X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fprice_rule%2F_filter.html;h=02c66db22eabf9b052127db7a1bcf14f746d6850;hb=dcfea9c2ce19dd6865e478ef745aa5e1c085b8f8;hp=6cc7cfbbbb996b122ebe11d4fba1daff894c2813;hpb=b2fad3c4e94141c2b1ccc4dc5951d330a5b455c5;p=kivitendo-erp.git

diff --git a/templates/webpages/price_rule/_filter.html b/templates/webpages/price_rule/_filter.html
index 6cc7cfbbb..02c66db22 100644
--- a/templates/webpages/price_rule/_filter.html
+++ b/templates/webpages/price_rule/_filter.html
@@ -10,33 +10,89 @@
 <div class='filter_toggle' style='display:none'>
 <a href='#' onClick='javascript:$(".filter_toggle").toggle()'>[% 'Hide Filter' | $T8 %]</a>
  <table id='filter_table'>
-  <tr>
   <tr>
    <th align="right">[% 'Description' | $T8 %]</th>
-   <td>[% L.input_tag('filter.name:substr::ilike', filter.name_substr__ilike, size = 20) %]</td>
+   <td>[% L.input_tag('filter.name:substr::ilike', filter.name_substr__ilike, size = 20, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Type' | $T8 %]</th>
+   <td>[% L.select_tag('filter.type', [ [ 'customer', LxERP.t8('Sales Price Rules '), ] [ 'vendor', LxERP.t8('Purchase Price Rules ') ] ], with_empty=1, default=filter.type, id='price_rule_filter_type', style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Part' | $T8 %]</th>
+   <td>[% L.part_picker('filter.item_type_matches[].part', FORM.filter.item_type_matches.0.part, style='width: 300px') %]</td>
+  </tr>
+  <tr id='price_rule_filter_customer_tr' [% "style='display:hidden' " UNLESS SELF.vc == 'customer' %]>
+   <th align="right">[% 'Customer' | $T8 %]</th>
+   <td>[% L.customer_vendor_picker('filter.item_type_matches[].customer', FORM.filter.item_type_matches.0.customer, type='customer', id='price_rule_filter_customer', style='width: 300px') %]</td>
+  </tr>
+  <tr id='price_rule_filter_vendor_tr' [% "style='display:hidden' " UNLESS SELF.vc == 'customer' %]>
+   <th align="right">[% 'Vendor' | $T8 %]</th>
+   <td>[% L.customer_vendor_picker('filter.item_type_matches[].vendor', FORM.filter.item_type_matches.0.vendor, type='vendor', id='price_rule_filter_vendor', style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Business' | $T8 %]</th>
+   <td>[% L.select_tag('filter.item_type_matches[].business', SELF.businesses, title_key='description', default=FORM.filter.item_type_matches.0.business, with_empty=1, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Partsgroup' | $T8 %]</th>
+   <td>[% L.select_tag('filter.item_type_matches[].partsgroup', SELF.partsgroups, title_key='partsgroup', default=FORM.filter.item_type_matches.0.partsgroup, with_empty=1, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Qty' | $T8 %]</th>
+   <td>[% L.input_tag('filter.item_type_matches[].qty', FORM.filter.item_type_matches.0.qty, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Reqdate' | $T8 %]</th>
+   <td>[% L.date_tag('filter.item_type_matches[].reqdate', FORM.filter.item_type_matches.0.reqdate, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Transdate' | $T8 %]</th>
+   <td>[% L.date_tag('filter.item_type_matches[].transdate', FORM.filter.item_type_matches.0.transdate, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Pricegroup' | $T8 %]</th>
+   <td>[% L.select_tag('filter.item_type_matches[].pricegroup', SELF.pricegroups, default=FORM.filter.item_type_matches.0.pricegroup, title_key='pricegroup', with_empty=1, style='width: 300px') %]<br>
+   </td>
   </tr>
   <tr>
    <th align="right">[% 'Price' | $T8 %]</th>
-   <td>[% L.input_tag('filter.price:number', filter.price_number, size=20) %]</td>
+   <td>[% L.input_tag('filter.price:number', filter.price_number, size=20, style='width: 300px') %]</td>
   </tr>
   <tr>
-   <th align="right">[% 'Discount' | $T8 %]</th>
-   <td>[% L.input_tag('filter.discount:number', filter.discount_number, size=20) %]</td>
+   <th align="right">[% 'Reduced Master Data' | $T8 %]</th>
+   <td>[% L.input_tag('filter.reduction:number', filter.reduction_number, size=20, style='width: 300px') %]</td>
   </tr>
   <tr>
    <th align="right">[% 'Discount' | $T8 %]</th>
-   <td>[% L.select_tag('filter.obsolete', [ [ '', LxERP.t8('Both') ], [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=filter.obsolete, title_key='description', style='width: 300px') %]</td>
+   <td>[% L.input_tag('filter.discount:number', filter.discount_number, size=20, style='width: 300px') %]</td>
   </tr>
+  <tr>
+   <th align="right">[% 'Priority' | $T8 %]</th>
+   <td>[% L.select_tag('filter.priority', [ [ '', LxERP.t8('All') ], [ 3, LxERP.t8('Normal') ], [ 4 , LxERP.t8('Override')]], default=filter.priority, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Obsolete' | $T8 %]</th>
+   <td>[% L.select_tag('filter.obsolete', [ [ '', LxERP.t8('Both') ], [ 0, LxERP.t8('Valid') ], [ 1 , LxERP.t8('Obsolete')]], default=filter.obsolete, style='width: 300px') %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Has item type' | $T8 %]</th>
+   <td>
+     [%- FOREACH type = SELF.all_price_rule_item_types %]
+       [%- L.checkbox_tag('filter.has_item_type[]', value=type.0, label=type.1, checked=filter.has_item_type_.${type.0})  %]
+     [%- END %]
+   </td>
+  </tr>
+
  </table>
 
 [% L.hidden_tag('action', 'PriceRule/dispatch') %]
-[% L.hidden_tag('filter.type', FORM.filter.type) %]
 [% L.hidden_tag('sort_by', FORM.sort_by) %]
 [% L.hidden_tag('sort_dir', FORM.sort_dir) %]
 [% L.hidden_tag('page', FORM.page) %]
-[% L.input_tag('action_list', LxERP.t8('Continue'), type = 'submit', class='submit')%]
+[% 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>
+<a class='interact cursor-pointer' onClick='javascript:$("#filter_table input").val("");$("#filter_table input[type=checkbox]").prop("checked", 0);$("#filter_table select").val("")'>[% 'Reset' | $T8 %]</a>
 
 </div>