|
@@ -534,6 +534,41 @@ def compute_balance(invoices, payments):
|
|
|
return s
|
|
|
|
|
|
|
|
|
+@receiver(post_save, sender=Payment)
|
|
|
+def payment_changed(sender, instance, created, **kwargs):
|
|
|
+
|
|
|
+ if created:
|
|
|
+ accounting_log.info("Adding payment %s (Date: %s, Member: %s, Amount: %s, Label: %s)."
|
|
|
+ % (instance.pk, instance.date, instance.member,
|
|
|
+ instance.amount, instance.label))
|
|
|
+ else:
|
|
|
+ accounting_log.info("Updating payment %s (Date: %s, Member: %s, Amount: %s, Label: %s, Allocated: %s)."
|
|
|
+ % (instance.pk, instance.date, instance.member,
|
|
|
+ instance.amount, instance.label,
|
|
|
+ instance.amount_already_allocated))
|
|
|
+
|
|
|
+ # If this payment is related to a member, update the accounting for
|
|
|
+ # this member
|
|
|
+ if (created or instance.amount_not_allocated != 0) \
|
|
|
+ and (instance.member is not None):
|
|
|
+ update_accounting_for_member(instance.member)
|
|
|
+
|
|
|
+
|
|
|
+@receiver(post_save, sender=Invoice)
|
|
|
+def invoice_changed(sender, instance, created, **kwargs):
|
|
|
+
|
|
|
+ if created:
|
|
|
+ accounting_log.info("Creating draft invoice %s (Member: %s)."
|
|
|
+ % ('DRAFT-{}'.format(instance.pk), instance.member))
|
|
|
+ else:
|
|
|
+ if not instance.validated:
|
|
|
+ accounting_log.info("Updating draft invoice %s (Member: %s)."
|
|
|
+ % (instance.number, instance.member))
|
|
|
+ else:
|
|
|
+ accounting_log.info("Updating invoice %s (Member: %s, Total amount: %s, Amount paid: %s)."
|
|
|
+ % (instance.number, instance.member, instance.amount(), instance.amount_paid ))
|
|
|
+
|
|
|
+
|
|
|
def test_accounting_update():
|
|
|
|
|
|
Member.objects.all().delete()
|
|
@@ -572,40 +607,3 @@ def test_accounting_update():
|
|
|
Invoice.objects.all().delete()
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-@receiver(post_save, sender=Payment)
|
|
|
-def payment_changed(sender, instance, created, **kwargs):
|
|
|
-
|
|
|
- if created:
|
|
|
- accounting_log.info("Adding payment %s (Date: %s, Member: %s, Amount: %s, Label: %s)."
|
|
|
- % (instance.pk, instance.date, instance.member,
|
|
|
- instance.amount, instance.label))
|
|
|
- else:
|
|
|
- accounting_log.info("Updating payment %s (Date: %s, Member: %s, Amount: %s, Label: %s, Allocated: %s)."
|
|
|
- % (instance.pk, instance.date, instance.member,
|
|
|
- instance.amount, instance.label,
|
|
|
- instance.amount_already_allocated))
|
|
|
-
|
|
|
- # If this payment is related to a member, update the accounting for
|
|
|
- # this member
|
|
|
- if (created or instance.amount_not_allocated != 0) \
|
|
|
- and (instance.member is not None):
|
|
|
- update_accounting_for_member(instance.member)
|
|
|
-
|
|
|
-
|
|
|
-@receiver(post_save, sender=Invoice)
|
|
|
-def invoice_changed(sender, instance, created, **kwargs):
|
|
|
-
|
|
|
- if created:
|
|
|
- accounting_log.info("Creating draft invoice %s (Member: %s)."
|
|
|
- % ('DRAFT-{}'.format(instance.pk), instance.member))
|
|
|
- else:
|
|
|
- if not instance.validated:
|
|
|
- accounting_log.info("Updating draft invoice %s (Member: %s)."
|
|
|
- % (instance.number, instance.member))
|
|
|
- else:
|
|
|
- accounting_log.info("Updating invoice %s (Member: %s, Total amount: %s, Amount paid: %s)."
|
|
|
- % (instance.number, instance.member, instance.amount(), instance.amount_paid ))
|
|
|
-
|