Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal

Fix email cc in selectlist on propal/bill
This commit is contained in:
Laurent Destailleur 2015-05-22 16:56:53 +02:00
commit 2f5d1f5965
2 changed files with 19 additions and 2 deletions

View File

@ -434,7 +434,16 @@ if (empty($reshook)) {
$from = $_POST ['fromname'] . ' <' . $_POST ['frommail'] . '>';
$replyto = $_POST ['replytoname'] . ' <' . $_POST ['replytomail'] . '>';
$message = $_POST ['message'];
$sendtocc = $_POST ['sendtocc'];
$receivercc = GETPOST('receivercc');
if($_POST ['sendtocc']!=='') {
$sendtocc = $_POST ['sendtocc'] ;
}
elseif($receivercc!=-1) {
$sendtocc = $object->client->contact_get_property($receivercc, 'email');
}
$deliveryreceipt = $_POST ['deliveryreceipt'];
if (dol_strlen($_POST ['subject']))

View File

@ -1571,7 +1571,15 @@ if (empty($reshook)) {
$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
$replyto = $_POST['replytoname'] . ' <' . $_POST['replytomail'] . '>';
$message = $_POST['message'];
$sendtocc = $_POST['sendtocc'];
$receivercc = GETPOST('receivercc');
if($_POST ['sendtocc']!=='') {
$sendtocc = $_POST ['sendtocc'] ;
}
elseif($receivercc!=-1) {
$sendtocc = $object->client->contact_get_property($receivercc, 'email');
}
$deliveryreceipt = $_POST['deliveryreceipt'];
if ($action == 'send') {