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

Fix : bad call of extrafields into contact substitution (works with socpeople)

Browse Source
This commit is contained in:
jfefe 2014-05-10 18:47:00 +02:00
parent 4e53b57313
commit 31044f1f72
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,10 +254,9 @@ abstract class CommonDocGenerator
); );
// Retrieve extrafields // Retrieve extrafields
if (is_array($object->array_options) && count($object->array_options)) {
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
$extrafields = new ExtraFields($this->db); $extrafields = new ExtraFields($this->db);
$extralabels = $extrafields->fetch_name_optionals_label('contact', true); $extralabels = $extrafields->fetch_name_optionals_label('socpeople', true);
$object->fetch_optionals($object->id, $extralabels); $object->fetch_optionals($object->id, $extralabels);
foreach($extrafields->attribute_label as $key => $label) foreach($extrafields->attribute_label as $key => $label)
@ -270,8 +269,7 @@ abstract class CommonDocGenerator
{ {
$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]]; $object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
} }
$array_contact = array_merge($array_contact, array('contact_options_' . $key => $object->array_options['options_'. $key])); $array_contact = array_merge($array_contact, array($array_key.'_options_' . $key => $object->array_options['options_'. $key]));
}
} }
return $array_contact; return $array_contact;
} }

1
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
View File

@ -329,7 +329,6 @@ class doc_generic_odt extends ModeleThirdPartyDoc
foreach($contact_arrray as $array_key => $contact_id) foreach($contact_arrray as $array_key => $contact_id)
{ {
$res_contact = $contactstatic->fetch($contact_id); $res_contact = $contactstatic->fetch($contact_id);
//$contact['fullname']=$objectdetail->getFullName($outputlangs,1);
$tmparray=$this->get_substitutionarray_contact($contactstatic,$outputlangs,'contact'); $tmparray=$this->get_substitutionarray_contact($contactstatic,$outputlangs,'contact');
foreach($tmparray as $key => $val) foreach($tmparray as $key => $val)
{ {