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

FIX multicompany override constants of current entity

Browse Source
This commit is contained in:
Regis Houssin 2018-11-14 15:37:10 +01:00
parent 93a1e941a4
commit 874e27ef84
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/propale/mod_propale_saphir.php
View File

@ -134,14 +134,8 @@ class mod_propale_saphir extends ModeleNumRefPropales
require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
$constant = 'PROPALE_SAPHIR_MASK_'.$propal->entity;
// On defini critere recherche compteur // On defini critere recherche compteur
if (! empty($conf->global->$constant)) { $mask = $conf->global->PROPALE_SAPHIR_MASK;
$mask = $conf->global->$constant; // for multicompany proposal sharing
} else {
$mask = $conf->global->PROPALE_SAPHIR_MASK;
}
if (! $mask) if (! $mask)
{ {