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

FIX A service email must always be sent using the service email

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-07 16:40:20 +01:00
parent ee0e882607
commit 7ad5a89a16
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/holiday/card.php
View File

@ -403,7 +403,7 @@ if (empty($reshook))
{ {
$object->fetch($id); $object->fetch($id);
// Si brouillon et créateur // If draft and owner of leave
if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) if ($object->statut == Holiday::STATUS_DRAFT && $cancreate)
{ {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
@ -430,7 +430,8 @@ if (empty($reshook))
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($object->fk_user); $expediteur->fetch($object->fk_user);
$emailFrom = $expediteur->email; //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email.
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
// Subject // Subject
$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@ -441,6 +442,7 @@ if (empty($reshook))
// Content // Content
$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
$message .= "\n"; $message .= "\n";
$message .= $langs->transnoentities("HolidaysToValidateBody")."\n"; $message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
$delayForRequest = $object->getConfCP('delayForRequest'); $delayForRequest = $object->getConfCP('delayForRequest');
@ -525,7 +527,7 @@ if (empty($reshook))
{ {
$object->fetch($id); $object->fetch($id);
// Si statut en attente de validation et valideur = utilisateur // If status is waiting approval and approver is also user
if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator)
{ {
$object->oldcopy = dol_clone($object); $object->oldcopy = dol_clone($object);
@ -582,7 +584,8 @@ if (empty($reshook))
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($object->fk_validator); $expediteur->fetch($object->fk_validator);
$emailFrom = $expediteur->email; //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email.
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
// Subject // Subject
$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@ -593,6 +596,7 @@ if (empty($reshook))
// 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";
@ -666,7 +670,8 @@ if (empty($reshook))
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($object->fk_validator); $expediteur->fetch($object->fk_validator);
$emailFrom = $expediteur->email; //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email.
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
// Subject // Subject
$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
@ -677,6 +682,7 @@ if (empty($reshook))
// 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";
@ -813,7 +819,8 @@ if (empty($reshook))
// From // From
$expediteur = new User($db); $expediteur = new User($db);
$expediteur->fetch($object->fk_user_cancel); $expediteur->fetch($object->fk_user_cancel);
$emailFrom = $expediteur->email; //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email.
$emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM;
// Subject // Subject
$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;