commit 930c9a552b83647f60aa7bd412bc4433d021a84e
Author: Hans Peter Schlaepfer <hanspeter.schlaepfer@revamp-it.ch>
Date:   Fri Jan 4 06:23:25 2019 +0100

    Neues kivitendo Design Aenderungen in templates/webpages/sepa/..

diff --git a/templates/webpages/sepa/bank_transfer_add.html b/templates/webpages/sepa/bank_transfer_add.html
index c8cc07c01..34db41ea3 100644
--- a/templates/webpages/sepa/bank_transfer_add.html
+++ b/templates/webpages/sepa/bank_transfer_add.html
@@ -1,145 +1,150 @@
-[%- USE T8 %]
-[%- USE L %]
-[% USE HTML %][% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
 [% IF vc == 'vendor' %]
- [% SET is_vendor = 1 %]
- [% SET arap = 'ap' %]
- [% SET iris = 'ir' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
 [% ELSE %]
- [% SET is_vendor = 0 %]
- [% SET arap = 'ar' %]
- [% SET iris = 'is' %]
-[%- END %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
+
+<h1>[% title %]</h1>
 
- <p><div class="listtop">[% title %]</div></p>
+<form action="sepa.pl" method="post" id="form">
+<div class="wrapper">
 
- <form action="sepa.pl" method="post" id="form">
-  <p>
-   [%- IF is_vendor %]
+<div class="select-item control-panel">
+  <span class="label above">
+  [% IF is_vendor %]
     [% 'Please select the source bank account for the transfers:' | $T8 %]
-   [%- ELSE %]
+  [% ELSE %]
     [% 'Please select the destination bank account for the collections:' | $T8 %]
-   [%- END %]
-   <br>
-   [% L.select_tag('bank_account',
-       BANK_ACCOUNTS,
-       title_key='displayable_name',
-       with_empty=0,
-       style='width:450px',
-   ) %]
-  </p>
+  [% END %]</span><br>
+  [% L.select_tag('bank_account',
+      BANK_ACCOUNTS,
+      title_key='displayable_name',
+      with_empty=0,
+      class='wi-wide',
+  ) %]
+</div><!-- /.select-item -->
+</div><!-- /.wrapper -->
 
-  <p>
-   <table border="0">
+<table class="tbl-list">
+  <thead>
     <tr>
-     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading">[% IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
-     <th class="listheading">[% 'Invoice' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Invoice Date' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Due Date' | $T8 %]</th>
-     <th class="listheading">[% 'Purpose' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Bank transfer amount' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Payment type' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Skonto information' | $T8 %]</th>
+      <th><input type="checkbox" id="select_all"></th>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Open amount' | $T8 %]</th>
+      <th>[% 'Invoice Date' | $T8 %]</th>
+      <th>[% 'Due Date' | $T8 %]</th>
+      <th>[% 'Purpose' | $T8 %]</th>
+      <th>[% 'Bank transfer amount' | $T8 %]</th>
+      <th>[% 'Payment type' | $T8 %]</th>
+      <th>[% 'Skonto information' | $T8 %]</th>
     </tr>
+  </thead>
+  <tbody>
+    [% FOREACH invoice = INVOICES %]
+      <tr[% IF !invoice.vc_bank_info_ok && invoice.checked %] class="listrow_error"[% END %]>
+        <td>
+          <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(invoice.id) %]">
+          <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]">
+          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.open_sepa_transfer_amount, 2) %]">
+          <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.skonto_amount, 2) %]">
+          [% IF invoice.vc_bank_info_ok %]
+            [% L.checkbox_tag("ids[]", value=invoice.id, checked=invoice.checked) %]
+          [% END %]
+        </td>
+        <td>
+         [% IF loop.first || (previous_vcname != invoice.vcname) %]
+          <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(invoice.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
+           [% GET HTML.escape(invoice.vcname);
+               SET previous_vcname = invoice.vcname;
+               IF !invoice.vc_bank_info_ok;
+                 IF invoice.checked;
+                   GET ' <sup>(2)</sup>';
+                 ELSE;
+                   GET ' <sup>(1)</sup>';
+                 END;
+                 SET show_vc_bank_info_footnote = '1';
+               END; %]
+          </a>
+         [% END %]
+        </td>
+        <td>
+         <a href="[% IF invoice.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
+          [% HTML.escape(invoice.invnumber) %]
+         </a>
+        </td>
+        <td>[% LxERP.format_amount(invoice.invoice_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
+        <td>[% LxERP.format_amount(invoice.open_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
+        <td>[% invoice.transdate %]</td>
+        <td>[% invoice.duedate %]</td>
+        <td>
+          [% IF INSTANCE_CONF.get_sepa_reference_add_vc_vc_id %]
+            [% SET reference = invoice.reference_prefix _ invoice.invnumber _ invoice.reference_prefix_vc _ invoice.vc_vc_id %]
+          [% ELSE %]
+            [% SET reference = invoice.reference_prefix _ invoice.invnumber %]
+          [% END %]
+         <input type="text" name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="30">
+        </td>
+        <td>
+          <input type="text" id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.invoice_amount_suggestion, 2) %]" style="text-align: right" size="12">
+        </td>
+        <td>
+          [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
+        </td>
+        <td[% IF invoice.within_skonto_period %] class="highlight"[% END %]>
+          [% IF invoice.skonto_amount %]
+            [% LxERP.format_amount(invoice.percent_skonto, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount, 2) %] € bis [% invoice.skonto_date %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
 
-    [%- FOREACH invoice = INVOICES %]
-     <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(invoice.id) %]">
-     <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(invoice.amount_less_skonto, 2) %]">
-     <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.open_amount - invoice.open_sepa_transfer_amount, 2) %]">
-     <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.skonto_amount, 2) %]">
-
-
-     <tr class="listrow[% IF !invoice.vc_bank_info_ok && invoice.checked %]_error[% END %]">
-      <td align="center">
-       [%- IF invoice.vc_bank_info_ok %]
-        [% L.checkbox_tag("ids[]", value=invoice.id, checked=invoice.checked) %]
-       [%- END %]
-      </td>
-      <td>
-       [%- IF loop.first || (previous_vcname != invoice.vcname) %]
-        <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(invoice.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
-         [%- GET HTML.escape(invoice.vcname);
-             SET previous_vcname = invoice.vcname;
-             IF !invoice.vc_bank_info_ok;
-               IF invoice.checked;
-                 GET ' <sup>(2)</sup>';
-               ELSE;
-                 GET ' <sup>(1)</sup>';
-               END;
-               SET show_vc_bank_info_footnote = '1';
-             END; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF invoice.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(invoice.id) %]">
-        [% HTML.escape(invoice.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(invoice.invoice_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
-      <td align="right">[% LxERP.format_amount(invoice.open_amount-invoice.open_sepa_transfer_amount, 2) %]</td>
-      <td align="right">[% invoice.transdate %]</td>
-      <td align="right">[% invoice.duedate %]</td>
-      <td>
-    [% IF INSTANCE_CONF.get_sepa_reference_add_vc_vc_id %]
-       [%- SET reference = invoice.reference_prefix _ invoice.invnumber _ invoice.reference_prefix_vc _ invoice.vc_vc_id %]
+[% IF show_vc_bank_info_footnote %]
+<div class="long-desc wrapper">
+  <p><sup>(1)</sup>
+    [% IF is_vendor %]
+      [% 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN and the BIC." | $T8 %]
     [% ELSE %]
-       [%- SET reference = invoice.reference_prefix _ invoice.invnumber %]
+      [% 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
     [% END %]
-       <input name="bank_transfers[].reference" value="[% HTML.escape(reference.substr(0, 140)) %]" maxlength="140" size="30">
-      </td>
-      <td align="right">
-       <input id=[% loop.count %] name="bank_transfers[].amount" id="amount_[% loop.count %]" value="[% LxERP.format_amount(invoice.invoice_amount_suggestion, 2) %]" style="text-align: right" size="12">
-      </td>
-      <td>
-      [% L.select_tag('bank_transfers[].payment_type', invoice.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
-      </td>
-      <td align="left" [%- IF invoice.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF invoice.skonto_amount %] [% LxERP.format_amount(invoice.percent_skonto, 2) %] % = [% LxERP.format_amount(invoice.skonto_amount, 2) %] € bis [% invoice.skonto_date %] [%- END %]</td>
-     </tr>
-    [%- END %]
-   </table>
   </p>
+  <p><sup>(2)</sup>
+    [% IF is_vendor %]
+      [% 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN and the BIC." | $T8 %]
+      [% LxERP.t8("Additionally the invoice is not marked for direct debit and would have been checked automatically had the bank information been entered.") %]
+    [% ELSE %]
+      [% 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
+      [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
+      [% LxERP.t8("Additionally the invoice is marked for direct debit and would have been checked automatically had the bank information been entered.") %]
+    [% END %]
+  </p>
+</div><!-- /.long-desc -->
+[% END %]
 
-  [%- IF show_vc_bank_info_footnote %]
-   <p>
-    <sup>(1)</sup>
-    [%- IF is_vendor %]
-     [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN and the BIC." | $T8 %]
-    [%- ELSE %]
-     [%- 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
-    [%- END %]
-   </p>
-
-   <p>
-    <sup>(2)</sup>
-    [%- IF is_vendor %]
-     [%- 'No bank information has been entered in this vendor\'s master data entry. You cannot create bank transfers unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN and the BIC." | $T8 %]
-     [% LxERP.t8("Additionally the invoice is not marked for direct debit and would have been checked automatically had the bank information been entered.") %]
-    [%- ELSE %]
-     [%- 'No bank information has been entered in this customer\'s master data entry. You cannot create bank collections unless you enter bank information.' | $T8 %]
-     [% "The required information consists of the IBAN, the BIC, the mandator ID and the mandate's date of signature." | $T8 %]
-     [% LxERP.t8("Additionally the invoice is marked for direct debit and would have been checked automatically had the bank information been entered.") %]
-    [%- END %]
-   </p>
-  [%- END %]
-
-  <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
- </form>
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+</form>
 
- <script type="text/javascript">
+<script type="text/javascript">
   <!--
     $(function() {
       $("#select_all").checkall('INPUT[name="ids[]"]');
     });
-    -->
+  -->
 
 $( ".type_target" ).change(function() {
   type_id = $(this).attr('id');
@@ -154,4 +159,4 @@ $( ".type_target" ).change(function() {
   }
 });
 
- </script>
+</script>
diff --git a/templates/webpages/sepa/bank_transfer_create.html b/templates/webpages/sepa/bank_transfer_create.html
index 0eab6ffb5..fd3c0c5d8 100644
--- a/templates/webpages/sepa/bank_transfer_create.html
+++ b/templates/webpages/sepa/bank_transfer_create.html
@@ -1,156 +1,145 @@
-[%- USE T8 %]
-[%- USE L %]
-[% USE HTML %][% USE LxERP %]
+[% USE T8 %]
+[% USE L %]
+[% USE HTML %]
+[% USE LxERP %]
+
 [% IF vc == 'vendor' %]
- [% SET is_vendor = 1 %]
- [% SET arap = 'ap' %]
- [% SET iris = 'ir' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
 [% ELSE %]
- [% SET is_vendor = 0 %]
- [% SET arap = 'ar' %]
- [% SET iris = 'is' %]
-[%- END %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
 
- [%- IF error_message %]
- <p><div class="message_error">[% error_message %]</div></p>
- [%- END %]
+<h1>[% title %]</h1>
 
- <p><div class="listtop">[% title %]</div></p>
+[% IF error_message %]
+  <div class="message message_error">[% error_message %]</div>
+[% END %]
 
- <form action="sepa.pl" method="post" id="form">
-  <p>1.
-   [%- IF is_vendor %]
+<form action="sepa.pl" method="post" id="form">
+<p>1.
+  [% IF is_vendor %]
     [% 'Please select the source bank account for the transfers:' | $T8 %]
-   [%- ELSE %]
+  [% ELSE %]
     [% 'Please select the destination bank account for the collections:' | $T8 %]
-   [%- END %]
-   <br>
-   [% L.select_tag('bank_account',
-       BANK_ACCOUNTS,
-       title_key='displayable_name',
-       default=bank_account.id,
-       with_empty=0,
-       style='width:450px',
-   ) %]
-  </p>
+  [% END %]
+  <br>
+  [% L.select_tag('bank_account',
+     BANK_ACCOUNTS,
+     title_key='displayable_name',
+     default=bank_account.id,
+     with_empty=0,
+     style='width:450px',
+  ) %]
+</p>
+
+<p>2.
+[% IF is_vendor %]
+  [% 'Please Check the bank information for each vendor:' | $T8 %]
+[% ELSE %]
+  [% 'Please Check the bank information for each customer:' | $T8 %]
+[% END %]
+</p>
 
-  <p>
-   2.
-   [%- IF is_vendor %]
-    [% 'Please Check the bank information for each vendor:' | $T8 %]
-   [%- ELSE %]
-    [% 'Please Check the bank information for each customer:' | $T8 %]
-   [%- END %]
-   <br>
-   <table>
+<table>
+  <thead>
     <tr>
-     <th class="listheading">[%- IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
-     <th class="listheading">[% 'IBAN' | $T8 %]</th>
-     <th class="listheading">[% 'BIC' | $T8 %]</th>
-     <th class="listheading">[% 'Bank' | $T8 %]</th>
-     [% IF vc == 'customer' %]
-      <th class="listheading">[% 'Mandator ID' | $T8 %]</th>
-      <th class="listheading">[% 'Mandate Date of Signature' | $T8 %]</th>
-     [%- END %]
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      <th>[% 'Bank' | $T8 %]</th>
+      [% IF vc == 'customer' %]
+        <th>[% 'Mandator ID' | $T8 %]</th>
+        <th>[% 'Mandate Date of Signature' | $T8 %]</th>
+      [% END %]
     </tr>
+  </thead>
+  <tbody>
+    [% FOREACH vbi = VC_BANK_INFO %]
+      <tr class="listrow[% loop.count % 1 %]">
+        <td> <input type="hidden" name="vc_bank_info[+].id" value="[% HTML.escape(vbi.id) %]"> <input type="hidden" name="vc_bank_info[].name" value="[% HTML.escape(vbi.name) %]"> [% HTML.escape(vbi.name) %] </td>
+        <td><input type="text" name="vc_bank_info[].iban" size="34" value="[% HTML.escape(vbi.iban.substr(0, 34)) %]" maxlength="34"></td>
+        <td><input type="text" name="vc_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic.substr(0, 20)) %]" maxlength="20"></td>
+        <td><input type="text" name="vc_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
+        [% IF vc == 'customer' %]
+          <td><input type="text" name="vc_bank_info[].mandator_id" size="30" value="[% HTML.escape(vbi.mandator_id) %]"></td>
+          <td>[% L.date_tag("vc_bank_info[].mandate_date_of_signature", vbi.mandate_date_of_signature) %]</td>
+        [% END %]
+      </tr>
+    [% END %]
+  </tbody>
+</table>
 
-    [%- FOREACH vbi = VC_BANK_INFO %]
-    <tr class="listrow[% loop.count % 1 %]">
-     <td>
-      <input type="hidden" name="vc_bank_info[+].id" value="[% HTML.escape(vbi.id) %]">
-      <input type="hidden" name="vc_bank_info[].name" value="[% HTML.escape(vbi.name) %]">
-      [% HTML.escape(vbi.name) %]
-     </td>
-     <td><input name="vc_bank_info[].iban" size="34" value="[% HTML.escape(vbi.iban.substr(0, 34)) %]" maxlength="34"></td>
-     <td><input name="vc_bank_info[].bic" size="20" value="[% HTML.escape(vbi.bic.substr(0, 20)) %]" maxlength="20"></td>
-     <td><input name="vc_bank_info[].bank" size="30" value="[% HTML.escape(vbi.bank) %]"></td>
-     [% IF vc == 'customer' %]
-      <td><input name="vc_bank_info[].mandator_id" size="30" value="[% HTML.escape(vbi.mandator_id) %]"></td>
-      <td>[% L.date_tag("vc_bank_info[].mandate_date_of_signature", vbi.mandate_date_of_signature) %]</td>
-     [%- END %]
-    </tr>
-    [%- END %]
-   </table>
-  </p>
+<p>3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]</p>
 
-  <p>
-   3. [% 'Enter the requested execution date or leave empty for the quickest possible execution:' | $T8 %]
-   <br>
-   <table>
+<table class="tbl-list">
+  <thead>
     <tr>
-     <th class="listheading">[%- IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
-     <th class="listheading">[% 'Invoice' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Amount' | $T8 %]</th>
-     <th class="listheading" align="right">[% 'Open amount' | $T8 %]</th>
-     <th class="listheading">[% 'Purpose' | $T8 %]</th>
-     <th class="listheading" align="right">[%- IF is_vendor %][% 'Bank transfer amount' | $T8 %][%- ELSE %][%- LxERP.t8('Bank collection amount') %][%- END %]</th>
-     <th class="listheading" align="right">[% LxERP.t8('Payment type') %]</th>
-     <th class="listheading" align="right">[% LxERP.t8('Skonto information') %]</th>
-     <th class="listheading">[% 'Execution date' | $T8 %]</th>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Open amount' | $T8 %]</th>
+      <th>[% 'Purpose' | $T8 %]</th>
+      <th>[% IF is_vendor %][% 'Bank transfer amount' | $T8 %][% ELSE %][% LxERP.t8('Bank collection amount') %][% END %]</th>
+      <th>[% LxERP.t8('Payment type') %]</th>
+      <th>[% LxERP.t8('Skonto information') %]</th>
+      <th>[% 'Execution date' | $T8 %]</th>
     </tr>
+  </thead>
+  <tbody>
+    [% FOREACH bank_transfer = BANK_TRANSFERS %]
+      <tr>
+        <td>
+          <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(bank_transfer.id) %]">
+          <input type="hidden" name="bank_transfers[].vc_id" value="[% HTML.escape(bank_transfer.vc_id) %]">
+          <input type="hidden" name="bank_transfers[].selected" value="1">
+          <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.amount_less_skonto, 2) %]">
+          <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.skonto_amount, 2) %]">
+          <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.open_amount, 2) %]">
+          [% IF loop.first || (previous_vcname != bank_transfer.vcname) %]
+            <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(bank_transfer.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
+              [% GET HTML.escape(bank_transfer.vcname); SET previous_vcname = bank_transfer.vcname; %]
+            </a>
+          [% END %]
+        </td>
+        <td><a href="[% IF bank_transfer.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]"> [% HTML.escape(bank_transfer.invnumber) %]</a></td>
+        <td>[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
+        <td>[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
+        <td><input type="text" name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference.substr(0, 140)) %]" size="40" maxlength="140"></td>
+        <td><input type="text" id="[%" loop.count %] name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right" size="12"></td>
+        <td>[% L.select_tag('bank_transfers[].payment_type', bank_transfer.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]</td>
+        <td[% if bank_transfer.within_skonto_period %] style="background-color:LightGreen"[% end %]>
+          [% IF bank_transfer.skonto_amount %]
+            [% LxERP.format_amount(bank_transfer.percent_skonto, 2) %] % = [% LxERP.format_amount(bank_transfer.skonto_amount, 2) %] € [% 'until' | $T8 %] [% bank_transfer.skonto_date %]
+          [% END %]
+        </td>
+        <td>[% L.date_tag('bank_transfers[].requested_execution_date', bank_transfer.recommended_execution_date) %]</td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
 
-    [%- FOREACH bank_transfer = BANK_TRANSFERS %]
-     <input type="hidden" name="bank_transfers[+].[% arap %]_id" value="[% HTML.escape(bank_transfer.id) %]">
-     <input type="hidden" name="bank_transfers[].vc_id" value="[% HTML.escape(bank_transfer.vc_id) %]">
-     <input type="hidden" name="bank_transfers[].selected" value="1">
-     <input type="hidden" id="amount_less_skonto_[% loop.count %]" name="amount_less_skonto_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.amount_less_skonto, 2) %]">
-     <input type="hidden" id="skonto_amount_[% loop.count %]" name="skonto_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.skonto_amount, 2) %]">
-     <input type="hidden" id="invoice_open_amount_[% loop.count %]" name="invoice_open_amount_[% loop.count %]" value="[% LxERP.format_amount(bank_transfer.open_amount, 2) %]">
-
-     <tr class="listrow[% loop.count % 2 %]">
-      <td>
-       [%- IF loop.first || (previous_vcname != bank_transfer.vcname) %]
-        <a href="controller.pl?action=CustomerVendor/edit&db=[% vc %]&id=[% HTML.url(bank_transfer.vc_id) %]&callback=[% HTML.url('sepa.pl?action=bank_transfer_add&vc=' _ vc) %]">
-         [%- GET HTML.escape(bank_transfer.vcname);
-             SET previous_vcname = bank_transfer.vcname; -%]
-        </a>
-       [%- END -%]
-      </td>
-
-      <td>
-       <a href="[% IF bank_transfer.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&id=[% HTML.escape(bank_transfer.id) %]">
-        [% HTML.escape(bank_transfer.invnumber) %]
-       </a>
-      </td>
-
-      <td align="right">[% LxERP.format_amount(bank_transfer.invoice_amount, -2) %]</td>
-      <td align="right">[% LxERP.format_amount(bank_transfer.open_amount, -2) %]</td>
-      <td>
-       <input name="bank_transfers[].reference" value="[% HTML.escape(bank_transfer.reference.substr(0, 140)) %]" size="40" maxlength="140">
-      </td>
-      <td align="right"><input id=[% loop.count %] name="bank_transfers[].amount" value="[% LxERP.format_amount(bank_transfer.amount, -2) %]" style="text-align: right" size="12"></td>
-      <td>
-      [% L.select_tag('bank_transfers[].payment_type', bank_transfer.payment_select_options, value_key => 'payment_type', title_key => 'display', id => 'payment_type_' _ loop.count, class => 'type_target' ) %]
-      </td>
-      <td align="left" [%- IF bank_transfer.within_skonto_period %]style="background-color: LightGreen"[%- END %]>[%- IF bank_transfer.skonto_amount %] [% LxERP.format_amount(bank_transfer.percent_skonto, 2) %] % = [% LxERP.format_amount(bank_transfer.skonto_amount, 2) %] € [% 'until' | $T8 %] [% bank_transfer.skonto_date %] [% END %]</td>
-      <td nowrap>
-        [% L.date_tag('bank_transfers[].requested_execution_date', bank_transfer.recommended_execution_date) %]
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
-
-  <p>
-   [% 'Sum open amount' | $T8 %]: [% LxERP.format_amount(total_trans, -2) %]
-  </p>
+<p>[% 'Sum open amount' | $T8 %]: [% LxERP.format_amount(total_trans, -2) %]</p>
 
-  <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
-  <input type="hidden" name="confirmation" value="1">
- </form>
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
+<input type="hidden" name="confirmation" value="1">
 
- <script type="text/javascript">
-$( ".type_target" ).change(function() {
-  type_id = $(this).attr('id');
-  var id = type_id.match(/\d*$/);
-  // alert("found id " + id);
-  if ( $(this).val() == "without_skonto" ) {
-      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
-  } else if ( $(this).val() == "difference_as_skonto" ) {
-      $('#' + id).val( $('#invoice_open_amount_' + id).val() );
-  } else if ( $(this).val() == "with_skonto_pt" ) {
-            $('#' + id).val( $('#amount_less_skonto_' + id).val() );
-  }
-});
+</form>
 
+<script type="text/javascript">
+  $( ".type_target" ).change(function() {
+    type_id = $(this).attr('id');
+    var id = type_id.match(/\d*$/);
+    // alert("found id " + id);
+    if ( $(this).val() == "without_skonto" ) {
+        $('#' + id).val( $('#invoice_open_amount_' + id).val() );
+    } else if ( $(this).val() == "difference_as_skonto" ) {
+        $('#' + id).val( $('#invoice_open_amount_' + id).val() );
+    } else if ( $(this).val() == "with_skonto_pt" ) {
+              $('#' + id).val( $('#amount_less_skonto_' + id).val() );
+    }
+  });
 </script>
diff --git a/templates/webpages/sepa/bank_transfer_created.html b/templates/webpages/sepa/bank_transfer_created.html
index e4930156c..4f831e461 100644
--- a/templates/webpages/sepa/bank_transfer_created.html
+++ b/templates/webpages/sepa/bank_transfer_created.html
@@ -1,24 +1,10 @@
-[%- USE T8 %]
+[% USE T8 %]
 [% USE HTML %]
-<h1>[% title %]</h1>
-
- <p>
-  [% 'The SEPA export has been created.' | $T8 %]
- </p>
 
- <p>
-  <ul>
-   <li>
-    <a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]&vc=[% HTML.url(vc) %]">
-     [% 'Download SEPA XML export file' | $T8 %]
-    </a>
-   </li>
-
-   <li>
-    <a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1&vc=[% HTML.url(vc) %]">
-     [% 'List open SEPA exports' | $T8 %]
-    </a>
-   </li>
-  </ul>
- </p>
+<h1>[% title %]</h1>
 
+<p>[% 'The SEPA export has been created.' | $T8 %]</p>
+<ul>
+  <li><a href="sepa.pl?action=bank_transfer_download_sepa_xml&id=[% HTML.url(id) %]&vc=[% HTML.url(vc) %]"> [% 'Download SEPA XML export file' | $T8 %] </a></li>
+  <li><a href="sepa.pl?action=bank_transfer_list&l_open=1&l_not_executed=1&vc=[% HTML.url(vc) %]"> [% 'List open SEPA exports' | $T8 %] </a></li>
+</ul>
diff --git a/templates/webpages/sepa/bank_transfer_edit.html b/templates/webpages/sepa/bank_transfer_edit.html
index e171ef2d0..87fbb622a 100644
--- a/templates/webpages/sepa/bank_transfer_edit.html
+++ b/templates/webpages/sepa/bank_transfer_edit.html
@@ -1,111 +1,110 @@
-[%- USE T8 %]
+[% USE T8 %]
 [% USE HTML %]
 [% USE LxERP %]
-[%- USE L %]
+[% USE L %]
+
 [% IF vc == 'vendor' %]
- [% SET is_vendor = 1 %]
- [% SET arap = 'ap' %]
- [% SET iris = 'ir' %]
+  [% SET is_vendor = 1 %]
+  [% SET arap = 'ap' %]
+  [% SET iris = 'ir' %]
 [% ELSE %]
- [% SET is_vendor = 0 %]
- [% SET arap = 'ar' %]
- [% SET iris = 'is' %]
-[%- END %]
+  [% SET is_vendor = 0 %]
+  [% SET arap = 'ar' %]
+  [% SET iris = 'is' %]
+[% END %]
+
 <h1>[% title %]: [% HTML.escape(export.ids.join(', ')) %]</h1>
 
- <form action="sepa.pl" method="post" id="form">
-  <p>
-   <table>
+<form action="sepa.pl" method="post" id="form">
+
+<table>
+  <thead>
     <tr>
-     <th class="listheading" align="center"><input type="checkbox" id="select_all"></th>
-     <th class="listheading">[% 'Invoice' | $T8 %]</th>
-     <th class="listheading">[%- IF is_vendor %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</th>
-     [%- IF is_vendor %]
-      <th class="listheading" colspan="2">[% 'Source bank account' | $T8 %]</th>
-      <th class="listheading" colspan="2">[% 'Target bank account' | $T8 %]</th>
-     [%- ELSE %]
-      <th class="listheading" colspan="2">[% 'Target bank account' | $T8 %]</th>
-      <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>
+      <th><input type="checkbox" id="select_all"></th>
+      <th>[% 'Invoice' | $T8 %]</th>
+      <th>[% IF is_vendor %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      [% IF is_vendor %]
+      <th colspan="2">[% 'Source bank account' | $T8 %]</th>
+      <th colspan="2">[% 'Target bank account' | $T8 %]</th>
+      [% ELSE %]
+      <th colspan="2">[% 'Target bank account' | $T8 %]</th>
+      <th colspan="2">[% 'Source bank account' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Amount' | $T8 %]</th>
+      <th>[% 'Skonto amount' | $T8 %]</th>
+      <th>[% 'Payment type' | $T8 %]</th>
+      [% IF vc == 'customer' %]
+      <th>[% 'Mandator ID' | $T8 %]</th>
+      [% END %]
+      <th>[% 'Reference' | $T8 %]</th>
+      <th>[% 'Requested execution date' | $T8 %]</th>
+      <th>[% 'Execution date' | $T8 %]</th>
     </tr>
     <tr>
-     <th class="listheading" colspan="3">&nbsp;</th>
-     <th class="listheading">[% 'IBAN' | $T8 %]</th>
-     <th class="listheading">[% 'BIC' | $T8 %]</th>
-     <th class="listheading">[% 'IBAN' | $T8 %]</th>
-     <th class="listheading">[% 'BIC' | $T8 %]</th>
-     [%- IF show_post_payments_button %]
-      <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>
-     [%- ELSE %]
-      <th class="listheading" colspan="[% IF vc == 'customer' %]7[% ELSE %]6[% END %]">&nbsp;</th>
-     [%- END %]
+      <th colspan="3">&nbsp;</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      <th>[% 'IBAN' | $T8 %]</th>
+      <th>[% 'BIC' | $T8 %]</th>
+      [% IF show_post_payments_button %]
+      <th colspan="[% IF vc == 'customer' %]6[% ELSE %]5[% END %]">&nbsp;</th>
+      <th> [% L.date_tag('set_all_execution_date', '', onchange='set_all_execution_date_fields(this);') %] </th>
+      [% ELSE %]
+      <th colspan="[% IF vc == 'customer' %]7[% ELSE %]6[% END %]">&nbsp;</th>
+      [% END %]
     </tr>
+  </thead>
+  <tbody>
+    [% FOREACH item = export.items %]
+      <tr>
+        <td>
+          [% IF (show_post_payments_button && !item.executed) || (!show_post_payments_button && item.executed) %]
+            [% L.hidden_tag("items[+].id", item.id) %]
+            [% L.hidden_tag("items[].sepa_export_id", item.sepa_export_id) %]
+            [% L.checkbox_tag("ids[]", value=item.id) %]
+          [% END %]
+        </td>
+        <td><a href="[% IF item.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&type=invoice&id=[% IF is_vendor %][% HTML.url(item.ap_id) %][% ELSE %][% HTML.url(item.ar_id) %][% END %]">[% HTML.escape(item.invnumber) %]</a></td>
+        <td>[% HTML.escape(item.vc_name) %]</td>
+        <td>[% HTML.escape(item.our_iban) %]</td>
+        <td>[% HTML.escape(item.our_bic) %]</td>
+        <td>[% HTML.escape(item.vc_iban) %]</td>
+        <td>[% HTML.escape(item.vc_bic) %]</td>
+        <td>[% HTML.escape(LxERP.format_amount(item.amount, 2)) %]</td>
+        <td>[% HTML.escape(LxERP.format_amount(item.skonto_amount, 2)) %]</td>
+        <td>[% item.payment_type | $T8 %]</td>
+        [% IF vc == 'customer' %]
+          <td>[% HTML.escape(item.mandator_id) %]</td>
+        [% END %]
+        <td>[% HTML.escape(item.reference) %]</td>
+        <td>[% HTML.escape(item.requested_execution_date) %]</td>
+        <td>
+          [% IF item.executed %]
+            [% HTML.escape(item.execution_date) %]
+          [% ELSIF item.export_closed %]
+            [% 'not executed' | $T8 %]
+          [% ELSE %]
+            [% L.date_tag('items[].execution_date', item.requested_execution_date || current_date) %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
+  </tbody>
+</table>
 
-    [%- FOREACH item = export.items %]
-     <tr class="listrow">
-      <td align="center">
-       [%- IF (show_post_payments_button && !item.executed) || (!show_post_payments_button && item.executed) %]
-        [% L.hidden_tag("items[+].id", item.id) %]
-        [% L.hidden_tag("items[].sepa_export_id", item.sepa_export_id) %]
-        [% L.checkbox_tag("ids[]", value=item.id) %]
-       [%- END %]
-      </td>
-      <td>
-       <a href="[% IF item.invoice %][% iris %][% ELSE %][% arap %][% END %].pl?action=edit&type=invoice&id=[% IF is_vendor %][% HTML.url(item.ap_id) %][% ELSE %][% HTML.url(item.ar_id) %][% END %]">[% HTML.escape(item.invnumber) %]</a>
-      </td>
-      <td>[% HTML.escape(item.vc_name) %]</td>
-      <td>[% HTML.escape(item.our_iban) %]</td>
-      <td>[% HTML.escape(item.our_bic) %]</td>
-      <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>
-       [%- IF item.executed %]
-        [% HTML.escape(item.execution_date) %]
-       [%- ELSIF item.export_closed %]
-        [% 'not executed' | $T8 %]
-       [%- ELSE %]
-         [% L.date_tag('items[].execution_date', item.requested_execution_date || current_date) %]
-       [%- END %]
-      </td>
-     </tr>
-    [%- END %]
-   </table>
-  </p>
+<script type="text/javascript">
+  function set_all_execution_date_fields(input) {
+    var new_date = $(input).val();
+    $('INPUT[name="items[].execution_date"]').each(function() {
+      $(this).val(new_date);
+    });
+  }
 
-  <script type="text/javascript">
-   <!--
-    function set_all_execution_date_fields(input) {
-      var new_date = $(input).val();
-      $('INPUT[name="items[].execution_date"]').each(function() {
-        $(this).val(new_date);
-      });
-    }
+  $(function() {
+    $("#select_all").checkall('INPUT[name="ids[]"]');
+  });
+</script>
 
-    $(function() {
-      $("#select_all").checkall('INPUT[name="ids[]"]');
-    });
-     -->
-  </script>
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 
-     <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
- </form>
+</form>
diff --git a/templates/webpages/sepa/bank_transfer_list_bottom.html b/templates/webpages/sepa/bank_transfer_list_bottom.html
index c623d6720..e4959bac7 100644
--- a/templates/webpages/sepa/bank_transfer_list_bottom.html
+++ b/templates/webpages/sepa/bank_transfer_list_bottom.html
@@ -1,17 +1,15 @@
-[%- USE T8 %]
+[% USE T8 %]
 [% USE HTML %]
 
-[%- IF show_buttons %]
+[% IF show_buttons %]
  <input type="hidden" name="mode" value="multi">
- <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
+ <input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 
- <script type="text/javascript">
-  <!--
-    $(function() {
-      $("#select_all").checkall('INPUT[name="ids[]"]');
-    });
-    -->
- </script>
-[%- END %]
+<script type="text/javascript"><!--
+  $(function() {
+    $("#select_all").checkall('INPUT[name="ids[]"]');
+  });
+--></script>
+[% END %]
 
 </form>
diff --git a/templates/webpages/sepa/bank_transfer_search.html b/templates/webpages/sepa/bank_transfer_search.html
index bd832dc62..8b63c70df 100644
--- a/templates/webpages/sepa/bank_transfer_search.html
+++ b/templates/webpages/sepa/bank_transfer_search.html
@@ -1,87 +1,57 @@
-[%- USE T8 %]
-[%- USE HTML %]
-[%- USE LxERP %]
-[%- USE L %]
+[% USE T8 %]
+[% USE HTML %]
+[% USE LxERP %]
+[% USE L %]
+
 <h1>[% title %]</h1>
 
- <form action="sepa.pl" method="post" id="form">
-  <p>
-   <table>
-    <tr>
-     <td align="right">[%- IF vc == 'vendor' %][% 'Vendor' | $T8 %][%- ELSE %][%- LxERP.t8('Customer') %][%- END %]</td>
-     <td><input name="f_vc" class="initial_focus"></td>
-    </tr>
+<form action="sepa.pl" method="post" id="form">
 
+<div class="wrapper">
+
+<table class="tbl-horizontal">
+  <tbody>
     <tr>
-     <td align="right">[% 'Invoice number' | $T8 %]</td>
-     <td><input name="f_invnumber"></td>
+      <th>[% IF vc == 'vendor' %][% 'Vendor' | $T8 %][% ELSE %][% LxERP.t8('Customer') %][% END %]</th>
+      <td><input type="text" name="f_vc" class="initial_focus">
+      </td>
     </tr>
-
     <tr>
-     <td align="right">[% LxERP.t8("SEPA message ID") %]</td>
-     <td>[% L.input_tag("f_message_id") %]</td>
+      <th>[% 'Invoice number' | $T8 %]</th>
+      <td><input type="text" name="f_invnumber">
+      </td>
     </tr>
-
     <tr>
-     <td align="right">[% 'Export date from' | $T8 %]</td>
-     <td>
-       [% L.date_tag('f_export_date_from') %]
-       [% 'to (time)' | $T8 %]
-       [% L.date_tag('f_export_date_to') %]
-     </td>
+      <th>[% LxERP.t8("SEPA message ID") %]</th>
+      <td>[% L.input_tag("f_message_id") %]</td>
     </tr>
-
     <tr>
-     <td align="right">[% 'Requested execution date from' | $T8 %]</td>
-     <td>
-       [% L.date_tag('f_requested_execution_date_from') %]
-       [% 'to (time)' | $T8 %]
-       [% L.date_tag('f_requested_execution_date_to') %]
-     </td>
+      <th>[% 'Export date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_export_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_export_date_to') %]</td>
     </tr>
-
     <tr>
-     <td align="right">[% 'Execution date from' | $T8 %]</td>
-     <td>
-       [% L.date_tag('f_execution_date_from') %]
-       [% 'to (time)' | $T8 %]
-       [% L.date_tag('f_execution_date_to') %]
-     </td>
+      <th>[% 'Requested execution date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_requested_execution_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_requested_execution_date_to') %]</td>
     </tr>
-
     <tr>
-     <td align="right" valign="top">[% 'Include in Report' | $T8 %]</td>
-     <td valign="top">
-      <table>
-       <tr>
-        <td>
-         <input type="checkbox" name="l_open" id="l_open" value="1" checked>
-         <label for="l_open">[% 'open' | $T8 %]</label>
-        </td>
-
-        <td>
-         <input type="checkbox" name="l_closed" id="l_closed" value="1">
-         <label for="l_closed">[% 'closed' | $T8 %]</label>
-        </td>
-       </tr>
+      <th>[% 'Execution date from' | $T8 %]</th>
+      <td>[% L.date_tag('f_execution_date_from') %] [% 'to (time)' | $T8 %] [% L.date_tag('f_execution_date_to') %]</td>
+    </tr>
+  </tbody>
+</table>
 
-       <tr>
-        <td>
-         <input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked>
-         <label for="l_not_executed">[% 'not yet executed' | $T8 %]</label>
-        </td>
+<div class="form-addition control-panel">
+  <h4>[% 'Include in Report' | $T8 %]</h4>
+  <div class="list">
+    <div><input type="checkbox" name="l_open" id="l_open" value="1" checked> <label for="l_open"> [% 'open' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_closed" id="l_closed" value="1"> <label for="l_closed"> [% 'closed' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_not_executed" id="l_not_executed" value="1" checked> <label for="l_not_executed"> [% 'not yet executed' | $T8 %]</label></div>
+    <div><input type="checkbox" name="l_executed" id="l_executed" value="1" checked> <label for="l_executed"> [% 'executed' | $T8 %]</label></div>
+  </div>
+</div><!-- /.form-addition -->
 
-        <td>
-         <input type="checkbox" name="l_executed" id="l_executed" value="1" checked>
-         <label for="l_executed">[% 'executed' | $T8 %]</label>
-        </td>
-       </tr>
-      </table>
-     </td>
-    </tr>
+</div><!-- /.wrapper -->
 
-   </table>
-  </p>
+<input type="hidden" name="vc" value="[% HTML.escape(vc) %]">
 
-   <input type="hidden" name="vc" value="[%- HTML.escape(vc) %]">
- </form>
+</form>
