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

Fix : in ODT show value and not label of company extrafield

Browse Source
This commit is contained in:
jfefe 2013-02-17 21:14:00 +01:00
parent 060060f08b
commit 8ebb48cb5c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/commondocgenerator.class.php
View File

@ -164,14 +164,20 @@ abstract class CommonDocGenerator
'company_note'=>$object->note
);
$extrafields = array();
// Retrieve extrafields
if(is_array($object->array_options) && count($object->array_options))
{
foreach($object->array_options as $key=>$label)
if(!class_exists('Extrafields'))
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('company',true);
//Get extrafield values
$object->fetch_optionals($object->id,$extralabels);
foreach($extrafields->attribute_label as $key=>$label)
{
$extrafields['company_'.$key] = $label;
$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
}
$array_thirdparty = array_merge($array_thirdparty,$extrafields);
}
return $array_thirdparty;
}