locale/en/locales.pl ausgef<FC>hrt.

diff --git a/templates/webpages/do/stock_in_form_en.html b/templates/webpages/do/stock_in_form_en.html
index 6b95a479347298a4aeb0a4c370f7fcba58d9dd48..277c7e44dec486d4eb0d49545b3fb25e7b21fa8e 100644 (file)
--- a/templates/webpages/do/stock_in_form_en.html
+++ b/templates/webpages/do/stock_in_form_en.html
@@ -92,7 +92,9 @@
      <th class="listheading">Warehouse</th>
      <th class="listheading">Bin</th>
      <th class="listheading">Charge Number</th>
+     [% IF conf_show_best_before %]
      <th class="listheading">Best Before</th>
+     [% END %]
      <th align="right" class="listheading">Qty</th>
      <th align="right" class="listheading">Unit</th>
     </tr>
@@ -106,7 +108,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>
 
@@ -122,12 +126,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>
@@ -158,6 +162,7 @@
  </form>
 
  [%- IF NOT delivered %]
+ [% IF conf_show_best_before %]
   <script type="text/javascript">
     <!--
     [%- FOREACH row = STOCK_INFO %]
@@ -170,6 +175,7 @@
     [%- END %]
     //-->
   </script>
+  [% END %]
   [%- END %]
 
 </body>

diff --git a/templates/webpages/do/stock_out_form_en.html b/templates/webpages/do/stock_out_form_en.html
index f2ad437ea284d8a37b6b135571db245ae810d50c..a1c7ce3b42939b0aac5f27a2cf13883f7c994c67 100644 (file)
--- a/templates/webpages/do/stock_out_form_en.html
+++ b/templates/webpages/do/stock_out_form_en.html
@@ -60,7 +60,9 @@
      <th class="listheading">Warehouse</th>
      <th class="listheading">Bin</th>
      <th class="listheading">Charge Number</th>
+     [% IF conf_show_best_before %]
      <th class="listheading">Best Before</th>
+     [% END %]
      [%- UNLESS delivered %]
      <th align="right" class="listheading">Available qty</th>
      [%- END %]
@@ -74,8 +76,9 @@
      <td>[% HTML.escape(row.warehousedescription) %]</td>
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
      <td>[% HTML.escape(row.bestbefore) %]</td>
-
+     [% END %]
      [%- IF delivered %]
 
      <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
@@ -105,7 +108,9 @@
     <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="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+    [% END %]
     [%- END %]
    </table>
   </p>

