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

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

Browse Source 
Conflicts:
	htdocs/societe/class/societe.class.php
This commit is contained in:
Laurent Destailleur 2018-04-05 13:10:11 +02:00
commit 08ab67289b
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/societe/class/societe.class.php
View File

@ -2582,18 +2582,15 @@ class Societe extends CommonObject
if (! empty($conf->global->SOCIETE_CODECOMPTA_ADDON))
{
$file='';
$res=false;
$dirsociete=array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
foreach ($dirsociete as $dirroot)
{
if (file_exists(DOL_DOCUMENT_ROOT.'/'.$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php"))
{
$file=$dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.".php";
break;
}
$res=dol_include_once($dirroot.$conf->global->SOCIETE_CODECOMPTA_ADDON.'.php');
if ($res) break;
}
if (! empty($file))
if ($res)
{
dol_include_once($file);