From 319fb92d18a12d414995861388657a44463c50f2 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 22 Jan 2013 14:40:20 +0530 Subject: [PATCH] consider global val method if not specified in item master and apply zero filters --- public/js/stock_analytics.js | 5 ++++- stock/page/stock_balance/stock_balance.js | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index 53be93c4e4..124b02afa5 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -144,7 +144,10 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ if(me.value_or_qty!="Quantity") { var wh = me.get_item_warehouse(sl.warehouse, sl.item_code); - var is_fifo = item.valuation_method == "FIFO"; + var valuation_method = item.valuation_method ? + item.valuation_method : sys_defaults.valuation_method; + var is_fifo = valuation_method == "FIFO"; + var diff = me.get_value_diff(wh, sl, is_fifo); } else { var diff = sl.qty; diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index 5a2af2ad49..536d435732 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -74,7 +74,9 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ return val == opts.default_value || item.brand == val || item._show; }, link_formatter: {filter_input: "brand"}}, {fieldtype:"Select", label: "Warehouse", link:"Warehouse", - default_value: "Select Warehouse..."}, + default_value: "Select Warehouse...", filter: function(val, item, opts, me) { + return me.apply_zero_filter(val, item, opts, me); + }}, {fieldtype:"Date", label: "From Date"}, {fieldtype:"Label", label: "To"}, {fieldtype:"Date", label: "To Date"}, @@ -107,7 +109,9 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) { var item = me.item_by_name[sl.item_code]; var wh = me.get_item_warehouse(sl.warehouse, sl.item_code); - var is_fifo = item.valuation_method == "FIFO"; + var valuation_method = item.valuation_method ? + item.valuation_method : sys_defaults.valuation_method; + var is_fifo = valuation_method == "FIFO"; var qty_diff = sl.qty; var value_diff = me.get_value_diff(wh, sl, is_fifo);