nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 03:29:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve item tax template from item group in update items

Browse Source 
(cherry picked from commit 97e7916b66)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
This commit is contained in:
ervishnucs
2026-03-29 21:35:26 +05:30
committed by Mergify
parent 40ddbbaaac
commit 0e02e365a4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/controllers/accounts_controller.py
View File

@@ -75,10 +75,10 @@ from erpnext.stock.get_item_details import (
get_item_warehouse, get_item_warehouse,
======= =======
ItemDetailsCtx, ItemDetailsCtx,
_get_item_tax_template,
get_conversion_factor, get_conversion_factor,
get_item_details, get_item_details,
get_item_tax_map, get_item_tax_map,
get_item_tax_template,
get_item_warehouse_, get_item_warehouse_,
>>>>>>> 03c9d16ca6 (fix: fetch get_item_tax_template while update items) >>>>>>> 03c9d16ca6 (fix: fetch get_item_tax_template while update items)
) )
@@ -3655,6 +3655,7 @@ def set_child_tax_template_and_map(item, child_item, parent_doc):
"base_net_rate": item.get("base_net_rate"), "base_net_rate": item.get("base_net_rate"),
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
child_item.item_tax_template = _get_item_tax_template(args, item.taxes) child_item.item_tax_template = _get_item_tax_template(args, item.taxes)
if child_item.get("item_tax_template"): if child_item.get("item_tax_template"):
@@ -3663,6 +3664,18 @@ def set_child_tax_template_and_map(item, child_item, parent_doc):
) )
======= =======
child_item.item_tax_template = get_item_tax_template(ctx, item.taxes) child_item.item_tax_template = get_item_tax_template(ctx, item.taxes)
=======
item_tax_template = _get_item_tax_template(ctx, item.taxes)
if not item_tax_template:
item_group = item.item_group
while item_group and not item_tax_template:
item_group_doc = frappe.get_cached_doc("Item Group", item_group)
item_tax_template = _get_item_tax_template(ctx, item_group_doc.taxes)
item_group = item_group_doc.parent_item_group
child_item.item_tax_template = item_tax_template
>>>>>>> 97e7916b66 (fix: resolve item tax template from item group in update items)
child_item.item_tax_rate = get_item_tax_map( child_item.item_tax_rate = get_item_tax_map(
doc=parent_doc, doc=parent_doc,
tax_template=child_item.item_tax_template, tax_template=child_item.item_tax_template,