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

Merge pull request #2468 from defrance69/patch-55

Browse Source 
Update extrafields.class.php
This commit is contained in:
Laurent Destailleur 2015-03-22 21:28:53 +01:00
commit 87faf530e0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/extrafields.class.php
View File

@ -567,10 +567,12 @@ class ExtraFields
{
global $conf;
if ( empty($elementtype) ) return array();
if ($elementtype == 'thirdparty') $elementtype='societe';
$array_name_label=array();
// For avoid conflicts with external modules
if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;