From bbf5c662c1c707852b30d0fb6985efdf6148f14f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20B=C3=BCren?= Date: Fri, 13 May 2016 10:19:31 +0200 Subject: [PATCH] =?utf8?q?bessere=20visuelle=20Kontrolle=20=C3=BCber=20Ban?= =?utf8?q?kauszug=20verbuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Der Betrag, der wirklich zugeordnet wird, wird in der GUI angezeigt. Ferner Berechnungen aus den Templates ausgelagert. --- templates/webpages/bank_transactions/add_list.html | 2 +- templates/webpages/bank_transactions/invoices.html | 5 ++++- templates/webpages/bank_transactions/tabs/all.html | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/webpages/bank_transactions/add_list.html b/templates/webpages/bank_transactions/add_list.html index ad48bfa07..71ffc3ecd 100644 --- a/templates/webpages/bank_transactions/add_list.html +++ b/templates/webpages/bank_transactions/add_list.html @@ -19,7 +19,7 @@ [% L.checkbox_tag('invoice_id[]', value=invoice.id) %] [%- invoice.invnumber %] [%- LxERP.format_amount(invoice.amount, 2) %] - [%- LxERP.format_amount(invoice.amount - invoice.paid, 2) %] + [%- LxERP.format_amount(invoice.amount_open, 2) %] [%- LxERP.format_amount(invoice.amount_less_skonto, 2) %] [%- invoice.transdate_as_date %] [%- invoice.vendor.vendornumber %][%- invoice.customer.customernumber %] diff --git a/templates/webpages/bank_transactions/invoices.html b/templates/webpages/bank_transactions/invoices.html index 6ba716c2b..3249dcf82 100644 --- a/templates/webpages/bank_transactions/invoices.html +++ b/templates/webpages/bank_transactions/invoices.html @@ -1,8 +1,11 @@ [% USE L %] +[% USE T8 %] +[% USE LxERP %] [% FOREACH invoice = INVOICES %]
[% L.hidden_tag('invoice_ids.' _ bt_id _'[]', invoice.id) %] - [% invoice.invnumber %] + [% 'Invno.' | $T8 %]: [% invoice.invnumber %] + [% 'Amount' | $T8 %]: [% LxERP.format_amount(invoice.amount_open, 2) %] x
[% END %] diff --git a/templates/webpages/bank_transactions/tabs/all.html b/templates/webpages/bank_transactions/tabs/all.html index 0b1d6144e..50af95b34 100644 --- a/templates/webpages/bank_transactions/tabs/all.html +++ b/templates/webpages/bank_transactions/tabs/all.html @@ -7,7 +7,7 @@ - [% 'Assigned invoices' | $T8 %] + [% 'Assigned invoices' | $T8 %] [% 'with amount' | $T8 %]< [% IF debug %] [% 'Score' | $T8 %] [% END %] -- 2.20.1