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

This commit is contained in:
Laurent Destailleur 2020-07-03 00:41:06 +02:00
commit 8d8695ccd7

View File

@ -846,6 +846,11 @@ if (empty($reshook))
$id=$socid;
$object->fetch($socid);
// Selection of new fields
if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD) && (empty($conf->global->SOCIETE_DISABLE_CONTACTS) || !empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))) {
include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
}
// Actions to send emails
$trigger_name='COMPANY_SENTBYMAIL';
$paramname='socid';