diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 7ab8533368f..c1f014fb971 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -2200,10 +2200,19 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
 			return doc.company ? {filters: {company: doc.company}} : {};
 		} else {
 			let filters = {
+<<<<<<< HEAD
 				'item_code': item.item_code,
 				'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
 				'item_group': item.item_group,
 			}
+=======
+				item_code: item.item_code,
+				valid_from: ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
+				item_group: item.item_group,
+				base_net_rate: item.base_net_rate,
+				disabled: 0,
+			};
+>>>>>>> b10cf4a928 (fix: do not fetch disabled item tax template)
 
 			if (doc.tax_category)
 				filters['tax_category'] = doc.tax_category;
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index bdc442e07a1..bf35785803a 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -635,8 +635,15 @@ def _get_item_tax_template(args, taxes, out=None, for_validate=False):
 	taxes_with_no_validity = []
 
 	for tax in taxes:
+<<<<<<< HEAD
 		tax_company = frappe.get_cached_value("Item Tax Template", tax.item_tax_template, "company")
 		if tax_company == args["company"]:
+=======
+		disabled, tax_company = frappe.get_cached_value(
+			"Item Tax Template", tax.item_tax_template, ["disabled", "company"]
+		)
+		if not disabled and tax_company == ctx["company"]:
+>>>>>>> b10cf4a928 (fix: do not fetch disabled item tax template)
 			if tax.valid_from or tax.maximum_net_rate:
 				# In purchase Invoice first preference will be given to supplier invoice date
 				# if supplier date is not present then posting date