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

FIX Show declared progress

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-06 21:25:04 +01:00
parent 572366c6c2
commit d3a6b16021
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/projet/tasks/time.php
View File

@ -515,7 +515,10 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Planned workload
print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
print convertSecondToTime($object->planned_workload,'allhourmin');
if ($object->planned_workload)
{
print convertSecondToTime($object->planned_workload,'allhourmin');
}
print '</td></tr>';
print '</table>';
@ -528,7 +531,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
// Progress declared
print '<tr><td class="titlefield">'.$langs->trans("ProgressDeclared").'</td><td>';
print $object->progress.' %';
print $object->progress != '' ? $object->progress.' %' : '';
print '</td></tr>';
// Progress calculated
@ -960,7 +963,6 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
$totalarray=array();
foreach ($tasks as $task_time)
{
print '<tr class="oddeven">';
$date1=$db->jdate($task_time->task_date);