From a8cccc0a8878dcb2a76f0e444248739f6a529321 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 23 Jan 2008 16:57:03 +0000
Subject: [PATCH] =?utf8?q?HTML-Attribute=20anst=C3=A4ndig=20quoten.=20Kosm?=
 =?utf8?q?etik.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 templates/webpages/oe/orders_footer_de.html   | 131 ++++++++---------
 .../webpages/oe/orders_footer_master.html     | 131 ++++++++---------
 templates/webpages/oe/orders_header_de.html   | 135 +++++++++---------
 .../webpages/oe/orders_header_master.html     | 135 +++++++++---------
 4 files changed, 268 insertions(+), 264 deletions(-)

diff --git a/templates/webpages/oe/orders_footer_de.html b/templates/webpages/oe/orders_footer_de.html
index 73a423e8e..9785de14c 100644
--- a/templates/webpages/oe/orders_footer_de.html
+++ b/templates/webpages/oe/orders_footer_de.html
@@ -2,98 +2,101 @@
 [%- USE LxERP %]
   <tr>
     <td>
-      <table width=100%>
-	<tr valign=bottom>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=left>Bemerkungen</th>
-		<th align=left>interne Bemerkungen</th>
-	      </tr>
-	      <tr valign=top>
-		<td>[% notes %]</td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left">Bemerkungen</th>
+                <th align="left">interne Bemerkungen</th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
                 <td>[% intnotes %]</td>
-	      </tr>
+              </tr>
               <tr>
                 <th align="right">Zahlungskonditionen</th>
                 <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'payment_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_PAYMENTS, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
                            label_key  = 'description',
                            show_empty = 1 -%]
                 </td>
-	    </tr>
+            </tr>
       [%- IF id && num_follow_ups %]
       <tr>
        <td colspan="2">[% LxERP.format_string('Es gibt #1 Wiedervorlage(n), von denen #2 f&auml;llig ist/sind.', num_follow_ups, num_due_follow_ups) %]</td>
       </tr>
       [%- END %]
       </table>
-	  </td>
+          </td>
 [%- IF is_sales %]
           <td>
             <table>
 
             <tr>
-              <th  align=left>Ertrag</th>
+              <th  align="left">Ertrag</th>
               <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
-              <th  align=left>Ertrag prozentual</th>
+              <th  align="left">Ertrag prozentual</th>
               <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
               <td>%</td>
             </tr>
 
-            <input type=hidden name="marge_total" value="[% marge_total %]">
-            <input type=hidden name="marge_percent" value="[% marge_percent %]">
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
             </table>
           </td>
 [%- END %]
-	  <td align=right>
+          <td align="right">
 [%- IF taxaccounts %]
-            <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
 [%- END %]
-	    <table>
-	      [% subtotal %]
-	      [% tax %]
-	      <tr>
-		<th align=right>Summe</th>
-		<td align=right>[% LxERP.format_amount(invtotal, 2) %]</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
+            <table>
+              [% subtotal %]
+              [% tax %]
+              <tr>
+                <th align="right">Summe</th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
-<input type=hidden name=oldinvtotal value="[% HTML.escape(oldinvtotal) %]">
-<input type=hidden name=oldtotalpaid value="[% HTML.escape(totalpaid) %]">
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 
 [%- IF webdav %]
   <tr>
-    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
   </tr>
-    <table width=100%>
+  <tr>
+   <td>
+    <table width="100%">
      <tr>
-      <td align=left width=30%><b>Dateiname</b></td>
-      <td align=left width=70%><b>Webdavlink</b></td>
+      <td align="left" width="30%"><b>Dateiname</b></td>
+      <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>
- [%- FOREACH file = WEBDAV %] 
+ [%- FOREACH file="WEBDAV" %]
       <tr>
-        <td align="left">[% file.name %]</td>
-        <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
       </tr>
  [%- END %]
     </table>
+   </td>
   </tr>
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 [%- END %]
 
@@ -105,52 +108,52 @@
 </table>
 
 [% label_edit %]<br>
