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

Fix: possibility to force the clause

Browse Source
This commit is contained in:
Regis Houssin 2012-10-09 18:06:59 +02:00
parent 337cb0faa5
commit 74dd4ce218
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/societe/class/societe.class.php
View File

@ -842,9 +842,10 @@ class Societe extends CommonObject
* @param array $filters Array of couple field name/value to filter the companies with the same name * @param array $filters Array of couple field name/value to filter the companies with the same name
* @param boolean $exact Exact string search (true/false) * @param boolean $exact Exact string search (true/false)
* @param boolean $case Case sensitive (true/false) * @param boolean $case Case sensitive (true/false)
* @param string $clause Clause for filters
* @return array Array of thirdparties object * @return array Array of thirdparties object
*/ */
function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false) function searchByName($name, $type='0', $filters = array(), $exact = false, $case = false, $clause = 'AND')
{ {
$thirdparties = array(); $thirdparties = array();
@ -858,6 +859,7 @@ class Societe extends CommonObject
elseif ($type == 3) elseif ($type == 3)
$sql.= " AND fournisseur = 1"; $sql.= " AND fournisseur = 1";
} }
$sql.= "(";
if (! empty($name)) if (! empty($name))
{ {
if (! $exact) if (! $exact)
@ -874,11 +876,12 @@ class Societe extends CommonObject
if (! $exact) if (! $exact)
$value = '%'.str_replace('*', '%', $value).'%'; $value = '%'.str_replace('*', '%', $value).'%';
if (! $case) if (! $case)
$sql.= " AND ".$field." LIKE '".$this->db->escape($value)."'"; $sql.= " ".$clause." ".$field." LIKE '".$this->db->escape($value)."'";
else else
$sql.= " AND ".$field." LIKE BINARY '".$this->db->escape($value)."'"; $sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
} }
} }
$sql.= ")";
$res = $this->db->query($sql); $res = $this->db->query($sql);
if ($res) if ($res)