diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 0bab573da6a..1e30b12cb34 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -319,6 +319,7 @@ if ($_POST['action'] == 'send') $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $message = $_POST['message']; $sendtocc = $_POST['sendtocc']; + $deliveryreceipt = $_POST['deliveryreceipt']; if ($_POST['action'] == 'send') { @@ -351,7 +352,7 @@ if ($_POST['action'] == 'send') $mimetype[1] = $_FILES['addedfile']['type']; } // Envoi de la propal - $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc); + $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->sendfile()) { $msg='
'.$langs->trans('MailSuccessfulySent',$from,$sendto).'.
'; @@ -1585,6 +1586,7 @@ if ($_GET['propalid'] > 0) $formmail->withtopic=$langs->trans('SendPropalRef','__PROPREF__'); $formmail->withfile=1; $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; // Tableau des substitutions $formmail->substit['__PROPREF__']=$propal->ref; // Tableau des paramètres complémentaires diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 7b362d32e0f..ee6497b059b 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -475,6 +475,7 @@ if ($_POST['action'] == 'send') $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $message = $_POST['message']; $sendtocc = $_POST['sendtocc']; + $deliveryreceipt = $_POST['deliveryreceipt']; if ($_POST['action'] == 'send') { @@ -507,7 +508,7 @@ if ($_POST['action'] == 'send') $mimetype[1] = $_FILES['addedfile']['type']; } // Envoi de la commande - $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc); + $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->sendfile()) { $msg='
'.$langs->trans('MailSuccessfulySent',$from,$sendto).'.
'; @@ -1761,6 +1762,7 @@ else $formmail->withtopic=$langs->trans('SendOrderRef','__ORDERREF__'); $formmail->withfile=1; $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; // Tableau des substitutions $formmail->substit['__ORDERREF__']=$commande->ref; // Tableau des paramètres complémentaires diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index c47069284c7..4d3380d1b1f 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -576,6 +576,7 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance') $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $message = $_POST['message']; $sendtocc = $_POST['sendtocc']; + $deliveryreceipt = $_POST['deliveryreceipt']; if ($_POST['action'] == 'send') { @@ -619,7 +620,7 @@ if ($_POST['action'] == 'send' || $_POST['action'] == 'relance') $mimetype[1] = $_FILES['addedfile']['type']; // Envoi de la facture - $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc); + $mailfile = new CMailFile($subject,$sendto,$from,$message,$filepath,$mimetype,$filename,$sendtocc,'',$deliveryreceipt); if ($mailfile->sendfile()) { @@ -2343,6 +2344,7 @@ else $formmail->withtopic=$langs->trans('SendBillRef','__FACREF__'); $formmail->withfile=1; $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; // Tableau des substitutions $formmail->substit['__FACREF__']=$fac->ref; // Tableau des paramètres complémentaires du post @@ -2397,6 +2399,7 @@ else $formmail->withtopic=$langs->trans('SendReminderBillRef','__FACREF__'); $formmail->withfile=1; $formmail->withbody=1; + $formmail->withdeliveryreceipt=1; // Tableau des substitutions $formmail->substit['__FACREF__']=$fac->ref; // Tableau des paramètres complémentaires diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php index 5cdc358f150..58b6afb934b 100644 --- a/htdocs/html.form.class.php +++ b/htdocs/html.form.class.php @@ -1063,11 +1063,11 @@ class Form } /** - * \brief Retourne la liste des types de paiements possibles - * \param selected Id du type de paiement présélectionné + * \brief Selection oui ou non + * \param selected Id présélectionné * \param htmlname Nom de la zone select */ - function select_assujetti_tva($selected='',$htmlname='') + function select_YesNo($selected='',$htmlname='') { global $langs; print '