X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FAdmin.pm;h=ab4e24fbb22fdb92065b1a470b77b5675bab2a64;hb=c7241bf7c547d63999898dee7b5dd486e4d122d3;hp=c595b241126f2866efcac3561f82cdb5f3a9d116;hpb=1e403f489b283e2e6b725f32cea29f38b3fe4e1f;p=kivitendo-erp.git

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index c595b2411..ab4e24fbb 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -21,7 +21,7 @@ use SL::Layout::AdminLogin;
 use Rose::Object::MakeMethods::Generic
 (
   'scalar --get_set_init' => [ qw(client user group printer db_cfg is_locked
-                                  all_dateformats all_numberformats all_countrycodes all_countrymodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers
+                                  all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers
                                   all_dbsources all_used_dbsources all_accounting_methods all_inventory_systems all_profit_determinations all_charts) ],
 );
 
@@ -490,7 +490,7 @@ sub action_lock_system {
 
 sub init_db_cfg            { $::lx_office_conf{'authentication/database'}                                                    }
 sub init_is_locked         { SL::System::InstallationLock->is_locked                                                         }
-sub init_client            { SL::DB::Manager::AuthClient->find_by(id => ($::form->{id} || ($::form->{client}  || {})->{id})) }
+sub init_client            { SL::DB::Manager::AuthClient->find_by(id => (($::form->{client} || {})->{id} || $::form->{id}))  }
 sub init_user              { SL::DB::AuthUser  ->new(id => ($::form->{id} || ($::form->{user}    || {})->{id}))->load        }
 sub init_group             { SL::DB::AuthGroup ->new(id => ($::form->{id} || ($::form->{group}   || {})->{id}))->load        }
 sub init_printer           { SL::DB::Printer   ->new(id => ($::form->{id} || ($::form->{printer} || {})->{id}))->load        }
@@ -552,11 +552,6 @@ sub init_all_countrycodes {
   return [ map { id => $_, title => $cc{$_} }, sort { $cc{$a} cmp $cc{$b} } keys %cc ];
 }
 
-sub init_all_countrymodes {
-  my %cm = SL::DefaultManager->country_modes;
-  return [ map { id => $_, title => "$_ ($cm{$_})" }, sort keys %cm ];
-}
-
 #
 # filters
 #