Merge lp:~unifield-team/unifield-addons/OEB-15 into lp:unifield-addons

[Matthieu Dietrich @ camptocamp]

=== modified file 'product/product.py'
--- product/product.py	2011-03-10 09:52:25 +0000
+++ product/product.py	2011-06-20 14:09:26 +0000
@@ -563,8 +563,7 @@
             if not len(ids):
                 ids = self.search(cr, user, [('ean13','=',name)]+ args, limit=limit, context=context)
             if not len(ids):
-                ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context)
-                ids += self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+                ids = self.search(cr, user, ['|',('name',operator,name),('default_code',operator,name)] + args, limit=limit, context=context)
             if not len(ids):
                ptrn=re.compile('(\[(.*?)\])')
                res = ptrn.search(name)