From 3ffd6acc023617944d997f079c44aa34ac4221d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 5 Mar 2021 09:58:17 +0000 Subject: [PATCH] [IMP] mail: concatenate all Base class code in a single override Merge two overrides of Base into the same file. Just moving code to clean module, nothing changes functionally or technically. LINKS Task ID-2431217 COM PR odoo/odoo#67322 ENT PR odoo/enterprise#16876 UPG PR odoo/upgrade#2236 --- addons/mail/models/ir_model.py | 11 ----------- addons/mail/models/models.py | 7 +++++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/addons/mail/models/ir_model.py b/addons/mail/models/ir_model.py index 386ff3760c9..7aadd09b02f 100644 --- a/addons/mail/models/ir_model.py +++ b/addons/mail/models/ir_model.py @@ -5,17 +5,6 @@ from odoo import _, api, fields, models from odoo.exceptions import UserError -class Base(models.AbstractModel): - _inherit = 'base' - - def _valid_field_parameter(self, field, name): - # allow tracking on abstract models; see also 'mail.thread' - return ( - name == 'tracking' and self._abstract - or super()._valid_field_parameter(field, name) - ) - - class IrModel(models.Model): _inherit = 'ir.model' _order = 'is_mail_thread DESC, name ASC' diff --git a/addons/mail/models/models.py b/addons/mail/models/models.py index 2c9aea4f144..c09eefbd10c 100644 --- a/addons/mail/models/models.py +++ b/addons/mail/models/models.py @@ -9,6 +9,13 @@ from odoo import api, models, tools, _ class BaseModel(models.AbstractModel): _inherit = 'base' + def _valid_field_parameter(self, field, name): + # allow tracking on abstract models; see also 'mail.thread' + return ( + name == 'tracking' and self._abstract + or super()._valid_field_parameter(field, name) + ) + # ------------------------------------------------------------ # GENERIC MAIL FEATURES # ------------------------------------------------------------