|
@@ -138,7 +138,7 @@ class FormProjets
|
|
|
$sql.= " WHERE p.entity IN (".getEntity('project', 1).")";
|
|
|
if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
|
|
|
if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
|
|
|
- if ($socid > 0) $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
|
|
|
+ if ($socid > 0 && empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
|
|
|
if (!empty($filterkey)) {
|
|
|
$sql .= ' AND p.title LIKE "%'.$this->db->escape($filterkey).'%"';
|
|
|
$sql .= ' OR p.ref LIKE "%'.$this->db->escape($filterkey).'%"';
|
|
@@ -204,7 +204,7 @@ class FormProjets
|
|
|
if ($discard_close == 2) $disabled=1;
|
|
|
$labeltoshow.=' - '.$langs->trans("Closed");
|
|
|
}
|
|
|
- else if ($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))
|
|
|
{
|
|
|
$disabled=1;
|
|
|
$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
|