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

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-03-03 12:28:06 +05:30
committed by GitHub
parent 61d5680c8d
commit 7f4d553201
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/get_item_details.py
View File

@@ -1051,17 +1051,8 @@ def get_batch_based_item_price(params, item_code) -> float:
if not item_price: if not item_price:
item_price = get_item_price(params, item_code, ignore_party=True, force_batch_no=True) item_price = get_item_price(params, item_code, ignore_party=True, force_batch_no=True)
<<<<<<< HEAD
<<<<<<< HEAD
if item_price and item_price[0][2] == params.get("uom"):
return item_price[0][1]
=======
if item_price and item_price[0].uom == pctx.uom and not pctx.get("items")[0].get("is_free_item"):
=======
if item_price and item_price[0].uom == pctx.uom and not pctx.get("items", [{}])[0].get("is_free_item", 0): if item_price and item_price[0].uom == pctx.uom and not pctx.get("items", [{}])[0].get("is_free_item", 0):
>>>>>>> 7c9c0c7776 (fix: error)
return item_price[0].price_list_rate return item_price[0].price_list_rate
>>>>>>> a3596f717b (fix: dont update rate of free item when batch is updated)
return 0.0 return 0.0