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

fix: fetch get_item_tax_template while update items

Browse Source 
(cherry picked from commit 03c9d16ca6)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
This commit is contained in:
ervishnucs
2026-03-23 16:45:20 +05:30
committed by Mergify
parent 1e2a7196e5
commit 40ddbbaaac
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/controllers/accounts_controller.py
View File

@@ -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.item.item import get_uom_conv_factor
from erpnext.stock.doctype.packed_item.packed_item import make_packing_list from erpnext.stock.doctype.packed_item.packed_item import make_packing_list
from erpnext.stock.get_item_details import ( from erpnext.stock.get_item_details import (
<<<<<<< HEAD
_get_item_tax_template, _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_warehouse, 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.regional import temporary_flag
from erpnext.utilities.transaction_base import TransactionBase 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"), "base_net_rate": item.get("base_net_rate"),
} }
<<<<<<< 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"):
child_item.item_tax_rate = get_item_tax_map( child_item.item_tax_rate = get_item_tax_map(
parent_doc.get("company"), child_item.item_tax_template, as_json=True 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): def add_taxes_from_tax_template(child_item, parent_doc, db_insert=True):