Merge lp:~openerp-dev/openobject-addons/6.0-opw-574759-ksa into lp:openobject-addons/6.0

[Kirti Savalia(OpenERP)]

Hello,

Fixed the problem when import the data with product category in product form.

Thanks
KSA

[Naresh(OpenERP) (nch-openerp)]

review: Approve

Unmerged revisions

5227. By Kirti Savalia(OpenERP) on 2012-05-14

[FIX]: when import the data with product category you can not import the data

=== modified file 'product/product.py'
--- product/product.py	2012-03-30 08:53:02 +0000
+++ product/product.py	2012-05-14 10:40:24 +0000
@@ -184,6 +184,19 @@
 # Categories
 #----------------------------------------------------------
 class product_category(osv.osv):
+    
+    def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
+        if not args:
+            args=[]
+        if not context:
+            context={}
+        if name:
+            # Be sure name_search is symetric to name_get
+            name = name.split(' / ')[-1]
+            ids = self.search(cr, uid, [('name', operator, name)] + args, limit=limit, context=context)
+        else:
+            ids = self.search(cr, uid, args, limit=limit, context=context)
+        return self.name_get(cr, uid, ids, context)
 
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):