X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdo%2Fform_header.html;h=198a44ff33982884c901674a69d31bc2e9e3c2a0;hb=5896615180704b3dddba46f4064a47ff1f094c3c;hp=000811e39e7cc700d4d69f3b001d746280ceb9b0;hpb=9b67d27cd821260c8577a94358345f98e95a92db;p=kivitendo-erp.git

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 000811e39..198a44ff3 100644
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -19,10 +19,6 @@
         [% IF onload %][% onload %];[% END %]
         setupDateFormat('[% myconfig_dateformat %]', '[% 'Falsches Datumsformat!' | $T8 %]');
         setupPoints('[% myconfig_numberformat %]', '[% 'wrongformat' | $T8 %]');
-
-        [%- UNLESS delivered %]
-        Calendar.setup({ inputField : "transdate", ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "transdate_trigger" });
-        [%- END %]
       }
     -->
  </script>
@@ -47,7 +43,6 @@
  [%- SET is_customer = '0' %]
  [%- END %]
  [%- IF delivered %]
- [%- SET RO = ' readonly' %]
  [%- SET DISABLED = ' disabled' %]
  [%- END %]
 
@@ -137,7 +132,7 @@
           [%- HTML.escape(row.cp_name) %][%- IF row.cp_abteilung %] ([% HTML.escape(row.cp_abteilung) %])[% END -%]
           [%- END %]
           [%- ELSE %]
-            [% L.select_tag('cp_id', L.options_for_select(ALL_CONTACTS, default=cp_id, value='cp_id', title='full_name_dep', with_empty=1), style='width: 250px') %]
+            [% L.select_tag('cp_id', ALL_CONTACTS, default = cp_id, value = 'cp_id', title = 'full_name_dep', with_empty = 1, style='width: 250px') %]
           [%- END %]
          </td>
         </tr>
@@ -159,7 +154,7 @@
           [%- END %]
 
           [%- ELSE %]
-            [% L.select_tag('shipto_id', L.options_for_select(ALL_SHIPTO, default=shipto_id, value='shipto_id', title='displayable_id', with_empty=1), class='fixed_width') %]
+            [% L.select_tag('shipto_id', ALL_SHIPTO, default = shipto_id, value = 'shipto_id', title = 'displayable_id', with_empty = 1, class = 'fixed_width') %]
           [%- END %]
          </td>
         </tr>
@@ -187,7 +182,10 @@
        <tr>
         <th align="right" nowrap>[% 'Department' | $T8 %]</th>
         <td colspan="3">
-         [% L.select_tag('department_id', L.options_for_select(ALL_DEPARTMENTS, default=department_id, title="description", with_empty=1), style='width: 250px', disabled => delivered )%]
+          [% IF ( delivered ) %]
+            [% L.hidden_tag('department_id', department_id) %]
+          [% END %]
+          [% L.select_tag('department_id', ALL_DEPARTMENTS, default = department_id, title = 'description', with_empty = 1, style = 'width: 250px', disabled = delivered )%]
        </td>
        </tr>
        [%- END %]
@@ -248,7 +246,7 @@
          [% IF row.id == employee_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
          [%- END %]
          [%- ELSE %]
-           [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, default=employee_id, title='safe_name')) %]
+           [% L.select_tag('employee_id', ALL_EMPLOYEES, default = employee_id, title = 'safe_name') %]
          [%- END %]
         </td>
        </tr>
@@ -268,7 +266,7 @@
          [% IF row.id == the_salesman_id %][%- IF row.name %][%- HTML.escape(row.name) %][%- ELSE %][% HTML.escape(row.login) %][%- END %][% END %]
          [%- END %]
          [%- ELSE %]
-          [% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title='safe_name')) %]
+          [% L.select_tag('salesman_id', ALL_SALESMEN, default = (salesman_id ? salesman_id : employee_id), title = 'safe_name') %]
          [%- END %]
         </td>
        </tr>
@@ -292,9 +290,7 @@
        <tr>
         <th align="right" nowrap>[% 'Delivery Order Date' | $T8 %]</th>
         <td nowrap>
-         <input name="transdate" id="transdate" size="11" title="[% HTML.escape(myconfig_dateformat) %]" value="[% HTML.escape(transdate) %]"
-                onBlur="check_right_date_format(this)"[% RO %]>
-         [% UNLESS delivered %]<input type="button" name="b_transdate" id="transdate_trigger" value="?">[% END %]
+         [% L.date_tag('transdate', transdate, readonly => delivered) %]
         </td>
        </tr>