Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / financial_controlling_report / _filter.html

diff --git a/templates/webpages/financial_controlling_report/_filter.html b/templates/webpages/financial_controlling_report/_filter.html
index 0e93ce3..87b0118 100644 (file)
--- a/templates/webpages/financial_controlling_report/_filter.html
+++ b/templates/webpages/financial_controlling_report/_filter.html
@@ -2,7 +2,8 @@
 [%- USE L %]
 [%- USE LxERP %]
 [%- USE HTML %]
-<form action='controller.pl' method='post'>
+[%- SET style='width: 400px' %]
+<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 %]
@@ -12,19 +13,27 @@
  <table id='filter_table'>
   <tr>
    <th align="right">[% 'Customer' | $T8 %]</th>
-   <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, size = 20) %]</td>
+   <td>[% L.input_tag('filter.customer.name:substr::ilike', filter.customer.name_substr__ilike, style=style) %]</td>
   </tr>
   <tr>
    <th align="right">[% 'Customer Number' | $T8 %]</th>
-   <td>[% L.input_tag('filter.customer.customernumber:substr::ilike', filter.customer.customernumber_substr__ilike, size = 20) %]</td>
+   <td>[% L.input_tag('filter.customer.customernumber:substr::ilike', filter.customer.customernumber_substr__ilike, style=style) %]</td>
   </tr>
   <tr>
    <th align="right">[% 'Order Number' | $T8 %]</th>
-   <td>[% L.input_tag('filter.ordnumber:substr::ilike', filter.ordnumber_substr__ilike, size = 20) %]</td>
+   <td>[% L.input_tag('filter.ordnumber:substr::ilike', filter.ordnumber_substr__ilike, style=style) %]</td>
   </tr>
   <tr>
    <th align="right">[% 'Project Number' | $T8 %]</th>
-   <td>[% L.input_tag('filter.globalproject.projectnumber:substr::ilike', filter.globalproject.projectnumber_substr__ilike, size = 20) %]</td>
+   <td>[% L.input_tag('filter.globalproject.projectnumber:substr::ilike', filter.globalproject.projectnumber_substr__ilike, style=style) %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% 'Project Type' | $T8 %]</th>
+   <td>[% L.select_tag('filter.globalproject.project_type_id', SELF.project_types, default=filter.globalproject.project_type_id, title_key='description', with_empty=1, style=style) %]</td>
+  </tr>
+  <tr>
+   <th align="right">[% LxERP.t8('Transaction description') %]</th>
+   <td>[% L.input_tag('filter.transaction_description:substr::ilike', filter.transaction_description_substr__ilike, style=style) %]</td>
   </tr>
   <tr>
    <th align="right">[% 'Order Date' | $T8 %] [% 'From Date' | $T8 %]</th>
@@ -36,15 +45,10 @@
   </tr>
  </table>
 
-[% L.hidden_tag('action', 'FinancialControllingReport/dispatch') %]
 [% 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')%]
-
-
-<a href='#' onClick='javascript:$("#filter_table input").attr("value","");$("#filter_table option").attr("selected","")'>[% 'Reset' | $T8 %]</a>
-
+[% L.button_tag('$("#filter_form").resetForm()', LxERP.t8('Reset')) %]
 </div>
 
 </form>