-<input class=submit type=submit name=action id=update_button value="Erneuern">
-<input class=submit type=submit name=action value="Lieferadresse">
-<input class=submit type=submit name=action value="Drucken">
-<input class=submit type=submit name=action value="eMail">
-<input class=submit type=submit name=action value="Speichern">
-<input class=submit type=submit name=action value="Speichern und schließen">
+<input class="submit" type="submit" name="action" id="update_button" value="Erneuern">
+<input class="submit" type="submit" name="action" value="Lieferadresse">
+<input class="submit" type="submit" name="action" value="Drucken">
+<input class="submit" type="submit" name="action" value="eMail">
+<input class="submit" type="submit" name="action" value="Speichern">
+<input class="submit" type="submit" name="action" value="Speichern und schließen">
 
 [%- IF id %]
   <input type="button" class="submit" onclick="follow_up_window()" value="Wiedervorlage">
   <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="Historie">
 
   <br>[% label_workflow %]<br>
-  <input class=submit type=submit name=action value="als neu speichern">
-  <input class=submit type=submit name=action value="Löschen">
+  <input class="submit" type="submit" name="action" value="als neu speichern">
+  <input class="submit" type="submit" name="action" value="Löschen">
 
   [%- IF is_sales_quo %]
-    <input class=submit type=submit name=action value="Kundenauftrag">
+    <input class="submit" type="submit" name="action" value="Kundenauftrag">
   [%- END %]
 
   [%- IF is_req_quo %]
-    <input class=submit type=submit name=action value="Lieferantenauftrag">
+    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
   [%- END %]
 
   [%- IF is_sales_ord || is_pur_ord %]
     <input class="submit" type="submit" name="action" value="Lieferschein">
   [%- END %]
 
-  <input class=submit type=submit name=action value="Rechnung">
+  <input class="submit" type="submit" name="action" value="Rechnung">
 
   <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
   [%- IF is_sales_ord %]
-    <input class=submit type=submit name=action value="Lieferantenauftrag">
-    <input class=submit type=submit name=action value="Angebot">
+    <input class="submit" type="submit" name="action" value="Lieferantenauftrag">
+    <input class="submit" type="submit" name="action" value="Angebot">
   [%- ELSE %]
    [%- IF is_pur_ord %]
-    <input class=submit type=submit name=action value="Kundenauftrag">
-    <input class=submit type=submit name=action value="Anfrage">
+    <input class="submit" type="submit" name="action" value="Kundenauftrag">
+    <input class="submit" type="submit" name="action" value="Anfrage">
    [%- ELSE %]
-    <input class=submit type=submit name=action value="Auftrag">
+    <input class="submit" type="submit" name="action" value="Auftrag">
    [%- END %]
   [%- END %]
 [%- END %]
 
-<input type=hidden name=saved_xyznumber value="[% HTML.escape(saved_xyznumber) %]">
-<input type=hidden name=rowcount value="[% HTML.escape(rowcount) %]">
-<input type=hidden name=callback value="[% callback %]">
+<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input type="hidden" name="callback" value="[% callback %]">
 
 </form>
 
diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
index 4efc868d7..e866ff88f 100644
--- a/templates/webpages/oe/orders_footer_master.html
+++ b/templates/webpages/oe/orders_footer_master.html
@@ -2,98 +2,101 @@
 [%- USE LxERP %]
   <tr>
     <td>
-      <table width=100%>
-	<tr valign=bottom>
-	  <td>
-	    <table>
-	      <tr>
-		<th align=left><translate>Notes</translate></th>
-		<th align=left><translate>Internal Notes</translate></th>
-	      </tr>
-	      <tr valign=top>
-		<td>[% notes %]</td>
+      <table width="100%">
+        <tr valign="bottom">
+          <td>
+            <table>
+              <tr>
+                <th align="left"><translate>Notes</translate></th>
+                <th align="left"><translate>Internal Notes</translate></th>
+              </tr>
+              <tr valign="top">
+                <td>[% notes %]</td>
                 <td>[% intnotes %]</td>
-	      </tr>
+              </tr>
               <tr>
                 <th align="right"><translate>Payment Terms</translate></th>
                 <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'payment_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_PAYMENTS, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'payment_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_PAYMENTS,
+                           id_key     = 'id',
                            label_key  = 'description',
                            show_empty = 1 -%]
                 </td>
-	    </tr>
+            </tr>
       [%- IF id && num_follow_ups %]
       <tr>
        <td colspan="2">[% LxERP.format_string('<translate>There are #1 unfinished follow-ups of which #2 are due.</translate>', num_follow_ups, num_due_follow_ups) %]</td>
       </tr>
       [%- END %]
       </table>
-	  </td>
+          </td>
 [%- IF is_sales %]
           <td>
             <table>
 
             <tr>
