Browse Source

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
Laurent Destailleur 4 years ago
parent
commit
6078267f86

+ 2 - 5
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php

@@ -83,12 +83,9 @@ class InterfaceContactRoles extends DolibarrTriggers
 
 				if (is_array($TContact) && !empty($TContact)) {
 					$TContactAlreadyLinked = array();
-					if ($object->id > 0) {
-						$cloneFrom = dol_clone($object, 1);
 
-						if (!empty($cloneFrom->id)) {
-							$TContactAlreadyLinked = array_merge($cloneFrom->liste_contact(-1, 'external'), $cloneFrom->liste_contact(-1, 'internal'));
-						}
+					if ($object->id > 0) {
+						$TContactAlreadyLinked = array_merge($object->liste_contact(-1, 'external'), $object->liste_contact(-1, 'internal'));
 					}
 
 					foreach ($TContact as $i => $infos) {