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

[MERGE] 

bzr revid: ysa@tinyerp.com-20111005093709-u3rg6g10rcs7tf8f
This commit is contained in:
Yogesh (OpenERP) 2011-10-05 15:07:09 +05:30
parent 2fe1e8c0d8
commit 07121a762b
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openerp/osv/expression.py
View File

@ -614,30 +614,10 @@ class expression(object):
if m2o_str:
self.__exp[i] = _get_expression(field_obj, cr, uid, left, right, operator, context=context)
elif right == []:
<<<<<<< TREE
m2o_str = False
if operator in ('not in', '!=', '<>'):
# (many2one not in []) should return all records
self.__exp[i] = self.__DUMMY_LEAF
else:
self.__exp[i] = ('id','=',0)
else:
new_op = '='
if operator in ['not like','not ilike','not in','<>','!=']:
new_op = '!='
#Is it ok to put 'left' and not 'id' ?
self.__exp[i] = (left,new_op,False)
=======
pass # Handled by __leaf_to_sql().
else: # right is False
pass # Handled by __leaf_to_sql().
>>>>>>> MERGE-SOURCE
<<<<<<< TREE
if m2o_str:
self.__exp[i] = _get_expression(field_obj,cr, uid, left, right, operator, context=context)
=======
>>>>>>> MERGE-SOURCE
else:
# other field type
# add the time part to datetime field when it's not there: