X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdo%2Fstock_out_form.html;h=0e33bd153f6d1ff336baad810d8718cfc184acdb;hb=59274d46487423806bdc4c76ea405c57d9e45c0a;hp=6aee3510f051fb0206d8216b17a23694ee0be1d4;hpb=0e723a19cf157a78a57458dda69fd1ea36e68ea1;p=kivitendo-erp.git

diff --git a/templates/webpages/do/stock_out_form.html b/templates/webpages/do/stock_out_form.html
index 6aee3510f..0e33bd153 100644
--- a/templates/webpages/do/stock_out_form.html
+++ b/templates/webpages/do/stock_out_form.html
@@ -1,5 +1,6 @@
 [%- USE T8 %]
 [%- USE HTML %][%- USE LxERP %]
+<h1>[% title %]</h1>
 
  [%- IF delivered %]
  [%- SET RO = ' readonly' %]
@@ -13,8 +14,6 @@
 
  <form method="post" action="do.pl" name="Form">
 
-  <div class="listtop">[% title %]</div>
-
   [%- IF ERRORS && ERRORS.size %]
   <p><font color="#ff0000">[% ERRORS.join('<br>') %]</font></p>
   [%- END %]
@@ -41,6 +40,14 @@
 
   <p><button type="button" onclick="window.close()">[% 'Close Window' | $T8 %]</button></p>
 
+  <script type="text/javascript">
+   <!--
+       $(function(){
+         $(window.opener.document.getElementsByName("stock_out_[% HTML.escape(row) %]")).val("");
+       });
+     -->
+  </script>
+
   [%- ELSE %]
 
   <input type="hidden" name="nextsub"   value="set_stock_out">
@@ -61,7 +68,7 @@
      <th class="listheading">[% 'Warehouse' | $T8 %]</th>
      <th class="listheading">[% 'Bin' | $T8 %]</th>
      <th class="listheading">[% 'Charge Number' | $T8 %]</th>
-     [% IF conf_show_best_before %]
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
      <th class="listheading">[% 'Best Before' | $T8 %]</th>
      [% END %]
      [%- UNLESS delivered %]
@@ -77,7 +84,7 @@
      <td>[% HTML.escape(row.warehousedescription) %]</td>
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
-     [% IF conf_show_best_before %]
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
      <td>[% HTML.escape(row.bestbefore) %]</td>
      [% END %]
      [%- IF delivered %]
@@ -109,7 +116,8 @@
     <input type="hidden" name="warehouse_id_[% loop.count %]" value="[% HTML.escape(row.warehouse_id) %]">
     <input type="hidden" name="bin_id_[% loop.count %]"       value="[% HTML.escape(row.bin_id) %]">
     <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
-    [% IF conf_show_best_before %]
+    <input type="hidden" name="delivery_order_items_stock_id_[% loop.count %]" value="[% HTML.escape(row.stock_delivery_order_items_stock_id) %]">
+    [% IF INSTANCE_CONF.get_show_bestbefore %]
     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
     [% END %]
     [%- END %]