Verbesserung Visualisierung Bankverbuchen

Ein HTML-Tag zuviel.
open_amount aus SL/DB/Helper/Payments.pm nehmen
anstatt die DB/Invoice.pm unnötigerweise zu erweitern.

diff --git a/templates/webpages/bank_transactions/add_list.html b/templates/webpages/bank_transactions/add_list.html
index 71ffc3e..d562172 100644 (file)
--- 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_open, 2) %]</td>
+    <td align="right">[%- LxERP.format_amount(invoice.open_amount, 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 3249dcf..aba030c 100644 (file)
--- a/templates/webpages/bank_transactions/invoices.html
+++ b/templates/webpages/bank_transactions/invoices.html
@@ -5,7 +5,7 @@
   <div id="[% bt_id %].[% invoice.id %]">
     [% L.hidden_tag('invoice_ids.' _ bt_id _'[]', invoice.id) %]
     [% 'Invno.' | $T8 %]: [% invoice.invnumber %]
-    [% 'Amount' | $T8 %]: [% LxERP.format_amount(invoice.amount_open, 2) %]
+    [% 'Amount' | $T8 %]: [% LxERP.format_amount(invoice.open_amount, 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 50af95b..0956daf 100644 (file)
--- 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 %] [% 'with amount' | $T8 %]<</th>
+    <th>[% 'Assigned invoices' | $T8 %] [% 'with amount' | $T8 %]</th>
     [% IF debug %]
     <th>[% 'Score' | $T8 %]</th>
     [% END %]