Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Rushabh Mehta 2013-01-25 15:12:28 +05:30
commit a72158842e

View File

@ -64,10 +64,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
},
filters: [
{fieldtype:"Select", label: "Warehouse", link:"Warehouse",
default_value: "Select Warehouse...",
filter: function(val, item, opts, me) {
return me.apply_zero_filter(val, item, opts, me);
}},
default_value: "Select Warehouse..."},
{fieldtype:"Select", label: "Brand", link:"Brand",
default_value: "Select Brand...", filter: function(val, item, opts) {
return val == opts.default_value || item.brand == val;
@ -108,6 +105,11 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
this.data = $.map(this.data, function(d) {
return me.apply_filter(d, "brand") ? d : null;
});
// filter out rows with zero values
this.data = $.map(this.data, function(d) {
return me.apply_zero_filter(null, d, null, me) ? d : null;
});
},
prepare_balances: function() {
var me = this;