Merge branch 'develop' into fix-test

erpnext/controllers/tests/test_accounts_controller.py

@@ -935,7 +935,10 @@ class TestAccountsController(IntegrationTestCase):
 		self.assertEqual(exc_je_for_si, [])
 		self.assertEqual(exc_je_for_pe, [])
 
-	@IntegrationTestCase.change_settings("Accounts Settings", {"add_taxes_from_item_tax_template": 1})
+	@IntegrationTestCase.change_settings(
+		"Accounts Settings",
+		{"add_taxes_from_item_tax_template": 0, "add_taxes_from_taxes_and_charges_template": 1},
+	)
 	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"):
@@ -964,6 +967,30 @@ class TestAccountsController(IntegrationTestCase):
 
 		self.assertEqual(sinv.total_taxes_and_charges, 4.5)
 
+	@IntegrationTestCase.change_settings(
+		"Accounts Settings",
+		{"add_taxes_from_item_tax_template": 1, "add_taxes_from_taxes_and_charges_template": 0},
+	)
+	def test_19_fetch_taxes_based_on_item_tax_template_template(self):
+		# Create a Sales Invoice
+		sinv = frappe.new_doc("Sales Invoice")
+		sinv.customer = self.customer
+		sinv.company = self.company
+		sinv.currency = "INR"
+		sinv.append(
+			"items",
+			{
+				"item_code": "_Test Item",
+				"qty": 1,
+				"rate": 50,
+				"item_tax_template": "_Test Account Excise Duty @ 10 - _TC",
+			},
+		)
+		sinv.insert()
+
+		self.assertEqual(sinv.taxes[0].account_head, "_Test Account Excise Duty - _TC")
+		self.assertEqual(sinv.total_taxes_and_charges, 5)
+
 	def test_20_journal_against_sales_invoice(self):
 		# Invoice in Foreign Currency
 		si = self.create_sales_invoice(qty=1, conversion_rate=80, rate=1)

erpnext/controllers/tests/test_queries.py

@@ -5,7 +5,6 @@ import frappe
 from frappe.core.doctype.user_permission.test_user_permission import create_user
 from frappe.core.doctype.user_permission.user_permission import add_user_permissions
 from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-from frappe.tests import IntegrationTestCase
 
 from erpnext.controllers import queries
 from erpnext.tests.utils import ERPNextTestSuite
@@ -120,7 +119,7 @@ class TestQueries(ERPNextTestSuite):
 			}
 		)
 
-		with IntegrationTestCase.set_user(user.name):
+		with self.set_user(user.name):
 			params = {
 				"doctype": "Employee",
 				"txt": "",