-              <th  align=left><translate>Ertrag</translate></th>
+              <th  align="left"><translate>Ertrag</translate></th>
               <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>
             </tr>
             <tr>
-              <th  align=left><translate>Ertrag prozentual</translate></th>
+              <th  align="left"><translate>Ertrag prozentual</translate></th>
               <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
               <td>%</td>
             </tr>
 
-            <input type=hidden name="marge_total" value="[% marge_total %]">
-            <input type=hidden name="marge_percent" value="[% marge_percent %]">
+            <input type="hidden" name="marge_total" value="[% HTML.escape(marge_total) %]">
+            <input type="hidden" name="marge_percent" value="[% HTML.escape(marge_percent) %]">
             </table>
           </td>
 [%- END %]
-	  <td align=right>
+          <td align="right">
 [%- IF taxaccounts %]
-            <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b><translate>Tax Included</translate></b><br><br>
+            <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
 [%- END %]
-	    <table>
-	      [% subtotal %]
-	      [% tax %]
-	      <tr>
-		<th align=right><translate>Total</translate></th>
-		<td align=right>[% LxERP.format_amount(invtotal, 2) %]</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
+            <table>
+              [% subtotal %]
+              [% tax %]
+              <tr>
+                <th align="right"><translate>Total</translate></th>
+                <td align="right">[% LxERP.format_amount(invtotal, 2) %]</td>
+              </tr>
+            </table>
+          </td>
+        </tr>
       </table>
     </td>
   </tr>
-<input type=hidden name=oldinvtotal value="[% HTML.escape(oldinvtotal) %]">
-<input type=hidden name=oldtotalpaid value="[% HTML.escape(totalpaid) %]">
+  <input type="hidden" name="oldinvtotal" value="[% HTML.escape(oldinvtotal) %]">
+  <input type="hidden" name="oldtotalpaid" value="[% HTML.escape(totalpaid) %]">
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 
 [%- IF webdav %]
   <tr>
-    <th class=listtop align=left>Dokumente im Webdav-Repository</th>
+    <th class="listtop" align="left">Dokumente im Webdav-Repository</th>
   </tr>
-    <table width=100%>
+  <tr>
+   <td>
+    <table width="100%">
      <tr>
-      <td align=left width=30%><b>Dateiname</b></td>
-      <td align=left width=70%><b>Webdavlink</b></td>
+      <td align="left" width="30%"><b>Dateiname</b></td>
+      <td align="left" width="70%"><b>Webdavlink</b></td>
      </tr>
- [%- FOREACH file = WEBDAV %] 
+ [%- FOREACH file="WEBDAV" %]
       <tr>
-        <td align="left">[% file.name %]</td>
-        <td align="left"><a href="[% file.link %]">[% file.type %]</a></td>
+        <td align="left">[% HTML.escape(file.name) %]</td>
+        <td align="left"><a href="[% file.link %]">[% HTML.escape(file.type) %]</a></td>
       </tr>
  [%- END %]
     </table>
+   </td>
   </tr>
   <tr>
-    <td><hr size=3 noshade></td>
+    <td><hr size="3" noshade></td>
   </tr>
 [%- END %]
 
@@ -105,52 +108,52 @@
 </table>
 
 [% label_edit %]<br>
-<input class=submit type=submit name=action id=update_button value="<translate>Update</translate>">
-<input class=submit type=submit name=action value="<translate>Ship to</translate>">
-<input class=submit type=submit name=action value="<translate>Print</translate>">
-<input class=submit type=submit name=action value="<translate>E-mail</translate>">
-<input class=submit type=submit name=action value="<translate>Save</translate>">
-<input class=submit type=submit name=action value="<translate>Save and Close</translate>">
+<input class="submit" type="submit" name="action" id="update_button" value="<translate>Update</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Ship to</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Print</translate>">
+<input class="submit" type="submit" name="action" value="<translate>E-mail</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save</translate>">
+<input class="submit" type="submit" name="action" value="<translate>Save and Close</translate>">
 
 [%- IF id %]
   <input type="button" class="submit" onclick="follow_up_window()" value="<translate>Follow-Up</translate>">
   <input type="button" class="submit" onclick="set_history_window([% HTML.escape(id) %])" name="history" id="history" value="<translate>history</translate>">
 
   <br>[% label_workflow %]<br>
