automated preferences for Switzerland, new sub get_default_coa in SL/Controller/Admin.pm

[mfinanz.git] / SL / Controller / Admin.pm

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index c2d9f29e7228ec85634468ce33ddd230ada569d7..ad2d3ccdd2731f9e6b18b22d8bcfa189a9bb3a8f 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -11,6 +11,7 @@ use SL::Common ();
 use SL::DB::AuthUser;
 use SL::DB::AuthGroup;
 use SL::DB::Printer;
 use SL::DB::AuthUser;
 use SL::DB::AuthGroup;
 use SL::DB::Printer;

+use SL::DBUtils;

 use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::System::InstallationLock;
 use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::System::InstallationLock;


@@ -81,18 +82,18 @@ sub action_create_auth_tables {
   $::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
   $::auth->create_or_refresh_session;
 
   $::auth->set_session_value('admin_password', $::lx_office_conf{authentication}->{admin_password});
   $::auth->create_or_refresh_session;
 

+  return if $self->apply_dbupgrade_scripts;
+

   my $group = (SL::DB::Manager::AuthGroup->get_all(limit => 1))[0];
   if (!$group) {
     SL::DB::AuthGroup->new(
       name        => t8('Full Access'),
       description => t8('Full access to all functions'),
   my $group = (SL::DB::Manager::AuthGroup->get_all(limit => 1))[0];
   if (!$group) {
     SL::DB::AuthGroup->new(
       name        => t8('Full Access'),
       description => t8('Full access to all functions'),

-      rights      => [ map { SL::DB::AuthGroupRight->new(right => $_, granted => 1) } SL::Auth::all_rights() ],
+      rights      => [ map { SL::DB::AuthGroupRight->new(right => $_, granted => 1) } $::auth->all_rights ],

     )->save;
   }
 
     )->save;
   }
 

-  if (!$self->apply_dbupgrade_scripts) {
-    $self->action_login;
-  }
+  $self->action_login;

 }
 
 #
 }
 
 #


@@ -110,12 +111,11 @@ sub action_show {
 
 sub action_new_user {
   my ($self) = @_;
 
 sub action_new_user {
   my ($self) = @_;

-

   $self->user(SL::DB::AuthUser->new(
     config_values => {
       vclimit      => 200,
       countrycode  => "de",
   $self->user(SL::DB::AuthUser->new(
     config_values => {
       vclimit      => 200,
       countrycode  => "de",

-      numberformat => "1.000,00",
+      numberformat => scalar(grep(/^Switzerland/, get_default_coa($self))) ? "1'000.00" : "1.000,00",

       dateformat   => "dd.mm.yy",
       stylesheet   => "kivitendo.css",
       menustyle    => "neu",
       dateformat   => "dd.mm.yy",
       stylesheet   => "kivitendo.css",
       menustyle    => "neu",


@@ -497,8 +497,8 @@ sub init_all_users         { SL::DB::Manager::AuthUser  ->get_all_sorted
 sub init_all_groups        { SL::DB::Manager::AuthGroup ->get_all_sorted                                                     }
 sub init_all_printers      { SL::DB::Manager::Printer   ->get_all_sorted                                                     }
 sub init_all_dateformats   { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)      ]                                              }
 sub init_all_groups        { SL::DB::Manager::AuthGroup ->get_all_sorted                                                     }
 sub init_all_printers      { SL::DB::Manager::Printer   ->get_all_sorted                                                     }
 sub init_all_dateformats   { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd)      ]                                              }

-sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00'   ]                                              }
-sub init_all_stylesheets   { [ qw(lx-office-erp.css kivitendo.css) ]                                                         }
+sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00', "1'000.00" ]                                    }
+sub init_all_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ]                                              }

 sub init_all_dbsources             { [ sort User->dbsources($::form)                               ] }
 sub init_all_used_dbsources        { { map { (join(':', $_->dbhost || 'localhost', $_->dbport || 5432, $_->dbname) => $_->name) } @{ $_[0]->all_clients }  } }
 sub init_all_accounting_methods    { [ { id => 'accrual',   name => t8('Accrual accounting')  }, { id => 'cash',     name => t8('Cash accounting')       } ] }
 sub init_all_dbsources             { [ sort User->dbsources($::form)                               ] }
 sub init_all_used_dbsources        { { map { (join(':', $_->dbhost || 'localhost', $_->dbport || 5432, $_->dbname) => $_->name) } @{ $_[0]->all_clients }  } }
 sub init_all_accounting_methods    { [ { id => 'accrual',   name => t8('Accrual accounting')  }, { id => 'cash',     name => t8('Cash accounting')       } ] }


@@ -528,13 +528,13 @@ sub init_all_rights {
   my (@sections, $current_section);
 
   foreach my $entry ($::auth->all_rights_full) {
   my (@sections, $current_section);
 
   foreach my $entry ($::auth->all_rights_full) {

-    if ($entry->[0] =~ m/^--/) {
-      push @sections, { description => $entry->[1], rights => [] };
+    if ($entry->[2]) {
+      push @sections, { description => t8($entry->[1]), rights => [] };

 
     } elsif (@sections) {
       push @{ $sections[-1]->{rights} }, {
         name        => $entry->[0],
 
     } elsif (@sections) {
       push @{ $sections[-1]->{rights} }, {
         name        => $entry->[0],

-        description => $entry->[1],
+        description => t8($entry->[1]),

       };
 
     } else {
       };
 
     } else {


@@ -672,4 +672,20 @@ sub authenticate_root {
   return undef;
 }
 
   return undef;
 }
 

+sub get_default_coa {
+  my ( $self ) = @_;
+  my $coa = undef;
+  eval {
+    my $client = first { $_->is_default } @{ $self->all_clients };
+    my $dbconnect = 'dbi:Pg:dbname=' . $client->dbname . ';host=' . $client->dbhost . ';port=' . $client->dbport;
+    my $dbh       = DBI->connect($dbconnect, $client->dbuser, $client->dbpasswd);
+    my $query = q{ SELECT coa FROM defaults };
+    (my $sth = $dbh->prepare($query))->execute;
+    ($coa) = selectrow_query($::form, $dbh, $query);
+    $sth->finish;
+    $dbh->disconnect;
+  };
+  return $coa;
+}
+

 1;
 1;