X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fdo%2Fstock_in_form_master.html;h=238747ef6c8f325eb22029c22434a593849191f6;hb=5ec5ebedb4ea9789a34ded543395fed981382636;hp=42208f2e09741e01cae4d04f2cd0a8cf034fbd3a;hpb=74c7135dd76391b581476daffe240f2829493744;p=kivitendo-erp.git

diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
index 42208f2e0..238747ef6 100644
--- a/templates/webpages/do/stock_in_form_master.html
+++ b/templates/webpages/do/stock_in_form_master.html
@@ -1,3 +1,4 @@
+[%- USE T8 %]
 [% USE HTML %][% USE LxERP %][% USE JavaScript %]<body[% UNLESS delivered %] onload="on_load();"[% END %]>
 
  [%- UNLESS delivered %]
@@ -61,15 +62,15 @@
   <p>
    <table>
     <tr>
-     <td><translate>Part Number</translate></td>
+     <td>[% 'Part Number' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.partnumber) %]</td>
     </tr>
     <tr>
-     <td><translate>Description</translate></td>
+     <td>[% 'Description' | $T8 %]</td>
      <td>[% HTML.escape(PART_INFO.description) %]</td>
     </tr>
     <tr>
-     <td><translate>Qty according to delivery order</translate></td>
+     <td>[% 'Qty according to delivery order' | $T8 %]</td>
      <td>[% HTML.escape(do_qty) %] [% HTML.escape(do_unit) %]</td>
     </tr>
    </table>
@@ -89,11 +90,14 @@
    <table>
     <tr class="listheading">
      <th class="listheading">&nbsp;</th>
-     <th class="listheading"><translate>Warehouse</translate></th>
-     <th class="listheading"><translate>Bin</translate></th>
-     <th class="listheading"><translate>Charge Number</translate></th>
-     <th align="right" class="listheading"><translate>Qty</translate></th>
-     <th align="right" class="listheading"><translate>Unit</translate></th>
+     <th class="listheading">[% 'Warehouse' | $T8 %]</th>
+     <th class="listheading">[% 'Bin' | $T8 %]</th>
+     <th class="listheading">[% 'Charge Number' | $T8 %]</th>
+     [% IF conf_show_best_before %]
+     <th class="listheading">[% 'Best Before' | $T8 %]</th>
+     [% END %]
+     <th align="right" class="listheading">[% 'Qty' | $T8 %]</th>
+     <th align="right" class="listheading">[% 'Unit' | $T8 %]</th>
     </tr>
 
     [%- FOREACH row = STOCK_INFO %]
@@ -105,6 +109,9 @@
      <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 %]
+     <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
      <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
      <td>[% HTML.escape(row.unit) %]</td>
 
@@ -120,6 +127,12 @@
 
      <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 %]
+     <td>
+       <input name="bestbefore_[% loop.count %]" id="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]" size="11" title="[% myconfig_dateformat %]">
+       <input type="button" name="b_bestbefore_[% loop.count %]" id="bestbefore_trigger_[% loop.count %]" value="?">
+     </td>
+     [% END %]
      <td><input name="qty_[% loop.count %]" size="12" value="[% HTML.escape(LxERP.format_amount(row.qty)) %]"></td>
 
      <td>
@@ -141,14 +154,31 @@
 
   <p>
    [%- IF delivered %]
-   <button type="button" class="submit" name="action" onclick="window.close()"><translate>Close Window</translate></button>
+   <button type="button" class="submit" name="action" onclick="window.close()">[% 'Close Window' | $T8 %]</button>
    [%- ELSE %]
-   <input class="submit" type="submit" name="action" value="<translate>Update</translate>">
-   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="[% 'Update' | $T8 %]">
+   <input class="submit" type="submit" name="action" value="[% 'Continue' | $T8 %]">
    [%- END %]
   </p>
  </form>
 
+ [%- IF NOT delivered %]
+ [% IF conf_show_best_before %]
+  <script type="text/javascript">
+    <!--
+    [%- FOREACH row = STOCK_INFO %]
+    Calendar.setup( {
+      inputField : "bestbefore_[% loop.count %]",
+      ifFormat :"[% myconfig_jsc_dateformat %]",
+      align : "BR",
+      button : "bestbefore_trigger_[% loop.count %]"
+    });
+    [%- END %]
+    //-->
+  </script>
+  [% END %]
+  [%- END %]
+
 </body>
 </html>