From f944e819e9b4663ae09dff50cbe6e8c53e47192a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 27 May 2014 15:22:04 +0530 Subject: [PATCH] fixes #1581 and added icons to grid reports --- erpnext/accounts/page/accounts_browser/accounts_browser.js | 6 ++++++ .../page/financial_analytics/financial_analytics.js | 2 +- .../buying/page/purchase_analytics/purchase_analytics.js | 2 +- erpnext/public/js/account_tree_grid.js | 2 +- erpnext/public/js/stock_analytics.js | 2 +- erpnext/selling/page/sales_browser/sales_browser.js | 4 ++-- erpnext/stock/page/stock_ageing/stock_ageing.js | 2 +- erpnext/stock/page/stock_balance/stock_balance.js | 2 +- erpnext/stock/page/stock_ledger/stock_ledger.js | 2 +- erpnext/stock/page/stock_level/stock_level.js | 2 +- erpnext/support/page/support_analytics/support_analytics.js | 2 +- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index ca6ebffdd1..552ec2a34c 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -238,6 +238,9 @@ erpnext.AccountsChart = Class.extend({ method: 'erpnext.accounts.utils.add_ac', callback: function(r) { d.hide(); + if(node.expanded) { + node.toggle_node(); + } node.reload(); } }); @@ -281,6 +284,9 @@ erpnext.AccountsChart = Class.extend({ method: 'erpnext.accounts.utils.add_cc', callback: function(r) { d.hide(); + if(node.expanded) { + node.toggle_node(); + } node.reload(); } }); diff --git a/erpnext/accounts/page/financial_analytics/financial_analytics.js b/erpnext/accounts/page/financial_analytics/financial_analytics.js index f3452e8f68..7d2cfb1179 100644 --- a/erpnext/accounts/page/financial_analytics/financial_analytics.js +++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js @@ -45,7 +45,7 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ {fieldtype:"Select", label: __("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_columns: function() { var std_columns = [ diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js index 614b40d387..f695a4982f 100644 --- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js +++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js @@ -102,7 +102,7 @@ erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({ {fieldtype:"Select", label: __("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_filters: function() { var me = this; diff --git a/erpnext/public/js/account_tree_grid.js b/erpnext/public/js/account_tree_grid.js index df39d3ffdd..50924772d5 100644 --- a/erpnext/public/js/account_tree_grid.js +++ b/erpnext/public/js/account_tree_grid.js @@ -69,7 +69,7 @@ erpnext.AccountTreeGrid = frappe.views.TreeGridReport.extend({ {fieldtype: "Date", label: __("To Date")}, {fieldtype: "Button", label: __("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype: "Button", label: __("Reset Filters")}, + {fieldtype: "Button", label: __("Reset Filters"), icon: "icon-filter"}, ], setup_filters: function() { this._super(); diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js index d62a1da883..7c15dba2a5 100644 --- a/erpnext/public/js/stock_analytics.js +++ b/erpnext/public/js/stock_analytics.js @@ -66,7 +66,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ {fieldtype:"Select", label: __("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_filters: function() { var me = this; diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index 950e3f61f4..a8fd464c68 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -147,10 +147,10 @@ erpnext.SalesChart = Class.extend({ callback: function(r) { if(!r.exc) { d.hide(); - node.reload(); - if(!node.expanded) { + if(node.expanded) { node.toggle_node(); } + node.reload(); } } }); diff --git a/erpnext/stock/page/stock_ageing/stock_ageing.js b/erpnext/stock/page/stock_ageing/stock_ageing.js index c16e2eca1b..f7740101ca 100644 --- a/erpnext/stock/page/stock_ageing/stock_ageing.js +++ b/erpnext/stock/page/stock_ageing/stock_ageing.js @@ -60,7 +60,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ options: ["Average Age", "Earliest", "Latest"]}, {fieldtype:"Date", label: __("To Date")}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_filters: function() { var me = this; diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js index 52e73f1a91..dbd8830774 100644 --- a/erpnext/stock/page/stock_balance/stock_balance.js +++ b/erpnext/stock/page/stock_balance/stock_balance.js @@ -71,7 +71,7 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ {fieldtype:"Label", label: __("To")}, {fieldtype:"Date", label: __("To Date")}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_plot_check: function() { diff --git a/erpnext/stock/page/stock_ledger/stock_ledger.js b/erpnext/stock/page/stock_ledger/stock_ledger.js index 4e31e37de4..02af7149f7 100644 --- a/erpnext/stock/page/stock_ledger/stock_ledger.js +++ b/erpnext/stock/page/stock_ledger/stock_ledger.js @@ -85,7 +85,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date); }}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_filters: function() { diff --git a/erpnext/stock/page/stock_level/stock_level.js b/erpnext/stock/page/stock_level/stock_level.js index b04882f120..8659c28729 100644 --- a/erpnext/stock/page/stock_level/stock_level.js +++ b/erpnext/stock/page/stock_level/stock_level.js @@ -99,7 +99,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ return val == opts.default_value || item.brand == val; }}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_filters: function() { diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js index 5c2a722e11..b9db1f881c 100644 --- a/erpnext/support/page/support_analytics/support_analytics.js +++ b/erpnext/support/page/support_analytics/support_analytics.js @@ -35,7 +35,7 @@ erpnext.SupportAnalytics = frappe.views.GridReportWithPlot.extend({ {fieldtype:"Select", label: __("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, {fieldtype:"Button", label: __("Refresh"), icon:"icon-refresh icon-white"}, - {fieldtype:"Button", label: __("Reset Filters")} + {fieldtype:"Button", label: __("Reset Filters"), icon: "icon-filter"} ], setup_columns: function() {