petits changements cosmétiques

adhesions/admin.py

@@ -19,7 +19,7 @@ class AdherentInline(GenericStackedInline):
 
 
 class ProfileAdmin(admin.ModelAdmin):
-    list_display = ('user', 'phone_number',)
+    list_display = ('__str__', 'phone_number',)
     inlines = (AdherentInline,)
 
 

adhesions/models.py

@@ -31,7 +31,10 @@ class Adherent(models.Model):
             return 'Personne morale'
 
     def __str__(self):
-        return str(self.adherent)
+        if self.adherent_type.app_label == 'auth' and self.adherent_type.model == 'user':
+            return str(self.adherent.profile)
+        else:
+            return str(self.adherent)
 
 
 class AdhesionMixin:
@@ -55,7 +58,7 @@ class Profile(AdhesionMixin, models.Model):
         verbose_name = 'profil'
 
     def __str__(self):
-        return 'Profil de %s' % self.user
+        return self.user.get_full_name() or self.user.username
 
 
 class Corporation(AdhesionMixin, models.Model):

banking/models.py

@@ -19,7 +19,12 @@ class Payment(models.Model):
     def __str__(self):
         s = str(self.amount) + '€' 
         if self.period:
-            s += '%d/mois' % self.period
+            if self.period == 1:
+                s += '/mois'
+            elif self.period == 12:
+                s += '/an'
+            else:
+                s += '/%d mois' % self.period
         if self.payment_method == self.TRANSFERT:
             s += ' (virement)'
         elif self.payment_method == self.WITHDRAWAL:

services/migrations/0002_auto_20161230_1837.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2016-12-30 17:37
+from __future__ import unicode_literals
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('services', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ipresource',
+            name='ip',
+            field=models.GenericIPAddressField(verbose_name='IP'),
+        ),
+        migrations.AlterField(
+            model_name='ipresource',
+            name='mask',
+            field=models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(128)], verbose_name='Masque'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='contribution',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='banking.Payment', verbose_name='Cotisation'),
+        ),
+        migrations.AlterField(
+            model_name='service',
+            name='ip_resources',
+            field=models.ManyToManyField(blank=True, to='services.IPResource', verbose_name='Ressources IP'),
+        ),
+    ]

services/models.py

@@ -7,8 +7,9 @@ from banking.models import Payment
 
 
 class IPResource(models.Model):
-    ip = models.GenericIPAddressField()
-    mask = models.PositiveIntegerField(validators=[MaxValueValidator(128)], default=0)
+    ip = models.GenericIPAddressField(verbose_name='IP')
+    mask = models.PositiveIntegerField(validators=[MaxValueValidator(128)],
+                                       default=0, verbose_name='Masque')
 
     @property
     def in_use(self):
@@ -44,8 +45,9 @@ class Service(models.Model):
     adherent = models.ForeignKey(Adherent, verbose_name='Adhérent')
     service_type = models.ForeignKey(ServiceType, verbose_name='Type de service')
     notes = models.TextField(blank=True, default='')
-    contribution = models.ForeignKey(Payment, null=True, blank=True)
-    ip_resources = models.ManyToManyField(IPResource,
+    contribution = models.ForeignKey(Payment, null=True, blank=True,
+                                     verbose_name='Cotisation')
+    ip_resources = models.ManyToManyField(IPResource, blank=True,
                                           verbose_name='Ressources IP')
     start = models.DateTimeField(verbose_name='Début du service')
     end = models.DateTimeField(null=True, blank=True, verbose_name='Fin du service')