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 develop

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-08 14:59:07 +01:00
commit f333fb3b7d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/holiday/card.php
View File

@ -334,7 +334,7 @@ if ($action == 'confirm_send')
$object->fetch($id);
// Si brouillon et créateur
if($object->statut == Holiday::STATUS_DRAFT && $cancreate)
if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
{
$object->oldcopy = dol_clone($object);
@ -379,7 +379,7 @@ if ($action == 'confirm_send')
$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
// Si l'option pour avertir le valideur en cas de délai trop court
if($object->getConfCP('AlertValidatorDelay'))
if ($object->getConfCP('AlertValidatorDelay'))
{
if($object->date_debut < $nextMonth)
{
@ -479,7 +479,10 @@ if ($action == 'confirm_valid')
$error++;
setEventMessages(null, $object->errors, 'errors');
}
}
if (! $error)
{
// To
$destinataire = new User($db);
$destinataire->fetch($object->fk_user);