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

FIX: Sql syntax error in doc_generic_task_odt

Browse Source
This commit is contained in:
Laurent Destailleur 2016-01-16 10:20:14 +01:00
parent a9f0d6964a
commit d46c655fb4
1 changed files with 3 additions and 2 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

@ -587,7 +587,7 @@ class doc_generic_task_odt extends ModelePDFTask
// Time ressources // Time ressources
$sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note"; $sql = "SELECT t.rowid, t.task_date, t.task_duration, t.fk_user, t.note";
$sql.= ", u.name, u.firstname"; $sql.= ", u.lastname, u.firstname";
$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t"; $sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
$sql .= " , ".MAIN_DB_PREFIX."user as u"; $sql .= " , ".MAIN_DB_PREFIX."user as u";
$sql .= " WHERE t.fk_task =".$object->id; $sql .= " WHERE t.fk_task =".$object->id;
@ -607,6 +607,7 @@ class doc_generic_task_odt extends ModelePDFTask
if (!empty($row['fk_user'])) { if (!empty($row['fk_user'])) {
$objectdetail=new User($this->db); $objectdetail=new User($this->db);
$objectdetail->fetch($row['fk_user']); $objectdetail->fetch($row['fk_user']);
// TODO Use a cache to aoid fetch for same user
$row['fullcivname']=$objectdetail->getFullName($outputlangs,1); $row['fullcivname']=$objectdetail->getFullName($outputlangs,1);
} else { } else {
$row['fullcivname']=''; $row['fullcivname']='';