(no commit message)

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 8515fe5387073c2febfe871cb70419b1132f6be7..aec6d87678e9192f47e65bec8222920ef4f4adc7 100644 (file)
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -184,7 +184,7 @@ class commonDAOEntreprise extends commonDAO {
                return true;\r
        }\r
 \r
-       public function count($limitedToUserRights = false,$table='entreprise_vue')\r
+       public function count($limitedToUserRights = false,$table='entreprises_vue')\r
        {\r
                $r = $this->con->select('SELECT COUNT(*) AS nb FROM '.$table.' WHERE ' . $this->makeWhereFromFiltres() . ' ' . $this->limitToUserRights($limitedToUserRights));\r
                return $r->nb;\r

diff --git a/inc/commons/DAO/class.common.dao.equipier.php b/inc/commons/DAO/class.common.dao.equipier.php
index f76cbcb85cdabc2339f99827c8ea533166d55fe6..e68773bb59a940fbfe5c799e40b768b5c31443cb 100644 (file)
--- a/inc/commons/DAO/class.common.dao.equipier.php
+++ b/inc/commons/DAO/class.common.dao.equipier.php
@@ -31,7 +31,7 @@ class commonDAOEquipier extends commonDAOUtilisateur {
        {\r
                global $core;\r
 \r
-               $sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit, $search_id);\r
+               $sql = $this->getQueryList('equipiers', $q, $orderby, $sens, $limit,false);\r
 \r
                $r = $this->con->select($sql);\r
                return $this->factory($r);\r

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index d2083f8bc481584009f00a284a735fbe9f485648..76d0b2b40b922966cfa34f3ba6589a455ed5bbf1 100644 (file)
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -163,7 +163,7 @@ class commonDAOUtilisateur extends commonDAO {
                        $where .= $this->whereSearchByName($this->q);\r
                        $limit = null;\r
                } else {\r
-                       $where = $this->makeWhereFromFiltres();\r
+                       $where .= $this->makeWhereFromFiltres();\r
                }\r
                $where .= ' ' . $wherec . ' )';\r
                $where .= $this->limitToUserRights($limitedToUserRights);\r
@@ -186,7 +186,6 @@ class commonDAOUtilisateur extends commonDAO {
        public function getListe($orderby = null, $sens = null, $limit = null, $where = null, $limitedToUserRights = false)\r
        {\r
                $sql = $this->getQueryList('utilisateurs_entreprise', $orderby, $sens, $limit, $where, $limitedToUserRights);\r
-               fb($sql);\r
                $r = $this->con->select($sql);\r
                return $this->factory($r);\r
        }\r