From 6762dc3392db930d920f5042eadb95ddf4d83998 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 3 Mar 2025 14:01:20 +0530 Subject: [PATCH] chore: linter fix (cherry picked from commit 0a2193e4589a9e748041001a8eb592be2bf091ce) # 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 71a58e7f836..66c5ae28478 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -1051,6 +1051,7 @@ 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"): @@ -1059,6 +1060,9 @@ def get_batch_based_item_price(params, item_code) -> float: ======= 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) if item_price and item_price[0].uom == pctx.uom and not is_free_item: return item_price[0].price_list_rate