Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
de64ce5b
Commit
de64ce5b
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: user right on Holiday for month report nor working
parent
abc96b51
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/core/menus/init_menu_auguria.sql
+1
-1
1 addition, 1 deletion
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
+1
-1
1 addition, 1 deletion
htdocs/core/menus/standard/eldy.lib.php
with
3 additions
and
2 deletions
ChangeLog
+
1
−
0
View file @
de64ce5b
...
...
@@ -25,6 +25,7 @@ Fix: Be sure there is no duplicate default rib.
Fix: Enable extrafields for customer order, proposal and invoice lines. This feature
was developed for 3.5 but was disabled (hidden) because of a bug not possible to
fix enough quickly for 3.5.0 release.
Fix: user right on Holiday for month report nor working.
***** ChangeLog for 3.5 compared to 3.4.* *****
For users:
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/menus/init_menu_auguria.sql
+
1
−
1
View file @
de64ce5b
...
...
@@ -281,5 +281,5 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
insert
into
llx_menu
(
module
,
enabled
,
menu_handler
,
type
,
rowid
,
mainmenu
,
leftmenu
,
fk_menu
,
url
,
titre
,
level
,
langs
,
perms
,
target
,
usertype
,
position
,
entity
)
values
(
''
,
'$conf->holiday->enabled'
,
__HANDLER__
,
'left'
,
5001
__
+
MAX_llx_menu__
,
'hrm'
,
''
,
5000
__
+
MAX_llx_menu__
,
'/holiday/fiche.php?&action=request'
,
'MenuAddCP'
,
1
,
'holiday'
,
'$user->rights->holiday->write'
,
''
,
0
,
1
,
__ENTITY__
);
insert
into
llx_menu
(
module
,
enabled
,
menu_handler
,
type
,
rowid
,
mainmenu
,
leftmenu
,
fk_menu
,
url
,
titre
,
level
,
langs
,
perms
,
target
,
usertype
,
position
,
entity
)
values
(
''
,
'$conf->holiday->enabled'
,
__HANDLER__
,
'left'
,
5002
__
+
MAX_llx_menu__
,
'hrm'
,
''
,
5000
__
+
MAX_llx_menu__
,
'/holiday/define_holiday.php?&action=request'
,
'MenuConfCP'
,
1
,
'holiday'
,
'$user->rights->holiday->define_holiday'
,
''
,
0
,
2
,
__ENTITY__
);
insert
into
llx_menu
(
module
,
enabled
,
menu_handler
,
type
,
rowid
,
mainmenu
,
leftmenu
,
fk_menu
,
url
,
titre
,
level
,
langs
,
perms
,
target
,
usertype
,
position
,
entity
)
values
(
''
,
'$conf->holiday->enabled'
,
__HANDLER__
,
'left'
,
5003
__
+
MAX_llx_menu__
,
'hrm'
,
''
,
5000
__
+
MAX_llx_menu__
,
'/holiday/view_log.php?&action=request'
,
'MenuLogCP'
,
1
,
'holiday'
,
'$user->rights->holiday->view_log'
,
''
,
0
,
3
,
__ENTITY__
);
insert
into
llx_menu
(
module
,
enabled
,
menu_handler
,
type
,
rowid
,
mainmenu
,
leftmenu
,
fk_menu
,
url
,
titre
,
level
,
langs
,
perms
,
target
,
usertype
,
position
,
entity
)
values
(
''
,
'$conf->holiday->enabled'
,
__HANDLER__
,
'left'
,
5004
__
+
MAX_llx_menu__
,
'hrm'
,
''
,
5000
__
+
MAX_llx_menu__
,
'/holiday/month_report.php?&action=request'
,
'MenuReportMonth'
,
1
,
'holiday'
,
'$user->rights->holiday->
view_log
'
,
''
,
0
,
4
,
__ENTITY__
);
insert
into
llx_menu
(
module
,
enabled
,
menu_handler
,
type
,
rowid
,
mainmenu
,
leftmenu
,
fk_menu
,
url
,
titre
,
level
,
langs
,
perms
,
target
,
usertype
,
position
,
entity
)
values
(
''
,
'$conf->holiday->enabled'
,
__HANDLER__
,
'left'
,
5004
__
+
MAX_llx_menu__
,
'hrm'
,
''
,
5000
__
+
MAX_llx_menu__
,
'/holiday/month_report.php?&action=request'
,
'MenuReportMonth'
,
1
,
'holiday'
,
'$user->rights->holiday->
month_report
'
,
''
,
0
,
4
,
__ENTITY__
);
This diff is collapsed.
Click to expand it.
htdocs/core/menus/standard/eldy.lib.php
+
1
−
1
View file @
de64ce5b
...
...
@@ -1090,7 +1090,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
$newmenu
->
add
(
"/holiday/fiche.php?&action=request"
,
$langs
->
trans
(
"MenuAddCP"
),
1
,
$user
->
rights
->
holiday
->
write
);
$newmenu
->
add
(
"/holiday/define_holiday.php?&action=request"
,
$langs
->
trans
(
"MenuConfCP"
),
1
,
$user
->
rights
->
holiday
->
define_holiday
);
$newmenu
->
add
(
"/holiday/view_log.php?&action=request"
,
$langs
->
trans
(
"MenuLogCP"
),
1
,
$user
->
rights
->
holiday
->
view_log
);
$newmenu
->
add
(
"/holiday/month_report.php?&action=request"
,
$langs
->
trans
(
"MenuReportMonth"
),
1
,
$user
->
rights
->
holiday
->
view_log
);
$newmenu
->
add
(
"/holiday/month_report.php?&action=request"
,
$langs
->
trans
(
"MenuReportMonth"
),
1
,
$user
->
rights
->
holiday
->
month_report
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment