diff --git a/erpnext/accounts/report/consolidated_trial_balance/test_consolidated_trial_balance.py b/erpnext/accounts/report/consolidated_trial_balance/test_consolidated_trial_balance.py index 3e6ea82e13b..3166abf4061 100644 --- a/erpnext/accounts/report/consolidated_trial_balance/test_consolidated_trial_balance.py +++ b/erpnext/accounts/report/consolidated_trial_balance/test_consolidated_trial_balance.py @@ -15,24 +15,9 @@ class ForeignCurrencyTranslationReserveNotFoundError(frappe.ValidationError): class TestConsolidatedTrialBalance(ERPNextTestSuite): - @classmethod - def setUpClass(cls): - from erpnext.accounts.report.trial_balance.test_trial_balance import create_company + def setUp(self): from erpnext.accounts.utils import get_fiscal_year - # Group Company - create_company(company_name="Parent Group Company India", is_group=1) - - create_company(company_name="Child Company India", parent_company="Parent Group Company India") - - # Child Company with different currency - create_company( - company_name="Child Company US", - country="United States", - currency="USD", - parent_company="Parent Group Company India", - ) - create_journal_entry( company="Parent Group Company India", acc1="Marketing Expenses - PGCI", @@ -48,7 +33,7 @@ class TestConsolidatedTrialBalance(ERPNextTestSuite): company="Child Company US", acc1="Marketing Expenses - CCU", acc2="Cash - CCU", amount=1000 ) - cls.fiscal_year = get_fiscal_year(today(), company="Parent Group Company India")[0] + self.fiscal_year = get_fiscal_year(today(), company="Parent Group Company India")[0] def test_single_company_report(self): filters = frappe._dict({"company": ["Parent Group Company India"], "fiscal_year": self.fiscal_year}) diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py index afd78dfa9de..1a1a56f2c88 100644 --- a/erpnext/tests/utils.py +++ b/erpnext/tests/utils.py @@ -936,6 +936,42 @@ class ERPNextTestSuite(unittest.TestCase): "password": "test", "chart_of_accounts": "Standard", }, + { + "abbr": "PGCI", + "company_name": "Parent Group Company India", + "country": "India", + "default_currency": "INR", + "doctype": "Company", + "domain": "Manufacturing", + "chart_of_accounts": "Standard", + "default_holiday_list": cls.holiday_list[0].name, + "enable_perpetual_inventory": 0, + "is_group": 1, + }, + { + "abbr": "CCI", + "company_name": "Child Company India", + "country": "India", + "default_currency": "INR", + "doctype": "Company", + "domain": "Manufacturing", + "chart_of_accounts": "Standard", + "default_holiday_list": cls.holiday_list[0].name, + "enable_perpetual_inventory": 0, + "parent_company": "Parent Group Company India", + }, + { + "abbr": "CCU", + "company_name": "Child Company US", + "country": "United States", + "default_currency": "USD", + "doctype": "Company", + "domain": "Manufacturing", + "chart_of_accounts": "Standard", + "default_holiday_list": cls.holiday_list[0].name, + "enable_perpetual_inventory": 0, + "parent_company": "Parent Group Company India", + }, ] cls.companies = [] for x in records: