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

consider global val method if not specified in item master and apply zero filters

Browse Source
This commit is contained in:
Nabin Hait 2013-01-22 14:40:20 +05:30
parent 025e01322c
commit 319fb92d18
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/stock_analytics.js
View File

@ -144,7 +144,10 @@ 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 = 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); var diff = me.get_value_diff(wh, sl, is_fifo);
} else { } else {
var diff = sl.qty; var diff = sl.qty;

8
stock/page/stock_balance/stock_balance.js
View File

@ -74,7 +74,9 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({
return val == opts.default_value || item.brand == val || item._show; return val == opts.default_value || item.brand == val || item._show;
}, link_formatter: {filter_input: "brand"}}, }, link_formatter: {filter_input: "brand"}},
{fieldtype:"Select", label: "Warehouse", link:"Warehouse", {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:"Date", label: "From Date"},
{fieldtype:"Label", label: "To"}, {fieldtype:"Label", label: "To"},
{fieldtype:"Date", label: "To Date"}, {fieldtype:"Date", label: "To Date"},
@ -107,7 +109,9 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({
if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) { if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) {
var item = me.item_by_name[sl.item_code]; var item = me.item_by_name[sl.item_code];
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 = 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 qty_diff = sl.qty;
var value_diff = me.get_value_diff(wh, sl, is_fifo); var value_diff = me.get_value_diff(wh, sl, is_fifo);