diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 3c1ea553a66..99e9055c6a3 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -332,7 +332,7 @@ function project_admin_prepare_head()
*/
function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId='', $addordertick=0, $projectidfortotallink=0, $filterprogresscalc='')
{
- global $user, $bc, $langs, $conf;
+ global $user, $bc, $langs, $conf, $db;
global $projectstatic, $taskstatic;
$lastprojectid=0;
@@ -531,6 +531,24 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
}
print '';
+ // Ressources
+ print '
';
+ foreach(array('internal','external') as $source)
+ {
+ $tab = $lines[$i]->liste_contact(-1,$source);
+ $num=count($tab);
+ if (!empty($num)){
+ foreach ($tab as $contacttask){
+ //var_dump($contacttask);
+ if ($source == 'internal') $c = new User($db);
+ else $c = new Contact($db);
+ $c->fetch($contacttask['id']);
+ print $c->getNomUrl(1) . ' (' . $contacttask['libelle'] . ')' . ' ';
+ }
+ }
+ }
+ print ' | ';
+
// Tick to drag and drop
if ($addordertick)
{
@@ -579,6 +597,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
if ($total_projectlinesa_planned) print round(100 * $total_projectlinesa_spent / $total_projectlinesa_planned,2).' %';
print '';
print ' | ';
+ print ' | ';
if ($addordertick) print ' | ';
print '';
}
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 0205f2b5e33..922bfafcbf6 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -660,6 +660,8 @@ else if ($id > 0 || ! empty($ref))
print '';
print '';
+ print ' | ';
+
// Action column
print '';
$searchpicto=$form->showFilterButtons();
@@ -677,7 +679,7 @@ else if ($id > 0 || ! empty($ref))
print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,'');
- //print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
+ print_liste_field_titre("TaskRessourceLinks",$_SERVER["PHP_SELF"],'','','',$sortfield,$sortorder,'');
print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch ');
print "\n";
@@ -689,7 +691,7 @@ else if ($id > 0 || ! empty($ref))
}
else
{
- print ' | | '.$langs->trans("NoTasks").' |
';
+ print '| '.$langs->trans("NoTasks").' |
';
}
print "";