schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: error

Browse Source 
(cherry picked from commit 7c9c0c7776)

# Conflicts:
#	erpnext/stock/get_item_details.py
This commit is contained in:
Mihir Kandoi
2025-03-02 12:07:31 +05:30
committed by Mergify
parent 9e649d8522
commit 61d5680c8d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/get_item_details.py
View File

@@ -1051,11 +1051,15 @@ 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
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):
>>>>>>> 7c9c0c7776 (fix: error)
return item_price[0].price_list_rate
>>>>>>> a3596f717b (fix: dont update rate of free item when batch is updated)