diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 27499f65c7323ddf720572a1e01709705f3a5979..b06b5d5b5fddb76637d300ee6991492d22274388 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -661,8 +661,7 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0, $sta $project_year_filter=0; $title=$langs->trans("Project"); - if ($statut == 0) $title=$langs->trans("ProjectDraft"); - if ($statut == 1) $title=$langs->trans("Project").' ('.$langs->trans("Validated").')'; + if ($statut != '' && $statut >= 0) $title=$langs->trans("Project").' ('.$langs->trans($projectstatic->statuts[$statut]).')'; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php index 58fb1b79abf6f7a0395a4b91fa1d4df4d30904f2..f98a393e188270a1486a5cbb236e51a0d0ced7b4 100644 --- a/htdocs/projet/activity/index.php +++ b/htdocs/projet/activity/index.php @@ -48,7 +48,6 @@ $langs->load("projects"); $now = dol_now(); $projectstatic=new Project($db); -//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$mine:($user->rights->projet->all->lire?2:0)),1); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1); // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project $title=$langs->trans("Activities"); @@ -69,7 +68,7 @@ else print '<div class="fichecenter"><div class="fichethirdleft">'; -print_projecttasks_array($db,$socid,$projectsListId,$mine); +print_projecttasks_array($db,$socid,$projectsListId,$mine,1); /* Affichage de la liste des projets d'aujourd'hui */ diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 3225916c9139c63ca16f8b05e9898f52b4e1ec11..8db1313904d6877132ef0aecec9d793661745d5b 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -46,7 +46,6 @@ class Project extends CommonObject var $id; var $ref; var $description; - var $statut; var $title; var $date_start; var $date_end;