From d50114df649a0d7752f4a549e5d541da1dc27eeb Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Fri, 6 Sep 2019 09:20:18 +0200
Subject: [PATCH] mostlyDone

---
 htdocs/contact/class/contact.class.php        |  2 +-
 ...rface_90_modSociete_ContactRoles.class.php | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 6b46e32f532..fad72d69637 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -1544,7 +1544,7 @@ class Contact extends CommonObject
 		$sql.= " AND tc.element='".$element."'";
 		$sql.= " AND tc.active=1";
 
-		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
+		dol_syslog(get_class($this)."::".__METHOD__, LOG_DEBUG);
 		$resql=$this->db->query($sql);
 		if ($resql)
 		{
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index 8fba51e7a69..36a8274c602 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -71,16 +71,20 @@ class InterfaceContactRoles extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		// Lors de la création d'un document, récupération des contacts et rôle associés à la société et association avec le document
+
 		if ($action === 'PROPAL_CREATE' || $action === 'ORDER_CREATE' || $action === 'BILL_CREATE'	|| $action === 'ORDER_SUPPLIER_CREATE' || $action === 'BILL_SUPPLIER_CREATE'
 			|| $action === 'CONTRACT_CREATE' || $action === 'FICHINTER_CREATE' || $action === 'PROJECT_CREATE' || $action === 'TICKET_CREATE' || $action === 'ACTION_CREATE') {
 
-			if(!empty($object->socid) && $object->socid != '-1') {
-				global $db, $langs;
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
+			$socid=(property_exists($object, 'socid')?$object->socid:$object->fk_soc);
+
+			if(!empty($socid) && $socid != '-1') {
+				global $db, $langs;
+				var_dump($socid);
 				$contactdefault = new Contact($this->db);
-				$contactdefault->socid=$object->socid;
-				$TContact = $contactdefault->getContactRoles();
+				$contactdefault->socid=$socid;
+				$TContact = $contactdefault->getContactRoles($object->element);
 
 				// Le trigger est appelé avant que le core n'ajoute lui-même des contacts (contact propale, clone), il ne faut pas les associer avant sinon bug
 				$TContactAlreadyLinked = array();
@@ -90,7 +94,7 @@ class InterfaceContactRoles extends DolibarrTriggers
 					$cloneFrom = new $class($db);
 					$r = $cloneFrom->fetch($object->id);
 
-					if (!empty($cloneFrom->id))	$TContactAlreadyLinked = array_merge($cloneFrom->liste_contact(-1,'external'), $cloneFrom->liste_contact(-1,'internal'));
+					if (!empty($cloneFrom->id))	$TContactAlreadyLinked = array_merge($cloneFrom->liste_contact(-1, 'external'), $cloneFrom->liste_contact(-1, 'internal'));
 				}
 
 				foreach($TContact as $i => $infos) {
@@ -111,10 +115,6 @@ class InterfaceContactRoles extends DolibarrTriggers
 					setEventMessage($langs->trans('ContactAddedAutomatically', $nb));
 				}
 			}
-
-			dol_syslog(
-				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-			);
 		}
     }
 }