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

NEW Save one click to select on delivery ack, on emails.

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-19 21:10:07 +02:00
parent 574cba906f
commit b1136f6115
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/html.formmail.class.php
View File

@ -1205,8 +1205,8 @@ class FormMail extends Form
*/ */
public function getHtmlForDeliveryreceipt() public function getHtmlForDeliveryreceipt()
{ {
global $conf, $langs, $form; global $conf, $langs;
$out = '<tr><td>'.$langs->trans("DeliveryReceipt").'</td><td>'; $out = '<tr><td><label for="deliveryreceipt">'.$langs->trans("DeliveryReceipt").'</label></td><td>';
if (!empty($this->withdeliveryreceiptreadonly)) { if (!empty($this->withdeliveryreceiptreadonly)) {
$out .= yn($this->withdeliveryreceipt); $out .= yn($this->withdeliveryreceipt);
@ -1227,7 +1227,8 @@ class FormMail extends Form
if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') { if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_supplier_send') {
$defaultvaluefordeliveryreceipt = 1; $defaultvaluefordeliveryreceipt = 1;
} }
$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1); //$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);
$out .= '<input type="checkbox" id="deliveryreceipt" name="deliveryreceipt" value="1"'.((GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt) ? ' checked="checked"' : '').'>';
} }
$out .= "</td></tr>\n"; $out .= "</td></tr>\n";
return $out; return $out;

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

@ -7,10 +7,10 @@ MailCard=EMailing card
MailRecipients=Recipients MailRecipients=Recipients
MailRecipient=Recipient MailRecipient=Recipient
MailTitle=Description MailTitle=Description
MailFrom=Sender MailFrom=From
MailErrorsTo=Errors to MailErrorsTo=Errors to
MailReply=Reply to MailReply=Reply to
MailTo=Receiver(s) MailTo=To
MailToUsers=To user(s) MailToUsers=To user(s)
MailCC=Copy to MailCC=Copy to
MailToCCUsers=Copy to users(s) MailToCCUsers=Copy to users(s)