From d797ffbd371c299a68a45592cf8979ebe13b1f97 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 22 Jan 2013 14:02:55 +0530 Subject: [PATCH] show analytics value based valuation method defined in item master --- public/js/stock_analytics.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index 53641ce996..53be93c4e4 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -62,8 +62,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ this.columns = std_columns.concat(this.columns); }, filters: [ - {fieldtype:"Select", label: "Value or Qty", options:["Value (Weighted Average)", - "Value (FIFO)", "Quantity"], + {fieldtype:"Select", label: "Value or Qty", options:["Value", "Quantity"], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); }}, @@ -145,7 +144,7 @@ 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 = this.value_or_qty== "Value (FIFO)"; + var is_fifo = item.valuation_method == "FIFO"; var diff = me.get_value_diff(wh, sl, is_fifo); } else { var diff = sl.qty;