Remove now useless entry_date field (superseded by membershipfee)

coin/members/admin.py

@@ -37,10 +37,9 @@ class MemberAdmin(UserAdmin):
 
     fieldsets = (
         ('Adhérent', {'fields': (
-            'status',
+            ('status', 'resign_date'),
             'type',
-                ('first_name', 'last_name', 'organization_name'),
-                ('entry_date', 'resign_date'))}),
+                ('first_name', 'last_name', 'organization_name'))}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),
@@ -56,8 +55,7 @@ class MemberAdmin(UserAdmin):
         ('Adhérent', {'fields': (
             'status',
             'type',
-            ('first_name', 'last_name', 'organization_name'),
-            ('entry_date', 'resign_date'))}),
+            ('first_name', 'last_name', 'organization_name'))}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),

coin/members/migrations/0005_auto_20141008_1038.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0004_auto_20141007_1002'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='member',
+            name='entry_date',
+        ),
+        migrations.AlterField(
+            model_name='member',
+            name='resign_date',
+            field=models.DateField(help_text='En cas de d\xe9part pr\xe9matur\xe9', null=True, verbose_name="date de d\xe9part de l'association", blank=True),
+        ),
+    ]

coin/members/models.py

@@ -59,15 +59,11 @@ class Member(CoinLdapSyncMixin, AbstractUser):
     country = models.CharField(max_length=200, blank=True, null=True,
                                default='France',
                                verbose_name='pays')
-    entry_date = models.DateField(null=False,
-                                  blank=False,
-                                  default=datetime.date.today,
-                                  verbose_name='date de première adhésion')
-    # TODO: for data retention, prevent deletion of a user object while
-    # the resign date is recent enough (e.g. one year in France).
+
     resign_date = models.DateField(null=True, blank=True,
                                    verbose_name="date de départ de "
-                                   "l'association")
+                                   "l'association",
+                                   help_text="En cas de départ prématuré")
 
     # Following fields are managed by the parent class AbstractUser :
     # username, first_name, last_name, email