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

Merge pull request #4159 from belyas/develop

Browse Source 
addLogCP and updateSoledCP methodes throwing warnings when assigning leave for a user
This commit is contained in:
Laurent Destailleur 2015-12-06 14:44:46 +01:00
commit f73c059bc4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/.gitignore vendored
View File

@ -19,4 +19,5 @@
/dolimed*
/allscreens*
/ecommerce/
/cabinetmed*
/cabinetmed*
/conf/conf.php

11
htdocs/holiday/define_holiday.php
View File

@ -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');
}