From e98b326ba30a8b2b245f741ceca71a7bba19f231 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 12 Jun 2014 12:24:11 +0530 Subject: [PATCH] Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932 --- erpnext/stock/doctype/stock_entry/stock_entry.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index ac81f88e88..da176b0976 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -205,8 +205,10 @@ class StockEntry(StockController): # 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)