From 1685b5396c5dd1899054e1b0dcfc260151f6e55d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Nov 2020 00:59:07 +0100 Subject: [PATCH] Fix warning --- htdocs/projet/class/task.class.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 523b5e7543c..d971b0a1562 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -907,7 +907,13 @@ class Task extends CommonObject $tasks[$i]->projectref = $obj->ref; $tasks[$i]->projectlabel = $obj->plabel; $tasks[$i]->projectstatus = $obj->projectstatus; + + $tasks[$i]->fk_opp_status = $obj->fk_opp_status; + $tasks[$i]->opp_amount = $obj->opp_amount; + $tasks[$i]->opp_percent = $obj->opp_percent; + $tasks[$i]->budget_amount = $obj->budget_amount; $tasks[$i]->usage_bill_time = $obj->usage_bill_time; + $tasks[$i]->label = $obj->label; $tasks[$i]->description = $obj->description; $tasks[$i]->fk_parent = $obj->fk_task_parent; // deprecated @@ -915,8 +921,10 @@ class Task extends CommonObject $tasks[$i]->duration = $obj->duration_effective; $tasks[$i]->planned_workload = $obj->planned_workload; - $tasks[$i]->tobill = $obj->tobill; - $tasks[$i]->billed = $obj->billed; + if ($includebilltime) { + $tasks[$i]->tobill = $obj->tobill; + $tasks[$i]->billed = $obj->billed; + } $tasks[$i]->progress = $obj->progress; $tasks[$i]->fk_statut = $obj->status; @@ -930,13 +938,6 @@ class Task extends CommonObject $tasks[$i]->thirdparty_name = $obj->thirdparty_name; $tasks[$i]->thirdparty_email = $obj->thirdparty_email; - - $tasks[$i]->fk_opp_status = $obj->fk_opp_status; - $tasks[$i]->opp_amount = $obj->opp_amount; - $tasks[$i]->opp_percent = $obj->opp_percent; - $tasks[$i]->budget_amount = $obj->budget_amount; - $tasks[$i]->usage_bill_time = $obj->usage_bill_time; - if (!empty($extrafields->attributes['projet']['label'])) { foreach ($extrafields->attributes['projet']['label'] as $key => $val)