=resolved uncommited prepared statement

[mfinanz.git] / SL / Layout / Base.pm

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index c470a05b675da292db36a808e2bf588ad7d2fb05..8c7aa392740a85126a16711dbccb7b64189a202a 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -19,6 +19,7 @@ use Rose::Object::MakeMethods::Generic (
 
 use SL::Menu;
 use SL::Presenter;
 
 use SL::Menu;
 use SL::Presenter;

+use SL::DBUtils;

 
 my %menu_cache;
 
 
 my %menu_cache;
 


@@ -29,7 +30,14 @@ sub new {
 }
 
 sub init_menu {
 }
 
 sub init_menu {

-  my @menu_files = qw(menus/erp.ini);
+  my @menu_files;
+  my $dbh = $::form->get_standard_dbh;
+  if(scalar(grep(/^Switzerland/, (selectrow_query($::form, $dbh, 'SELECT coa FROM defaults'))[0]))) {
+    @menu_files = qw(menus/erp_ch.ini);
+  } else {
+    @menu_files = qw(menus/erp.ini);
+  }
+  $dbh->commit;

   unshift @menu_files, 'menus/crm.ini' if $::instance_conf->crm_installed;
   Menu->new(@menu_files);
 }
   unshift @menu_files, 'menus/crm.ini' if $::instance_conf->crm_installed;
   Menu->new(@menu_files);
 }


@@ -115,7 +123,6 @@ sub get_stylesheet_for_user {
   } else {
     $css_path = "$css_path/kivitendo";
   }
   } else {
     $css_path = "$css_path/kivitendo";
   }

-  $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here

 
   return $css_path;
 }
 
   return $css_path;
 }