-  <input class=submit type=submit name=action value="<translate>Save as new</translate>">
-  <input class=submit type=submit name=action value="<translate>Delete</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Save as new</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Delete</translate>">
 
   [%- IF is_sales_quo %]
-    <input class=submit type=submit name=action value="<translate>Sales Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
   [%- END %]
 
   [%- IF is_req_quo %]
-    <input class=submit type=submit name=action value="<translate>Purchase Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
   [%- END %]
 
   [%- IF is_sales_ord || is_pur_ord %]
     <input class="submit" type="submit" name="action" value="<translate>Delivery Order</translate>">
   [%- END %]
 
-  <input class=submit type=submit name=action value="<translate>Invoice</translate>">
+  <input class="submit" type="submit" name="action" value="<translate>Invoice</translate>">
 
   <br>[% heading %] als neue Vorlage verwenden f&uuml;r<br>
   [%- IF is_sales_ord %]
-    <input class=submit type=submit name=action value="<translate>Purchase Order</translate>">
-    <input class=submit type=submit name=action value="<translate>Quotation</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Purchase Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Quotation</translate>">
   [%- ELSE %]
    [%- IF is_pur_ord %]
-    <input class=submit type=submit name=action value="<translate>Sales Order</translate>">
-    <input class=submit type=submit name=action value="<translate>Request for Quotation</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Sales Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Request for Quotation</translate>">
    [%- ELSE %]
-    <input class=submit type=submit name=action value="<translate>Order</translate>">
+    <input class="submit" type="submit" name="action" value="<translate>Order</translate>">
    [%- END %]
   [%- END %]
 [%- END %]
 
-<input type=hidden name=saved_xyznumber value="[% HTML.escape(saved_xyznumber) %]">
-<input type=hidden name=rowcount value="[% HTML.escape(rowcount) %]">
-<input type=hidden name=callback value="[% callback %]">
+<input type="hidden" name="saved_xyznumber" value="[% HTML.escape(saved_xyznumber) %]">
+<input type="hidden" name="rowcount" value="[% HTML.escape(rowcount) %]">
+<input type="hidden" name="callback" value="[% callback %]">
 
 </form>
 
diff --git a/templates/webpages/oe/orders_header_de.html b/templates/webpages/oe/orders_header_de.html
index c2409f2f3..209d4fa1f 100644
--- a/templates/webpages/oe/orders_header_de.html
+++ b/templates/webpages/oe/orders_header_de.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 <body onLoad="[% onload %]">
 
-  <form method=post name=oe action="[% script %]">
+  <form method="post" name="oe" action="[% script %]">
 
     <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
@@ -12,7 +12,7 @@
     <script type="text/javascript" src="js/follow_up.js"></script>
 
 [%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
+   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 
     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
@@ -20,55 +20,54 @@
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
     <input type="hidden" name="follow_up_rowcount" value="1">
 
-    <table width=100%>
-      <tr class=listtop>
-        <th class=listtop>[% HTML.escape(title) %]</th>
-      </tr>
+    <div class="listtop">[% title %]</div>
+
+    <table width="100%">
       <tr height="5"></tr>
       <tr>
         <td>
           <table width="100%">
-            <tr valign=top>
-              <td width=50%>
-                <table width=100%>
+            <tr valign="top">
+              <td width="50%">
+                <table width="100%">
                   <tr>
                     <th align="right">[% IF vc == 'customer' %]Kunde[% ELSE %]Lieferant[% END %]</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
+                      [%- INCLUDE 'generic/multibox.html'
                            name       = vc,
-                           style      = 'width: 250px', 
+                           style      = 'width: 250px',
                            DATA       = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
                            id_sub     = 'vc_keys',
                            label_key  = 'name',
                            select     = vc_select,
                            limit      = vclimit,
                            onChange   = "document.getElementById('update_button').click();" -%]
-                      <input type="button" value="D" onclick="show_vc_details('[% vc %]')">
+                      <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
                   </tr>
 [%- IF ALL_CONTACTS.size %]
                   <tr>
                     <th align="right">Ansprechpartner</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'cp_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_CONTACTS, 
-                           id_key     = 'cp_id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
                            label_sub  = 'contact_labels',
                            show_empty = 1 -%]
                     </td>
                   </tr>
 [%- END %]
-[%- IF ALL_SHIPTO %] 
+[%- IF ALL_SHIPTO.size %]
                   <tr>
                     <th align="right">Lieferadresse</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'shipto_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_SHIPTO, 
