From 821aad52811850d9f2cfd01bbe0ba72c95eb54cf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 13 Aug 2014 16:41:59 +0530 Subject: [PATCH] Sales/purchase return: fixes for qty validation --- erpnext/stock/doctype/stock_entry/stock_entry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index bdd760ba4a..cddfd9885f 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -327,7 +327,7 @@ class StockEntry(StockController): frappe.DoesNotExistError) # validate quantity <= ref item's qty - qty already returned - ref_item_qty = sum([flt(d.qty) for d in ref.doc.get({"item_code": item.item_code})]) + ref_item_qty = sum([flt(d.qty)*flt(d.conversion_factor) for d in ref.doc.get({"item_code": item.item_code})]) returnable_qty = ref_item_qty - flt(already_returned_item_qty.get(item.item_code)) if not returnable_qty: frappe.throw(_("Item {0} has already been returned").format(item.item_code), StockOverReturnError)