projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CVar: Dokumentation um Lieferadressen-CVars ergänzt
[kivitendo-erp.git]
/
SL
/
Controller
/
Admin.pm
diff --git
a/SL/Controller/Admin.pm
b/SL/Controller/Admin.pm
index
c595b24
..
ab4e24f
100644
(file)
--- 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
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) ],
);
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_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 }
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 ];
}
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
#
#
# filters
#