ext/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-10-29 22:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: item price with party condition (backport #55100)

Browse Source 
A party-specific Item Price is found when the transaction uses another UOM.

(cherry picked from commit 3084e3654c)
This commit is contained in:
Mihir Kandoi
2026-10-15 14:13:51 +05:30
parent a203432a2c
commit d9437a3aa8
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
erpnext/stock/doctype/batch/test_batch.py
+1
View File
@@ -569,6 +569,7 @@ class TestBatch(FrappeTestCase):
"plc_conversion_rate": 1,
"customer": "_Test Customer",
"name": None,
"qty": 1,
}
)
erpnext/stock/doctype/item/test_item.py
+1
View File
@@ -150,6 +150,7 @@ class TestItem(FrappeTestCase):
"conversion_factor": 1,
"price_list_uom_dependant": 1,
"ignore_pricing_rule": 1,
"qty": 1,
}
)
erpnext/stock/get_item_details.py
+14 -9
View File
@@ -1224,9 +1224,6 @@ def get_item_price(args, item_code, ignore_party=False, force_batch_no=False) ->
& (ip.price_list == args.get("price_list"))
& (IfNull(ip.uom, "").isin(["", args.get("uom")]))
)
.orderby(ip.valid_from, order=frappe.qb.desc)
.orderby(IfNull(ip.batch_no, ""), order=frappe.qb.desc)
.orderby(ip.uom, order=frappe.qb.desc)
)
if force_batch_no:
@@ -1236,9 +1233,15 @@ def get_item_price(args, item_code, ignore_party=False, force_batch_no=False) ->
if not ignore_party:
if args.get("customer"):
query = query.where(ip.customer == args.get("customer"))
query = query.where(
(ip.customer == args.get("customer"))
| ((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == ""))
).orderby(IfNull(ip.customer, ""), order=frappe.qb.desc)
elif args.get("supplier"):
query = query.where(ip.supplier == args.get("supplier"))
query = query.where(
(ip.supplier == args.get("supplier"))
| ((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == ""))
).orderby(IfNull(ip.supplier, ""), order=frappe.qb.desc)
else:
query = query.where((IfNull(ip.customer, "") == "") & (IfNull(ip.supplier, "") == ""))
@@ -1248,7 +1251,12 @@ def get_item_price(args, item_code, ignore_party=False, force_batch_no=False) ->
& (IfNull(ip.valid_upto, "2500-12-31") >= args["transaction_date"])
)
return query.run()
return (
query.orderby(ip.valid_from, order=frappe.qb.desc)
.orderby(IfNull(ip.batch_no, ""), order=frappe.qb.desc)
.orderby(ip.uom, order=frappe.qb.desc)
.run()
)
@frappe.whitelist()
@@ -1303,9 +1311,6 @@ def get_price_list_rate_for(args, item_code):
if desired_qty and check_packing_list(price_list_rate[0][0], desired_qty, item_code):
item_price_data = price_list_rate
else:
for field in ["customer", "supplier"]:
del item_price_args[field]
general_price_list_rate = get_item_price(
item_price_args, item_code, ignore_party=args.get("ignore_party")
)