diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 7359108310e..49169241d76 100755 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -42,8 +42,9 @@ Activity=Activity Activities=Tasks/activities MyActivity=My activity MyActivities=My tasks/activities -DurationEffective=Effective duration MyProjects=My projects +DurationEffective=Effective duration +Progress=Progress Time=Time ListProposalsAssociatedProject=List of the commercial proposals associated with the project ListOrdersAssociatedProject=List of customers' orders associated with the project diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index f2cf0066c66..939852863a9 100755 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -44,6 +44,7 @@ MyActivity=Mon activité MyActivities=Mes tâches/activités MyProjects=Mes projets DurationEffective=Durée effective +Progress=Progression Time=Temps ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet ListOrdersAssociatedProject=Liste des commandes clients associées au projet diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php index a43ba567d84..a773923bc42 100644 --- a/htdocs/lib/project.lib.php +++ b/htdocs/lib/project.lib.php @@ -426,6 +426,11 @@ function PLines(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole if ($showlineingray) print ''; else print ''; print "\n"; + + // Progress + print ''; + print $lines[$i]->progress.' %'; + print ''; // Time spent print ''; diff --git a/htdocs/projet/tasks/fiche.php b/htdocs/projet/tasks/fiche.php index fda90ccca9e..50a6a41416d 100644 --- a/htdocs/projet/tasks/fiche.php +++ b/htdocs/projet/tasks/fiche.php @@ -280,6 +280,7 @@ else if ($projectstatic->id) print ''.$langs->trans("Project").''; print ''.$langs->trans("RefTask").''; print ''.$langs->trans("LabelTask").''; + print ''.$langs->trans("Progress").''; print ''.$langs->trans("TimeSpent").''; print "\n"; // Show all lines in taskarray (recursive function to go down on tree) diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index 89930997601..1be662b6a04 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -80,6 +80,7 @@ print ''; print ''.$langs->trans("Project").''; print ''.$langs->trans("RefTask").''; print ''.$langs->trans("LabelTask").''; +print ''.$langs->trans("Progress").''; print ''.$langs->trans("TimeSpent").''; print "\n"; // Show all lines in taskarray (recursive function to go down on tree) diff --git a/htdocs/projet/tasks/task.class.php b/htdocs/projet/tasks/task.class.php index b4136b54e54..9cbb48bea26 100644 --- a/htdocs/projet/tasks/task.class.php +++ b/htdocs/projet/tasks/task.class.php @@ -451,7 +451,7 @@ class Task extends CommonObject // List of tasks (does not care about permissions. Filtering will be done later) $sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public"; - $sql.= ", t.rowid as taskid, t.label, t.fk_task_parent, t.duration_effective"; + $sql.= ", t.rowid as taskid, t.label, t.fk_task_parent, t.duration_effective, t.progress"; if ($mode == 0) { $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; @@ -503,6 +503,7 @@ class Task extends CommonObject $tasks[$i]->description = $obj->description; $tasks[$i]->fk_parent = $obj->fk_task_parent; $tasks[$i]->duration = $obj->duration_effective; + $tasks[$i]->progress = $obj->progress; $tasks[$i]->public = $obj->public; }