From: Bernd Blessmann <bibi@online.de>
Date: Sat, 6 Mar 2010 01:06:05 +0000 (+0100)
Subject: Eingabe, Anzeige und Filter für Mindesthaltbarkeitsanzeige ist
X-Git-Tag: release-2.6.1beta1~7
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=3bd73b5b3b3c828b227a229a6b14a3f5a143da87;p=kivitendo-erp.git

Eingabe, Anzeige und Filter für Mindesthaltbarkeitsanzeige ist
über show_best_before einschaltbar.
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 905c629db..51c43d158 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -772,6 +772,7 @@ sub _prepare_html_template {
   $additional_params->{"conf_latex_templates"}        = $main::latex;
   $additional_params->{"conf_opendocument_templates"} = $main::opendocument_templates;
   $additional_params->{"conf_vertreter"}              = $main::vertreter;
+  $additional_params->{"conf_show_best_before"}       = $main::show_best_before;
 
   if (%main::debug_options) {
     map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
diff --git a/config/lx-erp.conf b/config/lx-erp.conf
index 21973a454..91bfc83b4 100644
--- a/config/lx-erp.conf
+++ b/config/lx-erp.conf
@@ -2,7 +2,7 @@ use Cwd;
 
 use vars qw($dbcharset $eur $ghostscript_bin $html2ps_bin $language $latex_bin $latex_templates $lizenzen $memberfile
             $opendocument_templates $openofficeorg_daemon $openofficeorg_daemon_port $openofficeorg_writer_bin
-            $pg_dump_exe $pg_restore_exe $sendmail $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
+            $pg_dump_exe $pg_restore_exe $sendmail $show_best_before $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
 
 # path to user configuration files
 $userspath = "users";
@@ -43,6 +43,9 @@ $webdav = 0;
 $lizenzen = 1;
 $vertreter = 0;
 
+# Zeige Felder für Mindesthaltbarkeitsdatum
+$show_best_before = 0;
+
 ## Support fuer OpenDocument-Vorlagen
 # Diese Option legt fest, ob OpenDocument-Vorlagen generell verfuegbar sind.
 $opendocument_templates = 1;
diff --git a/config/lx-erp.conf.default b/config/lx-erp.conf.default
index 8e7280d10..e031c3e05 100644
--- a/config/lx-erp.conf.default
+++ b/config/lx-erp.conf.default
@@ -2,7 +2,7 @@ use Cwd;
 
 use vars qw($dbcharset $eur $ghostscript_bin $html2ps_bin $language $latex_bin $latex_templates $lizenzen $memberfile
             $opendocument_templates $openofficeorg_daemon $openofficeorg_daemon_port $openofficeorg_writer_bin
-            $pg_dump_exe $pg_restore_exe $sendmail $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
+            $pg_dump_exe $pg_restore_exe $sendmail $show_best_before $sid $spool $templates $userspath $vertreter $webdav $xvfb_bin);
 
 # path to user configuration files
 $userspath = "users";
@@ -43,6 +43,9 @@ $webdav = 0;
 $lizenzen = 1;
 $vertreter = 0;
 
+# Zeige Felder für Mindesthaltbarkeitsdatum
+$show_best_before = 0;
+
 ## Support fuer OpenDocument-Vorlagen
 # Diese Option legt fest, ob OpenDocument-Vorlagen generell verfuegbar sind.
 $opendocument_templates = 1;
diff --git a/templates/webpages/do/stock_in_form_master.html b/templates/webpages/do/stock_in_form_master.html
index 6b2caab24..e8c411b3a 100644
--- a/templates/webpages/do/stock_in_form_master.html
+++ b/templates/webpages/do/stock_in_form_master.html
@@ -92,7 +92,9 @@
      <th class="listheading"><translate>Warehouse</translate></th>
      <th class="listheading"><translate>Bin</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
+     [% IF conf_show_best_before %]
      <th class="listheading"><translate>Best Before</translate></th>
+     [% END %]
      <th align="right" class="listheading"><translate>Qty</translate></th>
      <th align="right" class="listheading"><translate>Unit</translate></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_master.html b/templates/webpages/do/stock_out_form_master.html
index 8e77f9669..e8f7a13a6 100644
--- a/templates/webpages/do/stock_out_form_master.html
+++ b/templates/webpages/do/stock_out_form_master.html
@@ -60,7 +60,9 @@
      <th class="listheading"><translate>Warehouse</translate></th>
      <th class="listheading"><translate>Bin</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
+     [% IF conf_show_best_before %]
      <th class="listheading"><translate>Best Before</translate></th>
+     [% END %]
      [%- UNLESS delivered %]
      <th align="right" class="listheading"><translate>Available qty</translate></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_master.html b/templates/webpages/generic/select_part_master.html
index 732ed2f5d..433bceb11 100644
--- a/templates/webpages/generic/select_part_master.html
+++ b/templates/webpages/generic/select_part_master.html
@@ -21,8 +21,10 @@
      <th class="listheading"><translate>Charge number</translate></th>
      [% END %]
      [% IF has_bestbefore %]
+     [% IF conf_show_best_before %]
      <th class="listheading"><translate>Best Before</translate></th>
      [% END %]
+     [% END %]
      [% IF has_ean %]
      <th class="listheading"><translate>EAN</translate></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_master.html b/templates/webpages/wh/journal_filter_master.html
index 946a04c27..550604505 100644
--- a/templates/webpages/wh/journal_filter_master.html
+++ b/templates/webpages/wh/journal_filter_master.html
@@ -104,6 +104,7 @@
         <th align="right" nowrap><translate>Charge Number</translate>:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       [% IF conf_show_best_before %]
        <tr>
         <th align="right" nowrap><translate>Best Before</translate>:</th>
         <td>
@@ -111,6 +112,7 @@
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
         </td>
        </tr>
+       [% END %]
        <tr>
         <th align="right" nowrap><translate>Transfer Quantity</translate>:</th>
         <td>
@@ -166,8 +168,10 @@
         <td nowrap><label for="l_partnumber"><translate>Part Number</translate></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"><translate>Charge Number</translate></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"><translate>Best Before</translate></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_master.html b/templates/webpages/wh/removal_parts_selection_master.html
index 0f3751383..ec48a7840 100644
--- a/templates/webpages/wh/removal_parts_selection_master.html
+++ b/templates/webpages/wh/removal_parts_selection_master.html
@@ -34,7 +34,9 @@
      <th class="listheading"><translate>Part Number</translate></th>
      <th class="listheading"><translate>Part Description</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
+     [% IF conf_show_best_before %]
      <th class="listheading"><translate>Best Before</translate></th>
+     [% END %]
      <th class="listheading"><translate>EAN</translate></th>
      <th class="listheading"><translate>Available qty</translate></th>
      <th class="listheading"><translate>Removal qty</translate></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_master.html b/templates/webpages/wh/report_filter_master.html
index 0c789a62f..4a65f66e3 100644
--- a/templates/webpages/wh/report_filter_master.html
+++ b/templates/webpages/wh/report_filter_master.html
@@ -104,6 +104,7 @@
         <th align="right" nowrap><translate>Charge Number</translate>:</th>
         <td><input name="chargenumber" size=40></td>
        </tr>
+       [% IF conf_show_best_before %]
        <tr>
         <th align="right" nowrap><translate>Best Before</translate>:</th>
         <td>
@@ -111,6 +112,7 @@
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
         </td>
        </tr>
+       [% END %]
        <tr>
         <th align="right" nowrap><translate>Qty in stock</translate>:</th>
         <td>
@@ -154,8 +156,10 @@
         <td nowrap><label for="l_partnumber"><translate>Part Number</translate></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"><translate>Charge Number</translate></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"><translate>Best Before</translate></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_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
index 8b78a770a..cbe242914 100644
--- a/templates/webpages/wh/transfer_parts_selection_master.html
+++ b/templates/webpages/wh/transfer_parts_selection_master.html
@@ -66,7 +66,9 @@
      <th class="listheading"><translate>Part Number</translate></th>
      <th class="listheading"><translate>Part Description</translate></th>
      <th class="listheading"><translate>Charge Number</translate></th>
+     [% IF conf_show_best_before %]
      <th class="listheading"><translate>Best Before</translate></th>
+     [% END %]
      <th class="listheading"><translate>EAN</translate></th>
      <th class="listheading"><translate>Available qty</translate></th>
      <th class="listheading" colspan="2"><translate>Transfer qty</translate></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_master.html b/templates/webpages/wh/warehouse_selection_assembly_master.html
index 27f034439..7272fe808 100644
--- a/templates/webpages/wh/warehouse_selection_assembly_master.html
+++ b/templates/webpages/wh/warehouse_selection_assembly_master.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><translate>Best Before</translate></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><translate>Quantity</translate></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_master.html b/templates/webpages/wh/warehouse_selection_master.html
index c6da317e4..e070a464b 100644
--- a/templates/webpages/wh/warehouse_selection_master.html
+++ b/templates/webpages/wh/warehouse_selection_master.html
@@ -119,6 +119,7 @@
      <td><input name="chargenumber" size="30"></td>
     </tr>
 
+    [% IF conf_show_best_before %]
     <tr>
      <th align="right" nowrap><translate>Best Before</translate></th>
      <td>
@@ -126,6 +127,7 @@
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>
+    [% END %]
 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></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_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
index 9b68561ff..e8b072c80 100644
--- a/templates/webpages/wh/warehouse_selection_stock_master.html
+++ b/templates/webpages/wh/warehouse_selection_stock_master.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><translate>Best Before</translate></th>
      <td>
@@ -112,6 +113,7 @@
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>
+    [% END %]
 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></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>