Merge branch '7.0-advanced_filters' of github.com:hbrunn/web into 7.0-advanced_filters

Conflicts:
	web_advanced_filters/model/ir_filters.py

web_advanced_filters/model/ir_filters.py

@@ -98,8 +98,8 @@ class IrFilters(Model):
                               context=context):
             result[this['id']] = False
             complement_domain = expression.normalize_domain(
-                safe_eval(this['domain'] or 'False') or
-                [expression.FALSE_LEAF])
+                safe_eval(this['domain'] or 'False')
+                or [expression.FALSE_LEAF])
             for arg in complement_domain:
                 if not expression.is_leaf(arg):
                     continue