openerp-dev-web team mailing list archive

["Somesh Khare\(OpenERP\)" <skh@xxxxxxxxxxx>]

Somesh Khare(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/6.0-opw-5861-skh into lp:openobject-addons/6.0.

Requested reviews:
  Jay Vora (OpenERP) (jvo-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5861-skh/+merge/61706

Hello,

[FIX] Product: name_search() method corrected while duplicating ids in sale_order_line.

Thanks
SKH
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.0-opw-5861-skh/+merge/61706
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.0-opw-5861-skh.

=== modified file 'product/product.py'
--- product/product.py	2011-03-10 09:52:25 +0000
+++ product/product.py	2011-05-20 07:41:43 +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)