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

Fix do not send email if approval error

Browse Source
This commit is contained in:
Laurent Destailleur 2019-02-08 14:58:46 +01:00
parent 2e1201b7b0
commit 8412a91576
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/holiday/card.php
View File

@ -334,7 +334,7 @@ if ($action == 'confirm_send')
$object->fetch($id); $object->fetch($id);
// Si brouillon et créateur // Si brouillon et créateur
if($object->statut == Holiday::STATUS_DRAFT && $cancreate) if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
{ {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
@ -379,7 +379,7 @@ if ($action == 'confirm_send')
$nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd'); $nextMonth = dol_time_plus_duree($now, $delayForRequest, 'd');
// Si l'option pour avertir le valideur en cas de délai trop court // 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) if($object->date_debut < $nextMonth)
{ {
@ -460,7 +460,7 @@ if ($action == 'confirm_valid')
if (! $error) if (! $error)
{ {
// Calculcate number of days consummed // Calculcate number of days consummed
$nbopenedday=num_open_day($object->date_debut_gmt,$object->date_fin_gmt,0,1,$object->halfday); $nbopenedday=num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
$soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type); $soldeActuel = $object->getCpforUser($object->fk_user, $object->fk_type);
$newSolde = ($soldeActuel - $nbopenedday); $newSolde = ($soldeActuel - $nbopenedday);
@ -469,7 +469,7 @@ if ($action == 'confirm_valid')
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
setEventMessages(null, $object->errors,'errors'); setEventMessages(null, $object->errors, 'errors');
} }
//Update balance //Update balance
@ -477,9 +477,12 @@ if ($action == 'confirm_valid')
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
setEventMessages(null, $object->errors,'errors'); setEventMessages(null, $object->errors, 'errors');
}
} }
if (! $error)
{
// To // To
$destinataire = new User($db); $destinataire = new User($db);
$destinataire->fetch($object->fk_user); $destinataire->fetch($object->fk_user);
@ -505,7 +508,7 @@ if ($action == 'confirm_valid')
// Content // Content
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message.= "\n"; $message.= "\n";
$message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut,'day'),dol_print_date($object->date_fin,'day'))."\n"; $message.= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
$message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
@ -594,7 +597,7 @@ if ($action == 'confirm_refuse' && GETPOST('confirm','alpha') == 'yes')
// Content // Content
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message.= "\n"; $message.= "\n";
$message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut,'day'), dol_print_date($object->date_fin,'day'))."\n"; $message.= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
$message.= GETPOST('detail_refuse','alpha')."\n\n"; $message.= GETPOST('detail_refuse','alpha')."\n\n";
$message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; $message.= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";