Merge pull request #13904 from atm-maxime/fix_merge_contactrole
Fix third merge issue with contact roles
This commit is contained in:
commit
e29f4083e5
@ -1576,7 +1576,7 @@ class Contact extends CommonObject
|
|||||||
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
|
public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
|
||||||
{
|
{
|
||||||
$tables = array(
|
$tables = array(
|
||||||
'socpeople'
|
'socpeople', 'societe_contacts'
|
||||||
);
|
);
|
||||||
|
|
||||||
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
|
return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user