chore: resolve conflicts

This commit is contained in:
Mihir Kandoi
2025-03-03 15:05:44 +05:30
committed by GitHub
parent 7f4d553201
commit 81c7b8c273

View File

@@ -1051,7 +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)
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 == params.uom and not params.get("items", [{}])[0].get("is_free_item", 0):
return item_price[0].price_list_rate
return 0.0