-                           id_key     = 'shipto_id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'shipto_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_SHIPTO,
+                           id_key     = 'shipto_id',
                            label_sub  = 'shipto_labels',
                            show_empty = 1,
                            onChange   = "document.getElementById('update_button').click();" -%]
@@ -99,19 +98,19 @@
                   <tr>
                     <th align="right">Steuersatz</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'taxzone_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_TAXZONES, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
                            label_key  = 'description' -%]
                     </td>
                   </tr>
 [%- IF selectdepartment %]
                   <tr>
                     <th align="right" nowrap>Abteilung</th>
-                    <td colspan=3><select name=department style="width: 250px">[% selectdepartment %]</select>
-                    <input type=hidden name=selectdepartment value="[% HTML.escape(selectdepartment) %]">
+                    <td colspan="3"><select name="department" style="width: 250px">[% selectdepartment %]</select>
+                    <input type="hidden" name="selectdepartment" value="[% HTML.escape(selectdepartment) %]">
                     </td>
                   </tr>
 [%- END %]
@@ -124,29 +123,29 @@
 [%- END %]
 [%- IF show_exchangerate %]
                   <tr>
-                    <th align=right>Wechselkurs</th>
+                    <th align="right">Wechselkurs</th>
                     <td>
                      [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 0) %]
                      [%- ELSE %]
-                      <input name=exchangerate size=10 value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
                      [%- END %]
                     </td>
                   </tr>
 [%- END %]
 [%- IF is_sales %]
                   <tr>
-                    <th align=right>Motiv</th>
-                    <td style="font-weight:bold" colspan=3><input name=motiv size=35 value="[% HTML.escape(motiv) %]"></td>
+                    <th align="right">Motiv</th>
+                    <td style="font-weight:bold" colspan="3"><input name="motiv" size="35" value="[% HTML.escape(motiv) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align=right>Versandort</th>
-                    <td colspan=3><input name=shippingpoint size=35 value="[% HTML.escape(shippingpoint) %]"></td>
+                    <th align="right">Versandort</th>
+                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
                   </tr>
                   <tr>
-                    <th align=right>Transportmittel</th>
-                    <td colspan=3><input name=shipvia size=35 value="[% HTML.escape(shipvia) %]"></td>
+                    <th align="right">Transportmittel</th>
+                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
                   </tr>
                   <tr>
                     <th align="right">Vorgangsbezeichnung</th>
@@ -154,38 +153,38 @@
                   </tr>
 [%- IF show_delivery_customer %]
                   <tr>
-                    <td colspan=4>
+                    <td colspan="4">
                       <table>
                         <tr>
-                          <td colspan=2>
+                          <td colspan="2">
                           <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')">Endkunde wählen:</button>
                         </td>
-                          <td colspan=2><input type=hidden name=delivery_customer_id value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size=45 id=delivery_customer_string name=delivery_customer_string value="[% HTML.escape(delivery_customer_string) %]"></td>
+                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
+                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
                         </tr>
                         <tr>
-                          <td colspan=2>
+                          <td colspan="2">
                             <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')">Händler wählen</button>
                           </td>
-                          <td colspan=2><input type=hidden name=delivery_vendor_id value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size=45 id=vendor_string name=delivery_vendor_string value="[% HTML.escape(delivery_vendor_string) %]"></td>
+                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
+                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
                         </tr>
                       </table>
                     </td>
-                  </tr> 
+                  </tr>
 [%- END %]
                 </table>
               </td>
-              <td align=right>
+              <td align="right">
                 <table>
               [% openclosed %]
                   <tr>
                     <th align="right">Bearbeiter</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'employee_id', 
-                           DATA       = ALL_EMPLOYEES, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
                            label_sub  = 'sales_employee_labels' -%]
                     </td>
                   </tr>
@@ -193,33 +192,33 @@
                   <tr>
                     <th align="right">Verkäufer/in</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'salesman_id', 
-                           default    = salesman_id ? salesman_id : employee_id, 
-                           DATA       = ALL_SALESMEN, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'salesman_id',
+                           default    = salesman_id ? salesman_id : employee_id,
+                           DATA       = ALL_SALESMEN,
+                           id_key     = 'id',
                            label_sub  = 'sales_employee_labels' -%]
                     </td>
                   </tr>
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <th width=70% align=right nowrap>Auftragsnummer</th>
-                    <td><input name=ordnumber size=11 value="[% HTML.escape(ordnumber) %]"></td>
+                    <th width="70%" align="right" nowrap>Auftragsnummer</th>
+                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th width=70% align=right nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
-                    <td><input name=quonumber size=11 value="[% HTML.escape(quonumber) %]"></td>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]Anfragenummer[% ELSE %]Angebotsnummer[% END %]</th>
+                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
                   </tr>
 [%- IF is_order %]
                   <tr>
