arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-24 08:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Creating an invoice now appears in its history. Rudimentary tracking of payments is also implemented

Browse Source
This commit is contained in:
Matthew Smith
2020-01-22 02:24:58 +00:00
parent 1be1b1abd7
commit 228592a0f3
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RIGS/models.py
View File

@@ -527,7 +527,7 @@ class EventAuthorisation(models.Model, RevisionMixin):
return str("N%05d" % self.event.pk + ' (requested by ' + self.sent_by.initials + ')')
@reversion.register(follow=['payment_set'])
@reversion.register(follow=['payments'])
@python_2_unicode_compatible
class Invoice(models.Model, RevisionMixin):
event = models.OneToOneField('Event', on_delete=models.CASCADE)
@@ -544,7 +544,7 @@ class Invoice(models.Model, RevisionMixin):
@property
def payment_total(self):
total = self.payment_set.aggregate(total=models.Sum('amount'))['total']
total = self.payments.aggregate(total=models.Sum('amount'))['total']
if total:
return total
return Decimal("0.00")
@@ -582,7 +582,7 @@ class Payment(models.Model):
(ADJUSTMENT, 'TEC Adjustment'),
)
invoice = models.ForeignKey('Invoice', on_delete=models.CASCADE)
invoice = models.ForeignKey('Invoice', on_delete=models.CASCADE, related_name="payments")
date = models.DateField()
amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)