From c88a277ad920d6282bf261d5bdfd74a538e554cf Mon Sep 17 00:00:00 2001 From: Kavin <78342682+kavin0411@users.noreply.github.com> Date: Mon, 29 Sep 2025 22:15:41 +0530 Subject: [PATCH] fix: don't recalculate stock_qty with conversion_factor (cherry picked from commit fed8236919c05daf0d78176976859985a1ea1f8f) --- erpnext/controllers/sales_and_purchase_return.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py index 599221185d9..a45b5813584 100644 --- a/erpnext/controllers/sales_and_purchase_return.py +++ b/erpnext/controllers/sales_and_purchase_return.py @@ -200,7 +200,11 @@ def validate_quantity(doc, key, args, ref, valid_items, already_returned_items): current_stock_qty = args.get(column) elif args.get("return_qty_from_rejected_warehouse"): reference_qty = ref.get("rejected_qty") * ref.get("conversion_factor", 1.0) - current_stock_qty = args.get(column) * args.get("conversion_factor", 1.0) + current_stock_qty = ( + args.get(column) * args.get("conversion_factor", 1.0) + if column != "stock_qty" + else args.get(column) + ) else: reference_qty = ref.get(column) * ref.get("conversion_factor", 1.0) current_stock_qty = args.get(column) * args.get("conversion_factor", 1.0)