[MIG] sale_report_salesperson_from_partner: Migration to 16.0

TT51908
OCA · Dec 2, 2024 · 150a098 · 150a098
1 parent be087c9
commit 150a098
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/sale_report_salesperson_from_partner/__manifest__.py b/sale_report_salesperson_from_partner/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 {
     "name": "Sale Report Salesperson From Partner",
-    "version": "15.0.1.0.0",
+    "version": "16.0.1.0.0",
     "author": "Tecnativa," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/sale-reporting",
     "category": "Sales",

diff --git a/sale_report_salesperson_from_partner/report/sale_report.py b/sale_report_salesperson_from_partner/report/sale_report.py
@@ -10,11 +10,12 @@ class SaleReport(models.Model):
         readonly=True,
     )
 
-    def _group_by_sale(self, groupby=""):
-        res = super()._group_by_sale(groupby)
+    def _group_by_sale(self):
+        res = super()._group_by_sale()
         res += """,partner.user_id"""
         return res
 
-    def _select_additional_fields(self, fields):
-        fields["user_from_partner_id"] = ", partner.user_id as user_from_partner_id"
-        return super()._select_additional_fields(fields)
+    def _select_additional_fields(self):
+        res = super()._select_additional_fields()
+        res["user_from_partner_id"] = "partner.user_id"
+        return res
diff --git a/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py b/sale_report_salesperson_from_partner/tests/test_sale_report_salesperson_from_partner.py
@@ -1,22 +1,15 @@
-# Copyright 2022 Tecnativa - Víctor Martínez
+# Copyright 2024 Tecnativa - Pilar Vargas
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from odoo.tests import Form, common, new_test_user
 
+from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
+
 
 class SaleReportSalespersonFromPartner(common.TransactionCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        # Remove this variable in v16 and put instead:
-        # from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
-        DISABLED_MAIL_CONTEXT = {
-            "tracking_disable": True,
-            "mail_create_nolog": True,
-            "mail_create_nosubscribe": True,
-            "mail_notrack": True,
-            "no_reset_password": True,
-        }
         cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
         cls.salesperson = new_test_user(
             cls.env,