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

Merge pull request #1035 from MaxMorais/patch-1

Browse Source 
[minor] by Max - fixes after translation in sales_analytics.js
This commit is contained in:
Anand Doshi 2013-11-13 02:55:04 -08:00
commit 09391e14ad
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
selling/page/sales_analytics/sales_analytics.js
View File

@ -88,23 +88,23 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
this.columns = std_columns.concat(this.columns); this.columns = std_columns.concat(this.columns);
}, },
filters: [ filters: [
{fieldtype:"Select", label: wn._("Tree Type"), options:["Customer Group", "Customer", {fieldtype:"Select", fieldname: "treetype", label: wn._("Tree Type"), options:["Customer Group", "Customer",
"Item Group", "Item", "Territory"], "Item Group", "Item", "Territory"],
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);
}}, }},
{fieldtype:"Select", label: wn._("Based On"), options:["Sales Invoice", {fieldtype:"Select", fieldname: "based_on", label: wn._("Based On"), options:["Sales Invoice",
"Sales Order", "Delivery Note"]}, "Sales Order", "Delivery Note"]},
{fieldtype:"Select", label: wn._("Value or Qty"), options:["Value", "Quantity"]}, {fieldtype:"Select", fieldname: "value_or_qty", label: wn._("Value or Qty"), options:["Value", "Quantity"]},
{fieldtype:"Select", label: wn._("Company"), link:"Company", {fieldtype:"Select", fieldname: "company", label: wn._("Company"), link:"Company",
default_value: "Select Company..."}, default_value: "Select Company..."},
{fieldtype:"Date", label: wn._("From Date")}, {fieldtype:"Date", fieldname: "from_date", label: wn._("From Date")},
{fieldtype:"Label", label: wn._("To")}, {fieldtype:"Label", fieldname: "to", label: wn._("To")},
{fieldtype:"Date", label: wn._("To Date")}, {fieldtype:"Date", fieldname: "to_date", label: wn._("To Date")},
{fieldtype:"Select", label: wn._("Range"), {fieldtype:"Select", fieldname: "range", label: wn._("Range"),
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]},
{fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, {fieldtype:"Button", fieldname: "refresh", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"},
{fieldtype:"Button", label: wn._("Reset Filters")} {fieldtype:"Button", fieldname: "reset_filters", label: wn._("Reset Filters")}
], ],
setup_filters: function() { setup_filters: function() {
var me = this; var me = this;
@ -247,4 +247,4 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({
return [[dateutil.str_to_obj(col.id).getTime(), item[col.field]], return [[dateutil.str_to_obj(col.id).getTime(), item[col.field]],
[dateutil.user_to_obj(col.name).getTime(), item[col.field]]]; [dateutil.user_to_obj(col.name).getTime(), item[col.field]]];
} }
}); });