From: Jan Büren <jan@kivitendo-premium.de>
Date: Fri, 13 May 2016 08:19:31 +0000 (+0200)
Subject: bessere visuelle Kontrolle über Bankauszug verbuchen
X-Git-Tag: release-3.4.1~64
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bbf5c662c1c707852b30d0fb6985efdf6148f14f;p=kivitendo-erp.git

bessere visuelle Kontrolle über Bankauszug verbuchen

Der Betrag, der wirklich zugeordnet wird, wird in der GUI angezeigt.
Ferner Berechnungen aus den Templates ausgelagert.
---

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 @@
     <td>[% L.checkbox_tag('invoice_id[]', value=invoice.id) %]</td>
     <td>[%- invoice.invnumber %]</td>
     <td align="right">[%- LxERP.format_amount(invoice.amount, 2) %]</td>
-    <td align="right">[%- LxERP.format_amount(invoice.amount - invoice.paid, 2) %]</td>
+    <td align="right">[%- LxERP.format_amount(invoice.amount_open, 2) %]</td>
     <td align="right">[%- LxERP.format_amount(invoice.amount_less_skonto, 2) %]</td>
     <td align="right">[%- invoice.transdate_as_date %]</td>
     <td>[%- invoice.vendor.vendornumber %][%- invoice.customer.customernumber %]</td>
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 %]
   <div id="[% bt_id %].[% invoice.id %]">
     [% L.hidden_tag('invoice_ids.' _ bt_id _'[]', invoice.id) %]
-    [% invoice.invnumber %]
+    [% 'Invno.' | $T8 %]: [% invoice.invnumber %]
+    [% 'Amount' | $T8 %]: [% LxERP.format_amount(invoice.amount_open, 2) %]
     <a href=# onclick="delete_invoice([% bt_id %], [% invoice.id %])">x</a>
   </div>
 [% 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 @@
    <tr class="listheading">
     <th></th>
     <th></th>
-    <th>[% 'Assigned invoices' | $T8 %]</th>
+    <th>[% 'Assigned invoices' | $T8 %] [% 'with amount' | $T8 %]<</th>
     [% IF debug %]
     <th>[% 'Score' | $T8 %]</th>
     [% END %]