diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index 6ed55a0b55e..b2524d9f508 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -3282,12 +3282,24 @@ def get_supplier_block_status(party_name): def set_child_tax_template_and_map(item, child_item, parent_doc): +<<<<<<< HEAD args = { "item_code": item.item_code, "posting_date": parent_doc.transaction_date, "tax_category": parent_doc.get("tax_category"), "company": parent_doc.get("company"), } +======= + ctx = ItemDetailsCtx( + { + "item_code": item.item_code, + "posting_date": parent_doc.transaction_date, + "tax_category": parent_doc.get("tax_category"), + "company": parent_doc.get("company"), + "base_net_rate": item.get("base_net_rate"), + } + ) +>>>>>>> d01367eefe (fix: `base_net_rate` Required to Check Valid Range (#46332)) child_item.item_tax_template = _get_item_tax_template(args, item.taxes) if child_item.get("item_tax_template"): diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index f124bfdbfc8..d87e1ac8e16 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -832,12 +832,24 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters): valid_from = filters.get("valid_from") valid_from = valid_from[1] if isinstance(valid_from, list) else valid_from +<<<<<<< HEAD args = { "item_code": filters.get("item_code"), "posting_date": valid_from, "tax_category": filters.get("tax_category"), "company": company, } +======= + ctx = ItemDetailsCtx( + { + "item_code": filters.get("item_code"), + "posting_date": valid_from, + "tax_category": filters.get("tax_category"), + "company": company, + "base_net_rate": filters.get("base_net_rate"), + } + ) +>>>>>>> d01367eefe (fix: `base_net_rate` Required to Check Valid Range (#46332)) taxes = _get_item_tax_template(args, taxes, for_validate=True) txt = txt.lower() diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index a98cb450eb3..2fab91cbf88 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -2479,6 +2479,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe '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, } if (doc.tax_category)