commit 94f9f48d70420d5cea6d8e66b950da2efb0e3e05
author Zarrar <zarrar65@gmail.com> Wed Jan 10 16:29:40 2018 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Jan 10 16:29:40 2018 +0530
tree cb42ac08b064d2544d03e441f785a99a24ac2641
parent 687dc6a4246ecbca4003f1f637a93d574455bfcb

set from_warehouse only if purchase_order and purpose found (#12398)

erpnext/stock/doctype/stock_entry/stock_entry.py

diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 3af8d4e..dd8d998 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -599,7 +599,7 @@
 						if self.pro_doc and not self.pro_doc.skip_transfer:
 							item["from_warehouse"] = self.pro_doc.wip_warehouse
 						#Get Reserve Warehouse from PO
-						item["from_warehouse"] = item_wh.get(item.item_code)
+						item["from_warehouse"] = item_wh.get(item.item_code) if self.purchase_order and self.purpose=="Subcontract" else ""
 						item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""
 
 					self.add_to_stock_entry_detail(item_dict)