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

Fix status disabled of task intocombo list

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-08 17:49:26 +02:00
parent 925f240340
commit 047d6f78e7
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,6 +368,7 @@ class FormProjets
} else $out .= ' '; } else $out .= ' ';
$out .= '</option>'; $out .= '</option>';
} }
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$i = 0; $i = 0;
if ($num) if ($num)
@ -388,6 +389,18 @@ class FormProjets
$labeltoshow = ''; $labeltoshow = '';
$disabled = 0;
if ($obj->fk_statut == Project::STATUS_DRAFT)
{
$disabled = 1;
} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
{
if ($discard_closed == 2) $disabled = 1;
} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
{
$disabled = 1;
}
if ($showproject == 'all') if ($showproject == 'all')
{ {
$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref $labeltoshow .= dol_trunc($obj->ref, 18); // Project ref