Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.5.0'
+__version__ = '8.5.1'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/public/js/frappe/ui/page.js

@@ -272,10 +272,11 @@ frappe.ui.Page = Class.extend({
 	},
 
 	add_inner_button: function(label, action, group) {
+		var me = this;
 		let _action = function() {
 			let btn = $(this);
 			let response = action();
-			this.btn_disable_enable(btn, response);
+			me.btn_disable_enable(btn, response);
 		};
 		if(group) {
 			var $group = this.get_inner_group_button(group);