X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FForm.pm;h=ca8d4fc22841c82fc669ec261ad9eb9493cf3811;hb=84408bc565031cc6f7eda31e968c7294bb8244d5;hp=905c629dbdae887c4c1100d0e6570ed51c1aae0a;hpb=bea3f989a3bb5d1b734cf4e606a668213755e2e0;p=kivitendo-erp.git

diff --git a/SL/Form.pm b/SL/Form.pm
index 905c629db..ca8d4fc22 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -270,7 +270,7 @@ sub new {
   $self->{action}  =  lc $self->{action};
   $self->{action}  =~ s/( |-|,|\#)/_/g;
 
-  $self->{version} =  "2.6.0";
+  $self->{version} =  "2.6.1 Beta 1";
 
   $main::lxdebug->leave_sub();
 
@@ -720,7 +720,7 @@ sub _prepare_html_template {
   my ($self, $file, $additional_params) = @_;
   my $language;
 
-  if (!defined(%main::myconfig) || !defined($main::myconfig{"countrycode"})) {
+  if (!%::myconfig || !$::myconfig{"countrycode"}) {
     $language = $main::language;
   } else {
     $language = $main::myconfig{"countrycode"};
@@ -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;