Browse Source

Add billing to settings
Fix typo in models
Add admin register

Fabs 11 years ago
parent
commit
101c0eee44
3 changed files with 22 additions and 15 deletions
  1. 6 1
      coin/billing/admin.py
  2. 14 13
      coin/billing/models.py
  3. 2 1
      coin/settings.py

+ 6 - 1
coin/billing/admin.py

@@ -1,3 +1,8 @@
+# -*- coding: utf-8 -*-
 from django.contrib import admin
+from coin.billing.models import Invoice, InvoceDetail, Payment
 
-# Register your models here.
+
+admin.site.register(Invoice,)
+admin.site.register(InvoceDetail,)
+admin.site.register(Payment,)

+ 14 - 13
coin/billing/models.py

@@ -1,17 +1,7 @@
+# -*- coding: utf-8 -*-
 from django.db import models
 
 
-class InvoceDetail(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)
-
-    def __unicode__(self):
-        return self.label
-
-
 class Invoice(models.Model):
 
     INVOICES_STATUS_CHOICES = (
@@ -22,7 +12,6 @@ class Invoice(models.Model):
 
     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)
@@ -30,8 +19,20 @@ class Invoice(models.Model):
     date_due = models.DateField(auto_now_add=False, null=True)
 
 
+class InvoceDetail(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)
+    invoice = models.ForeignKey(Invoice)
+
+    def __unicode__(self):
+        return self.label
+
+
 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(Invoces)
+    invoce = models.ForeignKey(Invoice)

+ 2 - 1
coin/settings.py

@@ -143,7 +143,8 @@ INSTALLED_APPS = (
     'ldapdb',  # LDAP as database backend
     'autocomplete_light', #Automagic autocomplete foreingkey form component
     'coin.members',
-    'coin.offers'
+    'coin.offers',
+    'coin.billing'
 )
 
 # A sample logging configuration. The only tangible logging