diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 3ed36ec97b..182ad60b00 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -147,8 +147,8 @@ def set_portal_link(sent_via, comm):
if is_signup_enabled() and hasattr(sent_via, "get_portal_page"):
portal_page = sent_via.get_portal_page()
if portal_page:
- is_valid_recipient = cstr(sent_via.email or sent_via.email_id or
- sent_via.contact_email) in comm.recipients
+ is_valid_recipient = cstr(sent_via.get("email") or sent_via.get("email_id") or
+ sent_via.get("contact_email")) in comm.recipients
if is_valid_recipient:
url = "%s/%s?name=%s" % (get_url(), portal_page, urllib.quote(sent_via.name))
footer = """
diff --git a/frappe/core/doctype/customize_form/customize_form.py b/frappe/core/doctype/customize_form/customize_form.py
index 802949c7e6..98be26d0be 100644
--- a/frappe/core/doctype/customize_form/customize_form.py
+++ b/frappe/core/doctype/customize_form/customize_form.py
@@ -16,9 +16,6 @@ class CustomizeForm(Document):
'search_fields': 'Data',
'default_print_format': 'Data',
'read_only_onload': 'Check',
- 'allow_print': 'Check',
- 'allow_email': 'Check',
- 'allow_copy': 'Check',
'allow_attach': 'Check',
'max_attachments': 'Int'
}
diff --git a/frappe/core/page/data_import_tool/data_import_tool.js b/frappe/core/page/data_import_tool/data_import_tool.js
index cd5b938505..6dd953ad17 100644
--- a/frappe/core/page/data_import_tool/data_import_tool.js
+++ b/frappe/core/page/data_import_tool/data_import_tool.js
@@ -2,9 +2,11 @@ frappe.pages['data-import-tool'].onload = function(wrapper) {
wrapper.app_page = frappe.ui.make_app_page({
parent: wrapper,
title: __("Data Import / Export Tool"),
- icon: "data-import-tool"
+ icon: "icon-upload"
});
+ wrapper.appframe.set_title_left(function() { frappe.set_route(frappe.get_module("Setup").link); });
+
// check permission for import
if(!((frappe.boot.user.can_import && frappe.boot.user.can_import.length) ||
user_roles.indexOf("System Manager")!==-1)) {