From a20f7094efbbc4a4fbdbbaa2a14d7cbde07c4b10 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 9 Oct 2012 18:11:51 +0200
Subject: [PATCH] Fix: refactore

---
 htdocs/societe/class/societe.class.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 86754296c8b..048d7da7d8a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -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)