Merge pull request #4159 from belyas/develop
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
This commit is contained in:
commit
f73c059bc4
2 changed files with 10 additions and 4 deletions
3
htdocs/.gitignore
vendored
3
htdocs/.gitignore
vendored
|
|
@ -19,4 +19,5 @@
|
|||
/dolimed*
|
||||
/allscreens*
|
||||
/ecommerce/
|
||||
/cabinetmed*
|
||||
/cabinetmed*
|
||||
/conf/conf.php
|
||||
|
|
@ -130,10 +130,15 @@ elseif($action == 'add_event')
|
|||
$add_holiday = $holiday->getValueEventCp($event);
|
||||
$new_holiday = $nb_holiday + $add_holiday;
|
||||
|
||||
// On ajoute la modification dans le LOG
|
||||
$holiday->addLogCP($user->id,$userCP, $holiday->getNameEventCp($event),$new_holiday);
|
||||
// add event to existing types of vacation
|
||||
foreach ($typeleaves as $key => $leave) {
|
||||
$vacationTypeID = $leave['rowid'];
|
||||
|
||||
$holiday->updateSoldeCP($userCP,$new_holiday);
|
||||
// On ajoute la modification dans le LOG
|
||||
$holiday->addLogCP($user->id,$userCP, $holiday->getNameEventCp($event),$new_holiday, $vacationTypeID);
|
||||
|
||||
$holiday->updateSoldeCP($userCP,$new_holiday, $vacationTypeID);
|
||||
}
|
||||
|
||||
setEventMessages('AddEventToUserOkCP', '', 'mesgs');
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue