Merge pull request #32 from GunpreetAhuja/dirty

Suspense attributes added

src/librehatti/catalog/models.py

@@ -33,6 +33,9 @@ class PurchaseOrder(models.Model):
     delivery_address = models.ForeignKey('useraccounts.Address')
     organisation = models.ForeignKey('useraccounts.AdminOrganisations')
     date_time = models.DateTimeField(auto_now_add=True)
+    is_suspense = models.BooleanField(default=False)
+    choices = (('cash', 'Cash'), ('demand_draft', 'Demand Draft'), ('cheque', 'Cheque'))
+    mode_of_payment = models.CharField(max_length=25, default='cash', choices=choices)
     def __unicode__(self):
         return '%s' % (self.buyer_id) +' - ' '%s' % (self.date_time.strftime
                ('%b %d, %Y'))

src/librehatti/suspense/models.py

@@ -1,8 +1,13 @@
 from django.db import models
+from librehatti.catalog.models import PurchaseOrder
+
+
+class SuspenseOrder(models.Model):
+    purchase_order_id = models.ForeignKey(PurchaseOrder)
+    transportation = models.IntegerField()
 
-# Create your models here.
-class SuspenseClearance(models.Model):
 
+class SuspenseClearance(models.Model):
     #suspense_id = models.ForeignKey('SuspenseOrder')
     work_charge =models.IntegerField(blank=True, null=True)
     labour_charge = models.IntegerField(blank=True, null=True)
@@ -14,6 +19,7 @@ class SuspenseClearance(models.Model):
     Test_date = models.DateTimeField(auto_now_add=True)
     Clear_date = models.DateTimeField(auto_now_add=True)
 
+
 class Department(models.Model):
     title = models.CharField(max_length=50)
     address = models.CharField(max_length=150)
@@ -22,6 +28,7 @@ class Department(models.Model):
     def __unicode__(self):
         return self.title
 
+
 class Staff(models.Model):
     department = models.ForeignKey(Department)
     code = models.CharField(max_length=5)