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 '';
- // Duration
- print '
';
- print $lines[$i]->planned_workload.' '.$langs->trans('Hours');
- print ' | ';
+ // Planned Workload
+ print '';
+ 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 ' | ';
// Progress
print '';
@@ -443,7 +448,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
// Tick to drag and drop
if ($addordertick)
{
- print ' | | ';
+ print ' | ';
}
print "\n";
@@ -555,10 +560,15 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr
print dol_print_date($lines[$i]->date_end,'day');
print '';
- // Duration
- print '';
- print $lines[$i]->planned_workload.' '.$langs->trans('Hours');
- print ' | ';
+ // Planned Workload
+ print '';
+ 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 ' | ';
// Progress
print '';
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 ' | '.$langs->trans("LabelTask").' | ';
print ''.$langs->trans("DateStart").' | ';
print ''.$langs->trans("DateEnd").' | ';
- print ''.$langs->trans("Duration").' | ';
+ print ''.$langs->trans("PlannedWorkload").' | ';
print ''.$langs->trans("Progress").' | ';
print ''.$langs->trans("TimeSpent").' | ';
print ' | ';
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 ''.$langs->trans("RefTask").' | ';
print ''.$langs->trans("LabelTask").' | ';
print ''.$langs->trans("DateStart").' | ';
print ''.$langs->trans("DateEnd").' | ';
-print ''.$langs->trans("Duration").' | ';
+print ''.$langs->trans("PlannedWorkload").' | ';
print ''.$langs->trans("Progress").' | ';
print ''.$langs->trans("TimeSpent").' | ';
print "\n";