|
@@ -454,11 +454,8 @@ def get_active_payment_and_invoices(member):
|
|
|
# Fetch relevant and active payments / invoices
|
|
|
# and sort then by chronological order : olders first, newers last.
|
|
|
|
|
|
- this_member_invoices = [i for i in member.invoices
|
|
|
- .filter(validated=True)
|
|
|
- .order_by("date")]
|
|
|
- this_member_payments = [p for p in member.payments
|
|
|
- .order_by("date")]
|
|
|
+ this_member_invoices = [i for i in member.invoices.filter(validated=True).order_by("date")]
|
|
|
+ this_member_payments = [p for p in member.payments.order_by("date")]
|
|
|
|
|
|
# TODO / FIXME ^^^ maybe also consider only 'opened' invoices (i.e. not
|
|
|
# conflict / trouble invoices)
|
|
@@ -482,11 +479,8 @@ def update_accounting_for_member(member):
|
|
|
|
|
|
reconcile_invoices_and_payments(member)
|
|
|
|
|
|
- this_member_invoices = [i for i in member.invoices
|
|
|
- .filter(validated=True)
|
|
|
- .order_by("date")]
|
|
|
- this_member_payments = [p for p in member.payments
|
|
|
- .order_by("date")]
|
|
|
+ this_member_invoices = [i for i in member.invoices.filter(validated=True).order_by("date")]
|
|
|
+ this_member_payments = [p for p in member.payments.order_by("date")]
|
|
|
|
|
|
member.balance = compute_balance(this_member_invoices,
|
|
|
this_member_payments)
|