Merge lp:~openerp-dev/openobject-client/6.0-opw-16409-ado into lp:openobject-client/6.0

[Amit Dodiya (OpenERP)]

Hello Sir,

[Fix]: searching for a partner from a purchase order only gets a limited result.

I have removed the "[('id','in', self.ids)]" domain from def go() method which cause a limited result for partner while you select the partner in M2O field in purchase order while you have partner more than the limit.

Thanks,
Amit.

[lp:~openerp-dev/openobject-client/6.0-opw-16409-ado]

1877. By Amit Dodiya (OpenERP) on 2011-07-27

[FIX]: M2O search for supplier in purchase_order: case(16409)

[Jay Vora (Serpent Consulting Services) (jayvora)]

review: Approve

=== modified file 'bin/modules/gui/window/win_search.py'
--- bin/modules/gui/window/win_search.py	2010-12-03 11:55:42 +0000
+++ bin/modules/gui/window/win_search.py	2011-07-27 10:39:38 +0000
@@ -111,6 +111,7 @@
         self.model = model
         self.sel_multi = sel_multi
         self.ids = ids
+        self.ctx = context
         self.glade = glade.XML(common.terp_path("openerp.glade"),'win_search',gettext.textdomain())
         self.win = self.glade.get_widget('win_search')
         self.win.set_icon(common.OPENERP_ICON)
@@ -184,7 +185,9 @@
     def go(self):
         ## This is if the user has set some filters by default with search_default_XXX
         if self.ids:
-            self.screen.win_search_domain += [('id','in', self.ids)]
+            #Add the domain only if there was no name_search performed with name
+            name_search = self.ctx.get('name_search',False)
+            self.screen.win_search_domain += [('id','in', self.ids)] if name_search else []
             self.find()
         else:
             self.screen.update_scroll()
 
=== modified file 'bin/widget/view/form_gtk/many2many.py'
--- bin/widget/view/form_gtk/many2many.py	2010-12-13 12:46:13 +0000
+++ bin/widget/view/form_gtk/many2many.py	2011-07-27 10:39:38 +0000
@@ -147,6 +147,8 @@
                                         self.attrs['relation'], 'name_search',
                                         self.wid_text.get_text(), domain, 'ilike', context)
         ids = [oid for oid, _ in records]
+        #Updating the context in order to avoid domain of name_search and custom domain of search_context
+        context.update({'name_search':self.wid_text.get_text()})
         self.wid_text.set_text('')
         win = win_search(self.attrs['relation'], sel_multi=True, ids=ids, context=context, domain=domain, parent=self._window)
         ids = win.go()
 
=== modified file 'bin/widget/view/form_gtk/many2one.py'
--- bin/widget/view/form_gtk/many2one.py	2010-12-03 11:55:42 +0000
+++ bin/widget/view/form_gtk/many2one.py	2011-07-27 10:39:38 +0000
@@ -260,7 +260,8 @@
                 self.display(self._view.model, self._view.modelfield)
                 self.ok = True
                 return True
-
+            #Updating the context in order to avoid domain of name_search and custom domain of search_context
+            context.update({'name_search':name_search})
             win = win_search(self.attrs['relation'], sel_multi=False, ids=map(lambda x: x[0], ids), context=context, domain=domain, parent=self._window)
             ids = win.go()
             if ids: