diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2014-07-22 20:55:51 +0200 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2014-07-22 20:55:51 +0200 |
| commit | f8161b78728615c6c67a70985935ff7798921578 (patch) | |
| tree | e2e90889ba2ab4ece2531bf612fb7e97204c3d75 /budget | |
| parent | 229fe41a0ceb207e8d6d4b24adfa0aa2c32b436d (diff) | |
| parent | 79f24b7cb812f0fa0aa1b4bb82d23cbae87d540e (diff) | |
| download | ihatemoney-mirror-f8161b78728615c6c67a70985935ff7798921578.zip ihatemoney-mirror-f8161b78728615c6c67a70985935ff7798921578.tar.gz ihatemoney-mirror-f8161b78728615c6c67a70985935ff7798921578.tar.bz2 | |
Merge pull request #117 from aavenel/fix-rounding
Fix #116 : rounding error in balances
Diffstat (limited to 'budget')
| -rw-r--r-- | budget/models.py | 4 | ||||
| -rw-r--r-- | budget/templates/list_bills.html | 4 | ||||
| -rw-r--r-- | budget/templates/settle_bills.html | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/budget/models.py b/budget/models.py index c1372c0..55a97c1 100644 --- a/budget/models.py +++ b/budget/models.py @@ -45,7 +45,7 @@ class Project(db.Model): for person in self.members: balance = should_receive[person] - should_pay[person] - balances[person.id] = round(balance, 2) + balances[person.id] = balance return balances @@ -219,7 +219,7 @@ class Bill(db.Model): def pay_each(self): """Compute what each person has to pay""" if self.owers: - return round(self.amount / len(self.owers), 2) + return self.amount / len(self.owers) else: return 0 diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html index ee97624..f9d372a 100644 --- a/budget/templates/list_bills.html +++ b/budget/templates/list_bills.html @@ -73,8 +73,8 @@ <form class="action reactivate" action="{{ url_for(".reactivate", member_id=member.id) }}" method="POST"> <button type="submit">{{ _("reactivate") }}</button></form></td> {% endif %} - <td class="balance-value {% if balance[member] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}"> - {% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }} + <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}"> + {% if balance[member.id] > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} </td> </tr> {% endfor %} diff --git a/budget/templates/settle_bills.html b/budget/templates/settle_bills.html index 29d9b26..4066b16 100644 --- a/budget/templates/settle_bills.html +++ b/budget/templates/settle_bills.html @@ -15,7 +15,7 @@ <tr id="bal-member-{{ member.id }}" action={% if member.activated %}delete{% else %}reactivate{% endif %}> <td class="balance-name">{{ member.name }}</td> <td class="balance-value {% if balance[member.id] > 0 %}positive{% elif balance[member.id] < 0 %}negative{% endif %}"> - {% if balance[member.id] > 0 %}+{% endif %}{{ balance[member.id] }} + {% if balance[member.id] > 0 %}+{% endif %}{{ "%.2f" | format(balance[member.id]) }} </td> </tr> {% endfor %} |