diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-04 15:49:35 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-04 15:49:35 +0100 |
| commit | 1c712986c437ff16a7d7d7392e4b52b319f55b70 (patch) | |
| tree | 950a097b11c1c20cd7145fdccd40cc279752c443 /odoo/osv | |
| parent | d92eba3a1999ba08c83b6b60c16633ba813bd500 (diff) | |
| parent | 1f1fa35c07299dd3940c47ac13f966ddbb1c875b (diff) | |
[MERGE] forward port branch saas-15 up to 1f1fa35c072
Diffstat (limited to 'odoo/osv')
| -rw-r--r-- | odoo/osv/expression.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/osv/expression.py b/odoo/osv/expression.py index 26013885437..72fbc654577 100644 --- a/odoo/osv/expression.py +++ b/odoo/osv/expression.py @@ -258,7 +258,7 @@ def combine(operator, unit, zero, domains): result += domain count += 1 result = [operator] * (count - 1) + result - return result + return result or unit def AND(domains): |
