Merge branch 'evol-237'

coin/members/admin.py

@@ -49,7 +49,8 @@ class MemberAdmin(UserAdmin):
             ('status', 'resign_date'),
             'type',
             ('first_name', 'last_name', 'nickname'),
-            'organization_name')}),
+            'organization_name',
+            'comments')}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),
@@ -66,7 +67,8 @@ class MemberAdmin(UserAdmin):
             'status',
             'type',
             ('first_name', 'last_name', 'nickname'),
-            'organization_name')}),
+            'organization_name',
+            'comments')}),
         ('Coordonnées', {'fields': (
             'email',
             ('home_phone_number', 'mobile_phone_number'),

coin/members/migrations/0011_member_comments.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('members', '0010_auto_20141008_2246'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='member',
+            name='comments',
+            field=models.TextField(default='', help_text="Commentaires libres (informations sp\xe9cifiques concernant l'adh\xe9sion, raison du d\xe9part, etc)", verbose_name='commentaires', blank=True),
+            preserve_default=False,
+        ),
+    ]

coin/members/models.py

@@ -62,11 +62,14 @@ class Member(CoinLdapSyncMixin, AbstractUser):
     country = models.CharField(max_length=200, blank=True, null=True,
                                default='France',
                                verbose_name='pays')
-
     resign_date = models.DateField(null=True, blank=True,
                                    verbose_name="date de départ de "
                                    "l'association",
                                    help_text="En cas de départ prématuré")
+    comments = models.TextField(blank=True, verbose_name='commentaires',
+                                help_text="Commentaires libres (informations"
+                                " spécifiques concernant l'adhésion,"
+                                " raison du départ, etc)")
 
     # Following fields are managed by the parent class AbstractUser :
     # username, first_name, last_name, email