lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
This commit is contained in:
Laurent Destailleur 2021-06-14 14:43:46 +02:00
commit 6078267f86
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
View File

@ -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) {