Merge branch 'extra_odt' into extrafields

htdocs/core/class/commondocgenerator.class.php

@@ -171,6 +171,7 @@ abstract class CommonDocGenerator
         		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
         	$extrafields = new ExtraFields($this->db);
         	$extralabels = $extrafields->fetch_name_optionals_label('company',true);
+        	$object->fetch_optionals($object->id,$extralabels);
         	 
         	foreach($extrafields->attribute_label as $key=>$label)
         	{
@@ -178,9 +179,13 @@ abstract class CommonDocGenerator
         		{
         			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key]).' '.$outputlangs->getCurrencySymbol($conf->currency);
         		}
+        		else if($extrafields->attribute_type[$key] == 'select')
+        		{        			
+        			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
+        		}
         		$array_thirdparty=array_merge($array_thirdparty,array('company_options_'.$key => $object->array_options['options_'.$key]));
         	}
-        }
+        }        
         return $array_thirdparty;
     }