nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-15 11:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #49794 from aerele/support-49604

Browse Source 
fix: don't recalculate stock_qty with conversion_factor
This commit is contained in:
rohitwaghchaure
2025-09-30 16:32:38 +05:30
committed by GitHub
parent 4a01c53cca fed8236919
commit a2d907d8bc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -202,7 +202,11 @@ def validate_quantity(doc, key, args, ref, valid_items, already_returned_items):
current_stock_qty = args.get(column) current_stock_qty = args.get(column)
elif args.get("return_qty_from_rejected_warehouse"): elif args.get("return_qty_from_rejected_warehouse"):
reference_qty = ref.get("rejected_qty") * ref.get("conversion_factor", 1.0) 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: else:
reference_qty = ref.get(column) * ref.get("conversion_factor", 1.0) reference_qty = ref.get(column) * 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)