From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 11 Feb 2011 11:12:47 +0000 (+0100)
Subject: Konfigurationsoption "show_best_before" ist in Abschnitt "features"
X-Git-Tag: release-2.6.3~83
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=bb3e6ada9c9ecd6dec1be77f0c47fe20319ffb71;p=kivitendo-erp.git

Konfigurationsoption "show_best_before" ist in Abschnitt "features"
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 6e7145f20..8ad572c9a 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -809,7 +809,7 @@ sub _prepare_html_template {
   $additional_params->{"conf_latex_templates"}        = $::lx_office_conf{print_templates}->{latex};
   $additional_params->{"conf_opendocument_templates"} = $::lx_office_conf{print_templates}->{opendocument};
   $additional_params->{"conf_vertreter"}              = $::lx_office_conf{system}->{vertreter};
-  $additional_params->{"conf_show_best_before"}       = $::lx_office_conf{system}->{show_best_before};
+  $additional_params->{"conf_show_best_before"}       = $::lx_office_conf{features}->{show_best_before};
   $additional_params->{"conf_parts_image_css"}        = $::lx_office_conf{features}->{parts_image_css};
   $additional_params->{"conf_parts_listing_images"}   = $::lx_office_conf{features}->{parts_listing_images};
   $additional_params->{"conf_parts_show_image"}       = $::lx_office_conf{features}->{parts_show_image};
diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index d6e594f5b..2bd7f6b42 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -1361,7 +1361,7 @@ sub transfer_out {
         my $pinfo = $part_info_map{$request->{parts_id}};
         my $binfo = $bin_info_map{$request->{bin_id}};
 
-        if ($::lx_office_conf{system}->{show_best_before}) {
+        if ($::lx_office_conf{features}->{show_best_before}) {
             push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.",
                                                      $pinfo->{description},
                                                      $binfo->{warehouse_description},
diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index f49710785..2b49ba00c 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -438,7 +438,7 @@ sub create_assembly {
     $form->error($locale->text('The warehouse or the bin is missing.'));
   }
 
-  if (!$::lx_office_conf{system}->{show_best_before}) {
+  if (!$::lx_office_conf{features}->{show_best_before}) {
       $form->{bestbefore} = '';
   }