Merge lp:~openerp-dev/openobject-server/trunk-bug-844651-vme into lp:openobject-server

[Vidhin Mehta (OpenERP)]

> To support string search from Advance search view for reference type field.
> web branch: https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-844651-vme/+merge/136868

Unmerged revisions

4607. By Vidhin Mehta (OpenERP) on 2012-11-29

[IMP]minor improvement.

4606. By Vidhin Mehta (OpenERP) on 2012-11-29

[IMP]code improve.

4605. By Vidhin Mehta (OpenERP) on 2012-11-29

[IMP]reference field can works on string attribute.implement for advance search reference widget.

=== modified file 'openerp/osv/expression.py'
--- openerp/osv/expression.py	2012-10-18 12:47:50 +0000
+++ openerp/osv/expression.py	2012-11-29 08:49:23 +0000
@@ -627,6 +627,18 @@
             else:
                 # other field type
                 # add the time part to datetime field when it's not there:
+                if field._type == 'reference' and isinstance(right, str):
+                    ref_obj, ref_id = right.split(',')
+                    if not ref_id.isdigit():
+                        dic_opt = {'!=':'=','not like':'like','not ilike':'ilike','not in':'in'}
+                        records = table.pool[ref_obj].name_search(cr, uid, ref_id, [], dic_opt.get(operator,operator), context=context, limit=None)
+                        if records:
+                            exp_list = [("%s,%d"%(ref_obj,res[0])) for res in records]
+                            if operator in NEGATIVE_TERM_OPERATORS:
+                                self.__exp[i] = (left,"not in",exp_list)
+                            else:
+                                self.__exp[i] = (left,"in",exp_list)
+                            
                 if field._type == 'datetime' and self.__exp[i][2] and len(self.__exp[i][2]) == 10:
 
                     self.__exp[i] = list(self.__exp[i])