projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SL::DB::RequirementSpec-Refactoring: create_copy in create_copy+copy_from aufgesplittet
[kivitendo-erp.git]
/
SL
/
Layout
/
Base.pm
diff --git
a/SL/Layout/Base.pm
b/SL/Layout/Base.pm
index
467f56e
..
7932aff
100644
(file)
--- a/
SL/Layout/Base.pm
+++ b/
SL/Layout/Base.pm
@@
-29,7
+29,9
@@
sub new {
}
sub init_menu {
}
sub init_menu {
- Menu->new('crm/update/menu.ini', 'menu.ini');
+ my @menu_files = qw(menus/erp.ini);
+ unshift @menu_files, 'menus/crm.ini' if $::instance_conf->crm_installed;
+ Menu->new(@menu_files);
}
sub init_auto_reload_resources_param {
}
sub init_auto_reload_resources_param {
@@
-327,4
+329,3
@@
None yet, if you don't count the horrible stylesheet/javascript interface.
Sven Schöling E<lt>s.schoeling@linet-services.deE<gt>
=cut
Sven Schöling E<lt>s.schoeling@linet-services.deE<gt>
=cut
-