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

FIX task ODT company object not correctly retrieved

Browse Source
This commit is contained in:
Maxime Kohlhaas 2016-07-05 16:04:18 +02:00
parent ad82909d08
commit d658e2cf31
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
View File

@ -415,6 +415,7 @@ class doc_generic_task_odt extends ModelePDFTask
} }
$project= new Project($this->db); $project= new Project($this->db);
$project->fetch($object->fk_project); $project->fetch($object->fk_project);
$project->fetch_thirdparty();
$dir = $conf->projet->dir_output. "/" . $project->ref. "/"; $dir = $conf->projet->dir_output. "/" . $project->ref. "/";
$objectref = dol_sanitizeFileName($object->ref); $objectref = dol_sanitizeFileName($object->ref);
@ -449,7 +450,7 @@ class doc_generic_task_odt extends ModelePDFTask
dol_mkdir($conf->projet->dir_temp); dol_mkdir($conf->projet->dir_temp);
$socobject=$object->thirdparty; $socobject=$project->thirdparty;
// Make substitution // Make substitution
$substitutionarray=array( $substitutionarray=array(