*modified behavior of global rules: they are now at the same level than other rules...

bzr revid: qdp@tinyerp.com-20080715111504-irlodwg3pzaqnqjy

diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py
index 093c329..6f76133 100644 (file)
--- a/bin/addons/base/ir/ir_rule.py
+++ b/bin/addons/base/ir/ir_rule.py
@@ -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