From 9e139171f41405d677d62361fb2ef2190d475d5e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 8 Apr 2020 18:35:49 +0530
Subject: [PATCH 001/274] feat: custom form dashboards

---
 frappe/custom/doctype/custom_link/__init__.py |  0
 .../custom/doctype/custom_link/custom_link.js | 16 ++++++
 .../doctype/custom_link/custom_link.json      | 52 +++++++++++++++++++
 .../custom/doctype/custom_link/custom_link.py | 43 +++++++++++++++
 .../doctype/custom_link/test_custom_link.py   | 10 ++++
 frappe/desk/form/meta.py                      |  2 -
 frappe/desk/notifications.py                  |  7 +--
 frappe/model/meta.py                          |  4 +-
 8 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 frappe/custom/doctype/custom_link/__init__.py
 create mode 100644 frappe/custom/doctype/custom_link/custom_link.js
 create mode 100644 frappe/custom/doctype/custom_link/custom_link.json
 create mode 100644 frappe/custom/doctype/custom_link/custom_link.py
 create mode 100644 frappe/custom/doctype/custom_link/test_custom_link.py

diff --git a/frappe/custom/doctype/custom_link/__init__.py b/frappe/custom/doctype/custom_link/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/custom_link/custom_link.js b/frappe/custom/doctype/custom_link/custom_link.js
new file mode 100644
index 0000000000..f1c06daeeb
--- /dev/null
+++ b/frappe/custom/doctype/custom_link/custom_link.js
@@ -0,0 +1,16 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Custom Link', {
+	refresh: function(frm) {
+		frm.set_query("document_type", function () {
+			return {
+				filters: {
+					custom: 0,
+					istable: 0,
+					module: ['not in', ["Email", "Core", "Custom", "Event Streaming", "Social", "Data Migration", "Geo", "Desk"]]
+				}
+			}
+		});
+	}
+});
diff --git a/frappe/custom/doctype/custom_link/custom_link.json b/frappe/custom/doctype/custom_link/custom_link.json
new file mode 100644
index 0000000000..350e6b1c2d
--- /dev/null
+++ b/frappe/custom/doctype/custom_link/custom_link.json
@@ -0,0 +1,52 @@
+{
+ "actions": [],
+ "autoname": "field:document_type",
+ "creation": "2020-04-08 15:16:44.342509",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "links"
+ ],
+ "fields": [
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "links",
+   "fieldtype": "Table",
+   "label": "Links",
+   "options": "DocType Link"
+  }
+ ],
+ "links": [],
+ "modified": "2020-04-08 16:42:59.402671",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Custom Link",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/custom_link/custom_link.py b/frappe/custom/doctype/custom_link/custom_link.py
new file mode 100644
index 0000000000..b9a88b58f2
--- /dev/null
+++ b/frappe/custom/doctype/custom_link/custom_link.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class CustomLink(Document):
+	pass
+
+def get_custom_doctype_links(doctype, data):
+	if frappe.get_all("Custom Link", {"document_type": doctype}):
+		doc = frappe.get_doc("Custom Link", doctype)
+
+		if not data.transactions:
+			# init groups
+			data.transactions = []
+			data.non_standard_fieldnames = {}
+
+		for link in doc.links:
+			link.added = False
+			for group in data.transactions:
+				# group found
+				if group.get("label") == link.group:
+					if not link.link_doctype in group.get("items"):
+						group.get("items").append(link.link_doctype)
+					link.added = True
+
+			if not link.added:
+				# group not found, make a new group
+				data.transactions.append({
+					"label": link.group,
+					"items": [link.link_doctype]
+				})
+
+			if link.link_fieldname != data.fieldname:
+				if data.fieldname:
+					data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
+				else:
+					data.fieldname = link.link_fieldname
+
+	return data
\ No newline at end of file
diff --git a/frappe/custom/doctype/custom_link/test_custom_link.py b/frappe/custom/doctype/custom_link/test_custom_link.py
new file mode 100644
index 0000000000..a292f73ad0
--- /dev/null
+++ b/frappe/custom/doctype/custom_link/test_custom_link.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestCustomLink(unittest.TestCase):
+	pass
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index 26fc6037fd..ba0e5c2216 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -196,8 +196,6 @@ class FormMeta(Meta):
 				self.get("__messages").update(messages, as_value=True)
 
 	def load_dashboard(self):
-		if self.custom:
-			return
 		self.set('__dashboard', self.get_dashboard_data())
 
 	def load_kanban_meta(self):
diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py
index 3a8815ca71..109dd25f4f 100644
--- a/frappe/desk/notifications.py
+++ b/frappe/desk/notifications.py
@@ -268,8 +268,9 @@ def get_open_count(doctype, name, items=[]):
 		"count": out,
 	}
 
-	module = frappe.get_meta_module(doctype)
-	if hasattr(module, "get_timeline_data"):
-		out["timeline_data"] = module.get_timeline_data(doctype, name)
+	if not meta.custom:
+		module = frappe.get_meta_module(doctype)
+		if hasattr(module, "get_timeline_data"):
+			out["timeline_data"] = module.get_timeline_data(doctype, name)
 
 	return out
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 5065684311..e6a89be108 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -26,6 +26,7 @@ from frappe.model.base_document import BaseDocument
 from frappe.modules import load_doctype_module
 from frappe.model.workflow import get_workflow_name
 from frappe import _
+from frappe.custom.doctype.custom_link.custom_link import get_custom_doctype_links
 
 def get_meta(doctype, cached=True):
 	if cached:
@@ -429,6 +430,7 @@ class Meta(Document):
 			pass
 
 		self.add_doctype_links(data)
+		get_custom_doctype_links(self.name, data)
 
 		for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []):
 			data = frappe.get_attr(hook)(data=data)
@@ -447,7 +449,7 @@ class Meta(Document):
 				link.added = False
 				for group in data.transactions:
 					# group found
-					if group.label == link.label:
+					if group.label == link.group:
 						if not link.link_doctype in group.items:
 							group.items.append(link.link_doctype)
 						link.added = True

From a25088a606dd50a293d1f6b542af9b8c75e8cd5e Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 13 Apr 2020 19:10:19 +0530
Subject: [PATCH 002/274] chore: show message on migrate when services are not
 running

shows message before migrate if the database or redis service is not running
instead of trying to migrate and then failing.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/migrate.py           | 16 +++++++++++++
 frappe/utils/connections.py | 48 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 frappe/utils/connections.py

diff --git a/frappe/migrate.py b/frappe/migrate.py
index 043b6817d7..711f51c57a 100644
--- a/frappe/migrate.py
+++ b/frappe/migrate.py
@@ -5,11 +5,13 @@ from __future__ import unicode_literals
 
 import json
 import os
+import sys
 import frappe
 import frappe.translate
 import frappe.modules.patch_handler
 import frappe.model.sync
 from frappe.utils.fixtures import sync_fixtures
+from frappe.utils.connections import check_connection
 from frappe.cache_manager import clear_global_cache
 from frappe.desk.notifications import clear_notifications
 from frappe.website import render
@@ -18,6 +20,7 @@ from frappe.modules.utils import sync_customizations
 from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
 from frappe.utils import global_search
 
+
 def migrate(verbose=True, rebuild_website=False, skip_failing=False):
 	'''Migrate all apps to the latest version, will:
 	- run before migrate hooks
@@ -30,6 +33,19 @@ def migrate(verbose=True, rebuild_website=False, skip_failing=False):
 	- run after migrate hooks
 	'''
 
+	service_status = check_connection(redis_services=["redis_cache"])
+	if False in service_status.values():
+		for service in service_status:
+			if not service_status.get(service, True):
+				print("{} service is not running.".format(service))
+		print("""Cannot run bench migrate without the services running.
+If you are running bench in development mode, make sure that bench is running:
+
+$ bench start
+
+Otherwise, check the server logs and ensure that all the required services are running.""")
+		sys.exit(1)
+
 	touched_tables_file = frappe.get_site_path('touched_tables.json')
 	if os.path.exists(touched_tables_file):
 		os.remove(touched_tables_file)
diff --git a/frappe/utils/connections.py b/frappe/utils/connections.py
new file mode 100644
index 0000000000..57b9399986
--- /dev/null
+++ b/frappe/utils/connections.py
@@ -0,0 +1,48 @@
+import socket
+
+from six.moves.urllib.parse import urlparse
+from frappe import get_conf
+
+config = get_conf()
+REDIS_KEYS = ('redis_cache', 'redis_queue', 'redis_socketio')
+
+
+def is_open(ip, port, timeout=10):
+	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+	s.settimeout(timeout)
+	try:
+		s.connect((ip, int(port)))
+		s.shutdown(socket.SHUT_RDWR)
+		return True
+	except socket.error:
+		return False
+	finally:
+		s.close()
+
+
+def check_database():
+	db_type = config.get("db_type", "mariadb")
+	if db_type == "mariadb":
+		db_host = config.get("db_host", "localhost")
+		db_port = config.get("db_port", 3306)
+	else:
+		db_host = "localhost"
+		db_port = 5342
+	return {"db_type": is_open(db_host, db_port)}
+
+
+def check_redis(redis_services=None):
+	services = redis_services or REDIS_KEYS
+	status = {}
+	for conn in services:
+		redis_url = urlparse(config.get(conn)).netloc
+		redis_host, redis_port = redis_url.split(":")
+		status[conn] = is_open(redis_host, redis_port)
+	return status
+
+
+def check_connection(redis_services=None):
+	service_status = {}
+	service_status.update(check_database())
+	service_status.update(check_redis(redis_services))
+	return service_status

From 318e397ab35cb0508ea8697b0088f23c37e67df2 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 13 Apr 2020 19:13:43 +0530
Subject: [PATCH 003/274] chore: unquote db_type

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/utils/connections.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/connections.py b/frappe/utils/connections.py
index 57b9399986..bffbd98134 100644
--- a/frappe/utils/connections.py
+++ b/frappe/utils/connections.py
@@ -28,7 +28,7 @@ def check_database():
 	else:
 		db_host = "localhost"
 		db_port = 5342
-	return {"db_type": is_open(db_host, db_port)}
+	return {db_type: is_open(db_host, db_port)}
 
 
 def check_redis(redis_services=None):

From c0d0fcfd69227562069933449881d27470bb904b Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 13 Apr 2020 19:24:51 +0530
Subject: [PATCH 004/274] chore: do not hardcode anything for postgres

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/utils/connections.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frappe/utils/connections.py b/frappe/utils/connections.py
index bffbd98134..6bd24d57ec 100644
--- a/frappe/utils/connections.py
+++ b/frappe/utils/connections.py
@@ -22,12 +22,8 @@ def is_open(ip, port, timeout=10):
 
 def check_database():
 	db_type = config.get("db_type", "mariadb")
-	if db_type == "mariadb":
-		db_host = config.get("db_host", "localhost")
-		db_port = config.get("db_port", 3306)
-	else:
-		db_host = "localhost"
-		db_port = 5342
+	db_host = config.get("db_host", "localhost")
+	db_port = config.get("db_port", 3306 if db_type == "mariadb" else 5342)
 	return {db_type: is_open(db_host, db_port)}
 
 

From fca6181d6771235d883bd1c4cc0ce57c3c32065c Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 Apr 2020 21:32:22 +0530
Subject: [PATCH 005/274] feat: multiple assignments

---
 frappe/desk/form/assign_to.py                 |  77 +++----
 .../js/frappe/form/sidebar/assign_to.js       | 202 +++++++++++-------
 2 files changed, 164 insertions(+), 115 deletions(-)

diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index 76c7caa63d..a0f2f99910 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -11,6 +11,7 @@ from frappe.desk.doctype.notification_log.notification_log import enqueue_create
 	get_title, get_title_html
 import frappe.utils
 import frappe.share
+import json
 
 class DuplicateToDoError(frappe.ValidationError): pass
 
@@ -19,7 +20,7 @@ def get(args=None):
 	if not args:
 		args = frappe.local.form_dict
 
-	return frappe.get_all('ToDo', fields = ['owner', 'description'], filters = dict(
+	return frappe.get_all('ToDo', fields = ['owner', 'name'], filters = dict(
 		reference_type = args.get('doctype'),
 		reference_name = args.get('name'),
 		status = ('!=', 'Cancelled')
@@ -40,49 +41,53 @@ def add(args=None):
 	if not args:
 		args = frappe.local.form_dict
 
-	if frappe.db.sql("""SELECT `owner`
-		FROM `tabToDo`
-		WHERE `reference_type`=%(doctype)s
-		AND `reference_name`=%(name)s
-		AND `status`='Open'
-		AND `owner`=%(assign_to)s""", args):
-		frappe.throw(_("Already in user's To Do list"), DuplicateToDoError)
-	else:
-		from frappe.utils import nowdate
-
-		if not args.get('description'):
-			args['description'] = _('Assignment for {0} {1}').format(args['doctype'], args['name'])
-
-		d = frappe.get_doc({
-			"doctype":"ToDo",
-			"owner": args['assign_to'],
+	for assign_to in json.loads(args.get("assign_to")):
+		filters = {
 			"reference_type": args['doctype'],
 			"reference_name": args['name'],
-			"description": args.get('description'),
-			"priority": args.get("priority", "Medium"),
 			"status": "Open",
-			"date": args.get('date', nowdate()),
-			"assigned_by": args.get('assigned_by', frappe.session.user),
-			'assignment_rule': args.get('assignment_rule')
-		}).insert(ignore_permissions=True)
+			"owner": assign_to
+		}
 
-		# set assigned_to if field exists
-		if frappe.get_meta(args['doctype']).get_field("assigned_to"):
-			frappe.db.set_value(args['doctype'], args['name'], "assigned_to", args['assign_to'])
+		if frappe.get_all("ToDo", filters=filters):
+			if not args.get("bulk_assign"):
+				frappe.throw(_("Already in user's ToDo list"), DuplicateToDoError)
+		else:
+			from frappe.utils import nowdate
 
-		doc = frappe.get_doc(args['doctype'], args['name'])
+			if not args.get('description'):
+				args['description'] = _('Assignment for {0} {1}').format(args['doctype'], args['name'])
 
-		# if assignee does not have permissions, share
-		if not frappe.has_permission(doc=doc, user=args['assign_to']):
-			frappe.share.add(doc.doctype, doc.name, args['assign_to'])
-			frappe.msgprint(_('Shared with user {0} with read access').format(args['assign_to']), alert=True)
+			d = frappe.get_doc({
+				"doctype":"ToDo",
+				"owner": assign_to,
+				"reference_type": args['doctype'],
+				"reference_name": args['name'],
+				"description": args.get('description'),
+				"priority": args.get("priority", "Medium"),
+				"status": "Open",
+				"date": args.get('date', nowdate()),
+				"assigned_by": args.get('assigned_by', frappe.session.user),
+				'assignment_rule': args.get('assignment_rule')
+			}).insert(ignore_permissions=True)
 
-		# make this document followed by assigned user
-		follow_document(args['doctype'], args['name'], args['assign_to'])
+			# set assigned_to if field exists
+			if frappe.get_meta(args['doctype']).get_field("assigned_to"):
+				frappe.db.set_value(args['doctype'], args['name'], "assigned_to", assign_to)
 
-	# notify
-	notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
-			description=args.get("description"))
+			doc = frappe.get_doc(args['doctype'], args['name'])
+
+			# if assignee does not have permissions, share
+			if not frappe.has_permission(doc=doc, user=assign_to):
+				frappe.share.add(doc.doctype, doc.name, assign_to)
+				frappe.msgprint(_('Shared with user {0} with read access').format(assign_to, alert=True))
+
+			# make this document followed by assigned user
+			follow_document(args['doctype'], args['name'], assign_to)
+
+		# notify
+		notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
+				description=args.get("description"))
 
 	return get(args)
 
diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index 61d1789518..b78540f6a7 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -87,23 +87,17 @@ frappe.ui.form.AssignTo = Class.extend({
 
 		if(!me.assign_to) {
 			me.assign_to = new frappe.ui.form.AssignToDialog({
-				obj: me,
-				method: 'frappe.desk.form.assign_to.add',
+				method: "frappe.desk.form.assign_to.add",
 				doctype: me.frm.doctype,
 				docname: me.frm.docname,
-				callback: function(r) {
+				frm: me.frm,
+				callback: function (r) {
 					me.render(r.message);
 				}
 			});
 		}
 		me.assign_to.dialog.clear();
-
-		if(me.frm.meta.title_field) {
-			me.assign_to.dialog.set_value("description", me.frm.doc[me.frm.meta.title_field])
-		}
-
 		me.assign_to.dialog.show();
-		me.assign_to = null;
 	},
 	remove: function(owner) {
 		var me = this;
@@ -130,81 +124,131 @@ frappe.ui.form.AssignTo = Class.extend({
 
 frappe.ui.form.AssignToDialog = Class.extend({
 	init: function(opts){
-		var me = this
-		var dialog = new frappe.ui.Dialog({
-			title: __('Add to To Do'),
-			fields: [
-				{ fieldtype: 'Link', fieldname: 'assign_to', options: 'User', label: __("Assign To"), reqd: true, filters: { 'user_type': 'System User' }},
-				{ fieldtype: 'Check', fieldname: 'myself', label: __("Assign to me"), "default": 0 },
-				{ fieldtype: 'Small Text', fieldname: 'description', label: __("Comment") },
-				{ fieldtype: 'Section Break' },
-				{ fieldtype: 'Column Break' },
-				{ fieldtype: 'Date', fieldname: 'date', label: __("Complete By") },
-				{ fieldtype: 'Column Break' },
-				{ fieldtype: 'Select', fieldname: 'priority', label: __("Priority"),
-					options: [
-						{ value: 'Low', label: __('Low') },
-						{ value: 'Medium', label: __('Medium') },
-						{ value: 'High', label: __('High') }
-					],
-					// Pick up priority from the source document, if it exists and is available in ToDo
-					'default': ["Low", "Medium", "High"].includes(opts.obj.frm && opts.obj.frm.doc.priority
-						? opts.obj.frm.doc.priority : 'Medium')
-				},
-			],
-			primary_action: function() { frappe.ui.add_assignment(opts, this) },
-			primary_action_label: __("Add")
-		})
-		$.extend(me, dialog);
+		$.extend(this, opts)
 
-		me.dialog = dialog;
-
-		me.dialog.fields_dict.assign_to.get_query = "frappe.core.doctype.user.user.user_query";
-
-		var myself = me.dialog.get_input("myself").on("click", function() {
-			me.toggle_myself(this);
-		});
-		me.toggle_myself(myself);
-	},
-	toggle_myself: function(myself) {
-		var me = this;
-		if($(myself).prop("checked")) {
-			me.dialog.set_value("assign_to", frappe.session.user);
-			me.dialog.get_field("notify").$wrapper.toggle(false);
-			me.dialog.get_field("assign_to").$wrapper.toggle(false);
-		} else {
-			me.dialog.set_value("assign_to", "");
-			me.dialog.get_field("assign_to").$wrapper.toggle(true);
-		}
+		this.make();
+		this.set_description_from_doc();
 	},
+	make: function() {
+		let me = this
 
-});
+		me.dialog = new frappe.ui.Dialog({
+			title: __('Add to ToDo'),
+			fields: me.get_fields(),
+			primary_action_label: __("Add"),
+			primary_action: function() {
+				let args = me.dialog.get_values();
 
-frappe.ui.add_assignment = function(opts, dialog) {
-	var assign_to = dialog.fields_dict.assign_to.get_value();
-	var args = dialog.get_values();
-	if(args && assign_to) {
-		dialog.set_message('Assigning...');
-		return frappe.call({
-			method: opts.method,
-			args: $.extend(args, {
-				doctype: opts.doctype,
-				name: opts.docname,
-				assign_to: assign_to,
-				bulk_assign:  opts.bulk_assign || false,
-				re_assign: opts.re_assign || false
-			}),
-			btn: dialog.get_primary_btn(),
-			callback: function(r) {
-				if(!r.exc) {
-					if(opts.callback){
-						opts.callback(r);
-					}
-					dialog && dialog.hide();
-				} else {
-					dialog.clear_message();
+				if (args && args.assign_to) {
+					me.dialog.set_message("Assigning...");
+
+					frappe.call({
+						method: me.method,
+						args: $.extend(args, {
+							doctype: me.doctype,
+							name: me.docname,
+							assign_to: args.assign_to,
+							bulk_assign:  me.bulk_assign || false,
+							re_assign: me.re_assign || false
+						}),
+						btn: me.dialog.get_primary_btn(),
+						callback: function(r) {
+							if (!r.exc) {
+								if (me.callback) {
+									me.callback(r);
+								}
+								me.dialog && me.dialog.hide();
+							} else {
+								me.dialog.clear_message();
+							}
+						},
+					});
 				}
 			},
 		});
+	},
+	assign_to_me: function() {
+		let me = this;
+		let assign_to = [];
+
+		if(me.dialog.get_value("assign_to_me")) {
+			assign_to.push(frappe.session.user);
+		}
+
+		me.dialog.set_value("assign_to", assign_to);
+	},
+	set_description_from_doc: function() {
+		let me = this;
+
+		if (me.frm && me.frm.meta.title_field) {
+			me.dialog.set_value("description", me.frm.doc[me.frm.meta.title_field]);
+		}
+	},
+	set_assign_to_field_description: function() {
+		let me = this;
+
+		let assignees = me.dialog.get_value("assign_to");
+		let field = me.dialog.get_field("assign_to");
+		let description = "";
+
+		if (assignees.length > 0) {
+			description = "Assign To: " + assignees.join(", ");
+		}
+
+		field.set_description(description);
+	},
+	get_fields: function() {
+		let me = this;
+
+		return [
+			{
+				fieldtype: 'MultiSelectList',
+				fieldname: 'assign_to',
+				label: __("Assign To"),
+				reqd: true,
+				get_data: function(txt) {
+					return frappe.db.get_link_options("User", txt, {user_type: "System User", enabled: 1});
+				},
+				onchange: () => me.set_assign_to_field_description()
+			},
+			{
+				label: __("Assign to me"),
+				fieldtype: 'Check',
+				fieldname: 'assign_to_me',
+				default: 0,
+				onchange: () => me.assign_to_me()
+			},
+			{
+				label: __("Comment"),
+				fieldtype: 'Small Text',
+				fieldname: 'description'
+			},
+			{
+				fieldtype: 'Section Break'
+			},
+			{
+				fieldtype: 'Column Break'
+			},
+			{
+				label: __("Complete By"),
+				fieldtype: 'Date',
+				fieldname: 'date'
+			},
+			{
+				fieldtype: 'Column Break'
+			},
+			{
+				label: __("Priority"),
+				fieldtype: 'Select',
+				fieldname: 'priority',
+				options: [
+					{ value: 'Low', label: __('Low') },
+					{ value: 'Medium', label: __('Medium') },
+					{ value: 'High', label: __('High') }
+				],
+				// Pick up priority from the source document, if it exists and is available in ToDo
+				default: ["Low", "Medium", "High"].includes(me.frm && me.frm.doc.priority ? me.frm.doc.priority : 'Medium')
+			}
+		]
 	}
-}
+});

From 6b9de21d539d4a64fe82473be994af9bc814eb61 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 Apr 2020 22:20:23 +0530
Subject: [PATCH 006/274] fix: minor bug fixes for notifying assignees

---
 frappe/desk/form/assign_to.py                     | 4 ++--
 frappe/public/js/frappe/form/sidebar/assign_to.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index a0f2f99910..8a8219eb22 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -85,8 +85,8 @@ def add(args=None):
 			# make this document followed by assigned user
 			follow_document(args['doctype'], args['name'], assign_to)
 
-		# notify
-		notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
+			# notify
+			notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
 				description=args.get("description"))
 
 	return get(args)
diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index b78540f6a7..03fba17ec7 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -124,7 +124,7 @@ frappe.ui.form.AssignTo = Class.extend({
 
 frappe.ui.form.AssignToDialog = Class.extend({
 	init: function(opts){
-		$.extend(this, opts)
+		$.extend(this, opts);
 
 		this.make();
 		this.set_description_from_doc();
@@ -148,7 +148,7 @@ frappe.ui.form.AssignToDialog = Class.extend({
 							doctype: me.doctype,
 							name: me.docname,
 							assign_to: args.assign_to,
-							bulk_assign:  me.bulk_assign || false,
+							bulk_assign: me.bulk_assign || false,
 							re_assign: me.re_assign || false
 						}),
 						btn: me.dialog.get_primary_btn(),
@@ -171,7 +171,7 @@ frappe.ui.form.AssignToDialog = Class.extend({
 		let me = this;
 		let assign_to = [];
 
-		if(me.dialog.get_value("assign_to_me")) {
+		if (me.dialog.get_value("assign_to_me")) {
 			assign_to.push(frappe.session.user);
 		}
 
@@ -249,6 +249,6 @@ frappe.ui.form.AssignToDialog = Class.extend({
 				// Pick up priority from the source document, if it exists and is available in ToDo
 				default: ["Low", "Medium", "High"].includes(me.frm && me.frm.doc.priority ? me.frm.doc.priority : 'Medium')
 			}
-		]
+		];
 	}
 });

From 7886365c090ad1b645b63c0987af83e13366b1e9 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 Apr 2020 22:48:58 +0530
Subject: [PATCH 007/274] chore: code cleanup

---
 frappe/desk/form/assign_to.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index 8a8219eb22..be83dc957e 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -20,11 +20,11 @@ def get(args=None):
 	if not args:
 		args = frappe.local.form_dict
 
-	return frappe.get_all('ToDo', fields = ['owner', 'name'], filters = dict(
+	return frappe.get_all('ToDo', fields=['owner', 'name'], filters=dict(
 		reference_type = args.get('doctype'),
 		reference_name = args.get('name'),
 		status = ('!=', 'Cancelled')
-	), limit = 5)
+	), limit=5)
 
 @frappe.whitelist()
 def add(args=None):
@@ -59,7 +59,7 @@ def add(args=None):
 				args['description'] = _('Assignment for {0} {1}').format(args['doctype'], args['name'])
 
 			d = frappe.get_doc({
-				"doctype":"ToDo",
+				"doctype": "ToDo",
 				"owner": assign_to,
 				"reference_type": args['doctype'],
 				"reference_name": args['name'],
@@ -86,15 +86,13 @@ def add(args=None):
 			follow_document(args['doctype'], args['name'], assign_to)
 
 			# notify
-			notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\
+			notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',
 				description=args.get("description"))
 
 	return get(args)
 
 @frappe.whitelist()
 def add_multiple(args=None):
-	import json
-
 	if not args:
 		args = frappe.local.form_dict
 

From 7dac9e2a0342809453bdb44d0588606715b5154b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 16 Apr 2020 21:55:52 +0530
Subject: [PATCH 008/274] fix: change to multiselect pills

---
 .../js/frappe/form/sidebar/assign_to.js       | 33 ++++++++-----------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index 03fba17ec7..84fde564c0 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -184,32 +184,18 @@ frappe.ui.form.AssignToDialog = Class.extend({
 			me.dialog.set_value("description", me.frm.doc[me.frm.meta.title_field]);
 		}
 	},
-	set_assign_to_field_description: function() {
-		let me = this;
-
-		let assignees = me.dialog.get_value("assign_to");
-		let field = me.dialog.get_field("assign_to");
-		let description = "";
-
-		if (assignees.length > 0) {
-			description = "Assign To: " + assignees.join(", ");
-		}
-
-		field.set_description(description);
-	},
 	get_fields: function() {
 		let me = this;
 
 		return [
 			{
-				fieldtype: 'MultiSelectList',
+				fieldtype: 'MultiSelectPills',
 				fieldname: 'assign_to',
 				label: __("Assign To"),
 				reqd: true,
 				get_data: function(txt) {
 					return frappe.db.get_link_options("User", txt, {user_type: "System User", enabled: 1});
-				},
-				onchange: () => me.set_assign_to_field_description()
+				}
 			},
 			{
 				label: __("Assign to me"),
@@ -242,9 +228,18 @@ frappe.ui.form.AssignToDialog = Class.extend({
 				fieldtype: 'Select',
 				fieldname: 'priority',
 				options: [
-					{ value: 'Low', label: __('Low') },
-					{ value: 'Medium', label: __('Medium') },
-					{ value: 'High', label: __('High') }
+					{
+						value: 'Low',
+						label: __('Low')
+					},
+					{
+						value: 'Medium',
+						label: __('Medium')
+					},
+					{
+						value: 'High',
+						label: __('High')
+					}
 				],
 				// Pick up priority from the source document, if it exists and is available in ToDo
 				default: ["Low", "Medium", "High"].includes(me.frm && me.frm.doc.priority ? me.frm.doc.priority : 'Medium')

From acc7de7335e28b13c5590b95a42ed972198de83b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 17 Apr 2020 18:49:04 +0530
Subject: [PATCH 009/274] feat: added pandas date_range to utils

---
 frappe/utils/dateutils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py
index d5b7a3136b..907cab3d02 100644
--- a/frappe/utils/dateutils.py
+++ b/frappe/utils/dateutils.py
@@ -73,3 +73,9 @@ def datetime_in_user_format(date_time):
 		date_time = get_datetime(date_time)
 	from frappe.utils import formatdate
 	return formatdate(date_time.date()) + " " + date_time.strftime("%H:%M")
+
+def get_date_range(from_date, to_date, frequency="M", normalize=True):
+	from pandas import date_range
+	date_range = date_range(start=from_date, end=to_date, freq=frequency, normalize=normalize).to_pydatetime().tolist()
+
+	return date_range
\ No newline at end of file

From da6024242769e8c0934f8bc283ae8c9d93fbc573 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 17 Apr 2020 18:49:12 +0530
Subject: [PATCH 010/274] feat: added website analytics report

---
 frappe/website/report/__init__.py             |   0
 .../report/website_analytics/__init__.py      |   0
 .../website_analytics/website_analytics.js    |  34 ++++
 .../website_analytics/website_analytics.json  |  27 ++++
 .../website_analytics/website_analytics.py    | 145 ++++++++++++++++++
 5 files changed, 206 insertions(+)
 create mode 100644 frappe/website/report/__init__.py
 create mode 100644 frappe/website/report/website_analytics/__init__.py
 create mode 100644 frappe/website/report/website_analytics/website_analytics.js
 create mode 100644 frappe/website/report/website_analytics/website_analytics.json
 create mode 100644 frappe/website/report/website_analytics/website_analytics.py

diff --git a/frappe/website/report/__init__.py b/frappe/website/report/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/report/website_analytics/__init__.py b/frappe/website/report/website_analytics/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/report/website_analytics/website_analytics.js b/frappe/website/report/website_analytics/website_analytics.js
new file mode 100644
index 0000000000..b607a16eb4
--- /dev/null
+++ b/frappe/website/report/website_analytics/website_analytics.js
@@ -0,0 +1,34 @@
+// Copyright (c) 2016, Frappe Technologies and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Website Analytics"] = {
+	"filters": [
+		{
+			fieldname: "from_date",
+			label: __("From Date"),
+			fieldtype: "Date",
+			default: frappe.datetime.add_days(frappe.datetime.now_date(true), -7),
+			reqd: 1
+		},
+		{
+			fieldname:"to_date",
+			label: __("To Date"),
+			fieldtype: "Date",
+			default: frappe.datetime.now_date(true),
+			reqd: 1
+		},
+		{
+			fieldname: "range",
+			label: __("Range"),
+			fieldtype: "Select",
+			options: [
+				{ "value": "D", "label": __("Daily") },
+				{ "value": "W", "label": __("Weekly") },
+				{ "value": "M", "label": __("Monthly") },
+			],
+			default: "D",
+			reqd: 1
+		}
+	]
+};
diff --git a/frappe/website/report/website_analytics/website_analytics.json b/frappe/website/report/website_analytics/website_analytics.json
new file mode 100644
index 0000000000..62c5751a5c
--- /dev/null
+++ b/frappe/website/report/website_analytics/website_analytics.json
@@ -0,0 +1,27 @@
+{
+ "add_total_row": 0,
+ "creation": "2020-04-17 13:04:45.770148",
+ "disable_prepared_report": 0,
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2020-04-17 16:10:30.168312",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Website Analytics",
+ "owner": "Administrator",
+ "prepared_report": 0,
+ "ref_doctype": "Web Page View",
+ "report_name": "Website Analytics",
+ "report_type": "Script Report",
+ "roles": [
+  {
+   "role": "System Manager"
+  },
+  {
+   "role": "Website Manager"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/frappe/website/report/website_analytics/website_analytics.py b/frappe/website/report/website_analytics/website_analytics.py
new file mode 100644
index 0000000000..8b2d5b3806
--- /dev/null
+++ b/frappe/website/report/website_analytics/website_analytics.py
@@ -0,0 +1,145 @@
+# Copyright (c) 2013, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils.dateutils import get_date_range
+
+def execute(filters=None):
+	return WebsiteAnalytics(filters).run()
+
+class WebsiteAnalytics(object):
+	def __init__(self, filters=None):
+		self.filters = frappe._dict(filters or {})
+		self.filters.to_date = frappe.utils.add_days(self.filters.to_date, 1)
+		self.query_filters = {'creation': ['between', [self.filters.from_date, self.filters.to_date]]}
+
+	def run(self):
+		columns = self.get_columns()
+		data = self.get_data()
+		summary = self.get_report_summary()
+		chart = self.get_chart_data()
+		return columns, data, None, chart, summary
+
+	def get_columns(self):
+		return [
+			{
+				"fieldname": "path",
+				"label": "Page",
+				"fieldtype": "Data",
+				"width": 300
+			},
+			{
+				"fieldname": "count",
+				"label": "Page Views",
+				"fieldtype": "Int",
+				"width": 150
+			}
+		]
+
+	def get_data(self):
+		data = frappe.get_all("Web Page View", fields=['path', 'count(*) as count'], filters=self.query_filters, group_by="path", order_by='count desc')
+		return data
+
+	def get_chart_data(self):
+		def _get_field_for_chart(filters_range):
+			field = 'creation'
+			date_format = '%Y-%m-%d'
+
+			if filters_range == "W":
+				field = 'ADDDATE(creation, INTERVAL 1-DAYOFWEEK(creation) DAY)'
+
+			elif filters_range == "M":
+				date_format = '%Y-%m-01'
+
+			return field, date_format
+
+		field, date_format = _get_field_for_chart(self.filters.range)
+
+		data = frappe.db.sql("""
+				SELECT
+					DATE_FORMAT({0}, %s) as date,
+					COUNT(*) as count,
+					count(CASE WHEN is_unique = 1 THEN 1 END) as unique_count
+				FROM `tabWeb Page View`
+				WHERE creation BETWEEN %s AND %s
+				GROUP BY DATE_FORMAT({0}, %s)
+				ORDER BY creation
+			""".format(field), (date_format, self.filters.from_date, self.filters.to_date, date_format), as_dict=1, debug=1)
+
+		return self.prepare_chart_data(data)
+
+	def prepare_chart_data(self, data):
+		date_range = get_date_range(self.filters.from_date, self.filters.to_date, self.filters.range)
+		if self.filters.range == "M":
+			date_range = [frappe.utils.add_days(dd, 1) for dd in date_range]
+
+		labels = []
+		total_dataset = []
+		unique_dataset = []
+
+		def get_data_for_date(date):
+			for item in data:
+				item_date = frappe.utils.get_datetime(item.get("date")).date()
+				if item_date == date.date():
+					return item
+			return {'count': 0, 'unique_count': 0}
+
+
+		for date in date_range:
+			labels.append(date.strftime("%b %d %Y"))
+			match = get_data_for_date(date)
+			total_dataset.append(match.get('count', 0))
+			unique_dataset.append(match.get('unique_count', 0))
+
+		chart = {
+			"data": {
+				'labels': labels,
+				'datasets': [
+					{
+						'name': "Total Views",
+						'type': 'line',
+						'values': total_dataset
+					},
+					{
+						'name': "Unique Visits",
+						'type': 'line',
+						'values': unique_dataset
+					}
+				]
+			},
+			"type": "axis-mixed",
+			'lineOptions': {
+				'regionFill': 1,
+			},
+			'axisOptions': {
+				'xIsSeries': 1
+			}
+		}
+
+		return chart
+
+
+	def get_report_summary(self):
+		summary_data = frappe.get_all("Web Page View", fields=['is_unique', 'count(*) as count'], filters=self.query_filters, group_by="is_unique")
+
+		total_count = 0
+		unique_count = 0
+		for data in summary_data:
+			if data.get('is_unique'):
+				unique_count = data.get('count')
+			total_count += data.get('count')
+		report_summary = [
+			{
+				"value": total_count,
+				"label": "Total Page Views",
+				"datatype": "Int",
+			},
+			{
+				"value": unique_count,
+				"label": "Unique Page Views",
+				"datatype": "Int",
+			},
+
+		]
+		return report_summary
\ No newline at end of file

From 9b185802aaab09aa84dff1fce76292ea1edcdc54 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 27 Apr 2020 18:56:12 +0530
Subject: [PATCH 011/274] fix: fix calculation of dates and values for
 dashboard charts

---
 .../dashboard_chart/dashboard_chart.py        | 108 ++++--------------
 .../dashboard_chart/test_dashboard_chart.py   |  58 +++++++---
 2 files changed, 64 insertions(+), 102 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7bed8f4504..4502748504 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -128,7 +128,6 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 		to_date = datetime.datetime.now()
 
 	doctype = chart.document_type
-	unit_function = get_unit_function(doctype, chart.based_on, timegrain)
 	datefield = chart.based_on
 	aggregate_function = get_aggregate_function(chart.chart_type)
 	value_field = chart.value_based_on or '1'
@@ -141,23 +140,18 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 	data = frappe.db.get_all(
 		doctype,
 		fields = [
-			'extract(year from `tab{doctype}`.{datefield}) as _year'.format(doctype=doctype, datefield=datefield),
-			'{} as _unit'.format(unit_function),
+			'{} as _unit'.format(datefield),
 			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
 		],
 		filters = filters,
-		group_by = '_year, _unit',
-		order_by = '_year asc, _unit asc',
+		group_by = '_unit',
+		order_by = '_unit asc',
 		as_list = True,
 		ignore_ifnull = True
 	)
 
+	result = get_result(data, timegrain, from_date, to_date)
 
-	# result given as year, unit -> convert it to end of period of that unit
-	result = convert_to_dates(data, timegrain)
-
-	# add missing data points for periods where there was no result
-	result = add_missing_values(result, timegrain, timespan, from_date, to_date)
 	chart_config = {
 		"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
 		"datasets": [{
@@ -217,75 +211,22 @@ def get_aggregate_function(chart_type):
 	}[chart_type]
 
 
-def convert_to_dates(data, timegrain):
-	""" Converts individual dates within data to the end of period """
-	result = []
-	for d in data:
-		if d[2] != 0:
-			if timegrain == 'Daily':
-				result.append([add_to_date('{:d}-01-01'.format(int(d[0])), days = d[1] - 1), d[2]])
-			elif timegrain == 'Weekly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), weeks = d[1] + 1), days = -1), d[2]])
-			elif timegrain == 'Monthly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1]), days = -1), d[2]])
-			elif timegrain == 'Quarterly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1] * 3), days = -1), d[2]])
-			elif timegrain == 'Yearly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=12), days = -1), d[2]])
-			result[-1][0] = getdate(result[-1][0])
-
-	return result
-
-def get_unit_function(doctype, datefield, timegrain):
-	unit_function = ''
-	if timegrain=='Daily':
-		if frappe.db.db_type == 'mariadb':
-			unit_function = 'dayofyear(`tab{doctype}`.{datefield})'.format(
-				doctype=doctype, datefield=datefield)
-		else:
-			unit_function = 'extract(doy from `tab{doctype}`.{datefield})'.format(
-				doctype=doctype, datefield=datefield)
-
-	else:
-		unit_function = 'extract({unit} from `tab{doctype}`.{datefield})'.format(
-			unit = timegrain[:-2].lower(), doctype=doctype, datefield=datefield)
-
-	return unit_function
-
-def add_missing_values(data, timegrain, timespan, from_date, to_date):
-	# add missing intervals
+def get_result(data, timegrain, from_date, to_date):
+	start_date = getdate(from_date)
+	end_date = getdate(to_date)
 	result = []
 
-	if timespan != 'All Time':
-		first_expected_date = get_period_ending(from_date, timegrain)
-		# fill out data before the first data point
-		first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1))
-		while first_data_point_date > first_expected_date:
-			result.append([first_expected_date, 0.0])
-			first_expected_date = get_next_expected_date(first_expected_date, timegrain)
+	while start_date <= end_date:
+		next_date = get_next_expected_date(start_date, timegrain)
+		result.append([next_date, 0.0])
+		start_date = next_date
 
-	# fill data points and missing points
-	for i, d in enumerate(data):
-		result.append(d)
-
-		next_expected_date = get_next_expected_date(d[0], timegrain)
-
-		if i < len(data)-1:
-			next_date = data[i+1][0]
-		else:
-			# already reached at end of data, see if we need any more dates
-			next_date = getdate(nowdate())
-
-		# if next data point is earler than the expected date
-		# need to fill out missing data points
-		while next_date > next_expected_date:
-			# fill missing value
-			result.append([next_expected_date, 0.0])
-			next_expected_date = get_next_expected_date(next_expected_date, timegrain)
-
-	# add date for the last period (if missing)
-	if result and get_period_ending(to_date, timegrain) > result[-1][0]:
-		result.append([get_period_ending(to_date, timegrain), 0.0])
+	data_index = 0
+	if data:
+		for i, d in enumerate(result):
+			while data_index < len(data) and getdate(data[data_index][0]) <= d[0]:
+				d[1] += data[data_index][1]
+				data_index += 1
 
 	return result
 
@@ -314,17 +255,12 @@ def get_period_ending(date, timegrain):
 	return getdate(date)
 
 def get_week_ending(date):
-	# fun fact: week ends on the day before 1st Jan of the year.
-	# for 2019 it is Monday
+	# week starts on monday
+	from datetime import timedelta
+	start = date - timedelta(days = date.weekday())
+	end = start + timedelta(days=6)
 
-	week_of_the_year = int(date.strftime('%U'))
-
-	if week_of_the_year == 52:
-		date = add_to_date(date, years=1)
-	# first day of next week
-	date = add_to_date('{}-01-01'.format(date.year), weeks = (week_of_the_year%52) + 1)
-	# last day of this week
-	return add_to_date(date, days=-1)
+	return end
 
 def get_month_ending(date):
 	month_of_the_year = int(date.strftime('%m'))
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index 4425c4fd45..dfc6edbf58 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -17,10 +17,9 @@ class TestDashboardChart(unittest.TestCase):
 		self.assertEqual(get_period_ending('2019-04-10', 'Daily'),
 			getdate('2019-04-10'))
 
-		# fun fact: week ends on the day before 1st Jan of the year.
-		# for 2019 it is Monday
+		# week starts on monday
 		self.assertEqual(get_period_ending('2019-04-10', 'Weekly'),
-			getdate('2019-04-15'))
+			getdate('2019-04-14'))
 
 		self.assertEqual(get_period_ending('2019-04-10', 'Monthly'),
 			getdate('2019-04-30'))
@@ -133,6 +132,34 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
+	def test_weekly_dashboard_chart(self):
+		insert_test_records()
+
+		if frappe.db.exists('Dashboard Chart', 'Test Weekly Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Weekly Dashboard Chart')
+
+		frappe.get_doc(dict(
+			doctype = 'Dashboard Chart',
+			chart_name = 'Test Weekly Dashboard Chart',
+			chart_type = 'Sum',
+			document_type = 'Communication',
+			based_on = 'communication_date',
+			value_based_on = 'rating',
+			timespan = 'Select Date Range',
+			time_interval = 'Weekly',
+			from_date = datetime(2018, 12, 30),
+			to_date = datetime(2019, 1, 15),
+			filters_json = '[]',
+			timeseries = 1
+		)).insert()
+
+		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
+
+		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 0.0])
+		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
+
+		frappe.db.rollback()
+
 	def test_group_by_chart_type(self):
 		if frappe.db.exists('Dashboard Chart', 'Test Group By Dashboard Chart'):
 			frappe.delete_doc('Dashboard Chart', 'Test Group By Dashboard Chart')
@@ -155,17 +182,16 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
-	def test_dashboard_with_single_doctype(self):
-		if frappe.db.exists('Dashboard Chart', 'Test Single DocType In Dashboard Chart'):
-			frappe.delete_doc('Dashboard Chart', 'Test Single DocType In Dashboard Chart')
+def insert_test_records():
+	create_new_communication(datetime(2019, 1, 10), 100)
+	create_new_communication(datetime(2019, 1, 6), 200)
+	create_new_communication(datetime(2019, 1, 8), 300)
 
-		chart_doc = frappe.get_doc(dict(
-			doctype = 'Dashboard Chart',
-			chart_name = 'Test Single DocType In Dashboard Chart',
-			chart_type = 'Count',
-			document_type = 'System Settings',
-			group_by_based_on = 'Created On',
-			filters_json = '{}',
-		))
-
-		self.assertRaises(frappe.ValidationError, chart_doc.insert)
+def create_new_communication(date, rating):
+	communication = {
+		'doctype': 'Communication',
+		'subject': 'Test Communication',
+		'rating': rating,
+		'communication_date': date
+	}
+	frappe.get_doc(communication).insert()

From 19dc0a65b06e75def4d5b755eefb00eb805c64ab Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 13 Mar 2020 17:16:52 +0530
Subject: [PATCH 012/274] feat: initial bingup for cutomization export

---
 .../doctype/customization_export/__init__.py  |  0
 .../customization_export.json                 | 56 +++++++++++++
 .../customization_export.py                   | 10 +++
 .../doctype/manage_customization/__init__.py  |  0
 .../manage_customization.js                   | 46 +++++++++++
 .../manage_customization.json                 | 73 +++++++++++++++++
 .../manage_customization.py                   | 78 +++++++++++++++++++
 .../test_manage_customization.py              | 10 +++
 8 files changed, 273 insertions(+)
 create mode 100644 frappe/custom/doctype/customization_export/__init__.py
 create mode 100644 frappe/custom/doctype/customization_export/customization_export.json
 create mode 100644 frappe/custom/doctype/customization_export/customization_export.py
 create mode 100644 frappe/custom/doctype/manage_customization/__init__.py
 create mode 100644 frappe/custom/doctype/manage_customization/manage_customization.js
 create mode 100644 frappe/custom/doctype/manage_customization/manage_customization.json
 create mode 100644 frappe/custom/doctype/manage_customization/manage_customization.py
 create mode 100644 frappe/custom/doctype/manage_customization/test_manage_customization.py

diff --git a/frappe/custom/doctype/customization_export/__init__.py b/frappe/custom/doctype/customization_export/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/customization_export/customization_export.json b/frappe/custom/doctype/customization_export/customization_export.json
new file mode 100644
index 0000000000..bc59a89f4f
--- /dev/null
+++ b/frappe/custom/doctype/customization_export/customization_export.json
@@ -0,0 +1,56 @@
+{
+ "actions": [],
+ "creation": "2020-03-12 14:51:09.260025",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "sb_00",
+  "filters",
+  "cb_00",
+  "or_filters"
+ ],
+ "fields": [
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "fieldname": "filters",
+   "fieldtype": "Code",
+   "in_list_view": 1,
+   "label": "Filters"
+  },
+  {
+   "fieldname": "or_filters",
+   "fieldtype": "Code",
+   "in_list_view": 1,
+   "label": "Or Filters"
+  },
+  {
+   "fieldname": "sb_00",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-03-13 16:53:15.214275",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Customization Export",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/customization_export/customization_export.py b/frappe/custom/doctype/customization_export/customization_export.py
new file mode 100644
index 0000000000..70a7da3b08
--- /dev/null
+++ b/frappe/custom/doctype/customization_export/customization_export.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class CustomizationExport(Document):
+	pass
diff --git a/frappe/custom/doctype/manage_customization/__init__.py b/frappe/custom/doctype/manage_customization/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.js b/frappe/custom/doctype/manage_customization/manage_customization.js
new file mode 100644
index 0000000000..41e2fd316b
--- /dev/null
+++ b/frappe/custom/doctype/manage_customization/manage_customization.js
@@ -0,0 +1,46 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Manage Customization', {
+	refresh: function(frm) {
+		frappe.realtime.on("exporting_progress", (data) => {
+			if (data.progress !== data.total) {
+				frm.dashboard.show_progress("Exporting", data.progress / data.total * 100, __("{0}", [data.message]));
+			} else {
+				frm.dashboard.hide_progress();
+			}
+		});
+
+		frappe.realtime.on("importing_progress", (data) => {
+			if (data.progress !== data.total) {
+				frm.dashboard.show_progress("Importing", data.progress / data.total * 100, __("{0}", [data.message]));
+			} else {
+				frm.dashboard.hide_progress();
+			}
+		});
+	},
+	export: function(frm) {
+		frappe.call({
+			method: 'frappe.custom.doctype.manage_customization.manage_customization.export_customizations',
+			callback: function(r) {
+				if (r.message) {
+					const args = {
+						cmd: 'frappe.custom.doctype.manage_customization.manage_customization.export_customizations',
+						data: r.message.data
+					};
+					open_url_post(frappe.request.url, args);
+				}
+			}
+		});
+	},
+	import: function(frm) {
+		frappe.call({
+			method: 'frappe.custom.doctype.manage_customization.manage_customization.import_customizations',
+			callback: function(r) {
+				if (r.message) {
+					console.log("done")
+				}
+			}
+		});
+	}
+});
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.json b/frappe/custom/doctype/manage_customization/manage_customization.json
new file mode 100644
index 0000000000..43c4596590
--- /dev/null
+++ b/frappe/custom/doctype/manage_customization/manage_customization.json
@@ -0,0 +1,73 @@
+{
+ "actions": [],
+ "creation": "2020-03-01 23:21:17.394500",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "sb_00",
+  "export_customization",
+  "export",
+  "sb_01",
+  "import_customization",
+  "import"
+ ],
+ "fields": [
+  {
+   "fieldname": "export_customization",
+   "fieldtype": "Table",
+   "label": "Customizations to Export",
+   "options": "Customization Export"
+  },
+  {
+   "fieldname": "sb_00",
+   "fieldtype": "Section Break",
+   "label": "Export Customizations"
+  },
+  {
+   "fieldname": "sb_01",
+   "fieldtype": "Section Break",
+   "label": "Import Customizations"
+  },
+  {
+   "fieldname": "import_customization",
+   "fieldtype": "Attach",
+   "label": "Attach"
+  },
+  {
+   "depends_on": "export_customization",
+   "fieldname": "export",
+   "fieldtype": "Button",
+   "label": "Export"
+  },
+  {
+   "depends_on": "import_customization",
+   "fieldname": "import",
+   "fieldtype": "Button",
+   "label": "Import"
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-03-13 17:14:00.382402",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Manage Customization",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.py b/frappe/custom/doctype/manage_customization/manage_customization.py
new file mode 100644
index 0000000000..3e21b587c9
--- /dev/null
+++ b/frappe/custom/doctype/manage_customization/manage_customization.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+import json
+
+class ManageCustomization(Document):
+	pass
+
+@frappe.whitelist()
+def export_customizations():
+	"""Export fixtures as JSON"""
+
+	export_customizations_doc = frappe.get_single("Manage Customization")
+	customizations = []
+
+	for doctype in export_customizations_doc.export_customization:
+		filters, or_filters = {}, {}
+
+		if doctype.get("filters"):
+			filters = json.loads(doctype.get("filters"))
+		if doctype.get("or_filters"):
+			or_filters = json.loads(doctype.get("or_filters"))
+
+		docs = frappe.get_all(doctype.get("document_type"), filters=filters, or_filters=or_filters)
+		length = len(docs)
+		for idx, doc in enumerate(docs):
+			frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doctype.get("document_type")), user=frappe.session.user)
+			customizations.append(frappe.get_doc(doctype.get("document_type"), doc.name).as_dict())
+
+	return frappe._dict({
+		"data": post_process(customizations)
+	})
+
+@frappe.whitelist()
+def import_customizations():
+	"""Import fixtures as JSON"""
+
+	import_customizations_doc = frappe.get_single("Manage Customization")
+
+	with open(frappe.utils.get_url() + import_customizations_doc.import_customization, 'r') as f:
+		f = json.loads(f)
+
+		length = f.get("data")
+
+		for idx, doc in enumerate(f.get("data")):
+			frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
+			frappe.get_doc(doc).insert(ignore_permissions=True)
+
+def post_process(customizations):
+	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'name', 'modified', 'docstatus')
+
+	for doc in customizations:
+		for key in del_keys:
+			if key in doc:
+				del doc[key]
+
+		for key, value in doc.items():
+			if not isinstance(value, list):
+				continue
+
+			for child in value:
+				for key in del_keys:
+					if key in child:
+						del child[key]
+
+	return customizations
+
+@frappe.whitelist()
+def download_customization_json():
+	data = frappe._dict(frappe.local.form_dict)
+	frappe.response['filename'] = 'Customizations.json'
+	frappe.response['filecontent'] = data.get("data")
+	frappe.response['content_type'] = 'application/json'
+	frappe.response['type'] = 'download'
\ No newline at end of file
diff --git a/frappe/custom/doctype/manage_customization/test_manage_customization.py b/frappe/custom/doctype/manage_customization/test_manage_customization.py
new file mode 100644
index 0000000000..af1a332bb4
--- /dev/null
+++ b/frappe/custom/doctype/manage_customization/test_manage_customization.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestManageCustomization(unittest.TestCase):
+	pass

From eb57ec7903cbd5dc58e5deb8281f850d37d3f327 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 13 Mar 2020 18:21:14 +0530
Subject: [PATCH 013/274] fix: importer for customization fix

---
 .../manage_customization.js                    |  6 ++----
 .../manage_customization.py                    | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frappe/custom/doctype/manage_customization/manage_customization.js b/frappe/custom/doctype/manage_customization/manage_customization.js
index 41e2fd316b..418a7c2c17 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.js
+++ b/frappe/custom/doctype/manage_customization/manage_customization.js
@@ -36,10 +36,8 @@ frappe.ui.form.on('Manage Customization', {
 	import: function(frm) {
 		frappe.call({
 			method: 'frappe.custom.doctype.manage_customization.manage_customization.import_customizations',
-			callback: function(r) {
-				if (r.message) {
-					console.log("done")
-				}
+			callback: function() {
+				frappe.msgprint(__("Customizations Imported."));
 			}
 		});
 	}
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.py b/frappe/custom/doctype/manage_customization/manage_customization.py
index 3e21b587c9..feb140251a 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.py
+++ b/frappe/custom/doctype/manage_customization/manage_customization.py
@@ -39,16 +39,20 @@ def export_customizations():
 def import_customizations():
 	"""Import fixtures as JSON"""
 
-	import_customizations_doc = frappe.get_single("Manage Customization")
+	import_file = frappe.get_all("File", filters={
+		"attached_to_doctype": "Manage Customization",
+		"attached_to_name": "Manage Customization"
+	}, limit=1, order_by="creation desc")
 
-	with open(frappe.utils.get_url() + import_customizations_doc.import_customization, 'r') as f:
-		f = json.loads(f)
+	if not import_file:
+		return
 
-		length = f.get("data")
+	content = json.loads(frappe.get_doc("File", import_file[0].name).get_content())
+	length = len(content)
 
-		for idx, doc in enumerate(f.get("data")):
-			frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
-			frappe.get_doc(doc).insert(ignore_permissions=True)
+	for idx, doc in enumerate(content.get("message").get("data")):
+		frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
+		frappe.get_doc(doc).insert(ignore_permissions=True)
 
 def post_process(customizations):
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'name', 'modified', 'docstatus')

From 846594d6c8516a9ed89ec73404b47cc46d5936a8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 13 Mar 2020 18:41:36 +0530
Subject: [PATCH 014/274] fix: miscellaneous fixes

---
 .../custom/doctype/manage_customization/manage_customization.js | 2 +-
 .../custom/doctype/manage_customization/manage_customization.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/custom/doctype/manage_customization/manage_customization.js b/frappe/custom/doctype/manage_customization/manage_customization.js
index 418a7c2c17..4c86519dd8 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.js
+++ b/frappe/custom/doctype/manage_customization/manage_customization.js
@@ -28,7 +28,7 @@ frappe.ui.form.on('Manage Customization', {
 						cmd: 'frappe.custom.doctype.manage_customization.manage_customization.export_customizations',
 						data: r.message.data
 					};
-					open_url_post(frappe.request.url, args);
+					open_url_post(frappe.request.url, args, true);
 				}
 			}
 		});
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.py b/frappe/custom/doctype/manage_customization/manage_customization.py
index feb140251a..f3c18d5017 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.py
+++ b/frappe/custom/doctype/manage_customization/manage_customization.py
@@ -52,7 +52,7 @@ def import_customizations():
 
 	for idx, doc in enumerate(content.get("message").get("data")):
 		frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
-		frappe.get_doc(doc).insert(ignore_permissions=True)
+		frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
 
 def post_process(customizations):
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'name', 'modified', 'docstatus')

From b3f45bd81c81747713359bab032b962c4d166fac Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 14 Mar 2020 11:59:13 +0530
Subject: [PATCH 015/274] feat: rename to package

---
 frappe/config/customization.py                |  8 +--
 .../__init__.py                               |  0
 .../package.js}                               | 18 +++---
 .../package.json}                             | 58 +++++++++++--------
 .../package.py}                               | 44 +++++++-------
 .../test_package.py}                          |  2 +-
 .../__init__.py                               |  0
 .../package_doctype.json}                     | 22 +++----
 .../package_doctype.py}                       |  2 +-
 9 files changed, 82 insertions(+), 72 deletions(-)
 rename frappe/custom/doctype/{customization_export => package}/__init__.py (100%)
 rename frappe/custom/doctype/{manage_customization/manage_customization.js => package/package.js} (56%)
 rename frappe/custom/doctype/{manage_customization/manage_customization.json => package/package.json} (63%)
 rename frappe/custom/doctype/{manage_customization/manage_customization.py => package/package.py} (55%)
 rename frappe/custom/doctype/{manage_customization/test_manage_customization.py => package/test_package.py} (78%)
 rename frappe/custom/doctype/{manage_customization => package_doctype}/__init__.py (100%)
 rename frappe/custom/doctype/{customization_export/customization_export.json => package_doctype/package_doctype.json} (88%)
 rename frappe/custom/doctype/{customization_export/customization_export.py => package_doctype/package_doctype.py} (86%)

diff --git a/frappe/config/customization.py b/frappe/config/customization.py
index 06eaa2ea00..3d587e6839 100644
--- a/frappe/config/customization.py
+++ b/frappe/config/customization.py
@@ -3,7 +3,7 @@ from frappe import _
 
 def get_data():
 	return [
-        {
+		{
 			"label": _("Form Customization"),
 			"icon": "fa fa-glass",
 			"items": [
@@ -57,9 +57,9 @@ def get_data():
 				},
 				{
 					"type": "doctype",
-					"label": _("Custom Tags"),
-					"name": "Tag Category",
-					"description": _("Add your own Tag Categories")
+					"label": _("Package"),
+					"name": "Package",
+					"description": _("Import and Export Packages.")
 				}
 			]
 		}
diff --git a/frappe/custom/doctype/customization_export/__init__.py b/frappe/custom/doctype/package/__init__.py
similarity index 100%
rename from frappe/custom/doctype/customization_export/__init__.py
rename to frappe/custom/doctype/package/__init__.py
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.js b/frappe/custom/doctype/package/package.js
similarity index 56%
rename from frappe/custom/doctype/manage_customization/manage_customization.js
rename to frappe/custom/doctype/package/package.js
index 4c86519dd8..c362c51b24 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.js
+++ b/frappe/custom/doctype/package/package.js
@@ -1,18 +1,18 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Manage Customization', {
+frappe.ui.form.on('Package', {
 	refresh: function(frm) {
-		frappe.realtime.on("exporting_progress", (data) => {
-			if (data.progress !== data.total) {
+		frappe.realtime.on("exporting_package", (data) => {
+			if (data.progress !== (data.total-1)) {
 				frm.dashboard.show_progress("Exporting", data.progress / data.total * 100, __("{0}", [data.message]));
 			} else {
 				frm.dashboard.hide_progress();
 			}
 		});
 
-		frappe.realtime.on("importing_progress", (data) => {
-			if (data.progress !== data.total) {
+		frappe.realtime.on("importing_package", (data) => {
+			if (data.progress !== (data.total-1)) {
 				frm.dashboard.show_progress("Importing", data.progress / data.total * 100, __("{0}", [data.message]));
 			} else {
 				frm.dashboard.hide_progress();
@@ -21,11 +21,11 @@ frappe.ui.form.on('Manage Customization', {
 	},
 	export: function(frm) {
 		frappe.call({
-			method: 'frappe.custom.doctype.manage_customization.manage_customization.export_customizations',
+			method: 'frappe.custom.doctype.package.package.export_package',
 			callback: function(r) {
 				if (r.message) {
 					const args = {
-						cmd: 'frappe.custom.doctype.manage_customization.manage_customization.export_customizations',
+						cmd: 'frappe.custom.doctype.package.package.download_package',
 						data: r.message.data
 					};
 					open_url_post(frappe.request.url, args, true);
@@ -35,9 +35,9 @@ frappe.ui.form.on('Manage Customization', {
 	},
 	import: function(frm) {
 		frappe.call({
-			method: 'frappe.custom.doctype.manage_customization.manage_customization.import_customizations',
+			method: 'frappe.custom.doctype.package.package.import_package',
 			callback: function() {
-				frappe.msgprint(__("Customizations Imported."));
+				frappe.msgprint(__("Package Imported."));
 			}
 		});
 	}
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.json b/frappe/custom/doctype/package/package.json
similarity index 63%
rename from frappe/custom/doctype/manage_customization/manage_customization.json
rename to frappe/custom/doctype/package/package.json
index 43c4596590..cad2ca6788 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.json
+++ b/frappe/custom/doctype/package/package.json
@@ -1,58 +1,58 @@
 {
  "actions": [],
- "creation": "2020-03-01 23:21:17.394500",
+ "creation": "2020-03-14 11:20:14.850552",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "sb_00",
-  "export_customization",
+  "export_package",
   "export",
   "sb_01",
-  "import_customization",
+  "import_package",
   "import"
  ],
  "fields": [
-  {
-   "fieldname": "export_customization",
-   "fieldtype": "Table",
-   "label": "Customizations to Export",
-   "options": "Customization Export"
-  },
   {
    "fieldname": "sb_00",
    "fieldtype": "Section Break",
-   "label": "Export Customizations"
+   "label": "Export Package"
   },
   {
-   "fieldname": "sb_01",
-   "fieldtype": "Section Break",
-   "label": "Import Customizations"
-  },
-  {
-   "fieldname": "import_customization",
-   "fieldtype": "Attach",
-   "label": "Attach"
-  },
-  {
-   "depends_on": "export_customization",
+   "depends_on": "export_package",
    "fieldname": "export",
    "fieldtype": "Button",
    "label": "Export"
   },
   {
-   "depends_on": "import_customization",
+   "fieldname": "sb_01",
+   "fieldtype": "Section Break",
+   "label": "Import Package"
+  },
+  {
+   "depends_on": "import_package",
    "fieldname": "import",
    "fieldtype": "Button",
    "label": "Import"
+  },
+  {
+   "fieldname": "export_package",
+   "fieldtype": "Table",
+   "label": "Package",
+   "options": "Package DocType"
+  },
+  {
+   "fieldname": "import_package",
+   "fieldtype": "Attach",
+   "label": "Attach"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-13 17:14:00.382402",
+ "modified": "2020-03-14 11:52:58.221081",
  "modified_by": "Administrator",
  "module": "Custom",
- "name": "Manage Customization",
+ "name": "Package",
  "owner": "Administrator",
  "permissions": [
   {
@@ -64,6 +64,16 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
   }
  ],
  "quick_entry": 1,
diff --git a/frappe/custom/doctype/manage_customization/manage_customization.py b/frappe/custom/doctype/package/package.py
similarity index 55%
rename from frappe/custom/doctype/manage_customization/manage_customization.py
rename to frappe/custom/doctype/package/package.py
index f3c18d5017..e3a29144d9 100644
--- a/frappe/custom/doctype/manage_customization/manage_customization.py
+++ b/frappe/custom/doctype/package/package.py
@@ -7,17 +7,17 @@ import frappe
 from frappe.model.document import Document
 import json
 
-class ManageCustomization(Document):
+class Package(Document):
 	pass
 
 @frappe.whitelist()
-def export_customizations():
-	"""Export fixtures as JSON"""
+def export_package():
+	"""Export package as JSON"""
 
-	export_customizations_doc = frappe.get_single("Manage Customization")
-	customizations = []
+	package_doc = frappe.get_single("Package")
+	package = []
 
-	for doctype in export_customizations_doc.export_customization:
+	for doctype in package_doc.export_package:
 		filters, or_filters = {}, {}
 
 		if doctype.get("filters"):
@@ -28,36 +28,36 @@ def export_customizations():
 		docs = frappe.get_all(doctype.get("document_type"), filters=filters, or_filters=or_filters)
 		length = len(docs)
 		for idx, doc in enumerate(docs):
-			frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doctype.get("document_type")), user=frappe.session.user)
-			customizations.append(frappe.get_doc(doctype.get("document_type"), doc.name).as_dict())
+			frappe.publish_realtime("exporting_package", dict(progress=idx, total=length, message=doctype.get("document_type")), user=frappe.session.user)
+			package.append(frappe.get_doc(doctype.get("document_type"), doc.name).as_dict())
 
 	return frappe._dict({
-		"data": post_process(customizations)
+		"data": post_process(package)
 	})
 
 @frappe.whitelist()
-def import_customizations():
-	"""Import fixtures as JSON"""
+def import_package():
+	"""Import package from JSON"""
 
-	import_file = frappe.get_all("File", filters={
-		"attached_to_doctype": "Manage Customization",
-		"attached_to_name": "Manage Customization"
+	package_file = frappe.get_all("File", filters={
+		"attached_to_doctype": "Package",
+		"attached_to_name": "Package"
 	}, limit=1, order_by="creation desc")
 
-	if not import_file:
+	if not package_file:
 		return
 
-	content = json.loads(frappe.get_doc("File", import_file[0].name).get_content())
+	content = json.loads(frappe.get_doc("File", package_file[0].name).get_content())
 	length = len(content)
 
 	for idx, doc in enumerate(content.get("message").get("data")):
-		frappe.publish_realtime("exporting_progress", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
+		frappe.publish_realtime("importing_package", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
 		frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
 
-def post_process(customizations):
+def post_process(package):
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'name', 'modified', 'docstatus')
 
-	for doc in customizations:
+	for doc in package:
 		for key in del_keys:
 			if key in doc:
 				del doc[key]
@@ -71,12 +71,12 @@ def post_process(customizations):
 					if key in child:
 						del child[key]
 
-	return customizations
+	return package
 
 @frappe.whitelist()
-def download_customization_json():
+def download_package():
 	data = frappe._dict(frappe.local.form_dict)
-	frappe.response['filename'] = 'Customizations.json'
+	frappe.response['filename'] = 'Package.json'
 	frappe.response['filecontent'] = data.get("data")
 	frappe.response['content_type'] = 'application/json'
 	frappe.response['type'] = 'download'
\ No newline at end of file
diff --git a/frappe/custom/doctype/manage_customization/test_manage_customization.py b/frappe/custom/doctype/package/test_package.py
similarity index 78%
rename from frappe/custom/doctype/manage_customization/test_manage_customization.py
rename to frappe/custom/doctype/package/test_package.py
index af1a332bb4..3a17d51260 100644
--- a/frappe/custom/doctype/manage_customization/test_manage_customization.py
+++ b/frappe/custom/doctype/package/test_package.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestManageCustomization(unittest.TestCase):
+class TestPackage(unittest.TestCase):
 	pass
diff --git a/frappe/custom/doctype/manage_customization/__init__.py b/frappe/custom/doctype/package_doctype/__init__.py
similarity index 100%
rename from frappe/custom/doctype/manage_customization/__init__.py
rename to frappe/custom/doctype/package_doctype/__init__.py
diff --git a/frappe/custom/doctype/customization_export/customization_export.json b/frappe/custom/doctype/package_doctype/package_doctype.json
similarity index 88%
rename from frappe/custom/doctype/customization_export/customization_export.json
rename to frappe/custom/doctype/package_doctype/package_doctype.json
index bc59a89f4f..cfc4cbbe8f 100644
--- a/frappe/custom/doctype/customization_export/customization_export.json
+++ b/frappe/custom/doctype/package_doctype/package_doctype.json
@@ -1,6 +1,6 @@
 {
  "actions": [],
- "creation": "2020-03-12 14:51:09.260025",
+ "creation": "2020-03-14 11:20:42.875446",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
@@ -20,33 +20,33 @@
    "options": "DocType",
    "reqd": 1
   },
+  {
+   "fieldname": "sb_00",
+   "fieldtype": "Section Break"
+  },
   {
    "fieldname": "filters",
    "fieldtype": "Code",
    "in_list_view": 1,
    "label": "Filters"
   },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  },
   {
    "fieldname": "or_filters",
    "fieldtype": "Code",
    "in_list_view": 1,
    "label": "Or Filters"
-  },
-  {
-   "fieldname": "sb_00",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "cb_00",
-   "fieldtype": "Column Break"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-03-13 16:53:15.214275",
+ "modified": "2020-03-14 11:20:42.875446",
  "modified_by": "Administrator",
  "module": "Custom",
- "name": "Customization Export",
+ "name": "Package DocType",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
diff --git a/frappe/custom/doctype/customization_export/customization_export.py b/frappe/custom/doctype/package_doctype/package_doctype.py
similarity index 86%
rename from frappe/custom/doctype/customization_export/customization_export.py
rename to frappe/custom/doctype/package_doctype/package_doctype.py
index 70a7da3b08..c185395965 100644
--- a/frappe/custom/doctype/customization_export/customization_export.py
+++ b/frappe/custom/doctype/package_doctype/package_doctype.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class CustomizationExport(Document):
+class PackageDocType(Document):
 	pass

From 6aa5580eaee2bc6112d81a5d6be36dcc45a6ab35 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 14 Mar 2020 12:16:30 +0530
Subject: [PATCH 016/274] Update package.py

---
 frappe/custom/doctype/package/package.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index e3a29144d9..e3b6468791 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -50,7 +50,7 @@ def import_package():
 	content = json.loads(frappe.get_doc("File", package_file[0].name).get_content())
 	length = len(content)
 
-	for idx, doc in enumerate(content.get("message").get("data")):
+	for idx, doc in enumerate(content):
 		frappe.publish_realtime("importing_package", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
 		frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
 
@@ -79,4 +79,4 @@ def download_package():
 	frappe.response['filename'] = 'Package.json'
 	frappe.response['filecontent'] = data.get("data")
 	frappe.response['content_type'] = 'application/json'
-	frappe.response['type'] = 'download'
\ No newline at end of file
+	frappe.response['type'] = 'download'

From ea93f12a9a8b5557b1bbcc90c1d656f577f680aa Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 16 Mar 2020 22:29:55 +0530
Subject: [PATCH 017/274] feat: use UI for adding filters

---
 frappe/custom/doctype/package/package.js      | 80 +++++++++++++++++++
 frappe/custom/doctype/package/package.py      | 29 +++----
 .../package_doctype/package_doctype.json      | 32 +++-----
 3 files changed, 105 insertions(+), 36 deletions(-)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index c362c51b24..08ec8ac96b 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -42,3 +42,83 @@ frappe.ui.form.on('Package', {
 		});
 	}
 });
+
+frappe.ui.form.on('Package DocType', {
+	form_render: function (frm, cdt, cdn) {
+		function _show_filters(filters, table) {
+			table.find('tbody').empty();
+
+			if (filters.length > 0) {
+				filters.forEach(filter => {
+					const filter_row =
+						$(`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`);
+
+					table.find('tbody').append(filter_row);
+				});
+			} else {
+				const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+					${__("Click to Set Filters")}</td></tr>`);
+				table.find('tbody').append(filter_row);
+			}
+		}
+
+		let row = frappe.get_doc(cdt, cdn);
+
+		let wrapper = $(`[data-fieldname="filters_json"]`).empty();
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+				<thead>
+					<tr>
+						<th style="width: 33%">${__('Filter')}</th>
+						<th style="width: 33%">${__('Condition')}</th>
+						<th>${__('Value')}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>`).appendTo(wrapper);
+		$(`<p class="text-muted small">${__("Click table to edit")}</p>`).appendTo(wrapper);
+
+		let filters = JSON.parse(row.filters_json || '[]');
+		_show_filters(filters, table);
+
+		table.on('click', () => {
+			frappe.model.with_doctype(row.document_type, function() {
+				let dialog = new frappe.ui.Dialog({
+					title: __('Set Filters'),
+					fields: [
+						{
+							fieldtype: 'HTML',
+							label: 'Filters',
+							fieldname: 'filter_area',
+						}
+					],
+					primary_action: function() {
+						let values = filter_group.get_filters();
+						let flt = []
+						if (values) {
+							values.forEach(function(value) {
+								flt.push([value[0], value[1], value[2], value[3]]);
+							});
+						}
+						row.filters_json = JSON.stringify(flt);
+						_show_filters(flt, table);
+						dialog.hide();
+					},
+					primary_action_label: "Set"
+				});
+
+				let filter_group = new frappe.ui.FilterGroup({
+					parent: dialog.get_field('filter_area').$wrapper,
+					doctype: row.document_type,
+					on_change: () => {},
+				});
+				filter_group.add_filters_to_filter_group(filters);
+				dialog.show();
+			})
+		});
+	},
+});
\ No newline at end of file
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index e3b6468791..06edcc4ce0 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -18,14 +18,12 @@ def export_package():
 	package = []
 
 	for doctype in package_doc.export_package:
-		filters, or_filters = {}, {}
+		filters = []
 
-		if doctype.get("filters"):
-			filters = json.loads(doctype.get("filters"))
-		if doctype.get("or_filters"):
-			or_filters = json.loads(doctype.get("or_filters"))
+		if doctype.get("filters_json"):
+			filters = json.loads(doctype.get("filters_json"))
 
-		docs = frappe.get_all(doctype.get("document_type"), filters=filters, or_filters=or_filters)
+		docs = frappe.get_all(doctype.get("document_type"), filters=filters)
 		length = len(docs)
 		for idx, doc in enumerate(docs):
 			frappe.publish_realtime("exporting_package", dict(progress=idx, total=length, message=doctype.get("document_type")), user=frappe.session.user)
@@ -36,18 +34,21 @@ def export_package():
 	})
 
 @frappe.whitelist()
-def import_package():
+def import_package(package=None):
 	"""Import package from JSON"""
 
-	package_file = frappe.get_all("File", filters={
-		"attached_to_doctype": "Package",
-		"attached_to_name": "Package"
-	}, limit=1, order_by="creation desc")
+	if not package:
+		package_file = frappe.get_all("File", filters={
+			"attached_to_doctype": "Package",
+			"attached_to_name": "Package"
+		}, limit=1, order_by="creation desc")
 
-	if not package_file:
-		return
+		if not package_file:
+			return
 
-	content = json.loads(frappe.get_doc("File", package_file[0].name).get_content())
+		package = frappe.get_doc("File", package_file[0].name).get_content()
+
+	content = json.loads(package)
 	length = len(content)
 
 	for idx, doc in enumerate(content):
diff --git a/frappe/custom/doctype/package_doctype/package_doctype.json b/frappe/custom/doctype/package_doctype/package_doctype.json
index cfc4cbbe8f..353f01a673 100644
--- a/frappe/custom/doctype/package_doctype/package_doctype.json
+++ b/frappe/custom/doctype/package_doctype/package_doctype.json
@@ -6,10 +6,8 @@
  "engine": "InnoDB",
  "field_order": [
   "document_type",
-  "sb_00",
-  "filters",
-  "cb_00",
-  "or_filters"
+  "section_break_4",
+  "filters_json"
  ],
  "fields": [
   {
@@ -21,29 +19,19 @@
    "reqd": 1
   },
   {
-   "fieldname": "sb_00",
+   "fieldname": "filters_json",
+   "fieldtype": "Code",
+   "label": "Filters",
+   "options": "JSON"
+  },
+  {
+   "fieldname": "section_break_4",
    "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "filters",
-   "fieldtype": "Code",
-   "in_list_view": 1,
-   "label": "Filters"
-  },
-  {
-   "fieldname": "cb_00",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "or_filters",
-   "fieldtype": "Code",
-   "in_list_view": 1,
-   "label": "Or Filters"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-03-14 11:20:42.875446",
+ "modified": "2020-03-16 22:11:40.479498",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package DocType",

From f0ec5cec0e0da7b07caf1172fbb8e20fa8cf2230 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 17 Mar 2020 11:37:47 +0530
Subject: [PATCH 018/274] feat: package migrator

---
 .../doctype/package_migration/__init__.py     |  0
 .../package_migration/package_migration.js    | 51 +++++++++++++++++++
 .../package_migration/package_migration.json  | 42 +++++++++++++++
 .../package_migration/package_migration.py    | 28 ++++++++++
 .../test_package_migration.py                 | 10 ++++
 5 files changed, 131 insertions(+)
 create mode 100644 frappe/custom/doctype/package_migration/__init__.py
 create mode 100644 frappe/custom/doctype/package_migration/package_migration.js
 create mode 100644 frappe/custom/doctype/package_migration/package_migration.json
 create mode 100644 frappe/custom/doctype/package_migration/package_migration.py
 create mode 100644 frappe/custom/doctype/package_migration/test_package_migration.py

diff --git a/frappe/custom/doctype/package_migration/__init__.py b/frappe/custom/doctype/package_migration/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/package_migration/package_migration.js b/frappe/custom/doctype/package_migration/package_migration.js
new file mode 100644
index 0000000000..020092f5f3
--- /dev/null
+++ b/frappe/custom/doctype/package_migration/package_migration.js
@@ -0,0 +1,51 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Package Migration', {
+	refresh: function(frm) {
+		if (frm.doc.attach) {
+			frm.add_custom_button(__("Connect"), function() {
+				let dialog = new frappe.ui.Dialog({
+					title: __('Connect to Remote Instance'),
+					fields: [
+						{
+							fieldtype: 'Data',
+							label: 'Remote Instance',
+							fieldname: 'remote_instance',
+							reqd: 1
+						},
+						{
+							fieldtype: 'Data',
+							label: 'User',
+							fieldname: 'user',
+							reqd: 1
+						},
+						{
+							fieldtype: 'Password',
+							label: 'Password',
+							fieldname: 'password',
+							reqd: 1
+						},
+					],
+					primary_action: function() {
+						let values = dialog.get_values();
+						frm.call("install_package_to_remote", {
+							"remote_instance": values.remote_instance,
+							"user": values.user,
+							"password": values.password
+						}).then((r) => {
+							console.log(r);
+						})
+						dialog.hide();
+					},
+					primary_action_label: "Execute"
+				});
+				dialog.show();
+			})
+		}
+	}
+});
+
+// "erpnext_support_password": "uYrMeEhb2NzuEGOk",
+//  "erpnext_support_url": "https://marketplace.erpnext.com",
+//  "erpnext_support_user": "erpnext_support_fQrhUujW@erpnext.com",
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_migration/package_migration.json b/frappe/custom/doctype/package_migration/package_migration.json
new file mode 100644
index 0000000000..a3c230502b
--- /dev/null
+++ b/frappe/custom/doctype/package_migration/package_migration.json
@@ -0,0 +1,42 @@
+{
+ "actions": [],
+ "creation": "2020-03-17 00:13:31.851579",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "attach"
+ ],
+ "fields": [
+  {
+   "fieldname": "attach",
+   "fieldtype": "Attach",
+   "in_list_view": 1,
+   "label": "Attach",
+   "reqd": 1
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-03-17 10:00:26.676328",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Package Migration",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_migration/package_migration.py b/frappe/custom/doctype/package_migration/package_migration.py
new file mode 100644
index 0000000000..cdcbc0bd19
--- /dev/null
+++ b/frappe/custom/doctype/package_migration/package_migration.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.frappeclient import FrappeClient
+from frappe.model.document import Document
+from frappe import _
+
+class PackageMigration(Document):
+
+	def install_package_to_remote(self, remote_instance, user, password):
+		connection = FrappeClient(remote_instance, user, password)
+
+		package_file = frappe.get_all("File", filters={
+			"attached_to_doctype": "Package Migration",
+			"attached_to_name": "Package Migration"
+		}, limit=1, order_by="creation desc")
+
+		try:
+			connection.post_request({
+				"cmd": "frappe.custom.doctype.package.package.import_package",
+				"package": frappe.get_doc("File", package_file[0].name).get_content()
+			})
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			frappe.throw(_("Could not connect to Remote Site."))
diff --git a/frappe/custom/doctype/package_migration/test_package_migration.py b/frappe/custom/doctype/package_migration/test_package_migration.py
new file mode 100644
index 0000000000..8b438145e8
--- /dev/null
+++ b/frappe/custom/doctype/package_migration/test_package_migration.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestPackageMigration(unittest.TestCase):
+	pass

From 230d78df2511032f7bc93021b004ab1786911726 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 18 Mar 2020 16:16:41 +0530
Subject: [PATCH 019/274] feat: deploy remote instance with package

---
 frappe/custom/doctype/package/package.js      | 42 ++---------
 frappe/custom/doctype/package/package.json    | 37 +--------
 frappe/custom/doctype/package/package.py      | 75 ++++++++++++-------
 .../package_doctype/package_doctype.json      | 23 +++++-
 .../package_migration/package_migration.js    | 51 -------------
 .../package_migration/package_migration.py    | 28 -------
 .../__init__.py                               |  0
 frappe/custom/doctype/release/release.js      | 22 ++++++
 .../release.json}                             | 17 ++---
 frappe/custom/doctype/release/release.py      | 45 +++++++++++
 .../test_release.py}                          |  2 +-
 .../doctype/release_instance/__init__.py      |  0
 .../release_instance/release_instance.json    | 31 ++++++++
 .../release_instance/release_instance.py      | 10 +++
 .../doctype/remote_instance/__init__.py       |  0
 .../remote_instance/remote_instance.js        |  8 ++
 .../remote_instance/remote_instance.json      | 67 +++++++++++++++++
 .../remote_instance/remote_instance.py        | 10 +++
 .../remote_instance/test_remote_instance.py   | 10 +++
 19 files changed, 290 insertions(+), 188 deletions(-)
 delete mode 100644 frappe/custom/doctype/package_migration/package_migration.js
 delete mode 100644 frappe/custom/doctype/package_migration/package_migration.py
 rename frappe/custom/doctype/{package_migration => release}/__init__.py (100%)
 create mode 100644 frappe/custom/doctype/release/release.js
 rename frappe/custom/doctype/{package_migration/package_migration.json => release/release.json} (67%)
 create mode 100644 frappe/custom/doctype/release/release.py
 rename frappe/custom/doctype/{package_migration/test_package_migration.py => release/test_release.py} (79%)
 create mode 100644 frappe/custom/doctype/release_instance/__init__.py
 create mode 100644 frappe/custom/doctype/release_instance/release_instance.json
 create mode 100644 frappe/custom/doctype/release_instance/release_instance.py
 create mode 100644 frappe/custom/doctype/remote_instance/__init__.py
 create mode 100644 frappe/custom/doctype/remote_instance/remote_instance.js
 create mode 100644 frappe/custom/doctype/remote_instance/remote_instance.json
 create mode 100644 frappe/custom/doctype/remote_instance/remote_instance.py
 create mode 100644 frappe/custom/doctype/remote_instance/test_remote_instance.py

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index 08ec8ac96b..2fb0b8eb1d 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -3,44 +3,12 @@
 
 frappe.ui.form.on('Package', {
 	refresh: function(frm) {
-		frappe.realtime.on("exporting_package", (data) => {
-			if (data.progress !== (data.total-1)) {
-				frm.dashboard.show_progress("Exporting", data.progress / data.total * 100, __("{0}", [data.message]));
-			} else {
-				frm.dashboard.hide_progress();
-			}
-		});
-
-		frappe.realtime.on("importing_package", (data) => {
-			if (data.progress !== (data.total-1)) {
-				frm.dashboard.show_progress("Importing", data.progress / data.total * 100, __("{0}", [data.message]));
-			} else {
-				frm.dashboard.hide_progress();
-			}
-		});
+		if (frm.doc.export_package) {
+			frm.add_custom_button(__("Go to Release"), function() {
+				frappe.set_route("Form", "Release", "Release");
+			});
+		}
 	},
-	export: function(frm) {
-		frappe.call({
-			method: 'frappe.custom.doctype.package.package.export_package',
-			callback: function(r) {
-				if (r.message) {
-					const args = {
-						cmd: 'frappe.custom.doctype.package.package.download_package',
-						data: r.message.data
-					};
-					open_url_post(frappe.request.url, args, true);
-				}
-			}
-		});
-	},
-	import: function(frm) {
-		frappe.call({
-			method: 'frappe.custom.doctype.package.package.import_package',
-			callback: function() {
-				frappe.msgprint(__("Package Imported."));
-			}
-		});
-	}
 });
 
 frappe.ui.form.on('Package DocType', {
diff --git a/frappe/custom/doctype/package/package.json b/frappe/custom/doctype/package/package.json
index cad2ca6788..1d71b744d1 100644
--- a/frappe/custom/doctype/package/package.json
+++ b/frappe/custom/doctype/package/package.json
@@ -5,51 +5,20 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "sb_00",
-  "export_package",
-  "export",
-  "sb_01",
-  "import_package",
-  "import"
+  "export_package"
  ],
  "fields": [
   {
-   "fieldname": "sb_00",
-   "fieldtype": "Section Break",
-   "label": "Export Package"
-  },
-  {
-   "depends_on": "export_package",
-   "fieldname": "export",
-   "fieldtype": "Button",
-   "label": "Export"
-  },
-  {
-   "fieldname": "sb_01",
-   "fieldtype": "Section Break",
-   "label": "Import Package"
-  },
-  {
-   "depends_on": "import_package",
-   "fieldname": "import",
-   "fieldtype": "Button",
-   "label": "Import"
-  },
-  {
+   "description": "Click on the row for accessing filters.",
    "fieldname": "export_package",
    "fieldtype": "Table",
    "label": "Package",
    "options": "Package DocType"
-  },
-  {
-   "fieldname": "import_package",
-   "fieldtype": "Attach",
-   "label": "Attach"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-14 11:52:58.221081",
+ "modified": "2020-03-17 16:41:13.542896",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package",
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 06edcc4ce0..a51386acfc 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -4,8 +4,10 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.model.document import Document
 import json
+from frappe.model.document import Document
+from frappe.core.doctype.version.version import get_diff
+from frappe.utils.file_manager import save_file
 
 class Package(Document):
 	pass
@@ -25,9 +27,29 @@ def export_package():
 
 		docs = frappe.get_all(doctype.get("document_type"), filters=filters)
 		length = len(docs)
+
 		for idx, doc in enumerate(docs):
-			frappe.publish_realtime("exporting_package", dict(progress=idx, total=length, message=doctype.get("document_type")), user=frappe.session.user)
-			package.append(frappe.get_doc(doctype.get("document_type"), doc.name).as_dict())
+			frappe.publish_realtime("exporting_package", {"progress":idx, "total":length, "message":doctype.get("document_type")},
+				user=frappe.session.user)
+
+			document = frappe.get_doc(doctype.get("document_type"), doc.name).as_dict()
+
+			if doctype.attachments:
+				attachments = []
+				filters = {"attached_to_doctype": document.get("doctype"), "attached_to_name": document.get("doctype")}
+				for f in frappe.get_list("File", filters=filters):
+					attachments.append({
+						"fname": f.name,
+						"content": frappe.get_doc("File", f.name).get_content()
+					})
+
+				document.update({"attachments": json.dumps(attachments)})
+
+			if doctype.overwrite:
+				document.update({"overwrite": 1})
+
+			document.update({"modified": frappe.utils.get_datetime_str(document.get("modified"))})
+			package.append(document)
 
 	return frappe._dict({
 		"data": post_process(package)
@@ -37,26 +59,33 @@ def export_package():
 def import_package(package=None):
 	"""Import package from JSON"""
 
-	if not package:
-		package_file = frappe.get_all("File", filters={
-			"attached_to_doctype": "Package",
-			"attached_to_name": "Package"
-		}, limit=1, order_by="creation desc")
-
-		if not package_file:
-			return
-
-		package = frappe.get_doc("File", package_file[0].name).get_content()
-
 	content = json.loads(package)
 	length = len(content)
 
-	for idx, doc in enumerate(content):
-		frappe.publish_realtime("importing_package", dict(progress=idx, total=length, message=doc.get("doctype")), user=frappe.session.user)
-		frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
+	for doc in content:
+		docname = doc.pop("name")
+		modified = doc.pop("modified")
+		overwrite = doc.pop("overwrite")
+		exists = frappe.db.exists(doc.get("doctype"), docname)
+
+		if not exists:
+			d = frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
+			if doc.get("attachments"):
+				add_attachment(doc.get("attachments"), d)
+		elif exists and overwrite:
+			document = frappe.get_doc(doc.get("doctype"), doc.pop("name"))
+			if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified):
+				document.update(doc)
+				document.save()
+				if doc.get("attachments"):
+					add_attachment(doc.get("attachments"), document)
+
+def add_attachment(attachments, doc):
+	for attachment in attachments:
+		save_file(attachment.get("fname"), attachment.get("content"), doc.get("doctype"), doc.get("name"))
 
 def post_process(package):
-	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'name', 'modified', 'docstatus')
+	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus')
 
 	for doc in package:
 		for key in del_keys:
@@ -68,16 +97,8 @@ def post_process(package):
 				continue
 
 			for child in value:
-				for key in del_keys:
+				for key in del_keys + ('name'):
 					if key in child:
 						del child[key]
 
 	return package
-
-@frappe.whitelist()
-def download_package():
-	data = frappe._dict(frappe.local.form_dict)
-	frappe.response['filename'] = 'Package.json'
-	frappe.response['filecontent'] = data.get("data")
-	frappe.response['content_type'] = 'application/json'
-	frappe.response['type'] = 'download'
diff --git a/frappe/custom/doctype/package_doctype/package_doctype.json b/frappe/custom/doctype/package_doctype/package_doctype.json
index 353f01a673..058cff6480 100644
--- a/frappe/custom/doctype/package_doctype/package_doctype.json
+++ b/frappe/custom/doctype/package_doctype/package_doctype.json
@@ -6,6 +6,9 @@
  "engine": "InnoDB",
  "field_order": [
   "document_type",
+  "column_break_2",
+  "attachments",
+  "overwrite",
   "section_break_4",
   "filters_json"
  ],
@@ -27,11 +30,29 @@
   {
    "fieldname": "section_break_4",
    "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "attachments",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Include Attachments"
+  },
+  {
+   "default": "0",
+   "fieldname": "overwrite",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Overwrite"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-03-16 22:11:40.479498",
+ "modified": "2020-03-17 17:27:58.859896",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package DocType",
diff --git a/frappe/custom/doctype/package_migration/package_migration.js b/frappe/custom/doctype/package_migration/package_migration.js
deleted file mode 100644
index 020092f5f3..0000000000
--- a/frappe/custom/doctype/package_migration/package_migration.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Package Migration', {
-	refresh: function(frm) {
-		if (frm.doc.attach) {
-			frm.add_custom_button(__("Connect"), function() {
-				let dialog = new frappe.ui.Dialog({
-					title: __('Connect to Remote Instance'),
-					fields: [
-						{
-							fieldtype: 'Data',
-							label: 'Remote Instance',
-							fieldname: 'remote_instance',
-							reqd: 1
-						},
-						{
-							fieldtype: 'Data',
-							label: 'User',
-							fieldname: 'user',
-							reqd: 1
-						},
-						{
-							fieldtype: 'Password',
-							label: 'Password',
-							fieldname: 'password',
-							reqd: 1
-						},
-					],
-					primary_action: function() {
-						let values = dialog.get_values();
-						frm.call("install_package_to_remote", {
-							"remote_instance": values.remote_instance,
-							"user": values.user,
-							"password": values.password
-						}).then((r) => {
-							console.log(r);
-						})
-						dialog.hide();
-					},
-					primary_action_label: "Execute"
-				});
-				dialog.show();
-			})
-		}
-	}
-});
-
-// "erpnext_support_password": "uYrMeEhb2NzuEGOk",
-//  "erpnext_support_url": "https://marketplace.erpnext.com",
-//  "erpnext_support_user": "erpnext_support_fQrhUujW@erpnext.com",
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_migration/package_migration.py b/frappe/custom/doctype/package_migration/package_migration.py
deleted file mode 100644
index cdcbc0bd19..0000000000
--- a/frappe/custom/doctype/package_migration/package_migration.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.frappeclient import FrappeClient
-from frappe.model.document import Document
-from frappe import _
-
-class PackageMigration(Document):
-
-	def install_package_to_remote(self, remote_instance, user, password):
-		connection = FrappeClient(remote_instance, user, password)
-
-		package_file = frappe.get_all("File", filters={
-			"attached_to_doctype": "Package Migration",
-			"attached_to_name": "Package Migration"
-		}, limit=1, order_by="creation desc")
-
-		try:
-			connection.post_request({
-				"cmd": "frappe.custom.doctype.package.package.import_package",
-				"package": frappe.get_doc("File", package_file[0].name).get_content()
-			})
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Could not connect to Remote Site."))
diff --git a/frappe/custom/doctype/package_migration/__init__.py b/frappe/custom/doctype/release/__init__.py
similarity index 100%
rename from frappe/custom/doctype/package_migration/__init__.py
rename to frappe/custom/doctype/release/__init__.py
diff --git a/frappe/custom/doctype/release/release.js b/frappe/custom/doctype/release/release.js
new file mode 100644
index 0000000000..b0919bef43
--- /dev/null
+++ b/frappe/custom/doctype/release/release.js
@@ -0,0 +1,22 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Release', {
+	refresh: function(frm) {
+		frm.add_custom_button(__("Go to Package"), function() {
+			frappe.set_route("Form", "Package", "Package");
+		});
+
+		frm.add_custom_button(__("Release"), function() {
+			frm.call("create_release").then(() => {});
+		});
+
+		frappe.realtime.on("exporting_package", (data) => {
+			if (data.progress !== (data.total-1)) {
+				frm.dashboard.show_progress("Releasing Package", data.progress / data.total * 100, __("{0}", [data.message]));
+			} else {
+				frm.dashboard.hide_progress();
+			}
+		});
+	}
+});
diff --git a/frappe/custom/doctype/package_migration/package_migration.json b/frappe/custom/doctype/release/release.json
similarity index 67%
rename from frappe/custom/doctype/package_migration/package_migration.json
rename to frappe/custom/doctype/release/release.json
index a3c230502b..ffe7c599cc 100644
--- a/frappe/custom/doctype/package_migration/package_migration.json
+++ b/frappe/custom/doctype/release/release.json
@@ -1,27 +1,26 @@
 {
  "actions": [],
- "creation": "2020-03-17 00:13:31.851579",
+ "creation": "2020-03-17 13:27:30.158389",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "attach"
+  "instances"
  ],
  "fields": [
   {
-   "fieldname": "attach",
-   "fieldtype": "Attach",
-   "in_list_view": 1,
-   "label": "Attach",
-   "reqd": 1
+   "fieldname": "instances",
+   "fieldtype": "Table",
+   "label": "Instances",
+   "options": "Release Instance"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-17 10:00:26.676328",
+ "modified": "2020-03-17 15:37:21.813063",
  "modified_by": "Administrator",
  "module": "Custom",
- "name": "Package Migration",
+ "name": "Release",
  "owner": "Administrator",
  "permissions": [
   {
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
new file mode 100644
index 0000000000..27ecf5c459
--- /dev/null
+++ b/frappe/custom/doctype/release/release.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+from frappe import _
+from frappe.model.document import Document
+from frappe.custom.doctype.package.package import export_package
+from frappe.frappeclient import FrappeClient
+from frappe.utils.file_manager import save_file
+from frappe.model.naming import make_autoname
+from frappe.utils.password import get_decrypted_password
+
+class Release(Document):
+
+	def create_release(self):
+		package = export_package().get("data")
+
+		for dt_file in frappe.get_list("File", filters={"attached_to_doctype": "Release", "attached_to_name": "Release"}):
+			frappe.delete_doc_if_exists("File", dt_file.name)
+
+		file_name = make_autoname("Package")
+		save_file(file_name, json.dumps(package), "Release", "Release")
+
+		length = len(self.instances)
+		for instance in self.instances:
+			message = _("Releasing to {0}").format(instance.instance)
+			frappe.publish_realtime("exporting_package", {"progress": idx, "total": length, "message": message},
+				user=frappe.session.user)
+			remote = frappe.get_doc("Remote Instance", instance.instance)
+			self.install_package_to_remote(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
+
+	def install_package_to_remote(self, remote_instance, user, password):
+		connection = FrappeClient(remote_instance, user, password)
+
+		try:
+			connection.post_request({
+				"cmd": "frappe.custom.doctype.package.package.import_package",
+				"package": package
+			})
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			frappe.throw(_("Could not connect to Site {0}.").format(remote_instance))
diff --git a/frappe/custom/doctype/package_migration/test_package_migration.py b/frappe/custom/doctype/release/test_release.py
similarity index 79%
rename from frappe/custom/doctype/package_migration/test_package_migration.py
rename to frappe/custom/doctype/release/test_release.py
index 8b438145e8..13e4e26ac0 100644
--- a/frappe/custom/doctype/package_migration/test_package_migration.py
+++ b/frappe/custom/doctype/release/test_release.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestPackageMigration(unittest.TestCase):
+class TestRelease(unittest.TestCase):
 	pass
diff --git a/frappe/custom/doctype/release_instance/__init__.py b/frappe/custom/doctype/release_instance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
new file mode 100644
index 0000000000..a91b00666f
--- /dev/null
+++ b/frappe/custom/doctype/release_instance/release_instance.json
@@ -0,0 +1,31 @@
+{
+ "actions": [],
+ "creation": "2020-03-17 12:24:29.615432",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "instance"
+ ],
+ "fields": [
+  {
+   "fieldname": "instance",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Instance",
+   "options": "Remote Instance"
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-03-17 13:35:38.456830",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Release Instance",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/release_instance/release_instance.py b/frappe/custom/doctype/release_instance/release_instance.py
new file mode 100644
index 0000000000..f5b745a9b4
--- /dev/null
+++ b/frappe/custom/doctype/release_instance/release_instance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class ReleaseInstance(Document):
+	pass
diff --git a/frappe/custom/doctype/remote_instance/__init__.py b/frappe/custom/doctype/remote_instance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.js b/frappe/custom/doctype/remote_instance/remote_instance.js
new file mode 100644
index 0000000000..50096efe4a
--- /dev/null
+++ b/frappe/custom/doctype/remote_instance/remote_instance.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Remote Instance', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.json b/frappe/custom/doctype/remote_instance/remote_instance.json
new file mode 100644
index 0000000000..4224d40c4c
--- /dev/null
+++ b/frappe/custom/doctype/remote_instance/remote_instance.json
@@ -0,0 +1,67 @@
+{
+ "actions": [],
+ "autoname": "field:instance",
+ "creation": "2020-03-17 12:08:33.304631",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "instance",
+  "user",
+  "password"
+ ],
+ "fields": [
+  {
+   "fieldname": "instance",
+   "fieldtype": "Data",
+   "label": "Instance",
+   "unique": 1
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Data",
+   "label": "User"
+  },
+  {
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "label": "Password"
+  }
+ ],
+ "links": [],
+ "modified": "2020-03-17 13:34:40.924501",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Remote Instance",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.py b/frappe/custom/doctype/remote_instance/remote_instance.py
new file mode 100644
index 0000000000..5fd513a2f6
--- /dev/null
+++ b/frappe/custom/doctype/remote_instance/remote_instance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class RemoteInstance(Document):
+	pass
diff --git a/frappe/custom/doctype/remote_instance/test_remote_instance.py b/frappe/custom/doctype/remote_instance/test_remote_instance.py
new file mode 100644
index 0000000000..0eb7561bf5
--- /dev/null
+++ b/frappe/custom/doctype/remote_instance/test_remote_instance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestRemoteInstance(unittest.TestCase):
+	pass

From a02847f12676f310b637ad1cfb89436c24896613 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 18 Mar 2020 23:18:06 +0530
Subject: [PATCH 020/274] fix: remove release instance doctype

---
 frappe/custom/doctype/package/package.py      | 17 +++--
 frappe/custom/doctype/release/release.js      |  9 +--
 frappe/custom/doctype/release/release.json    |  4 +-
 frappe/custom/doctype/release/release.py      | 25 +++----
 .../release_instance.js}                      |  2 +-
 .../release_instance/release_instance.json    | 57 ++++++++++++++--
 .../test_release_instance.py}                 |  2 +-
 .../__init__.py                               |  0
 .../release_instance_list.json                | 32 +++++++++
 .../release_instance_list.py}                 |  2 +-
 .../remote_instance/remote_instance.json      | 67 -------------------
 11 files changed, 116 insertions(+), 101 deletions(-)
 rename frappe/custom/doctype/{remote_instance/remote_instance.js => release_instance/release_instance.js} (79%)
 rename frappe/custom/doctype/{remote_instance/test_remote_instance.py => release_instance/test_release_instance.py} (79%)
 rename frappe/custom/doctype/{remote_instance => release_instance_list}/__init__.py (100%)
 create mode 100644 frappe/custom/doctype/release_instance_list/release_instance_list.json
 rename frappe/custom/doctype/{remote_instance/remote_instance.py => release_instance_list/release_instance_list.py} (86%)
 delete mode 100644 frappe/custom/doctype/remote_instance/remote_instance.json

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index a51386acfc..bedc567066 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -5,9 +5,11 @@
 from __future__ import unicode_literals
 import frappe
 import json
+import pickle
 from frappe.model.document import Document
 from frappe.core.doctype.version.version import get_diff
 from frappe.utils.file_manager import save_file
+from frappe import _
 
 class Package(Document):
 	pass
@@ -29,7 +31,7 @@ def export_package():
 		length = len(docs)
 
 		for idx, doc in enumerate(docs):
-			frappe.publish_realtime("exporting_package", {"progress":idx, "total":length, "message":doctype.get("document_type")},
+			frappe.publish_realtime("package", {"progress":idx, "total":length, "message":doctype.get("document_type"), "prefix": _("Exporting")},
 				user=frappe.session.user)
 
 			document = frappe.get_doc(doctype.get("document_type"), doc.name).as_dict()
@@ -51,15 +53,13 @@ def export_package():
 			document.update({"modified": frappe.utils.get_datetime_str(document.get("modified"))})
 			package.append(document)
 
-	return frappe._dict({
-		"data": post_process(package)
-	})
+	return post_process(package)
 
 @frappe.whitelist()
 def import_package(package=None):
 	"""Import package from JSON"""
 
-	content = json.loads(package)
+	content = pickle.loads(package)
 	length = len(content)
 
 	for doc in content:
@@ -85,7 +85,12 @@ def add_attachment(attachments, doc):
 		save_file(attachment.get("fname"), attachment.get("content"), doc.get("doctype"), doc.get("name"))
 
 def post_process(package):
+	"""
+		Remove the keys from Document and Child Document
+		Convert datetime, date, time to str
+	"""
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus')
+	child_del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus', 'name')
 
 	for doc in package:
 		for key in del_keys:
@@ -97,7 +102,7 @@ def post_process(package):
 				continue
 
 			for child in value:
-				for key in del_keys + ('name'):
+				for key in child_del_keys:
 					if key in child:
 						del child[key]
 
diff --git a/frappe/custom/doctype/release/release.js b/frappe/custom/doctype/release/release.js
index b0919bef43..709ae18d36 100644
--- a/frappe/custom/doctype/release/release.js
+++ b/frappe/custom/doctype/release/release.js
@@ -8,12 +8,13 @@ frappe.ui.form.on('Release', {
 		});
 
 		frm.add_custom_button(__("Release"), function() {
-			frm.call("create_release").then(() => {});
+			frm.call("create_release");
 		});
 
-		frappe.realtime.on("exporting_package", (data) => {
-			if (data.progress !== (data.total-1)) {
-				frm.dashboard.show_progress("Releasing Package", data.progress / data.total * 100, __("{0}", [data.message]));
+		frappe.realtime.on("package", (data) => {
+			frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
+			if ((data.progress+1) != data.total) {
+				frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
 			} else {
 				frm.dashboard.hide_progress();
 			}
diff --git a/frappe/custom/doctype/release/release.json b/frappe/custom/doctype/release/release.json
index ffe7c599cc..ba6c69c49f 100644
--- a/frappe/custom/doctype/release/release.json
+++ b/frappe/custom/doctype/release/release.json
@@ -12,12 +12,12 @@
    "fieldname": "instances",
    "fieldtype": "Table",
    "label": "Instances",
-   "options": "Release Instance"
+   "options": "Release Instance List"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-17 15:37:21.813063",
+ "modified": "2020-03-18 18:25:23.539372",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release",
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
index 27ecf5c459..ae798f7d85 100644
--- a/frappe/custom/doctype/release/release.py
+++ b/frappe/custom/doctype/release/release.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 import json
+import pickle
 from frappe import _
 from frappe.model.document import Document
 from frappe.custom.doctype.package.package import export_package
@@ -16,30 +17,30 @@ from frappe.utils.password import get_decrypted_password
 class Release(Document):
 
 	def create_release(self):
-		package = export_package().get("data")
+		package = export_package()
 
 		for dt_file in frappe.get_list("File", filters={"attached_to_doctype": "Release", "attached_to_name": "Release"}):
 			frappe.delete_doc_if_exists("File", dt_file.name)
 
 		file_name = make_autoname("Package")
-		save_file(file_name, json.dumps(package), "Release", "Release")
+		save_file(file_name, pickle.dumps(package), "Release", "Release")
 
 		length = len(self.instances)
-		for instance in self.instances:
-			message = _("Releasing to {0}").format(instance.instance)
-			frappe.publish_realtime("exporting_package", {"progress": idx, "total": length, "message": message},
+		for idx, instance in enumerate(self.instances):
+			frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance, "prefix": _("Deploying")},
 				user=frappe.session.user)
-			remote = frappe.get_doc("Remote Instance", instance.instance)
-			self.install_package_to_remote(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
 
-	def install_package_to_remote(self, remote_instance, user, password):
-		connection = FrappeClient(remote_instance, user, password)
+			self.install_package_to_remote(package, instance)
+
+	def install_package_to_remote(self, package, instance):
+		remote = frappe.get_doc("Release Instance", instance.instance)
+		connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
 
 		try:
 			connection.post_request({
 				"cmd": "frappe.custom.doctype.package.package.import_package",
-				"package": package
+				"package": pickle.dumps(package)
 			})
-		except Exception:
+		except Exception as e:
 			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Could not connect to Site {0}.").format(remote_instance))
+			frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(remote.instance))
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.js b/frappe/custom/doctype/release_instance/release_instance.js
similarity index 79%
rename from frappe/custom/doctype/remote_instance/remote_instance.js
rename to frappe/custom/doctype/release_instance/release_instance.js
index 50096efe4a..7447c9c706 100644
--- a/frappe/custom/doctype/remote_instance/remote_instance.js
+++ b/frappe/custom/doctype/release_instance/release_instance.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Remote Instance', {
+frappe.ui.form.on('Release Instance', {
 	// refresh: function(frm) {
 
 	// }
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
index a91b00666f..d1bf07db59 100644
--- a/frappe/custom/doctype/release_instance/release_instance.json
+++ b/frappe/custom/doctype/release_instance/release_instance.json
@@ -1,29 +1,72 @@
 {
  "actions": [],
+ "autoname": "field:instance",
  "creation": "2020-03-17 12:24:29.615432",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "instance"
+  "instance",
+  "user",
+  "password"
  ],
  "fields": [
   {
    "fieldname": "instance",
-   "fieldtype": "Link",
+   "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Instance",
-   "options": "Remote Instance"
+   "in_standard_filter": 1,
+   "label": "Instance URL",
+   "unique": 1
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "User",
+   "options": "Email"
+  },
+  {
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Password"
   }
  ],
- "istable": 1,
  "links": [],
- "modified": "2020-03-17 13:35:38.456830",
+ "modified": "2020-03-18 18:54:55.801749",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release Instance",
  "owner": "Administrator",
- "permissions": [],
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
+  }
+ ],
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
diff --git a/frappe/custom/doctype/remote_instance/test_remote_instance.py b/frappe/custom/doctype/release_instance/test_release_instance.py
similarity index 79%
rename from frappe/custom/doctype/remote_instance/test_remote_instance.py
rename to frappe/custom/doctype/release_instance/test_release_instance.py
index 0eb7561bf5..95df304262 100644
--- a/frappe/custom/doctype/remote_instance/test_remote_instance.py
+++ b/frappe/custom/doctype/release_instance/test_release_instance.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestRemoteInstance(unittest.TestCase):
+class TestReleaseInstance(unittest.TestCase):
 	pass
diff --git a/frappe/custom/doctype/remote_instance/__init__.py b/frappe/custom/doctype/release_instance_list/__init__.py
similarity index 100%
rename from frappe/custom/doctype/remote_instance/__init__.py
rename to frappe/custom/doctype/release_instance_list/__init__.py
diff --git a/frappe/custom/doctype/release_instance_list/release_instance_list.json b/frappe/custom/doctype/release_instance_list/release_instance_list.json
new file mode 100644
index 0000000000..d9b9b63340
--- /dev/null
+++ b/frappe/custom/doctype/release_instance_list/release_instance_list.json
@@ -0,0 +1,32 @@
+{
+ "actions": [],
+ "creation": "2020-03-18 18:25:02.024237",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "instance"
+ ],
+ "fields": [
+  {
+   "fieldname": "instance",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Instance",
+   "options": "Release Instance",
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-03-18 22:55:20.130597",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Release Instance List",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.py b/frappe/custom/doctype/release_instance_list/release_instance_list.py
similarity index 86%
rename from frappe/custom/doctype/remote_instance/remote_instance.py
rename to frappe/custom/doctype/release_instance_list/release_instance_list.py
index 5fd513a2f6..f6eb68a535 100644
--- a/frappe/custom/doctype/remote_instance/remote_instance.py
+++ b/frappe/custom/doctype/release_instance_list/release_instance_list.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class RemoteInstance(Document):
+class ReleaseInstanceList(Document):
 	pass
diff --git a/frappe/custom/doctype/remote_instance/remote_instance.json b/frappe/custom/doctype/remote_instance/remote_instance.json
deleted file mode 100644
index 4224d40c4c..0000000000
--- a/frappe/custom/doctype/remote_instance/remote_instance.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
- "actions": [],
- "autoname": "field:instance",
- "creation": "2020-03-17 12:08:33.304631",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "instance",
-  "user",
-  "password"
- ],
- "fields": [
-  {
-   "fieldname": "instance",
-   "fieldtype": "Data",
-   "label": "Instance",
-   "unique": 1
-  },
-  {
-   "fieldname": "user",
-   "fieldtype": "Data",
-   "label": "User"
-  },
-  {
-   "fieldname": "password",
-   "fieldtype": "Password",
-   "label": "Password"
-  }
- ],
- "links": [],
- "modified": "2020-03-17 13:34:40.924501",
- "modified_by": "Administrator",
- "module": "Custom",
- "name": "Remote Instance",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file

From 1901650514037d29786e2d1841681a39fd7f4648 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 19 Mar 2020 11:33:25 +0530
Subject: [PATCH 021/274] fix: add utils for converting to string

---
 frappe/custom/doctype/package/package.py | 31 ++++++++++++++++++++----
 frappe/utils/data.py                     | 13 ++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index bedc567066..5ee781c608 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 import json
-import pickle
+import datetime
 from frappe.model.document import Document
 from frappe.core.doctype.version.version import get_diff
 from frappe.utils.file_manager import save_file
@@ -59,7 +59,7 @@ def export_package():
 def import_package(package=None):
 	"""Import package from JSON"""
 
-	content = pickle.loads(package)
+	content = json.loads(package)
 	length = len(content)
 
 	for doc in content:
@@ -98,12 +98,33 @@ def post_process(package):
 				del doc[key]
 
 		for key, value in doc.items():
+			stringified_value = get_stringified_value(value)
+			if stringified_value:
+				doc[key] = stringified_value
+
 			if not isinstance(value, list):
 				continue
 
 			for child in value:
-				for key in child_del_keys:
-					if key in child:
-						del child[key]
+				for child_key in child_del_keys:
+					if child_key in child:
+						del child[child_key]
+
+				for child_key, child_value in child.items():
+					stringified_value = get_stringified_value(child_value)
+					if stringified_value:
+						child[child_key] = stringified_value
 
 	return package
+
+def get_stringified_value(value):
+	if isinstance(value, datetime.datetime):
+		return frappe.utils.get_datetime_str(value)
+
+	if isinstance(value, datetime.date):
+		return frappe.utils.get_date_str(value)
+
+	if isinstance(value, datetime.timedelta):
+		return frappe.utils.get_time_str(value)
+
+	return None
\ No newline at end of file
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index acebfa2271..4c64624098 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -209,6 +209,19 @@ def get_datetime_str(datetime_obj):
 		datetime_obj = get_datetime(datetime_obj)
 	return datetime_obj.strftime(DATETIME_FORMAT)
 
+def get_date_str(date_obj):
+	if isinstance(date_obj, string_types):
+		date_obj = get_datetime(date_obj)
+	return date_obj.strftime(DATE_FORMAT)
+
+def get_time_str(timedelta_obj):
+	if isinstance(timedelta_obj, string_types):
+		timedelta_obj = to_timedelta(date_obj)
+
+	hours, remainder = divmod(timedelta_obj.seconds, 3600)
+	minutes, seconds = divmod(remainder, 60)
+	return "{0}:{1}:{2}".format(hours, minutes, seconds)
+
 def get_user_date_format():
 	"""Get the current user date format. The result will be cached."""
 	if getattr(frappe.local, "user_date_format", None) is None:

From a47efa8d96c98ba8202755bdf80cdc9292a7f493 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 19 Mar 2020 18:09:10 +0530
Subject: [PATCH 022/274] fix: file attachments

---
 frappe/custom/doctype/package/package.py | 35 ++++++++++++------------
 frappe/custom/doctype/release/release.py |  5 ++--
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 5ee781c608..88549b644e 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -6,9 +6,10 @@ from __future__ import unicode_literals
 import frappe
 import json
 import datetime
+import base64
 from frappe.model.document import Document
 from frappe.core.doctype.version.version import get_diff
-from frappe.utils.file_manager import save_file
+from frappe.utils.file_manager import save_file, get_file
 from frappe import _
 
 class Package(Document):
@@ -35,22 +36,19 @@ def export_package():
 				user=frappe.session.user)
 
 			document = frappe.get_doc(doctype.get("document_type"), doc.name).as_dict()
+			attachments = []
 
 			if doctype.attachments:
-				attachments = []
-				filters = {"attached_to_doctype": document.get("doctype"), "attached_to_name": document.get("doctype")}
+				filters = {"attached_to_doctype": document.get("doctype"), "attached_to_name": document.get("name")}
 				for f in frappe.get_list("File", filters=filters):
-					attachments.append({
-						"fname": f.name,
-						"content": frappe.get_doc("File", f.name).get_content()
-					})
+					fname, fcontents = get_file(f.name)
+					attachments.append({"fname": fname, "content": base64.b64encode(fcontents).decode('ascii')})
 
-				document.update({"attachments": json.dumps(attachments)})
+			document.update({
+				"attachments": attachments,
+				"overwrite": True if doctype.overwrite else False
+			})
 
-			if doctype.overwrite:
-				document.update({"overwrite": 1})
-
-			document.update({"modified": frappe.utils.get_datetime_str(document.get("modified"))})
 			package.append(document)
 
 	return post_process(package)
@@ -66,23 +64,24 @@ def import_package(package=None):
 		docname = doc.pop("name")
 		modified = doc.pop("modified")
 		overwrite = doc.pop("overwrite")
+		attachments = doc.get("attachments")
 		exists = frappe.db.exists(doc.get("doctype"), docname)
 
 		if not exists:
 			d = frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
-			if doc.get("attachments"):
-				add_attachment(doc.get("attachments"), d)
+			if attachments:
+				add_attachment(attachments, d)
 		elif exists and overwrite:
-			document = frappe.get_doc(doc.get("doctype"), doc.pop("name"))
+			document = frappe.get_doc(doc.get("doctype"), docname)
 			if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified):
 				document.update(doc)
 				document.save()
-				if doc.get("attachments"):
-					add_attachment(doc.get("attachments"), document)
+				if attachments:
+					add_attachment(attachments, document)
 
 def add_attachment(attachments, doc):
 	for attachment in attachments:
-		save_file(attachment.get("fname"), attachment.get("content"), doc.get("doctype"), doc.get("name"))
+		save_file(attachment.get("fname"), base64.b64decode(attachment.get("content")), doc.get("doctype"), doc.get("name"))
 
 def post_process(package):
 	"""
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
index ae798f7d85..099e98a4fb 100644
--- a/frappe/custom/doctype/release/release.py
+++ b/frappe/custom/doctype/release/release.py
@@ -5,7 +5,6 @@
 from __future__ import unicode_literals
 import frappe
 import json
-import pickle
 from frappe import _
 from frappe.model.document import Document
 from frappe.custom.doctype.package.package import export_package
@@ -23,7 +22,7 @@ class Release(Document):
 			frappe.delete_doc_if_exists("File", dt_file.name)
 
 		file_name = make_autoname("Package")
-		save_file(file_name, pickle.dumps(package), "Release", "Release")
+		save_file(file_name, json.dumps(package), "Release", "Release")
 
 		length = len(self.instances)
 		for idx, instance in enumerate(self.instances):
@@ -39,7 +38,7 @@ class Release(Document):
 		try:
 			connection.post_request({
 				"cmd": "frappe.custom.doctype.package.package.import_package",
-				"package": pickle.dumps(package)
+				"package": json.dumps(package)
 			})
 		except Exception as e:
 			frappe.log_error(frappe.get_traceback())

From 4a38cf09838db5c7f64b5f8e1a8e55e509954e52 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 19 Mar 2020 19:45:21 +0530
Subject: [PATCH 023/274] fix: package import fixes

---
 frappe/custom/doctype/package/package.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 88549b644e..31f681486f 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -61,19 +61,19 @@ def import_package(package=None):
 	length = len(content)
 
 	for doc in content:
-		docname = doc.pop("name")
 		modified = doc.pop("modified")
 		overwrite = doc.pop("overwrite")
-		attachments = doc.get("attachments")
-		exists = frappe.db.exists(doc.get("doctype"), docname)
+		attachments = doc.pop("attachments")
+		exists = frappe.db.exists(doc.get("doctype"), doc.get("name"))
 
 		if not exists:
 			d = frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
 			if attachments:
 				add_attachment(attachments, d)
-		elif exists and overwrite:
+		elif exists:
+			docname = doc.pop("name")
 			document = frappe.get_doc(doc.get("doctype"), docname)
-			if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified):
+			if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified) and not overwrite:
 				document.update(doc)
 				document.save()
 				if attachments:

From b77d93d22af1425fe7ea2a43d08d1a2fb7369f67 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 19 Mar 2020 21:32:34 +0530
Subject: [PATCH 024/274] fix: add filters for document type in package

---
 frappe/custom/doctype/package/package.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index 2fb0b8eb1d..f6b908bcf1 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -8,6 +8,14 @@ frappe.ui.form.on('Package', {
 				frappe.set_route("Form", "Release", "Release");
 			});
 		}
+
+		frm.set_query("document_type", "export_package", function () {
+			return {
+				filters: {
+					"istable": 0,
+				}
+			};
+		})
 	},
 });
 
@@ -54,6 +62,11 @@ frappe.ui.form.on('Package DocType', {
 		_show_filters(filters, table);
 
 		table.on('click', () => {
+			if (!row.document_type) {
+				frappe.msgprint(__("Select Document Type."));
+				return;
+			}
+
 			frappe.model.with_doctype(row.document_type, function() {
 				let dialog = new frappe.ui.Dialog({
 					title: __('Set Filters'),

From 0f1eaee1be856a4df4f2734a9d584cf1e701eebd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 20 Mar 2020 13:28:35 +0530
Subject: [PATCH 025/274] feat: add manual import

---
 frappe/custom/doctype/package/package.js   |  3 +++
 frappe/custom/doctype/package/package.json | 24 ++++++++++++++++++++--
 frappe/custom/doctype/package/package.py   | 21 +++++++++++++++----
 frappe/utils/data.py                       |  2 +-
 4 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index f6b908bcf1..aa6fdbe635 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -17,6 +17,9 @@ frappe.ui.form.on('Package', {
 			};
 		})
 	},
+	import: function(frm) {
+		frm.call("import_from_package");
+	}
 });
 
 frappe.ui.form.on('Package DocType', {
diff --git a/frappe/custom/doctype/package/package.json b/frappe/custom/doctype/package/package.json
index 1d71b744d1..7bfdf719cf 100644
--- a/frappe/custom/doctype/package/package.json
+++ b/frappe/custom/doctype/package/package.json
@@ -5,7 +5,10 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "export_package"
+  "export_package",
+  "import_section",
+  "attach",
+  "import"
  ],
  "fields": [
   {
@@ -14,11 +17,28 @@
    "fieldtype": "Table",
    "label": "Package",
    "options": "Package DocType"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "attach",
+   "fieldname": "import_section",
+   "fieldtype": "Section Break",
+   "label": "Import Package"
+  },
+  {
+   "fieldname": "import",
+   "fieldtype": "Button",
+   "label": "Import"
+  },
+  {
+   "fieldname": "attach",
+   "fieldtype": "Attach",
+   "label": "Attach Package"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-17 16:41:13.542896",
+ "modified": "2020-03-19 22:03:06.012473",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package",
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 31f681486f..2bf5a5f7cc 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -11,9 +11,22 @@ from frappe.model.document import Document
 from frappe.core.doctype.version.version import get_diff
 from frappe.utils.file_manager import save_file, get_file
 from frappe import _
+from six import string_types
 
 class Package(Document):
-	pass
+
+	def import_from_package(self):
+		filters = {"attached_to_doctype": "Package", "attached_to_name": "Package"}
+		files = frappe.get_list("File", filters=filters, limit=1, order_by="creation desc")
+		if not files:
+			frappe.msgprint(_("No file attach for Importing."))
+			return
+
+		for f in files:
+			fname, fcontents = get_file(f.name)
+			import_package(fcontents)
+
+		frappe.msgprint(_("Package Imported."))
 
 @frappe.whitelist()
 def export_package():
@@ -57,10 +70,10 @@ def export_package():
 def import_package(package=None):
 	"""Import package from JSON"""
 
-	content = json.loads(package)
-	length = len(content)
+	if isinstance(package, string_types):
+		package = json.loads(package)
 
-	for doc in content:
+	for doc in package:
 		modified = doc.pop("modified")
 		overwrite = doc.pop("overwrite")
 		attachments = doc.pop("attachments")
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 4c64624098..96bdb20841 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -216,7 +216,7 @@ def get_date_str(date_obj):
 
 def get_time_str(timedelta_obj):
 	if isinstance(timedelta_obj, string_types):
-		timedelta_obj = to_timedelta(date_obj)
+		timedelta_obj = to_timedelta(timedelta_obj)
 
 	hours, remainder = divmod(timedelta_obj.seconds, 3600)
 	minutes, seconds = divmod(remainder, 60)

From 8302f251762ea9362ca7b1d1b92f91542b781139 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 20 Mar 2020 15:21:21 +0530
Subject: [PATCH 026/274] chore: codacy fixes

---
 frappe/custom/doctype/package/package.js |  4 ++--
 frappe/custom/doctype/package/package.py | 11 ++++-------
 frappe/custom/doctype/release/release.py |  9 +++++++--
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index aa6fdbe635..a053b7d864 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -82,7 +82,7 @@ frappe.ui.form.on('Package DocType', {
 					],
 					primary_action: function() {
 						let values = filter_group.get_filters();
-						let flt = []
+						let flt = [];
 						if (values) {
 							values.forEach(function(value) {
 								flt.push([value[0], value[1], value[2], value[3]]);
@@ -102,7 +102,7 @@ frappe.ui.form.on('Package DocType', {
 				});
 				filter_group.add_filters_to_filter_group(filters);
 				dialog.show();
-			})
+			});
 		});
 	},
 });
\ No newline at end of file
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 2bf5a5f7cc..d5da360089 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -8,7 +8,6 @@ import json
 import datetime
 import base64
 from frappe.model.document import Document
-from frappe.core.doctype.version.version import get_diff
 from frappe.utils.file_manager import save_file, get_file
 from frappe import _
 from six import string_types
@@ -30,7 +29,7 @@ class Package(Document):
 
 @frappe.whitelist()
 def export_package():
-	"""Export package as JSON"""
+	"""Export package as JSON."""
 
 	package_doc = frappe.get_single("Package")
 	package = []
@@ -68,7 +67,7 @@ def export_package():
 
 @frappe.whitelist()
 def import_package(package=None):
-	"""Import package from JSON"""
+	"""Import package from JSON."""
 
 	if isinstance(package, string_types):
 		package = json.loads(package)
@@ -97,10 +96,8 @@ def add_attachment(attachments, doc):
 		save_file(attachment.get("fname"), base64.b64decode(attachment.get("content")), doc.get("doctype"), doc.get("name"))
 
 def post_process(package):
-	"""
-		Remove the keys from Document and Child Document
-		Convert datetime, date, time to str
-	"""
+	"""Remove the keys from Document and Child Document. Convert datetime, date, time to str."""
+
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus')
 	child_del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus', 'name')
 
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
index 099e98a4fb..e68be15778 100644
--- a/frappe/custom/doctype/release/release.py
+++ b/frappe/custom/doctype/release/release.py
@@ -33,13 +33,18 @@ class Release(Document):
 
 	def install_package_to_remote(self, package, instance):
 		remote = frappe.get_doc("Release Instance", instance.instance)
-		connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
+
+		try:
+			connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(remote.instance))
 
 		try:
 			connection.post_request({
 				"cmd": "frappe.custom.doctype.package.package.import_package",
 				"package": json.dumps(package)
 			})
-		except Exception as e:
+		except Exception:
 			frappe.log_error(frappe.get_traceback())
 			frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(remote.instance))

From ddb02bd7366ec83abe6abd9297b383595cde97da Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 31 Mar 2020 11:15:01 +0530
Subject: [PATCH 027/274] Update package.js

---
 frappe/custom/doctype/package/package.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index a053b7d864..54af424e4d 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -15,7 +15,7 @@ frappe.ui.form.on('Package', {
 					"istable": 0,
 				}
 			};
-		})
+		});
 	},
 	import: function(frm) {
 		frm.call("import_from_package");
@@ -105,4 +105,4 @@ frappe.ui.form.on('Package DocType', {
 			});
 		});
 	},
-});
\ No newline at end of file
+});

From c12cfffc84c1800807acebd4380fbd1f72dfc750 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 31 Mar 2020 11:45:59 +0530
Subject: [PATCH 028/274] Update package.py

---
 frappe/custom/doctype/package/package.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index d5da360089..a42de94896 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -30,7 +30,6 @@ class Package(Document):
 @frappe.whitelist()
 def export_package():
 	"""Export package as JSON."""
-
 	package_doc = frappe.get_single("Package")
 	package = []
 
@@ -68,7 +67,6 @@ def export_package():
 @frappe.whitelist()
 def import_package(package=None):
 	"""Import package from JSON."""
-
 	if isinstance(package, string_types):
 		package = json.loads(package)
 
@@ -97,7 +95,6 @@ def add_attachment(attachments, doc):
 
 def post_process(package):
 	"""Remove the keys from Document and Child Document. Convert datetime, date, time to str."""
-
 	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus')
 	child_del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus', 'name')
 
@@ -136,4 +133,4 @@ def get_stringified_value(value):
 	if isinstance(value, datetime.timedelta):
 		return frappe.utils.get_time_str(value)
 
-	return None
\ No newline at end of file
+	return None

From 20d54e4588c74920bcbe8033ed2f9a9641f7e0e6 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 6 Apr 2020 14:09:19 +0530
Subject: [PATCH 029/274] fix: child doctype naming

---
 frappe/custom/doctype/package/package.js      |  4 +-
 frappe/custom/doctype/package/package.json    | 18 ++---
 frappe/custom/doctype/package/package.py      | 19 ++++--
 .../__init__.py                               |  0
 .../package_detail/package_detail.json        | 65 +++++++++++++++++++
 .../package_detail.py}                        |  2 +-
 .../package_doctype/package_doctype.json      | 65 -------------------
 .../release_instance/release_instance.json    | 14 +---
 8 files changed, 93 insertions(+), 94 deletions(-)
 rename frappe/custom/doctype/{package_doctype => package_detail}/__init__.py (100%)
 create mode 100644 frappe/custom/doctype/package_detail/package_detail.json
 rename frappe/custom/doctype/{package_doctype/package_doctype.py => package_detail/package_detail.py} (88%)
 delete mode 100644 frappe/custom/doctype/package_doctype/package_doctype.json

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index 54af424e4d..adad9d7e52 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Package', {
 	refresh: function(frm) {
-		if (frm.doc.export_package) {
+		if (frm.doc.package_details) {
 			frm.add_custom_button(__("Go to Release"), function() {
 				frappe.set_route("Form", "Release", "Release");
 			});
@@ -22,7 +22,7 @@ frappe.ui.form.on('Package', {
 	}
 });
 
-frappe.ui.form.on('Package DocType', {
+frappe.ui.form.on('Package Details', {
 	form_render: function (frm, cdt, cdn) {
 		function _show_filters(filters, table) {
 			table.find('tbody').empty();
diff --git a/frappe/custom/doctype/package/package.json b/frappe/custom/doctype/package/package.json
index 7bfdf719cf..0607abf6d7 100644
--- a/frappe/custom/doctype/package/package.json
+++ b/frappe/custom/doctype/package/package.json
@@ -5,19 +5,12 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "export_package",
+  "package_details",
   "import_section",
   "attach",
   "import"
  ],
  "fields": [
-  {
-   "description": "Click on the row for accessing filters.",
-   "fieldname": "export_package",
-   "fieldtype": "Table",
-   "label": "Package",
-   "options": "Package DocType"
-  },
   {
    "collapsible": 1,
    "collapsible_depends_on": "attach",
@@ -34,11 +27,18 @@
    "fieldname": "attach",
    "fieldtype": "Attach",
    "label": "Attach Package"
+  },
+  {
+   "description": "Click on the row for accessing filters.",
+   "fieldname": "package_details",
+   "fieldtype": "Table",
+   "label": "Package Details",
+   "options": "Package Detail"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-19 22:03:06.012473",
+ "modified": "2020-04-06 14:32:42.202640",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package",
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index a42de94896..ed9cb66957 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -33,7 +33,7 @@ def export_package():
 	package_doc = frappe.get_single("Package")
 	package = []
 
-	for doctype in package_doc.export_package:
+	for doctype in package_doc.package_details:
 		filters = []
 
 		if doctype.get("filters_json"):
@@ -43,17 +43,28 @@ def export_package():
 		length = len(docs)
 
 		for idx, doc in enumerate(docs):
-			frappe.publish_realtime("package", {"progress":idx, "total":length, "message":doctype.get("document_type"), "prefix": _("Exporting")},
+			frappe.publish_realtime("package", {
+					"progress":idx, "total":length,
+					"message":doctype.get("document_type"),
+					"prefix": _("Exporting")
+				},
 				user=frappe.session.user)
 
 			document = frappe.get_doc(doctype.get("document_type"), doc.name).as_dict()
 			attachments = []
 
 			if doctype.attachments:
-				filters = {"attached_to_doctype": document.get("doctype"), "attached_to_name": document.get("name")}
+				filters = {
+					"attached_to_doctype": document.get("doctype"),
+					"attached_to_name": document.get("name")
+				}
+
 				for f in frappe.get_list("File", filters=filters):
 					fname, fcontents = get_file(f.name)
-					attachments.append({"fname": fname, "content": base64.b64encode(fcontents).decode('ascii')})
+					attachments.append({
+						"fname": fname,
+						"content": base64.b64encode(fcontents).decode('ascii')
+					})
 
 			document.update({
 				"attachments": attachments,
diff --git a/frappe/custom/doctype/package_doctype/__init__.py b/frappe/custom/doctype/package_detail/__init__.py
similarity index 100%
rename from frappe/custom/doctype/package_doctype/__init__.py
rename to frappe/custom/doctype/package_detail/__init__.py
diff --git a/frappe/custom/doctype/package_detail/package_detail.json b/frappe/custom/doctype/package_detail/package_detail.json
new file mode 100644
index 0000000000..f749587a42
--- /dev/null
+++ b/frappe/custom/doctype/package_detail/package_detail.json
@@ -0,0 +1,65 @@
+{
+ "engine": "InnoDB", 
+ "field_order": [
+  "document_type", 
+  "column_break_2", 
+  "attachments", 
+  "overwrite", 
+  "section_break_4", 
+  "filters_json"
+ ], 
+ "istable": 1, 
+ "modified_by": "Administrator", 
+ "name": "Package Detail", 
+ "links": [], 
+ "fields": [
+  {
+   "label": "Document Type", 
+   "in_list_view": 1, 
+   "fieldtype": "Link", 
+   "reqd": 1, 
+   "fieldname": "document_type", 
+   "options": "DocType"
+  }, 
+  {
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break"
+  }, 
+  {
+   "default": "0", 
+   "in_list_view": 1, 
+   "fieldname": "attachments", 
+   "fieldtype": "Check", 
+   "label": "Include Attachments"
+  }, 
+  {
+   "default": "0", 
+   "in_list_view": 1, 
+   "fieldname": "overwrite", 
+   "fieldtype": "Check", 
+   "label": "Overwrite"
+  }, 
+  {
+   "fieldname": "section_break_4", 
+   "fieldtype": "Section Break"
+  }, 
+  {
+   "options": "JSON", 
+   "fieldname": "filters_json", 
+   "fieldtype": "Code", 
+   "label": "Filters"
+  }
+ ], 
+ "track_changes": 1, 
+ "creation": "2020-04-06 12:59:59.657816", 
+ "doctype": "DocType", 
+ "actions": [], 
+ "modified": "2020-04-06 12:59:59.657816", 
+ "sort_order": "DESC", 
+ "module": "Custom", 
+ "owner": "Administrator", 
+ "sort_field": "modified", 
+ "editable_grid": 1, 
+ "quick_entry": 1, 
+ "permissions": []
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_doctype/package_doctype.py b/frappe/custom/doctype/package_detail/package_detail.py
similarity index 88%
rename from frappe/custom/doctype/package_doctype/package_doctype.py
rename to frappe/custom/doctype/package_detail/package_detail.py
index c185395965..0460329d85 100644
--- a/frappe/custom/doctype/package_doctype/package_doctype.py
+++ b/frappe/custom/doctype/package_detail/package_detail.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class PackageDocType(Document):
+class PackageDetail(Document):
 	pass
diff --git a/frappe/custom/doctype/package_doctype/package_doctype.json b/frappe/custom/doctype/package_doctype/package_doctype.json
deleted file mode 100644
index 058cff6480..0000000000
--- a/frappe/custom/doctype/package_doctype/package_doctype.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "actions": [],
- "creation": "2020-03-14 11:20:42.875446",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "document_type",
-  "column_break_2",
-  "attachments",
-  "overwrite",
-  "section_break_4",
-  "filters_json"
- ],
- "fields": [
-  {
-   "fieldname": "document_type",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Document Type",
-   "options": "DocType",
-   "reqd": 1
-  },
-  {
-   "fieldname": "filters_json",
-   "fieldtype": "Code",
-   "label": "Filters",
-   "options": "JSON"
-  },
-  {
-   "fieldname": "section_break_4",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_2",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "attachments",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Include Attachments"
-  },
-  {
-   "default": "0",
-   "fieldname": "overwrite",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Overwrite"
-  }
- ],
- "istable": 1,
- "links": [],
- "modified": "2020-03-17 17:27:58.859896",
- "modified_by": "Administrator",
- "module": "Custom",
- "name": "Package DocType",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
index d1bf07db59..90484b16f4 100644
--- a/frappe/custom/doctype/release_instance/release_instance.json
+++ b/frappe/custom/doctype/release_instance/release_instance.json
@@ -36,7 +36,7 @@
   }
  ],
  "links": [],
- "modified": "2020-03-18 18:54:55.801749",
+ "modified": "2020-04-06 14:31:49.443654",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release Instance",
@@ -53,18 +53,6 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "share": 1,
-   "write": 1
   }
  ],
  "quick_entry": 1,

From 1e7c4531e95e28b80cbacf65d2da6ce810ca1bd8 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 6 Apr 2020 14:52:20 +0530
Subject: [PATCH 030/274] fix: package overwriting

---
 frappe/custom/doctype/package/package.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index ed9cb66957..0cdfe4a87e 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -91,14 +91,22 @@ def import_package(package=None):
 			d = frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
 			if attachments:
 				add_attachment(attachments, d)
-		elif exists:
+		else:
 			docname = doc.pop("name")
 			document = frappe.get_doc(doc.get("doctype"), docname)
-			if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified) and not overwrite:
-				document.update(doc)
-				document.save()
-				if attachments:
-					add_attachment(attachments, document)
+
+			if overwrite:
+				update_document(document, doc, attachments)
+
+			else:
+				if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified):
+					update_document(document, doc, attachments)
+
+def update_document(document, doc, attachments):
+	document.update(doc)
+	document.save()
+	if attachments:
+		add_attachment(attachments, document)
 
 def add_attachment(attachments, doc):
 	for attachment in attachments:

From 514f2bdae998b1bb5b37b90409b31086828252fa Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 6 Apr 2020 15:32:44 +0530
Subject: [PATCH 031/274] fix: rename release related doctypes

---
 frappe/custom/doctype/package/package.js      |  2 +-
 frappe/custom/doctype/release/release.json    |  4 +-
 frappe/custom/doctype/release/release.py      |  2 +-
 .../release_instance/release_instance.js      |  8 ----
 .../release_instance/release_instance.json    | 48 ++++---------------
 .../release_instance/test_release_instance.py | 10 ----
 .../doctype/release_instance_list/__init__.py |  0
 .../release_instance_list.json                | 32 -------------
 .../release_instance_list.py                  | 10 ----
 9 files changed, 13 insertions(+), 103 deletions(-)
 delete mode 100644 frappe/custom/doctype/release_instance/release_instance.js
 delete mode 100644 frappe/custom/doctype/release_instance/test_release_instance.py
 delete mode 100644 frappe/custom/doctype/release_instance_list/__init__.py
 delete mode 100644 frappe/custom/doctype/release_instance_list/release_instance_list.json
 delete mode 100644 frappe/custom/doctype/release_instance_list/release_instance_list.py

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index adad9d7e52..1743f38dd3 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -9,7 +9,7 @@ frappe.ui.form.on('Package', {
 			});
 		}
 
-		frm.set_query("document_type", "export_package", function () {
+		frm.set_query("document_type", "package_details", function () {
 			return {
 				filters: {
 					"istable": 0,
diff --git a/frappe/custom/doctype/release/release.json b/frappe/custom/doctype/release/release.json
index ba6c69c49f..b3f44196d0 100644
--- a/frappe/custom/doctype/release/release.json
+++ b/frappe/custom/doctype/release/release.json
@@ -12,12 +12,12 @@
    "fieldname": "instances",
    "fieldtype": "Table",
    "label": "Instances",
-   "options": "Release Instance List"
+   "options": "Release Instance"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-03-18 18:25:23.539372",
+ "modified": "2020-04-06 14:56:56.206720",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release",
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
index e68be15778..c02aa0605d 100644
--- a/frappe/custom/doctype/release/release.py
+++ b/frappe/custom/doctype/release/release.py
@@ -32,7 +32,7 @@ class Release(Document):
 			self.install_package_to_remote(package, instance)
 
 	def install_package_to_remote(self, package, instance):
-		remote = frappe.get_doc("Release Instance", instance.instance)
+		remote = frappe.get_doc("Instance", instance.instance)
 
 		try:
 			connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
diff --git a/frappe/custom/doctype/release_instance/release_instance.js b/frappe/custom/doctype/release_instance/release_instance.js
deleted file mode 100644
index 7447c9c706..0000000000
--- a/frappe/custom/doctype/release_instance/release_instance.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Release Instance', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
index 90484b16f4..2ebdc93954 100644
--- a/frappe/custom/doctype/release_instance/release_instance.json
+++ b/frappe/custom/doctype/release_instance/release_instance.json
@@ -1,60 +1,30 @@
 {
  "actions": [],
- "autoname": "field:instance",
- "creation": "2020-03-17 12:24:29.615432",
+ "creation": "2020-03-18 18:25:02.024237",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "instance",
-  "user",
-  "password"
+  "instance"
  ],
  "fields": [
   {
    "fieldname": "instance",
-   "fieldtype": "Data",
+   "fieldtype": "Link",
    "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Instance URL",
-   "unique": 1
-  },
-  {
-   "fieldname": "user",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "User",
-   "options": "Email"
-  },
-  {
-   "fieldname": "password",
-   "fieldtype": "Password",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Password"
+   "label": "Instance",
+   "options": "Instance",
+   "reqd": 1
   }
  ],
+ "istable": 1,
  "links": [],
- "modified": "2020-04-06 14:31:49.443654",
+ "modified": "2020-04-06 15:30:08.966941",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release Instance",
  "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
+ "permissions": [],
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
diff --git a/frappe/custom/doctype/release_instance/test_release_instance.py b/frappe/custom/doctype/release_instance/test_release_instance.py
deleted file mode 100644
index 95df304262..0000000000
--- a/frappe/custom/doctype/release_instance/test_release_instance.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestReleaseInstance(unittest.TestCase):
-	pass
diff --git a/frappe/custom/doctype/release_instance_list/__init__.py b/frappe/custom/doctype/release_instance_list/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/custom/doctype/release_instance_list/release_instance_list.json b/frappe/custom/doctype/release_instance_list/release_instance_list.json
deleted file mode 100644
index d9b9b63340..0000000000
--- a/frappe/custom/doctype/release_instance_list/release_instance_list.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "actions": [],
- "creation": "2020-03-18 18:25:02.024237",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "instance"
- ],
- "fields": [
-  {
-   "fieldname": "instance",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Instance",
-   "options": "Release Instance",
-   "reqd": 1
-  }
- ],
- "istable": 1,
- "links": [],
- "modified": "2020-03-18 22:55:20.130597",
- "modified_by": "Administrator",
- "module": "Custom",
- "name": "Release Instance List",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/custom/doctype/release_instance_list/release_instance_list.py b/frappe/custom/doctype/release_instance_list/release_instance_list.py
deleted file mode 100644
index f6eb68a535..0000000000
--- a/frappe/custom/doctype/release_instance_list/release_instance_list.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class ReleaseInstanceList(Document):
-	pass

From 23a76cea202588b6d450057cba7a454837f035cd Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 6 Apr 2020 15:42:16 +0530
Subject: [PATCH 032/274] fix: rename instance to deploy instance

---
 .../doctype/deploy_instance/__init__.py       |  0
 .../deploy_instance/deploy_instance.js        |  8 +++
 .../deploy_instance/deploy_instance.json      | 63 +++++++++++++++++++
 .../deploy_instance/deploy_instance.py        | 10 +++
 .../deploy_instance/test_deploy_instance.py   | 10 +++
 frappe/custom/doctype/release/release.py      |  2 +-
 .../release_instance/release_instance.json    |  4 +-
 7 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 frappe/custom/doctype/deploy_instance/__init__.py
 create mode 100644 frappe/custom/doctype/deploy_instance/deploy_instance.js
 create mode 100644 frappe/custom/doctype/deploy_instance/deploy_instance.json
 create mode 100644 frappe/custom/doctype/deploy_instance/deploy_instance.py
 create mode 100644 frappe/custom/doctype/deploy_instance/test_deploy_instance.py

diff --git a/frappe/custom/doctype/deploy_instance/__init__.py b/frappe/custom/doctype/deploy_instance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.js b/frappe/custom/doctype/deploy_instance/deploy_instance.js
new file mode 100644
index 0000000000..d4b6e75155
--- /dev/null
+++ b/frappe/custom/doctype/deploy_instance/deploy_instance.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('DeployInstance', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.json b/frappe/custom/doctype/deploy_instance/deploy_instance.json
new file mode 100644
index 0000000000..2822ab81f9
--- /dev/null
+++ b/frappe/custom/doctype/deploy_instance/deploy_instance.json
@@ -0,0 +1,63 @@
+{
+ "actions": [],
+ "autoname": "field:instance",
+ "creation": "2020-04-06 15:34:44.428007",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "instance",
+  "user",
+  "password"
+ ],
+ "fields": [
+  {
+   "fieldname": "instance",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Instance URL",
+   "unique": 1
+  },
+  {
+   "fieldname": "user",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "User",
+   "options": "Email"
+  },
+  {
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Password"
+  }
+ ],
+ "links": [],
+ "modified": "2020-04-06 15:40:39.242881",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Deploy Instance",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_views": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.py b/frappe/custom/doctype/deploy_instance/deploy_instance.py
new file mode 100644
index 0000000000..9bc2e9192e
--- /dev/null
+++ b/frappe/custom/doctype/deploy_instance/deploy_instance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class DeployInstance(Document):
+	pass
diff --git a/frappe/custom/doctype/deploy_instance/test_deploy_instance.py b/frappe/custom/doctype/deploy_instance/test_deploy_instance.py
new file mode 100644
index 0000000000..cdacc3a1ca
--- /dev/null
+++ b/frappe/custom/doctype/deploy_instance/test_deploy_instance.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestDeployInstance(unittest.TestCase):
+	pass
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
index c02aa0605d..05b99f3e57 100644
--- a/frappe/custom/doctype/release/release.py
+++ b/frappe/custom/doctype/release/release.py
@@ -32,7 +32,7 @@ class Release(Document):
 			self.install_package_to_remote(package, instance)
 
 	def install_package_to_remote(self, package, instance):
-		remote = frappe.get_doc("Instance", instance.instance)
+		remote = frappe.get_doc("Deploy Instance", instance.instance)
 
 		try:
 			connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
index 2ebdc93954..4ac4f30246 100644
--- a/frappe/custom/doctype/release_instance/release_instance.json
+++ b/frappe/custom/doctype/release_instance/release_instance.json
@@ -13,13 +13,13 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Instance",
-   "options": "Instance",
+   "options": "Deploy Instance",
    "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-06 15:30:08.966941",
+ "modified": "2020-04-06 15:37:07.099322",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Release Instance",

From 08d7f905b57060ae4d6418ee2e681bef4830e96e Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 15 Apr 2020 16:36:41 +0530
Subject: [PATCH 033/274] feat: provision to deploy packages

---
 .../deploy_instance/deploy_instance.json      | 45 ++++++-----------
 frappe/custom/doctype/package/package.js      | 24 ++++++---
 frappe/custom/doctype/package/package.json    | 14 +++++-
 frappe/custom/doctype/package/package.py      | 37 +++++++++++++-
 frappe/custom/doctype/release/__init__.py     |  0
 frappe/custom/doctype/release/release.js      | 23 ---------
 frappe/custom/doctype/release/release.json    | 41 ---------------
 frappe/custom/doctype/release/release.py      | 50 -------------------
 frappe/custom/doctype/release/test_release.py | 10 ----
 .../doctype/release_instance/__init__.py      |  0
 .../release_instance/release_instance.json    | 32 ------------
 .../release_instance/release_instance.py      | 10 ----
 12 files changed, 80 insertions(+), 206 deletions(-)
 delete mode 100644 frappe/custom/doctype/release/__init__.py
 delete mode 100644 frappe/custom/doctype/release/release.js
 delete mode 100644 frappe/custom/doctype/release/release.json
 delete mode 100644 frappe/custom/doctype/release/release.py
 delete mode 100644 frappe/custom/doctype/release/test_release.py
 delete mode 100644 frappe/custom/doctype/release_instance/__init__.py
 delete mode 100644 frappe/custom/doctype/release_instance/release_instance.json
 delete mode 100644 frappe/custom/doctype/release_instance/release_instance.py

diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.json b/frappe/custom/doctype/deploy_instance/deploy_instance.json
index 2822ab81f9..4bb140f088 100644
--- a/frappe/custom/doctype/deploy_instance/deploy_instance.json
+++ b/frappe/custom/doctype/deploy_instance/deploy_instance.json
@@ -1,63 +1,46 @@
 {
  "actions": [],
- "autoname": "field:instance",
- "creation": "2020-04-06 15:34:44.428007",
+ "creation": "2020-03-18 18:25:02.024237",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "instance",
-  "user",
+  "instance_url",
+  "username",
   "password"
  ],
  "fields": [
   {
-   "fieldname": "instance",
+   "fieldname": "instance_url",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Instance URL",
-   "unique": 1
+   "reqd": 1
   },
   {
-   "fieldname": "user",
+   "fieldname": "username",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "User",
-   "options": "Email"
+   "label": "Username",
+   "reqd": 1
   },
   {
    "fieldname": "password",
    "fieldtype": "Password",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Password"
+   "label": "Password",
+   "reqd": 1
   }
  ],
+ "istable": 1,
  "links": [],
- "modified": "2020-04-06 15:40:39.242881",
+ "modified": "2020-04-14 13:56:31.167730",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Deploy Instance",
  "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
+ "permissions": [],
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_views": 1
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index 1743f38dd3..47a7bce0df 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -3,12 +3,6 @@
 
 frappe.ui.form.on('Package', {
 	refresh: function(frm) {
-		if (frm.doc.package_details) {
-			frm.add_custom_button(__("Go to Release"), function() {
-				frappe.set_route("Form", "Release", "Release");
-			});
-		}
-
 		frm.set_query("document_type", "package_details", function () {
 			return {
 				filters: {
@@ -16,13 +10,29 @@ frappe.ui.form.on('Package', {
 				}
 			};
 		});
+
+		frappe.realtime.on("package", (data) => {
+			frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
+			if ((data.progress+1) != data.total) {
+				frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
+			} else {
+				frm.dashboard.hide_progress();
+			}
+		});
+
+		if(frm.doc.instances){
+			frm.add_custom_button(__("Deploy"), function() {
+				frm.call("deploy_package");
+			});
+		}
+
 	},
 	import: function(frm) {
 		frm.call("import_from_package");
 	}
 });
 
-frappe.ui.form.on('Package Details', {
+frappe.ui.form.on('Package Detail', {
 	form_render: function (frm, cdt, cdn) {
 		function _show_filters(filters, table) {
 			table.find('tbody').empty();
diff --git a/frappe/custom/doctype/package/package.json b/frappe/custom/doctype/package/package.json
index 0607abf6d7..2bec7f9b79 100644
--- a/frappe/custom/doctype/package/package.json
+++ b/frappe/custom/doctype/package/package.json
@@ -6,6 +6,8 @@
  "engine": "InnoDB",
  "field_order": [
   "package_details",
+  "section_break_2",
+  "instances",
   "import_section",
   "attach",
   "import"
@@ -34,11 +36,21 @@
    "fieldtype": "Table",
    "label": "Package Details",
    "options": "Package Detail"
+  },
+  {
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "instances",
+   "fieldtype": "Table",
+   "label": "Instances",
+   "options": "Deploy Instance"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-06 14:32:42.202640",
+ "modified": "2020-04-14 13:50:50.779396",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package",
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package/package.py
index 0cdfe4a87e..b4427d55bc 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package/package.py
@@ -11,9 +11,11 @@ from frappe.model.document import Document
 from frappe.utils.file_manager import save_file, get_file
 from frappe import _
 from six import string_types
+from frappe.frappeclient import FrappeClient
+from frappe.model.naming import make_autoname
+from frappe.utils.password import get_decrypted_password
 
 class Package(Document):
-
 	def import_from_package(self):
 		filters = {"attached_to_doctype": "Package", "attached_to_name": "Package"}
 		files = frappe.get_list("File", filters=filters, limit=1, order_by="creation desc")
@@ -27,6 +29,39 @@ class Package(Document):
 
 		frappe.msgprint(_("Package Imported."))
 
+	def deploy_package(self):
+		package = export_package()
+
+		for dt_file in frappe.get_list("File", filters={"attached_to_doctype": "Release", "attached_to_name": "Release"}):
+			frappe.delete_doc_if_exists("File", dt_file.name)
+
+		file_name = make_autoname("Package")
+		save_file(file_name, json.dumps(package), "Package", "Package")
+
+		length = len(self.instances)
+		for idx, instance in enumerate(self.instances):
+			frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance_url, "prefix": _("Deploying")},
+				user=frappe.session.user)
+
+			self.install_package_to_remote(package, instance)
+
+	def install_package_to_remote(self, package, instance):
+		print((instance.doctype, instance.name))
+		try:
+			connection = FrappeClient(instance.instance_url, instance.username, get_decrypted_password(instance.doctype, instance.name))
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(instance.instance_url))
+
+		try:
+			connection.post_request({
+				"cmd": "frappe.custom.doctype.package.package.import_package",
+				"package": json.dumps(package)
+			})
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(instance.instance_url))
+
 @frappe.whitelist()
 def export_package():
 	"""Export package as JSON."""
diff --git a/frappe/custom/doctype/release/__init__.py b/frappe/custom/doctype/release/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/custom/doctype/release/release.js b/frappe/custom/doctype/release/release.js
deleted file mode 100644
index 709ae18d36..0000000000
--- a/frappe/custom/doctype/release/release.js
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Release', {
-	refresh: function(frm) {
-		frm.add_custom_button(__("Go to Package"), function() {
-			frappe.set_route("Form", "Package", "Package");
-		});
-
-		frm.add_custom_button(__("Release"), function() {
-			frm.call("create_release");
-		});
-
-		frappe.realtime.on("package", (data) => {
-			frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
-			if ((data.progress+1) != data.total) {
-				frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
-			} else {
-				frm.dashboard.hide_progress();
-			}
-		});
-	}
-});
diff --git a/frappe/custom/doctype/release/release.json b/frappe/custom/doctype/release/release.json
deleted file mode 100644
index b3f44196d0..0000000000
--- a/frappe/custom/doctype/release/release.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "actions": [],
- "creation": "2020-03-17 13:27:30.158389",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "instances"
- ],
- "fields": [
-  {
-   "fieldname": "instances",
-   "fieldtype": "Table",
-   "label": "Instances",
-   "options": "Release Instance"
-  }
- ],
- "issingle": 1,
- "links": [],
- "modified": "2020-04-06 14:56:56.206720",
- "modified_by": "Administrator",
- "module": "Custom",
- "name": "Release",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/custom/doctype/release/release.py b/frappe/custom/doctype/release/release.py
deleted file mode 100644
index 05b99f3e57..0000000000
--- a/frappe/custom/doctype/release/release.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-import json
-from frappe import _
-from frappe.model.document import Document
-from frappe.custom.doctype.package.package import export_package
-from frappe.frappeclient import FrappeClient
-from frappe.utils.file_manager import save_file
-from frappe.model.naming import make_autoname
-from frappe.utils.password import get_decrypted_password
-
-class Release(Document):
-
-	def create_release(self):
-		package = export_package()
-
-		for dt_file in frappe.get_list("File", filters={"attached_to_doctype": "Release", "attached_to_name": "Release"}):
-			frappe.delete_doc_if_exists("File", dt_file.name)
-
-		file_name = make_autoname("Package")
-		save_file(file_name, json.dumps(package), "Release", "Release")
-
-		length = len(self.instances)
-		for idx, instance in enumerate(self.instances):
-			frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance, "prefix": _("Deploying")},
-				user=frappe.session.user)
-
-			self.install_package_to_remote(package, instance)
-
-	def install_package_to_remote(self, package, instance):
-		remote = frappe.get_doc("Deploy Instance", instance.instance)
-
-		try:
-			connection = FrappeClient(remote.instance, remote.user, get_decrypted_password(remote.doctype, remote.name))
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(remote.instance))
-
-		try:
-			connection.post_request({
-				"cmd": "frappe.custom.doctype.package.package.import_package",
-				"package": json.dumps(package)
-			})
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(remote.instance))
diff --git a/frappe/custom/doctype/release/test_release.py b/frappe/custom/doctype/release/test_release.py
deleted file mode 100644
index 13e4e26ac0..0000000000
--- a/frappe/custom/doctype/release/test_release.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestRelease(unittest.TestCase):
-	pass
diff --git a/frappe/custom/doctype/release_instance/__init__.py b/frappe/custom/doctype/release_instance/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/custom/doctype/release_instance/release_instance.json b/frappe/custom/doctype/release_instance/release_instance.json
deleted file mode 100644
index 4ac4f30246..0000000000
--- a/frappe/custom/doctype/release_instance/release_instance.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "actions": [],
- "creation": "2020-03-18 18:25:02.024237",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "instance"
- ],
- "fields": [
-  {
-   "fieldname": "instance",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Instance",
-   "options": "Deploy Instance",
-   "reqd": 1
-  }
- ],
- "istable": 1,
- "links": [],
- "modified": "2020-04-06 15:37:07.099322",
- "modified_by": "Administrator",
- "module": "Custom",
- "name": "Release Instance",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/custom/doctype/release_instance/release_instance.py b/frappe/custom/doctype/release_instance/release_instance.py
deleted file mode 100644
index f5b745a9b4..0000000000
--- a/frappe/custom/doctype/release_instance/release_instance.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class ReleaseInstance(Document):
-	pass

From b7408102411e4375aa1a155b3ee2bc809782aebc Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 4 May 2020 14:00:14 +0530
Subject: [PATCH 034/274] feat(blog settings): social share settings

---
 .../doctype/blog_settings/blog_settings.json  | 182 ++++++------------
 .../doctype/social_link_settings/__init__.py  |   0
 .../social_link_settings.json                 |  43 +++++
 .../social_link_settings.py                   |  10 +
 4 files changed, 107 insertions(+), 128 deletions(-)
 create mode 100644 frappe/website/doctype/social_link_settings/__init__.py
 create mode 100644 frappe/website/doctype/social_link_settings/social_link_settings.json
 create mode 100644 frappe/website/doctype/social_link_settings/social_link_settings.py

diff --git a/frappe/website/doctype/blog_settings/blog_settings.json b/frappe/website/doctype/blog_settings/blog_settings.json
index 1ee974d850..f0e51de170 100644
--- a/frappe/website/doctype/blog_settings/blog_settings.json
+++ b/frappe/website/doctype/blog_settings/blog_settings.json
@@ -1,139 +1,65 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-03-11 17:48:16", 
- "custom": 0, 
- "description": "Blog Settings", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 0, 
+ "actions": [],
+ "creation": "2013-03-11 17:48:16",
+ "description": "Blog Settings",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "blog_title",
+  "blog_introduction",
+  "writers_introduction",
+  "section_break_4",
+  "social_share_settings"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "blog_title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Blog Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "blog_title",
+   "fieldtype": "Data",
+   "label": "Blog Title"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "blog_introduction", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Blog Introduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "blog_introduction",
+   "fieldtype": "Small Text",
+   "label": "Blog Introduction"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "writers_introduction", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Writers Introduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "writers_introduction",
+   "fieldtype": "Small Text",
+   "label": "Writers Introduction"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "social_share_settings",
+   "fieldtype": "Table",
+   "label": "Social Share Settings",
+   "options": "Social Link Settings"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-cog", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2016-12-29 14:40:41.629468", 
- "modified_by": "Administrator", 
- "module": "Website", 
- "name": "Blog Settings", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-cog",
+ "idx": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-05-04 09:10:41.815238",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Blog Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Website Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Website Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/social_link_settings/__init__.py b/frappe/website/doctype/social_link_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/social_link_settings/social_link_settings.json b/frappe/website/doctype/social_link_settings/social_link_settings.json
new file mode 100644
index 0000000000..459c98eed6
--- /dev/null
+++ b/frappe/website/doctype/social_link_settings/social_link_settings.json
@@ -0,0 +1,43 @@
+{
+ "actions": [],
+ "creation": "2020-04-30 07:39:33.095554",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "social_link_type",
+  "color",
+  "background_color"
+ ],
+ "fields": [
+  {
+   "fieldname": "social_link_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Social Link Type",
+   "options": "\nfacebook\nlinkedin\ntwitter\nemail"
+  },
+  {
+   "fieldname": "color",
+   "fieldtype": "Color",
+   "in_list_view": 1,
+   "label": "Color"
+  },
+  {
+   "fieldname": "background_color",
+   "fieldtype": "Color",
+   "in_list_view": 1,
+   "label": "Background Color"
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-01 23:55:04.731518",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Social Link Settings",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/social_link_settings/social_link_settings.py b/frappe/website/doctype/social_link_settings/social_link_settings.py
new file mode 100644
index 0000000000..b382afac99
--- /dev/null
+++ b/frappe/website/doctype/social_link_settings/social_link_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class SocialLinkSettings(Document):
+	pass

From ef3e3685e90449f3379102833f40d6c7d6a50674 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 4 May 2020 18:01:14 +0530
Subject: [PATCH 035/274] feat(about): add social media links

---
 frappe/public/js/frappe/ui/toolbar/about.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js
index 13ba4836fb..87462916c2 100644
--- a/frappe/public/js/frappe/ui/toolbar/about.js
+++ b/frappe/public/js/frappe/ui/toolbar/about.js
@@ -9,6 +9,12 @@ frappe.ui.misc.about = function() {
 			Website: <a href='https://frappe.io' target='_blank'>https://frappe.io</a></p>\
 		<p><i class='fa fa-github fa-fw'></i>\
 			Source: <a href='https://github.com/frappe' target='_blank'>https://github.com/frappe</a></p>\
+		<p><i class='fa fa-linkedin fa-fw'></i>\
+			Linkedin: <a href='https://linkedin.com/company/frappe-tech' target='_blank'>https://linkedin.com/company/frappe-tech</a></p>\
+		<p><i class='fa fa-facebook fa-fw'></i>\
+			Facebook: <a href='https://facebook.com/erpnext' target='_blank'>https://facebook.com/erpnext</a></p>\
+		<p><i class='fa fa-twitter fa-fw'></i>\
+			Twitter: <a href='https://twitter.com/erpnext' target='_blank'>https://twitter.com/erpnext</a></p>\
 		<hr>\
 		<h4>Installed Apps</h4>\
 		<div id='about-app-versions'>Loading versions...</div>\

From 77d2c3d8cfaaa61aa7c8984f6e5ec3640c6ab020 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 13:43:34 +0530
Subject: [PATCH 036/274] feat: added patch for is unique

---
 frappe/patches.txt                            |  1 +
 .../patches/v13_0/set_unique_for_page_view.py |  6 +++++
 .../doctype/web_page_view/web_page_view.json  | 24 ++++++++++++++-----
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 frappe/patches/v13_0/set_unique_for_page_view.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index a086fa6f4a..3d8b0732d2 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -278,3 +278,4 @@ frappe.patches.v13_0.set_path_for_homepage_in_web_page_view
 frappe.patches.v13_0.migrate_translation_column_data
 frappe.patches.v13_0.set_read_times
 frappe.patches.v13_0.remove_web_view
+frappe.patches.v13_0.set_unique_for_page_view
\ No newline at end of file
diff --git a/frappe/patches/v13_0/set_unique_for_page_view.py b/frappe/patches/v13_0/set_unique_for_page_view.py
new file mode 100644
index 0000000000..2a084e52e3
--- /dev/null
+++ b/frappe/patches/v13_0/set_unique_for_page_view.py
@@ -0,0 +1,6 @@
+import frappe
+
+def execute():
+	frappe.reload_doc('website', 'doctype', 'web_page_view', force=True)
+	site_url = frappe.utils.get_site_url(frappe.local.site)
+	frappe.db.sql("""UPDATE `tabWeb Page View` set is_unique=1 where referrer LIKE '%{0}%'""".format(site_url))
diff --git a/frappe/website/doctype/web_page_view/web_page_view.json b/frappe/website/doctype/web_page_view/web_page_view.json
index 7a1a210d62..4243df39b1 100644
--- a/frappe/website/doctype/web_page_view/web_page_view.json
+++ b/frappe/website/doctype/web_page_view/web_page_view.json
@@ -1,5 +1,6 @@
 {
  "actions": [],
+ "allow_import": 1,
  "creation": "2020-04-15 22:54:46.009703",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -9,7 +10,9 @@
   "referrer",
   "browser",
   "browser_version",
-  "date"
+  "is_unique",
+  "time_zone",
+  "user_agent"
  ],
  "fields": [
   {
@@ -39,15 +42,24 @@
    "set_only_once": 1
   },
   {
-   "fieldname": "date",
-   "fieldtype": "Datetime",
-   "label": "Date",
-   "set_only_once": 1
+   "fieldname": "is_unique",
+   "fieldtype": "Data",
+   "label": "Is Unique"
+  },
+  {
+   "fieldname": "time_zone",
+   "fieldtype": "Data",
+   "label": "Time Zone"
+  },
+  {
+   "fieldname": "user_agent",
+   "fieldtype": "Data",
+   "label": "User Agent"
   }
  ],
  "in_create": 1,
  "links": [],
- "modified": "2020-04-15 23:31:27.517793",
+ "modified": "2020-05-05 14:11:24.718770",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Page View",

From ab9e596f627dc70dab273d1b8485796559ea23a3 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 15:06:14 +0530
Subject: [PATCH 037/274] feat: do not track 404

---
 frappe/www/404.html          | 6 ++++--
 frappe/www/website_script.js | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/www/404.html b/frappe/www/404.html
index 47685c45d0..dc178dbdc8 100644
--- a/frappe/www/404.html
+++ b/frappe/www/404.html
@@ -15,7 +15,9 @@ html, body {
 }
 {% include "templates/styles/card_style.css" %}
 </style>
-
+<script>
+	window.is_404 = true;
+</script>
 <div class='page-card'>
 	<div class='page-card-head'>
 		<span class='indicator darkgrey'>{{_("Page Missing or Moved")}}</span>
@@ -29,4 +31,4 @@ html, body {
 	background-color: #f5f7fa;
 }
 </style>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/frappe/www/website_script.js b/frappe/www/website_script.js
index 7fdc2e94d6..e31b6812d5 100644
--- a/frappe/www/website_script.js
+++ b/frappe/www/website_script.js
@@ -14,7 +14,7 @@ ga('send', 'pageview');
 {%- endif %}
 
 {% if enable_view_tracking %}
-	if (navigator.doNotTrack != 1) {
+	if (navigator.doNotTrack != 1 && !window.is_404) {
 		frappe.ready(() => {
 			let browser = frappe.utils.get_browser();
 			frappe.call("frappe.website.doctype.web_page_view.web_page_view.make_view_log", {

From fb66f85d6364f26b4d1cc4281aed6ac80ee8bdb7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 15:06:48 +0530
Subject: [PATCH 038/274] feat: update website analytics report

---
 .../website_analytics/website_analytics.py       | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frappe/website/report/website_analytics/website_analytics.py b/frappe/website/report/website_analytics/website_analytics.py
index 8b2d5b3806..b821cbff1f 100644
--- a/frappe/website/report/website_analytics/website_analytics.py
+++ b/frappe/website/report/website_analytics/website_analytics.py
@@ -17,8 +17,8 @@ class WebsiteAnalytics(object):
 	def run(self):
 		columns = self.get_columns()
 		data = self.get_data()
-		summary = self.get_report_summary()
 		chart = self.get_chart_data()
+		summary = self.get_report_summary()
 		return columns, data, None, chart, summary
 
 	def get_columns(self):
@@ -56,7 +56,7 @@ class WebsiteAnalytics(object):
 
 		field, date_format = _get_field_for_chart(self.filters.range)
 
-		data = frappe.db.sql("""
+		self.chart_data = frappe.db.sql("""
 				SELECT
 					DATE_FORMAT({0}, %s) as date,
 					COUNT(*) as count,
@@ -65,9 +65,9 @@ class WebsiteAnalytics(object):
 				WHERE creation BETWEEN %s AND %s
 				GROUP BY DATE_FORMAT({0}, %s)
 				ORDER BY creation
-			""".format(field), (date_format, self.filters.from_date, self.filters.to_date, date_format), as_dict=1, debug=1)
+			""".format(field), (date_format, self.filters.from_date, self.filters.to_date, date_format), as_dict=1)
 
-		return self.prepare_chart_data(data)
+		return self.prepare_chart_data(self.chart_data)
 
 	def prepare_chart_data(self, data):
 		date_range = get_date_range(self.filters.from_date, self.filters.to_date, self.filters.range)
@@ -121,14 +121,12 @@ class WebsiteAnalytics(object):
 
 
 	def get_report_summary(self):
-		summary_data = frappe.get_all("Web Page View", fields=['is_unique', 'count(*) as count'], filters=self.query_filters, group_by="is_unique")
-
 		total_count = 0
 		unique_count = 0
-		for data in summary_data:
-			if data.get('is_unique'):
-				unique_count = data.get('count')
+		for data in self.chart_data:
+			unique_count += data.get('unique_count')
 			total_count += data.get('count')
+
 		report_summary = [
 			{
 				"value": total_count,

From 606c57be5d849335513025d6ef12e1ab50613c1b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 5 May 2020 17:35:26 +0530
Subject: [PATCH 039/274] fix: error message

---
 frappe/desk/form/assign_to.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index be83dc957e..6178690b1f 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -41,6 +41,9 @@ def add(args=None):
 	if not args:
 		args = frappe.local.form_dict
 
+	users_with_duplicate_todo = []
+	shared_with_users = []
+
 	for assign_to in json.loads(args.get("assign_to")):
 		filters = {
 			"reference_type": args['doctype'],
@@ -50,8 +53,7 @@ def add(args=None):
 		}
 
 		if frappe.get_all("ToDo", filters=filters):
-			if not args.get("bulk_assign"):
-				frappe.throw(_("Already in user's ToDo list"), DuplicateToDoError)
+			users_with_duplicate_todo.append(assign_to)
 		else:
 			from frappe.utils import nowdate
 
@@ -80,7 +82,7 @@ def add(args=None):
 			# if assignee does not have permissions, share
 			if not frappe.has_permission(doc=doc, user=assign_to):
 				frappe.share.add(doc.doctype, doc.name, assign_to)
-				frappe.msgprint(_('Shared with user {0} with read access').format(assign_to, alert=True))
+				shared_with_users.append(assign_to)
 
 			# make this document followed by assigned user
 			follow_document(args['doctype'], args['name'], assign_to)
@@ -89,6 +91,14 @@ def add(args=None):
 			notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',
 				description=args.get("description"))
 
+	if shared_with_users:
+		user_list = format_message_for_assign_to(shared_with_users)
+		frappe.msgprint(_("Shared with the following Users with Read access:{0}").format(user_list, alert=True))
+
+	if users_with_duplicate_todo:
+		user_list = format_message_for_assign_to(users_with_duplicate_todo)
+		frappe.msgprint(_("Already in the following Users ToDo list:{0}").format(user_list, alert=True))
+
 	return get(args)
 
 @frappe.whitelist()
@@ -186,3 +196,5 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE',
 
 	enqueue_create_notification(owner, notification_doc)
 
+def format_message_for_assign_to(users):
+	return "<br><br>" + "<br>".join(users)
\ No newline at end of file

From f684756fba34fcd5ac1099ea7938f64fe08e574d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 18:22:04 +0530
Subject: [PATCH 040/274] feat: added website analytics report

---
 .../website_analytics/website_analytics.js    |   2 -
 .../website_analytics/website_analytics.py    | 116 +++++++++++++++---
 2 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/frappe/website/report/website_analytics/website_analytics.js b/frappe/website/report/website_analytics/website_analytics.js
index b607a16eb4..7e051afa8c 100644
--- a/frappe/website/report/website_analytics/website_analytics.js
+++ b/frappe/website/report/website_analytics/website_analytics.js
@@ -9,14 +9,12 @@ frappe.query_reports["Website Analytics"] = {
 			label: __("From Date"),
 			fieldtype: "Date",
 			default: frappe.datetime.add_days(frappe.datetime.now_date(true), -7),
-			reqd: 1
 		},
 		{
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
 			default: frappe.datetime.now_date(true),
-			reqd: 1
 		},
 		{
 			fieldname: "range",
diff --git a/frappe/website/report/website_analytics/website_analytics.py b/frappe/website/report/website_analytics/website_analytics.py
index b821cbff1f..694bc9e797 100644
--- a/frappe/website/report/website_analytics/website_analytics.py
+++ b/frappe/website/report/website_analytics/website_analytics.py
@@ -3,6 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
+from datetime import datetime
 from frappe.utils.dateutils import get_date_range
 
 def execute(filters=None):
@@ -11,6 +12,16 @@ def execute(filters=None):
 class WebsiteAnalytics(object):
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
+
+		if not self.filters.to_date:
+			self.filters.to_date = datetime.now()
+
+		if not self.filters.from_date:
+			self.filters.from_date = frappe.utils.add_days(self.filters.to_date, -7)
+
+		if not self.filters.range:
+			self.filters.range = "D"
+
 		self.filters.to_date = frappe.utils.add_days(self.filters.to_date, 1)
 		self.query_filters = {'creation': ['between', [self.filters.from_date, self.filters.to_date]]}
 
@@ -19,7 +30,8 @@ class WebsiteAnalytics(object):
 		data = self.get_data()
 		chart = self.get_chart_data()
 		summary = self.get_report_summary()
-		return columns, data, None, chart, summary
+
+		return columns, data[:250], None, chart, summary
 
 	def get_columns(self):
 		return [
@@ -34,38 +46,105 @@ class WebsiteAnalytics(object):
 				"label": "Page Views",
 				"fieldtype": "Int",
 				"width": 150
+			},
+			{
+				"fieldname": "unique_count",
+				"label": "Unique Visitors",
+				"fieldtype": "Int",
+				"width": 150
 			}
 		]
 
 	def get_data(self):
-		data = frappe.get_all("Web Page View", fields=['path', 'count(*) as count'], filters=self.query_filters, group_by="path", order_by='count desc')
+		pg_query = """
+				SELECT
+					path,
+					COUNT(*) as count,
+					COUNT(CASE WHEN CAST(is_unique as Integer) = 1 THEN 1 END) as unique_count
+				FROM `tabWeb Page View`
+				WHERE  coalesce("tabWeb Page View".creation, '0001-01-01') BETWEEN %s AND %s
+				GROUP BY path
+				ORDER BY count desc
+			"""
+
+		mariadb_query = """
+				SELECT
+					path,
+					COUNT(*) as count,
+					COUNT(CASE WHEN is_unique = 1 THEN 1 END) as unique_count
+				FROM `tabWeb Page View`
+				WHERE creation BETWEEN %s AND %s
+				GROUP BY path
+				ORDER BY count desc
+			"""
+
+		data = frappe.db.multisql({
+				"mariadb": mariadb_query,
+				"postgres": pg_query
+			}, (self.filters.from_date, self.filters.to_date))
 		return data
 
-	def get_chart_data(self):
-		def _get_field_for_chart(filters_range):
-			field = 'creation'
-			date_format = '%Y-%m-%d'
+	def _get_query_for_mariadb(self):
+		filters_range = self.filters.range
+		field = 'creation'
+		date_format = '%Y-%m-%d'
 
-			if filters_range == "W":
-				field = 'ADDDATE(creation, INTERVAL 1-DAYOFWEEK(creation) DAY)'
+		if filters_range == "W":
+			field = 'ADDDATE(creation, INTERVAL 1-DAYOFWEEK(creation) DAY)'
 
-			elif filters_range == "M":
-				date_format = '%Y-%m-01'
+		elif filters_range == "M":
+			date_format = '%Y-%m-01'
 
-			return field, date_format
-
-		field, date_format = _get_field_for_chart(self.filters.range)
-
-		self.chart_data = frappe.db.sql("""
+		query = """
 				SELECT
 					DATE_FORMAT({0}, %s) as date,
 					COUNT(*) as count,
-					count(CASE WHEN is_unique = 1 THEN 1 END) as unique_count
+					COUNT(CASE WHEN is_unique = 1 THEN 1 END) as unique_count
 				FROM `tabWeb Page View`
 				WHERE creation BETWEEN %s AND %s
 				GROUP BY DATE_FORMAT({0}, %s)
 				ORDER BY creation
-			""".format(field), (date_format, self.filters.from_date, self.filters.to_date, date_format), as_dict=1)
+			""".format(field)
+
+		values = (date_format, self.filters.from_date, self.filters.to_date, date_format)
+
+		return query, values
+
+	def _get_query_for_postgres(self):
+		filters_range = self.filters.range
+		field = 'creation'
+		granularity = 'day'
+
+		if filters_range == "W":
+			granularity = 'week'
+
+		elif filters_range == "M":
+			granularity = 'day'
+
+		query = """
+				SELECT
+					DATE_TRUNC(%s, {0}) as date,
+					COUNT(*) as count,
+					COUNT(CASE WHEN CAST(is_unique as Integer) = 1 THEN 1 END) as unique_count
+				FROM "tabWeb Page View"
+				WHERE  coalesce("tabWeb Page View".{0}, '0001-01-01') BETWEEN %s AND %s
+				GROUP BY date_trunc(%s, {0})
+				ORDER BY date
+			""".format(field)
+
+		values = (granularity, self.filters.from_date, self.filters.to_date, granularity)
+
+		return query, values
+
+	def get_chart_data(self):
+		current_dialect = frappe.db.db_type or 'mariadb'
+
+		if current_dialect == 'mariadb':
+			query, values = self._get_query_for_mariadb()
+		else:
+			query, values = self._get_query_for_postgres()
+
+		self.chart_data = frappe.db.sql(query, values=values, as_dict=1)
 
 		return self.prepare_chart_data(self.chart_data)
 
@@ -114,7 +193,8 @@ class WebsiteAnalytics(object):
 			},
 			'axisOptions': {
 				'xIsSeries': 1
-			}
+			},
+			'colors': ['#7cd6fd', '#5e64ff']
 		}
 
 		return chart

From 83380f25475edfb3bec8d79cad7013d78443b9b4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 18:22:47 +0530
Subject: [PATCH 041/274] feat: added website analytics chart as JSON fixture

---
 frappe/model/sync.py                          |  5 ++--
 .../website_analytics/website_analytics.json  | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 frappe/website/dashboard_chart/website_analytics/website_analytics.json

diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index c2acb59f63..3dba994134 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -52,7 +52,8 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe
 			("desk", "desk_card"),
 			("desk", "desk_chart"),
 			("desk", "desk_shortcut"),
-			("desk", "desk_page")):
+			("desk", "desk_page"),
+			("desk", "dashboard_chart")):
 			files.append(os.path.join(frappe.get_app_path("frappe"), d[0],
 				"doctype", d[1], d[1] + ".json"))
 
@@ -82,7 +83,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F
 	document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format',
 		'website_theme', 'web_form', 'web_template', 'notification', 'print_style',
 		'data_migration_mapping', 'data_migration_plan', 'desk_page',
-		'onboarding_step', 'onboarding']
+		'onboarding_step', 'onboarding', 'dashboard_chart']
 
 	for doctype in document_types:
 		doctype_path = os.path.join(start_path, doctype)
diff --git a/frappe/website/dashboard_chart/website_analytics/website_analytics.json b/frappe/website/dashboard_chart/website_analytics/website_analytics.json
new file mode 100644
index 0000000000..eeeb1a11f9
--- /dev/null
+++ b/frappe/website/dashboard_chart/website_analytics/website_analytics.json
@@ -0,0 +1,24 @@
+{
+ "chart_name": "Website Analytics",
+ "chart_type": "Report",
+ "creation": "2020-05-05 18:14:19.369181",
+ "custom_options": "{\"type\": \"line\", \"lineOptions\": {\"regionFill\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"colors\": [\"#7cd6fd\", \"#5e64ff\"], \"tooltipOptions\": {}}",
+ "docstatus": 0,
+ "doctype": "Dashboard Chart",
+ "filters_json": "{}",
+ "group_by_type": "Count",
+ "idx": 0,
+ "is_custom": 1,
+ "is_public": 1,
+ "modified": "2020-05-05 18:16:47.383649",
+ "modified_by": "Administrator",
+ "name": "Website Analytics",
+ "number_of_groups": 0,
+ "owner": "Administrator",
+ "report_name": "Website Analytics",
+ "time_interval": "Yearly",
+ "timeseries": 0,
+ "timespan": "Last Year",
+ "type": "Line",
+ "y_axis": []
+}
\ No newline at end of file

From 06e4e6a3b933b28e29bcd7e01bf1027939a236a1 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 5 May 2020 18:29:42 +0530
Subject: [PATCH 042/274] feat: add analytics chart to desk

---
 frappe/website/desk_page/website/website.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frappe/website/desk_page/website/website.json b/frappe/website/desk_page/website/website.json
index 1c6066d21e..c42a17d404 100644
--- a/frappe/website/desk_page/website/website.json
+++ b/frappe/website/desk_page/website/website.json
@@ -27,7 +27,11 @@
   }
  ],
  "category": "Modules",
- "charts": [],
+ "charts": [
+  {
+   "chart_name": "Website Analytics"
+  }
+ ],
  "creation": "2020-03-02 14:13:51.089373",
  "developer_mode_only": 0,
  "disable_user_customization": 0,
@@ -37,7 +41,7 @@
  "idx": 0,
  "is_standard": 1,
  "label": "Website",
- "modified": "2020-04-26 13:03:49.094728",
+ "modified": "2020-05-05 18:17:13.232473",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website",

From e71b14c17dc9bf6b5ba7f22f8ed2899fa175e5f6 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 5 May 2020 19:53:50 +0530
Subject: [PATCH 043/274] fix: Schedule Date for Daily and Weekly frequency

---
 frappe/automation/doctype/auto_repeat/auto_repeat.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py
index bfcaf684d6..c447c55727 100644
--- a/frappe/automation/doctype/auto_repeat/auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py
@@ -299,17 +299,20 @@ def get_next_schedule_date(schedule_date, frequency, start_date, repeat_on_day=N
 		next_date = get_next_date(start_date, month_count)
 	else:
 		days = 7 if frequency == 'Weekly' else 1
-		next_date = add_days(start_date, days)
+		next_date = add_days(schedule_date, days)
 
 	# next schedule date should be after or on current date
 	if not for_full_schedule:
 		while getdate(next_date) < getdate(today()):
 			if month_count:
 				month_count += month_map.get(frequency)
-			next_date = get_next_date(start_date, month_count, day_count)
+				next_date = get_next_date(start_date, month_count, day_count)
+			elif days:
+				next_date = add_days(next_date, days)
 
 	return next_date
 
+
 def get_next_date(dt, mcount, day=None):
 	dt = getdate(dt)
 	dt += relativedelta(months=mcount, day=day)

From 6ea8881b29106edf45155b9ac565d95f9672ded2 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 6 May 2020 12:48:15 +0530
Subject: [PATCH 044/274] fix: remove exact phrase search

---
 frappe/utils/global_search.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py
index 3c4b9583f8..0272ae16f4 100644
--- a/frappe/utils/global_search.py
+++ b/frappe/utils/global_search.py
@@ -81,10 +81,10 @@ def rebuild_for_doctype(doctype):
 		return filters
 
 	meta = frappe.get_meta(doctype)
-	
+
 	if cint(meta.issingle) == 1:
 		return
-	
+
 	if cint(meta.istable) == 1:
 		parent_doctypes = frappe.get_all("DocField", fields="parent", filters={
 			"fieldtype": ["in", frappe.model.table_fields],
@@ -506,15 +506,13 @@ def web_search(text, scope=None, start=0, limit=20):
 		mariadb_conditions = postgres_conditions = ' '.join([published_condition, scope_condition])
 
 		# https://mariadb.com/kb/en/library/full-text-index-overview/#in-boolean-mode
-		text = '"{}"'.format(text)
-		mariadb_conditions += 'MATCH(`content`) AGAINST (%(text)s IN BOOLEAN MODE)'
-		postgres_conditions += 'TO_TSVECTOR("content") @@ PLAINTO_TSQUERY(%(text)s)'
+		mariadb_conditions += 'MATCH(`content`) AGAINST ({} IN BOOLEAN MODE)'.format(frappe.db.escape('+' + text + '*'))
+		postgres_conditions += 'TO_TSVECTOR("content") @@ PLAINTO_TSQUERY({})'.format(frappe.db.escape(text))
 
 		values = {
 			"scope": "".join([scope, "%"]) if scope else '',
 			"limit": limit,
-			"start": start,
-			"text": text
+			"start": start
 		}
 
 		result = frappe.db.multisql({

From e91050b0e496d872d08a7898fb2124b3a64424ef Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 6 May 2020 13:14:22 +0530
Subject: [PATCH 045/274] fix: add admin to email unsubscribe

---
 frappe/desk/page/setup_wizard/install_fixtures.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/page/setup_wizard/install_fixtures.py b/frappe/desk/page/setup_wizard/install_fixtures.py
index c857bd077f..b74153f1c7 100644
--- a/frappe/desk/page/setup_wizard/install_fixtures.py
+++ b/frappe/desk/page/setup_wizard/install_fixtures.py
@@ -12,6 +12,7 @@ def install():
 	update_salutations()
 	update_global_search_doctypes()
 	setup_email_linking()
+	add_unsubscribe()
 
 @frappe.whitelist()
 def update_genders():
@@ -35,4 +36,12 @@ def setup_email_linking():
 		"email_id": "email_linking@example.com",
 	})
 	doc.insert(ignore_permissions=True, ignore_if_duplicate=True)
-  
\ No newline at end of file
+
+def add_unsubscribe():
+	email_unsubscribe = [
+		{"email": "admin@example.com", "global_unsubscribe": 1},
+		{"email": "guest@example.com", "global_unsubscribe": 1}
+	]
+
+	for unsubscribe in email_unsubscribe:
+		frappe.get_doc(unsubscribe).insert()
\ No newline at end of file

From 37e81e33a52da50ff16ed3e476afe97124a75000 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 6 May 2020 13:20:59 +0530
Subject: [PATCH 046/274] fix: add patch

---
 frappe/desk/page/setup_wizard/install_fixtures.py |  5 ++++-
 frappe/patches.txt                                |  1 +
 frappe/patches/v13_0/email_unsubscribe.py         | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v13_0/email_unsubscribe.py

diff --git a/frappe/desk/page/setup_wizard/install_fixtures.py b/frappe/desk/page/setup_wizard/install_fixtures.py
index b74153f1c7..692c1a117a 100644
--- a/frappe/desk/page/setup_wizard/install_fixtures.py
+++ b/frappe/desk/page/setup_wizard/install_fixtures.py
@@ -44,4 +44,7 @@ def add_unsubscribe():
 	]
 
 	for unsubscribe in email_unsubscribe:
-		frappe.get_doc(unsubscribe).insert()
\ No newline at end of file
+		if not frappe.get_all("Email Unsubscribe", filters=unsubscribe):
+			doc = frappe.new_doc("Email Unsubscribe")
+			doc.update(unsubscribe)
+			doc.insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/frappe/patches.txt b/frappe/patches.txt
index cbda8cf677..5d45cbec66 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -273,3 +273,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings')
 frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
 frappe.patches.v13_0.website_theme_custom_scss
+frappe.patches.v13_0.email_unsubscribe
diff --git a/frappe/patches/v13_0/email_unsubscribe.py b/frappe/patches/v13_0/email_unsubscribe.py
new file mode 100644
index 0000000000..69ed1be948
--- /dev/null
+++ b/frappe/patches/v13_0/email_unsubscribe.py
@@ -0,0 +1,13 @@
+import frappe
+
+def execute():
+	email_unsubscribe = [
+		{"email": "admin@example.com", "global_unsubscribe": 1},
+		{"email": "guest@example.com", "global_unsubscribe": 1}
+	]
+
+	for unsubscribe in email_unsubscribe:
+		if not frappe.get_all("Email Unsubscribe", filters=unsubscribe):
+			doc = frappe.new_doc("Email Unsubscribe")
+			doc.update(unsubscribe)
+			doc.insert(ignore_permissions=True)
\ No newline at end of file

From 04a59352f7ccaf66758632e15415395844246280 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 6 May 2020 17:40:50 +0530
Subject: [PATCH 047/274] fix: test cases

---
 frappe/desk/form/assign_to.py                     | 2 +-
 frappe/public/js/frappe/form/sidebar/assign_to.js | 2 +-
 frappe/tests/test_assign.py                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index 6178690b1f..6c8cd5dfbd 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -44,7 +44,7 @@ def add(args=None):
 	users_with_duplicate_todo = []
 	shared_with_users = []
 
-	for assign_to in json.loads(args.get("assign_to")):
+	for assign_to in frappe.parse_json(args.get("assign_to")):
 		filters = {
 			"reference_type": args['doctype'],
 			"reference_name": args['name'],
diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index 84fde564c0..95ceb246e6 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -130,7 +130,7 @@ frappe.ui.form.AssignToDialog = Class.extend({
 		this.set_description_from_doc();
 	},
 	make: function() {
-		let me = this
+		let me = this;
 
 		me.dialog = new frappe.ui.Dialog({
 			title: __('Add to ToDo'),
diff --git a/frappe/tests/test_assign.py b/frappe/tests/test_assign.py
index f32e3c9272..439e1546c0 100644
--- a/frappe/tests/test_assign.py
+++ b/frappe/tests/test_assign.py
@@ -60,7 +60,7 @@ class TestAssign(unittest.TestCase):
 
 def assign(doc, user):
 	return frappe.desk.form.assign_to.add({
-		"assign_to": user,
+		"assign_to": [user],
 		"doctype": doc.doctype,
 		"name": doc.name,
 		"description": 'test',

From 2c12af23191518a625b77c7cf6e715826b709db8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 7 May 2020 12:12:04 +0530
Subject: [PATCH 048/274] fix: consider permissions for charts and cards

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++--
 frappe/desk/doctype/number_card/number_card.py         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7ddb3d98f0..c03f6f8156 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -144,7 +144,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 	filters.append([doctype, datefield, '>=', from_date, False])
 	filters.append([doctype, datefield, '<=', to_date, False])
 
-	data = frappe.db.get_all(
+	data = frappe.db.get_list(
 		doctype,
 		fields = [
 			'extract(year from `tab{doctype}`.{datefield}) as _year'.format(doctype=doctype, datefield=datefield),
@@ -182,7 +182,7 @@ def get_group_by_chart_config(chart, filters):
 	group_by_field = chart.group_by_based_on
 	doctype = chart.document_type
 
-	data = frappe.db.get_all(
+	data = frappe.db.get_list(
 		doctype,
 		fields = [
 			'{} as name'.format(group_by_field),
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 2c5655beda..2c072f44c4 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -65,7 +65,7 @@ def get_result(doc, to_date=None):
 	if to_date:
 		filters.append([doc.document_type, 'creation', '<', to_date, False])
 
-	res = frappe.db.get_all(doc.document_type, fields=fields, filters=filters)
+	res = frappe.db.get_list(doc.document_type, fields=fields, filters=filters)
 	number = res[0]['result'] if res else 0
 
 	return cint(number)

From fff07548fd0e05b5e4232cbda25237a5137ff012 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 7 May 2020 14:00:32 +0530
Subject: [PATCH 049/274] fix: show restricted button to indicate permission
 restrictions

---
 frappe/core/page/dashboard/dashboard.css       |  5 +++++
 frappe/core/page/dashboard/dashboard.js        |  7 +++++++
 frappe/public/js/frappe/list/list_view.js      |  2 +-
 .../frappe/views/dashboard/dashboard_view.js   |  8 +++++++-
 frappe/public/less/dashboard_view.less         | 12 ++++++++++++
 frappe/public/less/desk.less                   | 17 +++++++++++++++++
 frappe/public/less/list.less                   | 18 +-----------------
 7 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index e69de29bb2..e1687a0675 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -0,0 +1,5 @@
+.restricted-button {
+    cursor: default;
+    position: relative;
+    right: -5px;
+}
\ No newline at end of file
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 222a31a863..0634d6518c 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -26,6 +26,13 @@ class Dashboard {
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
 		this.page = wrapper.page;
+
+		this.page.set_title_sub(
+			$(`<button class="restricted-button">
+				<span class="octicon octicon-lock"></span>
+				<span>${__('Restricted')}</span>
+			</button>`)
+		)
 	}
 
 	show() {
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index af9a3c0221..dd9362d664 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -139,7 +139,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	show_restricted_list_indicator_if_applicable() {
 		const match_rules_list = frappe.perm.get_match_rules(this.doctype);
 		if (match_rules_list.length) {
-			this.restricted_list = $(`<button class="restricted-list form-group">${__('Restricted')}</button>`)
+			this.restricted_list = $(`<button class="restricted-button">${__('Restricted')}</button>`)
 				.prepend('<span class="octicon octicon-lock"></span>')
 				.click(() => this.show_restrictions(match_rules_list))
 				.appendTo(this.page.page_form);
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 13c44d2130..83f45da5be 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -41,7 +41,13 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 		this.$dashboard_page = this.$page.find('.layout-main-section-wrapper').addClass('dashboard-page');
 		this.$page.find('.page-form').empty().html(
 			`<div class="dashboard-header">
-				<div class="text-muted uppercase">${dashboard_name}</div>
+				<div class="text-muted">
+					<span class="uppercase header-title"> ${dashboard_name} </span>
+				</div>
+				<button class="restricted-button">
+					<span class="octicon octicon-lock"></span>
+					<span>${__('Restricted')}</span>
+				</button>
 				<div class="text-muted customize-dashboard" data-action="customize">${__('Customize')}</div>
 				<div class="small text-muted customize-options small-bounce">
 					<span class="reset-customization customize-option" data-action="reset_dashboard_customization">${__('Reset')}</span>
diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less
index 874e4e2e36..5af532b9c7 100644
--- a/frappe/public/less/dashboard_view.less
+++ b/frappe/public/less/dashboard_view.less
@@ -28,6 +28,18 @@
             display: flex;
             justify-content: space-between;
             width: 100%;
+
+            .header-title {
+                line-height: 1.5em;
+                vertical-align: text-bottom;
+            }
+
+            .restricted-button {
+                cursor: default;
+                position: relative;
+                right: 5px;
+                top: -3px;
+            }
         }
 
         .customize-dashboard {
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 6d44fc5192..e85367435e 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -316,6 +316,23 @@ li.user-progress {
 	}
 }
 
+.restricted-button {
+	padding: 0px 10px;
+	border: 1px solid @yellow;
+	height: 25px;
+	font-weight: 600;
+	border-radius:  5px;
+	background: lightyellow;
+	color: @text-light;
+	margin: auto 5px auto auto;
+	font-size: @text-small;
+	outline: 0;
+	.octicon {
+		padding-right: 5px;
+		font-size: 12px;
+	}
+}
+
 /* on small screens, show only icons on top */
 @media (max-width: 767px) {
 	.module-view-layout .nav-stacked > li {
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 3294e24bf3..639e67e3a7 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -298,26 +298,10 @@ input.list-check-all, input.list-row-checkbox {
 	.awesomplete > ul {
 		min-width: 300px;
 	}
-	.restricted-list {
-		padding: 0px 10px;
-		border: 1px solid @yellow;
-		height: 25px;
-		font-weight: 600;
-		border-radius:  5px;
-		background: lightyellow;
-		color: @text-light;
-		margin: auto 5px auto auto;
-		font-size: @text-small;
-		outline: 0;
-		.octicon {
-			padding-right: 5px;
-			font-size: 12px;
-		}
-	}
 }
 
 .frappe-rtl {
-	.restricted-list {
+	.restricted-button {
 		margin: auto auto auto 5px;
 		direction: ltr;
 	}

From eeaca0968f210c288e82961f0305b9316840f555 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 7 May 2020 16:03:04 +0530
Subject: [PATCH 050/274] feat: add styling and links for sharing blogs

---
 frappe/website/doctype/blog_post/blog_post.py | 23 +++++++++
 .../blog_post/templates/blog_post.html        | 50 ++++++++++++++-----
 .../doctype/blog_settings/blog_settings.js    |  2 +-
 .../website_theme/standard/standard.json      |  2 +-
 4 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index be58bec842..d24c3a5e8e 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -61,6 +61,7 @@ class BlogPost(WebsiteGenerator):
 		# temp fields
 		context.full_name = get_fullname(self.owner)
 		context.updated = global_date_format(self.published_on)
+		context.social_links = self.fetch_social_links_info()
 
 		if self.blogger:
 			context.blogger_info = frappe.get_doc("Blogger", self.blogger).as_dict()
@@ -89,6 +90,28 @@ class BlogPost(WebsiteGenerator):
 			{"name": "Blog", "route": "/blog"},
 			{"label": context.category.title, "route":context.category.route}]
 
+
+	def fetch_social_links_info(self):
+		url = frappe.local.site + "/" +self.route
+		social_url_map = {
+			"twitter": "https://twitter.com/intent/tweet?text=" +self.title + "&url=" + url,
+			"facebook": "https://www.facebook.com/sharer.php?u=" + url,
+			"linkedin": "https://www.linkedin.com/sharing/share-offsite/?url=" + url,
+			"email": "mailto:?subject=" + self.title + "&body=" + url,
+		}
+
+		social_link = []
+		for link in frappe.get_cached_doc("Blog Settings").social_share_settings:
+			social_media = link.social_link_type
+
+			social_link.append({
+				'icon': social_media if not social_media == 'email' else 'envelope',
+				'url': social_url_map.get(social_media),
+				'color': link.color,
+				'background': link.background_color
+			})
+		return social_link
+
 	def load_comments(self, context):
 		context.comment_list = get_comment_list(self.doctype, self.name)
 
diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index 4c4219ea54..f01d3a7e9b 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -9,18 +9,30 @@
 	<article class="blog-content mb-3" itemscope itemtype="http://schema.org/BlogPosting">
 		<!-- begin blog content -->
 		<div class="blog-info">
-			<h1 itemprop="headline" class="blog-header">{{ title }}</h1>
-			<p class="text-muted small">
-			{{ frappe.format_date(published_on) }}
-			{% if read_time %}
-				&middot;
-				{{ read_time }} min read
-			{% endif %}
-			</p>
+			<span class="text-center">
+				<h1 itemprop="headline" class="blog-header">{{ title }}</h1>
+				<p class="lead">
+					{{ blog_intro }}
+				</p>
+			</span>
+			
+			<div class="text-muted small meta-info">
+				{{ frappe.format_date(published_on) }}
+				{% if read_time %}
+					&middot;
+					{{ read_time }} min read
+				{% endif %}
+				{% if social_links %}
+				<div class="social-links">
+					{% for link in social_links %}
+						<a href="{{ link.url }}" class="fa fa-{{ link.icon }}" 
+							style='color:{{ link.color }}; background-color: {{ link.background }};' 
+							target="_blank"></a>
+					{% endfor %}
+				</div>
+				{% endif %}
+			</div>
 		</div>
-		<p class="lead">
-			{{ blog_intro }}
-		</p>
 		<div itemprop="articleBody" class="longform blog-text mt-5">
 		{{ content }}
 		</div>
@@ -51,6 +63,20 @@
 	margin: 0 auto;
 	font-size: 1.2rem;
 }
-
+.meta-info {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-end;
+}
+.social-links {
+	margin-right: 0px;
+}
+.social-links a { 
+	font-size: 1.25rem;
+	margin: 0 5px 0 0;
+	padding: 5px;
+	width: 2.5rem;
+	text-align: center;
+}
 </style>
 {% endblock %}
diff --git a/frappe/website/doctype/blog_settings/blog_settings.js b/frappe/website/doctype/blog_settings/blog_settings.js
index b52c8862c5..90421b9550 100644
--- a/frappe/website/doctype/blog_settings/blog_settings.js
+++ b/frappe/website/doctype/blog_settings/blog_settings.js
@@ -5,4 +5,4 @@ frappe.ui.form.on('Blog Settings', {
 	refresh: function(frm) {
 
 	}
-});
+})
\ No newline at end of file
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index 1729e4616a..db79bde0a8 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -10,7 +10,7 @@
  "font_properties": "300,600",
  "footer": [],
  "idx": 26,
- "modified": "2020-04-29 12:26:48.399125",
+ "modified": "2020-05-06 17:36:19.830993",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Standard",

From fe911aa0c59251b8ebf25cd95cf263ce5a073b08 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Thu, 7 May 2020 18:25:17 +0530
Subject: [PATCH 051/274] Update package.js

---
 frappe/custom/doctype/package/package.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package/package.js
index 47a7bce0df..956bbfc05c 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package/package.js
@@ -20,7 +20,7 @@ frappe.ui.form.on('Package', {
 			}
 		});
 
-		if(frm.doc.instances){
+		if (frm.doc.instances) {
 			frm.add_custom_button(__("Deploy"), function() {
 				frm.call("deploy_package");
 			});

From 8a918fd54dce8c0ab4ad2326d2f6dc8257412d33 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 7 May 2020 19:18:08 +0530
Subject: [PATCH 052/274] feat: use new sync API

---
 frappe/model/sync.py                          |  5 ++-
 .../website_analytics/website_analytics.json  | 24 -------------
 frappe/website/dashboard_fixtures.py          | 36 +++++++++++++++++++
 3 files changed, 38 insertions(+), 27 deletions(-)
 delete mode 100644 frappe/website/dashboard_chart/website_analytics/website_analytics.json
 create mode 100644 frappe/website/dashboard_fixtures.py

diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index 7991d11d15..320cc24677 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -55,8 +55,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe
 			("desk", "desk_card"),
 			("desk", "desk_chart"),
 			("desk", "desk_shortcut"),
-			("desk", "desk_page"),
-			("desk", "dashboard_chart")):
+			("desk", "desk_page")):
 			files.append(os.path.join(frappe.get_app_path("frappe"), d[0],
 				"doctype", d[1], d[1] + ".json"))
 
@@ -86,7 +85,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F
 	document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format',
 		'website_theme', 'web_form', 'web_template', 'notification', 'print_style',
 		'data_migration_mapping', 'data_migration_plan', 'desk_page',
-		'onboarding_step', 'onboarding', 'dashboard_chart']
+		'onboarding_step', 'onboarding']
 
 	for doctype in document_types:
 		doctype_path = os.path.join(start_path, doctype)
diff --git a/frappe/website/dashboard_chart/website_analytics/website_analytics.json b/frappe/website/dashboard_chart/website_analytics/website_analytics.json
deleted file mode 100644
index eeeb1a11f9..0000000000
--- a/frappe/website/dashboard_chart/website_analytics/website_analytics.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "chart_name": "Website Analytics",
- "chart_type": "Report",
- "creation": "2020-05-05 18:14:19.369181",
- "custom_options": "{\"type\": \"line\", \"lineOptions\": {\"regionFill\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"colors\": [\"#7cd6fd\", \"#5e64ff\"], \"tooltipOptions\": {}}",
- "docstatus": 0,
- "doctype": "Dashboard Chart",
- "filters_json": "{}",
- "group_by_type": "Count",
- "idx": 0,
- "is_custom": 1,
- "is_public": 1,
- "modified": "2020-05-05 18:16:47.383649",
- "modified_by": "Administrator",
- "name": "Website Analytics",
- "number_of_groups": 0,
- "owner": "Administrator",
- "report_name": "Website Analytics",
- "time_interval": "Yearly",
- "timeseries": 0,
- "timespan": "Last Year",
- "type": "Line",
- "y_axis": []
-}
\ No newline at end of file
diff --git a/frappe/website/dashboard_fixtures.py b/frappe/website/dashboard_fixtures.py
new file mode 100644
index 0000000000..4e5b5454bb
--- /dev/null
+++ b/frappe/website/dashboard_fixtures.py
@@ -0,0 +1,36 @@
+import frappe
+
+def get_data():
+	return frappe._dict({
+		"dashboards": get_dashboards(),
+		"charts": get_charts(),
+		"number_cards": get_number_cards(),
+	})
+
+def get_dashboards():
+	return [{
+		"name": "Website",
+		"dashboard_name": "Website",
+		"charts": [
+			{ "chart": "Website Analytics", "width": "Full" }
+		]
+	}]
+
+def get_charts():
+	return [{
+		"chart_name": "Website Analytics",
+		"chart_type": "Report",
+		"custom_options": "{\"type\": \"line\", \"lineOptions\": {\"regionFill\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"colors\": [\"#7cd6fd\", \"#5e64ff\"], \"tooltipOptions\": {}}",
+		"doctype": "Dashboard Chart",
+		"filters_json": "{}",
+		"group_by_type": "Count",
+		"is_custom": 1,
+		"is_public": 1,
+		"name": "Website Analytics",
+		"number_of_groups": 0,
+		"report_name": "Website Analytics",
+		"time_interval": "Yearly",
+		"timeseries": 0,
+		"timespan": "Last Year",
+		"type": "Line"
+	}]
\ No newline at end of file

From 80f6ff7f17c95f1046d7b377e5395a46ff403e42 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 7 May 2020 23:34:37 +0530
Subject: [PATCH 053/274] style: formatting fixes

---
 frappe/core/page/dashboard/dashboard.js | 2 +-
 frappe/public/less/desk.less            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 0634d6518c..db2f8f8988 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -32,7 +32,7 @@ class Dashboard {
 				<span class="octicon octicon-lock"></span>
 				<span>${__('Restricted')}</span>
 			</button>`)
-		)
+		);
 	}
 
 	show() {
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index e85367435e..4c2c37c785 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -327,7 +327,7 @@ li.user-progress {
 	margin: auto 5px auto auto;
 	font-size: @text-small;
 	outline: 0;
-	.octicon {
+	.octicon-lock {
 		padding-right: 5px;
 		font-size: 12px;
 	}

From 50bde698bb5848f3303a9fbb84634a0aac53d4d5 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 8 May 2020 15:11:21 +0530
Subject: [PATCH 054/274] fix: alignment issues on mobile

---
 frappe/website/doctype/blog_post/templates/blog_post.html | 4 +++-
 frappe/website/doctype/blog_settings/blog_settings.js     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index f01d3a7e9b..12e5ccf2d7 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -67,14 +67,16 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: flex-end;
+	flex-wrap: wrap;
 }
 .social-links {
 	margin-right: 0px;
+	margin-top: 1rem;
 }
 .social-links a { 
 	font-size: 1.25rem;
 	margin: 0 5px 0 0;
-	padding: 5px;
+	padding: 5px 0;
 	width: 2.5rem;
 	text-align: center;
 }
diff --git a/frappe/website/doctype/blog_settings/blog_settings.js b/frappe/website/doctype/blog_settings/blog_settings.js
index 90421b9550..5ffc4ffc44 100644
--- a/frappe/website/doctype/blog_settings/blog_settings.js
+++ b/frappe/website/doctype/blog_settings/blog_settings.js
@@ -5,4 +5,4 @@ frappe.ui.form.on('Blog Settings', {
 	refresh: function(frm) {
 
 	}
-})
\ No newline at end of file
+});
\ No newline at end of file

From 9e0b96c5c90239442a3240a74ae8d4378c1d9387 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 8 May 2020 18:21:18 +0530
Subject: [PATCH 055/274] fix: function not found

---
 frappe/website/dashboard_fixtures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/dashboard_fixtures.py b/frappe/website/dashboard_fixtures.py
index 4e5b5454bb..01f1376d43 100644
--- a/frappe/website/dashboard_fixtures.py
+++ b/frappe/website/dashboard_fixtures.py
@@ -4,7 +4,7 @@ def get_data():
 	return frappe._dict({
 		"dashboards": get_dashboards(),
 		"charts": get_charts(),
-		"number_cards": get_number_cards(),
+		"number_cards": None,
 	})
 
 def get_dashboards():

From 62c1b74932294e232dcc214b75b55006e214f386 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 29 Apr 2020 17:52:02 +0530
Subject: [PATCH 056/274] feat: add heatmap type dashboard chart

---
 frappe/core/page/dashboard/dashboard.js       |   4 +-
 .../dashboard_chart/dashboard_chart.js        |   6 +-
 .../dashboard_chart/dashboard_chart.json      |  19 +--
 .../dashboard_chart/dashboard_chart.py        |  30 ++++-
 .../js/frappe/views/reports/report_utils.js   |   2 +-
 .../public/js/frappe/widgets/chart_widget.js  | 120 ++++++++++++------
 frappe/public/less/desktop.less               |  48 +++++++
 7 files changed, 175 insertions(+), 54 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index 222a31a863..0d1337351e 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -6,7 +6,7 @@ frappe.provide('frappe.dashboards.chart_sources');
 
 
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
-	var page = frappe.ui.make_app_page({
+	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __("Dashboard"),
 		single_column: true
@@ -21,7 +21,7 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 class Dashboard {
 	constructor(wrapper) {
 		this.wrapper = $(wrapper);
-		$(`<div class="dashboard">
+		$(`<div class="dashboard" style="overflow-y: hidden">
 			<div class="dashboard-graph"></div>
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index f8d5886b26..894dcccb27 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -88,9 +88,9 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 
 			if (frm.doc.chart_type == 'Group By') {
-				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie']);
+				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie', 'Donut']);
 			} else {
-				frm.set_df_property('type', 'options', ['Line', 'Bar']);
+				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Heatmap']);
 			}
 
 			frm.set_value('document_type', '');
@@ -358,5 +358,3 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 });
-
-
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index b5201a8b1f..d6f204db00 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -28,12 +28,12 @@
   "to_date",
   "time_interval",
   "timeseries",
+  "type",
   "filters_section",
   "filters_json",
   "chart_options_section",
-  "type",
-  "column_break_2",
   "color",
+  "column_break_2",
   "custom_options",
   "section_break_10",
   "last_synced_on"
@@ -85,22 +85,22 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "timeseries",
+   "depends_on": "eval: doc.timeseries && doc.type !== 'Heatmap'",
    "fieldname": "timespan",
    "fieldtype": "Select",
    "label": "Timespan",
    "options": "Last Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range"
   },
   {
-   "depends_on": "timeseries",
+   "depends_on": "eval: doc.timeseries && doc.type !== 'Heatmap'",
    "fieldname": "time_interval",
    "fieldtype": "Select",
    "label": "Time Interval",
    "options": "Yearly\nQuarterly\nMonthly\nWeekly\nDaily"
   },
   {
-   "default": "0",
-   "depends_on": "eval: ['Count', 'Sum', 'Average'].includes(doc.chart_type)",
+   "default": "1",
+   "depends_on": "eval: doc.chart_type !== 'Group By'",
    "fieldname": "timeseries",
    "fieldtype": "Check",
    "label": "Time Series"
@@ -123,10 +123,11 @@
    "label": "Chart Options"
   },
   {
+   "default": "Line",
    "fieldname": "type",
    "fieldtype": "Select",
    "label": "Type",
-   "options": "Line\nBar\nPercentage\nPie\nDonut",
+   "options": "Line\nBar\nHeatmap",
    "reqd": 1
   },
   {
@@ -134,7 +135,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.chart_type !== 'Report'",
+   "depends_on": "eval: doc.chart_type !== 'Report' && doc.type !== 'Heatmap'",
    "fieldname": "color",
    "fieldtype": "Color",
    "label": "Color"
@@ -231,7 +232,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 15:22:59.119341",
+ "modified": "2020-04-29 17:50:59.867496",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 417ef2ba82..2b095b0263 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -87,7 +87,10 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 	if chart.chart_type == 'Group By':
 		chart_config = get_group_by_chart_config(chart, filters)
 	else:
-		chart_config =  get_chart_config(chart, filters, timespan, timegrain, from_date, to_date)
+		if chart.type == 'Heatmap':
+			chart_config = get_heatmap_chart_config(chart, filters)
+		else:
+			chart_config =  get_chart_config(chart, filters, timespan, timegrain, from_date, to_date)
 
 	return chart_config
 
@@ -174,6 +177,31 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 
 	return chart_config
 
+def get_heatmap_chart_config(chart, filters):
+	aggregate_function = get_aggregate_function(chart.chart_type)
+	value_field = chart.value_based_on or '1'
+	doctype = chart.document_type
+	datefield = chart.based_on
+	filters.append([doctype, datefield, '>', 'subdate(curdate(), interval 1 year)', False])
+
+	data = dict(frappe.db.get_all(
+		doctype,
+		fields = [
+			'unix_timestamp(date({datefield}))'.format(datefield=datefield),
+			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
+		],
+		filters = filters,
+		group_by = 'date(creation)',
+		as_list = 1,
+		order_by = 'creation asc',
+		ignore_ifnull = True
+	))
+
+	chart_config = {
+		'labels': '',
+		'dataPoints': data,
+	}
+	return chart_config
 
 def get_group_by_chart_config(chart, filters):
 
diff --git a/frappe/public/js/frappe/views/reports/report_utils.js b/frappe/public/js/frappe/views/reports/report_utils.js
index a8149b9134..7b1205482f 100644
--- a/frappe/public/js/frappe/views/reports/report_utils.js
+++ b/frappe/public/js/frappe/views/reports/report_utils.js
@@ -20,7 +20,7 @@ frappe.report_utils = {
 
 		return {
 			data: {
-				labels: labels,
+				labels: labels.length? labels: null,
 				datasets: datasets
 			},
 			truncateLegends: 1,
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index a50acfcd9d..4f95649635 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -40,6 +40,10 @@ export default class ChartWidget extends Widget {
 	setup_container() {
 		this.body.empty();
 
+		if (this.chart_doc.type == 'Heatmap') {
+			this.setup_heatmap_container();
+		}
+
 		this.loading = $(
 			`<div class="chart-loading-state text-muted" style="height: ${this.height}px;">${__(
 				"Loading..."
@@ -60,6 +64,12 @@ export default class ChartWidget extends Widget {
 		this.set_chart_title();
 	}
 
+	setup_heatmap_container() {
+		this.widget.addClass('heatmap-chart');
+		this.widget.removeClass('full-width').addClass('full-width');
+		this.width = 'Full';
+	}
+
 	set_summary() {
 		if (!this.$summary) {
 			this.$summary = $(`<div class="report-summary"></div>`).hide();
@@ -104,6 +114,10 @@ export default class ChartWidget extends Widget {
 	}
 
 	render_time_series_filters() {
+		if (this.chart_doc.type == 'Heatmap') {
+			return;
+		}
+
 		let filters = [
 			{
 				label: this.chart_settings.timespan || this.chart_doc.timespan,
@@ -465,51 +479,17 @@ export default class ChartWidget extends Widget {
 	}
 
 	render() {
-		const chart_type_map = {
-			Line: "line",
-			Bar: "bar",
-			Percentage: "percentage",
-			Pie: "pie",
-			Donut: "donut"
-		};
-
-		let colors = [];
-
-		if (this.chart_doc.y_axis.length) {
-			this.chart_doc.y_axis.map(field => {
-				colors.push(field.color);
-			});
-		} else if (["Line", "Bar"].includes(this.chart_doc.type)) {
-			colors = [this.chart_doc.color || []];
-		}
-
-		if (!this.data || !this.data.labels.length || !Object.keys(this.data).length) {
+		if (!this.data || !this.data.labels || !Object.keys(this.data).length) {
 			this.chart_wrapper.hide();
 			this.loading.hide();
-			this.$summary.hide();
+			this.$summary && this.$summary.hide();
 			this.empty.show();
 		} else {
 			this.loading.hide();
 			this.empty.hide();
 			this.chart_wrapper.show();
 
-			let chart_args = {
-				data: this.data,
-				type: chart_type_map[this.chart_doc.type],
-				colors: colors,
-				height: this.height,
-				axisOptions: {
-					xIsSeries: this.chart_doc.timeseries,
-					shortenYAxisNumbers: 1
-				}
-			};
-
-			if (this.chart_doc.custom_options) {
-				let custom_options = JSON.parse(this.chart_doc.custom_options);
-				for (let key in custom_options) {
-					chart_args[key] = custom_options[key];
-				}
-			}
+			const chart_args = this.get_chart_args();
 
 			if (!this.dashboard_chart) {
 				this.dashboard_chart = new frappe.Chart(
@@ -519,7 +499,73 @@ export default class ChartWidget extends Widget {
 			} else {
 				this.dashboard_chart.update(this.data);
 			}
+
 			this.width == "Full" && this.summary && this.set_summary();
+			this.chart_doc.type == 'Heatmap' && this.render_heatmap_legend();
+		}
+	}
+
+
+	get_chart_args() {
+		let colors = this.get_chart_colors();
+
+		const chart_type_map = {
+			Line: "line",
+			Bar: "bar",
+			Percentage: "percentage",
+			Pie: "pie",
+			Donut: "donut",
+			Heatmap: "heatmap"
+		};
+
+		let chart_args = {
+			data: this.data,
+			type: chart_type_map[this.chart_doc.type],
+			colors: colors,
+			height: this.height,
+			axisOptions: {
+				xIsSeries: this.chart_doc.timeseries,
+				shortenYAxisNumbers: 1
+			}
+		};
+
+		return chart_args;
+	}
+
+	get_chart_colors() {
+		let colors = [];
+		if (this.chart_doc.y_axis.length) {
+			this.chart_doc.y_axis.map(field => {
+				colors.push(field.color);
+			});
+		} else if (["Line", "Bar"].includes(this.chart_doc.type)) {
+			colors = [this.chart_doc.color || "light-blue"];
+		}  else if (this.chart_doc.type == "Heatmap") {
+			colors = [];
+		}
+
+		return colors;
+	}
+
+	render_heatmap_legend() {
+		if (!this.$heatmap_legend) {
+			this.$heatmap_legend =
+				$(`
+				<div class="heatmap-legend">
+					<ul class="legend-colors">
+						<li style="background-color: #ebedf0"></li>
+						<li style="background-color: #c6e48b"></li>
+						<li style="background-color: #7bc96f"></li>
+						<li style="background-color: #239a3b"></li>
+						<li style="background-color: #196127"></li>
+					</ul>
+					<div class="legend-label">
+						<div style="margin-bottom: 45px">${__("Less")}</div>
+						<div>${__("More")}</div>
+					</div>
+				</div>
+				`);
+			this.body.append(this.$heatmap_legend);
 		}
 	}
 
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 1e64533079..da59fd8c0a 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -293,6 +293,54 @@
 		}
 	}
 
+	&.dashboard-widget-box.heatmap-chart {
+		min-height: 0px;
+		height: 180px;
+
+		.widget-footer {
+			display: none;
+		}
+
+		.frappe-chart .chart-legend {
+			display: none;
+		}
+
+		.widget-body {
+			display: flex;
+			max-height: 100%;
+
+			.chart-container {
+				margin-left: 65px;
+				margin-top: -15px;
+			}
+
+			.heatmap-legend {
+				display: flex;
+    			height: 100%;
+				margin-top: 30px;
+
+				.legend-colors {
+					padding-left: 1;
+					padding-left: 15px;
+					list-style: none;
+				}
+
+				li {
+					width: 10px;
+					height: 10px;
+					margin: 5px;
+				}
+
+				.legend-label {
+					color: #555b51;
+					font-size: 11px;
+					margin-left: 15px;
+					line-height: 1.6em;
+				}
+			}
+		}
+	}
+
 	&.onboarding-widget-box {
 		margin-bottom: 50px;
 		margin-top: 10px;

From 08eeb8350f6494deef8b7222dc5b9e7747452297 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 29 Apr 2020 18:01:58 +0530
Subject: [PATCH 057/274] fix: hide chart for smaller widths

---
 frappe/public/less/desktop.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index da59fd8c0a..44c5636731 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -341,6 +341,12 @@
 		}
 	}
 
+	@media (max-width: 768px) {
+		&.dashboard-widget-box.heatmap-chart {
+			display: none;
+		}
+	}
+
 	&.onboarding-widget-box {
 		margin-bottom: 50px;
 		margin-top: 10px;

From d83127021023b0ec018e43d771125c52cb662038 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 29 Apr 2020 18:04:52 +0530
Subject: [PATCH 058/274] fix: set label as empty list

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 2b095b0263..21af41adad 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -198,7 +198,7 @@ def get_heatmap_chart_config(chart, filters):
 	))
 
 	chart_config = {
-		'labels': '',
+		'labels': [],
 		'dataPoints': data,
 	}
 	return chart_config

From 302af369ac11ba3a4e72376f6ccb8f164f57a10f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 30 Apr 2020 18:35:49 +0530
Subject: [PATCH 059/274] fix: set timeseries according to chart type

---
 .../doctype/dashboard_chart/dashboard_chart.js | 18 +++++++++++-------
 .../dashboard_chart/dashboard_chart.json       |  6 +++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 894dcccb27..7836a66443 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -49,6 +49,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.trigger('set_time_series')
 		frm.set_query('document_type', function() {
 			return {
 				filters: {
@@ -71,6 +72,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	chart_type: function(frm) {
+		frm.trigger('set_time_series')
 		if (frm.doc.chart_type == 'Report') {
 			frm.set_query('report_name', () => {
 				return {
@@ -80,13 +82,6 @@ frappe.ui.form.on('Dashboard Chart', {
 				}
 			});
 		} else {
-			// set timeseries based on chart type
-			if (['Count', 'Average', 'Sum'].includes(frm.doc.chart_type)) {
-				frm.set_value('timeseries', 1);
-			} else {
-				frm.set_value('timeseries', 0);
-			}
-
 			if (frm.doc.chart_type == 'Group By') {
 				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie', 'Donut']);
 			} else {
@@ -97,6 +92,15 @@ frappe.ui.form.on('Dashboard Chart', {
 		}
 	},
 
+	set_time_series: function(frm) {
+		// set timeseries based on chart type
+		if (['Count', 'Average', 'Sum'].includes(frm.doc.chart_type)) {
+			frm.set_value('timeseries', 1);
+		} else {
+			frm.set_value('timeseries', 0);
+		}
+	},
+
 	document_type: function(frm) {
 		// update `based_on` options based on date / datetime fields
 		frm.set_value('source', '');
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index d6f204db00..f62d032767 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -99,8 +99,8 @@
    "options": "Yearly\nQuarterly\nMonthly\nWeekly\nDaily"
   },
   {
-   "default": "1",
-   "depends_on": "eval: doc.chart_type !== 'Group By'",
+   "default": "0",
+   "depends_on": "eval: !['Group By', 'Report'].includes(doc.chart_type)\n",
    "fieldname": "timeseries",
    "fieldtype": "Check",
    "label": "Time Series"
@@ -232,7 +232,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-29 17:50:59.867496",
+ "modified": "2020-04-30 18:30:46.242316",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From bd3d572376b56ab6522968cca753745caf9aaca8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 30 Apr 2020 18:51:53 +0530
Subject: [PATCH 060/274] fix: fix modified timestamp

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index f62d032767..19d358c8c5 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -232,7 +232,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-30 18:30:46.242316",
+ "modified": "2020-04-23 13:01:07.178866",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 98aad96ee8647b9f5078219665caf2a72c96bac2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 30 Apr 2020 19:20:06 +0530
Subject: [PATCH 061/274] fix: missing semicolons

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 7836a66443..4c525e56b3 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -49,7 +49,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 
 		frm.set_df_property("filters_section", "hidden", 1);
-		frm.trigger('set_time_series')
+		frm.trigger('set_time_series');
 		frm.set_query('document_type', function() {
 			return {
 				filters: {
@@ -72,7 +72,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	},
 
 	chart_type: function(frm) {
-		frm.trigger('set_time_series')
+		frm.trigger('set_time_series');
 		if (frm.doc.chart_type == 'Report') {
 			frm.set_query('report_name', () => {
 				return {

From b045840228ce0327c0e39a2c220a0a9a6ac99530 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 1 May 2020 19:17:03 +0530
Subject: [PATCH 062/274] fix: fix heatmap chart css for smaller widths

---
 .../public/js/frappe/widgets/chart_widget.js  |  2 +-
 frappe/public/less/desktop.less               | 27 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 4f95649635..b160afa1fa 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -548,7 +548,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	render_heatmap_legend() {
-		if (!this.$heatmap_legend) {
+		if (!this.$heatmap_legend && this.widget.width() > 991) {
 			this.$heatmap_legend =
 				$(`
 				<div class="heatmap-legend">
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 44c5636731..fbd7f988a3 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -301,6 +301,10 @@
 			display: none;
 		}
 
+		.widget-control {
+            z-index: 1;
+        }
+
 		.frappe-chart .chart-legend {
 			display: none;
 		}
@@ -308,16 +312,19 @@
 		.widget-body {
 			display: flex;
 			max-height: 100%;
+			margin: auto;
+			margin-top: -15px;
 
 			.chart-container {
-				margin-left: 65px;
-				margin-top: -15px;
+				height: 100%;
+				.frappe-chart {
+					height: 100%;
+				}
 			}
 
 			.heatmap-legend {
 				display: flex;
-    			height: 100%;
-				margin-top: 30px;
+				margin: 45px 20px 0 20px;
 
 				.legend-colors {
 					padding-left: 1;
@@ -337,13 +344,17 @@
 					margin-left: 15px;
 					line-height: 1.6em;
 				}
+
+				@media (max-width: 991px) {
+					display: none;
+				}
 			}
 		}
-	}
 
-	@media (max-width: 768px) {
-		&.dashboard-widget-box.heatmap-chart {
-			display: none;
+		@media (max-width: 768px) {
+			.heatmap-chart {
+				display: none;
+			}
 		}
 	}
 

From fe31522cf58376b6db2f99b7d8dd0bdde9b69bd9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 18:27:30 +0530
Subject: [PATCH 063/274] feat: add year field for heatmap charts

---
 .../dashboard_chart/dashboard_chart.js        | 10 ++++++++++
 .../dashboard_chart/dashboard_chart.json      |  9 ++++++++-
 .../dashboard_chart/dashboard_chart.py        | 20 ++++++++++++++-----
 frappe/desk/page/user_profile/user_profile.js | 19 ++----------------
 .../public/js/frappe/utils/dashboard_utils.js | 16 +++++++++++++++
 .../public/js/frappe/widgets/chart_widget.js  |  9 ++++++++-
 6 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 4c525e56b3..90e8ce288a 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -58,6 +58,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		});
 		frm.trigger('update_options');
+		frm.trigger('set_heatmap_year_options');
 		if (frm.doc.report_name) {
 			frm.trigger('set_chart_report_filters');
 		}
@@ -71,6 +72,15 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.trigger("show_filters");
 	},
 
+	set_heatmap_year_options: function(frm) {
+		if (frm.doc.type == 'Heatmap') {
+			frappe.db.get_doc('System Settings').then(doc => {
+				const creation_date = doc.creation;
+				frm.set_df_property('heatmap_year', 'options', frappe.dashboard_utils.get_years_since_creation(creation_date));
+			});
+		}
+	},
+
 	chart_type: function(frm) {
 		frm.trigger('set_time_series');
 		if (frm.doc.chart_type == 'Report') {
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 19d358c8c5..e377ef740e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -23,6 +23,7 @@
   "number_of_groups",
   "column_break_6",
   "is_public",
+  "heatmap_year",
   "timespan",
   "from_date",
   "to_date",
@@ -229,10 +230,16 @@
    "fieldname": "is_public",
    "fieldtype": "Check",
    "label": "Is Public"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Heatmap'",
+   "fieldname": "heatmap_year",
+   "fieldtype": "Select",
+   "label": "Year"
   }
  ],
  "links": [],
- "modified": "2020-04-23 13:01:07.178866",
+ "modified": "2020-05-01 19:45:01.669384",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 21af41adad..529e60f3a2 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -8,7 +8,7 @@ from frappe import _
 import datetime
 import json
 from frappe.utils.dashboard import cache_source, get_from_date_from_timespan
-from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime
+from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime, cint
 from frappe.model.naming import append_number_if_name_exists
 from frappe.boot import get_allowed_reports
 from frappe.model.document import Document
@@ -182,18 +182,28 @@ def get_heatmap_chart_config(chart, filters):
 	value_field = chart.value_based_on or '1'
 	doctype = chart.document_type
 	datefield = chart.based_on
-	filters.append([doctype, datefield, '>', 'subdate(curdate(), interval 1 year)', False])
+	year = cint(chart.heatmap_year) if chart.heatmap_year else getdate(nowdate()).year
+	year_start_date = datetime.date(year, 1, 1).strftime('%Y-%m-%d')
+	next_year_start_date = datetime.date(year + 1, 1, 1).strftime('%Y-%m-%d')
+
+	filters.append([doctype, datefield, '>', "{date}".format(date=year_start_date), False])
+	filters.append([doctype, datefield, '<', "{date}".format(date=next_year_start_date), False])
+
+	if frappe.db.db_type == 'mariadb':
+		timestamp_field = 'unix_timestamp({datefield})'.format(datefield=datefield)
+	else:
+		timestamp_field = 'extract(epoch from timestamp {datefield})'.format(datefield=datefield)
 
 	data = dict(frappe.db.get_all(
 		doctype,
 		fields = [
-			'unix_timestamp(date({datefield}))'.format(datefield=datefield),
+			timestamp_field,
 			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
 		],
 		filters = filters,
-		group_by = 'date(creation)',
+		group_by = 'date({datefield})'.format(datefield=datefield),
 		as_list = 1,
-		order_by = 'creation asc',
+		order_by = '{datefield} asc'.format(datefield=datefield),
 		ignore_ifnull = True
 	))
 
diff --git a/frappe/desk/page/user_profile/user_profile.js b/frappe/desk/page/user_profile/user_profile.js
index ff1e906cff..c43ff27ba3 100644
--- a/frappe/desk/page/user_profile/user_profile.js
+++ b/frappe/desk/page/user_profile/user_profile.js
@@ -108,21 +108,6 @@ class UserProfile {
 		});
 	}
 
-	get_years_since_creation() {
-		//Get years since user account created
-		this.user_creation = frappe.boot.user.creation;
-		let creation_year = this.get_year(this.user_creation);
-		let current_year = this.get_year(frappe.datetime.now_date());
-		let years_list = [];
-		for (var year = current_year; year >= creation_year; year--) {
-			years_list.push(year);
-		}
-		return years_list;
-	}
-
-	get_year(date_str) {
-		return date_str.substring(0, date_str.indexOf('-'));
-	}
 
 	render_line_chart() {
 		this.line_chart_filters = [['Energy Point Log', 'user', '=', this.user_id, false]];
@@ -246,8 +231,8 @@ class UserProfile {
 	create_heatmap_chart_filters() {
 		let filters = [
 			{
-				label: this.get_year(frappe.datetime.now_date()),
-				options: this.get_years_since_creation(),
+				label: frappe.dashboard_utils.get_year(frappe.datetime.now_date()),
+				options: frappe.dashboard_utils.get_years_since_creation(frappe.boot.user.creation),
 				action: (selected_item) => {
 					this.update_heatmap_data(frappe.datetime.obj_to_str(selected_item));
 				}
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index a1628be34a..d1621a3e15 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -82,5 +82,21 @@ frappe.dashboard_utils = {
 		).then(settings => {
 			return settings;
 		});
+	},
+
+	get_years_since_creation(creation) {
+		//Get years since user account created
+		let creation_year = this.get_year(creation);
+		let current_year = this.get_year(frappe.datetime.now_date());
+		let years_list = [];
+		for (var year = current_year; year >= creation_year; year--) {
+			years_list.push(year);
+		}
+		return years_list;
+	},
+
+	get_year(date_str) {
+		return date_str.substring(0, date_str.indexOf('-'));
 	}
+
 };
\ No newline at end of file
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index b160afa1fa..f2753be32e 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -61,6 +61,7 @@ export default class ChartWidget extends Widget {
 		this.chart_wrapper = $(`<div></div>`);
 		this.chart_wrapper.appendTo(this.body);
 
+		this.$heatmap_legend = null;
 		this.set_chart_title();
 	}
 
@@ -288,7 +289,7 @@ export default class ChartWidget extends Widget {
 			},
 			{
 				label: __("Reset Chart"),
-				action: "action-list",
+				action: "action-reset",
 				handler: () => {
 					this.reset_chart();
 					delete this.dashboard_chart;
@@ -529,6 +530,12 @@ export default class ChartWidget extends Widget {
 			}
 		};
 
+		if (this.chart_doc.type == "Heatmap") {
+			const heatmap_year = parseInt(this.chart_doc.heatmap_year || "2020");
+			chart_args.data.start = new Date(`${heatmap_year}-01-01`);
+			chart_args.data.end = new Date(`${heatmap_year+1}-01-01`);
+		}
+
 		return chart_args;
 	}
 

From 31a523a720c88c8141eaae04094a4d408d611ca7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 19:21:51 +0530
Subject: [PATCH 064/274] feat: add year filter to heatmap charts

---
 .../dashboard_chart/dashboard_chart.py        |  10 +-
 .../public/js/frappe/widgets/chart_widget.js  | 131 ++++++++++--------
 frappe/utils/dashboard.py                     |   1 +
 3 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 529e60f3a2..e7e4aefe09 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -58,13 +58,13 @@ def has_permission(doc, ptype, user):
 @frappe.whitelist()
 @cache_source
 def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None,
-	to_date = None, timespan = None, time_interval = None, refresh = None):
+	to_date = None, timespan = None, time_interval = None, heatmap_year=None, refresh = None):
 	if chart_name:
 		chart = frappe.get_doc('Dashboard Chart', chart_name)
 	else:
 		chart = frappe._dict(frappe.parse_json(chart))
 
-
+	heatmap_year = heatmap_year or chart.heatmap_year
 	timespan = timespan or chart.timespan
 
 	if timespan == 'Select Date Range':
@@ -88,7 +88,7 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 		chart_config = get_group_by_chart_config(chart, filters)
 	else:
 		if chart.type == 'Heatmap':
-			chart_config = get_heatmap_chart_config(chart, filters)
+			chart_config = get_heatmap_chart_config(chart, filters, heatmap_year)
 		else:
 			chart_config =  get_chart_config(chart, filters, timespan, timegrain, from_date, to_date)
 
@@ -177,12 +177,12 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 
 	return chart_config
 
-def get_heatmap_chart_config(chart, filters):
+def get_heatmap_chart_config(chart, filters, heatmap_year):
 	aggregate_function = get_aggregate_function(chart.chart_type)
 	value_field = chart.value_based_on or '1'
 	doctype = chart.document_type
 	datefield = chart.based_on
-	year = cint(chart.heatmap_year) if chart.heatmap_year else getdate(nowdate()).year
+	year = cint(heatmap_year) if heatmap_year else getdate(nowdate()).year
 	year_start_date = datetime.date(year, 1, 1).strftime('%Y-%m-%d')
 	next_year_start_date = datetime.date(year + 1, 1, 1).strftime('%Y-%m-%d')
 
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index f2753be32e..abd99e360d 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -115,58 +115,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	render_time_series_filters() {
-		if (this.chart_doc.type == 'Heatmap') {
-			return;
-		}
-
-		let filters = [
-			{
-				label: this.chart_settings.timespan || this.chart_doc.timespan,
-				options: [
-					"Select Date Range",
-					"Last Year",
-					"Last Quarter",
-					"Last Month",
-					"Last Week"
-				],
-				action: selected_item => {
-					this.selected_timespan = selected_item;
-
-					if (this.selected_timespan === "Select Date Range") {
-						this.render_date_range_fields();
-					} else {
-						this.selected_from_date = null;
-						this.selected_to_date = null;
-						if (this.date_field_wrapper) {
-							this.date_field_wrapper.hide();
-
-							// Title maybe hidden becuase of date range fields
-							// in half width chart
-							this.title_field.show();
-							this.head.css('flex-direction', "row");
-						}
-
-						this.save_chart_config_for_user({
-							'timespan': this.selected_timespan,
-							'from_date': null,
-							'to_date': null
-
-						});
-						this.fetch_and_update_chart();
-					}
-				}
-			},
-			{
-				label: this.chart_settings.time_interval || this.chart_doc.time_interval,
-				options: ["Yearly", "Quarterly", "Monthly", "Weekly", "Daily"],
-				action: selected_item => {
-					this.selected_time_interval = selected_item;
-					this.save_chart_config_for_user({'time_interval': this.selected_time_interval});
-					this.fetch_and_update_chart();
-				}
-			}
-		];
-
+		let filters = this.get_time_series_filters();
 		frappe.dashboard_utils.render_chart_filters(
 			filters,
 			"chart-actions",
@@ -175,12 +124,77 @@ export default class ChartWidget extends Widget {
 		);
 	}
 
+	get_time_series_filters() {
+		let filters;
+		if (this.chart_doc.type == 'Heatmap') {
+			filters = [{
+				label: this.chart_settings.heatmap_year || this.chart_doc.heatmap_year,
+				options: frappe.dashboard_utils.get_years_since_creation(frappe.boot.user.creation),
+				action: selected_item => {
+					this.selected_heatmap_year = selected_item;
+					this.save_chart_config_for_user({'heatmap_year': this.selected_heatmap_year});
+					this.fetch_and_update_chart();
+				}
+			}];
+		} else {
+			filters = [
+				{
+					label: this.chart_settings.timespan || this.chart_doc.timespan,
+					options: [
+						"Select Date Range",
+						"Last Year",
+						"Last Quarter",
+						"Last Month",
+						"Last Week"
+					],
+					action: selected_item => {
+						this.selected_timespan = selected_item;
+
+						if (this.selected_timespan === "Select Date Range") {
+							this.render_date_range_fields();
+						} else {
+							this.selected_from_date = null;
+							this.selected_to_date = null;
+							if (this.date_field_wrapper) {
+								this.date_field_wrapper.hide();
+
+								// Title maybe hidden becuase of date range fields
+								// in half width chart
+								this.title_field.show();
+								this.head.css('flex-direction', "row");
+							}
+
+							this.save_chart_config_for_user({
+								'timespan': this.selected_timespan,
+								'from_date': null,
+								'to_date': null
+
+							});
+							this.fetch_and_update_chart();
+						}
+					}
+				},
+				{
+					label: this.chart_settings.time_interval || this.chart_doc.time_interval,
+					options: ["Yearly", "Quarterly", "Monthly", "Weekly", "Daily"],
+					action: selected_item => {
+						this.selected_time_interval = selected_item;
+						this.save_chart_config_for_user({'time_interval': this.selected_time_interval});
+						this.fetch_and_update_chart();
+					}
+				}
+			];
+		}
+		return filters;
+	}
+
 	fetch_and_update_chart() {
 		this.args = {
 			timespan: this.selected_timespan || this.chart_settings.timespan,
 			time_interval: this.selected_time_interval || this.chart_settings.time_interval,
 			from_date: this.selected_from_date || this.chart_settings.from_date,
-			to_date: this.selected_to_date || this.chart_settings.to_date
+			to_date: this.selected_to_date || this.chart_settings.to_date,
+			heatmap_year: this.selected_heatmap_year || this.chart_settings.heatmap_year,
 		};
 
 		this.fetch(this.filters, true, this.args).then(data => {
@@ -406,6 +420,9 @@ export default class ChartWidget extends Widget {
 		this.save_chart_config_for_user(null, 1);
 		this.chart_settings = {};
 		this.filters = null;
+		this.selected_time_interval = null;
+		this.selected_timespan = null;
+		this.selected_heatmap_year = null;
 	}
 
 	save_chart_config_for_user(config, reset=0) {
@@ -473,7 +490,8 @@ export default class ChartWidget extends Widget {
 				time_interval: args && args.time_interval ? args.time_interval : null,
 				timespan: args && args.timespan ? args.timespan : null,
 				from_date: args && args.from_date ? args.from_date : null,
-				to_date: args && args.to_date ? args.to_date : null
+				to_date: args && args.to_date ? args.to_date : null,
+				heatmap_year: args && args.heatmap_year ?  args.heatmap_year : null,
 			};
 		}
 		return frappe.xcall(method, args);
@@ -531,7 +549,10 @@ export default class ChartWidget extends Widget {
 		};
 
 		if (this.chart_doc.type == "Heatmap") {
-			const heatmap_year = parseInt(this.chart_doc.heatmap_year || "2020");
+			if (!this.chart_doc.heatmap_year) {
+				this.chart_doc.heatmap_year = frappe.dashboard_utils.get_year(frappe.datetime.now_date());
+			}
+			const heatmap_year = parseInt(this.selected_heatmap_year || this.chart_settings.heatmap_year || this.chart_doc.heatmap_year);
 			chart_args.data.start = new Date(`${heatmap_year}-01-01`);
 			chart_args.data.end = new Date(`${heatmap_year+1}-01-01`);
 		}
diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index 7cc97ed3f9..8edcf085f0 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -41,6 +41,7 @@ def generate_and_cache_results(args, function, cache_key, chart):
 			to_date = args.to_date or None,
 			time_interval = args.time_interval or None,
 			timespan = args.timespan or None,
+			heatmap_year = args.heatmap_year or None
 		)
 	except TypeError as e:
 		if str(e) == "'NoneType' object is not iterable":

From a3bedcbef478dac49fe221854f2026d6415889a2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 19:30:18 +0530
Subject: [PATCH 065/274] fix: fix media query to hide heatmap for smaller
 widths

---
 frappe/public/less/desktop.less | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index fbd7f988a3..6d4bbca8e8 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -350,11 +350,11 @@
 				}
 			}
 		}
+	}
 
-		@media (max-width: 768px) {
-			.heatmap-chart {
-				display: none;
-			}
+	@media (max-width: 768px) {
+		&.dashboard-widget-box.heatmap-chart {
+			display: none;
 		}
 	}
 

From f662d9011e803ece7644610a1eba1bba128f7bca Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 23:03:51 +0530
Subject: [PATCH 066/274] fix: style for heatmap chart loading state

---
 frappe/public/less/desktop.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 6d4bbca8e8..eef0b29875 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -309,6 +309,10 @@
 			display: none;
 		}
 
+		.chart-loading-state {
+			height: 160px !important;
+		}
+
 		.widget-body {
 			display: flex;
 			max-height: 100%;

From 9eabcce714332aeed994cd30c3307bbd86e74b8e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 23:04:21 +0530
Subject: [PATCH 067/274] fix: undefined selected heatmap year

---
 frappe/public/js/frappe/widgets/chart_widget.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index abd99e360d..4be9ce1fd9 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -549,9 +549,6 @@ export default class ChartWidget extends Widget {
 		};
 
 		if (this.chart_doc.type == "Heatmap") {
-			if (!this.chart_doc.heatmap_year) {
-				this.chart_doc.heatmap_year = frappe.dashboard_utils.get_year(frappe.datetime.now_date());
-			}
 			const heatmap_year = parseInt(this.selected_heatmap_year || this.chart_settings.heatmap_year || this.chart_doc.heatmap_year);
 			chart_args.data.start = new Date(`${heatmap_year}-01-01`);
 			chart_args.data.end = new Date(`${heatmap_year+1}-01-01`);
@@ -616,6 +613,10 @@ export default class ChartWidget extends Widget {
 		let saved_filters = this.chart_settings.filters || null;
 		this.filters =
 			saved_filters || this.filters || JSON.parse(this.chart_doc.filters_json || "[]");
+
+		if (this.chart_doc.type == 'Heatmap' && !this.chart_doc.heatmap_year) {
+			this.chart_doc.heatmap_year = frappe.dashboard_utils.get_year(frappe.datetime.now_date());
+		}
 	}
 
 	get_settings() {

From 7c3749c2a8c1bd4eff62d5570176d0ce9b981762 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Sat, 9 May 2020 17:20:25 +0530
Subject: [PATCH 068/274] fix: scaffolding for migrate-to command added

---
 frappe/commands/site.py | 74 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 52994ccec3..d5329d4cf9 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -1,6 +1,7 @@
 # imports - standard imports
 import atexit
 import compileall
+import getpass
 import hashlib
 import os
 import re
@@ -9,6 +10,7 @@ import sys
 
 # imports - third party imports
 import click
+import requests
 
 # imports - module imports
 import frappe
@@ -256,6 +258,77 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 	print("Compiling Python Files...")
 	compileall.compile_dir('../apps', quiet=1, rx=re.compile('.*node_modules.*'))
 
+
+@click.command('migrate-to')
+@click.argument('site_url')
+@pass_context
+def migrate_to(context, site_url):
+	'''
+	>>> import requests
+	>>> session = requests.Session()
+	>>> session.post("http://cloud:8002/api/method/login", {"usr":"gavin18d@gmail.com", "pwd":"bfdiljn;jnd"})
+	<Response [200]>
+	>>> session.headers.update({"X-Press-Team": "gavin18d@gmail.com"})
+	>>> session.post("http://cloud:8002/api/method/press.api.site.options_for_new").json()
+	'''
+
+	if site_url in ("frappe.cloud", "frappecloud.com"):
+		site_url = "frappe.cloud"
+
+		login_url = "https://{site_url}/api/method/login"
+		upload_url = "https://{site_url}/api/method/press.api.site.new_from_existing_account"
+		options_url = "https://{site_url}/api/method/press.api.site.options_for_new"
+
+	else:
+		print(f"{site_url} is not supported yet")
+		sys.exit(1)
+
+	for site in context.site:
+		username = input()
+		password = getpass.unix_getpass()
+		auth_credentials = {"usr": username, "pwd": password}
+
+		# create frapp_cloud session
+		session = requests.Session()
+		login_sc = session.post(login_url, auth_credentials)
+
+		if login_sc.ok:
+			print(f"Auth Successful w {site_url}")
+
+			# get options
+			session.headers.update({"X-Press-Team": username})
+			site_options_sc = session.post(options_url)
+
+			if site_options_sc.ok:
+				site_options = site_options_sc.json()
+
+			else:
+				print(f"Request failed with Status Code: {site_options_sc.status_code}")
+				sys.exit(1)
+
+			# set preferences from options
+
+			# take backup
+			import frappe.utils.backups
+			print(f"Taking backup for site {site}")
+			odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
+
+			# relative paths here
+			odb.backup_path_db
+			odb.backup_path_files
+			odb.backup_path_private_files
+
+			site_files = {
+				"files": []
+			}
+
+			# push to frappe_cloud
+			session.post(upload_url, files=site_files)
+
+		else:
+			print(f"Request failed with Status Code: {login_sc.status_code}")
+
+
 @click.command('run-patch')
 @click.argument('module')
 @pass_context
@@ -559,6 +632,7 @@ commands = [
 	install_app,
 	list_apps,
 	migrate,
+	migrate_to,
 	new_site,
 	reinstall,
 	reload_doc,

From 51289dbd008d0ada4da690669a02950f3c99b677 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Sat, 9 May 2020 17:21:29 +0530
Subject: [PATCH 069/274] fix: set totals currency for field

---
 frappe/public/js/frappe/views/reports/report_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 43540f449d..0c1f0f4635 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1020,7 +1020,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					name: __('Totals Row'),
 					content: totals[col.id],
 					format: value => {
-						return frappe.format(value, col.docfield, { always_show_decimals: true });
+						return frappe.format(value, col.docfield, { always_show_decimals: true }, data[0]);
 					}
 				}
 			})

From be27513a56c69f6a70bcbf5b03b99847ea1415d9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 12:09:54 +0530
Subject: [PATCH 070/274] feat: added driver.js with style overrides

---
 frappe/public/build.json             |   5 +-
 frappe/public/js/frappe/ui/driver.js |   3 +
 frappe/public/less/driver.less       | 180 +++++++++++++++++++++++++++
 package.json                         |   1 +
 yarn.lock                            |   5 +
 5 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 frappe/public/js/frappe/ui/driver.js
 create mode 100644 frappe/public/less/driver.less

diff --git a/frappe/public/build.json b/frappe/public/build.json
index d56907b558..e4c90cb708 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -112,7 +112,9 @@
 		"public/less/chat.less",
 		"public/less/filters.less",
 		"public/less/social.less",
-		"node_modules/frappe-charts/dist/frappe-charts.min.css"
+		"node_modules/frappe-charts/dist/frappe-charts.min.css",
+		"node_modules/driver.js/dist/driver.min.css",
+		"public/less/driver.less"
 	],
 	"css/frappe-rtl.css": [
 		"public/css/bootstrap-rtl.css",
@@ -244,6 +246,7 @@
 		"public/js/frappe/utils/energy_point_utils.js",
 		"public/js/frappe/utils/dashboard_utils.js",
 		"public/js/frappe/ui/chart.js",
+		"public/js/frappe/ui/driver.js",
 		"public/js/frappe/barcode_scanner/index.js"
 	],
 	"css/form.min.css": [
diff --git a/frappe/public/js/frappe/ui/driver.js b/frappe/public/js/frappe/ui/driver.js
new file mode 100644
index 0000000000..98ed49ec05
--- /dev/null
+++ b/frappe/public/js/frappe/ui/driver.js
@@ -0,0 +1,3 @@
+import Driver from 'driver.js';
+
+frappe.Driver = Driver;
\ No newline at end of file
diff --git a/frappe/public/less/driver.less b/frappe/public/less/driver.less
new file mode 100644
index 0000000000..9dc7cde0b1
--- /dev/null
+++ b/frappe/public/less/driver.less
@@ -0,0 +1,180 @@
+@import "frappe/public/less/variables.less";
+
+div#driver-popover-item {
+	.driver-popover-footer {
+		display: block;
+		margin-top: 12px;
+
+		button {
+			// Edited
+			padding: 1px 5px;
+			font-size: 12px;
+			line-height: 1.5;
+			border-radius: 3px;
+			display: inline-block;
+			margin-bottom: 0;
+			font-weight: normal;
+			text-align: center;
+			white-space: nowrap;
+			vertical-align: middle;
+			text-shadow: none !important;
+			-ms-touch-action: manipulation;
+			touch-action: manipulation;
+			cursor: pointer;
+			-webkit-user-select: none;
+			-moz-user-select: none;
+			-ms-user-select: none;
+			user-select: none;
+			background-image: none;
+			border: 1px solid transparent;
+		}
+
+		button.driver-disabled {
+			color: grey;
+			cursor: default;
+			pointer-events: none;
+		}
+
+		.driver-close-btn {
+			// Edited
+			float: left;
+			color: inherit;
+			background-color: #f0f4f7;
+			border-color: transparent;
+		}
+
+		.driver-navigation-btns {
+			// Edited
+			.driver-prev-btn {
+				color: inherit;
+				background-color: #f0f4f7;
+				border-color: transparent;
+			}
+
+			.driver-next-btn {
+				color: #fff;
+				background-color: #5e64ff;
+				border-color: #444bff;
+			}
+		}
+	}
+	.driver-popover-title {
+		// Edited
+		font: 18px/normal sans-serif;
+		margin: 0 0 5px;
+		font-weight: 500;
+		display: block;
+		position: relative;
+		line-height: 1.5;
+		zoom: 1;
+	}
+	.driver-popover-description {
+		// Edited
+		margin-bottom: 0;
+		font: 12px/normal sans-serif;
+		line-height: 1.5;
+		color: @text-muted;
+		font-weight: 400;
+		zoom: 1;
+	}
+}
+
+.driver-clearfix {
+	&:after {
+		content: "";
+		display: table;
+		clear: both;
+	}
+	&:before {
+		content: "";
+		display: table;
+	}
+}
+
+.driver-stage-no-animation {
+	-webkit-transition: none !important;
+	-moz-transition: none !important;
+	-ms-transition: none !important;
+	-o-transition: none !important;
+	transition: none !important;
+	background: transparent !important;
+	outline: 5000px solid rgba(0,0,0,.75);
+}
+
+div#driver-page-overlay {
+	background: @modal-backdrop-bg;
+	position: fixed;
+	bottom: 0;
+	right: 0;
+	display: block;
+	width: 100%;
+	height: 100%;
+	zoom: 1;
+	filter: alpha(opacity=25);
+	opacity: .25;
+	z-index: 100002 !important;
+	top: 0;
+	left: 0;
+	-webkit-transition: all .3s;
+	-moz-transition: all .3s;
+	-ms-transition: all .3s;
+	-o-transition: all .3s;
+	transition: all .3s;
+}
+
+div#driver-highlighted-element-stage {
+	top: 0;
+	left: 0;
+	-webkit-transition: all .3s;
+	-moz-transition: all .3s;
+	-ms-transition: all .3s;
+	-o-transition: all .3s;
+	transition: all .3s;
+	position: absolute;
+	height: 50px;
+	width: 300px;
+	background: #fff;
+	z-index: 100003 !important;
+	display: none;
+	border-radius: 2px;
+}
+
+.driver-highlighted-element {
+	z-index: 100004 !important;
+}
+
+.driver-position-relative {
+	position: relative !important;
+}
+
+.driver-fix-stacking {
+	z-index: auto !important;
+	opacity: 1 !important;
+	-webkit-transform: none !important;
+	-moz-transform: none !important;
+	-ms-transform: none !important;
+	-o-transform: none !important;
+	transform: none !important;
+	-webkit-filter: none !important;
+	-moz-filter: none !important;
+	-ms-filter: none !important;
+	-o-filter: none !important;
+	filter: none !important;
+	-webkit-perspective: none !important;
+	-moz-perspective: none !important;
+	-ms-perspective: none !important;
+	-o-perspective: none !important;
+	perspective: none !important;
+	-webkit-transform-style: flat !important;
+	-moz-transform-style: flat !important;
+	-ms-transform-style: flat !important;
+	transform-style: flat !important;
+	-webkit-transform-box: border-box !important;
+	-moz-transform-box: border-box !important;
+	-ms-transform-box: border-box !important;
+	-o-transform-box: border-box !important;
+	transform-box: border-box !important;
+	will-change: unset !important;
+}
+
+
diff --git a/package.json b/package.json
index e735beee9b..fae9798706 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "bootstrap": "^4.4.1",
     "cookie": "^0.4.0",
     "cssnano": "^4.1.10",
+    "driver.js": "^0.9.8",
     "express": "^4.17.1",
     "fast-deep-equal": "^2.0.1",
     "frappe-charts": "^1.3.2",
diff --git a/yarn.lock b/yarn.lock
index b189296086..73816bdece 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1770,6 +1770,11 @@ double-ended-queue@^2.1.0-0:
   resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c"
   integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=
 
+driver.js@^0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/driver.js/-/driver.js-0.9.8.tgz#4b327f4537b1c9b9fb19419de86174be821ae32a"
+  integrity sha512-bczjyKdX6XmFyCDkwtRmlaORDwfBk1xXmRO0CAe5VwNQTM98aWaG2LAIiIdTe53iV/B7W5lXlIy2xYtf0JRb7Q==
+
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"

From 1ab4f21a3609296b7cd1898f6064a578920cb897 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 12:36:25 +0530
Subject: [PATCH 071/274] feat: added frappe tour API

---
 frappe/public/js/frappe/form/form.js | 29 ++++++++++++++++++++++++++++
 frappe/public/js/frappe/provide.js   |  1 +
 2 files changed, 30 insertions(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index a5853d96f5..0368311a2d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1556,6 +1556,35 @@ frappe.ui.form.Form = class FrappeForm {
 			$el.find('input, select, textarea').focus();
 		}, 1000);
 	}
+
+	show_tour() {
+		if (!frappe.tour.hasOwnProperty(this.doctype) || !Array.isArray(frappe.tour[this.doctype])) {
+			return
+		}
+
+		const driver = new frappe.Driver({
+			overlayClickNext: true,
+			keyboardControl: true,
+			nextBtnText: 'Next',              // Next button text for this step
+  			prevBtnText: 'Previous',
+		});
+
+		let steps = frappe.tour[this.doctype].map(step => {
+			let field = this.get_docfield(step.fieldname);
+			return {
+				element: `.frappe-control[title='${step.fieldname}']`,
+				popover: {
+					title: step.title || field.label,
+					description: step.description
+				}
+			}
+		});
+
+		console.log(steps);
+
+		driver.defineSteps(steps);
+		driver.start();
+	}
 };
 
 frappe.validated = 0;
diff --git a/frappe/public/js/frappe/provide.js b/frappe/public/js/frappe/provide.js
index 1dacc4dd47..d4d0fdffb8 100644
--- a/frappe/public/js/frappe/provide.js
+++ b/frappe/public/js/frappe/provide.js
@@ -35,6 +35,7 @@ frappe.provide('locals.DocType');
 
 // for listviews
 frappe.provide("frappe.listview_settings");
+frappe.provide("frappe.tour");
 frappe.provide("frappe.listview_parent_route");
 
 // constants

From b24de5b703c8ac2c7fed1afa5a84821768406c99 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 12:37:25 +0530
Subject: [PATCH 072/274] feat: setup tour for note

---
 frappe/desk/doctype/note/note.js | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/doctype/note/note.js b/frappe/desk/doctype/note/note.js
index c237998ccf..5718180b70 100644
--- a/frappe/desk/doctype/note/note.js
+++ b/frappe/desk/doctype/note/note.js
@@ -1,9 +1,9 @@
 frappe.ui.form.on("Note", {
 	refresh: function(frm) {
-		if(frm.doc.__islocal) {
+		if (frm.doc.__islocal) {
 			frm.events.set_editable(frm, true);
 		} else {
-			if(!frm.doc.content) {
+			if (!frm.doc.content) {
 				frm.doc.content = "<span></span>";
 			}
 
@@ -18,16 +18,15 @@ frappe.ui.form.on("Note", {
 		// hide all fields other than content
 
 		// no permission
-		if(editable && !frm.perm[0].write) return;
+		if (editable && !frm.perm[0].write) return;
 
 		// content read_only
-		frm.set_df_property("content", "read_only", editable ? 0: 1);
+		frm.set_df_property("content", "read_only", editable ? 0 : 1);
 
 		// hide all other fields
 		$.each(frm.fields_dict, function(fieldname) {
-
-			if(fieldname !== "content") {
-				frm.set_df_property(fieldname, "hidden", editable ? 0: 1);
+			if (fieldname !== "content") {
+				frm.set_df_property(fieldname, "hidden", editable ? 0 : 1);
 			}
 		});
 
@@ -39,3 +38,16 @@ frappe.ui.form.on("Note", {
 		frm.is_note_editable = editable;
 	}
 });
+
+frappe.tour['Note'] = [
+	{
+		fieldname: "title",
+		title: "Title of the Note",
+		description: "This is the name by which the note will be saved, you can change this later",
+	},
+	{
+		fieldname: "public",
+		title: "Sets the Note to Public",
+		description: "You can change the visibility of the note with this, setting it to public will allow other users to view it.",
+	},
+];
\ No newline at end of file

From 470abc20a1463ae68cbc33f4d8d748edb2a9f47d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 12:56:40 +0530
Subject: [PATCH 073/274] feat: expand all sections before tour

---
 frappe/public/js/frappe/form/form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 0368311a2d..41bde104dd 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1569,6 +1569,8 @@ frappe.ui.form.Form = class FrappeForm {
   			prevBtnText: 'Previous',
 		});
 
+		this.layout.sections.forEach(section => section.collapse(false))
+
 		let steps = frappe.tour[this.doctype].map(step => {
 			let field = this.get_docfield(step.fieldname);
 			return {
@@ -1580,8 +1582,6 @@ frappe.ui.form.Form = class FrappeForm {
 			}
 		});
 
-		console.log(steps);
-
 		driver.defineSteps(steps);
 		driver.start();
 	}

From bf7de110e27a50906a3d4384c9489a769af3b5a0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 12:57:37 +0530
Subject: [PATCH 074/274] feat: added steps for website settings

---
 .../doctype/website_settings/website_settings.js  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index be294258f4..7fbb785acf 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -95,4 +95,17 @@ frappe.ui.form.on('Top Bar Item', {
 	label: function(frm, doctype, name) {
 		frm.events.set_parent_options(frm, doctype, name);
 	},
-});
\ No newline at end of file
+});
+
+frappe.tour['Website Settings'] = [
+	{
+		fieldname: "enable_view_tracking",
+		title: __("Enable Tracking Page Views"),
+		description: __("Checking this will enable tracking page views for blogs, web pages, etc."),
+	},
+	{
+		fieldname: "disable_signup",
+		title: __("Disable Signup for your site"),
+		description: __("Check this if you don't want users to sign up for an account on your site. Users won't get desk access unless you explicitly provide it."),
+	}
+];
\ No newline at end of file

From 66a58ba09a3ca9158f19408fd8a298f782c27cb2 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 11 May 2020 14:03:12 +0530
Subject: [PATCH 075/274] test: next schedule date of auto repeat with daily
 frequency

---
 frappe/automation/doctype/auto_repeat/test_auto_repeat.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py
index 769c77b67c..60fa9cb59e 100644
--- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py
@@ -99,13 +99,18 @@ class TestAutoRepeat(unittest.TestCase):
 	def test_next_schedule_date(self):
 		current_date = getdate(today())
 		todo = frappe.get_doc(
-			dict(doctype='ToDo', description='test next schedule date todo', assigned_by='Administrator')).insert()
+			dict(doctype='ToDo', description='test next schedule date for monthly', assigned_by='Administrator')).insert()
 		doc = make_auto_repeat(frequency='Monthly',	reference_document=todo.name, start_date=add_months(today(), -2))
 
 		# next_schedule_date is set as on or after current date
 		# it should not be a previous month's date
 		self.assertTrue((doc.next_schedule_date >= current_date))
 
+		todo = frappe.get_doc(
+			dict(doctype='ToDo', description='test next schedule date for daily', assigned_by='Administrator')).insert()
+		doc = make_auto_repeat(frequency='Daily', reference_document=todo.name, start_date=add_days(today(), -2))
+		self.assertEqual(getdate(doc.next_schedule_date), current_date)
+
 
 def make_auto_repeat(**args):
 	args = frappe._dict(args)

From a358bcdc33246b81120ff8ee558e51b2cfdd5e41 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 14:07:21 +0530
Subject: [PATCH 076/274] feat: add form tour as onboarding option

---
 .../doctype/onboarding_step/onboarding_step.js | 18 ++++++++++++++++++
 .../onboarding_step/onboarding_step.json       | 15 ++++++++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.js b/frappe/desk/doctype/onboarding_step/onboarding_step.js
index 3e5d4d4260..793e044d98 100644
--- a/frappe/desk/doctype/onboarding_step/onboarding_step.js
+++ b/frappe/desk/doctype/onboarding_step/onboarding_step.js
@@ -25,6 +25,24 @@ frappe.ui.form.on("Onboarding Step", {
 		}
 	},
 
+	action: function(frm) {
+		if (frm.doc.action == "Show Form Tour") {
+			frm.fields_dict.reference_document.set_description(`You need to add the steps in the contoller JS file. For example: <code>note.js</code>
+<pre class="small text-muted"><code>
+frappe.tour['Note'] = [
+	{
+		fieldname: "title",
+		title: "Title of the Note",
+		description: "...",
+	}
+];
+</code></pre>
+				`);
+		} else {
+			frm.fields_dict.reference_document.set_description(null);
+		}
+	},
+
 	disable_form: function(frm) {
 		frm.set_read_only();
 		frm.fields
diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.json b/frappe/desk/doctype/onboarding_step/onboarding_step.json
index e1035a4343..3bc9d5f286 100644
--- a/frappe/desk/doctype/onboarding_step/onboarding_step.json
+++ b/frappe/desk/doctype/onboarding_step/onboarding_step.json
@@ -15,6 +15,7 @@
   "action",
   "column_break_7",
   "reference_document",
+  "is_single",
   "reference_report",
   "report_reference_doctype",
   "report_type",
@@ -57,7 +58,7 @@
    "fieldname": "action",
    "fieldtype": "Select",
    "label": "Action",
-   "options": "Create Entry\nUpdate Settings\nView Report\nWatch Video",
+   "options": "Create Entry\nUpdate Settings\nShow Form Tour\nView Report\nWatch Video",
    "reqd": 1
   },
   {
@@ -65,7 +66,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.action == \"Create Entry\" || doc.action == \"Update Settings\"",
+   "depends_on": "eval:doc.action == \"Create Entry\" || doc.action == \"Update Settings\" || doc.action == \"Create Entry\" || doc.action == \"Show Form Tour\"",
    "fieldname": "reference_document",
    "fieldtype": "Link",
    "label": "Reference Document",
@@ -127,10 +128,18 @@
    "fieldtype": "Data",
    "label": "Report Reference Doctype",
    "read_only": 1
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.action == \"Create Entry\" || doc.action == \"Update Settings\" || doc.action == \"Create Entry\" || doc.action == \"Show Form Tour\"",
+   "fetch_from": "reference_document.issingle",
+   "fieldname": "is_single",
+   "fieldtype": "Check",
+   "label": "Is Single"
   }
  ],
  "links": [],
- "modified": "2020-05-04 12:53:19.276952",
+ "modified": "2020-05-11 13:24:05.457160",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Onboarding Step",

From 5c241255516edfbc62e1ace935746611ab03551d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 14:07:55 +0530
Subject: [PATCH 077/274] feat: add on_finish hook for tour

---
 frappe/public/js/frappe/form/form.js          |  8 ++++-
 .../js/frappe/widgets/onboarding_widget.js    | 35 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 41bde104dd..3742ea36dc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1557,7 +1557,7 @@ frappe.ui.form.Form = class FrappeForm {
 		}, 1000);
 	}
 
-	show_tour() {
+	show_tour(on_finish) {
 		if (!frappe.tour.hasOwnProperty(this.doctype) || !Array.isArray(frappe.tour[this.doctype])) {
 			return
 		}
@@ -1567,6 +1567,12 @@ frappe.ui.form.Form = class FrappeForm {
 			keyboardControl: true,
 			nextBtnText: 'Next',              // Next button text for this step
   			prevBtnText: 'Previous',
+  			opacity: 0.25,
+  			onNext: (el) => {
+  				if (!driver.hasNextStep()) {
+  					on_finish && on_finish();
+  				}
+  			}
 		});
 
 		this.layout.sections.forEach(section => section.collapse(false))
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 78305edd5d..f9abbaf64e 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -57,6 +57,7 @@ export default class OnboardingWidget extends Widget {
 		let actions = {
 			"Watch Video": () => this.show_video(step),
 			"Create Entry": () => this.show_quick_entry(step),
+			"Show Form Tour": () => this.show_form_tour(step),
 			"Update Settings": () => this.update_settings(step),
 			"View Report": () => this.open_report(step),
 		};
@@ -86,7 +87,9 @@ export default class OnboardingWidget extends Widget {
 				primary_action: {
 					action: () => {
 						msg_dialog.hide();
-						this.mark_complete(step);
+						frappe.set_route(current_route).then(() => {
+							this.mark_complete(step);
+						});
 					},
 					label: () => __("Continue"),
 				},
@@ -105,6 +108,36 @@ export default class OnboardingWidget extends Widget {
 		});
 	}
 
+	show_form_tour(step) {
+		let route;
+		if (step.is_single) {
+			route = `Form/${step.reference_document}`
+		} else {
+			route = `Form/${step.reference_document}/New ${step.reference_document}`
+		}
+
+		frappe.route_options = {};
+		frappe.route_options.after_load = (frm) => {
+			frm.show_tour(() => {
+				let msg_dialog = frappe.msgprint({
+					message: __("Let's take you back to onboarding"),
+					title: __("Great Job"),
+					primary_action: {
+						action: () => {
+							frappe.set_route(current_route).then(() => {
+								this.mark_complete(step);
+							});
+							msg_dialog.hide();
+						},
+						label: () => __("Continue"),
+					}
+				});
+			});
+		};
+
+		frappe.set_route(route)
+	}
+
 	update_settings(step) {
 		let current_route = frappe.get_route();
 

From 986504d46d7960fe2cb272111e3d02fa33a23f9f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 11 May 2020 14:19:22 +0530
Subject: [PATCH 078/274] fix: routing bug for tour

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index f9abbaf64e..94b73d0c8b 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -78,6 +78,7 @@ export default class OnboardingWidget extends Widget {
 			doctype: step.report_reference_doctype
 		});
 
+
 		let current_route = frappe.get_route();
 
 		frappe.set_route(route).then(() => {
@@ -86,10 +87,10 @@ export default class OnboardingWidget extends Widget {
 				title: __(step.reference_report),
 				primary_action: {
 					action: () => {
-						msg_dialog.hide();
 						frappe.set_route(current_route).then(() => {
 							this.mark_complete(step);
 						});
+						msg_dialog.hide();
 					},
 					label: () => __("Continue"),
 				},
@@ -116,6 +117,8 @@ export default class OnboardingWidget extends Widget {
 			route = `Form/${step.reference_document}/New ${step.reference_document}`
 		}
 
+		let current_route = frappe.get_route();
+
 		frappe.route_options = {};
 		frappe.route_options.after_load = (frm) => {
 			frm.show_tour(() => {

From 451772dfab13abfb440c199c34d67887cf1921d9 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 11 May 2020 15:47:19 +0530
Subject: [PATCH 079/274] refactor(commands): migrate-to frappecloud connector

---
 frappe/commands/site.py           |  67 +------------
 frappe/utils/remote_migrations.py | 151 ++++++++++++++++++++++++++++++
 requirements.txt                  |   1 +
 3 files changed, 155 insertions(+), 64 deletions(-)
 create mode 100644 frappe/utils/remote_migrations.py

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index d5329d4cf9..058554cff6 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -263,70 +263,9 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 @click.argument('site_url')
 @pass_context
 def migrate_to(context, site_url):
-	'''
-	>>> import requests
-	>>> session = requests.Session()
-	>>> session.post("http://cloud:8002/api/method/login", {"usr":"gavin18d@gmail.com", "pwd":"bfdiljn;jnd"})
-	<Response [200]>
-	>>> session.headers.update({"X-Press-Team": "gavin18d@gmail.com"})
-	>>> session.post("http://cloud:8002/api/method/press.api.site.options_for_new").json()
-	'''
-
-	if site_url in ("frappe.cloud", "frappecloud.com"):
-		site_url = "frappe.cloud"
-
-		login_url = "https://{site_url}/api/method/login"
-		upload_url = "https://{site_url}/api/method/press.api.site.new_from_existing_account"
-		options_url = "https://{site_url}/api/method/press.api.site.options_for_new"
-
-	else:
-		print(f"{site_url} is not supported yet")
-		sys.exit(1)
-
-	for site in context.site:
-		username = input()
-		password = getpass.unix_getpass()
-		auth_credentials = {"usr": username, "pwd": password}
-
-		# create frapp_cloud session
-		session = requests.Session()
-		login_sc = session.post(login_url, auth_credentials)
-
-		if login_sc.ok:
-			print(f"Auth Successful w {site_url}")
-
-			# get options
-			session.headers.update({"X-Press-Team": username})
-			site_options_sc = session.post(options_url)
-
-			if site_options_sc.ok:
-				site_options = site_options_sc.json()
-
-			else:
-				print(f"Request failed with Status Code: {site_options_sc.status_code}")
-				sys.exit(1)
-
-			# set preferences from options
-
-			# take backup
-			import frappe.utils.backups
-			print(f"Taking backup for site {site}")
-			odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
-
-			# relative paths here
-			odb.backup_path_db
-			odb.backup_path_files
-			odb.backup_path_private_files
-
-			site_files = {
-				"files": []
-			}
-
-			# push to frappe_cloud
-			session.post(upload_url, files=site_files)
-
-		else:
-			print(f"Request failed with Status Code: {login_sc.status_code}")
+	from frappe.utils.remote_migrations import migrate_to
+	for site in context.sites:
+		migrate_to(site, site_url)
 
 
 @click.command('run-patch')
diff --git a/frappe/utils/remote_migrations.py b/frappe/utils/remote_migrations.py
new file mode 100644
index 0000000000..7664411474
--- /dev/null
+++ b/frappe/utils/remote_migrations.py
@@ -0,0 +1,151 @@
+import getpass
+import sys
+
+import requests
+from terminaltables import AsciiTable
+
+import frappe
+import frappe.utils.backups
+
+
+def choose(plans_list):
+	plans_table = []
+	available_plans = []
+	selected_plan = None
+
+	print(f"{len(plans_list)} plans available")
+
+	plans_table.append([x for x in plans_list[0].keys()])
+	for plan in plans_list:
+		row_data = [x for x in plan.values()]
+		available_plans.append(row_data[0])
+		plans_table.append(row_data)
+
+	print(AsciiTable(plans_table).table)
+
+	while True:
+		if selected_plan:
+			break
+		else:
+			input_plan = input("Send plan?: ")
+			if input_plan in available_plans:
+				return selected_plan
+			else:
+				print("Invalid selection...try again")
+
+
+def filter_apps(app_groups):
+	from frappe.utils import get_installed_apps_info
+
+	allowed_apps = []
+	filtered_apps = []
+	existing_apps = []
+
+	for group in app_groups:
+		for app in group.get("apps"):
+			app_name = group.get('scrubbed')
+			branch = group.get('branch')
+			allowed_apps.append(tuple(app_name, branch))
+
+	for app in get_installed_apps_info():
+		app_name = app.get('app_name')
+		branch = app.get('branch')
+		existing_apps.append(tuple(app_name, branch))
+
+	filtered_apps = [app[0] for app in existing_apps if app in allowed_apps]
+
+	return "Vanilla Version 12", filtered_apps
+
+
+def migrate_to(local_site, remote_site):
+	if remote_site in ("frappe.cloud", "frappecloud.com"):
+		remote_site = "cloud:8002"
+		# remote_site = "frappecloud.com"
+		return frappecloud_migrator(local_site, remote_site)
+	else:
+		print(f"{remote_site} is not supported yet")
+		sys.exit(1)
+
+
+def frappecloud_migrator(local_site, remote_site):
+	# test:
+	login_url = f"http://{remote_site}/api/method/login"
+	upload_url = f"http://{remote_site}/api/method/press.api.site.new"
+	files_url = f"http://{remote_site}/api/method/upload_file"
+	options_url = f"http://{remote_site}/api/method/press.api.site.options_for_new"
+
+	# production:
+	# login_url = f"https://{remote_site}/api/method/login"
+	# upload_url = f"https://{remote_site}/api/method/press.api.site.new_from_existing_account"
+	# options_url = f"https://{remote_site}/api/method/press.api.site.options_for_new"
+
+	print(f"Frappe Cloud credentials @ {remote_site}")
+
+	username = input("Username: ")
+	password = getpass.unix_getpass()
+	auth_credentials = {"usr": username, "pwd": password}
+
+	# create frapp_cloud session
+	session = requests.Session()
+	login_sc = session.post(login_url, auth_credentials)
+
+	if login_sc.ok:
+		print(f"Authorization Successful!")
+
+		# get options
+		session.headers.update({"X-Press-Team": username})
+		site_options_sc = session.post(options_url)
+
+		if site_options_sc.ok:
+			site_options = site_options_sc.json()["message"]
+			app_groups = site_options_sc.json()["groups"]
+
+		else:
+			print(f"Request failed with Status Code: {site_options_sc.status_code}")
+			sys.exit(1)
+
+		# set preferences from options
+		subdomain = input("Enter subdomain: ")
+		plan = choose(site_options['plans'])
+
+		frappe.init(site=local_site)
+		frappe.connect()
+
+		# apps currently on site....vanilla.
+		selected_group, filtered_apps = filter_apps(app_groups)
+
+		# take backup
+		print(f"Taking backup for site {local_site}")
+		odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
+		files_session = {}
+
+		# upload files
+		for file_type, file_path in [("database", odb.backup_path_db), ("public", odb.backup_path_files), ("private", odb.backup_path_private_files)]:
+			file_upload_response = session.post(files_url, data={}, files={
+				"file": open(file_path, "rb"),
+				"is_private": 1,
+				"folder": "Home",
+				"method": "press.api.site.upload_backup",
+				"type": file_type
+			})
+			if file_upload_response.ok:
+				files_session[file_type] = file_upload_response.json()["message"]
+			else:
+				print(f"Upload failed for: {file_path}")
+
+		files_uploaded = { k, v["file_url"] for k, v in files_session.items() }
+
+		# push to frappe_cloud
+		session.post(upload_url, data={
+			"site": {
+				"apps": filtered_apps,
+				"files": files_uploaded,
+				"group": selected_group,
+				"name": subdomain,
+				"plan": plan
+			}
+		})
+		frappe.destroy()
+
+	else:
+		print(f"Request failed with Status Code: {login_sc.status_code}")
diff --git a/requirements.txt b/requirements.txt
index 6c22d66139..c4cb79892a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -60,6 +60,7 @@ semantic-version==2.8.4
 six==1.14.0
 sqlparse==0.2.4
 stripe==2.40.0
+terminaltables
 unittest-xml-reporting==2.5.2
 urllib3==1.25.8
 watchdog==0.8.0

From d40b60d95b454b9b253689c6ba69b04b7edb9da9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 11 May 2020 18:15:38 +0530
Subject: [PATCH 080/274] fix(Report): hide chart if group by is applied to
 report

---
 frappe/public/js/frappe/ui/group_by/group_by.js      | 1 +
 frappe/public/js/frappe/views/reports/report_view.js | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js
index 831bafa8e8..5053ad71f4 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -241,6 +241,7 @@ frappe.ui.GroupBy = class {
 
 		this.order_by = '';
 		this.group_by = null;
+		this.report_view.group_by = null;
 		this.aggregate_function = null;
 		this.aggregate_on = null;
 		$(".groupby").val("");
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 856061f1f0..9399acf39e 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -113,7 +113,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		} else {
 			this.save_report_settings();
 		}
-		this.init_chart();
+		if (!this.group_by) {
+			this.init_chart();
+		}
 	}
 
 	set_dirty_state_for_custom_report() {
@@ -177,9 +179,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		this.render_count();
 		this.setup_columns();
 
-		if (this.chart) {
+		if (this.group_by) {
+			this.$charts_wrapper.addClass('hidden');
+		} else if (this.chart) {
 			this.refresh_charts();
 		}
+
 		if (this.datatable && !force) {
 			this.datatable.refresh(this.get_data(this.data), this.columns);
 			return;

From 4e79dc98e02f039bfa826dbaf4c70a5370d9eb07 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 11 May 2020 18:22:13 +0530
Subject: [PATCH 081/274] fix: show chart if hidden

---
 frappe/public/js/frappe/views/reports/report_view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 9399acf39e..f794248ad9 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -182,6 +182,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		if (this.group_by) {
 			this.$charts_wrapper.addClass('hidden');
 		} else if (this.chart) {
+			this.$charts_wrapper.removeClass('hidden');
 			this.refresh_charts();
 		}
 

From ed74f52e206f7108938ef23fecb198c30a99a683 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 11 May 2020 20:12:05 +0530
Subject: [PATCH 082/274] feat: single doctype to store installed apps data

updated on migrate
versions enabled
---
 .../installed_application_details/__init__.py |  0
 .../installed_application_details.json        | 49 +++++++++++++++++++
 .../installed_application_details.py          | 10 ++++
 .../installed_applications/__init__.py        |  0
 .../installed_applications.js                 |  8 +++
 .../installed_applications.json               | 42 ++++++++++++++++
 .../installed_applications.py                 | 17 +++++++
 .../test_installed_applications.py            | 10 ++++
 frappe/migrate.py                             |  3 ++
 .../website_theme/standard/standard.json      |  2 +-
 10 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 frappe/core/doctype/installed_application_details/__init__.py
 create mode 100644 frappe/core/doctype/installed_application_details/installed_application_details.json
 create mode 100644 frappe/core/doctype/installed_application_details/installed_application_details.py
 create mode 100644 frappe/core/doctype/installed_applications/__init__.py
 create mode 100644 frappe/core/doctype/installed_applications/installed_applications.js
 create mode 100644 frappe/core/doctype/installed_applications/installed_applications.json
 create mode 100644 frappe/core/doctype/installed_applications/installed_applications.py
 create mode 100644 frappe/core/doctype/installed_applications/test_installed_applications.py

diff --git a/frappe/core/doctype/installed_application_details/__init__.py b/frappe/core/doctype/installed_application_details/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.json b/frappe/core/doctype/installed_application_details/installed_application_details.json
new file mode 100644
index 0000000000..ec453c320f
--- /dev/null
+++ b/frappe/core/doctype/installed_application_details/installed_application_details.json
@@ -0,0 +1,49 @@
+{
+ "actions": [],
+ "creation": "2020-05-11 17:44:54.674657",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "application_name",
+  "application_version",
+  "git_branch"
+ ],
+ "fields": [
+  {
+   "fieldname": "application_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Name",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "application_version",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Version",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "git_branch",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Git Branch",
+   "read_only": 1,
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-11 19:54:07.141641",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Installed Application Details",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.py b/frappe/core/doctype/installed_application_details/installed_application_details.py
new file mode 100644
index 0000000000..3dd2b67228
--- /dev/null
+++ b/frappe/core/doctype/installed_application_details/installed_application_details.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class InstalledApplicationDetails(Document):
+	pass
diff --git a/frappe/core/doctype/installed_applications/__init__.py b/frappe/core/doctype/installed_applications/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/doctype/installed_applications/installed_applications.js b/frappe/core/doctype/installed_applications/installed_applications.js
new file mode 100644
index 0000000000..9a1fd5ac18
--- /dev/null
+++ b/frappe/core/doctype/installed_applications/installed_applications.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Installed Applications', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/core/doctype/installed_applications/installed_applications.json b/frappe/core/doctype/installed_applications/installed_applications.json
new file mode 100644
index 0000000000..8f0e658d92
--- /dev/null
+++ b/frappe/core/doctype/installed_applications/installed_applications.json
@@ -0,0 +1,42 @@
+{
+ "actions": [],
+ "creation": "2020-05-11 17:45:41.587750",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "installed_applications"
+ ],
+ "fields": [
+  {
+   "fieldname": "installed_applications",
+   "fieldtype": "Table",
+   "label": "Installed Applications",
+   "options": "Installed Application Details",
+   "read_only": 1
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-05-11 19:52:47.775562",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Installed Applications",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/core/doctype/installed_applications/installed_applications.py b/frappe/core/doctype/installed_applications/installed_applications.py
new file mode 100644
index 0000000000..0b9603a005
--- /dev/null
+++ b/frappe/core/doctype/installed_applications/installed_applications.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class InstalledApplications(Document):
+	def before_save(self):
+		self.delete_key("installed_applications")
+		for app in frappe.utils.get_installed_apps_info():
+			self.append("installed_applications", {
+				"application_name": app.get("app_name"),
+				"application_version": app.get("version"),
+				"git_branch": app.get("branch")
+			})
\ No newline at end of file
diff --git a/frappe/core/doctype/installed_applications/test_installed_applications.py b/frappe/core/doctype/installed_applications/test_installed_applications.py
new file mode 100644
index 0000000000..ab9b849fa1
--- /dev/null
+++ b/frappe/core/doctype/installed_applications/test_installed_applications.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestInstalledApplications(unittest.TestCase):
+	pass
diff --git a/frappe/migrate.py b/frappe/migrate.py
index 094abbe099..0b4680ced3 100644
--- a/frappe/migrate.py
+++ b/frappe/migrate.py
@@ -67,6 +67,9 @@ def migrate(verbose=True, rebuild_website=False, skip_failing=False):
 		# add static pages to global search
 		global_search.update_global_search_for_all_web_pages()
 
+		# updating installed applications data
+		frappe.get_single('Installed Applications').save()
+
 		#run after_migrate hooks
 		for app in frappe.get_installed_apps():
 			for fn in frappe.get_hooks('after_migrate', app_name=app):
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index 1729e4616a..e56d1934c6 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -19,4 +19,4 @@
  "theme": "Standard",
  "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
  "theme_url": "/assets/css/standard_style.css"
-}
\ No newline at end of file
+}

From b48d2921bbef1e1e2f8003853c008b4f43316bbf Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 12 May 2020 10:18:48 +0530
Subject: [PATCH 083/274] chore(installed-applications): renamed doctype and
 docfields

---
 .../__init__.py                               |  0
 .../installed_application.json}               | 40 +++++++++----------
 .../installed_application.py}                 |  2 +-
 .../installed_applications.json               |  4 +-
 .../installed_applications.py                 |  9 +++--
 5 files changed, 28 insertions(+), 27 deletions(-)
 rename frappe/core/doctype/{installed_application_details => installed_application}/__init__.py (100%)
 rename frappe/core/doctype/{installed_application_details/installed_application_details.json => installed_application/installed_application.json} (78%)
 rename frappe/core/doctype/{installed_application_details/installed_application_details.py => installed_application/installed_application.py} (84%)

diff --git a/frappe/core/doctype/installed_application_details/__init__.py b/frappe/core/doctype/installed_application/__init__.py
similarity index 100%
rename from frappe/core/doctype/installed_application_details/__init__.py
rename to frappe/core/doctype/installed_application/__init__.py
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.json b/frappe/core/doctype/installed_application/installed_application.json
similarity index 78%
rename from frappe/core/doctype/installed_application_details/installed_application_details.json
rename to frappe/core/doctype/installed_application/installed_application.json
index ec453c320f..1f32c557ce 100644
--- a/frappe/core/doctype/installed_application_details/installed_application_details.json
+++ b/frappe/core/doctype/installed_application/installed_application.json
@@ -4,27 +4,11 @@
  "doctype": "DocType",
  "engine": "InnoDB",
  "field_order": [
-  "application_name",
-  "application_version",
+  "app_name",
+  "app_version",
   "git_branch"
  ],
  "fields": [
-  {
-   "fieldname": "application_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Application Name",
-   "read_only": 1,
-   "reqd": 1
-  },
-  {
-   "fieldname": "application_version",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Application Version",
-   "read_only": 1,
-   "reqd": 1
-  },
   {
    "fieldname": "git_branch",
    "fieldtype": "Data",
@@ -32,14 +16,30 @@
    "label": "Git Branch",
    "read_only": 1,
    "reqd": 1
+  },
+  {
+   "fieldname": "app_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Name",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "app_version",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Version",
+   "read_only": 1,
+   "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-11 19:54:07.141641",
+ "modified": "2020-05-12 10:09:49.148087",
  "modified_by": "Administrator",
  "module": "Core",
- "name": "Installed Application Details",
+ "name": "Installed Application",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
diff --git a/frappe/core/doctype/installed_application_details/installed_application_details.py b/frappe/core/doctype/installed_application/installed_application.py
similarity index 84%
rename from frappe/core/doctype/installed_application_details/installed_application_details.py
rename to frappe/core/doctype/installed_application/installed_application.py
index 3dd2b67228..6bb12afc49 100644
--- a/frappe/core/doctype/installed_application_details/installed_application_details.py
+++ b/frappe/core/doctype/installed_application/installed_application.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class InstalledApplicationDetails(Document):
+class InstalledApplication(Document):
 	pass
diff --git a/frappe/core/doctype/installed_applications/installed_applications.json b/frappe/core/doctype/installed_applications/installed_applications.json
index 8f0e658d92..f2345e66b2 100644
--- a/frappe/core/doctype/installed_applications/installed_applications.json
+++ b/frappe/core/doctype/installed_applications/installed_applications.json
@@ -12,13 +12,13 @@
    "fieldname": "installed_applications",
    "fieldtype": "Table",
    "label": "Installed Applications",
-   "options": "Installed Application Details",
+   "options": "Installed Application",
    "read_only": 1
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-05-11 19:52:47.775562",
+ "modified": "2020-05-12 10:09:14.310622",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Installed Applications",
diff --git a/frappe/core/doctype/installed_applications/installed_applications.py b/frappe/core/doctype/installed_applications/installed_applications.py
index 0b9603a005..aa0401f368 100644
--- a/frappe/core/doctype/installed_applications/installed_applications.py
+++ b/frappe/core/doctype/installed_applications/installed_applications.py
@@ -7,11 +7,12 @@ import frappe
 from frappe.model.document import Document
 
 class InstalledApplications(Document):
-	def before_save(self):
+	def update_versions(self):
 		self.delete_key("installed_applications")
 		for app in frappe.utils.get_installed_apps_info():
 			self.append("installed_applications", {
-				"application_name": app.get("app_name"),
-				"application_version": app.get("version"),
+				"app_name": app.get("app_name"),
+				"app_version": app.get("version"),
 				"git_branch": app.get("branch")
-			})
\ No newline at end of file
+			})
+		self.save()
\ No newline at end of file

From 2473b1ccd7b7472e70fca383a7a2fce4ad6b5a6a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 12 May 2020 10:20:10 +0530
Subject: [PATCH 084/274] fix: explicitly called method instead of updating
 implicitly

---
 frappe/migrate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/migrate.py b/frappe/migrate.py
index 0b4680ced3..3325bc8a2d 100644
--- a/frappe/migrate.py
+++ b/frappe/migrate.py
@@ -68,7 +68,7 @@ def migrate(verbose=True, rebuild_website=False, skip_failing=False):
 		global_search.update_global_search_for_all_web_pages()
 
 		# updating installed applications data
-		frappe.get_single('Installed Applications').save()
+		frappe.get_single('Installed Applications').update_versions()
 
 		#run after_migrate hooks
 		for app in frappe.get_installed_apps():

From 91e3b2406ada6a46eb4f09cf8918ab9364784b09 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 12 May 2020 12:01:12 +0530
Subject: [PATCH 085/274] fix: allow validations only on Data fields

---
 frappe/public/js/frappe/form/controls/data.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js
index c943ec89bb..25f3ef76af 100644
--- a/frappe/public/js/frappe/form/controls/data.js
+++ b/frappe/public/js/frappe/form/controls/data.js
@@ -87,6 +87,9 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
 		return val==null ? "" : val;
 	},
 	validate: function(v) {
+		if (this.df.fieldtype !== "Data") {
+			return v;
+		}
 		if (!v) {
 			return '';
 		}

From 280c4fb0a8c7c4ed425b3050e857c92aff75a777 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 12 May 2020 12:01:40 +0530
Subject: [PATCH 086/274] fix: improve buggy regex for email

rfc822 compliant email regex added from https://emailregex.com/

https://stackoverflow.com/questions/46155/how-to-validate-an-email-address-in-javascript/46181#46181
will give you enough content to go over before deciding how your email validation should work :')

eg for bug: string like '"purchase=fmtrd.com@mail.erpnext.com"
<purchase=fmtrd.com@mail.erpnext.com>' would take sometimes over 10s or even freeze the tab for 10m at the least via validate_email
---
 frappe/public/js/frappe/utils/utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 7eff0b8e24..7d2c20c693 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -250,7 +250,8 @@ Object.assign(frappe.utils, {
 				regExp = /^\w+$/;
 				break;
 			case "email":
-				regExp = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i;
+				// from https://emailregex.com/
+				regExp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 				break;
 			case "url":
 				regExp = /^(https?|s?ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;

From 4018bf6f5e54636a6cb21df0394c252c1b3b1228 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 15:36:48 +0530
Subject: [PATCH 087/274] refactor: remove default rules

---
 frappe/public/less/driver.less | 104 ---------------------------------
 1 file changed, 104 deletions(-)

diff --git a/frappe/public/less/driver.less b/frappe/public/less/driver.less
index 9dc7cde0b1..d331b92e24 100644
--- a/frappe/public/less/driver.less
+++ b/frappe/public/less/driver.less
@@ -29,12 +29,6 @@ div#driver-popover-item {
 			border: 1px solid transparent;
 		}
 
-		button.driver-disabled {
-			color: grey;
-			cursor: default;
-			pointer-events: none;
-		}
-
 		.driver-close-btn {
 			// Edited
 			float: left;
@@ -79,102 +73,4 @@ div#driver-popover-item {
 	}
 }
 
-.driver-clearfix {
-	&:after {
-		content: "";
-		display: table;
-		clear: both;
-	}
-	&:before {
-		content: "";
-		display: table;
-	}
-}
-
-.driver-stage-no-animation {
-	-webkit-transition: none !important;
-	-moz-transition: none !important;
-	-ms-transition: none !important;
-	-o-transition: none !important;
-	transition: none !important;
-	background: transparent !important;
-	outline: 5000px solid rgba(0,0,0,.75);
-}
-
-div#driver-page-overlay {
-	background: @modal-backdrop-bg;
-	position: fixed;
-	bottom: 0;
-	right: 0;
-	display: block;
-	width: 100%;
-	height: 100%;
-	zoom: 1;
-	filter: alpha(opacity=25);
-	opacity: .25;
-	z-index: 100002 !important;
-	top: 0;
-	left: 0;
-	-webkit-transition: all .3s;
-	-moz-transition: all .3s;
-	-ms-transition: all .3s;
-	-o-transition: all .3s;
-	transition: all .3s;
-}
-
-div#driver-highlighted-element-stage {
-	top: 0;
-	left: 0;
-	-webkit-transition: all .3s;
-	-moz-transition: all .3s;
-	-ms-transition: all .3s;
-	-o-transition: all .3s;
-	transition: all .3s;
-	position: absolute;
-	height: 50px;
-	width: 300px;
-	background: #fff;
-	z-index: 100003 !important;
-	display: none;
-	border-radius: 2px;
-}
-
-.driver-highlighted-element {
-	z-index: 100004 !important;
-}
-
-.driver-position-relative {
-	position: relative !important;
-}
-
-.driver-fix-stacking {
-	z-index: auto !important;
-	opacity: 1 !important;
-	-webkit-transform: none !important;
-	-moz-transform: none !important;
-	-ms-transform: none !important;
-	-o-transform: none !important;
-	transform: none !important;
-	-webkit-filter: none !important;
-	-moz-filter: none !important;
-	-ms-filter: none !important;
-	-o-filter: none !important;
-	filter: none !important;
-	-webkit-perspective: none !important;
-	-moz-perspective: none !important;
-	-ms-perspective: none !important;
-	-o-perspective: none !important;
-	perspective: none !important;
-	-webkit-transform-style: flat !important;
-	-moz-transform-style: flat !important;
-	-ms-transform-style: flat !important;
-	transform-style: flat !important;
-	-webkit-transform-box: border-box !important;
-	-moz-transform-box: border-box !important;
-	-ms-transform-box: border-box !important;
-	-o-transform-box: border-box !important;
-	transform-box: border-box !important;
-	will-change: unset !important;
-}
-
 

From 4f3c40ae3d0cb2fb3478e68e3313fa487098d5b5 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 12 May 2020 15:52:03 +0530
Subject: [PATCH 088/274] fix(google-contact): remove parent kwarg from create
 contact

---
 frappe/integrations/doctype/google_contacts/google_contacts.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/doctype/google_contacts/google_contacts.py b/frappe/integrations/doctype/google_contacts/google_contacts.py
index 0e28c1306c..5874c79108 100644
--- a/frappe/integrations/doctype/google_contacts/google_contacts.py
+++ b/frappe/integrations/doctype/google_contacts/google_contacts.py
@@ -218,7 +218,7 @@ def insert_contacts_to_google_contacts(doc, method=None):
 	emailAddresses = [{"value": email_id.email_id} for email_id in doc.email_ids]
 
 	try:
-		contact = google_contacts.people().createContact(parent='people/me', body={"names": [names],"phoneNumbers": phoneNumbers,
+		contact = google_contacts.people().createContact(body={"names": [names],"phoneNumbers": phoneNumbers,
 			"emailAddresses": emailAddresses}).execute()
 		frappe.db.set_value("Contact", doc.name, "google_contacts_id", contact.get("resourceName"))
 	except HttpError as err:

From 48382fdca0adf7842120ec79585236c242cb4bdc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:15:36 +0530
Subject: [PATCH 089/274] refactor: rename onboarding to module onboarding

---
 frappe/desk/desktop.py                                    | 4 ++--
 frappe/desk/doctype/desk_page/desk_page.json              | 4 ++--
 .../doctype/{onboarding => module_onboarding}/__init__.py | 0
 .../module_onboarding.js}                                 | 2 +-
 .../module_onboarding.json}                               | 2 +-
 .../module_onboarding.py}                                 | 8 ++++----
 .../test_module_onboarding.py}                            | 2 +-
 frappe/model/sync.py                                      | 4 ++--
 frappe/modules/import_file.py                             | 2 +-
 frappe/website/onboarding/website/website.json            | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)
 rename frappe/desk/doctype/{onboarding => module_onboarding}/__init__.py (100%)
 rename frappe/desk/doctype/{onboarding/onboarding.js => module_onboarding/module_onboarding.js} (92%)
 rename frappe/desk/doctype/{onboarding/onboarding.json => module_onboarding/module_onboarding.json} (98%)
 rename frappe/desk/doctype/{onboarding/onboarding.py => module_onboarding/module_onboarding.py} (73%)
 rename frappe/desk/doctype/{onboarding/test_onboarding.py => module_onboarding/test_module_onboarding.py} (79%)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index f2047003fa..a912ca341c 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -61,10 +61,10 @@ class Workspace:
 		if not self.doc.onboarding:
 			return None
 
-		if frappe.db.get_value("Onboarding", self.doc.onboarding, "is_complete"):
+		if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"):
 			return None
 
-		doc = frappe.get_doc("Onboarding", self.doc.onboarding)
+		doc = frappe.get_doc("Module Onboarding", self.doc.onboarding)
 
 		# Check if user is allowed
 		allowed_roles = set(doc.get_allowed_roles())
diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json
index cb106c5dd4..0064d7bd28 100644
--- a/frappe/desk/doctype/desk_page/desk_page.json
+++ b/frappe/desk/doctype/desk_page/desk_page.json
@@ -188,11 +188,11 @@
    "fieldname": "onboarding",
    "fieldtype": "Link",
    "label": "Onboarding",
-   "options": "Onboarding"
+   "options": "Module Onboarding"
   }
  ],
  "links": [],
- "modified": "2020-04-26 12:21:46.205079",
+ "modified": "2020-05-12 16:12:20.708394",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",
diff --git a/frappe/desk/doctype/onboarding/__init__.py b/frappe/desk/doctype/module_onboarding/__init__.py
similarity index 100%
rename from frappe/desk/doctype/onboarding/__init__.py
rename to frappe/desk/doctype/module_onboarding/__init__.py
diff --git a/frappe/desk/doctype/onboarding/onboarding.js b/frappe/desk/doctype/module_onboarding/module_onboarding.js
similarity index 92%
rename from frappe/desk/doctype/onboarding/onboarding.js
rename to frappe/desk/doctype/module_onboarding/module_onboarding.js
index bed7dbd5de..48ab047c5e 100644
--- a/frappe/desk/doctype/onboarding/onboarding.js
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Onboarding", {
+frappe.ui.form.on("Module ModuleOnboarding", {
 	refresh: function(frm) {
 		frappe.boot.developer_mode &&
 			frm.set_intro(
diff --git a/frappe/desk/doctype/onboarding/onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json
similarity index 98%
rename from frappe/desk/doctype/onboarding/onboarding.json
rename to frappe/desk/doctype/module_onboarding/module_onboarding.json
index b1d563a9dc..9810e7a15f 100644
--- a/frappe/desk/doctype/onboarding/onboarding.json
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json
@@ -93,7 +93,7 @@
  "modified": "2020-05-01 19:37:21.492405",
  "modified_by": "Administrator",
  "module": "Desk",
- "name": "Onboarding",
+ "name": "Module Onboarding",
  "owner": "Administrator",
  "permissions": [
   {
diff --git a/frappe/desk/doctype/onboarding/onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py
similarity index 73%
rename from frappe/desk/doctype/onboarding/onboarding.py
rename to frappe/desk/doctype/module_onboarding/module_onboarding.py
index c8527d22b6..a723953a11 100644
--- a/frappe/desk/doctype/onboarding/onboarding.py
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py
@@ -8,16 +8,16 @@ from frappe.model.document import Document
 from frappe.modules.export_file import export_to_files
 
 
-class Onboarding(Document):
+class ModuleOnboarding(Document):
 	def on_update(self):
 		if frappe.conf.developer_mode:
-			export_to_files(record_list=[['Onboarding', self.name]], record_module=self.module)
+			export_to_files(record_list=[['Module ModuleOnboarding', self.name]], record_module=self.module)
 
 			for step in self.steps:
-				export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module)
+				export_to_files(record_list=[['Module ModuleOnboarding Step', step.step]], record_module=self.module)
 
 	def get_steps(self):
-		return [frappe.get_doc("Onboarding Step", step.step) for step in self.steps]
+		return [frappe.get_doc("Module ModuleOnboarding Step", step.step) for step in self.steps]
 
 	def get_allowed_roles(self):
 		all_roles = [role.role for role in self.allow_roles]
diff --git a/frappe/desk/doctype/onboarding/test_onboarding.py b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py
similarity index 79%
rename from frappe/desk/doctype/onboarding/test_onboarding.py
rename to frappe/desk/doctype/module_onboarding/test_module_onboarding.py
index 8a9e346fd9..ef305667b1 100644
--- a/frappe/desk/doctype/onboarding/test_onboarding.py
+++ b/frappe/desk/doctype/module_onboarding/test_module_onboarding.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestOnboarding(unittest.TestCase):
+class TestModuleOnboarding(unittest.TestCase):
 	pass
diff --git a/frappe/model/sync.py b/frappe/model/sync.py
index 320cc24677..b7d9d4d548 100644
--- a/frappe/model/sync.py
+++ b/frappe/model/sync.py
@@ -51,7 +51,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe
 			("desk", "onboarding_permission"),
 			("desk", "onboarding_step"),
 			("desk", "onboarding_step_map"),
-			("desk", "onboarding"),
+			("desk", "module_onboarding"),
 			("desk", "desk_card"),
 			("desk", "desk_chart"),
 			("desk", "desk_shortcut"),
@@ -85,7 +85,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F
 	document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format',
 		'website_theme', 'web_form', 'web_template', 'notification', 'print_style',
 		'data_migration_mapping', 'data_migration_plan', 'desk_page',
-		'onboarding_step', 'onboarding']
+		'onboarding_step', 'module_onboarding']
 
 	for doctype in document_types:
 		doctype_path = os.path.join(start_path, doctype)
diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py
index cddef4f910..27649b8da9 100644
--- a/frappe/modules/import_file.py
+++ b/frappe/modules/import_file.py
@@ -13,7 +13,7 @@ ignore_values = {
 	"Print Format": ["disabled"],
 	"Notification": ["enabled"],
 	"Print Style": ["disabled"],
-	"Onboarding": ['is_complete'],
+	"Module Onboarding": ['is_complete'],
 	"Onboarding Step": ['is_complete', 'is_skipped']
 }
 
diff --git a/frappe/website/onboarding/website/website.json b/frappe/website/onboarding/website/website.json
index ee4403557b..b849a809ed 100644
--- a/frappe/website/onboarding/website/website.json
+++ b/frappe/website/onboarding/website/website.json
@@ -6,7 +6,7 @@
  ],
  "creation": "2020-04-26 13:03:30.405135",
  "docstatus": 0,
- "doctype": "Onboarding",
+ "doctype": "Module Onboarding",
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website",
  "idx": 0,
  "is_complete": 0,

From ef0c99c922e0b058e86712c65afe6f6ca779a120 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:24:59 +0530
Subject: [PATCH 090/274] refactor: rename folder for website onboarding

---
 .../{onboarding => module_onboarding}/website/website.json        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frappe/website/{onboarding => module_onboarding}/website/website.json (100%)

diff --git a/frappe/website/onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
similarity index 100%
rename from frappe/website/onboarding/website/website.json
rename to frappe/website/module_onboarding/website/website.json

From 963483cb0e29a7aa1baa1bda7c2e519714776d61 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:28:54 +0530
Subject: [PATCH 091/274] feat: add patch to rename Onboarding

---
 frappe/patches.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index a086fa6f4a..ef9e9fe4bb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -278,3 +278,4 @@ frappe.patches.v13_0.set_path_for_homepage_in_web_page_view
 frappe.patches.v13_0.migrate_translation_column_data
 frappe.patches.v13_0.set_read_times
 frappe.patches.v13_0.remove_web_view
+execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding")

From bcf20a8a5c69f3735905f8fee49ad482030e9376 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:41:48 +0530
Subject: [PATCH 092/274] fix: controller methods

---
 frappe/desk/doctype/module_onboarding/module_onboarding.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py
index a723953a11..2be427749c 100644
--- a/frappe/desk/doctype/module_onboarding/module_onboarding.py
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py
@@ -11,13 +11,13 @@ from frappe.modules.export_file import export_to_files
 class ModuleOnboarding(Document):
 	def on_update(self):
 		if frappe.conf.developer_mode:
-			export_to_files(record_list=[['Module ModuleOnboarding', self.name]], record_module=self.module)
+			export_to_files(record_list=[['ModuleOnboarding', self.name]], record_module=self.module)
 
 			for step in self.steps:
-				export_to_files(record_list=[['Module ModuleOnboarding Step', step.step]], record_module=self.module)
+				export_to_files(record_list=[['ModuleOnboarding Step', step.step]], record_module=self.module)
 
 	def get_steps(self):
-		return [frappe.get_doc("Module ModuleOnboarding Step", step.step) for step in self.steps]
+		return [frappe.get_doc("ModuleOnboarding Step", step.step) for step in self.steps]
 
 	def get_allowed_roles(self):
 		all_roles = [role.role for role in self.allow_roles]

From dd1e3bbf7a5a1fa62b4f42adb7dea2dd89a88e02 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:41:58 +0530
Subject: [PATCH 093/274] feat: add ignore flag in patch

---
 frappe/patches.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index ec0c515907..118d42ba16 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -279,4 +279,4 @@ frappe.patches.v13_0.migrate_translation_column_data
 frappe.patches.v13_0.set_read_times
 frappe.patches.v13_0.remove_web_view
 frappe.patches.v13_0.remove_tailwind_from_page_builder
-execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding")
+execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)

From 22f59b7e6a46cd73202a65c3398d780a44580818 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:42:59 +0530
Subject: [PATCH 094/274] fix: onboarding step name in query

---
 frappe/desk/doctype/module_onboarding/module_onboarding.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.py b/frappe/desk/doctype/module_onboarding/module_onboarding.py
index 2be427749c..89160a60f0 100644
--- a/frappe/desk/doctype/module_onboarding/module_onboarding.py
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.py
@@ -11,13 +11,13 @@ from frappe.modules.export_file import export_to_files
 class ModuleOnboarding(Document):
 	def on_update(self):
 		if frappe.conf.developer_mode:
-			export_to_files(record_list=[['ModuleOnboarding', self.name]], record_module=self.module)
+			export_to_files(record_list=[['Module Onboarding', self.name]], record_module=self.module)
 
 			for step in self.steps:
-				export_to_files(record_list=[['ModuleOnboarding Step', step.step]], record_module=self.module)
+				export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module)
 
 	def get_steps(self):
-		return [frappe.get_doc("ModuleOnboarding Step", step.step) for step in self.steps]
+		return [frappe.get_doc("Onboarding Step", step.step) for step in self.steps]
 
 	def get_allowed_roles(self):
 		all_roles = [role.role for role in self.allow_roles]

From 759db9f3241e11b6ac52c4a857eb3aa7e7aec908 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 16:55:22 +0530
Subject: [PATCH 095/274] refactor: add check to onboarding rename patch

---
 frappe/patches.txt                        |  2 +-
 frappe/patches/v13_0/rename_onboarding.py | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v13_0/rename_onboarding.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 118d42ba16..86491b32b4 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -279,4 +279,4 @@ frappe.patches.v13_0.migrate_translation_column_data
 frappe.patches.v13_0.set_read_times
 frappe.patches.v13_0.remove_web_view
 frappe.patches.v13_0.remove_tailwind_from_page_builder
-execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)
+frappe.patches.v13_0.rename_onboarding
diff --git a/frappe/patches/v13_0/rename_onboarding.py b/frappe/patches/v13_0/rename_onboarding.py
new file mode 100644
index 0000000000..9b3add0620
--- /dev/null
+++ b/frappe/patches/v13_0/rename_onboarding.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	if frappe.db.exists("DocType", "Onboarding"):
+		execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)
+

From 413fa607210bbc17f5c7d0d67df6785ec8e05747 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 17:22:15 +0530
Subject: [PATCH 096/274] fix: styling fixes for sider

---
 frappe/public/js/frappe/form/form.js          | 24 +++++++++----------
 .../js/frappe/widgets/onboarding_widget.js    |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 3742ea36dc..afdde6a207 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1558,24 +1558,24 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	show_tour(on_finish) {
-		if (!frappe.tour.hasOwnProperty(this.doctype) || !Array.isArray(frappe.tour[this.doctype])) {
-			return
+		if (!Array.isArray(frappe.tour[this.doctype])) {
+			return;
 		}
 
 		const driver = new frappe.Driver({
 			overlayClickNext: true,
 			keyboardControl: true,
-			nextBtnText: 'Next',              // Next button text for this step
-  			prevBtnText: 'Previous',
-  			opacity: 0.25,
-  			onNext: (el) => {
-  				if (!driver.hasNextStep()) {
-  					on_finish && on_finish();
-  				}
-  			}
+			nextBtnText: 'Next',
+			prevBtnText: 'Previous',
+			opacity: 0.25,
+			onNext: () => {
+				if (!driver.hasNextStep()) {
+					on_finish && on_finish();
+				}
+			}
 		});
 
-		this.layout.sections.forEach(section => section.collapse(false))
+		this.layout.sections.forEach(section => section.collapse(false));
 
 		let steps = frappe.tour[this.doctype].map(step => {
 			let field = this.get_docfield(step.fieldname);
@@ -1585,7 +1585,7 @@ frappe.ui.form.Form = class FrappeForm {
 					title: step.title || field.label,
 					description: step.description
 				}
-			}
+			};
 		});
 
 		driver.defineSteps(steps);
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 94b73d0c8b..84bdbd56ac 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -112,9 +112,9 @@ export default class OnboardingWidget extends Widget {
 	show_form_tour(step) {
 		let route;
 		if (step.is_single) {
-			route = `Form/${step.reference_document}`
+			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/New ${step.reference_document}`
+			route = `Form/${step.reference_document}/New ${step.reference_document}`;
 		}
 
 		let current_route = frappe.get_route();
@@ -138,7 +138,7 @@ export default class OnboardingWidget extends Widget {
 			});
 		};
 
-		frappe.set_route(route)
+		frappe.set_route(route);
 	}
 
 	update_settings(step) {

From 502fb92904253f20d9a30b912cdaf6d4b271169c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 12 May 2020 17:51:18 +0530
Subject: [PATCH 097/274] fix: js controller name for module_onboarding

---
 frappe/desk/doctype/module_onboarding/module_onboarding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.js b/frappe/desk/doctype/module_onboarding/module_onboarding.js
index 48ab047c5e..d95920e2ca 100644
--- a/frappe/desk/doctype/module_onboarding/module_onboarding.js
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Module ModuleOnboarding", {
+frappe.ui.form.on("Module Onboarding", {
 	refresh: function(frm) {
 		frappe.boot.developer_mode &&
 			frm.set_intro(

From c16c7fb1219daf326c05e75d097d60db2ebdbfa0 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 12 May 2020 18:23:57 +0530
Subject: [PATCH 098/274] fix typo 'Send Attachements' in Newsletter

---
 frappe/email/doctype/newsletter/newsletter..json |  0
 frappe/email/doctype/newsletter/newsletter.json  | 16 ++++++++--------
 frappe/email/doctype/newsletter/newsletter.py    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 frappe/email/doctype/newsletter/newsletter..json

diff --git a/frappe/email/doctype/newsletter/newsletter..json b/frappe/email/doctype/newsletter/newsletter..json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json
index 719d51c176..01f75be954 100644
--- a/frappe/email/doctype/newsletter/newsletter.json
+++ b/frappe/email/doctype/newsletter/newsletter.json
@@ -17,7 +17,7 @@
   "subject",
   "message",
   "send_unsubscribe_link",
-  "send_attachements",
+  "send_attachments",
   "published",
   "route",
   "test_the_newsletter",
@@ -73,12 +73,6 @@
    "fieldtype": "Check",
    "label": "Send Unsubscribe Link"
   },
-  {
-   "default": "0",
-   "fieldname": "send_attachements",
-   "fieldtype": "Check",
-   "label": "Send Attachements"
-  },
   {
    "default": "0",
    "fieldname": "published",
@@ -127,6 +121,12 @@
   {
    "fieldname": "column_break_2",
    "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "send_attachments",
+   "fieldtype": "Check",
+   "label": "Send Attachments"
   }
  ],
  "has_web_view": 1,
@@ -135,7 +135,7 @@
  "is_published_field": "published",
  "links": [],
  "max_attachments": 3,
- "modified": "2020-03-02 06:26:51.622521",
+ "modified": "2020-05-12 18:09:40.137138",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Newsletter",
diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index 2469569892..2dccfbead4 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -67,7 +67,7 @@ class Newsletter(WebsiteGenerator):
 			frappe.db.auto_commit_on_many_writes = True
 
 		attachments = []
-		if self.send_attachements:
+		if self.send_attachments:
 			files = frappe.get_all("File", fields=["name"], filters={"attached_to_doctype": "Newsletter",
 				"attached_to_name": self.name}, order_by="creation desc")
 

From f170d87019641c79fde53aec43f43b0e76d7946e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 18:32:58 +0530
Subject: [PATCH 099/274] feat: use frappe.route_hooks namespace

---
 frappe/public/js/frappe/form/form.js                 | 12 ++++++------
 frappe/public/js/frappe/router.js                    |  1 +
 frappe/public/js/frappe/widgets/onboarding_widget.js | 10 +++++-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index afdde6a207..01dfbf81f9 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -464,9 +464,9 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	run_after_load_hook() {
-		if (frappe.route_options.after_load) {
-			let route_callback = frappe.route_options.after_load;
-			delete frappe.route_options.after_load;
+		if (frappe.route_hooks.after_load) {
+			let route_callback = frappe.route_hooks.after_load;
+			delete frappe.route_hooks.after_load;
 
 			route_callback(this);
 		}
@@ -580,9 +580,9 @@ frappe.ui.form.Form = class FrappeForm {
 
 				me.script_manager.trigger("after_save");
 
-				if (frappe.route_options.after_save) {
-					let route_callback = frappe.route_options.after_save;
-					delete frappe.route_options.after_save;
+				if (frappe.route_hooks.after_save) {
+					let route_callback = frappe.route_hooks.after_save;
+					delete frappe.route_hooks.after_save;
 
 					route_callback(me);
 				}
diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 06bd6a3bd9..f3f3285245 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -12,6 +12,7 @@ frappe.route_history = [];
 frappe.view_factory = {};
 frappe.view_factories = [];
 frappe.route_options = null;
+frappe.route_hooks = {};
 
 frappe.route = function() {
 
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 84bdbd56ac..e347a70036 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -119,8 +119,8 @@ export default class OnboardingWidget extends Widget {
 
 		let current_route = frappe.get_route();
 
-		frappe.route_options = {};
-		frappe.route_options.after_load = (frm) => {
+		frappe.route_hooks = {};
+		frappe.route_hooks.after_load = (frm) => {
 			frm.show_tour(() => {
 				let msg_dialog = frappe.msgprint({
 					message: __("Let's take you back to onboarding"),
@@ -144,12 +144,12 @@ export default class OnboardingWidget extends Widget {
 	update_settings(step) {
 		let current_route = frappe.get_route();
 
-		frappe.route_options = {};
-		frappe.route_options.after_load = (frm) => {
+		frappe.route_hooks = {};
+		frappe.route_hooks.after_load = (frm) => {
 			frm.scroll_to_field(step.field);
 		};
 
-		frappe.route_options.after_save = (frm) => {
+		frappe.route_hooks.after_save = (frm) => {
 			let success = false;
 			let args = {};
 

From f2cd5f691131976ab1b11d94898844ec25ec81ca Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 19:14:30 +0530
Subject: [PATCH 100/274] fix (test): run invalid login test before successful
 test

---
 cypress/integration/login.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cypress/integration/login.js b/cypress/integration/login.js
index 3f13130b58..904b9e0721 100644
--- a/cypress/integration/login.js
+++ b/cypress/integration/login.js
@@ -21,15 +21,6 @@ context('Login', () => {
 		cy.location('pathname').should('eq', '/login');
 	});
 
-	it('logs in using correct credentials', () => {
-		cy.get('#login_email').type('Administrator');
-		cy.get('#login_password').type(Cypress.config('adminPassword'));
-
-		cy.get('.btn-login').click();
-		cy.location('pathname').should('eq', '/desk');
-		cy.window().its('frappe.session.user').should('eq', 'Administrator');
-	});
-
 	it('shows invalid login if incorrect credentials', () => {
 		cy.get('#login_email').type('Administrator');
 		cy.get('#login_password').type('qwer');
@@ -38,4 +29,13 @@ context('Login', () => {
 		cy.get('.page-card-head').contains('Invalid Login. Try again.');
 		cy.location('pathname').should('eq', '/login');
 	});
+
+	it('logs in using correct credentials', () => {
+		cy.get('#login_email').type('Administrator');
+		cy.get('#login_password').type(Cypress.config('adminPassword'));
+
+		cy.get('.btn-login').click();
+		cy.location('pathname').should('eq', '/desk');
+		cy.window().its('frappe.session.user').should('eq', 'Administrator');
+	});
 });

From 7c1afd49922a9df35cf167e77da11a30ce29f935 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 May 2020 19:08:58 +0530
Subject: [PATCH 101/274] fix (tests): wait before and after routing

---
 cypress/integration/list_view_settings.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/integration/list_view_settings.js b/cypress/integration/list_view_settings.js
index 51cba94a70..47f8efe94b 100644
--- a/cypress/integration/list_view_settings.js
+++ b/cypress/integration/list_view_settings.js
@@ -9,7 +9,9 @@ context('List View Settings', () => {
 		cy.get('.sidebar-stat').should('contain', "Tags");
 	});
 	it('disable count and sidebar stats then verify', () => {
+		cy.wait(300);
 		cy.visit('/desk#List/DocType/List');
+		cy.wait(300);
 		cy.get('.list-count').should('contain', "20 of");
 		cy.get('button').contains('Menu').click();
 		cy.get('.dropdown-menu li').filter(':visible').contains('Settings').click();

From ac53c4fd9adc2340ade5645c4beb4b7cb7473e99 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 12 May 2020 21:00:58 +0530
Subject: [PATCH 102/274] fix: update patch

---
 frappe/patches/v13_0/rename_onboarding.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v13_0/rename_onboarding.py b/frappe/patches/v13_0/rename_onboarding.py
index 9b3add0620..c506c6076e 100644
--- a/frappe/patches/v13_0/rename_onboarding.py
+++ b/frappe/patches/v13_0/rename_onboarding.py
@@ -6,5 +6,5 @@ import frappe
 
 def execute():
 	if frappe.db.exists("DocType", "Onboarding"):
-		execute:frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)
+		frappe.rename_doc("DocType", "Onboarding", "Module Onboarding", ignore_if_exists=True)
 

From d53b88a72fea30aa8d4004a3b35c04a6af572f85 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 12 May 2020 22:34:10 +0530
Subject: [PATCH 103/274] perf: Make tests faster (#10307)

* feat: Ignore versions for test

* test: Do not ignore version where needed

* perf: Use frappe.db.get_single_value to leverage caching

- frappe.get_cached_value does not support single value caching

* style: Fix sider issue
---
 frappe/__init__.py                            |  2 +-
 frappe/desk/doctype/note/test_note.py         |  8 ++++----
 .../document_follow/test_document_follow.py   | 20 +++++++++----------
 frappe/model/document.py                      |  5 ++---
 .../energy_point_settings.py                  |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index eae8b0d76f..f0b6bfe41b 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -345,7 +345,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 			style="margin: 0;">{}</table>'''.format(table_rows)
 
 	if flags.print_messages and out.message:
-		print("Message: " + repr(out.message).encode("utf-8"))
+		print(f"Message: {repr(out.message).encode('utf-8')}")
 
 	if title:
 		out.title = title
diff --git a/frappe/desk/doctype/note/test_note.py b/frappe/desk/doctype/note/test_note.py
index 8d46eaf336..38894a9c3d 100644
--- a/frappe/desk/doctype/note/test_note.py
+++ b/frappe/desk/doctype/note/test_note.py
@@ -20,7 +20,7 @@ class TestNote(unittest.TestCase):
 		note = self.insert_note()
 		note.title = 'test note 1'
 		note.content = '1'
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -33,7 +33,7 @@ class TestNote(unittest.TestCase):
 
 		# test add
 		note.append('seen_by', {'user': 'Administrator'})
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -48,7 +48,7 @@ class TestNote(unittest.TestCase):
 
 		# test row change
 		note.seen_by[0].user = 'Guest'
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -62,7 +62,7 @@ class TestNote(unittest.TestCase):
 
 		# test remove
 		note.seen_by = []
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
diff --git a/frappe/email/doctype/document_follow/test_document_follow.py b/frappe/email/doctype/document_follow/test_document_follow.py
index 4f1a8733cc..1208a6c5c1 100644
--- a/frappe/email/doctype/document_follow/test_document_follow.py
+++ b/frappe/email/doctype/document_follow/test_document_follow.py
@@ -14,7 +14,7 @@ class TestDocumentFollow(unittest.TestCase):
 		event_doc = get_event()
 
 		event_doc.description = "This is a test description for sending mail"
-		event_doc.save()
+		event_doc.save(ignore_version=False)
 
 		doc = document_follow.follow_document("Event", event_doc.name , user.name, force=True)
 		self.assertEquals(doc.user, user.name)
@@ -45,12 +45,12 @@ def get_event():
 	return doc
 
 def get_user():
-		doc = frappe.new_doc("User")
-		doc.email = "test@docsub.com"
-		doc.first_name = "Test"
-		doc.last_name = "User"
-		doc.send_welcome_email = 0
-		doc.document_follow_notify = 1
-		doc.document_follow_frequency = "Hourly"
-		doc.insert()
-		return doc
\ No newline at end of file
+	doc = frappe.new_doc("User")
+	doc.email = "test@docsub.com"
+	doc.first_name = "Test"
+	doc.last_name = "User"
+	doc.send_welcome_email = 0
+	doc.document_follow_notify = 1
+	doc.document_follow_frequency = "Hourly"
+	doc.insert()
+	return doc
\ No newline at end of file
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 65cb6073b7..843cb421fe 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -297,8 +297,7 @@ class Document(BaseDocument):
 		if ignore_permissions!=None:
 			self.flags.ignore_permissions = ignore_permissions
 
-		if ignore_version!=None:
-			self.flags.ignore_version = ignore_version
+		self.flags.ignore_version = frappe.flags.in_test if ignore_version is None else ignore_version
 
 		if self.get("__islocal") or not self.get("name"):
 			self.insert()
@@ -1339,4 +1338,4 @@ def check_doctype_has_consumers(doctype):
 
 	if len(event_consumers) and event_consumers[0]:
 		return True
-	return False
\ No newline at end of file
+	return False
diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.py b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
index 737aab587c..7299eef916 100644
--- a/frappe/social/doctype/energy_point_settings/energy_point_settings.py
+++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.py
@@ -12,7 +12,7 @@ class EnergyPointSettings(Document):
 	pass
 
 def is_energy_point_enabled():
-	return frappe.get_cached_value('Energy Point Settings', None, 'enabled')
+	return frappe.db.get_single_value('Energy Point Settings', 'enabled', True)
 
 def allocate_review_points():
 	settings = frappe.get_single('Energy Point Settings')

From d94e48dbfb03b8f4cf131e30f69b77a184940182 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 13 May 2020 02:03:12 +0530
Subject: [PATCH 104/274] chore: set python_requires to >=3.6

recent changes in frappe/__init__.py make use of f-strings that are only
available on python>=3.6

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c70e138cd2..515e9448c2 100644
--- a/setup.py
+++ b/setup.py
@@ -58,5 +58,6 @@ setup(
 	cmdclass = \
 	{
 		'clean': CleanCommand
-	}
+	},
+	python_requires='>=3.6'
 )

From 79ff0eeaf8de7a3ec45471da4e88916b0739f2c7 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 13 May 2020 05:45:38 +0530
Subject: [PATCH 105/274] fix: Better error handling in FrappeClient login

---
 frappe/frappeclient.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py
index 8611c21720..919c334e51 100644
--- a/frappe/frappeclient.py
+++ b/frappe/frappeclient.py
@@ -15,6 +15,9 @@ class AuthError(Exception):
 class SiteExpiredError(Exception):
 	pass
 
+class SiteUnreachableError(Exception):
+	pass
+
 class FrappeException(Exception):
 	pass
 
@@ -53,9 +56,16 @@ class FrappeClient(object):
 
 		if r.status_code==200 and r.json().get('message') in ("Logged In", "No App"):
 			return r.json()
+		elif r.status_code == 502:
+			raise SiteUnreachableError
 		else:
-			if json.loads(r.text).get('exc_type') == "SiteExpiredError":
-				raise SiteExpiredError
+			try:
+				error = json.loads(r.text)
+				if error.get('exc_type') == "SiteExpiredError":
+					raise SiteExpiredError
+			except json.decoder.JSONDecodeError:
+				error = r.text
+				print(error)
 			raise AuthError
 
 	def setup_key_authentication_headers(self):

From ba7227ab084302f569eded82b706a949c3a81abf Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 12:31:00 +0530
Subject: [PATCH 106/274] feat: Rate Limiter

---
 frappe/rate_limiter.py | 81 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 frappe/rate_limiter.py

diff --git a/frappe/rate_limiter.py b/frappe/rate_limiter.py
new file mode 100644
index 0000000000..26cad7de3e
--- /dev/null
+++ b/frappe/rate_limiter.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+
+from datetime import datetime
+import frappe
+from frappe import _
+from frappe.utils import cint
+from werkzeug.wrappers import Response
+
+
+def apply():
+	rate_limit = frappe.conf.rate_limit
+	if rate_limit:
+		frappe.local.rate_limiter = RateLimiter(rate_limit["limit"], rate_limit["window"])
+		frappe.local.rate_limiter.apply()
+
+
+def update():
+	if hasattr(frappe.local, "rate_limiter"):
+		frappe.local.rate_limiter.update()
+
+
+def respond():
+	if hasattr(frappe.local, "rate_limiter"):
+		return frappe.local.rate_limiter.respond()
+
+
+class RateLimiter:
+	def __init__(self, limit, window):
+		self.limit = int(limit * 1000000)
+		self.window = window
+
+		self.start = datetime.utcnow()
+		timestamp = int(frappe.utils.now_datetime().timestamp())
+
+		self.window_number, self.spent = divmod(timestamp, self.window)
+		self.key = frappe.cache().make_key(f"rate-limit-counter-{self.window_number}")
+		self.counter = cint(frappe.cache().get(self.key))
+		self.remaining = max(self.limit - self.counter, 0)
+		self.reset = self.window - self.spent
+
+		self.end = None
+		self.duration = None
+		self.rejected = False
+
+	def apply(self):
+		if self.counter > self.limit:
+			self.rejected = True
+			self.reject()
+
+	def reject(self):
+		raise frappe.TooManyRequestsError
+
+	def update(self):
+		self.end = datetime.utcnow()
+		self.duration = int((self.end - self.start).total_seconds() * 1000000)
+
+		pipeline = frappe.cache().pipeline()
+		pipeline.incrby(self.key, self.duration)
+		pipeline.expire(self.key, self.window)
+		pipeline.execute()
+
+	def headers(self):
+		headers = {
+			"X-RateLimit-Reset": self.reset,
+			"X-RateLimit-Limit": self.limit,
+			"X-RateLimit-Remaining": self.remaining,
+		}
+		if self.rejected:
+			headers["Retry-After"] = self.reset
+		else:
+			headers["X-RateLimit-Used"] = self.duration
+
+		return headers
+
+	def respond(self):
+		if self.rejected:
+			return Response(_("Too Many Requests"), status=429, headers=self.headers())

From f71dc3c991d5ee0e8b347d7df303dbcfc5448910 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 12:32:20 +0530
Subject: [PATCH 107/274] feat(rate-limiter): Log data with monitor

---
 frappe/monitor.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/monitor.py b/frappe/monitor.py
index b056286cf9..6802a59584 100644
--- a/frappe/monitor.py
+++ b/frappe/monitor.py
@@ -81,6 +81,12 @@ class Monitor:
 				self.data.request.status_code = response.status_code
 				self.data.request.response_length = int(response.headers.get("Content-Length", 0))
 
+				if hasattr(frappe.local, "rate_limiter"):
+					limiter = frappe.local.rate_limiter
+					self.data.request.counter = limiter.counter
+					if limiter.rejected:
+						self.data.request.reset = limiter.reset
+
 			self.store()
 		except Exception:
 			traceback.print_exc()

From 19e8008c3c310e56a3d21fe3c0bb8e8d5eaac498 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 12:33:34 +0530
Subject: [PATCH 108/274] feat(rate-limiter): Ignore requests above limit

---
 frappe/app.py        | 9 +++++++++
 frappe/exceptions.py | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/frappe/app.py b/frappe/app.py
index 41798b0bc4..3bb764149b 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -26,6 +26,7 @@ from frappe.core.doctype.comment.comment import update_comments_in_parent_after_
 from frappe import _
 import frappe.recorder
 import frappe.monitor
+import frappe.rate_limiter
 
 local_manager = LocalManager([frappe.local])
 
@@ -54,6 +55,7 @@ def application(request):
 
 		frappe.recorder.record()
 		frappe.monitor.start()
+		frappe.rate_limiter.apply()
 
 		if frappe.local.form_dict.cmd:
 			response = frappe.handler.handle()
@@ -93,9 +95,13 @@ def application(request):
 		if response and hasattr(frappe.local, 'cookie_manager'):
 			frappe.local.cookie_manager.flush_cookies(response=response)
 
+		frappe.rate_limiter.update()
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
+		if response and hasattr(frappe.local, 'rate_limiter'):
+			response.headers.extend(frappe.local.rate_limiter.headers())
+
 		frappe.destroy()
 
 	return response
@@ -171,6 +177,9 @@ def handle_exception(e):
 			http_status_code=http_status_code,  indicator_color='red')
 		return_as_message = True
 
+	elif http_status_code == 429:
+		response = frappe.rate_limiter.respond()
+
 	else:
 		traceback = "<pre>" + sanitize_html(frappe.get_traceback()) + "</pre>"
 		if frappe.local.flags.disable_traceback:
diff --git a/frappe/exceptions.py b/frappe/exceptions.py
index 9a1c1fb0b0..5a1181f31e 100644
--- a/frappe/exceptions.py
+++ b/frappe/exceptions.py
@@ -49,6 +49,11 @@ class Redirect(Exception):
 class CSRFTokenError(Exception):
 	http_status_code = 400
 
+
+class TooManyRequestsError(Exception):
+	http_status_code = 429
+
+
 class ImproperDBConfigurationError(Exception):
 	"""
 	Used when frappe detects that database or tables are not properly

From c532a873703c11c774cf25d108a48266a64c2892 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 12:33:58 +0530
Subject: [PATCH 109/274] tests(rate-limiter): Rate Limiter tests

---
 frappe/tests/test_rate_limiter.py | 114 ++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 frappe/tests/test_rate_limiter.py

diff --git a/frappe/tests/test_rate_limiter.py b/frappe/tests/test_rate_limiter.py
new file mode 100644
index 0000000000..40a05153ee
--- /dev/null
+++ b/frappe/tests/test_rate_limiter.py
@@ -0,0 +1,114 @@
+#  -*- coding: utf-8 -*-
+
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import unittest
+import frappe
+import time
+import frappe.rate_limiter
+from frappe.rate_limiter import RateLimiter
+from frappe.utils import cint
+from werkzeug.wrappers import Response
+
+
+class TestRateLimiter(unittest.TestCase):
+	def setUp(self):
+		pass
+
+	def test_apply_with_limit(self):
+		frappe.conf.rate_limit = {"window": 86400, "limit": 1}
+		frappe.rate_limiter.apply()
+
+		self.assertTrue(hasattr(frappe.local, "rate_limiter"))
+		self.assertIsInstance(frappe.local.rate_limiter, RateLimiter)
+
+		frappe.cache().delete(frappe.local.rate_limiter.key)
+		delattr(frappe.local, "rate_limiter")
+
+	def test_apply_without_limit(self):
+		frappe.conf.rate_limit = None
+		frappe.rate_limiter.apply()
+
+		self.assertFalse(hasattr(frappe.local, "rate_limiter"))
+
+	def test_respond_over_limit(self):
+		limiter = RateLimiter(0.01, 86400)
+		time.sleep(0.01)
+		limiter.update()
+
+		frappe.conf.rate_limit = {"window": 86400, "limit": 0.01}
+		self.assertRaises(frappe.TooManyRequestsError, frappe.rate_limiter.apply)
+		frappe.rate_limiter.update()
+
+		response = frappe.rate_limiter.respond()
+
+		self.assertIsInstance(response, Response)
+		self.assertEqual(response.status_code, 429)
+		self.assertIn("Retry-After", response.headers)
+		self.assertNotIn("X-RateLimit-Used", response.headers)
+		self.assertIn("X-RateLimit-Reset", response.headers)
+		self.assertIn("X-RateLimit-Limit", response.headers)
+		self.assertIn("X-RateLimit-Remaining", response.headers)
+		self.assertTrue(int(response.headers["X-RateLimit-Reset"]) <= 86400)
+		self.assertEqual(int(response.headers["X-RateLimit-Limit"]), 10000)
+		self.assertEqual(int(response.headers["X-RateLimit-Remaining"]), 0)
+
+		frappe.cache().delete(limiter.key)
+		frappe.cache().delete(frappe.local.rate_limiter.key)
+		delattr(frappe.local, "rate_limiter")
+
+	def test_respond_under_limit(self):
+		frappe.conf.rate_limit = {"window": 86400, "limit": 0.01}
+		frappe.rate_limiter.apply()
+		frappe.rate_limiter.update()
+		response = frappe.rate_limiter.respond()
+		self.assertEqual(response, None)
+
+		frappe.cache().delete(frappe.local.rate_limiter.key)
+		delattr(frappe.local, "rate_limiter")
+
+	def test_headers_under_limit(self):
+		frappe.conf.rate_limit = {"window": 86400, "limit": 0.01}
+		frappe.rate_limiter.apply()
+		frappe.rate_limiter.update()
+		headers = frappe.local.rate_limiter.headers()
+		self.assertNotIn("Retry-After", headers)
+		self.assertIn("X-RateLimit-Reset", headers)
+		self.assertTrue(int(headers["X-RateLimit-Reset"] < 86400))
+		self.assertEqual(int(headers["X-RateLimit-Used"]), frappe.local.rate_limiter.duration)
+		self.assertEqual(int(headers["X-RateLimit-Limit"]), 10000)
+		self.assertEqual(int(headers["X-RateLimit-Remaining"]), 10000)
+
+		frappe.cache().delete(frappe.local.rate_limiter.key)
+		delattr(frappe.local, "rate_limiter")
+
+	def test_reject_over_limit(self):
+		limiter = RateLimiter(0.01, 86400)
+		time.sleep(0.01)
+		limiter.update()
+
+		limiter = RateLimiter(0.01, 86400)
+		self.assertRaises(frappe.TooManyRequestsError, limiter.apply)
+
+		frappe.cache().delete(limiter.key)
+
+	def test_do_not_reject_under_limit(self):
+		limiter = RateLimiter(0.01, 86400)
+		time.sleep(0.01)
+		limiter.update()
+
+		limiter = RateLimiter(0.02, 86400)
+		self.assertEqual(limiter.apply(), None)
+
+		frappe.cache().delete(limiter.key)
+
+	def test_update_method(self):
+		limiter = RateLimiter(0.01, 86400)
+		time.sleep(0.01)
+		limiter.update()
+
+		self.assertEqual(limiter.duration, cint(frappe.cache().get(limiter.key)))
+
+		frappe.cache().delete(limiter.key)

From 39ecc61b61d75bec0bfadf655de08e6a6c9dae69 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 12:34:34 +0530
Subject: [PATCH 110/274] feat: added tour for web page

---
 frappe/website/doctype/web_page/web_page.js | 55 +++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index c0a3bcdc20..c714b98241 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -48,3 +48,58 @@ frappe.ui.form.on('Web Page', {
 		frappe.utils.set_meta_tag(frm.doc.route);
 	}
 });
+
+frappe.tour['Web Page'] = [
+	{
+		fieldname: "title",
+		title: "Title of the page",
+		description: "This title will be used as the title of the webpage as well as in meta tags",
+	},
+	{
+		fieldname: "published",
+		title: "Makes the page public",
+		description: "Checking this will publish the page on your website and it'll be visible to everyone.",
+	},
+	{
+		fieldname: "route",
+		title: "URL of the page",
+		description: "This will be automatically generated when you publish the page, you can also enter a route yourself if you wish",
+	},
+	{
+		fieldname: "content_type",
+		title: "Content type for building the page",
+		description: `You can select one from the following, <br>
+					<ul>
+						<li><b>Rich Text</b>: Standard rich text editor with controls</li>
+						<li><b>Markdown</b>: Github flavoured markdown syntax</li>
+						<li><b>HTML</b>: HTML with jinja support</li>
+						<li><b>Page Builder</b>: Frappe page builder using components</li>
+					</ul>
+					`
+	},
+	{
+		fieldname: "insert_code",
+		title: "Client Script",
+		description: "Checking this will show a text area where you can write custom javascript that will run on this page.",
+	},
+	{
+		fieldname: "meta_title",
+		title: "Meta title for SEO",
+		description: "By default the title is used as meta title, adding a value here will override it.",
+	},
+	{
+		fieldname: "meta_title",
+		title: "Meta Title",
+		description: "By default the title is used as meta title, adding a value here will override it.",
+	},
+	{
+		fieldname: "meta_description",
+		title: "Meta Description",
+		description: "The meta description is an HTML attribute that provides a brief summary of a web page. Search engines such as Google often display the meta description in search results, which can influence click-through rates."
+	},
+	{
+		fieldname: "meta_image",
+		title: "Meta Image",
+		description: "The meta image is unique image representing the content of the page. Images for this Card should be at least 280px in width, and at least 150px in height."
+	},
+];
\ No newline at end of file

From aa76a03d266d085080dcfdc389badaea4f69ef07 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 12:34:55 +0530
Subject: [PATCH 111/274] feat: added web page tour to onboarding

---
 .../module_onboarding/website/website.json      |  5 ++++-
 .../add_blog_category/add_blog_category.json    |  1 +
 .../create_blogger/create_blogger.json          |  1 +
 .../enable_website_tracking.json                |  1 +
 .../introduction_to_website.json                |  1 +
 .../web_page_tour/web_page_tour.json            | 17 +++++++++++++++++
 6 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 frappe/website/onboarding_step/web_page_tour/web_page_tour.json

diff --git a/frappe/website/module_onboarding/website/website.json b/frappe/website/module_onboarding/website/website.json
index b849a809ed..606ef09811 100644
--- a/frappe/website/module_onboarding/website/website.json
+++ b/frappe/website/module_onboarding/website/website.json
@@ -10,7 +10,7 @@
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/website",
  "idx": 0,
  "is_complete": 0,
- "modified": "2020-04-30 20:23:06.438314",
+ "modified": "2020-05-13 12:32:35.269025",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website",
@@ -27,6 +27,9 @@
   },
   {
    "step": "Enable Website Tracking"
+  },
+  {
+   "step": "Web Page Tour"
   }
  ],
  "subtitle": "Blogs, website view tracking, and more.",
diff --git a/frappe/website/onboarding_step/add_blog_category/add_blog_category.json b/frappe/website/onboarding_step/add_blog_category/add_blog_category.json
index a0d07c8464..5936e78c68 100644
--- a/frappe/website/onboarding_step/add_blog_category/add_blog_category.json
+++ b/frappe/website/onboarding_step/add_blog_category/add_blog_category.json
@@ -6,6 +6,7 @@
  "idx": 0,
  "is_complete": 0,
  "is_mandatory": 0,
+ "is_single": 0,
  "is_skipped": 0,
  "modified": "2020-04-30 19:06:10.750976",
  "modified_by": "Administrator",
diff --git a/frappe/website/onboarding_step/create_blogger/create_blogger.json b/frappe/website/onboarding_step/create_blogger/create_blogger.json
index 5162e7e895..841325ca6a 100644
--- a/frappe/website/onboarding_step/create_blogger/create_blogger.json
+++ b/frappe/website/onboarding_step/create_blogger/create_blogger.json
@@ -6,6 +6,7 @@
  "idx": 0,
  "is_complete": 0,
  "is_mandatory": 0,
+ "is_single": 0,
  "is_skipped": 0,
  "modified": "2020-04-30 19:06:10.694419",
  "modified_by": "Administrator",
diff --git a/frappe/website/onboarding_step/enable_website_tracking/enable_website_tracking.json b/frappe/website/onboarding_step/enable_website_tracking/enable_website_tracking.json
index 56a4fa58b6..b37a704b1e 100644
--- a/frappe/website/onboarding_step/enable_website_tracking/enable_website_tracking.json
+++ b/frappe/website/onboarding_step/enable_website_tracking/enable_website_tracking.json
@@ -7,6 +7,7 @@
  "idx": 0,
  "is_complete": 0,
  "is_mandatory": 0,
+ "is_single": 0,
  "is_skipped": 0,
  "modified": "2020-04-30 20:22:50.778590",
  "modified_by": "Administrator",
diff --git a/frappe/website/onboarding_step/introduction_to_website/introduction_to_website.json b/frappe/website/onboarding_step/introduction_to_website/introduction_to_website.json
index 683d0a889e..f3c95657e8 100644
--- a/frappe/website/onboarding_step/introduction_to_website/introduction_to_website.json
+++ b/frappe/website/onboarding_step/introduction_to_website/introduction_to_website.json
@@ -6,6 +6,7 @@
  "idx": 0,
  "is_complete": 0,
  "is_mandatory": 1,
+ "is_single": 0,
  "is_skipped": 0,
  "modified": "2020-04-30 19:06:10.578218",
  "modified_by": "Administrator",
diff --git a/frappe/website/onboarding_step/web_page_tour/web_page_tour.json b/frappe/website/onboarding_step/web_page_tour/web_page_tour.json
new file mode 100644
index 0000000000..1ee98d69ee
--- /dev/null
+++ b/frappe/website/onboarding_step/web_page_tour/web_page_tour.json
@@ -0,0 +1,17 @@
+{
+ "action": "Show Form Tour",
+ "creation": "2020-05-13 12:32:15.966570",
+ "docstatus": 0,
+ "doctype": "Onboarding Step",
+ "idx": 0,
+ "is_complete": 0,
+ "is_mandatory": 0,
+ "is_single": 0,
+ "is_skipped": 0,
+ "modified": "2020-05-13 12:32:15.966570",
+ "modified_by": "Administrator",
+ "name": "Web Page Tour",
+ "owner": "Administrator",
+ "reference_document": "Web Page",
+ "title": "Learn about Web Pages"
+}
\ No newline at end of file

From aef567fddef2f9e84305e3cda9c8f3d922ca6f78 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 13:45:55 +0530
Subject: [PATCH 112/274] fix(rate-limiter): Remove duplicate headers

---
 frappe/rate_limiter.py            |  2 +-
 frappe/tests/test_rate_limiter.py | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/rate_limiter.py b/frappe/rate_limiter.py
index 26cad7de3e..e29b2b3061 100644
--- a/frappe/rate_limiter.py
+++ b/frappe/rate_limiter.py
@@ -78,4 +78,4 @@ class RateLimiter:
 
 	def respond(self):
 		if self.rejected:
-			return Response(_("Too Many Requests"), status=429, headers=self.headers())
+			return Response(_("Too Many Requests"), status=429)
diff --git a/frappe/tests/test_rate_limiter.py b/frappe/tests/test_rate_limiter.py
index 40a05153ee..292b521460 100644
--- a/frappe/tests/test_rate_limiter.py
+++ b/frappe/tests/test_rate_limiter.py
@@ -46,14 +46,16 @@ class TestRateLimiter(unittest.TestCase):
 
 		self.assertIsInstance(response, Response)
 		self.assertEqual(response.status_code, 429)
-		self.assertIn("Retry-After", response.headers)
-		self.assertNotIn("X-RateLimit-Used", response.headers)
-		self.assertIn("X-RateLimit-Reset", response.headers)
-		self.assertIn("X-RateLimit-Limit", response.headers)
-		self.assertIn("X-RateLimit-Remaining", response.headers)
-		self.assertTrue(int(response.headers["X-RateLimit-Reset"]) <= 86400)
-		self.assertEqual(int(response.headers["X-RateLimit-Limit"]), 10000)
-		self.assertEqual(int(response.headers["X-RateLimit-Remaining"]), 0)
+
+		headers = frappe.local.rate_limiter.headers()
+		self.assertIn("Retry-After", headers)
+		self.assertNotIn("X-RateLimit-Used", headers)
+		self.assertIn("X-RateLimit-Reset", headers)
+		self.assertIn("X-RateLimit-Limit", headers)
+		self.assertIn("X-RateLimit-Remaining", headers)
+		self.assertTrue(int(headers["X-RateLimit-Reset"]) <= 86400)
+		self.assertEqual(int(headers["X-RateLimit-Limit"]), 10000)
+		self.assertEqual(int(headers["X-RateLimit-Remaining"]), 0)
 
 		frappe.cache().delete(limiter.key)
 		frappe.cache().delete(frappe.local.rate_limiter.key)

From 9bd31b05fa0f02ae3ebcd7d70d041db6a7c12a0f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:12:59 +0530
Subject: [PATCH 113/274] refactor: minor change in field order

---
 frappe/desk/doctype/desk_page/desk_page.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json
index 0064d7bd28..851eb43b23 100644
--- a/frappe/desk/doctype/desk_page/desk_page.json
+++ b/frappe/desk/doctype/desk_page/desk_page.json
@@ -8,8 +8,8 @@
  "engine": "InnoDB",
  "field_order": [
   "label",
-  "extends",
   "for_user",
+  "extends",
   "module",
   "category",
   "restrict_to_domain",
@@ -170,7 +170,7 @@
    "search_index": 1
   },
   {
-   "depends_on": "eval:doc.extends_another_page == 1",
+   "depends_on": "eval:doc.extends_another_page == 1 || doc.for_user",
    "fieldname": "extends",
    "fieldtype": "Link",
    "in_standard_filter": 1,
@@ -192,7 +192,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-12 16:12:20.708394",
+ "modified": "2020-05-13 19:01:42.041524",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",

From a789ed772eef71997f3ee966239774919af441de Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:13:18 +0530
Subject: [PATCH 114/274] feat: allow form editing for users

---
 frappe/desk/doctype/desk_page/desk_page.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.js b/frappe/desk/doctype/desk_page/desk_page.js
index 3087a5f5b8..e11d83816f 100644
--- a/frappe/desk/doctype/desk_page/desk_page.js
+++ b/frappe/desk/doctype/desk_page/desk_page.js
@@ -2,10 +2,16 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Desk Page', {
-	setup: function(frm) {
+	refresh: function(frm) {
 		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
 		frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
-		if (!frappe.boot.developer_mode || frm.doc.for_user) {
+		frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);
+
+		if (frm.doc.for_user) {
+			frm.set_df_property("extends", "read_only", true);
+		}
+
+		if (frm.doc.for_user || frm.doc.is_standard) {
 			frm.trigger('disable_form');
 		}
 	},

From dad0a87f78531ea9fcf04da55c906486c103b8f0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:13:33 +0530
Subject: [PATCH 115/274] feat: allow custom pages in sidebar query

---
 frappe/desk/desktop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index a912ca341c..284aba20c8 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -292,7 +292,6 @@ def get_desk_sidebar_items(flatten=False):
 	filters = {
 		'restrict_to_domain': ['in', frappe.get_active_domains()],
 		'extends_another_page': 0,
-		'is_standard': 1,
 		'for_user': '',
 		'module': ['not in', blocked_modules]
 	}

From 3e661589d141db29e6c0ffeab51f04ec6699a961 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:27:12 +0530
Subject: [PATCH 116/274] feat: enable save explicitly during refresh

---
 frappe/desk/doctype/desk_page/desk_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.js b/frappe/desk/doctype/desk_page/desk_page.js
index e11d83816f..ec8eaaa60b 100644
--- a/frappe/desk/doctype/desk_page/desk_page.js
+++ b/frappe/desk/doctype/desk_page/desk_page.js
@@ -3,6 +3,7 @@
 
 frappe.ui.form.on('Desk Page', {
 	refresh: function(frm) {
+		frm.enable_save();
 		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
 		frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
 		frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);
@@ -17,7 +18,6 @@ frappe.ui.form.on('Desk Page', {
 	},
 
 	disable_form: function(frm) {
-		frm.set_read_only();
 		frm.fields
 			.filter(field => field.has_input)
 			.forEach(field => {

From 830e89164486e58fa2b3d095f3f532fc6048223a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:27:36 +0530
Subject: [PATCH 117/274] refactor: better UX for shortcut table

---
 frappe/desk/doctype/desk_shortcut/desk_shortcut.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
index 9f8990732a..550ea609c8 100644
--- a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
+++ b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
@@ -6,9 +6,9 @@
  "engine": "InnoDB",
  "field_order": [
   "type",
-  "label",
-  "column_break_4",
   "link_to",
+  "column_break_4",
+  "label",
   "icon",
   "restrict_to_domain",
   "section_break_5",
@@ -81,13 +81,14 @@
   {
    "fieldname": "label",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Label",
    "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-07 19:04:23.645198",
+ "modified": "2020-05-13 19:26:34.229669",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Shortcut",

From e559e30d0235e6f42379317fdc2cf125b60ab080 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 13 May 2020 19:42:54 +0530
Subject: [PATCH 118/274] refactor(migrate-to): code restructure and bug fixes

---
 frappe/utils/remote_migrations.py | 351 ++++++++++++++++++++----------
 1 file changed, 242 insertions(+), 109 deletions(-)

diff --git a/frappe/utils/remote_migrations.py b/frappe/utils/remote_migrations.py
index 7664411474..abe2b921e8 100644
--- a/frappe/utils/remote_migrations.py
+++ b/frappe/utils/remote_migrations.py
@@ -1,17 +1,45 @@
+# imports - standard imports
+import functools
 import getpass
+import json
+import re
 import sys
 
+# imports - third party imports
+import click
 import requests
 from terminaltables import AsciiTable
 
+# imports - module imports
 import frappe
 import frappe.utils.backups
+from frappe.utils import get_installed_apps_info
 
 
-def choose(plans_list):
+def render_table(data):
+	print(AsciiTable(data).table)
+
+def padme(me):
+	def empty_line(*args, **kwargs):
+		result = me(*args, **kwargs)
+		print()
+		return result
+	return empty_line
+
+@functools.lru_cache(maxsize=1024)
+def get_first_party_apps():
+	apps = []
+	for org in ["frappe", "erpnext"]:
+		req = requests.get(f"https://api.github.com/users/{org}/repos", {"type": "sources", "per_page": 200})
+		if req.ok:
+			apps.extend([x["name"] for x in req.json()])
+	return apps
+
+
+@padme
+def choose_plan(plans_list):
 	plans_table = []
 	available_plans = []
-	selected_plan = None
 
 	print(f"{len(plans_list)} plans available")
 
@@ -21,40 +49,229 @@ def choose(plans_list):
 		available_plans.append(row_data[0])
 		plans_table.append(row_data)
 
-	print(AsciiTable(plans_table).table)
+	render_table(plans_table)
 
 	while True:
-		if selected_plan:
-			break
+		input_plan = input("Send plan?: ").strip()
+		if input_plan in available_plans:
+			print(f"{input_plan} Plan selected ✅")
+			return input_plan
 		else:
-			input_plan = input("Send plan?: ")
-			if input_plan in available_plans:
-				return selected_plan
-			else:
-				print("Invalid selection...try again")
+			print("Invalid selection...try again ❌")
 
 
-def filter_apps(app_groups):
-	from frappe.utils import get_installed_apps_info
+def check_app_compat(available_group):
+	frappe_upgrade_msg = ""
+	trimmed_available_group = set([(app['scrubbed'], app['branch']) for app in available_group['apps']])
+	existing_group = set([(app['app_name'], app['branch']) for app in get_installed_apps_info()])
 
-	allowed_apps = []
+	print("Checking availability of existing app group")
+	incompatible_apps = []
 	filtered_apps = []
-	existing_apps = []
+	branch_msgs = []
 
-	for group in app_groups:
-		for app in group.get("apps"):
-			app_name = group.get('scrubbed')
-			branch = group.get('branch')
-			allowed_apps.append(tuple(app_name, branch))
+	for (app, branch) in existing_group:
+		if (app, branch) not in trimmed_available_group:
+			app_title = [group["name"] for group in available_group["apps"] if group["scrubbed"] == app]
+			if app_title:
+				app_title = app_title[0]
+			is_compat = False
+			if app not in get_first_party_apps():
+				incompatible_apps.append(app)
+				print(f"❌ App {app}:{branch}")
+			else:
+				available_branch = [a['branch'] for a in available_group['apps'] if a['scrubbed'] == app]
+				if not available_branch:
+					print(f"App {app} doesn't exist in selected group")
+					continue
+				else:
+					available_branch = available_branch[0]
+				print(f"⚠️  {app}:{branch} => {available_branch}")
+				branch_msgs.append([app.title(), branch, available_branch])
+				filtered_apps.append(app_title)
+		else:
+			filtered_apps.append(app_title)
 
-	for app in get_installed_apps_info():
-		app_name = app.get('app_name')
-		branch = app.get('branch')
-		existing_apps.append(tuple(app_name, branch))
+	start_msg = "\nSelecting this group will "
+	incompatible_apps = f"drop {len(incompatible_apps)} apps: " + ", ".join(incompatible_apps) + " and " if incompatible_apps else ""
+	branch_change = "upgrade:\n" + "\n".join(["{}: {} => {}".format(*x) for x in branch_msgs]) if branch_msgs else ""
+	changes = (incompatible_apps + branch_change) or "be perfect for you :)"
+	warning_message = start_msg + changes
 
-	filtered_apps = [app[0] for app in existing_apps if app in allowed_apps]
+	print(warning_message)
 
-	return "Vanilla Version 12", filtered_apps
+	return is_compat, filtered_apps
+
+
+def generate_app_group_table(app_groups):
+	app_groups_table = [["#", "App Group", "Apps"]]
+
+	for _, app_group in enumerate(app_groups):
+		row = [_ + 1, app_group["name"], ", ".join([f"{app['scrubbed']}:{app['branch']}" for app in app_group['apps']])]
+		app_groups_table.append(row)
+
+	render_table(app_groups_table)
+
+
+@padme
+def filter_apps(app_groups):
+	# try for default group first...then let em select which group
+	default_group = [g for g in app_groups if g['default']][0]
+	is_compat, filtered_apps = check_app_compat(default_group)
+
+	if not is_compat and not click.confirm("Continue anyway?"):
+		generate_app_group_table(app_groups)
+
+		while True:
+			try:
+				app_group_index = int(input("Select App Group #: ").strip()) - 1
+				selected_group = app_groups[app_group_index]
+				is_compat, filtered_apps = check_app_compat(selected_group)
+			except:
+				print("Invalid Selection")
+				sys.exit(1)
+
+			if is_compat or click.confirm("Continue anyway?"):
+				break
+
+	return default_group['name'], filtered_apps
+
+@padme
+def create_session():
+	# take user input from STDIN
+	username = input("Username: ").strip()
+	password = getpass.unix_getpass()
+
+	auth_credentials = {"usr": username, "pwd": password}
+
+	session = requests.Session()
+	login_sc = session.post(login_url, auth_credentials)
+
+	if login_sc.ok:
+		print(f"Authorization Successful! ✅")
+		session.headers.update({"X-Press-Team": username})
+		return session
+	else:
+		print(f"Authorization Failed with Error Code {login_sc.status_code}")
+
+
+def get_new_site_options():
+	site_options_sc = session.post(options_url)
+
+	if site_options_sc.ok:
+		site_options = site_options_sc.json()["message"]
+		return site_options
+	else:
+		print(f"Couldn't retrive New site information: {site_options_sc.status_code}")
+
+
+def is_valid_subdomain(subdomain):
+	matched = re.match("^[a-z0-9][a-z0-9-]*[a-z0-9]$", subdomain)
+	if matched:
+		return True
+	print('Subdomain contains invalid characters. Use lowercase characters, numbers and hyphens')
+
+
+def is_subdomain_available(subdomain):
+	res = session.post(site_exists_url, {"subdomain": subdomain})
+	if res.ok:
+		available = not res.json()['message']
+		if not available:
+			print('Subdomain already exists! Try another one')
+
+		return available
+
+
+@padme
+def get_subdomain(domain):
+	while True:
+		subdomain = input("Enter subdomain: ").strip()
+		if is_valid_subdomain(subdomain):
+			if is_subdomain_available(subdomain):
+				print(f"Site Domain: {subdomain}.{domain}")
+				return subdomain
+
+
+@padme
+def upload_backup(local_site):
+	# take backup
+	print(f"Taking backup for site {local_site}")
+	odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
+	files_session = {}
+
+	# upload files
+	for file_type, file_path in [
+				("database", odb.backup_path_db),
+				("public", odb.backup_path_files),
+				("private", odb.backup_path_private_files)
+			]:
+		file_upload_response = session.post(files_url, data={}, files={
+			"file": open(file_path, "rb"),
+			"is_private": 1,
+			"folder": "Home",
+			"method": "press.api.site.upload_backup",
+			"type": file_type
+		})
+		if file_upload_response.ok:
+			files_session[file_type] = file_upload_response.json()["message"]
+		else:
+			print(f"Upload failed for: {file_path}")
+
+	files_uploaded = { k: v["file_url"] for k, v in files_session.items() }
+
+	return files_uploaded
+
+
+def frappecloud_migrator(local_site, remote_site):
+	# test (change to https !!!):
+	global login_url, upload_url, files_url, options_url, site_exists_url, session
+
+	login_url = f"http://{remote_site}/api/method/login"
+	upload_url = f"http://{remote_site}/api/method/press.api.site.new"
+	files_url = f"http://{remote_site}/api/method/upload_file"
+	options_url = f"http://{remote_site}/api/method/press.api.site.options_for_new"
+	site_exists_url = f"http://{remote_site}/api/method/press.api.site.exists"
+
+	print(f"Frappe Cloud credentials @ {remote_site}")
+
+	# get credentials + auth user + start session
+	session = create_session()
+
+	if session:
+		# connect to site db
+		frappe.init(site=local_site)
+		frappe.connect()
+
+		# get new site options
+		site_options = get_new_site_options()
+
+		# set preferences from site options
+		subdomain = get_subdomain(site_options['domain'])
+		plan = choose_plan(site_options['plans'])
+
+		app_groups = site_options["groups"]
+		selected_group, filtered_apps = filter_apps(app_groups)
+		files_uploaded = upload_backup(local_site)
+
+		# push to frappe_cloud
+		payload = json.dumps({
+			"site": {
+				"apps": filtered_apps,
+				"files": files_uploaded,
+				"group": selected_group,
+				"name": subdomain,
+				"plan": plan
+			}
+		})
+
+		session.headers.update({"Content-Type": "application/json; charset=utf-8"})
+		site_creation_request = session.post(upload_url, payload)
+		frappe.destroy()
+
+		if site_creation_request.ok:
+			print(f"Site creation started at {site_creation_request.json()['message']}")
+		else:
+			print(f"Request failed with error code {site_creation_request.status_code}")
 
 
 def migrate_to(local_site, remote_site):
@@ -65,87 +282,3 @@ def migrate_to(local_site, remote_site):
 	else:
 		print(f"{remote_site} is not supported yet")
 		sys.exit(1)
-
-
-def frappecloud_migrator(local_site, remote_site):
-	# test:
-	login_url = f"http://{remote_site}/api/method/login"
-	upload_url = f"http://{remote_site}/api/method/press.api.site.new"
-	files_url = f"http://{remote_site}/api/method/upload_file"
-	options_url = f"http://{remote_site}/api/method/press.api.site.options_for_new"
-
-	# production:
-	# login_url = f"https://{remote_site}/api/method/login"
-	# upload_url = f"https://{remote_site}/api/method/press.api.site.new_from_existing_account"
-	# options_url = f"https://{remote_site}/api/method/press.api.site.options_for_new"
-
-	print(f"Frappe Cloud credentials @ {remote_site}")
-
-	username = input("Username: ")
-	password = getpass.unix_getpass()
-	auth_credentials = {"usr": username, "pwd": password}
-
-	# create frapp_cloud session
-	session = requests.Session()
-	login_sc = session.post(login_url, auth_credentials)
-
-	if login_sc.ok:
-		print(f"Authorization Successful!")
-
-		# get options
-		session.headers.update({"X-Press-Team": username})
-		site_options_sc = session.post(options_url)
-
-		if site_options_sc.ok:
-			site_options = site_options_sc.json()["message"]
-			app_groups = site_options_sc.json()["groups"]
-
-		else:
-			print(f"Request failed with Status Code: {site_options_sc.status_code}")
-			sys.exit(1)
-
-		# set preferences from options
-		subdomain = input("Enter subdomain: ")
-		plan = choose(site_options['plans'])
-
-		frappe.init(site=local_site)
-		frappe.connect()
-
-		# apps currently on site....vanilla.
-		selected_group, filtered_apps = filter_apps(app_groups)
-
-		# take backup
-		print(f"Taking backup for site {local_site}")
-		odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
-		files_session = {}
-
-		# upload files
-		for file_type, file_path in [("database", odb.backup_path_db), ("public", odb.backup_path_files), ("private", odb.backup_path_private_files)]:
-			file_upload_response = session.post(files_url, data={}, files={
-				"file": open(file_path, "rb"),
-				"is_private": 1,
-				"folder": "Home",
-				"method": "press.api.site.upload_backup",
-				"type": file_type
-			})
-			if file_upload_response.ok:
-				files_session[file_type] = file_upload_response.json()["message"]
-			else:
-				print(f"Upload failed for: {file_path}")
-
-		files_uploaded = { k, v["file_url"] for k, v in files_session.items() }
-
-		# push to frappe_cloud
-		session.post(upload_url, data={
-			"site": {
-				"apps": filtered_apps,
-				"files": files_uploaded,
-				"group": selected_group,
-				"name": subdomain,
-				"plan": plan
-			}
-		})
-		frappe.destroy()
-
-	else:
-		print(f"Request failed with Status Code: {login_sc.status_code}")

From 0ae5e65c2cfe30d89f1599b6fafac3adb93b670c Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Wed, 13 May 2020 19:46:09 +0530
Subject: [PATCH 119/274] fix: Routing for doctypes having treeviews (#10300)

* fix: Routing for doctypes having treeviews

* fix: Linting errors
---
 frappe/public/js/frappe/model/model.js   | 5 +++++
 frappe/public/js/frappe/widgets/utils.js | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index b87dad1d36..663850d08c 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -268,6 +268,11 @@ $.extend(frappe.model, {
 		return frappe.boot.single_types.indexOf(doctype) != -1;
 	},
 
+	is_tree: function(doctype) {
+		if (!doctype) return false;
+		return frappe.boot.treeviews.indexOf(doctype) != -1;
+	},
+
 	can_import: function(doctype, frm) {
 		// system manager can always import
 		if(frappe.user_roles.includes("System Manager")) return true;
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 59067bd9a0..0d93bb3784 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -8,7 +8,9 @@ function generate_route(item) {
 		if (item.link) {
 			route = strip(item.link, "#");
 		} else if (type === "doctype") {
-			if (frappe.model.is_single(item.doctype)) {
+			if (frappe.model.is_tree(item.doctype)) {
+				route = "Tree/" + item.doctype;
+			} else if (frappe.model.is_single(item.doctype)) {
 				route = "Form/" + item.doctype;
 			} else {
 				if (item.filters) {

From 218e945b2614b0b2a72d59bfaf74ca2862a4794f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:56:00 +0530
Subject: [PATCH 120/274] feat: add get_last_day_of_week function

---
 frappe/utils/data.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 58c74a905d..906b07fd08 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -190,6 +190,10 @@ def get_first_day(dt, d_years=0, d_months=0):
 def get_first_day_of_week(dt):
 	return dt - datetime.timedelta(days=dt.weekday())
 
+def get_last_day_of_week(dt):
+	dt = get_first_day_of_week(dt)
+	return dt + datetime.timedelta(days=6)
+
 def get_last_day(dt):
 	"""
 	 Returns last day of the month using:

From 8de7f7602e7aa6ba8ac10b60b5a83886fd77ab93 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:56:16 +0530
Subject: [PATCH 121/274] refactor: replace pandas date range with native
 function

---
 frappe/utils/dateutils.py | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py
index 907cab3d02..b98c1c12fc 100644
--- a/frappe/utils/dateutils.py
+++ b/frappe/utils/dateutils.py
@@ -6,6 +6,9 @@ import frappe
 import frappe.defaults
 import datetime
 from frappe.utils import get_datetime
+from frappe.utils import nowdate, add_to_date, getdate, get_datetime
+from frappe.utils.data import get_last_day_of_week
+from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_period_ending
 from six import string_types
 
 # global values -- used for caching
@@ -74,8 +77,29 @@ def datetime_in_user_format(date_time):
 	from frappe.utils import formatdate
 	return formatdate(date_time.date()) + " " + date_time.strftime("%H:%M")
 
-def get_date_range(from_date, to_date, frequency="M", normalize=True):
-	from pandas import date_range
-	date_range = date_range(start=from_date, end=to_date, freq=frequency, normalize=normalize).to_pydatetime().tolist()
+def get_dates_from_timegrain(from_date, to_date, timegrain="Daily"):
+	from_date = getdate(from_date)
+	to_date = getdate(to_date)
 
-	return date_range
\ No newline at end of file
+	days = months = years = 0
+	if "Daily" == timegrain:
+		days = 1
+	elif "Weekly" == timegrain:
+		days = 7
+	elif "Monthly" == timegrain:
+		months = 1
+	elif "Quarterly" == timegrain:
+		months = 3
+
+	if "Weekly" == timegrain:
+		dates = [get_last_day_of_week(from_date)]
+	else:
+		dates = [get_period_ending(from_date, timegrain)]
+
+	while getdate(dates[-1]) < getdate(to_date):
+		if "Weekly" == timegrain:
+			date = get_last_day_of_week(add_to_date(dates[-1], years=years, months=months, days=days))
+		else:
+			date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
+		dates.append(date)
+	return dates
\ No newline at end of file

From 0eaf778fe24911970f9e1b02e0e743fc63082103 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:56:33 +0530
Subject: [PATCH 122/274] refactor: change values for report range options

---
 .../report/website_analytics/website_analytics.js      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/website/report/website_analytics/website_analytics.js b/frappe/website/report/website_analytics/website_analytics.js
index 7e051afa8c..9079949724 100644
--- a/frappe/website/report/website_analytics/website_analytics.js
+++ b/frappe/website/report/website_analytics/website_analytics.js
@@ -8,7 +8,7 @@ frappe.query_reports["Website Analytics"] = {
 			fieldname: "from_date",
 			label: __("From Date"),
 			fieldtype: "Date",
-			default: frappe.datetime.add_days(frappe.datetime.now_date(true), -7),
+			default: frappe.datetime.add_days(frappe.datetime.now_date(true), -100),
 		},
 		{
 			fieldname:"to_date",
@@ -21,11 +21,11 @@ frappe.query_reports["Website Analytics"] = {
 			label: __("Range"),
 			fieldtype: "Select",
 			options: [
-				{ "value": "D", "label": __("Daily") },
-				{ "value": "W", "label": __("Weekly") },
-				{ "value": "M", "label": __("Monthly") },
+				{ "value": "Daily", "label": __("Daily") },
+				{ "value": "Weekly", "label": __("Weekly") },
+				{ "value": "Monthly", "label": __("Monthly") },
 			],
-			default: "D",
+			default: "Daily",
 			reqd: 1
 		}
 	]

From 0bb10609989a71bcde291cb7cfaec43b428cb978 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:57:30 +0530
Subject: [PATCH 123/274] feat: use new date range function

---
 .../website_analytics/website_analytics.py    | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/frappe/website/report/website_analytics/website_analytics.py b/frappe/website/report/website_analytics/website_analytics.py
index 694bc9e797..97c330fed9 100644
--- a/frappe/website/report/website_analytics/website_analytics.py
+++ b/frappe/website/report/website_analytics/website_analytics.py
@@ -4,7 +4,8 @@
 from __future__ import unicode_literals
 import frappe
 from datetime import datetime
-from frappe.utils.dateutils import get_date_range
+from frappe.utils import getdate
+from frappe.utils.dateutils import get_dates_from_timegrain
 
 def execute(filters=None):
 	return WebsiteAnalytics(filters).run()
@@ -20,7 +21,7 @@ class WebsiteAnalytics(object):
 			self.filters.from_date = frappe.utils.add_days(self.filters.to_date, -7)
 
 		if not self.filters.range:
-			self.filters.range = "D"
+			self.filters.range = "Daily"
 
 		self.filters.to_date = frappe.utils.add_days(self.filters.to_date, 1)
 		self.query_filters = {'creation': ['between', [self.filters.from_date, self.filters.to_date]]}
@@ -89,10 +90,10 @@ class WebsiteAnalytics(object):
 		field = 'creation'
 		date_format = '%Y-%m-%d'
 
-		if filters_range == "W":
+		if filters_range == "Weekly":
 			field = 'ADDDATE(creation, INTERVAL 1-DAYOFWEEK(creation) DAY)'
 
-		elif filters_range == "M":
+		elif filters_range == "Monthly":
 			date_format = '%Y-%m-01'
 
 		query = """
@@ -115,10 +116,10 @@ class WebsiteAnalytics(object):
 		field = 'creation'
 		granularity = 'day'
 
-		if filters_range == "W":
+		if filters_range == "Weekly":
 			granularity = 'week'
 
-		elif filters_range == "M":
+		elif filters_range == "Monthly":
 			granularity = 'day'
 
 		query = """
@@ -149,8 +150,8 @@ class WebsiteAnalytics(object):
 		return self.prepare_chart_data(self.chart_data)
 
 	def prepare_chart_data(self, data):
-		date_range = get_date_range(self.filters.from_date, self.filters.to_date, self.filters.range)
-		if self.filters.range == "M":
+		date_range = get_dates_from_timegrain(self.filters.from_date, self.filters.to_date, self.filters.range)
+		if self.filters.range == "Monthly":
 			date_range = [frappe.utils.add_days(dd, 1) for dd in date_range]
 
 		labels = []
@@ -159,8 +160,8 @@ class WebsiteAnalytics(object):
 
 		def get_data_for_date(date):
 			for item in data:
-				item_date = frappe.utils.get_datetime(item.get("date")).date()
-				if item_date == date.date():
+				item_date = getdate(item.get("date"))
+				if item_date == date:
 					return item
 			return {'count': 0, 'unique_count': 0}
 

From e2b5fcb6abe46d4b3da13263aca427d316d068ae Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 May 2020 19:58:33 +0530
Subject: [PATCH 124/274] chore: update fixtures

---
 frappe/website/dashboard_fixtures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/dashboard_fixtures.py b/frappe/website/dashboard_fixtures.py
index 01f1376d43..1ac7ca60ec 100644
--- a/frappe/website/dashboard_fixtures.py
+++ b/frappe/website/dashboard_fixtures.py
@@ -20,7 +20,7 @@ def get_charts():
 	return [{
 		"chart_name": "Website Analytics",
 		"chart_type": "Report",
-		"custom_options": "{\"type\": \"line\", \"lineOptions\": {\"regionFill\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"colors\": [\"#7cd6fd\", \"#5e64ff\"], \"tooltipOptions\": {}}",
+		"custom_options": "{\"type\": \"line\", \"lineOptions\": {\"regionFill\": 1}, \"axisOptions\": {\"shortenYAxisNumbers\": 1}, \"tooltipOptions\": {}}",
 		"doctype": "Dashboard Chart",
 		"filters_json": "{}",
 		"group_by_type": "Count",

From 9d03190335093f16a06a8a8b62936009e05e1129 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 13 May 2020 20:10:35 +0530
Subject: [PATCH 125/274] fix: Re-raise swallowed exception

---
 frappe/website/render.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/website/render.py b/frappe/website/render.py
index ae84d85e5b..2e448e7d5b 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -180,6 +180,8 @@ def build(path):
 			return build_page(path)
 		else:
 			raise
+	except Exception:
+		raise
 
 def build_page(path):
 	if not getattr(frappe.local, "path", None):

From 16b518b7c54b3c9c44d9c39879c788c878b3e20b Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 13 May 2020 20:10:46 +0530
Subject: [PATCH 126/274] fix: Redirect website user to /me

---
 frappe/www/login.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/www/login.py b/frappe/www/login.py
index b1abd6a2c4..65952f0154 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -20,7 +20,7 @@ def get_context(context):
 
 	if frappe.session.user != "Guest":
 		if not redirect_to:
-			redirect_to = "/" if frappe.session.data.user_type=="Website User" else "/desk"
+			redirect_to = "/me" if frappe.session.data.user_type=="Website User" else "/desk"
 		frappe.local.flags.redirect_location = redirect_to
 		raise frappe.Redirect
 
@@ -96,4 +96,4 @@ def login_via_token(login_token):
 	frappe.local.form_dict.sid = sid
 	frappe.local.login_manager = LoginManager()
 
-	redirect_post_login(desk_user = frappe.db.get_value("User", frappe.session.user, "user_type")=="System User")
\ No newline at end of file
+	redirect_post_login(desk_user = frappe.db.get_value("User", frappe.session.user, "user_type")=="System User")

From 977e6c23f235ea5dfeb7a8c958a2816c11a3e440 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 13 May 2020 20:42:19 +0530
Subject: [PATCH 127/274] perf(desk): Even faster desk (#9930)

* feat (perf): even faster desk

* fix: user not found bug

* feat: store db counts

* feat: use cached db.get_value

* style (sider): comparison to None should be 'if cond is None:'

* feat: add keys to user_cache_keys

* refactor: cache blocked modules and roles

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/boot.py          | 19 +++++++++++----
 frappe/cache_manager.py |  3 ++-
 frappe/desk/desktop.py  | 53 +++++++++++++++++++++++++++++------------
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 9d5dbe1909..42b5ca38b7 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -107,13 +107,20 @@ def load_desktop_data(bootinfo):
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
 	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
 
-def get_allowed_pages():
-	return get_user_pages_or_reports('Page')
+def get_allowed_pages(cache=False):
+	return get_user_pages_or_reports('Page', cache=cache)
 
-def get_allowed_reports():
-	return get_user_pages_or_reports('Report')
+def get_allowed_reports(cache=False):
+	return get_user_pages_or_reports('Report', cache=cache)
+
+def get_user_pages_or_reports(parent, cache=False):
+	_cache = frappe.cache()
+
+	if cache:
+		has_role = _cache.get_value('has_role:' + parent, user=frappe.session.user)
+		if has_role:
+			return has_role
 
-def get_user_pages_or_reports(parent):
 	roles = frappe.get_roles()
 	has_role = {}
 	column = get_column(parent)
@@ -184,6 +191,8 @@ def get_user_pages_or_reports(parent):
 		for report in reports:
 			has_role[report.name]["report_type"] = report.report_type
 
+	# Expire every six hours
+	_cache.set_value('has_role:' + parent, has_role, frappe.session.user, 21600)
 	return has_role
 
 def get_column(doctype):
diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index 2daed59074..4560680653 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -20,7 +20,8 @@ global_cache_keys = ("app_hooks", "installed_apps",
 
 user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang",
 		"defaults", "user_permissions", "home_page", "linked_with",
-		"desktop_icons", 'portal_menu_items')
+		"desktop_icons", 'portal_menu_items', 'user_perm_can_read',
+		"has_role:Page", "has_role:Report")
 
 doctype_cache_keys = ("meta", "form_meta", "table_columns", "last_modified",
 		"linked_doctypes", 'notifications', 'workflow' ,'energy_point_rule_map')
diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index a912ca341c..76be5f581d 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -21,19 +21,17 @@ class Workspace:
 		self.extended_charts = []
 		self.extended_shortcuts = []
 
-		user = frappe.get_user()
-		user.build_permissions()
-
-		user_doc = frappe.get_doc('User', frappe.session.user)
-		self.blocked_modules = user_doc.get_blocked_modules()
+		self.user = frappe.get_user()
+		self.allowed_modules = self.get_cached_value('user_allowed_modules', self.get_allowed_modules)
 		self.doc = self.get_page_for_user()
 
-		if self.doc.module in self.blocked_modules:
+		if self.doc.module not in self.allowed_modules:
 			raise frappe.PermissionError
 
-		self.user = user
-		self.allowed_pages = get_allowed_pages()
-		self.allowed_reports = get_allowed_reports()
+		self.can_read = self.get_cached_value('user_perm_can_read', self.get_can_read_items)
+
+		self.allowed_pages = get_allowed_pages(cache=True)
+		self.allowed_reports = get_allowed_reports(cache=True)
 		self.onboarding_doc = self.get_onboarding_doc()
 		self.onboarding = None
 
@@ -41,6 +39,31 @@ class Workspace:
 		self.restricted_doctypes = frappe.cache().get_value("domain_restricted_doctypes") or build_domain_restriced_doctype_cache()
 		self.restricted_pages = frappe.cache().get_value("domain_restricted_pages") or build_domain_restriced_page_cache()
 
+	def get_cached_value(self, cache_key, fallback_fn):
+		_cache = frappe.cache()
+
+		value = _cache.get_value(cache_key, user=frappe.session.user)
+		if value:
+			return value
+
+		value = fallback_fn()
+
+		# Expire every six hour
+		_cache.set_value(cache_key, value, frappe.session.user, 21600)
+		return value
+
+	def get_can_read_items(self):
+		if not self.user.can_read:
+			self.user.build_permissions()
+
+		return self.user.can_read
+
+	def get_allowed_modules(self):
+		if not self.user.allow_modules:
+			self.user.build_permissions()
+
+		return self.user.allow_modules
+
 	def get_page_for_user(self):
 		filters = {
 			'extends': self.page_name,
@@ -68,7 +91,7 @@ class Workspace:
 
 		# Check if user is allowed
 		allowed_roles = set(doc.get_allowed_roles())
-		user_roles = set(self.user.get_roles())
+		user_roles = set(frappe.get_roles())
 		if not allowed_roles & user_roles:
 			return None
 
@@ -83,7 +106,7 @@ class Workspace:
 			"extends": self.page_name,
 			'restrict_to_domain': ['in', frappe.get_active_domains()],
 			'for_user': '',
-			'module': ['not in', self.blocked_modules]
+			'module': ['in', self.allowed_modules]
 		})
 
 		pages = [frappe.get_doc("Desk Page", page['name']) for page in pages]
@@ -97,7 +120,7 @@ class Workspace:
 		item_type = item_type.lower()
 
 		if item_type == "doctype":
-			return (name in self.user.can_read and name in self.restricted_doctypes)
+			return (name in self.can_read and name in self.restricted_doctypes)
 		if item_type == "page":
 			return (name in self.allowed_pages and name in self.restricted_pages)
 		if item_type == "report":
@@ -140,9 +163,9 @@ class Workspace:
 		default_country = frappe.db.get_default("country")
 
 		def _doctype_contains_a_record(name):
-			exists = self.table_counts.get(name)
-			if not exists:
-				if not frappe.db.get_value('DocType', name, 'issingle'):
+			exists = self.table_counts.get(name, None)
+			if exists is None:
+				if not frappe.db.get_value('DocType', name, 'issingle', cache=True):
 					exists = frappe.db.count(name)
 				else:
 					exists = True

From 55fe81aaac2d436071d1dd0d0b2379841513e01d Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 May 2020 20:56:51 +0530
Subject: [PATCH 128/274] perf: Add HTTP Link header for preload hints

Parse rendered templates and find stylesheet and script files.
Add these files to the HTTP Link header.

In the case of http1.1 browser can fetch these resources before parsing the DOM.
In the case of http2 NGINX can use HTTP2 Server Push (http2_push_preload on).

https://www.w3.org/TR/preload/
---
 frappe/website/render.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frappe/website/render.py b/frappe/website/render.py
index 601a4e7eb2..f2078ebfc1 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -7,8 +7,10 @@ from frappe import _
 import frappe.sessions
 from frappe.utils import cstr
 import os, mimetypes, json
+import re
 
 import six
+from bs4 import BeautifulSoup
 from six import iteritems
 from werkzeug.wrappers import Response
 from werkzeug.routing import Map, Rule, NotFound
@@ -128,12 +130,35 @@ def build_response(path, data, http_status_code, headers=None):
 	response.headers["X-Page-Name"] = path.encode("ascii", errors="xmlcharrefreplace")
 	response.headers["X-From-Cache"] = frappe.local.response.from_cache or False
 
+	add_preload_headers(response)
 	if headers:
 		for key, val in iteritems(headers):
 			response.headers[key] = val.encode("ascii", errors="xmlcharrefreplace")
 
 	return response
 
+
+def add_preload_headers(response):
+	try:
+		preload = []
+		soup = BeautifulSoup(response.data, "lxml")
+		for elem in soup.find_all('script', src=re.compile(".*")):
+			preload.append(("script", elem.get("src")))
+
+		for elem in soup.find_all('link', rel="stylesheet"):
+			preload.append(("style", elem.get("href")))
+
+		links = []
+		for type, link in preload:
+			links.append("</{}>; rel=preload; as={}".format(link.lstrip("/"), type))
+
+		if links:
+			response.headers["Link"] = ",".join(links)
+	except Exception:
+		import traceback
+		traceback.print_exc()
+
+
 def render_page_by_language(path):
 	translated_languages = frappe.get_hooks("translated_languages_for_website")
 	user_lang = guess_language(translated_languages)

From 9bba3154bc602f77f9e9c9f82fc0de40de00dce8 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Wed, 13 May 2020 21:22:08 +0530
Subject: [PATCH 129/274] fix: redirect after login

fix sanitise redirect
test for redirect after login
---
 cypress/integration/login.js            | 17 +++++++++++++++++
 frappe/public/js/frappe/utils/common.js |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cypress/integration/login.js b/cypress/integration/login.js
index 904b9e0721..b3227fa3ba 100644
--- a/cypress/integration/login.js
+++ b/cypress/integration/login.js
@@ -38,4 +38,21 @@ context('Login', () => {
 		cy.location('pathname').should('eq', '/desk');
 		cy.window().its('frappe.session.user').should('eq', 'Administrator');
 	});
+
+	it('check redirect after login', () => {
+		const payload = new URLSearchParams({
+			uuid: '6fed1519-cfd8-4a2d-84a6-9a1799c7c741',
+			encoded_string: 'hello all',
+			encoded_url: 'http://test.localhost/callback',
+			base64_string: 'aGVsbG8gYWxs'
+		});
+
+		cy.request('/api/method/logout');
+		cy.visit('/login?redirect-to=/me?' + encodeURIComponent(payload.toString()));
+		cy.get('#login_email').type('Administrator');
+		cy.get('#login_password').type(Cypress.config('adminPassword'));
+
+		cy.get('.btn-login').click();
+		cy.url().should('include', '/me?' + payload.toString());
+	});
 });
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 1cdabf23e0..9ff4ade761 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -276,7 +276,7 @@ frappe.utils.sanitise_redirect = (url) => {
 
 			// check for base domain only if the url is absolute
 			// return true for relative url (except protocol-relative urls)
-			return is_absolute(url) ? domain(location.href) !== domain(url) : true;
+			return is_absolute(url) ? domain(location.href) !== domain(url) : false;
 		}
 	})();
 

From a0d8b1a1b3e775b55d49c9b6d0429b75d8e1b781 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Thu, 14 May 2020 05:51:08 +0530
Subject: [PATCH 130/274] fix: add comments to login ui test

---
 cypress/integration/login.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/login.js b/cypress/integration/login.js
index b3227fa3ba..861377444c 100644
--- a/cypress/integration/login.js
+++ b/cypress/integration/login.js
@@ -40,6 +40,8 @@ context('Login', () => {
 	});
 
 	it('check redirect after login', () => {
+
+		// mock for OAuth 2.0 client_id, redirect_uri, scope and state
 		const payload = new URLSearchParams({
 			uuid: '6fed1519-cfd8-4a2d-84a6-9a1799c7c741',
 			encoded_string: 'hello all',
@@ -48,11 +50,19 @@ context('Login', () => {
 		});
 
 		cy.request('/api/method/logout');
-		cy.visit('/login?redirect-to=/me?' + encodeURIComponent(payload.toString()));
+
+		// redirect-to /me page with params to mock OAuth 2.0 like request
+		cy.visit(
+			'/login?redirect-to=/me?' +
+				encodeURIComponent(payload.toString().replace("+", " "))
+		);
+
 		cy.get('#login_email').type('Administrator');
 		cy.get('#login_password').type(Cypress.config('adminPassword'));
 
 		cy.get('.btn-login').click();
-		cy.url().should('include', '/me?' + payload.toString());
+
+		// verify redirected location and url params after login
+		cy.url().should('include', '/me?' + payload.toString().replace('+', '%20'));
 	});
 });

From 7d0faa940ebcb5cbe58debbaec473aed5cfda7a4 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 14 May 2020 09:57:48 +0530
Subject: [PATCH 131/274] fix(minor): Custom Web Forms wont have templates

---
 frappe/www/list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/www/list.py b/frappe/www/list.py
index c48cb40d4f..313505b729 100644
--- a/frappe/www/list.py
+++ b/frappe/www/list.py
@@ -168,7 +168,7 @@ def get_list_context(context, doctype, web_form_name=None):
 		list_context = update_context_from_module(web_form.get_web_form_module(), list_context)
 
 	# get path from '/templates/' folder of the doctype
-	if not list_context.row_template:
+	if not meta.custom and not list_context.row_template:
 		list_context.row_template = meta.get_row_template()
 
 	return list_context

From d3f8a5bbb9fe49c22e363c76dac155fe30ba4f5a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 10:22:51 +0530
Subject: [PATCH 132/274] style: remove unsused imports, spacing for
 consistency

---
 frappe/commands/site.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 058554cff6..10bf700340 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -1,7 +1,6 @@
 # imports - standard imports
 import atexit
 import compileall
-import getpass
 import hashlib
 import os
 import re
@@ -10,7 +9,6 @@ import sys
 
 # imports - third party imports
 import click
-import requests
 
 # imports - module imports
 import frappe
@@ -258,7 +256,6 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 	print("Compiling Python Files...")
 	compileall.compile_dir('../apps', quiet=1, rx=re.compile('.*node_modules.*'))
 
-
 @click.command('migrate-to')
 @click.argument('site_url')
 @pass_context
@@ -267,7 +264,6 @@ def migrate_to(context, site_url):
 	for site in context.sites:
 		migrate_to(site, site_url)
 
-
 @click.command('run-patch')
 @click.argument('module')
 @pass_context
@@ -334,18 +330,19 @@ def use(site, sites_path='.'):
 
 @click.command('backup')
 @click.option('--with-files', default=False, is_flag=True, help="Take backup with files")
+@click.option('--verbose', default=False, is_flag=True)
 @pass_context
 def backup(context, with_files=False, backup_path_db=None, backup_path_files=None,
-	backup_path_private_files=None, quiet=False):
+	backup_path_private_files=None, quiet=False, verbose=False):
 	"Backup"
 	from frappe.utils.backups import scheduled_backup
-	verbose = context.verbose
+	verbose = verbose or context.verbose
 	exit_code = 0
 	for site in context.sites:
 		try:
 			frappe.init(site=site)
 			frappe.connect()
-			odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True)
+			odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True, verbose=verbose)
 		except Exception as e:
 			if verbose:
 				print("Backup failed for {0}. Database or site_config.json may be corrupted".format(site))
@@ -354,10 +351,12 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non
 
 		if verbose:
 			from frappe.utils import now
-			print("database backup taken -", odb.backup_path_db, "- on", now())
+			summary_title = "Backup Summary at {0}".format(now())
+			print(summary_title + "\n" + "-" * len(summary_title))
+			print("Database backup:", odb.backup_path_db)
 			if with_files:
-				print("files backup taken -", odb.backup_path_files, "- on", now())
-				print("private files backup taken -", odb.backup_path_private_files, "- on", now())
+				print("Public files:   ", odb.backup_path_files)
+				print("Private files:  ", odb.backup_path_private_files)
 
 		frappe.destroy()
 	sys.exit(exit_code)

From 2924b98097cfaac3b84b35b43088f73e93e2878d Mon Sep 17 00:00:00 2001
From: Mathieu Brunot <mathieu.brunot@monogramm.io>
Date: Thu, 14 May 2020 08:51:39 +0200
Subject: [PATCH 133/274] fix: Exit chat from website (#10201)

---
 frappe/public/js/frappe/chat.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js
index f54b9e5cbe..6b723d508c 100644
--- a/frappe/public/js/frappe/chat.js
+++ b/frappe/public/js/frappe/chat.js
@@ -2259,14 +2259,19 @@ class extends Component {
 						) : null,
 					h("div","",
 						h("div", { class: "panel-title" },
-							h("div", { class: "cursor-pointer", onclick: () => { frappe.set_route(item.route) }},
+							h("div", { class: "cursor-pointer", onclick: () => {
+								frappe.session.user !== "Guest" ?
+									frappe.set_route(item.route) : null;
+							}},
 								h(frappe.Chat.Widget.MediaProfile, { ...item })
 							)
 						)
 					),
-					h("div", { class: popper ? "col-xs-1"  : "col-xs-3" },
+					h("div", { class: popper ? "col-xs-2"  : "col-xs-3" },
 						h("div", { class: "text-right" },
-
+							frappe._.is_mobile() && h(frappe.components.Button, { class: "frappe-chat-close", onclick: props.toggle },
+								h(frappe.components.Octicon, { type: "x" })
+							)
 						)
 					)
 				)

From 637409095c8ff718abaf2c0cf72872361418addb Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 12:24:00 +0530
Subject: [PATCH 134/274] fix: simplyify and segregate migrator utils

---
 frappe/utils/commands.py          |  25 ++++
 frappe/utils/remote_migrations.py | 238 ++++++++++++++----------------
 2 files changed, 136 insertions(+), 127 deletions(-)
 create mode 100644 frappe/utils/commands.py

diff --git a/frappe/utils/commands.py b/frappe/utils/commands.py
new file mode 100644
index 0000000000..3c16193173
--- /dev/null
+++ b/frappe/utils/commands.py
@@ -0,0 +1,25 @@
+import functools
+import requests
+from terminaltables import AsciiTable
+
+
+@functools.lru_cache(maxsize=1024)
+def get_first_party_apps():
+	apps = []
+	for org in ["frappe", "erpnext"]:
+		req = requests.get(f"https://api.github.com/users/{org}/repos", {"type": "sources", "per_page": 200})
+		if req.ok:
+			apps.extend([x["name"] for x in req.json()])
+	return apps
+
+
+def render_table(data):
+	print(AsciiTable(data).table)
+
+
+def padme(me):
+	def empty_line(*args, **kwargs):
+		result = me(*args, **kwargs)
+		print()
+		return result
+	return empty_line
diff --git a/frappe/utils/remote_migrations.py b/frappe/utils/remote_migrations.py
index abe2b921e8..c89134f27c 100644
--- a/frappe/utils/remote_migrations.py
+++ b/frappe/utils/remote_migrations.py
@@ -7,107 +7,122 @@ import sys
 
 # imports - third party imports
 import click
+from html2text import html2text
 import requests
-from terminaltables import AsciiTable
 
 # imports - module imports
 import frappe
 import frappe.utils.backups
 from frappe.utils import get_installed_apps_info
+from frappe.utils.commands import get_first_party_apps, render_table, padme
 
 
-def render_table(data):
-	print(AsciiTable(data).table)
 
-def padme(me):
-	def empty_line(*args, **kwargs):
-		result = me(*args, **kwargs)
-		print()
-		return result
-	return empty_line
+def get_new_site_options():
+	site_options_sc = session.post(options_url)
 
-@functools.lru_cache(maxsize=1024)
-def get_first_party_apps():
-	apps = []
-	for org in ["frappe", "erpnext"]:
-		req = requests.get(f"https://api.github.com/users/{org}/repos", {"type": "sources", "per_page": 200})
-		if req.ok:
-			apps.extend([x["name"] for x in req.json()])
-	return apps
+	if site_options_sc.ok:
+		site_options = site_options_sc.json()["message"]
+		return site_options
+	else:
+		print("Couldn't retrive New site information: {}".format(site_options_sc.status_code))
+
+
+def is_valid_subdomain(subdomain):
+	if len(subdomain) < 6:
+		print("Subdomain too short. Use 5 or more characters")
+		return False
+	matched = re.match("^[a-z0-9][a-z0-9-]*[a-z0-9]$", subdomain)
+	if matched:
+		return True
+	print("Subdomain contains invalid characters. Use lowercase characters, numbers and hyphens")
+
+
+def is_subdomain_available(subdomain):
+	res = session.post(site_exists_url, {"subdomain": subdomain})
+	if res.ok:
+		available = not res.json()["message"]
+		if not available:
+			print("Subdomain already exists! Try another one")
+
+		return available
+
+
+def render_plan_table(plans_list):
+	plans_table = []
+
+	# title row
+	visible_headers = ["name", "concurrent_users", "cpu_time_per_day"]
+	plans_table.append(visible_headers)
+
+	# all rows
+	for plan in plans_list:
+		plans_table.append([plan[header] for header in visible_headers])
+
+	render_table(plans_table)
 
 
 @padme
 def choose_plan(plans_list):
-	plans_table = []
-	available_plans = []
-
-	print(f"{len(plans_list)} plans available")
-
-	plans_table.append([x for x in plans_list[0].keys()])
-	for plan in plans_list:
-		row_data = [x for x in plan.values()]
-		available_plans.append(row_data[0])
-		plans_table.append(row_data)
-
-	render_table(plans_table)
+	print("{} plans available".format(len(plans_list)))
+	available_plans = [plan["name"] for plan in plans_list]
+	render_plan_table(plans_list)
 
 	while True:
 		input_plan = input("Send plan?: ").strip()
 		if input_plan in available_plans:
-			print(f"{input_plan} Plan selected ✅")
+			print("{} Plan selected ✅".format(input_plan))
 			return input_plan
 		else:
 			print("Invalid selection...try again ❌")
 
 
+@padme
 def check_app_compat(available_group):
 	frappe_upgrade_msg = ""
-	trimmed_available_group = set([(app['scrubbed'], app['branch']) for app in available_group['apps']])
-	existing_group = set([(app['app_name'], app['branch']) for app in get_installed_apps_info()])
-
+	is_compat = True
+	incompatible_apps, filtered_apps, branch_msgs = [], [], []
+	existing_group = [(app["app_name"], app["branch"]) for app in get_installed_apps_info()]
 	print("Checking availability of existing app group")
-	incompatible_apps = []
-	filtered_apps = []
-	branch_msgs = []
 
 	for (app, branch) in existing_group:
-		if (app, branch) not in trimmed_available_group:
-			app_title = [group["name"] for group in available_group["apps"] if group["scrubbed"] == app]
-			if app_title:
-				app_title = app_title[0]
-			is_compat = False
-			if app not in get_first_party_apps():
-				incompatible_apps.append(app)
-				print(f"❌ App {app}:{branch}")
-			else:
-				available_branch = [a['branch'] for a in available_group['apps'] if a['scrubbed'] == app]
-				if not available_branch:
-					print(f"App {app} doesn't exist in selected group")
-					continue
-				else:
-					available_branch = available_branch[0]
-				print(f"⚠️  {app}:{branch} => {available_branch}")
+		info = [ (a["name"], a["branch"]) for a in available_group["apps"] if a["scrubbed"] == app]
+		if info:
+			app_title, available_branch = info[0]
+
+			if branch != available_branch:
+				print("⚠️  {}:{} => {}".format(app, branch, available_branch))
 				branch_msgs.append([app.title(), branch, available_branch])
 				filtered_apps.append(app_title)
+				is_compat = False
+
+			else:
+				print("✅ App {}:{}".format(app, branch))
+				filtered_apps.append(app_title)
+
 		else:
-			filtered_apps.append(app_title)
+			incompatible_apps.append(app)
+			print("❌ App {}:{}".format(app, branch))
+			is_compat = False
 
 	start_msg = "\nSelecting this group will "
-	incompatible_apps = f"drop {len(incompatible_apps)} apps: " + ", ".join(incompatible_apps) + " and " if incompatible_apps else ""
+	incompatible_apps = "drop {} apps: ".format(len(incompatible_apps)) + ", ".join(incompatible_apps) + " and " if incompatible_apps else ""
 	branch_change = "upgrade:\n" + "\n".join(["{}: {} => {}".format(*x) for x in branch_msgs]) if branch_msgs else ""
 	changes = (incompatible_apps + branch_change) or "be perfect for you :)"
 	warning_message = start_msg + changes
-
 	print(warning_message)
 
 	return is_compat, filtered_apps
 
 
-def generate_app_group_table(app_groups):
+def render_group_table(app_groups):
+	# title row
 	app_groups_table = [["#", "App Group", "Apps"]]
 
-	for _, app_group in enumerate(app_groups):
-		row = [_ + 1, app_group["name"], ", ".join([f"{app['scrubbed']}:{app['branch']}" for app in app_group['apps']])]
+	# all rows
+	for idx, app_group in enumerate(app_groups):
+		apps_list = ", ".join(["{}:{}".format(app["scrubbed"], app["branch"]) for app in app_group["apps"]])
+		row = [idx + 1, app_group["name"], apps_list]
 		app_groups_table.append(row)
 
 	render_table(app_groups_table)
@@ -115,26 +130,21 @@ def generate_app_group_table(app_groups):
 
 @padme
 def filter_apps(app_groups):
-	# try for default group first...then let em select which group
-	default_group = [g for g in app_groups if g['default']][0]
-	is_compat, filtered_apps = check_app_compat(default_group)
+	render_group_table(app_groups)
 
-	if not is_compat and not click.confirm("Continue anyway?"):
-		generate_app_group_table(app_groups)
+	while True:
+		try:
+			app_group_index = int(input("Select App Group #: ").strip()) - 1
+			selected_group = app_groups[app_group_index]
+			is_compat, filtered_apps = check_app_compat(selected_group)
+		except:
+			print("Invalid Selection")
+			sys.exit(1)
 
-		while True:
-			try:
-				app_group_index = int(input("Select App Group #: ").strip()) - 1
-				selected_group = app_groups[app_group_index]
-				is_compat, filtered_apps = check_app_compat(selected_group)
-			except:
-				print("Invalid Selection")
-				sys.exit(1)
+		if is_compat or click.confirm("Continue anyway?"):
+			break
 
-			if is_compat or click.confirm("Continue anyway?"):
-				break
-
-	return default_group['name'], filtered_apps
+	return selected_group["name"], filtered_apps
 
 @padme
 def create_session():
@@ -148,63 +158,35 @@ def create_session():
 	login_sc = session.post(login_url, auth_credentials)
 
 	if login_sc.ok:
-		print(f"Authorization Successful! ✅")
+		print("Authorization Successful! ✅")
 		session.headers.update({"X-Press-Team": username})
 		return session
 	else:
-		print(f"Authorization Failed with Error Code {login_sc.status_code}")
-
-
-def get_new_site_options():
-	site_options_sc = session.post(options_url)
-
-	if site_options_sc.ok:
-		site_options = site_options_sc.json()["message"]
-		return site_options
-	else:
-		print(f"Couldn't retrive New site information: {site_options_sc.status_code}")
-
-
-def is_valid_subdomain(subdomain):
-	matched = re.match("^[a-z0-9][a-z0-9-]*[a-z0-9]$", subdomain)
-	if matched:
-		return True
-	print('Subdomain contains invalid characters. Use lowercase characters, numbers and hyphens')
-
-
-def is_subdomain_available(subdomain):
-	res = session.post(site_exists_url, {"subdomain": subdomain})
-	if res.ok:
-		available = not res.json()['message']
-		if not available:
-			print('Subdomain already exists! Try another one')
-
-		return available
+		print("Authorization Failed with Error Code {}".format(login_sc.status_code))
 
 
 @padme
 def get_subdomain(domain):
 	while True:
 		subdomain = input("Enter subdomain: ").strip()
-		if is_valid_subdomain(subdomain):
-			if is_subdomain_available(subdomain):
-				print(f"Site Domain: {subdomain}.{domain}")
-				return subdomain
+		if is_valid_subdomain(subdomain) and is_subdomain_available(subdomain):
+			print("Site Domain: {}.{}".format(subdomain, domain))
+			return subdomain
 
 
 @padme
 def upload_backup(local_site):
 	# take backup
-	print(f"Taking backup for site {local_site}")
-	odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
 	files_session = {}
+	print("Taking backup for site {}".format(local_site))
+	odb = frappe.utils.backups.new_backup(ignore_files=False, force=True)
 
 	# upload files
-	for file_type, file_path in [
+	for x, (file_type, file_path) in enumerate([
 				("database", odb.backup_path_db),
 				("public", odb.backup_path_files),
 				("private", odb.backup_path_private_files)
-			]:
+			]):
 		file_upload_response = session.post(files_url, data={}, files={
 			"file": open(file_path, "rb"),
 			"is_private": 1,
@@ -212,27 +194,28 @@ def upload_backup(local_site):
 			"method": "press.api.site.upload_backup",
 			"type": file_type
 		})
+		print("Uploading files ({}/3)".format(x+1), end="\r")
 		if file_upload_response.ok:
 			files_session[file_type] = file_upload_response.json()["message"]
 		else:
-			print(f"Upload failed for: {file_path}")
+			print("Upload failed for: {}".format(file_path))
 
 	files_uploaded = { k: v["file_url"] for k, v in files_session.items() }
+	print("Uploaded backup files! ✅")
 
 	return files_uploaded
 
 
 def frappecloud_migrator(local_site, remote_site):
-	# test (change to https !!!):
 	global login_url, upload_url, files_url, options_url, site_exists_url, session
 
-	login_url = f"http://{remote_site}/api/method/login"
-	upload_url = f"http://{remote_site}/api/method/press.api.site.new"
-	files_url = f"http://{remote_site}/api/method/upload_file"
-	options_url = f"http://{remote_site}/api/method/press.api.site.options_for_new"
-	site_exists_url = f"http://{remote_site}/api/method/press.api.site.exists"
+	login_url = "https://{}/api/method/login".format(remote_site)
+	upload_url = "https://{}/api/method/press.api.site.new".format(remote_site)
+	files_url = "https://{}/api/method/upload_file".format(remote_site)
+	options_url = "https://{}/api/method/press.api.site.options_for_new".format(remote_site)
+	site_exists_url = "https://{}/api/method/press.api.site.exists".format(remote_site)
 
-	print(f"Frappe Cloud credentials @ {remote_site}")
+	print("Frappe Cloud credentials @ {}".format(remote_site))
 
 	# get credentials + auth user + start session
 	session = create_session()
@@ -246,8 +229,8 @@ def frappecloud_migrator(local_site, remote_site):
 		site_options = get_new_site_options()
 
 		# set preferences from site options
-		subdomain = get_subdomain(site_options['domain'])
-		plan = choose_plan(site_options['plans'])
+		subdomain = get_subdomain(site_options["domain"])
+		plan = choose_plan(site_options["plans"])
 
 		app_groups = site_options["groups"]
 		selected_group, filtered_apps = filter_apps(app_groups)
@@ -269,16 +252,17 @@ def frappecloud_migrator(local_site, remote_site):
 		frappe.destroy()
 
 		if site_creation_request.ok:
-			print(f"Site creation started at {site_creation_request.json()['message']}")
+			print("Site creation started at {}".format(site_creation_request.json()["message"]))
 		else:
-			print(f"Request failed with error code {site_creation_request.status_code}")
+			print("Request failed with error code {}".format(site_creation_request.status_code))
+			reason = html2text(site_creation_request.text)
+			print(reason)
 
 
 def migrate_to(local_site, remote_site):
 	if remote_site in ("frappe.cloud", "frappecloud.com"):
-		remote_site = "cloud:8002"
-		# remote_site = "frappecloud.com"
+		remote_site = "frappecloud.com"
 		return frappecloud_migrator(local_site, remote_site)
 	else:
-		print(f"{remote_site} is not supported yet")
+		print("{} is not supported yet".format(remote_site))
 		sys.exit(1)

From 1ee09fa76ef71c95b9f1444596e82873850e1e9d Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 12:25:02 +0530
Subject: [PATCH 135/274] chore: pin terminaltables dependency

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c4cb79892a..e0ab166a8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -60,7 +60,7 @@ semantic-version==2.8.4
 six==1.14.0
 sqlparse==0.2.4
 stripe==2.40.0
-terminaltables
+terminaltables==3.1.0
 unittest-xml-reporting==2.5.2
 urllib3==1.25.8
 watchdog==0.8.0

From 07893b295b260e44e0ef7f8d02351cdd3cf0934f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 12:31:20 +0530
Subject: [PATCH 136/274] fix: enable forms for developers

---
 frappe/desk/doctype/desk_page/desk_page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.js b/frappe/desk/doctype/desk_page/desk_page.js
index ec8eaaa60b..503859eb61 100644
--- a/frappe/desk/doctype/desk_page/desk_page.js
+++ b/frappe/desk/doctype/desk_page/desk_page.js
@@ -12,7 +12,7 @@ frappe.ui.form.on('Desk Page', {
 			frm.set_df_property("extends", "read_only", true);
 		}
 
-		if (frm.doc.for_user || frm.doc.is_standard) {
+		if (frm.doc.for_user || (frm.doc.is_standard && !frappe.boot.developer_mode)) {
 			frm.trigger('disable_form');
 		}
 	},

From 2c5fe271ff61b4896eeafe58dfdac08abd86a76c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 12:45:56 +0530
Subject: [PATCH 137/274] feat: hide desk dashboard if onboarding is present

---
 frappe/public/js/frappe/views/desktop/desktop.js | 3 ++-
 frappe/public/js/frappe/widgets/widget_group.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js
index 5956a6310d..51add61f07 100644
--- a/frappe/public/js/frappe/views/desktop/desktop.js
+++ b/frappe/public/js/frappe/views/desktop/desktop.js
@@ -294,7 +294,7 @@ class DesktopPage {
 
 	make_charts() {
 		return frappe.dashboard_utils.get_dashboard_settings().then(settings => {
-			let chart_config = settings.chart_config? JSON.parse(settings.chart_config): {};
+			let chart_config = settings.chart_config ? JSON.parse(settings.chart_config): {};
 			if (this.data.charts.items) {
 				this.data.charts.items.map(chart => {
 					chart.chart_settings = chart_config[chart.chart_name] || {};
@@ -306,6 +306,7 @@ class DesktopPage {
 				container: this.page,
 				type: "chart",
 				columns: 1,
+				hidden: Boolean(this.onboarding_widget),
 				options: {
 					allow_sorting: this.allow_customization,
 					allow_create: this.allow_customization,
diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js
index 8c8dd02968..2147cd0dee 100644
--- a/frappe/public/js/frappe/widgets/widget_group.js
+++ b/frappe/public/js/frappe/widgets/widget_group.js
@@ -52,6 +52,7 @@ export default class WidgetGroup {
 				</div>
 			</div>`);
 		this.widget_area = widget_area;
+		if (this.hidden) this.widget_area.hide()
 		this.title_area = widget_area.find(".widget-group-title");
 		this.control_area = widget_area.find(".widget-group-control");
 		this.body = widget_area.find(".widget-group-body");
@@ -96,7 +97,7 @@ export default class WidgetGroup {
 	}
 
 	customize() {
-		this.widget_area.show();
+		if (!this.hidden) this.widget_area.show();
 		this.widgets_list.forEach((wid) => {
 			wid.customize(this.options);
 		});

From a48c24e4bf9bf96671a4f1d4359fc34a0c59faac Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 13:01:46 +0530
Subject: [PATCH 138/274] chore: consistent functions used for inputs, removed
 unused imports

---
 frappe/utils/commands.py          | 14 ++++++++++++++
 frappe/utils/remote_migrations.py | 21 +++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/frappe/utils/commands.py b/frappe/utils/commands.py
index 3c16193173..babefc56e2 100644
--- a/frappe/utils/commands.py
+++ b/frappe/utils/commands.py
@@ -23,3 +23,17 @@ def padme(me):
 		print()
 		return result
 	return empty_line
+
+
+def log(message, colour=''):
+	colours = {
+		"nc": '\033[0m',
+		"blue": '\033[94m',
+		"green": '\033[92m',
+		"yellow": '\033[93m',
+		"red": '\033[91m',
+		"silver": '\033[90m'
+	}
+	colour = colours.get(colour, "")
+	end_line = '\033[0m'
+	print(colour + message + end_line)
diff --git a/frappe/utils/remote_migrations.py b/frappe/utils/remote_migrations.py
index c89134f27c..656fb803de 100644
--- a/frappe/utils/remote_migrations.py
+++ b/frappe/utils/remote_migrations.py
@@ -14,8 +14,7 @@ import requests
 import frappe
 import frappe.utils.backups
 from frappe.utils import get_installed_apps_info
-from frappe.utils.commands import get_first_party_apps, render_table, padme
-
+from frappe.utils.commands import render_table, padme
 
 
 def get_new_site_options():
@@ -69,12 +68,12 @@ def choose_plan(plans_list):
 	render_plan_table(plans_list)
 
 	while True:
-		input_plan = input("Send plan?: ").strip()
+		input_plan = click.prompt("Select Plan").strip()
 		if input_plan in available_plans:
 			print("{} Plan selected ✅".format(input_plan))
 			return input_plan
 		else:
-			print("Invalid selection...try again ❌")
+			print("Invalid Selection ❌")
 
 
 @padme
@@ -133,15 +132,17 @@ def filter_apps(app_groups):
 	render_group_table(app_groups)
 
 	while True:
+		app_group_index = click.prompt("Select App Group #", type=int) - 1
 		try:
-			app_group_index = int(input("Select App Group #: ").strip()) - 1
 			selected_group = app_groups[app_group_index]
-			is_compat, filtered_apps = check_app_compat(selected_group)
 		except:
-			print("Invalid Selection")
-			sys.exit(1)
+			print("Invalid Selection ❌")
+			break
+
+		is_compat, filtered_apps = check_app_compat(selected_group)
 
 		if is_compat or click.confirm("Continue anyway?"):
+			print("App Group {} selected! ✅".format(selected_group["name"]))
 			break
 
 	return selected_group["name"], filtered_apps
@@ -149,7 +150,7 @@ def filter_apps(app_groups):
 @padme
 def create_session():
 	# take user input from STDIN
-	username = input("Username: ").strip()
+	username = click.prompt("Username").strip()
 	password = getpass.unix_getpass()
 
 	auth_credentials = {"usr": username, "pwd": password}
@@ -168,7 +169,7 @@ def create_session():
 @padme
 def get_subdomain(domain):
 	while True:
-		subdomain = input("Enter subdomain: ").strip()
+		subdomain = click.prompt("Enter subdomain: ").strip()
 		if is_valid_subdomain(subdomain) and is_subdomain_available(subdomain):
 			print("Site Domain: {}.{}".format(subdomain, domain))
 			return subdomain

From 3fcc15685ab85929b6f594e137251c38a3c99974 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Sun, 10 May 2020 04:07:14 +0530
Subject: [PATCH 139/274] fix: dont show any output unless verbose set

---
 frappe/utils/backups.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index a4c2c4bb70..0a04db2c3e 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -103,7 +103,8 @@ class BackupGenerator:
 			cmd_string = """tar -cf %s %s""" % (backup_path, files_path)
 			err, out = frappe.utils.execute_in_shell(cmd_string)
 
-			print('Backed up files', os.path.abspath(backup_path))
+			if verbose:
+				print('Backed up files', os.path.abspath(backup_path))
 
 	def take_dump(self):
 		import frappe.utils
@@ -151,7 +152,6 @@ def get_backup():
 		This function is executed when the user clicks on
 		Toos > Download Backup
 	"""
-	#if verbose: print frappe.db.cur_db_name + " " + conf.db_password
 	delete_temp_backups()
 	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name,\
 						  frappe.conf.db_password, db_host = frappe.db.host)

From 00bace4d3fcff50372e34e2c0d2772a7098cf926 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 14 May 2020 14:38:38 +0530
Subject: [PATCH 140/274] fix: linting issues sider

---
 frappe/public/js/frappe/widgets/widget_group.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js
index 2147cd0dee..e82cbc6edf 100644
--- a/frappe/public/js/frappe/widgets/widget_group.js
+++ b/frappe/public/js/frappe/widgets/widget_group.js
@@ -52,7 +52,7 @@ export default class WidgetGroup {
 				</div>
 			</div>`);
 		this.widget_area = widget_area;
-		if (this.hidden) this.widget_area.hide()
+		if (this.hidden) this.widget_area.hide();
 		this.title_area = widget_area.find(".widget-group-title");
 		this.control_area = widget_area.find(".widget-group-control");
 		this.body = widget_area.find(".widget-group-body");

From 791bb82255ed3eb1dd6a7bd65893f4283a283d8b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 15:10:51 +0530
Subject: [PATCH 141/274] feat: rename doctype

---
 .../deploy_instance/deploy_instance.js        |  8 ---
 .../deploy_instance/test_deploy_instance.py   | 10 ---
 .../__init__.py                               |  0
 .../package_publish_target.json}              |  7 +-
 .../package_publish_target.py}                |  2 +-
 .../__init__.py                               |  0
 .../package_publish_tool.js}                  | 47 +++++++++---
 .../package_publish_tool.json}                | 58 ++++++++-------
 .../package_publish_tool.py}                  | 71 ++++++++-----------
 .../test_package_publish_tool.py}             |  2 +-
 frappe/public/js/frappe/utils/pretty_date.js  |  1 +
 11 files changed, 104 insertions(+), 102 deletions(-)
 delete mode 100644 frappe/custom/doctype/deploy_instance/deploy_instance.js
 delete mode 100644 frappe/custom/doctype/deploy_instance/test_deploy_instance.py
 rename frappe/custom/doctype/{deploy_instance => package_publish_target}/__init__.py (100%)
 rename frappe/custom/doctype/{deploy_instance/deploy_instance.json => package_publish_target/package_publish_target.json} (83%)
 rename frappe/custom/doctype/{deploy_instance/deploy_instance.py => package_publish_target/package_publish_target.py} (86%)
 rename frappe/custom/doctype/{package => package_publish_tool}/__init__.py (100%)
 rename frappe/custom/doctype/{package/package.js => package_publish_tool/package_publish_tool.js} (66%)
 rename frappe/custom/doctype/{package/package.json => package_publish_tool/package_publish_tool.json} (62%)
 rename frappe/custom/doctype/{package/package.py => package_publish_tool/package_publish_tool.py} (68%)
 rename frappe/custom/doctype/{package/test_package.py => package_publish_tool/test_package_publish_tool.py} (78%)

diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.js b/frappe/custom/doctype/deploy_instance/deploy_instance.js
deleted file mode 100644
index d4b6e75155..0000000000
--- a/frappe/custom/doctype/deploy_instance/deploy_instance.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('DeployInstance', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/custom/doctype/deploy_instance/test_deploy_instance.py b/frappe/custom/doctype/deploy_instance/test_deploy_instance.py
deleted file mode 100644
index cdacc3a1ca..0000000000
--- a/frappe/custom/doctype/deploy_instance/test_deploy_instance.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestDeployInstance(unittest.TestCase):
-	pass
diff --git a/frappe/custom/doctype/deploy_instance/__init__.py b/frappe/custom/doctype/package_publish_target/__init__.py
similarity index 100%
rename from frappe/custom/doctype/deploy_instance/__init__.py
rename to frappe/custom/doctype/package_publish_target/__init__.py
diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.json b/frappe/custom/doctype/package_publish_target/package_publish_target.json
similarity index 83%
rename from frappe/custom/doctype/deploy_instance/deploy_instance.json
rename to frappe/custom/doctype/package_publish_target/package_publish_target.json
index 4bb140f088..ccf3f2ea05 100644
--- a/frappe/custom/doctype/deploy_instance/deploy_instance.json
+++ b/frappe/custom/doctype/package_publish_target/package_publish_target.json
@@ -1,6 +1,6 @@
 {
  "actions": [],
- "creation": "2020-03-18 18:25:02.024237",
+ "creation": "2020-05-13 16:04:32.724663",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
@@ -27,16 +27,17 @@
   {
    "fieldname": "password",
    "fieldtype": "Password",
+   "in_list_view": 1,
    "label": "Password",
    "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-14 13:56:31.167730",
+ "modified": "2020-05-13 16:04:49.943057",
  "modified_by": "Administrator",
  "module": "Custom",
- "name": "Deploy Instance",
+ "name": "Package Publish Target",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
diff --git a/frappe/custom/doctype/deploy_instance/deploy_instance.py b/frappe/custom/doctype/package_publish_target/package_publish_target.py
similarity index 86%
rename from frappe/custom/doctype/deploy_instance/deploy_instance.py
rename to frappe/custom/doctype/package_publish_target/package_publish_target.py
index 9bc2e9192e..34eee02562 100644
--- a/frappe/custom/doctype/deploy_instance/deploy_instance.py
+++ b/frappe/custom/doctype/package_publish_target/package_publish_target.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class DeployInstance(Document):
+class PackagePublishTarget(Document):
 	pass
diff --git a/frappe/custom/doctype/package/__init__.py b/frappe/custom/doctype/package_publish_tool/__init__.py
similarity index 100%
rename from frappe/custom/doctype/package/__init__.py
rename to frappe/custom/doctype/package_publish_tool/__init__.py
diff --git a/frappe/custom/doctype/package/package.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
similarity index 66%
rename from frappe/custom/doctype/package/package.js
rename to frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index 956bbfc05c..3d84a50820 100644
--- a/frappe/custom/doctype/package/package.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Package', {
+frappe.ui.form.on('Package Publish Tool', {
 	refresh: function(frm) {
 		frm.set_query("document_type", "package_details", function () {
 			return {
@@ -20,15 +20,46 @@ frappe.ui.form.on('Package', {
 			}
 		});
 
-		if (frm.doc.instances) {
-			frm.add_custom_button(__("Deploy"), function() {
-				frm.call("deploy_package");
+		frm.trigger("show_instructions");
+		frm.trigger("last_deployed_on");
+		frm.trigger("set_dirty_trigger");
+		frm.trigger("set_deploy_primary_action");
+	},
+	last_deployed_on: function(frm) {
+		if (frm.doc.last_deployed_on) {
+			frm.trigger("show_indicator");
+		}
+	},
+	show_indicator: function(frm) {
+		let pretty_date = frappe.datetime.prettyDate(frm.doc.last_deployed_on);
+		frm.page.set_indicator(__("Last deployed {0}", [pretty_date]), "blue");
+	},
+	set_dirty_trigger: function(frm) {
+		$(frm.wrapper).on("dirty", function() {
+			frm.page.set_primary_action(__('Save'), () => frm.save());
+		})
+	},
+	set_deploy_primary_action: function(frm) {
+		if (frm.doc.package_details.length && frm.doc.instances.length){
+			frm.page.set_primary_action(__("Deploy"), function () {
+				frappe.call({
+					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
+					callback: function(r) {
+						frappe.msgprint(__("Package has been published."));
+					}
+				});
 			});
 		}
-
 	},
-	import: function(frm) {
-		frm.call("import_from_package");
+	show_instructions: function(frm) {
+		let field = frm.get_field("html_info");
+		field.html(`
+			<p class="text-muted small">
+				- Create a Package by selecting the Documents and filters in the Package table.<br>
+				- Add the Remote Instance's URL, Username and Password to the Instances table.<br>
+				- Once the above details are filled, Deploy button will be visible and the Package will be deployed on click.<br>
+			</p>
+		`);
 	}
 });
 
@@ -115,4 +146,4 @@ frappe.ui.form.on('Package Detail', {
 			});
 		});
 	},
-});
+});
\ No newline at end of file
diff --git a/frappe/custom/doctype/package/package.json b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
similarity index 62%
rename from frappe/custom/doctype/package/package.json
rename to frappe/custom/doctype/package_publish_tool/package_publish_tool.json
index 2bec7f9b79..cdb6f0ce84 100644
--- a/frappe/custom/doctype/package/package.json
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
@@ -1,59 +1,57 @@
 {
  "actions": [],
- "creation": "2020-03-14 11:20:14.850552",
+ "creation": "2020-05-13 15:54:38.082657",
  "doctype": "DocType",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "html_info",
+  "sb_00",
   "package_details",
-  "section_break_2",
+  "sb_01",
   "instances",
-  "import_section",
-  "attach",
-  "import"
+  "last_deployed_on"
  ],
  "fields": [
-  {
-   "collapsible": 1,
-   "collapsible_depends_on": "attach",
-   "fieldname": "import_section",
-   "fieldtype": "Section Break",
-   "label": "Import Package"
-  },
-  {
-   "fieldname": "import",
-   "fieldtype": "Button",
-   "label": "Import"
-  },
-  {
-   "fieldname": "attach",
-   "fieldtype": "Attach",
-   "label": "Attach Package"
-  },
   {
    "description": "Click on the row for accessing filters.",
    "fieldname": "package_details",
    "fieldtype": "Table",
-   "label": "Package Details",
+   "label": "Package",
    "options": "Package Detail"
   },
-  {
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break"
-  },
   {
    "fieldname": "instances",
    "fieldtype": "Table",
    "label": "Instances",
-   "options": "Deploy Instance"
+   "options": "Package Publish Target"
+  },
+  {
+   "fieldname": "html_info",
+   "fieldtype": "HTML"
+  },
+  {
+   "fieldname": "last_deployed_on",
+   "fieldtype": "Datetime",
+   "hidden": 1,
+   "label": "Last Deployed On",
+   "read_only": 1
+  },
+  {
+   "fieldname": "sb_00",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "sb_01",
+   "fieldtype": "Section Break"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-14 13:50:50.779396",
+ "modified": "2020-05-14 15:09:38.092918",
  "modified_by": "Administrator",
  "module": "Custom",
- "name": "Package",
+ "name": "Package Publish Tool",
  "owner": "Administrator",
  "permissions": [
   {
diff --git a/frappe/custom/doctype/package/package.py b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
similarity index 68%
rename from frappe/custom/doctype/package/package.py
rename to frappe/custom/doctype/package_publish_tool/package_publish_tool.py
index b4427d55bc..f4d71a9fd9 100644
--- a/frappe/custom/doctype/package/package.py
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
@@ -15,57 +15,46 @@ from frappe.frappeclient import FrappeClient
 from frappe.model.naming import make_autoname
 from frappe.utils.password import get_decrypted_password
 
-class Package(Document):
-	def import_from_package(self):
-		filters = {"attached_to_doctype": "Package", "attached_to_name": "Package"}
-		files = frappe.get_list("File", filters=filters, limit=1, order_by="creation desc")
-		if not files:
-			frappe.msgprint(_("No file attach for Importing."))
-			return
+class PackagePublishTool(Document):
+	pass
 
-		for f in files:
-			fname, fcontents = get_file(f.name)
-			import_package(fcontents)
+@frappe.whitelist()
+def deploy_package():
+	package, doc = export_package()
 
-		frappe.msgprint(_("Package Imported."))
+	file_name = make_autoname("Package.####")
+	save_file(file_name, json.dumps(package), "Package Publish Tool", "Package Publish Tool")
 
-	def deploy_package(self):
-		package = export_package()
+	length = len(doc.instances)
+	for idx, instance in enumerate(doc.instances):
+		frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance_url, "prefix": _("Deploying")},
+			user=frappe.session.user)
 
-		for dt_file in frappe.get_list("File", filters={"attached_to_doctype": "Release", "attached_to_name": "Release"}):
-			frappe.delete_doc_if_exists("File", dt_file.name)
+		install_package_to_remote(package, instance)
 
-		file_name = make_autoname("Package")
-		save_file(file_name, json.dumps(package), "Package", "Package")
+	frappe.db.set_value("Package Publish Tool", "Package Publish Tool", "last_deployed_on", frappe.utils.now_datetime())
 
-		length = len(self.instances)
-		for idx, instance in enumerate(self.instances):
-			frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance_url, "prefix": _("Deploying")},
-				user=frappe.session.user)
+def install_package_to_remote(package, instance):
+	return
+	try:
+		connection = FrappeClient(instance.instance_url, instance.username, get_decrypted_password(instance.doctype, instance.name))
+	except Exception:
+		frappe.log_error(frappe.get_traceback())
+		frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(instance.instance_url))
 
-			self.install_package_to_remote(package, instance)
-
-	def install_package_to_remote(self, package, instance):
-		print((instance.doctype, instance.name))
-		try:
-			connection = FrappeClient(instance.instance_url, instance.username, get_decrypted_password(instance.doctype, instance.name))
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(instance.instance_url))
-
-		try:
-			connection.post_request({
-				"cmd": "frappe.custom.doctype.package.package.import_package",
-				"package": json.dumps(package)
-			})
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(instance.instance_url))
+	try:
+		connection.post_request({
+			"cmd": "frappe.custom.doctype.package_publish_tool.package_publish_tool.import_package",
+			"package": json.dumps(package)
+		})
+	except Exception:
+		frappe.log_error(frappe.get_traceback())
+		frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(instance.instance_url))
 
 @frappe.whitelist()
 def export_package():
 	"""Export package as JSON."""
-	package_doc = frappe.get_single("Package")
+	package_doc = frappe.get_single("Package Publish Tool")
 	package = []
 
 	for doctype in package_doc.package_details:
@@ -108,7 +97,7 @@ def export_package():
 
 			package.append(document)
 
-	return post_process(package)
+	return post_process(package), package_doc
 
 @frappe.whitelist()
 def import_package(package=None):
diff --git a/frappe/custom/doctype/package/test_package.py b/frappe/custom/doctype/package_publish_tool/test_package_publish_tool.py
similarity index 78%
rename from frappe/custom/doctype/package/test_package.py
rename to frappe/custom/doctype/package_publish_tool/test_package_publish_tool.py
index 3a17d51260..8332240543 100644
--- a/frappe/custom/doctype/package/test_package.py
+++ b/frappe/custom/doctype/package_publish_tool/test_package_publish_tool.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestPackage(unittest.TestCase):
+class TestPackagePublishTool(unittest.TestCase):
 	pass
diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js
index ef235ed3b1..7618d58829 100644
--- a/frappe/public/js/frappe/utils/pretty_date.js
+++ b/frappe/public/js/frappe/utils/pretty_date.js
@@ -76,6 +76,7 @@ window.comment_when = function(datetime, mini) {
 		+ prettyDate(datetime, mini) + '</span>';
 };
 frappe.datetime.comment_when = comment_when;
+frappe.datetime.prettyDate = prettyDate;
 
 frappe.datetime.refresh_when = function() {
 	if (jQuery) {

From 94b6fa4319a0bff37428f7875e8843a06bc1607e Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 14 May 2020 15:27:17 +0530
Subject: [PATCH 142/274] fix: report filters in dialog

---
 frappe/public/js/frappe/views/reports/query_report.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 5105494862..e79e43ae02 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -330,8 +330,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	evaluate_depends_on_value(expression, filter_label) {
 		let out = null;
-		let filters = this.get_filter_values();
-		if (filters) {
+		let doc = this.get_filter_values();
+		if (doc) {
 			if (typeof expression === 'boolean') {
 				out = expression;
 			} else if (expression.substr(0, 5) == 'eval:') {
@@ -341,7 +341,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					frappe.throw(__(`Invalid "depends_on" expression set in filter ${filter_label}`));
 				}
 			} else {
-				var value = filters[expression];
+				var value = doc[expression];
 				if ($.isArray(value)) {
 					out = !!value.length;
 				} else {

From e5d5d0b6bb6c74007da312fb647d9a16b3f2e61d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 16:07:57 +0530
Subject: [PATCH 143/274] feat: allow linking dashboard in desk page

---
 frappe/desk/desktop.py                               | 2 ++
 frappe/desk/doctype/desk_shortcut/desk_shortcut.json | 4 ++--
 frappe/public/js/frappe/widgets/utils.js             | 2 ++
 frappe/public/js/frappe/widgets/widget_dialog.js     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index ddcfb670d4..e2fe020eca 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -127,6 +127,8 @@ class Workspace:
 			return name in self.allowed_reports
 		if item_type == "help":
 			return True
+		if item_type == "dashboard":
+			return True
 
 		return False
 
diff --git a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
index 550ea609c8..f3fd546a77 100644
--- a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
+++ b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
@@ -23,7 +23,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Type",
-   "options": "DocType\nReport\nPage",
+   "options": "DocType\nReport\nPage\nDashboard",
    "reqd": 1
   },
   {
@@ -88,7 +88,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-13 19:26:34.229669",
+ "modified": "2020-05-14 16:02:15.420993",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Shortcut",
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 0d93bb3784..f336335d1c 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -24,6 +24,8 @@ function generate_route(item) {
 			route = "List/" + item.doctype + "/Report/" + item.name;
 		} else if (type === "page") {
 			route = item.name;
+		} else if (type === "dashboard") {
+			route = "dashboard/" + item.name;
 		}
 
 		route = "#" + route;
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 31215a40c3..5c44533b37 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -145,7 +145,7 @@ class ShortcutDialog extends WidgetDialog {
 				fieldname: "type",
 				label: "Type",
 				reqd: 1,
-				options: "DocType\nReport\nPage",
+				options: "DocType\nReport\nPage\nDashboard",
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						this.dialog.fields_dict.link_to.get_query = () => {

From b55d168f2ab7b0564c531048a83fa38950d7ecd0 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 16:10:58 +0530
Subject: [PATCH 144/274] fix: show alert while deploying

---
 .../doctype/package_publish_tool/package_publish_tool.js  | 5 +++++
 .../package_publish_tool/package_publish_tool.json        | 8 +++++---
 .../doctype/package_publish_tool/package_publish_tool.py  | 1 -
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index 3d84a50820..7822299f21 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -42,6 +42,11 @@ frappe.ui.form.on('Package Publish Tool', {
 	set_deploy_primary_action: function(frm) {
 		if (frm.doc.package_details.length && frm.doc.instances.length){
 			frm.page.set_primary_action(__("Deploy"), function () {
+				frappe.show_alert({
+					message: __("Deploying Package"),
+					indicator: "green"
+				});
+
 				frappe.call({
 					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
 					callback: function(r) {
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
index cdb6f0ce84..9b1db2c2ff 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
@@ -18,13 +18,15 @@
    "fieldname": "package_details",
    "fieldtype": "Table",
    "label": "Package",
-   "options": "Package Detail"
+   "options": "Package Detail",
+   "reqd": 1
   },
   {
    "fieldname": "instances",
    "fieldtype": "Table",
    "label": "Instances",
-   "options": "Package Publish Target"
+   "options": "Package Publish Target",
+   "reqd": 1
   },
   {
    "fieldname": "html_info",
@@ -48,7 +50,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-05-14 15:09:38.092918",
+ "modified": "2020-05-14 16:06:19.714596",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package Publish Tool",
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
index f4d71a9fd9..09549107be 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
@@ -35,7 +35,6 @@ def deploy_package():
 	frappe.db.set_value("Package Publish Tool", "Package Publish Tool", "last_deployed_on", frappe.utils.now_datetime())
 
 def install_package_to_remote(package, instance):
-	return
 	try:
 		connection = FrappeClient(instance.instance_url, instance.username, get_decrypted_password(instance.doctype, instance.name))
 	except Exception:

From c14b6c592a1eacd4158801ad9865dd7ed00c9a87 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 16:27:34 +0530
Subject: [PATCH 145/274] fix: move code to meta.py

---
 .../custom/doctype/custom_link/custom_link.js |  4 +++
 .../custom/doctype/custom_link/custom_link.py | 33 ------------------
 frappe/model/meta.py                          | 34 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/frappe/custom/doctype/custom_link/custom_link.js b/frappe/custom/doctype/custom_link/custom_link.js
index f1c06daeeb..9540ec5662 100644
--- a/frappe/custom/doctype/custom_link/custom_link.js
+++ b/frappe/custom/doctype/custom_link/custom_link.js
@@ -12,5 +12,9 @@ frappe.ui.form.on('Custom Link', {
 				}
 			}
 		});
+
+		frm.add_custom_button(__('Go to {0} List', [frm.doc.document_type]), function() {
+			frappe.set_route('List', frm.doc.document_type);
+		});
 	}
 });
diff --git a/frappe/custom/doctype/custom_link/custom_link.py b/frappe/custom/doctype/custom_link/custom_link.py
index b9a88b58f2..be57d256f2 100644
--- a/frappe/custom/doctype/custom_link/custom_link.py
+++ b/frappe/custom/doctype/custom_link/custom_link.py
@@ -8,36 +8,3 @@ from frappe.model.document import Document
 
 class CustomLink(Document):
 	pass
-
-def get_custom_doctype_links(doctype, data):
-	if frappe.get_all("Custom Link", {"document_type": doctype}):
-		doc = frappe.get_doc("Custom Link", doctype)
-
-		if not data.transactions:
-			# init groups
-			data.transactions = []
-			data.non_standard_fieldnames = {}
-
-		for link in doc.links:
-			link.added = False
-			for group in data.transactions:
-				# group found
-				if group.get("label") == link.group:
-					if not link.link_doctype in group.get("items"):
-						group.get("items").append(link.link_doctype)
-					link.added = True
-
-			if not link.added:
-				# group not found, make a new group
-				data.transactions.append({
-					"label": link.group,
-					"items": [link.link_doctype]
-				})
-
-			if link.link_fieldname != data.fieldname:
-				if data.fieldname:
-					data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
-				else:
-					data.fieldname = link.link_fieldname
-
-	return data
\ No newline at end of file
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 156fe2dba3..717070a217 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -26,7 +26,6 @@ from frappe.model.base_document import BaseDocument
 from frappe.modules import load_doctype_module
 from frappe.model.workflow import get_workflow_name
 from frappe import _
-from frappe.custom.doctype.custom_link.custom_link import get_custom_doctype_links
 
 def get_meta(doctype, cached=True):
 	if cached:
@@ -609,3 +608,36 @@ def trim_tables(doctype=None):
 			query = """alter table `tab{doctype}` {columns}""".format(
 				doctype=doctype, columns=columns_to_remove)
 			frappe.db.sql_ddl(query)
+
+def get_custom_doctype_links(doctype, data):
+	if frappe.get_all("Custom Link", {"document_type": doctype}):
+		doc = frappe.get_doc("Custom Link", doctype)
+
+		if not data.transactions:
+			# init groups
+			data.transactions = []
+			data.non_standard_fieldnames = {}
+
+		for link in doc.links:
+			link.added = False
+			for group in data.transactions:
+				# group found
+				if group.get("label") == link.group:
+					if not link.link_doctype in group.get("items"):
+						group.get("items").append(link.link_doctype)
+					link.added = True
+
+			if not link.added:
+				# group not found, make a new group
+				data.transactions.append({
+					"label": link.group,
+					"items": [link.link_doctype]
+				})
+
+			if link.link_fieldname != data.fieldname:
+				if data.fieldname:
+					data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
+				else:
+					data.fieldname = link.link_fieldname
+
+	return data
\ No newline at end of file

From aa98d6ffb6f32af4f9a15701350b05fce104967c Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 16:37:14 +0530
Subject: [PATCH 146/274] fix: sider changes

---
 frappe/custom/doctype/custom_link/custom_link.js | 2 +-
 frappe/custom/doctype/custom_link/custom_link.py | 2 +-
 frappe/model/meta.py                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/custom/doctype/custom_link/custom_link.js b/frappe/custom/doctype/custom_link/custom_link.js
index 9540ec5662..8662724b1a 100644
--- a/frappe/custom/doctype/custom_link/custom_link.js
+++ b/frappe/custom/doctype/custom_link/custom_link.js
@@ -10,7 +10,7 @@ frappe.ui.form.on('Custom Link', {
 					istable: 0,
 					module: ['not in', ["Email", "Core", "Custom", "Event Streaming", "Social", "Data Migration", "Geo", "Desk"]]
 				}
-			}
+			};
 		});
 
 		frm.add_custom_button(__('Go to {0} List', [frm.doc.document_type]), function() {
diff --git a/frappe/custom/doctype/custom_link/custom_link.py b/frappe/custom/doctype/custom_link/custom_link.py
index be57d256f2..11316d5751 100644
--- a/frappe/custom/doctype/custom_link/custom_link.py
+++ b/frappe/custom/doctype/custom_link/custom_link.py
@@ -3,7 +3,7 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe
+# import frappe
 from frappe.model.document import Document
 
 class CustomLink(Document):
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 717070a217..a9ae19af6d 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -623,7 +623,7 @@ def get_custom_doctype_links(doctype, data):
 			for group in data.transactions:
 				# group found
 				if group.get("label") == link.group:
-					if not link.link_doctype in group.get("items"):
+					if link.link_doctype not in group.get("items"):
 						group.get("items").append(link.link_doctype)
 					link.added = True
 

From 69afa4f10cabc89846fc321c96c9856c32132460 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 14 May 2020 16:57:35 +0530
Subject: [PATCH 147/274] feat: onboarding enhancements (#10356)

* feat: added go to path option in onboarding step

* feat: added show full form check and doctype cleanup

* feat: added show full form controller to onboarding widget

* feat: don't mark complete step on go to page

* feat: make callback message optional

* feat: mark go to page as non mandatory

* feat: use check for skipped step

* fix: spaces

* feat: set form as dirty on routing

* style: remove unused variable
---
 .../onboarding_step/onboarding_step.json      | 59 ++++++++++++++--
 .../onboarding_step/onboarding_step.py        |  4 ++
 .../js/frappe/widgets/onboarding_widget.js    | 68 ++++++++++++++++---
 3 files changed, 116 insertions(+), 15 deletions(-)

diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.json b/frappe/desk/doctype/onboarding_step/onboarding_step.json
index 3bc9d5f286..37d1d63dbe 100644
--- a/frappe/desk/doctype/onboarding_step/onboarding_step.json
+++ b/frappe/desk/doctype/onboarding_step/onboarding_step.json
@@ -15,11 +15,16 @@
   "action",
   "column_break_7",
   "reference_document",
+  "show_full_form",
   "is_single",
   "reference_report",
   "report_reference_doctype",
   "report_type",
   "report_description",
+  "path",
+  "callback_title",
+  "callback_message",
+  "validate_action",
   "field",
   "value_to_validate",
   "video_url"
@@ -58,7 +63,7 @@
    "fieldname": "action",
    "fieldtype": "Select",
    "label": "Action",
-   "options": "Create Entry\nUpdate Settings\nShow Form Tour\nView Report\nWatch Video",
+   "options": "Create Entry\nUpdate Settings\nShow Form Tour\nView Report\nGo to Page\nWatch Video",
    "reqd": 1
   },
   {
@@ -70,6 +75,7 @@
    "fieldname": "reference_document",
    "fieldtype": "Link",
    "label": "Reference Document",
+   "mandatory_depends_on": "eval:doc.action == \"Create Entry\" || doc.action == \"Update Settings\" || doc.action == \"Create Entry\" || doc.action == \"Show Form Tour\"",
    "options": "DocType"
   },
   {
@@ -84,7 +90,8 @@
    "depends_on": "eval:doc.action == \"Watch Video\"",
    "fieldname": "video_url",
    "fieldtype": "Data",
-   "label": "Video URL"
+   "label": "Video URL",
+   "mandatory_depends_on": "eval:doc.action == \"Watch Video\""
   },
   {
    "depends_on": "eval:doc.action == \"View Report\"",
@@ -102,17 +109,19 @@
    "label": "Is Skipped"
   },
   {
-   "depends_on": "eval:doc.action == \"Update Settings\"",
+   "depends_on": "eval:doc.action == \"Update Settings\" && doc.validate_action",
    "fieldname": "field",
    "fieldtype": "Select",
-   "label": "Field"
+   "label": "Field",
+   "mandatory_depends_on": "eval:doc.action == \"Update Settings\" && doc.validate_action"
   },
   {
-   "depends_on": "eval:doc.action == \"Update Settings\"",
+   "depends_on": "eval:doc.action == \"Update Settings\" && doc.validate_action",
    "description": "Use % for any non empty value.",
    "fieldname": "value_to_validate",
    "fieldtype": "Data",
-   "label": "Value to Validate"
+   "label": "Value to Validate",
+   "mandatory_depends_on": "eval:doc.action == \"Update Settings\" && doc.validate_action"
   },
   {
    "depends_on": "eval:doc.action == \"View Report\"",
@@ -136,10 +145,46 @@
    "fieldname": "is_single",
    "fieldtype": "Check",
    "label": "Is Single"
+  },
+  {
+   "depends_on": "eval:doc.action == \"Go to Page\"",
+   "description": "Example: #Tree/Account",
+   "fieldname": "path",
+   "fieldtype": "Data",
+   "label": "Path",
+   "mandatory_depends_on": "eval:doc.action == \"Go to Page\""
+  },
+  {
+   "depends_on": "eval:doc.action == \"Go to Page\"",
+   "fieldname": "callback_title",
+   "fieldtype": "Data",
+   "label": "Callback Title"
+  },
+  {
+   "depends_on": "eval:doc.action == \"Go to Page\"",
+   "description": "This will be shown in a modal after routing",
+   "fieldname": "callback_message",
+   "fieldtype": "Small Text",
+   "label": "Callback Message"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:doc.action == \"Update Settings\"",
+   "fieldname": "validate_action",
+   "fieldtype": "Check",
+   "label": "Validate Field"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.action == \"Create Entry\"",
+   "description": "Show full form instead of a quick entry modal",
+   "fieldname": "show_full_form",
+   "fieldtype": "Check",
+   "label": "Show Full Form?"
   }
  ],
  "links": [],
- "modified": "2020-05-11 13:24:05.457160",
+ "modified": "2020-05-14 15:10:05.627706",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Onboarding Step",
diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.py b/frappe/desk/doctype/onboarding_step/onboarding_step.py
index e1cc5dfba4..8086acbb2a 100644
--- a/frappe/desk/doctype/onboarding_step/onboarding_step.py
+++ b/frappe/desk/doctype/onboarding_step/onboarding_step.py
@@ -10,3 +10,7 @@ class OnboardingStep(Document):
 	def before_export(self, doc):
 		doc.is_complete = 0
 		doc.is_skipped = 0
+
+	def validate(self):
+		if self.action == "Go to Page":
+			self.is_mandatory = 0
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index e347a70036..e869b281ae 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -25,7 +25,7 @@ export default class OnboardingWidget extends Widget {
 
 		if (step.is_skipped) {
 			status = "skipped";
-			icon_class = "fa-times-circle-o";
+			icon_class = "fa-check-circle-o";
 		}
 
 		if (step.is_complete) {
@@ -56,10 +56,17 @@ export default class OnboardingWidget extends Widget {
 		// Setup actions
 		let actions = {
 			"Watch Video": () => this.show_video(step),
-			"Create Entry": () => this.show_quick_entry(step),
+			"Create Entry": () => {
+				if (step.show_full_form) {
+					this.create_entry(step);
+				} else {
+					this.show_quick_entry(step);
+				}
+			},
 			"Show Form Tour": () => this.show_form_tour(step),
 			"Update Settings": () => this.update_settings(step),
 			"View Report": () => this.open_report(step),
+			"Go to Page": () => this.go_to_page(step),
 		};
 
 		$step.find("#title").on("click", actions[step.action]);
@@ -68,6 +75,24 @@ export default class OnboardingWidget extends Widget {
 		return $step;
 	}
 
+	go_to_page(step) {
+		frappe.set_route(step.path).then(() => {
+			if (step.callback_message) {
+				let msg_dialog = frappe.msgprint({
+					message: __(step.callback_message),
+					title: __(step.callback_title),
+					primary_action: {
+						action: () => {
+							msg_dialog.hide();
+						},
+						label: () => __("Continue"),
+					},
+					wide: true,
+				});
+			}
+		});
+	}
+
 	open_report(step) {
 		let route = generate_route({
 			name: step.reference_report,
@@ -75,10 +100,9 @@ export default class OnboardingWidget extends Widget {
 			is_query_report: ["Query Report", "Script Report"].includes(
 				step.report_type
 			),
-			doctype: step.report_reference_doctype
+			doctype: step.report_reference_doctype,
 		});
 
-
 		let current_route = frappe.get_route();
 
 		frappe.set_route(route).then(() => {
@@ -133,7 +157,7 @@ export default class OnboardingWidget extends Widget {
 							msg_dialog.hide();
 						},
 						label: () => __("Continue"),
-					}
+					},
 				});
 			});
 		};
@@ -147,6 +171,7 @@ export default class OnboardingWidget extends Widget {
 		frappe.route_hooks = {};
 		frappe.route_hooks.after_load = (frm) => {
 			frm.scroll_to_field(step.field);
+			frm.doc.__unsaved = true;
 		};
 
 		frappe.route_hooks.after_save = (frm) => {
@@ -204,6 +229,33 @@ export default class OnboardingWidget extends Widget {
 		frappe.set_route("Form", step.reference_document);
 	}
 
+	create_entry(step) {
+		let current_route = frappe.get_route();
+
+		frappe.route_hooks = {};
+
+		frappe.route_hooks.after_save = () => {
+			frappe.msgprint({
+				message: __("You're doing great, let's take you back to the onboarding page."),
+				title: __("Good Work 🎉"),
+				primary_action: {
+					action: () => {
+						frappe.set_route(current_route).then(() => {
+							this.mark_complete(step);
+						});
+					},
+					label: __("Continue"),
+				},
+			});
+
+			frappe.msg_dialog.custom_onhide = () => {
+				this.mark_complete(step);
+			};
+		};
+
+		frappe.set_route(`Form/${step.reference_document}/New ${step.reference_document} 1`);
+	}
+
 	show_quick_entry(step) {
 		let current_route = frappe.get_route_str();
 		frappe.ui.form.make_quick_entry(
@@ -221,7 +273,7 @@ export default class OnboardingWidget extends Widget {
 								});
 							},
 							label: __("Continue"),
-						}
+						},
 					});
 
 					frappe.msg_dialog.custom_onhide = () => {
@@ -271,7 +323,7 @@ export default class OnboardingWidget extends Widget {
 	update_step_status(step, status, value, callback) {
 		let icon_class = {
 			is_complete: "fa-check-circle-o",
-			is_skipped: "fa-times-circle-o",
+			is_skipped: "fa-check-circle-o",
 		};
 
 		frappe
@@ -394,4 +446,4 @@ export default class OnboardingWidget extends Widget {
 		});
 		dismiss.appendTo(this.action_area);
 	}
-}
\ No newline at end of file
+}

From 79f41fd43f6e311dcddc617cac8d792f7380d01b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 17:05:44 +0530
Subject: [PATCH 148/274] fix: rename to __attachments

---
 .../package_detail/package_detail.json        | 65 -------------------
 .../__init__.py                               |  0
 .../package_document_type.json                | 65 +++++++++++++++++++
 .../package_document_type.py}                 |  2 +-
 .../package_publish_tool.json                 |  4 +-
 .../package_publish_tool.py                   | 12 ++--
 6 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 frappe/custom/doctype/package_detail/package_detail.json
 rename frappe/custom/doctype/{package_detail => package_document_type}/__init__.py (100%)
 create mode 100644 frappe/custom/doctype/package_document_type/package_document_type.json
 rename frappe/custom/doctype/{package_detail/package_detail.py => package_document_type/package_document_type.py} (86%)

diff --git a/frappe/custom/doctype/package_detail/package_detail.json b/frappe/custom/doctype/package_detail/package_detail.json
deleted file mode 100644
index f749587a42..0000000000
--- a/frappe/custom/doctype/package_detail/package_detail.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "engine": "InnoDB", 
- "field_order": [
-  "document_type", 
-  "column_break_2", 
-  "attachments", 
-  "overwrite", 
-  "section_break_4", 
-  "filters_json"
- ], 
- "istable": 1, 
- "modified_by": "Administrator", 
- "name": "Package Detail", 
- "links": [], 
- "fields": [
-  {
-   "label": "Document Type", 
-   "in_list_view": 1, 
-   "fieldtype": "Link", 
-   "reqd": 1, 
-   "fieldname": "document_type", 
-   "options": "DocType"
-  }, 
-  {
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break"
-  }, 
-  {
-   "default": "0", 
-   "in_list_view": 1, 
-   "fieldname": "attachments", 
-   "fieldtype": "Check", 
-   "label": "Include Attachments"
-  }, 
-  {
-   "default": "0", 
-   "in_list_view": 1, 
-   "fieldname": "overwrite", 
-   "fieldtype": "Check", 
-   "label": "Overwrite"
-  }, 
-  {
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break"
-  }, 
-  {
-   "options": "JSON", 
-   "fieldname": "filters_json", 
-   "fieldtype": "Code", 
-   "label": "Filters"
-  }
- ], 
- "track_changes": 1, 
- "creation": "2020-04-06 12:59:59.657816", 
- "doctype": "DocType", 
- "actions": [], 
- "modified": "2020-04-06 12:59:59.657816", 
- "sort_order": "DESC", 
- "module": "Custom", 
- "owner": "Administrator", 
- "sort_field": "modified", 
- "editable_grid": 1, 
- "quick_entry": 1, 
- "permissions": []
-}
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_detail/__init__.py b/frappe/custom/doctype/package_document_type/__init__.py
similarity index 100%
rename from frappe/custom/doctype/package_detail/__init__.py
rename to frappe/custom/doctype/package_document_type/__init__.py
diff --git a/frappe/custom/doctype/package_document_type/package_document_type.json b/frappe/custom/doctype/package_document_type/package_document_type.json
new file mode 100644
index 0000000000..6d011bd4e4
--- /dev/null
+++ b/frappe/custom/doctype/package_document_type/package_document_type.json
@@ -0,0 +1,65 @@
+{
+ "actions": [],
+ "creation": "2020-05-14 16:45:47.196395",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "column_break_2",
+  "attachments",
+  "overwrite",
+  "section_break_4",
+  "filters_json"
+ ],
+ "fields": [
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "attachments",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Include Attachments"
+  },
+  {
+   "default": "0",
+   "fieldname": "overwrite",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Overwrite"
+  },
+  {
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "filters_json",
+   "fieldtype": "Code",
+   "label": "Filters",
+   "options": "JSON"
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-14 16:45:47.196395",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Package Document Type",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/custom/doctype/package_detail/package_detail.py b/frappe/custom/doctype/package_document_type/package_document_type.py
similarity index 86%
rename from frappe/custom/doctype/package_detail/package_detail.py
rename to frappe/custom/doctype/package_document_type/package_document_type.py
index 0460329d85..6e166eecbd 100644
--- a/frappe/custom/doctype/package_detail/package_detail.py
+++ b/frappe/custom/doctype/package_document_type/package_document_type.py
@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-class PackageDetail(Document):
+class PackageDocumentType(Document):
 	pass
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
index 9b1db2c2ff..59d22f6ad4 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
@@ -18,7 +18,7 @@
    "fieldname": "package_details",
    "fieldtype": "Table",
    "label": "Package",
-   "options": "Package Detail",
+   "options": "Package Document Type",
    "reqd": 1
   },
   {
@@ -50,7 +50,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-05-14 16:06:19.714596",
+ "modified": "2020-05-14 16:46:20.374773",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package Publish Tool",
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
index 09549107be..415839322c 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
@@ -12,7 +12,7 @@ from frappe.utils.file_manager import save_file, get_file
 from frappe import _
 from six import string_types
 from frappe.frappeclient import FrappeClient
-from frappe.model.naming import make_autoname
+from frappe.utils import get_datetime_str, get_datetime
 from frappe.utils.password import get_decrypted_password
 
 class PackagePublishTool(Document):
@@ -22,7 +22,7 @@ class PackagePublishTool(Document):
 def deploy_package():
 	package, doc = export_package()
 
-	file_name = make_autoname("Package.####")
+	file_name = "Package-" + get_datetime_str(get_datetime())
 	save_file(file_name, json.dumps(package), "Package Publish Tool", "Package Publish Tool")
 
 	length = len(doc.instances)
@@ -90,8 +90,8 @@ def export_package():
 					})
 
 			document.update({
-				"attachments": attachments,
-				"overwrite": True if doctype.overwrite else False
+				"__attachments": attachments,
+				"__overwrite": True if doctype.overwrite else False
 			})
 
 			package.append(document)
@@ -106,8 +106,8 @@ def import_package(package=None):
 
 	for doc in package:
 		modified = doc.pop("modified")
-		overwrite = doc.pop("overwrite")
-		attachments = doc.pop("attachments")
+		overwrite = doc.pop("__overwrite")
+		attachments = doc.pop("__attachments")
 		exists = frappe.db.exists(doc.get("doctype"), doc.get("name"))
 
 		if not exists:

From 8df9cb6bede5733ba372f75e413cb89f76ea87cc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 17:09:27 +0530
Subject: [PATCH 149/274] chore: optimize imports, style fixes

---
 frappe/utils/remote_migrations.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/utils/remote_migrations.py b/frappe/utils/remote_migrations.py
index 656fb803de..90f8db0b74 100644
--- a/frappe/utils/remote_migrations.py
+++ b/frappe/utils/remote_migrations.py
@@ -1,5 +1,4 @@
 # imports - standard imports
-import functools
 import getpass
 import json
 import re
@@ -78,7 +77,6 @@ def choose_plan(plans_list):
 
 @padme
 def check_app_compat(available_group):
-	frappe_upgrade_msg = ""
 	is_compat = True
 	incompatible_apps, filtered_apps, branch_msgs = [], [], []
 	existing_group = [(app["app_name"], app["branch"]) for app in get_installed_apps_info()]
@@ -135,7 +133,7 @@ def filter_apps(app_groups):
 		app_group_index = click.prompt("Select App Group #", type=int) - 1
 		try:
 			selected_group = app_groups[app_group_index]
-		except:
+		except IndexError:
 			print("Invalid Selection ❌")
 			break
 
@@ -169,7 +167,7 @@ def create_session():
 @padme
 def get_subdomain(domain):
 	while True:
-		subdomain = click.prompt("Enter subdomain: ").strip()
+		subdomain = click.prompt("Enter subdomain").strip()
 		if is_valid_subdomain(subdomain) and is_subdomain_available(subdomain):
 			print("Site Domain: {}.{}".format(subdomain, domain))
 			return subdomain

From 30a4fd7ac0a4a30dc33baee8745f0d89986ba43b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 14 May 2020 17:16:37 +0530
Subject: [PATCH 150/274] fix: allow validations for all fieldtypes

---
 frappe/public/js/frappe/form/controls/data.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js
index 25f3ef76af..c943ec89bb 100644
--- a/frappe/public/js/frappe/form/controls/data.js
+++ b/frappe/public/js/frappe/form/controls/data.js
@@ -87,9 +87,6 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
 		return val==null ? "" : val;
 	},
 	validate: function(v) {
-		if (this.df.fieldtype !== "Data") {
-			return v;
-		}
 		if (!v) {
 			return '';
 		}

From e5a2171a66f19e1900d5316f2a1c7e17cc6f54b8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 14 May 2020 17:18:05 +0530
Subject: [PATCH 151/274] fix: set query report object for chart filters

---
 .../doctype/dashboard_chart/dashboard_chart.js     | 14 +++-----------
 frappe/public/js/frappe/widgets/chart_widget.js    | 12 +++---------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index f8d5886b26..fb6f9252ce 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -283,17 +283,7 @@ frappe.ui.form.on('Dashboard Chart', {
 				});
 			}
 		} else if (frm.chart_filters.length) {
-			fields = frm.chart_filters.filter(f => {
-				if (f.on_change && !f.reqd) {
-					return false;
-				}
-				if (f.get_query || f.get_data) {
-					f.read_only = 1;
-				}
-
-				return f.fieldname;
-			});
-
+			fields = frm.chart_filters.filter(f => f.fieldname);
 			fields.map( f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
@@ -353,6 +343,8 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 
 			dialog.show();
+			//Set query report object so that it can be used while fetching filter values in the report
+			frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
 			dialog.set_values(filters);
 		});
 	},
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index a50acfcd9d..b4c622f151 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -332,15 +332,7 @@ export default class ChartWidget extends Widget {
 								}
 							];
 						} else {
-							fields = filters.filter(f => {
-								if (f.on_change && !f.reqd) {
-									return false;
-								}
-								if (f.get_query || f.get_data) {
-									f.read_only = 1;
-								}
-								return f.fieldname;
-							});
+							fields = filters.filter(f => f.fieldname);
 						}
 					} else {
 						fields = [
@@ -384,6 +376,8 @@ export default class ChartWidget extends Widget {
 		}
 
 		dialog.show();
+		//Set query report object so that it can be used while fetching filter values in the report
+		frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
 		dialog.set_values(this.filters);
 	}
 

From 12ca630c522f668e92995a4451b177f83a42d1a8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 14 May 2020 17:22:51 +0530
Subject: [PATCH 152/274] fix: merge code

---
 frappe/model/meta.py | 89 +++++++++++++++-----------------------------
 1 file changed, 31 insertions(+), 58 deletions(-)

diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index a9ae19af6d..c8fd1a2ac2 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -434,7 +434,6 @@ class Meta(Document):
 				pass
 
 		self.add_doctype_links(data)
-		get_custom_doctype_links(self.name, data)
 
 		if not self.custom:
 			for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []):
@@ -444,34 +443,41 @@ class Meta(Document):
 
 	def add_doctype_links(self, data):
 		'''add `links` child table in standard link dashboard format'''
+		dashboard_links = []
+
 		if hasattr(self, 'links') and self.links:
-			if not data.transactions:
-				# init groups
-				data.transactions = []
-				data.non_standard_fieldnames = {}
+			dashboard_links.extend(self.links)
 
-			for link in self.links:
-				link.added = False
-				for group in data.transactions:
-					group = frappe._dict(group)
-					# group found
-					if link.group and group.label == link.group:
-						if link.link_doctype not in group.get('items'):
-							group.get('items').append(link.link_doctype)
-						link.added = True
+		if frappe.get_all("Custom Link", {"document_type": self.name}):
+			dashboard_links.extend(frappe.get_doc("Custom Link", self.name).links)
 
-				if not link.added:
-					# group not found, make a new group
-					data.transactions.append(dict(
-						label = link.group,
-						items = [link.link_doctype]
-					))
+		if not data.transactions:
+			# init groups
+			data.transactions = []
+			data.non_standard_fieldnames = {}
 
-				if link.link_fieldname != data.fieldname:
-					if data.fieldname:
-						data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
-					else:
-						data.fieldname = link.link_fieldname
+		for link in dashboard_links:
+			link.added = False
+			for group in data.transactions:
+				group = frappe._dict(group)
+				# group found
+				if link.group and group.label == link.group:
+					if link.link_doctype not in group.get('items'):
+						group.get('items').append(link.link_doctype)
+					link.added = True
+
+			if not link.added:
+				# group not found, make a new group
+				data.transactions.append(dict(
+					label = link.group,
+					items = [link.link_doctype]
+				))
+
+			if link.link_fieldname != data.fieldname:
+				if data.fieldname:
+					data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
+				else:
+					data.fieldname = link.link_fieldname
 
 
 	def get_row_template(self):
@@ -608,36 +614,3 @@ def trim_tables(doctype=None):
 			query = """alter table `tab{doctype}` {columns}""".format(
 				doctype=doctype, columns=columns_to_remove)
 			frappe.db.sql_ddl(query)
-
-def get_custom_doctype_links(doctype, data):
-	if frappe.get_all("Custom Link", {"document_type": doctype}):
-		doc = frappe.get_doc("Custom Link", doctype)
-
-		if not data.transactions:
-			# init groups
-			data.transactions = []
-			data.non_standard_fieldnames = {}
-
-		for link in doc.links:
-			link.added = False
-			for group in data.transactions:
-				# group found
-				if group.get("label") == link.group:
-					if link.link_doctype not in group.get("items"):
-						group.get("items").append(link.link_doctype)
-					link.added = True
-
-			if not link.added:
-				# group not found, make a new group
-				data.transactions.append({
-					"label": link.group,
-					"items": [link.link_doctype]
-				})
-
-			if link.link_fieldname != data.fieldname:
-				if data.fieldname:
-					data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname
-				else:
-					data.fieldname = link.link_fieldname
-
-	return data
\ No newline at end of file

From f4b9f8a31453c02733d2ee82a5db5f63c3014fbd Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 19:27:09 +0530
Subject: [PATCH 153/274] feat: trigger after insert for submittable quick
 entry

---
 frappe/public/js/frappe/form/quick_entry.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 9996389a4e..dbb3792262 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -213,8 +213,15 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 				me.dialog.doc = r.message;
 				if (frappe._from_link) {
 					frappe.ui.form.update_calling_link(me.dialog.doc);
+				} else {
+					if(me.after_insert) {
+						me.after_insert(me.dialog.doc);
+					} else {
+						me.open_form_if_not_list();
+					}
 				}
-				cur_frm.reload_doc();
+
+				cur_frm && cur_frm.reload_doc();
 			}
 		});
 	},

From 657d001eefda12759f075d416044cf39c8609ac5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 19:28:08 +0530
Subject: [PATCH 154/274] feat: don't show full link option if force is set in
 quick entry

---
 frappe/public/js/frappe/form/quick_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index dbb3792262..5b427feb1c 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -107,7 +107,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 		});
 
 		this.register_primary_action();
-		this.render_edit_in_full_page_link();
+		!this.force && this.render_edit_in_full_page_link();
 		// ctrl+enter to save
 		this.dialog.wrapper.keydown(function(e) {
 			if((e.ctrlKey || e.metaKey) && e.which==13) {

From dae9eb5a2a5a24fd2b63079a7052a21a66986065 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 14 May 2020 19:32:01 +0530
Subject: [PATCH 155/274] fix: don't get filters if string type

---
 frappe/desk/notifications.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py
index 109dd25f4f..4a1302788b 100644
--- a/frappe/desk/notifications.py
+++ b/frappe/desk/notifications.py
@@ -212,7 +212,10 @@ def get_notification_config():
 def get_filters_for(doctype):
 	'''get open filters for doctype'''
 	config = get_notification_config()
-	return config.get("for_doctype").get(doctype, {})
+	doctype_config = config.get("for_doctype").get(doctype, {})
+	filters = doctype_config if not isinstance(doctype_config, string_types) else None
+
+	return filters
 
 @frappe.whitelist()
 @frappe.read_only()

From 21d7926d60288a3fac6f46b5da9a2cba1548667d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 14 May 2020 19:41:55 +0530
Subject: [PATCH 156/274] fix: linting

---
 frappe/public/js/frappe/form/quick_entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index 5b427feb1c..68444c8a3b 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -214,7 +214,7 @@ frappe.ui.form.QuickEntryForm = Class.extend({
 				if (frappe._from_link) {
 					frappe.ui.form.update_calling_link(me.dialog.doc);
 				} else {
-					if(me.after_insert) {
+					if (me.after_insert) {
 						me.after_insert(me.dialog.doc);
 					} else {
 						me.open_form_if_not_list();

From 76c8e62e354f30a7e21ecbe7d86831d3ac047543 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 19:51:58 +0530
Subject: [PATCH 157/274] feat: store if document is submitable

---
 frappe/desk/desktop.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index e2fe020eca..06aff0b714 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -274,6 +274,8 @@ class Workspace:
 		for doc in self.onboarding_doc.get_steps():
 			step = doc.as_dict().copy()
 			step.label = _(doc.title)
+			if step.action == "Create Entry":
+				step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable')
 			steps.append(step)
 
 		return steps
@@ -516,4 +518,5 @@ def update_onboarding_step(name, field, value):
 	    value: Value to be updated
 
 	"""
+	return
 	frappe.db.set_value("Onboarding Step", name, field, value)

From 5fe6ef8c4a91915a30862d3f9d68fac67a8e47f9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 19:52:08 +0530
Subject: [PATCH 158/274] feat: added after submit hooks

---
 frappe/public/js/frappe/form/form.js            |  6 ++++++
 .../js/frappe/widgets/onboarding_widget.js      | 17 +++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 01dfbf81f9..bad7c877fc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -651,6 +651,12 @@ frappe.ui.form.Form = class FrappeForm {
 							callback && callback();
 							me.script_manager.trigger("on_submit")
 								.then(() => resolve(me));
+							if (frappe.route_hooks.after_submit) {
+								let route_callback = frappe.route_hooks.after_submit;
+								delete frappe.route_hooks.after_submit;
+
+								route_callback(me);
+							}
 						}
 					}, btn, () => me.handle_save_fail(btn, on_error), resolve);
 				});
diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index e869b281ae..821824a2d2 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -233,8 +233,7 @@ export default class OnboardingWidget extends Widget {
 		let current_route = frappe.get_route();
 
 		frappe.route_hooks = {};
-
-		frappe.route_hooks.after_save = () => {
+		let callback = () => {
 			frappe.msgprint({
 				message: __("You're doing great, let's take you back to the onboarding page."),
 				title: __("Good Work 🎉"),
@@ -253,6 +252,18 @@ export default class OnboardingWidget extends Widget {
 			};
 		};
 
+		if (step.is_submittable) {
+			frappe.route_hooks.after_save = () => {
+				frappe.msgprint({
+					message: __("Submit this document to complete this step."),
+					title: __("Great")
+				});
+			};
+			frappe.route_hooks.after_submit = callback;
+		} else {
+			frappe.route_hooks.after_save = callback;
+		}
+
 		frappe.set_route(`Form/${step.reference_document}/New ${step.reference_document} 1`);
 	}
 
@@ -325,6 +336,8 @@ export default class OnboardingWidget extends Widget {
 			is_complete: "fa-check-circle-o",
 			is_skipped: "fa-check-circle-o",
 		};
+		//  Clear any hooks
+		frappe.route_hooks = {};
 
 		frappe
 			.call("frappe.desk.desktop.update_onboarding_step", {

From 0091f514b5c984c71467f7093b86b09bacf253d5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 20:00:34 +0530
Subject: [PATCH 159/274] fix: remove return

---
 frappe/desk/desktop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 06aff0b714..29f9aea4be 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -518,5 +518,4 @@ def update_onboarding_step(name, field, value):
 	    value: Value to be updated
 
 	"""
-	return
 	frappe.db.set_value("Onboarding Step", name, field, value)

From ba2da078af338530543a29d070e4ac2b24c19ff7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 20:00:43 +0530
Subject: [PATCH 160/274] feat: use cached db value

---
 frappe/desk/desktop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 29f9aea4be..512b3f2890 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -275,7 +275,7 @@ class Workspace:
 			step = doc.as_dict().copy()
 			step.label = _(doc.title)
 			if step.action == "Create Entry":
-				step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable')
+				step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable', cache=True)
 			steps.append(step)
 
 		return steps

From 0f94edd87cceaa741cd400a078b0f83d361e69f0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 May 2020 21:31:02 +0530
Subject: [PATCH 161/274] feat: allow overriding filters in dashboards

---
 frappe/public/js/frappe/widgets/chart_widget.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 35ddaab4cf..c42e6053eb 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -361,7 +361,12 @@ export default class ChartWidget extends Widget {
 								}
 							];
 						} else {
-							fields = filters.filter(f => f.fieldname);
+							fields = filters
+								.filter(df => df.fieldname)
+								.map(df => {
+									Object.assign(df, df.dashboard_config || {});
+									return df;
+								});
 						}
 					} else {
 						fields = [

From bc8620d42038d1974e9c8e286395d2cc7522662a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 28 Apr 2020 16:46:22 +0530
Subject: [PATCH 162/274] feat: add default custom options to dashboard

---
 frappe/desk/doctype/dashboard/dashboard.json  | 10 +++-
 frappe/desk/doctype/dashboard/dashboard.py    |  8 ++-
 .../dashboard_chart/dashboard_chart.json      |  2 +-
 .../public/js/frappe/widgets/chart_widget.js  | 53 +++++++++++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c17bc3235c..a3a6d492f1 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -9,6 +9,7 @@
   "dashboard_name",
   "is_default",
   "charts",
+  "default_chart_custom_options",
   "cards"
  ],
  "fields": [
@@ -33,6 +34,13 @@
    "options": "Dashboard Chart Link",
    "reqd": 1
   },
+  {
+    "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
+    "fieldname": "default_chart_custom_options",
+    "fieldtype": "Code",
+    "label": "Default Chart Custom Options",
+    "options": "JSON"
+  },
   {
    "fieldname": "cards",
    "fieldtype": "Table",
@@ -41,7 +49,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-19 17:44:36.237163",
+ "modified": "2020-04-28 14:17:02.391084",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index b85e135071..952db21042 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -19,7 +19,13 @@ def get_permitted_charts(dashboard_name):
 	dashboard = frappe.get_doc('Dashboard', dashboard_name)
 	for chart in dashboard.charts:
 		if frappe.has_permission('Dashboard Chart', doc=chart.chart):
-			permitted_charts.append(chart)
+			chart_dict = frappe._dict()
+			chart_dict.update(chart.as_dict())
+
+			if dashboard.get('default_chart_custom_options'):
+				chart_dict.custom_options = dashboard.get('default_chart_custom_options')
+			permitted_charts.append(chart_dict)
+
 	return permitted_charts
 
 @frappe.whitelist()
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index e377ef740e..472d02a75e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -219,7 +219,7 @@
    "options": "Dashboard Chart Field"
   },
   {
-   "description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"]",
+   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the default custom options set in the Dashboard)",
    "fieldname": "custom_options",
    "fieldtype": "Code",
    "label": "Custom Options"
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index c42e6053eb..a0211284bf 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -593,6 +593,59 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
+	get_chart_args() {
+		let colors = this.get_chart_colors();
+
+		const chart_type_map = {
+			Line: "line",
+			Bar: "bar",
+			Percentage: "percentage",
+			Pie: "pie",
+			Donut: "donut"
+		};
+
+		let chart_args = {
+			data: this.data,
+			type: chart_type_map[this.chart_doc.type],
+			colors: colors,
+			height: this.height,
+			axisOptions: {
+				xIsSeries: this.chart_doc.timeseries,
+				shortenYAxisNumbers: 1
+			}
+		};
+
+		let set_options = (options) => {
+			let custom_options = JSON.parse(options);
+			for (let key in custom_options) {
+				chart_args[key] = custom_options[key];
+			}
+		};
+
+		if (this.custom_options) {
+			set_options(this.custom_options);
+		}
+
+		if (this.chart_doc.custom_options) {
+			set_options(this.chart_doc.custom_options);
+		}
+
+		return chart_args;
+	}
+
+	get_chart_colors() {
+		let colors = [];
+		if (this.chart_doc.y_axis.length) {
+			this.chart_doc.y_axis.map(field => {
+				colors.push(field.color);
+			});
+		} else if (["Line", "Bar"].includes(this.chart_doc.type)) {
+			colors = [this.chart_doc.color || "light-blue"];
+		}
+
+		return colors;
+	}
+
 	update_last_synced() {
 		let last_synced_text = __("Last synced {0}", [
 			comment_when(this.chart_doc.last_synced_on)

From 08f740acf8cb3fc5704fc4be1e971fcba0f11fbd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 29 Apr 2020 13:30:05 +0530
Subject: [PATCH 163/274] fix: better naming

---
 frappe/desk/doctype/dashboard/dashboard.json             | 6 +++++-
 frappe/desk/doctype/dashboard/dashboard.py               | 4 ++--
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index a3a6d492f1..e17fb66436 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -9,8 +9,12 @@
   "dashboard_name",
   "is_default",
   "charts",
+<<<<<<< HEAD
   "default_chart_custom_options",
   "cards"
+=======
+  "chart_options"
+>>>>>>> fix: better naming
  ],
  "fields": [
   {
@@ -49,7 +53,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-28 14:17:02.391084",
+ "modified": "2020-04-29 13:26:37.362482",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 952db21042..9368315343 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -22,8 +22,8 @@ def get_permitted_charts(dashboard_name):
 			chart_dict = frappe._dict()
 			chart_dict.update(chart.as_dict())
 
-			if dashboard.get('default_chart_custom_options'):
-				chart_dict.custom_options = dashboard.get('default_chart_custom_options')
+			if dashboard.get('chart_options'):
+				chart_dict.custom_options = dashboard.get('chart_options')
 			permitted_charts.append(chart_dict)
 
 	return permitted_charts
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 472d02a75e..3332534de6 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -219,7 +219,7 @@
    "options": "Dashboard Chart Field"
   },
   {
-   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the default custom options set in the Dashboard)",
+   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
    "fieldname": "custom_options",
    "fieldtype": "Code",
    "label": "Custom Options"

From d5364f759bb47139b35adc714b15abb497d69f40 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 29 Apr 2020 18:47:14 +0530
Subject: [PATCH 164/274] fix: validate chart options json

---
 frappe/desk/doctype/dashboard/dashboard.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 9368315343..3d86a1e48a 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 from frappe.model.document import Document
 import frappe
+import json
 
 class Dashboard(Document):
 	def on_update(self):
@@ -13,6 +14,16 @@ class Dashboard(Document):
 			frappe.db.sql('''update
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
+	def validate(self):
+		self.validate_custom_options()
+
+	def validate_custom_options(self):
+		if self.chart_options:
+			try:
+				json.loads(self.chart_options)
+			except ValueError as error:
+				frappe.throw("Invalid json added in the custom options: %s" % error)
+
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []

From e34e8715d360195c7e3356f57b916e5a584447d2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 12:17:04 +0530
Subject: [PATCH 165/274] fix: translate messages

---
 frappe/desk/doctype/dashboard/dashboard.py             | 2 +-
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 3d86a1e48a..daf065949c 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -22,7 +22,7 @@ class Dashboard(Document):
 			try:
 				json.loads(self.chart_options)
 			except ValueError as error:
-				frappe.throw("Invalid json added in the custom options: %s" % error)
+				frappe.throw(_("Invalid json added in the custom options: %s" % error))
 
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index e7e4aefe09..4044a66638 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -435,11 +435,11 @@ class DashboardChart(Document):
 
 	def check_document_type(self):
 		if frappe.get_meta(self.document_type).issingle:
-			frappe.throw("You cannot create a dashboard chart from single DocTypes")
+			frappe.throw(_("You cannot create a dashboard chart from single DocTypes"))
 
 	def validate_custom_options(self):
 		if self.custom_options:
 			try:
 				json.loads(self.custom_options)
 			except ValueError as error:
-				frappe.throw("Invalid json added in the custom options: %s" % error)
\ No newline at end of file
+				frappe.throw(_("Invalid json added in the custom options: %s" % error))
\ No newline at end of file

From 7425e5cc6c2f2e5798d4edd144b043964f852e06 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 12:29:21 +0530
Subject: [PATCH 166/274] fix: invalid json

---
 frappe/desk/doctype/dashboard/dashboard.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index e17fb66436..c0e2bddcf8 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -9,12 +9,8 @@
   "dashboard_name",
   "is_default",
   "charts",
-<<<<<<< HEAD
-  "default_chart_custom_options",
+  "chart_options",
   "cards"
-=======
-  "chart_options"
->>>>>>> fix: better naming
  ],
  "fields": [
   {
@@ -40,9 +36,9 @@
   },
   {
     "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
-    "fieldname": "default_chart_custom_options",
+    "fieldname": "chart_options",
     "fieldtype": "Code",
-    "label": "Default Chart Custom Options",
+    "label": "Chart Options",
     "options": "JSON"
   },
   {

From 58d75ad5d7f40ba71f3ba40685d03354321ef2ed Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 5 May 2020 12:40:15 +0530
Subject: [PATCH 167/274] fix: import _

---
 frappe/desk/doctype/dashboard/dashboard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index daf065949c..621ab19ecd 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 from frappe.model.document import Document
 import frappe
+from frappe import _
 import json
 
 class Dashboard(Document):

From 3a090e71382c19cda42ca3bce5b7c6bb5dd4fad4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Fri, 8 May 2020 16:18:49 +0530
Subject: [PATCH 168/274] fix: translation

---
 frappe/desk/doctype/dashboard/dashboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 621ab19ecd..af0c48d9c6 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -23,7 +23,7 @@ class Dashboard(Document):
 			try:
 				json.loads(self.chart_options)
 			except ValueError as error:
-				frappe.throw(_("Invalid json added in the custom options: %s" % error))
+				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
 
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):

From ee292ed2d0b5f51791fddb98c6994304c86833e8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Fri, 8 May 2020 16:20:35 +0530
Subject: [PATCH 169/274] style: remove leading space

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 3332534de6..72f5c43316 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -219,7 +219,7 @@
    "options": "Dashboard Chart Field"
   },
   {
-   "description": " Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
+   "description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
    "fieldname": "custom_options",
    "fieldtype": "Code",
    "label": "Custom Options"
@@ -283,4 +283,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 0bba2e8c28b0d434bc09a3e0fb6d6ecff42c4e5d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Fri, 8 May 2020 16:20:52 +0530
Subject: [PATCH 170/274] fix: minor translation issue

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 4044a66638..7e375e835f 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -442,4 +442,4 @@ class DashboardChart(Document):
 			try:
 				json.loads(self.custom_options)
 			except ValueError as error:
-				frappe.throw(_("Invalid json added in the custom options: %s" % error))
\ No newline at end of file
+				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))

From 9c412d60df01b5f0c555f102b950092a669ba14e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 15 May 2020 00:40:01 +0530
Subject: [PATCH 171/274] fix: fix rebase

---
 .../public/js/frappe/widgets/chart_widget.js  | 69 ++++---------------
 1 file changed, 15 insertions(+), 54 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index a0211284bf..e5378cf2ab 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -523,7 +523,6 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
-
 	get_chart_args() {
 		let colors = this.get_chart_colors();
 
@@ -553,6 +552,21 @@ export default class ChartWidget extends Widget {
 			chart_args.data.end = new Date(`${heatmap_year+1}-01-01`);
 		}
 
+		let set_options = (options) => {
+			let custom_options = JSON.parse(options);
+			for (let key in custom_options) {
+				chart_args[key] = custom_options[key];
+			}
+		};
+
+		if (this.custom_options) {
+			set_options(this.custom_options);
+		}
+
+		if (this.chart_doc.custom_options) {
+			set_options(this.chart_doc.custom_options);
+		}
+
 		return chart_args;
 	}
 
@@ -593,59 +607,6 @@ export default class ChartWidget extends Widget {
 		}
 	}
 
-	get_chart_args() {
-		let colors = this.get_chart_colors();
-
-		const chart_type_map = {
-			Line: "line",
-			Bar: "bar",
-			Percentage: "percentage",
-			Pie: "pie",
-			Donut: "donut"
-		};
-
-		let chart_args = {
-			data: this.data,
-			type: chart_type_map[this.chart_doc.type],
-			colors: colors,
-			height: this.height,
-			axisOptions: {
-				xIsSeries: this.chart_doc.timeseries,
-				shortenYAxisNumbers: 1
-			}
-		};
-
-		let set_options = (options) => {
-			let custom_options = JSON.parse(options);
-			for (let key in custom_options) {
-				chart_args[key] = custom_options[key];
-			}
-		};
-
-		if (this.custom_options) {
-			set_options(this.custom_options);
-		}
-
-		if (this.chart_doc.custom_options) {
-			set_options(this.chart_doc.custom_options);
-		}
-
-		return chart_args;
-	}
-
-	get_chart_colors() {
-		let colors = [];
-		if (this.chart_doc.y_axis.length) {
-			this.chart_doc.y_axis.map(field => {
-				colors.push(field.color);
-			});
-		} else if (["Line", "Bar"].includes(this.chart_doc.type)) {
-			colors = [this.chart_doc.color || "light-blue"];
-		}
-
-		return colors;
-	}
-
 	update_last_synced() {
 		let last_synced_text = __("Last synced {0}", [
 			comment_when(this.chart_doc.last_synced_on)

From 76db5e11c8cb8ee5f12e71e46c29e6c78d5d71bd Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 27 Apr 2020 16:51:31 +0530
Subject: [PATCH 172/274] feat: Section Break without border

---
 frappe/core/doctype/docfield/docfield.json         | 10 +++++++++-
 .../custom/doctype/custom_field/custom_field.json  | 10 +++++++++-
 .../doctype/customize_form/customize_form.py       |  3 ++-
 .../customize_form_field/customize_form_field.json | 10 +++++++++-
 frappe/database/mariadb/framework_mariadb.sql      |  1 +
 frappe/database/postgres/framework_postgres.sql    |  1 +
 frappe/public/js/frappe/form/layout.js             | 14 ++++++++++++++
 frappe/public/less/form.less                       | 11 ++++++++++-
 8 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index 6d8ee41a5a..8e7516cd0a 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -43,6 +43,7 @@
   "report_hide",
   "remember_last_selected_value",
   "ignore_xss_filter",
+  "hide_border",
   "property_depends_on_section",
   "mandatory_depends_on",
   "column_break_38",
@@ -448,12 +449,19 @@
   {
    "fieldname": "column_break_38",
    "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Section Break'",
+   "fieldname": "hide_border",
+   "fieldtype": "Check",
+   "label": "Hide Border"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-04-19 21:54:13.783908",
+ "modified": "2020-04-27 11:38:21.223185",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",
diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json
index 394f38b56c..122e6c7070 100644
--- a/frappe/custom/doctype/custom_field/custom_field.json
+++ b/frappe/custom/doctype/custom_field/custom_field.json
@@ -48,6 +48,7 @@
   "allow_in_quick_entry",
   "ignore_xss_filter",
   "translatable",
+  "hide_border",
   "description",
   "permlevel",
   "width",
@@ -378,12 +379,19 @@
    "fieldname": "in_preview",
    "fieldtype": "Check",
    "label": "In Preview"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Section Break'",
+   "fieldname": "hide_border",
+   "fieldtype": "Check",
+   "label": "Hide Border"
   }
  ],
  "icon": "fa fa-glass",
  "idx": 1,
  "links": [],
- "modified": "2020-04-10 11:57:10.392218",
+ "modified": "2020-04-27 11:40:48.325481",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Custom Field",
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index ebf01d11b3..6a54d9c7e6 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -76,7 +76,8 @@ docfield_properties = {
 	'remember_last_selected_value': 'Check',
 	'allow_bulk_edit': 'Check',
 	'auto_repeat': 'Link',
-	'allow_in_quick_entry': 'Check'
+	'allow_in_quick_entry': 'Check',
+	'hide_border': 'Check'
 }
 
 allowed_fieldtype_change = (('Currency', 'Float', 'Percent'), ('Small Text', 'Data'),
diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json
index d7887cf8bd..2c5fb874f7 100644
--- a/frappe/custom/doctype/customize_form_field/customize_form_field.json
+++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json
@@ -39,6 +39,7 @@
   "allow_on_submit",
   "report_hide",
   "remember_last_selected_value",
+  "hide_border",
   "property_depends_on_section",
   "mandatory_depends_on",
   "column_break_33",
@@ -388,12 +389,19 @@
    "fieldname": "in_preview",
    "fieldtype": "Check",
    "label": "In Preview"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Section Break'",
+   "fieldname": "hide_border",
+   "fieldtype": "Check",
+   "label": "Hide Border"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-04-10 11:58:44.573537",
+ "modified": "2020-04-27 11:39:26.389300",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form Field",
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index 46940cc846..bd93069a3f 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -63,6 +63,7 @@ CREATE TABLE `tabDocField` (
   `precision` varchar(255) DEFAULT NULL,
   `length` int(11) NOT NULL DEFAULT 0,
   `translatable` int(1) NOT NULL DEFAULT 0,
+  `hide_border` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`),
   KEY `label` (`label`),
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index 26760dbcc9..76309e7347 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -63,6 +63,7 @@ CREATE TABLE "tabDocField" (
   "precision" varchar(255) DEFAULT NULL,
   "length" bigint NOT NULL DEFAULT 0,
   "translatable" smallint NOT NULL DEFAULT 0,
+  "hide_border" smallint NOT NULL DEFAULT 0,
   PRIMARY KEY ("name")
 ) ;
 
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 5aeb29b1ed..26131fc9c7 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -236,6 +236,7 @@ frappe.ui.form.Layout = Class.extend({
 		// collapse sections
 		if(this.frm) {
 			this.refresh_section_collapse();
+			this.refresh_section_border();
 		}
 	},
 
@@ -307,6 +308,16 @@ frappe.ui.form.Layout = Class.extend({
 		}
 	},
 
+	refresh_section_border: function() {
+		if(!this.doc) return;
+		this.sections.forEach(section => {
+			const df = section.df;
+			if (df && cint(df.hide_border)) {
+				section.hide_border(true);
+			}
+		})
+	},
+
 	attach_doc_and_docfields: function(refresh) {
 		var me = this;
 		for(var i=0, l=this.fields_list.length; i<l; i++) {
@@ -663,6 +674,9 @@ frappe.ui.form.Section = Class.extend({
 			}
 		});
 	},
+	hide_border(hide) {
+		this.body.parent().toggleClass("hide-border", hide);
+	},
 	is_collapsed() {
 		return this.body.hasClass('hide');
 	},
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index 8e43b05122..df0334c14f 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -314,11 +314,20 @@ h6.uppercase, .h6.uppercase {
 	}
 }
 
-.form-section:not(:last-child),
+.hide-border {
+	border-top: none !important;
+	padding-top: 0px;
+}
+
+.form-section:not(:first-child) {
+	border-top: 1px solid @border-color;
+}
+
 .form-inner-toolbar {
 	border-bottom: 1px solid @border-color;
 }
 
+
 .empty-section {
 	display: none !important;
 }

From 240c78c11de3959871679e1c93589c8c61d0ab80 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 11 May 2020 17:29:24 +0530
Subject: [PATCH 173/274] fix: linting issue

---
 frappe/public/js/frappe/form/layout.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index 26131fc9c7..c8d5c9b422 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -309,13 +309,13 @@ frappe.ui.form.Layout = Class.extend({
 	},
 
 	refresh_section_border: function() {
-		if(!this.doc) return;
+		if (!this.doc) return;
 		this.sections.forEach(section => {
 			const df = section.df;
 			if (df && cint(df.hide_border)) {
 				section.hide_border(true);
 			}
-		})
+		});
 	},
 
 	attach_doc_and_docfields: function(refresh) {

From 30c22ba3e576770bea3e28287e912637d4720918 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 15 May 2020 10:11:42 +0530
Subject: [PATCH 174/274] fix: hide section border on make, instead of refresh

---
 frappe/public/js/frappe/form/layout.js | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index c8d5c9b422..d6106255a0 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -236,7 +236,6 @@ frappe.ui.form.Layout = Class.extend({
 		// collapse sections
 		if(this.frm) {
 			this.refresh_section_collapse();
-			this.refresh_section_border();
 		}
 	},
 
@@ -308,16 +307,6 @@ frappe.ui.form.Layout = Class.extend({
 		}
 	},
 
-	refresh_section_border: function() {
-		if (!this.doc) return;
-		this.sections.forEach(section => {
-			const df = section.df;
-			if (df && cint(df.hide_border)) {
-				section.hide_border(true);
-			}
-		});
-	},
-
 	attach_doc_and_docfields: function(refresh) {
 		var me = this;
 		for(var i=0, l=this.fields_list.length; i<l; i++) {
@@ -610,12 +599,15 @@ frappe.ui.form.Section = Class.extend({
 			if(this.df.cssClass) {
 				this.wrapper.addClass(this.df.cssClass);
 			}
+			if (this.df.hide_border) {
+				this.wrapper.toggleClass("hide-border", true);
+			}
 		}
 
-
 		// for bc
 		this.body = $('<div class="section-body">').appendTo(this.wrapper);
 	},
+
 	make_head: function() {
 		var me = this;
 		if(!this.df.collapsible) {
@@ -674,12 +666,11 @@ frappe.ui.form.Section = Class.extend({
 			}
 		});
 	},
-	hide_border(hide) {
-		this.body.parent().toggleClass("hide-border", hide);
-	},
+
 	is_collapsed() {
 		return this.body.hasClass('hide');
 	},
+
 	has_missing_mandatory: function() {
 		var missing_mandatory = false;
 		for (var j=0, l=this.fields_list.length; j < l; j++) {

From 85d86fbedfd0707e9d9493470349e884b8fe74ac Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 15 May 2020 11:21:24 +0530
Subject: [PATCH 175/274] refactor: moved remote_migrations to
 frappe.integrations.frappe_providers

fix: exit code fixes and minor bug fix
---
 frappe/commands/site.py                       |  8 +++----
 .../integrations/frappe_providers/__init__.py | 11 +++++++++
 .../frappe_providers/frappecloud.py}          | 23 ++++++++-----------
 3 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 frappe/integrations/frappe_providers/__init__.py
 rename frappe/{utils/remote_migrations.py => integrations/frappe_providers/frappecloud.py} (95%)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 10bf700340..1f22650930 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -257,12 +257,12 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 	compileall.compile_dir('../apps', quiet=1, rx=re.compile('.*node_modules.*'))
 
 @click.command('migrate-to')
-@click.argument('site_url')
+@click.argument('frappe_provider')
 @pass_context
-def migrate_to(context, site_url):
-	from frappe.utils.remote_migrations import migrate_to
+def migrate_to(context, frappe_provider):
+	from frappe.integrations.frappe_providers import migrate_to
 	for site in context.sites:
-		migrate_to(site, site_url)
+		migrate_to(site, frappe_provider)
 
 @click.command('run-patch')
 @click.argument('module')
diff --git a/frappe/integrations/frappe_providers/__init__.py b/frappe/integrations/frappe_providers/__init__.py
new file mode 100644
index 0000000000..31a0cf1c04
--- /dev/null
+++ b/frappe/integrations/frappe_providers/__init__.py
@@ -0,0 +1,11 @@
+# imports - module imports
+from frappe.integrations.frappe_providers.frappecloud import frappecloud_migrator
+
+
+def migrate_to(local_site, frappe_provider):
+	if frappe_provider in ("frappe.cloud", "frappecloud.com"):
+		frappe_provider = "staging.frappe.cloud"
+		return frappecloud_migrator(local_site, frappe_provider)
+	else:
+		print("{} is not supported yet".format(frappe_provider))
+		sys.exit(1)
diff --git a/frappe/utils/remote_migrations.py b/frappe/integrations/frappe_providers/frappecloud.py
similarity index 95%
rename from frappe/utils/remote_migrations.py
rename to frappe/integrations/frappe_providers/frappecloud.py
index 90f8db0b74..1785823a2d 100644
--- a/frappe/utils/remote_migrations.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -13,7 +13,7 @@ import requests
 import frappe
 import frappe.utils.backups
 from frappe.utils import get_installed_apps_info
-from frappe.utils.commands import render_table, padme
+from frappe.utils.commands import render_table, add_line_after
 
 
 def get_new_site_options():
@@ -27,7 +27,7 @@ def get_new_site_options():
 
 
 def is_valid_subdomain(subdomain):
-	if len(subdomain) < 6:
+	if len(subdomain) < 5:
 		print("Subdomain too short. Use 5 or more characters")
 		return False
 	matched = re.match("^[a-z0-9][a-z0-9-]*[a-z0-9]$", subdomain)
@@ -60,7 +60,7 @@ def render_plan_table(plans_list):
 	render_table(plans_table)
 
 
-@padme
+@add_line_after
 def choose_plan(plans_list):
 	print("{} plans available".format(len(plans_list)))
 	available_plans = [plan["name"] for plan in plans_list]
@@ -75,7 +75,7 @@ def choose_plan(plans_list):
 			print("Invalid Selection ❌")
 
 
-@padme
+@add_line_after
 def check_app_compat(available_group):
 	is_compat = True
 	incompatible_apps, filtered_apps, branch_msgs = [], [], []
@@ -125,7 +125,7 @@ def render_group_table(app_groups):
 	render_table(app_groups_table)
 
 
-@padme
+@add_line_after
 def filter_apps(app_groups):
 	render_group_table(app_groups)
 
@@ -145,7 +145,7 @@ def filter_apps(app_groups):
 
 	return selected_group["name"], filtered_apps
 
-@padme
+@add_line_after
 def create_session():
 	# take user input from STDIN
 	username = click.prompt("Username").strip()
@@ -164,7 +164,7 @@ def create_session():
 		print("Authorization Failed with Error Code {}".format(login_sc.status_code))
 
 
-@padme
+@add_line_after
 def get_subdomain(domain):
 	while True:
 		subdomain = click.prompt("Enter subdomain").strip()
@@ -173,7 +173,7 @@ def get_subdomain(domain):
 			return subdomain
 
 
-@padme
+@add_line_after
 def upload_backup(local_site):
 	# take backup
 	files_session = {}
@@ -256,12 +256,7 @@ def frappecloud_migrator(local_site, remote_site):
 			print("Request failed with error code {}".format(site_creation_request.status_code))
 			reason = html2text(site_creation_request.text)
 			print(reason)
+			sys.exit(1)
 
-
-def migrate_to(local_site, remote_site):
-	if remote_site in ("frappe.cloud", "frappecloud.com"):
-		remote_site = "frappecloud.com"
-		return frappecloud_migrator(local_site, remote_site)
 	else:
-		print("{} is not supported yet".format(remote_site))
 		sys.exit(1)

From 15b96f8915f2d88bb2bfa200b63f7176c06f3cc9 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 15 May 2020 11:45:44 +0530
Subject: [PATCH 176/274] fix: sider fixes

---
 .../doctype/package_publish_tool/package_publish_tool.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index 7822299f21..4c10b609a8 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -37,10 +37,10 @@ frappe.ui.form.on('Package Publish Tool', {
 	set_dirty_trigger: function(frm) {
 		$(frm.wrapper).on("dirty", function() {
 			frm.page.set_primary_action(__('Save'), () => frm.save());
-		})
+		});
 	},
 	set_deploy_primary_action: function(frm) {
-		if (frm.doc.package_details.length && frm.doc.instances.length){
+		if (frm.doc.package_details.length && frm.doc.instances.length) {
 			frm.page.set_primary_action(__("Deploy"), function () {
 				frappe.show_alert({
 					message: __("Deploying Package"),
@@ -49,7 +49,7 @@ frappe.ui.form.on('Package Publish Tool', {
 
 				frappe.call({
 					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
-					callback: function(r) {
+					callback: function() {
 						frappe.msgprint(__("Package has been published."));
 					}
 				});

From ed344ae8cf2d303a55c1cee07b30765babf1fdad Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 15 May 2020 11:23:42 +0530
Subject: [PATCH 177/274] chore: updated docstrings for command APIs

---
 frappe/commands/site.py  | 1 +
 frappe/utils/commands.py | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 1f22650930..d92c727dc7 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -260,6 +260,7 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 @click.argument('frappe_provider')
 @pass_context
 def migrate_to(context, frappe_provider):
+	"Migrates site to the specified provider"
 	from frappe.integrations.frappe_providers import migrate_to
 	for site in context.sites:
 		migrate_to(site, frappe_provider)
diff --git a/frappe/utils/commands.py b/frappe/utils/commands.py
index babefc56e2..99322b50ba 100644
--- a/frappe/utils/commands.py
+++ b/frappe/utils/commands.py
@@ -5,6 +5,7 @@ from terminaltables import AsciiTable
 
 @functools.lru_cache(maxsize=1024)
 def get_first_party_apps():
+	"""Get list of all apps under orgs: frappe. erpnext from GitHub"""
 	apps = []
 	for org in ["frappe", "erpnext"]:
 		req = requests.get(f"https://api.github.com/users/{org}/repos", {"type": "sources", "per_page": 200})
@@ -17,15 +18,17 @@ def render_table(data):
 	print(AsciiTable(data).table)
 
 
-def padme(me):
+def add_line_after(function):
+	"""Adds an extra line to STDOUT after the execution of a function this decorates"""
 	def empty_line(*args, **kwargs):
-		result = me(*args, **kwargs)
+		result = function(*args, **kwargs)
 		print()
 		return result
 	return empty_line
 
 
 def log(message, colour=''):
+	"""Coloured log outputs to STDOUT"""
 	colours = {
 		"nc": '\033[0m',
 		"blue": '\033[94m',

From c6a66eb47b895521fa2a3660316fcaf46d149d0b Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 15 May 2020 13:31:13 +0530
Subject: [PATCH 178/274] fix: use different number system for india

---
 .../js/frappe/widgets/number_card_widget.js   |  3 +-
 frappe/public/js/frappe/widgets/utils.js      | 45 ++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index cda17e08bc..77cb8a59c2 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -119,7 +119,8 @@ export default class NumberCardWidget extends Widget {
 	get_formatted_number() {
 		const based_on_df =
 			frappe.meta.get_docfield(this.card_doc.document_type, this.card_doc.aggregate_function_based_on);
-		const shortened_number = shorten_number(this.number);
+		const default_country = frappe.sys_defaults.country;
+		const shortened_number = shorten_number(this.number, default_country);
 		let number_parts = shortened_number.split(' ');
 
 		const symbol = number_parts[1] || '';
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index f336335d1c..ab807bb0b1 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -127,19 +127,44 @@ function go_to_list_with_filters(doctype, filters) {
 	});
 }
 
-function shorten_number(number) {
+function shorten_number(number, country) {
+	country = country || '';
+	const number_system = get_number_system(country);
 	let x = Math.abs(Math.round(number));
+	for (const map of number_system) {
+		if (x >= map.divisor) {
+			return Math.round(number/map.divisor) +  ' ' + map.symbol;
+		}
+	};
+	return number.toFixed();
+}
 
-	switch (true) {
-		case x >= 1.0e+12:
-			return Math.round(number/1.0e+12) + " T";
-		case x >= 1.0e+9:
-			return Math.round(number/1.0e+9) + " B";
-		case x >= 1.0e+6:
-			return Math.round(number/1.0e+6) + " M";
-		default:
-			return number.toFixed();
+function get_number_system(country) {
+	let number_system_map = {
+		'India':
+			[{
+				divisor: 1.0e+7,
+				symbol: 'Cr'
+			},
+			{
+				divisor: 1.0e+5,
+				symbol: 'Lakh'
+			}],
+		'':
+			[{
+				divisor: 1.0e+12,
+				symbol: 'T'
+			},
+			{
+				divisor: 1.0e+9,
+				symbol: 'B'
+			},
+			{
+				divisor: 1.0e+6,
+				symbol: 'M'
+			}]
 	}
+	return number_system_map[country];
 }
 
 export { generate_route, generate_grid, build_summary_item, go_to_list_with_filters, shorten_number };
\ No newline at end of file

From 2ebdb292f93823f242b40360bdeda8785de6020c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 15 May 2020 13:35:21 +0530
Subject: [PATCH 179/274] style: fix semicolon

---
 frappe/public/js/frappe/widgets/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index ab807bb0b1..c92bdc1b5f 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -135,7 +135,7 @@ function shorten_number(number, country) {
 		if (x >= map.divisor) {
 			return Math.round(number/map.divisor) +  ' ' + map.symbol;
 		}
-	};
+	}
 	return number.toFixed();
 }
 
@@ -163,7 +163,7 @@ function get_number_system(country) {
 				divisor: 1.0e+6,
 				symbol: 'M'
 			}]
-	}
+	};
 	return number_system_map[country];
 }
 

From 9d4a4ef6f4c1a92ec5f0918f4773cb605586cbc9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 14:03:04 +0530
Subject: [PATCH 180/274] feat: collapse sections by default for page builder
 dialog

---
 frappe/public/js/frappe/utils/web_page_block.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/web_page_block.js b/frappe/public/js/frappe/utils/web_page_block.js
index bcf821bcfa..acc7943671 100644
--- a/frappe/public/js/frappe/utils/web_page_block.js
+++ b/frappe/public/js/frappe/utils/web_page_block.js
@@ -4,7 +4,12 @@ frappe.ui.form.on('Web Page Block', {
 		frappe.model.with_doc('Web Template', row.web_template).then(doc => {
 			let d = new frappe.ui.Dialog({
 				title: __('Edit Values'),
-				fields: doc.fields,
+				fields: doc.fields.map(df => {
+					if (df.fieldtype == "Section Break") {
+						df.collapsible = 1;
+					}
+					return df
+				}),
 				primary_action(values) {
 					frappe.model.set_value(
 						cdt,

From a7b431465d127360f995f45acd6bb605b58e111f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 14:03:37 +0530
Subject: [PATCH 181/274] feat: allow 9 cards in card grid

---
 .../section_with_cards.html                   |  2 +-
 .../section_with_cards.json                   | 26 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frappe/website/web_template/section_with_cards/section_with_cards.html b/frappe/website/web_template/section_with_cards/section_with_cards.html
index 1f0f71a15b..431a64a86d 100644
--- a/frappe/website/web_template/section_with_cards/section_with_cards.html
+++ b/frappe/website/web_template/section_with_cards/section_with_cards.html
@@ -29,7 +29,7 @@
 {%- set card_size = card_size or 'Small' -%}
 <div class="{{ resolve_class({'mt-4': title}) }}">
 	<div class="row mt-n4">
-		{%- for index in ['1', '2', '3', '4', '5', '6', '7', '8'] -%}
+		{%- for index in ['1', '2', '3', '4', '5', '6', '7', '8', '9'] -%}
 		{%- set title = values['card_' + index + '_title'] -%}
 		{%- set content = values['card_' + index + '_content'] -%}
 		{%- set url = values['card_' + index + '_url'] -%}
diff --git a/frappe/website/web_template/section_with_cards/section_with_cards.json b/frappe/website/web_template/section_with_cards/section_with_cards.json
index 9ec430ae60..311cced829 100644
--- a/frappe/website/web_template/section_with_cards/section_with_cards.json
+++ b/frappe/website/web_template/section_with_cards/section_with_cards.json
@@ -213,10 +213,34 @@
    "fieldtype": "Data",
    "label": "URL",
    "reqd": 0
+  },
+  {
+   "fieldname": "card_9",
+   "fieldtype": "Section Break",
+   "label": "Card 9",
+   "reqd": 0
+  },
+  {
+   "fieldname": "card_9_title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "reqd": 0
+  },
+  {
+   "fieldname": "card_9_content",
+   "fieldtype": "Small Text",
+   "label": "Content",
+   "reqd": 0
+  },
+  {
+   "fieldname": "card_9_url",
+   "fieldtype": "Data",
+   "label": "URL",
+   "reqd": 0
   }
  ],
  "idx": 0,
- "modified": "2020-04-29 22:40:03.362229",
+ "modified": "2020-05-15 13:52:02.984001",
  "modified_by": "Administrator",
  "name": "Section with Cards",
  "owner": "Administrator",

From 7721d540167d30f76308a2bc557afb29f021b33a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 14:15:59 +0530
Subject: [PATCH 182/274] feat: add hide login to website settings

---
 frappe/templates/includes/navbar/navbar_login.html       | 2 +-
 .../doctype/website_settings/website_settings.json       | 9 ++++++++-
 .../website/doctype/website_settings/website_settings.py | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frappe/templates/includes/navbar/navbar_login.html b/frappe/templates/includes/navbar/navbar_login.html
index 2a58efe039..4e2c6dc93b 100644
--- a/frappe/templates/includes/navbar/navbar_login.html
+++ b/frappe/templates/includes/navbar/navbar_login.html
@@ -1,5 +1,5 @@
 <!-- post login tools -->
-{% if not only_static %}
+{% if not only_static and not hide_login %}
 
 	{% if frappe.session.user != 'Guest' %}
 	<li class="nav-item dropdown logged-in" id="website-post-login" data-label="website-post-login" style="display: none">
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 4fba1b0530..c91366c103 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -20,6 +20,7 @@
   "favicon",
   "top_bar",
   "navbar_search",
+  "hide_login",
   "top_bar_items",
   "call_to_action",
   "call_to_action_url",
@@ -344,6 +345,12 @@
    "fieldname": "call_to_action_url",
    "fieldtype": "Data",
    "label": "Call To Action URL"
+  },
+  {
+   "default": "0",
+   "fieldname": "hide_login",
+   "fieldtype": "Check",
+   "label": "Hide Login"
   }
  ],
  "icon": "fa fa-cog",
@@ -351,7 +358,7 @@
  "issingle": 1,
  "links": [],
  "max_attachments": 10,
- "modified": "2020-05-11 07:14:37.302357",
+ "modified": "2020-05-15 14:12:32.907352",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Settings",
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 5da49ae20b..80a74eed2c 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -156,6 +156,8 @@ def get_website_settings():
 	if settings.favicon and settings.favicon != "attach_files:":
 		context["favicon"] = settings.favicon
 
+	context["hide_login"] = settings.hide_login
+
 	return context
 
 def get_items(parentfield):

From 1bd48a4c09c76465f978e909608e11d06b23e882 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 14:37:10 +0530
Subject: [PATCH 183/274] feat: set max height for default brand html

---
 frappe/website/doctype/website_settings/website_settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index 7fbb785acf..f7ad0610e6 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -10,7 +10,7 @@ frappe.ui.form.on('Website Settings', {
 			frappe.msgprint(__("Select a Brand Image first."));
 		}
 		frm.set_value("brand_html", "<img src='"+ frm.doc.banner_image
-			+"' style='max-width: 150px;'>");
+			+"' style='max-width: 150px; max-height: 25px;'>");
 	},
 
 	onload_post_render: function(frm) {

From 1395d2d662b76a37b208dbadf9b1bfd3244c5a92 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 14:43:25 +0530
Subject: [PATCH 184/274] fix: banner_image not used in navbar automatically

---
 frappe/templates/includes/navbar/navbar.html           | 10 +++++++++-
 .../doctype/website_settings/website_settings.py       |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html
index d669eee9d3..bf1932153e 100644
--- a/frappe/templates/includes/navbar/navbar.html
+++ b/frappe/templates/includes/navbar/navbar.html
@@ -1,7 +1,15 @@
 <nav class="navbar navbar-light navbar-expand-lg">
 	<div class="container">
 		<a class="navbar-brand" href="{{ url_prefix }}{{ home_page or "/" }}">
-			<span>{{ brand_html or (frappe.get_hooks("brand_html") or [_("Home")])[0] }}</span>
+			<span>
+			{% if brand_html %}
+				{{ brand_html }}
+			{% elif banner_image %}
+				<img src='{{ banner_image }}' style='max-width: 150px;max-height: 25px;'>
+			{% else %}
+				{{ (frappe.get_hooks("brand_html") or [_("Home")])[0] }}
+			{% endif %}
+			</span>
 		</a>
 		<button class="navbar-toggler" type="button"
 			data-toggle="collapse"
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 80a74eed2c..aaaa1c2cbf 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -115,7 +115,7 @@ def get_website_settings():
 	})
 
 	settings = frappe.get_single("Website Settings")
-	for k in ["banner_html", "brand_html", "copyright", "twitter_share_via",
+	for k in ["banner_html", "banner_image", "brand_html", "copyright", "twitter_share_via",
 		"facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
 		"disable_signup", "hide_footer_signup", "head_html", "title_prefix",
 		"navbar_search", "enable_view_tracking", "footer_logo", "call_to_action", "call_to_action_url"]:

From db3b57116d84a7f3d94fff1c2e63ecbc42b2ad76 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 15 May 2020 15:16:56 +0530
Subject: [PATCH 185/274] fix: consistent UI and minor fixes

---
 .../frappe_providers/frappecloud.py           | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index 1785823a2d..3815042e9d 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -50,12 +50,13 @@ def render_plan_table(plans_list):
 	plans_table = []
 
 	# title row
-	visible_headers = ["name", "concurrent_users", "cpu_time_per_day"]
-	plans_table.append(visible_headers)
+	visible_headers = ["name", "cpu_time_per_day"]
+	plans_table.append(["Plan", "CPU Time"])
 
 	# all rows
 	for plan in plans_list:
-		plans_table.append([plan[header] for header in visible_headers])
+		plan, cpu_time = [plan[header] for header in visible_headers]
+		plans_table.append([plan, "{} hour{}/day".format(cpu_time, "" if cpu_time < 2 else "s")])
 
 	render_table(plans_table)
 
@@ -83,13 +84,13 @@ def check_app_compat(available_group):
 	print("Checking availability of existing app group")
 
 	for (app, branch) in existing_group:
-		info = [ (a["name"], a["branch"]) for a in available_group["apps"] if a["scrubbed"] == app]
+		info = [ (a["name"], a["branch"]) for a in available_group["apps"] if a["scrubbed"] == app ]
 		if info:
 			app_title, available_branch = info[0]
 
 			if branch != available_branch:
-				print("⚠️  {}:{} => {}".format(app, branch, available_branch))
-				branch_msgs.append([app.title(), branch, available_branch])
+				print("⚠️  App {}:{} => {}".format(app, branch, available_branch))
+				branch_msgs.append([app, branch, available_branch])
 				filtered_apps.append(app_title)
 				is_compat = False
 
@@ -103,8 +104,8 @@ def check_app_compat(available_group):
 			is_compat = False
 
 	start_msg = "\nSelecting this group will "
-	incompatible_apps = "drop {} apps: ".format(len(incompatible_apps)) + ", ".join(incompatible_apps) + " and " if incompatible_apps else ""
-	branch_change = "upgrade:\n" + "\n".join(["{}: {} => {}".format(*x) for x in branch_msgs]) if branch_msgs else ""
+	incompatible_apps = ("\n\nDrop the following apps:\n" + "\n".join(incompatible_apps)) if incompatible_apps else ""
+	branch_change = ("\n\nUpgrade the following apps:\n" + "\n".join(["{}: {} => {}".format(*x) for x in branch_msgs])) if branch_msgs else ""
 	changes = (incompatible_apps + branch_change) or "be perfect for you :)"
 	warning_message = start_msg + changes
 	print(warning_message)
@@ -130,12 +131,14 @@ def filter_apps(app_groups):
 	render_group_table(app_groups)
 
 	while True:
-		app_group_index = click.prompt("Select App Group #", type=int) - 1
+		app_group_index = click.prompt("Select App Group Number", type=int) - 1
 		try:
+			if app_group_index == -1:
+				raise IndexError
 			selected_group = app_groups[app_group_index]
 		except IndexError:
 			print("Invalid Selection ❌")
-			break
+			continue
 
 		is_compat, filtered_apps = check_app_compat(selected_group)
 
@@ -251,7 +254,9 @@ def frappecloud_migrator(local_site, remote_site):
 		frappe.destroy()
 
 		if site_creation_request.ok:
-			print("Site creation started at {}".format(site_creation_request.json()["message"]))
+			site_url = site_creation_request.json()["message"]
+			print("View your site dashboard at {}/dashboard/#/sites/{} ✨".format(remote_site, site_url))
+			print("Your site URL: {}".format(site_url))
 		else:
 			print("Request failed with error code {}".format(site_creation_request.status_code))
 			reason = html2text(site_creation_request.text)

From a0d332b0e9299e2e18d7cef5191ce6deced83c37 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 15:32:01 +0530
Subject: [PATCH 186/274] fix: footer logo aspect ratio

---
 frappe/public/scss/website.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 30781c52c1..9ca03a59cc 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -134,7 +134,7 @@ a.card {
 
 .footer-logo {
 	width: 5rem;
-	height: 2rem;
+	max-height: 2rem;
 }
 
 .footer-link, .footer-child-item a {

From a8c01a091518ee1e0f823bd4e9190e31aa14c875 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 15 May 2020 15:32:13 +0530
Subject: [PATCH 187/274] fix: Success message

---
 frappe/integrations/frappe_providers/frappecloud.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/integrations/frappe_providers/frappecloud.py b/frappe/integrations/frappe_providers/frappecloud.py
index 3815042e9d..4f33c990f9 100644
--- a/frappe/integrations/frappe_providers/frappecloud.py
+++ b/frappe/integrations/frappe_providers/frappecloud.py
@@ -255,7 +255,8 @@ def frappecloud_migrator(local_site, remote_site):
 
 		if site_creation_request.ok:
 			site_url = site_creation_request.json()["message"]
-			print("View your site dashboard at {}/dashboard/#/sites/{} ✨".format(remote_site, site_url))
+			print("Your site {} is being migrated ✨".format(local_site))
+			print("View your site dashboard at {}/dashboard/#/sites/{}".format(remote_site, site_url))
 			print("Your site URL: {}".format(site_url))
 		else:
 			print("Request failed with error code {}".format(site_creation_request.status_code))

From 8280a83ff03746aac4b9ee49a4a94306292f2019 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 15:32:25 +0530
Subject: [PATCH 188/274] fix: left margin for buttons

---
 frappe/website/web_template/hero/hero.html                      | 2 +-
 .../hero_with_right_image/hero_with_right_image.html            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/web_template/hero/hero.html b/frappe/website/web_template/hero/hero.html
index 5f96dacc7c..66d24a9936 100644
--- a/frappe/website/web_template/hero/hero.html
+++ b/frappe/website/web_template/hero/hero.html
@@ -15,7 +15,7 @@
 		</a>
 		{%- endif -%}
 		{%- if secondary_action -%}
-		<a class="ml-3 btn btn-lg btn-primary-light" href="{{ secondary_action }}">
+		<a class="ml-2 ml-lg-3 btn btn-lg btn-primary-light" href="{{ secondary_action }}">
 			{{ secondary_action_label }}
 		</a>
 		{%- endif -%}
diff --git a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html
index ae318cd3e0..d0c42b87c7 100644
--- a/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html
+++ b/frappe/website/web_template/hero_with_right_image/hero_with_right_image.html
@@ -16,7 +16,7 @@
 				</a>
 				{%- endif -%}
 				{%- if secondary_action -%}
-				<a class="ml-3 btn btn-lg btn-primary-light" href="{{ secondary_action }}">
+				<a class="ml-2 ml-lg-3 btn btn-lg btn-primary-light" href="{{ secondary_action }}">
 					{{ secondary_action_label }}
 				</a>
 				{%- endif -%}

From 4af13edc87fee4083491fcc14197040300b4575f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 15 May 2020 16:13:16 +0530
Subject: [PATCH 189/274] fix: Remove hardcoded url

---
 frappe/integrations/frappe_providers/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/integrations/frappe_providers/__init__.py b/frappe/integrations/frappe_providers/__init__.py
index 31a0cf1c04..ec762627d0 100644
--- a/frappe/integrations/frappe_providers/__init__.py
+++ b/frappe/integrations/frappe_providers/__init__.py
@@ -4,7 +4,6 @@ from frappe.integrations.frappe_providers.frappecloud import frappecloud_migrato
 
 def migrate_to(local_site, frappe_provider):
 	if frappe_provider in ("frappe.cloud", "frappecloud.com"):
-		frappe_provider = "staging.frappe.cloud"
 		return frappecloud_migrator(local_site, frappe_provider)
 	else:
 		print("{} is not supported yet".format(frappe_provider))

From 7a58cbeff287a36700a4c316463f060be885ab62 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 15 May 2020 16:30:17 +0530
Subject: [PATCH 190/274] fix: hardcode url frappe.cloud => frappecloud.com

---
 frappe/integrations/frappe_providers/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/integrations/frappe_providers/__init__.py b/frappe/integrations/frappe_providers/__init__.py
index ec762627d0..a5cf284151 100644
--- a/frappe/integrations/frappe_providers/__init__.py
+++ b/frappe/integrations/frappe_providers/__init__.py
@@ -4,6 +4,7 @@ from frappe.integrations.frappe_providers.frappecloud import frappecloud_migrato
 
 def migrate_to(local_site, frappe_provider):
 	if frappe_provider in ("frappe.cloud", "frappecloud.com"):
+		frappe_provider = "frappecloud.com"
 		return frappecloud_migrator(local_site, frappe_provider)
 	else:
 		print("{} is not supported yet".format(frappe_provider))

From b2e4ab201f53b9609509ef24e0be2a8de617c31b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 15 May 2020 17:01:20 +0530
Subject: [PATCH 191/274] fix: change child doctype name

---
 .../custom/doctype/package_publish_tool/package_publish_tool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index 4c10b609a8..7e3b65936f 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -68,7 +68,7 @@ frappe.ui.form.on('Package Publish Tool', {
 	}
 });
 
-frappe.ui.form.on('Package Detail', {
+frappe.ui.form.on('Package Document Type', {
 	form_render: function (frm, cdt, cdn) {
 		function _show_filters(filters, table) {
 			table.find('tbody').empty();

From e02feac919e928f1f3db304320a06bd44f618588 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 15 May 2020 17:22:48 +0530
Subject: [PATCH 192/274] fix: do not link package to doc

---
 .../custom/doctype/package_publish_tool/package_publish_tool.js  | 1 +
 .../custom/doctype/package_publish_tool/package_publish_tool.py  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index 7e3b65936f..baf1ab1fcb 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -50,6 +50,7 @@ frappe.ui.form.on('Package Publish Tool', {
 				frappe.call({
 					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
 					callback: function() {
+						frm.reload_doc();
 						frappe.msgprint(__("Package has been published."));
 					}
 				});
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
index 415839322c..a01dd0ba47 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py
@@ -23,7 +23,6 @@ def deploy_package():
 	package, doc = export_package()
 
 	file_name = "Package-" + get_datetime_str(get_datetime())
-	save_file(file_name, json.dumps(package), "Package Publish Tool", "Package Publish Tool")
 
 	length = len(doc.instances)
 	for idx, instance in enumerate(doc.instances):

From 8e204e9fb92cc1ceeaa003eff86d1acb634c70f9 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 15 May 2020 17:40:33 +0530
Subject: [PATCH 193/274] fix: UX fixes

---
 .../package_publish_target.json               |  4 ++--
 .../package_publish_tool.js                   | 22 +++++++++++--------
 .../package_publish_tool.json                 |  6 ++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/frappe/custom/doctype/package_publish_target/package_publish_target.json b/frappe/custom/doctype/package_publish_target/package_publish_target.json
index ccf3f2ea05..baeb7cb8bc 100644
--- a/frappe/custom/doctype/package_publish_target/package_publish_target.json
+++ b/frappe/custom/doctype/package_publish_target/package_publish_target.json
@@ -14,7 +14,7 @@
    "fieldname": "instance_url",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Instance URL",
+   "label": "Site URL",
    "reqd": 1
   },
   {
@@ -34,7 +34,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-13 16:04:49.943057",
+ "modified": "2020-05-15 17:35:16.282235",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package Publish Target",
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
index baf1ab1fcb..a0190a8d8c 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.js
@@ -32,7 +32,7 @@ frappe.ui.form.on('Package Publish Tool', {
 	},
 	show_indicator: function(frm) {
 		let pretty_date = frappe.datetime.prettyDate(frm.doc.last_deployed_on);
-		frm.page.set_indicator(__("Last deployed {0}", [pretty_date]), "blue");
+		frm.page.set_indicator(__("Last published {0}", [pretty_date]), "blue");
 	},
 	set_dirty_trigger: function(frm) {
 		$(frm.wrapper).on("dirty", function() {
@@ -41,9 +41,9 @@ frappe.ui.form.on('Package Publish Tool', {
 	},
 	set_deploy_primary_action: function(frm) {
 		if (frm.doc.package_details.length && frm.doc.instances.length) {
-			frm.page.set_primary_action(__("Deploy"), function () {
+			frm.page.set_primary_action(__("Publish"), function () {
 				frappe.show_alert({
-					message: __("Deploying Package"),
+					message: __("Publishing documents..."),
 					indicator: "green"
 				});
 
@@ -51,7 +51,7 @@ frappe.ui.form.on('Package Publish Tool', {
 					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
 					callback: function() {
 						frm.reload_doc();
-						frappe.msgprint(__("Package has been published."));
+						frappe.msgprint(__("Documents have been published."));
 					}
 				});
 			});
@@ -60,11 +60,15 @@ frappe.ui.form.on('Package Publish Tool', {
 	show_instructions: function(frm) {
 		let field = frm.get_field("html_info");
 		field.html(`
-			<p class="text-muted small">
-				- Create a Package by selecting the Documents and filters in the Package table.<br>
-				- Add the Remote Instance's URL, Username and Password to the Instances table.<br>
-				- Once the above details are filled, Deploy button will be visible and the Package will be deployed on click.<br>
+			<p class="text-muted text-medium">
+				Package Publish Tool let's you copy documents from your site to any other remote site.
+				Follow the steps below to publish.
 			</p>
+			<ol class="text-muted small">
+				<li>Add Document Types that you want to copy from the table below. You can also add filters by expanding the row.</li>
+				<li>Add the Sites URL where you want to copy these documents, and enter the Username and Password.</li>
+				<li>Click on Save. Now, you can click on Publish and the documents will be copied.</li>
+			</ol>
 		`);
 	}
 });
@@ -152,4 +156,4 @@ frappe.ui.form.on('Package Document Type', {
 			});
 		});
 	},
-});
\ No newline at end of file
+});
diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
index 59d22f6ad4..0f85ae0348 100644
--- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
+++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.json
@@ -17,14 +17,14 @@
    "description": "Click on the row for accessing filters.",
    "fieldname": "package_details",
    "fieldtype": "Table",
-   "label": "Package",
+   "label": "Document Types",
    "options": "Package Document Type",
    "reqd": 1
   },
   {
    "fieldname": "instances",
    "fieldtype": "Table",
-   "label": "Instances",
+   "label": "Sites",
    "options": "Package Publish Target",
    "reqd": 1
   },
@@ -50,7 +50,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-05-14 16:46:20.374773",
+ "modified": "2020-05-15 17:31:37.060199",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Package Publish Tool",

From f7f81a0843cb7d988f340eeae67e7cea258afd02 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 15 May 2020 17:52:40 +0530
Subject: [PATCH 194/274] chore: add missed import

---
 frappe/integrations/frappe_providers/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/integrations/frappe_providers/__init__.py b/frappe/integrations/frappe_providers/__init__.py
index a5cf284151..0b689478d2 100644
--- a/frappe/integrations/frappe_providers/__init__.py
+++ b/frappe/integrations/frappe_providers/__init__.py
@@ -1,3 +1,6 @@
+# imports - standard imports
+import sys
+
 # imports - module imports
 from frappe.integrations.frappe_providers.frappecloud import frappecloud_migrator
 

From fb65414d820891f655fec5c507cd0543e596c00f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 18:52:55 +0530
Subject: [PATCH 195/274] feat: added subnav

---
 .../website/web_template/subnav/__init__.py   |  0
 .../website/web_template/subnav/subnav.html   | 21 ++++++
 .../website/web_template/subnav/subnav.json   | 74 +++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 frappe/website/web_template/subnav/__init__.py
 create mode 100644 frappe/website/web_template/subnav/subnav.html
 create mode 100644 frappe/website/web_template/subnav/subnav.json

diff --git a/frappe/website/web_template/subnav/__init__.py b/frappe/website/web_template/subnav/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/web_template/subnav/subnav.html b/frappe/website/web_template/subnav/subnav.html
new file mode 100644
index 0000000000..274acf2b8a
--- /dev/null
+++ b/frappe/website/web_template/subnav/subnav.html
@@ -0,0 +1,21 @@
+<nav class="navbar navbar-expand-lg navbar-light subnav">
+	<div class="container">
+		<a class="navbar-brand d-none d-sm-block" href="{{ path }}">
+			{% if logo %}
+			<img class="d-inline-block align-top mr-2" src="{{ logo }}" style="max-height: 25px;"/>
+			{% endif %}
+			<span class="subnav-title">{{ title }}</span>
+		</a>
+		<ul class="navbar-nav justify-content-sm-end">
+			{% for index in ['1', '2', '3', '4'] %}
+			{% set label = values['label_' + index] %}
+			{% set url = values['url_' + index] %}
+				{% if label and url %}
+				<li class="navbar-item">
+					<a class="nav-link text-muted" href="{{ url }}">{{ label }}</a>
+				</li>
+				{% endif %}
+			{% endfor %}
+		</ul>
+	</div>
+</nav>
diff --git a/frappe/website/web_template/subnav/subnav.json b/frappe/website/web_template/subnav/subnav.json
new file mode 100644
index 0000000000..baaebc14b7
--- /dev/null
+++ b/frappe/website/web_template/subnav/subnav.json
@@ -0,0 +1,74 @@
+{
+ "creation": "2020-05-15 17:53:36.526784",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "reqd": 0
+  },
+  {
+   "fieldname": "logo",
+   "fieldtype": "Attach Image",
+   "label": "Logo",
+   "reqd": 0
+  },
+  {
+   "fieldname": "label_1",
+   "fieldtype": "Data",
+   "label": "Label 1",
+   "reqd": 0
+  },
+  {
+   "fieldname": "url_1",
+   "fieldtype": "Data",
+   "label": "URL 1",
+   "reqd": 0
+  },
+  {
+   "fieldname": "label_2",
+   "fieldtype": "Data",
+   "label": "Label 2",
+   "reqd": 0
+  },
+  {
+   "fieldname": "url_2",
+   "fieldtype": "Data",
+   "label": "URL 2",
+   "reqd": 0
+  },
+  {
+   "fieldname": "label_3",
+   "fieldtype": "Data",
+   "label": "Label 3",
+   "reqd": 0
+  },
+  {
+   "fieldname": "url_3",
+   "fieldtype": "Data",
+   "label": "URL 3",
+   "reqd": 0
+  },
+  {
+   "fieldname": "label_4",
+   "fieldtype": "Data",
+   "label": "Label 4",
+   "reqd": 0
+  },
+  {
+   "fieldname": "url_4",
+   "fieldtype": "Data",
+   "label": "URL 4",
+   "reqd": 0
+  }
+ ],
+ "idx": 0,
+ "modified": "2020-05-15 17:54:52.253976",
+ "modified_by": "Administrator",
+ "name": "Subnav",
+ "owner": "Administrator",
+ "standard": 1,
+ "template": "<nav class=\"navbar navbar-expand-lg navbar-light subnav\">\n\t<div class=\"container\">\n\t\t<a class=\"navbar-brand d-none d-sm-block\" href=\"{{ path }}\">\n\t\t\t{% if logo %}\n\t\t\t<img class=\"d-inline-block align-top\" src=\"{{ logo }}\" />\n\t\t\t{% endif %}\n\t\t\t<span class=\"subnav-title\">{{ title }}</span>\n\t\t</a>\n\t\t<ul class=\"navbar-nav justify-content-sm-end\">\n\t\t\t{% for item in items %}\n\t\t\t<li class=\"navbar-item\">\n\t\t\t\t<a\n\t\t\t\t\tclass=\"nav-link\"\n\t\t\t\t\thref=\"{{ item.path }}\"\n\t\t\t\t\t{% if item.new %}\n\t\t\t\t\ttarget=\"_blank\"\n\t\t\t\t\t{% endif %}>{{ item.label }}\n\t\t\t\t</a>\n\t\t\t</li>\n\t\t\t{% endfor %}\n\t\t</ul>\n\t</div>\n</nav>"
+}
\ No newline at end of file

From 20c55b4f7334aa2f57d0ab4cd245c51dad6b1cc4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 18:53:17 +0530
Subject: [PATCH 196/274] refactor: remove template from list view

---
 frappe/website/doctype/web_template/web_template.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/website/doctype/web_template/web_template.json b/frappe/website/doctype/web_template/web_template.json
index 9c0ef37b1c..18b36b9b81 100644
--- a/frappe/website/doctype/web_template/web_template.json
+++ b/frappe/website/doctype/web_template/web_template.json
@@ -16,7 +16,6 @@
    "depends_on": "eval:!doc.standard",
    "fieldname": "template",
    "fieldtype": "Code",
-   "in_list_view": 1,
    "label": "Template",
    "options": "HTML"
   },
@@ -35,7 +34,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-17 14:05:28.499020",
+ "modified": "2020-05-15 17:50:51.856135",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Template",

From b53d91b886c9433fa540a40b8e652728fa51de90 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 15 May 2020 19:45:46 +0530
Subject: [PATCH 197/274] style: fix linting issues from sider

---
 frappe/public/js/frappe/utils/web_page_block.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/web_page_block.js b/frappe/public/js/frappe/utils/web_page_block.js
index acc7943671..8b0dbe5134 100644
--- a/frappe/public/js/frappe/utils/web_page_block.js
+++ b/frappe/public/js/frappe/utils/web_page_block.js
@@ -8,7 +8,7 @@ frappe.ui.form.on('Web Page Block', {
 					if (df.fieldtype == "Section Break") {
 						df.collapsible = 1;
 					}
-					return df
+					return df;
 				}),
 				primary_action(values) {
 					frappe.model.set_value(

From 898c214176ed0309c199750109b32000a9fd81dc Mon Sep 17 00:00:00 2001
From: ABHISHEK KEDAR <44434910+ABHISHEK-KEDAR-21@users.noreply.github.com>
Date: Fri, 15 May 2020 23:30:13 +0530
Subject: [PATCH 198/274] feat: show current site name on bench use <site>
 (#10372)

---
 frappe/commands/site.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index d92c727dc7..82ed72dd5c 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -326,6 +326,7 @@ def use(site, sites_path='.'):
 	if os.path.exists(os.path.join(sites_path, site)):
 		with open(os.path.join(sites_path,  "currentsite.txt"), "w") as sitefile:
 			sitefile.write(site)
+		print("Current Site set to {}".format(site))
 	else:
 		print("{} does not exist".format(site))
 

From 6c58b63f51cb58fcf9bf532a49870ae6ad16c3ea Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 16 May 2020 12:31:05 +0530
Subject: [PATCH 199/274] fix: referrer length too long

---
 .../doctype/web_page_view/web_page_view.py    | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/frappe/website/doctype/web_page_view/web_page_view.py b/frappe/website/doctype/web_page_view/web_page_view.py
index 93cf1d7bb8..e95f0fede2 100644
--- a/frappe/website/doctype/web_page_view/web_page_view.py
+++ b/frappe/website/doctype/web_page_view/web_page_view.py
@@ -12,9 +12,15 @@ class WebPageView(Document):
 
 @frappe.whitelist(allow_guest=True)
 def make_view_log(path, referrer=None, browser=None, version=None, url=None, user_tz=None):
+	if not is_tracking_enabled():
+		return
+
 	request_dict = frappe.request.__dict__
 	user_agent = request_dict.get('environ', {}).get('HTTP_USER_AGENT')
 
+	if referrer:
+		referrer = referrer.split('?')[0]
+
 	is_unique = True
 	if referrer.startswith(url):
 		is_unique = False
@@ -22,16 +28,20 @@ def make_view_log(path, referrer=None, browser=None, version=None, url=None, use
 	if path != "/" and path.startswith('/'):
 		path = path[1:]
 
-	if is_tracking_enabled():
-		view = frappe.new_doc("Web Page View")
-		view.path = path
-		view.referrer = referrer
-		view.browser = browser
-		view.browser_version = version
-		view.time_zone = user_tz
-		view.user_agent = user_agent
-		view.is_unique = is_unique
+	view = frappe.new_doc("Web Page View")
+	view.path = path
+	view.referrer = referrer
+	view.browser = browser
+	view.browser_version = version
+	view.time_zone = user_tz
+	view.user_agent = user_agent
+	view.is_unique = is_unique
+
+	try:
 		view.insert(ignore_permissions=True)
+	except:
+		if frappe.message_log:
+			frappe.message_log.pop()
 
 	return
 

From ff525deaf97dc3106223f0faecb5f26a0035192f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 16 May 2020 12:43:10 +0530
Subject: [PATCH 200/274] style: sider fixes

---
 frappe/website/doctype/web_page_view/web_page_view.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/website/doctype/web_page_view/web_page_view.py b/frappe/website/doctype/web_page_view/web_page_view.py
index e95f0fede2..d9794c6d99 100644
--- a/frappe/website/doctype/web_page_view/web_page_view.py
+++ b/frappe/website/doctype/web_page_view/web_page_view.py
@@ -39,12 +39,10 @@ def make_view_log(path, referrer=None, browser=None, version=None, url=None, use
 
 	try:
 		view.insert(ignore_permissions=True)
-	except:
+	except Exception:
 		if frappe.message_log:
 			frappe.message_log.pop()
 
-	return
-
 @frappe.whitelist()
 def get_page_view_count(path):
 	return frappe.db.count("Web Page View", filters={'path': path})

From d5e16b3edb8f4ac6097cdef6ef115906b3aaba2a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 16 May 2020 15:09:24 +0530
Subject: [PATCH 201/274] fix: add missing chart types and don't make type
 mandatory

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js   | 6 ------
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 9 ++++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 2ec73cff42..e2be095fce 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -92,12 +92,6 @@ frappe.ui.form.on('Dashboard Chart', {
 				}
 			});
 		} else {
-			if (frm.doc.chart_type == 'Group By') {
-				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie', 'Donut']);
-			} else {
-				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Heatmap']);
-			}
-
 			frm.set_value('document_type', '');
 		}
 	},
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index 72f5c43316..4bab76337f 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -128,8 +128,7 @@
    "fieldname": "type",
    "fieldtype": "Select",
    "label": "Type",
-   "options": "Line\nBar\nHeatmap",
-   "reqd": 1
+   "options": "Line\nBar\nPercentage\nPie\nDonut\nHeatmap"
   },
   {
    "fieldname": "column_break_2",
@@ -219,7 +218,7 @@
    "options": "Dashboard Chart Field"
   },
   {
-   "description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
+   "description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"]",
    "fieldname": "custom_options",
    "fieldtype": "Code",
    "label": "Custom Options"
@@ -239,7 +238,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 19:45:01.669384",
+ "modified": "2020-05-16 15:03:02.455395",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
@@ -283,4 +282,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}
\ No newline at end of file

From 19e16d8a5a161cdffbfe8e90d8a0366dc4a787ee Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 16 May 2020 20:08:38 +0530
Subject: [PATCH 202/274] fix: TypeError in cmp

---
 frappe/contacts/doctype/contact/contact.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 99068dcf6d..4cf209541c 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, has_gravatar
+from frappe.utils import cstr, has_gravatar, cint
 from frappe import _
 from frappe.model.document import Document
 from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
@@ -133,7 +133,7 @@ def get_default_contact(doctype, name):
 			dl.parenttype = "Contact"''', (doctype, name))
 
 	if out:
-		return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0]
+		return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(cint(y[1]), cint(x[1]))))[0][0]
 	else:
 		return None
 

From 90b0c045f32339fe264bde09b551af9ba10ada64 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 17 May 2020 18:07:35 +0530
Subject: [PATCH 203/274] fix: Handle Untitled Column in Import Preview

---
 frappe/public/js/frappe/data_import/import_preview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js
index 1900a1f789..27d81b75b7 100644
--- a/frappe/public/js/frappe/data_import/import_preview.js
+++ b/frappe/public/js/frappe/data_import/import_preview.js
@@ -81,7 +81,7 @@ frappe.data_import.ImportPreview = class ImportPreview {
 				</span>`;
 				return {
 					id: frappe.utils.get_random(6),
-					name: col.header_title || df.label,
+					name: col.header_title || (df ? df.label : 'Untitled Column'),
 					content: column_title,
 					skip_import: true,
 					editable: false,

From b4dd66ceb370db60fd254e4d2cffed4ab3a4b7a1 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 17 May 2020 18:12:40 +0530
Subject: [PATCH 204/274] fix: Remove empty rows and columns before validating
 template

---
 .../core/doctype/data_import/importer_new.py  | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index 3dcb902482..99d12c506b 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -74,7 +74,6 @@ class Importer:
 			self.read_content(content, extension)
 
 		self.validate_template_content()
-		self.remove_empty_rows_and_columns()
 
 	def read_file(self, file_path):
 		extn = file_path.split(".")[1]
@@ -99,6 +98,8 @@ class Importer:
 		elif extension == "xls":
 			data = read_xls_file_from_attached_file(content)
 
+		data = self.remove_empty_rows_and_columns(data)
+
 		if len(data) <= 1:
 			frappe.throw(
 				_("Import template should contain a Header and atleast one row."), title=error_title
@@ -114,42 +115,41 @@ class Importer:
 				_("Number of columns does not match with data"), title=_("Invalid Template")
 			)
 
-	def remove_empty_rows_and_columns(self):
+	def remove_empty_rows_and_columns(self, raw_data):
 		self.row_index_map = []
 		removed_rows = []
 		removed_columns = []
 
 		# remove empty rows
-		data = []
-		for i, row in enumerate(self.data):
+		data_without_empty_rows = []
+		for i, row in enumerate(raw_data):
 			if all(v in INVALID_VALUES for v in row):
 				# empty row
 				removed_rows.append(i)
 			else:
-				data.append(row)
+				data_without_empty_rows.append(row)
 				self.row_index_map.append(i)
 
 		# remove empty columns
 		# a column with a header and no data is a valid column
 		# a column with no header and no data will be removed
-		header_row = []
-		for i, column in enumerate(self.header_row):
-			column_values = [row[i] for row in data]
-			values = [column] + column_values
-			if all(v in INVALID_VALUES for v in values):
+		first_row = data_without_empty_rows[0]
+		for i, column in enumerate(first_row):
+			column_values = [row[i] for row in data_without_empty_rows]
+			if all(v in INVALID_VALUES for v in column_values):
 				# empty column
 				removed_columns.append(i)
-			else:
-				header_row.append(column)
 
-		data_without_empty_columns = []
-		# remove empty columns from data
-		for i, row in enumerate(data):
-			new_row = [v for j, v in enumerate(row) if j not in removed_columns]
-			data_without_empty_columns.append(new_row)
+		if removed_columns:
+			data_without_empty_rows_and_columns = []
+			# remove empty columns from data
+			for i, row in enumerate(data_without_empty_rows):
+				new_row = [v for j, v in enumerate(row) if j not in removed_columns]
+				data_without_empty_rows_and_columns.append(new_row)
+		else:
+			data_without_empty_rows_and_columns = data_without_empty_rows
 
-		self.data = data_without_empty_columns
-		self.header_row = header_row
+		return data_without_empty_rows_and_columns
 
 	def get_data_for_import_preview(self):
 		out = frappe._dict()

From 9a806585f2884174b5cb309e910e8bb129d2e477 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 17 May 2020 18:12:51 +0530
Subject: [PATCH 205/274] style: Black formatting

---
 .../core/doctype/data_import/importer_new.py  | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index 99d12c506b..040e9fabc4 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -325,7 +325,7 @@ class Importer:
 
 	def detect_date_formats(self, columns):
 		for col in columns:
-			if col.df and col.df.fieldtype in ['Date', 'Time', 'Datetime']:
+			if col.df and col.df.fieldtype in ["Date", "Time", "Datetime"]:
 				col.date_format = self.guess_date_format_for_column(col, columns)
 		return columns
 
@@ -351,7 +351,16 @@ class Importer:
 		value = cstr(value)
 
 		# convert boolean values to 0 or 1
-		if df.fieldtype == "Check" and value.lower().strip() in ["t", "f", "true", "false", "yes", "no", "y", "n"]:
+		if df.fieldtype == "Check" and value.lower().strip() in [
+			"t",
+			"f",
+			"true",
+			"false",
+			"yes",
+			"no",
+			"y",
+			"n",
+		]:
 			value = value.lower().strip()
 			value = 1 if value in ["t", "true", "y", "yes"] else 0
 
@@ -398,8 +407,9 @@ class Importer:
 			date_values = [
 				row[column_index] for row in self.data[:PARSE_ROW_COUNT] if row[column_index]
 			]
-			date_formats = [guess_date_format(d) if isinstance(d, str) else None
-							for d in date_values]
+			date_formats = [
+				guess_date_format(d) if isinstance(d, str) else None for d in date_values
+			]
 			if not date_formats:
 				return
 			max_occurred_date_format = max(set(date_formats), key=date_formats.count)
@@ -827,9 +837,9 @@ class Importer:
 		id_value = doc[id_fieldname]
 		existing_doc = frappe.get_doc(self.doctype, id_value)
 		existing_doc.flags.updater_reference = {
-			'doctype': self.data_import.doctype,
-			'docname': self.data_import.name,
-			'label': _('via Data Import')
+			"doctype": self.data_import.doctype,
+			"docname": self.data_import.name,
+			"label": _("via Data Import"),
 		}
 		existing_doc.update(doc)
 		existing_doc.save()

From b16f04c50b307c24ffd3d6f2dba2efb717d04a63 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 17 May 2020 18:14:00 +0530
Subject: [PATCH 206/274] fix: Use frappe.call instead of frm.call

- frm.call sends the full doc as JSON which can be large
---
 .../data_import_beta/data_import_beta.js        |  6 +++---
 .../data_import_beta/data_import_beta.py        | 17 +++++++++++++----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.js b/frappe/core/doctype/data_import_beta/data_import_beta.js
index 82c490c524..527dbd7d0c 100644
--- a/frappe/core/doctype/data_import_beta/data_import_beta.js
+++ b/frappe/core/doctype/data_import_beta/data_import_beta.js
@@ -177,8 +177,8 @@ frappe.ui.form.on('Data Import Beta', {
 	start_import(frm) {
 		frm
 			.call({
-				doc: frm.doc,
-				method: 'start_import',
+				method: 'form_start_import',
+				args: { data_import: frm.doc.name },
 				btn: frm.page.btn_primary
 			})
 			.then(r => {
@@ -252,8 +252,8 @@ frappe.ui.form.on('Data Import Beta', {
 
 		frm
 			.call({
-				doc: frm.doc,
 				method: 'get_preview_from_template',
+				args: { data_import: frm.doc.name },
 				error_handlers: {
 					TimestampMismatchError() {
 						// ignore this error
diff --git a/frappe/core/doctype/data_import_beta/data_import_beta.py b/frappe/core/doctype/data_import_beta/data_import_beta.py
index d010cd7ec2..8f12bd20ed 100644
--- a/frappe/core/doctype/data_import_beta/data_import_beta.py
+++ b/frappe/core/doctype/data_import_beta/data_import_beta.py
@@ -61,6 +61,16 @@ class DataImportBeta(Document):
 		return Importer(self.reference_doctype, data_import=self)
 
 
+@frappe.whitelist()
+def get_preview_from_template(data_import):
+	return frappe.get_doc("Data Import Beta", data_import).get_preview_from_template()
+
+
+@frappe.whitelist()
+def form_start_import(data_import):
+	return frappe.get_doc("Data Import Beta", data_import).start_import()
+
+
 def start_import(data_import):
 	"""This method runs in background job"""
 	data_import = frappe.get_doc("Data Import Beta", data_import)
@@ -69,12 +79,11 @@ def start_import(data_import):
 		i.import_data()
 	except:
 		frappe.db.rollback()
-		data_import.db_set('status', 'Error')
+		data_import.db_set("status", "Error")
 		frappe.log_error(title=data_import.name)
 		frappe.db.commit()
-		frappe.publish_realtime(
-			"data_import_refresh", {"data_import": data_import.name}
-		)
+		frappe.publish_realtime("data_import_refresh", {"data_import": data_import.name})
+
 
 @frappe.whitelist()
 def download_template(

From dad80a1ed17b505c4b5ed2e4f6ba5c7955a899b0 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Fri, 1 May 2020 11:21:50 +0530
Subject: [PATCH 207/274] feat: Resesign Multiselect Dialog

---
 .../js/frappe/form/multi_select_dialog.js     | 249 ++++++++++--------
 1 file changed, 139 insertions(+), 110 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index cdd385a6ea..40c2a92113 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -1,83 +1,42 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
 frappe.ui.form.MultiSelectDialog = Class.extend({
-	init: function(opts) {
-		/* Options: doctype, target, setters, get_query, action */
+	init: function (opts) {
+		/* Options: doctype, target, setters, get_query, action, add_filters_group, data_fields, primary_action_label */
 		$.extend(this, opts);
-
 		var me = this;
-		if(this.doctype!="[Select]") {
-			frappe.model.with_doctype(this.doctype, function(r) {
+		if (this.doctype != "[Select]") {
+			frappe.model.with_doctype(this.doctype, function () {
 				me.make();
 			});
 		} else {
 			this.make();
 		}
 	},
-	make: function() {
+	make: function () {
 		let me = this;
 
 		this.page_length = 20;
 		this.start = 0;
 
-		let fields = [
-			{
-				fieldtype: "Data",
-				label: __("Search Term"),
-				fieldname: "search_term"
-			},
-			{
-				fieldtype: "Column Break"
-			}
-		];
-		let count = 0;
-		if(!this.date_field) {
-			this.date_field = "transaction_date";
-		}
+		let fields = [];
 
-		// setters can be defined as a dict or a list of fields
-		// setters define the additional filters that get applied
-		// for selection
+		let header_fields = this.make_dialog_header();
 
-		// CASE 1: DocType name and fieldname is the same, example "customer" and "customer"
-		// setters define the filters applied in the modal
-		// if the fieldnames and doctypes are consistently named,
-		// pass a dict with the setter key and value, for example
-		// {customer: [customer_name]}
+		fields = fields.concat(header_fields);
 
-		// CASE 2: if the fieldname of the target is different,
-		// then pass a list of fields with appropriate fieldname
-
-		if($.isArray(this.setters)) {
-			for (let df of this.setters) {
-				fields.push(df, {fieldtype: "Column Break"});
-			}
-		} else {
-			Object.keys(this.setters).forEach(function(setter) {
-				fields.push({
-					fieldtype: me.target.fields_dict[setter].df.fieldtype,
-					label: me.target.fields_dict[setter].df.label,
-					fieldname: setter,
-					options: me.target.fields_dict[setter].df.options,
-					default: me.setters[setter]
-				});
-				if (count++ < Object.keys(me.setters).length) {
-					fields.push({fieldtype: "Column Break"});
-				}
-			});
+		if (this.add_filters_group) {
+			fields = fields.concat([
+				{
+					fieldtype: 'HTML',
+					fieldname: 'filter_area',
+				},
+			]);
 		}
 
 		fields = fields.concat([
-			{
-				"fieldname":"date_range",
-				"label": __("Date Range"),
-				"fieldtype": "DateRange",
-			},
-			{ fieldtype: "Section Break" },
 			{ fieldtype: "HTML", fieldname: "results_area" },
-			{ fieldtype: "Button", fieldname: "more_btn", label: __("More"),
-				click: function(){
+			{
+				fieldtype: "Button", fieldname: "more_btn", label: __("More"),
+				click: function () {
 					me.start += 20;
 					frappe.flags.auto_scroll = true;
 					me.get_results();
@@ -85,26 +44,33 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			}
 		]);
 
+		if (this.data_fields) {
+			fields = fields.concat([{ fieldtype: "Section Break" }]);
+			fields = fields.concat(this.data_fields);
+
+		}
+
 		let doctype_plural = !this.doctype.endsWith('y') ? this.doctype + 's'
 			: this.doctype.slice(0, -1) + 'ies';
 		this.dialog = new frappe.ui.Dialog({
-			title: __("Select {0}", [(this.doctype=='[Select]') ? __("value") : __(doctype_plural)]),
+			title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
 			fields: fields,
-			primary_action_label: __("Get Items"),
+			primary_action_label: this.primary_action_label || __("Get Items"),
 			secondary_action_label: __("Make {0}", [me.doctype]),
-			primary_action: function() {
-				me.action(me.get_checked_values(), me.args);
+			primary_action: function () {
+				let filters_data = me.get_filters();
+				me.action(me.get_checked_values(), cur_dialog.get_values(), me.args, filters_data);
 			},
-			secondary_action: function(e) {
+			secondary_action: function (e) {
 				// If user wants to close the modal
 				if (e) {
 					frappe.route_options = {};
-					if($.isArray(me.setters)) {
+					if ($.isArray(me.setters)) {
 						for (let df of me.setters) {
 							frappe.route_options[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
 						}
 					} else {
-						Object.keys(me.setters).forEach(function(setter) {
+						Object.keys(me.setters).forEach(function (setter) {
 							frappe.route_options[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
 						});
 					}
@@ -114,6 +80,10 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			}
 		});
 
+		if (this.add_filters_group) {
+			this.make_filter_area();
+		}
+
 		this.$parent = $(this.dialog.body);
 		this.$wrapper = this.dialog.fields_dict.results_area.$wrapper.append(`<div class="results"
 			style="border: 1px solid #d1d8dd; border-radius: 3px; height: 300px; overflow: auto;"></div>`);
@@ -128,7 +98,80 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		this.dialog.show();
 	},
 
-	bind_events: function() {
+	make_dialog_header: function () {
+		let fields = [];
+		let me = this;
+		this.col_0 = [
+			{
+				fieldtype: "Data",
+				label: __("Search Term"),
+				fieldname: "search_term"
+			}
+		];
+		this.col_1 = [];
+		this.col_2 = [];
+
+		// setters can be defined as a dict or a list of fields
+		// setters define the additional filters that get applied
+		// for selection
+
+		// CASE 1: DocType name and fieldname is the same, example "customer" and "customer"
+		// setters define the filters applied in the modal
+		// if the fieldnames and doctypes are consistently named,
+		// pass a dict with the setter key and value, for example
+		// {customer: [customer_name]}
+
+		// CASE 2: if the fieldname of the target is different,
+		// then pass a list of fields with appropriate
+
+		if ($.isArray(this.setters)) {  // need to figure out
+			for (let df of this.setters) {
+				fields.push(df, { fieldtype: "Column Break" });
+			}
+		} else {
+			Object.keys(this.setters).forEach(function (setter, index) {
+				// x['group_' + cstr((index+1)%4)].push(setter);
+				let df_prop = frappe.meta.docfield_map[me.doctype][setter];
+				// this[]push({fieldtype: "Column Break"});
+				me['col_' + cstr((index + 1) % 3)].push({
+					fieldtype: df_prop.fieldtype,
+					label: df_prop.label,
+					fieldname: setter,
+					options: df_prop.options,
+					default: me.setters[setter]
+				});
+			});
+		}
+
+		fields = fields.concat(this.col_0);
+		fields = fields.concat({ fieldtype: "Column Break" });
+		fields = fields.concat(this.col_1);
+		fields = fields.concat({ fieldtype: "Column Break" });
+		fields = fields.concat(this.col_2);
+
+		fields = fields.concat({ fieldtype: "Section Break" });
+		return fields;
+	},
+
+	make_filter_area: function () {
+		this.filter_group = new frappe.ui.FilterGroup({
+			parent: this.dialog.get_field('filter_area').$wrapper,
+			doctype: this.doctype,
+			on_change: () => {
+				this.get_results();
+			}
+		});
+	},
+
+	get_filters: function () {
+		return this.filter_group.get_filters().reduce((acc, filter) => {
+			return Object.assign(acc, {
+				[filter[1]]: [filter[2], filter[3]]
+			});
+		}, {});
+	},
+
+	bind_events: function () {
 		let me = this;
 
 		this.$results.on('click', '.list-item-container', function (e) {
@@ -145,16 +188,10 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			frappe.flags.auto_scroll = false;
 			this.get_results();
 		});
-
-		this.$parent.find('[data-fieldname="date_range"]').on('blur', (e) => {
-			frappe.flags.auto_scroll = false;
-			this.get_results();
-		});
-
 		this.$parent.find('[data-fieldname="search_term"]').on('input', (e) => {
 			var $this = $(this);
 			clearTimeout($this.data('timeout'));
-			$this.data('timeout', setTimeout(function() {
+			$this.data('timeout', setTimeout(function () {
 				frappe.flags.auto_scroll = false;
 				me.empty_list();
 				me.get_results();
@@ -162,22 +199,22 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		});
 	},
 
-	get_checked_values: function() {
+	get_checked_values: function () {
 		// Return name of checked value.
-		return this.$results.find('.list-item-container').map(function() {
-			if ($(this).find('.list-row-check:checkbox:checked').length > 0 ) {
+		return this.$results.find('.list-item-container').map(function () {
+			if ($(this).find('.list-row-check:checkbox:checked').length > 0) {
 				return $(this).attr('data-item-name');
 			}
 		}).get();
 	},
 
-	get_checked_items: function() {
+	get_checked_items: function () {
 		// Return checked items with all the column values.
 		let checked_values = this.get_checked_values();
 		return this.results.filter(res => checked_values.includes(res.name));
 	},
 
-	make_list_row: function(result={}) {
+	make_list_row: function (result = {}) {
 		var me = this;
 		// Make a head row by default (if result not passed)
 		let head = Object.keys(result).length === 0;
@@ -185,26 +222,24 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		let contents = ``;
 		let columns = ["name"];
 
-		if($.isArray(this.setters)) {
+		if ($.isArray(this.setters)) {
 			for (let df of this.setters) {
 				columns.push(df.fieldname);
 			}
 		} else {
 			columns = columns.concat(Object.keys(this.setters));
 		}
-		columns.push("Date");
 
-		columns.forEach(function(column) {
+		columns.forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
 				${
-					head ? `<span class="ellipsis">${__(frappe.model.unscrub(column))}</span>`
-
+				head ? `<span class="ellipsis">${__(frappe.model.unscrub(column))}</span>`
 					: (column !== "name" ? `<span class="ellipsis">${__(result[column])}</span>`
-						: `<a href="${"#Form/"+ me.doctype + "/" + result[column]}" class="list-id ellipsis">
+						: `<a href="${"#Form/" + me.doctype + "/" + result[column]}" class="list-id ellipsis">
 							${__(result[column])}</a>`)
 				}
 			</div>`;
-		})
+		});
 
 		let $row = $(`<div class="list-item">
 			<div class="list-item__content" style="flex: 0 0 10px;">
@@ -215,10 +250,12 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 
 		head ? $row.addClass('list-item--head')
 			: $row = $(`<div class="list-item-container" data-item-name="${result.name}"></div>`).append($row);
+
+		$(".modal-dialog .list-item--head").css("z-index", 0);
 		return $row;
 	},
 
-	render_result_list: function(results, more = 0, empty=true) {
+	render_result_list: function (results, more = 0, empty = true) {
 		var me = this;
 		var more_btn = me.dialog.fields_dict.more_btn.$wrapper;
 
@@ -240,44 +277,43 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			});
 
 		if (frappe.flags.auto_scroll) {
-			this.$results.animate({scrollTop: me.$results.prop('scrollHeight')}, 500);
+			this.$results.animate({ scrollTop: me.$results.prop('scrollHeight') }, 500);
 		}
 	},
 
-	empty_list: function() {
+	empty_list: function () {
 		let checked = this.get_checked_items().map(item => {
 			return {
 				...item,
 				checked: true
-			}
+			};
 		});
 		this.$results.find('.list-item-container').remove();
 		this.render_result_list(checked, 0, false);
 	},
 
-	get_results: function() {
+	get_results: function () {
 		let me = this;
 
-		let filters = this.get_query ? this.get_query().filters : {};
-		let filter_fields = [me.date_field];
-		if($.isArray(this.setters)) {
+		let filters = this.get_query ? this.get_query().filters : {} || {};
+		// let filter_fields = [me.date_field];
+		let filter_fields = [];
+		if ($.isArray(this.setters)) {
 			for (let df of this.setters) {
 				filters[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
 				me.args[df.fieldname] = filters[df.fieldname];
 				filter_fields.push(df.fieldname);
 			}
 		} else {
-			Object.keys(this.setters).forEach(function(setter) {
+			Object.keys(this.setters).forEach(function (setter) {
 				filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
 				me.args[setter] = filters[setter];
 				filter_fields.push(setter);
 			});
 		}
 
-		let date_val = this.dialog.fields_dict["date_range"].get_value();
-		if(date_val) {
-			filters[this.date_field] = ['between', date_val];
-		}
+		let filter_group = this.get_filters();
+		$.extend(filters, filter_group);
 
 		let args = {
 			doctype: me.doctype,
@@ -288,13 +324,13 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			page_length: this.page_length + 1,
 			query: this.get_query ? this.get_query().query : '',
 			as_dict: 1
-		}
+		};
 		frappe.call({
 			type: "GET",
-			method:'frappe.desk.search.search_widget',
+			method: 'frappe.desk.search.search_widget',
 			no_spinner: true,
 			args: args,
-			callback: function(r) {
+			callback: function (r) {
 				let more = 0;
 				me.results = [];
 				if (r.values.length) {
@@ -302,18 +338,11 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 						r.values.pop();
 						more = 1;
 					}
-					r.values.forEach(function(result) {
-						if(me.date_field in result) {
-							result["Date"] = result[me.date_field]
-						}
+					r.values.forEach(function (result) {
 						result.checked = 0;
 						result.parsed_date = Date.parse(result["Date"]);
 						me.results.push(result);
 					});
-					me.results.map( (result) => {
-						result["Date"] = frappe.format(result["Date"], {"fieldtype":"Date"});
-					})
-
 					me.results.sort((a, b) => {
 						return a.parsed_date - b.parsed_date;
 					});

From a3659684f511f84064751a2b4c6daf97cb55fd49 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Wed, 6 May 2020 18:53:32 +0530
Subject: [PATCH 208/274] fix:changes requested

---
 .../js/frappe/form/multi_select_dialog.js     | 54 ++++++++-----------
 frappe/public/js/frappe/utils/utils.js        |  4 ++
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 40c2a92113..a8e64543e8 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -13,23 +13,16 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 	},
 	make: function () {
 		let me = this;
-
 		this.page_length = 20;
 		this.start = 0;
-
-		let fields = [];
-
-		let header_fields = this.make_dialog_header();
-
-		fields = fields.concat(header_fields);
-
+		let fields = this.get_fields_for_header();
 		if (this.add_filters_group) {
-			fields = fields.concat([
+			fields.push(
 				{
 					fieldtype: 'HTML',
 					fieldname: 'filter_area',
-				},
-			]);
+				}
+			);
 		}
 
 		fields = fields.concat([
@@ -45,13 +38,11 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		]);
 
 		if (this.data_fields) {
-			fields = fields.concat([{ fieldtype: "Section Break" }]);
+			fields.push({ fieldtype: "Section Break" });
 			fields = fields.concat(this.data_fields);
-
 		}
 
-		let doctype_plural = !this.doctype.endsWith('y') ? this.doctype + 's'
-			: this.doctype.slice(0, -1) + 'ies';
+		let doctype_plural =frappe.utils.get_doctype_plural(this.doctype);
 		this.dialog = new frappe.ui.Dialog({
 			title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
 			fields: fields,
@@ -65,7 +56,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				// If user wants to close the modal
 				if (e) {
 					frappe.route_options = {};
-					if ($.isArray(me.setters)) {
+					if (Array.isArray(me.setters)) {
 						for (let df of me.setters) {
 							frappe.route_options[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
 						}
@@ -98,18 +89,19 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		this.dialog.show();
 	},
 
-	make_dialog_header: function () {
+	get_fields_for_header: function () {
 		let fields = [];
 		let me = this;
-		this.col_0 = [
+		let columns = {};
+		columns['col_0'] = [
 			{
 				fieldtype: "Data",
 				label: __("Search Term"),
 				fieldname: "search_term"
 			}
 		];
-		this.col_1 = [];
-		this.col_2 = [];
+		columns['col_1'] = [];
+		columns['col_2'] = [];
 
 		// setters can be defined as a dict or a list of fields
 		// setters define the additional filters that get applied
@@ -124,16 +116,14 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		// CASE 2: if the fieldname of the target is different,
 		// then pass a list of fields with appropriate
 
-		if ($.isArray(this.setters)) {  // need to figure out
+		if (Array.isArray(this.setters)) {
 			for (let df of this.setters) {
 				fields.push(df, { fieldtype: "Column Break" });
 			}
 		} else {
 			Object.keys(this.setters).forEach(function (setter, index) {
-				// x['group_' + cstr((index+1)%4)].push(setter);
 				let df_prop = frappe.meta.docfield_map[me.doctype][setter];
-				// this[]push({fieldtype: "Column Break"});
-				me['col_' + cstr((index + 1) % 3)].push({
+				columns['col_' + cstr((index + 1) % 3)].push({
 					fieldtype: df_prop.fieldtype,
 					label: df_prop.label,
 					fieldname: setter,
@@ -143,12 +133,12 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			});
 		}
 
-		fields = fields.concat(this.col_0);
-		fields = fields.concat({ fieldtype: "Column Break" });
-		fields = fields.concat(this.col_1);
-		fields = fields.concat({ fieldtype: "Column Break" });
-		fields = fields.concat(this.col_2);
-
+		for (let i = 0; i < 3; i++) {
+			fields = fields.concat(columns['col_' + cstr(i)]);
+			if (i != 2) {
+				fields = fields.concat({ fieldtype: "Column Break" });
+			}
+		}
 		fields = fields.concat({ fieldtype: "Section Break" });
 		return fields;
 	},
@@ -222,7 +212,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		let contents = ``;
 		let columns = ["name"];
 
-		if ($.isArray(this.setters)) {
+		if (Array.isArray(this.setters)) {
 			for (let df of this.setters) {
 				columns.push(df.fieldname);
 			}
@@ -298,7 +288,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		let filters = this.get_query ? this.get_query().filters : {} || {};
 		// let filter_fields = [me.date_field];
 		let filter_fields = [];
-		if ($.isArray(this.setters)) {
+		if (Array.isArray(this.setters)) {
 			for (let df of this.setters) {
 				filters[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
 				me.args[df.fieldname] = filters[df.fieldname];
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 7d2c20c693..ba11374a4f 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -803,7 +803,11 @@ Object.assign(frappe.utils, {
 			name: M[0],
 			version: M[1],
 		};
+	},
+	get_doctype_plural(doctype) {
+		return !doctype.endsWith('y') ? doctype + 's': doctype.slice(0, -1) + 'ies';
 	}
+
 });
 
 // Array de duplicate

From 4d741916b0d02c9f37dadb478644b3afe0f4c00d Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Mon, 18 May 2020 12:05:33 +0530
Subject: [PATCH 209/274] fix: requested changes

---
 .../js/frappe/form/multi_select_dialog.js     | 50 ++++++-------------
 .../website_theme/standard/standard.json      |  5 +-
 2 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index a8e64543e8..61375aaedd 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -116,22 +116,16 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		// CASE 2: if the fieldname of the target is different,
 		// then pass a list of fields with appropriate
 
-		if (Array.isArray(this.setters)) {
-			for (let df of this.setters) {
-				fields.push(df, { fieldtype: "Column Break" });
-			}
-		} else {
-			Object.keys(this.setters).forEach(function (setter, index) {
-				let df_prop = frappe.meta.docfield_map[me.doctype][setter];
-				columns['col_' + cstr((index + 1) % 3)].push({
-					fieldtype: df_prop.fieldtype,
-					label: df_prop.label,
-					fieldname: setter,
-					options: df_prop.options,
-					default: me.setters[setter]
-				});
+		Object.keys(this.setters).forEach(function (setter, index) {
+			let df_prop = frappe.meta.docfield_map[me.doctype][setter];
+			columns['col_' + cstr((index + 1) % 3)].push({
+				fieldtype: df_prop.fieldtype,
+				label: df_prop.label,
+				fieldname: setter,
+				options: df_prop.options,
+				default: me.setters[setter]
 			});
-		}
+		});
 
 		for (let i = 0; i < 3; i++) {
 			fields = fields.concat(columns['col_' + cstr(i)]);
@@ -212,13 +206,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		let contents = ``;
 		let columns = ["name"];
 
-		if (Array.isArray(this.setters)) {
-			for (let df of this.setters) {
-				columns.push(df.fieldname);
-			}
-		} else {
-			columns = columns.concat(Object.keys(this.setters));
-		}
+		columns = columns.concat(Object.keys(this.setters));
 
 		columns.forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
@@ -288,19 +276,11 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		let filters = this.get_query ? this.get_query().filters : {} || {};
 		// let filter_fields = [me.date_field];
 		let filter_fields = [];
-		if (Array.isArray(this.setters)) {
-			for (let df of this.setters) {
-				filters[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
-				me.args[df.fieldname] = filters[df.fieldname];
-				filter_fields.push(df.fieldname);
-			}
-		} else {
-			Object.keys(this.setters).forEach(function (setter) {
-				filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
-				me.args[setter] = filters[setter];
-				filter_fields.push(setter);
-			});
-		}
+		Object.keys(this.setters).forEach(function (setter) {
+			filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
+			me.args[setter] = filters[setter];
+			filter_fields.push(setter);
+		});
 
 		let filter_group = this.get_filters();
 		$.extend(filters, filter_group);
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index 9365d5be27..fc80ba82dc 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -4,13 +4,12 @@
  "button_shadows": 0,
  "creation": "2015-02-19 13:37:33.925909",
  "custom": 0,
- "custom_css": "",
  "custom_overrides": "",
  "docstatus": 0,
  "doctype": "Website Theme",
  "font_properties": "400,500,600,700,800",
  "idx": 26,
- "modified": "2020-05-09 16:44:18.508471",
+ "modified": "2020-05-18 11:52:41.949264",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Standard",
@@ -18,4 +17,4 @@
  "theme": "Standard",
  "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n// Bootstrap Variable Overrides\n\n\n@import \"frappe/public/scss/website\";\n\n\n\n// Custom Theme\n",
  "theme_url": "/assets/css/standard_style.css"
-}
+}
\ No newline at end of file

From 59d1c29c986031b374ad02b65805f534ff046c47 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 18 May 2020 12:54:26 +0530
Subject: [PATCH 210/274] fix: test cases

---
 frappe/automation/doctype/assignment_rule/assignment_rule.py    | 2 +-
 frappe/desk/doctype/event/test_event.py                         | 2 +-
 frappe/desk/doctype/notification_log/test_notification_log.py   | 2 +-
 frappe/desk/form/assign_to.py                                   | 2 +-
 frappe/social/doctype/energy_point_log/test_energy_point_log.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.py b/frappe/automation/doctype/assignment_rule/assignment_rule.py
index 0a5d85636f..bf45347c4f 100644
--- a/frappe/automation/doctype/assignment_rule/assignment_rule.py
+++ b/frappe/automation/doctype/assignment_rule/assignment_rule.py
@@ -44,7 +44,7 @@ class AssignmentRule(Document):
 		user = self.get_user()
 
 		assign_to.add(dict(
-			assign_to = user,
+			assign_to = [user],
 			doctype = doc.get('doctype'),
 			name = doc.get('name'),
 			description = frappe.render_template(self.description, doc),
diff --git a/frappe/desk/doctype/event/test_event.py b/frappe/desk/doctype/event/test_event.py
index 6d1e865a45..3bb0518964 100644
--- a/frappe/desk/doctype/event/test_event.py
+++ b/frappe/desk/doctype/event/test_event.py
@@ -71,7 +71,7 @@ class TestEvent(unittest.TestCase):
 		ev = frappe.get_doc(self.test_records[0]).insert()
 
 		add({
-			"assign_to": "test@example.com",
+			"assign_to": ["test@example.com"],
 			"doctype": "Event",
 			"name": ev.name,
 			"description": "Test Assignment"
diff --git a/frappe/desk/doctype/notification_log/test_notification_log.py b/frappe/desk/doctype/notification_log/test_notification_log.py
index fe7d56c081..e59aee30c9 100644
--- a/frappe/desk/doctype/notification_log/test_notification_log.py
+++ b/frappe/desk/doctype/notification_log/test_notification_log.py
@@ -13,7 +13,7 @@ class TestNotificationLog(unittest.TestCase):
 		user = get_user()
 
 		assign_task({
-			"assign_to": user,
+			"assign_to": [user],
 			"doctype": 'ToDo',
 			"name": todo.name,
 			"description": todo.description
diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py
index 6c8cd5dfbd..a916cbca82 100644
--- a/frappe/desk/form/assign_to.py
+++ b/frappe/desk/form/assign_to.py
@@ -30,7 +30,7 @@ def get(args=None):
 def add(args=None):
 	"""add in someone's to do list
 		args = {
-			"assign_to": ,
+			"assign_to": [],
 			"doctype": ,
 			"name": ,
 			"description": ,
diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index 9e4d0e6425..1ecaba9cd5 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -306,7 +306,7 @@ def get_points(user, point_type='energy_points'):
 def assign_users_to_todo(todo_name, users):
 	for user in users:
 		assign_to({
-			'assign_to': user,
+			'assign_to': [user],
 			'doctype': 'ToDo',
 			'name': todo_name
 		})
\ No newline at end of file

From c615767aec1e27bd038d5b3f53a7ba5b3bdc828d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 May 2020 13:49:12 +0530
Subject: [PATCH 211/274] style: remove unused imports

---
 frappe/utils/dateutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/dateutils.py b/frappe/utils/dateutils.py
index b98c1c12fc..90abdeb6cd 100644
--- a/frappe/utils/dateutils.py
+++ b/frappe/utils/dateutils.py
@@ -6,7 +6,7 @@ import frappe
 import frappe.defaults
 import datetime
 from frappe.utils import get_datetime
-from frappe.utils import nowdate, add_to_date, getdate, get_datetime
+from frappe.utils import add_to_date, getdate
 from frappe.utils.data import get_last_day_of_week
 from frappe.desk.doctype.dashboard_chart.dashboard_chart import get_period_ending
 from six import string_types

From 365b770e5e073f4b06f3a923fdcedcea967ec3d8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 18 May 2020 14:49:06 +0530
Subject: [PATCH 212/274] fix: test cases

---
 frappe/desk/doctype/event/test_event.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/event/test_event.py b/frappe/desk/doctype/event/test_event.py
index 3bb0518964..dcfb38bd08 100644
--- a/frappe/desk/doctype/event/test_event.py
+++ b/frappe/desk/doctype/event/test_event.py
@@ -83,7 +83,7 @@ class TestEvent(unittest.TestCase):
 
 		# add another one
 		add({
-			"assign_to": self.test_user,
+			"assign_to": [self.test_user],
 			"doctype": "Event",
 			"name": ev.name,
 			"description": "Test Assignment"

From fb24432251deae1947ba7024a7bde42f93b094bb Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 May 2020 15:18:02 +0530
Subject: [PATCH 213/274] refactor: apply style via css class

---
 frappe/public/scss/website.scss              | 8 ++++++++
 frappe/templates/includes/navbar/navbar.html | 6 ++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 9ca03a59cc..1c899ba10c 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -55,6 +55,14 @@
 	}
 }
 
+.navbar-brand {
+	img {
+		display: inline-block;
+		max-width: 150px;
+		max-height: 25px;
+	}
+}
+
 .dropdown-menu {
 	padding: 0.25rem;
 }
diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html
index bf1932153e..cd707c7e04 100644
--- a/frappe/templates/includes/navbar/navbar.html
+++ b/frappe/templates/includes/navbar/navbar.html
@@ -1,15 +1,13 @@
 <nav class="navbar navbar-light navbar-expand-lg">
 	<div class="container">
 		<a class="navbar-brand" href="{{ url_prefix }}{{ home_page or "/" }}">
-			<span>
 			{% if brand_html %}
 				{{ brand_html }}
 			{% elif banner_image %}
-				<img src='{{ banner_image }}' style='max-width: 150px;max-height: 25px;'>
+				<img src='{{ banner_image }}'>
 			{% else %}
-				{{ (frappe.get_hooks("brand_html") or [_("Home")])[0] }}
+				<span>{{ (frappe.get_hooks("brand_html") or [_("Home")])[0] }}</span>
 			{% endif %}
-			</span>
 		</a>
 		<button class="navbar-toggler" type="button"
 			data-toggle="collapse"

From f913054a64a96d710ba452573d01c8e9d2c50346 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 May 2020 15:20:04 +0530
Subject: [PATCH 214/274] refactor: remove template data from subnav json

---
 frappe/website/web_template/subnav/subnav.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/website/web_template/subnav/subnav.json b/frappe/website/web_template/subnav/subnav.json
index baaebc14b7..8991c42366 100644
--- a/frappe/website/web_template/subnav/subnav.json
+++ b/frappe/website/web_template/subnav/subnav.json
@@ -69,6 +69,5 @@
  "modified_by": "Administrator",
  "name": "Subnav",
  "owner": "Administrator",
- "standard": 1,
- "template": "<nav class=\"navbar navbar-expand-lg navbar-light subnav\">\n\t<div class=\"container\">\n\t\t<a class=\"navbar-brand d-none d-sm-block\" href=\"{{ path }}\">\n\t\t\t{% if logo %}\n\t\t\t<img class=\"d-inline-block align-top\" src=\"{{ logo }}\" />\n\t\t\t{% endif %}\n\t\t\t<span class=\"subnav-title\">{{ title }}</span>\n\t\t</a>\n\t\t<ul class=\"navbar-nav justify-content-sm-end\">\n\t\t\t{% for item in items %}\n\t\t\t<li class=\"navbar-item\">\n\t\t\t\t<a\n\t\t\t\t\tclass=\"nav-link\"\n\t\t\t\t\thref=\"{{ item.path }}\"\n\t\t\t\t\t{% if item.new %}\n\t\t\t\t\ttarget=\"_blank\"\n\t\t\t\t\t{% endif %}>{{ item.label }}\n\t\t\t\t</a>\n\t\t\t</li>\n\t\t\t{% endfor %}\n\t\t</ul>\n\t</div>\n</nav>"
+ "standard": 1
 }
\ No newline at end of file

From f8d20d87affccd22d29547f5317b144953067ffc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 May 2020 15:21:18 +0530
Subject: [PATCH 215/274] style: cleanup jinja whitespaces

---
 frappe/templates/includes/navbar/navbar.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html
index cd707c7e04..3ae0aef164 100644
--- a/frappe/templates/includes/navbar/navbar.html
+++ b/frappe/templates/includes/navbar/navbar.html
@@ -1,13 +1,13 @@
 <nav class="navbar navbar-light navbar-expand-lg">
 	<div class="container">
 		<a class="navbar-brand" href="{{ url_prefix }}{{ home_page or "/" }}">
-			{% if brand_html %}
+			{%- if brand_html -%}
 				{{ brand_html }}
-			{% elif banner_image %}
+			{%- elif banner_image -%}
 				<img src='{{ banner_image }}'>
-			{% else %}
+			{%- else -%}
 				<span>{{ (frappe.get_hooks("brand_html") or [_("Home")])[0] }}</span>
-			{% endif %}
+			{%- endif -%}
 		</a>
 		<button class="navbar-toggler" type="button"
 			data-toggle="collapse"

From cca6d5c860a9c2ea0303ac3f10734a91cba91a8d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 May 2020 15:22:25 +0530
Subject: [PATCH 216/274] fix: do not apply inline css

---
 frappe/website/doctype/website_settings/website_settings.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index f7ad0610e6..1575802f5f 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -9,8 +9,7 @@ frappe.ui.form.on('Website Settings', {
 		if (!frm.doc.banner_image) {
 			frappe.msgprint(__("Select a Brand Image first."));
 		}
-		frm.set_value("brand_html", "<img src='"+ frm.doc.banner_image
-			+"' style='max-width: 150px; max-height: 25px;'>");
+		frm.set_value("brand_html", "<img src='"+ frm.doc.banner_image + "'>");
 	},
 
 	onload_post_render: function(frm) {

From 520342a2d2c41d61be7224ab8a9d42e2ce3ef398 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Mon, 18 May 2020 19:00:55 +0530
Subject: [PATCH 217/274] fix: requested changes

---
 .../js/frappe/form/multi_select_dialog.js     | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 61375aaedd..1e70c74782 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -96,7 +96,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		columns['col_0'] = [
 			{
 				fieldtype: "Data",
-				label: __("Search Term"),
+				label: __("Search"),
 				fieldname: "search_term"
 			}
 		];
@@ -133,7 +133,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				fields = fields.concat({ fieldtype: "Column Break" });
 			}
 		}
-		fields = fields.concat({ fieldtype: "Section Break" });
+		fields = fields.concat({ fieldtype: "Section Break", fieldname: "hello" });
 		return fields;
 	},
 
@@ -148,11 +148,15 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 	},
 
 	get_filters: function () {
-		return this.filter_group.get_filters().reduce((acc, filter) => {
-			return Object.assign(acc, {
-				[filter[1]]: [filter[2], filter[3]]
-			});
-		}, {});
+		if (this.add_filters_group) {
+			return this.filter_group.get_filters().reduce((acc, filter) => {
+				return Object.assign(acc, {
+					[filter[1]]: [filter[2], filter[3]]
+				});
+			}, {});
+		} else {
+			return [];
+		}
 	},
 
 	bind_events: function () {
@@ -163,16 +167,25 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				$(this).find(':checkbox').trigger('click');
 			}
 		});
+
 		this.$results.on('click', '.list-item--head :checkbox', (e) => {
 			this.$results.find('.list-item-container .list-row-check')
 				.prop("checked", ($(e.target).is(':checked')));
 		});
 
 		this.$parent.find('.input-with-feedback').on('change', (e) => {
+			// debugger;
 			frappe.flags.auto_scroll = false;
 			this.get_results();
 		});
-		this.$parent.find('[data-fieldname="search_term"]').on('input', (e) => {
+		// this.$parent.find('[data-fieldtype="Link"]').on('change', (e) => {
+		// 	// debugger;
+		// 	frappe.flags.auto_scroll = false;
+		// 	console.log("cool");
+		// 	this.get_results();
+		// });
+
+		this.$parent.find('[data-fieldtype="Data"]').on('input', (e) => {
 			var $this = $(this);
 			clearTimeout($this.data('timeout'));
 			$this.data('timeout', setTimeout(function () {
@@ -211,10 +224,10 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		columns.forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
 				${
-				head ? `<span class="ellipsis">${__(frappe.model.unscrub(column))}</span>`
-					: (column !== "name" ? `<span class="ellipsis">${__(result[column])}</span>`
-						: `<a href="${"#Form/" + me.doctype + "/" + result[column]}" class="list-id ellipsis">
-							${__(result[column])}</a>`)
+				head ? `<span class="ellipsis text-muted" title="${__(frappe.model.unscrub(column))}">${__(frappe.model.unscrub(column))}</span>`
+					: (column !== "name" ? `<span class="ellipsis result-row" title="${__(result[column] || '')}">${__(result[column] || '')}</span>`
+						: `<a href="${"#Form/" + me.doctype + "/" + result[column] || ''}" class="list-id ellipsis" title="${__(result[column] || '')}">
+							${__(result[column] || '')}</a>`)
 				}
 			</div>`;
 		});
@@ -272,16 +285,18 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 
 	get_results: function () {
 		let me = this;
-
 		let filters = this.get_query ? this.get_query().filters : {} || {};
-		// let filter_fields = [me.date_field];
 		let filter_fields = [];
 		Object.keys(this.setters).forEach(function (setter) {
-			filters[setter] = me.dialog.fields_dict[setter].get_value() || undefined;
-			me.args[setter] = filters[setter];
-			filter_fields.push(setter);
+			var value = me.dialog.fields_dict[setter].get_value();
+			if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
+				filters[setter] = ["like", "%"+value+"%"];
+			} else {
+				filters[setter] = value || undefined;
+				me.args[setter] = filters[setter];
+				filter_fields.push(setter);
+			}
 		});
-
 		let filter_group = this.get_filters();
 		$.extend(filters, filter_group);
 

From cebd2c47173589fa1aee488631e1169cf4371688 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 18 May 2020 20:05:05 +0530
Subject: [PATCH 218/274] feat: allow disabling custom cards in desk page
 (#10384)

---
 frappe/desk/desktop.py                       |  5 ++++-
 frappe/desk/doctype/desk_page/desk_page.json | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 512b3f2890..6ca101c3a8 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -159,7 +159,10 @@ class Workspace:
 			}
 
 	def get_cards(self):
-		cards = self.doc.cards + get_custom_reports_and_doctypes(self.doc.module)
+		cards = self.doc.cards
+		if not self.doc.hide_custom:
+			cards = cards + get_custom_reports_and_doctypes(self.doc.module)
+
 		if len(self.extended_cards):
 			cards = cards + self.extended_cards
 		default_country = frappe.db.get_default("country")
diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json
index 851eb43b23..2b8aea5e6c 100644
--- a/frappe/desk/doctype/desk_page/desk_page.json
+++ b/frappe/desk/doctype/desk_page/desk_page.json
@@ -21,6 +21,7 @@
   "disable_user_customization",
   "pin_to_top",
   "pin_to_bottom",
+  "hide_custom",
   "section_break_2",
   "charts_label",
   "charts",
@@ -189,10 +190,17 @@
    "fieldtype": "Link",
    "label": "Onboarding",
    "options": "Module Onboarding"
+  },
+  {
+   "default": "0",
+   "description": "Checking this will hide custom doctypes and reports cards in Links section",
+   "fieldname": "hide_custom",
+   "fieldtype": "Check",
+   "label": "Hide Custom DocTypes and Reports"
   }
  ],
  "links": [],
- "modified": "2020-05-13 19:01:42.041524",
+ "modified": "2020-05-18 19:17:27.206646",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",

From 10c5f6316cf787e35f2464fa4549545c1a56cfd2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 18 May 2020 20:05:18 +0530
Subject: [PATCH 219/274] refactor: don't allow users to search onboarding docs
 (#10386)

---
 frappe/desk/doctype/module_onboarding/module_onboarding.json | 3 ++-
 frappe/desk/doctype/onboarding_step/onboarding_step.json     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/module_onboarding/module_onboarding.json b/frappe/desk/doctype/module_onboarding/module_onboarding.json
index 9810e7a15f..0667ddf6ad 100644
--- a/frappe/desk/doctype/module_onboarding/module_onboarding.json
+++ b/frappe/desk/doctype/module_onboarding/module_onboarding.json
@@ -90,7 +90,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 19:37:21.492405",
+ "modified": "2020-05-18 19:42:39.738869",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Module Onboarding",
@@ -118,6 +118,7 @@
    "share": 1
   }
  ],
+ "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.json b/frappe/desk/doctype/onboarding_step/onboarding_step.json
index 37d1d63dbe..365a1c7d21 100644
--- a/frappe/desk/doctype/onboarding_step/onboarding_step.json
+++ b/frappe/desk/doctype/onboarding_step/onboarding_step.json
@@ -184,7 +184,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-14 15:10:05.627706",
+ "modified": "2020-05-18 19:42:30.435604",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Onboarding Step",
@@ -213,6 +213,7 @@
   }
  ],
  "quick_entry": 1,
+ "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1

From 77a333086cadaa7ca53b9c474b08eb0e6605f460 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 18 May 2020 20:41:16 +0530
Subject: [PATCH 220/274] feat: make dashboards searchable in awesomebar
 (#10385)

---
 frappe/boot.py                                |  1 +
 .../js/frappe/ui/toolbar/awesome_bar.js       |  1 +
 .../js/frappe/ui/toolbar/search_utils.js      | 27 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 42b5ca38b7..0eb6265942 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -106,6 +106,7 @@ def load_desktop_data(bootinfo):
 	from frappe.desk.desktop import get_desk_sidebar_items
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
 	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
+	bootinfo.dashboards = frappe.get_list("Dashboard")
 
 def get_allowed_pages(cache=False):
 	return get_user_pages_or_reports('Page', cache=cache)
diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index 0595fb6219..3e59986928 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -177,6 +177,7 @@ frappe.search.AwesomeBar = Class.extend({
 			frappe.search.utils.get_reports(txt),
 			frappe.search.utils.get_pages(txt),
 			frappe.search.utils.get_workspaces(txt),
+			frappe.search.utils.get_dashboards(txt),
 			frappe.search.utils.get_recent_pages(txt || ""),
 			frappe.search.utils.get_executables(txt)
 		);
diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js
index 9a03360d59..6161368766 100644
--- a/frappe/public/js/frappe/ui/toolbar/search_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js
@@ -288,7 +288,7 @@ frappe.search.utils = {
 		var out = [];
 		frappe.boot.allowed_workspaces.forEach(function(item) {
 			var level = me.fuzzy_search(keywords, item.name);
-			if(level > 0) {
+			if (level > 0) {
 				var ret = {
 					type: "Workspace",
 					label: __("Open {0}", [me.bolden_match_part(__(item.name), keywords)]),
@@ -303,6 +303,26 @@ frappe.search.utils = {
 		return out;
 	},
 
+	get_dashboards: function(keywords) {
+		var me = this;
+		var out = [];
+		frappe.boot.dashboards.forEach(function(item) {
+			var level = me.fuzzy_search(keywords, item.name);
+			if (level > 0) {
+				var ret = {
+					type: "Dashboard",
+					label: __("{0} Dashboard", [me.bolden_match_part(__(item.name), keywords)]),
+					value: __("{0} Dashboard", [__(item.name)]),
+					index: level,
+					route: ["dashboard", item.name]
+				};
+
+				out.push(ret);
+			}
+		});
+		return out;
+	},
+
 	get_global_results: function(keywords, start, limit, doctype = "") {
 		var me = this;
 		function get_results_sets(data) {
@@ -490,6 +510,11 @@ frappe.search.utils = {
 			fetch_type: "Nav",
 			results: sort_uniques(this.get_workspaces(keywords))
 		},
+		{
+			title: "Dashboard",
+			fetch_type: "Nav",
+			results: sort_uniques(this.get_dashboards(keywords))
+		},
 		{
 			title: "Setup",
 			fetch_type: "Nav",

From 282197e010a66f3ad3537c5da0391500f1d1770f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 18 May 2020 22:06:32 +0530
Subject: [PATCH 221/274] fix: spaces to tabs

---
 frappe/core/page/dashboard/dashboard.css |  6 +-
 frappe/public/less/dashboard_view.less   | 92 ++++++++++++------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index e1687a0675..b319cc1ed2 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -1,5 +1,5 @@
 .restricted-button {
-    cursor: default;
-    position: relative;
-    right: -5px;
+	cursor: default;
+	position: relative;
+	right: -5px;
 }
\ No newline at end of file
diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less
index 5af532b9c7..ab78fa5b2a 100644
--- a/frappe/public/less/dashboard_view.less
+++ b/frappe/public/less/dashboard_view.less
@@ -1,60 +1,60 @@
 .dashboard-page {
-    .dashboard-view {
-        min-height: calc(100vh - 284px);
-        padding: 20px 20px 0 20px;
+	.dashboard-view {
+		min-height: calc(100vh - 284px);
+		padding: 20px 20px 0 20px;
 
-        .new-widget {
-            text-align: center;
-        }
+		.new-widget {
+			text-align: center;
+		}
 
-        .new-chart-widget {
-            min-height: 200px;
-        }
+		.new-chart-widget {
+			min-height: 200px;
+		}
 
-        .new-number-card-widget {
-            min-height: 110px;
-        }
-    }
+		.new-number-card-widget {
+			min-height: 110px;
+		}
+	}
 
-    .empty-dashboard {
-        margin-top: 45px;
-    }
+	.empty-dashboard {
+		margin-top: 45px;
+	}
 
-    .page-form {
-        height: 50px;
+	.page-form {
+		height: 50px;
 
-        .dashboard-header {
-            padding: 10px;
-            display: flex;
-            justify-content: space-between;
-            width: 100%;
+		.dashboard-header {
+			padding: 10px;
+			display: flex;
+			justify-content: space-between;
+			width: 100%;
 
-            .header-title {
-                line-height: 1.5em;
-                vertical-align: text-bottom;
-            }
+			.header-title {
+				line-height: 1.5em;
+				vertical-align: text-bottom;
+			}
 
-            .restricted-button {
-                cursor: default;
-                position: relative;
-                right: 5px;
-                top: -3px;
-            }
-        }
+			.restricted-button {
+				cursor: default;
+				position: relative;
+				right: 5px;
+				top: -3px;
+			}
+		}
 
-        .customize-dashboard {
-            font-size: 13px;
-            cursor: pointer;
-        }
+		.customize-dashboard {
+			font-size: 13px;
+			cursor: pointer;
+		}
 
-        .customize-options {
-            display: none;
-            cursor: pointer;
+		.customize-options {
+			display: none;
+			cursor: pointer;
 
-            .customize-option:hover {
-                text-decoration: underline;
-            }
-        }
-    }
+			.customize-option:hover {
+				text-decoration: underline;
+			}
+		}
+	}
 }
 

From eef38a1802945c5b4fdbe43df20caa264e22aa14 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 18 May 2020 23:24:15 +0530
Subject: [PATCH 222/274] fix: layout for new version available dialog (#10389)

---
 frappe/public/less/desk.less | 10 ++++++++++
 frappe/utils/change_log.py   |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 6d44fc5192..5cefc375f6 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -1170,3 +1170,13 @@ body.no-sidebar {
 		font-size: 20px;
 	}
 }
+
+.new-version-log {
+	.new-version-links {
+		padding: 5px 0px;
+	}
+
+	&:not(:last-child) {
+		margin-bottom: 1em;
+	}
+}
\ No newline at end of file
diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py
index 776fb825c2..53c83cfe99 100644
--- a/frappe/utils/change_log.py
+++ b/frappe/utils/change_log.py
@@ -235,14 +235,15 @@ def show_update_popup():
 			release_links = ""
 			for app in updates[update_type]:
 				app = frappe._dict(app)
-				release_links += "<a href='https://github.com/{org_name}/{app_name}/releases/tag/v{available_version}'><b>{title}</b>: v{available_version}</a><br>".format(
+				release_links += "<b>{title}</b>: <a href='https://github.com/{org_name}/{app_name}/releases/tag/v{available_version}'>v{available_version}</a><br>".format(
 					available_version = app.available_version,
 					org_name          = app.org_name,
 					app_name          = app.app_name,
 					title             = app.title
 				)
 			if release_links:
-				update_message += _("New {} releases for the following apps are available").format(update_type) + ":<br><br>{}".format(release_links)
+				message = _("New {} releases for the following apps are available").format(_(update_type))
+				update_message += "<div class='new-version-log'>{0}<div class='new-version-links'>{1}</div></div>".format(message, release_links)
 
 	if update_message:
 		frappe.msgprint(update_message, title=_("New updates are available"), indicator='green')

From 3a2eb64a2914bb082113986482ce7cb46c14a4bf Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Mon, 18 May 2020 23:32:42 +0530
Subject: [PATCH 223/274] fix: Console error in
 generate_google_search_preview() when route is not set

VM2249:28 Uncaught (in promise) TypeError: Cannot read property 'split' of undefined
    at generate_google_search_preview (eval at setup (form.min.js?ver=1589740826.0:15059), <anonymous>:28:34)
    at refresh (eval at setup (form.min.js?ver=1589740826.0:15059), <anonymous>:10:3)
    at runner (form.min.js?ver=1589740826.0:14996)
    at form.min.js?ver=1589740826.0:15014
---
 frappe/website/doctype/blog_post/blog_post.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js
index adc03ca77e..138440db2f 100644
--- a/frappe/website/doctype/blog_post/blog_post.js
+++ b/frappe/website/doctype/blog_post/blog_post.js
@@ -21,7 +21,7 @@ function generate_google_search_preview(frm) {
 	let seo_title = (frm.doc.title).slice(0, 60);
 	let seo_description =  (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160);
 	let date = frm.doc.published_on ? new frappe.datetime.datetime(frm.doc.published_on).moment.format('ll') + ' - ' : '';
-	let route_array = frm.doc.route.split('/');
+	let route_array = (frm.doc.route) ? frm.doc.route.split('/') : [];
 	route_array.pop();
 
 	google_preview.html(`

From 2fe23e29f0f8ebd8738087e9407267d4af77df23 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 19 May 2020 11:05:07 +0530
Subject: [PATCH 224/274] requested change

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
---
 frappe/website/doctype/blog_post/blog_post.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js
index 138440db2f..7b260af8bc 100644
--- a/frappe/website/doctype/blog_post/blog_post.js
+++ b/frappe/website/doctype/blog_post/blog_post.js
@@ -21,7 +21,7 @@ function generate_google_search_preview(frm) {
 	let seo_title = (frm.doc.title).slice(0, 60);
 	let seo_description =  (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160);
 	let date = frm.doc.published_on ? new frappe.datetime.datetime(frm.doc.published_on).moment.format('ll') + ' - ' : '';
-	let route_array = (frm.doc.route) ? frm.doc.route.split('/') : [];
+	let route_array = frm.doc.route ? frm.doc.route.split('/') : [];
 	route_array.pop();
 
 	google_preview.html(`

From abc0251458505b5fdb71dccc24ebd0463ab04fdd Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 15:42:02 +0530
Subject: [PATCH 225/274] feat: grid layout fix for onboarding

---
 frappe/public/less/desktop.less | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index eef0b29875..0b17d75861 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -388,10 +388,11 @@
 
 		.widget-body {
 			margin-top: 20px;
+			padding-right: 200px;
 
 			&.grid {
 				display: grid;
-				grid-template-columns: 1fr 1fr 1fr;
+				grid-template-columns: 1fr 1fr;
 				grid-auto-flow: column;
 
 				&.grid-rows-2 {

From 4d0b8e64d8d249274785e61d85f2a3e8e4ce1535 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 May 2020 16:08:44 +0530
Subject: [PATCH 226/274] fix: set chart name in dashboard from the new doc

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7e375e835f..4b44067688 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -110,11 +110,11 @@ def create_dashboard_chart(args):
 	doc.insert(ignore_permissions=True)
 	return doc
 
-
 @frappe.whitelist()
 def create_report_chart(args):
-	create_dashboard_chart(args)
+	doc = create_dashboard_chart(args)
 	args = frappe.parse_json(args)
+	args.chart_name = doc.chart_name
 	if args.dashboard:
 		add_chart_to_dashboard(json.dumps(args))
 

From 9b2dd569f31e5a44a07c04051087f850e27141dd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 May 2020 12:48:08 +0530
Subject: [PATCH 227/274] fix: keyboard shortcut for toggle sidbar in report
 view

(cherry picked from commit 7ff391f1d75cb4c849e688e9cb2139b325372e8a)
---
 frappe/public/js/frappe/views/reports/report_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 36ad9c5bd4..17e61c4f89 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1258,7 +1258,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			},
 			{
 				label: __('Toggle Sidebar'),
-				action: () => this.toggle_side_bar()
+				action: () => this.toggle_side_bar(),
+				shortcut: 'Ctrl+K',
 			},
 			{
 				label: __('Pick Columns'),

From 1f0d1475c5d1c9dedf6fe6a92322f413f9758b23 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:14:50 +0530
Subject: [PATCH 228/274] refactor: use modern JS Class

---
 .../js/frappe/form/multi_select_dialog.js     | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 1e70c74782..3465a7e6ff 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -1,7 +1,7 @@
-frappe.ui.form.MultiSelectDialog = Class.extend({
-	init: function (opts) {
+frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
+	constructor(opts) {
 		/* Options: doctype, target, setters, get_query, action, add_filters_group, data_fields, primary_action_label */
-		$.extend(this, opts);
+		Object.assign(this, opts);
 		var me = this;
 		if (this.doctype != "[Select]") {
 			frappe.model.with_doctype(this.doctype, function () {
@@ -10,8 +10,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		} else {
 			this.make();
 		}
-	},
-	make: function () {
+	}
+
+	make() {
 		let me = this;
 		this.page_length = 20;
 		this.start = 0;
@@ -87,9 +88,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		this.bind_events();
 		this.get_results();
 		this.dialog.show();
-	},
+	}
 
-	get_fields_for_header: function () {
+	get_fields_for_header() {
 		let fields = [];
 		let me = this;
 		let columns = {};
@@ -135,9 +136,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		}
 		fields = fields.concat({ fieldtype: "Section Break", fieldname: "hello" });
 		return fields;
-	},
+	}
 
-	make_filter_area: function () {
+	make_filter_area() {
 		this.filter_group = new frappe.ui.FilterGroup({
 			parent: this.dialog.get_field('filter_area').$wrapper,
 			doctype: this.doctype,
@@ -145,9 +146,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				this.get_results();
 			}
 		});
-	},
+	}
 
-	get_filters: function () {
+	get_filters() {
 		if (this.add_filters_group) {
 			return this.filter_group.get_filters().reduce((acc, filter) => {
 				return Object.assign(acc, {
@@ -157,9 +158,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		} else {
 			return [];
 		}
-	},
+	}
 
-	bind_events: function () {
+	bind_events() {
 		let me = this;
 
 		this.$results.on('click', '.list-item-container', function (e) {
@@ -194,24 +195,24 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				me.get_results();
 			}, 300));
 		});
-	},
+	}
 
-	get_checked_values: function () {
+	get_checked_values() {
 		// Return name of checked value.
 		return this.$results.find('.list-item-container').map(function () {
 			if ($(this).find('.list-row-check:checkbox:checked').length > 0) {
 				return $(this).attr('data-item-name');
 			}
 		}).get();
-	},
+	}
 
-	get_checked_items: function () {
+	get_checked_items() {
 		// Return checked items with all the column values.
 		let checked_values = this.get_checked_values();
 		return this.results.filter(res => checked_values.includes(res.name));
-	},
+	}
 
-	make_list_row: function (result = {}) {
+	make_list_row(result = {}) {
 		var me = this;
 		// Make a head row by default (if result not passed)
 		let head = Object.keys(result).length === 0;
@@ -244,9 +245,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 
 		$(".modal-dialog .list-item--head").css("z-index", 0);
 		return $row;
-	},
+	}
 
-	render_result_list: function (results, more = 0, empty = true) {
+	render_result_list(results, more = 0, empty = true) {
 		var me = this;
 		var more_btn = me.dialog.fields_dict.more_btn.$wrapper;
 
@@ -270,9 +271,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		if (frappe.flags.auto_scroll) {
 			this.$results.animate({ scrollTop: me.$results.prop('scrollHeight') }, 500);
 		}
-	},
+	}
 
-	empty_list: function () {
+	empty_list() {
 		let checked = this.get_checked_items().map(item => {
 			return {
 				...item,
@@ -281,9 +282,9 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 		});
 		this.$results.find('.list-item-container').remove();
 		this.render_result_list(checked, 0, false);
-	},
+	}
 
-	get_results: function () {
+	get_results() {
 		let me = this;
 		let filters = this.get_query ? this.get_query().filters : {} || {};
 		let filter_fields = [];
@@ -298,7 +299,7 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 			}
 		});
 		let filter_group = this.get_filters();
-		$.extend(filters, filter_group);
+		Object.assign(filters, filter_group);
 
 		let args = {
 			doctype: me.doctype,
@@ -340,6 +341,5 @@ frappe.ui.form.MultiSelectDialog = Class.extend({
 				me.render_result_list(me.results, more);
 			}
 		});
-	},
-
-});
\ No newline at end of file
+	}
+};
\ No newline at end of file

From ea99865f3f9e580cb5986cc5a7720b04d31fe09f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:25:52 +0530
Subject: [PATCH 229/274] style: clean up fields creation

---
 .../js/frappe/form/multi_select_dialog.js     | 75 ++++++++++---------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 3465a7e6ff..2f86df3182 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -16,15 +16,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		let me = this;
 		this.page_length = 20;
 		this.start = 0;
-		let fields = this.get_fields_for_header();
-		if (this.add_filters_group) {
-			fields.push(
-				{
-					fieldtype: 'HTML',
-					fieldname: 'filter_area',
-				}
-			);
-		}
+		let fields = this.get_primary_filters();
 
 		fields = fields.concat([
 			{ fieldtype: "HTML", fieldname: "results_area" },
@@ -90,51 +82,62 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		this.dialog.show();
 	}
 
-	get_fields_for_header() {
+	get_primary_filters() {
 		let fields = [];
 		let me = this;
-		let columns = {};
-		columns['col_0'] = [
+
+		let columns = new Array(3);
+
+		// Hack for three column layout
+		// To add column break
+		columns[0] = [
 			{
 				fieldtype: "Data",
 				label: __("Search"),
 				fieldname: "search_term"
 			}
 		];
-		columns['col_1'] = [];
-		columns['col_2'] = [];
+		columns[1] = [];
+		columns[2] = [];
 
-		// setters can be defined as a dict or a list of fields
-		// setters define the additional filters that get applied
-		// for selection
+		Object.keys(this.setters).forEach((setter, index) => {
+			let df_prop = frappe.meta.docfield_map[this.doctype][setter];
 
-		// CASE 1: DocType name and fieldname is the same, example "customer" and "customer"
-		// setters define the filters applied in the modal
-		// if the fieldnames and doctypes are consistently named,
-		// pass a dict with the setter key and value, for example
-		// {customer: [customer_name]}
-
-		// CASE 2: if the fieldname of the target is different,
-		// then pass a list of fields with appropriate
-
-		Object.keys(this.setters).forEach(function (setter, index) {
-			let df_prop = frappe.meta.docfield_map[me.doctype][setter];
-			columns['col_' + cstr((index + 1) % 3)].push({
+			// Index + 1 to start filling from index 1
+			// Since Search is a standrd field already pushed
+			columns[(index + 1) % 3].push({
 				fieldtype: df_prop.fieldtype,
 				label: df_prop.label,
 				fieldname: setter,
 				options: df_prop.options,
-				default: me.setters[setter]
+				default: this.setters[setter]
 			});
 		});
 
-		for (let i = 0; i < 3; i++) {
-			fields = fields.concat(columns['col_' + cstr(i)]);
-			if (i != 2) {
-				fields = fields.concat({ fieldtype: "Column Break" });
-			}
+		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/seal
+		if(Object.seal) {
+			Object.seal(columns);
+			// now a is a fixed-size array with mutable entries
 		}
-		fields = fields.concat({ fieldtype: "Section Break", fieldname: "hello" });
+
+		fields = [
+			...columns[0],
+			{ fieldtype: "Column Break" },
+			...columns[1],
+			{ fieldtype: "Column Break" },
+			...columns[2],
+			{ fieldtype: "Section Break", fieldname: "primary_filters_sb" }
+		]
+
+		if (this.add_filters_group) {
+			fields.push(
+				{
+					fieldtype: 'HTML',
+					fieldname: 'filter_area',
+				}
+			);
+		}
+
 		return fields;
 	}
 

From ad744effc930c27f897d434a9cc35d94e46e9aae Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:29:35 +0530
Subject: [PATCH 230/274] style: minor clean for make

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 2f86df3182..4eec460d65 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -18,24 +18,27 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		this.start = 0;
 		let fields = this.get_primary_filters();
 
+		// Make results area
 		fields = fields.concat([
 			{ fieldtype: "HTML", fieldname: "results_area" },
 			{
 				fieldtype: "Button", fieldname: "more_btn", label: __("More"),
-				click: function () {
-					me.start += 20;
+				click: () => {
+					this.start += 20;
 					frappe.flags.auto_scroll = true;
-					me.get_results();
+					this.get_results();
 				}
 			}
 		]);
 
+		// Custom Data Fields
 		if (this.data_fields) {
 			fields.push({ fieldtype: "Section Break" });
 			fields = fields.concat(this.data_fields);
 		}
 
-		let doctype_plural =frappe.utils.get_doctype_plural(this.doctype);
+		let doctype_plural = frappe.utils.get_doctype_plural(this.doctype);
+
 		this.dialog = new frappe.ui.Dialog({
 			title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
 			fields: fields,

From 1b559e448c99ba897916145378ca72b7de4c2cfe Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:35:22 +0530
Subject: [PATCH 231/274] refactor: rename get_fitlers to get_custom_filters

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 4eec460d65..a231c0bac3 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -45,7 +45,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			primary_action_label: this.primary_action_label || __("Get Items"),
 			secondary_action_label: __("Make {0}", [me.doctype]),
 			primary_action: function () {
-				let filters_data = me.get_filters();
+				let filters_data = me.get_custom_filters();
 				me.action(me.get_checked_values(), cur_dialog.get_values(), me.args, filters_data);
 			},
 			secondary_action: function (e) {
@@ -154,8 +154,8 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		});
 	}
 
-	get_filters() {
-		if (this.add_filters_group) {
+	get_custom_filters() {
+		if (this.add_filters_group && this.filter_group) {
 			return this.filter_group.get_filters().reduce((acc, filter) => {
 				return Object.assign(acc, {
 					[filter[1]]: [filter[2], filter[3]]
@@ -294,6 +294,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		let me = this;
 		let filters = this.get_query ? this.get_query().filters : {} || {};
 		let filter_fields = [];
+
 		Object.keys(this.setters).forEach(function (setter) {
 			var value = me.dialog.fields_dict[setter].get_value();
 			if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
@@ -304,7 +305,8 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 				filter_fields.push(setter);
 			}
 		});
-		let filter_group = this.get_filters();
+
+		let filter_group = this.get_custom_filters();
 		Object.assign(filters, filter_group);
 
 		let args = {

From a725d1daf1fdc313daf4490e506634af7672a54e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:35:49 +0530
Subject: [PATCH 232/274] feat: don't auto select last result

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index a231c0bac3..c6e5cef573 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -337,14 +337,11 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 						result.parsed_date = Date.parse(result["Date"]);
 						me.results.push(result);
 					});
+
 					me.results.sort((a, b) => {
 						return a.parsed_date - b.parsed_date;
 					});
 
-					// Preselect oldest entry
-					if (me.start < 1 && r.values.length === 1) {
-						me.results[0].checked = 1;
-					}
 				}
 				me.render_result_list(me.results, more);
 			}

From e9710278a197caed31b23e29d79e8d3312fa0fc4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:46:13 +0530
Subject: [PATCH 233/274] style: remove unnecessary comments

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index c6e5cef573..a56e5c6964 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -181,16 +181,9 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		});
 
 		this.$parent.find('.input-with-feedback').on('change', (e) => {
-			// debugger;
 			frappe.flags.auto_scroll = false;
 			this.get_results();
 		});
-		// this.$parent.find('[data-fieldtype="Link"]').on('change', (e) => {
-		// 	// debugger;
-		// 	frappe.flags.auto_scroll = false;
-		// 	console.log("cool");
-		// 	this.get_results();
-		// });
 
 		this.$parent.find('[data-fieldtype="Data"]').on('input', (e) => {
 			var $this = $(this);

From e9e15c1914e5a528b9848bc32d6335402be6f054 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 19:46:22 +0530
Subject: [PATCH 234/274] style: added comments

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index a56e5c6964..9187b28c97 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -273,13 +273,18 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 	}
 
 	empty_list() {
+		// Store all checked items
 		let checked = this.get_checked_items().map(item => {
 			return {
 				...item,
 				checked: true
 			};
 		});
+
+		// Remove **all** items
 		this.$results.find('.list-item-container').remove();
+
+		// Rerender checked items
 		this.render_result_list(checked, 0, false);
 	}
 

From 3fd8a15412999b37af514f87e8b0fdb47b4e5789 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Tue, 19 May 2020 19:49:25 +0530
Subject: [PATCH 235/274] fix: remove markdown conversion

---
 frappe/desk/form/load.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index f24f33df07..4e5e84423d 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -133,11 +133,6 @@ def get_comments(doctype, name):
 		reference_name = name
 	))
 
-	# convert to markdown (legacy ?)
-	for c in comments:
-		if c.comment_type == 'Comment':
-			c.content = frappe.utils.markdown(c.content)
-
 	return comments
 
 def get_point_logs(doctype, docname):

From c6b77fb07282796e02d426db908c5ecc2d02eefb Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 20:03:58 +0530
Subject: [PATCH 236/274] feat: add pluralize util

---
 .../js/frappe/form/multi_select_dialog.js     |   2 +-
 frappe/public/js/frappe/utils/utils.js        | 116 +++++++++++++++++-
 2 files changed, 113 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 9187b28c97..4ad072cbb5 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -37,7 +37,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			fields = fields.concat(this.data_fields);
 		}
 
-		let doctype_plural = frappe.utils.get_doctype_plural(this.doctype);
+		let doctype_plural = this.doctype.plural();
 
 		this.dialog = new frappe.ui.Dialog({
 			title: __("Select {0}", [(this.doctype == '[Select]') ? __("value") : __(doctype_plural)]),
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index ba11374a4f..50109f010d 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -803,11 +803,7 @@ Object.assign(frappe.utils, {
 			name: M[0],
 			version: M[1],
 		};
-	},
-	get_doctype_plural(doctype) {
-		return !doctype.endsWith('y') ? doctype + 's': doctype.slice(0, -1) + 'ies';
 	}
-
 });
 
 // Array de duplicate
@@ -827,3 +823,115 @@ if (!Array.prototype.uniqBy) {
 		}
 	});
 }
+
+// Pluralize
+String.prototype.plural = function(revert) {
+	const plural = {
+		"(quiz)$": "$1zes",
+		"^(ox)$": "$1en",
+		"([m|l])ouse$": "$1ice",
+		"(matr|vert|ind)ix|ex$": "$1ices",
+		"(x|ch|ss|sh)$": "$1es",
+		"([^aeiouy]|qu)y$": "$1ies",
+		"(hive)$": "$1s",
+		"(?:([^f])fe|([lr])f)$": "$1$2ves",
+		"(shea|lea|loa|thie)f$": "$1ves",
+		sis$: "ses",
+		"([ti])um$": "$1a",
+		"(tomat|potat|ech|her|vet)o$": "$1oes",
+		"(bu)s$": "$1ses",
+		"(alias)$": "$1es",
+		"(octop)us$": "$1i",
+		"(ax|test)is$": "$1es",
+		"(us)$": "$1es",
+		"([^s]+)$": "$1s",
+	};
+
+	const singular = {
+		"(quiz)zes$": "$1",
+		"(matr)ices$": "$1ix",
+		"(vert|ind)ices$": "$1ex",
+		"^(ox)en$": "$1",
+		"(alias)es$": "$1",
+		"(octop|vir)i$": "$1us",
+		"(cris|ax|test)es$": "$1is",
+		"(shoe)s$": "$1",
+		"(o)es$": "$1",
+		"(bus)es$": "$1",
+		"([m|l])ice$": "$1ouse",
+		"(x|ch|ss|sh)es$": "$1",
+		"(m)ovies$": "$1ovie",
+		"(s)eries$": "$1eries",
+		"([^aeiouy]|qu)ies$": "$1y",
+		"([lr])ves$": "$1f",
+		"(tive)s$": "$1",
+		"(hive)s$": "$1",
+		"(li|wi|kni)ves$": "$1fe",
+		"(shea|loa|lea|thie)ves$": "$1f",
+		"(^analy)ses$": "$1sis",
+		"((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$":
+			"$1$2sis",
+		"([ti])a$": "$1um",
+		"(n)ews$": "$1ews",
+		"(h|bl)ouses$": "$1ouse",
+		"(corpse)s$": "$1",
+		"(us)es$": "$1",
+		s$: "",
+	};
+
+	const irregular = {
+		move: "moves",
+		foot: "feet",
+		goose: "geese",
+		sex: "sexes",
+		child: "children",
+		man: "men",
+		tooth: "teeth",
+		person: "people",
+	};
+
+	const uncountable = [
+		"sheep",
+		"fish",
+		"deer",
+		"moose",
+		"series",
+		"species",
+		"money",
+		"rice",
+		"information",
+		"equipment",
+	];
+
+	// save some time in the case that singular and plural are the same
+	if (uncountable.indexOf(this.toLowerCase()) >= 0) return this;
+
+	// check for irregular forms
+	let word;
+	let pattern;
+	let replace;
+	for (word in irregular) {
+		if (revert) {
+			pattern = new RegExp(irregular[word] + "$", "i");
+			replace = word;
+		} else {
+			pattern = new RegExp(word + "$", "i");
+			replace = irregular[word];
+		}
+		if (pattern.test(this)) return this.replace(pattern, replace);
+	}
+
+	let array;
+	if (revert) array = singular;
+	else array = plural;
+
+	// check for matches using regular expressions
+	let reg;
+	for (reg in array) {
+		pattern = new RegExp(reg, "i");
+
+		if (pattern.test(this)) return this.replace(pattern, array[reg]);
+	}
+
+	return this;
+};
\ No newline at end of file

From b68d4935658a9d48964e9889d4a3c5ce2081ef78 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 May 2020 20:55:25 +0530
Subject: [PATCH 237/274] feat: trigger events in web forms

---
 frappe/public/js/frappe/web_form/web_form.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 81b219aece..4dc1a50bc4 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -29,6 +29,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 
 		// webform client script
 		frappe.init_client_script && frappe.init_client_script();
+		frappe.web_form.events.trigger('after_load');
 		this.after_load && this.after_load();
 	}
 
@@ -136,6 +137,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 				if (!response.exc) {
 					// Success
 					this.handle_success(response.message);
+					frappe.web_form.events.trigger('after_save');
 					this.after_save && this.after_save();
 				}
 			},

From 2ca6802e8e5d4e0b22cbc370c66b982719553b9a Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 00:30:18 +0530
Subject: [PATCH 238/274] fix: Add Testimonial template

---
 frappe/public/scss/page-builder.scss          | 28 +++++++++++++++++
 .../web_template/testimonial/__init__.py      |  0
 .../web_template/testimonial/testimonial.html | 13 ++++++++
 .../web_template/testimonial/testimonial.json | 31 +++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 frappe/website/web_template/testimonial/__init__.py
 create mode 100644 frappe/website/web_template/testimonial/testimonial.html
 create mode 100644 frappe/website/web_template/testimonial/testimonial.json

diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss
index f792209c24..d28f0c593c 100644
--- a/frappe/public/scss/page-builder.scss
+++ b/frappe/public/scss/page-builder.scss
@@ -250,3 +250,31 @@
 		left: 16.67%;
 	}
 }
+
+.testimonial {
+	text-align: center;
+}
+
+.testimonial-logo {
+	display: inline-block;
+	max-width: 10rem;
+	max-height: 2.5rem;;
+}
+
+.testimonial-content {
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 2rem;
+	max-width: 52rem;
+	font-size: $font-size-2xl;
+	font-weight: 500;
+}
+
+.testimonial-by {
+	font-size: $font-size-lg;
+	margin-top: 2rem;
+
+	&:before {
+		content: '—'
+	}
+}
diff --git a/frappe/website/web_template/testimonial/__init__.py b/frappe/website/web_template/testimonial/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/web_template/testimonial/testimonial.html b/frappe/website/web_template/testimonial/testimonial.html
new file mode 100644
index 0000000000..3cd08165ea
--- /dev/null
+++ b/frappe/website/web_template/testimonial/testimonial.html
@@ -0,0 +1,13 @@
+<div class="testimonial">
+	<div class="testimonial-logo">
+		<img src="{{ logo }}" alt="{{ name }}">
+	</div>
+	<div class="testimonial-content">
+		<span>“</span>
+		{{ content }}
+		<span>”</span>
+	</div>
+	<div class="testimonial-by">
+		{{ name }}
+	</div>
+</div>
diff --git a/frappe/website/web_template/testimonial/testimonial.json b/frappe/website/web_template/testimonial/testimonial.json
new file mode 100644
index 0000000000..8b194fe81b
--- /dev/null
+++ b/frappe/website/web_template/testimonial/testimonial.json
@@ -0,0 +1,31 @@
+{
+ "creation": "2020-05-16 19:52:11.590319",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [
+  {
+   "fieldname": "logo",
+   "fieldtype": "Attach Image",
+   "label": "Logo",
+   "reqd": 0
+  },
+  {
+   "fieldname": "name",
+   "fieldtype": "Data",
+   "label": "Name",
+   "reqd": 0
+  },
+  {
+   "fieldname": "content",
+   "fieldtype": "Small Text",
+   "label": "Content",
+   "reqd": 0
+  }
+ ],
+ "idx": 0,
+ "modified": "2020-05-16 19:52:11.590319",
+ "modified_by": "Administrator",
+ "name": "Testimonial",
+ "owner": "Administrator",
+ "standard": 1
+}
\ No newline at end of file

From 7234b4b7fa06edea8c43a930590c657d76629133 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 00:45:12 +0530
Subject: [PATCH 239/274] fix: Add Split Section template

---
 frappe/public/scss/page-builder.scss          |  4 ++
 .../split_section_with_image/__init__.py      |  0
 .../split_section_with_image.html             | 24 ++++++++++++
 .../split_section_with_image.json             | 38 +++++++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 frappe/website/web_template/split_section_with_image/__init__.py
 create mode 100644 frappe/website/web_template/split_section_with_image/split_section_with_image.html
 create mode 100644 frappe/website/web_template/split_section_with_image/split_section_with_image.json

diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss
index d28f0c593c..f59e589afe 100644
--- a/frappe/public/scss/page-builder.scss
+++ b/frappe/public/scss/page-builder.scss
@@ -278,3 +278,7 @@
 		content: '—'
 	}
 }
+
+.split-section-content {
+	margin-top: 2rem;
+}
diff --git a/frappe/website/web_template/split_section_with_image/__init__.py b/frappe/website/web_template/split_section_with_image/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/web_template/split_section_with_image/split_section_with_image.html b/frappe/website/web_template/split_section_with_image/split_section_with_image.html
new file mode 100644
index 0000000000..2a2f7a920e
--- /dev/null
+++ b/frappe/website/web_template/split_section_with_image/split_section_with_image.html
@@ -0,0 +1,24 @@
+<div class="split-section-with-image row">
+	{%- if not image_on_right -%}
+	<div class="col-12 col-sm-6">
+		{{ frappe.render_template('templates/includes/image_with_blur.html', {
+			"src": image,
+			"alt": title,
+			"class": "split-section-image"
+		}) }}
+	</div>
+	{%- endif -%}
+	<div class="split-section-content col-12 col-sm-6">
+		<h2>{{ title }}</h2>
+		<p>{{ content }}</p>
+	</div>
+	{%- if image_on_right -%}
+	<div class="col-12 col-sm-6">
+		{{ frappe.render_template('templates/includes/image_with_blur.html', {
+			"src": image,
+			"alt": title,
+			"class": "split-section-image"
+		}) }}
+	</div>
+	{%- endif -%}
+</div>
diff --git a/frappe/website/web_template/split_section_with_image/split_section_with_image.json b/frappe/website/web_template/split_section_with_image/split_section_with_image.json
new file mode 100644
index 0000000000..c3885c33d1
--- /dev/null
+++ b/frappe/website/web_template/split_section_with_image/split_section_with_image.json
@@ -0,0 +1,38 @@
+{
+ "creation": "2020-05-17 06:37:27.461722",
+ "docstatus": 0,
+ "doctype": "Web Template",
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Title",
+   "reqd": 0
+  },
+  {
+   "fieldname": "content",
+   "fieldtype": "Small Text",
+   "label": "Content",
+   "reqd": 0
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "label": "Image",
+   "reqd": 0
+  },
+  {
+   "fieldname": "image_on_right",
+   "fieldtype": "Check",
+   "label": "Image on Right",
+   "reqd": 0
+  }
+ ],
+ "idx": 0,
+ "modified": "2020-05-17 06:37:27.461722",
+ "modified_by": "Administrator",
+ "name": "Split Section with Image",
+ "owner": "Administrator",
+ "standard": 1,
+ "template": ""
+}
\ No newline at end of file

From 4b8927af17d88e55dba0ca7d4f4eaf92f6e54269 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 00:47:52 +0530
Subject: [PATCH 240/274] fix: Remove section with left image

---
 frappe/patches.txt                            |  1 +
 .../section_with_left_image/__init__.py       |  0
 .../section_with_left_image.html              |  9 ------
 .../section_with_left_image.json              | 29 -------------------
 4 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 frappe/website/web_template/section_with_left_image/__init__.py
 delete mode 100644 frappe/website/web_template/section_with_left_image/section_with_left_image.html
 delete mode 100644 frappe/website/web_template/section_with_left_image/section_with_left_image.json

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 8ab9418e6c..7616ac65bc 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -281,3 +281,4 @@ frappe.patches.v13_0.remove_web_view
 frappe.patches.v13_0.remove_tailwind_from_page_builder
 frappe.patches.v13_0.rename_onboarding
 frappe.patches.v13_0.email_unsubscribe
+execute:frappe.delete_doc("Web Template", "Section with Left Image", force=1)
diff --git a/frappe/website/web_template/section_with_left_image/__init__.py b/frappe/website/web_template/section_with_left_image/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/web_template/section_with_left_image/section_with_left_image.html b/frappe/website/web_template/section_with_left_image/section_with_left_image.html
deleted file mode 100644
index 3daaf87ffb..0000000000
--- a/frappe/website/web_template/section_with_left_image/section_with_left_image.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="section-with-left-image row">
-    <div class="col-12 col-sm-6">
-        <img class="w-full rounded-xl" src="{{ image }}" alt="{{ title }}" />
-    </div>
-    <div class="py-4 col-12 col-sm-6">
-        <h2>{{ title }}</h2>
-        <p>{{ content }}</p>
-    </div>
-</div>
diff --git a/frappe/website/web_template/section_with_left_image/section_with_left_image.json b/frappe/website/web_template/section_with_left_image/section_with_left_image.json
deleted file mode 100644
index bae672d312..0000000000
--- a/frappe/website/web_template/section_with_left_image/section_with_left_image.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "creation": "2020-04-18 12:58:28.670489",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title"
-  },
-  {
-   "fieldname": "content",
-   "fieldtype": "Small Text",
-   "label": "Content"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "label": "Image"
-  }
- ],
- "idx": 0,
- "modified": "2020-04-18 12:58:28.670489",
- "modified_by": "Administrator",
- "name": "Section with Left Image",
- "owner": "Administrator",
- "standard": 1,
- "template": ""
-}
\ No newline at end of file

From 17c5a64e8ecd68178367974e0a6af7131b1de80e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 01:44:18 +0530
Subject: [PATCH 241/274] fix: Sidebar

- Fix sidebar items styling
- Support sidebar on right
---
 frappe/public/scss/markdown.scss           |  7 +++++++
 frappe/public/scss/sidebar.scss            | 18 ++++++++++++++++++
 frappe/public/scss/website.scss            |  4 +++-
 frappe/templates/includes/web_sidebar.html | 13 +++++++------
 frappe/templates/web.html                  | 22 ++++++++++++++++------
 5 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 frappe/public/scss/sidebar.scss

diff --git a/frappe/public/scss/markdown.scss b/frappe/public/scss/markdown.scss
index 440a4cfe88..595b7f96a3 100644
--- a/frappe/public/scss/markdown.scss
+++ b/frappe/public/scss/markdown.scss
@@ -115,3 +115,10 @@
 		border-radius: 0.375rem;
 	}
 }
+
+// apply margin on first h1 if container is full width without top margin
+main:not(.my-5) .from-markdown {
+	h1:first-child {
+		margin-top: 5rem;
+	}
+}
diff --git a/frappe/public/scss/sidebar.scss b/frappe/public/scss/sidebar.scss
new file mode 100644
index 0000000000..72f64a912e
--- /dev/null
+++ b/frappe/public/scss/sidebar.scss
@@ -0,0 +1,18 @@
+.web-sidebar {
+	padding-top: 2rem;
+	position: sticky;
+	top: 0;
+}
+
+.sidebar-item a {
+	display: block;
+	padding: 0.25rem 0;
+	font-size: $font-size-sm;
+	color: $gray-700;
+	text-decoration: none;
+	font-weight: 500;
+}
+
+.sidebar-item a.active {
+	color: $primary;
+}
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index 1c899ba10c..0149ac0d0a 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -6,6 +6,7 @@
 @import 'website-image';
 @import 'page-builder';
 @import 'markdown';
+@import 'sidebar';
 
 .container {
 	padding-left: 1.25rem;
@@ -142,7 +143,8 @@ a.card {
 
 .footer-logo {
 	width: 5rem;
-	max-height: 2rem;
+	height: 2rem;
+	object-fit: contain;
 }
 
 .footer-link, .footer-child-item a {
diff --git a/frappe/templates/includes/web_sidebar.html b/frappe/templates/includes/web_sidebar.html
index 9f1bbb8645..d7816eff34 100644
--- a/frappe/templates/includes/web_sidebar.html
+++ b/frappe/templates/includes/web_sidebar.html
@@ -1,5 +1,5 @@
 <div class="web-sidebar">
-	<div class="sidebar-items small">
+	<div class="sidebar-items">
 		<ul class="list-unstyled">
 			{% if sidebar_title %}
 			<li class="title">
@@ -7,9 +7,10 @@
 			</li>
 			{% endif %}
 			{% for item in sidebar_items -%}
-			<li class="sidebar-item my-2">
+			<li class="sidebar-item">
 				{% if item.type != 'input' %}
-					<a href="{{ item.route }}" class="{{ 'text-dark' if pathname==item.route else 'text-muted' }}"
+					{%- set item_route = item.route[1:] if item.route[0] == '/' else item.route -%}
+					<a href="{{ item.route }}" class="{{ 'active' if pathname == item_route else '' }}"
 						{% if item.target %}target="{{ item.target }}"{% endif %}>
 						{{ _(item.title or item.label) }}
 					</a>
@@ -23,7 +24,7 @@
 			{%- endfor %}
 			{% if frappe.user != 'Guest' %}
 			<li class="sidebar-item">
-				<a href="/me" class="text-muted">{{ _("My Account") }}</a>
+				<a href="/me">{{ _("My Account") }}</a>
 			</li>
 			{% endif %}
 		</ul>
@@ -33,8 +34,8 @@
 <script>
 frappe.ready(function() {
 	$('.sidebar-item a').each(function(index) {
-        const active_class = 'text-dark font-weight-bold'
-        const non_active_class = 'text-muted'
+        const active_class = 'active'
+        const non_active_class = ''
             if(this.href.trim() == window.location) {
                 $(this).removeClass(non_active_class).addClass(active_class);
             } else {
diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index f6d78a8b14..2e7aea6b53 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -48,17 +48,27 @@ id="page-{{ name or route | e }}" data-path="{{ pathname | e }}"
 {%- if source_content_type %}source-content-type="{{ source_content_type }}"{%- endif %}
 {%- endmacro %}
 
+{% macro sidebar() %}
+<div class="sidebar-column col-sm-{{ columns }}">
+	{% block page_sidebar %}
+	{% include "templates/includes/web_sidebar.html" %}
+	{% endblock %}
+</div>
+{% endmacro %}
+
 {% if show_sidebar %}
 <div class="container">
 	<div class="row" {{ container_attributes() }}>
-		<div class="pt-4 col-sm-2 border-right sidebar-column d-none d-sm-block">
-			{% block page_sidebar %}
-			{% include "templates/includes/web_sidebar.html" %}
-			{% endblock %}
-		</div>
-		<div class="col-sm-10 main-column">
+		{%- set columns = sidebar_columns or 2 -%}
+		{%- if not sidebar_right -%}
+		{{ sidebar() }}
+		{%- endif -%}
+		<div class="main-column col-sm-{{ 12 - columns }}">
 			{{ main_content() }}
 		</div>
+		{%- if sidebar_right -%}
+		{{ sidebar() }}
+		{%- endif -%}
 	</div>
 </div>
 {% else %}

From 01dfd23c664a180fe050122300114ef5315acd9b Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 01:44:49 +0530
Subject: [PATCH 242/274] fix: Set default font properties to all weights

---
 frappe/website/doctype/website_theme/website_theme.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json
index 1c5ef1b53d..7af6c91281 100644
--- a/frappe/website/doctype/website_theme/website_theme.json
+++ b/frappe/website/doctype/website_theme/website_theme.json
@@ -135,7 +135,7 @@
    "options": "Color"
   },
   {
-   "default": "300,600",
+   "default": "wght@300;400;500;600;700;800",
    "fieldname": "font_properties",
    "fieldtype": "Data",
    "label": "Font Properties"
@@ -170,7 +170,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-11 16:01:04.654990",
+ "modified": "2020-05-16 18:36:22.203519",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Theme",

From 3d9e6470157b14be87ff07a086b477da06170557 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 01:45:17 +0530
Subject: [PATCH 243/274] fix: Commit auto-updated files

---
 frappe/public/css/email.css                   | 47 -------------------
 .../website_theme/standard/standard.json      |  9 ++--
 2 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css
index 92ac433fd2..40c6149927 100644
--- a/frappe/public/css/email.css
+++ b/frappe/public/css/email.css
@@ -1,82 +1,64 @@
 /* csslint ignore:start */
-
 /* palette colors*/
-
 body {
   line-height: 1.5;
   color: #36414c;
 }
-
 p {
   margin: 1em 0 !important;
 }
-
 hr {
   border-top: 1px solid #d1d8dd;
 }
-
 .body-table {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
-
 .body-table td {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
-
 .email-header,
 .email-body,
 .email-footer {
   width: 100% !important;
   min-width: 100% !important;
 }
-
 .email-body {
   font-size: 14px;
 }
-
 .email-footer {
   border-top: 1px solid #d1d8dd;
   font-size: 12px;
 }
-
 .email-header {
   border: 1px solid #d1d8dd;
   border-radius: 4px 4px 0 0;
 }
-
 .email-header .brand-image {
   width: 24px;
   height: 24px;
   display: block;
 }
-
 .email-header-title {
   font-weight: bold;
 }
-
 .body-table.has-header .email-body {
   border: 1px solid #d1d8dd;
   border-radius: 0 0 4px 4px;
   border-top: none;
 }
-
 .body-table.has-header .email-footer {
   border-top: none;
 }
-
 .email-footer-container {
   margin-top: 30px;
 }
-
 .email-footer-container > div:not(:last-child) {
   margin-bottom: 5px;
 }
-
 .email-unsubscribe a {
   color: #8d99a6;
   text-decoration: underline;
 }
-
 .btn {
   text-decoration: none;
   padding: 7px 10px;
@@ -84,24 +66,20 @@ hr {
   border: 1px solid;
   border-radius: 3px;
 }
-
 .btn.btn-default {
   color: #fff;
   background-color: #f0f4f7;
   border-color: transparent;
 }
-
 .btn.btn-primary {
   color: #fff;
   background-color: #5e64ff;
   border-color: #444bff;
 }
-
 .table {
   width: 100%;
   border-collapse: collapse;
 }
-
 .table td,
 .table th {
   padding: 8px;
@@ -110,68 +88,53 @@ hr {
   border-top: 1px solid #d1d8dd;
   text-align: left;
 }
-
 .table th {
   font-weight: bold;
 }
-
 .table > thead > tr > th {
   vertical-align: middle;
   border-bottom: 2px solid #d1d8dd;
 }
-
 .table > thead:first-child > tr:first-child > th {
   border-top: none;
 }
-
 .table.table-bordered {
   border: 1px solid #d1d8dd;
 }
-
 .table.table-bordered td,
 .table.table-bordered th {
   border: 1px solid #d1d8dd;
 }
-
 .more-info {
   font-size: 80% !important;
   color: #8d99a6 !important;
   border-top: 1px solid #ebeff2;
   padding-top: 10px;
 }
-
 .text-right {
   text-align: right !important;
 }
-
 .text-center {
   text-align: center !important;
 }
-
 .text-muted {
   color: #8d99a6 !important;
 }
-
 .text-extra-muted {
   color: #d1d8dd !important;
 }
-
 .text-regular {
   font-size: 14px;
 }
-
 .text-medium {
   font-size: 12px;
 }
-
 .text-small {
   font-size: 10px;
 }
-
 .text-bold {
   font-weight: bold;
 }
-
 .indicator {
   width: 8px;
   height: 8px;
@@ -180,43 +143,33 @@ hr {
   display: inline-block;
   margin-right: 5px;
 }
-
 .indicator.indicator-blue {
   background-color: #5e64ff;
 }
-
 .indicator.indicator-green {
   background-color: #98d85b;
 }
-
 .indicator.indicator-orange {
   background-color: #ffa00a;
 }
-
 .indicator.indicator-red {
   background-color: #ff5858;
 }
-
 .indicator.indicator-yellow {
   background-color: #feef72;
 }
-
 .screenshot {
   box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1);
   border: 1px solid #d1d8dd;
   margin: 8px 0;
   max-width: 100%;
 }
-
 .list-unstyled {
   list-style-type: none;
   padding: 0;
 }
-
 /* auto email report */
-
 .report-title {
   margin-bottom: 20px;
 }
-
 /* csslint ignore:end */
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index 9365d5be27..11527a5229 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -4,13 +4,12 @@
  "button_shadows": 0,
  "creation": "2015-02-19 13:37:33.925909",
  "custom": 0,
- "custom_css": "",
  "custom_overrides": "",
  "docstatus": 0,
  "doctype": "Website Theme",
- "font_properties": "400,500,600,700,800",
- "idx": 26,
- "modified": "2020-05-09 16:44:18.508471",
+ "font_properties": "wght:400;500;600;700;800",
+ "idx": 28,
+ "modified": "2020-05-19 00:33:58.011046",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Standard",
@@ -18,4 +17,4 @@
  "theme": "Standard",
  "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n// Bootstrap Variable Overrides\n\n\n@import \"frappe/public/scss/website\";\n\n\n\n// Custom Theme\n",
  "theme_url": "/assets/css/standard_style.css"
-}
+}
\ No newline at end of file

From f4cd72c792b47fc95cc17cb8ff109f790c0898fa Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Wed, 20 May 2020 12:14:03 +0530
Subject: [PATCH 244/274] fix: Type error when empty 'Rich Text' content saved
 in Blog Post

---
 frappe/website/doctype/blog_post/blog_post.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index be58bec842..be50002870 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -101,7 +101,7 @@ class BlogPost(WebsiteGenerator):
 				context.comment_text = _('{0} comments').format(len(context.comment_list))
 
 	def set_read_time(self):
-		content = self.content or self.content_html
+		content = self.content or self.content_html or ''
 		if self.content_type == "Markdown":
 			content = markdown(self.content_md)
 

From 69b1ee5ab917b3a1f3bfce74d72e0be9ae430204 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Wed, 20 May 2020 12:20:49 +0530
Subject: [PATCH 245/274] fix: remove auto scroll from result area

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 4ad072cbb5..de26fd0f8d 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -25,7 +25,6 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 				fieldtype: "Button", fieldname: "more_btn", label: __("More"),
 				click: () => {
 					this.start += 20;
-					frappe.flags.auto_scroll = true;
 					this.get_results();
 				}
 			}

From 6f31827c800aedf04f21e14004da9908ef5c86a5 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Wed, 20 May 2020 12:55:04 +0530
Subject: [PATCH 246/274] chore: removed unwanted code

---
 frappe/public/js/frappe/form/multi_select_dialog.js | 6 ------
 frappe/website/website_theme/standard/standard.json | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index de26fd0f8d..9c496fabd0 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -331,14 +331,8 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 					}
 					r.values.forEach(function (result) {
 						result.checked = 0;
-						result.parsed_date = Date.parse(result["Date"]);
 						me.results.push(result);
 					});
-
-					me.results.sort((a, b) => {
-						return a.parsed_date - b.parsed_date;
-					});
-
 				}
 				me.render_result_list(me.results, more);
 			}
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
index fc80ba82dc..9365d5be27 100644
--- a/frappe/website/website_theme/standard/standard.json
+++ b/frappe/website/website_theme/standard/standard.json
@@ -4,12 +4,13 @@
  "button_shadows": 0,
  "creation": "2015-02-19 13:37:33.925909",
  "custom": 0,
+ "custom_css": "",
  "custom_overrides": "",
  "docstatus": 0,
  "doctype": "Website Theme",
  "font_properties": "400,500,600,700,800",
  "idx": 26,
- "modified": "2020-05-18 11:52:41.949264",
+ "modified": "2020-05-09 16:44:18.508471",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Standard",
@@ -17,4 +18,4 @@
  "theme": "Standard",
  "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n// Bootstrap Variable Overrides\n\n\n@import \"frappe/public/scss/website\";\n\n\n\n// Custom Theme\n",
  "theme_url": "/assets/css/standard_style.css"
-}
\ No newline at end of file
+}

From c9642949af2f8a79555b014ddc47553aee3a4945 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Wed, 20 May 2020 13:11:02 +0530
Subject: [PATCH 247/274] style: fixed indentation

---
 .../js/frappe/form/multi_select_dialog.js     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 9c496fabd0..41b87e0207 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -86,7 +86,6 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 
 	get_primary_filters() {
 		let fields = [];
-		let me = this;
 
 		let columns = new Array(3);
 
@@ -117,7 +116,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		});
 
 		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/seal
-		if(Object.seal) {
+		if (Object.seal) {
 			Object.seal(columns);
 			// now a is a fixed-size array with mutable entries
 		}
@@ -129,7 +128,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			{ fieldtype: "Column Break" },
 			...columns[2],
 			{ fieldtype: "Section Break", fieldname: "primary_filters_sb" }
-		]
+		];
 
 		if (this.add_filters_group) {
 			fields.push(
@@ -179,12 +178,12 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 				.prop("checked", ($(e.target).is(':checked')));
 		});
 
-		this.$parent.find('.input-with-feedback').on('change', (e) => {
+		this.$parent.find('.input-with-feedback').on('change', () => {
 			frappe.flags.auto_scroll = false;
 			this.get_results();
 		});
 
-		this.$parent.find('[data-fieldtype="Data"]').on('input', (e) => {
+		this.$parent.find('[data-fieldtype="Data"]').on('input', () => {
 			var $this = $(this);
 			clearTimeout($this.data('timeout'));
 			$this.data('timeout', setTimeout(function () {
@@ -223,11 +222,10 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		columns.forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
 				${
-				head ? `<span class="ellipsis text-muted" title="${__(frappe.model.unscrub(column))}">${__(frappe.model.unscrub(column))}</span>`
-					: (column !== "name" ? `<span class="ellipsis result-row" title="${__(result[column] || '')}">${__(result[column] || '')}</span>`
-						: `<a href="${"#Form/" + me.doctype + "/" + result[column] || ''}" class="list-id ellipsis" title="${__(result[column] || '')}">
-							${__(result[column] || '')}</a>`)
-				}
+	head ? `<span class="ellipsis text-muted" title="${__(frappe.model.unscrub(column))}">${__(frappe.model.unscrub(column))}</span>`
+		: (column !== "name" ? `<span class="ellipsis result-row" title="${__(result[column] || '')}">${__(result[column] || '')}</span>`
+			: `<a href="${"#Form/" + me.doctype + "/" + result[column] || ''}" class="list-id ellipsis" title="${__(result[column] || '')}">
+							${__(result[column] || '')}</a>`)}
 			</div>`;
 		});
 
@@ -295,7 +293,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		Object.keys(this.setters).forEach(function (setter) {
 			var value = me.dialog.fields_dict[setter].get_value();
 			if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
-				filters[setter] = ["like", "%"+value+"%"];
+				filters[setter] = ["like", "%" + value + "%"];
 			} else {
 				filters[setter] = value || undefined;
 				me.args[setter] = filters[setter];

From c8aed039bda13531305b2fbfff1d1a30585a2be7 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 May 2020 13:17:59 +0530
Subject: [PATCH 248/274] Revert "fix: remove markdown conversion"

This reverts commit 3fd8a15412999b37af514f87e8b0fdb47b4e5789.
---
 frappe/desk/form/load.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 4e5e84423d..f24f33df07 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -133,6 +133,11 @@ def get_comments(doctype, name):
 		reference_name = name
 	))
 
+	# convert to markdown (legacy ?)
+	for c in comments:
+		if c.comment_type == 'Comment':
+			c.content = frappe.utils.markdown(c.content)
+
 	return comments
 
 def get_point_logs(doctype, docname):

From f3ccdd9ebcd94d9a01437ab7184ff96dc8549aeb Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 May 2020 13:18:19 +0530
Subject: [PATCH 249/274] fix: dont convert from md if html

---
 frappe/utils/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 956846d50c..f2e2319802 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -481,7 +481,7 @@ def watch(path, handler=None, debug=True):
 	observer.join()
 
 def markdown(text, sanitize=True, linkify=True):
-	html = frappe.utils.md_to_html(text)
+	html = text if is_html(text) else frappe.utils.md_to_html(text)
 
 	if sanitize:
 		html = html.replace("<!-- markdown -->", "")

From 952c3840149e42b9df68d93548fbe5e3b98ecc32 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 20 May 2020 14:46:42 +0530
Subject: [PATCH 250/274] fix: get_data takes input value

---
 frappe/public/js/frappe/form/controls/multiselect_pills.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_pills.js b/frappe/public/js/frappe/form/controls/multiselect_pills.js
index 8796c95eaa..6190204357 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_pills.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_pills.js
@@ -129,7 +129,8 @@ frappe.ui.form.ControlMultiSelectPills = frappe.ui.form.ControlAutocomplete.exte
 	get_data() {
 		let data;
 		if(this.df.get_data) {
-			data = this.df.get_data();
+			let txt = this.$input.val();
+			data = this.df.get_data(txt);
 			if (data && data.then) {
 				data.then((r) => {
 					this.set_data(r);

From 8e87734ff9bfdd12cbabd441c27bf7ec2847f868 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 20 May 2020 14:54:15 +0530
Subject: [PATCH 251/274] fix: Move address and contact from ERPNext

---
 frappe/public/build.json                      |  2 +
 .../frappe/form/templates/address_list.html   | 22 ++++++++
 .../frappe/form/templates/contact_list.html   | 54 +++++++++++++++++++
 3 files changed, 78 insertions(+)
 create mode 100644 frappe/public/js/frappe/form/templates/address_list.html
 create mode 100644 frappe/public/js/frappe/form/templates/contact_list.html

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 30cb2adf87..997a3092ad 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -250,6 +250,8 @@
 		"public/less/form_grid.less"
 	],
 	"js/form.min.js": [
+		"public/js/frappe/form/templates/address_list.html",
+		"public/js/frappe/form/templates/contact_list.html",
 		"public/js/frappe/form/templates/print_layout.html",
 		"public/js/frappe/form/templates/users_in_sidebar.html",
 		"public/js/frappe/form/templates/set_sharing.html",
diff --git a/frappe/public/js/frappe/form/templates/address_list.html b/frappe/public/js/frappe/form/templates/address_list.html
new file mode 100644
index 0000000000..0f967b67a0
--- /dev/null
+++ b/frappe/public/js/frappe/form/templates/address_list.html
@@ -0,0 +1,22 @@
+<div class="clearfix"></div>
+{% for(var i=0, l=addr_list.length; i<l; i++) { %}
+<div class="address-box">
+	<p class="h6">
+		{%= i+1 %}. {%= addr_list[i].address_title %}{% if(addr_list[i].address_type!="Other") { %}
+		<span class="text-muted">({%= __(addr_list[i].address_type) %})</span>{% } %}
+		{% if(addr_list[i].is_primary_address) { %}
+		<span class="text-muted">({%= __("Primary") %})</span>{% } %}
+		{% if(addr_list[i].is_shipping_address) { %}
+		<span class="text-muted">({%= __("Shipping") %})</span>{% } %}
+
+		<a href="#Form/Address/{%= encodeURIComponent(addr_list[i].name) %}" class="btn btn-default btn-xs pull-right"
+			style="margin-top:-3px; margin-right: -5px;">
+			{%= __("Edit") %}</a>
+	</p>
+	<p>{%= addr_list[i].display %}</p>
+</div>
+{% } %}
+{% if(!addr_list.length) { %}
+<p class="text-muted small">{%= __("No address added yet.") %}</p>
+{% } %}
+<p><button class="btn btn-xs btn-default btn-address">{{ __("New Address") }}</button></p>
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/templates/contact_list.html b/frappe/public/js/frappe/form/templates/contact_list.html
new file mode 100644
index 0000000000..7e6969163b
--- /dev/null
+++ b/frappe/public/js/frappe/form/templates/contact_list.html
@@ -0,0 +1,54 @@
+<div class="clearfix"></div>
+{% for(var i=0, l=contact_list.length; i<l; i++) { %}
+	<div class="address-box">
+		<p class="h6">
+			{%= contact_list[i].first_name %} {%= contact_list[i].last_name %}
+			{% if(contact_list[i].is_primary_contact) { %}
+				<span class="text-muted">({%= __("Primary") %})</span>
+			{% } %}
+			{% if(contact_list[i].designation){ %}
+			 <span class="text-muted">&ndash; {%= contact_list[i].designation %}</span>
+			{% } %}
+			<a href="#Form/Contact/{%= encodeURIComponent(contact_list[i].name) %}"
+				class="btn btn-xs btn-default pull-right"
+				style="margin-top:-3px; margin-right: -5px;">
+				{%= __("Edit") %}</a>
+		</p>
+		{% if (contact_list[i].phones || contact_list[i].email_ids) { %}
+		<p>
+			{% if(contact_list[i].phone) { %}
+				{%= __("Phone") %}: {%= contact_list[i].phone %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
+			{% endif %}
+			{% if(contact_list[i].mobile_no) { %}
+				{%= __("Mobile No") %}: {%= contact_list[i].mobile_no %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
+			{% endif %}
+			{% if(contact_list[i].phone_nos) { %}
+				{% for(var j=0, k=contact_list[i].phone_nos.length; j<k; j++) { %}
+					{%= __("Phone") %}: {%= contact_list[i].phone_nos[j].phone %}<br>
+				{% } %}
+			{% endif %}
+		</p>
+		<p>
+			{% if(contact_list[i].email_id) { %}
+				{%= __("Email") %}: {%= contact_list[i].email_id %}<span class="text-muted"> ({%= __("Primary") %})</span><br>
+			{% endif %}
+			{% if(contact_list[i].email_ids) { %}
+				{% for(var j=0, k=contact_list[i].email_ids.length; j<k; j++) { %}
+					{%= __("Email") %}: {%= contact_list[i].email_ids[j].email_id %}<br>
+				{% } %}
+			{% endif %}
+		</p>
+		{% endif %}
+		<p>
+		{% if (contact_list[i].address) { %}
+			{%= __("Address") %}: {%= contact_list[i].address %}<br>
+		{% endif %}
+		</p>
+	</div>
+{% } %}
+{% if(!contact_list.length) { %}
+<p class="text-muted small">{%= __("No contacts added yet.") %}</p>
+{% } %}
+<p><button class="btn btn-xs btn-default btn-contact">
+	{{ __("New Contact") }}</button>
+</p>
\ No newline at end of file

From 0a8506da87e784365aad1b9eb4984186c141c87c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 15:16:28 +0530
Subject: [PATCH 252/274] feat: remove subnav

---
 .../website/web_template/subnav/__init__.py   |  0
 .../website/web_template/subnav/subnav.html   | 21 ------
 .../website/web_template/subnav/subnav.json   | 73 -------------------
 3 files changed, 94 deletions(-)
 delete mode 100644 frappe/website/web_template/subnav/__init__.py
 delete mode 100644 frappe/website/web_template/subnav/subnav.html
 delete mode 100644 frappe/website/web_template/subnav/subnav.json

diff --git a/frappe/website/web_template/subnav/__init__.py b/frappe/website/web_template/subnav/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/web_template/subnav/subnav.html b/frappe/website/web_template/subnav/subnav.html
deleted file mode 100644
index 274acf2b8a..0000000000
--- a/frappe/website/web_template/subnav/subnav.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<nav class="navbar navbar-expand-lg navbar-light subnav">
-	<div class="container">
-		<a class="navbar-brand d-none d-sm-block" href="{{ path }}">
-			{% if logo %}
-			<img class="d-inline-block align-top mr-2" src="{{ logo }}" style="max-height: 25px;"/>
-			{% endif %}
-			<span class="subnav-title">{{ title }}</span>
-		</a>
-		<ul class="navbar-nav justify-content-sm-end">
-			{% for index in ['1', '2', '3', '4'] %}
-			{% set label = values['label_' + index] %}
-			{% set url = values['url_' + index] %}
-				{% if label and url %}
-				<li class="navbar-item">
-					<a class="nav-link text-muted" href="{{ url }}">{{ label }}</a>
-				</li>
-				{% endif %}
-			{% endfor %}
-		</ul>
-	</div>
-</nav>
diff --git a/frappe/website/web_template/subnav/subnav.json b/frappe/website/web_template/subnav/subnav.json
deleted file mode 100644
index 8991c42366..0000000000
--- a/frappe/website/web_template/subnav/subnav.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
- "creation": "2020-05-15 17:53:36.526784",
- "docstatus": 0,
- "doctype": "Web Template",
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "label": "Title",
-   "reqd": 0
-  },
-  {
-   "fieldname": "logo",
-   "fieldtype": "Attach Image",
-   "label": "Logo",
-   "reqd": 0
-  },
-  {
-   "fieldname": "label_1",
-   "fieldtype": "Data",
-   "label": "Label 1",
-   "reqd": 0
-  },
-  {
-   "fieldname": "url_1",
-   "fieldtype": "Data",
-   "label": "URL 1",
-   "reqd": 0
-  },
-  {
-   "fieldname": "label_2",
-   "fieldtype": "Data",
-   "label": "Label 2",
-   "reqd": 0
-  },
-  {
-   "fieldname": "url_2",
-   "fieldtype": "Data",
-   "label": "URL 2",
-   "reqd": 0
-  },
-  {
-   "fieldname": "label_3",
-   "fieldtype": "Data",
-   "label": "Label 3",
-   "reqd": 0
-  },
-  {
-   "fieldname": "url_3",
-   "fieldtype": "Data",
-   "label": "URL 3",
-   "reqd": 0
-  },
-  {
-   "fieldname": "label_4",
-   "fieldtype": "Data",
-   "label": "Label 4",
-   "reqd": 0
-  },
-  {
-   "fieldname": "url_4",
-   "fieldtype": "Data",
-   "label": "URL 4",
-   "reqd": 0
-  }
- ],
- "idx": 0,
- "modified": "2020-05-15 17:54:52.253976",
- "modified_by": "Administrator",
- "name": "Subnav",
- "owner": "Administrator",
- "standard": 1
-}
\ No newline at end of file

From 66df42b28144bd17766ddb4f6fa506396c560244 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 15:34:13 +0530
Subject: [PATCH 253/274] refactor: show sections with values

---
 .../public/js/frappe/utils/web_page_block.js  | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/utils/web_page_block.js b/frappe/public/js/frappe/utils/web_page_block.js
index 8b0dbe5134..db655df98b 100644
--- a/frappe/public/js/frappe/utils/web_page_block.js
+++ b/frappe/public/js/frappe/utils/web_page_block.js
@@ -1,10 +1,10 @@
-frappe.ui.form.on('Web Page Block', {
+frappe.ui.form.on("Web Page Block", {
 	edit_values(frm, cdt, cdn) {
 		let row = frm.selected_doc;
-		frappe.model.with_doc('Web Template', row.web_template).then(doc => {
+		frappe.model.with_doc("Web Template", row.web_template).then((doc) => {
 			let d = new frappe.ui.Dialog({
-				title: __('Edit Values'),
-				fields: doc.fields.map(df => {
+				title: __("Edit Values"),
+				fields: doc.fields.map((df) => {
 					if (df.fieldtype == "Section Break") {
 						df.collapsible = 1;
 					}
@@ -14,15 +14,25 @@ frappe.ui.form.on('Web Page Block', {
 					frappe.model.set_value(
 						cdt,
 						cdn,
-						'web_template_values',
+						"web_template_values",
 						JSON.stringify(values)
 					);
 					d.hide();
-				}
+				},
 			});
-			let values = JSON.parse(row.web_template_values || '{}');
+			let values = JSON.parse(row.web_template_values || "{}");
 			d.set_values(values);
 			d.show();
+
+			d.sections.forEach((sect) => {
+				let fields_with_value = sect.fields_list.filter(
+					(field) => values[field.df.fieldname]
+				);
+
+				if (fields_with_value.length) {
+					sect.collapse(false);
+				}
+			});
 		});
-	}
-});
+	},
+});
\ No newline at end of file

From 2f5ff982402af6956a49dea52e7a0704ebc11f74 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 May 2020 14:25:24 +0530
Subject: [PATCH 254/274] fix: web_blocks global method to render web blocks

---
 frappe/utils/jinja.py | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index d571185bce..3705414f4f 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -21,7 +21,8 @@ def get_jenv():
 		jenv.globals.update(get_jenv_customization('methods'))
 		jenv.globals.update({
 			'resolve_class': resolve_class,
-			'inspect': inspect
+			'inspect': inspect,
+			'web_blocks': web_blocks
 		})
 
 		frappe.local.jenv = jenv
@@ -189,3 +190,30 @@ def inspect(var, render=True):
 	else:
 		html = ""
 	return get_jenv().from_string(html).render(context)
+
+def web_blocks(blocks):
+	from frappe import _dict, get_doc
+	from frappe.website.doctype.web_page.web_page import get_web_blocks_html
+
+	web_blocks = []
+	for block in blocks:
+		doc = {
+			'doctype': 'Web Page Block',
+			'web_template': block['template'],
+			'web_template_values': block['values'],
+			'add_top_padding': 1,
+			'add_bottom_padding': 1,
+			'add_container': 1,
+			'hide_block': 0,
+			'css_class': ''
+		}
+		doc.update(block)
+		web_blocks.append(get_doc(doc))
+
+	out = get_web_blocks_html(web_blocks)
+
+	html = out.html
+	for script in out.scripts:
+		html += '<script>{}</script>'.format(script)
+
+	return html

From 931e35b55468b01fca52b350a2aa2b9fa9413ac9 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 May 2020 17:59:08 +0530
Subject: [PATCH 255/274] fix: handle verbose kwarg in BackupGenerator

---
 frappe/utils/backups.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 0a04db2c3e..54b1f2a7e9 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -10,10 +10,9 @@ from frappe import _
 import os, frappe
 from datetime import datetime
 from frappe.utils import cstr, get_url, now_datetime
-
-#Global constants
-verbose = 0
 from frappe import conf
+
+_verbose = False
 #-------------------------------------------------------------------------------
 class BackupGenerator:
 	"""
@@ -23,7 +22,8 @@ class BackupGenerator:
 		If specifying db_file_name, also append ".sql.gz"
 	"""
 	def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None,
-		backup_path_private_files=None, db_host="localhost", db_port=3306):
+		backup_path_private_files=None, db_host="localhost", db_port=3306, verbose=False):
+		global _verbose
 		self.db_host = db_host
 		self.db_port = db_port or 3306
 		self.db_name = db_name
@@ -32,6 +32,8 @@ class BackupGenerator:
 		self.backup_path_files = backup_path_files
 		self.backup_path_db = backup_path_db
 		self.backup_path_private_files = backup_path_private_files
+		self.verbose = verbose
+		_verbose = verbose
 
 	def get_backup(self, older_than=24, ignore_files=False, force=False):
 		"""
@@ -103,7 +105,7 @@ class BackupGenerator:
 			cmd_string = """tar -cf %s %s""" % (backup_path, files_path)
 			err, out = frappe.utils.execute_in_shell(cmd_string)
 
-			if verbose:
+			if self.verbose:
 				print('Backed up files', os.path.abspath(backup_path))
 
 	def take_dump(self):
@@ -159,21 +161,22 @@ def get_backup():
 	recipient_list = odb.send_email()
 	frappe.msgprint(_("Download link for your backup will be emailed on the following email address: {0}").format(', '.join(recipient_list)))
 
-def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False):
+def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False):
 	"""this function is called from scheduler
 		deletes backups older than 7 days
 		takes backup"""
-	odb = new_backup(older_than, ignore_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, force=force)
+	odb = new_backup(older_than, ignore_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, force=force, verbose=verbose)
 	return odb
 
-def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False):
+def new_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False):
 	delete_temp_backups(older_than = frappe.conf.keep_backups_for_hours or 24)
 	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name,\
 						  frappe.conf.db_password,
 						  backup_path_db=backup_path_db, backup_path_files=backup_path_files,
 						  backup_path_private_files=backup_path_private_files,
 						  db_host = frappe.db.host,
-						  db_port = frappe.db.port)
+						  db_port = frappe.db.port,
+						  verbose=verbose)
 	odb.get_backup(older_than, ignore_files, force=force)
 	return odb
 
@@ -202,13 +205,16 @@ def is_file_old(db_file_name, older_than=24):
 			file_datetime = datetime.fromtimestamp\
 						(os.stat(db_file_name).st_ctime)
 			if datetime.today() - file_datetime >= timedelta(hours = older_than):
-				if verbose: print("File is old")
+				if _verbose:
+					print("File is old")
 				return True
 			else:
-				if verbose: print("File is recent")
+				if _verbose:
+					print("File is recent")
 				return False
 		else:
-			if verbose: print("File does not exist")
+			if _verbose:
+				print("File does not exist")
 			return True
 
 def get_backup_path():

From 716ae57b29888e782f997b3e6a2c32814d519a62 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 May 2020 18:01:32 +0530
Subject: [PATCH 256/274] style: sort imports and spacing

---
 frappe/utils/backups.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 54b1f2a7e9..087dec3111 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -3,17 +3,18 @@
 
 """This module handles the On Demand Backup utility"""
 
-from __future__ import unicode_literals, print_function
+from __future__ import print_function, unicode_literals
 
-#Imports
-from frappe import _
-import os, frappe
+import os
 from datetime import datetime
+
+import frappe
+from frappe import _, conf
 from frappe.utils import cstr, get_url, now_datetime
-from frappe import conf
 
 _verbose = False
-#-------------------------------------------------------------------------------
+
+
 class BackupGenerator:
 	"""
 		This class contains methods to perform On Demand Backup
@@ -221,7 +222,6 @@ def get_backup_path():
 	backup_path = frappe.utils.get_site_path(conf.get("backup_path", "private/backups"))
 	return backup_path
 
-#-------------------------------------------------------------------------------
 def backup(with_files=False, backup_path_db=None, backup_path_files=None, quiet=False):
 	"Backup"
 	odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, force=True)
@@ -231,6 +231,7 @@ def backup(with_files=False, backup_path_db=None, backup_path_files=None, quiet=
 		"backup_path_private_files": odb.backup_path_private_files
 	}
 
+
 if __name__ == "__main__":
 	"""
 		is_file_old db_name user password db_host

From 2328fe5aa32f70717da749a59373a83e4fe25f0f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 19:07:05 +0530
Subject: [PATCH 257/274] style: linting fixes from sider

---
 frappe/public/scss/page-builder.scss | 2 +-
 frappe/utils/jinja.py                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss
index f59e589afe..c74d0c3e1a 100644
--- a/frappe/public/scss/page-builder.scss
+++ b/frappe/public/scss/page-builder.scss
@@ -258,7 +258,7 @@
 .testimonial-logo {
 	display: inline-block;
 	max-width: 10rem;
-	max-height: 2.5rem;;
+	max-height: 2.5rem;
 }
 
 .testimonial-content {
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 3705414f4f..2863ec99cd 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -192,7 +192,7 @@ def inspect(var, render=True):
 	return get_jenv().from_string(html).render(context)
 
 def web_blocks(blocks):
-	from frappe import _dict, get_doc
+	from frappe import get_doc
 	from frappe.website.doctype.web_page.web_page import get_web_blocks_html
 
 	web_blocks = []

From 62b2c034aea14ecff6279f350ea7d7ce6f6e95d4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 May 2020 19:33:39 +0530
Subject: [PATCH 258/274] fix(recorder): reduce z index to avoid overlap

---
 .../public/js/frappe/recorder/RequestDetail.vue   |  2 +-
 frappe/public/less/form_grid.less                 | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue
index 60795076ec..58824d2f97 100644
--- a/frappe/public/js/frappe/recorder/RequestDetail.vue
+++ b/frappe/public/js/frappe/recorder/RequestDetail.vue
@@ -79,7 +79,7 @@
 														<span class="octicon octicon-triangle-down"></span></a>
 													</div>
 												</div>
-												<div class="form-in-grid" v-if="showing == call.index">
+												<div class="recorder-form-in-grid" v-if="showing == call.index">
 													<div class="grid-form-heading" @click="showing = null">
 														<div class="toolbar grid-header-toolbar">
 															<span class="panel-title">SQL Query #<span class="grid-form-row-index">{{ call.index }}</span></span>
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 86482686d1..5cb04a252c 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -247,14 +247,23 @@
 	}
 }
 
-.form-in-grid {
+.base-grid() {
 	background-color: white;
-	z-index: 1021;
 	position: relative;
+	.transition(opacity .2s ease)
+}
+
+.form-in-grid {
 	overflow: hidden;
 	height: 0;
 	opacity: 0;
-	.transition(opacity .2s ease)
+	z-index: 1021;
+	.base-grid();
+}
+
+.recorder-form-in-grid {
+	z-index: 0;
+	.base-grid();
 }
 
 .grid-row-open .form-in-grid {

From 0826a9db45855916d806c770d4201d5ac7c09641 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 20 May 2020 21:24:09 +0530
Subject: [PATCH 259/274] fix: check for self linking and circular linking
 while getting submitted linked docs (bp #10179) (#10425)

---
 frappe/desk/form/linked_with.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index 6c679bf312..5f5f6e4f82 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -13,7 +13,7 @@ from frappe.modules import load_doctype_module
 
 
 @frappe.whitelist()
-def get_submitted_linked_docs(doctype, name, docs=None):
+def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
 	"""
 	Get all nested submitted linked doctype linkinfo
 
@@ -31,12 +31,23 @@ def get_submitted_linked_docs(doctype, name, docs=None):
 	if not docs:
 		docs = []
 
+	if not linked:
+		linked = {}
+
 	linkinfo = get_linked_doctypes(doctype)
 	linked_docs = get_linked_docs(doctype, name, linkinfo)
 
 	link_count = 0
 	for link_doctype, link_names in linked_docs.items():
+		if link_doctype not in linked:
+			linked[link_doctype] = []
+
 		for link in link_names:
+			if linked and name in linked[link_doctype]:
+				continue
+
+			linked[link_doctype].append(link['name'])
+
 			docinfo = link.update({"doctype": link_doctype})
 			validated_doc = validate_linked_doc(docinfo)
 
@@ -47,7 +58,7 @@ def get_submitted_linked_docs(doctype, name, docs=None):
 			if link.name in [doc.get("name") for doc in docs]:
 				continue
 
-			links = get_submitted_linked_docs(link_doctype, link.name, docs)
+			links = get_submitted_linked_docs(link_doctype, link.name, docs, linked)
 			docs.append({
 				"doctype": link_doctype,
 				"name": link.name,

From 49f9447627570db6b0f6e939c6919c03aaa2f327 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 21:48:38 +0530
Subject: [PATCH 260/274] fix: apply rule on image

---
 frappe/public/scss/page-builder.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/scss/page-builder.scss b/frappe/public/scss/page-builder.scss
index c74d0c3e1a..a028e34158 100644
--- a/frappe/public/scss/page-builder.scss
+++ b/frappe/public/scss/page-builder.scss
@@ -255,7 +255,7 @@
 	text-align: center;
 }
 
-.testimonial-logo {
+.testimonial-logo img {
 	display: inline-block;
 	max-width: 10rem;
 	max-height: 2.5rem;

From d6e0cdb4fec74448c3fd949a3c4a967142ad942e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 22:45:29 +0530
Subject: [PATCH 261/274] fix (test): fix flaky relative filter test

---
 cypress/integration/relative_filters.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cypress/integration/relative_filters.js b/cypress/integration/relative_filters.js
index 986c5ce342..411ede62fa 100644
--- a/cypress/integration/relative_filters.js
+++ b/cypress/integration/relative_filters.js
@@ -1,7 +1,6 @@
 context('Relative Timeframe', () => {
 	beforeEach(() => {
 		cy.login();
-		cy.visit('/desk#workspace/Website');
 	});
 	before(() => {
 		cy.login();

From 7a1cb7fa00c9c893494c4bd225dc4d70ed630d2f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 23:21:09 +0530
Subject: [PATCH 262/274] refactor: don't login before each test

---
 cypress/integration/control_link.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index 658a7fe320..07e427ab02 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -1,12 +1,16 @@
 context('Control Link', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.login();
 		cy.visit('/desk#workspace/Website');
+	});
+
+	beforeEach(() => {
+		cy.visit('/desk#workspace/Website');
 		cy.create_records({
 			doctype: 'ToDo',
 			description: 'this is a test todo for link'
 		}).as('todos');
-	});
+	})
 
 	function get_dialog_with_link() {
 		return cy.dialog({

From 5d5cb26143f4866a5f73d48d85daea14a6fe6a04 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 23:28:40 +0530
Subject: [PATCH 263/274] fix: add delay in typing

---
 cypress/integration/control_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index 07e427ab02..eb9ab405b5 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -34,7 +34,7 @@ context('Control Link', () => {
 
 		cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
 		cy.wait('@search_link');
-		cy.get('@input').type('todo for link');
+		cy.get('@input').type('todo for link', { delay: 200 });
 		cy.wait('@search_link');
 		cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
 		cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });

From 53855cad1d7d39a196c01c5e33a5530091350dbc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 20 May 2020 23:29:30 +0530
Subject: [PATCH 264/274] fix (cypress): set default command timeout to 20
 seconds

---
 cypress.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress.json b/cypress.json
index ae0c45c3ae..97ac41bb61 100644
--- a/cypress.json
+++ b/cypress.json
@@ -2,6 +2,6 @@
   "baseUrl": "http://test_site_ui:8000",
   "projectId": "92odwv",
   "adminPassword": "admin",
-  "defaultCommandTimeout": 10000,
+  "defaultCommandTimeout": 20000,
   "pageLoadTimeout": 15000
 }

From 4f6f9f32933bf4aef4625bb57e4285be9af09d03 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 20 May 2020 23:30:27 +0530
Subject: [PATCH 265/274] fix: check for self linking (bp #10181) (#10426)

---
 frappe/desk/form/linked_with.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index 5f5f6e4f82..72917d0341 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -43,6 +43,9 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
 			linked[link_doctype] = []
 
 		for link in link_names:
+			if link['name'] == name:
+				continue
+
 			if linked and name in linked[link_doctype]:
 				continue
 

From e33bcfa6bd5afd68d7815844a92275dcb1754674 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 21 May 2020 00:03:46 +0530
Subject: [PATCH 266/274] style: fix linting issue

---
 cypress/integration/control_link.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index eb9ab405b5..0dc7d5b88e 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -10,7 +10,7 @@ context('Control Link', () => {
 			doctype: 'ToDo',
 			description: 'this is a test todo for link'
 		}).as('todos');
-	})
+	});
 
 	function get_dialog_with_link() {
 		return cy.dialog({

From 33a52fcff2eff1a33b77d1e3b8def883ef6276d5 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 21 May 2020 10:28:45 +0530
Subject: [PATCH 267/274] fix(background-jobs): Include traceback in error logs

---
 frappe/utils/background_jobs.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py
index 4b37e850f0..2701ca9bc6 100755
--- a/frappe/utils/background_jobs.py
+++ b/frappe/utils/background_jobs.py
@@ -116,12 +116,12 @@ def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True,
 				is_async=is_async, retry=retry+1)
 
 		else:
-			frappe.log_error(method_name)
+			frappe.log_error(title=method_name)
 			raise
 
 	except:
 		frappe.db.rollback()
-		frappe.log_error(method_name)
+		frappe.log_error(title=method_name)
 		frappe.db.commit()
 		print(frappe.get_traceback())
 		raise

From 066ecb44cc8aba6dc6228144445a4ac9df949dc7 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Thu, 21 May 2020 10:31:26 +0530
Subject: [PATCH 268/274] fix(Query Report): column reordering bug (#10270)

---
 frappe/desk/query_report.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 74e841f107..0edfd57d4f 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -62,8 +62,16 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
 		ljust_list(res, 6)
 
 	if report.custom_columns:
+		# Original query columns, needed to reorder data as per custom columns
+		query_columns = columns
+		# Reordered columns
 		columns = json.loads(report.custom_columns)
+
+		if report.report_type == 'Query Report':
+			result = reorder_data_for_custom_columns(columns, query_columns, result)
+
 		result = add_data_to_custom_columns(columns, result)
+
 	if custom_columns:
 		result = add_data_to_custom_columns(custom_columns, result)
 
@@ -208,6 +216,23 @@ def add_data_to_custom_columns(columns, result):
 
 	return data
 
+def reorder_data_for_custom_columns(custom_columns, columns, result):
+	reordered_result = []
+	columns = [col.split(":")[0] for col in columns]
+
+	for res in result:
+		r = []
+		for col in custom_columns:
+			try:
+				idx = columns.index(col.get("label"))
+				r.append(res[idx])
+			except ValueError:
+				pass
+
+		reordered_result.append(r)
+
+	return reordered_result
+
 def get_prepared_report_result(report, filters, dn="", user=None):
 	latest_report_data = {}
 	doc = None

From 1abf265451a9d276dd7fa679ffc567b824b9b2e0 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 21 May 2020 10:59:41 +0530
Subject: [PATCH 269/274] fix(recorder): Use sane defaults for sorting

---
 frappe/public/js/frappe/recorder/RecorderDetail.vue | 4 ++--
 frappe/public/js/frappe/recorder/RequestDetail.vue  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue
index 68269ad0f4..53b3c8720b 100644
--- a/frappe/public/js/frappe/recorder/RecorderDetail.vue
+++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue
@@ -114,8 +114,8 @@ export default {
 				{label: "Time", slug: "time", sortable: true},
 			],
 			query: {
-				sort: "time",
-				order: "asc",
+				sort: "duration",
+				order: "desc",
 				filters: {},
 				pagination: {
 					limit: 20,
diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue
index 58824d2f97..ac349d7937 100644
--- a/frappe/public/js/frappe/recorder/RequestDetail.vue
+++ b/frappe/public/js/frappe/recorder/RequestDetail.vue
@@ -216,8 +216,8 @@ export default {
 				{label: "Exact Copies", slug: "exact_copies", sortable: true},
 			],
 			query: {
-				sort: "index",
-				order: "asc",
+				sort: "duration",
+				order: "desc",
 				pagination: {
 					limit: 20,
 					page: 1,

From 53f64046044197ddd3af5ef03ab43224e5d045bd Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Thu, 21 May 2020 14:36:19 +0530
Subject: [PATCH 270/274] chore: pin redis version to 3.5.1

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 431f216afa..4ef3e5abf1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ python-dateutil==2.8.1
 pytz==2019.3
 PyYAML==5.3.1
 rauth==0.7.3
-redis>=3.0
+redis==3.5.1
 requests-oauthlib==1.3.0
 requests==2.23.0
 RestrictedPython==5.0

From 3e9d8d05e97e60132ba80ce35a02ef8a5e7f25ec Mon Sep 17 00:00:00 2001
From: SDLyu <dragon90321@gmail.com>
Date: Thu, 21 May 2020 18:47:00 +0800
Subject: [PATCH 271/274] Wrappe frappe._dict

`frappe.get_attr(hook)(data=data)` return dict. But function `get_open_count` will access `fieldname` attribute in notifications.py.
 I will cause error `'dict' object has no attribute 'fieldname'`.
---
 frappe/model/meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index c8fd1a2ac2..0c5ec75597 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -437,7 +437,7 @@ class Meta(Document):
 
 		if not self.custom:
 			for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []):
-				data = frappe.get_attr(hook)(data=data)
+				data = frappe._dict(frappe.get_attr(hook)(data=data))
 
 		return data
 

From a905f34c2daf773923baacdf58178fd3417519f5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 21 May 2020 11:36:45 +0000
Subject: [PATCH 272/274] fix: use get-all instead of get-list (#10444)

---
 frappe/boot.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 0eb6265942..e615cc49fa 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -106,7 +106,7 @@ def load_desktop_data(bootinfo):
 	from frappe.desk.desktop import get_desk_sidebar_items
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
 	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
-	bootinfo.dashboards = frappe.get_list("Dashboard")
+	bootinfo.dashboards = frappe.get_all("Dashboard")
 
 def get_allowed_pages(cache=False):
 	return get_user_pages_or_reports('Page', cache=cache)

From 895ffc3fec627c24e73c69f57ca2c1de406a47d4 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 21 May 2020 18:22:32 +0530
Subject: [PATCH 273/274] fix: default return value for flt

---
 frappe/utils/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 9796aa3c4a..a0cd08770a 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -348,7 +348,7 @@ def flt(s, precision=None):
 		if precision is not None:
 			num = rounded(num, precision)
 	except Exception:
-		num = 0
+		num = 0.0
 
 	return num
 

From 5bdcc4cbe08d85463960f6d6abcd9adbc6fff570 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 21 May 2020 19:38:49 +0530
Subject: [PATCH 274/274] fix: translate tour for web page

---
 frappe/website/doctype/web_page/web_page.js | 44 ++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index c714b98241..437a86b5d0 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -52,54 +52,54 @@ frappe.ui.form.on('Web Page', {
 frappe.tour['Web Page'] = [
 	{
 		fieldname: "title",
-		title: "Title of the page",
-		description: "This title will be used as the title of the webpage as well as in meta tags",
+		title: __("Title of the page"),
+		description: __("This title will be used as the title of the webpage as well as in meta tags"),
 	},
 	{
 		fieldname: "published",
-		title: "Makes the page public",
-		description: "Checking this will publish the page on your website and it'll be visible to everyone.",
+		title: __("Makes the page public"),
+		description: __("Checking this will publish the page on your website and it'll be visible to everyone."),
 	},
 	{
 		fieldname: "route",
-		title: "URL of the page",
-		description: "This will be automatically generated when you publish the page, you can also enter a route yourself if you wish",
+		title: __("URL of the page"),
+		description: __("This will be automatically generated when you publish the page, you can also enter a route yourself if you wish"),
 	},
 	{
 		fieldname: "content_type",
-		title: "Content type for building the page",
-		description: `You can select one from the following, <br>
+		title: __("Content type for building the page"),
+		description: `${__('You can select one from the following,')} <br>
 					<ul>
-						<li><b>Rich Text</b>: Standard rich text editor with controls</li>
-						<li><b>Markdown</b>: Github flavoured markdown syntax</li>
-						<li><b>HTML</b>: HTML with jinja support</li>
-						<li><b>Page Builder</b>: Frappe page builder using components</li>
+						<li><b>${__('Rich Text')}</b>: ${__('Standard rich text editor with controls')}</li>
+						<li><b>${__('Markdown')}</b>: ${__('Github flavoured markdown syntax')}</li>
+						<li><b>${__('HTML')}</b>: ${__('HTML with jinja support')}</li>
+						<li><b>${__('Page Builder')}</b>: ${__('Frappe page builder using components')}</li>
 					</ul>
 					`
 	},
 	{
 		fieldname: "insert_code",
-		title: "Client Script",
-		description: "Checking this will show a text area where you can write custom javascript that will run on this page.",
+		title: __("Client Script"),
+		description: __("Checking this will show a text area where you can write custom javascript that will run on this page."),
 	},
 	{
 		fieldname: "meta_title",
-		title: "Meta title for SEO",
-		description: "By default the title is used as meta title, adding a value here will override it.",
+		title: __("Meta title for SEO"),
+		description: __("By default the title is used as meta title, adding a value here will override it."),
 	},
 	{
 		fieldname: "meta_title",
-		title: "Meta Title",
-		description: "By default the title is used as meta title, adding a value here will override it.",
+		title: __("Meta Title"),
+		description: __("By default the title is used as meta title, adding a value here will override it."),
 	},
 	{
 		fieldname: "meta_description",
-		title: "Meta Description",
-		description: "The meta description is an HTML attribute that provides a brief summary of a web page. Search engines such as Google often display the meta description in search results, which can influence click-through rates."
+		title: __("Meta Description"),
+		description: __("The meta description is an HTML attribute that provides a brief summary of a web page. Search engines such as Google often display the meta description in search results, which can influence click-through rates.")
 	},
 	{
 		fieldname: "meta_image",
-		title: "Meta Image",
-		description: "The meta image is unique image representing the content of the page. Images for this Card should be at least 280px in width, and at least 150px in height."
+		title: __("Meta Image"),
+		description: __("The meta image is unique image representing the content of the page. Images for this Card should be at least 280px in width, and at least 150px in height.")
 	},
 ];
\ No newline at end of file