From 874e27ef84d106311cb84d718288fe4e41400862 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 14 Nov 2018 15:37:10 +0100 Subject: [PATCH] FIX multicompany override constants of current entity --- htdocs/core/modules/propale/mod_propale_saphir.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php index c91f9eb529c..87fcc7c2920 100644 --- a/htdocs/core/modules/propale/mod_propale_saphir.php +++ b/htdocs/core/modules/propale/mod_propale_saphir.php @@ -134,14 +134,8 @@ class mod_propale_saphir extends ModeleNumRefPropales require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; - $constant = 'PROPALE_SAPHIR_MASK_'.$propal->entity; - // On defini critere recherche compteur - if (! empty($conf->global->$constant)) { - $mask = $conf->global->$constant; // for multicompany proposal sharing - } else { - $mask = $conf->global->PROPALE_SAPHIR_MASK; - } + $mask = $conf->global->PROPALE_SAPHIR_MASK; if (! $mask) {