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

FIX better compatibility with multicompany

Browse Source
This commit is contained in:
Regis Houssin 2018-09-10 10:08:04 +02:00
parent dfea391c88
commit 8699866062
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/commonobject.class.php
View File

@ -1064,7 +1064,7 @@ abstract class CommonObject
$sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc"; $sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc";
$sql.= " WHERE ec.element_id = ".$id; $sql.= " WHERE ec.element_id = ".$id;
$sql.= " AND ec.fk_socpeople = c.rowid"; $sql.= " AND ec.fk_socpeople = c.rowid";
if ($source == 'internal') $sql.= " AND c.entity IN (0,".$conf->entity.")"; if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")";
if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")"; if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")";
$sql.= " AND ec.fk_c_type_contact = tc.rowid"; $sql.= " AND ec.fk_c_type_contact = tc.rowid";
$sql.= " AND tc.element = '".$element."'"; $sql.= " AND tc.element = '".$element."'";
@ -1072,7 +1072,7 @@ abstract class CommonObject
$sql.= " AND tc.code = '".$code."'"; $sql.= " AND tc.code = '".$code."'";
$sql.= " AND tc.active = 1"; $sql.= " AND tc.active = 1";
if ($status) $sql.= " AND ec.statut = ".$status; if ($status) $sql.= " AND ec.statut = ".$status;
echo $sql;exit;
dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG); dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
$resql=$this->db->query($sql); $resql=$this->db->query($sql);
if ($resql) if ($resql)