Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLOSE|Close #29274 Add possibility to have different mail for autocopy for holiday #29275

Merged
merged 4 commits into from
Apr 8, 2024
Merged

CLOSE|Close #29274 Add possibility to have different mail for autocopy for holiday #29275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44f1148
Add handdling of multiple autocopy mail to in CMailFile class __const…
lunoshist Apr 8, 2024
c1c7044
Change mail to autocopy to for leaves
lunoshist Apr 8, 2024
1731aa2
Remove new param and set $sendtobcc to MAIN_MAIL_AUTOCOPY_HOLIDAY_TO
lunoshist Apr 8, 2024
9a5208d
Merge branch 'Dolibarr:develop' into develop
lunoshist Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions htdocs/holiday/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,9 @@

$trackid = 'leav'.$object->id;

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
$sendtobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_HOLIDAY_TO');

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', $sendtobcc, 0, 1, '', '', $trackid);

// Sending the email
$result = $mail->sendfile();
Expand Down Expand Up @@ -677,7 +679,9 @@

$trackid = 'leav'.$object->id;

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
$sendtobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_HOLIDAY_TO');

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', $sendtobcc, 0, 1, '', '', $trackid);

// Sending email
$result = $mail->sendfile();
Expand Down Expand Up @@ -760,7 +764,9 @@

$trackid = 'leav'.$object->id;

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
$sendtobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_HOLIDAY_TO');

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', $sendtobcc, 0, 1, '', '', $trackid);

// sending email
$result = $mail->sendfile();
Expand Down Expand Up @@ -907,7 +913,9 @@

$trackid = 'leav'.$object->id;

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
$sendtobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_HOLIDAY_TO');

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', $sendtobcc, 0, 1, '', '', $trackid);

// sending email
$result = $mail->sendfile();
Expand Down
4 changes: 3 additions & 1 deletion htdocs/holiday/card_group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,9 @@ function sendMail($id, $cancreate, $now, $autoValidation)

$trackid = 'leav'.$object->id;

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
$sendtobcc = getDolGlobalString('MAIN_MAIL_AUTOCOPY_HOLIDAY_TO');

$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', $sendtobcc, 0, 1, '', '', $trackid);

// Sending the email
$result = $mail->sendfile();
Expand Down
Loading