Merge branch 'develop'

frappe/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.10.3"
+__version__ = "6.10.4"

frappe/hooks.py

@@ -5,7 +5,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.10.3"
+app_version = "6.10.4"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

frappe/public/js/frappe/form/toolbar.js

@@ -295,7 +295,7 @@ frappe.ui.form.Toolbar = Class.extend({
 		if(has_workflow) {
 			return;
 		} else if(docstatus==1 && p[CANCEL]) {
-			this.page.set_secondary_action(__('Cancel)', function() {
+			this.page.set_secondary_action(__('Cancel'), function() {
 				me.frm.savecancel(this) }, 'icon-ban-circle');
 		} else if(docstatus==2 && p[AMEND]) {
 			this.page.set_secondary_action(__('Amend'), function() {

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.10.3"
+version = "6.10.4"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()