fixup! [MIG] sale_confirm_activities_mandatory: Migration to 17.0

Author: yankinmax

sale_confirm_activities_mandatory/models/sale_order.py

@@ -10,10 +10,9 @@ class SaleOrder(models.Model):
 
     def manage_activities(self):
         # manage activities creation
-        model_id = self.env["ir.model"]._get(self._name).id
         activity_types = self.env["mail.activity.type"].search(
             [
-                ("res_model_id", "=", model_id),
+                ("res_model", "=", self._name),
                 ("category", "=", "validation"),
                 ("previous_type_ids", "=", False),
             ]
@@ -33,7 +32,7 @@ def _prepare_activity_data(self, activity_type):
         self.ensure_one()
         res = {
             "res_id": self.id,
-            "res_model_id": activity_type.res_model_id.id,
+            "res_model_id": self.env["ir.model"]._get(activity_type.res_model).id,
             "activity_type_id": activity_type.id,
             "summary": activity_type.summary,
             "automated": True,
@@ -45,7 +44,7 @@ def action_confirm(self):
         # given in self
         # All done activities are unlinked
         # (see _action_done of mail.activity model)
-        if not self.check_validation_activities_todo():
+        if not self._check_validation_activities_todo():
             raise UserError(
                 _(
                     "All validation checks must be done before "

sale_confirm_activities_mandatory/tests/test_activities_confirm.py

@@ -17,9 +17,8 @@ def setUpClass(cls, chart_template_ref=None):
         )
         SaleOrder = cls.env["sale.order"]
         ActivityType = cls.env["mail.activity.type"]
-        model_so_id = cls.env["ir.model"]._get("sale.order").id
         cls.not_validation_step = ActivityType.create(
-            {"category": "default", "name": "Test1", "res_model_id": model_so_id}
+            {"category": "default", "name": "Test1", "res_model": SaleOrder._name}
         )
         cls.validation_step1 = ActivityType.create(
             {
@@ -33,7 +32,7 @@ def setUpClass(cls, chart_template_ref=None):
                 "category": "validation",
                 "name": "Test2 validation",
                 "res_model": "sale.order",
-                "force_next": True,
+                "triggered_next_type_id": cls.validation_step1.id,
             }
         )
         cls.validation_step2_1 = ActivityType.create(
@@ -49,9 +48,9 @@ def setUpClass(cls, chart_template_ref=None):
 
         cls.sale_order = SaleOrder.create(
             {
-                "partner_id": cls.partner.id,
-                "partner_invoice_id": cls.partner.id,
-                "partner_shipping_id": cls.partner.id,
+                "partner_id": cls.partner_a.id,
+                "partner_invoice_id": cls.partner_a.id,
+                "partner_shipping_id": cls.partner_a.id,
                 "pricelist_id": cls.company_data["default_pricelist"].id,
             }
         )
@@ -144,15 +143,15 @@ def test_steps_acl(self):
             self.sale_order.action_confirm()
         # error while terminating the last activity because of ACL
         with self.assertRaises(AccessError):
-            self.sale_order.sudo(user=self.user_not_validator).activity_ids[
+            self.sale_order.with_user(self.user_not_validator).activity_ids[
                 0
             ].action_done_schedule_next()
 
-        self.sale_order.sudo(user=self.user_validator.id).activity_ids[
+        self.sale_order.with_user(self.user_validator).activity_ids[
             0
         ].action_done_schedule_next()
         # no activities left on SO
         self.assertEqual(0, len(self.sale_order.activity_ids))
         # user_not_validator should not be able to confirm sale order
-        self.sale_order.sudo(user=self.user_validator.id).action_confirm()
+        self.sale_order.with_user(self.user_validator).action_confirm()
         self.assertIn(self.sale_order.state, ["sale", "done"])