Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #609 from FHenry/3.3

Browse Source 
Add option to fecth extrafield even if extranal extrafield module is
This commit is contained in:
Regis Houssin
2013-01-15 02:35:56 -08:00
parent 285bcbecb7 52b4d98849
commit 9152d5575f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,16 +431,17 @@ class ExtraFields
* Load array this->attribute_label * Load array this->attribute_label
* *
* @param string $elementtype Type of element * @param string $elementtype Type of element
* @param boolean $forcecheck override test of MAIN_EXTRAFIELDS_DISABLED
* @return array Array of attributes for all extra fields * @return array Array of attributes for all extra fields
*/ */
function fetch_name_optionals_label($elementtype='member') function fetch_name_optionals_label($elementtype='member',$forcecheck=false)
{ {
global $conf; global $conf;
$array_name_label=array(); $array_name_label=array();
// For avoid conflicts with external modules // For avoid conflicts with external modules
if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && !$forcecheck)
return $array_name_label; return $array_name_label;
$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired"; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired";