epic-ts

[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 a5cbe12..70fb4f1 100644 (file)
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -1,6 +1,7 @@
  [%- USE T8 %]
  [%- USE L %]
-[% USE HTML %][% USE JavaScript %]<body onload="on_load();">
+[%- USE HTML %][%- USE JavaScript %]
+<h1>[% 'Report about warehouse contents' | $T8 %]</h1>
  
   <script type="text/javascript">
     <!--
@@ -57,15 +58,13 @@
          control.options[bin_index].selected = true;
        }
  
-      function on_load() {
+      $(function () {
          warehouse_selected(0, 0);
          document.Form.partnumber.focus();
-      }
+      });
       -->
   </script>
  
- <div class="listtop">[% 'Report about warehouse contents' | $T8 %]</div>
-
   <form method="post" name="Form" action="wh.pl">
  
    <input type="hidden" name="nextsub" value="generate_report">
@@ -106,12 +105,11 @@
          <th align="right" nowrap>[% 'Charge Number' | $T8 %]:</th>
          <td><input name="chargenumber" size=40></td>
         </tr>
-       [% IF conf_show_best_before %]
+       [% IF INSTANCE_CONF.get_show_bestbefore %]
         <tr>
          <th align="right" nowrap>[% 'Best Before' | $T8 %]:</th>
          <td>
-         <input name="bestbefore" id="bestbefore" size="11" title="[% myconfig_dateformat %]">
-         <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
+          [% L.date_tag('bestbefore') %]
          </td>
         </tr>
         [% END %]
@@ -162,7 +160,7 @@
          <td nowrap><label for="l_partnumber">[% 'Part Number' | $T8 %]</label></td>
          <td align="right"><input name="l_chargenumber" id="l_chargenumber" class="checkbox" type="checkbox" value="Y" checked></td>
          <td nowrap><label for="l_chargenumber">[% 'Charge Number' | $T8 %]</label></td>
-        [% IF conf_show_best_before %]
+        [% IF INSTANCE_CONF.get_show_bestbefore %]
          <td align="right"><input name="l_bestbefore" id="l_bestbefore" class="checkbox" type="checkbox" value="Y" checked></td>
          <td nowrap><label for="l_bestbefore">[% 'Best Before' | $T8 %]</label></td>
          [% END %]
@@ -175,6 +173,8 @@
          <td nowrap><label for="subtotal">[% 'Subtotal' | $T8 %]</label></td>
          <td align="right"><input name="include_empty_bins" id="include_empty_bins" class="checkbox" type="checkbox" value="Y"></td>
          <td nowrap><label for="include_empty_bins">[% 'Include empty bins' | $T8 %]</label></td>
+        <td align="right"><input name="include_invalid_warehouses" id="include_invalid_warehouses" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="include_invalid_warehouses">[% 'Include invalid warehouses ' | $T8 %]</label></td>
         </tr>
  
         <tr>
@@ -193,18 +193,3 @@
    </p>
   </form>
  
- [% IF conf_show_best_before %]
- <script type="text/javascript">
-   <!--
-     Calendar.setup( {
-     inputField : "bestbefore",
-     ifFormat :"[% myconfig_jsc_dateformat %]",
-     align : "BR",
-     button : "bestbefore_trigger"
-     });
-   //-->
- </script>
- [% END %]
-
-</body>
-</html>