X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fwh%2Freport_filter.html;h=9d79535c6db972522e6d314eb4186496089477ac;hb=ec4cffa8a9fe604ecaab2a0af734b5e28c040935;hp=77a5070be5459c3eefef09db350a6d88b8708395;hpb=fc41222c61dbee590005f04c50e8603581462543;p=kivitendo-erp.git

diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html
index 77a5070be..9d79535c6 100644
--- a/templates/webpages/wh/report_filter.html
+++ b/templates/webpages/wh/report_filter.html
@@ -1,6 +1,10 @@
 [%- USE T8 %]
 [%- USE L %]
+[%- USE P %]
+[%- USE LxERP %]
 [%- USE HTML %][%- USE JavaScript %]
+<h1>[% 'Report about warehouse contents' | $T8 %]</h1>
+
  <script type="text/javascript">
    <!--
       warehouses = new Array();
@@ -63,13 +67,10 @@
      -->
  </script>
 
- <div class="listtop">[% 'Report about warehouse contents' | $T8 %]</div>
-
- <form method="post" name="Form" action="wh.pl">
+ <form method="post" name="Form" action="wh.pl" id="form">
 
   <input type="hidden" name="nextsub" value="generate_report">
 
-  <p>
    <table>
     <tr>
      <th class="listheading" align="left" valign="top" colspan="6" nowrap>[% 'Filter' | $T8 %]</th>
@@ -95,7 +96,11 @@
        </tr>
        <tr>
         <th align="right" nowrap>[% 'Part Number' | $T8 %]:</th>
-        <td><input name="partnumber" size=20></td>
+        <td><input name="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>
@@ -105,7 +110,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>
@@ -128,10 +133,27 @@
          </select>
         </td>
        </tr>
+       <tr>
         <th align="right" nowrap>[% 'Stock Qty for Date' | $T8 %]:</th>
         <td>[% L.date_tag('date') %]</td>
-       <tr>
        </tr>
+        <tr>
+        <th align="right">
+          [% "basis for stock value" | $T8 %]:
+        </th>
+        <td align="left">
+         [% L.radio_button_tag("stock_value_basis", value='purchase_price', checked=1, label=LxERP.t8('Purchase price')) %]
+         [% L.radio_button_tag("stock_value_basis", value='list_price',     checked=0, label=LxERP.t8('List Price')) %]
+        </td>
+       </tr>
+        <th align="right">
+          [% "List all rows" | $T8 %]:
+        </th>
+        <td align="left">
+         [% L.yes_no_tag("allrows", 1) %]
+        </td>
+       </tr>
+
       </table>
      </td>
     </tr>
@@ -160,13 +182,13 @@
         <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 %]
        </tr>
 
-       <tr><td colspan="4"><hr noshade height="1"></td></tr>
+       <tr><td colspan="6"><hr noshade height="1"></td></tr>
 
        <tr>
         <td align="right"><input name="subtotal" id="subtotal" class="checkbox" type="checkbox" value="Y"></td>
@@ -180,16 +202,13 @@
        <tr>
         <td align="right"><input name="l_stock_value" id="l_stock_value" class="checkbox" type="checkbox" value="Y"></td>
         <td nowrap><label for="l_stock_value">[% 'Stock value' | $T8 %]</label></td>
+        <td align="right"><input name="l_purchase_price" id="l_purchase_price" class="checkbox" type="checkbox" value="Y"></td>
+        <td nowrap><label for="l_purchase_price">[% 'Purchase price' | $T8 %]</label></td>
+        <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>
-
       </table>
      </td>
     </tr>
    </table>
-  </p>
-
-  <p>
-   <input type="submit" class="submit" name="action" value="[% 'Continue' | $T8 %]">
-  </p>
  </form>
-