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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-05 15:47:46 +02:00
commit 81f289619d
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/actions_massactions.inc.php
View File

@ -499,9 +499,11 @@ if (!$error && $massaction == 'confirm_presend')
//var_dump($trackid);exit; //var_dump($trackid);exit;
//var_dump($subjectreplaced); //var_dump($subjectreplaced);
if (empty($sendcontext)) $sendcontext = 'standard';
// Send mail (substitutionarray must be done just before this) // Send mail (substitutionarray must be done just before this)
require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid); $mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
if ($mailfile->error) if ($mailfile->error)
{ {
$resaction .= '<div class="error">'.$mailfile->error.'</div>'; $resaction .= '<div class="error">'.$mailfile->error.'</div>';

2
htdocs/core/class/html.formticket.class.php
View File

@ -125,7 +125,7 @@ class FormTicket
* Show the form to input ticket * Show the form to input ticket
* *
* @param int $withdolfichehead With dol_fiche_head * @param int $withdolfichehead With dol_fiche_head
* @param string Mode ('create' or 'edit') * @param string $mode Mode ('create' or 'edit')
* @return void * @return void
*/ */
public function showForm($withdolfichehead = 0, $mode = 'edit') public function showForm($withdolfichehead = 0, $mode = 'edit')

2
htdocs/core/lib/admin.lib.php
View File

@ -1809,7 +1809,7 @@ function email_admin_prepare_head()
if ($conf->mailing->enabled) if ($conf->mailing->enabled)
{ {
$head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php"; $head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing"); $head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("EMailing"));
$head[$h][2] = 'common_emailing'; $head[$h][2] = 'common_emailing';
$h++; $h++;
} }

2
htdocs/langs/en_US/mails.lang
View File

@ -164,7 +164,7 @@ NoContactWithCategoryFound=No contact/address with a category found
NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
OutGoingEmailSetup=Outgoing email setup OutGoingEmailSetup=Outgoing email setup
InGoingEmailSetup=Incoming email setup InGoingEmailSetup=Incoming email setup
OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing) OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
DefaultOutgoingEmailSetup=Default outgoing email setup DefaultOutgoingEmailSetup=Default outgoing email setup
Information=Information Information=Information
ContactsWithThirdpartyFilter=Contacts with third-party filter ContactsWithThirdpartyFilter=Contacts with third-party filter