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

Fix bad property set. Must set fk_task_parent not fk_parent.

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-08 16:22:16 +02:00
parent a95335d869
commit 298c55b3ed
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/projet/class/task.class.php
View File

@ -679,7 +679,8 @@ class Task extends CommonObject
$tasks[$i]->projectstatus = $obj->projectstatus; $tasks[$i]->projectstatus = $obj->projectstatus;
$tasks[$i]->label = $obj->label; $tasks[$i]->label = $obj->label;
$tasks[$i]->description = $obj->description; $tasks[$i]->description = $obj->description;
$tasks[$i]->fk_parent = $obj->fk_task_parent; $tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated
$tasks[$i]->fk_task_parent = $obj->fk_task_parent;
$tasks[$i]->duration = $obj->duration_effective; $tasks[$i]->duration = $obj->duration_effective;
$tasks[$i]->planned_workload= $obj->planned_workload; $tasks[$i]->planned_workload= $obj->planned_workload;
$tasks[$i]->progress = $obj->progress; $tasks[$i]->progress = $obj->progress;
@ -913,14 +914,18 @@ class Task extends CommonObject
/** /**
* Calculate total of time spent for task * Calculate total of time spent for task
* *
* @param int $id Id of object (here task)
* @return array Array of info for task array('min_date', 'max_date', 'total_duration') * @return array Array of info for task array('min_date', 'max_date', 'total_duration')
*/ */
function getSummaryOfTimeSpent($id='') function getSummaryOfTimeSpent()
{ {
global $langs; global $langs;
if (empty($id)) $id=$this->id; $id=$this->id;
if (empty($id))
{
dol_syslog("getSummaryOfTimeSpent called on a not loaded task", LOG_ERR);
return -1;
}
$result=array(); $result=array();