nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2025-06-24 15:31:34 +05:30
parent 2bf8dffb60
commit 1ccdb67c55
4 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/tests/test_accounts_controller.py
View File

@@ -931,14 +931,10 @@ class TestAccountsController(FrappeTestCase):
self.assertEqual(exc_je_for_si, [])
self.assertEqual(exc_je_for_pe, [])
<<<<<<< HEAD
@change_settings("Accounts Settings", {"add_taxes_from_item_tax_template": 1})
=======
@IntegrationTestCase.change_settings(
@change_settings(
"Accounts Settings",
{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1},
)
>>>>>>> 4cb1fa2b6b (fix: auto append_taxes_from_item_tax_template in backend)
def test_18_fetch_taxes_based_on_taxes_and_charges_template(self):
# Create a Sales Taxes and Charges Template
if not frappe.db.exists("Sales Taxes and Charges Template", "_Test Tax - _TC"):
@@ -967,7 +963,7 @@ class TestAccountsController(FrappeTestCase):
self.assertEqual(sinv.total_taxes_and_charges, 4.5)
@IntegrationTestCase.change_settings(
@change_settings(
"Accounts Settings",
{"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0},
)