lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-14 12:45:00 +01:00
commit ee800189a6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/admin.lang
View File

@ -857,6 +857,7 @@ Permission20003=Delete leave requests
Permission20004=Read all leave requests (even of user not subordinates) Permission20004=Read all leave requests (even of user not subordinates)
Permission20005=Create/modify leave requests for everybody (even of user not subordinates) Permission20005=Create/modify leave requests for everybody (even of user not subordinates)
Permission20006=Admin leave requests (setup and update balance) Permission20006=Admin leave requests (setup and update balance)
Permission20007=Approve leave requests
Permission23001=Read Scheduled job Permission23001=Read Scheduled job
Permission23002=Create/update Scheduled job Permission23002=Create/update Scheduled job
Permission23003=Delete Scheduled job Permission23003=Delete Scheduled job

3
htdocs/langs/en_US/holiday.lang
View File

@ -127,4 +127,5 @@ HolidaysNumberingModules=Leave requests numbering models
TemplatePDFHolidays=Template for leave requests PDF TemplatePDFHolidays=Template for leave requests PDF
FreeLegalTextOnHolidays=Free text on PDF FreeLegalTextOnHolidays=Free text on PDF
WatermarkOnDraftHolidayCards=Watermarks on draft leave requests WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
HolidaysToApprove=Holidays to approve HolidaysToApprove=Holidays to approve
NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays