From 66cd8419a88814a363f582d67174d1ece26c2fe4 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 4 Sep 2017 11:37:34 +0530 Subject: [PATCH 1/3] [Fix] Calendar view is not working for sales order --- frappe/public/js/frappe/views/calendar/calendar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index e920a6a496..f43e721cfb 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/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'); From cb87bb5b587c55024de36f32f3020323be764e28 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 4 Sep 2017 14:13:54 +0530 Subject: [PATCH 2/3] [hotfix] delete attachment first before deleting parent doc --- frappe/core/doctype/file/file.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index e2f4b84027..f6f5da3fe6 100755 --- a/frappe/core/doctype/file/file.py +++ b/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: From 29b4ac3760c7a6df342bc29e8b78163ac45e4143 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 4 Sep 2017 15:19:24 +0600 Subject: [PATCH 3/3] bumped to version 8.9.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index b342854adf..0df26f461b 100644 --- a/frappe/__init__.py +++ b/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()