Skip to content

Commit

Permalink
fix: duplicate acc dimension in test
Browse files Browse the repository at this point in the history
(cherry picked from commit b3f6d99)
  • Loading branch information
GursheenK authored and mergify[bot] committed Aug 18, 2023
1 parent 8530a28 commit cdb66bf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 20 deletions.
23 changes: 5 additions & 18 deletions erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
Original file line number Diff line number Diff line change
Expand Up @@ -1733,25 +1733,18 @@ def test_payment_allocation_for_payment_terms(self):
=======
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",
company="_Test Company",
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"
Expand Down Expand Up @@ -1792,12 +1785,6 @@ def test_offsetting_entries_for_accounting_dimensions(self):
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",
Expand Down
12 changes: 10 additions & 2 deletions erpnext/accounts/report/trial_balance/test_trial_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def test_offsetting_entries_for_accounting_dimensions(self):

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,
Expand Down Expand Up @@ -91,6 +91,8 @@ 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",
{
Expand All @@ -109,3 +111,9 @@ def disable_dimension(**args):
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()

0 comments on commit cdb66bf

Please sign in to comment.