From c6dcc64471dc4084137570898d9b53e7c9a64667 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Nov 2010 19:21:29 +0000 Subject: [PATCH] Fix: Removed a bug where function returns too many records --- htdocs/core/class/commonobject.class.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 416c9146864..d9e2a7d13e4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -386,17 +386,19 @@ class CommonObject } /** - * \brief Retourne id des contacts d'une source et d'un type actif donne - * Exemple: contact client de facturation ('external', 'BILLING') - * Exemple: contact client de livraison ('external', 'SHIPPING') - * Exemple: contact interne suivi paiement ('internal', 'SALESREPFOLL') - * \param source 'external' or 'internal' - * \param code 'BILLING', 'SHIPPING', 'SALESREPFOLL', ... - ** \param status limited to a certain status - * \return array Liste des id contacts + * Return id of contacts for a source and a contact code. + * Example: contact client de facturation ('external', 'BILLING') + * Example: contact client de livraison ('external', 'SHIPPING') + * Example: contact interne suivi paiement ('internal', 'SALESREPFOLL') + * @param source 'external' or 'internal' + * @param code 'BILLING', 'SHIPPING', 'SALESREPFOLL', ... + * @param status limited to a certain status + * @return array List of id for such contacts */ function getIdContact($source,$code,$status=0) { + global $conf; + $result=array(); $i=0; @@ -410,7 +412,7 @@ class CommonObject $sql.= " AND tc.code = '".$code."'"; $sql.= " AND tc.active = 1"; if ($status) $sql.= " AND ec.statut = ".$status; - // FIXME Add filter on entity + $sql.= " AND entity = ".$conf->entity; dol_syslog("CommonObject::getIdContact sql=".$sql); $resql=$this->db->query($sql);