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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-24 02:21:53 +02:00
commit ddd267f4c3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ class FormProjets
} }
else if ($obj->fk_statut == 2) else if ($obj->fk_statut == 2)
{ {
if ($discard_close == 2) $disabled=1; if ($discard_closed == 2) $disabled=1;
$labeltoshow.=' - '.$langs->trans("Closed"); $labeltoshow.=' - '.$langs->trans("Closed");
} }
else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid)) else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))