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

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
-}
+}

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']