Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index ac81f88..da176b0 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -205,8 +205,10 @@
# get incoming rate
if not d.bom_no:
- if not flt(d.incoming_rate):
- d.incoming_rate = self.get_incoming_rate(args)
+ if not flt(d.incoming_rate) or d.s_warehouse or self.purpose == "Sales Return":
+ incoming_rate = self.get_incoming_rate(args)
+ if incoming_rate:
+ d.incoming_rate = incoming_rate
d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
raw_material_cost += flt(d.amount)