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

Merge branch 'NEW/Collective_group_leave' of github.com:atm-jpb/dolibarr into NEW/Collective_group_leave

Browse Source
This commit is contained in:
jpb 2022-06-11 10:17:22 +02:00
commit fabbd6032f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/holiday/card_group.php
View File

@ -316,7 +316,6 @@ if (empty($reshook)) {
setEventMessages($object->error, $object->errors, 'errors'); setEventMessages($object->error, $object->errors, 'errors');
$error++; $error++;
} else { } else {
//@TODO changer le nom si validated //@TODO changer le nom si validated
if ($autoValidation) { if ($autoValidation) {
$htemp = new Holiday($db); $htemp = new Holiday($db);
@ -334,7 +333,7 @@ if (empty($reshook)) {
if ($AutoSendMail && !$error) { if ($AutoSendMail && !$error) {
// send a mail to the user // send a mail to the user
$returnSendMail = sendMail($result, $cancreate, $now, $autoValidation); $returnSendMail = sendMail($result, $cancreate, $now, $autoValidation);
if (!empty($returnSendMail->msg)) setEventMessage($returnSendMail->msg,$returnSendMail->style); if (!empty($returnSendMail->msg)) setEventMessage($returnSendMail->msg, $returnSendMail->style);
} }
} }
} }
@ -740,19 +739,16 @@ function sendMail($id, $cancreate, $now, $autoValidation)
$result = $mail->sendfile(); $result = $mail->sendfile();
if (!$result) { if (!$result) {
$objStd->error++; $objStd->error++;
$objStd->msg = $langs->trans('ErroreSendmail'); $objStd->msg = $langs->trans('ErroreSendmail');
$objStd->style="warnings"; $objStd->style="warnings";
$objStd->status = 'error'; $objStd->status = 'error';
} else { } else {
$objStd->msg = $langs->trans('mailSended'); $objStd->msg = $langs->trans('mailSended');
} }
return $objStd; return $objStd;
} else { } else {
$objStd->error++; $objStd->error++;
$objStd->msg = $langs->trans('ErroreVerif'); $objStd->msg = $langs->trans('ErroreVerif');
$objStd->status = 'error'; $objStd->status = 'error';
@ -761,7 +757,6 @@ function sendMail($id, $cancreate, $now, $autoValidation)
} }
} }
} else { } else {
$objStd->error++; $objStd->error++;
$objStd->msg = $langs->trans('ErrorloadUserOnSendingMail'); $objStd->msg = $langs->trans('ErrorloadUserOnSendingMail');
$objStd->status = 'error'; $objStd->status = 'error';