From 7e5ac25b27ea40b0b2b3ecde8ba9a2788a596ba9 Mon Sep 17 00:00:00 2001
From: Ernesto Tejeda <ernesto.tejeda@tecnativa.com>
Date: Mon, 14 Feb 2022 16:27:33 -0500
Subject: [PATCH 1/2] [IMP] contract: remove l10n_generic_coa dependencie

---
 contract/tests/test_multicompany.py | 49 +++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/contract/tests/test_multicompany.py b/contract/tests/test_multicompany.py
index 395d5d2e5..6d104b205 100644
--- a/contract/tests/test_multicompany.py
+++ b/contract/tests/test_multicompany.py
@@ -8,14 +8,57 @@ class ContractMulticompanyCase(TestContractBase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        chart_template = cls.env.ref("l10n_generic_coa.configurable_chart_template")
         cls.company_obj = cls.env["res.company"]
         cls.company_1 = cls.env.ref("base.main_company")
         vals = {"name": "Company 2"}
         cls.company_2 = cls.company_obj.create(vals)
-        chart_template.try_loading(company=cls.company_2)
         cls.env.user.company_ids |= cls.company_2
-
+        cls.env["account.journal"].create(
+            {
+                "name": "Journal purchase test 1",
+                "code": "JP1",
+                "type": "purchase",
+                "company_id": cls.company_2.id,
+            }
+        )
+        account_payable_type = cls.env["account.account.type"].create(
+            {
+                "name": "Payable account type",
+                "type": "payable",
+                "internal_group": "liability",
+            }
+        )
+        account_expense_type = cls.env["account.account.type"].create(
+            {
+                "name": "Expense account type",
+                "type": "other",
+                "internal_group": "expense",
+            }
+        )
+        payable_account = cls.env["account.account"].create(
+            {
+                "name": "Payable Account",
+                "code": "PAY",
+                "user_type_id": account_payable_type.id,
+                "reconcile": True,
+                "company_id": cls.company_2.id,
+            }
+        )
+        expense_account = cls.env["account.account"].create(
+            {
+                "name": "Expense Account",
+                "code": "EXP",
+                "user_type_id": account_expense_type.id,
+                "reconcile": False,
+                "company_id": cls.company_2.id,
+            }
+        )
+        cls.partner.with_company(
+            cls.company_2
+        ).property_account_payable_id = payable_account.id
+        cls.product_1.with_company(
+            cls.company_2
+        ).property_account_expense_id = expense_account.id
         cls.contract_mc = (
             cls.env["contract.contract"]
             .with_company(cls.company_2)

From 6859bd5974636a21d23d9781966c915e0b4184a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?=
 <victor.martinez@tecnativa.com>
Date: Wed, 22 May 2024 16:35:00 +0200
Subject: [PATCH 2/2] [IMP] contract: Adapt to 16.0

---
 contract/tests/test_multicompany.py | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/contract/tests/test_multicompany.py b/contract/tests/test_multicompany.py
index 6d104b205..a46df9534 100644
--- a/contract/tests/test_multicompany.py
+++ b/contract/tests/test_multicompany.py
@@ -10,8 +10,7 @@ class ContractMulticompanyCase(TestContractBase):
         super().setUpClass()
         cls.company_obj = cls.env["res.company"]
         cls.company_1 = cls.env.ref("base.main_company")
-        vals = {"name": "Company 2"}
-        cls.company_2 = cls.company_obj.create(vals)
+        cls.company_2 = cls.company_obj.create({"name": "Company 2"})
         cls.env.user.company_ids |= cls.company_2
         cls.env["account.journal"].create(
             {
@@ -21,25 +20,11 @@ class ContractMulticompanyCase(TestContractBase):
                 "company_id": cls.company_2.id,
             }
         )
-        account_payable_type = cls.env["account.account.type"].create(
-            {
-                "name": "Payable account type",
-                "type": "payable",
-                "internal_group": "liability",
-            }
-        )
-        account_expense_type = cls.env["account.account.type"].create(
-            {
-                "name": "Expense account type",
-                "type": "other",
-                "internal_group": "expense",
-            }
-        )
         payable_account = cls.env["account.account"].create(
             {
                 "name": "Payable Account",
                 "code": "PAY",
-                "user_type_id": account_payable_type.id,
+                "account_type": "liability_payable",
                 "reconcile": True,
                 "company_id": cls.company_2.id,
             }
@@ -48,7 +33,7 @@ class ContractMulticompanyCase(TestContractBase):
             {
                 "name": "Expense Account",
                 "code": "EXP",
-                "user_type_id": account_expense_type.id,
+                "account_type": "expense",
                 "reconcile": False,
                 "company_id": cls.company_2.id,
             }