Merge branch 'atm-maxime-develop' into develop
This commit is contained in:
commit
29545d80c7
@ -77,6 +77,7 @@ class FormProjets
|
|||||||
$sql.= " WHERE p.entity = ".$conf->entity;
|
$sql.= " WHERE p.entity = ".$conf->entity;
|
||||||
if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
|
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=0 OR p.fk_soc IS NULL)";
|
||||||
|
if ($socid > 0) $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
|
||||||
$sql.= " ORDER BY p.ref ASC";
|
$sql.= " ORDER BY p.ref ASC";
|
||||||
|
|
||||||
dol_syslog(get_class($this)."::select_projects sql=".$sql,LOG_DEBUG);
|
dol_syslog(get_class($this)."::select_projects sql=".$sql,LOG_DEBUG);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user