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

fix: missing duration odt task substitution

Browse Source
This commit is contained in:
florian HENRY 2020-04-23 15:55:37 +02:00
parent da80bacf9b
commit 55a9aa5991
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ class doc_generic_task_odt extends ModelePDFTask
/** /**
* Define array with couple substitution key => substitution value * Define array with couple substitution key => substitution value
* *
* @param array $task Task Object * @param Task $task Task Object
* @param Translate $outputlangs Lang object to use for output * @param Translate $outputlangs Lang object to use for output
* @param string $array_key Name of the key for return array * @param string $array_key Name of the key for return array
* @return array Return a substitution array * @return array Return a substitution array
@ -181,7 +181,8 @@ class doc_generic_task_odt extends ModelePDFTask
'task_label'=>$task->label, 'task_label'=>$task->label,
'task_description'=>$task->description, 'task_description'=>$task->description,
'task_fk_parent'=>$task->fk_parent, 'task_fk_parent'=>$task->fk_parent,
'task_duration'=>$task->duration, 'task_duration'=>$task->convertSecondToTime(duration_effective,'allhourmin'),
'task_planned_workload'=>convertSecondToTime($task->planned_workload,'allhourmin'),
'task_progress'=>$task->progress, 'task_progress'=>$task->progress,
'task_public'=>$task->public, 'task_public'=>$task->public,
'task_date_start'=>dol_print_date($task->date_start, 'day'), 'task_date_start'=>dol_print_date($task->date_start, 'day'),