[MIG] srm: Migration to 19.0

Author: vvrossem

srm/__manifest__.py

@@ -4,7 +4,7 @@
 {
     "name": "SRM",
     "summary": "Use CRM model for suppliers",
-    "version": "18.0.1.0.0",
+    "version": "19.0.1.0.0",
     "development_status": "Alpha",
     "category": "CRM",
     "website": "https://github.com/OCA/crm",

srm/models/crm_lead.py

@@ -3,6 +3,7 @@
 from collections import defaultdict
 
 from odoo import api, fields, models
+from odoo.fields import Domain
 
 
 class CrmLead(models.Model):
@@ -37,20 +38,25 @@ class CrmLead(models.Model):
     )
 
     def _get_lead_purchase_order_domain(self):
-        return [("state", "not in", ("draft", "sent", "cancel"))]
+        return Domain("state", "not in", ("draft", "sent", "cancel"))
 
     def _get_lead_request_for_quotation_domain(self):
-        return [("state", "in", ("draft", "sent"))]
+        return Domain("state", "in", ("draft", "sent"))
+
+    def _get_purchase_order_lead_domain(self):
+        return Domain("opportunity_id", "in", self.ids)
 
     @api.depends("purchase_order_ids.state")
     def _compute_purchase_order_count(self):
         purchase_order_per_lead = {
             lead.id: count
             for lead, count in self.env["purchase.order"]._read_group(
-                domain=[
-                    ("opportunity_id", "in", self.ids),
-                    *self._get_lead_purchase_order_domain(),
-                ],
+                domain=Domain.AND(
+                    [
+                        self._get_purchase_order_lead_domain(),
+                        self._get_lead_purchase_order_domain(),
+                    ]
+                ),
                 groupby=["opportunity_id"],
                 aggregates=["__count"],
             )
@@ -63,10 +69,12 @@ def _compute_request_for_quotation_count(self):
         rfq_per_lead = {
             lead.id: count
             for lead, count in self.env["purchase.order"]._read_group(
-                domain=[
-                    ("opportunity_id", "in", self.ids),
-                    *self._get_lead_request_for_quotation_domain(),
-                ],
+                domain=Domain.AND(
+                    [
+                        self._get_purchase_order_lead_domain(),
+                        self._get_lead_request_for_quotation_domain(),
+                    ]
+                ),
                 groupby=["opportunity_id"],
                 aggregates=["__count"],
             )
@@ -84,17 +92,15 @@ def _compute_request_for_quotation_count(self):
     def _compute_purchase_amount_total(self):
         amount_per_lead = defaultdict(float)
 
-        for (
-            lead,
-            currency,
-            company,
-            date_order,
-            amount,
-        ) in self.env["purchase.order"]._read_group(
-            domain=[
-                ("opportunity_id", "in", self.ids),
-                *self._get_lead_purchase_order_domain(),
-            ],
+        for lead, currency, company, date_order, amount in self.env[
+            "purchase.order"
+        ]._read_group(
+            domain=Domain.AND(
+                [
+                    self._get_purchase_order_lead_domain(),
+                    self._get_lead_purchase_order_domain(),
+                ]
+            ),
             groupby=["opportunity_id", "currency_id", "company_id", "date_order:day"],
             aggregates=["amount_untaxed:sum"],
         ):
@@ -109,12 +115,14 @@ def _compute_purchase_amount_total(self):
         for lead in self:
             lead.purchase_amount_total = amount_per_lead.get(lead.id, 0.0)
 
-    def _create_customer(self):
+    def _create_customer(self, with_parent=None):
         """It can be a customer or supplier depending on lead request type"""
+        self.ensure_one()
         self = self.with_context(res_partner_search_mode=self.request_type)
-        return super()._create_customer()
+        return super()._create_customer(with_parent=with_parent)
 
     def action_lead_rfq_new(self):
+        self.ensure_one()
         if not self.partner_id:
             return self.env["ir.actions.actions"]._for_xml_id(
                 "srm.srm_rfq_partner_action"
@@ -123,6 +131,7 @@ def action_lead_rfq_new(self):
             return self.action_rfq_new()
 
     def action_rfq_new(self):
+        self.ensure_one()
         action = self.env["ir.actions.actions"]._for_xml_id("srm.action_lead_rfq_new")
         action["context"] = self._prepare_rfq_context()
         return action

srm/models/crm_team.py

@@ -1,7 +1,9 @@
 # Copyright 2022 Camptocamp SA
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+import ast
 
 from odoo import api, models
+from odoo.fields import Domain
 
 
 class Team(models.Model):
@@ -13,7 +15,13 @@ def action_your_pipeline(self):
         request_type = self.env.context.get("request_type")
         if request_type:
             action["domain"] = (
-                f"[('type','=','opportunity'), ('request_type', '=', '{request_type}')]"
+                Domain(action.get("domain") or Domain.TRUE)
+                & Domain("type", "=", "opportunity")
+                & Domain("request_type", "=", request_type)
             )
+            if action.get("context"):
+                action["context"] = ast.literal_eval(action["context"])
+            else:
+                action["context"] = {}
             action["context"]["default_request_type"] = request_type
         return action

srm/models/purchase_order.py

@@ -11,6 +11,13 @@ class PurchaseOrder(models.Model):
         comodel_name="crm.lead",
         string="Opportunity",
         check_company=True,
-        domain="[('type', '=', 'opportunity'), ('request_type', '=', 'supplier'), "
-        "'|', ('company_id', '=', False), ('company_id', '=', company_id)]",
+        domain="""
+            [
+                ('type', '=', 'opportunity'),
+                ('request_type', '=', 'supplier'),
+                '|',
+                ('company_id', '=', False),
+                ('company_id', '=', company_id),
+            ]
+        """,
     )

srm/tests/__init__.py

@@ -0,0 +1 @@
+from . import test_srm