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

[Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-01-26 10:59:00 +05:30 committed by Nabin Hait
parent 0a33a359ca
commit bfa898ff9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,7 +288,7 @@ class StockEntry(StockController):
# get basic rate
if not d.bom_no:
if not flt(d.basic_rate) or d.s_warehouse or force:
if (not flt(d.basic_rate) and not d.allow_zero_valuation_rate) or d.s_warehouse or force:
basic_rate = flt(get_incoming_rate(args), self.precision("basic_rate", d))
if basic_rate > 0:
d.basic_rate = basic_rate
@ -299,7 +299,8 @@ class StockEntry(StockController):
# get scrap items basic rate
if d.bom_no:
if not flt(d.basic_rate) and getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
if not flt(d.basic_rate) and not d.allow_zero_valuation_rate and \
getattr(self, "pro_doc", frappe._dict()).scrap_warehouse == d.t_warehouse:
basic_rate = flt(get_incoming_rate(args), self.precision("basic_rate", d))
if basic_rate > 0:
d.basic_rate = basic_rate