Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues 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
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)
$sql.= " AND fournisseur = 1";
}
$sql.= "(";
if (! empty($name))
{
if (! $exact)
$name = '%'.str_replace('*', '%', $name).'%';
$sql.= " AND ";
if (is_array($filters) && ! empty($filters))
$sql.= "(";
if (! $case)
$sql.= " AND nom LIKE '".$this->db->escape($name)."'";
$sql.= "nom LIKE '".$this->db->escape($name)."'";
else
$sql.= " AND nom LIKE BINARY '".$this->db->escape($name)."'";
$sql.= "nom LIKE BINARY '".$this->db->escape($name)."'";
}
if (is_array($filters) && ! empty($filters))
{
@@ -880,8 +882,9 @@ class Societe extends CommonObject
else
$sql.= " ".$clause." ".$field." LIKE BINARY '".$this->db->escape($value)."'";
}
if (! empty($name))
$sql.= ")";
}
$sql.= ")";
$res = $this->db->query($sql);
if ($res)