From a4031a3680241275ac3404ba3d4835a3c6ba3701 Mon Sep 17 00:00:00 2001
From: Alexis Algoud <alexis@atm-consulting.fr>
Date: Mon, 18 May 2015 18:33:17 +0200
Subject: [PATCH] if contact in sellist, it's an Id
---
htdocs/comm/propal.php | 8 +++++++-
htdocs/compta/facture.php | 9 ++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index ce86b84a846..99119414971 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -436,7 +436,13 @@ if (empty($reshook)) {
$message = $_POST ['message'];
$receivercc = GETPOST('receivercc');
- $sendtocc = ($receivercc!=='') ? $receivercc : $_POST ['sendtocc'];
+ if($_POST ['sendtocc']!=='') {
+ $sendtocc = $_POST ['sendtocc'] ;
+ }
+ elseif($receivercc!=-1) {
+ $sendtocc = $object->client->contact_get_property($receivercc, 'email');
+ }
+
$deliveryreceipt = $_POST ['deliveryreceipt'];
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index b9805822149..af28d80b9e9 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1571,8 +1571,15 @@ if (empty($reshook)) {
$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
$replyto = $_POST['replytoname'] . ' <' . $_POST['replytomail'] . '>';
$message = $_POST['message'];
+
$receivercc = GETPOST('receivercc');
- $sendtocc = ($receivercc!=='') ? $receivercc : $_POST ['sendtocc'];
+ if($_POST ['sendtocc']!=='') {
+ $sendtocc = $_POST ['sendtocc'] ;
+ }
+ elseif($receivercc!=-1) {
+ $sendtocc = $object->client->contact_get_property($receivercc, 'email');
+ }
+
$deliveryreceipt = $_POST['deliveryreceipt'];
if ($action == 'send') {
--
GitLab