diff options
| author | Xavier Morel <xmo@odoo.com> | 2021-02-15 07:02:26 +0000 |
|---|---|---|
| committer | Xavier Morel <xmo@odoo.com> | 2021-02-15 08:04:17 +0000 |
| commit | 696819972d5a51f826fb675f0cb712f819c2cdf4 (patch) | |
| tree | 2b96c52b5ad967efc4cb8ee17eba8b5fc2798ae9 /addons | |
| parent | 4928ea9f7a35d1d2f00cf07300a90bab7bb3fb9a (diff) | |
[FIX] purchase: avoid broken domains
Combining domains using `+` is not ideal as it's somewhat easy to
unwittingly create broken ones and perform unexpected
selections. Combining with `expression.AND` should be a lot more
reliable.
closes odoo/odoo#66133
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/purchase/report/purchase_report.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index 326c32fbb6d..46cbb555c23 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -9,7 +9,7 @@ import re from odoo import api, fields, models, tools from odoo.exceptions import UserError -from odoo.osv.expression import expression +from odoo.osv.expression import AND, expression class PurchaseReport(models.Model): @@ -179,6 +179,7 @@ class PurchaseReport(models.Model): res = [{}] if avg_days_to_purchase: + self.check_access_rights('read') query = """ SELECT AVG(days_to_purchase.po_days_to_purchase)::decimal(16,2) AS avg_days_to_purchase FROM ( SELECT extract(epoch from age(po.date_approve,po.create_date))/(24*60*60) AS po_days_to_purchase @@ -188,7 +189,7 @@ class PurchaseReport(models.Model): ) AS days_to_purchase """ - subdomain = domain + [('company_id', '=', self.env.company.id), ('date_approve', '!=', False)] + subdomain = AND([domain, [('company_id', '=', self.env.company.id), ('date_approve', '!=', False)]]) subtables, subwhere, subparams = expression(subdomain, self).query.get_sql() self.env.cr.execute(query % (subtables, subwhere), subparams) |