Merge branch 'b-3.6.1' into mebil

[kivitendo-erp.git] / templates / webpages / wh / report_filter.html

diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
index c1dea3f..f0635c1 100644 (file)
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -106,6 +106,10 @@
         <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
         <td><input name="description" size=40></td>
        </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Partsgroup' | $T8 %]:</th>
+        <td>[% L.select_tag('partsgroup_id', PARTSGROUPS, value_key = 'id', title_key = 'partsgroup', with_empty = 1) %]</td>
+       </tr>
        <tr>
         <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
         <td><input name="chargenumber" size=40></td>
@@ -162,6 +166,7 @@
          [% L.input_number_tag("per_page", 20, size=4) %]
         </td>
        </tr>
+       [% CUSTOM_VARIABLES_FILTER_CODE %]
       </table>
      </td>
     </tr>
@@ -215,17 +220,9 @@
         <td align="right"><input name="l_list_price" id="l_list_price" class="checkbox" type="checkbox" value="Y"></td>
         <td nowrap><label for="l_list_price">[% 'List Price' | $T8 %]</label></td>
        </tr>
-       [% IF INCLUDABLE_CVAR_CONFIGS %]
-         <tr><td colspan="6"><hr noshade height="1"></td></tr>
-         [% FOREACH cvar_cfg = INCLUDABLE_CVAR_CONFIGS %]
-         <tr>
-          <td colspan="2" align="left">
-           [% name__ = cvar_cfg.name;
-            L.checkbox_tag("l_cvar_" _ name__, value="1", checked=(cvar_cfg.included_by_default ? 1 : ''), label=cvar_cfg.description) %]
-          </td>
-         </tr>
-         [% END %]
-       [% END %]
+      </table>
+      <table>
+       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
       </table>
      </td>
     </tr>