From aa20e224fbd3668b5aa79de593edc07dd9b976dd Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 7 Oct 2025 11:00:02 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/get_item_details.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index bf35785803a..cdbc719df97 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -635,15 +635,8 @@ 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) + disabled, tax_company = frappe.get_cached_value("Item Tax Template", tax.item_tax_template, ["disabled", "company"]) + if not disabled and tax_company == args["company"]: 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