fix: duplicate acc dimension in test
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 4aaed4c..846b8bd 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -1738,6 +1738,10 @@
def test_offsetting_entries_for_accounting_dimensions(self):
from erpnext.accounts.doctype.account.test_account import create_account
+ from erpnext.accounts.report.trial_balance.test_trial_balance import (
+ clear_dimension_defaults,
+ create_accounting_dimension,
+ )
create_account(
account_name="Offsetting",
@@ -1745,18 +1749,7 @@
parent_account="Temporary Accounts - _TC",
)
- clear_dimension_defaults("Branch")
- accounting_dimension = frappe.get_doc("Accounting Dimension", "Branch")
- accounting_dimension.disabled = 0
- accounting_dimension.append(
- "dimension_defaults",
- {
- "company": "_Test Company",
- "automatically_post_balancing_accounting_entry": 1,
- "offsetting_account": "Offsetting - _TC",
- },
- )
- accounting_dimension.save()
+ create_accounting_dimension()
branch1 = frappe.new_doc("Branch")
branch1.branch = "Location 1"
@@ -1797,12 +1790,6 @@
clear_dimension_defaults("Branch")
-def clear_dimension_defaults(dimension_name):
- accounting_dimension = frappe.get_doc("Accounting Dimension", dimension_name)
- accounting_dimension.dimension_defaults = []
- accounting_dimension.save()
-
-
def set_advance_flag(company, flag, default_account):
frappe.db.set_value(
"Company",
diff --git a/erpnext/accounts/report/trial_balance/test_trial_balance.py b/erpnext/accounts/report/trial_balance/test_trial_balance.py
index d4d0554..1a29e9f 100644
--- a/erpnext/accounts/report/trial_balance/test_trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/test_trial_balance.py
@@ -39,10 +39,10 @@
branch1 = frappe.new_doc("Branch")
branch1.branch = "Location 1"
- branch1.insert()
+ branch1.insert(ignore_if_duplicate=True)
branch2 = frappe.new_doc("Branch")
branch2.branch = "Location 2"
- branch2.insert()
+ branch2.insert(ignore_if_duplicate=True)
si = create_sales_invoice(
company=self.company,
@@ -91,6 +91,8 @@
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",
{
@@ -109,3 +111,9 @@
dimension = frappe.get_doc("Accounting Dimension", document_type)
dimension.disabled = 1
dimension.save()
+
+
+def clear_dimension_defaults(dimension_name):
+ accounting_dimension = frappe.get_doc("Accounting Dimension", dimension_name)
+ accounting_dimension.dimension_defaults = []
+ accounting_dimension.save()