nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

show analytics value based valuation method defined in item master

Browse Source
This commit is contained in:
Nabin Hait
2013-01-22 14:02:55 +05:30
parent 70c41b6722
commit d797ffbd37
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/stock_analytics.js
View File

@@ -62,8 +62,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
this.columns = std_columns.concat(this.columns); this.columns = std_columns.concat(this.columns);
}, },
filters: [ filters: [
{fieldtype:"Select", label: "Value or Qty", options:["Value (Weighted Average)", {fieldtype:"Select", label: "Value or Qty", options:["Value", "Quantity"],
"Value (FIFO)", "Quantity"],
filter: function(val, item, opts, me) { filter: function(val, item, opts, me) {
return me.apply_zero_filter(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") { if(me.value_or_qty!="Quantity") {
var wh = me.get_item_warehouse(sl.warehouse, sl.item_code); 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); var diff = me.get_value_diff(wh, sl, is_fifo);
} else { } else {
var diff = sl.qty; var diff = sl.qty;