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

Clean code

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-10 12:49:20 +01:00
parent 188cda7902
commit af5b63954a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.formprojet.class.php
View File

@ -334,7 +334,7 @@ class FormProjets
$out=''; $out='';
$hideunselectables = false; $hideunselectables = false;
if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true; if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
if (empty($projectsListId)) if (empty($projectsListId))
{ {
@ -346,11 +346,11 @@ class FormProjets
} }
// Search all projects // Search all projects
$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,'; $sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.rowid as pid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
$sql.= ' s.nom as name'; $sql.= ' s.nom as name';
$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p'; $sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc,';
$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t'; $sql.= ' '.MAIN_DB_PREFIX.'projet_task as t';
$sql.= " WHERE p.entity IN (".getEntity('project').")"; $sql.= " WHERE p.entity IN (".getEntity('project').")";
$sql.= " AND t.fk_projet = p.rowid"; $sql.= " AND t.fk_projet = p.rowid";
if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")"; if ($projectsListId) $sql.= " AND p.rowid IN (".$projectsListId.")";
@ -393,7 +393,7 @@ class FormProjets
} }
else else
{ {
if ($discard_closed == 1 && $obj->fk_statut == 2) if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
{ {
$i++; $i++;
continue; continue;
@ -411,12 +411,12 @@ class FormProjets
if ($obj->name) $labeltoshow.=' ('.$obj->name.')'; if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
$disabled=0; $disabled=0;
if ($obj->fk_statut == 0) if ($obj->fk_statut == Project::STATUS_DRAFT)
{ {
$disabled=1; $disabled=1;
$labeltoshow.=' - '.$langs->trans("Draft"); $labeltoshow.=' - '.$langs->trans("Draft");
} }
else if ($obj->fk_statut == 2) else if ($obj->fk_statut == Project::STATUS_CLOSED)
{ {
if ($discard_closed == 2) $disabled=1; if ($discard_closed == 2) $disabled=1;
$labeltoshow.=' - '.$langs->trans("Closed"); $labeltoshow.=' - '.$langs->trans("Closed");