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

fix: base_net_rate Required to Check Valid Range (#46332)

Browse Source 
fix: base_net_rate required to check valid range
(cherry picked from commit d01367eefe)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
#	erpnext/controllers/queries.py
This commit is contained in:
Ninad Parikh
2025-03-06 17:34:25 +05:30
committed by Mergify
parent 5cc251a172
commit 1b0e3f28f4
3 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/controllers/accounts_controller.py
View File

@@ -3282,12 +3282,24 @@ def get_supplier_block_status(party_name):
def set_child_tax_template_and_map(item, child_item, parent_doc): def set_child_tax_template_and_map(item, child_item, parent_doc):
<<<<<<< HEAD
args = { args = {
"item_code": item.item_code, "item_code": item.item_code,
"posting_date": parent_doc.transaction_date, "posting_date": parent_doc.transaction_date,
"tax_category": parent_doc.get("tax_category"), "tax_category": parent_doc.get("tax_category"),
"company": parent_doc.get("company"), "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) 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"):

12
erpnext/controllers/queries.py
View File

@@ -832,12 +832,24 @@ def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
valid_from = filters.get("valid_from") valid_from = filters.get("valid_from")
valid_from = valid_from[1] if isinstance(valid_from, list) else valid_from valid_from = valid_from[1] if isinstance(valid_from, list) else valid_from
<<<<<<< HEAD
args = { args = {
"item_code": filters.get("item_code"), "item_code": filters.get("item_code"),
"posting_date": valid_from, "posting_date": valid_from,
"tax_category": filters.get("tax_category"), "tax_category": filters.get("tax_category"),
"company": company, "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) taxes = _get_item_tax_template(args, taxes, for_validate=True)
txt = txt.lower() txt = txt.lower()

1
erpnext/public/js/controllers/transaction.js
View File

@@ -2479,6 +2479,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
'item_code': item.item_code, 'item_code': item.item_code,
'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date], 'valid_from': ["<=", doc.transaction_date || doc.bill_date || doc.posting_date],
'item_group': item.item_group, 'item_group': item.item_group,
"base_net_rate": item.base_net_rate,
} }
if (doc.tax_category) if (doc.tax_category)