X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/94f4a8615c7b6f1a35295723cd9578ecf3ad812d..46bc75c8:/templates/webpages/is/form_header.html

diff --git a/templates/webpages/is/form_header.html b/templates/webpages/is/form_header.html
index 16f796950..80dd758e1 100644
--- a/templates/webpages/is/form_header.html
+++ b/templates/webpages/is/form_header.html
@@ -45,11 +45,11 @@
                  allow_textbox = 1,
                  onChange      = "document.getElementById('update_button').click();" -%]
             <input type="button" value="[% 'Details (one letter abbreviation)' | $T8 %]" onclick="show_vc_details('[% HTML.escape(vc) %]')">
-          </td>
           <input type="hidden" name="customer_klass" value="[% HTML.escape(customer_klass) %]">
           <input type="hidden" name="customer_id" value="[% HTML.escape(customer_id) %]">
           <input type="hidden" name="oldcustomer" value="[% HTML.escape(oldcustomer) %]">
           <input type="hidden" name="selectcustomer" value="[% HTML.escape(selectcustomer) %]">
+          </td>
         </tr>
 [%- IF ALL_CONTACTS.size %]
         <tr>
@@ -63,7 +63,7 @@
         <tr>
           <th align="right">[% 'Shipping Address' | $T8 %]</th>
           <td>
-            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title_sub=\shipto_labels, with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
+            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title='displayable_id', with_empty=1), style='width: 250px', onChange="document.getElementById('update_button').click();") %]
           </td>
         </tr>
 [%- END %]
@@ -90,8 +90,10 @@
 [%- END %]
         <tr>
           <th align="right" nowrap>[% 'Record in' | $T8 %]</th>
-          <td colspan="3"><select name="AR" style="width:250px;">[% selectAR %]</select></td>
-          <input type="hidden" name="selectAR" value="[% selectAR %]">
+          <td colspan="3">
+            <select name="AR" style="width:250px;">[% selectAR %]</select>
+            <input type="hidden" name="selectAR" value="[% selectAR | html %]">
+          </td>
         </tr>
         <tr>
           <th align="right">[% 'Steuersatz' | $T8 %]</th>
@@ -100,6 +102,7 @@
   [%- IF id %]
           <input type='hidden' name='taxzone_id' value='[% taxzone_id %]'>
   [%- END %]
+          </td>
         </tr>
 [%- IF all_departments %]
         <tr>
@@ -115,8 +118,12 @@
           <td>[% currencies %]</td>
         </tr>
 [%- END %]
-        <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
-        <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+        <tr style='display:none'>
+          <td>
+            <input type="hidden" name="fxgain_accno" value="[% fxgain_accno %]">
+            <input type="hidden" name="fxloss_accno" value="[% fxloss_accno %]">
+          </td>
+        </tr>
 [%- IF show_exchangerate %]
         <tr>
           <th align="right">[% 'Exchangerate' | $T8 %]</th>
@@ -148,14 +155,14 @@
         <tr>
           <th align="right">[% 'Employee' | $T8 %]</th>
           <td>
-            [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, default=employee_id, title_sub=\sales_employee_labels)) %]
+            [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, default=employee_id, title='safe_name')) %]
           </td>
         </tr>
 [%- IF ALL_SALESMEN.size %]
         <tr>
           <th align="right">[% 'Salesman' | $T8 %]</th>
           <td>
-            [% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title_sub=\sales_employee_labels)) %]
+            [% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title='safe_name')) %]
           </td>
         </tr>
 [%- END %]
@@ -171,7 +178,7 @@
         </tr>
         <tr>
           <th align="right">[% 'Credit Note Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate()') %]</td>
+          <td>[% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %]</td>
         </tr>
 [%- ELSE %]
         <tr>
@@ -180,11 +187,11 @@
         </tr>
         <tr>
           <th align="right">[% 'Invoice Date' | $T8 %]</th>
-          <td>[% L.date_tag('invdate', invdate, onBlur='check_right_date_format(this)', cal_align='BL', onChange='set_duedate()') %]</td>
+          <td>[% L.date_tag('invdate', invdate, cal_align='BL', onchange='set_duedate()') %]</td>
         </tr>
         <tr>
           <th align="right">[% 'Due Date' | $T8 %]</th>
-          <td>[% L.date_tag('duedate', duedate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('duedate', duedate, cal_align='BL') %]</td>
         </tr>
         <tr>
         <th align="right" nowrap>[% 'Delivery Order Number' | $T8 %]</th>
@@ -192,7 +199,7 @@
         </tr>
         <tr>
           <th align="right">[% 'Delivery Date' | $T8 %]</th>
-          <td>[% L.date_tag('deliverydate', deliverydate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('deliverydate', deliverydate, cal_align='BL') %]</td>
         </tr>
 [%- END %]
 
@@ -202,7 +209,7 @@
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Order Date' | $T8 %]</th>
-          <td>[% L.date_tag('orddate', orddate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('orddate', orddate, cal_align='BL') %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Quotation Number' | $T8 %]</th>
@@ -210,7 +217,7 @@
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Quotation Date' | $T8 %]</th>
-          <td>[% L.date_tag('quodate', quodate, onBlur='check_right_date_format(this)', cal_align='BL') %]</td>
+          <td>[% L.date_tag('quodate', quodate, cal_align='BL') %]</td>
         </tr>
         <tr>
           <th align="right" nowrap>[% 'Customer Order Number' | $T8 %]</th>
@@ -225,13 +232,13 @@
       </table>
     </td>
   </tr>
-</table>
-    </td>
-  </tr>
-  <tr>
+  <tr style='display:none'>
     <td>
+      <input type="hidden" name="webdav" value="[% webdav %]">
     </td>
   </tr>
+</table>
+
   <script type="text/javascript" src="js/show_form_details.js"></script>
   <script type="text/javascript" src="js/show_vc_details.js"></script>
   <script type="text/javascript" src="js/show_history.js"></script>
@@ -265,5 +272,4 @@
      }
    //-->
   </script>
-
-  <input type="hidden" name="webdav" value="[% webdav %]">
+<table width="100%">