summaryrefslogtreecommitdiff
path: root/odoo/osv/expression.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-03-05 17:26:04 +0100
committerChristophe Simonis <chs@odoo.com>2019-03-05 17:26:04 +0100
commit3e54704e669441e655b1fe19ee0fa0646cdbf8d5 (patch)
treeacddbce8a7f3868c1bf8f882dc959f63134f40ec /odoo/osv/expression.py
parent2c495502aa37374f3748d9ff4ab7cf9e8d9a6d6e (diff)
parent27081bf6f5f00ccb39f82ae62d14d428bf1c9223 (diff)
[MERGE] forward port branch 11.0 up to 27081bf6f5f
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 68d19edf046..c73b9352bf3 100644
--- a/odoo/osv/expression.py
+++ b/odoo/osv/expression.py
@@ -259,7 +259,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):