Eingabe, Anzeige und Filter für Mindesthaltbarkeitsanzeige ist

über show_best_before einschaltbar.

diff --git a/SL/Form.pm b/SL/Form.pm
index 905c629dbdae887c4c1100d0e6570ed51c1aae0a..51c43d158ab4a15b34617853da51809d96c3a374 100644 (file)
--- 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_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;
 
   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 21973a4546deb49324c758aa04dbdecbb5359254..91bfc83b48a21935d33de5fadca6d80e9f35dcbb 100644 (file)
--- 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
 
 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";
 
 # path to user configuration files
 $userspath = "users";


@@ -43,6 +43,9 @@ $webdav = 0;
 $lizenzen = 1;
 $vertreter = 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;
 ## 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 8e7280d10e27ce632ba4a9c3099dbaba11bb7e33..e031c3e056f32a3119b34e2df41650e2856da527 100644 (file)
--- 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
 
 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";
 
 # path to user configuration files
 $userspath = "users";


@@ -43,6 +43,9 @@ $webdav = 0;
 $lizenzen = 1;
 $vertreter = 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;
 ## 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 6b2caab24ab6f76bfd287e3d4fa02151ecbd99bb..e8c411b3a90a7e620b1e9d4a2fb403cc8c70fe04 100644 (file)
--- 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>
      <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>
      <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>
      <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>
      <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>
      <td>[% HTML.escape(row.bestbefore) %]</td>

+     [% END %]

      <td>[% HTML.escape(LxERP.format_amount(row.qty)) %]</td>
      <td>[% HTML.escape(row.unit) %]</td>
 
      <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>
 
      <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>
      <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>
      <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 %]
  </form>
 
  [%- IF NOT delivered %]

+ [% IF conf_show_best_before %]

   <script type="text/javascript">
     <!--
     [%- FOREACH row = STOCK_INFO %]
   <script type="text/javascript">
     <!--
     [%- FOREACH row = STOCK_INFO %]


@@ -170,6 +175,7 @@
     [%- END %]
     //-->
   </script>
     [%- END %]
     //-->
   </script>

+  [% END %]

   [%- END %]
 
 </body>
   [%- END %]
 
 </body>

diff --git a/templates/webpages/do/stock_out_form_master.html b/templates/webpages/do/stock_out_form_master.html
index 8e77f966930d6f8ebe39afb696db14913a79da7a..e8f7a13a6e293af32d9b81966914f8ba7816e5c8 100644 (file)
--- 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>
      <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>
      <th class="listheading"><translate>Best Before</translate></th>

+     [% END %]

      [%- UNLESS delivered %]
      <th align="right" class="listheading"><translate>Available qty</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>
      <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>
      <td>[% HTML.escape(row.bestbefore) %]</td>

-
+     [% END %]

      [%- IF delivered %]
 
      <td>[% HTML.escape(LxERP.format_amount(row.stock_qty)) %]</td>
      [%- 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) %]">
     <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) %]">
     <input type="hidden" name="bestbefore_[% loop.count %]" value="[% HTML.escape(row.bestbefore) %]">

+    [% END %]

     [%- END %]
    </table>
   </p>
     [%- END %]
    </table>
   </p>

diff --git a/templates/webpages/generic/select_part_master.html b/templates/webpages/generic/select_part_master.html
index 732ed2f5d9b9833f8d9a57412abf113a3b03cd73..433bceb1117b11ea1fe7e9a6b52dd8e1b8face55 100644 (file)
--- 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 %]
      <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 %]
      <th class="listheading"><translate>Best Before</translate></th>
      [% END %]

+     [% END %]

      [% IF has_ean %]
      <th class="listheading"><translate>EAN</translate></th>
      [% END %]
      [% IF has_ean %]
      <th class="listheading"><translate>EAN</translate></th>
      [% END %]


@@ -53,12 +55,14 @@
      </td>
      [% END %]
      [% IF has_bestbefore %]
      </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 %]
      <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) %]">
      [% 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 946a04c2753505e9f03e8d64b4ba020ac662f945..550604505bb995f6065d7e1c42a74a3bb5169cd1 100644 (file)
--- 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>
         <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>
        <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>
          <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
         </td>
        </tr>

+       [% END %]

        <tr>
         <th align="right" nowrap><translate>Transfer Quantity</translate>:</th>
         <td>
        <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>
         <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>
         <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>
        </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">
     <!--
 
   <script type="text/javascript">
     <!--

+    [% IF conf_show_best_before %]

     Calendar.setup( {
       inputField : "bestbefore",
       ifFormat :"[% myconfig_jsc_dateformat %]",
       align : "BR",
       button : "bestbefore_trigger"
     });
     Calendar.setup( {
       inputField : "bestbefore",
       ifFormat :"[% myconfig_jsc_dateformat %]",
       align : "BR",
       button : "bestbefore_trigger"
     });

+    [% END %]

 
     Calendar.setup( {
       inputField : "fromdate",
 
     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 0f37513835647afd976e983b36a9f577d15f7b86..ec48a7840d3095a69dcf9cc0912afd4e79e4d2bd 100644 (file)
--- 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>
      <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>
      <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>
      <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) %]">
      <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) %]">
      <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>
      <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>
      <td>[% HTML.escape(row.bestbefore) %]</td>

