From ac41743fc6e77a8f413c79aec2f9b099de323285 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Fri, 14 Sep 2018 12:09:39 +0100 Subject: [PATCH] [FIX] purchase_sale_inter_company: No buggy demo data Make tests compatible with https://github.com/OCA/multi-company/pull/110, for the same reason as the specified in that link. --- purchase_sale_inter_company/README.rst | 1 + purchase_sale_inter_company/__manifest__.py | 3 -- .../inter_company_purchase_sale.xml | 0 .../tests/test_inter_company_purchase_sale.py | 33 +++++++++++++++---- 4 files changed, 27 insertions(+), 10 deletions(-) rename purchase_sale_inter_company/{demo => tests}/inter_company_purchase_sale.xml (100%) diff --git a/purchase_sale_inter_company/README.rst b/purchase_sale_inter_company/README.rst index 7f83c1a1414..b7731731707 100644 --- a/purchase_sale_inter_company/README.rst +++ b/purchase_sale_inter_company/README.rst @@ -55,6 +55,7 @@ Contributors * `Tecnativa `_: * Carlos Dauden + * Jairo Llopis Maintainer ---------- diff --git a/purchase_sale_inter_company/__manifest__.py b/purchase_sale_inter_company/__manifest__.py index 6a632e014c0..673349c2608 100644 --- a/purchase_sale_inter_company/__manifest__.py +++ b/purchase_sale_inter_company/__manifest__.py @@ -25,7 +25,4 @@ 'views/res_config_view.xml', 'views/purchase_order_view.xml', ], - 'demo': [ - 'demo/inter_company_purchase_sale.xml', - ], } diff --git a/purchase_sale_inter_company/demo/inter_company_purchase_sale.xml b/purchase_sale_inter_company/tests/inter_company_purchase_sale.xml similarity index 100% rename from purchase_sale_inter_company/demo/inter_company_purchase_sale.xml rename to purchase_sale_inter_company/tests/inter_company_purchase_sale.xml diff --git a/purchase_sale_inter_company/tests/test_inter_company_purchase_sale.py b/purchase_sale_inter_company/tests/test_inter_company_purchase_sale.py index f5b9a5b15c3..9262f0f365c 100644 --- a/purchase_sale_inter_company/tests/test_inter_company_purchase_sale.py +++ b/purchase_sale_inter_company/tests/test_inter_company_purchase_sale.py @@ -5,31 +5,50 @@ from odoo.tests.common import SavepointCase from odoo.exceptions import AccessError, UserError +from odoo.modules.module import get_resource_path +from odoo.tools import convert_file class TestPurchaseSaleInterCompany(SavepointCase): - @classmethod def setUpClass(cls): super().setUpClass() + cls._load( + "account_invoice_inter_company", + "tests", + "inter_company_invoice.xml", + ) + cls._load( + "purchase_sale_inter_company", + "tests", + "inter_company_purchase_sale.xml", + ) cls.purchase_company_a = cls.env.ref( 'purchase_sale_inter_company.purchase_company_a') cls.company_a = cls.env.ref( - 'account_invoice_inter_company.company_a') + 'purchase_sale_inter_company.company_a') cls.company_b = cls.env.ref( - 'account_invoice_inter_company.company_b') + 'purchase_sale_inter_company.company_b') cls.company_b.so_from_po = True cls.user_a = cls.env.ref( - 'account_invoice_inter_company.user_company_a') + 'purchase_sale_inter_company.user_company_a') cls.user_b = cls.env.ref( - 'account_invoice_inter_company.user_company_b') + 'purchase_sale_inter_company.user_company_b') cls.account_sale_b = cls.env.ref( - 'account_invoice_inter_company.a_sale_company_b') + 'purchase_sale_inter_company.a_sale_company_b') cls.product_consultant = cls.env.ref( - 'account_invoice_inter_company.product_consultant_multi_company') + 'purchase_sale_inter_company.product_consultant_multi_company') cls.product_consultant.sudo( cls.user_b.id).property_account_income_id = cls.account_sale_b + @classmethod + def _load(cls, module, *args): + convert_file( + cls.cr, "purchase_sale_inter_company", + get_resource_path(module, *args), + None, 'init', False, 'test', cls.registry._assertion_report, + ) + def test_purchase_sale_inter_company(self): self.purchase_company_a.notes = 'Test note' # Confirm the purchase of company A