From 40ddbbaaac2b46dbd7b9b86021d56d67d3cefc5b Mon Sep 17 00:00:00 2001 From: ervishnucs Date: Mon, 23 Mar 2026 16:45:20 +0530 Subject: [PATCH] fix: fetch get_item_tax_template while update items (cherry picked from commit 03c9d16ca64d1961a67b65e067e5d4ef2c8a66ca) # Conflicts: # erpnext/controllers/accounts_controller.py --- erpnext/controllers/accounts_controller.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 1308d2c1588..f81addc8b83 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -67,11 +67,20 @@ from erpnext.setup.utils import get_exchange_rate from erpnext.stock.doctype.item.item import get_uom_conv_factor from erpnext.stock.doctype.packed_item.packed_item import make_packing_list from erpnext.stock.get_item_details import ( +<<<<<<< HEAD _get_item_tax_template, get_conversion_factor, get_item_details, get_item_tax_map, get_item_warehouse, +======= + ItemDetailsCtx, + get_conversion_factor, + get_item_details, + get_item_tax_map, + get_item_tax_template, + get_item_warehouse_, +>>>>>>> 03c9d16ca6 (fix: fetch get_item_tax_template while update items) ) from erpnext.utilities.regional import temporary_flag from erpnext.utilities.transaction_base import TransactionBase @@ -3646,11 +3655,20 @@ def set_child_tax_template_and_map(item, child_item, parent_doc): "base_net_rate": item.get("base_net_rate"), } +<<<<<<< HEAD child_item.item_tax_template = _get_item_tax_template(args, item.taxes) if child_item.get("item_tax_template"): child_item.item_tax_rate = get_item_tax_map( parent_doc.get("company"), child_item.item_tax_template, as_json=True ) +======= + child_item.item_tax_template = get_item_tax_template(ctx, item.taxes) + child_item.item_tax_rate = get_item_tax_map( + doc=parent_doc, + tax_template=child_item.item_tax_template, + as_json=True, + ) +>>>>>>> 03c9d16ca6 (fix: fetch get_item_tax_template while update items) def add_taxes_from_tax_template(child_item, parent_doc, db_insert=True):