Conflicts:
	htdocs/holiday/class/holiday.class.php
This commit is contained in:
Laurent Destailleur 2017-12-05 11:53:19 +01:00
parent 365639a6c0
commit 340287f073

View File

@ -989,7 +989,7 @@ class Holiday extends CommonObject
while ($i < $nbUser)
{
$now_holiday = $this->getCPforUser($users[$i]['rowid'], $val['rowid']);
$new_solde = $now_holiday + $this->getConfCP('nbHolidayEveryMonth');
$new_solde = $now_holiday + $nb_holiday;
// We add a log for each user
$this->addLogCP($user->id, $users[$i]['rowid'], $langs->trans('HolidaysMonthlyUpdate'), $new_solde, $val['rowid']);