+     [% END %]

      <td>[% HTML.escape(row.ean) %]</td>
      <td>[% HTML.escape(row.qty) %]</td>
      <td>
      <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 0c789a62f9211a957ee42c22467a2d9573b58ca7..4a65f66e374a8129a22d8037a2520e310b34f8e0 100644 (file)
--- 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>
         <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>
        <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>
          <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>
        <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>
         <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>
         <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>
        </tr>
 
        <tr><td colspan="4"><hr noshade height="1"></td></tr>


@@ -183,6 +187,7 @@
   </p>
  </form>
 
   </p>
  </form>
 

+ [% IF conf_show_best_before %]

  <script type="text/javascript">
    <!--
      Calendar.setup( {
  <script type="text/javascript">
    <!--
      Calendar.setup( {


@@ -193,6 +198,7 @@
      });
    //-->
  </script>
      });
    //-->
  </script>

+ [% END %]

 
 </body>
 </html>
 
 </body>
 </html>

diff --git a/templates/webpages/wh/transfer_parts_selection_master.html b/templates/webpages/wh/transfer_parts_selection_master.html
index 8b78a770aeb18411bf14dcd991b57f8aa1573630..cbe2429142d5a21f1aaccab4fc05c6f3e2bd695e 100644 (file)
--- 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>
      <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>
      <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>
      <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) %]">
      <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) %]">
      <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>
      <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>
      <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>
      <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 27f0344396547487b221ce0983d01bdc741b9429..7272fe808a33992d307b0955b4949d1633396bff 100644 (file)
--- 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>
 
      <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="?">
     <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>
     </tr>

+    [% END %]

 
     <tr>
      <th align="right" nowrap><translate>Quantity</translate></th>
 
     <tr>
      <th align="right" nowrap><translate>Quantity</translate></th>


@@ -139,6 +141,7 @@
   </p>
  </form>
 
   </p>
  </form>
 

+ [% IF conf_show_best_before %]

  <script type="text/javascript">
    <!--
      Calendar.setup( {
  <script type="text/javascript">
    <!--
      Calendar.setup( {


@@ -149,6 +152,7 @@
      });
    //-->
  </script>
      });
    //-->
  </script>

+ [% END %]

 
 </body>
 </html>
 
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_master.html b/templates/webpages/wh/warehouse_selection_master.html
index c6da317e4ee829d65ac1701a87c8d7d9b79c9bdc..e070a464b75142e17904a5ed6cc1a8ba32d844f0 100644 (file)
--- 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>
 
      <td><input name="chargenumber" size="30"></td>
     </tr>
 

+    [% IF conf_show_best_before %]

     <tr>
      <th align="right" nowrap><translate>Best Before</translate></th>
      <td>
     <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>
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>

+    [% END %]

 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></th>
 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></th>


@@ -139,6 +141,7 @@
   </p>
  </form>
 
   </p>
  </form>
 

+ [% IF conf_show_best_before %]

  <script type="text/javascript">
    <!--
      Calendar.setup( {
  <script type="text/javascript">
    <!--
      Calendar.setup( {


@@ -149,6 +152,7 @@
      });
    //-->
  </script>
      });
    //-->
  </script>

+ [% END %]

 
 </body>
 </html>
 
 </body>
 </html>

diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html
index 9b68561ff564f3d02e7fdbbaaf8cb77f5969e882..e8b072c8028a20cd1fa766bab448108ac14b99d2 100644 (file)
--- 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>
 
      <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>
     <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>
        <input type="button" name="b_bestbefore" id="bestbefore_trigger" value="?">
      </td>
     </tr>

+    [% END %]

 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></th>
 
     <tr>
      <th align="right" nowrap><translate>EAN</translate></th>


@@ -144,6 +146,7 @@
   </p>
  </form>
 
   </p>
  </form>
 

+ [% IF conf_show_best_before %]

  <script type="text/javascript">
    <!--
      Calendar.setup( {
  <script type="text/javascript">
    <!--
      Calendar.setup( {


@@ -154,6 +157,7 @@
      });
    //-->
  </script>
      });
    //-->
  </script>

+  [% END %]

 
 </body>
 </html>
 
 </body>
 </html>