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

Fix: refactore

Browse Source
This commit is contained in:
Regis Houssin 2012-10-09 18:11:51 +02:00
parent 74dd4ce218
commit a20f7094ef
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,15 +859,17 @@ 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)
$name = '%'.str_replace('*', '%', $name).'%'; $name = '%'.str_replace('*', '%', $name).'%';
$sql.= " AND ";
if (is_array($filters) && ! empty($filters))
$sql.= "(";
if (! $case) if (! $case)
$sql.= " AND nom LIKE '".$this->db->escape($name)."'"; $sql.= "nom LIKE '".$this->db->escape($name)."'";
else else
$sql.= " AND nom LIKE BINARY '".$this->db->escape($name)."'"; $sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
} }
if (is_array($filters) && ! empty($filters)) if (is_array($filters) && ! empty($filters))
{ {
@ -880,8 +882,9 @@ class Societe extends CommonObject
else else
$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'"; $sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
} }
if (! empty($name))
$sql.= ")";
} }
$sql.= ")";
$res = $this->db->query($sql); $res = $this->db->query($sql);
if ($res) if ($res)