Browse Source

Add verbose name

Fabs 11 years ago
parent
commit
36e8f4ebbc
2 changed files with 22 additions and 12 deletions
  1. 7 1
      coin/offers/admin.py
  2. 15 11
      coin/offers/models.py

+ 7 - 1
coin/offers/admin.py

@@ -11,7 +11,13 @@ class OfferSubscriptionAdmin(admin.ModelAdmin):
     list_display = ('member', 'offer', 'subscription_date', 'commitment',
                     'resign_date')
     list_display_links = ('member','offer')
-
+    fields = (
+                'member',
+                'offer',
+                'subscription_date',
+                'commitment',
+                'resign_date'
+             )
 
 admin.site.register(Service)
 admin.site.register(Offer, OfferAdmin)

+ 15 - 11
coin/offers/models.py

@@ -5,43 +5,47 @@ from django.db import models
 
 class Service(models.Model):
     name = models.CharField(max_length=255, blank=False, null=False,
-                            help_text='Nom du service')
+                            verbose_name='Nom du service')
     
     def __unicode__(self):
         return self.name
 
+
 class Offer(models.Model):
     name = models.CharField(max_length=255, blank=False, null=False,
-                            help_text='Nom de l\'offre')
+                            verbose_name='Nom de l\'offre')
     billing_period = models.IntegerField(blank=False, null=False, default=1,
-                                       help_text='Période de facturation en mois')
+                                         verbose_name='Période de facturation',
+                                         help_text='en mois')
     period_fees = models.DecimalField(max_digits=5, decimal_places=2,
                                       blank=False, null=False,
-                                      help_text='Montant par période de facturation en €')
+                                      verbose_name='Montant par période de facturation',
+                                      help_text='en €')
     initial_fees = models.DecimalField(max_digits=5, decimal_places=2,
                                       blank=False, null=False,
-                                      help_text='Frais de mise en service en €')
+                                      verbose_name='Frais de mise en service',
+                                      help_text='en €')
     service = models.ForeignKey('Service')
     
     def __unicode__(self):
         return u'%s - %d€ / %im [%s]' % (self.name, self.period_fees, self.billing_period, self.service)
 
     class Meta:
-        verbose_name = 'Offre'
-
+        verbose_name = 'offre'
 
 class OfferSubscription(models.Model):
     subscription_date = models.DateField(
         null=False,
         blank=False,
         default=datetime.date.today,
-        help_text='Date de souscription à l\'offre')
+        verbose_name='Date de souscription à l\'offre')
     resign_date = models.DateField(
         null=True,
         blank=True,
-        help_text='Date de résiliation')
+        verbose_name='Date de résiliation')
     commitment = models.IntegerField(blank=False, null=False,
-                                     help_text='Période d\'engagement en mois',
+                                     verbose_name='Période d\'engagement',
+                                     help_text = 'en mois',
                                      default=0)
     member = models.ForeignKey('members.Member', verbose_name='Membre')
     offer = models.ForeignKey('Offer', verbose_name='Offre')
@@ -50,4 +54,4 @@ class OfferSubscription(models.Model):
         return u'%s - %s - %s' % (self.member, self.offer.name, self.subscription_date)
 
     class Meta:
-        verbose_name = 'Abonement'
+        verbose_name = 'abonnement'