From 416e0a766e89ba95775066c2ffe028d8011e0e31 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 1 Mar 2015 16:24:02 +0100
Subject: [PATCH] Fix: we must use status to find label of status

---
 htdocs/core/lib/project.lib.php       | 3 +--
 htdocs/projet/activity/index.php      | 3 +--
 htdocs/projet/class/project.class.php | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 27499f65c73..b06b5d5b5fd 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 58fb1b79abf..f98a393e188 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 3225916c913..8db1313904d 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;