Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

[kivitendo-erp.git] / templates / webpages / do / stock_in_form.html

diff --git a/templates/webpages/do/stock_in_form.html b/templates/webpages/do/stock_in_form.html
index f36e495..99b5db1 100644 (file)
--- a/templates/webpages/do/stock_in_form.html
+++ b/templates/webpages/do/stock_in_form.html
@@ -1,8 +1,6 @@
 [%- USE T8 %]
 [%- USE L %]
 [%- USE HTML %][%- USE LxERP %][%- USE JavaScript %]
-<body[%- UNLESS delivered %] onload="on_load();"[%- END %]>
-
  [%- UNLESS delivered %]
  <script type="text/javascript">
   <!--
@@ -30,7 +28,7 @@
         control.options[initial_bin_index].selected = true;
       }
 
-      function on_load() {
+      $(function(){
         [%- USE STOCK_INFO_it = Iterator(STOCK_INFO) %][%- FOREACH si = STOCK_INFO_it %]
           // new si for wh [% si.warehouse_id %] bin [% si.bin_id %]
           [%- SET warehouse_selected = '0' %]
@@ -48,7 +46,7 @@
           warehouse_selected([% STOCK_INFO_it.count %], 0);
           [%- END %]
         [%- END %]
-      }
+      });
     -->
  </script>
  [%- END %]
@@ -95,7 +93,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 %]
      <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
@@ -111,7 +109,7 @@
      <td>[% HTML.escape(row.warehouse_description) %]</td>
      <td>[% HTML.escape(row.bin_description) %]</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 %]
      <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
@@ -129,7 +127,7 @@
 
      <td><select name="bin_id_[% loop.count %]" id="bin_id_[% loop.count %]"></select></td>
      <td><input name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]"></td>
-     [% IF conf_show_best_before %]
+     [% IF INSTANCE_CONF.get_show_bestbefore %]
      <td>
        [% L.date_tag('bestbefore_'_ loop.count, row.bestbefore) %]
      </td>