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

Adds possibility to add senders name to $formmail->fromname

Browse Source 
If INVOICE_EMAIL_SENDER_NAME, SHIPPING_EMAIL_SENDER_NAME, COMMANDE_EMAIL_SENDER_NAME or ORDER_SUPPLIER_EMAIL_SENDER_NAME is beeing set, use it as sender name. If not, keep $formmail->fromname blank
This commit is contained in:
bjoern86 2022-01-01 20:24:30 +01:00 committed by GitHub
parent 0037ee2254
commit cab4b762d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/tpl/card_presend.tpl.php
View File

@ -124,22 +124,22 @@ if ($action == 'presend') {
if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) { if ($object->element === 'facture' && !empty($conf->global->INVOICE_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER; $formmail->frommail = $conf->global->INVOICE_EMAIL_SENDER;
$formmail->fromname = ''; (!empty($conf->global->INVOICE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->INVOICE_EMAIL_SENDER_NAME : $formmail->fromname = '');
$formmail->fromtype = 'special'; $formmail->fromtype = 'special';
} }
if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) { if ($object->element === 'shipping' && !empty($conf->global->SHIPPING_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER; $formmail->frommail = $conf->global->SHIPPING_EMAIL_SENDER;
$formmail->fromname = ''; (!empty($conf->global->SHIPPING_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->SHIPPING_EMAIL_SENDER_NAME : $formmail->fromname = '');
$formmail->fromtype = 'special'; $formmail->fromtype = 'special';
} }
if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) { if ($object->element === 'commande' && !empty($conf->global->COMMANDE_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER; $formmail->frommail = $conf->global->COMMANDE_EMAIL_SENDER;
$formmail->fromname = ''; (!empty($conf->global->COMMANDE_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->COMMANDE_EMAIL_SENDER_NAME : $formmail->fromname = '');
$formmail->fromtype = 'special'; $formmail->fromtype = 'special';
} }
if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) { if ($object->element === 'order_supplier' && !empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER)) {
$formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER; $formmail->frommail = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER;
$formmail->fromname = ''; (!empty($conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME) ? $formmail->fromname = $conf->global->ORDER_SUPPLIER_EMAIL_SENDER_NAME : $formmail->fromname = '');
$formmail->fromtype = 'special'; $formmail->fromtype = 'special';
} }