Merge branch 'develop'

frappe/__version__.py

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

frappe/core/doctype/communication/communication.js

@@ -1,27 +1,3 @@
-frappe.ui.form.on("Communication", "setup", function(frm) {
-	frappe.call({
-		method:"frappe.core.doctype.doctype.communication.get_convert_to",
-		callback: function(r) {
-			frappe.communication_convert_to = r.message;
-			frm.convert_to_click = [];
-			$.each(r.message, function(i, v) {
-				frm.convert_to_click.append({label:__(v), value:v, action:function() {
-					frm.convert_to($(this).attr("data-value"));
-				}});
-			});
-			frm.set_convert_button();
-		}
-	});
-
-	frm.set_convert_button = function() {
-		frm.add_custom_button(__("Add To"), frm.convert_to_click);
-	};
-
-	frm.convert_to = function(doctype) {
-
-	};
-});
-
 frappe.ui.form.on("Communication", "refresh", function(frm) {
 	frm.convert_to_click && frm.set_convert_button();
 	frm.subject_field = "subject";

frappe/core/doctype/communication/communication.py

@@ -394,7 +394,3 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		"name": comm.name,
 		"emails_not_sent_to": ", ".join(comm.emails_not_sent_to) if hasattr(comm, "emails_not_sent_to") else None
 	}
-
-@frappe.whitelist()
-def get_convert_to():
-	return frappe.get_hooks("communication_convert_to")

frappe/core/page/user_permissions/user_permissions.js

@@ -139,10 +139,15 @@ frappe.UserPermissions = Class.extend({
 				],
 				primary_action_label: __("Upload and Sync"),
 				primary_action: function() {
+					var filedata = d.fields_dict.attach.get_value();
+					if(!filedata) {
+						msgprint(_("Please attach a file"));
+						return;
+					}
 					frappe.call({
 						method:"frappe.core.page.user_permissions.user_permissions.import_user_permissions",
 						args: {
-							filedata: d.fields_dict.attach.get_value()
+							filedata: filedata
 						},
 						callback: function(r) {
 							if(!r.exc) {

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.2"
+app_version = "6.10.3"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

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

@@ -295,10 +295,10 @@ 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() {
+			this.page.set_secondary_action(__('Amend'), function() {
 				me.frm.amend_doc() }, 'icon-pencil', true);
 		}
 	},

setup.py

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