From 0d7c82b12267ed3a9ece1ca72a71cea077e9cc0f Mon Sep 17 00:00:00 2001 From: "A.Avenel" Date: Sun, 7 Apr 2013 22:14:32 +0200 Subject: More code cleanup for "settle bills" --- budget/models.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'budget/models.py') diff --git a/budget/models.py b/budget/models.py index 1f3fa4f..49c3eb4 100644 --- a/budget/models.py +++ b/budget/models.py @@ -49,7 +49,7 @@ class Project(db.Model): return balances - def settle_bills(self): + def get_transactions_to_settle_bill(self): """Return a list of transactions that could be made to settle the bill""" credits, debts, transactions = [],[],[] # Create lists of credits and debts @@ -63,17 +63,17 @@ class Project(db.Model): match = self.exactmatch(credit["balance"], debts) if match: for m in match: - transactions.append({"ower": m["person"], "payer": credit["person"], "amount": m["balance"]}) + transactions.append({"ower": m["person"], "receiver": credit["person"], "amount": m["balance"]}) debts.remove(m) credits.remove(credit) # Split any remaining debts & credits while credits and debts: if credits[0]["balance"] > debts[0]["balance"]: - transactions.append({"ower": debts[0]["person"], "payer": credits[0]["person"], "amount": debts[0]["balance"]}) + transactions.append({"ower": debts[0]["person"], "receiver": credits[0]["person"], "amount": debts[0]["balance"]}) credits[0]["balance"] = credits[0]["balance"] - debts[0]["balance"] del debts[0] else: - transactions.append({"ower": debts[0]["person"], "payer": credits[0]["person"], "amount": credits[0]["balance"]}) + transactions.append({"ower": debts[0]["person"], "receiver": credits[0]["person"], "amount": credits[0]["balance"]}) debts[0]["balance"] = debts[0]["balance"] - credits[0]["balance"] del credits[0] return transactions -- cgit v1.1