Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stock Entry: Always set valuation rate automatically if source warehouse provided or sales return. Fixes #932

Browse Source
This commit is contained in:
Nabin Hait 2014-06-12 12:24:11 +05:30
parent 7bcd31bddb
commit e98b326ba3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -205,8 +205,10 @@ class StockEntry(StockController):
# get incoming rate # get incoming rate
if not d.bom_no: if not d.bom_no:
if not flt(d.incoming_rate): if not flt(d.incoming_rate) or d.s_warehouse or self.purpose == "Sales Return":
d.incoming_rate = self.get_incoming_rate(args) 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) d.amount = flt(d.transfer_qty) * flt(d.incoming_rate)
raw_material_cost += flt(d.amount) raw_material_cost += flt(d.amount)