From bfa898ff9b56e0cca833abc1888e53acd76c5043 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 26 Jan 2018 10:59:00 +0530 Subject: [PATCH] [Fix] System pull the valuation rate even if allow zero valuation rate is enabled (#12537) --- erpnext/stock/doctype/stock_entry/stock_entry.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 6a6c667961..7d5af5fcf4 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -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