diff --git a/templates/webpages/generic/select_part_en.html b/templates/webpages/generic/select_part_en.html
index c06a200f9f4de1b9457546bbf3dabb1da2168b09..01f6ae3545384dc66a5589dcb59ad897b62c5b7e 100644 (file)
--- a/templates/webpages/generic/select_part_en.html
+++ b/templates/webpages/generic/select_part_en.html
@@ -21,8 +21,10 @@
      <th class="listheading">Charge number</th>
      [% END %]
      [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
      <th class="listheading">Best Before</th>
      [% END %]
+     [% END %]
      [% IF has_ean %]
      <th class="listheading">EAN</th>
      [% END %]
@@ -53,12 +55,14 @@
      </td>
      [% END %]
      [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
      <td>
       <input type="hidden" name="new_bestbefore_id_[% loop.count %]" value="[% HTML.escape(part.bestbefore_id) %]">
       <input type="hidden" name="new_bestbefore_[% loop.count %]" value="[% HTML.escape(part.bestbefore) %]">
       [% HTML.escape(part.bestbefore) %]
      </td>
      [% END %]
+     [% END %]
      [% IF has_ean %]
      <td>
       <input type="hidden" name="new_ean_[% loop.count %]" value="[% HTML.escape(part.ean) %]">

diff --git a/templates/webpages/wh/journal_filter_en.html b/templates/webpages/wh/journal_filter_en.html
index 9c577cfe8486eca061593256f414e710674387d2..3db64d01caf50850583fcb0a391de2f4c76d8a59 100644 (file)
--- a/templates/webpages/wh/journal_filter_en.html
+++ b/templates/webpages/wh/journal_filter_en.html
@@ -104,6 +104,7 @@
         <th align="right" nowrap>Charge Number:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       [% IF conf_show_best_before %]
        <tr>
         <th align="right" nowrap>Best Before:</th>
         <td>
@@ -111,6 +112,7 @@
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
         </td>
        </tr>
+       [% END %]
        <tr>
         <th align="right" nowrap>Transfer Quantity:</th>
         <td>
@@ -166,8 +168,10 @@
         <td nowrap><label for="l_partnumber">Part Number</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</label></td>
+        [% IF conf_show_best_before %]
         <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</label></td>
+        [% END %]
        </tr>
        <tr>
         <td align="right"><input name="l_trans_id" id="l_trans_id" class="checkbox" type="checkbox" value="Y"></td>
@@ -208,12 +212,14 @@
 
   <script type="text/javascript">
     <!--
+    [% IF conf_show_best_before %]
     Calendar.setup( {
       inputField : "bestbefore",
       ifFormat :"[% myconfig_jsc_dateformat %]",
       align : "BR",
       button : "bestbefore_trigger"
     });
+    [% END %]
 
     Calendar.setup( {
       inputField : "fromdate",

diff --git a/templates/webpages/wh/removal_parts_selection_en.html b/templates/webpages/wh/removal_parts_selection_en.html
index b730253dcb199704453f0525dbf2871569a710ca..34fec86aaad335a2d343098c447e8e732d9cc02d 100644 (file)
--- a/templates/webpages/wh/removal_parts_selection_en.html
+++ b/templates/webpages/wh/removal_parts_selection_en.html
@@ -34,7 +34,9 @@
      <th class="listheading">Part Number</th>
      <th class="listheading">Part Description</th>
      <th class="listheading">Charge Number</th>
+     [% IF conf_show_best_before %]
      <th class="listheading">Best Before</th>
+     [% END %]
      <th class="listheading">EAN</th>
      <th class="listheading">Available qty</th>
      <th class="listheading">Removal qty</th>
@@ -47,13 +49,17 @@
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     [% IF conf_show_best_before %]
      <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+     [% END %]
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
      <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td>

diff --git a/templates/webpages/wh/report_filter_en.html b/templates/webpages/wh/report_filter_en.html
index e090018b4020f79648e8046306304af1a08a7235..633c18866a36f96a45949d03932fcbebef5f42d8 100644 (file)
--- a/templates/webpages/wh/report_filter_en.html
+++ b/templates/webpages/wh/report_filter_en.html
@@ -104,6 +104,7 @@
         <th align="right" nowrap>Charge Number:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       [% IF conf_show_best_before %]
        <tr>
         <th align="right" nowrap>Best Before:</th>
         <td>
@@ -111,6 +112,7 @@
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
         </td>
        </tr>
+       [% END %]
        <tr>
         <th align="right" nowrap>Qty in stock:</th>
         <td>
@@ -154,8 +156,10 @@
         <td nowrap><label for="l_partnumber">Part Number</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</label></td>
+        [% IF conf_show_best_before %]
         <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</label></td>
+        [% END %]
        </tr>
 
        <tr><td colspan="4"><hr noshade height="1"></td></tr>
@@ -183,6 +187,7 @@
   </p>
  </form>
 
+ [% IF conf_show_best_before %]
  <script type="text/javascript">
    <!--
      Calendar.setup( {
@@ -193,6 +198,7 @@
      });
    //-->
  </script>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/wh/transfer_parts_selection_en.html b/templates/webpages/wh/transfer_parts_selection_en.html
index f2d5fa3667f1013ba0234eb7073f907f974efcd1..2915609726cc623f242e9f1513b51ac60d17422c 100644 (file)
--- a/templates/webpages/wh/transfer_parts_selection_en.html
+++ b/templates/webpages/wh/transfer_parts_selection_en.html
@@ -66,7 +66,9 @@
      <th class="listheading">Part Number</th>
      <th class="listheading">Part Description</th>
      <th class="listheading">Charge Number</th>
+     [% IF conf_show_best_before %]
      <th class="listheading">Best Before</th>
+     [% END %]
      <th class="listheading">EAN</th>
      <th class="listheading">Available qty</th>
      <th class="listheading" colspan="2">Transfer qty</th>
@@ -80,13 +82,17 @@
      <input type="hidden" name="partnumber_[% loop.count %]" value="[% HTML.escape(row.partnumber) %]">
      <input type="hidden" name="partdescription_[% loop.count %]" value="[% HTML.escape(row.partdescription) %]">
      <input type="hidden" name="chargenumber_[% loop.count %]" value="[% HTML.escape(row.chargenumber) %]">
+     [% IF conf_show_best_before %]
      <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">
+     [% END %]
      <input type="hidden" name="ean_[% loop.count %]" value="[% HTML.escape(row.ean) %]">
      <td>[% HTML.escape(row.bindescription) %]</td>
      <td>[% HTML.escape(row.partnumber) %]</td>
      <td>[% HTML.escape(row.partdescription) %]</td>
      <td>[% HTML.escape(row.chargenumber) %]</td>
+     [% IF conf_show_best_before %]
      <td>[% HTML.escape(row.bestbefore) %]</td>
+     [% END %]
      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td><input name="qty_[% loop.count %]" size="8" style="text-align: right"></td>

diff --git a/templates/webpages/wh/warehouse_selection_assembly_en.html b/templates/webpages/wh/warehouse_selection_assembly_en.html
index 095df6252913b664d18c33df229e3fdbbc97aa44..ddbdcd6388ef66feed465a63d0a050db4ac56425 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_assembly_en.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_en.html
@@ -105,13 +105,15 @@
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
+    [% IF conf_show_best_before %]
     <tr>
      <th align="right" nowrap>Best Before</th>
      <td>
        <input name="bestbefore" id="bestbefore" size="11" value="[% HTML.escape(bestbefore) %]" title="[% myconfig_dateformat %]">
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
-       </td>
+     </td>
     </tr>
+    [% END %]
 
     <tr>
      <th align="right" nowrap>Quantity</th>
@@ -139,6 +141,7 @@
   </p>
  </form>
 
+ [% IF conf_show_best_before %]
  <script type="text/javascript">
    <!--
      Calendar.setup( {
@@ -149,6 +152,7 @@
      });
    //-->
  </script>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_en.html b/templates/webpages/wh/warehouse_selection_en.html
index 34914e70abaf545d37ea82767ea661666d432513..6266915586a864c6bd901889c58907548c13809c 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_en.html
+++ b/templates/webpages/wh/warehouse_selection_en.html
@@ -116,6 +116,7 @@
      <td><input name="chargenumber" size="30"></td>
     </tr>
 
+    [% IF conf_show_best_before %]
     <tr>
      <th align="right" nowrap>Best Before</th>
      <td>
@@ -123,6 +124,7 @@
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>
+    [% END %]
 
     <tr>
      <th align="right" nowrap>EAN</th>
@@ -136,6 +138,7 @@
   </p>
  </form>
 
+ [% IF conf_show_best_before %]
  <script type="text/javascript">
    <!--
      Calendar.setup( {
@@ -146,6 +149,7 @@
      });
    //-->
  </script>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_stock_en.html b/templates/webpages/wh/warehouse_selection_stock_en.html
index 6b0076e21bd206b5c5188f81f2ca2727527ea862..559efc85a9944e588f5947b3c571ec96e2074e74 100644 (file)
--- a/templates/webpages/wh/warehouse_selection_stock_en.html
+++ b/templates/webpages/wh/warehouse_selection_stock_en.html
@@ -105,6 +105,7 @@
      <td><input name="chargenumber" size="30" value="[% HTML.escape(chargenumber) %]"></td>
     </tr>
 
+    [% IF conf_show_best_before %]
     <tr>
      <th align="right" nowrap>Best Before</th>
      <td>
@@ -112,6 +113,7 @@
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>
+    [% END %]
 
     <tr>
      <th align="right" nowrap>EAN</th>
@@ -144,6 +146,7 @@
   </p>
  </form>
 
+ [% IF conf_show_best_before %]
  <script type="text/javascript">
    <!--
      Calendar.setup( {
@@ -154,6 +157,7 @@
      });
    //-->
  </script>
+  [% END %]
 
 </body>
 </html>