From 473083ae9d7ededc5e9f69ba94e8abcd6651b81e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 17 Aug 2017 18:38:12 +0530 Subject: [PATCH 1/4] fix event color patch (#3943) --- frappe/patches/v8_5/patch_event_colors.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/patches/v8_5/patch_event_colors.py b/frappe/patches/v8_5/patch_event_colors.py index 7a48b6c3e2..8ac7aec238 100644 --- a/frappe/patches/v8_5/patch_event_colors.py +++ b/frappe/patches/v8_5/patch_event_colors.py @@ -2,6 +2,10 @@ from __future__ import unicode_literals import frappe def execute(): + + if not frappe.db.sql("SHOW COLUMNS FROM `tabEvent` LIKE 'color';"): + return + colors = ['red', 'green', 'blue', 'yellow', 'skyblue', 'orange'] hex_colors = ['#ffc4c4', '#cef6d1', '#d2d2ff', '#fffacd', '#d2f1ff', '#ffd2c2'] From 2631edd4f3e48e01f5a0523cee2bba51e8ab0aa1 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Fri, 18 Aug 2017 11:31:51 +0530 Subject: [PATCH 2/4] [hotfix] doctype field in custom script should be mandatory --- .../doctype/custom_script/custom_script.json | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/custom/doctype/custom_script/custom_script.json b/frappe/custom/doctype/custom_script/custom_script.json index 644fcb7986..0d4cb6ea28 100644 --- a/frappe/custom/doctype/custom_script/custom_script.json +++ b/frappe/custom/doctype/custom_script/custom_script.json @@ -15,6 +15,7 @@ "engine": "InnoDB", "fields": [ { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -40,12 +41,13 @@ "read_only": 0, "remember_last_selected_value": 0, "report_hide": 0, - "reqd": 0, + "reqd": 1, "search_index": 0, "set_only_once": 0, "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -78,6 +80,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -87,7 +90,7 @@ "hidden": 0, "ignore_user_permissions": 0, "ignore_xss_filter": 0, - "in_filter": 0, + "in_filter": 0, "in_global_search": 0, "in_list_view": 0, "in_standard_filter": 0, @@ -109,6 +112,7 @@ "unique": 0 }, { + "allow_bulk_edit": 0, "allow_on_submit": 0, "bold": 0, "collapsible": 0, @@ -149,8 +153,8 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-04-03 18:07:28.138437", - "modified_by": "faris@erpnext.com", + "modified": "2017-08-17 07:43:08.093341", + "modified_by": "Administrator", "module": "Custom", "name": "Custom Script", "owner": "Administrator", @@ -203,4 +207,4 @@ "sort_order": "ASC", "track_changes": 1, "track_seen": 0 -} +} \ No newline at end of file From 40ad63991cd4516551c7e76d51f0098b21b4afb3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sun, 20 Aug 2017 14:09:11 +0530 Subject: [PATCH 3/4] [fix] timeline.js --- frappe/public/js/frappe/views/communication.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 8c6d5ce4fd..1315da12ed 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -503,7 +503,7 @@ frappe.views.CommunicationComposer = Class.extend({ } if (cur_frm) { // clear input - cur_frm.timeline.input.val(""); + cur_frm.timeline.input && cur_frm.timeline.input.val(""); cur_frm.reload_doc(); } From d1dce9035f1b58c9f03b3550fb4a4db71c2e79c0 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Mon, 21 Aug 2017 09:24:37 +0600 Subject: [PATCH 4/4] bumped to version 8.7.9 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8206ba4946..2a83741212 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.7.8' +__version__ = '8.7.9' __title__ = "Frappe Framework" local = Local()