From e72c1565baf88fb0f12cfbaa60967bf3fed214b7 Mon Sep 17 00:00:00 2001 From: Joan Mateu Jordi Date: Tue, 30 Nov 2021 09:44:08 +0100 Subject: [PATCH] [15.0][MIG] mail_activity_partner: Migration to 15.0 --- mail_activity_partner/__manifest__.py | 2 +- mail_activity_partner/readme/CONTRIBUTORS.rst | 1 + .../tests/test_mail_activity_partner.py | 15 ++++++++------- .../views/mail_activity_views.xml | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/mail_activity_partner/__manifest__.py b/mail_activity_partner/__manifest__.py index 25365c9..867bda8 100644 --- a/mail_activity_partner/__manifest__.py +++ b/mail_activity_partner/__manifest__.py @@ -3,7 +3,7 @@ { "name": "Mail Activity Partner", "summary": "Add Partner to Activities", - "version": "14.0.1.0.0", + "version": "15.0.1.0.0", "development_status": "Beta", "category": "Social Network", "website": "https://github.com/OCA/social", diff --git a/mail_activity_partner/readme/CONTRIBUTORS.rst b/mail_activity_partner/readme/CONTRIBUTORS.rst index 5e81a9b..dd53919 100644 --- a/mail_activity_partner/readme/CONTRIBUTORS.rst +++ b/mail_activity_partner/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Adrià Gil Sorribes (adria.gil@forgeflow.com) +* Joan Mateu Jordi (joan.mateu@forgeflow.com) diff --git a/mail_activity_partner/tests/test_mail_activity_partner.py b/mail_activity_partner/tests/test_mail_activity_partner.py index 30c7c1a..45b23ec 100644 --- a/mail_activity_partner/tests/test_mail_activity_partner.py +++ b/mail_activity_partner/tests/test_mail_activity_partner.py @@ -1,9 +1,9 @@ # Copyright 2018 ForgeFlow S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import SavepointCase +from odoo.tests.common import TransactionCase -class TestMailActivityPartner(SavepointCase): +class TestMailActivityPartner(TransactionCase): @classmethod def setUpClass(cls): super().setUpClass() @@ -32,15 +32,16 @@ class TestMailActivityPartner(SavepointCase): } ) - cls.partner_ir_model = cls.env["ir.model"]._get("res.partner") + cls.partner_model = cls.env["ir.model"]._get("res.partner") activity_type_model = cls.env["mail.activity.type"] cls.activity1 = activity_type_model.create( { "name": "Initial Contact", "delay_count": 5, + "delay_unit": "days", "summary": "ACT 1 : Presentation, barbecue, ... ", - "res_model_id": cls.partner_ir_model.id, + "res_model": cls.partner_model.model, } ) cls.activity2 = activity_type_model.create( @@ -48,7 +49,7 @@ class TestMailActivityPartner(SavepointCase): "name": "Call for Demo", "delay_count": 6, "summary": "ACT 2 : I want to show you my ERP !", - "res_model_id": cls.partner_ir_model.id, + "res_model": cls.partner_model.model, } ) @@ -78,7 +79,7 @@ class TestMailActivityPartner(SavepointCase): "activity_type_id": self.activity1.id, "note": "Partner activity 1.", "res_id": self.partner_01.id, - "res_model_id": self.partner_ir_model.id, + "res_model_id": self.partner_model.id, "user_id": self.user_admin.id, } ) @@ -92,7 +93,7 @@ class TestMailActivityPartner(SavepointCase): "activity_type_id": self.activity2.id, "note": "Partner activity 10.", "res_id": self.partner_10.id, - "res_model_id": self.partner_ir_model.id, + "res_model_id": self.partner_model.id, "user_id": self.employee.id, } ) diff --git a/mail_activity_partner/views/mail_activity_views.xml b/mail_activity_partner/views/mail_activity_views.xml index 8c03daa..c568664 100644 --- a/mail_activity_partner/views/mail_activity_views.xml +++ b/mail_activity_partner/views/mail_activity_views.xml @@ -54,7 +54,7 @@ mail.activity - +