X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fsepa%2Fbank_transfer_edit.html;h=1519503e8ba03d6d779069bf5e96414e5463c0f2;hb=02b31f9250ed39394490ed94a08c5e96cd767a65;hp=a0ccd97e6b5d21fac0a41f71850ed33cbf925876;hpb=3aa5cee2f12c1dff757539b60196bf5e1be0a5d6;p=kivitendo-erp.git

diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
index a0ccd97e6..1519503e8 100644
--- a/templates/webpages/sepa/bank_transfer_edit.html
+++ b/templates/webpages/sepa/bank_transfer_edit.html
@@ -32,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 %]
@@ -46,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>
@@ -75,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 %]
@@ -117,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>
@@ -128,6 +139,7 @@
     [%- END %]
    [%- END %]
   [%- END %]
+  [% END %]
 
      <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
  </form>