-                    <th width=70% align=right nowrap>Bestellnummer des Kunden</th>
-                    <td><input name=cusordnumber size=11 value="[% HTML.escape(cusordnumber) %]"></td>
+                    <th width="70%" align="right" nowrap>Bestellnummer des Kunden</th>
+                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align=right nowrap>
+                    <th align="right" nowrap>
                      [%- IF is_order %]
                       Auftragsdatum
                      [%- ELSE %]
@@ -229,7 +228,7 @@
                     [% button1 %]
                   </tr>
                   <tr>
-                    <th align=right nowrap>
+                    <th align="right" nowrap>
                      [%- IF is_sales_quo %]
                       gültig bis
                      [%- ELSE %]
@@ -241,10 +240,10 @@
                   <tr>
                     <th width="70%" align="right" nowrap>Projektnummer</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'globalproject_id', 
-                           DATA       = ALL_PROJECTS, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'globalproject_id',
+                           DATA       = ALL_PROJECTS,
+                           id_key     = 'id',
                            label_key  = 'projectnumber',
                            show_empty = 1,
                            onChange   = "document.getElementById('update_button').click();" -%]
diff --git a/templates/webpages/oe/orders_header_master.html b/templates/webpages/oe/orders_header_master.html
index d7b4a30c9..f5df7d648 100644
--- a/templates/webpages/oe/orders_header_master.html
+++ b/templates/webpages/oe/orders_header_master.html
@@ -2,7 +2,7 @@
 [%- USE LxERP %]
 <body onLoad="[% onload %]">
 
-  <form method=post name=oe action="[% script %]">
+  <form method="post" name="oe" action="[% script %]">
 
     <script type="text/javascript" src="js/common.js"></script>
     <script type="text/javascript" src="js/delivery_customer_selection.js"></script>
@@ -12,7 +12,7 @@
     <script type="text/javascript" src="js/follow_up.js"></script>
 
 [%- FOREACH row = HIDDENS %]
-   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" > 
+   <input type="hidden" name="[% HTML.escape(row.name) %]" value="[% HTML.escape(row.value) %]" >
 [%- END %]
 
     <input type="hidden" name="follow_up_trans_id_1" value="[% HTML.escape(id) %]">
@@ -20,55 +20,54 @@
     <input type="hidden" name="follow_up_trans_info_1" value="[% HTML.escape(follow_up_trans_info) %]">
     <input type="hidden" name="follow_up_rowcount" value="1">
 
-    <table width=100%>
-      <tr class=listtop>
-        <th class=listtop>[% HTML.escape(title) %]</th>
-      </tr>
+    <div class="listtop">[% title %]</div>
+
+    <table width="100%">
       <tr height="5"></tr>
       <tr>
         <td>
           <table width="100%">
-            <tr valign=top>
-              <td width=50%>
-                <table width=100%>
+            <tr valign="top">
+              <td width="50%">
+                <table width="100%">
                   <tr>
                     <th align="right">[% IF vc == 'customer' %]<translate>Customer</translate>[% ELSE %]<translate>Vendor</translate>[% END %]</th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
+                      [%- INCLUDE 'generic/multibox.html'
                            name       = vc,
-                           style      = 'width: 250px', 
+                           style      = 'width: 250px',
                            DATA       = vc == 'customer' ? ALL_CUSTOMERS : ALL_VENDORS,
                            id_sub     = 'vc_keys',
                            label_key  = 'name',
                            select     = vc_select,
                            limit      = vclimit,
                            onChange   = "document.getElementById('update_button').click();" -%]
-                      <input type="button" value="D" onclick="show_vc_details('[% vc %]')">
+                      <input type="button" value="D" onclick="show_vc_details('[% HTML.escape(vc) %]')">
                     </td>
                   </tr>
 [%- IF ALL_CONTACTS.size %]
                   <tr>
                     <th align="right"><translate>Contact Person</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'cp_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_CONTACTS, 
