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.9.2'
+__version__ = '8.9.3'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/file/file.py

@@ -216,6 +216,10 @@ class File(NestedSet):
 
 	def check_reference_doc_permission(self):
 		"""Check if permission exists for reference document"""
+		if not frappe.db.exists(self.attached_to_doctype, self.attached_to_name):
+			# document is already deleted before deleting attachment
+			return
+
 		if self.attached_to_name:
 			# check persmission
 			try:

frappe/public/js/frappe/views/calendar/calendar.js

@@ -242,7 +242,7 @@ frappe.views.Calendar = Class.extend({
 		if(this.get_css_class) {
 			color_name = this.color_map[this.get_css_class(d)];
 			color_name =
-				frappe.ui.color.validate(color_name) ?
+				frappe.ui.color.validate_hex(color_name) ?
 					color_name :
 					'blue';
 			d.backgroundColor = frappe.ui.color.get(color_name, 'extra-light');