nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 23:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-03-03 20:28:24 +05:30
parent 6762dc3392
commit 854632dd51
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/stock/get_item_details.py
View File

@@ -1051,22 +1051,10 @@ def get_batch_based_item_price(params, item_code) -> float:
if not item_price:
item_price = get_item_price(params, item_code, ignore_party=True, force_batch_no=True)
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
if item_price and item_price[0][2] == params.get("uom"):
return item_price[0][1]
=======
=======
is_free_item = pctx.get('items', [{}])[0].get('is_free_item')
>>>>>>> 1a56b83054 (fix: Batch Price gets updated only if it is a billed item)
=======
is_free_item = pctx.get("items", [{}])[0].get("is_free_item")
>>>>>>> 0a2193e458 (chore: linter fix)
is_free_item = params.get("items", [{}])[0].get("is_free_item")
if item_price and item_price[0].uom == pctx.uom and not is_free_item:
return item_price[0].price_list_rate
>>>>>>> 9597b1a69e (fix: Batch Price gets updated only if it is a billed item)
if item_price and item_price[0][2] == params.get("uom") and not is_free_item:
return item_price[0][1]
return 0.0