diff --git a/ihatemoney/templates/settle_bills.html b/ihatemoney/templates/settle_bills.html index d23f9c06..a69ed64f 100644 --- a/ihatemoney/templates/settle_bills.html +++ b/ihatemoney/templates/settle_bills.html @@ -11,14 +11,14 @@ - {% for bill in bills %} - - - - + {% for transaction in transactions %} + + + +
{{ _("Who pays?") }}{{ _("To whom?") }}{{ _("How much?") }}{{ _("Settled?") }}
{{ bill.ower }}{{ bill.receiver }}{{ bill.amount|currency }}
{{ transaction.ower }}{{ transaction.receiver }}{{ transaction.amount|currency }} - + {{ ("Settle") }} diff --git a/ihatemoney/web.py b/ihatemoney/web.py index 4b5c82c5..617fdfa3 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -846,24 +846,24 @@ def change_lang(lang): @main.route("//settle_bills") def settle_bill(): """Compute the sum each one have to pay to each other and display it""" - bills = g.project.get_transactions_to_settle_bill() - return render_template("settle_bills.html", bills=bills, current_view="settle_bill") + transactions = g.project.get_transactions_to_settle_bill() + return render_template("settle_bills.html", transactions=transactions, current_view="settle_bill") -@main.route("//settle///") -def settle(amount, ower_id, payer_id): - new_reinbursement = Bill( +@main.route("//settle///") +def add_settlement_bill(amount, sender_id, receiver_id): + settlement = Bill( amount=float(amount), date=datetime.datetime.today(), - owers=[Person.query.get(payer_id)], - payer_id=ower_id, + owers=[Person.query.get(receiver_id)], + payer_id=sender_id, project_default_currency=g.project.default_currency, bill_type=BillType.REIMBURSEMENT, what=_("Settlement"), ) session.update() - db.session.add(new_reinbursement) + db.session.add(settlement) db.session.commit() return redirect(url_for(".settle_bill"))