|
|
@@ -482,9 +482,9 @@ def update_accounting_for_member(member):
|
|
|
"""
|
|
|
|
|
|
accounting_log.info("Updating accounting for member %s ..."
|
|
|
- % str(member))
|
|
|
+ % member)
|
|
|
accounting_log.info("Member %s current balance is %f ..."
|
|
|
- % (str(member), float(member.balance)))
|
|
|
+ % (member, float(member.balance)))
|
|
|
|
|
|
reconcile_invoices_and_payments(member)
|
|
|
|
|
|
@@ -496,7 +496,7 @@ def update_accounting_for_member(member):
|
|
|
member.save()
|
|
|
|
|
|
accounting_log.info("Member %s new balance is %f"
|
|
|
- % (str(member), float(member.balance)))
|
|
|
+ % (member, float(member.balance)))
|
|
|
|
|
|
|
|
|
def reconcile_invoices_and_payments(member):
|
|
|
@@ -510,16 +510,16 @@ def reconcile_invoices_and_payments(member):
|
|
|
if active_payments == []:
|
|
|
accounting_log.info("(No active payment for %s. No invoice/payment "
|
|
|
"reconciliation needed.)."
|
|
|
- % str(member))
|
|
|
+ % member)
|
|
|
return
|
|
|
elif active_invoices == []:
|
|
|
accounting_log.info("(No active invoice for %s. No invoice/payment "
|
|
|
"reconciliation needed.)."
|
|
|
- % str(member))
|
|
|
+ % member)
|
|
|
return
|
|
|
|
|
|
accounting_log.info("Initiating reconciliation between "
|
|
|
- "invoice and payments for %s" % str(member))
|
|
|
+ "invoice and payments for %s" % member)
|
|
|
|
|
|
while active_payments != [] and active_invoices != []:
|
|
|
|