-                           id_key     = 'cp_id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'cp_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_CONTACTS,
+                           id_key     = 'cp_id',
                            label_sub  = 'contact_labels',
                            show_empty = 1 -%]
                     </td>
                   </tr>
 [%- END %]
-[%- IF ALL_SHIPTO %] 
+[%- IF ALL_SHIPTO.size %]
                   <tr>
                     <th align="right"><translate>Shipping Address</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'shipto_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_SHIPTO, 
-                           id_key     = 'shipto_id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'shipto_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_SHIPTO,
+                           id_key     = 'shipto_id',
                            label_sub  = 'shipto_labels',
                            show_empty = 1,
                            onChange   = "document.getElementById('update_button').click();" -%]
@@ -99,19 +98,19 @@
                   <tr>
                     <th align="right"><translate>Steuersatz</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'taxzone_id', 
-                           style      = 'width: 250px', 
-                           DATA       = ALL_TAXZONES, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'taxzone_id',
+                           style      = 'width: 250px',
+                           DATA       = ALL_TAXZONES,
+                           id_key     = 'id',
                            label_key  = 'description' -%]
                     </td>
                   </tr>
 [%- IF selectdepartment %]
                   <tr>
                     <th align="right" nowrap><translate>Department</translate></th>
-                    <td colspan=3><select name=department style="width: 250px">[% selectdepartment %]</select>
-                    <input type=hidden name=selectdepartment value="[% HTML.escape(selectdepartment) %]">
+                    <td colspan="3"><select name="department" style="width: 250px">[% selectdepartment %]</select>
+                    <input type="hidden" name="selectdepartment" value="[% HTML.escape(selectdepartment) %]">
                     </td>
                   </tr>
 [%- END %]
@@ -124,29 +123,29 @@
 [%- END %]
 [%- IF show_exchangerate %]
                   <tr>
-                    <th align=right><translate>Exchangerate</translate></th>
+                    <th align="right"><translate>Exchangerate</translate></th>
                     <td>
                      [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 0) %]
                      [%- ELSE %]
-                      <input name=exchangerate size=10 value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
+                      <input name="exchangerate" size="10" value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
                      [%- END %]
                     </td>
                   </tr>
 [%- END %]
 [%- IF is_sales %]
                   <tr>
-                    <th align=right><translate>Motiv</translate></th>
-                    <td style="font-weight:bold" colspan=3><input name=motiv size=35 value="[% HTML.escape(motiv) %]"></td>
+                    <th align="right"><translate>Motiv</translate></th>
+                    <td style="font-weight:bold" colspan="3"><input name="motiv" size="35" value="[% HTML.escape(motiv) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align=right><translate>Shipping Point</translate></th>
-                    <td colspan=3><input name=shippingpoint size=35 value="[% HTML.escape(shippingpoint) %]"></td>
+                    <th align="right"><translate>Shipping Point</translate></th>
+                    <td colspan="3"><input name="shippingpoint" size="35" value="[% HTML.escape(shippingpoint) %]"></td>
                   </tr>
                   <tr>
-                    <th align=right><translate>Ship via</translate></th>
-                    <td colspan=3><input name=shipvia size=35 value="[% HTML.escape(shipvia) %]"></td>
+                    <th align="right"><translate>Ship via</translate></th>
+                    <td colspan="3"><input name="shipvia" size="35" value="[% HTML.escape(shipvia) %]"></td>
                   </tr>
                   <tr>
                     <th align="right"><translate>Transaction description</translate></th>
@@ -154,38 +153,38 @@
                   </tr>
 [%- IF show_delivery_customer %]
                   <tr>
-                    <td colspan=4>
+                    <td colspan="4">
                       <table>
                         <tr>
-                          <td colspan=2>
+                          <td colspan="2">
                           <button type="button" onclick="delivery_customer_selection_window('delivery_customer_string','delivery_customer_id')"><translate>Choose Customer</translate></button>
                         </td>
-                          <td colspan=2><input type=hidden name=delivery_customer_id value="[% HTML.escape(delivery_customer_id) %]">
-                          <input size=45 id=delivery_customer_string name=delivery_customer_string value="[% HTML.escape(delivery_customer_string) %]"></td>
+                          <td colspan="2"><input type="hidden" name="delivery_customer_id" value="[% HTML.escape(delivery_customer_id) %]">
+                          <input size="45" id="delivery_customer_string" name="delivery_customer_string" value="[% HTML.escape(delivery_customer_string) %]"></td>
                         </tr>
                         <tr>
