Merge branch 'test' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / templates / webpages / wh / journal_filter.html
diff --git a/templates/webpages/wh/journal_filter.html b/templates/webpages/wh/journal_filter.html

index 0a79c80..694e1fd 100644 (file)
--- a/templates/webpages/wh/journal_filter.html
+++ b/templates/webpages/wh/journal_filter.html
@@ -1,7 +1,8 @@
  [%- USE T8 %]
  [%- USE L %]
+[%- USE P %]
  [%- USE HTML %][%- USE JavaScript %]
-<body onload="on_load();">
+<h1>[% 'Report about warehouse transactions' | $T8 %]</h1>
  
   <script type="text/javascript">
     <!--
@@ -58,20 +59,15 @@
          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 transactions' | $T8 %]</div>
-
- <form method="post" name="Form" action="wh.pl">
-
-  <input type="hidden" name="nextsub" value="generate_journal">
+ <form method="post" name="Form" action="wh.pl" id="form">
  
-  <p>
     <table>
      <tr>
       <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
@@ -97,7 +93,11 @@
         </tr>
         <tr>
          <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
-        <td><input name="partnumber" id="partnumber" size=20></td>
+        <td><input name="partnumber" id="partnumber" size=20 value="[% partnumber %]"></td>
+       </tr>
+       <tr>
+        <th align="right" nowrap>[% 'Parts Classification' | $T8 %]:</th>
+        <td>[% P.part.select_classification('classification_id') %]</td>
         </tr>
         <tr>
          <th align="right" nowrap>[% 'Part Description' | $T8 %]:</th>
@@ -107,7 +107,7 @@
          <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>
@@ -142,6 +142,7 @@
            [% L.date_tag('todate') %]
          </td>
         </tr>
+       [% CUSTOM_VARIABLES_FILTER_CODE %]
        </table>
       </td>
      </tr>
@@ -168,7 +169,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 %]
@@ -194,21 +195,16 @@
         <tr>
          <td align="right"><input name="l_employee" id="l_employee" class="checkbox" type="checkbox" value="Y"></td>
          <td nowrap><label for="l_employee">[% 'Employee' | $T8 %]</label></td>
-        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y"></td>
+        <td align="right"><input name="l_oe_id" id="l_oe_id" class="checkbox" type="checkbox" value="Y" checked></td>
          <td nowrap><label for="l_oe_id">[% 'Document' | $T8 %]</label></td>
          <td align="right"><input name="l_projectnumber" id="l_projectnumber" class="checkbox" type="checkbox" value="Y" checked></td>
          <td nowrap><label for="l_projectnumber">[% 'Project Number' | $T8 %]</label></td>
         </tr>
        </table>
+      <table>
+       [% CUSTOM_VARIABLES_INCLUSION_CODE %]
+      </table>
       </td>
      </tr>
     </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
-  </p>
   </form>
-
-</body>
-</html>