From 91f8aa982bfab052d08e78022cb980c1129766c8 Mon Sep 17 00:00:00 2001 From: kj1352 Date: Thu, 14 Jul 2022 13:08:27 +0530 Subject: [PATCH] Models updated based on Adwaith's feedback --- invoice/models.py | 8 ++++++-- project/models.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/invoice/models.py b/invoice/models.py index 103ffca..a4ea0f7 100644 --- a/invoice/models.py +++ b/invoice/models.py @@ -8,7 +8,7 @@ class Invoice(models.Model): raised_date = models.DateField() due_date = models.DateField() paid_date = models.DateField(null=True, blank=True) - is_archived = models.BooleanField() + is_archived = models.BooleanField(default=False) def __str__(self): return self.invoice_id @@ -18,7 +18,11 @@ class Item(models.Model): name = models.TextField(blank=False, null=False) amount = models.DecimalField() quantity = models.IntegerField() - invoice = models.OneToOneField(Invoice, on_delete=models.CASCADE) + invoice = models.ForeignKey(Invoice, on_delete=models.CASCADE) + + @property + def item_total(self): + return self.amount * self.quantity def __str__(self): return self.name diff --git a/project/models.py b/project/models.py index fab9b28..003d367 100644 --- a/project/models.py +++ b/project/models.py @@ -6,7 +6,7 @@ class Project(models.Model): name = models.CharField(max_length=30) project_image = models.ImageField(upload_to='project_images', null=True, blank=True) client = models.ForeignKey(Client, on_delete=models.CASCADE) - total_cost = models.DecimalField() + total_compensation = models.DecimalField() start_date = models.DateField() end_date = models.DateField()