From: Bernd Blessmann 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 @@ Warehouse Bin Charge Number + [% IF conf_show_best_before %] Best Before + [% END %] Qty Unit @@ -106,7 +108,9 @@ [% HTML.escape(row.warehouse_description) %] [% HTML.escape(row.bin_description) %] [% HTML.escape(row.chargenumber) %] + [% IF conf_show_best_before %] [% HTML.escape(row.bestbefore) %] + [% END %] [% HTML.escape(LxERP.format_amount(row.qty)) %] [% HTML.escape(row.unit) %] @@ -122,12 +126,12 @@ - + [% IF conf_show_best_before %] - + [% END %] @@ -158,6 +162,7 @@ [%- IF NOT delivered %] + [% IF conf_show_best_before %] + [% END %] [%- END %] 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 @@ Warehouse Bin Charge Number + [% IF conf_show_best_before %] Best Before + [% END %] [%- UNLESS delivered %] Available qty [%- END %] @@ -74,8 +76,9 @@ [% HTML.escape(row.warehousedescription) %] [% HTML.escape(row.bindescription) %] [% HTML.escape(row.chargenumber) %] + [% IF conf_show_best_before %] [% HTML.escape(row.bestbefore) %] - + [% END %] [%- IF delivered %] [% HTML.escape(LxERP.format_amount(row.stock_qty)) %] @@ -105,7 +108,9 @@ + [% IF conf_show_best_before %] + [% END %] [%- END %]

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 @@ Charge number [% END %] [% IF has_bestbefore %] + [% IF conf_show_best_before %] Best Before [% END %] + [% END %] [% IF has_ean %] EAN [% END %] @@ -53,12 +55,14 @@ [% END %] [% IF has_bestbefore %] + [% IF conf_show_best_before %] [% HTML.escape(part.bestbefore) %] [% END %] + [% END %] [% IF has_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 @@ Charge Number: + [% IF conf_show_best_before %] Best Before: @@ -111,6 +112,7 @@ + [% END %] Transfer Quantity: @@ -166,8 +168,10 @@ + [% IF conf_show_best_before %] + [% END %] @@ -208,12 +212,14 @@ + [% END %] 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 @@ Part Number Part Description Charge Number + [% IF conf_show_best_before %] Best Before + [% END %] EAN Available qty Transfer qty @@ -80,13 +82,17 @@ + [% IF conf_show_best_before %] + [% END %] [% HTML.escape(row.bindescription) %] [% HTML.escape(row.partnumber) %] [% HTML.escape(row.partdescription) %] [% HTML.escape(row.chargenumber) %] + [% IF conf_show_best_before %] [% HTML.escape(row.bestbefore) %] + [% END %] [% HTML.escape(row.ean) %] [% HTML.escape(row.qty) %] 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 @@ + [% IF conf_show_best_before %] Best Before - + + [% END %] Quantity @@ -139,6 +141,7 @@

+ [% IF conf_show_best_before %] + [% END %] 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 @@ + [% IF conf_show_best_before %] Best Before @@ -126,6 +127,7 @@ + [% END %] EAN @@ -139,6 +141,7 @@

+ [% IF conf_show_best_before %] + [% END %] 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 @@ + [% IF conf_show_best_before %] Best Before @@ -112,6 +113,7 @@ + [% END %] EAN @@ -144,6 +146,7 @@

+ [% IF conf_show_best_before %] + [% END %]