X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdelivery_plan%2F_filter.html;h=87a94183cfe340fdb84fbac4d8986baafc5e8ff3;hb=04dccca70c47960cd6ea03a4f0ae05a9cbc42c41;hp=1bd64f12cb006885c158fc44976d09075beb3234;hpb=329534cc42a07ab50f6e69186e81cdaf1eca2187;p=kivitendo-erp.git

diff --git a/templates/webpages/delivery_plan/_filter.html b/templates/webpages/delivery_plan/_filter.html
index 1bd64f12c..87a94183c 100644
--- a/templates/webpages/delivery_plan/_filter.html
+++ b/templates/webpages/delivery_plan/_filter.html
@@ -2,7 +2,7 @@
 [%- USE L %]
 [%- USE LxERP %]
 [%- USE HTML %]
-<form action='controller.pl' method='post'>
+<form action='controller.pl' method='post' id='filter_form'>
 <div class='filter_toggle'>
 <a href='#' onClick='javascript:$(".filter_toggle").toggle()'>[% 'Show Filter' | $T8 %]</a>
   [% SELF.filter_summary | html %]
@@ -38,7 +38,7 @@
    <th align="right">[% 'Quantity' | $T8 %]</th>
    <td>[% L.input_tag('filter.qty:number', filter.qty_number, size = 20) %]</td>
   </tr>
-[% IF vc == 'customer' %]
+[% IF SELF.vc == 'customer' %]
     <tr>
      <th align="right">[% 'Customer' | $T8 %]</th>
      <td>[% L.input_tag('filter.order.customer.name:substr::ilike', filter.order.customer.name_substr__ilike, size = 20) %]</td>
@@ -67,27 +67,44 @@
                      style      => 'width: 200px') %]
    </td>
   </tr>
+  <tr>
+   <th align="right">[% 'Employee' | $T8 %]</th>
+   <td>
+     [% L.select_tag('filter.order.employee_id', SELF.all_employees,
+                     default    => filter.order.employee_id,
+                     title_key  => 'name',
+                     value_key  => 'id',
+                     with_empty => 1,
+                     style      => 'width: 200px') %]
+   </td>
+  </tr>
+  [%- IF SELF.all_departments.size %]
+    <tr>
+      <th align="right">[% 'Department' | $T8 %]</th>
+      <td>
+        [% L.select_tag('filter.order.department_id', SELF.all_departments, default=filter.order.department_id, title_key='description', with_empty=1, style='width:200px') %]
+      </td>
+    </tr>
+  [%- END %]
   <tr>
    <th align="right">[% 'Type' | $T8 %]</th>
    <td>
-     [% L.checkbox_tag('filter.part.type[]', checked=filter.part.type_.part,     value='part',     label=LxERP.t8('Part')) %]
-     [% L.checkbox_tag('filter.part.type[]', checked=filter.part.type_.service,  value='service',  label=LxERP.t8('Service')) %]
-     [% L.checkbox_tag('filter.part.type[]', checked=filter.part.type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
+     [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.part,     value='part',     label=LxERP.t8('Part')) %]
+     [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.service,  value='service',  label=LxERP.t8('Service')) %]
+     [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assembly, value='assembly', label=LxERP.t8('Assembly')) %]
+     [%- IF INSTANCE_CONF.get_feature_experimental_assortment %]
+       [% L.checkbox_tag('filter.part.part_type[]', checked=filter.part.part_type_.assortment, value='assortment', label=LxERP.t8('Assortment')) %]
+     [% END %]
    </td>
   </tr>
  </table>
 
-[% L.hidden_tag('action', 'DeliveryPlan/dispatch') %]
 [% L.hidden_tag('sort_by', FORM.sort_by) %]
 [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
 [% L.hidden_tag('page', FORM.page) %]
 [% L.hidden_tag('vc', SELF.vc) %]
 [% L.hidden_tag('mode', SELF.mode) %]
-  [% L.input_tag('action_list', LxERP.t8('Continue'), type = 'submit', class='submit')%]
-
-
-<a href='#' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);'>[% 'Reset' | $T8 %]</a>
-
+[% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset')) %]
 </div>
 
 </form>