FIX Show declared progress

Dolibarr · Dec 6, 2018 · 6d8a6bf · 6d8a6bf
1 parent 1647980
commit 6d8a6bf
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
@@ -515,7 +515,10 @@
 
 		// 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 @@
 
 		// 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 @@
 		$totalarray=array();
 		foreach ($tasks as $task_time)
 		{
-
 			print '<tr class="oddeven">';
 
 			$date1=$db->jdate($task_time->task_date);