Auftrags-Controller: Drucken und E-Mail

[kivitendo-erp.git] / templates / webpages / sepa / bank_transfer_edit.html

diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
index 589b358..1519503 100644 (file)
--- a/templates/webpages/sepa/bank_transfer_edit.html
+++ b/templates/webpages/sepa/bank_transfer_edit.html
@@ -11,8 +11,7 @@
  [% SET arap = 'ar' %]
  [% SET iris = 'is' %]
 [%- END %]
-
- <p><div class="listtop">[% title %]: [% HTML.escape(export.ids.join(', ')) %]</div></p>
+<h1>[% title %]: [% HTML.escape(export.ids.join(', ')) %]</h1>
 
  <form action="sepa.pl" method="post">
   <input type="hidden" name="action" value="dispatcher">
@@ -33,6 +32,8 @@
       <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
      [%- END %]
      <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Skonto amount' | $T8 %]</th>
+     <th class="listheading" align="right">[% 'Payment type' | $T8 %]</th>
      [% IF vc == 'customer' %]
       <th class="listheading" align="right">[% 'Mandator ID' | $T8 %]</th>
      [%- END %]
@@ -47,7 +48,7 @@
      <th class="listheading">[% 'IBAN' | $T8 %]</th>
      <th class="listheading">[% 'BIC' | $T8 %]</th>
      [%- IF show_post_payments_button %]
-      <th class="listheading" colspan="[% IF vc == 'customer' %]4[% ELSE %]3[% END %]">&nbsp;</th>
+      <th class="listheading" colspan="[% IF vc == 'customer' %]6[% ELSE %]5[% END %]">&nbsp;</th>
       <th class="listheading">
         [% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]
       </th>
@@ -76,6 +77,8 @@
       <td>[% HTML.escape(item.vc_iban) %]</td>
       <td>[% HTML.escape(item.vc_bic) %]</td>
       <td align="right">[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
+      <td align="right">[% HTML.escape(LxERP.format_amount(item.skonto_amount, 2)) %]</td>
+      <td align="right">[% item.payment_type | $T8 %]</td>
       [% IF vc == 'customer' %]
        <td>[% HTML.escape(item.mandator_id) %]</td>
       [%- END %]
@@ -118,6 +121,13 @@
   </script>
 
   [%- ELSE %]
+   [%- SET has_executed = 0;
+       FOREACH item = export.items;
+         IF item.executed;
+           SET has_executed = 1;
+         END ;
+       END ;
+       IF has_executed %]
   <p>
    <input type="submit" class="submit" name="action_bank_transfer_payment_list_as_pdf" value="[% 'Payment list as PDF' | $T8 %]">
   </p>
@@ -129,6 +139,7 @@
     [%- END %]
    [%- END %]
   [%- END %]
+  [% END %]
 
      <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
  </form>