Merge branch 'develop'

frappe/__init__.py

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

frappe/core/page/user_permissions/user_permissions.py

@@ -72,11 +72,15 @@ def add(user, defkey, defvalue):
 def get_doctypes_for_user_permissions():
 	'''Get doctypes for the current user where user permissions are applicable'''
 	user_roles = frappe.get_roles()
+
 	if "System Manager" in user_roles:
-		return sorted(set([p.parent for p in get_valid_perms()]))
+		doctypes = set([p.parent for p in get_valid_perms()])
 	else:
-		return sorted(set([p.parent for p in get_valid_perms() if p.set_user_permissions]))
+		doctypes = set([p.parent for p in get_valid_perms() if p.set_user_permissions])
 		
+	single_doctypes = set([d.name for d in frappe.get_all("DocType", {"issingle": 1})])
+	
+	return sorted(doctypes.difference(single_doctypes))
 
 
 @frappe.whitelist()

frappe/public/js/frappe/form/footer/timeline_item.html

@@ -73,7 +73,7 @@
 						</a>
 						{% } %}
 
-						{% if (data.communication_medium === "Email") { %}
+						{% if (data.communication_medium === "Email" && data.sender !== user_email) { %}
 						<a class="text-muted reply-link pull-right timeline-content-show"
 							data-name="{%= data.name %}">{%= __("Reply") %}</a>
 						{% } %}