Commit 72257f80 authored by ljf's avatar ljf
Browse files

[enh] Rename MEMBER_DEFAULT_COTISATION

parent 0659ffdf

README.md

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ List of available settings in your `settings_local.py` file. 
- `REGISTRATION_OPEN` : Allow visitor to join the association by register on COIN

- `ACCOUNT_ACTIVATION_DAYS` : All account with unvalidated email will be deleted after X days

- `MEMBERSHIP_REFERENCE` : Template string to display the label the member should indicates for the bank transfer, default: "ADH-{{ user.pk }}"

- `MEMBER_DEFAULT_COTISATION` : Default membership fee, if you have a more complex membership fees policy, you could overwrite templates

- `DEFAULT_MEMBERSHIP_FEE` : Default membership fee, if you have a more complex membership fees policy, you could overwrite templates

- `PAYMENT_DELAY`: Payment delay in days for issued invoices ( default is 30 days which is the default in french law)

- `MEMBER_CAN_EDIT_PROFILE`: Allow members to edit their profiles

- `HANDLE_BALANCE`: Allows to handle money balances for members (False default)

coin/members/migrations/0003_auto_20141007_0956.py

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ class Migration(migrations.Migration): 
        migrations.AlterField(

            model_name='membershipfee',

            name='amount',

            field=models.IntegerField(default=settings.MEMBER_DEFAULT_COTISATION, help_text='en \u20ac', verbose_name='montant'),

            field=models.IntegerField(default=settings.DEFAULT_MEMBERSHIP_FEE, help_text='en \u20ac', verbose_name='montant'),

        ),

        migrations.AlterField(

            model_name='membershipfee',

coin/members/migrations/0004_auto_20141007_1002.py

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ class Migration(migrations.Migration): 
        migrations.AlterField(

            model_name='membershipfee',

            name='amount',

            field=models.DecimalField(default=settings.MEMBER_DEFAULT_COTISATION, help_text='en \u20ac', verbose_name='montant', max_digits=5, decimal_places=2),

            field=models.DecimalField(default=settings.DEFAULT_MEMBERSHIP_FEE, help_text='en \u20ac', verbose_name='montant', max_digits=5, decimal_places=2),

        ),

    ]

coin/members/models.py

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ class MembershipFee(models.Model): 
    member = models.ForeignKey('Member', related_name='membership_fees',

                               verbose_name='membre')

    amount = models.DecimalField(null=False, max_digits=5, decimal_places=2,

                                 default=settings.MEMBER_DEFAULT_COTISATION,

                                 default=settings.DEFAULT_MEMBERSHIP_FEE,

                                 verbose_name='montant', help_text='en €')

    start_date = models.DateField(

        null=False,

coin/members/views.py

+4 −4
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ def activation_completed(request): 
    label_template = settings.MEMBERSHIP_REFERENCE.format(user=request.user)

    context = {

        'bank_transfer_label': label_template,

        'dues': settings.MEMBER_DEFAULT_COTISATION

        'dues': settings.DEFAULT_MEMBERSHIP_FEE

    }



    return render(request, 'members/registration/activation_complete.html',