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

*modified behavior of global rules: they are now at the same level than other rules (OR between the global rules and others) 

bzr revid: qdp@tinyerp.com-20080715111504-irlodwg3pzaqnqjy
This commit is contained in:
qdp 2008-07-15 13:15:04 +02:00
parent ea2cc2d98e
commit 7641121ba9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/ir/ir_rule.py
View File

@ -205,7 +205,7 @@ class ir_rule(osv.osv):
query_global, val_global = _query(clause_global, 'OR')
if query_global:
if query:
query = '('+query+') AND '+query_global
query = '('+query+') OR '+query_global
val.extend(val_global)
else:
query = query_global