X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/9a8ec1f0d7a7652498258ecb469cbc2d89ad945f..749772c5a889d83973fc42da88389f4c23839f87:/SL/Controller/Admin.pm

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index ac4aca5bc..bb7a3b539 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -375,8 +375,6 @@ sub action_database_administration {
   $::form->{dbpasswd}  ||= $::auth->{DB_config}->{password};
   $::form->{dbdefault} ||= 'template1';
 
-  $::request->layout->focus('#dbhost');
-
   $self->render('admin/dbadmin', title => t8('Database Administration'));
 }
 
@@ -461,7 +459,7 @@ 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_numberformats { [ qw(1,000.00 1000.00 1.000,00 1000,00)          ]                                              }
+sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,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_unused_dbsources      { [ sort User->dbsources_unused($::form)                        ] }
@@ -524,6 +522,11 @@ sub setup_layout {
   $::request->layout(SL::Layout::Dispatcher->new(style => 'admin'));
   $::request->layout->use_stylesheet("lx-office-erp.css");
   $::form->{favicon} = "favicon.ico";
+  %::myconfig        = (
+    countrycode      => 'de',
+    numberformat     => '1.000,00',
+    dateformat       => 'dd.mm.yy',
+  ) if !%::myconfig;
 }
 
 sub setup_client {
@@ -547,8 +550,8 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
-  $::request->layout->focus('#admin_password');
-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);
+  my $version         = $::form->read_version;
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
 }
 
 sub edit_user_form {