From 7de861eee4bf078314da7113a4caab370fd4dbc4 Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Tue, 14 May 2013 20:30:18 +0200
Subject: [PATCH] Beteer display

---
 htdocs/core/lib/project.lib.php | 32 +++++++++++++++++++++-----------
 htdocs/projet/tasks.php         |  2 +-
 htdocs/projet/tasks/index.php   |  2 +-
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 9f7ef3355e5..ae124ebb484 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -49,8 +49,8 @@ function project_prepare_head($object)
 	$h++;
 
 	if (! empty($conf->fournisseur->enabled) || ! empty($conf->propal->enabled) || ! empty($conf->commande->enabled)
-		|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
-		|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
+	|| ! empty($conf->facture->enabled) || ! empty($conf->contrat->enabled)
+	|| ! empty($conf->ficheinter->enabled) || ! empty($conf->agenda->enabled) || ! empty($conf->deplacement->enabled))
 	{
 		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Referers");
@@ -420,10 +420,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				print dol_print_date($lines[$i]->date_end,'day');
 				print '</td>';
 
-                // Duration
-                print '<td align="center">';
-                print $lines[$i]->planned_workload.' '.$langs->trans('Hours');
-                print '</td>';
+				// Planned Workload
+				print '<td align="center">';
+				if (!empty($lines[$i]->planned_workload)) {
+					$planned_workload_hours = intval($lines[$i]->planned_workload / 3600);
+				}else {
+					$planned_workload_hours = 0;
+				}
+				print $planned_workload_hours.' '.$langs->trans('Hours');
+				print '</td>';
 
 				// Progress
 				print '<td align="right">';
@@ -443,7 +448,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Tick to drag and drop
 				if ($addordertick)
 				{
-                	print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
+					print '<td align="center" class="tdlineupdown hideonsmartphone">&nbsp;</td>';
 				}
 
 				print "</tr>\n";
@@ -555,10 +560,15 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
 			print dol_print_date($lines[$i]->date_end,'day');
 			print '</td>';
 
-            // Duration
-            print '<td align="center">';
-            print $lines[$i]->planned_workload.' '.$langs->trans('Hours');
-            print '</td>';
+			// Planned Workload
+			print '<td align="center">';
+			if (!empty($lines[$i]->planned_workload)) {
+				$planned_workload_hours = intval($lines[$i]->planned_workload / 3600);
+			}else {
+				$planned_workload_hours = 0;
+			}
+			print $planned_workload_hours.' '.$langs->trans('Hours');
+			print '</td>';
 
 			// Progress
 			print '<td align="right">';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 7e3a2afd281..1bdb6711afb 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -403,7 +403,7 @@ else
 	print '<td>'.$langs->trans("LabelTask").'</td>';
 	print '<td align="center">'.$langs->trans("DateStart").'</td>';
 	print '<td align="center">'.$langs->trans("DateEnd").'</td>';
-	print '<td align="right">'.$langs->trans("Duration").'</td>';
+	print '<td align="right">'.$langs->trans("PlannedWorkload").'</td>';
 	print '<td align="right">'.$langs->trans("Progress").'</td>';
 	print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 	print '<td>&nbsp;</td>';
diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php
index c7a8647bfbf..5b42b76c221 100644
--- a/htdocs/projet/tasks/index.php
+++ b/htdocs/projet/tasks/index.php
@@ -100,7 +100,7 @@ print '<td width="80">'.$langs->trans("RefTask").'</td>';
 print '<td>'.$langs->trans("LabelTask").'</td>';
 print '<td align="center">'.$langs->trans("DateStart").'</td>';
 print '<td align="center">'.$langs->trans("DateEnd").'</td>';
-print '<td align="center">'.$langs->trans("Duration").'</td>';
+print '<td align="center">'.$langs->trans("PlannedWorkload").'</td>';
 print '<td align="right">'.$langs->trans("Progress").'</td>';
 print '<td align="right">'.$langs->trans("TimeSpent").'</td>';
 print "</tr>\n";