fix: clear dimension defaults after test

(cherry picked from commit 23e56d3)
frappe · Aug 18, 2023 · 2a467a9 · 2a467a9
1 parent 7ac35b4
commit 2a467a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -1736,6 +1736,7 @@ def test_offsetting_entries_for_accounting_dimensions(self):
 		from erpnext.accounts.report.trial_balance.test_trial_balance import (
 			clear_dimension_defaults,
 			create_accounting_dimension,
+			disable_dimension,
 		)
 
 		create_account(
@@ -1783,6 +1784,7 @@ def test_offsetting_entries_for_accounting_dimensions(self):
 			check_acc_dimensions=True,
 		)
 		clear_dimension_defaults("Branch")
+		disable_dimension()
 
 
 def set_advance_flag(company, flag, default_account):

diff --git a/erpnext/accounts/report/trial_balance/test_trial_balance.py b/erpnext/accounts/report/trial_balance/test_trial_balance.py
@@ -63,6 +63,7 @@ def test_offsetting_entries_for_accounting_dimensions(self):
 		self.assertEqual(total_row["debit"], total_row["credit"])
 
 	def tearDown(self):
+		clear_dimension_defaults("Branch")
 		disable_dimension()
 
 
@@ -91,8 +92,6 @@ def create_accounting_dimension(**args):
 		accounting_dimension = frappe.get_doc("Accounting Dimension", document_type)
 		accounting_dimension.disabled = 0
 
-	clear_dimension_defaults(document_type)
-	accounting_dimension.load_from_db()
 	accounting_dimension.append(
 		"dimension_defaults",
 		{