FIX php8 compatibility

This commit is contained in:
Philippe GRAND 2022-08-28 14:06:04 +02:00
parent 9c53fe07a0
commit 0329887643

View File

@ -295,7 +295,7 @@ class modSociete extends DolibarrModules
// Add multicompany field // Add multicompany field
if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) { if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1 $nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) { if (isModEnabled('multicompany') && $nbofallowedentities > 1) {
$this->export_fields_array[$r] += array('s.entity'=>'Entity'); $this->export_fields_array[$r] += array('s.entity'=>'Entity');
} }
} }
@ -379,7 +379,7 @@ class modSociete extends DolibarrModules
); );
// Add multicompany field // Add multicompany field
if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) { if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
if (!empty($conf->multicompany->enabled)) { if (isModEnabled('multicompany')) {
$nbofallowedentities = count(explode(',', getEntity('contact'))); $nbofallowedentities = count(explode(',', getEntity('contact')));
if ($nbofallowedentities > 1) { if ($nbofallowedentities > 1) {
$this->export_fields_array[$r]['c.entity'] = 'Entity'; $this->export_fields_array[$r]['c.entity'] = 'Entity';