Merge branch 'master' of ssh://lx-office/~/lx-office-erp

diff --git a/SL/Form.pm b/SL/Form.pm
index 32ea04d85eff96b529961eb921d0fccc26c709dd..ca8d4fc22841c82fc669ec261ad9eb9493cf3811 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -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"};