From 6bd219b117eebe7f6d88fdaad03331ff02d17534 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 24 Oct 2016 17:47:31 +0200
Subject: [PATCH] Fix column task ref/label

---
 htdocs/projet/tasks/time.php | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index ada4156ad1c..96c849d8df9 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -570,7 +570,8 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 		print '<td width="100">'.$langs->trans("Date").'</td>';
 		if (! $id && ! $ref)   // Not a dedicated task
         {
-		  print '<td>'.$langs->trans("Task").'</td>';
+		  print '<td>'.$langs->trans("RefTask").'</td>';
+		  print '<td>'.$langs->trans("LabelTask").'</td>';
         }
 		print '<td>'.$langs->trans("By").'</td>';
 		print '<td align="left">'.$langs->trans("Note").'</td>';
@@ -615,6 +616,9 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
     			$tasktmp->label = $task_time->label;
     			print $tasktmp->getNomUrl(1, 'withproject', 'time');	
     			print '</td>';
+    			print '<td class="nowrap">';
+    		    print $tasktmp->label;
+    			print '</td>';    			
 			}
 			
 			// User
@@ -702,7 +706,13 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0)
 			$total += $task_time->task_duration;
 			$totalvalue += price2num($task_time->thm * $task_time->task_duration / 3600);
 		}
-		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+		
+		$colspan=3;
+		if (! $id && ! $ref)   // Not a dedicated task
+		{
+		    $colspan+=2;
+		}
+		print '<tr class="liste_total"><td colspan="'.$colspan.'" class="liste_total">'.$langs->trans("Total").'</td>';
 		print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total,'allhourmin').'</td>';
 		if ($conf->salaries->enabled)
 		{