-                          <td colspan=2>
+                          <td colspan="2">
                             <button type="button" onclick="vendor_selection_window('delivery_vendor_string','delivery_vendor_id')"><translate>Choose Vendor</translate></button>
                           </td>
-                          <td colspan=2><input type=hidden name=delivery_vendor_id value="[% HTML.escape(delivery_vendor_id) %]">
-                          <input size=45 id=vendor_string name=delivery_vendor_string value="[% HTML.escape(delivery_vendor_string) %]"></td>
+                          <td colspan="2"><input type="hidden" name="delivery_vendor_id" value="[% HTML.escape(delivery_vendor_id) %]">
+                          <input size="45" id="vendor_string" name="delivery_vendor_string" value="[% HTML.escape(delivery_vendor_string) %]"></td>
                         </tr>
                       </table>
                     </td>
-                  </tr> 
+                  </tr>
 [%- END %]
                 </table>
               </td>
-              <td align=right>
+              <td align="right">
                 <table>
               [% openclosed %]
                   <tr>
                     <th align="right"><translate>Employee</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'employee_id', 
-                           DATA       = ALL_EMPLOYEES, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'employee_id',
+                           DATA       = ALL_EMPLOYEES,
+                           id_key     = 'id',
                            label_sub  = 'sales_employee_labels' -%]
                     </td>
                   </tr>
@@ -193,33 +192,33 @@
                   <tr>
                     <th align="right"><translate>Salesman</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'salesman_id', 
-                           default    = salesman_id ? salesman_id : employee_id, 
-                           DATA       = ALL_SALESMEN, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'salesman_id',
+                           default    = salesman_id ? salesman_id : employee_id,
+                           DATA       = ALL_SALESMEN,
+                           id_key     = 'id',
                            label_sub  = 'sales_employee_labels' -%]
                     </td>
                   </tr>
 [%- END %]
 [%- IF is_order %]
                   <tr>
-                    <th width=70% align=right nowrap><translate>Order Number</translate></th>
-                    <td><input name=ordnumber size=11 value="[% HTML.escape(ordnumber) %]"></td>
+                    <th width="70%" align="right" nowrap><translate>Order Number</translate></th>
+                    <td><input name="ordnumber" size="11" value="[% HTML.escape(ordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th width=70% align=right nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
-                    <td><input name=quonumber size=11 value="[% HTML.escape(quonumber) %]"></td>
+                    <th width="70%" align="right" nowrap>[% IF is_req_quo %]<translate>RFQ Number</translate>[% ELSE %]<translate>Quotation Number</translate>[% END %]</th>
+                    <td><input name="quonumber" size="11" value="[% HTML.escape(quonumber) %]"></td>
                   </tr>
 [%- IF is_order %]
                   <tr>
-                    <th width=70% align=right nowrap><translate>Customer Order Number</translate></th>
-                    <td><input name=cusordnumber size=11 value="[% HTML.escape(cusordnumber) %]"></td>
+                    <th width="70%" align="right" nowrap><translate>Customer Order Number</translate></th>
+                    <td><input name="cusordnumber" size="11" value="[% HTML.escape(cusordnumber) %]"></td>
                   </tr>
 [%- END %]
                   <tr>
-                    <th align=right nowrap>
+                    <th align="right" nowrap>
                      [%- IF is_order %]
                       <translate>Order Date</translate>
                      [%- ELSE %]
@@ -229,7 +228,7 @@
                     [% button1 %]
                   </tr>
                   <tr>
-                    <th align=right nowrap>
+                    <th align="right" nowrap>
                      [%- IF is_sales_quo %]
                       <translate>Valid until</translate>
                      [%- ELSE %]
@@ -241,10 +240,10 @@
                   <tr>
                     <th width="70%" align="right" nowrap><translate>Project Number</translate></th>
                     <td>
-                      [%- INCLUDE 'generic/multibox.html' 
-                           name       = 'globalproject_id', 
-                           DATA       = ALL_PROJECTS, 
-                           id_key     = 'id', 
+                      [%- INCLUDE 'generic/multibox.html'
+                           name       = 'globalproject_id',
+                           DATA       = ALL_PROJECTS,
+                           id_key     = 'id',
                            label_key  = 'projectnumber',
                            show_empty = 1,
                            onChange   = "document.getElementById('update_button').click();" -%]
-- 
2.20.1