From c0ba70305ad559a8d70cf14dd2989c98a63d1965 Mon Sep 17 00:00:00 2001 From: SodexisTeam Date: Thu, 25 Jan 2024 16:28:54 +0530 Subject: [PATCH] [MIG] mail_multicompany: Migration to 17.0 --- mail_multicompany/__manifest__.py | 2 +- mail_multicompany/models/mail_message.py | 12 +++++------- mail_multicompany/security/mail_security.xml | 2 +- mail_multicompany/static/description/index.html | 1 - 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mail_multicompany/__manifest__.py b/mail_multicompany/__manifest__.py index a2bc80a34b3..0b9acf40168 100644 --- a/mail_multicompany/__manifest__.py +++ b/mail_multicompany/__manifest__.py @@ -1,7 +1,7 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { "name": "Email Gateway Multi company", - "version": "16.0.1.0.1", + "version": "17.0.1.0.1", "category": "Extra Tools", "author": "Odoo Community Association (OCA), " "Comunitea", "maintainers": [ diff --git a/mail_multicompany/models/mail_message.py b/mail_multicompany/models/mail_message.py index 4cd565a182d..715cd67359c 100644 --- a/mail_multicompany/models/mail_message.py +++ b/mail_multicompany/models/mail_message.py @@ -1,28 +1,26 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import api, models class MailMessage(models.Model): _inherit = "mail.message" - company_id = fields.Many2one("res.company", "Company") - @api.model_create_multi def create(self, vals_list): for vals in vals_list: if vals.get("model") and vals.get("res_id"): current_object = self.env[vals["model"]].browse(vals["res_id"]) if hasattr(current_object, "company_id") and current_object.company_id: - vals["company_id"] = current_object.company_id.id - if not vals.get("company_id"): - vals["company_id"] = self.env.company.id + vals["record_company_id"] = current_object.company_id.id + if not vals.get("record_company_id"): + vals["record_company_id"] = self.env.company.id if not vals.get("mail_server_id"): vals["mail_server_id"] = ( self.sudo() .env["ir.mail_server"] .search( - [("company_id", "=", vals.get("company_id", False))], + [("company_id", "=", vals.get("record_company_id", False))], order="sequence", limit=1, ) diff --git a/mail_multicompany/security/mail_security.xml b/mail_multicompany/security/mail_security.xml index 84fcc6fc10b..fb6ed2e1e59 100644 --- a/mail_multicompany/security/mail_security.xml +++ b/mail_multicompany/security/mail_security.xml @@ -18,6 +18,6 @@ ['|',('company_id','=',False),('company_id', 'in', company_ids)] + >['|',('record_company_id','=',False),('record_company_id', 'in', company_ids)] diff --git a/mail_multicompany/static/description/index.html b/mail_multicompany/static/description/index.html index 764cc520f94..87ba969ae2f 100644 --- a/mail_multicompany/static/description/index.html +++ b/mail_multicompany/static/description/index.html @@ -1,4 +1,3 @@ -