Merge lp:~scigghiateam/openobject-addons/fix_bug_1028287 into lp:openobject-addons/6.1

[Andrea Cometa]

[Andrea Cometa (scigghia)]

this merge proposal fix the bug #1028287

Unmerged revisions

6938. By Andrea Cometa on 2012-08-08

[FIX] proposal to fix bug #1028287

=== modified file 'product/product.py'
--- product/product.py	2012-04-03 13:05:28 +0000
+++ product/product.py	2012-08-08 09:09:24 +0000
@@ -601,9 +601,9 @@
         if not args:
             args = []
         if name:
-            ids = self.search(cr, user, [('default_code','=',name)]+ args, limit=limit, context=context)
+            ids = self.search(cr, user, args + [('default_code','=',name)], limit=limit, context=context)
             if not ids:
-                ids = self.search(cr, user, [('ean13','=',name)]+ args, limit=limit, context=context)
+                ids = self.search(cr, user,args + [('ean13','=',name)], limit=limit, context=context)
             if not ids:
                 # Do not merge the 2 next lines into one single search, SQL search performance would be abysmal
                 # on a database with thousands of matching products, due to the huge merge+unique needed for the
@@ -619,7 +619,7 @@
                 ptrn = re.compile('(\[(.*?)\])')
                 res = ptrn.search(name)
                 if res:
-                    ids = self.search(cr, user, [('default_code','=', res.group(2))] + args, limit=limit, context=context)
+                    ids = self.search(cr, user,args + [('default_code','=', res.group(2))], limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
         result = self.name_get(cr, user, ids, context=context)