summaryrefslogtreecommitdiff
path: root/odoo/osv/expression.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-03-08 17:56:14 +0100
committerChristophe Simonis <chs@odoo.com>2019-03-08 17:56:14 +0100
commit2c5c9b8342df2748ad1044fa94c7c3ad821245ba (patch)
treeaa6228b4ee7c0038d8759f6d202c2e16e9ac0012 /odoo/osv/expression.py
parent7d4ca676809564d592257450f6a7628d0722ba0a (diff)
parentc023d0784f27622f185a1075cba8e408067b5352 (diff)
[MERGE] forward port branch 12.0 up to c023d0784f2
Diffstat (limited to 'odoo/osv/expression.py')
-rw-r--r--odoo/osv/expression.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/osv/expression.py b/odoo/osv/expression.py
index eeed85ca1e8..b6638a5b3c8 100644
--- a/odoo/osv/expression.py
+++ b/odoo/osv/expression.py
@@ -262,7 +262,7 @@ def combine(operator, unit, zero, domains):
result += normalize_domain(domain)
count += 1
result = [operator] * (count - 1) + result
- return result
+ return result or unit
def AND(domains):