Merge branch 'master' of git.illyse.org:coin

Conflicts:
	coin/settings.py

coin/billing/admin.py

@@ -1,3 +1,17 @@
+# -*- coding: utf-8 -*-
 from django.contrib import admin
+from coin.billing.models import Invoice, InvoiceDetail, Payment
 
-# Register your models here.
+
+class InvoiceDetailInline(admin.StackedInline):
+    model = InvoiceDetail
+    extra = 0
+
+
+class InvoiceAdmin(admin.ModelAdmin):
+    inlines = [InvoiceDetailInline]
+
+
+admin.site.register(Invoice,InvoiceAdmin)
+admin.site.register(InvoiceDetail,)
+admin.site.register(Payment,)

coin/billing/models.py

@@ -1,36 +1,38 @@
+# -*- coding: utf-8 -*-
 from django.db import models
 
-# Create your models here.
 
-    
-class Invoces_Detail(models.Model):
+class Invoice(models.Model):
 
-    label= models.CharField(max_length=100)
-    amount = models.DecimalField( max_digits=5, decimal_places=2)
+    INVOICES_STATUS_CHOICES = (
+        ('open', 'A payer'),
+        ('closed', 'Reglée'),
+        ('trouble', 'Litige')
+    )
+
+    status = models.CharField(max_length=50, choices=INVOICES_STATUS_CHOICES,
+                              default='open')
+    amount = models.DecimalField(max_digits=5, decimal_places=2)
+    date = models.DateField(auto_now_add=True, null=True)
+    period_from = models.DateField(auto_now_add=False, null=True)
+    period_to = models.DateField(auto_now_add=False, null=True)
+    date_due = models.DateField(auto_now_add=False, null=True)
+
+
+class InvoiceDetail(models.Model):
+
+    label = models.CharField(max_length=100)
+    amount = models.DecimalField(max_digits=5, decimal_places=2)
     quantity = models.IntegerField(null=True)
-    tax = models.IntegerField( null=True)
+    tax = models.IntegerField(null=True)
+    invoice = models.ForeignKey(Invoice)
+
     def __unicode__(self):
         return self.label
 
-class Invoces(models.Model):
 
-    INVOICES_STATUS_CHOICES = (
-        ('open', 'A payer'),
-        ('Closed', 'regler'),
-        ('trouble', "litige"),
-    )
-    status= models.CharField(max_length=50, choices=INVOICES_STATUS_CHOICES,default='open')
-    detail = models.ForeignKey(Invoces_Detail)
-    amount = models.DecimalField( max_digits=5, decimal_places=2)
-    date = models.DateField (auto_now_add=True, null=True)
-    period_from=models.DateField (auto_now_add=False, null=True)
-    period_to=models.DateField (auto_now_add=False, null=True)
-    date_due=models.DateField (auto_now_add=False, null=True)
-
-    
-        
-class Payments(models.Model):
-    payment_means =models.CharField(max_length=100, null=True)
-    amount=  models.DecimalField( max_digits=7, decimal_places=2, null=True)
-    date=models.DateField(auto_now_add=True)
-    invoce =models.ForeignKey(Invoces)
+class Payment(models.Model):
+    payment_means = models.CharField(max_length=100, null=True)
+    amount = models.DecimalField(max_digits=7, decimal_places=2, null=True)
+    date = models.DateField(auto_now_add=True)
+    invoce = models.ForeignKey(Invoice)

coin/members/models.py

@@ -78,6 +78,9 @@ class Member(models.Model):
         ldap_user.password = new_password
         ldap_user.save()
 
+    class Meta:
+        verbose_name = 'membre'
+
 
 class CryptoKey(models.Model):
 
@@ -90,6 +93,9 @@ class CryptoKey(models.Model):
     def __unicode__(self):
         return u'Clé %s de %s' % (self.type, self.member)
 
+    class Meta:
+        verbose_name = 'clé'
+
 
 class MembershipFee(models.Model):
     member = models.ForeignKey('Member', related_name='membership_fees',
@@ -111,6 +117,9 @@ class MembershipFee(models.Model):
         return (u'%s - %s - %i€' % (self.member, self.start_date,
                                      self.amount))
 
+    class Meta:
+        verbose_name = 'cotisation'
+
 
 class LdapUser(ldapdb.models.Model):
     # TODO: déplacer ligne suivante dans settings.py

coin/settings.py

@@ -144,6 +144,7 @@ INSTALLED_APPS = (
     'autocomplete_light', #Automagic autocomplete foreingkey form component
     'coin.members',
     'coin.offers',
+    'coin.billing',
     'coin.resources'
 )