Merge pull request #1700 from rmehta/develop
Various UI Bug Fixes
diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js
index ca6ebff..552ec2a 100644
--- a/erpnext/accounts/page/accounts_browser/accounts_browser.js
+++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js
@@ -238,6 +238,9 @@
method: 'erpnext.accounts.utils.add_ac',
callback: function(r) {
d.hide();
+ if(node.expanded) {
+ node.toggle_node();
+ }
node.reload();
}
});
@@ -281,6 +284,9 @@
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 f3452e8..7d2cfb1 100644
--- a/erpnext/accounts/page/financial_analytics/financial_analytics.js
+++ b/erpnext/accounts/page/financial_analytics/financial_analytics.js
@@ -45,7 +45,7 @@
{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 614b40d..f695a49 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -102,7 +102,7 @@
{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 df39d3f..5092477 100644
--- a/erpnext/public/js/account_tree_grid.js
+++ b/erpnext/public/js/account_tree_grid.js
@@ -69,7 +69,7 @@
{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/conf.js b/erpnext/public/js/conf.js
index 65ffe2d..176e13a 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -16,25 +16,3 @@
"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>© 2014 Web Notes Technologies Pvt. Ltd and contributers </p> \
- </div>", frappe.app));
-
- frappe.ui.misc.about_dialog = d;
- }
-
- frappe.ui.misc.about_dialog.show();
-}
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index d62a1da..7c15dba 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -66,7 +66,7 @@
{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 950e3f6..a8fd464 100644
--- a/erpnext/selling/page/sales_browser/sales_browser.js
+++ b/erpnext/selling/page/sales_browser/sales_browser.js
@@ -147,10 +147,10 @@
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 c16e2ec..f774010 100644
--- a/erpnext/stock/page/stock_ageing/stock_ageing.js
+++ b/erpnext/stock/page/stock_ageing/stock_ageing.js
@@ -60,7 +60,7 @@
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 52e73f1..dbd8830 100644
--- a/erpnext/stock/page/stock_balance/stock_balance.js
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -71,7 +71,7 @@
{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 4e31e37..02af714 100644
--- a/erpnext/stock/page/stock_ledger/stock_ledger.js
+++ b/erpnext/stock/page/stock_ledger/stock_ledger.js
@@ -85,7 +85,7 @@
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 b04882f..8659c28 100644
--- a/erpnext/stock/page/stock_level/stock_level.js
+++ b/erpnext/stock/page/stock_level/stock_level.js
@@ -99,7 +99,7 @@
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 5c2a722..b9db1f8 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -35,7 +35,7 @@
{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() {