odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] 

bzr revid: ysa@tinyerp.com-20111005093516-u8v7e58ndsyuxh9u
This commit is contained in:
Yogesh (OpenERP) 2011-10-05 15:05:16 +05:30
parent 36b97bc3d7
commit 2fe1e8c0d8
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openerp/osv/expression.py
View File

@ -589,13 +589,8 @@ class expression(object):
#Special treatment to ill-formed domains
operator = ( operator in ['<','>','<=','>='] ) and 'in' or operator
<<<<<<< TREE
dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in','<>':'not in'}
if isinstance(right,tuple):
=======
dict_op = {'not in':'!=','in':'=','=':'in','!=':'not in'}
if isinstance(right, tuple):
>>>>>>> MERGE-SOURCE
right = list(right)
if (not isinstance(right, list)) and operator in ['not in','in']:
operator = dict_op[operator]