Merge pull request #1700 from rmehta/develop

Various UI Bug Fixes

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();
 				}
 			});

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 = [

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;

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();

erpnext/public/js/conf.js

@@ -16,25 +16,3 @@ $(document).bind('toolbar_setup', function() {
 		"white-space": "nowrap"
 	});
 });
-
-frappe.provide('frappe.ui.misc');
-frappe.ui.misc.about = function() {
-	if(!frappe.ui.misc.about_dialog) {
-		var d = new frappe.ui.Dialog({title: __('About')})
-
-		$(d.body).html(repl("<div>\
-		<h2>ERPNext</h2>  \
-		<h4 class='text-muted'>"+__("Built on") + " Frappe Framework"+"</h4>  \
-		<p>"+__("Open source ERP built for the web") + "</p>" +
-		"<p>"+__("To report an issue, go to ")+"<a href='https://github.com/frappe/erpnext/issues'>GitHub Issues</a></p> \
-		<p><a href='http://erpnext.org' target='_blank'>http://erpnext.org</a>.</p>\
-		<p><a href='http://www.gnu.org/copyleft/gpl.html'>License: GNU General Public License Version 3</a></p>\
-		<hr>\
-		<p>&copy; 2014 Web Notes Technologies Pvt. Ltd and contributers </p> \
-		</div>", frappe.app));
-
-		frappe.ui.misc.about_dialog = d;
-	}
-
-	frappe.ui.misc.about_dialog.show();
-}

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;

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();
 					}
 				}
 			});

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;

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() {

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() {

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() {

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() {