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

add card and feature

Browse Source
This commit is contained in:
jpb 2022-06-07 19:01:57 +02:00
parent 661c414703
commit c434e9cffe
4 changed files with 1106 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/menus/standard/eldy.lib.php
View File

@ -2270,6 +2270,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"')); $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'holiday', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"'));
$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write, '', $mainmenu); $newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write, '', $mainmenu);
$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("NewHolidayForGroup"), 1, ($user->rights->holiday->writeall && $user->rights->holiday->readall) , '', $mainmenu, 'holiday_sm');
$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '', $mainmenu); $newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->holiday->read, '', $mainmenu);
if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") { if ($usemenuhider || empty($leftmenu) || $leftmenu == "holiday") {
$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm'); $newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=holiday", $langs->trans("DraftCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
@ -2281,6 +2282,7 @@ function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu =
$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm'); $newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm'); $newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm'); $newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday, '', $mainmenu, 'holiday_sm');
} }
// Trips and expenses (old module) // Trips and expenses (old module)

1093
htdocs/holiday/card_group.php Normal file
View File

File diff suppressed because it is too large Load Diff

6
htdocs/holiday/class/holiday.class.php
View File

@ -1111,11 +1111,11 @@ class Holiday extends CommonObject
$this->fetchByUser($fk_user, '', ''); $this->fetchByUser($fk_user, '', '');
foreach ($this->holiday as $infos_CP) { foreach ($this->holiday as $infos_CP) {
if ($infos_CP['statut'] == 4) { if ($infos_CP['statut'] == Holiday::STATUS_CANCELED) {
continue; // ignore not validated holidays continue; // ignore not validated holidays
} }
if ($infos_CP['statut'] == 5) { if ($infos_CP['statut'] == Holiday::STATUS_REFUSED) {
continue; // ignore not validated holidays continue; // ignore refused holidays
} }
//var_dump("--"); //var_dump("--");
//var_dump("old: ".dol_print_date($infos_CP['date_debut'],'dayhour').' '.dol_print_date($infos_CP['date_fin'],'dayhour').' '.$infos_CP['halfday']); //var_dump("old: ".dol_print_date($infos_CP['date_debut'],'dayhour').' '.dol_print_date($infos_CP['date_fin'],'dayhour').' '.$infos_CP['halfday']);

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

@ -4,6 +4,7 @@ Holidays=Leave
CPTitreMenu=Leave CPTitreMenu=Leave
MenuReportMonth=Monthly statement MenuReportMonth=Monthly statement
MenuAddCP=New leave request MenuAddCP=New leave request
MenuCollectiveAddCP=New collective leave request
NotActiveModCP=You must enable the module Leave to view this page. NotActiveModCP=You must enable the module Leave to view this page.
AddCP=Make a leave request AddCP=Make a leave request
DateDebCP=Start date DateDebCP=Start date
@ -86,6 +87,13 @@ UserUpdateCP=Updated for
PrevSoldeCP=Previous Balance PrevSoldeCP=Previous Balance
NewSoldeCP=New Balance NewSoldeCP=New Balance
alreadyCPexist=A leave request has already been done on this period. alreadyCPexist=A leave request has already been done on this period.
UseralreadyCPexist=A leave request has already been done on this period for %s.
groups=Groups
users=Users
AutoSendMail=Automatic mailing
NewHolidayForGroup=Collective leaves
SendRequestCollectiveCP=Send collective leave request
AutoApprovalOnCreate=Automatic approval
FirstDayOfHoliday=Beginning day of leave request FirstDayOfHoliday=Beginning day of leave request
LastDayOfHoliday=Ending day of leave request LastDayOfHoliday=Ending day of leave request
BoxTitleLastLeaveRequests=Latest %s modified leave requests BoxTitleLastLeaveRequests=Latest %s modified leave requests