[REF] cooperator: Pass recordset instead of int id to helper methods

Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>

cooperator/models/account_move.py

@@ -70,7 +70,7 @@ def set_cooperator_effective(self, effective_date):
 
         certificate_email_template = self.get_mail_template_certificate()
 
-        self.partner_id.get_cooperative_membership(self.company_id.id).set_effective()
+        self.partner_id.get_cooperative_membership(self.company_id).set_effective()
 
         sub_reg_operation = self.company_id.get_next_register_operation_number()
 
@@ -113,7 +113,7 @@ def _invoice_paid_hook(self):
         result = super()._invoice_paid_hook()
         for invoice in self:
             cooperative_membership = invoice.partner_id.get_cooperative_membership(
-                invoice.company_id.id
+                invoice.company_id
             )
             if not (
                 invoice.move_type == "out_invoice"

cooperator/models/operation_request.py

@@ -372,7 +372,7 @@ def execute_operation(self):
                 self.subscription_request.state = "done"
                 self.partner_id_to = partner
             to_membership = self.partner_id_to.get_cooperative_membership(
-                self.company_id.id
+                self.company_id
             )
             to_membership.set_effective()
             self.partner_id_to.write(

cooperator/models/res_partner.py

@@ -74,7 +74,7 @@ def _get_share_type(self):
 
     @api.depends_context("company")
     def _compute_cooperative_membership_id(self):
-        company_id = self.env.company.id
+        company_id = self.env.company
         for record in self:
             record.cooperative_membership_id = record.get_cooperative_membership(
                 company_id
@@ -268,7 +268,7 @@ def get_cooperative_membership(self, company_id):
         self.ensure_one()
         return self.env["cooperative.membership"].search(
             [
-                ("company_id", "=", company_id),
+                ("company_id", "=", company_id.id),
                 ("partner_id", "=", self.id),
             ]
         )
@@ -279,7 +279,7 @@ def create_cooperative_membership(self, company_id):
         for record in self:
             result |= cooperative_membership_model.create(
                 {
-                    "company_id": company_id,
+                    "company_id": company_id.id,
                     "partner_id": record.id,
                     "cooperator": True,
                 }
@@ -305,7 +305,7 @@ def get_share_quantities(self, company_id=None):
         if company_id is None:
             company_id = self.env.company
 
-        coop_membership = self.get_cooperative_membership(company_id.id)
+        coop_membership = self.get_cooperative_membership(company_id)
         if coop_membership:
             return coop_membership.get_share_quantities()
         else:

cooperator/models/subscription_request.py

@@ -113,10 +113,11 @@ def _adapt_create_vals_and_membership_from_partner(self, vals, partner):
         update it if needed and set vals accordingly.
         """
         company_id = vals.get("company_id", self.env.company.id)
+        company_id = self.env["res.company"].browse(company_id)
         cooperative_membership = partner.get_cooperative_membership(company_id)
         member = cooperative_membership and cooperative_membership.member
         pending_requests_domain = [
-            ("company_id", "=", company_id),
+            ("company_id", "=", company_id.id),
             ("partner_id", "=", partner.id),
             ("state", "in", ("draft", "waiting", "done")),
         ]
@@ -820,7 +821,7 @@ def setup_partner(self):
         partner = self._find_or_create_partner()
 
         cooperative_membership = partner.get_create_cooperative_membership(
-            self.company_id.id
+            self.company_id
         )
         if not cooperative_membership.cooperator:
             cooperative_membership.cooperator = True

cooperator/tests/test_cooperator.py

@@ -446,7 +446,7 @@ def test_create_subscription_with_multiple_matching_email(self):
                 "email": "dummy@example.net",
             }
         )
-        partner2.create_cooperative_membership(self.company.id)
+        partner2.create_cooperative_membership(self.company)
         vals = self.get_dummy_subscription_requests_vals()
         vals["email"] = "dummy@example.net"
         subscription_request = self.env["subscription.request"].create(vals)
@@ -520,7 +520,7 @@ def test_create_subscription_with_multiple_matching_company_register_number(self
                 "is_company": True,
             }
         )
-        company_partner2.create_cooperative_membership(self.company.id)
+        company_partner2.create_cooperative_membership(self.company)
         company_partner2.cooperator = True
         vals = self.get_dummy_company_subscription_requests_vals()
         subscription_request = self.env["subscription.request"].create(vals)
@@ -1451,23 +1451,23 @@ def test_cooperator_register_number_sequence_per_company(self):
     def test_get_create_cooperative_membership_create(self):
         """Create a membership if one does not yet exist."""
         partner = self.env["res.partner"].create({"name": "Jane Doe"})
-        membership = partner.get_create_cooperative_membership(self.env.company.id)
+        membership = partner.get_create_cooperative_membership(self.env.company)
         self.assertTrue(membership)
 
     def test_get_create_cooperative_membership_get(self):
         """Get the membership if one exists."""
         partner = self.env["res.partner"].create({"name": "Jane Doe"})
-        partner.create_cooperative_membership(self.env.company.id)
-        expected = partner.get_cooperative_membership(self.env.company.id)
-        result = partner.get_create_cooperative_membership(self.env.company.id)
+        partner.create_cooperative_membership(self.env.company)
+        expected = partner.get_cooperative_membership(self.env.company)
+        result = partner.get_create_cooperative_membership(self.env.company)
         self.assertEqual(result, expected)
 
     def test_set_effective(self):
         """Expect set_effective to do the things it says it does."""
         partner = self.env["res.partner"].create(
             {"name": "Jane Doe", "email": "jane@example.com"}
         )
-        membership = partner.create_cooperative_membership(self.env.company.id)
+        membership = partner.create_cooperative_membership(self.env.company)
         self.assertFalse(membership.member)
         self.assertFalse(membership.cooperator_register_number)
         self.assertFalse(membership.partner_id.user_ids)
@@ -1500,7 +1500,7 @@ def test_create_user_inactive(self):
             }
         )
         user.active = False
-        membership = partner.create_cooperative_membership(self.env.company.id)
+        membership = partner.create_cooperative_membership(self.env.company)
         membership.create_user()
         new_user = self.env["res.users"].search([("login", "=", "jane@example.com")])
         self.assertEqual(new_user, user)
@@ -1523,7 +1523,7 @@ def test_create_user_new_company(self):
                 "company_ids": [fields.Command.set([other_company.id])],
             }
         )
-        membership = partner.create_cooperative_membership(self.env.company.id)
+        membership = partner.create_cooperative_membership(self.env.company)
         membership.create_user()
         new_user = self.env["res.users"].search([("login", "=", "jane@example.com")])
         self.assertEqual(new_user, user)