From 2f5eaedd2e89013bd014d1300e66388793b1b599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= Date: Tue, 3 Jan 2023 09:07:06 +0000 Subject: [PATCH] [REM] purchase_stock: remove `avg_receipt_delay` field Since https://github.com/odoo/enterprise/pull/31641, this field is not used anymore. Then remove it and remove the override of read_group linked to. odoo/upgrade#4162 closes odoo/odoo#108977 Signed-off-by: William Henrotin (whe) --- .../purchase_stock/report/purchase_report.py | 52 +------------------ 1 file changed, 1 insertion(+), 51 deletions(-) diff --git a/addons/purchase_stock/report/purchase_report.py b/addons/purchase_stock/report/purchase_report.py index 67e63816588..a48a91958db 100644 --- a/addons/purchase_stock/report/purchase_report.py +++ b/addons/purchase_stock/report/purchase_report.py @@ -1,21 +1,13 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import re - -from odoo import api, fields, models -from odoo.exceptions import UserError -from odoo.osv.expression import expression +from odoo import fields, models class PurchaseReport(models.Model): _inherit = "purchase.report" picking_type_id = fields.Many2one('stock.warehouse', 'Warehouse', readonly=True) - avg_receipt_delay = fields.Float( - 'Average Receipt Delay', digits=(16, 2), readonly=True, store=False, # needs store=False to prevent showing up as a 'measure' option - help="Amount of time between expected and effective receipt date. Due to a hack needed to calculate this, \ - every record will show the same average value, therefore only use this as an aggregated value with group_operator=avg") effective_date = fields.Datetime(string="Effective Date") def _select(self): @@ -26,45 +18,3 @@ class PurchaseReport(models.Model): def _group_by(self): return super(PurchaseReport, self)._group_by() + ", spt.warehouse_id, effective_date" - - @api.model - def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True): - """ This is a hack to allow us to correctly calculate the average of PO specific date values since - the normal report query result will duplicate PO values across its PO lines during joins and - lead to incorrect aggregation values. - - Only the AVG operator is supported for avg_receipt_delay. - """ - avg_receipt_delay = next((field for field in fields if re.search(r'\bavg_receipt_delay\b', field)), False) - - if avg_receipt_delay: - fields.remove(avg_receipt_delay) - if any(field.split(':')[1].split('(')[0] != 'avg' for field in [avg_receipt_delay] if field): - raise UserError("Value: 'avg_receipt_delay' should only be used to show an average. If you are seeing this message then it is being accessed incorrectly.") - - res = [] - if fields: - res = super(PurchaseReport, self).read_group(domain, fields, groupby, offset=offset, limit=limit, orderby=orderby, lazy=lazy) - - if not res and avg_receipt_delay: - res = [{}] - - if avg_receipt_delay: - query = """ SELECT AVG(receipt_delay.po_receipt_delay)::decimal(16,2) AS avg_receipt_delay - FROM ( - SELECT extract(epoch from age(po.effective_date, po.date_planned))/(24*60*60) AS po_receipt_delay - FROM purchase_order po - WHERE po.id IN ( - SELECT "purchase_report"."order_id" FROM %s WHERE %s) - ) AS receipt_delay - """ - - subdomain = domain + [('company_id', '=', self.env.company.id), ('effective_date', '!=', False)] - subtables, subwhere, subparams = expression(subdomain, self).query.get_sql() - - self.env.cr.execute(query % (subtables, subwhere), subparams) - res[0].update({ - '__count': 1, - avg_receipt_delay.split(':')[0]: self.env.cr.fetchall()[0][0], - }) - return res