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

diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
index 36515b86b..1519503e8 100644
--- 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,11 @@
       <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 %]
      <th class="listheading">[% 'Reference' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Requested execution date' | $T8 %]</th>
      <th class="listheading" align="right">[% 'Execution date' | $T8 %]</th>
@@ -44,9 +48,9 @@
      <th class="listheading">[% 'IBAN' | $T8 %]</th>
      <th class="listheading">[% 'BIC' | $T8 %]</th>
      [%- IF show_post_payments_button %]
-      <th class="listheading" colspan="3">&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') %]
+        [% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %]
       </th>
      [%- ELSE %]
       <th class="listheading" colspan="4">&nbsp;</th>
@@ -73,6 +77,11 @@
       <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 %]
       <td>[% HTML.escape(item.reference) %]</td>
       <td align="right">[% HTML.escape(item.requested_execution_date) %]</td>
       <td align="right" nowrap>
@@ -98,21 +107,27 @@
 
   <script type="text/javascript">
    <!--
-    function set_all_execution_date_fields() {
-      var new_date = $('#set_all_execution_date').val();
+    function set_all_execution_date_fields(input) {
+      var new_date = $(input).val();
       $('INPUT[name="items[].execution_date"]').each(function() {
         $(this).val(new_date);
       });
     }
 
     $(function() {
-      $('#set_all_execution_date').change(set_all_execution_date_fields);
       $("#select_all").checkall('INPUT[name="items[].selected"]');
     });
      -->
   </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>
@@ -124,6 +139,7 @@
     [%- END %]
    [%- END %]
   [%- END %]
+  [% END %]
 
      <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
  </form>