Auch hier unnötige multiboxen auf L.select_tags umgestellt.

diff --git a/templates/webpages/oe/form_header.html b/templates/webpages/oe/form_header.html
index 0867d4abb8bdd5d8656796169360771f68598b23..c07cd59716abf3c35db6af6ae48dd1b70be69670 100644 (file)
--- a/templates/webpages/oe/form_header.html
+++ b/templates/webpages/oe/form_header.html
@@ -63,13 +63,7 @@
                   <tr>
                     <th align="right">[% 'Contact Person' | $T8 %]</th>
                     <td>
                   <tr>
                     <th align="right">[% 'Contact Person' | $T8 %]</th>
                     <td>

-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'cp_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_CONTACTS,
-                           id_key     = 'cp_id',
-                           label_sub  = 'contact_labels',
-                           show_empty = 1 -%]
+                      [% L.select_tag('cp_id', L.options_for_select(ALL_CONTACTS, default=cp_id, value='cp_id', title_sub=\contact_labels, with_empty=1), style='width: 250px') %]

                     </td>
                   </tr>
 [%- END %]
                     </td>
                   </tr>
 [%- END %]


@@ -77,14 +71,7 @@
                   <tr>
                     <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>
                   <tr>
                     <th align="right">[% 'Shipping Address' | $T8 %]</th>
                     <td>

-                      [%- 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();" -%]
+                      [% 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();") %]

                     </td>
                   </tr>
 [%- END %]
                     </td>
                   </tr>
 [%- END %]


@@ -112,25 +99,14 @@
                   <tr>
                     <th align="right">[% 'Steuersatz' | $T8 %]</th>
                     <td>
                   <tr>
                     <th align="right">[% 'Steuersatz' | $T8 %]</th>
                     <td>

-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'taxzone_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_TAXZONES,
-                           id_key     = 'id',
-                           label_key  = 'description' -%]
+                      [% L.select_tag('taxzone_id', L.options_for_select(ALL_TAXZONES, default=taxzone_id, title='description'), style='width: 250px') %]

                     </td>
                   </tr>
 [%- IF ALL_DEPARTMENTS %]
                   <tr>
                     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
                     <td colspan="3">
                     </td>
                   </tr>
 [%- IF ALL_DEPARTMENTS %]
                   <tr>
                     <th align="right" nowrap>[% 'Department' | $T8 %]</th>
                     <td colspan="3">

-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'department_id',
-                           style      = 'width: 250px',
-                           DATA       = ALL_DEPARTMENTS,
-                           id_key     = 'id',
-                           label_sub  = 'department_labels',
-                           show_empty = 1 -%]
+                      [% L.select_tag('department_id', L.options_for_select(ALL_DEPARTMENTS, default=department_id, title_sub=\department_labels, with_empty=1), style='width:250px') %]

                     </td>
                   </tr>
 [%- END %]
                     </td>
                   </tr>
 [%- END %]


@@ -195,23 +171,14 @@
                   <tr>
                     <th align="right">[% 'Employee' | $T8 %]</th>
                     <td>
                   <tr>
                     <th align="right">[% 'Employee' | $T8 %]</th>
                     <td>

-                      [%- INCLUDE 'generic/multibox.html'
-                           name       = 'employee_id',
-                           DATA       = ALL_EMPLOYEES,
-                           id_key     = 'id',
-                           label_sub  = 'sales_employee_labels' -%]
+                      [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, default=employee_id, title_sub=\sales_employee_labels)) %]

                     </td>
                   </tr>
 [%- IF is_sales and ALL_SALESMEN.size %]
                   <tr>
                     <th align="right">[% 'Salesman' | $T8 %]</th>
                     <td>
                     </td>
                   </tr>
 [%- IF is_sales and ALL_SALESMEN.size %]
                   <tr>
                     <th align="right">[% 'Salesman' | $T8 %]</th>
                     <td>

-                      [%- 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' -%]
+                      [% L.select_tag('salesman_id', L.options_for_select(ALL_SALESMEN, default=(salesman_id ? salesman_id : employee_id), title_sub=\sales_employee_labels)) %]

                     </td>
                   </tr>
 [%- END %]
                     </td>
                   </tr>
 [%- END %]


@@ -262,13 +229,7 @@
                   <tr>
                     <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
                     <td>
                   <tr>
                     <th width="70%" align="right" nowrap>[% 'Project Number' | $T8 %]</th>
                     <td>

-                      [%- 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();" -%]
+                      [%- L.select_tag('globalproject_id', L.options_for_select(ALL_PROJECTS, title='projectnumber', default=globalproject_id, with_empty='1'), onChange="document.getElementById('update_button').click();") %]

                     </td>
                   </tr>
                 </table>
                     </td>
                   </tr>
                 </table>