From 61d5680c8daf0b683be3460487711f98ac2d2232 Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Sun, 2 Mar 2025 12:07:31 +0530 Subject: [PATCH] fix: error (cherry picked from commit 7c9c0c7776b709005e4abe0edaa2591e3fa1e7cc) # Conflicts: # erpnext/stock/get_item_details.py --- erpnext/stock/get_item_details.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 58f83d7a593..dee4c362363 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -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)