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

Display linked propal information into invoice ODT

Browse Source
This commit is contained in:
jfefe 2013-03-05 09:44:53 +01:00
parent ff2a851ae8
commit 5ce11d00dd
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
View File

@ -348,6 +348,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$socobject=$object->client; $socobject=$object->client;
} }
// Fetch info for linked propal
$linked_propal = $object->fetchObjectLinked('','','','');
print '<pre>';
//print_r($object->linkedObjects['propal']); exit;
$propal_object = $object->linkedObjects['propal'][0];
// Make substitution // Make substitution
$substitutionarray=array( $substitutionarray=array(
'__FROM_NAME__' => $this->emetteur->nom, '__FROM_NAME__' => $this->emetteur->nom,
@ -397,8 +404,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
$array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs); $array_soc=$this->get_substitutionarray_mysoc($mysoc,$outputlangs);
$array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs); $array_thirdparty=$this->get_substitutionarray_thirdparty($socobject,$outputlangs);
$array_objet=$this->get_substitutionarray_object($object,$outputlangs); $array_objet=$this->get_substitutionarray_object($object,$outputlangs);
$array_propal=$this->get_substitutionarray_propal($propal_object,$outputlangs,'propal');
$tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet); $tmparray = array_merge($array_user,$array_soc,$array_thirdparty,$array_objet,$array_propal);
complete_substitutions_array($tmparray, $outputlangs, $object); complete_substitutions_array($tmparray, $outputlangs, $object);
//var_dump($tmparray); exit; //var_dump($tmparray); exit;