lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: we must use status to find label of status

Browse Source
This commit is contained in:
Laurent Destailleur 2015-03-01 16:24:02 +01:00
parent 2795d27cc9
commit 416e0a766e
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/lib/project.lib.php
View File

@ -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">';

3
htdocs/projet/activity/index.php
View File

@ -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 */

1
htdocs/projet/class/project.class.php
View File

@ -46,7 +46,6 @@ class Project extends CommonObject
var $id;
var $ref;
var $description;
var $statut;
var $title;
var $date_start;
var $date_end;