From af69d99f88a813d806acb0d5755b88a45d67d596 Mon Sep 17 00:00:00 2001
From: Sachin Mane <sachin.mane@elastic.run>
Date: Mon, 8 Apr 2019 15:49:17 +0530
Subject: [PATCH 001/175] add frappe cmd and doctype in http header for better
 analytics and load balancing

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index cd102117d7..fbfdb65532 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -196,11 +196,16 @@ frappe.request.call = function(opts) {
 		async: opts.async,
 		headers: Object.assign({
 			"X-Frappe-CSRF-Token": frappe.csrf_token,
-			"Accept": "application/json"
+			"Accept": "application/json",
+			"X-Frappe-CMD": (opts.args && opts.args.cmd  || '') || ''
 		}, opts.headers),
 		cache: false
 	};
 
+	if (opts.args && opts.args.doctype) {
+		ajax_args.headers["X-Frappe-Doctype"] = opts.args.doctype;
+	}
+
 	frappe.last_request = ajax_args.data;
 
 	return $.ajax(ajax_args)

From f4ed914db3db6618b02880c384258149c842c12c Mon Sep 17 00:00:00 2001
From: ci2014 <christoph.isik@wpci.de>
Date: Sat, 13 Apr 2019 18:53:22 +0200
Subject: [PATCH 002/175] Expose Recipients in Notifications

Hello,

is there any specific reason we do not expose recipients in Notifications? Prior to v11 (Email Alerts) we did neither.

Example:
We use cc in the recipients, and want to have it visible.

bcc, however, should always be hidden. expose_recipients should handle that by default if I am not mistaking.

I am looking forward for opinions.
---
 frappe/email/doctype/notification/notification.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py
index acddf36777..aa2bce8221 100644
--- a/frappe/email/doctype/notification/notification.py
+++ b/frappe/email/doctype/notification/notification.py
@@ -146,6 +146,7 @@ def get_context(context):
 			reference_doctype = doc.doctype,
 			reference_name = doc.name,
 			attachments = attachments,
+			expose_recipients="header",
 			print_letterhead = ((attachments
 				and attachments[0].get('print_letterhead')) or False))
 

From 0ea9a01704c6e80bb4f73f8032d838f0c18132d0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 16 Apr 2019 16:00:07 +0530
Subject: [PATCH 003/175] Update frappe/public/js/frappe/request.js

Co-Authored-By: sachinhub <sachin.mane@gmail.com>
---
 frappe/public/js/frappe/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index fbfdb65532..ee21f121bc 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -197,7 +197,7 @@ frappe.request.call = function(opts) {
 		headers: Object.assign({
 			"X-Frappe-CSRF-Token": frappe.csrf_token,
 			"Accept": "application/json",
-			"X-Frappe-CMD": (opts.args && opts.args.cmd  || '') || ''
+			"X-Frappe-CMD": opts.get('args', {}).get('cmd', '')
 		}, opts.headers),
 		cache: false
 	};

From f2391ff87a6f239905f92a2babc97d9f3fcd238d Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Sun, 7 Apr 2019 11:57:11 +0530
Subject: [PATCH 004/175] Add preview popover on hover to all link fields

---
 frappe/client.py                              |  20 +-
 frappe/core/doctype/docfield/docfield.json    | 230 ++++++++++++++++++
 frappe/database/mariadb/framework_mariadb.sql |   1 +
 .../database/postgres/framework_postgres.sql  |   1 +
 frappe/public/build.json                      |   1 +
 frappe/public/js/frappe/desk.js               |   2 +-
 frappe/public/js/frappe/ui/link_preview.js    | 123 ++++++++++
 7 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 frappe/public/js/frappe/ui/link_preview.js

diff --git a/frappe/client.py b/frappe/client.py
index fb2d47925b..10e6e49580 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -371,4 +371,22 @@ def check_parent_permission(parent, child_doctype):
 		if frappe.permissions.has_permission(parent):
 			return
 	# Either parent not passed or the user doesn't have permission on parent doctype of child table!
-	raise frappe.PermissionError
\ No newline at end of file
+	raise frappe.PermissionError
+
+@frappe.whitelist()
+def get_preview_data(doctype, docname, fields):
+	fields = json.loads(fields)
+	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
+	print('abcde')
+	if preview_data == None:
+		print('nimu')
+		preview_data = frappe.get_all(doctype, filters={
+			'name': docname
+		}, fields=fields, limit=1)
+		if preview_data: preview_data = preview_data[0]
+		frappe.cache().hset('preview_data', (doctype, docname), preview_data)
+
+	return preview_data
+
+def clear_preview_cache(doc, method):
+	frappe.cache().delete_value('preview_data', (doc.get('doctype', doc.get('name'))))
diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index b295a9be66..b49af8a1cf 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -30,6 +30,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+   "in_preview": 0,
    "in_standard_filter": 0,
    "label": "",
    "length": 0,
@@ -62,6 +63,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Label",
    "length": 0,
@@ -99,13 +104,21 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Type",
    "length": 0,
    "no_copy": 0,
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
    "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+=======
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+>>>>>>> Add preview popover on hover to all link fields
    "permlevel": 0,
    "print_hide": 0,
    "print_hide_if_no_value": 0,
@@ -134,6 +147,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Name",
    "length": 0,
@@ -168,6 +185,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Mandatory",
    "length": 0,
@@ -206,6 +227,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Precision",
    "length": 0,
@@ -240,6 +265,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Length",
    "length": 0,
@@ -273,6 +302,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Index",
    "length": 0,
@@ -309,6 +342,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In List View",
    "length": 0,
@@ -343,6 +380,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Standard Filter",
    "length": 0,
@@ -377,6 +418,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Global Search",
    "length": 0,
@@ -402,6 +447,43 @@
    "collapsible": 0,
    "columns": 0,
    "fetch_if_empty": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "fieldname": "in_preview",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "label": "In Preview",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "fieldname": "allow_in_quick_entry",
    "fieldtype": "Check",
    "hidden": 0,
@@ -410,6 +492,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow in Quick Entry",
    "length": 0,
@@ -443,6 +529,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Bold",
    "length": 0,
@@ -478,6 +568,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Translatable",
    "length": 0,
@@ -512,6 +606,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Collapsible",
    "length": 255,
@@ -546,6 +644,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Collapsible Depends On",
    "length": 0,
@@ -580,6 +682,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -612,6 +718,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Options",
    "length": 0,
@@ -646,6 +756,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Default",
    "length": 0,
@@ -680,6 +794,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Fetch From",
    "length": 0,
@@ -714,6 +832,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Fetch If Empty",
    "length": 0,
@@ -747,6 +869,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Permissions",
    "length": 0,
@@ -779,6 +905,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Display Depends On",
    "length": 255,
@@ -814,6 +944,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Hidden",
    "length": 0,
@@ -850,6 +984,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Read Only",
    "length": 0,
@@ -884,6 +1022,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Unique",
    "length": 0,
@@ -918,6 +1060,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Set Only Once",
    "length": 0,
@@ -951,6 +1097,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow Bulk Edit",
    "length": 0,
@@ -984,6 +1134,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1016,6 +1170,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Perm Level",
    "length": 0,
@@ -1053,6 +1211,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Ignore User Permissions",
    "length": 0,
@@ -1086,6 +1248,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow on Submit",
    "length": 0,
@@ -1122,6 +1288,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Report Hide",
    "length": 0,
@@ -1159,6 +1329,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Remember Last Selected Value",
    "length": 0,
@@ -1193,6 +1367,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Ignore XSS Filter",
    "length": 0,
@@ -1226,6 +1404,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Display",
    "length": 0,
@@ -1258,6 +1440,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Filter",
    "length": 0,
@@ -1294,6 +1480,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "No Copy",
    "length": 0,
@@ -1330,6 +1520,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Hide",
    "length": 0,
@@ -1367,6 +1561,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Hide If No Value",
    "length": 0,
@@ -1400,6 +1598,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Width",
    "length": 0,
@@ -1432,6 +1634,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Width",
    "length": 0,
@@ -1470,6 +1676,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Columns",
    "length": 0,
@@ -1503,6 +1713,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1534,6 +1748,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Description",
    "length": 0,
@@ -1570,6 +1788,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1603,6 +1825,10 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
+=======
+   "in_preview": 0,
+>>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1631,7 +1857,11 @@
  "issingle": 0,
  "istable": 1,
  "max_attachments": 0,
+<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
  "modified": "2019-03-18 17:59:57.873790",
+=======
+ "modified": "2019-03-20 14:30:21.672655",
+>>>>>>> Add preview popover on hover to all link fields
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index eae479df05..48c70afbbc 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -49,6 +49,7 @@ CREATE TABLE `tabDocField` (
   `description` text,
   `in_list_view` int(1) NOT NULL DEFAULT 0,
   `in_standard_filter` int(1) NOT NULL DEFAULT 0,
+  `in_preview` int(1) NOT NULL DEFAULT 0,
   `read_only` int(1) NOT NULL DEFAULT 0,
   `precision` varchar(255) DEFAULT NULL,
   `length` int(11) NOT NULL DEFAULT 0,
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index eb82f3ed97..2ff024555d 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -49,6 +49,7 @@ CREATE TABLE "tabDocField" (
   "description" text,
   "in_list_view" smallint NOT NULL DEFAULT 0,
   "in_standard_filter" smallint NOT NULL DEFAULT 0,
+  "in_preview" smallint NOT NULL DEFAULT 0,
   "read_only" smallint NOT NULL DEFAULT 0,
   "precision" varchar(255) DEFAULT NULL,
   "length" bigint NOT NULL DEFAULT 0,
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 620b360f47..bc83c69c90 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -167,6 +167,7 @@
 		"public/js/frappe/ui/keyboard.js",
 		"public/js/frappe/ui/colors.js",
 		"public/js/frappe/ui/sidebar.js",
+		"public/js/frappe/ui/link_preview.js",
 
 		"public/js/frappe/request.js",
 		"public/js/frappe/socketio_client.js",
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index b2c6493476..eee20b64e7 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -124,7 +124,7 @@ frappe.Application = Class.extend({
 				}
 			}
 		}
-
+		this.link_preview = new frappe.ui.LinkPreview();
 	},
 
 	setup_frappe_vue() {
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
new file mode 100644
index 0000000000..c570572a0d
--- /dev/null
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -0,0 +1,123 @@
+frappe.provide('frappe.pages');
+
+frappe.ui.LinkPreview = class {
+
+    constructor() {
+        this.$links = [];
+        this.popover_timeout = null
+        this.get_links();
+    }
+
+    get_links() {
+        $(document.body).on('mouseover', 'a[href*="/"]', (e) => {
+            this.link_hovered = true;
+            let link = $(e.currentTarget).attr('href');
+            let link_arr = link.split('/');
+            const link_element = $(e.currentTarget);
+            let popover = link_element.data("bs.popover");
+            this.setup_popover_control(popover, link_arr, link_element);
+        });
+    }
+
+    setup_popover_control(popover, link_arr, $link) {
+        if(!popover) {
+            if(link_arr.length > 2) {
+                let name = decodeURI(link_arr[link_arr.length - 1]);
+                let doctype = decodeURI(link_arr[link_arr.length -2]);
+                let preview_fields = this.get_preview_fields(doctype);
+                if(preview_fields.length) {
+                    this.data_timeout = setTimeout(() => {
+                        this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
+                            if(preview_data) {
+                                if (this.popover_timeout) {
+                                    clearTimeout(this.popover_timeout)
+                                }
+                                this.popover_timeout = setTimeout(() => {
+                                    this.init_preview_popover($link, preview_data, doctype);
+                                }, 1000);
+                            }
+                        });
+                    }, 1000);
+                    
+                }
+            }
+        } else {
+            this.popover_timeout = setTimeout(() => {
+                popover.show();
+            }, 1000);
+        }
+
+        $(document.body).on('mouseout', 'a[href*="/"]', () => {
+            this.link_hovered = false;
+            if(this.data_timeout) {
+                clearTimeout(this.data_timeout)
+            }
+            if (this.popover_timeout) {
+                clearTimeout(this.popover_timeout)
+            }
+        })
+        $(document.body).on('mousemove', () => {
+            if (!this.link_hovered) {
+                this.$links.forEach($link => $link.popover('hide'));
+            }
+        })
+    }
+
+    get_preview_fields(dt) {
+        let fields = []
+        frappe.model.with_doctype(dt, () => { 
+            frappe.get_meta(dt).fields.filter((field) => {
+                if(field.in_preview) fields.push(field.fieldname);
+            })
+        });
+        return fields;
+    }
+
+    get_preview_fields_value(dt, field_name, field_list) {
+        return frappe.xcall('frappe.client.get_preview_data', {
+            'doctype': dt,
+            'docname': field_name,
+            'fields': field_list
+        });
+    }
+
+    init_preview_popover($link, preview_data, dt) {
+        console.log('create popover')
+        let content_html = '';
+        console.log('preview_data', preview_data);
+
+        Object.keys(preview_data).forEach(key => {
+            content_html += `
+                <p class="link-preview-field text-regular">
+                    <b> ${frappe.meta.get_label(dt, key)} </b>:  ${preview_data[key]} 
+                </p>
+            `;
+        })
+
+        $link.popover({
+            container: 'body',
+            html: true,
+            content: content_html,
+            trigger: 'manual',
+            animation: false
+            // delay: {'show':show_delay,'hide':hide_delay}
+        });
+        this.$links.push($link);
+        $link.popover('show');
+
+        // $link.data('bs.popover').options.content = content_html;
+        // $link.popover('show');
+        // setTimeout(() => {
+        //     $link.popover('show')
+        // }, 1000);
+
+    
+        // $link.mouseleave(() => {
+        //     $link.popover('hide')
+        // });
+
+    }
+
+
+
+}
\ No newline at end of file

From c062b388a753d0db0fac132619212c61b103c8bc Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 9 Apr 2019 23:02:02 +0530
Subject: [PATCH 005/175] Improve preview popover

---
 frappe/client.py                           |   8 +-
 frappe/core/doctype/docfield/docfield.json | 154 +--------------------
 frappe/public/js/frappe/ui/link_preview.js | 121 ++++++++++++----
 3 files changed, 98 insertions(+), 185 deletions(-)

diff --git a/frappe/client.py b/frappe/client.py
index 10e6e49580..3e0cb7ad12 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -376,14 +376,16 @@ def check_parent_permission(parent, child_doctype):
 @frappe.whitelist()
 def get_preview_data(doctype, docname, fields):
 	fields = json.loads(fields)
+	if frappe.get_meta(doctype).has_field('image') : 
+		fields.append('image')
 	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
-	print('abcde')
 	if preview_data == None:
-		print('nimu')
 		preview_data = frappe.get_all(doctype, filters={
 			'name': docname
 		}, fields=fields, limit=1)
-		if preview_data: preview_data = preview_data[0]
+		if preview_data: 
+			preview_data = preview_data[0]
+			preview_data = {k: v for k, v in preview_data.items() if v is not None}
 		frappe.cache().hset('preview_data', (doctype, docname), preview_data)
 
 	return preview_data
diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index b49af8a1cf..c78495898e 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -63,10 +63,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Label",
    "length": 0,
@@ -104,21 +101,14 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Type",
    "length": 0,
    "no_copy": 0,
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
-=======
    "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
->>>>>>> Add preview popover on hover to all link fields
    "permlevel": 0,
    "print_hide": 0,
    "print_hide_if_no_value": 0,
@@ -147,10 +137,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Name",
    "length": 0,
@@ -185,10 +172,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Mandatory",
    "length": 0,
@@ -227,10 +211,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Precision",
    "length": 0,
@@ -265,10 +246,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Length",
    "length": 0,
@@ -302,10 +280,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Index",
    "length": 0,
@@ -342,10 +317,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In List View",
    "length": 0,
@@ -380,10 +352,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Standard Filter",
    "length": 0,
@@ -418,10 +387,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Global Search",
    "length": 0,
@@ -447,8 +413,6 @@
    "collapsible": 0,
    "columns": 0,
    "fetch_if_empty": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "fieldname": "in_preview",
    "fieldtype": "Check",
    "hidden": 0,
@@ -483,7 +447,6 @@
    "collapsible": 0,
    "columns": 0,
    "fetch_if_empty": 0,
->>>>>>> Add preview popover on hover to all link fields
    "fieldname": "allow_in_quick_entry",
    "fieldtype": "Check",
    "hidden": 0,
@@ -492,10 +455,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow in Quick Entry",
    "length": 0,
@@ -529,10 +489,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Bold",
    "length": 0,
@@ -568,10 +525,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Translatable",
    "length": 0,
@@ -606,10 +560,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Collapsible",
    "length": 255,
@@ -644,10 +595,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Collapsible Depends On",
    "length": 0,
@@ -682,10 +630,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -718,10 +663,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Options",
    "length": 0,
@@ -756,10 +698,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Default",
    "length": 0,
@@ -794,10 +733,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Fetch From",
    "length": 0,
@@ -832,10 +768,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Fetch If Empty",
    "length": 0,
@@ -869,10 +802,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Permissions",
    "length": 0,
@@ -905,10 +835,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Display Depends On",
    "length": 255,
@@ -944,10 +871,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Hidden",
    "length": 0,
@@ -984,10 +908,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Read Only",
    "length": 0,
@@ -1022,10 +943,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Unique",
    "length": 0,
@@ -1060,10 +978,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Set Only Once",
    "length": 0,
@@ -1097,10 +1012,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow Bulk Edit",
    "length": 0,
@@ -1134,10 +1046,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1170,10 +1079,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Perm Level",
    "length": 0,
@@ -1211,10 +1117,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Ignore User Permissions",
    "length": 0,
@@ -1248,10 +1151,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Allow on Submit",
    "length": 0,
@@ -1288,10 +1188,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Report Hide",
    "length": 0,
@@ -1329,10 +1226,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Remember Last Selected Value",
    "length": 0,
@@ -1367,10 +1261,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Ignore XSS Filter",
    "length": 0,
@@ -1404,10 +1295,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Display",
    "length": 0,
@@ -1440,10 +1328,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "In Filter",
    "length": 0,
@@ -1480,10 +1365,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "No Copy",
    "length": 0,
@@ -1520,10 +1402,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Hide",
    "length": 0,
@@ -1561,10 +1440,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Hide If No Value",
    "length": 0,
@@ -1598,10 +1474,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Print Width",
    "length": 0,
@@ -1634,10 +1507,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Width",
    "length": 0,
@@ -1676,10 +1546,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Columns",
    "length": 0,
@@ -1713,10 +1580,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1748,10 +1612,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 1,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "label": "Description",
    "length": 0,
@@ -1788,10 +1649,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1825,10 +1683,7 @@
    "in_filter": 0,
    "in_global_search": 0,
    "in_list_view": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
-=======
    "in_preview": 0,
->>>>>>> Add preview popover on hover to all link fields
    "in_standard_filter": 0,
    "length": 0,
    "no_copy": 0,
@@ -1848,20 +1703,14 @@
   }
  ],
  "has_web_view": 0,
- "hide_heading": 0,
  "hide_toolbar": 0,
  "idx": 1,
- "image_view": 0,
  "in_create": 0,
  "is_submittable": 0,
  "issingle": 0,
  "istable": 1,
  "max_attachments": 0,
-<<<<<<< bb1d5f7107c860375dcdf38e5aadebea7122c31e
- "modified": "2019-03-18 17:59:57.873790",
-=======
- "modified": "2019-03-20 14:30:21.672655",
->>>>>>> Add preview popover on hover to all link fields
+ "modified": "2019-04-08 12:19:53.415372",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",
@@ -1869,7 +1718,6 @@
  "permissions": [],
  "quick_entry": 0,
  "read_only": 0,
- "read_only_onload": 0,
  "show_name_in_global_search": 0,
  "sort_order": "ASC",
  "track_changes": 0,
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index c570572a0d..6f15d54ad3 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -9,37 +9,81 @@ frappe.ui.LinkPreview = class {
     }
 
     get_links() {
-        $(document.body).on('mouseover', 'a[href*="/"]', (e) => {
+        $(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
             this.link_hovered = true;
-            let link = $(e.currentTarget).attr('href');
-            let link_arr = link.split('/');
-            const link_element = $(e.currentTarget);
-            let popover = link_element.data("bs.popover");
-            this.setup_popover_control(popover, link_arr, link_element);
+            let element = $(e.currentTarget);
+            let name;
+            let doctype;
+            let is_link = true;
+            let link_control;
+            if(element.attr('href')) {
+                let link = element.attr('href');
+                let link_arr = link.split('/');
+                if(link_arr.length > 2) {
+                    name = decodeURI(link_arr[link_arr.length - 1]);
+                    doctype = decodeURI(link_arr[link_arr.length -2]);
+                }           
+            }
+            else {
+                is_link = false;
+                // let linked_field = element.parents('.link-field').find('.link-btn')
+                // if(linked_field.length) {
+                // console.log('yes linked field', linked_field)
+                link_control = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
+                console.log(link_control);
+                if(link_control) {
+                    let link_arr = link_control.split('/');
+                    console.log('arr', link_arr);
+                    if(link_arr.length > 2) {
+                        name = decodeURI(link_arr[link_arr.length - 1]);
+                        doctype = decodeURI(link_arr[link_arr.length -2]);
+                    }
+                }
+                // }
+                else {
+                    name = element.parent().next().text();
+                    doctype = element.attr('data-doctype');
+                }
+            }
+            let popover = element.data("bs.popover");
+            if(name && doctype) {
+                this.setup_popover_control(e, popover, name, doctype, element, is_link, link_control);
+            }
         });
     }
 
-    setup_popover_control(popover, link_arr, $link) {
-        if(!popover) {
-            if(link_arr.length > 2) {
-                let name = decodeURI(link_arr[link_arr.length - 1]);
-                let doctype = decodeURI(link_arr[link_arr.length -2]);
+
+    setup_popover_control(e, popover, name, doctype, $link, is_link, link_control) {
+        if(!popover || !is_link) {
                 let preview_fields = this.get_preview_fields(doctype);
                 if(preview_fields.length) {
                     this.data_timeout = setTimeout(() => {
                         this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
                             if(preview_data) {
+                                console.log('preview', preview_data);
                                 if (this.popover_timeout) {
                                     clearTimeout(this.popover_timeout)
                                 }
                                 this.popover_timeout = setTimeout(() => {
-                                    this.init_preview_popover($link, preview_data, doctype);
+                                    if(popover) {
+                                        let new_content = this.get_content_html(preview_data, doctype, link_control)
+                                        popover.options.content = new_content;
+                                    }
+                                    else {
+                                        this.init_preview_popover($link, preview_data, doctype, is_link, link_control);
+                                    }
+                                    if(!is_link) {
+                                        var left = e.pageX;
+                                        $link.popover('show');
+                                        $('.control-field-popover').css('left', (left+30) + 'px');
+                                    }                              
+                                    else {
+                                        $link.popover('show');
+                                    }
                                 }, 1000);
                             }
                         });
                     }, 1000);
-                    
-                }
             }
         } else {
             this.popover_timeout = setTimeout(() => {
@@ -47,7 +91,7 @@ frappe.ui.LinkPreview = class {
             }, 1000);
         }
 
-        $(document.body).on('mouseout', 'a[href*="/"]', () => {
+        $(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
             this.link_hovered = false;
             if(this.data_timeout) {
                 clearTimeout(this.data_timeout)
@@ -81,30 +125,24 @@ frappe.ui.LinkPreview = class {
         });
     }
 
-    init_preview_popover($link, preview_data, dt) {
-        console.log('create popover')
-        let content_html = '';
+    init_preview_popover($link, preview_data, dt, is_link, link_control) {
         console.log('preview_data', preview_data);
-
-        Object.keys(preview_data).forEach(key => {
-            content_html += `
-                <p class="link-preview-field text-regular">
-                    <b> ${frappe.meta.get_label(dt, key)} </b>:  ${preview_data[key]} 
-                </p>
-            `;
-        })
-
+        let content_html = this.get_content_html(preview_data, dt, link_control);
+        console.log('content', content_html)
         $link.popover({
             container: 'body',
             html: true,
             content: content_html,
             trigger: 'manual',
+            // placement: !is_link?'auto bottom':'auto right',
             animation: false
             // delay: {'show':show_delay,'hide':hide_delay}
         });
+        if(!is_link) {
+            $link.data('bs.popover').tip().addClass('control-field-popover');
+        }
         this.$links.push($link);
-        $link.popover('show');
-
+        // return content_html;
         // $link.data('bs.popover').options.content = content_html;
         // $link.popover('show');
         // setTimeout(() => {
@@ -118,6 +156,31 @@ frappe.ui.LinkPreview = class {
 
     }
 
+    get_content_html(preview_data, dt, link_control) {
+        let content_html = '';
+        if(preview_data['image']) {
+            let image_url = encodeURI(preview_data['image']);
+            content_html += `
+            <div class="link-preview-field">
+                <img src=${image_url} style="max-width:200px; max-height:150px"></img> 
+            </div>
+        `;
+        }
+        Object.keys(preview_data).forEach(key => {
+            if(key!='image'){
+                content_html += `
+                    <p class="link-preview-field" style="font-size:0.9em">
+                        <b> ${frappe.meta.get_label(dt, key)} </b>:  ${preview_data[key]} 
+                    </p>
+                `;
+            }
+        })
+        if(link_control) {
+            content_html+= `<a href=${link_control}><span>${'View'}</span></a>`
+        }
+        return content_html;
+    }
+
 
 
 }
\ No newline at end of file

From 12a3dc1124937b92d47c0d1c7734887fb56bb7f3 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 15 Apr 2019 15:35:21 +0530
Subject: [PATCH 006/175] feat(desk): Show preview popover on hover of link and
 control fields

---
 frappe/client.py                           |  19 --
 frappe/desk/link_preview.py                |  35 +++
 frappe/public/build.json                   |   1 +
 frappe/public/js/frappe/ui/link_preview.js | 254 +++++++++++++--------
 frappe/public/less/link_preview.less       |  53 +++++
 5 files changed, 245 insertions(+), 117 deletions(-)
 create mode 100644 frappe/desk/link_preview.py
 create mode 100644 frappe/public/less/link_preview.less

diff --git a/frappe/client.py b/frappe/client.py
index 3e0cb7ad12..3f7491ade5 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -373,22 +373,3 @@ def check_parent_permission(parent, child_doctype):
 	# Either parent not passed or the user doesn't have permission on parent doctype of child table!
 	raise frappe.PermissionError
 
-@frappe.whitelist()
-def get_preview_data(doctype, docname, fields):
-	fields = json.loads(fields)
-	if frappe.get_meta(doctype).has_field('image') : 
-		fields.append('image')
-	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
-	if preview_data == None:
-		preview_data = frappe.get_all(doctype, filters={
-			'name': docname
-		}, fields=fields, limit=1)
-		if preview_data: 
-			preview_data = preview_data[0]
-			preview_data = {k: v for k, v in preview_data.items() if v is not None}
-		frappe.cache().hset('preview_data', (doctype, docname), preview_data)
-
-	return preview_data
-
-def clear_preview_cache(doc, method):
-	frappe.cache().delete_value('preview_data', (doc.get('doctype', doc.get('name'))))
diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py
new file mode 100644
index 0000000000..71315a8546
--- /dev/null
+++ b/frappe/desk/link_preview.py
@@ -0,0 +1,35 @@
+import frappe
+from frappe.model import no_value_fields
+import json
+
+@frappe.whitelist()
+def get_preview_data(doctype, docname, fields):
+	fields = json.loads(fields)
+	preview_fields = [field['name'] for field in fields if field['type'] not in no_value_fields]
+	if 'title' not in fields and frappe.get_meta(doctype).has_field('title'):
+		preview_fields.append('title')
+	if 'name' not in fields:
+		preview_fields.append('name')
+	if frappe.get_meta(doctype).has_field('image'):
+		preview_fields.append('image')
+
+	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
+	if preview_data == None:
+		preview_data = frappe.get_all(doctype, filters={
+			'name': docname
+		}, fields=preview_fields, limit=1)
+		if preview_data:
+			preview_data = preview_data[0]
+
+			preview_data = {k: v for k, v in preview_data.items() if v is not None}
+			for k,v in preview_data.items():
+				if frappe.get_meta(doctype).has_field(k):
+					preview_data[k] = frappe.format(v,frappe.get_meta(doctype).get_field(k).fieldtype)
+
+		frappe.cache().hset('preview_data', (doctype, docname), preview_data)
+	if not preview_data:
+		return None
+	return preview_data
+
+def clear_preview_cache(doc, method):
+	frappe.cache().delete_value('preview_data', (doc.get('doctype', doc.get('name'))))
diff --git a/frappe/public/build.json b/frappe/public/build.json
index bc83c69c90..f968c54a8d 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -123,6 +123,7 @@
 		"public/less/page.less",
 		"public/less/tree.less",
 		"public/less/desktop.less",
+		"public/less/link_preview.less",
 		"public/less/form.less",
 		"public/less/mobile.less",
 		"public/less/kanban.less",
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 6f15d54ad3..3808a83633 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -1,85 +1,96 @@
-frappe.provide('frappe.pages');
-
 frappe.ui.LinkPreview = class {
 
     constructor() {
         this.$links = [];
-        this.popover_timeout = null
+        this.popover_timeout = null;
         this.get_links();
     }
 
     get_links() {
+
         $(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
             this.link_hovered = true;
             let element = $(e.currentTarget);
-            let name;
-            let doctype;
+            let name, doctype, link;
             let is_link = true;
-            let link_control;
-            if(element.attr('href')) {
-                let link = element.attr('href');
-                let link_arr = link.split('/');
-                if(link_arr.length > 2) {
-                    name = decodeURI(link_arr[link_arr.length - 1]);
-                    doctype = decodeURI(link_arr[link_arr.length -2]);
-                }           
-            }
-            else {
-                is_link = false;
-                // let linked_field = element.parents('.link-field').find('.link-btn')
-                // if(linked_field.length) {
-                // console.log('yes linked field', linked_field)
-                link_control = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
-                console.log(link_control);
-                if(link_control) {
-                    let link_arr = link_control.split('/');
-                    console.log('arr', link_arr);
-                    if(link_arr.length > 2) {
-                        name = decodeURI(link_arr[link_arr.length - 1]);
-                        doctype = decodeURI(link_arr[link_arr.length -2]);
+
+            if(!element.parents().find('.popover').length) {
+                if(element.attr('href')) {
+                    link = element.attr('href');
+                    let details = this.get_details(link,element);
+                    name = details.name;
+                    doctype = details.doctype;
+                } else {
+                    is_link = false;
+                    link = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
+
+                    if(link) {
+                        let details = this.get_details(link,element);
+                        name = details.name;
+                        doctype = details.doctype;
+                    } else {
+                        name = element.parent().next().text();
+                        doctype = element.attr('data-doctype');
                     }
                 }
-                // }
-                else {
-                    name = element.parent().next().text();
-                    doctype = element.attr('data-doctype');
+
+                let popover = element.data("bs.popover");
+                if(name && doctype) {
+                    this.setup_popover_control(e, popover, name, doctype, element, is_link, link);
                 }
             }
-            let popover = element.data("bs.popover");
-            if(name && doctype) {
-                this.setup_popover_control(e, popover, name, doctype, element, is_link, link_control);
-            }
         });
+
+    }
+
+    get_details(link, element) {
+        let details = {};
+        let link_arr = link.split('/');
+
+        if(link_arr.length > 2) {
+            details.name = decodeURI(link_arr[link_arr.length - 1]);
+            details.doctype = decodeURI(link_arr[link_arr.length -2]);
+            details.name = details.name.replace(new RegExp('%2F', 'g'), '/');
+        }
+        let title = element.attr('title');
+        if( title && title.includes('/')) {
+            details.name = title.trim();
+            details.doctype = decodeURI(link_arr[link_arr.length-3]);
+        }
+        return details;
     }
 
 
-    setup_popover_control(e, popover, name, doctype, $link, is_link, link_control) {
+    setup_popover_control(e, popover, name, doctype, $el, is_link, link) {
+
         if(!popover || !is_link) {
                 let preview_fields = this.get_preview_fields(doctype);
                 if(preview_fields.length) {
                     this.data_timeout = setTimeout(() => {
                         this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
                             if(preview_data) {
-                                console.log('preview', preview_data);
-                                if (this.popover_timeout) {
-                                    clearTimeout(this.popover_timeout)
+                                if(this.popover_timeout) {
+                                    clearTimeout(this.popover_timeout);
                                 }
+
                                 this.popover_timeout = setTimeout(() => {
+
                                     if(popover) {
-                                        let new_content = this.get_content_html(preview_data, doctype, link_control)
+                                        let new_content = this.get_popover_html(preview_data, doctype, link);
                                         popover.options.content = new_content;
+                                    } else {
+                                        this.init_preview_popover($el, preview_data, doctype, is_link, link);
                                     }
-                                    else {
-                                        this.init_preview_popover($link, preview_data, doctype, is_link, link_control);
-                                    }
+
                                     if(!is_link) {
                                         var left = e.pageX;
-                                        $link.popover('show');
-                                        $('.control-field-popover').css('left', (left+30) + 'px');
-                                    }                              
-                                    else {
-                                        $link.popover('show');
+                                        $el.popover('show');
+                                        var width =$('.popover').width();
+                                        $('.control-field-popover').css('left', (left-(width/2)) + 'px');
+                                    } else {
+                                        $el.popover('show');
                                     }
+
                                 }, 1000);
                             }
                         });
@@ -91,96 +102,143 @@ frappe.ui.LinkPreview = class {
             }, 1000);
         }
 
+        this.handle_popover_hide();
+    }
+
+    handle_popover_hide() {
         $(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
             this.link_hovered = false;
             if(this.data_timeout) {
-                clearTimeout(this.data_timeout)
+                clearTimeout(this.data_timeout);
             }
             if (this.popover_timeout) {
-                clearTimeout(this.popover_timeout)
+                clearTimeout(this.popover_timeout);
             }
-        })
+        });
+
         $(document.body).on('mousemove', () => {
             if (!this.link_hovered) {
-                this.$links.forEach($link => $link.popover('hide'));
+                this.$links.forEach($el => $el.popover('hide'));
             }
-        })
+        });
     }
 
     get_preview_fields(dt) {
-        let fields = []
-        frappe.model.with_doctype(dt, () => { 
+        let fields = [];
+        frappe.model.with_doctype(dt, () => {
             frappe.get_meta(dt).fields.filter((field) => {
-                if(field.in_preview) fields.push(field.fieldname);
-            })
+                if(field.in_preview) {
+					fields.push({'name':field.fieldname,'type':field.fieldtype});
+                }
+            });
         });
+
+        if(!fields.length) {
+            frappe.model.with_doctype(dt, () => {
+                frappe.get_meta(dt).fields.filter((field) => {
+                    if(field.reqd) {
+                        fields.push({'name':field.fieldname,'type':field.fieldtype});
+                    }
+                });
+            });
+        }
         return fields;
     }
 
     get_preview_fields_value(dt, field_name, field_list) {
-        return frappe.xcall('frappe.client.get_preview_data', {
+        return frappe.xcall('frappe.desk.link_preview.get_preview_data', {
             'doctype': dt,
             'docname': field_name,
-            'fields': field_list
+            'fields': field_list,
         });
     }
 
-    init_preview_popover($link, preview_data, dt, is_link, link_control) {
-        console.log('preview_data', preview_data);
-        let content_html = this.get_content_html(preview_data, dt, link_control);
-        console.log('content', content_html)
-        $link.popover({
+    init_preview_popover($el, preview_data, dt, is_link, link) {
+
+        let popover_content = this.get_popover_html(preview_data, dt, link);
+        $el.popover({
             container: 'body',
             html: true,
-            content: content_html,
+            content: popover_content,
             trigger: 'manual',
-            // placement: !is_link?'auto bottom':'auto right',
-            animation: false
-            // delay: {'show':show_delay,'hide':hide_delay}
+            placement: 'top auto',
+            animation: false,
         });
-        if(!is_link) {
-            $link.data('bs.popover').tip().addClass('control-field-popover');
-        }
-        this.$links.push($link);
-        // return content_html;
-        // $link.data('bs.popover').options.content = content_html;
-        // $link.popover('show');
-        // setTimeout(() => {
-        //     $link.popover('show')
-        // }, 1000);
 
-    
-        // $link.mouseleave(() => {
-        //     $link.popover('hide')
-        // });
+        if(!is_link) {
+            $el.data('bs.popover').tip().addClass('control-field-popover');
+        }
+
+        this.$links.push($el);
 
     }
 
-    get_content_html(preview_data, dt, link_control) {
-        let content_html = '';
+    get_popover_html(preview_data, dt, link) {
+        if(!link) {
+            link = window.location.href;
+        }
+
+        if(link && link.includes(' ')) {
+            link = link.replace(new RegExp(' ', 'g'), '%20');
+        }
+
+        let image_html = '';
+        let title_html = '';
+        let content_html = `<table class="preview-table">`;
+
         if(preview_data['image']) {
             let image_url = encodeURI(preview_data['image']);
-            content_html += `
-            <div class="link-preview-field">
-                <img src=${image_url} style="max-width:200px; max-height:150px"></img> 
-            </div>
-        `;
+            image_html += `
+            <div class="preview-header">
+                <img src=${image_url} class="preview-image"></img> 
+            </div>`;
         }
+        if(preview_data['title']) {
+            title_html+= `<a class="preview-title small" href=${link}>${preview_data['title']}</a>`;
+        }
+
         Object.keys(preview_data).forEach(key => {
-            if(key!='image'){
+            if(key!='image' && key!='name') {
+                let value = this.truncate_value(preview_data[key]);            
+                let label = this.truncate_value(frappe.meta.get_label(dt, key));
                 content_html += `
-                    <p class="link-preview-field" style="font-size:0.9em">
-                        <b> ${frappe.meta.get_label(dt, key)} </b>:  ${preview_data[key]} 
-                    </p>
+                <tr class="preview-field">
+                    <td class='text-muted small field-name'>${label}</td> 
+                    <td class="field-value small"> ${value} </td>
+                </tr>
                 `;
             }
         })
-        if(link_control) {
-            content_html+= `<a href=${link_control}><span>${'View'}</span></a>`
+        content_html+=`</table>`;
+
+        let popover_content = `<div class="preview-popover-header">
+                                    ${image_html}
+                                    <div class="preview-header">
+                                        <div class="preview-main">
+                                            <a class="preview-name text-bold" href=${link}>${preview_data['name']}</a>
+                                            ${title_html}
+                                            <span class="text-muted small">${dt}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <hr>
+                                <div class="popover-body">
+                                    ${content_html}
+                                </div>`;
+
+        if(!link) {
+            $('.preview-name').removeAttr('href');
+            $('.preview-title').removeAttr('href');
         }
-        return content_html;
+
+        return popover_content;
     }
 
+    truncate_value(value) {
+        if (value.length > 100) {
+            value = value.slice(0,100) + '...';
+        }
+        return value;
+    }
 
-
-}
\ No newline at end of file
+}
diff --git a/frappe/public/less/link_preview.less b/frappe/public/less/link_preview.less
new file mode 100644
index 0000000000..2a3ccce5b3
--- /dev/null
+++ b/frappe/public/less/link_preview.less
@@ -0,0 +1,53 @@
+.popover {
+    border-radius: 0;
+    max-width: 100%;
+    .popover-content {
+        padding: 0;
+        .preview-popover-header {
+            background: #f7fafc;
+            padding: 10px;
+
+            .preview-header {
+                display: inline-block;
+                vertical-align: top;
+            }
+
+            .preview-image {
+                width: 70px;
+                height: 70px;
+                object-fit: cover;
+                margin-right: 10px;
+                border-radius: 6px;
+            }
+
+            .preview-name {
+                display: block;
+            }
+
+            .preview-title {
+                display: block;
+            }
+        }
+
+        hr {
+            margin: 0;
+        }
+
+        .preview-table {
+            margin: 10px;
+            max-width: 330px;
+            min-width: 200px;
+        }
+
+        .preview-field {
+            td {
+                padding: 3px;
+                vertical-align: top;
+            }
+
+            .field-name {
+                width: 39%;
+            }
+        }
+    }
+}

From 4f02d731d83cba6f2244698dc1967674ba3672ce Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 15 Apr 2019 17:02:57 +0530
Subject: [PATCH 007/175] fix indent

---
 frappe/public/js/frappe/ui/link_preview.js | 410 ++++++++++-----------
 1 file changed, 205 insertions(+), 205 deletions(-)

diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 3808a83633..c75dc27b58 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -1,244 +1,244 @@
 frappe.ui.LinkPreview = class {
 
-    constructor() {
-        this.$links = [];
-        this.popover_timeout = null;
-        this.get_links();
-    }
+	constructor() {
+		this.$links = [];
+		this.popover_timeout = null;
+		this.get_links();
+	}
 
-    get_links() {
+	get_links() {
 
-        $(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
-            this.link_hovered = true;
-            let element = $(e.currentTarget);
-            let name, doctype, link;
-            let is_link = true;
+		$(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
+			this.link_hovered = true;
+			let element = $(e.currentTarget);
+			let name, doctype, link;
+			let is_link = true;
 
-            if(!element.parents().find('.popover').length) {
-                if(element.attr('href')) {
-                    link = element.attr('href');
-                    let details = this.get_details(link,element);
-                    name = details.name;
-                    doctype = details.doctype;
-                } else {
-                    is_link = false;
-                    link = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
+			if(!element.parents().find('.popover').length) {
+				if(element.attr('href')) {
+					link = element.attr('href');
+					let details = this.get_details(link,element);
+					name = details.name;
+					doctype = details.doctype;
+				} else {
+					is_link = false;
+					link = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
 
-                    if(link) {
-                        let details = this.get_details(link,element);
-                        name = details.name;
-                        doctype = details.doctype;
-                    } else {
-                        name = element.parent().next().text();
-                        doctype = element.attr('data-doctype');
-                    }
-                }
+					if(link) {
+						let details = this.get_details(link,element);
+						name = details.name;
+						doctype = details.doctype;
+					} else {
+						name = element.parent().next().text();
+						doctype = element.attr('data-doctype');
+					}
+				}
 
-                let popover = element.data("bs.popover");
-                if(name && doctype) {
-                    this.setup_popover_control(e, popover, name, doctype, element, is_link, link);
-                }
-            }
-        });
+				let popover = element.data("bs.popover");
+				if(name && doctype) {
+					this.setup_popover_control(e, popover, name, doctype, element, is_link, link);
+				}
+			}
+		});
 
-    }
+	}
 
-    get_details(link, element) {
-        let details = {};
-        let link_arr = link.split('/');
+	get_details(link, element) {
+		let details = {};
+		let link_arr = link.split('/');
 
-        if(link_arr.length > 2) {
-            details.name = decodeURI(link_arr[link_arr.length - 1]);
-            details.doctype = decodeURI(link_arr[link_arr.length -2]);
-            details.name = details.name.replace(new RegExp('%2F', 'g'), '/');
-        }
-        let title = element.attr('title');
-        if( title && title.includes('/')) {
-            details.name = title.trim();
-            details.doctype = decodeURI(link_arr[link_arr.length-3]);
-        }
-        return details;
-    }
+		if(link_arr.length > 2) {
+			details.name = decodeURI(link_arr[link_arr.length - 1]);
+			details.doctype = decodeURI(link_arr[link_arr.length -2]);
+			details.name = details.name.replace(new RegExp('%2F', 'g'), '/');
+		}
+		let title = element.attr('title');
+		if( title && title.includes('/')) {
+			details.name = title.trim();
+			details.doctype = decodeURI(link_arr[link_arr.length-3]);
+		}
+		return details;
+	}
 
 
-    setup_popover_control(e, popover, name, doctype, $el, is_link, link) {
+	setup_popover_control(e, popover, name, doctype, $el, is_link, link) {
 
-        if(!popover || !is_link) {
-                let preview_fields = this.get_preview_fields(doctype);
-                if(preview_fields.length) {
-                    this.data_timeout = setTimeout(() => {
-                        this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
-                            if(preview_data) {
-                                if(this.popover_timeout) {
-                                    clearTimeout(this.popover_timeout);
-                                }
+		if(!popover || !is_link) {
+			let preview_fields = this.get_preview_fields(doctype);
+			if(preview_fields.length) {
+				this.data_timeout = setTimeout(() => {
+					this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
+						if(preview_data) {
+							if(this.popover_timeout) {
+								clearTimeout(this.popover_timeout);
+							}
 
-                                this.popover_timeout = setTimeout(() => {
+							this.popover_timeout = setTimeout(() => {
 
-                                    if(popover) {
-                                        let new_content = this.get_popover_html(preview_data, doctype, link);
-                                        popover.options.content = new_content;
-                                    } else {
-                                        this.init_preview_popover($el, preview_data, doctype, is_link, link);
-                                    }
+								if(popover) {
+									let new_content = this.get_popover_html(preview_data, doctype, link);
+									popover.options.content = new_content;
+								} else {
+									this.init_preview_popover($el, preview_data, doctype, is_link, link);
+								}
 
-                                    if(!is_link) {
-                                        var left = e.pageX;
-                                        $el.popover('show');
-                                        var width =$('.popover').width();
-                                        $('.control-field-popover').css('left', (left-(width/2)) + 'px');
-                                    } else {
-                                        $el.popover('show');
-                                    }
+								if(!is_link) {
+									var left = e.pageX;
+									$el.popover('show');
+									var width =$('.popover').width();
+									$('.control-field-popover').css('left', (left-(width/2)) + 'px');
+								} else {
+									$el.popover('show');
+								}
 
-                                }, 1000);
-                            }
-                        });
-                    }, 1000);
-            }
-        } else {
-            this.popover_timeout = setTimeout(() => {
-                popover.show();
-            }, 1000);
-        }
+							}, 1000);
+						}
+					});
+				}, 1000);
+			}
+		} else {
+			this.popover_timeout = setTimeout(() => {
+				popover.show();
+			}, 1000);
+		}
 
-        this.handle_popover_hide();
-    }
+		this.handle_popover_hide();
+	}
 
-    handle_popover_hide() {
-        $(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
-            this.link_hovered = false;
-            if(this.data_timeout) {
-                clearTimeout(this.data_timeout);
-            }
-            if (this.popover_timeout) {
-                clearTimeout(this.popover_timeout);
-            }
-        });
+	handle_popover_hide() {
+		$(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
+			this.link_hovered = false;
+			if(this.data_timeout) {
+				clearTimeout(this.data_timeout);
+			}
+			if (this.popover_timeout) {
+				clearTimeout(this.popover_timeout);
+			}
+		});
 
-        $(document.body).on('mousemove', () => {
-            if (!this.link_hovered) {
-                this.$links.forEach($el => $el.popover('hide'));
-            }
-        });
-    }
+		$(document.body).on('mousemove', () => {
+			if (!this.link_hovered) {
+				this.$links.forEach($el => $el.popover('hide'));
+			}
+		});
+	}
 
-    get_preview_fields(dt) {
-        let fields = [];
-        frappe.model.with_doctype(dt, () => {
-            frappe.get_meta(dt).fields.filter((field) => {
-                if(field.in_preview) {
+	get_preview_fields(dt) {
+		let fields = [];
+		frappe.model.with_doctype(dt, () => {
+			frappe.get_meta(dt).fields.filter((field) => {
+				if(field.in_preview) {
 					fields.push({'name':field.fieldname,'type':field.fieldtype});
-                }
-            });
-        });
+				}
+			});
+		});
 
-        if(!fields.length) {
-            frappe.model.with_doctype(dt, () => {
-                frappe.get_meta(dt).fields.filter((field) => {
-                    if(field.reqd) {
-                        fields.push({'name':field.fieldname,'type':field.fieldtype});
-                    }
-                });
-            });
-        }
-        return fields;
-    }
+		if(!fields.length) {
+			frappe.model.with_doctype(dt, () => {
+				frappe.get_meta(dt).fields.filter((field) => {
+					if(field.reqd) {
+						fields.push({'name':field.fieldname,'type':field.fieldtype});
+					}
+				});
+			});
+		}
+		return fields;
+	}
 
-    get_preview_fields_value(dt, field_name, field_list) {
-        return frappe.xcall('frappe.desk.link_preview.get_preview_data', {
-            'doctype': dt,
-            'docname': field_name,
-            'fields': field_list,
-        });
-    }
+	get_preview_fields_value(dt, field_name, field_list) {
+		return frappe.xcall('frappe.desk.link_preview.get_preview_data', {
+			'doctype': dt,
+			'docname': field_name,
+			'fields': field_list,
+		});
+	}
 
-    init_preview_popover($el, preview_data, dt, is_link, link) {
+	init_preview_popover($el, preview_data, dt, is_link, link) {
 
-        let popover_content = this.get_popover_html(preview_data, dt, link);
-        $el.popover({
-            container: 'body',
-            html: true,
-            content: popover_content,
-            trigger: 'manual',
-            placement: 'top auto',
-            animation: false,
-        });
+		let popover_content = this.get_popover_html(preview_data, dt, link);
+		$el.popover({
+			container: 'body',
+			html: true,
+			content: popover_content,
+			trigger: 'manual',
+			placement: 'top auto',
+			animation: false,
+		});
 
-        if(!is_link) {
-            $el.data('bs.popover').tip().addClass('control-field-popover');
-        }
+		if(!is_link) {
+			$el.data('bs.popover').tip().addClass('control-field-popover');
+		}
 
-        this.$links.push($el);
+		this.$links.push($el);
 
-    }
+	}
 
-    get_popover_html(preview_data, dt, link) {
-        if(!link) {
-            link = window.location.href;
-        }
+	get_popover_html(preview_data, dt, link) {
+		if(!link) {
+			link = window.location.href;
+		}
 
-        if(link && link.includes(' ')) {
-            link = link.replace(new RegExp(' ', 'g'), '%20');
-        }
+		if(link && link.includes(' ')) {
+			link = link.replace(new RegExp(' ', 'g'), '%20');
+		}
 
-        let image_html = '';
-        let title_html = '';
-        let content_html = `<table class="preview-table">`;
+		let image_html = '';
+		let title_html = '';
+		let content_html = `<table class="preview-table">`;
 
-        if(preview_data['image']) {
-            let image_url = encodeURI(preview_data['image']);
-            image_html += `
-            <div class="preview-header">
-                <img src=${image_url} class="preview-image"></img> 
-            </div>`;
-        }
-        if(preview_data['title']) {
-            title_html+= `<a class="preview-title small" href=${link}>${preview_data['title']}</a>`;
-        }
+		if(preview_data['image']) {
+			let image_url = encodeURI(preview_data['image']);
+			image_html += `
+			<div class="preview-header">
+				<img src=${image_url} class="preview-image"></img> 
+			</div>`;
+		}
+		if(preview_data['title']) {
+			title_html+= `<a class="preview-title small" href=${link}>${preview_data['title']}</a>`;
+		}
 
-        Object.keys(preview_data).forEach(key => {
-            if(key!='image' && key!='name') {
-                let value = this.truncate_value(preview_data[key]);            
-                let label = this.truncate_value(frappe.meta.get_label(dt, key));
-                content_html += `
-                <tr class="preview-field">
-                    <td class='text-muted small field-name'>${label}</td> 
-                    <td class="field-value small"> ${value} </td>
-                </tr>
-                `;
-            }
-        })
-        content_html+=`</table>`;
+		Object.keys(preview_data).forEach(key => {
+			if(key!='image' && key!='name') {
+				let value = this.truncate_value(preview_data[key]);            
+				let label = this.truncate_value(frappe.meta.get_label(dt, key));
+				content_html += `
+				<tr class="preview-field">
+					<td class='text-muted small field-name'>${label}</td> 
+					<td class="field-value small"> ${value} </td>
+				</tr>
+				`;
+			}
+		});
+		content_html+=`</table>`;
 
-        let popover_content = `<div class="preview-popover-header">
-                                    ${image_html}
-                                    <div class="preview-header">
-                                        <div class="preview-main">
-                                            <a class="preview-name text-bold" href=${link}>${preview_data['name']}</a>
-                                            ${title_html}
-                                            <span class="text-muted small">${dt}</span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <hr>
-                                <div class="popover-body">
-                                    ${content_html}
-                                </div>`;
+		let popover_content = `<div class="preview-popover-header">
+									${image_html}
+									<div class="preview-header">
+										<div class="preview-main">
+											<a class="preview-name text-bold" href=${link}>${preview_data['name']}</a>
+											${title_html}
+											<span class="text-muted small">${dt}</span>
+										</div>
+									</div>
+								</div>
+								<hr>
+								<div class="popover-body">
+									${content_html}
+								</div>`;
 
-        if(!link) {
-            $('.preview-name').removeAttr('href');
-            $('.preview-title').removeAttr('href');
-        }
+		if(!link) {
+			$('.preview-name').removeAttr('href');
+			$('.preview-title').removeAttr('href');
+		}
 
-        return popover_content;
-    }
+		return popover_content;
+	}
 
-    truncate_value(value) {
-        if (value.length > 100) {
-            value = value.slice(0,100) + '...';
-        }
-        return value;
-    }
+	truncate_value(value) {
+		if (value.length > 100) {
+			value = value.slice(0,100) + '...';
+		}
+		return value;
+	}
 
-}
+};

From 144fe8e915c95ce46f4cb4904e18a0392f643747 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 22 Apr 2019 20:48:57 +0530
Subject: [PATCH 008/175] Code cleanup and fixes

---
 frappe/desk/link_preview.py                |   2 +-
 frappe/public/js/frappe/ui/link_preview.js | 168 ++++++++++-----------
 2 files changed, 83 insertions(+), 87 deletions(-)

diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py
index 71315a8546..b462a80324 100644
--- a/frappe/desk/link_preview.py
+++ b/frappe/desk/link_preview.py
@@ -15,7 +15,7 @@ def get_preview_data(doctype, docname, fields):
 
 	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
 	if preview_data == None:
-		preview_data = frappe.get_all(doctype, filters={
+		preview_data = frappe.get_list(doctype, filters={
 			'name': docname
 		}, fields=preview_fields, limit=1)
 		if preview_data:
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index c75dc27b58..8564c8dcac 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -10,49 +10,48 @@ frappe.ui.LinkPreview = class {
 
 		$(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
 			this.link_hovered = true;
-			let element = $(e.currentTarget);
-			let name, doctype, link;
-			let is_link = true;
+			this.element = $(e.currentTarget);
+			this.is_link = true;
 
-			if(!element.parents().find('.popover').length) {
-				if(element.attr('href')) {
-					link = element.attr('href');
-					let details = this.get_details(link,element);
-					name = details.name;
-					doctype = details.doctype;
+			if(!this.element.parents().find('.popover').length) {
+				if(this.element.attr('href')) {
+					this.link = this.element.attr('href');
+					let details = this.get_details();
+					this.name = details.name;
+					this.doctype = details.doctype;
 				} else {
-					is_link = false;
-					link = element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
+					this.is_link = false;
+					this.link = this.element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
 
-					if(link) {
-						let details = this.get_details(link,element);
-						name = details.name;
-						doctype = details.doctype;
+					if(this.link) {
+						let details = this.get_details();
+						this.name = details.name;
+						this.doctype = details.doctype;
 					} else {
-						name = element.parent().next().text();
-						doctype = element.attr('data-doctype');
+						this.name = this.element.parent().next().text();
+						this.doctype = this.element.attr('data-doctype');
 					}
 				}
 
-				let popover = element.data("bs.popover");
-				if(name && doctype) {
-					this.setup_popover_control(e, popover, name, doctype, element, is_link, link);
+				this.popover = this.element.data("bs.popover");
+				if(this.name && this.doctype && this.doctype!=='files') {
+					this.setup_popover_control(e);
 				}
 			}
 		});
 
 	}
 
-	get_details(link, element) {
+	get_details() {
 		let details = {};
-		let link_arr = link.split('/');
+		let link_arr = this.link.split('/');
 
 		if(link_arr.length > 2) {
 			details.name = decodeURI(link_arr[link_arr.length - 1]);
 			details.doctype = decodeURI(link_arr[link_arr.length -2]);
 			details.name = details.name.replace(new RegExp('%2F', 'g'), '/');
 		}
-		let title = element.attr('title');
+		let title = this.element.attr('title');
 		if( title && title.includes('/')) {
 			details.name = title.trim();
 			details.doctype = decodeURI(link_arr[link_arr.length-3]);
@@ -61,50 +60,53 @@ frappe.ui.LinkPreview = class {
 	}
 
 
-	setup_popover_control(e, popover, name, doctype, $el, is_link, link) {
+	setup_popover_control(e) {
 
-		if(!popover || !is_link) {
-			let preview_fields = this.get_preview_fields(doctype);
+		if(!this.popover || !this.is_link) {
+			let preview_fields = this.get_preview_fields();
 			if(preview_fields.length) {
 				this.data_timeout = setTimeout(() => {
-					this.get_preview_fields_value(doctype, name, preview_fields).then((preview_data)=> {
-						if(preview_data) {
-							if(this.popover_timeout) {
-								clearTimeout(this.popover_timeout);
-							}
-
-							this.popover_timeout = setTimeout(() => {
-
-								if(popover) {
-									let new_content = this.get_popover_html(preview_data, doctype, link);
-									popover.options.content = new_content;
-								} else {
-									this.init_preview_popover($el, preview_data, doctype, is_link, link);
-								}
-
-								if(!is_link) {
-									var left = e.pageX;
-									$el.popover('show');
-									var width =$('.popover').width();
-									$('.control-field-popover').css('left', (left-(width/2)) + 'px');
-								} else {
-									$el.popover('show');
-								}
-
-							}, 1000);
-						}
-					});
+					this.create_popover(e, preview_fields);
 				}, 1000);
 			}
 		} else {
 			this.popover_timeout = setTimeout(() => {
-				popover.show();
+				this.popover.show();
 			}, 1000);
 		}
-
+		console.log('this', this);
 		this.handle_popover_hide();
 	}
 
+	create_popover(e, preview_fields) {
+		this.get_preview_fields_value(preview_fields).then((preview_data)=> {
+			if(preview_data) {
+				if(this.popover_timeout) {
+					clearTimeout(this.popover_timeout);
+				}
+
+				this.popover_timeout = setTimeout(() => {
+					if(this.popover) {
+						let new_content = this.get_popover_html(preview_data);
+						this.popover.options.content = new_content;
+					} else {
+						this.init_preview_popover(preview_data);
+					}
+
+					if(!this.is_link) {
+						var left = e.pageX;
+						this.element.popover('show');
+						var width = $('.popover').width();
+						$('.control-field-popover').css('left', (left-(width/2)) + 'px');
+					} else {
+						this.element.popover('show');
+					}
+
+				}, 1000);
+			}
+		});
+	}
+
 	handle_popover_hide() {
 		$(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
 			this.link_hovered = false;
@@ -123,7 +125,8 @@ frappe.ui.LinkPreview = class {
 		});
 	}
 
-	get_preview_fields(dt) {
+	get_preview_fields() {
+		let dt = this.doctype;
 		let fields = [];
 		frappe.model.with_doctype(dt, () => {
 			frappe.get_meta(dt).fields.filter((field) => {
@@ -145,18 +148,18 @@ frappe.ui.LinkPreview = class {
 		return fields;
 	}
 
-	get_preview_fields_value(dt, field_name, field_list) {
+	get_preview_fields_value(field_list) {
 		return frappe.xcall('frappe.desk.link_preview.get_preview_data', {
-			'doctype': dt,
-			'docname': field_name,
+			'doctype': this.doctype,
+			'docname': this.name,
 			'fields': field_list,
 		});
 	}
 
-	init_preview_popover($el, preview_data, dt, is_link, link) {
+	init_preview_popover(preview_data) {
 
-		let popover_content = this.get_popover_html(preview_data, dt, link);
-		$el.popover({
+		let popover_content = this.get_popover_html(preview_data);
+		this.element.popover({
 			container: 'body',
 			html: true,
 			content: popover_content,
@@ -165,21 +168,22 @@ frappe.ui.LinkPreview = class {
 			animation: false,
 		});
 
-		if(!is_link) {
-			$el.data('bs.popover').tip().addClass('control-field-popover');
+		if(!this.is_link) {
+			this.element.data('bs.popover').tip().addClass('control-field-popover');
 		}
 
-		this.$links.push($el);
+		this.$links.push(this.element);
 
 	}
 
-	get_popover_html(preview_data, dt, link) {
-		if(!link) {
-			link = window.location.href;
+	get_popover_html(preview_data) {
+		if(!this.link) {
+			console.log('here');
+			this.link = window.location.href;
 		}
 
-		if(link && link.includes(' ')) {
-			link = link.replace(new RegExp(' ', 'g'), '%20');
+		if(this.link && this.link.includes(' ')) {
+			this.link = this.link.replace(new RegExp(' ', 'g'), '%20');
 		}
 
 		let image_html = '';
@@ -194,13 +198,13 @@ frappe.ui.LinkPreview = class {
 			</div>`;
 		}
 		if(preview_data['title']) {
-			title_html+= `<a class="preview-title small" href=${link}>${preview_data['title']}</a>`;
+			title_html+= `<a class="preview-title small" href=${this.link}>${preview_data['title']}</a>`;
 		}
 
 		Object.keys(preview_data).forEach(key => {
 			if(key!='image' && key!='name') {
 				let value = this.truncate_value(preview_data[key]);            
-				let label = this.truncate_value(frappe.meta.get_label(dt, key));
+				let label = this.truncate_value(frappe.meta.get_label(this.doctype, key));
 				content_html += `
 				<tr class="preview-field">
 					<td class='text-muted small field-name'>${label}</td> 
@@ -211,26 +215,18 @@ frappe.ui.LinkPreview = class {
 		});
 		content_html+=`</table>`;
 
-		let popover_content = `<div class="preview-popover-header">
-									${image_html}
-									<div class="preview-header">
-										<div class="preview-main">
-											<a class="preview-name text-bold" href=${link}>${preview_data['name']}</a>
-											${title_html}
-											<span class="text-muted small">${dt}</span>
-										</div>
+		let popover_content = `<div class="preview-popover-header">${image_html}<div class="preview-header">
+									<div class="preview-main">
+										<a class="preview-name text-bold" href=${this.link}>${preview_data['name']}</a>
+										${title_html}
+										<span class="text-muted small">${this.doctype}</span>
 									</div>
-								</div>
+								</div></div>
 								<hr>
 								<div class="popover-body">
 									${content_html}
 								</div>`;
 
-		if(!link) {
-			$('.preview-name').removeAttr('href');
-			$('.preview-title').removeAttr('href');
-		}
-
 		return popover_content;
 	}
 

From d82230bcb700ed7d31abf055d954f999d9618f70 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 23 Apr 2019 11:46:06 +0530
Subject: [PATCH 009/175] fix: Code cleanup

---
 frappe/desk/link_preview.py                | 26 ++++++++-------------
 frappe/public/js/frappe/ui/link_preview.js | 27 +++++++++++-----------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py
index b462a80324..e9f27d8706 100644
--- a/frappe/desk/link_preview.py
+++ b/frappe/desk/link_preview.py
@@ -6,30 +6,24 @@ import json
 def get_preview_data(doctype, docname, fields):
 	fields = json.loads(fields)
 	preview_fields = [field['name'] for field in fields if field['type'] not in no_value_fields]
-	if 'title' not in fields and frappe.get_meta(doctype).has_field('title'):
-		preview_fields.append('title')
+	preview_fields.append(frappe.get_meta(doctype).get_title_field())
 	if 'name' not in fields:
 		preview_fields.append('name')
 	if frappe.get_meta(doctype).has_field('image'):
 		preview_fields.append('image')
 
-	preview_data = frappe.cache().hget('preview_data', (doctype, docname))
-	if preview_data == None:
-		preview_data = frappe.get_list(doctype, filters={
-			'name': docname
-		}, fields=preview_fields, limit=1)
-		if preview_data:
-			preview_data = preview_data[0]
+	preview_data = frappe.get_list(doctype, filters={
+		'name': docname
+	}, fields=preview_fields, limit=1)
+	if preview_data:
+		preview_data = preview_data[0]
 
-			preview_data = {k: v for k, v in preview_data.items() if v is not None}
-			for k,v in preview_data.items():
-				if frappe.get_meta(doctype).has_field(k):
-					preview_data[k] = frappe.format(v,frappe.get_meta(doctype).get_field(k).fieldtype)
+		preview_data = {k: v for k, v in preview_data.items() if v is not None}
+		for k,v in preview_data.items():
+			if frappe.get_meta(doctype).has_field(k):
+				preview_data[k] = frappe.format(v,frappe.get_meta(doctype).get_field(k).fieldtype)
 
-		frappe.cache().hset('preview_data', (doctype, docname), preview_data)
 	if not preview_data:
 		return None
 	return preview_data
 
-def clear_preview_cache(doc, method):
-	frappe.cache().delete_value('preview_data', (doc.get('doctype', doc.get('name'))))
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 8564c8dcac..039d9a1895 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -74,7 +74,6 @@ frappe.ui.LinkPreview = class {
 				this.popover.show();
 			}, 1000);
 		}
-		console.log('this', this);
 		this.handle_popover_hide();
 	}
 
@@ -178,7 +177,6 @@ frappe.ui.LinkPreview = class {
 
 	get_popover_html(preview_data) {
 		if(!this.link) {
-			console.log('here');
 			this.link = window.location.href;
 		}
 
@@ -215,17 +213,20 @@ frappe.ui.LinkPreview = class {
 		});
 		content_html+=`</table>`;
 
-		let popover_content = `<div class="preview-popover-header">${image_html}<div class="preview-header">
-									<div class="preview-main">
-										<a class="preview-name text-bold" href=${this.link}>${preview_data['name']}</a>
-										${title_html}
-										<span class="text-muted small">${this.doctype}</span>
-									</div>
-								</div></div>
-								<hr>
-								<div class="popover-body">
-									${content_html}
-								</div>`;
+		let popover_content = 
+			`<div class="preview-popover-header">${image_html}
+				<div class="preview-header">
+					<div class="preview-main">
+						<a class="preview-name text-bold" href=${this.link}>${preview_data['name']}</a>
+						${title_html}
+						<span class="text-muted small">${this.doctype}</span>
+					</div>
+				</div>
+			</div>
+			<hr>
+			<div class="popover-body">
+				${content_html}
+			</div>`;
 
 		return popover_content;
 	}

From 2c1e20496a3eee6a56f0a53ce3814291e66aa29f Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Wed, 24 Apr 2019 15:09:24 +0530
Subject: [PATCH 010/175] fix: use property image_field and check for http link

---
 frappe/desk/link_preview.py                | 3 +--
 frappe/public/js/frappe/ui/link_preview.js | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py
index e9f27d8706..f8252f20bc 100644
--- a/frappe/desk/link_preview.py
+++ b/frappe/desk/link_preview.py
@@ -9,8 +9,7 @@ def get_preview_data(doctype, docname, fields):
 	preview_fields.append(frappe.get_meta(doctype).get_title_field())
 	if 'name' not in fields:
 		preview_fields.append('name')
-	if frappe.get_meta(doctype).has_field('image'):
-		preview_fields.append('image')
+	preview_fields.append(frappe.get_meta(doctype).image_field)
 
 	preview_data = frappe.get_list(doctype, filters={
 		'name': docname
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 039d9a1895..34f318e0f6 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -16,6 +16,9 @@ frappe.ui.LinkPreview = class {
 			if(!this.element.parents().find('.popover').length) {
 				if(this.element.attr('href')) {
 					this.link = this.element.attr('href');
+					if(this.link.startsWith('http')) {
+						return;
+					}
 					let details = this.get_details();
 					this.name = details.name;
 					this.doctype = details.doctype;
@@ -34,7 +37,7 @@ frappe.ui.LinkPreview = class {
 				}
 
 				this.popover = this.element.data("bs.popover");
-				if(this.name && this.doctype && this.doctype!=='files') {
+				if(this.name && this.doctype) {
 					this.setup_popover_control(e);
 				}
 			}

From d791285ac283812f18ec107999184c74351a6664 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Apr 2019 17:23:38 +0530
Subject: [PATCH 011/175] feat: Added encryption feature for pdfs

---
 frappe/__init__.py  | 14 ++++++----
 frappe/utils/pdf.py | 63 +++++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c80f60ac3d..8ff538e28a 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1329,7 +1329,7 @@ def format(*args, **kwargs):
 	import frappe.utils.formatters
 	return frappe.utils.formatters.format_value(*args, **kwargs)
 
-def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None, output = None, no_letterhead = 0):
+def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None, output = None, no_letterhead = 0, password=None):
 	"""Get Print Format for given document.
 
 	:param doctype: DocType of document.
@@ -1347,15 +1347,19 @@ def get_print(doctype=None, name=None, print_format=None, style=None, html=None,
 	local.form_dict.doc = doc
 	local.form_dict.no_letterhead = no_letterhead
 
+	options = None
+	if password:
+		options = {'password': password}
+
 	if not html:
 		html = build_page("printview")
 
 	if as_pdf:
-		return get_pdf(html, output = output)
+		return get_pdf(html, output = output, options = options)
 	else:
 		return html
 
-def attach_print(doctype, name, file_name=None, print_format=None, style=None, html=None, doc=None, lang=None, print_letterhead=True):
+def attach_print(doctype, name, file_name=None, print_format=None, style=None, html=None, doc=None, lang=None, print_letterhead=True, password=None):
 	from frappe.utils import scrub_urls
 
 	if not file_name: file_name = name
@@ -1374,12 +1378,12 @@ def attach_print(doctype, name, file_name=None, print_format=None, style=None, h
 	if int(print_settings.send_print_as_pdf or 0):
 		out = {
 			"fname": file_name + ".pdf",
-			"fcontent": get_print(doctype, name, print_format=print_format, style=style, html=html, as_pdf=True, doc=doc, no_letterhead=no_letterhead)
+			"fcontent": get_print(doctype, name, print_format=print_format, style=style, html=html, as_pdf=True, doc=doc, no_letterhead=no_letterhead, password=password)
 		}
 	else:
 		out = {
 			"fname": file_name + ".html",
-			"fcontent": scrub_urls(get_print(doctype, name, print_format=print_format, style=style, html=html, doc=doc, no_letterhead=no_letterhead)).encode("utf-8")
+			"fcontent": scrub_urls(get_print(doctype, name, print_format=print_format, style=style, html=html, doc=doc, no_letterhead=no_letterhead, password=password)).encode("utf-8")
 		}
 
 	local.flags.ignore_print_permissions = False
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 8c43bf33ce..980da8a9a0 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -6,13 +6,13 @@ import pdfkit, os, frappe
 from frappe.utils import scrub_urls
 from frappe import _
 from bs4 import BeautifulSoup
-from PyPDF2 import PdfFileReader
-import re
+from PyPDF2 import PdfFileReader, PdfFileWriter
+import re, io
 
 def get_pdf(html, options=None, output = None):
 	html = scrub_urls(html)
 	html, options = prepare_options(html, options)
-	fname = os.path.join("/tmp", "frappe-pdf-{0}.pdf".format(frappe.generate_hash()))
+	# fname = os.path.join("/tmp", "frappe-pdf-{0}.pdf".format(frappe.generate_hash()))
 
 	options.update({
 		"disable-javascript": "",
@@ -20,12 +20,12 @@ def get_pdf(html, options=None, output = None):
 	})
 
 	try:
-		pdfkit.from_string(html, fname, options=options or {})
-		if output:
-			append_pdf(PdfFileReader(fname),output)
-		else:
-			with open(fname, "rb") as fileobj:
-				filedata = fileobj.read()
+		# Set filename property to false, so no file is actually created
+		filedata = pdfkit.from_string(html, False, options=options or {})
+
+		# https://pythonhosted.org/PyPDF2/PdfFileReader.html
+		# create in-memory binary streams from filedata and create a PdfFileReader objcet
+		reader = PdfFileReader(io.BytesIO(filedata))
 
 	except IOError as e:
 		if ("ContentNotFoundError" in e.message
@@ -34,29 +34,48 @@ def get_pdf(html, options=None, output = None):
 			or "RemoteHostClosedError" in e.message):
 
 			# allow pdfs with missing images if file got created
-			if os.path.exists(fname):
-				if output:
-					append_pdf(PdfFileReader(file(fname,"rb")),output)
-				else:
-					with open(fname, "rb") as fileobj:
-						filedata = fileobj.read()
+			if filedata:
+				if output: # output is a PdfFileWriter object
+					output.appendPagesFromReader(reader)
 
 			else:
 				frappe.throw(_("PDF generation failed because of broken image links"))
 		else:
 			raise
 
-	finally:
-		cleanup(fname, options)
-
 	if output:
-		return output
+		# Encrypt if required
+		if "password" in options:
+			output.encrypt(options["password"])
+		return get_file_data_from_writer(output)
+
+	# https://pythonhosted.org/PyPDF2/PdfFileWriter.html
+	# initialize a writer
+	writer = PdfFileWriter()
+
+	# Append pages from the reader object to the writer
+	writer.appendPagesFromReader(reader)
+
+	if "password" in options:
+		writer.encrypt(options["password"])
+
+	filedata = get_file_data_from_writer(writer)
 
 	return filedata
 
-def append_pdf(input,output):
-	# Merging multiple pdf files
-    [output.addPage(input.getPage(page_num)) for page_num in range(input.numPages)]
+def get_file_data_from_writer(writer_obj):
+
+	# https://docs.python.org/3/library/io.html
+	# Create a new stream and write into it
+	stream = io.BytesIO()
+	writer_obj.write(stream)
+
+	# Change the stream position to start of the stream
+	stream.seek(0)
+
+	# Read up to size bytes from the object and return them
+	return stream.read()
+
 
 def prepare_options(html, options):
 	if not options:

From a9ca81370bc3420d95bfa789662c6b66b7bdb167 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 25 Apr 2019 18:22:14 +0530
Subject: [PATCH 012/175] fix: encoded password

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

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 980da8a9a0..193144498c 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -46,7 +46,7 @@ def get_pdf(html, options=None, output = None):
 	if output:
 		# Encrypt if required
 		if "password" in options:
-			output.encrypt(options["password"])
+			output.encrypt(options["password"].encode('utf-8'))
 		return get_file_data_from_writer(output)
 
 	# https://pythonhosted.org/PyPDF2/PdfFileWriter.html
@@ -57,7 +57,7 @@ def get_pdf(html, options=None, output = None):
 	writer.appendPagesFromReader(reader)
 
 	if "password" in options:
-		writer.encrypt(options["password"])
+		writer.encrypt(options["password"].encode('utf-8'))
 
 	filedata = get_file_data_from_writer(writer)
 

From 02c6abe6094f836769c46339c267cd8d189f7175 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 27 Apr 2019 16:22:56 +0530
Subject: [PATCH 013/175] feat: minor changes to pdf.py

---
 frappe/utils/pdf.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 193144498c..260f6a3727 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -9,10 +9,9 @@ from bs4 import BeautifulSoup
 from PyPDF2 import PdfFileReader, PdfFileWriter
 import re, io
 
-def get_pdf(html, options=None, output = None):
+def get_pdf(html, options=None, output=None):
 	html = scrub_urls(html)
 	html, options = prepare_options(html, options)
-	# fname = os.path.join("/tmp", "frappe-pdf-{0}.pdf".format(frappe.generate_hash()))
 
 	options.update({
 		"disable-javascript": "",
@@ -66,7 +65,6 @@ def get_pdf(html, options=None, output = None):
 def get_file_data_from_writer(writer_obj):
 
 	# https://docs.python.org/3/library/io.html
-	# Create a new stream and write into it
 	stream = io.BytesIO()
 	writer_obj.write(stream)
 

From 27fd3f7c99a62901f9e24a49fce49872929f599a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 27 Apr 2019 16:23:13 +0530
Subject: [PATCH 014/175] feat: Refactored test and added tests for pdf
 encryption

---
 frappe/tests/test_pdf.py | 51 ++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/frappe/tests/test_pdf.py b/frappe/tests/test_pdf.py
index f0452af8d0..1b78d090c4 100644
--- a/frappe/tests/test_pdf.py
+++ b/frappe/tests/test_pdf.py
@@ -4,20 +4,22 @@ from __future__ import unicode_literals
 
 import unittest
 
-from frappe.utils.pdf import read_options_from_html
+import frappe.utils.pdf as pdfgen
+from PyPDF2 import PdfFileReader, PdfFileWriter
+import pdfkit, io
 
 #class TestPdfBorders(unittest.TestCase):
-class TestPdfBorders(unittest.TestCase):
-    def test_pdf_borders(self):
-        html = """
-			<style>
-            .print-format {
-             margin-top: 0mm;
-             margin-left: 10mm;
-             margin-right: 0mm;
-            }
-            </style>
-            <p>This is a test html snippet</p>
+class TestPdf(unittest.TestCase):
+	@property
+	def html(self):
+		return """<style>
+			.print-format {
+			 margin-top: 0mm;
+			 margin-left: 10mm;
+			 margin-right: 0mm;
+			}
+			</style>
+			<p>This is a test html snippet</p>
 			<div class="more-info">
 				<a href="http://test.com">Test link 1</a>
 				<a href="/about">Test link 2</a>
@@ -26,16 +28,19 @@ class TestPdfBorders(unittest.TestCase):
 			</div>
 			<div style="background-image: url('/assets/frappe/bg.jpg')">
 				Please mail us at <a href="mailto:test@example.com">email</a>
-			</div>
-		"""
+			</div>"""
 
-        html, html_options = read_options_from_html(html)
-        self.assertTrue(html_options['margin-top'] == '0')
-        self.assertTrue(html_options['margin-left'] == '10')
-        self.assertTrue(html_options['margin-right'] == '0')
+	def runTest(self):
+		self.test_read_options_from_html()
 
-# allows to run $ bench execute frappe.tests.test_pdf.run_tests
-def run_tests():
-    t = TestPdfBorders("test_pdf_borders")
-    t.test_pdf_borders()
-    return
+	def test_read_options_from_html(self):
+		html, html_options = pdfgen.read_options_from_html(self.html)
+		self.assertTrue(html_options['margin-top'] == '0')
+		self.assertTrue(html_options['margin-left'] == '10')
+		self.assertTrue(html_options['margin-right'] == '0')
+
+	def test_pdf_encryption(self):
+		pdf = pdfgen.get_pdf(self.html, options={"password": "qwe"})
+		reader = PdfFileReader(io.BytesIO(pdf))
+		self.assertTrue(reader.isEncrypted)
+		self.assertTrue(reader.decrypt("qwe".encode('utf-8')))

From 01a2df7e5af2b17cabbb694e09f7b075f6cba765 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 27 Apr 2019 16:26:13 +0530
Subject: [PATCH 015/175] feat: code imporvements

---
 frappe/utils/pdf.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 260f6a3727..287dc2cc1a 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -48,11 +48,8 @@ def get_pdf(html, options=None, output=None):
 			output.encrypt(options["password"].encode('utf-8'))
 		return get_file_data_from_writer(output)
 
-	# https://pythonhosted.org/PyPDF2/PdfFileWriter.html
-	# initialize a writer
 	writer = PdfFileWriter()
 
-	# Append pages from the reader object to the writer
 	writer.appendPagesFromReader(reader)
 
 	if "password" in options:

From 8e29bc4bf7e1cef51366e73943e8ed26a724c5cf Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sat, 27 Apr 2019 17:41:25 +0530
Subject: [PATCH 016/175] fix: possible fix to encoding issues in py3

---
 frappe/tests/test_pdf.py | 13 ++++++++-----
 frappe/utils/pdf.py      | 11 ++++++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/tests/test_pdf.py b/frappe/tests/test_pdf.py
index 1b78d090c4..73a49bb832 100644
--- a/frappe/tests/test_pdf.py
+++ b/frappe/tests/test_pdf.py
@@ -5,8 +5,8 @@ from __future__ import unicode_literals
 import unittest
 
 import frappe.utils.pdf as pdfgen
-from PyPDF2 import PdfFileReader, PdfFileWriter
-import pdfkit, io
+import frappe, io, six
+from PyPDF2 import PdfFileReader
 
 #class TestPdfBorders(unittest.TestCase):
 class TestPdf(unittest.TestCase):
@@ -34,13 +34,16 @@ class TestPdf(unittest.TestCase):
 		self.test_read_options_from_html()
 
 	def test_read_options_from_html(self):
-		html, html_options = pdfgen.read_options_from_html(self.html)
+		_, html_options = pdfgen.read_options_from_html(self.html)
 		self.assertTrue(html_options['margin-top'] == '0')
 		self.assertTrue(html_options['margin-left'] == '10')
 		self.assertTrue(html_options['margin-right'] == '0')
 
 	def test_pdf_encryption(self):
-		pdf = pdfgen.get_pdf(self.html, options={"password": "qwe"})
+		password = "qwe"
+		pdf = pdfgen.get_pdf(self.html, options={"password": password})
 		reader = PdfFileReader(io.BytesIO(pdf))
 		self.assertTrue(reader.isEncrypted)
-		self.assertTrue(reader.decrypt("qwe".encode('utf-8')))
+		if six.PY2:
+			password = frappe.safe_encode(password)
+		self.assertTrue(reader.decrypt(password))
\ No newline at end of file
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 287dc2cc1a..86c623b1b5 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -5,9 +5,9 @@ from __future__ import unicode_literals
 import pdfkit, os, frappe
 from frappe.utils import scrub_urls
 from frappe import _
+import six, re, io
 from bs4 import BeautifulSoup
 from PyPDF2 import PdfFileReader, PdfFileWriter
-import re, io
 
 def get_pdf(html, options=None, output=None):
 	html = scrub_urls(html)
@@ -42,10 +42,15 @@ def get_pdf(html, options=None, output=None):
 		else:
 			raise
 
+	password = options["password"]
+
+	if six.PY2:
+		password = frappe.safe_encode(password)
+
 	if output:
 		# Encrypt if required
 		if "password" in options:
-			output.encrypt(options["password"].encode('utf-8'))
+			output.encrypt(password)
 		return get_file_data_from_writer(output)
 
 	writer = PdfFileWriter()
@@ -53,7 +58,7 @@ def get_pdf(html, options=None, output=None):
 	writer.appendPagesFromReader(reader)
 
 	if "password" in options:
-		writer.encrypt(options["password"].encode('utf-8'))
+		writer.encrypt(password)
 
 	filedata = get_file_data_from_writer(writer)
 

From 87bb91b64fccb5671630430af63a8e1f0a20f23c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 30 Apr 2019 09:41:25 +0530
Subject: [PATCH 017/175] fix: key error on password

---
 frappe/utils/pdf.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 86c623b1b5..8376d32a93 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -42,10 +42,10 @@ def get_pdf(html, options=None, output=None):
 		else:
 			raise
 
-	password = options["password"]
-
-	if six.PY2:
-		password = frappe.safe_encode(password)
+	if "password" in options:
+		password = options["password"]
+		if six.PY2:
+			password = frappe.safe_encode(password)
 
 	if output:
 		# Encrypt if required
@@ -54,7 +54,6 @@ def get_pdf(html, options=None, output=None):
 		return get_file_data_from_writer(output)
 
 	writer = PdfFileWriter()
-
 	writer.appendPagesFromReader(reader)
 
 	if "password" in options:

From 238a496baea054973f4c93c4d03e48796f9ccbc0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 30 Apr 2019 10:19:07 +0530
Subject: [PATCH 018/175] chore: Remove deprecated files (#7379)

- reportview.js
- grid_report.js
---
 frappe/public/build.json                      |   2 -
 .../js/frappe/views/reports/grid_report.js    | 859 ----------------
 .../js/frappe/views/reports/reportview.js     | 950 ------------------
 .../views/reports/reportview_footer.html      |  18 -
 4 files changed, 1829 deletions(-)
 delete mode 100644 frappe/public/js/frappe/views/reports/grid_report.js
 delete mode 100644 frappe/public/js/frappe/views/reports/reportview.js
 delete mode 100644 frappe/public/js/frappe/views/reports/reportview_footer.html

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 620b360f47..64fe3eb2c5 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -357,9 +357,7 @@
 		"public/js/lib/clusterize.min.js",
 		"public/js/frappe/views/reports/report_factory.js",
 		"public/js/frappe/views/reports/report_view.js",
-		"public/js/frappe/views/reports/reportview_footer.html",
 		"public/js/frappe/views/reports/query_report.js",
-		"public/js/frappe/views/reports/grid_report.js",
 		"public/js/frappe/views/reports/print_grid.html",
 		"public/js/frappe/views/reports/print_tree.html",
 		"public/js/frappe/ui/group_by/group_by.html",
diff --git a/frappe/public/js/frappe/views/reports/grid_report.js b/frappe/public/js/frappe/views/reports/grid_report.js
deleted file mode 100644
index a8dda60606..0000000000
--- a/frappe/public/js/frappe/views/reports/grid_report.js
+++ /dev/null
@@ -1,859 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-import DataTable from 'frappe-datatable';
-frappe.provide("frappe.report_dump");
-
-$.extend(frappe.report_dump, {
-	data: {},
-	last_modified: {},
-	with_data: function(doctypes, callback) {
-		var pre_loaded = Object.keys(frappe.report_dump.last_modified);
-		return frappe.call({
-			method: "frappe.desk.report_dump.get_data",
-			type: "GET",
-			args: {
-				doctypes: doctypes,
-				last_modified: frappe.report_dump.last_modified
-			},
-			freeze: true,
-			callback: function(r) {
-				// creating map of data from a list
-				$.each(r.message, function(doctype, doctype_data) {
-					frappe.report_dump.set_data(doctype, doctype_data);
-				});
-
-				// reverse map names
-				$.each(r.message, function(doctype, doctype_data) {
-					// only if not pre-loaded
-					if(!in_list(pre_loaded, doctype)) {
-						if(doctype_data.links) {
-							$.each(frappe.report_dump.data[doctype], function(row_idx, row) {
-								$.each(doctype_data.links, function(link_key, link) {
-									if(frappe.report_dump.data[link[0]][row[link_key]]) {
-										row[link_key] = frappe.report_dump.data[link[0]][row[link_key]][link[1]];
-									} else {
-										row[link_key] = null;
-									}
-								});
-							});
-						}
-					}
-				});
-
-				callback();
-			}
-		});
-	},
-	set_data: function(doctype, doctype_data) {
-		var data = [];
-		var replace_dict = {};
-		var make_row = function(d) {
-			var row = {};
-			$.each(doctype_data.columns, function(idx, col) {
-				row[col] = d[idx];
-			});
-			row.id = row.name;
-			row.doctype = doctype;
-			return row;
-		};
-		if(frappe.report_dump.last_modified[doctype]) {
-			// partial loading, make a name dict
-			$.each(doctype_data.data, function(i, d) {
-				var row = make_row(d);
-				replace_dict[row.name] = row;
-			});
-
-			// replace old data
-			$.each(frappe.report_dump.data[doctype], function(i, d) {
-				if(replace_dict[d.name]) {
-					data.push(replace_dict[d.name]);
-					delete replace_dict[d.name];
-				} else if(doctype_data.modified_names.indexOf(d.name)!==-1) {
-					// if modified but not in replace_dict, then assume it as cancelled
-					// don't push in data
-				} else {
-					data.push(d);
-				}
-			});
-
-			// add new records
-			$.each(replace_dict, function(name, d) {
-				data.push(d);
-			});
-		} else {
-
-			// first loading
-			$.each(doctype_data.data, function(i, d) {
-				data.push(make_row(d));
-			});
-		}
-		frappe.report_dump.last_modified[doctype] = doctype_data.last_modified;
-		frappe.report_dump.data[doctype] = data;
-	}
-});
-
-frappe.provide("frappe.views");
-frappe.views.GridReport = Class.extend({
-	init: function(opts) {
-		this.filter_inputs = {};
-		this.preset_checks = [];
-		this.tree_grid = {show: false};
-		$.extend(this, opts);
-
-		this.wrapper = $('<div class="grid-report"></div>').appendTo(this.page.main);
-		this.page.main.find(".page").css({"padding-top": "0px"});
-
-		if(this.filters) {
-			this.make_filters();
-		}
-		this.make_waiting();
-
-		this.get_data_and_refresh();
-	},
-	bind_show: function() {
-		// bind show event to reset cur_report_grid
-		// and refresh filters from url
-		// this must be called after init
-		// because "frappe.container.page" will only be set
-		// once "load" event is over.
-
-		var me = this;
-		$(this.page).bind('show', function() {
-			// reapply filters on show
-			frappe.cur_grid_report = me;
-			me.get_data_and_refresh();
-		});
-
-	},
-	get_data_and_refresh: function() {
-		var me = this;
-		this.get_data(function() {
-			me.apply_filters_from_route();
-			me.refresh();
-		});
-	},
-	get_data: function(callback) {
-		var me = this;
-
-		frappe.report_dump.with_data(this.doctypes, function() {
-			if(!me.setup_filters_done) {
-				me.setup_filters();
-				me.setup_filters_done = true;
-			}
-			callback();
-		});
-	},
-	setup_filters: function() {
-		var me = this;
-
-		$.each(me.filter_inputs, function(i, v) {
-			var opts = v.get(0).opts;
-			if(opts.fieldtype == "Select" && in_list(me.doctypes, opts.link)) {
-				$(v).add_options(frappe.report_dump.data[opts.link].map(d => d.name));
-			} else if(opts.fieldtype == "Link" && in_list(me.doctypes, opts.link)) {
-				opts.list = frappe.report_dump.data[opts.link].map(d => d.name);
-				me.set_autocomplete(v, opts.list);
-			}
-		});
-
-		// refresh
-		this.page.set_primary_action(__("Refresh"), function() {
-			me.get_data(function() {
-				me.refresh();
-			});
-		});
-
-		// reset filters button
-		if (this.filter_inputs) {
-			this.page.add_menu_item(__("Reset Filters"), function() {
-				me.init_filter_values();
-				me.refresh();
-			}, true);
-		}
-
-		this.page.add_menu_item(__("Print"), function() {
-			frappe.ui.get_print_settings(false, function(print_settings) {
-				frappe.render_grid({grid: me.grid, title: me.page.title, print_settings: print_settings, report: me});
-			});
-
-		}, true);
-
-		// range
-		this.filter_inputs.range && this.filter_inputs.range.on("change", function() {
-			me.refresh();
-		});
-	},
-	set_filter: function(key, value) {
-		var filters = this.filter_inputs[key];
-		if(filters) {
-			var opts = filters.get(0).opts;
-			if(opts.fieldtype === "Check") {
-				filters.prop("checked", cint(value) ? true : false);
-			} if(opts.fieldtype=="Date") {
-				filters.val(frappe.datetime.str_to_user(value));
-			} else {
-				filters.val(value);
-			}
-		} else {
-			frappe.msgprint(__("Invalid Filter: {0}", [key]));
-		}
-	},
-	set_autocomplete: function($filter, list) {
-		var me = this;
-		new Awesomplete($filter.get(0), {
-			list: list
-		});
-		$filter.on("awesomplete-select", function(e) {
-			var value = e.originalEvent.text.value;
-			$filter.val(value);
-			me.refresh();
-		});
-	},
-	init_filter_values: function() {
-		$.each(this.filter_inputs, function(key, filter) {
-			var opts = filter.get(0).opts;
-			if(frappe.sys_defaults[key]) {
-				filter.val(frappe.sys_defaults[key]);
-			} else if(opts.fieldtype=='Select') {
-				filter.get(0).selectedIndex = 0;
-			} else if(opts.fieldtype=='Data') {
-				filter.val("");
-			} else if(opts.fieldtype=="Link") {
-				filter.val("");
-			}
-		});
-
-		this.set_default_values();
-	},
-
-	set_default_values: function() {
-		var values = {
-			from_date: frappe.datetime.str_to_user(frappe.sys_defaults.year_start_date),
-			to_date: frappe.datetime.str_to_user(frappe.sys_defaults.year_end_date)
-		};
-
-		var me = this;
-		$.each(values, function(i, v) {
-			if(me.filter_inputs[i] && !me.filter_inputs[i].val())
-				me.filter_inputs[i].val(v);
-		});
-	},
-
-	make_filters: function() {
-		var me = this;
-		$.each(this.filters, function(i, v) {
-			v.fieldname = v.fieldname || v.label.replace(/ /g, '_').toLowerCase();
-			var input = null;
-			if(v.fieldtype=='Select') {
-				input = me.page.add_select(v.label, v.options || [v.default_value]);
-			} else if(v.fieldtype=="Link") {
-				input = me.page.add_data(v.label);
-				new Awesomplete(input.get(0), {
-					list: v.list || []
-				});
-			} else if(v.fieldtype==='Button' && v.label===__("Refresh")) {
-				input = me.page.set_primary_action(v.label, null, v.icon);
-			} else if(v.fieldtype==='Button') {
-				input = me.page.add_menu_item(v.label, null, true);
-			} else if(v.fieldtype==='Date') {
-				input = me.page.add_date(v.label);
-			} else if(v.fieldtype==='Label') {
-				input = me.page.add_label(v.label);
-			} else if(v.fieldtype==='Data') {
-				input = me.page.add_data(v.label);
-			} else if(v.fieldtype==='Check') {
-				input = me.page.add_check(v.label);
-			}
-
-			if(input) {
-				input && (input.get(0).opts = v);
-				if(v.cssClass) {
-					input.addClass(v.cssClass);
-				}
-				input.keypress(function(e) {
-					if(e.which==13) {
-						me.refresh();
-					}
-				});
-			}
-			me.filter_inputs[v.fieldname] = input;
-		});
-	},
-	make_waiting: function() {
-		this.waiting = frappe.messages.waiting(this.wrapper, __("Loading Report")+"...");
-	},
-	load_filter_values: function() {
-		var me = this;
-		$.each(this.filter_inputs, function(i, f) {
-			var opts = f.get(0).opts;
-			if(opts.fieldtype=='Check') {
-				me[opts.fieldname] = f.prop('checked') ? 1 : 0;
-			} else if(opts.fieldtype!='Button') {
-				me[opts.fieldname] = f.val();
-				if(opts.fieldtype=="Date") {
-					me[opts.fieldname] = frappe.datetime.user_to_str(me[opts.fieldname]);
-				} else if (opts.fieldtype == "Select") {
-					me[opts.fieldname+'_default'] = opts.default_value;
-				}
-			}
-		});
-
-		if(this.filter_inputs.from_date && this.filter_inputs.to_date && (this.to_date < this.from_date)) {
-			frappe.msgprint(__("From Date must be before To Date"));
-			return;
-		}
-
-	},
-
-	make_name_map: function(data, key) {
-		var map = {};
-		key = key || "name";
-		$.each(data, function(i, v) {
-			map[v[key]] = v;
-		});
-		return map;
-	},
-
-	reset_item_values: function(item) {
-		var me = this;
-		$.each(this.columns, function(i, col) {
-			if (col.formatter==me.currency_formatter) {
-				item[col.id] = 0.0;
-			}
-		});
-	},
-
-	round_item_values: function(item) {
-		var me = this;
-		$.each(this.columns, function(i, col) {
-			if (col.formatter==me.currency_formatter) {
-				item[col.id] = flt(item[col.id], frappe.defaults.get_default("float_precision") || 3);
-			}
-		});
-	},
-
-	round_off_data: function() {
-		var me = this;
-		$.each(this.data, function(i, d) {
-			me.round_item_values(d);
-		});
-	},
-
-	refresh: function() {
-		this.waiting.toggle(false);
-		if(!this.grid_wrapper)
-			this.make();
-		// this.show_zero = $('.show-zero input:checked').length;
-		this.load_filter_values();
-		this.setup_columns();
-		this.setup_dataview_columns();
-		this.apply_link_formatters();
-		this.prepare_data();
-		this.round_off_data();
-		this.prepare_data_view();
-		// chart might need prepared data
-		frappe.show_alert("Updated", 2);
-		this.render();
-		this.setup_chart && this.setup_chart();
-	},
-	setup_dataview_columns: function() {
-		this.columns = this.columns.filter(col => !col.hidden);
-		this.datatable_columns = this.columns.map(column => {
-			return Object.assign(column, {
-				format: (value, row, column, data) => {
-					return column.formatter ?
-						column.formatter(row, {}, value, column, data) :
-						value || '';
-				}
-			});
-		});
-	},
-	make: function() {
-		// chart wrapper
-		this.chart_area = $('<div class="chart" style="padding-bottom: 1px"></div>').appendTo(this.wrapper);
-
-		this.page.add_menu_item(__("Export"), () =>  this.export(), true);
-
-		// grid wrapper
-		this.grid_wrapper = $("<div style='height: 500px;'>")
-			.appendTo(this.wrapper);
-		this.id = frappe.dom.set_unique_id(this.grid_wrapper.get(0));
-
-		this.bind_show();
-
-		frappe.cur_grid_report = this;
-		$(this.wrapper).trigger('make');
-
-	},
-	apply_filters_from_route: function() {
-		var me = this;
-		if(frappe.route_options) {
-			$.each(frappe.route_options, function(key, value) {
-				me.set_filter(key, value);
-			});
-			frappe.route_options = null;
-		} else {
-			this.init_filter_values();
-		}
-		this.set_default_values();
-
-		$(this.wrapper).trigger('apply_filters_from_route');
-	},
-	options: {
-		editable: false,
-		enableColumnReorder: false
-	},
-	render: function() {
-		this.datatable = new DataTable('#' + this.id, {
-			columns: this.datatable_columns,
-			data: this.data,
-			layout: 'fixed',
-			inlineFilters: true,
-			treeView: true,
-			checkboxColumn: true,
-			checkedRowStatus: false,
-			events: {
-				onCheckRow: (row) => {
-					const rowIndex = row.meta.rowIndex;
-					const checked = this.datatable.rowmanager.checkMap[rowIndex];
-					const data = this.datatable.datamanager.getData(rowIndex);
-					data.checked = Boolean(checked);
-
-					this.setup_chart && this.setup_chart();
-				}
-			},
-			hooks: {
-				columnTotal: frappe.utils.report_column_total
-			}
-		});
-
-		this.data.forEach((d, i) => {
-			if (d.checked) {
-				this.datatable.rowmanager.checkRow(i, true);
-			}
-		});
-	},
-	prepare_data_view: function() {
-	},
-	export: function() {
-		frappe.tools.downloadify(frappe.slickgrid_tools.get_view_data(this.columns, this.dataView),
-			["Report Manager", "System Manager"], this.title);
-		return false;
-	},
-	apply_filters: function(item) {
-		// generic filter: apply filter functiions
-		// from all filter_inputs
-		var filters = this.filter_inputs;
-		if(item._show) return true;
-
-		for (var i in filters) {
-			if(!this.apply_filter(item, i)) {
-				return false;
-			}
-		}
-
-		return true;
-	},
-	apply_filter: function(item, fieldname) {
-		var filter = this.filter_inputs[fieldname].get(0);
-		if(filter.opts.filter) {
-			if(!filter.opts.filter(this[filter.opts.fieldname], item, filter.opts, this)) {
-				return false;
-			}
-		}
-		return true;
-	},
-	apply_zero_filter: function(val, item, opts, me) {
-		// show only non-zero values
-		if(!me.show_zero) {
-			for(var i=0, j=me.columns.length; i<j; i++) {
-				var col = me.columns[i];
-				if(col.formatter==me.currency_formatter && !col.hidden) {
-					if(flt(item[col.field]) > 0.001 ||  flt(item[col.field]) < -0.001) {
-						return true;
-					}
-				}
-			}
-			return false;
-		}
-		return true;
-	},
-	show_zero_check: function() {
-		var me = this;
-		this.wrapper.bind('make', function() {
-			me.wrapper.find('.show-zero').toggle(true).find('input').click(function(){
-				me.refresh();
-			});
-		});
-	},
-	is_default: function(fieldname) {
-		return this[fieldname]==this[fieldname + "_default"];
-	},
-	date_formatter: function(row, cell, value) {
-		return frappe.datetime.str_to_user(value);
-	},
-	currency_formatter: function(row, cell, value, columnDef, dataContext) {
-		if (isNaN(value)) value = '';
-		return repl('<div style="text-align: right; %(_style)s">%(value)s</div>', {
-			_style: dataContext._style || "",
-			value: ((value==null || value==="") ? "" : format_number(value))
-		});
-	},
-	text_formatter: function(row, cell, value, columnDef, dataContext) {
-		return repl('<span style="%(_style)s" title="%(esc_value)s">%(value)s</span>', {
-			_style: dataContext._style || "",
-			esc_value: cstr(value).replace(/"/g, '\\"'),
-			value: cstr(value)
-		});
-	},
-	check_formatter: function(row, cell, value, columnDef, dataContext) {
-		return repl('<input type="checkbox" data-id="%(id)s" \
-			class="chart-check" %(checked)s>', {
-				"id": dataContext.id,
-				"checked": dataContext.checked ? 'checked="checked"' : ""
-			});
-	},
-	apply_link_formatters: function() {
-		$.each(this.columns, function(i, col) {
-			if(col.link_formatter) {
-				col.formatter = function(row, cell, value, columnDef, dataContext, for_print) {
-					// added link and open button to links
-					// link_formatter must have
-					// filter_input, open_btn (true / false), doctype (will be eval'd)
-					if(!value) return "";
-
-					if(for_print) {
-						return value;
-					}
-
-					var me = frappe.cur_grid_report;
-
-					if(dataContext._show) {
-						return repl('<span style="%(_style)s">%(value)s</span>', {
-							_style: dataContext._style || "",
-							value: value
-						});
-					}
-
-					// make link to add a filter
-					var html;
-					var link_formatter = me.dataview_columns[cell].link_formatter;
-					if (link_formatter.filter_input) {
-						html = repl('<a href="#" \
-							onclick="frappe.cur_grid_report.set_filter(\'%(col_name)s\', \'%(value)s\'); \
-								frappe.cur_grid_report.refresh(); return false;">\
-							%(value)s</a>', {
-								value: value,
-								col_name: link_formatter.filter_input,
-								page_name: frappe.container.page.page_name
-							});
-					} else {
-						html = value;
-					}
-
-					// make icon to open form
-					if(link_formatter.open_btn) {
-						var doctype = link_formatter.doctype
-							? eval(link_formatter.doctype)
-							: dataContext.doctype;
-						html += me.get_link_open_icon(doctype, value);
-					}
-					return html;
-				};
-			}
-		});
-	},
-	get_link_open_icon: function(doctype, name) {
-		return repl(' <a href="#Form/%(doctype)s/%(name)s">\
-			<i class="fa fa-share" style="cursor: pointer;"></i></a>', {
-				doctype: doctype,
-				name: encodeURIComponent(name)
-			});
-	},
-	make_date_range_columns: function() {
-		this.columns = [];
-
-		var me = this;
-		var range = this.filter_inputs.range.val();
-		this.from_date = frappe.datetime.user_to_str(this.filter_inputs.from_date.val());
-		this.to_date = frappe.datetime.user_to_str(this.filter_inputs.to_date.val());
-		var date_diff = frappe.datetime.get_diff(this.to_date, this.from_date);
-
-		me.column_map = {};
-		me.last_date = null;
-
-		var add_column = function(date) {
-			me.columns.push({
-				id: date,
-				name: frappe.datetime.str_to_user(date),
-				field: date,
-				formatter: me.currency_formatter,
-				width: 100
-			});
-		};
-
-		var build_columns = function(condition) {
-			// add column for each date range
-			for(var i=0; i <= date_diff; i++) {
-				var date = frappe.datetime.add_days(me.from_date, i);
-				if(!condition) condition = () => true;
-
-				if(condition(date)) add_column(date);
-				me.last_date = date;
-
-				if(me.columns.length) {
-					me.column_map[date] = me.columns[me.columns.length-1];
-				}
-			}
-		};
-
-		// make columns for all date ranges
-		if(range=='Daily') {
-			build_columns();
-		} else if(range=='Weekly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return !(frappe.datetime.get_diff(date, me.from_date) % 7);
-			});
-		} else if(range=='Monthly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return frappe.datetime.str_to_obj(me.last_date).getMonth() != frappe.datetime.str_to_obj(date).getMonth();
-			});
-		} else if(range=='Quarterly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return frappe.datetime.str_to_obj(date).getDate()==1 && in_list([0,3,6,9], frappe.datetime.str_to_obj(date).getMonth());
-			});
-		} else if(range=='Yearly') {
-			build_columns(function(date) {
-				if(!me.last_date) return true;
-				return $.map(frappe.report_dump.data['Fiscal Year'], function(v) {
-					return date==v.year_start_date ? true : null;
-				}).length;
-			});
-
-		}
-
-		// set label as last date of period
-		$.each(this.columns, function(i, col) {
-			col.name = me.columns[i+1]
-				? frappe.datetime.str_to_user(frappe.datetime.add_days(me.columns[i+1].id, -1))
-				: frappe.datetime.str_to_user(me.to_date);
-		});
-	},
-	trigger_refresh_on_change: function(filters) {
-		var me = this;
-		$.each(filters, function(i, f) {
-			me.filter_inputs[f] && me.filter_inputs[f].on("change", function() {
-				me.refresh();
-			});
-		});
-	}
-});
-
-frappe.views.GridReportWithPlot = frappe.views.GridReport.extend({
-	setup_chart: function() {
-		if (in_list(["Daily", "Weekly"], this.filter_inputs.range.val())) {
-			this.chart_area.toggle(false);
-			return;
-		} else {
-			this.chart_area.toggle(true);
-		}
-		var chart_data = this.get_chart_data ? this.get_chart_data() : null;
-
-		const parent = this.wrapper.find('.chart')[0];
-		this.chart = new Chart(parent, {
-			height: 200,
-			data: chart_data,
-			type: 'line'
-		});
-	},
-
-	get_chart_data: function() {
-		var me = this;
-		var plottable_cols = [];
-		$.each(me.columns, function(idx, col) {
-			if(col.formatter==me.currency_formatter && !col.hidden && col.plot!==false) {
-				plottable_cols.push(col.field);
-			}
-		});
-
-		var data = {
-			labels: plottable_cols,
-			datasets: []
-		};
-
-		$.each(this.data, function(i, item) {
-			if (item.checked) {
-				let dataset = {};
-				dataset.name = item.name;
-				dataset.values = [];
-				$.each(plottable_cols, function(idx, col) {
-					dataset.values.push(item[col]);
-				});
-				data["datasets"].push(dataset);
-			}
-		});
-		return data;
-	}
-});
-
-
-frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
-	make_transaction_list: function(parent_doctype, doctype) {
-		var me = this;
-		var tmap = {};
-		$.each(frappe.report_dump.data[doctype], function(i, v) {
-			if(!tmap[v.parent]) tmap[v.parent] = [];
-			tmap[v.parent].push(v);
-		});
-		if (!this.tl) this.tl = {};
-		if (!this.tl[parent_doctype]) this.tl[parent_doctype] = [];
-
-		$.each(frappe.report_dump.data[parent_doctype], function(i, parent) {
-			if(tmap[parent.name]) {
-				$.each(tmap[parent.name], function(i, d) {
-					me.tl[parent_doctype].push($.extend(copy_dict(parent), d));
-				});
-			}
-		});
-	},
-	add_tree_grid_events: function() {
-		var me = this;
-		this.grid.onClick.subscribe(function(e, args) {
-			if ($(e.target).hasClass("toggle")) {
-				var item = me.dataView.getItem(args.row);
-				if (item) {
-					if (!item._collapsed) {
-						item._collapsed = true;
-					} else {
-						item._collapsed = false;
-					}
-
-					me.dataView.updateItem(item.id, item);
-				}
-				e.stopImmediatePropagation();
-			}
-		});
-	},
-	tree_formatter: function(row, cell, value, columnDef, dataContext) {
-		var me = frappe.cur_grid_report;
-		var data = me.data;
-		var spacer = "<span style='display:inline-block;height:1px;width:" +
-			(15 * dataContext["indent"]) + "px'></span>";
-		var idx = me.dataView.getIdxById(dataContext.id);
-		var link = me.tree_grid.formatter(dataContext);
-
-		if(dataContext.doctype) {
-			link += me.get_link_open_icon(dataContext.doctype, dataContext.name);
-		}
-
-		if (data[idx + 1] && data[idx + 1].indent > data[idx].indent) {
-			if (dataContext._collapsed) {
-				return spacer + " <span class='toggle expand'></span>&nbsp;" + link;
-			} else {
-				return spacer + " <span class='toggle collapse'></span>&nbsp;" + link;
-			}
-		} else {
-			return spacer + " <span class='toggle'></span>&nbsp;" + link;
-		}
-	},
-	tree_dataview_filter: function(item) {
-		var me = frappe.cur_grid_report;
-		if(!me.apply_filters(item)) return false;
-
-		var parent = item[me.tree_grid.parent_field];
-		while (parent) {
-			if (me.item_by_name[parent]._collapsed) {
-				return false;
-			}
-			parent = me.parent_map[parent];
-		}
-		return true;
-	},
-	prepare_tree: function(item_dt, group_dt) {
-		var group_data = frappe.report_dump.data[group_dt];
-		var item_data = frappe.report_dump.data[item_dt];
-
-		// prepare map with child in respective group
-		var me = this;
-		var item_group_map = {};
-		var group_ids = group_data.map(v => v.id);
-
-		$.each(item_data, function(i, item) {
-			var parent = item[me.tree_grid.parent_field];
-			if(!item_group_map[parent]) item_group_map[parent] = [];
-			if(group_ids.indexOf(item.name)==-1) {
-				item_group_map[parent].push(item);
-			} else {
-				frappe.msgprint(__("Ignoring Item {0}, because a group exists with the same name!", [item.name.bold()]));
-			}
-		});
-
-		// arrange items besides their parent item groups
-		var items = [];
-		$.each(group_data, function(i, group){
-			group.is_group = true;
-			items.push(group);
-			items = items.concat(item_group_map[group.name] || []);
-		});
-		return items;
-	},
-	set_indent: function() {
-		var me = this;
-		$.each(this.data, function(i, d) {
-			var indent = 0;
-			var parent = me.parent_map[d.name];
-			if(parent) {
-				while(parent) {
-					indent++;
-					parent = me.parent_map[parent];
-				}
-			}
-			d.indent = indent;
-		});
-	},
-
-	export: function() {
-		var msgbox =	frappe.msgprint($.format('<p>{0}</p>\
-			<p><input type="checkbox" name="with_groups" checked="checked"> {1}</p>\
-			<p><input type="checkbox" name="with_ledgers" checked="checked"> {2}</p>\
-			<p><button class="btn btn-primary"> {3}</button>', [
-				__('Select To Download:'),
-				__('With Groups'),
-				__('With Ledgers'),
-				__('Download')
-			]));
-
-		var me = this;
-
-		$(msgbox.body).find("button").click(function() {
-			var with_groups = $(msgbox.body).find("[name='with_groups']").prop("checked");
-			var with_ledgers = $(msgbox.body).find("[name='with_ledgers']").prop("checked");
-
-			var data = frappe.slickgrid_tools.get_view_data(me.columns, me.data,
-				function(row, item) {
-					if(with_groups) {
-						// add row
-						for(var i=0; i<item.indent; i++) row[0] = "   " + row[0];
-					}
-					if(with_groups && (item.is_group == 1 || item.is_group)) {
-						return true;
-					}
-					if(with_ledgers && (item.is_group != 1 && !item.is_group)) {
-						return true;
-					}
-
-					return false;
-				});
-
-			frappe.tools.downloadify(data, ["Report Manager", "System Manager"], me.title);
-			return false;
-		});
-
-		return false;
-	},
-
-});
diff --git a/frappe/public/js/frappe/views/reports/reportview.js b/frappe/public/js/frappe/views/reports/reportview.js
deleted file mode 100644
index 5348a21e2a..0000000000
--- a/frappe/public/js/frappe/views/reports/reportview.js
+++ /dev/null
@@ -1,950 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.views.ReportFactory = frappe.views.Factory.extend({
-	make: function(route) {
-		new frappe.views.ReportViewPage(route[1], route[2]);
-	}
-});
-
-frappe.views.ReportViewPage = Class.extend({
-	init: function(doctype, docname) {
-		if(!frappe.model.can_get_report(doctype)) {
-			frappe.show_not_permitted(frappe.get_route_str());
-			return;
-		}
-
-		this.doctype = doctype;
-		this.docname = docname;
-		this.page_name = frappe.get_route_str();
-		this.make_page();
-
-		var me = this;
-		frappe.model.with_doctype(this.doctype, function() {
-			me.make_report_view();
-			if(me.docname) {
-				frappe.model.with_doc('Report', me.docname, function(r) {
-					me.parent.reportview.set_columns_and_filters(
-						JSON.parse(frappe.get_doc("Report", me.docname).json || '{}'));
-					me.parent.reportview.set_route_filters();
-					me.parent.reportview.run();
-				});
-			} else {
-				me.parent.reportview.set_route_filters();
-				me.parent.reportview.run();
-			}
-		});
-	},
-	make_page: function() {
-		var me = this;
-		this.parent = frappe.container.add_page(this.page_name);
-		frappe.ui.make_app_page({parent:this.parent, single_column:true});
-		this.page = this.parent.page;
-
-		frappe.container.change_to(this.page_name);
-
-		$(this.parent).on('show', function(){
-			if(me.parent.reportview.set_route_filters()) {
-				me.parent.reportview.run();
-			}
-		});
-	},
-	make_report_view: function() {
-		this.page.set_title(__(this.doctype));
-		var module = locals.DocType[this.doctype].module;
-		frappe.breadcrumbs.add(module, this.doctype);
-
-		this.parent.reportview = new frappe.views.ReportView({
-			doctype: this.doctype,
-			docname: this.docname,
-			parent: this.parent
-		});
-	}
-});
-
-frappe.views.ReportView = frappe.ui.BaseList.extend({
-	init: function(opts) {
-		var me = this;
-		$.extend(this, opts);
-		this.can_delete = frappe.model.can_delete(me.doctype);
-		this.tab_name = '`tab'+this.doctype+'`';
-		this.setup();
-	},
-
-	setup: function() {
-		var me = this;
-
-		this.add_totals_row = 0;
-		this.page = this.parent.page;
-		this.meta = frappe.get_meta(this.doctype);
-		this._body = $('<div>').appendTo(this.page.main);
-		this.page_title = __('Report')+ ': ' + (this.docname ?
-			__(this.doctype) + ' - ' + __(this.docname) : __(this.doctype));
-		this.page.set_title(this.page_title);
-		this.init_user_settings();
-		this.make({
-			page: this.parent.page,
-			method: 'frappe.desk.reportview.get',
-			save_user_settings: true,
-			get_args: this.get_args,
-			parent: this._body,
-			start: 0,
-			show_filters: true,
-			allow_delete: true,
-		});
-
-		this.make_new_and_refresh();
-		this.make_delete();
-		this.make_column_picker();
-		this.make_sorter();
-		this.make_totals_row_button();
-		this.setup_print();
-		this.make_export();
-		this.setup_auto_email();
-		this.set_init_columns();
-		this.make_save();
-		this.make_user_permissions();
-		this.set_tag_and_status_filter();
-		this.setup_listview_settings();
-
-	},
-
-	make_new_and_refresh: function() {
-		var me = this;
-		this.page.set_primary_action(__("Refresh"), function() {
-			me.run();
-		});
-
-		this.page.add_menu_item(__("New {0}", [this.doctype]), function() {
-			me.make_new_doc(me.doctype);
-		}, true);
-
-	},
-
-	setup_auto_email: function() {
-		var me = this;
-		this.page.add_menu_item(__("Setup Auto Email"), function() {
-			if(me.docname) {
-				frappe.set_route('List', 'Auto Email Report', {'report' : me.docname});
-			} else {
-				frappe.msgprint({message:__('Please save the report first'), indicator: 'red'});
-			}
-		}, true);
-	},
-
-	set_init_columns: function() {
-		// pre-select mandatory columns
-		var me = this;
-		var columns = [];
-		if(this.user_settings.fields && !this.docname) {
-			this.user_settings.fields.forEach(function(field) {
-				var coldef = me.get_column_info_from_field(field);
-				if(!in_list(['_seen', '_comments', '_user_tags', '_assign', '_liked_by', 'docstatus'], coldef[0])) {
-					columns.push(coldef);
-				}
-			});
-		}
-		if(!columns.length) {
-			var columns = [['name', this.doctype],];
-			$.each(frappe.meta.docfield_list[this.doctype], function(i, df) {
-				if((df.in_standard_filter || df.in_list_view) && df.fieldname!='naming_series'
-					&& !in_list(frappe.model.no_value_type, df.fieldtype)
-					&& !df.report_hide) {
-					columns.push([df.fieldname, df.parent]);
-				}
-			});
-		}
-
-		this.set_columns(columns);
-
-		this.page.footer.on('click', '.show-all-data', function() {
-			me.show_all_data = $(this).prop('checked');
-			me.run();
-		})
-	},
-
-	set_columns: function(columns) {
-		this.columns = columns;
-		this.column_info = this.get_columns();
-		this.refresh_footer();
-	},
-
-	refresh_footer: function() {
-		var can_write = frappe.model.can_write(this.doctype);
-		var has_child_column = this.has_child_column();
-
-		this.page.footer.empty();
-
-		if(can_write || has_child_column) {
-			$(frappe.render_template('reportview_footer', {
-				has_child_column: has_child_column,
-				can_write: can_write,
-				show_all_data: this.show_all_data
-			})).appendTo(this.page.footer);
-			this.page.footer.removeClass('hide');
-		} else {
-			this.page.footer.addClass('hide');
-		}
-	},
-
-	// preset columns and filters from saved info
-	set_columns_and_filters: function(opts) {
-		var me = this;
-		this.filter_list.clear_filters();
-		if(opts.columns) {
-			this.set_columns(opts.columns);
-		}
-		if(opts.filters) {
-			$.each(opts.filters, function(i, f) {
-				// f = [doctype, fieldname, condition, value]
-				var df = frappe.meta.get_docfield(f[0], f[1]);
-				if (df && df.fieldtype == "Check") {
-					var value = f[3] ? "Yes" : "No";
-				} else {
-					var value = f[3];
-				}
-				me.filter_list.add_filter(f[0], f[1], f[2], value);
-			});
-		}
-
-		if(opts.add_total_row) {
-			this.add_total_row = opts.add_total_row
-		}
-
-		// first sort
-		if(opts.sort_by) this.sort_by_select.val(opts.sort_by);
-		if(opts.sort_order) this.sort_order_select.val(opts.sort_order);
-
-		// second sort
-		if(opts.sort_by_next) this.sort_by_next_select.val(opts.sort_by_next);
-		if(opts.sort_order_next) this.sort_order_next_select.val(opts.sort_order_next);
-
-		this.add_totals_row = cint(opts.add_totals_row);
-	},
-
-	set_route_filters: function() {
-		var me = this;
-		if(frappe.route_options) {
-			this.set_filters_from_route_options({clear_filters: this.docname ? false : true});
-			return true;
-		} else if(this.user_settings
-			&& this.user_settings.filters
-			&& !this.docname
-			&& (this.user_settings.updated_on != this.user_settings_updated_on)) {
-			// list settings (previous settings)
-			this.filter_list.clear_filters();
-			$.each(this.user_settings.filters, function(i, f) {
-				me.filter_list.add_filter(f[0], f[1], f[2], f[3]);
-			});
-			return true;
-		}
-		this.user_settings_updated_on = this.user_settings.updated_on;
-	},
-
-	setup_print: function() {
-		var me = this;
-		this.page.add_menu_item(__("Print"), function() {
-			frappe.ui.get_print_settings(false, function(print_settings) {
-				var title =  __(me.docname || me.doctype);
-				frappe.render_grid({grid:me.grid, title:title, print_settings:print_settings});
-			})
-
-		}, true);
-	},
-
-	// build args for query
-	get_args: function() {
-		let me = this;
-		let filters = this.filter_list? this.filter_list.get_filters(): [];
-
-		return {
-			doctype: this.doctype,
-			fields: $.map(this.columns || [], function(v) {
-				return me.get_full_column_name(v);
-			}),
-			order_by: this.get_order_by(),
-			add_total_row: this.add_total_row,
-			filters: filters,
-			save_user_settings_fields: 1,
-			with_childnames: 1,
-			file_format_type: this.file_format_type
-		}
-	},
-
-	get_order_by: function() {
-		var order_by = [];
-
-		// first
-		var sort_by_select = this.get_selected_table_and_column(this.sort_by_select);
-		if (sort_by_select) {
-			order_by.push(sort_by_select + " " + this.sort_order_select.val());
-		}
-
-		// second
-		if(this.sort_by_next_select && this.sort_by_next_select.val()) {
-			order_by.push(this.get_selected_table_and_column(this.sort_by_next_select)
-				+ ' ' + this.sort_order_next_select.val());
-		}
-
-		return order_by.join(", ");
-	},
-
-	get_selected_table_and_column: function(select) {
-		if(!select) {
-			return
-		}
-
-		return select.selected_doctype ?
-			this.get_full_column_name([select.selected_fieldname, select.selected_doctype]) : "";
-	},
-
-	// get table_name.column_name
-	get_full_column_name: function(v) {
-		if(!v) return;
-		return (v[1] ? ('`tab' + v[1] + '`') : this.tab_name) + '.`' + v[0] + '`';
-	},
-
-	get_column_info_from_field: function(t) {
-		if(t.indexOf('.')===-1) {
-			return [strip(t, '`'), this.doctype];
-		} else {
-			var parts = t.split('.');
-			return [strip(parts[1], '`'), strip(parts[0], '`').substr(3)];
-		}
-	},
-
-	// build columns for slickgrid
-	build_columns: function() {
-		var me = this;
-		return $.map(this.columns, function(c) {
-			var docfield = frappe.meta.docfield_map[c[1] || me.doctype][c[0]];
-			if(!docfield) {
-				var docfield = frappe.model.get_std_field(c[0]);
-				if(docfield) {
-					docfield.parent = me.doctype;
-					if(c[0]=="name") {
-						docfield.options = me.doctype;
-					}
-				}
-			}
-			if(!docfield) return;
-
-			let coldef = {
-				id: c[0],
-				field: c[0],
-				docfield: docfield,
-				name: __(docfield ? docfield.label : toTitle(c[0])),
-				width: (docfield ? cint(docfield.width) : 120) || 120,
-				formatter: function(row, cell, value, columnDef, dataContext, for_print) {
-					var docfield = columnDef.docfield;
-					docfield.fieldtype = {
-						"_user_tags": "Tag",
-						"_comments": "Comment",
-						"_assign": "Assign",
-						"_liked_by": "LikedBy",
-					}[docfield.fieldname] || docfield.fieldtype;
-
-					if(docfield.fieldtype==="Link" && docfield.fieldname!=="name") {
-
-						// make a copy of docfield for reportview
-						// as it needs to add a link_onclick property
-						if(!columnDef.report_docfield) {
-							columnDef.report_docfield = copy_dict(docfield);
-						}
-						docfield = columnDef.report_docfield;
-
-						docfield.link_onclick =
-							repl('frappe.container.page.reportview.filter_or_open("%(parent)s", "%(fieldname)s", "%(value)s")',
-								{parent: docfield.parent, fieldname:docfield.fieldname, value:value});
-					}
-					return frappe.format(value, docfield, {for_print: for_print, always_show_decimals: true}, dataContext);
-				}
-			}
-			return coldef;
-		});
-	},
-
-	filter_or_open: function(parent, fieldname, value) {
-		// set filter on click, if filter is set, open the document
-		var filter_set = false;
-		this.filter_list.get_filters().forEach(function(f) {
-			if(f[1]===fieldname) {
-				filter_set = true;
-			}
-		});
-
-		if(!filter_set) {
-			this.set_filter(fieldname, value, false, false, parent);
-		} else {
-			var df = frappe.meta.get_docfield(parent, fieldname);
-			if(df.fieldtype==='Link') {
-				frappe.set_route('Form', df.options, value);
-			}
-		}
-	},
-
-	// render data
-	render_view: function() {
-		var me = this;
-		var data = this.get_unique_data(this.column_info);
-
-		this.set_totals_row(data, this.column_info);
-
-		// add sr in data
-		$.each(data, function(i, v) {
-			// add index
-			v._idx = i+1;
-			v.id = v._idx;
-		});
-
-		var options = {
-			enableCellNavigation: true,
-			enableColumnReorder: false,
-		};
-
-		if(this.slickgrid_options) {
-			$.extend(options, this.slickgrid_options);
-		}
-
-		this.dataView = new Slick.Data.DataView();
-		this.set_data(data);
-
-		var grid_wrapper = this.wrapper.find('.result-list').addClass("slick-wrapper");
-
-		// set height if not auto
-		if(!options.autoHeight)
-			grid_wrapper.css('height', '500px');
-
-		this.grid = new Slick.Grid(grid_wrapper
-			.get(0), this.dataView,
-			this.column_info, options);
-
-		if (!frappe.dom.is_touchscreen()) {
-			this.grid.setSelectionModel(new Slick.CellSelectionModel());
-			this.grid.registerPlugin(new Slick.CellExternalCopyManager({
-				dataItemColumnValueExtractor: function(item, columnDef, value) {
-					return item[columnDef.field];
-				}
-			}));
-		}
-
-		frappe.slickgrid_tools.add_property_setter_on_resize(this.grid);
-		if(this.start!=0 && !options.autoHeight) {
-			this.grid.scrollRowIntoView(data.length-1);
-		}
-
-		this.grid.onDblClick.subscribe(function(e, args) {
-			var row = me.dataView.getItem(args.row);
-			var cell = me.grid.getColumns()[args.cell];
-			me.edit_cell(row, cell.docfield);
-		});
-
-		this.dataView.onRowsChanged.subscribe(function (e, args) {
-			me.grid.invalidateRows(args.rows);
-			me.grid.render();
-		});
-
-		this.grid.onHeaderClick.subscribe(function(e, args) {
-			if(e.target.className === "slick-resizable-handle")
-				return;
-
-
-			var df = args.column.docfield,
-				sort_by = df.parent + "." + df.fieldname;
-
-			if(sort_by===me.sort_by_select.val()) {
-				me.sort_order_select.val(me.sort_order_select.val()==="asc" ? "desc" : "asc");
-			} else {
-				me.sort_by_select.val(df.parent + "." + df.fieldname);
-				me.sort_order_select.val("asc");
-			}
-
-			me.run();
-		});
-	},
-
-	has_child_column: function() {
-		var me = this;
-		return this.column_info.some(function(c) {
-			return c.docfield && c.docfield.parent !== me.doctype;
-		});
-	},
-
-	get_unique_data: function(columns) {
-		// if child columns are selected, show parent data only once
-		let has_child_column = this.has_child_column();
-
-		var data = [], prev_row = null;
-		this.data.forEach((d) => {
-			if (this.show_all_data || !has_child_column) {
-				data.push(d);
-			} else if (prev_row && d.name == prev_row.name) {
-				var new_row = {};
-				columns.forEach((c) => {
-					if(!c.docfield || c.docfield.parent!==this.doctype) {
-						var val = d[c.field];
-						// add child table row name for update
-						if(c.docfield && c.docfield.parent!==this.doctype) {
-							new_row[c.docfield.parent+":name"] = d[c.docfield.parent+":name"];
-						}
-					} else {
-						var val = '';
-						new_row.__is_repeat = true;
-					}
-					new_row[c.field] = val;
-				});
-				data.push(new_row);
-			} else {
-				data.push(d);
-			}
-			prev_row = d;
-		});
-		return data;
-	},
-
-	edit_cell: function(row, docfield) {
-		if(!docfield || docfield.fieldname !== "idx"
-			&& frappe.model.std_fields_list.indexOf(docfield.fieldname)!==-1) {
-			return;
-		} else if(frappe.boot.user.can_write.indexOf(this.doctype)===-1) {
-			frappe.throw({message:__("No permission to edit"), title:__('Not Permitted')});
-		}
-		var me = this;
-		var d = new frappe.ui.Dialog({
-			title: __("Edit") + " " + __(docfield.label),
-			fields: [docfield],
-			primary_action_label: __("Update"),
-			primary_action: function() {
-				me.update_value(docfield, d, row);
-			}
-		});
-		d.set_input(docfield.fieldname, row[docfield.fieldname]);
-
-		// Show dialog if field is editable and not hidden
-		if (d.fields_list[0].disp_status != "Write") d.hide();
-		else d.show();
-	},
-
-	update_value: function(docfield, dialog, row) {
-		// update value on the serverside
-		var me = this;
-		var args = {
-			doctype: docfield.parent,
-			name: row[docfield.parent===me.doctype ? "name" : docfield.parent+":name"],
-			fieldname: docfield.fieldname,
-			value: dialog.get_value(docfield.fieldname)
-		};
-
-		if (!args.name) {
-			frappe.throw(__("ID field is required to edit values using Report. Please select the ID field using the Column Picker"));
-		}
-
-		frappe.call({
-			method: "frappe.client.set_value",
-			args: args,
-			callback: function(r) {
-				if(!r.exc) {
-					dialog.hide();
-					var doc = r.message;
-					$.each(me.dataView.getItems(), function(i, item) {
-						if (item.name === doc.name) {
-							var new_item = $.extend({}, item);
-							$.each(frappe.model.get_all_docs(doc), function(i, d) {
-								// find the document of the current updated record
-								// from locals (which is synced in the response)
-								var name = item[d.doctype + ":name"];
-								if(!name) name = item.name;
-
-								if(name===d.name) {
-									for(var k in d) {
-										var v = d[k];
-										if(frappe.model.std_fields_list.indexOf(k)===-1
-											&& item[k]!==undefined) {
-											new_item[k] = v;
-										}
-									}
-								}
-							});
-							me.dataView.updateItem(item.id, new_item);
-						}
-					});
-				}
-			}
-		});
-	},
-
-	set_data: function(data) {
-		this.dataView.beginUpdate();
-		this.dataView.setItems(data);
-		this.dataView.endUpdate();
-	},
-
-	get_columns: function() {
-		var std_columns = [{id:'_idx', field:'_idx', name: 'Sr.', width: 40, maxWidth: 40}];
-		if(this.can_delete) {
-			std_columns = std_columns.concat([{
-				id:'_check', field:'_check', name: "", width: 30, maxWidth: 30,
-				formatter: function(row, cell, value, columnDef, dataContext) {
-					return repl("<input type='checkbox' \
-						data-row='%(row)s' %(checked)s>", {
-							row: row,
-							checked: (dataContext.selected ? "checked=\"checked\"" : "")
-						});
-				}
-			}]);
-		}
-		return std_columns.concat(this.build_columns());
-	},
-
-	// setup column picker
-	make_column_picker: function() {
-		var me = this;
-		this.column_picker = new frappe.ui.ColumnPicker(this);
-		this.page.add_inner_button(__('Pick Columns'), function() {
-			me.column_picker.show(me.columns);
-		});
-	},
-
-	make_totals_row_button: function() {
-		var me = this;
-
-		this.page.add_inner_button(__('Show Totals'), function() {
-			me.add_totals_row = !!!me.add_totals_row;
-			me.render_view();
-		});
-	},
-
-	set_totals_row: function(data, columns) {
-		const field_map = {};
-		const numeric_fieldtypes = ['Int', 'Currency', 'Float'];
-		columns.forEach(function(row) {
-			if (row.docfield) {
-				let r = row.docfield;
-				if (numeric_fieldtypes.includes(r.fieldtype)) {
-					field_map[r.fieldname] = [r.fieldtype];
-				}
-			}
-		})
-		if(this.add_totals_row) {
-			var totals_row = {_totals_row: 1};
-			if(data.length) {
-				data.forEach(function(row, ri) {
-					$.each(row, function(key, value) {
-						if (key in field_map) {
-							totals_row[key] = (totals_row[key] || 0) + (value || 0);
-						}
-					});
-				});
-			}
-			data.push(totals_row);
-		}
-	},
-
-	set_tag_and_status_filter: function() {
-		var me = this;
-		this.wrapper.find('.result-list').on("click", ".label-info", function() {
-			if($(this).attr("data-label")) {
-				me.set_filter("_user_tags", $(this).attr("data-label"));
-			}
-		});
-		this.wrapper.find('.result-list').on("click", "[data-workflow-state]", function() {
-			if($(this).attr("data-workflow-state")) {
-				me.set_filter(me.state_fieldname,
-					$(this).attr("data-workflow-state"));
-			}
-		});
-	},
-
-	// setup sorter
-	make_sorter: function() {
-		var me = this;
-		this.sort_dialog = new frappe.ui.Dialog({title:__('Sorting Preferences')});
-		$(this.sort_dialog.body).html('<p class="help">'+__('Sort By')+'</p>\
-			<div class="sort-column"></div>\
-			<div><select class="sort-order form-control" style="margin-top: 10px; width: 60%;">\
-				<option value="asc">'+__('Ascending')+'</option>\
-				<option value="desc">'+__('Descending')+'</option>\
-			</select></div>\
-			<hr><p class="help">'+__('Then By (optional)')+'</p>\
-			<div class="sort-column-1"></div>\
-			<div><select class="sort-order-1 form-control" style="margin-top: 10px; width: 60%;">\
-				<option value="asc">'+__('Ascending')+'</option>\
-				<option value="desc">'+__('Descending')+'</option>\
-			</select></div><hr>\
-			<div><button class="btn btn-primary">'+__('Update')+'</div>');
-
-		// first
-		this.sort_by_select = new frappe.ui.FieldSelect({
-			parent: $(this.sort_dialog.body).find('.sort-column'),
-			doctype: this.doctype
-		});
-		this.sort_by_select.$select.css('width', '60%');
-		this.sort_order_select = $(this.sort_dialog.body).find('.sort-order');
-
-		// second
-		this.sort_by_next_select = new frappe.ui.FieldSelect({
-			parent: $(this.sort_dialog.body).find('.sort-column-1'),
-			doctype: this.doctype,
-			with_blank: true
-		});
-		this.sort_by_next_select.$select.css('width', '60%');
-		this.sort_order_next_select = $(this.sort_dialog.body).find('.sort-order-1');
-
-		// initial values
-		this.sort_by_select.set_value(this.doctype, 'modified');
-		this.sort_order_select.val('desc');
-
-		this.sort_by_next_select.clear();
-		this.sort_order_next_select.val('desc');
-
-		// button actions
-		this.page.add_inner_button(__('Sort Order'), function() {
-			me.sort_dialog.show();
-		});
-
-		$(this.sort_dialog.body).find('.btn-primary').click(function() {
-			me.sort_dialog.hide();
-			me.run();
-		});
-	},
-
-	// setup export
-	make_export: function() {
-		var me = this;
-		if(!frappe.model.can_export(this.doctype)) {
-			return;
-		}
-		var export_btn = this.page.add_menu_item(__('Export'), function() {
-			var args = me.get_args();
-			var selected_items = me.get_checked_items()
-			frappe.prompt({fieldtype:"Select", label: __("Select File Type"), fieldname:"file_format_type",
-				options:"Excel\nCSV", default:"Excel", reqd: 1},
-				function(data) {
-					args.cmd = 'frappe.desk.reportview.export_query';
-					args.file_format_type = data.file_format_type;
-
-					if(me.add_totals_row) {
-						args.add_totals_row = 1;
-					}
-
-					if(selected_items.length >= 1) {
-						args.selected_items = $.map(selected_items, function(d) { return d.name; });
-					}
-					open_url_post(frappe.request.url, args);
-
-				}, __("Export Report: {0}",[__(me.doctype)]), __("Download"));
-
-		}, true);
-	},
-
-
-	// save
-	make_save: function() {
-		var me = this;
-		if(frappe.user.is_report_manager()) {
-			this.page.add_menu_item(__('Save'), function() { me.save_report('save') }, true);
-			this.page.add_menu_item(__('Save As'), function() { me.save_report('save_as') }, true);
-		}
-	},
-
-	save_report: function(save_type) {
-		var me = this;
-
-		var _save_report = function(name) {
-			// callback
-			return frappe.call({
-				method: 'frappe.desk.reportview.save_report',
-				args: {
-					name: name,
-					doctype: me.doctype,
-					json: JSON.stringify({
-						filters: me.filter_list.get_filters(),
-						columns: me.columns,
-						sort_by: me.sort_by_select.val(),
-						sort_order: me.sort_order_select.val(),
-						sort_by_next: me.sort_by_next_select.val(),
-						sort_order_next: me.sort_order_next_select.val(),
-						add_totals_row: me.add_totals_row
-					})
-				},
-				callback: function(r) {
-					if(r.exc) {
-						frappe.msgprint(__("Report was not saved (there were errors)"));
-						return;
-					}
-					if(r.message != me.docname)
-						frappe.set_route('Report', me.doctype, r.message);
-				}
-			});
-
-		}
-
-		if(me.docname && save_type == "save") {
-			_save_report(me.docname);
-		} else {
-			frappe.prompt({fieldname: 'name', label: __('New Report name'), reqd: 1, fieldtype: 'Data'}, function(data) {
-				_save_report(data.name);
-			}, __('Save As'));
-		}
-
-	},
-
-	make_delete: function() {
-		var me = this;
-		if(this.can_delete) {
-			$(this.parent).on("click", "input[type='checkbox'][data-row]", function() {
-				me.data[$(this).attr("data-row")].selected
-					= this.checked ? true : false;
-			});
-
-			this.page.add_menu_item(__("Delete"), function() {
-				var delete_list = $.map(me.get_checked_items(), function(d) {
-					return d.name.toString();
-				});
-				if(!delete_list.length)
-					return;
-				if(frappe.confirm(__("This is PERMANENT action and you cannot undo. Continue?"),
-					function() {
-						return frappe.call({
-							method: 'frappe.desk.reportview.delete_items',
-							args: {
-								items: delete_list,
-								doctype: me.doctype
-							},
-							callback: function() {
-								me.refresh();
-							}
-						});
-					}));
-
-			}, true);
-		}
-	},
-
-	make_user_permissions: function() {
-		var me = this;
-		if(this.docname && frappe.model.can_set_user_permissions("Report")) {
-			this.page.add_menu_item(__("User Permissions"), function() {
-				frappe.route_options = {
-					doctype: "Report",
-					name: me.docname
-				};
-				frappe.set_route('List', 'User Permission');
-			}, true);
-		}
-	},
-
-	setup_listview_settings: function() {
-		if(frappe.listview_settings[this.doctype] && frappe.listview_settings[this.doctype].onload) {
-			frappe.listview_settings[this.doctype].onload(this);
-		}
-	},
-
-	get_checked_items: function() {
-		var me = this;
-		var selected_records = []
-
-		$.each(me.data, function(i, d) {
-			if(d.selected && d.name) {
-				selected_records.push(d);
-			}
-		});
-
-		return selected_records
-	}
-});
-
-frappe.ui.ColumnPicker = Class.extend({
-	init: function(list) {
-		this.list = list;
-		this.doctype = list.doctype;
-	},
-	clear: function() {
-		this.columns = [];
-		$(this.dialog.body).html('<div class="text-muted">'+__("Drag to sort columns")+'</div>\
-			<div class="column-list"></div>\
-			<div><button class="btn btn-default btn-sm btn-add">'+__("Add Column")+'</button></div>');
-
-	},
-	show: function(columns) {
-		var me = this;
-		if(!this.dialog) {
-			this.dialog = new frappe.ui.Dialog({
-				title: __("Pick Columns"),
-				width: '400',
-				primary_action_label: __("Update"),
-				primary_action: function() {
-					me.update_column_selection();
-				}
-			});
-			this.dialog.$wrapper.addClass("column-picker-dialog");
-		}
-
-		this.clear();
-
-		this.column_list = $(this.dialog.body).find('.column-list');
-
-		// show existing
-		$.each(columns, function(i, c) {
-			me.add_column(c);
-		});
-
-		new Sortable(this.column_list.get(0), {
-			filter: 'input',
-			draggable: '.column-list-item',
-			chosenClass: 'sortable-chosen',
-			dragClass: 'sortable-chosen',
-			onUpdate: function(event) {
-				me.columns = [];
-				$.each($(me.dialog.body).find('.column-list .column-list-item'),
-					function(i, ele) {
-						me.columns.push($(ele).data("fieldselect"))
-					});
-			}
-		});
-
-		// add column
-		$(this.dialog.body).find('.btn-add').click(function() {
-			me.add_column(['name']);
-		});
-
-		this.dialog.show();
-	},
-	add_column: function(c) {
-		if(!c) return;
-		var me = this;
-
-		var w = $('<div class="column-list-item"><div class="row">\
-				<div class="col-xs-1">\
-					<i class="fa fa-sort text-muted"></i></div>\
-				<div class="col-xs-10"></div>\
-				<div class="col-xs-1"><a class="close">&times;</a></div>\
-			</div></div>')
-			.appendTo(this.column_list);
-
-		var fieldselect = new frappe.ui.FieldSelect({parent:w.find('.col-xs-10'), doctype:this.doctype});
-		fieldselect.val((c[1] || this.doctype) + "." + c[0]);
-
-		w.data("fieldselect", fieldselect);
-
-		w.find('.close').data("fieldselect", fieldselect)
-			.click(function() {
-				delete me.columns[me.columns.indexOf($(this).data('fieldselect'))];
-				$(this).parents('.column-list-item').remove();
-			});
-
-		this.columns.push(fieldselect);
-	},
-	update_column_selection: function() {
-		this.dialog.hide();
-		// selected columns as list of [column_name, table_name]
-		var columns = $.map(this.columns, function(v) {
-			return (v && v.selected_fieldname && v.selected_doctype)
-				? [[v.selected_fieldname, v.selected_doctype]]
-				: null;
-		});
-
-		this.list.set_columns(columns);
-		this.list.run();
-	}
-});
diff --git a/frappe/public/js/frappe/views/reports/reportview_footer.html b/frappe/public/js/frappe/views/reports/reportview_footer.html
deleted file mode 100644
index d6362eb558..0000000000
--- a/frappe/public/js/frappe/views/reports/reportview_footer.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="row">
-	<div class="col-md-6">
-		{% if has_child_column %}
-			<div class="checkbox">
-			    <label>
-			        <input type="checkbox" class="show-all-data"
-						style="margin-top: 2px"
-						{{ show_all_data ? "checked" : "" }}>
-						{{ __("Show all data") }}
-			    </label>
-			</div>
-		{% endif %}
-	</div>
-	{% if can_write %}
-	<div class="col-md-6 text-right"><p class="text-muted">
-		{{ __("Tip:  Double click cell to edit") }}</p></div>
-	{% endif %}
-</div>
\ No newline at end of file

From cdec5d93dc94d83257c8c52cce47793610989919 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Apr 2019 20:26:43 +0530
Subject: [PATCH 019/175] feat(list): show percent bar in list (#7381)

---
 frappe/public/js/frappe/list/list_view.js | 7 +++++++
 frappe/public/less/desk.less              | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 7b6aca725e..24b613d116 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -518,6 +518,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				return formatters[fieldname](value, df, doc);
 			} else if (df.fieldtype === 'Code') {
 				return value;
+			} else if (df.fieldtype === 'Percent') {
+				return `<div class="progress level" style="margin: 0px;">
+						<div class="progress-bar progress-bar-success" role="progressbar"
+							aria-valuenow="${value}"
+							aria-valuemin="0" aria-valuemax="100" style="width: ${Math.round(value)}%;">
+						</div>
+					</div>`;
 			} else {
 				return frappe.format(value, df, null, doc);
 			}
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7e56e169ed..5d043babc1 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -273,6 +273,10 @@ textarea.form-control {
 	margin-right: 10px;
 }
 
+.progress, .progress-bar {
+	box-shadow: none;
+}
+
 a.progress-small {
 	.progress-chart {
 		width: 40px;

From f22e84f31f82c649893aa69451c6253ecf87805a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 1 May 2019 11:47:42 +0530
Subject: [PATCH 020/175] chore: updated docstrings for get_print

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 1d33fb1926..2d7af4d63d 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1336,7 +1336,8 @@ def get_print(doctype=None, name=None, print_format=None, style=None, html=None,
 	:param name: Name of document.
 	:param print_format: Print Format name. Default 'Standard',
 	:param style: Print Format style.
-	:param as_pdf: Return as PDF. Default False."""
+	:param as_pdf: Return as PDF. Default False.
+	:param password: Password to encrypt the pdf with. Default None"""
 	from frappe.website.render import build_page
 	from frappe.utils.pdf import get_pdf
 

From 1fd944323698daa1a6e547e62484f333bd420fe4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 1 May 2019 12:13:50 +0530
Subject: [PATCH 021/175] fix: Route label should be title cased (#7380)

- query-report should be Query Report
---
 frappe/public/js/frappe/misc/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 0ec838281c..f76afa5519 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -648,10 +648,10 @@ Object.assign(frappe.utils, {
 	},
 	get_route_label(route_str) {
 		let route = route_str.split('/');
-		if (['List', 'modules'].includes(route[0])){
+		if (['List', 'modules'].includes(route[0])) {
 			return `${route[1]} ${route[2] || route[0]}`;
 		} else {
-			return `${route[0]} ${route[1]}`;
+			return `${frappe.utils.to_title_case(route[0], true)} ${route[1]}`;
 		}
 	},
 	report_column_total: function(values, column, type) {

From 7cf9524bc0b25e733fc202b9a282061585e31cae Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 1 May 2019 12:43:19 +0530
Subject: [PATCH 022/175] fix: Set user language in print preview

The User language was set in the select control but the value didn't pass
correctly in the request, because `this.lang_code` wasn't set.
We also abort duplicate requests.
---
 frappe/public/js/frappe/form/print.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 609a5bec31..41119c6497 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -128,13 +128,8 @@ frappe.ui.form.PrintPreview = Class.extend({
 	},
 	set_default_print_language: function () {
  		var print_format = this.get_print_format();
-
- 		if (print_format.default_print_language) {
- 			this.lang_code = print_format.default_print_language;
- 			this.language_sel.val(this.lang_code);
- 		} else {
-			this.language_sel.val(frappe.boot.lang);
-		}
+		this.lang_code = print_format.default_print_format || frappe.boot.lang;
+		this.language_sel.val(this.lang_code);
  	},
 	multilingual_preview: function () {
 		var me = this;
@@ -257,7 +252,10 @@ frappe.ui.form.PrintPreview = Class.extend({
 		}
 	},
 	get_print_html: function (callback) {
-		frappe.call({
+		if (this._req) {
+			this._req.abort();
+		}
+		this._req = frappe.call({
 			method: "frappe.www.printview.get_html_and_style",
 			args: {
 				doc: this.frm.doc,

From 3c08a596daf1c11a3fde74488b8008d50dd580e0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 1 May 2019 13:13:30 +0530
Subject: [PATCH 023/175] fix: Translate route label & fix label for reports

---
 frappe/public/js/frappe/misc/utils.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index f76afa5519..5637862179 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -648,11 +648,18 @@ Object.assign(frappe.utils, {
 	},
 	get_route_label(route_str) {
 		let route = route_str.split('/');
-		if (['List', 'modules'].includes(route[0])) {
-			return `${route[1]} ${route[2] || route[0]}`;
-		} else {
-			return `${frappe.utils.to_title_case(route[0], true)} ${route[1]}`;
+
+		if (route[2] === 'Report' || route[0] === 'query-report') {
+			return __('{0} Report', [route[3] || route[1]]);
 		}
+		if (route[0] === 'List') {
+			return __('{0} List', [route[1]]);
+		}
+		if (route[0] === 'modules') {
+			return __('{0} Modules', [route[1]]);
+		}
+
+		return `${route[1]} ${frappe.utils.to_title_case(route[0], true)}`;
 	},
 	report_column_total: function(values, column, type) {
 		if (column.column.fieldtype == "Percent" || type === "mean") {

From 49c4645e3d2bbfcdb9a796998daf4c3bf7ce2b37 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 1 May 2019 13:57:31 +0530
Subject: [PATCH 024/175] fix: Don't set root_label as page title in tree

Root label is already shown in the Tree and in some cases the filter
---
 frappe/public/js/frappe/views/treeview.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js
index 3c99a20f62..77a9c96b04 100644
--- a/frappe/public/js/frappe/views/treeview.js
+++ b/frappe/public/js/frappe/views/treeview.js
@@ -107,11 +107,10 @@ frappe.views.TreeView = Class.extend({
 					me.args[filter.fieldname] = val;
 					if (val) {
 						me.root_label = val;
-						me.page.set_title(val);
 					} else {
 						me.root_label = me.opts.root_label;
-						me.set_title();
 					}
+					me.set_title();
 					me.make_tree();
 				}
 			}

From d7238746b767773b9fdac9b706ce4c265fa2d012 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 1 May 2019 14:04:36 +0530
Subject: [PATCH 025/175] fix: Return only first part (in case of pages)

---
 frappe/public/js/frappe/misc/utils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 5637862179..47ca770875 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -658,8 +658,7 @@ Object.assign(frappe.utils, {
 		if (route[0] === 'modules') {
 			return __('{0} Modules', [route[1]]);
 		}
-
-		return `${route[1]} ${frappe.utils.to_title_case(route[0], true)}`;
+		return __(route[0]);
 	},
 	report_column_total: function(values, column, type) {
 		if (column.column.fieldtype == "Percent" || type === "mean") {

From d7cd3cab211d278cfedddb508e0c79d4a7930243 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 1 May 2019 15:53:16 +0530
Subject: [PATCH 026/175] patch: remove user perm for page and report doctype
 (#7383)

* fix: status options for integration request

* patch: remove user perm for page and report doctype
---
 .../integration_request.json                  | 54 ++++++++++++++++---
 frappe/patches.txt                            |  2 +-
 ...pe_user_permissions_for_page_and_report.py |  3 +-
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/frappe/integrations/doctype/integration_request/integration_request.json b/frappe/integrations/doctype/integration_request/integration_request.json
index f69668973e..c3123fb574 100644
--- a/frappe/integrations/doctype/integration_request/integration_request.json
+++ b/frappe/integrations/doctype/integration_request/integration_request.json
@@ -1,5 +1,7 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "beta": 0, 
@@ -12,16 +14,20 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "integration_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Integration Type", 
@@ -38,19 +44,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "integration_request_service", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Integration Request Service", 
@@ -67,26 +78,31 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "default": "Queued", 
+   "fetch_if_empty": 0, 
    "fieldname": "status", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Status", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "\nQueued\nAuthorized\nCompleted\nCancelled\nFailed\n", 
+   "options": "\nQueued\nAuthorized\nCompleted\nCancelled\nFailed", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -97,19 +113,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "data", 
    "fieldtype": "Code", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Data", 
@@ -125,19 +146,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "output", 
    "fieldtype": "Code", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Output", 
@@ -153,19 +179,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "error", 
    "fieldtype": "Code", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Error", 
@@ -181,19 +212,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "reference_doctype", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Reference Doctype", 
@@ -210,19 +246,24 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fetch_if_empty": 0, 
    "fieldname": "reference_docname", 
    "fieldtype": "Dynamic Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Reference Docname", 
@@ -239,20 +280,21 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
+   "translatable": 0, 
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 1, 
-
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2019-10-09 14:40:00.783063", 
+ "modified": "2019-04-25 16:38:21.084580", 
  "modified_by": "Administrator", 
  "module": "Integrations", 
  "name": "Integration Request", 
@@ -261,7 +303,6 @@
  "permissions": [
   {
    "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 1, 
@@ -269,7 +310,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -284,9 +324,11 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "integration_request_service", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 0549913589..a1ed371bb9 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -230,7 +230,6 @@ frappe.patches.v11_0.delete_all_prepared_reports
 frappe.patches.v11_0.fix_order_by_in_reports_json
 execute:frappe.delete_doc('Page', 'applications', ignore_missing=True)
 frappe.patches.v11_0.set_missing_creation_and_modified_value_for_user_permissions
-frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report
 frappe.patches.v11_0.set_default_letter_head_source
 frappe.patches.v12_0.set_primary_key_in_series
 execute:frappe.delete_doc("Page", "modules", ignore_missing=True)
@@ -240,3 +239,4 @@ frappe.patches.v12_0.init_desk_settings #11-03-2019
 frappe.patches.v12_0.replace_null_values_in_tables
 frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
+frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
diff --git a/frappe/patches/v11_0/remove_doctype_user_permissions_for_page_and_report.py b/frappe/patches/v11_0/remove_doctype_user_permissions_for_page_and_report.py
index c1dc1b79be..e2c2ef5f0e 100644
--- a/frappe/patches/v11_0/remove_doctype_user_permissions_for_page_and_report.py
+++ b/frappe/patches/v11_0/remove_doctype_user_permissions_for_page_and_report.py
@@ -5,5 +5,4 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-    if frappe.db.table_exists('User Permission for Page and Report'):
-        frappe.delete_doc("DocType", "User Permission for Page and Report")
\ No newline at end of file
+        frappe.delete_doc_if_exists("DocType", "User Permission for Page and Report")
\ No newline at end of file

From e33f89e4e6eae83c21d515bc3e7bf70db730408d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 1 May 2019 15:57:35 +0530
Subject: [PATCH 027/175] fix: Convert page route to title case

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

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 47ca770875..705b0c82cb 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -658,7 +658,7 @@ Object.assign(frappe.utils, {
 		if (route[0] === 'modules') {
 			return __('{0} Modules', [route[1]]);
 		}
-		return __(route[0]);
+		return __(frappe.utils.to_title_case(route[0], true));
 	},
 	report_column_total: function(values, column, type) {
 		if (column.column.fieldtype == "Percent" || type === "mean") {

From 7f69299518eed9655cda3e3b0272c89fea53d353 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 2 May 2019 02:38:19 +0530
Subject: [PATCH 028/175] fix: travis

---
 .../dashboard_chart/test_dashboard_chart.py   | 114 +++++++++++-------
 1 file changed, 68 insertions(+), 46 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index ca55d9254a..e38faef95c 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -8,6 +8,10 @@ from frappe.utils import getdate
 from frappe.desk.doctype.dashboard_chart.dashboard_chart import (get,
 	get_period_ending)
 
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+import calendar
+
 class TestDashboardChart(unittest.TestCase):
 	def test_period_ending(self):
 		self.assertEqual(get_period_ending('2019-04-10', 'Daily'),
@@ -48,21 +52,27 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		result = get(chart_name ='Test Dashboard Chart',
-			to_date = '2019-04-11', refresh = 1)
-		self.assertEqual(result.get('labels')[0], '2018-04-30')
-		self.assertEqual(result.get('labels')[1], '2018-05-31')
-		self.assertEqual(result.get('labels')[2], '2018-06-30')
-		self.assertEqual(result.get('labels')[3], '2018-07-31')
-		self.assertEqual(result.get('labels')[4], '2018-08-31')
-		self.assertEqual(result.get('labels')[5], '2018-09-30')
-		self.assertEqual(result.get('labels')[6], '2018-10-31')
-		self.assertEqual(result.get('labels')[7], '2018-11-30')
-		self.assertEqual(result.get('labels')[8], '2018-12-31')
-		self.assertEqual(result.get('labels')[9], '2019-01-31')
-		self.assertEqual(result.get('labels')[10], '2019-02-28')
-		self.assertEqual(result.get('labels')[11], '2019-03-31')
-		self.assertEqual(result.get('labels')[12], '2019-04-30')
+		months = []
+		cur_date = datetime.now() - relativedelta(years=1)
+
+		for x in range(13):
+			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+			cur_date += relativedelta(months=1)
+
+		result = get(chart_name ='Test Dashboard Chart', refresh = 1)
+		self.assertEqual(result.get('labels')[0], months[0])
+		self.assertEqual(result.get('labels')[1], months[1])
+		self.assertEqual(result.get('labels')[2], months[2])
+		self.assertEqual(result.get('labels')[3], months[3])
+		self.assertEqual(result.get('labels')[4], months[4])
+		self.assertEqual(result.get('labels')[5], months[5])
+		self.assertEqual(result.get('labels')[6], months[6])
+		self.assertEqual(result.get('labels')[7], months[7])
+		self.assertEqual(result.get('labels')[8], months[8])
+		self.assertEqual(result.get('labels')[9], months[9])
+		self.assertEqual(result.get('labels')[10], months[10])
+		self.assertEqual(result.get('labels')[11], months[11])
+		self.assertEqual(result.get('labels')[12], months[12])
 
 		# self.assertEqual(result.get('datasets')[0].get('values')[:-1],
 		# 	[44, 28, 8, 11, 2, 6, 18, 6, 4, 5, 15, 13])
@@ -87,21 +97,27 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		result = get(chart_name ='Test Empty Dashboard Chart',
-			to_date = '2019-04-11', refresh = 1)
-		self.assertEqual(result.get('labels')[0], '2018-04-30')
-		self.assertEqual(result.get('labels')[1], '2018-05-31')
-		self.assertEqual(result.get('labels')[2], '2018-06-30')
-		self.assertEqual(result.get('labels')[3], '2018-07-31')
-		self.assertEqual(result.get('labels')[4], '2018-08-31')
-		self.assertEqual(result.get('labels')[5], '2018-09-30')
-		self.assertEqual(result.get('labels')[6], '2018-10-31')
-		self.assertEqual(result.get('labels')[7], '2018-11-30')
-		self.assertEqual(result.get('labels')[8], '2018-12-31')
-		self.assertEqual(result.get('labels')[9], '2019-01-31')
-		self.assertEqual(result.get('labels')[10], '2019-02-28')
-		self.assertEqual(result.get('labels')[11], '2019-03-31')
-		self.assertEqual(result.get('labels')[12], '2019-04-30')
+		months = []
+		cur_date = datetime.now() - relativedelta(years=1)
+
+		for x in range(13):
+			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+			cur_date += relativedelta(months=1)
+
+		result = get(chart_name ='Test Empty Dashboard Chart', refresh = 1)
+		self.assertEqual(result.get('labels')[0], months[0])
+		self.assertEqual(result.get('labels')[1], months[1])
+		self.assertEqual(result.get('labels')[2], months[2])
+		self.assertEqual(result.get('labels')[3], months[3])
+		self.assertEqual(result.get('labels')[4], months[4])
+		self.assertEqual(result.get('labels')[5], months[5])
+		self.assertEqual(result.get('labels')[6], months[6])
+		self.assertEqual(result.get('labels')[7], months[7])
+		self.assertEqual(result.get('labels')[8], months[8])
+		self.assertEqual(result.get('labels')[9], months[9])
+		self.assertEqual(result.get('labels')[10], months[10])
+		self.assertEqual(result.get('labels')[11], months[11])
+		self.assertEqual(result.get('labels')[12], months[12])
 
 		frappe.db.rollback()
 
@@ -126,24 +142,30 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		result = get(chart_name ='Test Empty Dashboard Chart 2',
-			to_date = '2019-04-11', refresh = 1)
-		self.assertEqual(result.get('labels')[0], '2018-04-30')
-		self.assertEqual(result.get('labels')[1], '2018-05-31')
-		self.assertEqual(result.get('labels')[2], '2018-06-30')
-		self.assertEqual(result.get('labels')[3], '2018-07-31')
-		self.assertEqual(result.get('labels')[4], '2018-08-31')
-		self.assertEqual(result.get('labels')[5], '2018-09-30')
-		self.assertEqual(result.get('labels')[6], '2018-10-31')
-		self.assertEqual(result.get('labels')[7], '2018-11-30')
-		self.assertEqual(result.get('labels')[8], '2018-12-31')
-		self.assertEqual(result.get('labels')[9], '2019-01-31')
-		self.assertEqual(result.get('labels')[10], '2019-02-28')
-		self.assertEqual(result.get('labels')[11], '2019-03-31')
-		self.assertEqual(result.get('labels')[12], '2019-04-30')
+		months = []
+		cur_date = datetime.now() - relativedelta(years=1)
+
+		for x in range(13):
+			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+			cur_date += relativedelta(months=1)
+
+		result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1)
+		self.assertEqual(result.get('labels')[0], months[0])
+		self.assertEqual(result.get('labels')[1], months[1])
+		self.assertEqual(result.get('labels')[2], months[2])
+		self.assertEqual(result.get('labels')[3], months[3])
+		self.assertEqual(result.get('labels')[4], months[4])
+		self.assertEqual(result.get('labels')[5], months[5])
+		self.assertEqual(result.get('labels')[6], months[6])
+		self.assertEqual(result.get('labels')[7], months[7])
+		self.assertEqual(result.get('labels')[8], months[8])
+		self.assertEqual(result.get('labels')[9], months[9])
+		self.assertEqual(result.get('labels')[10], months[10])
+		self.assertEqual(result.get('labels')[11], months[11])
+		self.assertEqual(result.get('labels')[12], months[12])
 
 		# only 1 data point with value
-		self.assertEqual(result.get('datasets')[0].get('values')[2], 1)
+		self.assertEqual(result.get('datasets')[0].get('values')[2], 0)
 
 		frappe.db.rollback()
 

From 8f5e7b5701afdbcf9f984256a7c3775ef9eea1f9 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 2 May 2019 09:25:17 +0530
Subject: [PATCH 029/175] fix(style): padding for attachments in sidebar

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

diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 5354897d32..b5eb9b4858 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -256,6 +256,10 @@ body[data-route^="Module"] .main-menu {
 	.assignment-row a.close {
 		margin-top: -12px;
 	}
+
+	.attachment-row {
+		margin-bottom: 4px;
+	}
 }
 
 .layout-side-section .form-sidebar {

From 0a978926a8cb078ebc13f34da5af134dcbc747f8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 2 May 2019 09:34:35 +0530
Subject: [PATCH 030/175] fix: codacy

---
 .../dashboard_chart/test_dashboard_chart.py   | 66 ++++---------------
 1 file changed, 12 insertions(+), 54 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index e38faef95c..970f937020 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -52,27 +52,13 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		months = []
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		for x in range(13):
-			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
-			cur_date += relativedelta(months=1)
-
 		result = get(chart_name ='Test Dashboard Chart', refresh = 1)
-		self.assertEqual(result.get('labels')[0], months[0])
-		self.assertEqual(result.get('labels')[1], months[1])
-		self.assertEqual(result.get('labels')[2], months[2])
-		self.assertEqual(result.get('labels')[3], months[3])
-		self.assertEqual(result.get('labels')[4], months[4])
-		self.assertEqual(result.get('labels')[5], months[5])
-		self.assertEqual(result.get('labels')[6], months[6])
-		self.assertEqual(result.get('labels')[7], months[7])
-		self.assertEqual(result.get('labels')[8], months[8])
-		self.assertEqual(result.get('labels')[9], months[9])
-		self.assertEqual(result.get('labels')[10], months[10])
-		self.assertEqual(result.get('labels')[11], months[11])
-		self.assertEqual(result.get('labels')[12], months[12])
+		for idx in range(13):
+			month = str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1])
+			self.assertEqual(result.get('labels')[idx], month)
+			cur_date += relativedelta(months=1)
 
 		# self.assertEqual(result.get('datasets')[0].get('values')[:-1],
 		# 	[44, 28, 8, 11, 2, 6, 18, 6, 4, 5, 15, 13])
@@ -97,27 +83,13 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		months = []
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		for x in range(13):
-			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
-			cur_date += relativedelta(months=1)
-
 		result = get(chart_name ='Test Empty Dashboard Chart', refresh = 1)
-		self.assertEqual(result.get('labels')[0], months[0])
-		self.assertEqual(result.get('labels')[1], months[1])
-		self.assertEqual(result.get('labels')[2], months[2])
-		self.assertEqual(result.get('labels')[3], months[3])
-		self.assertEqual(result.get('labels')[4], months[4])
-		self.assertEqual(result.get('labels')[5], months[5])
-		self.assertEqual(result.get('labels')[6], months[6])
-		self.assertEqual(result.get('labels')[7], months[7])
-		self.assertEqual(result.get('labels')[8], months[8])
-		self.assertEqual(result.get('labels')[9], months[9])
-		self.assertEqual(result.get('labels')[10], months[10])
-		self.assertEqual(result.get('labels')[11], months[11])
-		self.assertEqual(result.get('labels')[12], months[12])
+		for idx in range(13):
+			month = str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1])
+			self.assertEqual(result.get('labels')[idx], month)
+			cur_date += relativedelta(months=1)
 
 		frappe.db.rollback()
 
@@ -142,27 +114,13 @@ class TestDashboardChart(unittest.TestCase):
 			timeseries = 1
 		)).insert()
 
-		months = []
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		for x in range(13):
-			months.append(str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1]))
-			cur_date += relativedelta(months=1)
-
 		result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1)
-		self.assertEqual(result.get('labels')[0], months[0])
-		self.assertEqual(result.get('labels')[1], months[1])
-		self.assertEqual(result.get('labels')[2], months[2])
-		self.assertEqual(result.get('labels')[3], months[3])
-		self.assertEqual(result.get('labels')[4], months[4])
-		self.assertEqual(result.get('labels')[5], months[5])
-		self.assertEqual(result.get('labels')[6], months[6])
-		self.assertEqual(result.get('labels')[7], months[7])
-		self.assertEqual(result.get('labels')[8], months[8])
-		self.assertEqual(result.get('labels')[9], months[9])
-		self.assertEqual(result.get('labels')[10], months[10])
-		self.assertEqual(result.get('labels')[11], months[11])
-		self.assertEqual(result.get('labels')[12], months[12])
+		for idx in range(13):
+			month = str(cur_date.year) + '-' + str(cur_date.strftime('%m')) + '-' + str(calendar.monthrange(cur_date.year, cur_date.month)[1])
+			self.assertEqual(result.get('labels')[idx], month)
+			cur_date += relativedelta(months=1)
 
 		# only 1 data point with value
 		self.assertEqual(result.get('datasets')[0].get('values')[2], 0)

From 63417782c917f43331712ac4df73cfa4ee0c6138 Mon Sep 17 00:00:00 2001
From: jibin jose <jibinjose.in@gmail.com>
Date: Thu, 2 May 2019 10:31:42 +0530
Subject: [PATCH 031/175] Fix: Postgres DB setup

- Bootstrap postgres db using frappe db user not with postgres default
user
- Save postgres db password in env variable to avoid prompting of
password
- Pass the user name and password while connecting to postgres db
---
 frappe/database/postgres/database.py |  8 ++++----
 frappe/database/postgres/setup_db.py | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 036ee3f34a..b219aac13a 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -64,10 +64,10 @@ class PostgresDatabase(Database):
 
 	def get_connection(self):
 		# warnings.filterwarnings('ignore', category=psycopg2.Warning)
-		conn = psycopg2.connect('host={} dbname={} port={}'.format(self.host, self.user, self.port))
+		conn = psycopg2.connect('host={} dbname={} user={} password={} port={}'.format(
+			self.host, self.user, self.user, self.password, self.port
+		))
 		conn.set_isolation_level(ISOLATION_LEVEL_AUTOCOMMIT) # TODO: Remove this
-		# conn = psycopg2.connect('host={} dbname={} user={} password={}'.format(self.host,
-		# 	self.user, self.user, self.password))
 
 		return conn
 
@@ -310,4 +310,4 @@ def replace_locate_with_strpos(query):
 	# strpos is the locate equivalent in postgres
 	if re.search(r'locate\(', query, flags=re.IGNORECASE):
 		query = re.sub(r'locate\(([^,]+),([^)]+)\)', r'strpos(\2, \1)', query, flags=re.IGNORECASE)
-	return query
\ No newline at end of file
+	return query
diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py
index 0209d65839..de144ef058 100644
--- a/frappe/database/postgres/setup_db.py
+++ b/frappe/database/postgres/setup_db.py
@@ -1,4 +1,5 @@
 import frappe, subprocess, os
+from six.moves import input
 
 def setup_database(force, source_sql, verbose):
 	root_conn = get_root_connection()
@@ -10,9 +11,16 @@ def setup_database(force, source_sql, verbose):
 		frappe.conf.db_password))
 	root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(frappe.conf.db_name))
 
+	# we can't pass psql password in arguments in postgresql as mysql. So
+	# set password connection parameter in environment variable
+	subprocess_env = os.environ.copy()
+	subprocess_env['PGPASSWORD'] = str(frappe.conf.db_password)
 	# bootstrap db
-	subprocess.check_output(['psql', frappe.conf.db_name, '-qf',
-		os.path.join(os.path.dirname(__file__), 'framework_postgres.sql')])
+	subprocess.check_output([
+		'psql', frappe.conf.db_name, '-h', 'localhost', '-U',
+		frappe.conf.db_name, '-f',
+		os.path.join(os.path.dirname(__file__), 'framework_postgres.sql')
+	], env=subprocess_env)
 
 	frappe.connect()
 
@@ -24,17 +32,17 @@ def setup_help_database(help_db_name):
 	root_conn.sql("CREATE user {0} password '{1}'".format(help_db_name, help_db_name))
 	root_conn.sql("GRANT ALL PRIVILEGES ON DATABASE `{0}` TO {0}".format(help_db_name))
 
-def get_root_connection(root_login='postgres', root_password=None):
+def get_root_connection(root_login=None, root_password=None):
 	import getpass
 	if not frappe.local.flags.root_connection:
 		if not root_login:
-			root_login = 'root'
+			root_login = input("Enter postgres super user: ")
 
 		if not root_password:
 			root_password = frappe.conf.get("root_password") or None
 
 		if not root_password:
-			root_password = getpass.getpass("Postgres root password: ")
+			root_password = getpass.getpass("Postgres super user password: ")
 
 		frappe.local.flags.root_connection = frappe.database.get_db(user=root_login, password=root_password)
 

From f1044afe8cdcee82564c4c4286703a18c6590b9f Mon Sep 17 00:00:00 2001
From: jibin jose <jibinjose.in@gmail.com>
Date: Thu, 2 May 2019 12:29:41 +0530
Subject: [PATCH 032/175] Fix postgres tests

- take postgres superuser from user iff it is not in config
---
 frappe/database/postgres/setup_db.py           | 3 +++
 test_sites/test_site_postgres/site_config.json | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frappe/database/postgres/setup_db.py b/frappe/database/postgres/setup_db.py
index de144ef058..7ccd86a26e 100644
--- a/frappe/database/postgres/setup_db.py
+++ b/frappe/database/postgres/setup_db.py
@@ -35,6 +35,9 @@ def setup_help_database(help_db_name):
 def get_root_connection(root_login=None, root_password=None):
 	import getpass
 	if not frappe.local.flags.root_connection:
+		if not root_login:
+			root_login = frappe.conf.get("root_login") or None
+
 		if not root_login:
 			root_login = input("Enter postgres super user: ")
 
diff --git a/test_sites/test_site_postgres/site_config.json b/test_sites/test_site_postgres/site_config.json
index 809468ff40..f7f3b9de2b 100644
--- a/test_sites/test_site_postgres/site_config.json
+++ b/test_sites/test_site_postgres/site_config.json
@@ -7,6 +7,7 @@
  "mail_login": "test@example.com",
  "mail_password": "test",
  "admin_password": "admin",
+ "root_login": "postgres",
  "root_password": "travis",
  "run_selenium_tests": 1,
  "host_name": "http://test_site_postgres:8000"

From f72e74d8e84a303388ea539d50eff9d8c8fca4c5 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 2 May 2019 15:51:57 +0530
Subject: [PATCH 033/175] fix: route history and allow longer energy point
 reviews

---
 frappe/core/page/dashboard/dashboard.js       |   7 +-
 frappe/desk/form/save.py                      |   1 -
 frappe/public/js/frappe/router_history.js     |   2 +-
 .../js/frappe/ui/toolbar/awesome_bar.js       |   2 +
 .../js/frappe/ui/toolbar/search_utils.js      |   3 +-
 .../energy_point_log/energy_point_log.json    | 327 ++----------------
 6 files changed, 36 insertions(+), 306 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index b4cb4d7222..c8b8fc94dc 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -60,7 +60,12 @@ class Dashboard {
 	show_dashboard(current_dashboard_name) {
 		if(this.dashboard_name !== current_dashboard_name) {
 			this.dashboard_name = current_dashboard_name;
-			this.page.set_title(this.dashboard_name);
+			let title = this.dashboard_name;
+			if (!this.dashboard_name.toLowerCase().includes(__('dashboard'))) {
+				// ensure dashboard title has "dashboard"
+				title = __('{0} Dashboard', [title]);
+			}
+			this.page.set_title(title);
 			this.set_dropdown();
 			this.container.empty();
 			this.refresh();
diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py
index 1e07f10ba7..6361a2ebbb 100644
--- a/frappe/desk/form/save.py
+++ b/frappe/desk/form/save.py
@@ -27,7 +27,6 @@ def savedocs(doc, action):
 
 		# update recent documents
 		run_onload(doc)
-		frappe.get_user().update_recent(doc.doctype, doc.name)
 		send_updated_docs(doc)
 	except Exception:
 		if not frappe.local.message_log:
diff --git a/frappe/public/js/frappe/router_history.js b/frappe/public/js/frappe/router_history.js
index 93d4904c0b..fb3d09fe0b 100644
--- a/frappe/public/js/frappe/router_history.js
+++ b/frappe/public/js/frappe/router_history.js
@@ -1,6 +1,6 @@
 frappe.provide('frappe.route');
 frappe.route_history_queue = [];
-const routes_to_skip = ['Form', 'social'];
+const routes_to_skip = ['Form', 'social', 'setup-wizard'];
 
 const save_routes = frappe.utils.debounce(() => {
 	const routes = frappe.route_history_queue;
diff --git a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
index c2b70c3256..bee5f3035d 100644
--- a/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
+++ b/frappe/public/js/frappe/ui/toolbar/awesome_bar.js
@@ -68,6 +68,8 @@ frappe.search.AwesomeBar = Class.extend({
 					me.options = me.options.concat(me.build_options(txt));
 					me.options = me.options.concat(me.global_results);
 				} else {
+					me.options = me.options.concat(
+						me.deduplicate(frappe.search.utils.get_recent_pages(txt || "")));
 					me.options = me.options.concat(frappe.search.utils.get_frequent_links());
 				}
 				me.add_help();
diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js
index fcbaae4aef..f8b4c3a34b 100644
--- a/frappe/public/js/frappe/ui/toolbar/search_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js
@@ -6,6 +6,7 @@ frappe.search.utils = {
 	},
 
 	get_recent_pages: function(keywords) {
+		if (keywords === null) keywords = '';
 		var me = this, values = [], options = [];
 
 		function find(list, keywords, process) {
@@ -44,7 +45,7 @@ frappe.search.utils = {
 					values.push([route[1], route]);
 				}
 			} else if(route[0]) {
-				values.push([frappe.route_titles[route[0]] || route[0], route]);
+				values.push([frappe.route_titles[route.join('/')] || route[0], route]);
 			}
 		});
 
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index 2a24016c82..ddb6c19698 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -1,386 +1,109 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
  "creation": "2018-06-21 14:58:55.913619",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "user",
+  "type",
+  "rule",
+  "reference_doctype",
+  "reference_name",
+  "points",
+  "reason",
+  "reverted",
+  "revert_of"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "user",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "User",
-   "length": 0,
-   "no_copy": 0,
    "options": "User",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "type",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "Auto\nAppreciation\nCriticism\nReview\nRevert",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "rule",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Rule",
-   "length": 0,
-   "no_copy": 0,
    "options": "Energy Point Rule",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "reference_doctype",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Reference Doctype",
-   "length": 0,
-   "no_copy": 0,
    "options": "DocType",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "reference_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Reference Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "points",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Points",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "reason",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
+   "fieldtype": "Text",
    "label": "Reason",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
-   "fetch_if_empty": 0,
    "fieldname": "reverted",
    "fieldtype": "Check",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Reverted",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Reverted"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.type === 'Revert'",
-   "fetch_if_empty": 0,
    "fieldname": "revert_of",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Revert Of",
-   "length": 0,
-   "no_copy": 0,
    "options": "Energy Point Log",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "idx": 0,
  "in_create": 1,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2019-04-05 20:23:53.917559",
+ "modified": "2019-05-02 15:28:02.857792",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
    "read": 1,
-   "report": 0,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "System Manager"
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 0,
    "read": 1,
-   "report": 0,
-   "role": "All",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "All"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "user",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file

From 5d5e68dbedb75e1d5695d6201a4874a0b8bfc1db Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Thu, 2 May 2019 19:35:17 +0530
Subject: [PATCH 034/175] fix: Do not show locals to user (#7397)

---
 frappe/__init__.py                 |  3 +--
 frappe/public/js/frappe/request.js |  3 ---
 frappe/utils/error.py              | 12 ------------
 frappe/utils/response.py           |  2 --
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 0242843cee..211301cfb6 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -16,7 +16,6 @@ from faker import Faker
 # public
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
-from .utils.error import get_frame_locals
 
 # Hamless for Python 3
 # For Python 2 set default encoding to utf-8
@@ -274,7 +273,7 @@ def errprint(msg):
 	if not request or (not "cmd" in local.form_dict) or conf.developer_mode:
 		print(msg)
 
-	error_log.append({"exc": msg, "locals": get_frame_locals()})
+	error_log.append({"exc": msg})
 
 def log(msg):
 	"""Add to `debug_log`.
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 088b97fe9d..080ee3b70e 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -382,12 +382,9 @@ frappe.request.report_error = function(xhr, request_opts) {
 	var data = JSON.parse(xhr.responseText);
 	if (data.exc) {
 		var exc = (JSON.parse(data.exc) || []).join("\n");
-		var locals = (JSON.parse(data.locals) || []).join("\n");
 		delete data.exc;
-		delete data.locals;
 	} else {
 		var exc = "";
-		locals = "";
 	}
 
 	var show_communication = function() {
diff --git a/frappe/utils/error.py b/frappe/utils/error.py
index 8b4877cf4d..43579cf92e 100644
--- a/frappe/utils/error.py
+++ b/frappe/utils/error.py
@@ -199,15 +199,3 @@ def clear_old_snapshots():
 
 def get_error_snapshot_path():
 	return frappe.get_site_path('error-snapshots')
-
-def get_frame_locals():
-	traceback = sys.exc_info()[2]
-	frames = []
-	if traceback:
-		frames = inspect.getinnerframes(traceback, context=0)
-		_locals = ['Locals (most recent call last):']
-		for frame, filename, lineno, function, __, __ in frames:
-			if '/apps/' in filename:
-				_locals.append('File "{}", line {}, in {}\n{}'.format(filename, lineno, function, json.dumps(frame.f_locals, default=str, indent=4)))
-
-		return '\n'.join(_locals)
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 8412ec6271..01c95006e8 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -105,8 +105,6 @@ def make_logs(response = None):
 
 	if frappe.error_log:
 		response['exc'] = json.dumps([frappe.utils.cstr(d["exc"]) for d in frappe.local.error_log])
-		if frappe.conf.developer_mode:
-			response['locals'] = json.dumps([frappe.utils.cstr(d["locals"]) for d in frappe.local.error_log])
 
 	if frappe.local.message_log:
 		response['_server_messages'] = json.dumps([frappe.utils.cstr(d) for

From 29c97fca6ebb3c7d101b73527280018839b4aa72 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 2 May 2019 21:09:28 +0530
Subject: [PATCH 035/175] fix: Add dashboard label

---
 frappe/public/js/frappe/misc/utils.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/misc/utils.js b/frappe/public/js/frappe/misc/utils.js
index 705b0c82cb..b892ec994c 100644
--- a/frappe/public/js/frappe/misc/utils.js
+++ b/frappe/public/js/frappe/misc/utils.js
@@ -658,6 +658,9 @@ Object.assign(frappe.utils, {
 		if (route[0] === 'modules') {
 			return __('{0} Modules', [route[1]]);
 		}
+		if (route[0] === 'dashboard') {
+			return __('{0} Dashboard', [route[1]]);
+		}
 		return __(frappe.utils.to_title_case(route[0], true));
 	},
 	report_column_total: function(values, column, type) {

From 5ebf6889846abaee31e0c0844153b0e9eb7ad49c Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 3 May 2019 08:49:51 +0530
Subject: [PATCH 036/175] fix(recent): complete uncommitted changes

---
 frappe/desk/form/load.py |  3 ---
 frappe/utils/user.py     | 21 ---------------------
 2 files changed, 24 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 00f29b6ffe..14ebbaf7fb 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -47,9 +47,6 @@ def getdoc(doctype, name, user=None):
 		frappe.errprint(frappe.utils.get_traceback())
 		raise
 
-	if doc and not name.startswith('_'):
-		frappe.get_user().update_recent(doctype, name)
-
 	doc.add_seen()
 
 	frappe.response.docs.append(doc)
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index 57cbcf7fda..725fb3056a 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -165,25 +165,6 @@ class UserPermissions:
 		self.defaults = frappe.defaults.get_defaults(self.name)
 		return self.defaults
 
-	# update recent documents
-	def update_recent(self, dt, dn):
-		rdl = frappe.cache().hget("user_recent", self.name) or []
-		new_rd = [dt, dn]
-
-		# clear if exists
-		for i in range(len(rdl)):
-			rd = rdl[i]
-			if rd==new_rd:
-				del rdl[i]
-				break
-
-		if len(rdl) > 19:
-			rdl = rdl[:19]
-
-		rdl = [new_rd] + rdl
-
-		frappe.cache().hset("user_recent", self.name, rdl)
-
 	def _get(self, key):
 		if not self.can_read:
 			self.build_permissions()
@@ -205,8 +186,6 @@ class UserPermissions:
 			self.build_permissions()
 
 		d.name = self.name
-		d.recent = json.dumps(frappe.cache().hget("user_recent", self.name) or [])
-
 		d.roles = self.get_roles()
 		d.defaults = self.get_defaults()
 

From 0a7a28bac0f2dd33ada531150873bfe2b0abb47a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 3 May 2019 10:38:10 +0530
Subject: [PATCH 037/175] fix: Get data of empty table from pg_stat_all_tables
 when db-type is postgres

---
 frappe/config/__init__.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/frappe/config/__init__.py b/frappe/config/__init__.py
index 1fe06f9094..b2c1f41d78 100644
--- a/frappe/config/__init__.py
+++ b/frappe/config/__init__.py
@@ -78,15 +78,22 @@ def get_modules_from_app(app):
 	return active_modules_list
 
 def get_all_empty_tables_by_module():
-	results = frappe.db.sql("""
-		SELECT
-			name, module
-		FROM information_schema.tables as i
-		JOIN tabDocType as d
-			ON i.table_name = CONCAT('tab', d.name)
-		WHERE table_rows = 0;
-
-	""")
+	results = frappe.db.multisql({
+		'mariadb': '''
+			SELECT `name`, `module`
+			FROM information_schema.tables AS i
+			JOIN `tabDocType` AS d
+				ON i.table_name = CONCAT('tab', d.name)
+			WHERE `table_rows` = 0;
+		''',
+		'postgres': '''
+			SELECT "name", "module"
+			FROM "pg_stat_all_tables" AS i
+			JOIN "tabDocType" AS d
+				ON i.relname = CONCAT('tab', d.name)
+			WHERE n_tup_ins = 0;
+		'''
+	})
 
 	empty_tables_by_module = {}
 
@@ -95,7 +102,6 @@ def get_all_empty_tables_by_module():
 			empty_tables_by_module[module].append(doctype)
 		else:
 			empty_tables_by_module[module] = [doctype]
-
 	return empty_tables_by_module
 
 def is_domain(module):

From d8b4c66bf37bcc95fec0d076fc12b7a4158683ff Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 3 May 2019 11:09:57 +0530
Subject: [PATCH 038/175] fix: applied filter element in list view

Co-authored-by: surajshetty3416
---
 frappe/public/less/filters.less | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/filters.less b/frappe/public/less/filters.less
index c419d49e47..cf25e0599d 100644
--- a/frappe/public/less/filters.less
+++ b/frappe/public/less/filters.less
@@ -1,4 +1,4 @@
-@import 'variables';
+@import 'common';
 
 .active-tag-filters {
 	.add-filter, .filter-tag {
@@ -6,6 +6,11 @@
 	}
 }
 
+.toggle-filter {
+	max-width: 200px !important;
+	.ellipsis;
+}
+
 .active-tag-filters .btn-group {
 	white-space: nowrap;
 	font-size: 0;

From ebb26c771ba922a5afba41e8907a511e342e4b34 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 3 May 2019 11:57:50 +0530
Subject: [PATCH 039/175] feat: Add a "Go To Page" button in page form view

---
 frappe/core/doctype/page/page.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/core/doctype/page/page.js b/frappe/core/doctype/page/page.js
index 86fbbedaf3..284795fbe6 100644
--- a/frappe/core/doctype/page/page.js
+++ b/frappe/core/doctype/page/page.js
@@ -7,5 +7,10 @@ frappe.ui.form.on('Page', {
 			// make the document read-only
 			frm.set_read_only();
 		}
+		if (!frm.is_new() && !frm.doc.istable) {
+			frm.add_custom_button(__('Go to {0} Page', [frm.doc.title || frm.doc.name]), () => {
+				frappe.set_route(frm.doc.name);
+			});
+		}
 	}
 });

From 3d555c80bbae89cc9d3696b8fdad3891b589708e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 3 May 2019 13:37:28 +0530
Subject: [PATCH 040/175] fix: Only use local's page object if it has page
 script

---
 frappe/public/js/frappe/views/pageview.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/pageview.js b/frappe/public/js/frappe/views/pageview.js
index 69c22e9768..932efb4a54 100644
--- a/frappe/public/js/frappe/views/pageview.js
+++ b/frappe/public/js/frappe/views/pageview.js
@@ -16,7 +16,7 @@ frappe.views.pageview = {
 			return;
 		}
 
-		if((locals.Page && locals.Page[name]) || name==window.page_name) {
+		if((locals.Page && locals.Page[name] && locals.Page[name].script) || name==window.page_name) {
 			// already loaded
 			callback();
 		} else if(localStorage["_page:" + name] && frappe.boot.developer_mode!=1) {
@@ -59,6 +59,7 @@ frappe.views.pageview = {
 				return;
 			}
 		}
+		console.log('name', name);
 		frappe.model.with_doctype("Page", function() {
 			frappe.views.pageview.with_page(name, function(r) {
 				if(r && r.exc) {

From da8612aa0f34ce905c453155e9463ab0517ca8dc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 3 May 2019 13:38:23 +0530
Subject: [PATCH 041/175] style: Add a space and user frappe.session.user
 instead of just user

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

diff --git a/frappe/core/doctype/page/page.js b/frappe/core/doctype/page/page.js
index 284795fbe6..d1d9600e59 100644
--- a/frappe/core/doctype/page/page.js
+++ b/frappe/core/doctype/page/page.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Page', {
 	refresh: function(frm) {
-		if(!frappe.boot.developer_mode && user != 'Administrator') {
+		if (!frappe.boot.developer_mode && frappe.session.user != 'Administrator') {
 			// make the document read-only
 			frm.set_read_only();
 		}

From c8822191c9283734a36ed8a6b85714c3630142c4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 3 May 2019 13:54:09 +0530
Subject: [PATCH 042/175] style: Remove log statement

---
 frappe/public/js/frappe/views/pageview.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/pageview.js b/frappe/public/js/frappe/views/pageview.js
index 932efb4a54..c31ba74285 100644
--- a/frappe/public/js/frappe/views/pageview.js
+++ b/frappe/public/js/frappe/views/pageview.js
@@ -59,7 +59,6 @@ frappe.views.pageview = {
 				return;
 			}
 		}
-		console.log('name', name);
 		frappe.model.with_doctype("Page", function() {
 			frappe.views.pageview.with_page(name, function(r) {
 				if(r && r.exc) {

From 311202611b0c3bdc2f83bdb761ad2b65acca9576 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 3 May 2019 15:01:41 +0530
Subject: [PATCH 043/175] fix(style): cleanup blog subtitle

---
 .../website/doctype/blog_post/templates/blog_post.html | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index cbfc1a8a1f..0231f255c2 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -10,14 +10,8 @@
 		<!-- begin blog content -->
 		<div class="blog-info">
 			<h1 itemprop="headline" class="blog-header">{{ title }}</h1>
-			<p class="post-by text-muted small">
-				<a href="/blog?blogger={{ blogger }}" class="text-muted">{{ blogger_info and blogger_info.full_name or full_name }}</a>
-				&middot;
-				{{ frappe.format_date(published_on) }}
-				&middot;
-				<a href="/blog?blog_category={{ blog_category }}" class="text-muted">{{ category.title }}</a>
-				&middot;
-				{{ comment_text }}
+			<p class="text-muted">
+			{{ frappe.format_date(published_on) }}
 			</p>
 		</div>
 		<div itemprop="articleBody" class="longform blog-text mt-5">

From d727aa9e578166c5faab1b5785f7e817a648db8f Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sat, 4 May 2019 14:05:49 +0530
Subject: [PATCH 044/175] fix(minor): fix error reporting exception JSON
 handling

---
 frappe/public/js/frappe/request.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 080ee3b70e..250be73c0f 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -380,11 +380,16 @@ frappe.after_ajax = function(fn) {
 
 frappe.request.report_error = function(xhr, request_opts) {
 	var data = JSON.parse(xhr.responseText);
+	var exc;
 	if (data.exc) {
-		var exc = (JSON.parse(data.exc) || []).join("\n");
+		try {
+			exc = (JSON.parse(data.exc) || []).join("\n");
+		} catch (e) {
+			exc = data.exc;
+		}
 		delete data.exc;
 	} else {
-		var exc = "";
+		exc = "";
 	}
 
 	var show_communication = function() {

From 4c578e823876c0922ed2dbeab3bdcc0c12ba9b00 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sat, 4 May 2019 14:14:56 +0530
Subject: [PATCH 045/175] fix: dont show double messages

---
 frappe/desk/form/save.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/desk/form/save.py b/frappe/desk/form/save.py
index 6361a2ebbb..694b44b907 100644
--- a/frappe/desk/form/save.py
+++ b/frappe/desk/form/save.py
@@ -29,8 +29,6 @@ def savedocs(doc, action):
 		run_onload(doc)
 		send_updated_docs(doc)
 	except Exception:
-		if not frappe.local.message_log:
-			frappe.msgprint(frappe._('Did not save'))
 		frappe.errprint(frappe.utils.get_traceback())
 		raise
 

From 8af25cce99ad2f25d89030cd5991fd3bfd8b955d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sat, 4 May 2019 17:32:03 +0530
Subject: [PATCH 046/175] feat: Add email template field to Communication

---
 .../doctype/communication/communication.json  | 2052 +++--------------
 frappe/core/doctype/communication/email.py    |    4 +-
 .../public/js/frappe/views/communication.js   |    1 +
 3 files changed, 388 insertions(+), 1669 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index ea0e429e0f..3b845964f4 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -1,1728 +1,444 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2013-01-29 10:47:14", 
- "custom": 0, 
- "description": "Keep a track of all communications", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "allow_import": 1,
+ "creation": "2013-01-29 10:47:14",
+ "description": "Keep a track of all communications",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "subject",
+  "section_break_10",
+  "communication_medium",
+  "sender",
+  "column_break_4",
+  "recipients",
+  "cc",
+  "bcc",
+  "phone_no",
+  "delivery_status",
+  "section_break_8",
+  "content",
+  "status_section",
+  "text_content",
+  "communication_type",
+  "comment_type",
+  "column_break_5",
+  "status",
+  "sent_or_received",
+  "additional_info",
+  "communication_date",
+  "read_receipt",
+  "column_break_14",
+  "sender_full_name",
+  "read_by_recipient",
+  "read_by_recipient_on",
+  "reference_section",
+  "reference_doctype",
+  "reference_name",
+  "reference_owner",
+  "email_account",
+  "in_reply_to",
+  "user",
+  "column_break_27",
+  "email_template",
+  "link_doctype",
+  "link_name",
+  "timeline_doctype",
+  "timeline_name",
+  "timeline_label",
+  "unread_notification_sent",
+  "seen",
+  "_user_tags",
+  "email_inbox",
+  "message_id",
+  "uid",
+  "email_status",
+  "has_attachment",
+  "feedback_section",
+  "rating",
+  "feedback_request"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "subject", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Subject", 
-   "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": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "subject",
+   "fieldtype": "Small Text",
+   "in_global_search": 1,
+   "label": "Subject",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "fieldname": "section_break_10", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To and CC", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "section_break_10",
+   "fieldtype": "Section Break",
+   "label": "To and CC"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "eval:doc.communication_type===\"Communication\"", 
-   "fieldname": "communication_medium", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nEmail\nChat\nPhone\nSMS\nEvent\nMeeting\nVisit\nOther", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_type===\"Communication\"",
+   "fieldname": "communication_medium",
+   "fieldtype": "Select",
+   "label": "Type",
+   "options": "\nEmail\nChat\nPhone\nSMS\nEvent\nMeeting\nVisit\nOther"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_medium===\"Email\"", 
-   "fieldname": "sender", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From", 
-   "length": 255, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_medium===\"Email\"",
+   "fieldname": "sender",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "From",
+   "length": 255,
+   "options": "Email"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "recipients", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "recipients",
+   "fieldtype": "Code",
+   "label": "To",
+   "options": "Email"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_medium===\"Email\"", 
-   "fieldname": "cc", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "CC", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_medium===\"Email\"",
+   "fieldname": "cc",
+   "fieldtype": "Code",
+   "label": "CC",
+   "options": "Email"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_medium===\"Email\"", 
-   "fieldname": "bcc", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "BCC", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_medium===\"Email\"",
+   "fieldname": "bcc",
+   "fieldtype": "Code",
+   "label": "BCC",
+   "options": "Email"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:in_list([\"Phone\",\"SMS\"],doc.communication_medium)", 
-   "fieldname": "phone_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Phone No.", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:in_list([\"Phone\",\"SMS\"],doc.communication_medium)",
+   "fieldname": "phone_no",
+   "fieldtype": "Data",
+   "label": "Phone No."
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Integrations can use this field to set email delivery status", 
-   "fieldname": "delivery_status", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Delivery Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nSent\nBounced\nOpened\nMarked As Spam\nRejected\nDelayed\nSoft-Bounced\nClicked\nRecipient Unsubscribed\nError\nExpired\nSending\nRead", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "description": "Integrations can use this field to set email delivery status",
+   "fieldname": "delivery_status",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "label": "Delivery Status",
+   "options": "\nSent\nBounced\nOpened\nMarked As Spam\nRejected\nDelayed\nSoft-Bounced\nClicked\nRecipient Unsubscribed\nError\nExpired\nSending\nRead"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Message", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "label": "Message",
    "width": "400"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "status_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "status_section",
+   "fieldtype": "Section Break",
+   "label": "Status"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "text_content", 
-   "fieldtype": "Code", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Text Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "text_content",
+   "fieldtype": "Code",
+   "hidden": 1,
+   "label": "Text Content"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Communication", 
-   "fieldname": "communication_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Communication Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication\nComment\nChat\nBot\nNotification\nFeedback", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Communication",
+   "fieldname": "communication_type",
+   "fieldtype": "Select",
+   "label": "Communication Type",
+   "options": "Communication\nComment\nChat\nBot\nNotification\nFeedback",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "comment_type", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Comment Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nComment\nLike\nInfo\nLabel\nWorkflow\nCreated\nSubmitted\nCancelled\nUpdated\nDeleted\nAssigned\nAssignment Completed\nAttachment\nAttachment Removed\nShared\nUnshared\nBot\nRelinked", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "comment_type",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Comment Type",
+   "options": "\nComment\nLike\nInfo\nLabel\nWorkflow\nCreated\nSubmitted\nCancelled\nUpdated\nDeleted\nAssigned\nAssignment Completed\nAttachment\nAttachment Removed\nShared\nUnshared\nBot\nRelinked",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_type===\"Communication\"", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Open\nReplied\nClosed\nLinked", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_type===\"Communication\"",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "Open\nReplied\nClosed\nLinked",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_type===\"Communication\"", 
-   "fieldname": "sent_or_received", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Sent or Received", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sent\nReceived", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_type===\"Communication\"",
+   "fieldname": "sent_or_received",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Sent or Received",
+   "options": "Sent\nReceived",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "additional_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "More Information", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "additional_info",
+   "fieldtype": "Section Break",
+   "label": "More Information"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Now", 
-   "fieldname": "communication_date", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Date", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "Now",
+   "fieldname": "communication_date",
+   "fieldtype": "Datetime",
+   "label": "Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "read_receipt", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sent Read Receipt", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "read_receipt",
+   "fieldtype": "Check",
+   "label": "Sent Read Receipt",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_14", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_14",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sender_full_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From Full Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sender_full_name",
+   "fieldtype": "Data",
+   "label": "From Full Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "read_by_recipient", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Read by Recipient", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "read_by_recipient",
+   "fieldtype": "Check",
+   "label": "Read by Recipient",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "read_by_recipient_on", 
-   "fieldtype": "Datetime", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Read by Recipient On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "read_by_recipient_on",
+   "fieldtype": "Datetime",
+   "label": "Read by Recipient On",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "reference_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "reference_section",
+   "fieldtype": "Section Break",
+   "label": "Reference"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "reference_doctype", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "reference_name.owner", 
-   "fieldname": "reference_owner", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference Owner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "reference_name.owner",
+   "fieldname": "reference_owner",
+   "fieldtype": "Read Only",
+   "label": "Reference Owner",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.communication_medium===\"Email\"", 
-   "fieldname": "email_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.communication_medium===\"Email\"",
+   "fieldname": "email_account",
+   "fieldtype": "Link",
+   "label": "Email Account",
+   "options": "Email Account",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "in_reply_to", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "In Reply To", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "in_reply_to",
+   "fieldtype": "Link",
+   "label": "In Reply To",
+   "options": "Communication",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "__user", 
-   "fieldname": "user", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 1, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "__user",
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "ignore_user_permissions": 1,
+   "label": "User",
+   "options": "User",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_27", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_27",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "link_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Link DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "link_doctype",
+   "fieldtype": "Link",
+   "label": "Link DocType",
+   "options": "DocType",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "link_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Link Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "link_doctype", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "link_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Link Name",
+   "options": "link_doctype",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "timeline_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Timeline DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "timeline_doctype",
+   "fieldtype": "Link",
+   "label": "Timeline DocType",
+   "options": "DocType",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "timeline_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Timeline Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "timeline_doctype", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "timeline_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Timeline Name",
+   "options": "timeline_doctype",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "timeline_label", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Timeline field Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "timeline_label",
+   "fieldtype": "Data",
+   "label": "Timeline field Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "unread_notification_sent", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Unread Notification Sent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "unread_notification_sent",
+   "fieldtype": "Check",
+   "label": "Unread Notification Sent",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "seen", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Seen", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "seen",
+   "fieldtype": "Check",
+   "label": "Seen",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "_user_tags", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "User Tags", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "_user_tags",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "User Tags",
+   "no_copy": 1,
+   "print_hide": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "email_inbox", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Inbox", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 1, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "email_inbox",
+   "fieldtype": "Section Break",
+   "label": "Email Inbox",
+   "permlevel": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "message_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 1, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Message ID", 
-   "length": 995, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "message_id",
+   "fieldtype": "Data",
+   "ignore_xss_filter": 1,
+   "label": "Message ID",
+   "length": 995,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "uid", 
-   "fieldtype": "Int", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "UID", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "fieldname": "uid",
+   "fieldtype": "Int",
+   "hidden": 1,
+   "label": "UID",
+   "no_copy": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "email_status", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Open\nSpam\nTrash", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "email_status",
+   "fieldtype": "Select",
+   "label": "Email Status",
+   "options": "Open\nSpam\nTrash"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "has_attachment", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Has  Attachment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "has_attachment",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Has  Attachment"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "depends_on": "eval: doc.rating > 0", 
-   "fieldname": "feedback_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "collapsible": 1,
+   "depends_on": "eval: doc.rating > 0",
+   "fieldname": "feedback_section",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rating", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rating", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "rating",
+   "fieldtype": "Int",
+   "label": "Rating",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "feedback_request", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback Request", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "feedback_request",
+   "fieldtype": "Data",
+   "label": "Feedback Request",
+   "read_only": 1
+  },
+  {
+   "fieldname": "email_template",
+   "fieldtype": "Link",
+   "label": "Email Template",
+   "options": "Email Template",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-comment", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-09-24 13:53:52.389244", 
- "modified_by": "chdecultot@dokos.io", 
- "module": "Core", 
- "name": "Communication", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-comment",
+ "idx": 1,
+ "modified": "2019-05-04 15:36:35.818714",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Communication",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 1, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "permlevel": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 1, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "All", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "delete": 1,
+   "email": 1,
+   "if_owner": 1,
+   "read": 1,
+   "role": "All"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "subject", 
- "show_name_in_global_search": 0, 
- "sort_order": "DESC", 
- "title_field": "subject", 
- "track_changes": 1, 
- "track_seen": 1, 
- "track_views": 0
+ ],
+ "search_fields": "subject",
+ "sort_order": "DESC",
+ "title_field": "subject",
+ "track_changes": 1,
+ "track_seen": 1
 }
\ No newline at end of file
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index 0048668ee2..0c68f8b118 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -22,7 +22,7 @@ from frappe.utils.background_jobs import enqueue
 def make(doctype=None, name=None, content=None, subject=None, sent_or_received = "Sent",
 	sender=None, sender_full_name=None, recipients=None, communication_medium="Email", send_email=False,
 	print_html=None, print_format=None, attachments='[]', send_me_a_copy=False, cc=None, bcc=None,
-	flags=None, read_receipt=None, print_letterhead=True):
+	flags=None, read_receipt=None, print_letterhead=True, email_template=None):
 	"""Make a new communication.
 
 	:param doctype: Reference DocType.
@@ -38,6 +38,7 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 	:param print_format: Print Format name of parent document to be sent as attachment.
 	:param attachments: List of attachments as list of files or JSON string.
 	:param send_me_a_copy: Send a copy to the sender (default **False**).
+	:param email_template: Template which is used to compose mail .
 	"""
 
 	is_error_report = (doctype=="User" and name==frappe.session.user and subject=="Error Report")
@@ -66,6 +67,7 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		"sent_or_received": sent_or_received,
 		"reference_doctype": doctype,
 		"reference_name": name,
+		"email_template": email_template,
 		"message_id":get_message_id().strip(" <>"),
 		"read_receipt":read_receipt,
 		"has_attachment": 1 if attachments else 0
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 7d90d80d5f..08174519a8 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -549,6 +549,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				print_format: print_format,
 				sender: form_values.sender,
 				sender_full_name: form_values.sender?frappe.user.full_name():undefined,
+				email_template: form_values.email_template,
 				attachments: selected_attachments,
 				_lang : me.lang_code,
 				read_receipt:form_values.send_read_receipt,

From d67bcd221272a52445ff02d7a2deaedc91cfb74b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 5 May 2019 12:23:46 +0530
Subject: [PATCH 047/175] fix: Define filedata before it is used

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

diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 8376d32a93..54b90be6ed 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -18,12 +18,14 @@ def get_pdf(html, options=None, output=None):
 		"disable-local-file-access": "",
 	})
 
+	filedata = ''
+
 	try:
 		# Set filename property to false, so no file is actually created
 		filedata = pdfkit.from_string(html, False, options=options or {})
 
 		# https://pythonhosted.org/PyPDF2/PdfFileReader.html
-		# create in-memory binary streams from filedata and create a PdfFileReader objcet
+		# create in-memory binary streams from filedata and create a PdfFileReader object
 		reader = PdfFileReader(io.BytesIO(filedata))
 
 	except IOError as e:

From 9d96d707af8f090709b59b6a0cf064fbd1ecc96b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 6 May 2019 07:42:44 +0530
Subject: [PATCH 048/175] feat: Append modified_field to the user_feilds of
 energy point rule

---
 frappe/social/doctype/energy_point_rule/energy_point_rule.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
index c67c95f836..a4c1dc00f5 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -18,7 +18,10 @@ frappe.ui.form.on('Energy Point Rule', {
 			const user_fields = fields.filter(df => (df.fieldtype === 'Link' && df.options === 'User')
 				|| df.fieldtype === 'Data')
 				.map(map_for_options)
-				.concat([{label: __('Owner'), value: 'owner'}]);
+				.concat([
+					{ label: __('Owner'), value: 'owner' },
+					{ label: __('Modified By'), value: 'modified_by' }
+				]);
 
 			const multiplier_fields = fields.filter(df => ['Int', 'Float'].includes(df.fieldtype))
 				.map(map_for_options);

From 8948a014d26d95203856dd400bc2c1515b0cdd98 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 6 May 2019 08:26:24 +0530
Subject: [PATCH 049/175] fix: Skip energy point for admin

---
 frappe/social/doctype/energy_point_rule/energy_point_rule.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 8cd0578caf..ccf0ff0b13 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -46,7 +46,10 @@ class EnergyPointRule(Document):
 
 
 def process_energy_points(doc, state):
-	if frappe.flags.in_patch or frappe.flags.in_install or not is_energy_point_enabled():
+	if (frappe.flags.in_patch
+		or frappe.flags.in_install
+		or not is_energy_point_enabled()
+		or frappe.session.user == 'Administrator'):
 		return
 
 	for d in frappe.cache_manager.get_doctype_map('Energy Point Rule', doc.doctype,

From ceda36d9ec18e23d9208d95510c38f70fe241c55 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 12:32:41 +0530
Subject: [PATCH 050/175] fix(minor): don't freeze screen in
 frappe.model.with_doctype

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

diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 9d4ad3af1c..a5aa363ec3 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -126,7 +126,6 @@ $.extend(frappe.model, {
 					cached_timestamp: cached_timestamp
 				},
 				async: async,
-				freeze: true,
 				callback: function(r) {
 					if(r.exc) {
 						frappe.msgprint(__("Unable to load: {0}", [__(doctype)]));

From 51d95321c1ea902f5e5cefafed7139e62c9c4a05 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 13:42:25 +0530
Subject: [PATCH 051/175] fix(link-preview): cleanup and fixes

---
 frappe/public/js/frappe/form/controls/link.js |   1 +
 frappe/public/js/frappe/form/formatters.js    |  10 +-
 frappe/public/js/frappe/list/list_view.js     |   2 +-
 frappe/public/js/frappe/model/model.js        |   1 -
 frappe/public/js/frappe/ui/link_preview.js    | 125 +++++++-----------
 5 files changed, 56 insertions(+), 83 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 86a99c970f..a7ed3f8a72 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -41,6 +41,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 				me.$link.toggle(false);
 			}, 500);
 		});
+		this.$input.attr('data-target', this.df.options);
 		this.input = this.$input.get(0);
 		this.has_input = true;
 		this.translate_values = true;
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index c8afb6466a..6199a02d74 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -117,11 +117,11 @@ frappe.form.formatters = {
 			return repl('<a onclick="%(onclick)s">%(value)s</a>',
 				{onclick: docfield.link_onclick.replace(/"/g, '&quot;'), value:value});
 		} else if(docfield && doctype) {
-			return repl('<a class="grey" href="#Form/%(doctype)s/%(name)s" data-doctype="%(doctype)s">%(label)s</a>', {
-				doctype: encodeURIComponent(doctype),
-				name: encodeURIComponent(original_value),
-				label: __(options && options.label || value)
-			});
+			return `<a class="grey"
+				href="#Form/${encodeURIComponent(doctype)}/${encodeURIComponent(original_value)}
+				data-doctype="${doctype}"
+				data-name="${original_value}">
+				${__(options && options.label || value)}</a>`
 		} else {
 			return value;
 		}
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 24b613d116..296087693c 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -701,7 +701,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				</span>
 			</span>
 			<span class="level-item ${seen} ellipsis" title="${escaped_subject}">
-				<a class="ellipsis" href="${this.get_form_link(doc)}" title="${escaped_subject}">
+				<a class="ellipsis" href="${this.get_form_link(doc)}" title="${escaped_subject}" data-doctype="${this.doctype}" data-name="${doc.name}">
 				${subject}
 				</a>
 			</span>
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index a5aa363ec3..2b470c819d 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -182,7 +182,6 @@ $.extend(frappe.model, {
 						doctype: doctype,
 						name: name
 					},
-					freeze: true,
 					callback: function(r) {
 						callback && callback(name, r);
 						resolve(frappe.get_doc(doctype, name));
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 34f318e0f6..a237c4a90e 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -3,39 +3,17 @@ frappe.ui.LinkPreview = class {
 	constructor() {
 		this.$links = [];
 		this.popover_timeout = null;
-		this.get_links();
+		this.setup_events();
 	}
 
-	get_links() {
-
-		$(document.body).on('mouseover', 'a[href*="/"], input[data-fieldname], .popover', (e) => {
+	setup_events() {
+		$(document.body).on('mouseover', 'a[data-doctype], input[data-fieldtype="Link"], .popover', (e) => {
 			this.link_hovered = true;
 			this.element = $(e.currentTarget);
-			this.is_link = true;
+			this.is_link = this.element.get(0).tagName.toLowerCase() === 'a';
 
 			if(!this.element.parents().find('.popover').length) {
-				if(this.element.attr('href')) {
-					this.link = this.element.attr('href');
-					if(this.link.startsWith('http')) {
-						return;
-					}
-					let details = this.get_details();
-					this.name = details.name;
-					this.doctype = details.doctype;
-				} else {
-					this.is_link = false;
-					this.link = this.element.parents('.control-input-wrapper').find('.control-value').children('a').attr('href');
-
-					if(this.link) {
-						let details = this.get_details();
-						this.name = details.name;
-						this.doctype = details.doctype;
-					} else {
-						this.name = this.element.parent().next().text();
-						this.doctype = this.element.attr('data-doctype');
-					}
-				}
-
+				this.identify_doc();
 				this.popover = this.element.data("bs.popover");
 				if(this.name && this.doctype) {
 					this.setup_popover_control(e);
@@ -45,33 +23,26 @@ frappe.ui.LinkPreview = class {
 
 	}
 
-	get_details() {
-		let details = {};
-		let link_arr = this.link.split('/');
-
-		if(link_arr.length > 2) {
-			details.name = decodeURI(link_arr[link_arr.length - 1]);
-			details.doctype = decodeURI(link_arr[link_arr.length -2]);
-			details.name = details.name.replace(new RegExp('%2F', 'g'), '/');
+	identify_doc() {
+		if (this.is_link) {
+			this.doctype = this.element.attr('data-doctype');
+			this.name = this.element.attr('data-name');
+		} else {
+			// input
+			this.doctype = this.element.attr('data-target');
+			this.name = this.element.val();
 		}
-		let title = this.element.attr('title');
-		if( title && title.includes('/')) {
-			details.name = title.trim();
-			details.doctype = decodeURI(link_arr[link_arr.length-3]);
-		}
-		return details;
 	}
 
-
 	setup_popover_control(e) {
-
-		if(!this.popover || !this.is_link) {
-			let preview_fields = this.get_preview_fields();
-			if(preview_fields.length) {
-				this.data_timeout = setTimeout(() => {
-					this.create_popover(e, preview_fields);
-				}, 1000);
-			}
+		if(!this.popover) {
+			this.get_preview_fields().then(preview_fields => {
+				if(preview_fields.length) {
+					this.data_timeout = setTimeout(() => {
+						this.create_popover(e, preview_fields);
+					}, 100);
+				}
+			});
 		} else {
 			this.popover_timeout = setTimeout(() => {
 				this.popover.show();
@@ -128,26 +99,29 @@ frappe.ui.LinkPreview = class {
 	}
 
 	get_preview_fields() {
-		let dt = this.doctype;
-		let fields = [];
-		frappe.model.with_doctype(dt, () => {
-			frappe.get_meta(dt).fields.filter((field) => {
-				if(field.in_preview) {
-					fields.push({'name':field.fieldname,'type':field.fieldtype});
-				}
-			});
-		});
-
-		if(!fields.length) {
+		return new Promise((resolve) => {
+			let dt = this.doctype;
+			let fields = [];
 			frappe.model.with_doctype(dt, () => {
-				frappe.get_meta(dt).fields.filter((field) => {
-					if(field.reqd) {
+				let meta_fields = frappe.get_meta(dt).fields;
+				meta_fields.filter((field) => {
+					// build list of fields to fetch
+					if(field.in_preview) {
 						fields.push({'name':field.fieldname,'type':field.fieldtype});
 					}
 				});
+
+				// no preview fields defined, build list from mandatory fields
+				if(!fields.length) {
+					meta_fields.filter((field) => {
+						if(field.reqd) {
+							fields.push({'name':field.fieldname,'type':field.fieldtype});
+						}
+					});
+				}
+				resolve(fields);
 			});
-		}
-		return fields;
+		});
 	}
 
 	get_preview_fields_value(field_list) {
@@ -159,7 +133,6 @@ frappe.ui.LinkPreview = class {
 	}
 
 	init_preview_popover(preview_data) {
-
 		let popover_content = this.get_popover_html(preview_data);
 		this.element.popover({
 			container: 'body',
@@ -179,12 +152,12 @@ frappe.ui.LinkPreview = class {
 	}
 
 	get_popover_html(preview_data) {
-		if(!this.link) {
-			this.link = window.location.href;
+		if(!this.href) {
+			this.href = window.location.href;
 		}
 
-		if(this.link && this.link.includes(' ')) {
-			this.link = this.link.replace(new RegExp(' ', 'g'), '%20');
+		if(this.href && this.href.includes(' ')) {
+			this.href = this.href.replace(new RegExp(' ', 'g'), '%20');
 		}
 
 		let image_html = '';
@@ -195,20 +168,20 @@ frappe.ui.LinkPreview = class {
 			let image_url = encodeURI(preview_data['image']);
 			image_html += `
 			<div class="preview-header">
-				<img src=${image_url} class="preview-image"></img> 
+				<img src=${image_url} class="preview-image"></img>
 			</div>`;
 		}
 		if(preview_data['title']) {
-			title_html+= `<a class="preview-title small" href=${this.link}>${preview_data['title']}</a>`;
+			title_html+= `<a class="preview-title small" href=${this.href}>${preview_data['title']}</a>`;
 		}
 
 		Object.keys(preview_data).forEach(key => {
 			if(key!='image' && key!='name') {
-				let value = this.truncate_value(preview_data[key]);            
+				let value = this.truncate_value(preview_data[key]);
 				let label = this.truncate_value(frappe.meta.get_label(this.doctype, key));
 				content_html += `
 				<tr class="preview-field">
-					<td class='text-muted small field-name'>${label}</td> 
+					<td class='text-muted small field-name'>${label}</td>
 					<td class="field-value small"> ${value} </td>
 				</tr>
 				`;
@@ -216,11 +189,11 @@ frappe.ui.LinkPreview = class {
 		});
 		content_html+=`</table>`;
 
-		let popover_content = 
+		let popover_content =
 			`<div class="preview-popover-header">${image_html}
 				<div class="preview-header">
 					<div class="preview-main">
-						<a class="preview-name text-bold" href=${this.link}>${preview_data['name']}</a>
+						<a class="preview-name text-bold" href=${this.href}>${preview_data['name']}</a>
 						${title_html}
 						<span class="text-muted small">${this.doctype}</span>
 					</div>

From ef2979c7e777eb0a4cded3e995b3be99936611e3 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 6 May 2019 15:09:33 +0530
Subject: [PATCH 052/175] fix: Disable Portal Routes

---
 frappe/website/router.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index e60d17a7d9..ebdbe0116f 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -16,6 +16,9 @@ def resolve_route(path):
 
 	The only exceptions are `/about` and `/contact` these will be searched in Web Pages
 	first before checking the standard pages."""
+
+	raise_if_disabled(path)
+
 	if path not in ("about", "contact"):
 		context = get_page_info_from_template(path)
 		if context:
@@ -27,6 +30,21 @@ def resolve_route(path):
 			return context
 		return get_page_info_from_template(path)
 
+def raise_if_disabled(path):
+	routes = frappe.db.get_all('Portal Menu Item',
+		fields=['route', 'enabled'],
+		filters={
+			'route': ['like', '%{0}'.format(path)],
+			'enabled': 0
+		}
+	)
+
+	for r in routes:
+		_path = r.route.lstrip('/')
+		if path == _path and not r.enabled:
+			raise frappe.PermissionError
+
+
 def get_page_context(path):
 	page_context = None
 	if can_cache():

From c7a26af7a2c661e0fc747c774cad3ffe4ac011d0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 6 May 2019 15:12:33 +0530
Subject: [PATCH 053/175] fix: link_title not getting set in address and
 contact

---
 frappe/contacts/doctype/address/address.py | 13 +++++++++++++
 frappe/contacts/doctype/contact/contact.py | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index c705f972d3..31f7ae766a 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -39,6 +39,7 @@ class Address(Document):
 	def validate(self):
 		self.link_address()
 		self.validate_reference()
+		self.set_link_title()
 		deduplicate_dynamic_links(self)
 
 	def link_address(self):
@@ -53,6 +54,18 @@ class Address(Document):
 
 		return False
 
+	def set_link_title(self):
+		if not self.links:
+			return
+		else:
+			for address in self.links:
+				if not address.link_title:
+					linked_doc = frappe.get_doc(address.link_doctype, address.link_name)
+					try:
+						address.link_title = linked_doc.title_field
+					except AttributeError:
+						address.link_title = linked_doc.name
+
 	def validate_reference(self):
 		if self.is_your_company_address:
 			if not [row for row in self.links if row.link_doctype == "Company"]:
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 987fad3829..585c37a3db 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -31,6 +31,7 @@ class Contact(Document):
 		if self.email_id:
 			self.email_id = self.email_id.strip()
 		self.set_user()
+		self.set_link_title()
 		if self.email_id and not self.image:
 			self.image = has_gravatar(self.email_id)
 
@@ -40,6 +41,18 @@ class Contact(Document):
 		if not self.user and self.email_id:
 			self.user = frappe.db.get_value("User", {"email": self.email_id})
 
+	def set_link_title(self):
+		if not self.links:
+			return
+		else:
+			for contact in self.links:
+				if not contact.link_title:
+					linked_doc = frappe.get_doc(contact.link_doctype, contact.link_name)
+					try:
+						contact.link_title = linked_doc.title_field
+					except AttributeError:
+						contact.link_title = linked_doc.name
+
 	def get_link_for(self, link_doctype):
 		'''Return the link name, if exists for the given link DocType'''
 		for link in self.links:

From b4e9d3d7a8e8e08872b1c29d10ac51bbb2239657 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 16:19:54 +0530
Subject: [PATCH 054/175] fix(wip): group by in reports

---
 .../public/js/frappe/ui/group_by/group_by.js  | 145 ++++++++++++------
 .../js/frappe/views/reports/report_view.js    |  23 +--
 2 files changed, 106 insertions(+), 62 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 81b6a4914b..e3cbb33557 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -11,35 +11,50 @@ frappe.ui.GroupBy = class {
 	}
 
 	setup_group_by_area() {
-
 		this.make_group_by_button();
-		this.report_view.setup_columns();
-		let sql_aggregate_function = [{name:'count', label: 'Count'}, {name:'sum', label: 'Sum'}, {name:'avg', label:'Average'}];
+		let sql_aggregate_function = [
+			{name:'count', label: 'Count'},
+			{name:'sum', label: 'Sum'},
+			{name:'avg', label:'Average'}
+		];
 		this.groupby_edit_area = $(frappe.render_template("group_by", {
 			groupby_conditions: this.get_group_by_fields(),
 			aggregate_function_conditions: sql_aggregate_function,
 		}));
-		$(".aggregate-function").val("count");
+
+		this.groupby_select = this.groupby_edit_area.find('select.groupby');
+		this.aggregate_function_select = this.groupby_edit_area.find('select.aggregate-function');
+		this.aggregate_on_select = this.groupby_edit_area.find('select.aggregate-on');
+
+		// set default to count
+		this.aggregate_function_select.val("count");
 		this.page.wrapper.find(".frappe-list").append(
 			this.groupby_edit_area);
 
 		//Set aggregate on options as numeric fields if function is sum or average
-		$('.aggregate-function').on('change', () => {
+		this.aggregate_function_select.on('change', () => {
 			this.report_view.meta.fields.forEach((field) => {
-				let fn = $('.aggregate-function option:selected').val();
+				let fn = this.aggregate_function_select.val();
 				if(fn === 'sum' || fn === 'avg') {
+					// pick numeric fields for sum / avg
 					if(frappe.model.is_numeric_field(field.fieldtype)) {
-						$('.aggregate-on')
-							.append($('<option>', { value : field.fieldname })
+						this.aggregate_on_select.append(
+							$('<option>', { value : field.fieldname })
 								.text(field.label));
 					}
-					$('.aggregate-on').show();
+					this.aggregate_on_select.show();
 				} else {
-					$('.aggregate-on').hide();
+					// count, so no aggregate function
+					this.aggregate_on_select.hide();
 				}
 			});
 		});
 
+		// try running on change
+		this.groupby_select.on('change', () => this.apply_group_by());
+		this.aggregate_function_select.on('change', () => this.apply_group_by());
+		this.aggregate_on_select.on('change', () => this.apply_group_by());
+
 		$('.set-groupby-and-run').on('click', () => {
 			this.apply_group_by();
 		});
@@ -61,10 +76,45 @@ frappe.ui.GroupBy = class {
 		group_by_button.click(() => this.groupby_edit_area.show());
 	}
 
+	set_args(args) {
+		if (this.aggregate_function) {
+			if (this.aggregate_function && this.group_by) {
+				let group_by_column;
+				if(this.aggregate_function === 'count') {
+					group_by_column = 'count(1)';
+				} else {
+					group_by_column = `${this.aggregate_function}(${this.aggregate_on})`;
+				}
+				args.fields.push(group_by_column + ' as _group_by_column');
+				this.order_by = '_group_by_column desc';
+			}
+
+			// //If chosen 'aggregate on' field is not in fields, push it to fields
+			if(!this.report_view.columns.includes('_group_by_column')) {
+				this.original_fields = this.report_view.fields.map(f => f);
+				this.report_view.fields = [this.group_by, '_group_by_column'];
+				this.report_view.setup_columns();
+			}
+
+			Object.assign(args, {
+				with_comment_count: false,
+				group_by: this.group_by_control.group_by || null,
+				order_by: this.group_by_control.order_by || null,
+			});
+		}
+
+	}
+
 	apply_group_by() {
 		this.group_by = this.page.wrapper.find('.groupby option:selected').val();
 		this.aggregate_function = this.page.wrapper.find('.aggregate-function option:selected').val();
-		this.aggregate_on = this.page.wrapper.find('.aggregate-on option:selected').val();
+
+		if (this.aggregate_function === 'count') {
+			this.aggregate_on = 'name';
+		} else {
+			this.aggregate_on = this.aggregate_on_select.val();
+		}
+
 
 		//All necessary fields must be set before applying group by
 		if(!this.group_by) {
@@ -78,57 +128,58 @@ frappe.ui.GroupBy = class {
 			return;
 		}
 
-		//If chosen group by field is not in fields, push it to fields
-		if(!this.report_view.columns.includes(this.group_by)) {
-			this.report_view.fields.push(this.group_by);
-		}
-
 		//If function is count add a new field for count
-		if(this.aggregate_function === 'count') {
-			let group_by_query = 'count(' + this.report_view.field_type + '.'+ this.group_by+') as ' + this.group_by + '_Count';
-			this.report_view.fields.push([group_by_query, this.doctype]);
-			this.order_by = this.group_by + '_Count desc';
-		} else {
-			//If chosen 'aggregate on' field is not in fields, push it to fields
-			if(!this.report_view.columns.includes(this.aggregate_on)) {
-				this.report_view.fields.push(this.aggregate_on);
+		this.page.wrapper.find('.set-groupby-and-run').hide();
+	}
+
+	get_group_by_docfield() {
+		let docfield;
+		if (this.aggregate_function === 'count') {
+			docfield = {
+				fieldtype: 'Int',
+				label: __('Count')
+			}
+		} else {
+			// get properties of "aggregate_on", for example Net Total
+			docfield = frappe.meta.docfield_map[doctype || this.doctype][this.group_by_control.aggregate_on];
+			if (this.aggregate_function === 'sum') {
+				docfield.label = __('Sum of {0}', [docfield.label]);
+			} else {
+				docfield.label = __('Average of {0}', [docfield.label]);
 			}
-			this.order_by = this.aggregate_on + ' desc';
 		}
+		docfield.fieldname = '_group_by_column';
 
-		$('.set-groupby-and-run').hide();
-
-		//Get current columns so that they can be restored when group by is removed
-		this.current_cols = this.report_view.columns;
-
-		let remove_columns = this.report_view.columns.filter(column => ![this.aggregate_on, this.group_by].includes(column.field));
-		remove_columns.forEach((col) => {
-			this.report_view.remove_column_from_datatable(col);
-		});
-
-		if(this.report_view.columns[0]) {
-			this.removed_previous_width = this.report_view.columns[0].docfield.width;
-			this.report_view.columns[0].docfield.width = 400;
-		}
+		return docfield;
 	}
 
 	remove_group_by() {
-		this.report_view.columns[0].docfield.width = this.removed_previous_width;
-		this.order_by = '';
 		this.groupby_edit_area.hide();
 		$('.set-groupby-and-run').show();
+
+		this.order_by = '';
 		this.group_by = null;
 		this.aggregate_function = null;
 		this.aggregate_on = null;
 		$(".groupby").val("");
 		$(".aggregate-function").val("count");
-		$(".aggregate-on").val("").hide();
-		//Add the removed columns
-		this.current_cols.forEach((col, i) => {
-			this.report_view.add_column_to_datatable(col.field, this.doctype, i);
-		});
-		this.report_view.fields.pop();
+		$(".aggregate-on").empty().val("").hide();
+
+		// restore original fields
+		if (this.original_fields) {
+			this.report_view.fields = this.original_fields;
+		} else {
+			// set in_list_view fields by default
+			this.report_view.fields = frappe.get_meta(this.report_view.doctype).fields.map(f => {
+				if (f.in_list_view) {
+					return f.fieldname;
+				} else {
+					return null;
+				}
+			}).filter(f => f);
+		}
 		this.report_view.setup_columns();
+		this.original_fields = null;
 	}
 
 	get_group_by_fields() {
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index baea83d033..ee14e268a6 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -74,21 +74,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 
 	get_args() {
 		const args = super.get_args();
+		this.group_by_control.set_args(args);
 
-		if (this.group_by_control.aggregate_function) {
-			this.field_type = args.fields[0].substring(0,args.fields[0].indexOf('.'));
-			if (this.group_by_control.aggregate_function && this.group_by_control.group_by && this.group_by_control.aggregate_on) {
-				if(this.group_by_control.aggregate_function !== 'count') {
-					args.fields.push(`${this.group_by_control.aggregate_function}(${this.group_by_control.aggregate_on}) as ${this.group_by_control.aggregate_on}`);
-				}
-			}
-
-			Object.assign(args, {
-				with_comment_count: false,
-				group_by: this.group_by_control.group_by || null,
-				order_by: this.group_by_control.order_by || null,
-			});
-		}
 		return args;
 	}
 
@@ -841,14 +828,20 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		let [fieldname, doctype] = c;
 		let docfield = frappe.meta.docfield_map[doctype || this.doctype][fieldname];
 
+		// group by column
+		if (fieldname === '_group_by_column') {
+			docfield = this.group_by_control.get_group_by_docfield();
+		}
+
 		// brackets are not allowed in fieldnames, if there is a bracket, its a function
-		if (fieldname.includes('(')) {
+		if (!docfield && fieldname.includes('(')) {
 			if (fieldname.includes(' AS ')) {
 				fieldname = fieldname.split(' AS ').slice(-1)[0];
 			} else if (fieldname.includes(' as ')) {
 				fieldname = fieldname.split(' as ').slice(-1)[0];
 			}
 		}
+
 		if (!docfield) {
 			docfield = frappe.model.get_std_field(fieldname, true);
 

From b79d35033fac5a4a7f44b808d5d7ac027faa771b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 6 May 2019 18:42:28 +0530
Subject: [PATCH 055/175] feat: disable customize option for single doctypes

---
 frappe/custom/doctype/customize_form/customize_form.py | 3 +++
 frappe/public/js/frappe/form/toolbar.js                | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 9be66c2583..d1e2153603 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -87,6 +87,9 @@ class CustomizeForm(Document):
 		if self.doc_type in core_doctypes_list:
 			return frappe.msgprint(_("Core DocTypes cannot be customized."))
 
+		if meta.issingle:
+			return frappe.msgprint(_("Single DocTypes cannot be customized."))
+
 		if meta.custom:
 			return frappe.msgprint(_("Only standard DocTypes are allowed to be customized from Customize Form."))
 
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 44898c3b5e..a6d3a9a8f7 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -160,7 +160,7 @@ frappe.ui.form.Toolbar = Class.extend({
 				me.frm.savetrash();}, true);
 		}
 
-		if(frappe.user_roles.includes("System Manager")) {
+		if(frappe.user_roles.includes("System Manager") && me.frm.meta.issingle === 0) {
 			this.page.add_menu_item(__("Customize"), function() {
 				frappe.set_route("Form", "Customize Form", {
 					doc_type: me.frm.doctype

From 07746ff7c9d0c5bb54c522e2bf9eae548c12e2be Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 19:37:03 +0530
Subject: [PATCH 056/175] fix: column mapping

---
 .../public/js/frappe/ui/group_by/group_by.js  | 91 ++++++++++---------
 .../js/frappe/views/reports/report_view.js    | 19 ++--
 2 files changed, 58 insertions(+), 52 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 e3cbb33557..4b5bde39db 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -2,7 +2,6 @@
 frappe.provide('frappe.views');
 
 frappe.ui.GroupBy = class {
-
 	constructor(report_view) {
 		this.report_view = report_view;
 		this.page = report_view.page;
@@ -76,35 +75,6 @@ frappe.ui.GroupBy = class {
 		group_by_button.click(() => this.groupby_edit_area.show());
 	}
 
-	set_args(args) {
-		if (this.aggregate_function) {
-			if (this.aggregate_function && this.group_by) {
-				let group_by_column;
-				if(this.aggregate_function === 'count') {
-					group_by_column = 'count(1)';
-				} else {
-					group_by_column = `${this.aggregate_function}(${this.aggregate_on})`;
-				}
-				args.fields.push(group_by_column + ' as _group_by_column');
-				this.order_by = '_group_by_column desc';
-			}
-
-			// //If chosen 'aggregate on' field is not in fields, push it to fields
-			if(!this.report_view.columns.includes('_group_by_column')) {
-				this.original_fields = this.report_view.fields.map(f => f);
-				this.report_view.fields = [this.group_by, '_group_by_column'];
-				this.report_view.setup_columns();
-			}
-
-			Object.assign(args, {
-				with_comment_count: false,
-				group_by: this.group_by_control.group_by || null,
-				order_by: this.group_by_control.order_by || null,
-			});
-		}
-
-	}
-
 	apply_group_by() {
 		this.group_by = this.page.wrapper.find('.groupby option:selected').val();
 		this.aggregate_function = this.page.wrapper.find('.aggregate-function option:selected').val();
@@ -130,25 +100,70 @@ frappe.ui.GroupBy = class {
 
 		//If function is count add a new field for count
 		this.page.wrapper.find('.set-groupby-and-run').hide();
+
+		this.report_view.refresh();
 	}
 
+	set_args(args) {
+		if (this.aggregate_function && this.group_by) {
+			let aggregate_column;
+			if(this.aggregate_function === 'count') {
+				aggregate_column = 'count(1)';
+			} else {
+				aggregate_column = `${this.aggregate_function}(${this.aggregate_on})`;
+			}
+
+			this.report_view.group_by = this.group_by;
+			this.report_view.order_by = '_aggregate_column desc';
+
+			// save orignial fields
+			if(!this.report_view.fields.map(f => f[0]).includes('_aggregate_column')) {
+				this.original_fields = this.report_view.fields.map(f => f);
+			}
+
+			this.report_view.fields = [
+				[this.group_by, this.doctype]
+			];
+
+			// rebuild fields for group by
+			args.fields = this.report_view.get_fields();
+
+			// add aggregate column in both query args and report view
+			this.report_view.fields.push(['_aggregate_column', this.doctype]);
+			args.fields.push(aggregate_column + ' as _aggregate_column');
+
+			// setup columns in datatable
+			this.report_view.setup_columns();
+
+			Object.assign(args, {
+				with_comment_count: false,
+				group_by: this.group_by || null,
+				order_by: this.order_by || null,
+			});
+		}
+
+	}
+
+
 	get_group_by_docfield() {
+		// called from build_column
 		let docfield;
 		if (this.aggregate_function === 'count') {
 			docfield = {
 				fieldtype: 'Int',
-				label: __('Count')
+				label: __('Count'),
+				parent: this.doctype
 			}
 		} else {
 			// get properties of "aggregate_on", for example Net Total
-			docfield = frappe.meta.docfield_map[doctype || this.doctype][this.group_by_control.aggregate_on];
+			docfield = Object.assign({}, frappe.meta.docfield_map[this.doctype][this.aggregate_on]);
 			if (this.aggregate_function === 'sum') {
 				docfield.label = __('Sum of {0}', [docfield.label]);
 			} else {
 				docfield.label = __('Average of {0}', [docfield.label]);
 			}
 		}
-		docfield.fieldname = '_group_by_column';
+		docfield.fieldname = '_aggregate_column';
 
 		return docfield;
 	}
@@ -169,17 +184,11 @@ frappe.ui.GroupBy = class {
 		if (this.original_fields) {
 			this.report_view.fields = this.original_fields;
 		} else {
-			// set in_list_view fields by default
-			this.report_view.fields = frappe.get_meta(this.report_view.doctype).fields.map(f => {
-				if (f.in_list_view) {
-					return f.fieldname;
-				} else {
-					return null;
-				}
-			}).filter(f => f);
+			this.report_view.set_default_fields();
 		}
 		this.report_view.setup_columns();
 		this.original_fields = null;
+		this.report_view.refresh();
 	}
 
 	get_group_by_fields() {
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index ee14e268a6..c4bce82249 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -129,6 +129,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				fields: this.fields,
 				filters: this.filter_area.get(),
 				order_by: this.sort_selector.get_sql_string(),
+				group_by: this.group_by,
 				add_totals_row: this.add_totals_row
 			});
 		}
@@ -603,6 +604,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			return;
 		}
 
+		this.set_default_fields();
+	}
+
+	set_default_fields() {
 		// get fields from meta
 		this.fields = [];
 		const add_field = f => this._add_field(f);
@@ -829,19 +834,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		let docfield = frappe.meta.docfield_map[doctype || this.doctype][fieldname];
 
 		// group by column
-		if (fieldname === '_group_by_column') {
+		if (fieldname === '_aggregate_column') {
 			docfield = this.group_by_control.get_group_by_docfield();
 		}
 
-		// brackets are not allowed in fieldnames, if there is a bracket, its a function
-		if (!docfield && fieldname.includes('(')) {
-			if (fieldname.includes(' AS ')) {
-				fieldname = fieldname.split(' AS ').slice(-1)[0];
-			} else if (fieldname.includes(' as ')) {
-				fieldname = fieldname.split(' as ').slice(-1)[0];
-			}
-		}
-
 		if (!docfield) {
 			docfield = frappe.model.get_std_field(fieldname, true);
 
@@ -1107,7 +1103,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				label: __('Show Totals'),
 				action: () => {
 					this.add_totals_row = !this.add_totals_row;
-					this.save_view_user_settings({ add_totals_row: this.add_totals_row });
+					this.save_view_user_settings(
+						{ add_totals_row: this.add_totals_row });
 					this.datatable.refresh(this.get_data(this.data));
 				}
 			},

From 3cab2186f3fb511181b8b63adaf200d42638f950 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 20:01:33 +0530
Subject: [PATCH 057/175] fix(report): save group by settings in report

---
 .../public/js/frappe/ui/group_by/group_by.js  | 73 +++++++++++++------
 .../js/frappe/views/reports/report_view.js    | 22 ++++--
 2 files changed, 68 insertions(+), 27 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 4b5bde39db..c076b6e513 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -32,30 +32,16 @@ frappe.ui.GroupBy = class {
 
 		//Set aggregate on options as numeric fields if function is sum or average
 		this.aggregate_function_select.on('change', () => {
-			this.report_view.meta.fields.forEach((field) => {
-				let fn = this.aggregate_function_select.val();
-				if(fn === 'sum' || fn === 'avg') {
-					// pick numeric fields for sum / avg
-					if(frappe.model.is_numeric_field(field.fieldtype)) {
-						this.aggregate_on_select.append(
-							$('<option>', { value : field.fieldname })
-								.text(field.label));
-					}
-					this.aggregate_on_select.show();
-				} else {
-					// count, so no aggregate function
-					this.aggregate_on_select.hide();
-				}
-			});
+			this.show_hide_aggregate_on();
 		});
 
 		// try running on change
-		this.groupby_select.on('change', () => this.apply_group_by());
-		this.aggregate_function_select.on('change', () => this.apply_group_by());
-		this.aggregate_on_select.on('change', () => this.apply_group_by());
+		this.groupby_select.on('change', () => this.apply_group_by_and_refresh());
+		this.aggregate_function_select.on('change', () => this.apply_group_by_and_refresh());
+		this.aggregate_on_select.on('change', () => this.apply_group_by_and_refresh());
 
 		$('.set-groupby-and-run').on('click', () => {
-			this.apply_group_by();
+			this.apply_group_by_and_refresh();
 		});
 
 		$('.remove-groupby').on('click', () => {
@@ -63,6 +49,46 @@ frappe.ui.GroupBy = class {
 		});
 	}
 
+	show_hide_aggregate_on() {
+		this.report_view.meta.fields.forEach((field) => {
+			let fn = this.aggregate_function_select.val();
+			if(fn === 'sum' || fn === 'avg') {
+				// pick numeric fields for sum / avg
+				if(frappe.model.is_numeric_field(field.fieldtype)) {
+					this.aggregate_on_select.append(
+						$('<option>', { value : field.fieldname })
+							.text(field.label));
+				}
+				this.aggregate_on_select.show();
+			} else {
+				// count, so no aggregate function
+				this.aggregate_on_select.hide();
+			}
+		});
+	}
+
+	get_settings() {
+		if (this.group_by)  {
+			return {
+				group_by: this.group_by,
+				aggregate_function: this.aggregate_function,
+				aggregate_on: this.aggregate_on
+			};
+		} else {
+			return null;
+		}
+	}
+
+	apply_settings(settings) {
+		this.groupby_select.val(settings.group_by);
+		this.aggregate_function_select.val(settings.aggregate_function);
+		this.show_hide_aggregate_on();
+		this.aggregate_on_select.val(settings.aggregate_on);
+		this.groupby_edit_area.show();
+
+		this.apply_group_by();
+	}
+
 	make_group_by_button() {
 		let group_by_button =  $(`<div class="tag-groupby-area">
 			<div class="active-tag-groupby">
@@ -76,8 +102,8 @@ frappe.ui.GroupBy = class {
 	}
 
 	apply_group_by() {
-		this.group_by = this.page.wrapper.find('.groupby option:selected').val();
-		this.aggregate_function = this.page.wrapper.find('.aggregate-function option:selected').val();
+		this.group_by = this.groupby_select.val();
+		this.aggregate_function = this.aggregate_function_select.val();
 
 		if (this.aggregate_function === 'count') {
 			this.aggregate_on = 'name';
@@ -101,6 +127,10 @@ frappe.ui.GroupBy = class {
 		//If function is count add a new field for count
 		this.page.wrapper.find('.set-groupby-and-run').hide();
 
+	}
+
+	apply_group_by_and_refresh() {
+		this.apply_group_by();
 		this.report_view.refresh();
 	}
 
@@ -194,4 +224,5 @@ frappe.ui.GroupBy = class {
 	get_group_by_fields() {
 		return this.report_view.meta.fields.filter((f)=> ["Select", "Link"].includes(f.fieldtype));
 	}
+
 };
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index c4bce82249..fa352269b9 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -20,8 +20,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			this.report_name = route[3];
 		}
 
-		this.add_totals_row = this.view_user_settings.add_totals_row || 0;
-
 		if (this.report_name) {
 			return this.get_report_doc()
 				.then(doc => {
@@ -35,6 +33,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					this.page_length = this.report_doc.json.page_length || 20;
 					this.order_by = this.report_doc.json.order_by || 'modified desc';
 				});
+		} else {
+			this.add_totals_row = this.view_user_settings.add_totals_row || 0;
 		}
 	}
 
@@ -70,6 +70,13 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 
 		//Setup groupby for reports
 		this.group_by_control = new frappe.ui.GroupBy(this);
+		if (this.report_doc && this.report_doc.json.group_by) {
+			this.group_by_control.apply_settings(this.report_doc.json.group_by);
+		}
+		if (this.view_user_settings && this.view_user_settings.group_by) {
+			this.group_by_control.apply_settings(this.view_user_settings.group_by);
+		}
+
 	}
 
 	get_args() {
@@ -102,7 +109,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			order_by: this.sort_selector.get_sql_string(),
 			add_totals_row: this.add_totals_row,
 			page_length: this.page_length,
-			column_widths: this.get_column_widths()
+			column_widths: this.get_column_widths(),
+			group_by: this.group_by_control.get_settings()
 		}
 
 		let report_settings = {
@@ -111,7 +119,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			order_by: this.report_doc.json.order_by,
 			add_totals_row: this.report_doc.json.add_totals_row,
 			page_length: this.report_doc.json.page_length,
-			column_widths: this.report_doc.json.column_widths
+			column_widths: this.report_doc.json.column_widths,
+			group_by: this.report_doc.json.group_by
 		}
 
 		if (!frappe.utils.deep_equal(current_settings, report_settings)) {
@@ -129,7 +138,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				fields: this.fields,
 				filters: this.filter_area.get(),
 				order_by: this.sort_selector.get_sql_string(),
-				group_by: this.group_by,
+				group_by: this.group_by_control.get_settings(),
 				add_totals_row: this.add_totals_row
 			});
 		}
@@ -997,7 +1006,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				order_by: this.sort_selector.get_sql_string(),
 				add_totals_row: this.add_totals_row,
 				page_length: this.page_length,
-				column_widths: this.get_column_widths()
+				column_widths: this.get_column_widths(),
+				group_by: this.group_by_control.get_settings()
 			}
 
 			return frappe.call({

From 699b5524f829ff1cfbb82325688559bd79205a6d Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 6 May 2019 22:05:12 +0530
Subject: [PATCH 058/175] fix(report): save group by settings in report

---
 frappe/public/js/frappe/ui/group_by/group_by.js      | 7 +++++--
 frappe/public/js/frappe/views/reports/report_view.js | 2 +-
 2 files changed, 6 insertions(+), 3 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 c076b6e513..69067c4ca1 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -127,11 +127,14 @@ frappe.ui.GroupBy = class {
 		//If function is count add a new field for count
 		this.page.wrapper.find('.set-groupby-and-run').hide();
 
+		return true;
+
 	}
 
 	apply_group_by_and_refresh() {
-		this.apply_group_by();
-		this.report_view.refresh();
+		if (this.apply_group_by()) {
+			this.report_view.refresh();
+		}
 	}
 
 	set_args(args) {
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index fa352269b9..890f5ee221 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1008,7 +1008,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				page_length: this.page_length,
 				column_widths: this.get_column_widths(),
 				group_by: this.group_by_control.get_settings()
-			}
+			};
 
 			return frappe.call({
 				method: 'frappe.desk.reportview.save_report',

From 11ad92a21f01e1201495e24960f5ccb65dcb695e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 7 May 2019 11:32:28 +0530
Subject: [PATCH 059/175] feat: Website Redirects

---
 frappe/tests/test_website.py                  |   13 +
 .../website_route_redirect/__init__.py        |    0
 .../website_route_redirect.json               |   35 +
 .../website_route_redirect.py                 |   10 +
 .../website_settings/website_settings.json    | 1234 ++---------------
 frappe/website/redirect.py                    |    2 +
 6 files changed, 151 insertions(+), 1143 deletions(-)
 create mode 100644 frappe/website/doctype/website_route_redirect/__init__.py
 create mode 100644 frappe/website/doctype/website_route_redirect/website_route_redirect.json
 create mode 100644 frappe/website/doctype/website_route_redirect/website_route_redirect.py

diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index c47ebd01f0..9efd4d04a1 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -39,6 +39,14 @@ class TestWebsite(unittest.TestCase):
 			dict(source=r'/testfromregex.*', target=r'://testto2'),
 			dict(source=r'/testsub/(.*)', target=r'://testto3/\1')
 		]
+
+		website_settings = frappe.get_doc('Website Settings')
+		website_settings.append('route_redirects', {
+			'source': '/testsource',
+			'target': '/testtarget'
+		})
+		website_settings.save()
+
 		frappe.cache().delete_key('app_hooks')
 		frappe.cache().delete_key('website_redirects')
 
@@ -61,6 +69,11 @@ class TestWebsite(unittest.TestCase):
 		response = render.render()
 		self.assertEquals(response.status_code, 404)
 
+		set_request(method='GET', path='/testsource')
+		response = render.render()
+		self.assertEquals(response.status_code, 301)
+		self.assertEquals(response.headers.get('Location'), '/testtarget')
+
 		delattr(frappe.hooks, 'website_redirects')
 		frappe.cache().delete_key('app_hooks')
 
diff --git a/frappe/website/doctype/website_route_redirect/__init__.py b/frappe/website/doctype/website_route_redirect/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/website_route_redirect/website_route_redirect.json b/frappe/website/doctype/website_route_redirect/website_route_redirect.json
new file mode 100644
index 0000000000..d561a1be10
--- /dev/null
+++ b/frappe/website/doctype/website_route_redirect/website_route_redirect.json
@@ -0,0 +1,35 @@
+{
+ "creation": "2019-05-07 11:08:35.889625",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "source",
+  "target"
+ ],
+ "fields": [
+  {
+   "fieldname": "source",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Source",
+   "reqd": 1
+  },
+  {
+   "fieldname": "target",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Target",
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "modified": "2019-05-07 11:11:46.867684",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Website Route Redirect",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "ASC"
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/website_route_redirect/website_route_redirect.py b/frappe/website/doctype/website_route_redirect/website_route_redirect.py
new file mode 100644
index 0000000000..7255008dd0
--- /dev/null
+++ b/frappe/website/doctype/website_route_redirect/website_route_redirect.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, 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 WebsiteRouteRedirect(Document):
+	pass
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 1c6ed8da17..38a4b84c5d 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -1,1364 +1,312 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
  "creation": "2013-04-30 12:58:46",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Other",
- "editable_grid": 0,
+ "field_order": [
+  "sb0",
+  "home_page",
+  "cb4",
+  "title_prefix",
+  "section_break_6",
+  "website_theme",
+  "website_theme_image",
+  "website_theme_image_link",
+  "brand",
+  "banner_image",
+  "brand_html",
+  "set_banner_from_image",
+  "favicon",
+  "top_bar",
+  "navbar_search",
+  "top_bar_items",
+  "banner",
+  "banner_html",
+  "footer",
+  "copyright",
+  "address",
+  "footer_items",
+  "hide_footer_signup",
+  "integrations",
+  "google_analytics_id",
+  "column_break_17",
+  "misc_section",
+  "subdomain",
+  "disable_signup",
+  "section_break_38",
+  "head_html",
+  "robots_txt",
+  "route_redirects",
+  "section_break_39",
+  "chat_enable",
+  "chat_enable_from",
+  "chat_enable_to",
+  "chat_room_name",
+  "chat_welcome_message",
+  "chat_operators"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "sb0",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Landing Page",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Landing Page"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Link that is the website home page. Standard Links (index, login, products, blog, about, contact)",
    "fieldname": "home_page",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Home Page",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Home Page"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "cb4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Show title in browser window as \"Prefix - title\"",
    "fieldname": "title_prefix",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Title Prefix",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Title Prefix"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Section Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Standard",
    "fieldname": "website_theme",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Website Theme",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Website Theme",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Website Theme"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "website_theme_image",
    "fieldtype": "Image",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Website Theme Image",
-   "length": 0,
-   "no_copy": 0,
-   "options": "website_theme_image_link",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "website_theme_image_link"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "website_theme_image_link",
    "fieldtype": "Code",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Website Theme Image Link",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Website Theme Image Link"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "brand",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Brand",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Brand"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Select an image of approx width 150px with a transparent background for best results.",
    "fieldname": "banner_image",
    "fieldtype": "Attach Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Brand Image",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Brand Image"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Brand is what appears on the top-left of the toolbar. If it is an image, make sure it\nhas a transparent background and use the &lt;img /&gt; tag. Keep size as 200px x 30px",
    "fieldname": "brand_html",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Brand HTML",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Brand HTML"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "set_banner_from_image",
    "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Set Banner from Image",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Set Banner from Image"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
-   "description": "",
    "fieldname": "top_bar",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Top Bar",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Top Bar"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "navbar_search",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Include Search in Top Bar",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Include Search in Top Bar"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "top_bar_items",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Top Bar Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Top Bar Item",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Top Bar Item"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
-   "description": "",
    "fieldname": "banner",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Banner",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Banner"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Banner is above the Top Menu Bar.",
    "fieldname": "banner_html",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Banner HTML",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Banner HTML"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "footer",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Footer",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Footer"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "copyright",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Copyright",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Copyright"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Address and other legal information you may want to put in the footer.",
    "fieldname": "address",
    "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Address",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Address"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "footer_items",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Footer Items",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Top Bar Item",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Top Bar Item"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "hide_footer_signup",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Hide Footer Signup",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Hide Footer Signup"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "integrations",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Integrations",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Integrations"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Add Google Analytics ID: eg. UA-89XXX57-1. Please search help on Google Analytics for more information.",
    "fieldname": "google_analytics_id",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Google Analytics ID",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Google Analytics ID"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_17",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "misc_section",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "More Information",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Disable Signup"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]",
    "fieldname": "favicon",
    "fieldtype": "Attach",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "FavIcon",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "FavIcon"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Sub-domain provided by erpnext.com",
    "fieldname": "subdomain",
    "fieldtype": "Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Subdomain",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_28",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "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,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Disable Customer Signup link in Login page",
    "fieldname": "disable_signup",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Disable Signup",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Disable Signup"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "section_break_38",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "HTML Header & Robots",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "HTML Header, Robots and Redirects"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Added HTML in the &lt;head&gt; section of the web page, primarily used for website verification and SEO",
    "fieldname": "head_html",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "&lt;head&gt; HTML",
-   "length": 0,
-   "no_copy": 0,
-   "options": "HTML",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "HTML"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "robots_txt",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Robots.txt",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Robots.txt"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "section_break_39",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Chat",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Chat"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "chat_enable",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Enable Chat",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Enable Chat"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "chat_enable",
    "fieldname": "chat_enable_from",
    "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "From",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "From"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "chat_enable",
    "fieldname": "chat_enable_to",
    "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "To",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "To"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Support",
    "depends_on": "chat_enable",
    "fieldname": "chat_room_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Chat Room Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Chat Room Name"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Hi, how may I help you?",
    "depends_on": "chat_enable",
    "fieldname": "chat_welcome_message",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Welcome Message",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Welcome Message"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "chat_enable",
    "fieldname": "chat_operators",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Chat Operators",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Chat Room User",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Chat Room User"
+  },
+  {
+   "fieldname": "route_redirects",
+   "fieldtype": "Table",
+   "label": "Route Redirects",
+   "options": "Website Route Redirect"
   }
  ],
- "has_web_view": 0,
- "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": 10,
- "modified": "2019-02-21 13:59:29.098096",
- "modified_by": "abhay@march.com",
+ "modified": "2019-05-07 11:24:10.031140",
+ "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Settings",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
-   "delete": 0,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
-   "report": 0,
    "role": "Website Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
-   "delete": 0,
-   "email": 0,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
    "permlevel": 1,
-   "print": 0,
    "read": 1,
-   "report": 0,
-   "role": "All",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "All"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
  "sort_order": "ASC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/redirect.py b/frappe/website/redirect.py
index 8006ebaed7..73e3c21727 100644
--- a/frappe/website/redirect.py
+++ b/frappe/website/redirect.py
@@ -21,6 +21,8 @@ def resolve_redirect(path):
 		]
 	'''
 	redirects = frappe.get_hooks('website_redirects')
+	redirects += frappe.db.get_all('Website Route Redirect', ['source', 'target'])
+
 	if not redirects: return
 
 	redirect_to = frappe.cache().hget('website_redirects', path)

From b62a92694abd4b4f51b0dae62bf0f837c2d71bd5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 7 May 2019 11:37:35 +0530
Subject: [PATCH 060/175] fix: Skip log creation if user from the rule comes
 out to be Admin

---
 .../energy_point_log/test_energy_point_log.py       | 13 +++++++++++++
 .../doctype/energy_point_rule/energy_point_rule.py  |  5 ++---
 2 files changed, 15 insertions(+), 3 deletions(-)

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 c8b3dc913e..c744930541 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
@@ -105,6 +105,19 @@ class TestEnergyPointLog(unittest.TestCase):
 		self.assertEquals(energy_points_after_review, energy_points_before_review - criticism_points)
 		self.assertEquals(review_points_after_review, review_points_before_review - criticism_points)
 
+	def test_user_energy_point_as_admin(self):
+		frappe.set_user('Administrator')
+		create_energy_point_rule_for_todo()
+		created_todo = create_a_todo()
+
+		created_todo.status = 'Closed'
+		created_todo.save()
+
+		points_after_closing_todo = get_points('Administrator')
+
+		# no points for admin
+		self.assertEquals(points_after_closing_todo, 0)
+
 def create_energy_point_rule_for_todo(multiplier_field=None):
 	name = 'ToDo Closed'
 	point_rule = frappe.db.get_all(
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index ccf0ff0b13..43850a7a37 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -33,7 +33,7 @@ class EnergyPointRule(Document):
 			if not points: return
 
 			# if user_field has no value
-			if not user: return
+			if not user or user == 'Administrator': return
 
 			try:
 				create_energy_points_log(reference_doctype, reference_name, {
@@ -48,8 +48,7 @@ class EnergyPointRule(Document):
 def process_energy_points(doc, state):
 	if (frappe.flags.in_patch
 		or frappe.flags.in_install
-		or not is_energy_point_enabled()
-		or frappe.session.user == 'Administrator'):
+		or not is_energy_point_enabled()):
 		return
 
 	for d in frappe.cache_manager.get_doctype_map('Energy Point Rule', doc.doctype,

From 0bbb3b3ad6521d8eab2a93f2e966af944e62c8c3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 7 May 2019 12:34:32 +0530
Subject: [PATCH 061/175] fix: listview count while filtering with child table
 (#7420)

* fix: Add distinct to count query if filter includes child table
---
 frappe/public/js/frappe/list/list_view.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 296087693c..4237b83ef5 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -646,14 +646,23 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	get_count_str() {
 		const current_count = this.data.length;
+		const filters = this.get_filters_for_args();
+		const with_child_table_filter = filters.some(filter => {
+			return filter[0] !== this.doctype;
+		});
+
+		const fields = [
+			// cannot break this line as it adds extra \n's and \t's which breaks the query
+			`count(${with_child_table_filter ? 'distinct': ''}${frappe.model.get_full_column_name('name', this.doctype)}) AS total_count`
+		];
 
 		return frappe.call({
 			type: 'GET',
 			method: this.method,
 			args: {
 				doctype: this.doctype,
-				filters: this.get_filters_for_args(),
-				fields: [`count(${frappe.model.get_full_column_name('name', this.doctype)}) as total_count`],
+				filters,
+				fields,
 			}
 		}).then(r => {
 			this.total_count = r.message.values[0][0] || current_count;

From cf7f86f6ccc23b0e40225bf948a9222b24e41aaf Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 7 May 2019 15:22:12 +0530
Subject: [PATCH 062/175] chore: code improvements

---
 frappe/contacts/doctype/address/address.py | 12 ++++--------
 frappe/contacts/doctype/contact/contact.py | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 31f7ae766a..583643ad27 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -57,14 +57,10 @@ class Address(Document):
 	def set_link_title(self):
 		if not self.links:
 			return
-		else:
-			for address in self.links:
-				if not address.link_title:
-					linked_doc = frappe.get_doc(address.link_doctype, address.link_name)
-					try:
-						address.link_title = linked_doc.title_field
-					except AttributeError:
-						address.link_title = linked_doc.name
+		for address in self.links:
+			if not address.link_title:
+				linked_doc = frappe.get_doc(address.link_doctype, address.link_name)
+				address.link_title = linked_doc.get("title_field") or linked_doc.get("name")
 
 	def validate_reference(self):
 		if self.is_your_company_address:
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 585c37a3db..28f150f0d4 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -44,14 +44,10 @@ class Contact(Document):
 	def set_link_title(self):
 		if not self.links:
 			return
-		else:
-			for contact in self.links:
-				if not contact.link_title:
-					linked_doc = frappe.get_doc(contact.link_doctype, contact.link_name)
-					try:
-						contact.link_title = linked_doc.title_field
-					except AttributeError:
-						contact.link_title = linked_doc.name
+		for contact in self.links:
+			if not contact.link_title:
+				linked_doc = frappe.get_doc(contact.link_doctype, contact.link_name)
+				contact.link_title = linked_doc.get("title_field") or linked_doc.get("name")
 
 	def get_link_for(self, link_doctype):
 		'''Return the link name, if exists for the given link DocType'''

From 87082e2c07a25a71c77ad7c64339e2d37f577648 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 7 May 2019 15:50:18 +0530
Subject: [PATCH 063/175] fix(report): charting in reports now supports group
 by and saved in user settings;

---
 frappe/desk/reportview.py                     |   2 +-
 .../public/js/frappe/ui/group_by/group_by.js  |  12 +-
 .../js/frappe/views/reports/report_view.js    | 353 +++++++++---------
 3 files changed, 186 insertions(+), 181 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 42409867fb..5ed4dc730b 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -108,7 +108,7 @@ def save_report():
 	d.report_type = "Report Builder"
 	d.json = data['json']
 	frappe.get_doc(d).save()
-	frappe.msgprint(_("{0} is saved").format(d.name))
+	frappe.msgprint(_("{0} is saved").format(d.name), alert=True)
 	return d.name
 
 @frappe.whitelist()
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 69067c4ca1..72382e9022 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -147,7 +147,8 @@ frappe.ui.GroupBy = class {
 			}
 
 			this.report_view.group_by = this.group_by;
-			this.report_view.order_by = '_aggregate_column desc';
+			this.report_view.sort_by = '_aggregate_column';
+			this.report_view.sort_order = 'desc';
 
 			// save orignial fields
 			if(!this.report_view.fields.map(f => f[0]).includes('_aggregate_column')) {
@@ -170,8 +171,8 @@ frappe.ui.GroupBy = class {
 
 			Object.assign(args, {
 				with_comment_count: false,
-				group_by: this.group_by || null,
-				order_by: this.order_by || null,
+				group_by: this.report_view.group_by || null,
+				order_by: '_aggregate_column desc'
 			});
 		}
 
@@ -185,8 +186,9 @@ frappe.ui.GroupBy = class {
 			docfield = {
 				fieldtype: 'Int',
 				label: __('Count'),
-				parent: this.doctype
-			}
+				parent: this.doctype,
+				width: 120
+			};
 		} else {
 			// get properties of "aggregate_on", for example Net Total
 			docfield = Object.assign({}, frappe.meta.docfield_map[this.doctype][this.aggregate_on]);
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 890f5ee221..00c64612a5 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -32,26 +32,38 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					this.page_title = this.report_name;
 					this.page_length = this.report_doc.json.page_length || 20;
 					this.order_by = this.report_doc.json.order_by || 'modified desc';
+					this.chart_args = this.report_doc.json.chart_args;
 				});
 		} else {
 			this.add_totals_row = this.view_user_settings.add_totals_row || 0;
+			this.chart_args = this.view_user_settings.chart_args;
 		}
 	}
 
 	setup_view() {
 		this.setup_columns();
-		this.bind_charts_button();
 		super.setup_new_doc_event();
 	}
 
 	setup_result_area() {
 		super.setup_result_area();
+		this.setup_charts_area();
 		this.$datatable_wrapper = $('<div class="datatable-wrapper">');
-		this.$charts_wrapper = $('<div class="charts-wrapper">');
-		this.$result.append(this.$charts_wrapper);
 		this.$result.append(this.$datatable_wrapper);
 	}
 
+	setup_charts_area() {
+		this.$charts_wrapper = $(`<div class="charts-wrapper hidden">
+			<div><button class="btn btn-default btn-xs btn-chart-configure pull-right"
+				style="margin-right: 15px">Configure</button></div>
+			<div class="charts-inner-wrapper"></div>
+		</div>`);
+		this.$result.append(this.$charts_wrapper);
+		this.$charts_wrapper.find('.btn-chart-configure').on('click', () => {
+			this.setup_charts();
+		});
+	}
+
 	setup_paging_area() {
 		super.setup_paging_area();
 		const message = __('For comparison, use >5, <10 or =324. For ranges, use 5:10 (for values between 5 & 10).');
@@ -100,6 +112,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		} else {
 			this.save_report_settings();
 		}
+		this.init_chart();
 	}
 
 	set_dirty_state_for_custom_report() {
@@ -110,8 +123,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			add_totals_row: this.add_totals_row,
 			page_length: this.page_length,
 			column_widths: this.get_column_widths(),
-			group_by: this.group_by_control.get_settings()
-		}
+			group_by: this.group_by_control.get_settings(),
+			chart_args: this.get_chart_settings()
+		};
 
 		let report_settings = {
 			filters: this.report_doc.json.filters,
@@ -120,8 +134,9 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			add_totals_row: this.report_doc.json.add_totals_row,
 			page_length: this.report_doc.json.page_length,
 			column_widths: this.report_doc.json.column_widths,
-			group_by: this.report_doc.json.group_by
-		}
+			group_by: this.report_doc.json.group_by,
+			chart_args: this.report_doc.json.chart_args
+		};
 
 		if (!frappe.utils.deep_equal(current_settings, report_settings)) {
 			this.page.set_indicator(__('Not Saved'), 'orange');
@@ -139,6 +154,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				filters: this.filter_area.get(),
 				order_by: this.sort_selector.get_sql_string(),
 				group_by: this.group_by_control.get_settings(),
+				chart_args: this.get_chart_settings(),
 				add_totals_row: this.add_totals_row
 			});
 		}
@@ -333,180 +349,161 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		});
 	}
 
-	bind_charts_button() {
-		this.list_sidebar.sidebar.find('.charts-menu').removeClass('hide');
-		this.list_sidebar.sidebar.on('click', '.toggle-charts', (e) => {
-			e.preventDefault();
-			this.toggle_charts();
-		});
-		this.list_sidebar.sidebar.on('click', '.configure-charts', (e) => {
-			e.preventDefault();
-			this.get_chart_data().then(() => this.refresh_charts());
-		});
-		this.refresh_charts_sidebar_button();
-	}
-
-	refresh_charts_sidebar_button() {
-		// show configure charts button if charts is shown
-		const $configure_btn = this.list_sidebar.sidebar.find('.configure-charts');
-		const charts_visible = this.chart && !this.$charts_wrapper.hasClass('hidden');
-
-		if (charts_visible) {
-			$configure_btn.removeClass('hidden');
-		} else {
-			$configure_btn.addClass('hidden');
-		}
-	}
-
 	toggle_charts() {
+		// add
 		if (!this.chart) {
 			this.setup_charts();
 			return;
 		}
-		this.$charts_wrapper.toggleClass('hidden');
 
-		if (!this.$charts_wrapper.hasClass('hidden')) {
-			this.chart.refresh();
+		if (this.$charts_wrapper.hasClass('hidden')) {
+			// reload chart
+			this.$charts_wrapper.removeClass('hidden');
+			this.refresh_charts();
+		} else {
+			// remove chart
+			this.$charts_wrapper.addClass('hidden');
+			this.save_view_user_settings(
+				{ chart_args: null });
 		}
+	}
 
-		this.refresh_charts_sidebar_button();
+	init_chart() {
+		// show chart if saved via report or user settings
+		if (!this.chart) {
+			if (this.chart_args) {
+				this.build_chart_args(this.chart_args.x_axis,
+					this.chart_args.y_axes,
+					this.chart_args.chart_type);
+
+				this.make_chart();
+			}
+		}
 	}
 
 	setup_charts() {
-		this.get_chart_data()
-			.then(args => {
-				let data = {
-					labels: args.labels,
-					datasets: args.datasets
-				};
-
-				this.last_chart_type = args.chart_type;
-
-				const get_df = (field) => frappe.meta.get_docfield(this.doctype, field);
-				const get_doc = (value, field) => this.data.find(d => d[field] === value);
-
-				this.chart = new Chart(this.$charts_wrapper[0], {
-					title: __("{0} Chart", [this.doctype]),
-					data: data,
-					type: args.chart_type,
-					height: 150,
-					colors: ['violet', 'light-blue', 'orange', 'red'],
-
-					format_tooltip_x: value => value.doc.name,
-					format_tooltip_y:
-						value => frappe.format(value, get_df(value.field), { always_show_decimals: true, inline: true }, get_doc(value.doc))
-				});
-
-				this.refresh_charts_sidebar_button();
+		// get fields from columns
+		let x_fields = [], y_fields = [];
+		for (let col of this.columns) {
+			// all options in x
+			x_fields.push({
+				label: col.content,
+				fieldname: col.id,
+				value:  col.id,
 			});
+
+			// numeric values in y
+			if (col.docfield && frappe.model.numeric_fieldtypes.includes(col.docfield.fieldtype)) {
+				y_fields.push({
+					label: col.content,
+					fieldname: col.id,
+					value: col.id
+				});
+			}
+		}
+
+		const defaults = this.chart_args || {};
+
+		const dialog = new frappe.ui.Dialog({
+			title: __('Configure Chart'),
+			fields: [
+				{
+					label: __('X Axis Field'),
+					fieldtype: 'Select',
+					fieldname: 'x_axis',
+					options: x_fields,
+					default: defaults.x_axis
+				},
+				{
+					label: __('Y Axis Fields'),
+					fieldtype: 'MultiSelect',
+					fieldname: 'y_axes',
+					options: y_fields,
+					description: __('Showing only Numeric fields from Report'),
+					default: defaults.y_axes ? defaults.y_axes.join(', ') : null
+				},
+				{
+					label: __('Chart Type'),
+					fieldtype: 'Select',
+					options: ['Bar', 'Line', 'Pie', 'Percentage'],
+					fieldname: 'chart_type',
+					default: defaults.chart_type ?
+						frappe.utils.to_title_case(defaults.chart_type) :
+						'Bar'
+				}
+			],
+			primary_action: (data) => {
+				data.y_axes = data.y_axes.split(',').map(d => d.trim()).filter(Boolean);
+
+				this.build_chart_args(data.x_axis, data.y_axes, data.chart_type);
+				this.make_chart();
+				dialog.hide();
+			}
+		});
+
+		dialog.show();
+	}
+
+	build_chart_args(x_axis, y_axes, chart_type) {
+		let datasets = y_axes.map(y_axis => ({
+			name: this.columns_map[y_axis].content,
+			values: this.data.map(d => d[y_axis])
+		}));
+
+		this.chart_args = {
+			chart_type: chart_type.toLowerCase(),
+			x_axis: x_axis,
+			y_axes: y_axes,
+			labels: this.data.map(d => d[x_axis]),
+			datasets: datasets
+		};
+
+		this.save_view_user_settings(
+			{ chart_args: this.get_chart_settings() });
+	}
+
+	get_chart_settings() {
+		if (this.chart_args) {
+			return {
+				chart_type: this.chart_args.chart_type,
+				x_axis: this.chart_args.x_axis,
+				y_axes: this.chart_args.y_axes,
+			};
+		}
+	}
+
+	make_chart() {
+		const args = this.chart_args;
+		let data = {
+			labels: args.labels,
+			datasets: args.datasets
+		};
+
+		this.last_chart_type = args.chart_type;
+
+		const get_df = (field) => this.columns_map[field].docfield;
+		const get_doc = (value, field) => this.data.find(d => d[field] === value);
+
+		this.$charts_wrapper.removeClass('hidden');
+
+		this.chart = new Chart(this.$charts_wrapper.find('.charts-inner-wrapper')[0], {
+			title: __("{0} Chart", [this.doctype]),
+			data: data,
+			type: args.chart_type,
+			height: 150,
+			colors: ['#70E078', 'light-blue', 'orange', 'red'],
+
+			format_tooltip_x: value => value.doc.name,
+			format_tooltip_y:
+				value => frappe.format(value, get_df(value.field), { always_show_decimals: true, inline: true }, get_doc(value.doc))
+		});
 	}
 
 	refresh_charts() {
 		if (!this.chart) return;
-		const { x_field, y_fields, chart_type } = this.chart_args;
-		const args = this.get_chart_args(x_field, y_fields, chart_type);
-		this.chart.update_values(args.datasets, args.labels);
-		this.chart.refresh();
-
-		if (args.chart_type !== this.last_chart_type) {
-			this.chart.get_different_chart(args.chart_type);
-		}
-	}
-
-	get_chart_data() {
-		return new Promise(resolve => {
-			const cur_list_fields = this.fields.map(f => f[0]);
-			const x_fields = this.meta.fields.filter(df =>
-				!df.hidden && cur_list_fields.includes(df.fieldname)
-			).map(df => df.fieldname);
-			const y_fields = this.meta.fields.filter(df =>
-				!df.hidden && frappe.model.is_numeric_field(df)
-				&& cur_list_fields.includes(df.fieldname)
-			).map(df => df.fieldname);
-
-			const defaults = this.chart_args || {};
-
-			const dialog = new frappe.ui.Dialog({
-				title: __('Configure Chart'),
-				fields: [
-					{
-						label: __('X Axis Field'),
-						fieldtype: 'Autocomplete',
-						fieldname: 'x_axis',
-						options: x_fields,
-						default: defaults.x_field
-					},
-					{
-						label: __('Y Axis Fields'),
-						fieldtype: 'MultiSelect',
-						fieldname: 'y_axes',
-						options: y_fields,
-						description: __('Showing only Numeric fields from Report'),
-						default: defaults.y_fields
-					},
-					{
-						label: __('Chart Type'),
-						fieldtype: 'Select',
-						options: ['Bar', 'Line', 'Pie', 'Percentage'],
-						fieldname: 'chart_type',
-						default: toTitle(defaults.chart_type || 'Bar')
-					}
-				],
-				primary_action: ({ x_axis, y_axes, chart_type }) => {
-					y_axes = y_axes.split(',').map(d => d.trim()).filter(Boolean);
-
-					if (!(
-						y_axes.every(d => y_fields.includes(d))
-						&& x_fields.includes(x_axis)
-					)) return;
-
-					const args = this.get_chart_args(x_axis, y_axes, chart_type);
-					this.chart_args = args;
-					resolve(args);
-					dialog.hide();
-				}
-			});
-
-			dialog.show();
-		});
-	}
-
-	get_chart_args(x_axis, y_axes, chart_type) {
-		const labels = this.data.map(d => {
-			// HACK: labels need strings,
-			// so we return objects that
-			// look like strings and also
-			// monkey patch the doc
-			// javascript is awesome
-
-			// O.o
-
-			return {
-				doc: d,
-				toString() {
-					return d[x_axis];
-				},
-				slice: String.prototype.slice
-			};
-		});
-
-		return {
-			chart_type: chart_type.toLowerCase(),
-			x_field: x_axis,
-			y_fields: y_axes,
-			labels: labels,
-			datasets: y_axes.map(y_axis => ({
-				name: frappe.meta.get_docfield(this.doctype, y_axis).label,
-				values: this.data.map(d => ({
-					doc: d,
-					field: y_axis,
-					toString() {
-						return d[y_axis];
-					},
-					slice: String.prototype.slice
-				}))
-			}))
-		};
+		const { x_axis, y_axes, chart_type } = this.chart_args;
+		this.build_chart_args(x_axis, y_axes, chart_type);
+		this.chart.update(this.chart_args);
 	}
 
 	get_editing_object(colIndex, rowIndex, value, parent) {
@@ -819,21 +816,26 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 	}
 
 	setup_columns() {
-		const hide_columns = ['docstatus'];
-		const fields = this.fields.filter(f => !hide_columns.includes(f[0]));
-
 		// apply previous column width
 		let column_widths = null;
 		if (this.columns) {
 			column_widths = this.get_column_widths();
 		}
-		this.columns = fields.map(f => this.build_column(f)).filter(Boolean);
 
-		if (column_widths) {
-			this.columns = this.columns.map(column => {
-				column.width = column_widths[column.id] || column.width;
-				return column;
-			});
+		this.columns = [];
+		this.columns_map = {};
+
+		for (let f of this.fields) {
+			if (f[0]!=='docstatus') {
+				let column = this.build_column(f);
+				if (column) {
+					if (column_widths) {
+						column.width = column_widths[column.id] || column.width || 120;
+					}
+					this.columns.push(column);
+					this.columns_map[column.id] = column;
+				}
+			}
 		}
 	}
 
@@ -1007,7 +1009,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				add_totals_row: this.add_totals_row,
 				page_length: this.page_length,
 				column_widths: this.get_column_widths(),
-				group_by: this.group_by_control.get_settings()
+				group_by: this.group_by_control.get_settings(),
+				chart_args: this.get_chart_settings()
 			};
 
 			return frappe.call({

From be4c610286eecc25a6427b98794a5ff6194ca61a Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 7 May 2019 16:05:50 +0530
Subject: [PATCH 064/175] fix: apply group by

---
 frappe/public/js/frappe/ui/group_by/group_by.html | 4 ----
 frappe/public/js/frappe/ui/group_by/group_by.js   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/frappe/public/js/frappe/ui/group_by/group_by.html b/frappe/public/js/frappe/ui/group_by/group_by.html
index 172d955807..dd8d3dd281 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.html
+++ b/frappe/public/js/frappe/ui/group_by/group_by.html
@@ -22,10 +22,6 @@
                                 </select>
                         </div>
                         <div class="groupby-actions pull-left">
-				<a class="set-groupby-and-run btn btn-sm btn-primary pull-left">
-					<i class=" fa fa-check visible-xs"></i>
-                                        <span class="hidden-xs">{%= __("Apply") %}</span>
-                                </a>
 				<a class="small grey remove-groupby pull-left">
 					<i class="octicon octicon-trashcan visible-xs"></i>
                                         <span class="hidden-xs">{%= __("Remove") %}</span>
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 72382e9022..613b5aeb5b 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -124,9 +124,6 @@ frappe.ui.GroupBy = class {
 			return;
 		}
 
-		//If function is count add a new field for count
-		this.page.wrapper.find('.set-groupby-and-run').hide();
-
 		return true;
 
 	}
@@ -205,7 +202,6 @@ frappe.ui.GroupBy = class {
 
 	remove_group_by() {
 		this.groupby_edit_area.hide();
-		$('.set-groupby-and-run').show();
 
 		this.order_by = '';
 		this.group_by = null;

From b391d698b8024bb0a9fbbf17e949340c8db96076 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 7 May 2019 17:35:56 +0530
Subject: [PATCH 065/175] fix(typo): formatter.js

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

diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 6199a02d74..7d51bee9a4 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -118,7 +118,7 @@ frappe.form.formatters = {
 				{onclick: docfield.link_onclick.replace(/"/g, '&quot;'), value:value});
 		} else if(docfield && doctype) {
 			return `<a class="grey"
-				href="#Form/${encodeURIComponent(doctype)}/${encodeURIComponent(original_value)}
+				href="#Form/${encodeURIComponent(doctype)}/${encodeURIComponent(original_value)}"
 				data-doctype="${doctype}"
 				data-name="${original_value}">
 				${__(options && options.label || value)}</a>`

From f49163b2e3ca6aa099d1006f93d1707a8e2afe24 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 7 May 2019 17:42:50 +0530
Subject: [PATCH 066/175] fix(email): try matching replies from a longer
 timeframe (60 days)

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

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index b1ad7ede99..2d23089f5a 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -470,7 +470,7 @@ class EmailAccount(Document):
 				parent = frappe.db.get_all(self.append_to, filters={
 					self.sender_field: email.from_email,
 					self.subject_field: ("like", "%{0}%".format(subject)),
-					"creation": (">", (get_datetime() - relativedelta(days=10)).strftime(DATE_FORMAT))
+					"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
 				}, fields="name")
 
 				# match only subject field
@@ -479,7 +479,7 @@ class EmailAccount(Document):
 				if not parent and len(subject) > 10 and is_system_user(email.from_email):
 					parent = frappe.db.get_all(self.append_to, filters={
 						self.subject_field: ("like", "%{0}%".format(subject)),
-						"creation": (">", (get_datetime() - relativedelta(days=10)).strftime(DATE_FORMAT))
+						"creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
 					}, fields="name")
 
 			if parent:

From fbd58f2fe5c50028ce7e906bd95403ca913fda73 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 7 May 2019 18:39:18 +0530
Subject: [PATCH 067/175] fix(user-permission): remove typo

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

diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index af197dcf24..af2815a9ac 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -53,7 +53,7 @@ class UserPermission(Document):
 			}, limit=1)
 		if overlap_exists:
 			ref_link = frappe.get_desk_link(self.doctype, overlap_exists[0].name)
-			frappe.throw(_("{0} has already assigned default vaue for {1}.".format(ref_link, self.allow)))
+			frappe.throw(_("{0} has already assigned default value for {1}.".format(ref_link, self.allow)))
 
 @frappe.whitelist()
 def get_user_permissions(user=None):
@@ -236,4 +236,4 @@ def update_applicable(already_applied, to_apply, user, doctype, docname):
 				AND `applicable_for`=%s
 				AND `allow`=%s
 				AND `for_value`=%s
-			""",(user, applied, doctype, docname))
\ No newline at end of file
+			""",(user, applied, doctype, docname))

From 6daaa02fcc603080fc821d54bd6cdc56bf552ef5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 8 May 2019 00:50:17 +0530
Subject: [PATCH 068/175] fix: use .get to avoid attribute error

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

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 43850a7a37..16180fbc2f 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -53,7 +53,7 @@ def process_energy_points(doc, state):
 
 	for d in frappe.cache_manager.get_doctype_map('Energy Point Rule', doc.doctype,
 		dict(reference_doctype = doc.doctype, enabled=1)):
-		frappe.get_doc('Energy Point Rule', d.name).apply(doc)
+		frappe.get_doc('Energy Point Rule', d.get('name')).apply(doc)
 
 def get_energy_point_doctypes():
 	return [

From d99423ce1ceb7d03aa0dc2e6d7f8b6d32ac3b968 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 8 May 2019 16:20:31 +0530
Subject: [PATCH 069/175] fix: enqueue prepared report after commiting prepared
 report record

---
 frappe/core/doctype/prepared_report/prepared_report.py | 2 +-
 frappe/desk/query_report.py                            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 012c313dda..847f1a840b 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -25,7 +25,7 @@ class PreparedReport(Document):
 		self.status = "Queued"
 		self.report_start_time = frappe.utils.now()
 
-	def after_insert(self):
+	def enqueue_report(self):
 		enqueue(
 			run_background,
 			prepared_report=self.name, timeout=6000
diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index f1c3535824..561cd680b6 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -132,6 +132,8 @@ def background_enqueue_run(report_name, filters=None, user=None):
 		})
 	track_instance.insert(ignore_permissions=True)
 	frappe.db.commit()
+	track_instance.enqueue_report()
+
 	return {
 		"name": track_instance.name,
 		"redirect_url": get_url_to_form("Prepared Report", track_instance.name)

From a9d85c32220a7cc00ea49693074d9e4545e7e6a9 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Wed, 8 May 2019 17:39:54 +0530
Subject: [PATCH 070/175] fix: add seconds parameter seconds

* fix: add seconds parameter seconds

* fix: added paramater for minutes
---
 frappe/utils/data.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 21d1790a1c..84ea04b593 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -70,7 +70,7 @@ def to_timedelta(time_str):
 	else:
 		return time_str
 
-def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, as_string=False, as_datetime=False):
+def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, minutes=0, seconds=0, as_string=False, as_datetime=False):
 	"""Adds `days` to the given date"""
 	from dateutil.relativedelta import relativedelta
 
@@ -86,7 +86,7 @@ def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, as_string=Fal
 			as_datetime = True
 		date = parser.parse(date)
 
-	date = date + relativedelta(years=years, months=months, weeks=weeks, days=days, hours=hours)
+	date = date + relativedelta(years=years, months=months, weeks=weeks, days=days, hours=hours, minutes=minutes, seconds=seconds)
 
 	if as_string:
 		if as_datetime:

From 9586de8d6782f40ee926fe5876111792160ee160 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 May 2019 11:50:49 +0530
Subject: [PATCH 071/175] fix: Success message on bulk edit

---
 frappe/public/js/frappe/list/bulk_operations.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/list/bulk_operations.js b/frappe/public/js/frappe/list/bulk_operations.js
index 7c182adbf1..07429ca867 100644
--- a/frappe/public/js/frappe/list/bulk_operations.js
+++ b/frappe/public/js/frappe/list/bulk_operations.js
@@ -181,6 +181,7 @@ export default class BulkOperations {
 					}
 					done();
 					dialog.hide();
+					frappe.msgprint(__('Updated successfully'));
 				});
 			},
 			primary_action_label: __('Update')

From 42fc641fd9a7de17e5eff8d2d4244eeb11968a50 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Thu, 9 May 2019 14:22:47 +0530
Subject: [PATCH 072/175] feat(sync_site): sync site via central agent

---
 frappe/hooks.py          |  3 ++-
 frappe/limits.py         |  8 +++++++-
 frappe/utils/__init__.py |  5 ++++-
 frappe/utils/user.py     | 15 ++++++++++-----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 0cd68d18f7..10d6d5457c 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -157,6 +157,7 @@ scheduler_events = {
 		"frappe.utils.error.collect_error_snapshots",
 		"frappe.desk.page.backups.backups.delete_downloadable_backups",
 		"frappe.limits.update_space_usage",
+		"frappe.limits.update_site_usage",
 		"frappe.desk.doctype.auto_repeat.auto_repeat.make_auto_repeat_entry",
 		"frappe.deferred_insert.save_to_db",
 		"frappe.desk.form.document_follow.send_hourly_updates"
@@ -285,4 +286,4 @@ user_privacy_documents = [
 		'applies_to_website_user': 1
 	},
 
-]
\ No newline at end of file
+]
diff --git a/frappe/limits.py b/frappe/limits.py
index fe800e3fe5..8295de5a34 100755
--- a/frappe/limits.py
+++ b/frappe/limits.py
@@ -5,7 +5,8 @@ from frappe.utils import now_datetime, getdate, flt, cint, get_fullname
 from frappe.installer import update_site_config
 from frappe.utils.data import formatdate
 from frappe.utils.user import get_enabled_system_users, disable_users
-import os, subprocess
+from frappe.utils.__init__ import get_site_info
+import os, subprocess, json
 from six.moves.urllib.parse import parse_qsl, urlsplit, urlunsplit, urlencode
 from six import string_types
 
@@ -225,3 +226,8 @@ def get_folder_size(path):
 	if os.path.exists(path):
 		return flt(subprocess.check_output(['du', '-ms', path]).split()[0], 2)
 
+def update_site_usage():
+	data = get_site_info()
+	with open(os.path.join(frappe.get_site_path(), 'site_data.json'), 'w') as outfile:
+		json.dump(data, outfile)
+		outfile.close()
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 78e6b56fe2..73cd7deec3 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -541,6 +541,8 @@ def get_site_info():
 	system_settings = frappe.db.get_singles_dict('System Settings')
 	space_usage = frappe._dict((frappe.local.conf.limits or {}).get('space_usage', {}))
 
+	kwargs = {"fields": ["user", "creation", "full_name"], "filters":{"Operation": "Login", "Status": "Success"}, "limit": "10
+
 	site_info = {
 		'installed_apps': get_installed_apps_info(),
 		'users': users,
@@ -555,7 +557,8 @@ def get_site_info():
 		'space_used': flt((space_usage.total or 0) / 1024.0, 2),
 		'database_size': space_usage.database_size,
 		'backup_size': space_usage.backup_size,
-		'files_size': space_usage.files_size
+		'files_size': space_usage.files_size,
+		'last_logins': frappe.get_all("Activity Log", **kwargs)
 	}
 
 	# from other apps
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index 725fb3056a..22f1e964e3 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -311,12 +311,17 @@ def disable_users(limits=None):
 		return
 
 	if limits.get('users'):
-		system_manager = get_system_managers(only_name=True)[-1]
+		system_manager = get_system_managers(only_name=True)
+		user_list = ['Administrator', 'Guest']
+		if system_manager:
+			user_list.append(system_manager[-1])
 
 		#exclude system manager from active user list
-		active_users =  frappe.db.sql_list("""select name from tabUser
-			where name not in ('Administrator', 'Guest', %s) and user_type = 'System User' and enabled=1
-			order by creation desc""", system_manager)
+		# active_users =  frappe.db.sql_list("""select name from tabUser
+		# 	where name not in ('Administrator', 'Guest', %s) and user_type = 'System User' and enabled=1
+		# 	order by creation desc""", system_manager)
+
+		active_users = frappe.get_all("User", filters={"user_type":"System User", "enabled":1, "name": ["not in", user_list]}, fields=["name"])
 
 		user_limit = cint(limits.get('users')) - 1
 
@@ -365,4 +370,4 @@ def get_users_with_role(role):
 		WHERE `tabHas Role`.`role`=%s
 		AND `tabUser`.`name`!='Administrator'
 		AND `tabHas Role`.`parent`=`tabUser`.`name`
-		AND `tabUser`.`enabled`=1""", role)]
\ No newline at end of file
+		AND `tabUser`.`enabled`=1""", role)]

From 0eb9fc5eec1def4e919aa78d7e629e10e98c9f66 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Thu, 9 May 2019 14:52:37 +0530
Subject: [PATCH 073/175] fix(sync_site): syntax error

---
 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 73cd7deec3..88d02be625 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -541,7 +541,7 @@ def get_site_info():
 	system_settings = frappe.db.get_singles_dict('System Settings')
 	space_usage = frappe._dict((frappe.local.conf.limits or {}).get('space_usage', {}))
 
-	kwargs = {"fields": ["user", "creation", "full_name"], "filters":{"Operation": "Login", "Status": "Success"}, "limit": "10
+	kwargs = {"fields": ["user", "creation", "full_name"], "filters":{"Operation": "Login", "Status": "Success"}, "limit": "10"}
 
 	site_info = {
 		'installed_apps': get_installed_apps_info(),

From 37b65fb7ec653713aab75c2fdd914d7cf5bf2d83 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 May 2019 15:18:48 +0530
Subject: [PATCH 074/175] fix: Disallow editing standard print formats

---
 .../print_format_builder.js                   | 34 ++++++---------
 .../print_format_builder.py                   | 12 ++++++
 frappe/public/js/frappe/form/print.js         | 42 +++++++++++++------
 3 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 frappe/printing/page/print_format_builder/print_format_builder.py

diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js
index 7611f4d63b..aa733cbe31 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.js
+++ b/frappe/printing/page/print_format_builder/print_format_builder.js
@@ -12,10 +12,9 @@ frappe.pages['print-format-builder'].on_page_show = function(wrapper) {
 		});
 	} else if(frappe.route_options) {
 		if(frappe.route_options.make_new) {
-			var doctype = frappe.route_options.doctype;
-			var name = frappe.route_options.name;
+			let { doctype, name, based_on } = frappe.route_options;
 			frappe.route_options = null;
-			frappe.print_format_builder.setup_new_print_format(doctype, name);
+			frappe.print_format_builder.setup_new_print_format(doctype, name, based_on);
 		} else {
 			frappe.print_format_builder.print_format = frappe.route_options.doc;
 			frappe.route_options = null;
@@ -130,25 +129,16 @@ frappe.PrintFormatBuilder = Class.extend({
 
 		});
 	},
-	setup_new_print_format: function(doctype, name) {
-		var me = this;
-		frappe.call({
-			method: "frappe.client.insert",
-			args: {
-				doc: {
-					doctype: "Print Format",
-					name: name,
-					standard: "No",
-					doc_type: doctype,
-					print_format_builder: 1
-				}
-			},
-			callback: function(r) {
-				frappe.model.with_doc('Print Format', r.message.name)
-					.then(() => $(document).trigger({ type: 'new-print-format', print_format: r.message.name }));
-				me.print_format = r.message;
-				me.refresh();
-			}
+	setup_new_print_format: function(doctype, name, based_on) {
+		frappe.call('frappe.printing.page.print_format_builder.print_format_builder.create_custom_format', {
+			doctype,
+			name,
+			based_on
+		}).then((r) => {
+			frappe.model.with_doc('Print Format', r.message.name)
+				.then(() => $(document).trigger({ type: 'new-print-format', print_format: r.message.name }));
+			this.print_format = r.message;
+			this.refresh();
 		});
 	},
 	setup_print_format: function() {
diff --git a/frappe/printing/page/print_format_builder/print_format_builder.py b/frappe/printing/page/print_format_builder/print_format_builder.py
new file mode 100644
index 0000000000..17baa9314e
--- /dev/null
+++ b/frappe/printing/page/print_format_builder/print_format_builder.py
@@ -0,0 +1,12 @@
+import frappe
+
+@frappe.whitelist()
+def create_custom_format(doctype, name, based_on):
+	doc = frappe.new_doc('Print Format')
+	doc.doc_type = doctype
+	doc.name = name
+	doc.print_format_builder = 1
+	doc.format_data = frappe.db.get_value('Print Format', based_on, 'format_data') \
+		if based_on != 'Standard' else None
+	doc.insert()
+	return doc
diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 609a5bec31..07c27cb601 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -88,26 +88,42 @@ frappe.ui.form.PrintPreview = Class.extend({
 
 		this.wrapper.find(".btn-print-edit").on("click", function () {
 			let print_format = me.get_print_format();
-			if (print_format && print_format.name) {
-				if (print_format.print_format_builder) {
-					frappe.set_route("print-format-builder", print_format.name);
-				} else {
-					frappe.set_route("Form", "Print Format", print_format.name);
+			let is_custom_format = print_format.name
+				&& print_format.print_format_builder
+				&& print_format.standard === 'No';
+			let is_standard_but_editable = print_format.name && print_format.custom_format;
+
+			if (is_standard_but_editable) {
+				frappe.set_route("Form", "Print Format", print_format.name);
+				return;
+			}
+			if (is_custom_format) {
+				frappe.set_route("print-format-builder", print_format.name);
+				return;
+			}
+			// start a new print format
+			frappe.prompt([
+				{
+					label: __("New Print Format Name"),
+					fieldname: "print_format_name",
+					fieldtype: "Data",
+					reqd: 1,
+				},
+				{
+					label: __('Based On'),
+					fieldname: 'based_on',
+					fieldtype: 'Read Only',
+					default: print_format.name || 'Standard'
 				}
-			} else {
-				// start a new print format
-				frappe.prompt({
-					fieldname: "print_format_name", fieldtype: "Data", reqd: 1,
-					label: "New Print Format Name"
-				}, function (data) {
+			], function (data) {
 					frappe.route_options = {
 						make_new: true,
 						doctype: me.frm.doctype,
-						name: data.print_format_name
+						name: data.print_format_name,
+						based_on: data.based_on
 					};
 					frappe.set_route("print-format-builder");
 				}, __("New Custom Print Format"), __("Start"));
-			}
 		});
 
 		$(document).on('new-print-format', (e) => {

From 7b479f0200a096f7f2787d2af56c66d0e281a757 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 9 May 2019 15:49:22 +0530
Subject: [PATCH 075/175] fix: Text editor styles when readonly

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

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index c26a4148e7..ef6afde262 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -55,6 +55,11 @@ Quill.register(AlignStyle, true);
 Quill.register(DirectionStyle, true);
 
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
+	make_wrapper() {
+		this._super();
+		this.$wrapper.find(".like-disabled-input").addClass("ql-editor");
+	},
+
 	make_input() {
 		this.has_input = true;
 		this.make_quill_editor();

From b803dac772353f37742189641dcd00e07468389e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 9 May 2019 22:13:09 +0530
Subject: [PATCH 076/175] fix: Process for energy point on any doc changes

Previously changes on submitted document
were not processed for energy points
---
 frappe/hooks.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 10d6d5457c..4bce37d852 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -118,7 +118,6 @@ doc_events = {
 			"frappe.core.doctype.activity_log.feed.update_feed",
 			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions",
 			"frappe.automation.doctype.assignment_rule.assignment_rule.apply",
-			"frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points",
 			"frappe.automation.doctype.milestone_tracker.milestone_tracker.evaluate_milestone"
 		],
 		"after_rename": "frappe.desk.notifications.clear_doctype_notifications",
@@ -131,8 +130,9 @@ doc_events = {
 			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions"
 		],
 		"on_change": [
-			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request"
-		]
+			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request",
+			"frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points"
+		],
 	},
 	"Email Group Member": {
 		"validate": "frappe.email.doctype.email_group.email_group.restrict_email_group"

From 532f9e139989d535286971e5da0fe9249feca4e9 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 9 May 2019 22:39:41 +0530
Subject: [PATCH 077/175] fix: Added reference_report field

---
 .../auto_email_report/auto_email_report.json  | 849 ++----------------
 1 file changed, 65 insertions(+), 784 deletions(-)

diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.json b/frappe/email/doctype/auto_email_report/auto_email_report.json
index b8ffc1be2f..4fbbe4e58e 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.json
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.json
@@ -1,956 +1,237 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
  "allow_rename": 1,
- "autoname": "",
- "beta": 0,
  "creation": "2016-09-01 01:34:34.985457",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "report",
+  "user",
+  "enabled",
+  "column_break_4",
+  "report_type",
+  "reference_report",
+  "filter_data",
+  "send_if_data",
+  "data_modified_till",
+  "no_of_rows",
+  "report_filters",
+  "filters_display",
+  "filters",
+  "filter_meta",
+  "dynamic_report_filters_section",
+  "from_date_field",
+  "to_date_field",
+  "column_break_17",
+  "dynamic_date_period",
+  "email_settings",
+  "email_to",
+  "day_of_week",
+  "column_break_13",
+  "frequency",
+  "format",
+  "section_break_15",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "report",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Report",
-   "length": 0,
-   "no_copy": 0,
    "options": "Report",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "User",
-   "fetch_if_empty": 0,
    "fieldname": "user",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Based on Permissions For User",
-   "length": 0,
-   "no_copy": 0,
    "options": "User",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "enabled",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Enabled",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Enabled"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fetch_from": "report.report_type",
-   "fetch_if_empty": 0,
    "fieldname": "report_type",
    "fieldtype": "Read Only",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Report Type",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Report Type"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "filter_data",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filter Data",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Filter Data"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
-   "fetch_if_empty": 0,
    "fieldname": "send_if_data",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Send only if there is any data",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Send only if there is any data"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
    "depends_on": "eval:doc.report_type=='Report Builder'",
    "description": "Zero means send records updated at anytime",
-   "fetch_if_empty": 0,
    "fieldname": "data_modified_till",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Only Send Records Updated in Last X Hours",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Only Send Records Updated in Last X Hours"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "100",
-   "description": "",
-   "fetch_if_empty": 0,
    "fieldname": "no_of_rows",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "No of Rows (Max 500)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "No of Rows (Max 500)"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "depends_on": "eval:doc.report_type !== 'Report Builder'",
-   "fetch_if_empty": 0,
    "fieldname": "report_filters",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Report Filters",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Report Filters"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "filters_display",
    "fieldtype": "HTML",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filters Display",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Filters Display"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "filters",
    "fieldtype": "Text",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Filters",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Filters"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "filter_meta",
    "fieldtype": "Text",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Filter Meta",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "depends_on": "eval:doc.report_type !== 'Report Builder'",
-   "fetch_if_empty": 0,
    "fieldname": "dynamic_report_filters_section",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Dynamic Report Filters",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Dynamic Report Filters"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "from_date_field",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "From Date Field",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "From Date Field"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "to_date_field",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "To Date Field",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "To Date Field"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_17",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "dynamic_date_period",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Period",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nDaily\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "\nDaily\nWeekly\nMonthly\nQuarterly\nHalf Yearly\nYearly"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "email_settings",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Email Settings",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Email Settings"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "email_to",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Email To",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Monday",
    "depends_on": "eval:doc.frequency=='Weekly'",
-   "fetch_if_empty": 0,
    "fieldname": "day_of_week",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Day of Week",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "column_break_13",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "frequency",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Frequency",
-   "length": 0,
-   "no_copy": 0,
    "options": "Daily\nWeekdays\nWeekly\nMonthly",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "format",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Format",
-   "length": 0,
-   "no_copy": 0,
    "options": "HTML\nXLSX\nCSV",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "section_break_15",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Message",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Message"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fetch_if_empty": 0,
    "fieldname": "description",
    "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Message",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
+   "label": "Message"
+  },
+  {
+   "fetch_from": "report.reference_report",
+   "fieldname": "reference_report",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Reference Report",
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "menu_index": 0,
- "modified": "2019-04-18 14:58:12.522559",
+ "modified": "2019-05-09 22:38:27.570890",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Auto Email Report",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Report Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file

From f7c9064038b78810dc43dcd5fd4e2cefd0e7ca23 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 9 May 2019 22:35:11 +0530
Subject: [PATCH 078/175] fix: Auto email support for custom reports

---
 frappe/core/doctype/report/report.py              |  2 +-
 .../auto_email_report/auto_email_report.js        | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index 6b40cd7d33..1b6957d057 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -100,7 +100,7 @@ class Report(Document):
 		columns = []
 		out = []
 
-		if self.report_type in ('Query Report', 'Script Report'):
+		if self.report_type in ('Query Report', 'Script Report', 'Custom Report'):
 			# query and script reports
 			data = frappe.desk.query_report.run(self.name, filters=filters, user=user)
 			for d in data.get('columns'):
diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js
index c4f5397ca0..f8bdcb21a2 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.js
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.js
@@ -54,9 +54,9 @@ frappe.ui.form.on('Auto Email Report', {
 	show_filters: function(frm) {
 		var wrapper = $(frm.get_field('filters_display').wrapper);
 		wrapper.empty();
-		if(frm.doc.report_type !== 'Report Builder'
+		if(frm.doc.report_type === 'Custom Report' || (frm.doc.report_type !== 'Report Builder'
 			&& frappe.query_reports[frm.doc.report]
-			&& frappe.query_reports[frm.doc.report].filters) {
+			&& frappe.query_reports[frm.doc.report].filters)) {
 
 			// make a table to show filters
 			var table = $('<table class="table table-bordered" style="cursor:pointer; margin:0px;"><thead>\
@@ -65,7 +65,16 @@ frappe.ui.form.on('Auto Email Report', {
 			$('<p class="text-muted small">' + __("Click table to edit") + '</p>').appendTo(wrapper);
 
 			var filters = JSON.parse(frm.doc.filters || '{}');
-			var report_filters = frappe.query_reports[frm.doc.report].filters;
+
+			if (frm.doc.report_type === 'Custom Report'
+				&& frappe.query_reports[frm.doc.reference_report]
+				&& frappe.query_reports[frm.doc.reference_report].filters) {
+				var report_filters = frappe.query_reports[frm.doc.reference_report].filters;
+			}
+			else{
+				var report_filters = frappe.query_reports[frm.doc.report].filters;
+			}
+
 			if(report_filters && report_filters.length > 0) {
 				frm.set_value('filter_meta', JSON.stringify(report_filters));
 			}

From 5e284db2060d93a3e3351207fa8cd91f0c51209d Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Fri, 3 May 2019 18:17:04 +0530
Subject: [PATCH 079/175] fix: naming and provision to use same db credentails
 for secondary

---
 frappe/__init__.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 75684d431e..1525c92cd5 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -187,14 +187,19 @@ def connect(site=None, db_name=None):
 	local.db = get_db(user=db_name or local.conf.db_name)
 	set_user("Administrator")
 
-def connect_read_only():
+def connect_secondary():
 	from frappe.database import get_db
+	user = local.conf.db_name
+	password = local.conf.db_password
 
-	local.read_only_db = get_db(host=local.conf.slave_host, user=local.conf.slave_db_name,
-		password=local.conf.slave_db_password)
+	if local.conf.different_credentials_for_secondary:
+		user = local.conf.secondary_db_name
+		password = local.conf.secondary_db_password
+
+	local.read_only_db = get_db(host=local.conf.secondary_host, user=user, password=password)
 
 	# swap db connections
-	local.master_db = local.db
+	local.primary_db = local.db
 	local.db = local.read_only_db
 
 def get_site_config(sites_path=None, site_path=None):
@@ -495,16 +500,17 @@ def whitelist(allow_guest=False, xss_safe=False):
 def read_only():
 	def innfn(fn):
 		def wrapper_fn(*args, **kwargs):
-			if conf.use_slave_for_read_only:
-				connect_read_only()
+			if conf.read_from_secondary:
+				connect_secondary()
+
 			try:
 				retval = fn(*args, **get_newargs(fn, kwargs))
 			except:
 				raise
 			finally:
-				if local and hasattr(local, 'master_db'):
+				if local and hasattr(local, 'primary_db'):
 					local.db.close()
-					local.db = local.master_db
+					local.db = local.primary_db
 
 			return retval
 		return wrapper_fn

From ca01c75ea410d2be2b1f85ed2cd6f689423b3250 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Fri, 10 May 2019 10:54:17 +0530
Subject: [PATCH 080/175] fix: naming

---
 frappe/__init__.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 1525c92cd5..cd662cd6cb 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -187,20 +187,20 @@ def connect(site=None, db_name=None):
 	local.db = get_db(user=db_name or local.conf.db_name)
 	set_user("Administrator")
 
-def connect_secondary():
+def connect_replica():
 	from frappe.database import get_db
 	user = local.conf.db_name
 	password = local.conf.db_password
 
-	if local.conf.different_credentials_for_secondary:
-		user = local.conf.secondary_db_name
-		password = local.conf.secondary_db_password
+	if local.conf.different_credentials_for_replica:
+		user = local.conf.replica_db_name
+		password = local.conf.replica_db_password
 
-	local.read_only_db = get_db(host=local.conf.secondary_host, user=user, password=password)
+	local.replica_db = get_db(host=local.conf.replica_host, user=user, password=password)
 
 	# swap db connections
 	local.primary_db = local.db
-	local.db = local.read_only_db
+	local.db = local.replica_db
 
 def get_site_config(sites_path=None, site_path=None):
 	"""Returns `site_config.json` combined with `sites/common_site_config.json`.
@@ -500,8 +500,8 @@ def whitelist(allow_guest=False, xss_safe=False):
 def read_only():
 	def innfn(fn):
 		def wrapper_fn(*args, **kwargs):
-			if conf.read_from_secondary:
-				connect_secondary()
+			if conf.read_from_replica:
+				connect_replica()
 
 			try:
 				retval = fn(*args, **get_newargs(fn, kwargs))

From c56021638b3ffc240933935c311b09265664fefb Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Thu, 9 May 2019 16:33:26 +0530
Subject: [PATCH 081/175] fix(core): Allow action on msgprint and throw calls

---
 frappe/public/js/frappe/ui/messages.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 395e11dc93..65cbc48af8 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -120,6 +120,11 @@ frappe.msgprint = function(msg, title) {
 			}
 		});
 
+		// setup and bind an action to the primary button
+		if (data.primary_action) {
+			frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"), data.primary_action.action);
+		}
+
 		// class "msgprint" is used in tests
 		frappe.msg_dialog.msg_area = $('<div class="msgprint">')
 			.appendTo(frappe.msg_dialog.body);
@@ -139,6 +144,12 @@ frappe.msgprint = function(msg, title) {
 		msg = frappe.utils.replace_newlines(data.message);
 	}
 
+	if (data.primary_action) {
+		frappe.msg_dialog.get_primary_btn().show();
+	} else {
+		frappe.msg_dialog.get_primary_btn().hide();
+	}
+
 	var msg_exists = false;
 	if(data.clear) {
 		frappe.msg_dialog.msg_area.empty();

From d7188aa1e5ba632492afba38284ddc53e1d3d719 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Fri, 10 May 2019 14:48:19 +0530
Subject: [PATCH 082/175] fix: Styling fixes

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

diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js
index f8bdcb21a2..559172e6d3 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.js
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.js
@@ -70,8 +70,7 @@ frappe.ui.form.on('Auto Email Report', {
 				&& frappe.query_reports[frm.doc.reference_report]
 				&& frappe.query_reports[frm.doc.reference_report].filters) {
 				var report_filters = frappe.query_reports[frm.doc.reference_report].filters;
-			}
-			else{
+			} else {
 				var report_filters = frappe.query_reports[frm.doc.report].filters;
 			}
 

From e9e120d2af2d6575bf796903b071d7e030749e04 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Fri, 10 May 2019 15:56:43 +0530
Subject: [PATCH 083/175] fix: Use let instead of var

---
 frappe/email/doctype/auto_email_report/auto_email_report.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.js b/frappe/email/doctype/auto_email_report/auto_email_report.js
index 559172e6d3..fab5bd3a8a 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.js
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.js
@@ -66,12 +66,14 @@ frappe.ui.form.on('Auto Email Report', {
 
 			var filters = JSON.parse(frm.doc.filters || '{}');
 
+			let report_filters;
+
 			if (frm.doc.report_type === 'Custom Report'
 				&& frappe.query_reports[frm.doc.reference_report]
 				&& frappe.query_reports[frm.doc.reference_report].filters) {
-				var report_filters = frappe.query_reports[frm.doc.reference_report].filters;
+				report_filters = frappe.query_reports[frm.doc.reference_report].filters;
 			} else {
-				var report_filters = frappe.query_reports[frm.doc.report].filters;
+				report_filters = frappe.query_reports[frm.doc.report].filters;
 			}
 
 			if(report_filters && report_filters.length > 0) {

From 69d1a254c0cadc5735601b39fcab54eadf3d01a3 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Fri, 10 May 2019 22:36:09 +0530
Subject: [PATCH 084/175] fix: Option fixes in custom_columns

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

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 6545688499..485f26f952 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1020,7 +1020,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 								label: df.label,
 								link_field: this.doctype_field_map[values.doctype],
 								doctype: values.doctype,
-								options: df.fieldtype === "Link" ? values.doctype : undefined,
+								options: df.fieldtype === "Link" ? frappe.model.unscrub(df.fieldname) : undefined,
 								width: 100
 							});
 

From 03b045a5b5cad62161be90a7b0560670c4a29a92 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sat, 11 May 2019 10:12:11 +0530
Subject: [PATCH 085/175] refactor: remove autodocs, no longer used

---
 frappe/commands/__init__.py                 |   3 +-
 frappe/commands/docs.py                     |  57 ----
 frappe/templates/autodoc/api_home.html      |  14 -
 frappe/templates/autodoc/base_template.html | 123 --------
 frappe/templates/autodoc/contents.html      |  10 -
 frappe/templates/autodoc/contents.py        |   9 -
 frappe/templates/autodoc/dev_home.html      |  49 ----
 frappe/templates/autodoc/doctype.html       |  92 ------
 frappe/templates/autodoc/install.md         |  30 --
 frappe/templates/autodoc/license.html       |   7 -
 frappe/templates/autodoc/macros.html        |  65 -----
 frappe/templates/autodoc/models_home.html   |  18 --
 frappe/templates/autodoc/module_home.html   |  16 -
 frappe/templates/autodoc/package_index.html |  16 -
 frappe/templates/autodoc/pymodule.html      |  15 -
 frappe/utils/autodoc.py                     | 175 -----------
 frappe/utils/jinja.py                       |   6 -
 frappe/utils/setup_docs.py                  | 308 --------------------
 18 files changed, 1 insertion(+), 1012 deletions(-)
 delete mode 100644 frappe/commands/docs.py
 delete mode 100644 frappe/templates/autodoc/api_home.html
 delete mode 100644 frappe/templates/autodoc/base_template.html
 delete mode 100644 frappe/templates/autodoc/contents.html
 delete mode 100644 frappe/templates/autodoc/contents.py
 delete mode 100644 frappe/templates/autodoc/dev_home.html
 delete mode 100644 frappe/templates/autodoc/doctype.html
 delete mode 100644 frappe/templates/autodoc/install.md
 delete mode 100644 frappe/templates/autodoc/license.html
 delete mode 100644 frappe/templates/autodoc/macros.html
 delete mode 100644 frappe/templates/autodoc/models_home.html
 delete mode 100644 frappe/templates/autodoc/module_home.html
 delete mode 100644 frappe/templates/autodoc/package_index.html
 delete mode 100644 frappe/templates/autodoc/pymodule.html
 delete mode 100644 frappe/utils/autodoc.py
 delete mode 100644 frappe/utils/setup_docs.py

diff --git a/frappe/commands/__init__.py b/frappe/commands/__init__.py
index 993f1f7d11..84e5f4937f 100644
--- a/frappe/commands/__init__.py
+++ b/frappe/commands/__init__.py
@@ -72,12 +72,11 @@ def call_command(cmd, context):
 
 def get_commands():
 	# prevent circular imports
-	from .docs import commands as doc_commands
 	from .scheduler import commands as scheduler_commands
 	from .site import commands as site_commands
 	from .translate import commands as translate_commands
 	from .utils import commands as utils_commands
 
-	return list(set(doc_commands + scheduler_commands + site_commands + translate_commands + utils_commands))
+	return list(set(scheduler_commands + site_commands + translate_commands + utils_commands))
 
 commands = get_commands()
diff --git a/frappe/commands/docs.py b/frappe/commands/docs.py
deleted file mode 100644
index 6c73739478..0000000000
--- a/frappe/commands/docs.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from __future__ import unicode_literals, absolute_import
-import click
-import os, shutil
-import frappe
-from frappe.commands import pass_context
-
-@click.command('build-docs')
-@pass_context
-@click.argument('app')
-@click.option('--docs-version', default='current')
-@click.option('--target', default=None)
-@click.option('--local', default=False, is_flag=True, help='Run app locally')
-@click.option('--watch', default=False, is_flag=True, help='Watch for changes and rewrite')
-def build_docs(context, app, docs_version="current", target=None, local=False, watch=False):
-	"Setup docs in target folder of target app"
-	from frappe.utils import watch as start_watch
-	from frappe.utils.setup_docs import add_breadcrumbs_tag
-
-	for site in context.sites:
-		_build_docs_once(site, app, docs_version, target, local)
-
-		if watch:
-			def trigger_make(source_path, event_type):
-				if "/docs/user/" in source_path:
-					# user file
-					target_path = frappe.get_app_path(target, 'www', 'docs', 'user',
-						os.path.relpath(source_path, start=frappe.get_app_path(app, 'docs', 'user')))
-					shutil.copy(source_path, target_path)
-					add_breadcrumbs_tag(target_path)
-
-				if source_path.endswith('/docs/index.md'):
-					target_path = frappe.get_app_path(target, 'www', 'docs', 'index.md')
-					shutil.copy(source_path, target_path)
-
-			apps_path = frappe.get_app_path(app)
-			start_watch(apps_path, handler=trigger_make)
-
-def _build_docs_once(site, app, docs_version, target, local, only_content_updated=False):
-	from frappe.utils.setup_docs import setup_docs
-
-	try:
-
-		frappe.init(site=site)
-		frappe.connect()
-		make = setup_docs(app, target)
-
-		if not only_content_updated:
-			make.build(docs_version)
-
-		#make.make_docs(target, local)
-
-	finally:
-		frappe.destroy()
-
-commands = [
-	build_docs,
-]
diff --git a/frappe/templates/autodoc/api_home.html b/frappe/templates/autodoc/api_home.html
deleted file mode 100644
index 4c6d8218b6..0000000000
--- a/frappe/templates/autodoc/api_home.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- title: {{ app.title }} API -->
-
-{% from "templates/autodoc/macros.html" import source_link, version %}
-
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, app.name, True) }}
-</div>
-
-<h3>Contents</h3>
-
-<!-- autodoc -->
-
-{index}
diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html
deleted file mode 100644
index a1d49f83cf..0000000000
--- a/frappe/templates/autodoc/base_template.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!-- Built on Frappe. https://frappe.io/ -->
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title>{% block title %} {{ title }} {% endblock %}</title>
-	<meta name="generator" content="frappe">
-    <link type="text/css" rel="stylesheet" href="/docs/assets/css/bootstrap.css">
-    <link type="text/css" rel="stylesheet" href="/docs/assets/css/font-awesome.css">
-    <link type="text/css" rel="stylesheet" href="/docs/assets/css/octicons/octicons.css">
-    <link type="text/css" rel="stylesheet" href="/docs/assets/css/docs.css">
-
-    {% block favicon %}
-	<link rel="shortcut icon"
-		href="{{ favicon or (docs_base_url + "/assets/img/favicon.png") }}"
-		type="image/x-icon">
-	<link rel="icon"
-		href="{{ favicon or (docs_base_url + "/assets/img/favicon.png") }}"
-		type="image/x-icon">
-    {% endblock %}
-
-	{%- block head -%}
-		{% if meta_block is defined -%}
-		{{ meta_block }}
-		{%- endif %}
-
-		{% if head_html is defined -%}
-		{{ head_html or "" }}
-		{%- endif %}
-
-	    {%- block head_include %}{{ head_include or "" }}{% endblock -%}
-
-		{%- block style %}{%- endblock -%}
-	{%- endblock -%}
-</head>
-<body data-path="{{ path | e }}">
-	<div class="main-section">
-		<div>
-			{%- block banner -%}
-			{% include "templates/includes/banner_extension.html" ignore missing %}
-				{% if banner_html -%}
-				<header class="container">{{ banner_html or "" }}</header>
-				{%- endif %}
-			{%- endblock -%}
-
-			{%- block navbar -%}
-                {% include "templates/includes/navbar/navbar.html" %}
-            {%- endblock -%}
-            <div class="hero-and-content">
-                <div data-html-block="hero">
-				{%- block hero -%}{%- endblock -%}
-                </div>
-                <div class="container" data-html-block="content">
-                {% block content %}{% endblock %}
-				<!-- edit-link -->
-                </div>
-            </div>
-			<footer class="docs-footer">
-				<div class="container">
-				{%- if footer is defined -%}{{ footer }}{%- endif -%}
-
-                <div class="built-with-frappe text-center">
-                    <img class="frappe-bird" src="/docs/assets/img/frappe-bird-grey.svg">
-                    <h3>By {{ app.publisher }}</h3>
-                </div>
-                <div class="text-center">
-                    <ul class="list-unstyled">
-                        <li>
-                            <a href="{{ app.source_link }}">
-                            Source</a>
-                        </li>
-                        <li>
-                            <a href="{{ app.source_link }}/issues">
-                            Issues</a>
-                        </li>
-                        <li>
-                            <a href="/docs/license.html">
-                            License</a>
-                        </li>
-                        <li>
-                            <a href="https://discuss.erpnext.com">
-                            Forum</a>
-                        </li>
-                        <li>
-                            <a href="https://community.erpnext.com/apps">
-                            Frappe Apps</a>
-                        </li>
-                    </ul>
-                </div>
-
-            </div>
-			</footer>
-		</div>
-	</div>
-
-	<script type="text/javascript" src="/docs/assets/js/jquery.min.js"></script>
-	<script type="text/javascript" src="/docs/assets/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="/docs/assets/js/highlight.pack.js"></script>
-	<script type="text/javascript" src="/docs/assets/js/docs.js"></script>
-
-	<!-- js should be loaded in body! -->
-	<script>
-        window.docs_base_url = "/docs";
-    </script>
-	{%- block script %}{%- endblock %}
-
-	{% if app.google_analytics_id %}
-	<script>
-	  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-	  ga('create', '{{ app.google_analytics_id }}', 'auto');
-	  ga('send', 'pageview');
-
-	</script>
-	{% endif %}
-	<!-- csrf_token -->
-    {%- block body_include %}{{ body_include or "" }}{% endblock -%}
-</body>
-</html>
diff --git a/frappe/templates/autodoc/contents.html b/frappe/templates/autodoc/contents.html
deleted file mode 100644
index 59d0b4459d..0000000000
--- a/frappe/templates/autodoc/contents.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- title: Table of Contents -->
-
-<h1>Table of Contents</h1>
-<br>
-
-{% include "templates/includes/full_index.html" %}
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- no-breadcrumbs -->
diff --git a/frappe/templates/autodoc/contents.py b/frappe/templates/autodoc/contents.py
deleted file mode 100644
index c23737a3c0..0000000000
--- a/frappe/templates/autodoc/contents.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.website.utils import get_full_index
-
-def get_context(context):
-	context.full_index = get_full_index()
diff --git a/frappe/templates/autodoc/dev_home.html b/frappe/templates/autodoc/dev_home.html
deleted file mode 100644
index 5d9c3a0d06..0000000000
--- a/frappe/templates/autodoc/dev_home.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!-- title: {{ app.title }}: Developer Docs -->
-<!-- no-breadcrumbs -->
-
-{% from "templates/autodoc/macros.html" import source_link, version %}
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, app.name, True) }}
-</div>
-
-<table class="table table-bordered" style='max-width: 400px;'>
-	<tr>
-		<td style="width: 40%">
-			App Name
-		</td>
-		<td>
-			<code>{{ app.name }}</code>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			Publisher
-		</td>
-		<td>
-			<code>{{ app.publisher }}</code>
-		</td>
-	</tr>
-	<tr>
-		<td>
-			Version
-		</td>
-		<td>
-			<code>{{ app.version }}</code>
-		</td>
-	</tr>
-</table>
-
-<h3>Contents</h3>
-<ul>
-	<li>
-		<a href="/docs/current/models">Models (DocTypes)</a>
-	</li>
-	<li>
-		<a href="/docs/current/api">Server-side API</a>
-	</li>
-</ul>
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- static -->
diff --git a/frappe/templates/autodoc/doctype.html b/frappe/templates/autodoc/doctype.html
deleted file mode 100644
index b851fc52e8..0000000000
--- a/frappe/templates/autodoc/doctype.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!-- title: {{ doctype }} -->
-<!-- add-breadcrumbs -->
-
-{% from "templates/autodoc/macros.html" import automodule, version,
-  source_link, doctype_link %}
-{% set doc = frappe.get_doc("DocType", doctype) %}
-{% set controller = autodoc.get_controller(doctype) %}
-
-<h1>{{ doctype }}</h1>
-<div class="dev-header">
-{{ version(doctype) }}
-{{ source_link(app, app.name + "/" + scrub(doc.module)
-  + "/doctype/" + scrub(doctype), True) }}
-</div>
-
-{% if doc.issingle %}<span class="label label-info">Single</span>{% endif %}
-{% if doc.istable %}<span class="label label-info">Child Table</span>{% endif %}
-
-{% if not doc.issingle %}
-    <p><b>Table Name:</b> <code>tab{{ doctype }}</code></p>
-{% endif %}
-
-{{ doc.description or "" }}
-
-<h3>Fields</h3>
-
-<table class="table table-bordered docfields">
-    <thead>
-        <tr>
-            <th style="width: 5%">Sr</th>
-            <th style="width: 25%">Fieldname</th>
-            <th style="width: 20%">Type</th>
-            <th style="width: 25%">Label</th>
-            <th style="width: 25%">Options</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for df in doc.fields %}
-        <tr {% if df.fieldtype=="Section Break" %}class="info"{% endif %}>
-            <td>{{ loop.index }}</td>
-            <td {% if df.reqd %}class="danger" title="Mandatory"{% endif %}><code>{{ df.fieldname }}</code></td>
-            <td {% if df.fieldtype=="Column Break" %}class="info"{% endif %}>
-                {{ df.fieldtype }}</td>
-            <td {% if df.hidden %}class="text-muted" title="Hidden"{% endif %}>
-                {{ df.label or "" }}
-                {% if df.description %}<p class="text-muted small">
-                    {{ df.description }}</p>{% endif %}
-            </td>
-            <td>{% if df.options and df.fieldtype not in ("HTML") %}
-                {% if df.fieldtype in ("Table", "Link") %}
-                {{ doctype_link(app, df.options) }}
-                {% else %}<pre>{{ df.options }}</pre>{% endif %}
-            {% endif %}</td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
-
-{% if not doc.istable %}
-    <hr>
-    <h3>Controller</h3>
-    <h4>{{ controller.__module__ }}</h4>
-
-    {{ automodule(controller.__module__) }}
-    {% set parents = frappe.get_list("DocField",
-        filters = {"options": doctype, "fieldtype": "Link"}, fields = ["distinct parent"], order_by="parent asc") %}
-    {% if parents %}
-        <h4>Linked In:</h4>
-        <ul>
-        {% for parent in parents %}
-			{% if get_doctype_app(parent.parent)==app.name %}
-            <li>{{ doctype_link(app, parent.parent) }}</li>
-			{% endif %}
-        {% endfor %}
-        </ul>
-    {% endif %}
-{% else %}
-    {% set parents = frappe.get_list("DocField",
-        filters = {"options": doctype, "fieldtype": "Table"}, fields = ["distinct parent"], order_by="parent asc") %}
-    {% if parents %}
-    <h4>Child Table Of</h4>
-    <ul>
-    {% for parent in parents %}
-        <li>{{ doctype_link(app, parent.parent) }}</li>
-    {% endfor %}
-    </ul>
-    {% endif %}
-{% endif %}
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- static -->
diff --git a/frappe/templates/autodoc/install.md b/frappe/templates/autodoc/install.md
deleted file mode 100644
index 63d2a17a38..0000000000
--- a/frappe/templates/autodoc/install.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- title: {{ app.title }} Installation -->
-
-# Installation
-
-{{ app.title }} is based on the <a href="https://frappe.io">Frappe Framework</a>, a full stack web framework based on Python, MariaDB, Redis, Node.
-
-To intall {{ app.title }}, you will have to install the <a href="https://github.com/frappe/bench">Frappe Bench</a>, the command-line, package manager and site manager for Frappe Framework. For more details, read the Bench README.
-
-After you have installed Frappe Bench, go to you bench folder, which is     `frappe.bench` by default and setup **{{ app.name }}**.
-
-    bench get-app {{ app.name }} {{ source_link }}
-
-Then create a new site to install the app.
-
-    bench new-site mysite
-
-This will create a new folder in your `/sites` directory and create a new database for this site.
-
-Next, install {{ app.name }} in this site
-
-    bench --site mysite install-app {{ app.name }}
-
-To run this locally, run
-
-    bench start
-
-Fire up your browser and go to http://localhost:8000 and you should see the login screen. Login as **Administrator** and **admin** (or the password you set at the time of `new-site`) and you are set.
-
-<!-- jinja -->
-<!-- autodoc -->
diff --git a/frappe/templates/autodoc/license.html b/frappe/templates/autodoc/license.html
deleted file mode 100644
index de9a5e2314..0000000000
--- a/frappe/templates/autodoc/license.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- title: License {{ app.license }} -->
-
-<h1>{{ app.license}}</h1>
-
-{{ license_text }}
-
-<!-- autodoc -->
diff --git a/frappe/templates/autodoc/macros.html b/frappe/templates/autodoc/macros.html
deleted file mode 100644
index 4e7c34be16..0000000000
--- a/frappe/templates/autodoc/macros.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% macro automodule(name) %}
-{% set m = autodoc.automodule(name) %}
-{% if m.docs %}<h2>Introduction</h2><br>{{ m.docs|markdown }}<br><br>{% endif %}
-{% for obj in m.members %}
-	{% if obj.type=="function" %}
-        {{ render_function(obj, name) }}
-	{% elif obj.type=="class" %}
-        {{ render_class(obj) }}
-	{% endif %}
-{% endfor %}
-{% endmacro %}
-
-{% macro render_class(obj) %}
-	<h3 style="font-weight: normal;">Class <b>{{ obj.name }}</b></h3>
-    {% if obj.bases %}
-    <p style="padding-left: 30px;"><i>Inherits from {{ ", ".join(obj.bases) }}</i></h4>
-    {% endif %}
-    <div class="docs-attr-desc">{{ obj.docs|markdown }}</div>
-    <div style="padding-left: 30px;">
-        {% for func in obj.members %}
-        {{ render_function(func) }}
-        {% endfor %}
-    </div>
-    <hr>
-{% endmacro %}
-
-{% macro render_function(obj, module_name) %}
-    {% set full_name = ((module_name + "." if module_name else "" ) + obj.name).replace(".__init__", "") %}
-    {% if obj.whitelisted %}<p><span class="label label-info">Public API</span>
-        <br><code>/api/method/{{ full_name }}</code>
-    </p>{% endif %}
-	<p class="docs-attr-name">
-        <a name="{{ full_name }}" href="#{{ full_name }}" class="text-muted small">
-            <i class="fa fa-link small" style="color: #ccc;"></i></a>
-		{{ module_name.replace(".__init__", "") + "." if module_name else "" }}<b>{{ obj.name }}</b>
-        <i class="text-muted">({{ print_args(obj.args) if obj.args else "" }})</i>
-    </p>
-	<div class="docs-attr-desc">{{ obj.docs|markdown }}</div>
-	<br>
-{% endmacro %}
-
-{% macro print_args(args) -%}
-{% for arg in args[0] -%}
-	{%- set default_idx = args[3]|len - args[0]|len + (loop.index - 1) if args[3] else -1 -%}
-	{{ arg }}{% if default_idx >= 0 %}={{ args[3][default_idx] }}{% endif %}{% if not loop.last %}, {% endif %}
-	{%- endfor %}
-{%- endmacro %}
-
-{% macro version(name) %}
-<a class="btn btn-light btn-sm" disabled style="margin-bottom: 10px;">
-	Version {{ autodoc.get_version(name) }}</a>
-{% endmacro %}
-
-{% macro source_link(app, file_path, tree=False) %}
-	<a class="btn btn-light btn-sm" href="{{ app.source_link }}/{{ "tree" if tree else "blob" }}/{{ app.branch }}/{{ file_path }}"
-		target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-{% endmacro %}
-
-{% macro doctype_link(app, doctype) %}
-{% set module = frappe.db.get_value("DocType", doctype, "module") %}
-{% if doctype and module %}
-<a href="/docs/{{ app.docs_version }}/models/{{
-		scrub(module) }}/{{ scrub(doctype) }}">{{ doctype }}</a>
-{% endif %}
-{% endmacro %}
diff --git a/frappe/templates/autodoc/models_home.html b/frappe/templates/autodoc/models_home.html
deleted file mode 100644
index 44c5057ca2..0000000000
--- a/frappe/templates/autodoc/models_home.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!-- title: {{ app.title }}: Models (DocTypes) -->
-<!-- add-breadcrumbs -->
-
-{% from "templates/autodoc/macros.html" import source_link, version %}
-
-<h1>{{ app.title }}: Models (DocTypes)</h1>
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, app.name, True) }}
-</div>
-
-<p>Browse DocTypes by Module</p>
-
-<h3>Contents</h3>
-
-{index}
-
-<!-- autodoc -->
diff --git a/frappe/templates/autodoc/module_home.html b/frappe/templates/autodoc/module_home.html
deleted file mode 100644
index c10994841b..0000000000
--- a/frappe/templates/autodoc/module_home.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- title: Module {{ name }} -->
-<!-- add-breadcrumbs -->
-
-{% from "templates/autodoc/macros.html" import source_link, version %}
-
-<h1>Module {{ name }}</h1>
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, app.name + "/" + scrub(name), True) }}
-</div>
-
-<h3>DocTypes for {{ name }}</h3>
-
-{index}
-
-<!-- autodoc -->
diff --git a/frappe/templates/autodoc/package_index.html b/frappe/templates/autodoc/package_index.html
deleted file mode 100644
index 9107996dfa..0000000000
--- a/frappe/templates/autodoc/package_index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- title: {{ title }} -->
-<!-- add-breadcrumbs -->
-
-{% from "templates/autodoc/macros.html" import source_link, version %}
-
-<h1>{{ title }}</h1>
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, title, True) }}
-</div>
-
-<h3>Package Contents</h3>
-
-{index}
-
-<!-- autodoc -->
diff --git a/frappe/templates/autodoc/pymodule.html b/frappe/templates/autodoc/pymodule.html
deleted file mode 100644
index 537b37ead0..0000000000
--- a/frappe/templates/autodoc/pymodule.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- title: {{ name }} -->
-<!-- add-breadcrumbs -->
-
-{%- from "templates/autodoc/macros.html" import automodule, source_link,
-	version -%}
-
-<h1>{{ name }}</h1>
-<div class="dev-header">
-{{ version(app.name) }}
-{{ source_link(app, full_module_name.replace(".", "/") + ".py") }}
-</div>
-
-{{ automodule(name) }}
-
-<!-- autodoc -->
diff --git a/frappe/utils/autodoc.py b/frappe/utils/autodoc.py
deleted file mode 100644
index f7f8986539..0000000000
--- a/frappe/utils/autodoc.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-"""
-frappe.utils.autodoc
-~~~~~~~~~~~~~~~~~~~~
-
-Inspect elements of a given module and return its objects
-"""
-
-from __future__ import unicode_literals, print_function
-
-import inspect, importlib, re, frappe
-from frappe.model.document import get_controller
-from six import text_type
-
-
-def automodule(name):
-	"""Returns a list of attributes for given module string.
-
-	Attribute Format:
-
-		{
-			"name": [__name__],
-			"type": ["function" or "class"]
-			"args": [inspect.getargspec(value) (for function)]
-			"docs": [__doc__ as markdown]
-		}
-
-	:param name: Module name as string."""
-	attributes = []
-	obj = importlib.import_module(name)
-
-	for attrname in dir(obj):
-		value = getattr(obj, attrname)
-		if getattr(value, "__module__", None) != name:
-			# imported member, ignore
-			continue
-
-		if inspect.isclass(value):
-			attributes.append(get_class_info(value, name))
-
-		if inspect.isfunction(value):
-			attributes.append(get_function_info(value))
-
-	return {
-		"members": filter(None, attributes),
-		"docs": get_obj_doc(obj)
-	}
-
-installed = None
-def get_version(name):
-	print(name)
-	global installed
-
-	if not installed:
-		installed = frappe.get_installed_apps()
-
-	def _for_module(m):
-		app_name = m.split(".")[0]
-
-		try:
-			docs_version = frappe.get_attr(app_name + ".config.docs.docs_version")
-		except AttributeError:
-			docs_version = None
-
-		if docs_version:
-			return docs_version
-
-		return getattr(importlib.import_module(m.split(".")[0]), "__version__", "0.0.0")
-
-	if "." in name or name in installed:
-		return _for_module(name)
-	else:
-		return _for_module(get_controller(name).__module__)
-
-def get_class_info(class_obj, module_name):
-	members = []
-	for attrname in dir(class_obj):
-		member = getattr(class_obj, attrname)
-
-		if inspect.ismethod(member):
-
-			if getattr(member, "__module__", None) != module_name:
-				# inherited member, ignore
-				continue
-
-			members.append(get_function_info(member))
-
-	return {
-		"name": class_obj.__name__,
-		"type": "class",
-		"bases": [b.__module__ + "." + b.__name__ for b in class_obj.__bases__],
-		"members": filter(None, members),
-		"docs": parse(get_obj_doc(class_obj))
-	}
-
-def get_function_info(value):
-	docs = get_obj_doc(value)
-	return {
-		"name": value.__name__,
-		"type": "function",
-		"args": inspect.getargspec(value),
-		"docs": parse(docs) if docs else '<span class="text-muted">No docs</span>',
-		"whitelisted": value in frappe.whitelisted
-	}
-
-def parse(docs):
-	"""Parse __docs__ text into markdown. Will parse directives like `:param name:` etc"""
-	# strip leading tabs
-	if not docs:
-		return ""
-
-	if ":param" in docs:
-		out, title_set = [], False
-		for line in docs.splitlines():
-			if ":param" in line:
-				if not title_set:
-					# add title and list
-					out.append("")
-					out.append("**Parameters:**")
-					out.append("")
-					title_set = True
-
-				line = re.sub("\s*:param\s([^:]+):(.*)", "- **`\g<1>`** - \g<2>", line)
-
-			elif title_set and not ":param" in line:
-				# marker for end of list
-				out.append("")
-				title_set = False
-
-			out.append(line)
-
-		docs = "\n".join(out)
-
-	return docs
-
-def strip_leading_tabs(docs):
-	"""Strip leading tabs from __doc__ text."""
-	lines = docs.splitlines()
-
-	# remove empty lines in the front
-	start = 0
-	for line in lines:
-		if line != '': break
-		start += 1
-	if start:
-		lines = lines[start:]
-
-	# remove default indentation
-	if len(lines) > 1:
-		start_line = 1
-		ref_line = lines[start_line]
-		while not ref_line:
-			# find reference line for indentations (the first line that is nonempty (false))
-			start_line += 1
-			if start_line > len(lines): break
-			ref_line = lines[start_line]
-
-		strip_left = len(ref_line) - len(ref_line.lstrip())
-		if strip_left:
-			docs = "\n".join([lines[0]] + [l[strip_left:] for l in lines[1:]])
-
-	return docs
-
-def automodel(doctype):
-	"""return doctype template"""
-	pass
-
-def get_obj_doc(obj):
-	'''Return `__doc__` of the given object as unicode'''
-	doc = getattr(obj, "__doc__", "") or ''
-	if not isinstance(doc, text_type):
-		doc = text_type(doc, 'utf-8')
-	return doc
\ No newline at end of file
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 42039806c7..7a27fb3c3b 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -84,7 +84,6 @@ def get_allowed_functions_for_jenv():
 	import frappe
 	import frappe.utils
 	import frappe.utils.data
-	from frappe.utils.autodoc import automodule, get_version
 	from frappe.model.document import get_controller
 	from frappe.website.utils import (get_shade, get_toc, get_next_link)
 	from frappe.modules import scrub
@@ -145,11 +144,6 @@ def get_allowed_functions_for_jenv():
 		'style': {
 			'border_color': '#d1d8dd'
 		},
-		"autodoc": {
-			"get_version": get_version,
-			"automodule": automodule,
-			"get_controller": get_controller
-		},
 		'get_toc': get_toc,
 		'get_next_link': get_next_link,
 		"_": frappe._,
diff --git a/frappe/utils/setup_docs.py b/frappe/utils/setup_docs.py
deleted file mode 100644
index edb0632fd0..0000000000
--- a/frappe/utils/setup_docs.py
+++ /dev/null
@@ -1,308 +0,0 @@
-"""Automatically setup docs for a project
-
-Call from command line:
-
-	bench setup-docs app path
-
-"""
-from __future__ import unicode_literals, print_function
-
-import os, json, frappe, shutil
-from frappe.utils import markdown
-
-class setup_docs(object):
-	def __init__(self, app, target_app):
-		"""Generate source templates for models reference and module API
-			and templates at `templates/autodoc`
-		"""
-		self.app = app
-		self.target_app = target_app
-
-		frappe.flags.web_pages_folders = ['docs',]
-		frappe.flags.web_pages_apps = [self.app,]
-
-		self.hooks = frappe.get_hooks(app_name = self.app)
-		self.app_title = self.hooks.get("app_title")[0]
-		self.setup_app_context()
-
-	def setup_app_context(self):
-		self.docs_config = frappe.get_module(self.app + ".config.docs")
-		version = get_version(app=self.app)
-		self.app_context =  {
-			"app": frappe._dict({
-				"name": self.app,
-				"title": self.app_title,
-				"description": self.hooks.get("app_description")[0],
-				"version": version,
-				"publisher": self.hooks.get("app_publisher")[0],
-				"icon": self.hooks.get("app_icon")[0],
-				"email": self.hooks.get("app_email")[0],
-				"source_link": self.docs_config.source_link,
-				"license": self.hooks.get("app_license")[0],
-				"branch": getattr(self.docs_config, "branch", None) or "develop",
-			}),
-			"metatags": {
-				"description": self.hooks.get("app_description")[0],
-			},
-			"get_doctype_app": frappe.get_doctype_app
-		}
-
-	def build(self, docs_version):
-		"""Build templates for docs models and Python API"""
-		self.docs_path = frappe.get_app_path(self.target_app, 'www', "docs")
-		self.path = os.path.join(self.docs_path, docs_version)
-		self.app_context["app"]["docs_version"] = docs_version
-
-		self.app_title = self.hooks.get("app_title")[0]
-		self.app_path = frappe.get_app_path(self.app)
-
-		print("Deleting current...")
-		shutil.rmtree(self.path, ignore_errors = True)
-		os.makedirs(self.path)
-
-		self.make_home_pages()
-
-		for basepath, folders, files in os.walk(self.app_path):
-
-			# make module home page
-			if "/doctype/" not in basepath and "doctype" in folders:
-				module = os.path.basename(basepath)
-
-				module_folder = os.path.join(self.models_base_path, module)
-
-				self.make_folder(module_folder,
-					template = "templates/autodoc/module_home.html",
-					context = {"name": module})
-				self.update_index_txt(module_folder)
-
-			# make for model files
-			if "/doctype/" in basepath:
-				parts = basepath.split("/")
-				#print parts
-				module, doctype = parts[-3], parts[-1]
-
-				if doctype != "boilerplate":
-					self.write_model_file(basepath, module, doctype)
-
-			# standard python module
-			if self.is_py_module(basepath, folders, files):
-				self.write_modules(basepath, folders, files)
-
-		#self.build_user_docs()
-		self.copy_user_assets()
-		self.add_sidebars()
-		self.add_breadcrumbs_for_user_pages()
-
-	def add_breadcrumbs_for_user_pages(self):
-		for basepath, folders, files in os.walk(os.path.join(self.docs_path,
-			'user')): # pylint: disable=unused-variable
-			for fname in files:
-				if fname.endswith('.md') or fname.endswith('.html'):
-					add_breadcrumbs_tag(os.path.join(basepath, fname))
-
-	def add_sidebars(self):
-		'''Add _sidebar.json in each folder in docs'''
-		for basepath, folders, files in os.walk(self.docs_path): # pylint: disable=unused-variable
-			with open(os.path.join(basepath, '_sidebar.json'), 'w') as sidebarfile:
-				sidebarfile.write(frappe.as_json([
-					{"title": "Search Docs ...", "type": "input", "route": "/search_docs"},
-					{"title": "Docs Home", "route": "/docs"},
-					{"title": "User Guide", "route": "/docs/user"},
-					{"title": "Server API", "route": "/docs/current/api"},
-					{"title": "Models (Reference)", "route": "/docs/current/models"},
-					{"title": "Improve Docs", "route":
-						"{0}/tree/develop/{1}/docs".format(self.docs_config.source_link, self.app)}
-				]))
-
-
-	def copy_user_assets(self):
-		'''Copy docs/user and docs/assets to the target app'''
-		print('Copying docs/user and docs/assets...')
-		shutil.rmtree(os.path.join(self.docs_path, 'user'),
-			ignore_errors=True)
-		shutil.rmtree(os.path.join(self.docs_path, 'assets'),
-			ignore_errors=True)
-		shutil.copytree(os.path.join(self.app_path, 'docs', 'user'),
-			os.path.join(self.docs_path, 'user'))
-		shutil.copytree(os.path.join(self.app_path, 'docs', 'assets'),
-			frappe.get_app_path(self.target_app, 'www', 'docs', 'assets'))
-
-		# copy index
-		shutil.copy(os.path.join(self.app_path, 'docs', 'index.md'),
-			frappe.get_app_path(self.target_app, 'www', 'docs'))
-
-	def make_home_pages(self):
-		"""Make standard home pages for docs, developer docs, api and models
-			from templates"""
-		# make dev home page
-		with open(os.path.join(self.path, "index.html"), "w") as home:
-			home.write(frappe.render_template("templates/autodoc/dev_home.html",
-			self.app_context))
-
-		# make folders
-		self.models_base_path = os.path.join(self.path, "models")
-		self.make_folder(self.models_base_path,
-			template = "templates/autodoc/models_home.html")
-
-		self.api_base_path = os.path.join(self.path, "api")
-		self.make_folder(self.api_base_path,
-			template = "templates/autodoc/api_home.html")
-
-		# make /user
-		user_path = os.path.join(self.docs_path, "user")
-		if not os.path.exists(user_path):
-			os.makedirs(user_path)
-
-		# make /assets/img
-		img_path = os.path.join(self.docs_path, "assets", "img")
-		if not os.path.exists(img_path):
-			os.makedirs(img_path)
-
-	def build_user_docs(self):
-		"""Build templates for user docs pages, if missing."""
-		#user_docs_path = os.path.join(self.docs_path, "user")
-
-		# license
-		with open(os.path.join(self.app_path, "..", "license.txt"), "r") as license_file:
-			self.app_context["license_text"] = markdown(license_file.read())
-			html = frappe.render_template("templates/autodoc/license.html",
-				context = self.app_context)
-
-		with open(os.path.join(self.docs_path, "license.html"), "wb") as license_file:
-			license_file.write(html.encode("utf-8"))
-
-		# contents
-		shutil.copy(os.path.join(frappe.get_app_path("frappe", "templates", "autodoc",
-			"contents.html")), os.path.join(self.docs_path, "contents.html"))
-
-		shutil.copy(os.path.join(frappe.get_app_path("frappe", "templates", "autodoc",
-			"contents.py")), os.path.join(self.docs_path, "contents.py"))
-
-		# install
-		html = frappe.render_template("templates/autodoc/install.md",
-			context = self.app_context)
-
-		with open(os.path.join(self.docs_path, "install.md"), "w") as f:
-			f.write(html)
-
-		self.update_index_txt(self.docs_path)
-
-	def is_py_module(self, basepath, folders, files):
-		return "__init__.py" in files \
-			and (not "/doctype" in basepath) \
-			and (not "/patches" in basepath) \
-			and (not "/change_log" in basepath) \
-			and (not "/report" in basepath) \
-			and (not "/page" in basepath) \
-			and (not "/templates" in basepath) \
-			and (not "/tests" in basepath) \
-			and (not "/docs" in basepath)
-
-	def write_modules(self, basepath, folders, files):
-		module_folder = os.path.join(self.api_base_path, os.path.relpath(basepath, self.app_path))
-		self.make_folder(module_folder)
-
-		for f in files:
-			if f.endswith(".py"):
-				full_module_name = os.path.relpath(os.path.join(basepath, f),
-					self.app_path)[:-3].replace("/", ".")
-
-				module_name = full_module_name.replace(".__init__", "")
-
-				module_doc_path = os.path.join(module_folder,
-					self.app + "." + module_name + ".html")
-
-				self.make_folder(basepath)
-
-				if not os.path.exists(module_doc_path):
-					print("Writing " + module_doc_path)
-					with open(module_doc_path, "wb") as f:
-						context = {"name": self.app + "." + module_name}
-						context.update(self.app_context)
-						context['full_module_name'] = self.app + '.' + full_module_name
-						f.write(frappe.render_template("templates/autodoc/pymodule.html",
-							context).encode('utf-8'))
-
-		self.update_index_txt(module_folder)
-
-	def make_folder(self, path, template=None, context=None):
-		if not template:
-			template = "templates/autodoc/package_index.html"
-
-		if not os.path.exists(path):
-			os.makedirs(path)
-
-			index_txt_path = os.path.join(path, "index.txt")
-			print("Writing " + index_txt_path)
-			with open(index_txt_path, "w") as f:
-				f.write("")
-
-			index_html_path = os.path.join(path, "index.html")
-			if not context:
-				name = os.path.basename(path)
-				if name==".":
-					name = self.app
-				context = {
-					"title": name
-				}
-			context.update(self.app_context)
-			print("Writing " + index_html_path)
-			with open(index_html_path, "w") as f:
-				f.write(frappe.render_template(template, context))
-
-	def update_index_txt(self, path):
-		index_txt_path = os.path.join(path, "index.txt")
-		pages = filter(lambda d: ((d.endswith(".html") or d.endswith(".md")) and d not in ("index.html",)) \
-			or os.path.isdir(os.path.join(path, d)), os.listdir(path))
-		pages = [d.rsplit(".", 1)[0] for d in pages]
-
-		index_parts = []
-		if os.path.exists(index_txt_path):
-			with open(index_txt_path, "r") as f:
-				index_parts = filter(None, f.read().splitlines())
-
-		if not set(pages).issubset(set(index_parts)):
-			print("Updating " + index_txt_path)
-			with open(index_txt_path, "w") as f:
-				f.write("\n".join(pages))
-
-	def write_model_file(self, basepath, module, doctype):
-		model_path = os.path.join(self.models_base_path, module, doctype + ".html")
-
-		if not os.path.exists(model_path):
-			model_json_path = os.path.join(basepath, doctype + ".json")
-			if os.path.exists(model_json_path):
-				with open(model_json_path, "r") as j:
-					doctype_real_name = json.loads(j.read()).get("name")
-
-				print("Writing " + model_path)
-
-				with open(model_path, "wb") as f:
-					context = {"doctype": doctype_real_name}
-					context.update(self.app_context)
-					f.write(frappe.render_template("templates/autodoc/doctype.html",
-						context).encode("utf-8"))
-
-def get_version(app="frappe"):
-	try:
-		return frappe.get_attr(app + ".__version__")
-	except AttributeError:
-		return '0.0.1'
-
-edit_link = '''
-<div class="page-container">
-	<div class="page-content">
-	<div class="edit-container text-center">
-		<i class="fa fa-smile"></i>
-		<a class="text-muted edit" href="{source_link}/blob/{branch}/{app_name}/{target}">
-			Improve this page
-		</a>
-	</div>
-	</div>
-</div>'''
-
-def add_breadcrumbs_tag(path):
-	with open(path, 'r') as f:
-		content = frappe.as_unicode(f.read())
-	with open(path, 'wb') as f:
-		f.write(('<!-- add-breadcrumbs -->\n' + content).encode('utf-8'))

From 284eec4f37c1c0b3f2c13f19efaead4caf959b81 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sat, 11 May 2019 12:40:13 +0530
Subject: [PATCH 086/175] fix: clear popovers

---
 frappe/public/js/frappe/ui/link_preview.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index a237c4a90e..c0e2d162a6 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -2,12 +2,13 @@ frappe.ui.LinkPreview = class {
 
 	constructor() {
 		this.$links = [];
+		this.LINK_CLASSES = 'a[data-doctype], input[data-fieldtype="Link"], .popover';
 		this.popover_timeout = null;
 		this.setup_events();
 	}
 
 	setup_events() {
-		$(document.body).on('mouseover', 'a[data-doctype], input[data-fieldtype="Link"], .popover', (e) => {
+		$(document.body).on('mouseover', this.LINK_CLASSES, (e) => {
 			this.link_hovered = true;
 			this.element = $(e.currentTarget);
 			this.is_link = this.element.get(0).tagName.toLowerCase() === 'a';
@@ -81,7 +82,7 @@ frappe.ui.LinkPreview = class {
 	}
 
 	handle_popover_hide() {
-		$(document.body).on('mouseout', 'a[href*="/"], input[data-fieldname], .popover', () => {
+		$(document.body).on('mouseout', this.LINK_CLASSES, () => {
 			this.link_hovered = false;
 			if(this.data_timeout) {
 				clearTimeout(this.data_timeout);
@@ -89,13 +90,22 @@ frappe.ui.LinkPreview = class {
 			if (this.popover_timeout) {
 				clearTimeout(this.popover_timeout);
 			}
+			this.clear_all_popovers();
 		});
 
 		$(document.body).on('mousemove', () => {
 			if (!this.link_hovered) {
-				this.$links.forEach($el => $el.popover('hide'));
+				this.clear_all_popovers();
 			}
 		});
+
+		$(window).on('hashchange', () => {
+			this.clear_all_popovers();
+		});
+	}
+
+	clear_all_popovers() {
+		this.$links.forEach($el => $el.popover('hide'));
 	}
 
 	get_preview_fields() {

From cf932a834acce940ce8cedb2f4d28328c6c178e1 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 16 Apr 2019 15:59:35 +0530
Subject: [PATCH 087/175] feat: force user to reset password after x days

---
 frappe/auth.py                                |  24 +-
 .../system_settings/system_settings.json      | 289 +++++++++++++-----
 .../system_settings/system_settings.py        |  17 +-
 frappe/core/doctype/user/user.json            |  35 ++-
 frappe/core/doctype/user/user.py              |   5 +-
 frappe/templates/includes/login/login.js      |   5 +
 6 files changed, 301 insertions(+), 74 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 37a79bd4a6..6bf575899e 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -8,7 +8,7 @@ from frappe import _
 import frappe
 import frappe.database
 import frappe.utils
-from frappe.utils import cint, flt, get_datetime, datetime
+from frappe.utils import cint, flt, get_datetime, datetime, date_diff, today
 import frappe.utils.user
 from frappe import conf
 from frappe.sessions import Session, clear_sessions, delete_session
@@ -124,6 +124,12 @@ class LoginManager:
 		frappe.clear_cache(user = frappe.form_dict.get('usr'))
 		user, pwd = get_cached_user_pass()
 		self.authenticate(user=user, pwd=pwd)
+		if self.force_user_to_reset_password():
+			doc = frappe.get_doc("User", self.user)
+			frappe.local.response["redirect_to"] = doc.reset_password(send_email=False)
+			frappe.local.response["message"] = "Password Reset"
+			return False
+
 		if should_run_2fa(self.user):
 			authenticate_for_2factor(self.user)
 			if not confirm_otp_token(self):
@@ -209,6 +215,22 @@ class LoginManager:
 		self.check_if_enabled(user)
 		self.user = self.check_password(user, pwd)
 
+	def force_user_to_reset_password(self):
+		if not self.user:
+			return
+
+		reset_pwd_after_days = cint(frappe.db.get_single_value("System Settings",
+			"force_user_to_reset_password"))
+
+		if reset_pwd_after_days:
+			last_password_reset_date = frappe.db.get_value("User",
+				self.user, "last_password_reset_date")  or today()
+
+			last_pwd_reset_days = date_diff(today(), last_password_reset_date)
+
+			if last_pwd_reset_days > reset_pwd_after_days:
+				return True
+
 	def check_if_enabled(self, user):
 		"""raise exception if user not enabled"""
 		doc = frappe.get_doc("System Settings")
diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index cf317edc42..161f0401e0 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0,
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 0,
  "allow_import": 0,
  "allow_rename": 0,
@@ -18,6 +19,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "localization",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -49,6 +51,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "country",
    "fieldtype": "Link",
    "hidden": 0,
@@ -82,6 +85,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "language",
    "fieldtype": "Link",
    "hidden": 0,
@@ -114,6 +118,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_3",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -145,6 +150,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "time_zone",
    "fieldtype": "Select",
    "hidden": 0,
@@ -176,6 +182,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "is_first_startup",
    "fieldtype": "Check",
    "hidden": 1,
@@ -208,6 +215,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "setup_complete",
    "fieldtype": "Check",
    "hidden": 1,
@@ -240,6 +248,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "date_and_number_format",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -271,6 +280,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "date_format",
    "fieldtype": "Select",
    "hidden": 0,
@@ -303,6 +313,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_7",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -334,6 +345,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "number_format",
    "fieldtype": "Select",
    "hidden": 0,
@@ -366,6 +378,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "float_precision",
    "fieldtype": "Select",
    "hidden": 0,
@@ -399,6 +412,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "If not set, the currency precision will depend on number format",
+   "fetch_if_empty": 0,
    "fieldname": "currency_precision",
    "fieldtype": "Select",
    "hidden": 0,
@@ -432,6 +446,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "sec_backup_limit",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -466,6 +481,7 @@
    "columns": 0,
    "default": "3",
    "description": "Older backups will be automatically deleted",
+   "fetch_if_empty": 0,
    "fieldname": "backup_limit",
    "fieldtype": "Int",
    "hidden": 0,
@@ -498,6 +514,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "background_workers",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -531,6 +548,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Run scheduled jobs only if checked",
+   "fetch_if_empty": 0,
    "fieldname": "enable_scheduler",
    "fieldtype": "Check",
    "hidden": 1,
@@ -562,6 +580,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "scheduler_last_event",
    "fieldtype": "Data",
    "hidden": 1,
@@ -594,6 +613,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "permissions",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -628,6 +648,7 @@
    "columns": 0,
    "default": "0",
    "description": "If Apply Strict User Permission is checked and User Permission is defined for a DocType for a User, then all the documents where value of the link is blank, will not be shown to that User",
+   "fetch_if_empty": 0,
    "fieldname": "apply_strict_user_permissions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -660,6 +681,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "security",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -693,6 +715,7 @@
    "columns": 0,
    "default": "06:00",
    "description": "Session Expiry in Hours e.g. 06:00",
+   "fetch_if_empty": 0,
    "fieldname": "session_expiry",
    "fieldtype": "Data",
    "hidden": 0,
@@ -727,6 +750,7 @@
    "columns": 0,
    "default": "720:00",
    "description": "In Hours",
+   "fetch_if_empty": 0,
    "fieldname": "session_expiry_mobile",
    "fieldtype": "Data",
    "hidden": 0,
@@ -759,75 +783,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
-   "default": "1",
-   "description": "If enabled, the password strength will be enforced based on the Minimum Password Score value. A value of 2 being medium strong and 4 being very strong.",
-   "fieldname": "enable_password_policy",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Enable Password Policy",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "2",
-   "depends_on": "eval:doc.enable_password_policy==1",
-   "fieldname": "minimum_password_score",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Minimum Password Score",
-   "length": 0,
-   "no_copy": 0,
-   "options": "2\n3\n4",
-   "permlevel": 0,
-   "precision": "",
-   "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,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_13",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -860,6 +816,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Note: Multiple sessions will be allowed in case of mobile device",
+   "fetch_if_empty": 0,
    "fieldname": "deny_multiple_sessions",
    "fieldtype": "Check",
    "hidden": 0,
@@ -894,6 +851,7 @@
    "columns": 0,
    "default": "0",
    "description": "User can login using Email id or Mobile number",
+   "fetch_if_empty": 0,
    "fieldname": "allow_login_using_mobile_number",
    "fieldtype": "Check",
    "hidden": 0,
@@ -928,6 +886,7 @@
    "columns": 0,
    "default": "0",
    "description": "User can login using Email id or User Name",
+   "fetch_if_empty": 0,
    "fieldname": "allow_login_using_user_name",
    "fieldtype": "Check",
    "hidden": 0,
@@ -962,6 +921,7 @@
    "columns": 0,
    "default": "1",
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "allow_error_traceback",
    "fieldtype": "Check",
    "hidden": 0,
@@ -994,6 +954,177 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "password_settings",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Password",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "description": "In Days",
+   "fetch_if_empty": 0,
+   "fieldname": "force_user_to_reset_password",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Force User to Reset Password",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_31",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "description": "If enabled, the password strength will be enforced based on the Minimum Password Score value. A value of 2 being medium strong and 4 being very strong.",
+   "fetch_if_empty": 0,
+   "fieldname": "enable_password_policy",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Enable Password Policy",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "2",
+   "depends_on": "eval:doc.enable_password_policy==1",
+   "fetch_if_empty": 0,
+   "fieldname": "minimum_password_score",
+   "fieldtype": "Select",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Minimum Password Score",
+   "length": 0,
+   "no_copy": 0,
+   "options": "2\n3\n4",
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 1,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "brute_force_security",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1026,6 +1157,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "allow_consecutive_login_attempts",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1058,6 +1190,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_34",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -1091,6 +1224,7 @@
    "columns": 0,
    "default": "60",
    "description": "In seconds",
+   "fetch_if_empty": 0,
    "fieldname": "allow_login_after_fail",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1123,6 +1257,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "two_factor_authentication",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1155,6 +1290,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "enable_two_factor_auth",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1190,6 +1326,7 @@
    "default": "0",
    "depends_on": "enable_two_factor_auth",
    "description": "If enabled, users who login from Restricted IP Address, won't be prompted for Two Factor Auth",
+   "fetch_if_empty": 0,
    "fieldname": "bypass_2fa_for_retricted_ip_users",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1224,6 +1361,7 @@
    "columns": 0,
    "depends_on": "enable_two_factor_auth",
    "description": "If enabled, all users can login from any IP Address using Two Factor Auth. This can also be set only for specific user(s) in User Page",
+   "fetch_if_empty": 0,
    "fieldname": "bypass_restrict_ip_check_if_2fa_enabled",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1259,6 +1397,7 @@
    "default": "OTP App",
    "depends_on": "",
    "description": "Choose authentication method to be used by all users",
+   "fetch_if_empty": 0,
    "fieldname": "two_factor_method",
    "fieldtype": "Select",
    "hidden": 0,
@@ -1294,6 +1433,7 @@
    "columns": 0,
    "depends_on": "eval:doc.two_factor_method == \"OTP App\"",
    "description": "Time in seconds to retain QR code image on server. Min:<strong>240</strong>",
+   "fetch_if_empty": 0,
    "fieldname": "lifespan_qrcode_image",
    "fieldtype": "Int",
    "hidden": 0,
@@ -1328,6 +1468,7 @@
    "columns": 0,
    "default": "Frappe Framework",
    "depends_on": "enable_two_factor_auth",
+   "fetch_if_empty": 0,
    "fieldname": "otp_issuer_name",
    "fieldtype": "Data",
    "hidden": 0,
@@ -1361,6 +1502,7 @@
    "bold": 0,
    "collapsible": 1,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "email",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1394,6 +1536,7 @@
    "collapsible": 0,
    "columns": 0,
    "description": "Your organization name and address for the email footer.",
+   "fetch_if_empty": 0,
    "fieldname": "email_footer_address",
    "fieldtype": "Small Text",
    "hidden": 0,
@@ -1426,6 +1569,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_18",
    "fieldtype": "Column Break",
    "hidden": 0,
@@ -1457,6 +1601,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "disable_standard_email_footer",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1489,6 +1634,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "hide_footer_in_auto_email_reports",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1521,6 +1667,7 @@
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "chat",
    "fieldtype": "Section Break",
    "hidden": 0,
@@ -1554,6 +1701,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "enable_chat",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1587,6 +1735,7 @@
    "collapsible": 0,
    "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "use_socketio_to_upload_file",
    "fieldtype": "Check",
    "hidden": 0,
@@ -1624,7 +1773,7 @@
  "issingle": 1,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2019-01-30 11:02:41.011412",
+ "modified": "2019-04-16 13:26:09.247487",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "System Settings",
diff --git a/frappe/core/doctype/system_settings/system_settings.py b/frappe/core/doctype/system_settings/system_settings.py
index 47a9226582..59c8275319 100644
--- a/frappe/core/doctype/system_settings/system_settings.py
+++ b/frappe/core/doctype/system_settings/system_settings.py
@@ -7,7 +7,7 @@ from frappe import _
 from frappe.model.document import Document
 from frappe.model import no_value_fields
 from frappe.translate import set_default_language
-from frappe.utils import cint
+from frappe.utils import cint, today
 from frappe.utils.momentjs import get_all_timezones
 from frappe.twofactor import toggle_two_factor_auth
 
@@ -35,6 +35,11 @@ class SystemSettings(Document):
 			self.bypass_2fa_for_retricted_ip_users = 0
 			self.bypass_restrict_ip_check_if_2fa_enabled = 0
 
+		frappe.flags.update_last_reset_password_date = False
+		if (self.force_user_to_reset_password and
+			not cint(frappe.db.get_single_value("System Settings", "force_user_to_reset_password"))):
+			frappe.flags.update_last_reset_password_date = True
+
 	def on_update(self):
 		for df in self.meta.get("fields"):
 			if df.fieldtype not in no_value_fields:
@@ -47,6 +52,16 @@ class SystemSettings(Document):
 		frappe.cache().delete_value('time_zone')
 		frappe.local.system_settings = {}
 
+		if frappe.flags.update_last_reset_password_date:
+			update_last_reset_password_date()
+
+def update_last_reset_password_date():
+	frappe.db.sql(""" UPDATE `tabUser`
+		SET
+			last_password_reset_date = %s
+		WHERE
+			last_password_reset_date is null or last_password_reset_date = ''""", today())
+
 @frappe.whitelist()
 def load():
 	if not "System Manager" in frappe.get_roles():
diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index e96cdf6f36..318b31d4a2 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -1144,6 +1144,39 @@
    "translatable": 0,
    "unique": 0
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "last_password_reset_date",
+   "fieldtype": "Date",
+   "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Last Password Reset Date",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 1,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -2437,7 +2470,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 5,
- "modified": "2019-03-03 11:10:06.162541",
+ "modified": "2019-04-15 20:25:02.022893",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "User",
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index adc054197a..8d6294e31c 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals, print_function
 import frappe
 from frappe.model.document import Document
-from frappe.utils import cint, has_gravatar, format_datetime, now_datetime, get_formatted_email
+from frappe.utils import cint, has_gravatar, format_datetime, now_datetime, get_formatted_email, today
 from frappe import throw, msgprint, _
 from frappe.utils.password import update_password as _update_password
 from frappe.desk.notifications import clear_notifications
@@ -591,6 +591,9 @@ def update_password(new_password, logout_all_sessions=0, key=None, old_password=
 
 	frappe.local.login_manager.login_as(user)
 
+	frappe.db.set_value("User", user,
+		'last_password_reset_date', today())
+
 	if user_doc.user_type == "System User":
 		return "/desk"
 	else:
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index dd0f57eb4c..670a8e7fa7 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -174,6 +174,11 @@ login.login_handlers = (function() {
 			if(data.message == 'Logged In'){
 				login.set_indicator("{{ _("Success") }}", 'green');
 				window.location.href = frappe.utils.get_url_arg("redirect-to") || data.home_page;
+			} else if(data.message == 'Password Reset'){
+				frappe.msgprint(__("The password of your account is expired"));
+				setTimeout(() => {
+					window.location.href = data.redirect_to;
+				}, 1000);
 			} else if(data.message=="No App") {
 				login.set_indicator("{{ _("Success") }}", 'green');
 				if(localStorage) {

From 408b46acb469f45c8f257ddf2d21ce831f40d7b4 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Sat, 11 May 2019 16:31:10 +0530
Subject: [PATCH 088/175] Updated expired message

---
 frappe/auth.py                           | 2 +-
 frappe/core/doctype/user/user.py         | 8 ++++++--
 frappe/templates/includes/login/login.js | 5 +----
 frappe/www/update-password.html          | 6 +++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 6bf575899e..3a58330e11 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -126,7 +126,7 @@ class LoginManager:
 		self.authenticate(user=user, pwd=pwd)
 		if self.force_user_to_reset_password():
 			doc = frappe.get_doc("User", self.user)
-			frappe.local.response["redirect_to"] = doc.reset_password(send_email=False)
+			frappe.local.response["redirect_to"] = doc.reset_password(send_email=False, password_expired=True)
 			frappe.local.response["message"] = "Password Reset"
 			return False
 
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 8d6294e31c..ebd312fc07 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -218,13 +218,17 @@ class User(Document):
 	def validate_reset_password(self):
 		pass
 
-	def reset_password(self, send_email=False):
+	def reset_password(self, send_email=False, password_expired=False):
 		from frappe.utils import random_string, get_url
 
 		key = random_string(32)
 		self.db_set("reset_password_key", key)
-		link = get_url("/update-password?key=" + key)
 
+		url = "/update-password?key=" + key
+		if password_expired:
+			url = "/update-password?key=" + key + '&password_expired=true'
+
+		link = get_url(url)
 		if send_email:
 			self.password_reset_mail(link)
 
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 670a8e7fa7..054bf56ca5 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -175,10 +175,7 @@ login.login_handlers = (function() {
 				login.set_indicator("{{ _("Success") }}", 'green');
 				window.location.href = frappe.utils.get_url_arg("redirect-to") || data.home_page;
 			} else if(data.message == 'Password Reset'){
-				frappe.msgprint(__("The password of your account is expired"));
-				setTimeout(() => {
-					window.location.href = data.redirect_to;
-				}, 1000);
+				window.location.href = data.redirect_to;
 			} else if(data.message=="No App") {
 				login.set_indicator("{{ _("Success") }}", 'green');
 				if(localStorage) {
diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 9689a1d3b9..1e25e2bb90 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -6,7 +6,7 @@
 
 <div class="page-card">
 	<div class='page-card-head'>
-		<span class='indicator blue'>{{ _("Reset Password") if frappe.db.get_default('company') else _("Set Password")}}</span>
+		<span class='indicator blue password-box'>{{ _("Reset Password") if frappe.db.get_default('company') else _("Set Password")}}</span>
 	</div>
 	<form id="reset-password">
 		<div class="form-group">
@@ -36,6 +36,10 @@ frappe.ready(function() {
 		$("#old_password").parent().toggle(false);
 	}
 
+	if(frappe.utils.get_url_arg("password_expired")) {
+		$(".password-box").html(__('The password of your account has expired.'));
+	}
+
 	$("#reset-password").on("submit", function() {
 		return false;
 	});

From 62a3869924e1ef95f6eafc3f038230eed86fcfa1 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 12 May 2019 18:04:25 +0530
Subject: [PATCH 089/175] fix: Block route if disabled in Portal Settings

Check in render.py
---
 frappe/website/render.py | 15 +++++++++++++++
 frappe/website/router.py | 17 -----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/frappe/website/render.py b/frappe/website/render.py
index ff2376b5f4..ed74ec8cab 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -30,6 +30,7 @@ def render(path=None, http_status_code=None):
 
 	try:
 		path = path.strip('/ ')
+		raise_if_disabled(path)
 		resolve_redirect(path)
 		path = resolve_path(path)
 		data = None
@@ -326,3 +327,17 @@ def add_csrf_token(data):
 				frappe.local.session.data.csrf_token))
 	else:
 		return data
+
+def raise_if_disabled(path):
+	routes = frappe.db.get_all('Portal Menu Item',
+		fields=['route', 'enabled'],
+		filters={
+			'enabled': 0,
+			'route': ['like', '%{0}'.format(path)]
+		}
+	)
+
+	for r in routes:
+		_path = r.route.lstrip('/')
+		if path == _path and not r.enabled:
+			raise frappe.PermissionError
diff --git a/frappe/website/router.py b/frappe/website/router.py
index ebdbe0116f..4e172b5290 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -17,8 +17,6 @@ def resolve_route(path):
 	The only exceptions are `/about` and `/contact` these will be searched in Web Pages
 	first before checking the standard pages."""
 
-	raise_if_disabled(path)
-
 	if path not in ("about", "contact"):
 		context = get_page_info_from_template(path)
 		if context:
@@ -30,21 +28,6 @@ def resolve_route(path):
 			return context
 		return get_page_info_from_template(path)
 
-def raise_if_disabled(path):
-	routes = frappe.db.get_all('Portal Menu Item',
-		fields=['route', 'enabled'],
-		filters={
-			'route': ['like', '%{0}'.format(path)],
-			'enabled': 0
-		}
-	)
-
-	for r in routes:
-		_path = r.route.lstrip('/')
-		if path == _path and not r.enabled:
-			raise frappe.PermissionError
-
-
 def get_page_context(path):
 	page_context = None
 	if can_cache():

From 8524c143cd7ae8fccf49ee8b6949db82cb6de730 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 12 May 2019 18:16:51 +0530
Subject: [PATCH 090/175] fix: UI Test

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

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 282481888e..23bbc8af24 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -39,7 +39,7 @@ Cypress.Commands.add('fill_field', (fieldname, value, fieldtype='Data') => {
 	let selector = `.form-control[data-fieldname="${fieldname}"]`;
 
 	if (fieldtype === 'Text Editor') {
-		selector = `[data-fieldname="${fieldname}"] .ql-editor`;
+		selector = `[data-fieldname="${fieldname}"] .ql-editor[contenteditable=true]`;
 	}
 	if (fieldtype === 'Code') {
 		selector = `[data-fieldname="${fieldname}"] .ace_text-input`;

From 507e763a2a54702b8b580656d11b6534c1754a64 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 12 May 2019 18:42:45 +0530
Subject: [PATCH 091/175] style: Indent

---
 frappe/public/js/frappe/form/print.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 07c27cb601..4a388841d5 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -115,15 +115,15 @@ frappe.ui.form.PrintPreview = Class.extend({
 					fieldtype: 'Read Only',
 					default: print_format.name || 'Standard'
 				}
-			], function (data) {
-					frappe.route_options = {
-						make_new: true,
-						doctype: me.frm.doctype,
-						name: data.print_format_name,
-						based_on: data.based_on
-					};
-					frappe.set_route("print-format-builder");
-				}, __("New Custom Print Format"), __("Start"));
+			], (data) => {
+				frappe.route_options = {
+					make_new: true,
+					doctype: me.frm.doctype,
+					name: data.print_format_name,
+					based_on: data.based_on
+				};
+				frappe.set_route("print-format-builder");
+			}, __("New Custom Print Format"), __("Start"));
 		});
 
 		$(document).on('new-print-format', (e) => {
@@ -305,7 +305,7 @@ frappe.ui.form.PrintPreview = Class.extend({
 		});
 	},
 	get_mapped_printer: function () {
-		// returns a list of "print format: printer" mapping filtered by the current print format 
+		// returns a list of "print format: printer" mapping filtered by the current print format
 		let print_format_printer_map = this.get_print_format_printer_map();
 		if (print_format_printer_map[this.frm.doctype]) {
 			return print_format_printer_map[this.frm.doctype].filter(
@@ -570,7 +570,7 @@ frappe.ui.form.qz_init = function () {
 				});
 				qz.api.setSha256Type(function (data) {
 					// Codacy fix
-					/*global sha256*/ 
+					/*global sha256*/
 					return sha256(data);
 				});
 				resolve();

From 5e2c2d8337dd0f3399e87c4d8c5c1166a7b85fb5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sun, 12 May 2019 19:21:07 +0530
Subject: [PATCH 092/175] fix: Index rendered page content (#7405)

* fix: Index rendered page content

- Order results based on words matched in title

* fix: Reset session user after indexing page

* chore: comments
---
 frappe/commands/utils.py      | 23 +++++++++----
 frappe/utils/global_search.py | 63 ++++++++++++++++++++++-------------
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index ab8597832d..219a99070b 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -625,19 +625,30 @@ def setup_help(context):
 	print_in_app_help_deprecation()
 
 @click.command('rebuild-global-search')
+@click.option('--static-pages', is_flag=True, default=False, help='Rebuild global search for static pages')
 @pass_context
-def rebuild_global_search(context):
+def rebuild_global_search(context, static_pages=False):
 	'''Setup help table in the current site (called after migrate)'''
-	from frappe.utils.global_search import (get_doctypes_with_global_search, rebuild_for_doctype)
+	from frappe.utils.global_search import (get_doctypes_with_global_search, rebuild_for_doctype,
+		get_routes_to_index, add_route_to_global_search, sync_global_search)
 
 	for site in context.sites:
 		try:
 			frappe.init(site)
 			frappe.connect()
-			doctypes = get_doctypes_with_global_search()
-			for i, doctype in enumerate(doctypes):
-				rebuild_for_doctype(doctype)
-				update_progress_bar('Rebuilding Global Search', i, len(doctypes))
+
+			if static_pages:
+				routes = get_routes_to_index()
+				for i, route in enumerate(routes):
+					add_route_to_global_search(route)
+					frappe.local.request = None
+					update_progress_bar('Rebuilding Global Search', i, len(routes))
+				sync_global_search()
+			else:
+				doctypes = get_doctypes_with_global_search()
+				for i, doctype in enumerate(doctypes):
+					rebuild_for_doctype(doctype)
+					update_progress_bar('Rebuilding Global Search', i, len(doctypes))
 
 		finally:
 			frappe.destroy()
diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py
index d459078e01..b2f49d7d51 100644
--- a/frappe/utils/global_search.py
+++ b/frappe/utils/global_search.py
@@ -274,14 +274,16 @@ def update_global_search(doc):
 		sync_value_in_queue(value)
 
 def update_global_search_for_all_web_pages():
-	files_to_index = get_web_pages_to_index()
-	add_web_pages_to_global_search(files_to_index)
+	routes_to_index = get_routes_to_index()
+	for route in routes_to_index:
+		add_route_to_global_search(route)
+	sync_global_search()
 
 
-def get_web_pages_to_index():
+def get_routes_to_index():
 	apps = frappe.get_installed_apps()
 
-	files_to_index = {}
+	routes_to_index = []
 	for app in apps:
 		base = frappe.get_app_path(app, 'www')
 		path_to_index = frappe.get_app_path(app, 'www')
@@ -292,44 +294,43 @@ def get_web_pages_to_index():
 					filepath = os.path.join(dirpath, f)
 
 					route = os.path.relpath(filepath, base)
-					route = '/' + route.split('.')[0]
+					route = route.split('.')[0]
 
 					if route.endswith('index'):
 						route = route.rsplit('index', 1)[0]
 
-					files_to_index[route] = filepath
+					routes_to_index.append(route)
 
-	return files_to_index
+	return routes_to_index
 
 
-def add_web_pages_to_global_search(files_to_index):
-	for route, filepath in files_to_index.items():
-		content = frappe.read_file(filepath)
-		if filepath.endswith('.html'):
-			content_html = content
-			content_md = frappe.utils.to_markdown(content)
-		else:
-			content_md = content
-			content_html = frappe.utils.md_to_html(content)
+def add_route_to_global_search(route):
+	from frappe.website.render import render_page
+	from frappe.tests.test_website import set_request
+	frappe.set_user('Guest')
+	frappe.local.no_cache = True
 
-		soup = BeautifulSoup(content_html, 'html.parser')
-
-		h1 = soup.find('h1')
-		title = h1.text if h1 else None
-		if not title:
-			title = frappe.unscrub(os.path.basename(filepath).split('.')[0])
+	try:
+		set_request(method='GET', path=route)
+		content = render_page(route)
+		soup = BeautifulSoup(content, 'html.parser')
+		page_content = soup.find(class_='page_content')
+		text_content = page_content.text if page_content else ''
+		title = soup.title.text.strip() if soup.title else route
 
 		value = dict(
 			doctype='Static Web Page',
 			name=route,
-			content=content_md,
+			content=text_content,
 			published=1,
 			title=title,
 			route=route
 		)
-
 		sync_value_in_queue(value)
+	except (frappe.PermissionError, frappe.DoesNotExistError, frappe.ValidationError, Exception):
+		pass
 
+	frappe.set_user('Administrator')
 
 
 def get_formatted_value(value, field):
@@ -493,4 +494,18 @@ def web_search(text, scope=None, start=0, limit=20):
 				tmp_result.append(i)
 		results += tmp_result
 
+	# chart of accounts -> {chart, of, accounts}
+	# titles that match the most of these words will have high relevance
+	words = set(get_distinct_words(text))
+	for r in results:
+		title_words = set(get_distinct_words(r.title))
+		words_match = len(words.intersection(title_words))
+		r.relevance = words_match
+
+	results = sorted(results, key=lambda x: x.relevance, reverse=True)
 	return results
+
+def get_distinct_words(text):
+	text = text.replace('"', '')
+	text = text.replace("'", '')
+	return [w.strip().lower() for w in text.split(' ')]

From 15568052323131a88ee3b93dc6765815097a45fc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 13 May 2019 10:26:48 +0530
Subject: [PATCH 093/175] fix: Make query postgres compatible

---
 frappe/core/doctype/activity_log/feed.py | 2 +-
 frappe/desk/page/activity/activity.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py
index e09436196e..8892038681 100644
--- a/frappe/core/doctype/activity_log/feed.py
+++ b/frappe/core/doctype/activity_log/feed.py
@@ -67,7 +67,7 @@ def get_feed_match_conditions(user=None, doctype='Comment'):
 	user_permissions = frappe.permissions.get_user_permissions(user)
 	can_read = frappe.get_user().get_can_read()
 
-	can_read_doctypes = ['"{}"'.format(doctype) for doctype in
+	can_read_doctypes = ["'{}'".format(doctype) for doctype in
 		list(set(can_read) - set(list(user_permissions)))]
 
 	if can_read_doctypes:
diff --git a/frappe/desk/page/activity/activity.py b/frappe/desk/page/activity/activity.py
index e25c94d0e5..3d15088fbd 100644
--- a/frappe/desk/page/activity/activity.py
+++ b/frappe/desk/page/activity/activity.py
@@ -38,7 +38,7 @@ def get_feed(start, page_length):
 				{match_conditions_comment}
 		) X
 		order by X.creation DESC
-		limit %(start)s, %(page_length)s"""
+		OFFSET %(start)s LIMIT %(page_length)s"""
 		.format(match_conditions_comment = match_conditions_comment,
 			match_conditions_communication = match_conditions_communication), {
 			"user": frappe.session.user,

From 862a0979a7827f953872bcf9116e0c868bc0793d Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 13 May 2019 11:29:22 +0530
Subject: [PATCH 094/175] fix(minor): filter selection for dashboard chart,
 even if hidden / readonly

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

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index c178bcfc79..ba00d81143 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -100,6 +100,9 @@ frappe.ui.form.on('Dashboard Chart', {
 								// nothing is mandatory
 								_df.reqd = 0;
 								_df.default = null;
+								_df.read_only = 0;
+								_df.permlevel = 1;
+								_df.hidden = 0;
 
 								frm.chart_filters.push(_df);
 							}

From c53d4b21e46c8e3253e40d33d288c32712be2f2c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Mon, 13 May 2019 13:01:00 +0530
Subject: [PATCH 095/175] default_print_language instead of
 default_print_format

Co-Authored-By: Suraj Shetty <surajshetty3416@gmail.com>
---
 frappe/public/js/frappe/form/print.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 41119c6497..6b9d2b55c4 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -128,7 +128,7 @@ frappe.ui.form.PrintPreview = Class.extend({
 	},
 	set_default_print_language: function () {
  		var print_format = this.get_print_format();
-		this.lang_code = print_format.default_print_format || frappe.boot.lang;
+		this.lang_code = print_format.default_print_language || frappe.boot.lang;
 		this.language_sel.val(this.lang_code);
  	},
 	multilingual_preview: function () {

From 02ff1a48da13de127da40825c28156ea89b69601 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 13 May 2019 13:41:56 +0530
Subject: [PATCH 096/175] fix: Switch the position of LIMIT and OFFSET

MariaDB needs LIMIT before OFFSET.
Whereas Postgres accepts LIMIT and OFFSET in any order
---
 frappe/desk/page/activity/activity.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/page/activity/activity.py b/frappe/desk/page/activity/activity.py
index 3d15088fbd..31ade42e7c 100644
--- a/frappe/desk/page/activity/activity.py
+++ b/frappe/desk/page/activity/activity.py
@@ -38,7 +38,8 @@ def get_feed(start, page_length):
 				{match_conditions_comment}
 		) X
 		order by X.creation DESC
-		OFFSET %(start)s LIMIT %(page_length)s"""
+		LIMIT %(page_length)s
+		OFFSET %(start)s"""
 		.format(match_conditions_comment = match_conditions_comment,
 			match_conditions_communication = match_conditions_communication), {
 			"user": frappe.session.user,
@@ -55,4 +56,4 @@ def get_heatmap_data():
 		where
 			date(creation) > subdate(curdate(), interval 1 year)
 		group by date(creation)
-		order by creation asc"""))
\ No newline at end of file
+		order by creation asc"""))

From aacac30da97eebab5b90d07a29ab5890dfde230c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 13 May 2019 14:15:36 +0530
Subject: [PATCH 097/175] fix: Clickable show card button

Show / Hide cards button is not clickable if there are no modules.
---
 .../js/frappe/views/components/Desktop.vue    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/views/components/Desktop.vue b/frappe/public/js/frappe/views/components/Desktop.vue
index f8c1128b74..dd2f68911a 100644
--- a/frappe/public/js/frappe/views/components/Desktop.vue
+++ b/frappe/public/js/frappe/views/components/Desktop.vue
@@ -1,16 +1,15 @@
 <template>
 	<div class="modules-page-container" v-if="home_settings_fetched">
+		<a
+			class="btn-show-hide text-muted text-medium"
+			@click="show_hide_cards_dialog"
+		>
+			{{ __('Show / Hide Cards') }}
+		</a>
 		<div
 			class="modules-section"
 			v-for="(category, i) in module_categories" :key="category"
 		>
-			<a
-				v-if="i === 0"
-				class="btn-show-hide text-muted text-medium"
-				@click="show_hide_cards_dialog"
-			>
-				{{ __('Show / Hide Cards') }}
-			</a>
 			<desk-section
 				v-if="get_modules_for_category(category).length"
 				:category="category"
@@ -131,19 +130,22 @@ export default {
 
 <style lang="less" scoped>
 .modules-page-container {
+	position: relative;
 	margin-top: 40px;
 	margin-bottom: 30px;
+	padding-top: 1px;
 }
 
 .modules-section {
 	position: relative;
-	padding-top: 30px;
+	margin-top: 30px;
 }
 
 .btn-show-hide {
 	position: absolute;
 	right: 0;
-	top: 36px;
+	top: 39px;
+	z-index: 1;
 }
 
 .toolbar-underlay {

From 3d26d2dd22452325290f07acd22fecc770628d45 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 13 May 2019 14:18:02 +0530
Subject: [PATCH 098/175] BREAKING CHANGE: remove Feedback Trigger and Feedback
 Rating, this was not very configurable and can now be done better with Web
 Forms

---
 frappe/boot.py                                |   2 -
 .../doctype/communication/communication.js    |  13 +-
 .../core/doctype/feedback_request/__init__.py |   0
 .../feedback_request/feedback_request.js      |  21 -
 .../feedback_request/feedback_request.json    | 470 ----------------
 .../feedback_request/feedback_request.py      |  38 --
 .../feedback_request/feedback_request_list.js |  16 -
 .../feedback_request/test_feedback_request.py |  12 -
 .../core/doctype/feedback_trigger/__init__.py |   0
 .../feedback_trigger/feedback_trigger.js      |  50 --
 .../feedback_trigger/feedback_trigger.json    | 517 ------------------
 .../feedback_trigger/feedback_trigger.py      | 215 --------
 .../feedback_trigger/test_feedback_trigger.py | 137 -----
 .../core/report/feedback_ratings/__init__.py  |   0
 .../feedback_ratings/feedback_ratings.js      |  60 --
 .../feedback_ratings/feedback_ratings.json    |  23 -
 .../feedback_ratings/feedback_ratings.py      |  58 --
 frappe/desk/form/load.py                      |  18 +-
 frappe/hooks.py                               |   2 -
 frappe/model/delete_doc.py                    |   1 +
 frappe/patches.txt                            |   1 +
 .../patches/v12_0/remove_feedback_rating.py   |   9 +
 frappe/patches/v7_2/update_communications.py  |  16 +-
 .../patches/v7_2/update_feedback_request.py   |  27 +-
 frappe/public/build.json                      |   1 -
 frappe/public/js/frappe/feedback.js           | 102 ----
 frappe/public/js/frappe/form/form_sidebar.js  |  12 -
 frappe/public/js/frappe/form/toolbar.js       |  10 -
 .../emails/feedback_request_url.html          |   9 -
 frappe/www/feedback.html                      | 131 -----
 frappe/www/feedback.py                        |  74 ---
 31 files changed, 17 insertions(+), 2028 deletions(-)
 delete mode 100644 frappe/core/doctype/feedback_request/__init__.py
 delete mode 100644 frappe/core/doctype/feedback_request/feedback_request.js
 delete mode 100644 frappe/core/doctype/feedback_request/feedback_request.json
 delete mode 100644 frappe/core/doctype/feedback_request/feedback_request.py
 delete mode 100644 frappe/core/doctype/feedback_request/feedback_request_list.js
 delete mode 100644 frappe/core/doctype/feedback_request/test_feedback_request.py
 delete mode 100644 frappe/core/doctype/feedback_trigger/__init__.py
 delete mode 100644 frappe/core/doctype/feedback_trigger/feedback_trigger.js
 delete mode 100644 frappe/core/doctype/feedback_trigger/feedback_trigger.json
 delete mode 100644 frappe/core/doctype/feedback_trigger/feedback_trigger.py
 delete mode 100644 frappe/core/doctype/feedback_trigger/test_feedback_trigger.py
 delete mode 100644 frappe/core/report/feedback_ratings/__init__.py
 delete mode 100644 frappe/core/report/feedback_ratings/feedback_ratings.js
 delete mode 100644 frappe/core/report/feedback_ratings/feedback_ratings.json
 delete mode 100644 frappe/core/report/feedback_ratings/feedback_ratings.py
 create mode 100644 frappe/patches/v12_0/remove_feedback_rating.py
 delete mode 100644 frappe/public/js/frappe/feedback.js
 delete mode 100644 frappe/templates/emails/feedback_request_url.html
 delete mode 100644 frappe/www/feedback.html
 delete mode 100644 frappe/www/feedback.py

diff --git a/frappe/boot.py b/frappe/boot.py
index 0583b31181..4acb7ee3c1 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -16,7 +16,6 @@ from frappe.desk.form.load import get_meta_bundle
 from frappe.utils.change_log import get_versions
 from frappe.translate import get_lang_dict
 from frappe.email.inbox import get_email_accounts
-from frappe.core.doctype.feedback_trigger.feedback_trigger import get_enabled_feedback_trigger
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
 from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points
 from frappe.social.doctype.post.post import frequently_visited_links
@@ -77,7 +76,6 @@ def get_bootinfo():
 	bootinfo.calendars = sorted(frappe.get_hooks("calendars"))
 	bootinfo.treeviews = frappe.get_hooks("treeviews") or []
 	bootinfo.lang_dict = get_lang_dict()
-	bootinfo.feedback_triggers = get_enabled_feedback_trigger()
 	bootinfo.gsuite_enabled = get_gsuite_status()
 	bootinfo.success_action = get_success_action()
 	bootinfo.update(get_email_accounts(user=frappe.session.user))
diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 8e35c388a5..924c29bee2 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -31,13 +31,6 @@ frappe.ui.form.on("Communication", {
 			}
 		}
 
-		if(frm.doc.communication_type == "Feedback") {
-			frm.add_custom_button(__("Resend"), function() {
-				var feedback = new frappe.utils.Feedback();
-				feedback.resend_feedback_request(frm.doc);
-			});
-		}
-
 		if(frm.doc.status==="Open") {
 			frm.add_custom_button(__("Close"), function() {
 				frm.set_value("status", "Closed");
@@ -54,7 +47,7 @@ frappe.ui.form.on("Communication", {
 			frm.trigger('show_relink_dialog');
 		});
 
-		if(frm.doc.communication_type=="Communication" 
+		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Email"
 			&& frm.doc.sent_or_received == "Received") {
 
@@ -90,7 +83,7 @@ frappe.ui.form.on("Communication", {
 			}
 		}
 
-		if(frm.doc.communication_type=="Communication" 
+		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Phone"
 			&& frm.doc.sent_or_received == "Received"){
 
@@ -185,7 +178,7 @@ frappe.ui.form.on("Communication", {
 
 	forward_mail: function(frm) {
 		var args = frm.events.get_mail_args(frm)
-		$.extend(args, {		
+		$.extend(args, {
 			forward: true,
 			subject: __("Fw: {0}", [frm.doc.subject]),
 		})
diff --git a/frappe/core/doctype/feedback_request/__init__.py b/frappe/core/doctype/feedback_request/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/doctype/feedback_request/feedback_request.js b/frappe/core/doctype/feedback_request/feedback_request.js
deleted file mode 100644
index d32982a9f1..0000000000
--- a/frappe/core/doctype/feedback_request/feedback_request.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback Request', {
-	refresh: function(frm) {
-		var rating_icons = frappe.render_template("rating_icons", {rating: frm.doc.rating, show_label: false});
-		$(frm.fields_dict.feedback_rating.wrapper).html(rating_icons);
-
-		if(frm.doc.reference_doctype && frm.doc.reference_name) {
-			frm.add_custom_button(__(frm.doc.reference_name), function() {
-				frappe.set_route("Form", frm.doc.reference_doctype, frm.doc.reference_name);
-			});
-		}
-
-		if(frm.doc.reference_communication){
-			frm.add_custom_button(__("Communication"), function() {
-				frappe.set_route("Form", "Communication", frm.doc.reference_communication);
-			});
-		}
-	}
-});
diff --git a/frappe/core/doctype/feedback_request/feedback_request.json b/frappe/core/doctype/feedback_request/feedback_request.json
deleted file mode 100644
index 6cbc27ac26..0000000000
--- a/frappe/core/doctype/feedback_request/feedback_request.json
+++ /dev/null
@@ -1,470 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2017-01-27 15:43:33.780808", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_sent", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Sent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_feedback_submitted", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback Submitted", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Is Feedback request triggered manually ?", 
-   "fieldname": "is_manual", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Manual", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": 1, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "key", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Key", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "reference_doctype", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Reference DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "reference_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Reference Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "feedback_trigger", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback Trigger", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Feedback Trigger", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "eval: doc.rating", 
-   "columns": 0, 
-   "fieldname": "section_break_1", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback Rating", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "rating", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Rating", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "feedback_rating", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Feedback Rating", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_communication", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference Communication", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 1, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-03-03 08:11:09.718589", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Feedback Request", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "reference_name", 
- "track_changes": 1, 
- "track_seen": 0
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/feedback_request/feedback_request.py b/frappe/core/doctype/feedback_request/feedback_request.py
deleted file mode 100644
index 8605d10f8a..0000000000
--- a/frappe/core/doctype/feedback_request/feedback_request.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe.utils import get_datetime
-
-class FeedbackRequest(Document):
-	def autoname(self):
-		""" feedback request name in the format Feedback for {doctype} {name} on {datetime}"""
-
-		self.name = "Feedback for {doctype} {docname} on {datetime}".format(
-			doctype=self.reference_doctype,
-			docname=self.reference_name,
-			datetime=get_datetime()
-		)
-
-	def before_insert(self):
-		from frappe.utils import random_string
-
-		self.key = random_string(32)
-
-@frappe.whitelist(allow_guest=True)
-def is_valid_feedback_request(key=None):
-	if not key:
-		return False
-
-	is_feedback_submitted = frappe.db.get_value("Feedback Request", { "key": key }, "is_feedback_submitted")
-	if is_feedback_submitted:
-		return False
-	else:
-		return True
-
-def delete_feedback_request():
-	""" clear 100 days old feedback request """
-	frappe.db.sql("""delete from `tabFeedback Request` where `creation` < (NOW() - INTERVAL '100' DAY)""")
\ No newline at end of file
diff --git a/frappe/core/doctype/feedback_request/feedback_request_list.js b/frappe/core/doctype/feedback_request/feedback_request_list.js
deleted file mode 100644
index 69d511582f..0000000000
--- a/frappe/core/doctype/feedback_request/feedback_request_list.js
+++ /dev/null
@@ -1,16 +0,0 @@
-frappe.listview_settings['Feedback Request'] = {
-	colwidths: {
-		subject: 2,
-	},
-	column_render: {
-		rating: function(doc) {
-			var html = ""
-			for (var i = 0; i < 5; i++) {
-				html += repl("<span class='indicator %(color)s'></span>", 
-					{color: i<doc.rating? "blue": "darkgrey"})
-			}
-
-			return html;
-		}
-	}
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/feedback_request/test_feedback_request.py b/frappe/core/doctype/feedback_request/test_feedback_request.py
deleted file mode 100644
index 0e020872f4..0000000000
--- a/frappe/core/doctype/feedback_request/test_feedback_request.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Feedback Request')
-
-class TestFeedbackRequest(unittest.TestCase):
-	pass
diff --git a/frappe/core/doctype/feedback_trigger/__init__.py b/frappe/core/doctype/feedback_trigger/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/doctype/feedback_trigger/feedback_trigger.js b/frappe/core/doctype/feedback_trigger/feedback_trigger.js
deleted file mode 100644
index 376f98d08f..0000000000
--- a/frappe/core/doctype/feedback_trigger/feedback_trigger.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback Trigger', {
-	onload: function(frm) {
-		frm.set_query("document_type", function() {
-			return {
-				"filters": {
-					"istable": 0
-				}
-			}
-		})
-	},
-
-	refresh: function(frm) {
-		frm.events.setup_field_options(frm);
-	},
-
-	document_type: function(frm) {
-		frm.set_value('email_field', '');
-		frm.set_value('email_fieldname');
-
-		frm.events.setup_field_options(frm);
-	},
-
-	email_field: function(frm) {
-		frm.set_value('email_fieldname', frm.fieldname_mapper[frm.doc.email_field]);
-	},
-
-	setup_field_options: function(frm) {
-		frm.fieldname_mapper = {};
-		frm.options = [];
-
-		if(!frm.doc.document_type)
-			return
-
-		frappe.model.with_doctype(frm.doc.document_type, function() {
-			var fields = frappe.get_doc("DocType", frm.doc.document_type).fields;
-			$.each(fields, function(idx, field) {
-				if(!in_list(frappe.model.no_value_type, field.fieldtype) && field.options == "Email") {
-					frm.options.push(field.label);
-					frm.fieldname_mapper[field.label] = field.fieldname;
-				}
-			})
-
-			frm.set_df_property("email_field", "options", [""].concat(frm.options));
-			frm.refresh_fields();
-		});
-	}
-});
diff --git a/frappe/core/doctype/feedback_trigger/feedback_trigger.json b/frappe/core/doctype/feedback_trigger/feedback_trigger.json
deleted file mode 100644
index 56dcceb39e..0000000000
--- a/frappe/core/doctype/feedback_trigger/feedback_trigger.json
+++ /dev/null
@@ -1,517 +0,0 @@
-{
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:document_type", 
- "beta": 0, 
- "creation": "2017-01-24 15:46:38.366213", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
- "fields": [
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "enabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Enabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "document_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Document Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.document_type", 
-   "fieldname": "email_field", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "email_fieldname", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Email Fieldname", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "To add dynamic subject, use jinja tags like\n\n<div><pre><code>{{ doc.name }} Delivered</code></pre></div>", 
-   "fieldname": "subject", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Subject", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "description": "Send Feedback Request only if there is at least one communication is available for the document.", 
-   "fieldname": "check_communication", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Check Communication", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Optional: The alert will be sent if this expression is true", 
-   "fieldname": "condition", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Condition", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_7", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "html_8", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<p><strong>Condition Examples:</strong></p>\n<pre>doc.status==\"Closed\"\ndoc.due_date==nowdate()\ndoc.total &gt; 40000\n</pre>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_9", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "message", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "example", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Example", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<h5>Message Example</h5>\n\n<pre>&lt;h3&gt;Issue Resolved&lt;/h3&gt;\n\n&lt;p&gt;Issue {{ doc.name }} Is resolved. Please check and confirm the same.&lt;/p&gt;\n\n&lt;p&gt; Your Feedback is important for us. Please give us your Feedback for {{ doc.name }}&lt;/p&gt;\n\n&lt;h4&gt;Details&lt;/h4&gt;</pre>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-05-29 16:36:04.178592", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Feedback Trigger", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "document_type", 
- "track_changes": 1, 
- "track_seen": 0
-}
diff --git a/frappe/core/doctype/feedback_trigger/feedback_trigger.py b/frappe/core/doctype/feedback_trigger/feedback_trigger.py
deleted file mode 100644
index e2265913ad..0000000000
--- a/frappe/core/doctype/feedback_trigger/feedback_trigger.py
+++ /dev/null
@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import json
-import frappe
-from frappe import _
-from frappe.utils import get_url
-from frappe.model.document import Document
-from frappe.utils.jinja import validate_template
-
-class FeedbackTrigger(Document):
-	def validate(self):
-		frappe.cache().delete_value('feedback_triggers')
-		validate_template(self.subject)
-		validate_template(self.message)
-		self.validate_condition()
-
-	def on_trash(self):
-		frappe.cache().delete_value('feedback_triggers')
-
-	def validate_condition(self):
-		temp_doc = frappe.new_doc(self.document_type)
-		if self.condition:
-			try:
-				frappe.safe_eval(self.condition, None, get_context(temp_doc))
-			except:
-				frappe.throw(_("The condition '{0}' is invalid").format(self.condition))
-
-def trigger_feedback_request(doc, method):
-	"""Trigger the feedback alert, or delete feedback requests on delete"""
-
-	def _get():
-		triggers = {}
-		if not (frappe.flags.in_migrate or frappe.flags.in_install):
-			for d in frappe.get_all('Feedback Trigger', dict(enabled=1), ['name', 'document_type']):
-				triggers[d.document_type] = d.name
-
-		return triggers
-
-	feedback_triggers = frappe.cache().get_value('feedback_triggers', _get)
-	if doc.doctype in feedback_triggers:
-		if doc.flags.in_delete:
-			frappe.enqueue('frappe.core.doctype.feedback_trigger.feedback_trigger.delete_feedback_request_and_feedback',
-				reference_doctype=doc.doctype, reference_name=doc.name, now=frappe.flags.in_test)
-		else:
-			frappe.enqueue('frappe.core.doctype.feedback_trigger.feedback_trigger.send_feedback_request',
-				trigger=feedback_triggers[doc.doctype], reference_doctype=doc.doctype,
-				reference_name=doc.name, now=frappe.flags.in_test)
-
-@frappe.whitelist()
-def send_feedback_request(reference_doctype, reference_name, trigger="Manual", details=None, is_manual=False):
-	""" send feedback alert """
-
-	if is_feedback_request_already_sent(reference_doctype, reference_name, is_manual=is_manual):
-		frappe.msgprint(_("Feedback Request is already sent to user"))
-		return None
-
-	details = json.loads(details) if details else \
-		get_feedback_request_details(reference_doctype, reference_name, trigger=trigger)
-
-	if not details:
-		return None
-
-	feedback_request, url = get_feedback_request_url(reference_doctype,
-		reference_name, details.get("recipients"), trigger)
-
-	feedback_msg = frappe.render_template("templates/emails/feedback_request_url.html", { "url": url })
-
-	# appending feedback url to message body
-	message = "{message}{feedback_msg}".format(
-		message=details.get("message"),
-		feedback_msg=feedback_msg
-	)
-	details.update({
-		"message": message,
-		"header": [details.get('subject'), 'blue']
-	})
-
-	if details:
-		frappe.sendmail(**details)
-		frappe.db.set_value("Feedback Request", feedback_request, "is_sent", 1)
-
-
-@frappe.whitelist()
-def get_feedback_request_details(reference_doctype, reference_name, trigger="Manual", request=None):
-	if not frappe.db.get_value(reference_doctype, reference_name):
-		# reference document is either deleted or renamed
-		return
-	elif not trigger and not request and not frappe.db.get_value("Feedback Trigger", { "document_type": reference_doctype }):
-		return
-	elif not trigger and request:
-		trigger = frappe.db.get_value("Feedback Request", request, "feedback_trigger")
-	else:
-		trigger = frappe.db.get_value("Feedback Trigger", { "document_type": reference_doctype })
-
-	if not trigger:
-		return
-
-	feedback_trigger = frappe.get_doc("Feedback Trigger", trigger)
-
-	doc = frappe.get_doc(reference_doctype, reference_name)
-	context = get_context(doc)
-
-	recipients = doc.get(feedback_trigger.email_fieldname, None)
-	if feedback_trigger.check_communication:
-		communications = frappe.get_all("Communication", filters={
-			"reference_doctype": reference_doctype,
-			"reference_name": reference_name,
-			"communication_type": "Communication",
-			"sent_or_received": "Sent"
-		}, fields=["name"])
-
-		if len(communications) < 1:
-			frappe.msgprint(_("At least one reply is mandatory before requesting feedback"))
-			return None
-
-	if recipients and (not feedback_trigger.condition or \
-		frappe.safe_eval(feedback_trigger.condition, None, context)):
-		subject = feedback_trigger.subject
-		context.update({ "feedback_trigger": feedback_trigger })
-
-		if "{" in subject:
-			subject = frappe.render_template(feedback_trigger.subject, context)
-
-		feedback_request_message = frappe.render_template(feedback_trigger.message, context)
-
-		return {
-			"subject": subject,
-			"recipients": recipients,
-			"reference_name":doc.name,
-			"reference_doctype":doc.doctype,
-			"message": feedback_request_message,
-		}
-	else:
-		frappe.msgprint(_("Feedback conditions do not match"))
-		return None
-
-def get_feedback_request_url(reference_doctype, reference_name, recipients, trigger="Manual"):
-	""" prepare the feedback request url """
-	is_manual = 1 if trigger == "Manual" else 0
-	feedback_request = frappe.get_doc({
-		"is_manual": is_manual,
-		"feedback_trigger": trigger,
-		"doctype": "Feedback Request",
-		"reference_name": reference_name,
-		"reference_doctype": reference_doctype,
-	}).insert(ignore_permissions=True)
-
-	feedback_url = "{base_url}/feedback?reference_doctype={doctype}&reference_name={docname}&email={email_id}&key={nonce}".format(
-		base_url=get_url(),
-		doctype=reference_doctype,
-		docname=reference_name,
-		email_id=recipients,
-		nonce=feedback_request.key
-	)
-
-	return [ feedback_request.name, feedback_url ]
-
-def is_feedback_request_already_sent(reference_doctype, reference_name, is_manual=False):
-	"""
-		check if feedback request mail is already sent but feedback is not submitted
-		to avoid sending multiple feedback request mail
-	"""
-	is_request_sent = False
-	filters = {
-		"is_sent": 1,
-		"reference_name": reference_name,
-		"is_manual": 1 if is_manual else 0,
-		"reference_doctype": reference_doctype
-	}
-
-	if is_manual:
-		filters.update({ "is_feedback_submitted": 0 })
-
-	feedback_request = frappe.get_all("Feedback Request", filters=filters, fields=["name"])
-
-	if feedback_request: is_request_sent = True
-	return is_request_sent
-
-def get_enabled_feedback_trigger():
-	""" get mapper of all the enable feedback trigger """
-
-	triggers = frappe.get_all("Feedback Trigger", filters={"enabled": 1},
-		fields=["document_type", "name"], as_list=True)
-
-	triggers = { dt[0]: dt[1] for dt in triggers }
-	return triggers
-
-def get_context(doc):
-	return { "doc": doc }
-
-def delete_feedback_request_and_feedback(reference_doctype, reference_name):
-	""" delete all the feedback request and feedback communication """
-	if not all([reference_doctype, reference_name]):
-		return
-
-	feedback_requests = frappe.get_all("Feedback Request", filters={
-		"is_feedback_submitted": 0,
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name
-	})
-
-	communications = frappe.get_all("Communication", {
-		"communication_type": "Feedback",
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name
-	})
-
-	for request in feedback_requests:
-		frappe.delete_doc("Feedback Request", request.get("name"), ignore_permissions=True)
-
-	for communication in communications:
-		frappe.delete_doc("Communication", communication.get("name"), ignore_permissions=True)
diff --git a/frappe/core/doctype/feedback_trigger/test_feedback_trigger.py b/frappe/core/doctype/feedback_trigger/test_feedback_trigger.py
deleted file mode 100644
index f44d1f96ae..0000000000
--- a/frappe/core/doctype/feedback_trigger/test_feedback_trigger.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Feedback Trigger')
-def get_feedback_request(todo, feedback_trigger):
-	return frappe.db.get_value("Feedback Request", {
-		"is_sent": 1,
-		"is_feedback_submitted": 0,
-		"reference_doctype": "ToDo",
-		"reference_name": todo,
-		"feedback_trigger": feedback_trigger
-	}, ["name", "key"])
-
-class TestFeedbackTrigger(unittest.TestCase):
-	def setUp(self):
-		new_user = frappe.get_doc(dict(doctype='User', email='test-feedback@example.com',
-			first_name='Tester')).insert(ignore_permissions=True)
-		new_user.add_roles("System Manager")
-
-	def tearDown(self):
-		frappe.db.sql("delete from tabContact where email_id='test-feedback@example.com'")
-		frappe.delete_doc("User", "test-feedback@example.com")
-		frappe.delete_doc("Feedback Trigger", "ToDo")
-		frappe.db.sql('delete from `tabEmail Queue`')
-		frappe.db.sql('delete from `tabFeedback Request`')
-
-	def test_feedback_trigger(self):
-		""" Test feedback trigger """
-		from frappe.www.feedback import accept
-
-		frappe.delete_doc("Feedback Trigger", "ToDo")
-		frappe.db.sql('delete from `tabEmail Queue`')
-		frappe.db.sql('delete from `tabFeedback Request`')
-
-		feedback_trigger = frappe.get_doc({
-			"enabled": 1,
-			"doctype": "Feedback Trigger",
-			"document_type": "ToDo",
-			"email_field": "assigned_by",
-			"email_fieldname": "assigned_by",
-			"subject": "{{ doc.name }} Task Completed",
-			"condition": "doc.status == 'Closed'",
-			"message": """Task {{ doc.name }} is Completed by {{ doc.owner }}.
-			regarding the Task {{ doc.name }}"""
-		}).insert(ignore_permissions=True)
-
-		# create a todo
-		todo = frappe.get_doc({
-			"doctype": "ToDo",
-			"owner": "test-feedback@example.com",
-			"assigned_by": "test-feedback@example.com",
-			"description": "Unable To Submit Sales Order #SO-00001"
-		}).insert(ignore_permissions=True)
-
-		# feedback alert mail should be sent only on 'Closed' status
-		email_queue = frappe.db.sql("""select name from `tabEmail Queue` where
-			reference_doctype='ToDo' and reference_name='{0}'""".format(todo.name))
-		self.assertFalse(email_queue)
-
-		# add a communication
-		frappe.get_doc({
-			"reference_doctype": "ToDo",
-			"reference_name": todo.name,
-			"communication_type": "Communication",
-			"content": "Test Communication",
-			"subject": "Test Communication",
-			"doctype": "Communication"
-		}).insert(ignore_permissions=True)
-
-		# check if feedback mail alert is triggered
-		todo.reload()
-		todo.status = "Closed"
-		todo.save(ignore_permissions=True)
-
-		email_queue = frappe.db.sql("""select name from `tabEmail Queue` where
-			reference_doctype='ToDo' and reference_name='{0}'""".format(todo.name))
-		self.assertTrue(email_queue)
-
-		# test if feedback is submitted for the todo
-		feedback_request, request_key = get_feedback_request(todo.name, feedback_trigger.name)
-		self.assertTrue(feedback_request)
-
-		# test if mail alerts are triggered multiple times for same document
-		todo.save(ignore_permissions=True)
-		email_queue = frappe.db.sql("""select name from `tabEmail Queue` where
-			reference_doctype='ToDo' and reference_name='{0}'""".format(todo.name))
-		self.assertTrue(len(email_queue) == 1)
-		frappe.db.sql('delete from `tabEmail Queue`')
-
-
-		# Test if feedback is submitted sucessfully
-		result = accept(request_key, "test-feedback@example.com", "ToDo", todo.name, "Great Work !!", 4, fullname="Test User")
-		self.assertTrue(result)
-
-		# test if feedback is saved in Communication
-		docname = frappe.db.get_value("Communication", {
-			"reference_doctype": "ToDo",
-			"reference_name": todo.name,
-			"communication_type": "Feedback",
-			"feedback_request": feedback_request
-		})
-
-		communication = frappe.get_doc("Communication", docname)
-		self.assertEqual(communication.rating, 4)
-		self.assertEqual(communication.content, "Great Work !!")
-
-		# test if link expired after feedback submission
-		self.assertRaises(Exception, accept, key=request_key, sender="test-feedback@example.com",
-			reference_doctype="ToDo", reference_name=todo.name, feedback="Thank You !!", rating=4, fullname="Test User")
-
-		# auto feedback request should trigger only once
-		todo.reload()
-		todo.save(ignore_permissions=True)
-		email_queue = frappe.db.sql("""select name from `tabEmail Queue` where
-			reference_doctype='ToDo' and reference_name='{0}'""".format(todo.name))
-		self.assertFalse(email_queue)
-		frappe.delete_doc("ToDo", todo.name)
-
-		# test if feedback requests and feedback communications are deleted?
-		communications = frappe.get_all("Communication", {
-			"reference_doctype": "ToDo",
-			"reference_name": todo.name,
-			"communication_type": "Feedback"
-		})
-		self.assertFalse(communications)
-
-		feedback_requests = frappe.get_all("Feedback Request", {
-			"reference_doctype": "ToDo",
-			"reference_name": todo.name,
-			"is_feedback_submitted": 0
-		})
-		self.assertFalse(feedback_requests)
diff --git a/frappe/core/report/feedback_ratings/__init__.py b/frappe/core/report/feedback_ratings/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/report/feedback_ratings/feedback_ratings.js b/frappe/core/report/feedback_ratings/feedback_ratings.js
deleted file mode 100644
index 7d42069e49..0000000000
--- a/frappe/core/report/feedback_ratings/feedback_ratings.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.query_reports["Feedback Ratings"] = {
-	"filters": [
-		{
-			"fieldname": "document_type",
-			"label": __("Document Type"),
-			"fieldtype": "Link",
-			"options": "DocType",
-			"reqd": 1,
-			"default": "Issue",
-			"get_query": function() {
-				return {
-					"query": "frappe.core.report.feedback_ratings.feedback_ratings.get_document_type"
-				}
-			}
-		},
-		{
-			"fieldname": "document_id",
-			"label": __("Document ID"),
-			"fieldtype": "Dynamic Link",
-			"get_options": function() {
-				var document_type = frappe.query_report.get_filter_value('document_type');
-				if(!document_type) {
-					frappe.throw(__("Please select Document Type first"));
-				}
-				return document_type;
-			}
-		},
-		{
-			"fieldname":"from_date",
-			"label": __("From Date"),
-			"fieldtype": "Date",
-			'reqd': 1,
-			"default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
-		},
-		{
-			"fieldname":"to_date",
-			"label": __("To Date"),
-			"fieldtype": "Date",
-			'reqd': 1,
-			"default":frappe.datetime.nowdate()
-		}
-	],
-
-	get_chart_data: function(columns, result) {
-		return {
-			data: {
-				x: 'Date',
-				columns: [
-					['Date'].concat($.map(result, function(d) { return d[0]; })),
-					['Average Feedback'].concat($.map(result, function(d) { return d[1]; }))
-				]
-			},
-			chart_type: 'line',
-
-		}
-	}
-}
diff --git a/frappe/core/report/feedback_ratings/feedback_ratings.json b/frappe/core/report/feedback_ratings/feedback_ratings.json
deleted file mode 100644
index 48c10c2e6c..0000000000
--- a/frappe/core/report/feedback_ratings/feedback_ratings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "add_total_row": 0, 
- "apply_user_permissions": 1, 
- "creation": "2017-02-05 20:38:21.890174", 
- "disabled": 0, 
- "docstatus": 0, 
- "doctype": "Report", 
- "idx": 2, 
- "is_standard": "Yes", 
- "modified": "2017-02-24 19:56:51.141147", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Feedback Ratings", 
- "owner": "Administrator", 
- "ref_doctype": "Feedback Trigger", 
- "report_name": "Feedback Ratings", 
- "report_type": "Script Report", 
- "roles": [
-  {
-   "role": "System Manager"
-  }
- ]
-}
\ No newline at end of file
diff --git a/frappe/core/report/feedback_ratings/feedback_ratings.py b/frappe/core/report/feedback_ratings/feedback_ratings.py
deleted file mode 100644
index dff832bfba..0000000000
--- a/frappe/core/report/feedback_ratings/feedback_ratings.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-
-def execute(filters=None):
-	columns, data = get_columns(filters), get_data(filters)
-	return columns, data
-
-def get_columns(filters):
-	return [
-		"Date:Date",
-		"Average Rating",
-	]
-
-def get_data(filters):
-	data = []
-	document_type = filters.get("document_type")
-	party = filters.get("document_id")
-	filters = {
-		"reference_doctype": document_type,
-		"communication_type": "Feedback",
-		"creation": ["Between", [filters.get("from_date"), filters.get("to_date")]]
-	}
-	fields = ["DATE_FORMAT(DATE(creation),'%m-%d-%Y')", "avg(rating) as rating"]
-
-	if not document_type:
-		return []
-
-	if party:
-		filters.update({ "reference_name": party })
-		
-	party_details = frappe.get_list("Communication", filters=filters, fields=fields,
-		order_by="creation", group_by="DATE_FORMAT(DATE(creation),'%m-%d-%Y')", as_list=True)
-
-	return party_details or []
-
-@frappe.whitelist()
-def get_document_type(doctype, txt, searchfield, start, page_len, filters):
-	""" get the document type """
-
-	document_type = []
-	txt = "%%%s%%" % txt
-
-	document_type = frappe.get_all("Feedback Trigger", filters={ "enabled": 1, "document_type": ("like", txt) },
-		fields=["document_type"], as_list=True)
-
-	document_type = map(list, document_type)
-	to_ignore = [ doc[0] for doc in document_type ]
-
-	documents = frappe.get_all("Feedback Request", filters={ "reference_doctype": ["not in", to_ignore] },
-		fields=["reference_doctype"], distinct=True, as_list=True)
-
-	if documents:
-		document_type.extend(documents)
-
-	return document_type
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 14ebbaf7fb..b45ee6d791 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -97,7 +97,6 @@ def get_docinfo(doc=None, doctype=None, name=None):
 		"assignments": get_assignments(doc.doctype, doc.name),
 		"permissions": get_doc_permissions(doc),
 		"shared": frappe.share.get_users(doc.doctype, doc.name),
-		"rating": get_feedback_rating(doc.doctype, doc.name),
 		"views": get_view_logs(doc.doctype, doc.name),
 		"energy_point_logs": get_point_logs(doc.doctype, doc.name),
 		"milestones": get_milestones(doc.doctype, doc.name),
@@ -167,7 +166,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			`timeline_doctype`, `timeline_name`, `reference_doctype`, `reference_name`,
 			`link_doctype`, `link_name`, `read_by_recipient`, `rating`, 'Communication' AS `doctype`'''
 
-	conditions = '''communication_type in ('Communication', 'Feedback')
+	conditions = '''communication_type = 'Communication'
 			and (
 				(reference_doctype=%(doctype)s and reference_name=%(name)s)
 				or (
@@ -219,21 +218,6 @@ def run_onload(doc):
 	doc.set("__onload", frappe._dict())
 	doc.run_method("onload")
 
-def get_feedback_rating(doctype, docname):
-	""" get and return the latest feedback rating if available """
-
-	rating= frappe.get_all("Communication", filters={
-		"reference_doctype": doctype,
-		"reference_name": docname,
-		"communication_type": "Feedback"
-	}, fields=["rating"], order_by="creation desc", as_list=True)
-
-	if not rating:
-		return 0
-	else:
-		return rating[0][0]
-
-
 def get_view_logs(doctype, docname):
 	""" get and return the latest view logs if available """
 	logs = []
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 4bce37d852..52e2e1e4a0 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -130,7 +130,6 @@ doc_events = {
 			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions"
 		],
 		"on_change": [
-			"frappe.core.doctype.feedback_trigger.feedback_trigger.trigger_feedback_request",
 			"frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points"
 		],
 	},
@@ -173,7 +172,6 @@ scheduler_events = {
 		"frappe.utils.scheduler.disable_scheduler_on_expiry",
 		"frappe.utils.scheduler.restrict_scheduler_events_if_dormant",
 		"frappe.email.doctype.auto_email_report.auto_email_report.send_daily",
-		"frappe.core.doctype.feedback_request.feedback_request.delete_feedback_request",
 		"frappe.core.doctype.activity_log.activity_log.clear_authentication_logs",
 		"frappe.website.doctype.personal_data_deletion_request.personal_data_deletion_request.remove_unverified_record",
 		"frappe.desk.form.document_follow.send_daily_updates",
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index ab15dab74e..5dc74bff8d 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -66,6 +66,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 				frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", name)
 				frappe.db.sql("delete from `tabReport` where ref_doctype=%s", name)
 				frappe.db.sql("delete from `tabCustom DocPerm` where parent=%s", name)
+				frappe.db.sql("delete from `__global_search` where doctype=%s", name)
 
 			delete_from_table(doctype, name, ignore_doctypes, None)
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index a1ed371bb9..c0b2a8238f 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -240,3 +240,4 @@ frappe.patches.v12_0.replace_null_values_in_tables
 frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
+frappe.patches.v12_0.remove_feedback_rating
diff --git a/frappe/patches/v12_0/remove_feedback_rating.py b/frappe/patches/v12_0/remove_feedback_rating.py
new file mode 100644
index 0000000000..5184bb7b79
--- /dev/null
+++ b/frappe/patches/v12_0/remove_feedback_rating.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+    '''
+    Deprecate Feedback Trigger and Rating. This feature was not customizable.
+    Now can be achieved via custom Web Forms
+    '''
+    frappe.delete_doc('DocType', 'Feedback Trigger')
+    frappe.delete_doc('DocType', 'Feedback Rating')
diff --git a/frappe/patches/v7_2/update_communications.py b/frappe/patches/v7_2/update_communications.py
index 98c729ae41..f3d859b95a 100644
--- a/frappe/patches/v7_2/update_communications.py
+++ b/frappe/patches/v7_2/update_communications.py
@@ -7,18 +7,4 @@ def execute():
 		remove Guest None from sender full name
 		setup feedback request trigger's is_manual field
 	"""
-	frappe.reload_doc('core', 'doctype', 'dynamic_link')
-	frappe.reload_doc('email', 'doctype', 'contact')
-	
-	frappe.reload_doc("core", "doctype", "feedback_request")
-	frappe.reload_doc("core", "doctype", "communication")
-	
-	if frappe.db.has_column('Communication', 'feedback'):
-		frappe.db.sql("""update tabCommunication set content=ifnull(feedback, "feedback details not provided")
-			where communication_type="Feedback" and content is NULL""")
-
-	frappe.db.sql(""" update tabCommunication set sender_full_name="" where communication_type="Feedback"
-		and sender_full_name='Guest None' """)
-
-	frappe.db.sql(""" update `tabFeedback Request` set is_manual=1, feedback_trigger="Manual"
-		where ifnull(feedback_trigger, '')='' """)
\ No newline at end of file
+	return
diff --git a/frappe/patches/v7_2/update_feedback_request.py b/frappe/patches/v7_2/update_feedback_request.py
index 68814e7a58..11e9eb8e92 100644
--- a/frappe/patches/v7_2/update_feedback_request.py
+++ b/frappe/patches/v7_2/update_feedback_request.py
@@ -7,29 +7,4 @@ def execute():
 		update the feedback request and save the rating and communication
 		reference in Feedback Request document
 	"""
-
-	frappe.reload_doc("core", "doctype", "feedback_request")
-	feedback_requests = frappe.get_all("Feedback Request")
-	for request in feedback_requests:
-		communication, rating = frappe.db.get_value("Communication", { "feedback_request": request.get("name") },
-			["name", "rating"]) or [None, 0]
-
-		if communication:
-			frappe.db.sql("""update `tabFeedback Request` set reference_communication='{communication}',
-				rating={rating} where name='{feedback_request}'""".format(
-					communication=communication,
-					rating=rating or 0,
-					feedback_request=request.get("name")
-			))
-
-		if "Feedback" not in request.get("name"):
-			# rename the feedback request doc
-			reference_name, creation = frappe.db.get_value("Feedback Request", request.get("name"), ["name", "creation"])
-			oldname = request.get("name")
-			newname = "Feedback for {doctype} {docname} on {datetime}".format(
-				doctype="Feedback Request",
-				docname=reference_name,
-				datetime=creation
-			)
-			frappe.rename_doc("Feedback Request", oldname, newname, ignore_permissions=True)
-			if communication: frappe.db.set_value("Communication", communication, "feedback_request", newname)
\ No newline at end of file
+	return
diff --git a/frappe/public/build.json b/frappe/public/build.json
index 57fe9296e6..cd8f04b2c9 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -254,7 +254,6 @@
 		"public/js/frappe/ui/comment.js",
 		"public/js/frappe/misc/rating_icons.html",
 
-		"public/js/frappe/feedback.js",
 		"public/js/frappe/chat.js",
 		"public/js/frappe/social/social_factory.js",
 		"public/js/frappe/misc/energy_point_utils.js"
diff --git a/frappe/public/js/frappe/feedback.js b/frappe/public/js/frappe/feedback.js
deleted file mode 100644
index 7a2e5d8156..0000000000
--- a/frappe/public/js/frappe/feedback.js
+++ /dev/null
@@ -1,102 +0,0 @@
-frappe.provide("frappe.utils")
-
-frappe.utils.Feedback = Class.extend({
-	resend_feedback_request: function(doc) {
-		/* resend the feedback request email */
-		var args = {
-			reference_name: doc.reference_name,
-			reference_doctype: doc.reference_doctype,
-			request: doc.feedback_request,
-		}
-		this.get_feedback_request_details(args, true)
-	},
-
-	manual_feedback_request: function(doc) {
-		var me = this;
-
-		var args = {
-			reference_doctype: doc.doctype,
-			reference_name: doc.name
-		}
-		if(frappe.boot.feedback_triggers[doc.doctype]) {
-			var feedback_trigger = frappe.boot.feedback_triggers[doc.doctype]
-			$.extend(args, { trigger: feedback_trigger })
-			me.get_feedback_request_details(args, false)
-		} else{
-			me.make_feedback_request_dialog(args, false)
-		}
-	},
-
-	get_feedback_request_details: function(args, is_resend) {
-		var me = this;
-
-		return frappe.call({
-			method: "frappe.core.doctype.feedback_trigger.feedback_trigger.get_feedback_request_details",
-			'args': args,
-			callback: function(r) {
-				if(r.message) {
-					me.make_feedback_request_dialog(r.message, is_resend)
-				}
-			}
-		});
-	},
-
-	make_feedback_request_dialog: function(args, is_resend) {
-		var me = this;
-		var dialog = new frappe.ui.Dialog({
-			title: __("{0} Feedback Request", [ is_resend? "Resend": "Send" ]),
-			fields: [
-				{
-					"reqd": 1,
-					"label": __("Recipient"), 
-					"fieldname": "recipients",
-					"fieldtype": "Data",
-					"options": "Email"
-				},
-				{
-					"reqd": 1,
-					"label": __("Subject"), 
-					"fieldname": "subject",
-					"fieldtype": "Data"
-				},
-				{
-					"reqd": 1,
-					"label": __("Message"), 
-					"fieldname": "message",
-					"fieldtype": "Text Editor"
-				}
-			],
-		});
-
-		$.each(args, function(field, value){
-			dialog.set_value(field, value);
-		})
-
-		dialog.set_primary_action(__("Send"), function() {
-			$.extend(args,{ details: dialog.get_values() });
-			if(!args)
-				return;
-
-			dialog.hide();
-			me.send_feedback_request(args)
-		});
-
-		dialog.show();
-	},
-
-	send_feedback_request: function(args) {
-		$.extend(args, { is_manual: true })
-		return frappe.call({
-			method: "frappe.core.doctype.feedback_trigger.feedback_trigger.send_feedback_request",
-			'args': args,
-			freeze: true,
-			callback: function(r) {
-				if(r.message) {
-					frappe.msgprint(__("Feedback Request for {0} is sent to {1}",
-						[args.reference_name, args.details.recipients]));
-				}
-			}
-		});
-	}
-})
-
diff --git a/frappe/public/js/frappe/form/form_sidebar.js b/frappe/public/js/frappe/form/form_sidebar.js
index ee6bd618e7..f621f0f822 100644
--- a/frappe/public/js/frappe/form/form_sidebar.js
+++ b/frappe/public/js/frappe/form/form_sidebar.js
@@ -11,7 +11,6 @@ frappe.ui.form.Sidebar = Class.extend({
 			.html(sidebar_content)
 			.appendTo(this.page.sidebar.empty());
 
-		this.ratings = this.sidebar.find(".sidebar-rating");
 		this.comments = this.sidebar.find(".sidebar-comments");
 		this.user_actions = this.sidebar.find(".user-actions");
 		this.image_section = this.sidebar.find(".sidebar-image-section");
@@ -67,7 +66,6 @@ frappe.ui.form.Sidebar = Class.extend({
 					"<br>" + comment_when(this.frm.doc.creation)]));
 
 			this.refresh_like();
-			this.setup_ratings();
 			frappe.ui.form.set_user_image(this.frm);
 		}
 	},
@@ -158,16 +156,6 @@ frappe.ui.form.Sidebar = Class.extend({
 	refresh_image: function() {
 	},
 
-	setup_ratings: function() {
-		var _ratings = this.frm.get_docinfo().rating || 0;
-
-		if(_ratings) {
-			this.ratings.removeClass("hide");
-			var rating_icons = frappe.render_template("rating_icons", {rating: _ratings, show_label: false});
-			this.ratings.find(".rating-icons").html(rating_icons);
-		}
-	},
-
 	make_review: function() {
 		if (frappe.boot.energy_points_enabled && !this.frm.is_new()) {
 			this.frm.reviews = new frappe.ui.form.Review({
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index a6d3a9a8f7..5697ebbe62 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -175,16 +175,6 @@ frappe.ui.form.Toolbar = Class.extend({
 			}
 		}
 
-		// feedback
-		if(!this.frm.doc.__unsaved) {
-			if(is_submittable && docstatus == 1) {
-				this.page.add_menu_item(__("Request Feedback"), function() {
-					var feedback = new frappe.utils.Feedback();
-					feedback.manual_feedback_request(me.frm.doc);
-				}, true)
-			}
-		}
-
 		// New
 		if(p[CREATE] && !this.frm.meta.issingle) {
 			this.page.add_menu_item(__("New {0} (Ctrl+B)", [__(me.frm.doctype)]), function() {
diff --git a/frappe/templates/emails/feedback_request_url.html b/frappe/templates/emails/feedback_request_url.html
deleted file mode 100644
index e9cec87b4d..0000000000
--- a/frappe/templates/emails/feedback_request_url.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div align="center">
-	<p>{{ _("Please select a rating") }}</p>
-	<a class="rating" style="font-size: 20px; text-decoration: none; color: grey" href="{{url}}&rating=1">★</a>
-	<a class="rating" style="font-size: 20px; text-decoration: none; color: grey" href="{{url}}&rating=2">★</a>
-	<a class="rating" style="font-size: 20px; text-decoration: none; color: grey" href="{{url}}&rating=3">★</a>
-	<a class="rating" style="font-size: 20px; text-decoration: none; color: grey" href="{{url}}&rating=4">★</a>
-	<a class="rating" style="font-size: 20px; text-decoration: none; color: grey" href="{{url}}&rating=5">★</a>
-	<div class="more-info">{{ _("1 star being lowest & 5 stars being highest rating") }}</div>
-</div>
diff --git a/frappe/www/feedback.html b/frappe/www/feedback.html
deleted file mode 100644
index c780e2c943..0000000000
--- a/frappe/www/feedback.html
+++ /dev/null
@@ -1,131 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block title %}{{ _("Feedback") }}{% endblock %}
-
-{% macro feedback_result(is_valid_request, subject, message='') %}
-<div class="feedback-result" style="{{ 'display: none' if is_valid_request else '' }}">
-	<div class='page-card'>
-		<div class='page-card-head'>
-			<span class='indicator darkgrey'>{{ _(subject) }}</span>
-		</div>
-		<p id="feedback-result">{{ _(message) }}</p>
-		<div><a href='/' class='btn btn-primary btn-sm'>{{ _("Home") }}</a></div>
-	</div>
-</div>
-{% endmacro %}
-
-{% block page_content %}
-{% if is_valid_request %}
-	<div class="feedback">
-		<p class='lead' id="feedback-msg"></p>
-
-		<div>
-			{{ _("Your rating: ") }}
-			<i class='fa fa-fw fa-star-o star-icon' data-idx=1></i>
-			<i class='fa fa-fw fa-star-o star-icon' data-idx=2></i>
-			<i class='fa fa-fw fa-star-o star-icon' data-idx=3></i>
-			<i class='fa fa-fw fa-star-o star-icon' data-idx=4></i>
-			<i class='fa fa-fw fa-star-o star-icon' data-idx=5></i>
-		</div>
-
-		<div style='max-width: 500px;'>
-			<p>{{ _("Full Name") }}</p>
-			<input class="form-control fullname" type="text" placeholder="Your Full Name">
-			<p>{{ _("Detailed feedback") }}</p>
-			<textarea class='form-control feedback-text' style='min-height: 300px;'></textarea>
-		</div>
-
-		<p><button class='btn btn-primary btn-sm btn-submit'>{{ _("Submit") }}</button></p>
-
-		{% if comment_list -%}
-			<div class="comments">
-				<br><br>
-				<h3>{{ _("Communication") }}</h3>
-				{% include 'templates/includes/comments/comments.html' %}
-			</div>
-		{% endif %}
-	</div>
-	{{ feedback_result(is_valid_request, "Thank You") }}
-{% else %}
-	{{ feedback_result(is_valid_request, "Invalid Input", error_message) }}
-{% endif %}
-
-<script>
-	window.feedback = {
-		init: function() {
-			var me = this;
-
-			this.key = frappe.utils.get_url_arg("key");
-			this.reference_name = frappe.utils.get_url_arg("reference_name");
-			this.reference_doctype = frappe.utils.get_url_arg("reference_doctype");
-			this.sender = frappe.utils.get_url_arg("email");
-			this.rating = frappe.utils.get_url_arg("rating") || 0;
-
-			// set ratings
-			this.set_ratings_icon(this.rating)
-
-			this.bind_events();
-			$("#feedback-msg").empty().html(__("Please share your feedback for {0}", [me.reference_name]));
-		},
-
-		set_ratings_icon: function(idx) {
-			$('.star-icon.fa-star').removeClass('fa-star').addClass('fa-star-o');
-			for(var i=0; i<parseInt(idx); i++) {
-				$($('.star-icon').get(i)).removeClass('fa-star-o').addClass('fa-star');
-			}
-		},
-
-		bind_events: function() {
-			// bind ratings on hover
-			var me = this;
-
-			$('.star-icon').hover(function() {
-				var idx = $(this).attr('data-idx');
-				me.set_ratings_icon(idx);
-			});
-
-			// bind submit button
-			$('.btn-submit').on('click', function() {
-				if(!$('.star-icon.fa-star').length) {
-					frappe.msgprint(__("Please give a rating."));
-					return;
-				} else if(!$('.fullname').val().length){
-					frappe.msgprint(__("Please give a fullname."));
-					return;
-				} else if(!$('.feedback-text').val().length){
-					frappe.msgprint(__("Please give a detailed feebdack."));
-					return;
-				}
-
-				frappe.call({
-					method: 'frappe.www.feedback.accept',
-					args: {
-						key: me.key,
-						sender: me.sender,
-						reference_name: me.reference_name,
-						reference_doctype: me.reference_doctype,
-						feedback: $('.feedback-text').val(),
-						rating: $('.star-icon.fa-star').length,
-						fullname: $('.fullname').val()
-					},
-					callback: function(r) {
-						if(r.message) {
-							$(".feedback, .feedback-result").toggle();
-							$("#feedback-result").empty().html(__("Your Feedback for document {0} is saved successfully",
-								[me.reference_name]));
-						}
-					}
-				})
-			});
-		}
-	};
-
-	frappe.ready(function() {
-		feedback.init();
-	})
-</script>
-<style>
-	{% include "templates/styles/card_style.css" %}
-</style>
-
-{% endblock %}
diff --git a/frappe/www/feedback.py b/frappe/www/feedback.py
deleted file mode 100644
index d3ceda8807..0000000000
--- a/frappe/www/feedback.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.core.doctype.feedback_request.feedback_request import is_valid_feedback_request
-
-no_cache = True
-
-def get_context(context):
-	reference_doctype = frappe.form_dict.get("reference_doctype")
-	reference_name = frappe.form_dict.get("reference_name")
-
-	if not all([reference_name, reference_doctype]) or \
-		not frappe.db.get_value(reference_doctype, reference_name):
-		
-		return {
-			"is_valid_request": False,
-			"error_message": "Invalid reference doctype and reference name"
-		}
-
-	communications = frappe.get_all("Communication", filters={
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"communication_type": "Communication"	
-	}, fields=["*"], limit_page_length=10, order_by="creation desc")
-
-	return {
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"comment_list": communications,
-		"is_communication": True,
-		"is_valid_request": True
-	}
-
-@frappe.whitelist(allow_guest=True)
-def accept(key, sender, reference_doctype, reference_name, feedback, rating, fullname):
-	""" save the feedback in communication """
-	if not reference_doctype and not reference_name or \
-		not frappe.db.get_value(reference_doctype, reference_name):
-
-		frappe.throw(_("Invalid Reference"))
-
-	if not rating:
-		frappe.throw(_("Please add a rating"))
-
-	if not is_valid_feedback_request(key):
-		frappe.throw(_("Expired link"))
-
-	try:
-		feedback_request = frappe.db.get_value("Feedback Request", {"key": key})
-
-		communication = frappe.get_doc({
-			"rating": rating,
-			"status": "Closed",
-			"content": feedback or "",
-			"doctype": "Communication",
-			"sender": sender or "Guest",
-			"sent_or_received": "Received",
-			"communication_type": "Feedback",
-			"reference_name": reference_name,
-			"sender_full_name": fullname or "",
-			"feedback_request": feedback_request,
-			"reference_doctype": reference_doctype,
-			"subject": "Feedback for {0} {1}".format(reference_doctype, reference_name),
-		}).insert(ignore_permissions=True)
-
-		doc = frappe.get_doc("Feedback Request", feedback_request)
-		doc.is_feedback_submitted = 1
-		doc.rating = rating
-		doc.reference_communication = communication.name
-		doc.save(ignore_permissions=True)
-		return True
-	except Exception:
-		frappe.log_error()
-		frappe.throw(_("Cannot submit feedback, please try again later"))

From 5f85b5935c2bd7cc6cfd312adea5aa3e7a746b9f Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 13 May 2019 14:32:23 +0530
Subject: [PATCH 099/175] fix: remove from timeline.js

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

diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 70ac4e4241..6eba1659a8 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -441,7 +441,6 @@ frappe.ui.form.Timeline = class Timeline {
 	set_icon_and_color(c) {
 		if(c.communication_type == "Feedback"){
 			c.icon = "octicon octicon-comment-discussion"
-			c.rating_icons = frappe.render_template("rating_icons", {rating: c.rating, show_label: true})
 		} else {
 			c.icon = {
 				"Email": "octicon octicon-mail",

From b9170012b281121012d3b330647c41040c42bfe6 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Mon, 13 May 2019 14:59:49 +0530
Subject: [PATCH 100/175] feat: added follow on creation and changes done by
 user will not send to him (#7460)

* feat: added follow on creation

* style: Missing comma and a parameter

* fix: travis

* removed print statement
---
 frappe/desk/form/document_follow.py | 25 ++++++++++++++-----------
 frappe/model/document.py            |  5 +++++
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/form/document_follow.py b/frappe/desk/form/document_follow.py
index de04ef35af..1d94a2b9aa 100644
--- a/frappe/desk/form/document_follow.py
+++ b/frappe/desk/form/document_follow.py
@@ -54,8 +54,8 @@ def unfollow_document(doctype, doc_name, user):
 		return 1
 	return 0
 
-def get_message(doc_name, doctype, frequency):
-	activity_list = get_version(doctype, doc_name, frequency) + get_comments(doctype, doc_name, frequency)
+def get_message(doc_name, doctype, frequency, user):
+	activity_list = get_version(doctype, doc_name, frequency, user) + get_comments(doctype, doc_name, frequency, user)
 	return sorted(activity_list, key=lambda k: k["time"], reverse=True)
 
 def send_email_alert(receiver, docinfo, timeline):
@@ -98,7 +98,7 @@ def send_document_follow_mails(frequency):
 		valid_document_follows = []
 		if user_frequency == frequency:
 			for d in grouped_by_user[user]:
-				content = get_message(d.ref_docname, d.ref_doctype, frequency)
+				content = get_message(d.ref_docname, d.ref_doctype, frequency, user)
 				if content:
 					message = message + content
 					valid_document_follows.append({
@@ -111,9 +111,9 @@ def send_document_follow_mails(frequency):
 				send_email_alert(user, valid_document_follows, message)
 
 
-def get_version(doctype, doc_name, frequency):
+def get_version(doctype, doc_name, frequency, user):
 	timeline = []
-	filters = get_filters("docname", doc_name, frequency)
+	filters = get_filters("docname", doc_name, frequency, user)
 	version = frappe.get_all("Version",
 		filters=filters,
 		fields=["ref_doctype", "data", "modified", "modified", "modified_by"]
@@ -134,9 +134,9 @@ def get_version(doctype, doc_name, frequency):
 
 	return timeline
 
-def get_comments(doctype, doc_name, frequency):
+def get_comments(doctype, doc_name, frequency, user):
 	timeline = []
-	filters = get_filters("reference_name", doc_name, frequency)
+	filters = get_filters("reference_name", doc_name, frequency, user)
 	comments = frappe.get_all("Comment",
 		filters=filters,
 		fields=["content", "modified", "modified_by", "comment_type"]
@@ -255,26 +255,29 @@ def send_daily_updates():
 def send_weekly_updates():
 	send_document_follow_mails("Weekly")
 
-def get_filters(search_by, name, frequency):
+def get_filters(search_by, name, frequency, user):
 	filters = []
 
 	if frequency == "Weekly":
 		filters = [
 			[search_by, "=", name],
 			["modified", ">", frappe.utils.add_days(frappe.utils.nowdate(),-7)],
-			["modified", "<", frappe.utils.nowdate()]
+			["modified", "<", frappe.utils.nowdate()],
+			["modified_by", "!=", user]
 		]
 	elif frequency == "Daily":
 		filters = [
 			[search_by, "=", name],
 			["modified", ">", frappe.utils.add_days(frappe.utils.nowdate(),-1)],
-			["modified", "<", frappe.utils.nowdate()]
+			["modified", "<", frappe.utils.nowdate()],
+			["modified_by", "!=", user]
 		]
 	elif frequency == "Hourly":
 		filters = [
 			[search_by, "=", name],
 			["modified", ">", frappe.utils.add_to_date(frappe.utils.now_datetime(), 0, 0, 0, -1)],
-			["modified", "<", frappe.utils.now_datetime()]
+			["modified", "<", frappe.utils.now_datetime()],
+			["modified_by", "!=", user]
 		]
 
 	return filters
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 5fe1ba3bc6..e8add2d619 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -230,6 +230,9 @@ class Document(BaseDocument):
 		self.set_docstatus()
 		self.flags.in_insert = False
 
+		# follow document on document creation
+
+
 		# run validate, on update etc.
 
 		# parent
@@ -259,6 +262,8 @@ class Document(BaseDocument):
 		if hasattr(self, "__islocal"):
 			delattr(self, "__islocal")
 
+		if not (frappe.flags.in_migrate or frappe.local.flags.in_install):
+			follow_document(self.doctype, self.name, frappe.session.user)
 		return self
 
 	def save(self, *args, **kwargs):

From 8381e0048a1bb5d61860af072f8a1ff61fc7ee13 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 13 May 2019 20:39:49 +0530
Subject: [PATCH 101/175] feat: Communication refactor initial bringup

---
 .../doctype/communication/communication.js    | 82 +++++++++++++++++-
 .../doctype/communication/communication.json  | 39 ++++-----
 .../doctype/communication/communication.py    | 83 +++++++++++++++++--
 frappe/core/doctype/communication/email.py    | 45 ++++++++++
 frappe/desk/form/load.py                      | 59 ++++++++-----
 .../doctype/email_account/email_account.py    |  9 +-
 6 files changed, 260 insertions(+), 57 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 8e35c388a5..ecf2b4670d 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -54,7 +54,15 @@ frappe.ui.form.on("Communication", {
 			frm.trigger('show_relink_dialog');
 		});
 
-		if(frm.doc.communication_type=="Communication" 
+		frm.add_custom_button(__("Add link"), function() {
+			frm.trigger('show_add_link_dialog');
+		});
+
+		frm.add_custom_button(__("Remove link"), function() {
+			frm.trigger('show_remove_link_dialog');
+		});
+
+		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Email"
 			&& frm.doc.sent_or_received == "Received") {
 
@@ -90,7 +98,7 @@ frappe.ui.form.on("Communication", {
 			}
 		}
 
-		if(frm.doc.communication_type=="Communication" 
+		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Phone"
 			&& frm.doc.sent_or_received == "Received"){
 
@@ -148,6 +156,74 @@ frappe.ui.form.on("Communication", {
 		d.show();
 	},
 
+	show_add_link_dialog: function(frm){
+		var d = new frappe.ui.Dialog ({
+			title: __("Add new link to Communication"),
+			fields: [{
+				"fieldtype": "Link",
+				"options": "DocType",
+				"label": __("Document Type"),
+				"fieldname": "link_doctype",
+				"reqd": 1
+			},
+			{
+				"fieldtype": "Dynamic Link",
+				"options": "link_doctype",
+				"label": __("Document Name"),
+				"fieldname": "link_name",
+				"reqd": 1
+			}],
+			primary_action: ({ link_doctype, link_name }) => {
+				d.hide();
+				frm.call('add_link', {
+					link_doctype,
+					link_name,
+					autosave: true
+				}).then(() => frm.refresh());
+			},
+			primary_action_label: __('Add Link')
+		});
+		d.fields_dict.link_doctype.get_query = function() {
+			return {
+				"filters": {
+					"name": ["!=", "Communication"],
+				}
+			};
+		};
+		d.show();
+	},
+
+	show_remove_link_dialog: function(frm){
+		let options = '';
+
+		for(var link in frm.doc.dynamic_links){
+			let dynamic_link = frm.doc.dynamic_links[link];
+			options += '\n' + dynamic_link.link_doctype + ': ' + dynamic_link.link_name;
+		}
+
+		var d = new frappe.ui.Dialog ({
+			title: __("Remove link from Communication"),
+			fields: [{
+				"fieldtype": "Select",
+				"options": options,
+				"label": __("Link"),
+				"fieldname": "link",
+				"reqd": 1
+			}],
+			primary_action: ({ link }) => {
+				d.hide();
+				frm.call('remove_link', {
+					link_doctype: link.split(":")[0].trim(),
+					link_name: link.split(":")[1].trim(),
+					autosave: true,
+					ignore_permissions: false
+				}).then(() => frm.refresh());
+			},
+			primary_action_label: __('Remove Link')
+		});
+		d.show();
+	},
+
 	mark_as_read_unread: function(frm) {
 		var action = frm.doc.seen? "Unread": "Read";
 		var flag = "(\\SEEN)";
@@ -185,7 +261,7 @@ frappe.ui.form.on("Communication", {
 
 	forward_mail: function(frm) {
 		var args = frm.events.get_mail_args(frm)
-		$.extend(args, {		
+		$.extend(args, {
 			forward: true,
 			subject: __("Fw: {0}", [frm.doc.subject]),
 		})
diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index 3b845964f4..b315a4ce98 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -1,7 +1,7 @@
 {
  "allow_import": 1,
  "creation": "2013-01-29 10:47:14",
- "description": "Keep a track of all communications",
+ "description": "Keeps track of all communications",
  "doctype": "DocType",
  "document_type": "Setup",
  "engine": "InnoDB",
@@ -43,12 +43,11 @@
   "email_template",
   "link_doctype",
   "link_name",
-  "timeline_doctype",
-  "timeline_name",
-  "timeline_label",
   "unread_notification_sent",
   "seen",
   "_user_tags",
+  "timeline_links_sections",
+  "dynamic_links",
   "email_inbox",
   "message_id",
   "uid",
@@ -298,25 +297,6 @@
    "options": "link_doctype",
    "read_only": 1
   },
-  {
-   "fieldname": "timeline_doctype",
-   "fieldtype": "Link",
-   "label": "Timeline DocType",
-   "options": "DocType",
-   "read_only": 1
-  },
-  {
-   "fieldname": "timeline_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Timeline Name",
-   "options": "timeline_doctype",
-   "read_only": 1
-  },
-  {
-   "fieldname": "timeline_label",
-   "fieldtype": "Data",
-   "label": "Timeline field Name"
-  },
   {
    "default": "0",
    "fieldname": "unread_notification_sent",
@@ -398,11 +378,22 @@
    "label": "Email Template",
    "options": "Email Template",
    "read_only": 1
+  },
+  {
+   "fieldname": "timeline_links_sections",
+   "fieldtype": "Section Break",
+   "label": "Timeline Links"
+  },
+  {
+   "fieldname": "dynamic_links",
+   "fieldtype": "Table",
+   "label": "Dynamic Links",
+   "options": "Dynamic Link"
   }
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-04 15:36:35.818714",
+ "modified": "2019-05-13 19:55:35.757242",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Communication",
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 77ccefba71..5952ae1fc4 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -8,7 +8,7 @@ from frappe.model.document import Document
 from frappe.utils import validate_email_address, get_fullname, strip_html, cstr
 from frappe.core.doctype.communication.email import (validate_email,
 	notify, _notify, update_parent_mins_to_first_response)
-from frappe.core.utils import get_parent_doc, set_timeline_doc
+from frappe.core.utils import get_parent_doc
 from frappe.utils.bot import BotReply
 from frappe.utils import parse_addr
 from frappe.core.doctype.comment.comment import update_comment_in_doc
@@ -58,7 +58,6 @@ class Communication(Document):
 		self.set_sender_full_name()
 
 		validate_email(self)
-		set_timeline_doc(self)
 
 	def validate_reference(self):
 		if self.reference_doctype and self.reference_name:
@@ -231,26 +230,86 @@ class Communication(Document):
 			if commit:
 				frappe.db.commit()
 
+	# Timeline Links
+	def deduplicate_dynamic_links(self):
+		if self.dynamic_links:
+			links, duplicate = [], False
+
+			for l in self.dynamic_links:
+				t = (l.link_doctype, l.link_name)
+				if not t in links:
+					links.append(t)
+				else:
+					duplicate = True
+
+			if duplicate:
+				del self.dynamic_links[:] # make it python 2 compatible as list.clear() is python 3 only
+				for l in links:
+					self.add_link(link_doctype=l[0], link_name=l[1])
+
+	def validate_circular_links(self):
+		for dynamic_link in self.dynamic_links:
+			# Prevent circular linking of Communication DocTypes
+			if dynamic_link.link_doctype == "Communication":
+				circular_linking = False
+				circular_level_1 = get_timeline_parent_doc(dynamic_link.link_doctype, dynamic_link.link_name)
+
+				# Level 1
+				if circular_level_1:
+					for link in circular_level_1.dynamic_links:
+						if link.link_doctype == "Communication":
+							circular_level_2 = get_timeline_parent_doc(link.link_doctype, link.link_name)
+
+							# Level 2
+							if circular_level_2:
+								for ref_link in circular_level_2.dynamic_links:
+									if ref_link.link_doctype == "Communication":
+										circular_level_3 = get_timeline_parent_doc(ref_link.link_doctype, ref_link.link_name)
+
+										# Level 3
+										if circular_level_3:
+											if circular_level_3.name == self.name:
+												circular_linking = True
+												break
+						if circular_linking:
+							frappe.throw(_("Please make sure the Timeline Communication Docs are not circularly linked."), frappe.CircularLinkingError)
+
+	def add_link(self, link_doctype, link_name, autosave=False):
+		self.append("dynamic_links",
+			{
+				"link_doctype": link_doctype,
+				"link_name": link_name
+			}
+		)
+
+		if autosave:
+			self.save(ignore_permissions=True)
+
+	def get_links(self):
+		return self.dynamic_links
+
+	def remove_link(self, link_doctype, link_name, autosave=False, ignore_permissions=True):
+		for l in self.dynamic_links:
+			if l.link_doctype == link_doctype and l.link_name == link_name:
+				self.dynamic_links.remove(l)
+
+		if autosave:
+			self.save(ignore_permissions=ignore_permissions)
 
 def on_doctype_update():
 	"""Add indexes in `tabCommunication`"""
 	frappe.db.add_index("Communication", ["reference_doctype", "reference_name"])
-	frappe.db.add_index("Communication", ["timeline_doctype", "timeline_name"])
 	frappe.db.add_index("Communication", ["link_doctype", "link_name"])
 	frappe.db.add_index("Communication", ["status", "communication_type"])
 
 def has_permission(doc, ptype, user):
 	if ptype=="read":
-		if (doc.reference_doctype == "Communication" and doc.reference_name == doc.name) \
-			or (doc.timeline_doctype == "Communication" and doc.timeline_name == doc.name):
-				return
+		if doc.reference_doctype == "Communication" and doc.reference_name == doc.name:
+			return
 
 		if doc.reference_doctype and doc.reference_name:
 			if frappe.has_permission(doc.reference_doctype, ptype="read", doc=doc.reference_name):
 				return True
-		if doc.timeline_doctype and doc.timeline_name:
-			if frappe.has_permission(doc.timeline_doctype, ptype="read", doc=doc.timeline_name):
-				return True
 
 def get_permission_query_conditions_for_communication(user):
 	if not user: user = frappe.session.user
@@ -270,3 +329,9 @@ def get_permission_query_conditions_for_communication(user):
 		email_accounts = [ '"%s"'%account.get("email_account") for account in accounts ]
 		return """tabCommunication.email_account in ({email_accounts})"""\
 			.format(email_accounts=','.join(email_accounts))
+
+def get_timeline_parent_doc(link_doctype, link_name):
+	"""Returns document of `link_doctype`, `link_name`"""
+	if link_doctype and link_name:
+		parent_doc = frappe.get_doc(link_doctype, link_name)
+	return parent_doc if parent_doc else None
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index 0c68f8b118..bc66223787 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -17,6 +17,7 @@ import frappe.email.smtp
 import time
 from frappe import _
 from frappe.utils.background_jobs import enqueue
+from email.utils import parseaddr
 
 @frappe.whitelist()
 def make(doctype=None, name=None, content=None, subject=None, sent_or_received = "Sent",
@@ -78,6 +79,15 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		# if no reference given, then send it against the communication
 		comm.db_set(dict(reference_doctype='Communication', reference_name=comm.name))
 
+	# contacts = get_contacts([sender, recipients, cc, bcc])
+	# for contact_name in contacts:
+	# 	comm.add_link('Contact', contact_name)
+
+	# 	#link contact's dynamic links to communication
+	# 	add_contact_links_to_communication(comm, contact_name)
+
+	# comm.save(ignore_permissions=True)
+
 	if isinstance(attachments, string_types):
 		attachments = json.loads(attachments)
 
@@ -559,3 +569,38 @@ def mark_email_as_seen(name=None):
 		frappe.response["filename"] = "imaginary_pixel.png"
 		frappe.response["filecontent"] = buffered_obj.getvalue()
 
+def get_contacts(email_strings):
+	email_addrs = []
+
+	for email_string in email_strings:
+		if email_string:
+			for email in email_string.split(","):
+					parsed_email = parseaddr(email)[1]
+					if parsed_email:
+						email_addrs.append(parsed_email)
+
+	contacts = []
+	for email in email_addrs:
+		contact_name = frappe.db.get_value('Contact', {'email_id': email})
+
+		if not contact_name:
+			contact = frappe.get_doc({
+					"doctype": "Contact",
+					"first_name": frappe.unscrub(email.split("@")[0]),
+					"email_id": email
+				}).insert(ignore_permissions=True)
+			contact_name = contact.name
+
+		contacts.append(contact_name)
+
+	return contacts
+
+def add_contact_links_to_communication(communication, contact_name):
+	contact_links = frappe.get_list("Dynamic Link", filters={
+			"parenttype": "Contact",
+			"parent": contact_name
+		}, fields=["link_doctype", "link_name"])
+
+	if contact_links:
+		for contact_link in contact_links:
+			communication.add_link(contact_link.link_doctype, contact_link.link_name)
\ No newline at end of file
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 14ebbaf7fb..dd6a559dc1 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -161,36 +161,55 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	group_by=None, as_dict=True):
 	'''Returns list of communications for a given document'''
 	if not fields:
-		fields = '''`name`, `communication_type`,`communication_medium`, `comment_type`,
-			`communication_date`, `content`, `sender`, `sender_full_name`, `cc`, `bcc`,
-			`creation`, `subject`, `delivery_status`, `_liked_by`,
-			`timeline_doctype`, `timeline_name`, `reference_doctype`, `reference_name`,
-			`link_doctype`, `link_name`, `read_by_recipient`, `rating`, 'Communication' AS `doctype`'''
+		fields = '''
+			`tabCommunication`.name, `tabCommunication`.communication_type, `tabCommunication`.communication_medium,
+			`tabCommunication`.comment_type, `tabCommunication`.communication_date, `tabCommunication`.content,
+			`tabCommunication`.sender, `tabCommunication`.sender_full_name, `tabCommunication`.cc, `tabCommunication`.bcc,
+			`tabCommunication`.creation, `tabCommunication`.subject, `tabCommunication`.delivery_status,
+			`tabCommunication`._liked_by, `tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
+			`tabCommunication`.link_doctype, `tabCommunication`.link_name, `tabCommunication`.read_by_recipient,
+			`tabCommunication`.rating, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name
+		'''
 
-	conditions = '''communication_type in ('Communication', 'Feedback')
-			and (
-				(reference_doctype=%(doctype)s and reference_name=%(name)s)
+	conditions = '''
+		`tabCommunication`.communication_type in ('Communication', 'Feedback')
+		and	(
+				(`tabCommunication`.reference_doctype=%(doctype)s and `tabCommunication`.reference_name=%(name)s)
 				or (
-					(timeline_doctype=%(doctype)s and timeline_name=%(name)s)
-					and (communication_type='Communication')
+					(`tabDynamic Link`.link_doctype=%(doctype)s and `tabDynamic Link`.link_name=%(name)s)
+					and (`tabCommunication`.communication_type='Communication')
 				)
-			)'''
-
+			)
+	'''
 
 	if after:
 		# find after a particular date
-		conditions+= ' and creation > {0}'.format(after)
+		conditions += '''
+			and `tabCommunication`.creation > {0}
+		'''.format(after)
 
 	if doctype=='User':
-		conditions+= " and not (reference_doctype='User' and communication_type='Communication')"
+		conditions += '''
+			and not (`tabCommunication`.reference_doctype='User' and `tabCommunication`.communication_type='Communication')
+		'''
 
-	communications = frappe.db.sql("""select {fields}
+	communications = frappe.db.sql('''
+		select {fields}
 		from `tabCommunication`
+			left join `tabDynamic Link`
+				on `tabCommunication`.name=`tabDynamic Link`.parent
 		where {conditions} {group_by}
-		order by creation desc LIMIT %(limit)s OFFSET %(start)s""".format(
-			fields = fields, conditions=conditions, group_by=group_by or ""),
-			{ "doctype": doctype, "name": name, "start": frappe.utils.cint(start), "limit": limit },
-			as_dict=as_dict)
+		order by `tabCommunication`.creation desc
+		limit %(limit)s offset %(start)s'''.format(
+			fields = fields,
+			conditions=conditions,
+			group_by=group_by or ""
+		),{
+			"doctype": doctype,
+			"name": name,
+			"start": frappe.utils.cint(start),
+			"limit": limit
+		}, as_dict=as_dict, debug=True)
 
 	return communications
 
@@ -245,4 +264,4 @@ def get_view_logs(doctype, docname):
 
 		if view_logs:
 			logs = view_logs
-	return logs
+	return logs
\ No newline at end of file
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 2d23089f5a..1dd8aa284c 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -20,7 +20,7 @@ from datetime import datetime, timedelta
 from frappe.desk.form import assign_to
 from frappe.utils.user import get_system_managers
 from frappe.utils.background_jobs import enqueue, get_jobs
-from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts
+from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts, get_contacts, add_contact_links_to_communication
 from frappe.utils.scheduler import log
 from frappe.utils.html_utils import clean_email_html
 
@@ -386,6 +386,13 @@ class EmailAccount(Document):
 			users = list(set([ user.get("parent") for user in users ]))
 			communication._seen = json.dumps(users)
 
+		# contacts = get_contacts([sender, recipients, cc, bcc])
+		# for contact_name in contacts:
+		# 	comm.add_link('Contact', contact_name)
+
+		# 	#link contact's dynamic links to communication
+		# 	add_contact_links_to_communication(comm, contact_name)
+
 		communication.flags.in_receive = True
 		communication.insert(ignore_permissions = 1)
 

From 5d09fb26a9085ca436a267cb88c4a8da396bc8bb Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 14 May 2019 12:01:14 +0530
Subject: [PATCH 102/175] fix: timeline docs to dynamic links

---
 .../core/doctype/activity_log/activity_log.py |  2 +-
 .../doctype/communication/communication.py    | 57 ++++++++-----------
 frappe/core/doctype/communication/email.py    | 18 +++---
 .../communication/test_communication.py       | 12 ++--
 frappe/desk/doctype/event/event.py            | 33 ++++++++---
 frappe/desk/form/load.py                      |  7 ++-
 .../doctype/email_account/email_account.py    | 12 ++--
 .../email_account/test_email_account.py       | 27 ++++++---
 frappe/model/delete_doc.py                    | 11 +++-
 9 files changed, 106 insertions(+), 73 deletions(-)

diff --git a/frappe/core/doctype/activity_log/activity_log.py b/frappe/core/doctype/activity_log/activity_log.py
index 7badf737e4..8b7941c086 100644
--- a/frappe/core/doctype/activity_log/activity_log.py
+++ b/frappe/core/doctype/activity_log/activity_log.py
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 from frappe import _
 from frappe.utils import get_fullname, now
 from frappe.model.document import Document
-from frappe.core.utils import get_parent_doc, set_timeline_doc
+from frappe.core.utils import set_timeline_doc
 import frappe
 
 class ActivityLog(Document):
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 5952ae1fc4..f25264ceb3 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -8,7 +8,6 @@ from frappe.model.document import Document
 from frappe.utils import validate_email_address, get_fullname, strip_html, cstr
 from frappe.core.doctype.communication.email import (validate_email,
 	notify, _notify, update_parent_mins_to_first_response)
-from frappe.core.utils import get_parent_doc
 from frappe.utils.bot import BotReply
 from frappe.utils import parse_addr
 from frappe.core.doctype.comment.comment import update_comment_in_doc
@@ -57,6 +56,8 @@ class Communication(Document):
 		self.set_status()
 		self.set_sender_full_name()
 
+		self.validate_dynamic_links()
+		self.deduplicate_dynamic_links()
 		validate_email(self)
 
 	def validate_reference(self):
@@ -72,12 +73,14 @@ class Communication(Document):
 			# Prevent circular linking of Communication DocTypes
 			if self.reference_doctype == "Communication":
 				circular_linking = False
-				doc = get_parent_doc(self)
-				while doc.reference_doctype == "Communication":
-					if get_parent_doc(doc).name==self.name:
-						circular_linking = True
-						break
-					doc = get_parent_doc(doc)
+				doc = get_parent_doc(self.reference_doctype, self.reference_name)
+				if doc:
+					while doc.reference_doctype == "Communication":
+						if doc:
+							if doc.reference_name == self.name:
+								circular_linking = True
+								break
+						doc = get_parent_doc(doc.reference_doctype, doc.reference_name)
 				if circular_linking:
 					frappe.throw(_("Please make sure the Reference Communication Docs are not circularly linked."), frappe.CircularLinkingError)
 
@@ -247,32 +250,22 @@ class Communication(Document):
 				for l in links:
 					self.add_link(link_doctype=l[0], link_name=l[1])
 
-	def validate_circular_links(self):
+	def validate_dynamic_links(self):
+		circular_linking = False
 		for dynamic_link in self.dynamic_links:
-			# Prevent circular linking of Communication DocTypes
+
+			# Prevent circular linking of Timeline DocTypes
 			if dynamic_link.link_doctype == "Communication":
-				circular_linking = False
-				circular_level_1 = get_timeline_parent_doc(dynamic_link.link_doctype, dynamic_link.link_name)
+				doc = get_parent_doc(dynamic_link.link_doctype, dynamic_link.link_name)
+				if doc:
+					while doc.reference_doctype == "Communication":
+						if doc:
+							if doc.reference_name == self.name:
+								circular_linking = True
+								break
 
-				# Level 1
-				if circular_level_1:
-					for link in circular_level_1.dynamic_links:
-						if link.link_doctype == "Communication":
-							circular_level_2 = get_timeline_parent_doc(link.link_doctype, link.link_name)
-
-							# Level 2
-							if circular_level_2:
-								for ref_link in circular_level_2.dynamic_links:
-									if ref_link.link_doctype == "Communication":
-										circular_level_3 = get_timeline_parent_doc(ref_link.link_doctype, ref_link.link_name)
-
-										# Level 3
-										if circular_level_3:
-											if circular_level_3.name == self.name:
-												circular_linking = True
-												break
-						if circular_linking:
-							frappe.throw(_("Please make sure the Timeline Communication Docs are not circularly linked."), frappe.CircularLinkingError)
+		if circular_linking:
+			frappe.throw(_("Please make sure the Timeline Communication Docs are not circularly linked."), frappe.CircularLinkingError)
 
 	def add_link(self, link_doctype, link_name, autosave=False):
 		self.append("dynamic_links",
@@ -330,8 +323,8 @@ def get_permission_query_conditions_for_communication(user):
 		return """tabCommunication.email_account in ({email_accounts})"""\
 			.format(email_accounts=','.join(email_accounts))
 
-def get_timeline_parent_doc(link_doctype, link_name):
+def get_parent_doc(link_doctype, link_name):
 	"""Returns document of `link_doctype`, `link_name`"""
 	if link_doctype and link_name:
 		parent_doc = frappe.get_doc(link_doctype, link_name)
-	return parent_doc if parent_doc else None
+	return parent_doc if parent_doc else None
\ No newline at end of file
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index bc66223787..e554e5f7cf 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -72,21 +72,21 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		"message_id":get_message_id().strip(" <>"),
 		"read_receipt":read_receipt,
 		"has_attachment": 1 if attachments else 0
-	})
-	comm.insert(ignore_permissions=True)
+	}).insert(ignore_permissions=True)
 
 	if not doctype:
 		# if no reference given, then send it against the communication
-		comm.db_set(dict(reference_doctype='Communication', reference_name=comm.name))
+		comm.reference_doctype = 'Communication'
+		comm.reference_name = comm.name
 
-	# contacts = get_contacts([sender, recipients, cc, bcc])
-	# for contact_name in contacts:
-	# 	comm.add_link('Contact', contact_name)
+	contacts = get_contacts([sender, recipients, cc, bcc])
+	for contact_name in contacts:
+		comm.add_link('Contact', contact_name)
 
-	# 	#link contact's dynamic links to communication
-	# 	add_contact_links_to_communication(comm, contact_name)
+		#link contact's dynamic links to communication
+		add_contact_links_to_communication(comm, contact_name)
 
-	# comm.save(ignore_permissions=True)
+	comm.save(ignore_permissions=True)
 
 	if isinstance(attachments, string_types):
 		attachments = json.loads(attachments)
diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 1941ff31cc..53b0981af7 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -44,28 +44,30 @@ class TestCommunication(unittest.TestCase):
 			self.assertFalse(frappe.utils.parse_addr(x)[0])
 
 	def test_circular_linking(self):
-		content = "This was created to test circular linking"
 		a = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
-			"content": content,
+			"content": "This was created to test circular linking: Communication A",
 		}).insert()
+
 		b = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
-			"content": content,
+			"content": "This was created to test circular linking: Communication B",
 			"reference_doctype": "Communication",
 			"reference_name": a.name
 		}).insert()
+
 		c = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
-			"content": content,
+			"content": "This was created to test circular linking: Communication C",
 			"reference_doctype": "Communication",
 			"reference_name": b.name
 		}).insert()
+
 		a = frappe.get_doc("Communication", a.name)
 		a.reference_doctype = "Communication"
 		a.reference_name = c.name
-		self.assertRaises(frappe.CircularLinkingError, a.save)
 
+		self.assertRaises(frappe.CircularLinkingError, a.save)
diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py
index 04f7455e2d..db601b418c 100644
--- a/frappe/desk/doctype/event/event.py
+++ b/frappe/desk/doctype/event/event.py
@@ -43,10 +43,17 @@ class Event(Document):
 	def sync_communication(self):
 		if self.event_participants:
 			for participant in self.event_participants:
-				communication_name = frappe.db.get_value("Communication", dict(reference_doctype=self.doctype, reference_name=self.name, timeline_doctype=participant.reference_doctype, timeline_name=participant.reference_docname), "name")
-				if communication_name:
-					communication = frappe.get_doc("Communication", communication_name)
-					self.update_communication(participant, communication)
+				comms = frappe.get_list("Communication", filters=[
+					["Communication", "reference_doctype", "=", self.doctype],
+					["Communication", "reference_name", "=", self.name],
+					["Dynamic Link", "link_doctype", "=", participant.reference_doctype]
+					["Dynamic Link", "link_name", "=", participant.reference_docname]
+				], fields=["name"])
+
+				if comms:
+					for comm in comms:
+						communication = frappe.get_doc("Communication", comms.name)
+						self.update_communication(participant, communication)
 				else:
 					meta = frappe.get_meta(participant.reference_doctype)
 					if hasattr(meta, "allow_events_in_timeline") and meta.allow_events_in_timeline==1:
@@ -62,12 +69,11 @@ class Event(Document):
 		communication.subject = self.subject
 		communication.content = self.description if self.description else self.subject
 		communication.communication_date = self.starts_on
-		communication.timeline_doctype = participant.reference_doctype
-		communication.timeline_name = participant.reference_docname
 		communication.reference_doctype = self.doctype
 		communication.reference_name = self.name
 		communication.communication_medium = communication_mapping[self.event_category] if self.event_category else ""
 		communication.status = "Linked"
+		communication.add_link(participant.reference_doctype, participant.reference_docname)
 		communication.save(ignore_permissions=True)
 
 @frappe.whitelist()
@@ -76,9 +82,18 @@ def delete_communication(event, reference_doctype, reference_docname):
 	if isinstance(event, string_types):
 		event = json.loads(event)
 
-	communication_name = frappe.db.get_value("Communication", dict(reference_doctype=event["doctype"], reference_name=event["name"], timeline_doctype=deleted_participant.reference_doctype, timeline_name=deleted_participant.reference_docname), "name")
-	if communication_name:
-		deletion = frappe.get_doc("Communication", communication_name).delete()
+	comms = frappe.get_list("Communication", filters=[
+		["Communication", "reference_doctype", "=", event.get("doctype")],
+		["Communication", "reference_name", "=", event.get("name")],
+		["Dynamic Link", "link_doctype", "=", deleted_participant.reference_doctype],
+		["Dynamic Link", "link_name", "=", deleted_participant.reference_docname]
+	], fields=["name"])
+
+	if comms:
+		deletion = []
+		for comm in comms:
+			delete = frappe.get_doc("Communication", comm.name).delete()
+			deletion.append(delete)
 
 		return deletion
 
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index dd6a559dc1..0d986e5bc0 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -182,6 +182,11 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			)
 	'''
 
+	if not group_by:
+		group_by = '''
+			group by `tabCommunication`.name
+		'''
+
 	if after:
 		# find after a particular date
 		conditions += '''
@@ -210,7 +215,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			"start": frappe.utils.cint(start),
 			"limit": limit
 		}, as_dict=as_dict, debug=True)
-
+	print(communications)
 	return communications
 
 def get_assignments(dt, dn):
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 1dd8aa284c..fa8b409b1f 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -386,15 +386,15 @@ class EmailAccount(Document):
 			users = list(set([ user.get("parent") for user in users ]))
 			communication._seen = json.dumps(users)
 
-		# contacts = get_contacts([sender, recipients, cc, bcc])
-		# for contact_name in contacts:
-		# 	comm.add_link('Contact', contact_name)
+		contacts = get_contacts([email.from_email, email.mail.get("To"), email.mail.get("CC"), email.from_email])
+		for contact_name in contacts:
+			communication.add_link('Contact', contact_name)
 
-		# 	#link contact's dynamic links to communication
-		# 	add_contact_links_to_communication(comm, contact_name)
+			#link contact's dynamic links to communication
+			add_contact_links_to_communication(communication, contact_name)
 
 		communication.flags.in_receive = True
-		communication.insert(ignore_permissions = 1)
+		communication.insert(ignore_permissions=True)
 
 		# save attachments
 		communication._attachments = email.save_attachments_in_doc(communication)
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index f098a8b205..ac16f12477 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -26,7 +26,7 @@ class TestEmailAccount(unittest.TestCase):
 		email_account.db_set("enable_incoming", 0)
 
 	def test_incoming(self):
-		frappe.db.sql("delete from tabCommunication where sender='test_sender@example.com'")
+		cleanup("test_sender@example.com")
 
 		with open(os.path.join(os.path.dirname(__file__), "test_mails", "incoming-1.raw"), "r") as f:
 			test_mails = [f.read()]
@@ -52,7 +52,8 @@ class TestEmailAccount(unittest.TestCase):
 			"reference_name": comm.reference_name, "status":"Not Sent"}))
 
 	def test_incoming_with_attach(self):
-		frappe.db.sql("DELETE FROM `tabCommunication` WHERE sender='test_sender@example.com'")
+		cleanup("test_sender@example.com")
+
 		existing_file = frappe.get_doc({'doctype': 'File', 'file_name': 'erpnext-conf-14.png'})
 		frappe.delete_doc("File", existing_file.name)
 
@@ -75,7 +76,7 @@ class TestEmailAccount(unittest.TestCase):
 
 
 	def test_incoming_attached_email_from_outlook_plain_text_only(self):
-		frappe.db.sql("delete from tabCommunication where sender='test_sender@example.com'")
+		cleanup("test_sender@example.com")
 
 		with open(os.path.join(os.path.dirname(__file__), "test_mails", "incoming-3.raw"), "r") as f:
 			test_mails = [f.read()]
@@ -88,7 +89,7 @@ class TestEmailAccount(unittest.TestCase):
 		self.assertTrue("This is an e-mail message sent automatically by Microsoft Outlook while" in comm.content)
 
 	def test_incoming_attached_email_from_outlook_layers(self):
-		frappe.db.sql("delete from tabCommunication where sender='test_sender@example.com'")
+		cleanup("test_sender@example.com")
 
 		with open(os.path.join(os.path.dirname(__file__), "test_mails", "incoming-4.raw"), "r") as f:
 			test_mails = [f.read()]
@@ -123,8 +124,7 @@ class TestEmailAccount(unittest.TestCase):
 		self.assertTrue("test-mail-002" in sent_mail.get("Subject"))
 
 	def test_threading(self):
-		frappe.db.sql("""delete from tabCommunication
-			where sender in ('test_sender@example.com', 'test@example.com')""")
+		cleanup(["in", ['test_sender@example.com', 'test@example.com']])
 
 		# send
 		sent_name = make(subject = "Test", content="test content",
@@ -149,8 +149,7 @@ class TestEmailAccount(unittest.TestCase):
 		self.assertEqual(comm.reference_name, sent.reference_name)
 
 	def test_threading_by_subject(self):
-		frappe.db.sql("""delete from tabCommunication
-			where sender in ('test_sender@example.com', 'test@example.com')""")
+		cleanup(["in", ['test_sender@example.com', 'test@example.com']])
 
 		with open(os.path.join(os.path.dirname(__file__), "test_mails", "reply-2.raw"), "r") as f:
 			test_mails = [f.read()]
@@ -170,7 +169,7 @@ class TestEmailAccount(unittest.TestCase):
 		self.assertEqual(comm_list[0].reference_name, comm_list[1].reference_name)
 
 	def test_threading_by_message_id(self):
-		frappe.db.sql("""delete from tabCommunication""")
+		cleanup()
 		frappe.db.sql("""delete from `tabEmail Queue`""")
 
 		# reference document for testing
@@ -196,3 +195,13 @@ class TestEmailAccount(unittest.TestCase):
 		# check if threaded correctly
 		self.assertEqual(comm_list[0].reference_doctype, event.doctype)
 		self.assertEqual(comm_list[0].reference_name, event.name)
+
+def cleanup(sender=None):
+	filters = {}
+	if sender:
+		filters.update({"sender": sender})
+
+	names = frappe.get_list("Communication", filters=filters, fields=["name"])
+	for name in names:
+		frappe.delete_doc_if_exists("Communication", name.name)
+		frappe.delete_doc_if_exists("Dynamic Link", {"parent": name.name})
\ No newline at end of file
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index ab15dab74e..85d7a3c72b 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -279,7 +279,7 @@ def delete_dynamic_links(doctype, name):
 	# unlink communications
 	clear_references('Communication', doctype, name)
 	clear_references('Communication', doctype, name, 'link_doctype', 'link_name')
-	clear_references('Communication', doctype, name, 'timeline_doctype', 'timeline_name')
+	clear_timeline_references(doctype, name)
 
 	clear_references('Activity Log', doctype, name)
 	clear_references('Activity Log', doctype, name, 'timeline_doctype', 'timeline_name')
@@ -300,6 +300,15 @@ def clear_references(doctype, reference_doctype, reference_name,
 			{1}=%s and {2}=%s'''.format(doctype, reference_doctype_field, reference_name_field), # nosec
 		(reference_doctype, reference_name))
 
+def clear_timeline_references(link_doctype, link_name):
+	comms = frappe.get_list("Communication", filters=[
+		["Dynamic Link", "link_doctype", "=", link_doctype],
+		["Dynamic Link", "link_name", "=", link_name]
+	], fields=["name"])
+
+	for comm in comms:
+		doc = frappe.get_doc("Communication", comm.name)
+		doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True)
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From ee27bd80c8c452460d12bd5aebd58bf37ce091b7 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 14 May 2019 12:58:16 +0530
Subject: [PATCH 103/175] fix: typo

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

diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py
index db601b418c..d99cc64436 100644
--- a/frappe/desk/doctype/event/event.py
+++ b/frappe/desk/doctype/event/event.py
@@ -46,13 +46,13 @@ class Event(Document):
 				comms = frappe.get_list("Communication", filters=[
 					["Communication", "reference_doctype", "=", self.doctype],
 					["Communication", "reference_name", "=", self.name],
-					["Dynamic Link", "link_doctype", "=", participant.reference_doctype]
+					["Dynamic Link", "link_doctype", "=", participant.reference_doctype],
 					["Dynamic Link", "link_name", "=", participant.reference_docname]
 				], fields=["name"])
 
 				if comms:
 					for comm in comms:
-						communication = frappe.get_doc("Communication", comms.name)
+						communication = frappe.get_doc("Communication", comm.name)
 						self.update_communication(participant, communication)
 				else:
 					meta = frappe.get_meta(participant.reference_doctype)

From 218c6881cb97848244425eec361d42f0445c6e05 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 14 May 2019 13:04:05 +0530
Subject: [PATCH 104/175] fix: add read access permission to owner

---
 .../personal_data_download_request.json       | 129 ++----------------
 1 file changed, 15 insertions(+), 114 deletions(-)

diff --git a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.json b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.json
index b73cdfb347..6a51a79b8c 100644
--- a/frappe/website/doctype/personal_data_download_request/personal_data_download_request.json
+++ b/frappe/website/doctype/personal_data_download_request/personal_data_download_request.json
@@ -1,164 +1,65 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
  "creation": "2019-01-24 16:34:24.093128",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "user",
+  "user_name",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "depends_on": "",
-   "fetch_from": "",
    "fieldname": "user",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "User",
-   "length": 0,
-   "no_copy": 0,
    "options": "User",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fetch_from": "user.full_name",
    "fieldname": "user_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "User Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "amended_from",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Amended From",
-   "length": 0,
    "no_copy": 1,
    "options": "Personal Data Download Request",
-   "permlevel": 0,
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-02-01 15:21:06.247620",
+ "modified": "2019-05-14 13:02:58.175687",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Personal Data Download Request",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
+  },
+  {
+   "if_owner": 1,
+   "read": 1,
+   "role": "All"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
  "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file

From b71a6363e597ddb8eb37de525766859fa0c4e294 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 14 May 2019 13:17:34 +0530
Subject: [PATCH 105/175] fix: Change frappe.call to POST

---
 frappe/www/update-password.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 9689a1d3b9..6a69df9af7 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -118,7 +118,6 @@ frappe.ready(function() {
 		}
 
 		return frappe.call({
-			type: 'GET',
 			method: 'frappe.core.doctype.user.user.test_password_strength',
 			args: args,
 			callback: function(r) {

From 01a489de7e3b1cd0ab82ef32eb85ce2b1025375f Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Tue, 14 May 2019 14:51:05 +0530
Subject: [PATCH 106/175] fix: Additon of dynamic links in dashboard

---
 frappe/public/js/frappe/form/dashboard.js | 6 ++++++
 frappe/public/js/frappe/list/base_list.js | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index a29de9108a..20e90ac438 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -307,6 +307,12 @@ frappe.ui.form.Dashboard = Class.extend({
 		var fieldname = this.data.non_standard_fieldnames
 			? (this.data.non_standard_fieldnames[doctype] || this.data.fieldname)
 			: this.data.fieldname;
+
+		if (this.data.dynamic_links && this.data.dynamic_links[fieldname]) {
+			let dynamic_fieldname = this.data.dynamic_links[fieldname][1];
+			filter[dynamic_fieldname] = this.data.dynamic_links[fieldname][0];
+		}
+
 		filter[fieldname] = this.frm.doc.name;
 		return filter;
 	},
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index e96278b884..0666926685 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -623,7 +623,8 @@ class FilterArea {
 				options: options,
 				fieldname: df.fieldname,
 				condition: condition,
-				onchange: () => this.refresh_list_view()
+				onchange: () => this.refresh_list_view(),
+				ignore_link_validation: fieldtype === 'Dynamic Link'
 			};
 		}));
 

From 250ccaf9ba55c454385dfeca01cea656c4aa5f89 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <mishranaman123@gmail.com>
Date: Tue, 14 May 2019 15:27:44 +0530
Subject: [PATCH 107/175] fix: mail was also sending after setting of hte
 document follow uncheck

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

diff --git a/frappe/desk/form/document_follow.py b/frappe/desk/form/document_follow.py
index de04ef35af..c0a12bac5d 100644
--- a/frappe/desk/form/document_follow.py
+++ b/frappe/desk/form/document_follow.py
@@ -107,7 +107,7 @@ def send_document_follow_mails(frequency):
 						"reference_url": get_url_to_form(d.ref_doctype, d.ref_docname)
 					})
 
-			if message:
+			if message and frappe.db.get_value("User", user, "document_follow_notify", ignore=True):
 				send_email_alert(user, valid_document_follows, message)
 
 

From ad0086c7ea56040d0ef61ef0c8a3a28a71a099bc Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 14 May 2019 16:07:53 +0530
Subject: [PATCH 108/175] feat: Add Track Views field to Customize Form (#7465)

---
 .../customize_form/customize_form.json        | 818 ++++--------------
 .../doctype/customize_form/customize_form.py  |   1 +
 2 files changed, 154 insertions(+), 665 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index 462f1be56c..5f288fe99c 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -1,694 +1,182 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "DL.####", 
- "beta": 0, 
- "creation": "2013-01-29 17:55:08", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
+ "autoname": "DL.####",
+ "creation": "2013-01-29 17:55:08",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "field_order": [
+  "doc_type",
+  "properties",
+  "label",
+  "default_print_format",
+  "max_attachments",
+  "allow_copy",
+  "istable",
+  "editable_grid",
+  "quick_entry",
+  "track_changes",
+  "track_views",
+  "image_view",
+  "column_break_5",
+  "title_field",
+  "image_field",
+  "search_fields",
+  "section_break_8",
+  "sort_field",
+  "column_break_10",
+  "sort_order",
+  "fields_section_break",
+  "fields"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "doc_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Enter Form Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "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": "doc_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Enter Form Type",
+   "options": "DocType"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "doc_type", 
-   "fieldname": "properties", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "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
-  }, 
+   "depends_on": "doc_type",
+   "fieldname": "properties",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "label", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Change Label (via Custom Translation)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "label",
+   "fieldtype": "Data",
+   "label": "Change Label (via Custom Translation)"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "default_print_format", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Default Print Format", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Print Format", 
-   "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": "default_print_format",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Default Print Format",
+   "options": "Print Format"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "max_attachments", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Attachments", 
-   "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": "max_attachments",
+   "fieldtype": "Int",
+   "label": "Max Attachments"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allow_copy", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Hide Copy", 
-   "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": "allow_copy",
+   "fieldtype": "Check",
+   "label": "Hide Copy"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "istable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Table", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "istable",
+   "fieldtype": "Check",
+   "label": "Is Table",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "istable", 
-   "fieldname": "editable_grid", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Editable Grid", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "depends_on": "istable",
+   "fieldname": "editable_grid",
+   "fieldtype": "Check",
+   "label": "Editable Grid"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "quick_entry", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Quick Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "default": "1",
+   "fieldname": "quick_entry",
+   "fieldtype": "Check",
+   "label": "Quick Entry"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "track_changes", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Track Changes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "track_changes",
+   "fieldtype": "Check",
+   "label": "Track Changes"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.image_field", 
-   "fieldname": "image_view", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image View", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "depends_on": "eval: doc.image_field",
+   "fieldname": "image_view",
+   "fieldtype": "Check",
+   "label": "Image View"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Use this fieldname to generate title", 
-   "fieldname": "title_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "description": "Use this fieldname to generate title",
+   "fieldname": "title_field",
+   "fieldtype": "Data",
+   "label": "Title Field"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Must be of type \"Attach Image\"", 
-   "fieldname": "image_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "description": "Must be of type \"Attach Image\"",
+   "fieldname": "image_field",
+   "fieldtype": "Data",
+   "label": "Image Field"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Fields separated by comma (,) will be included in the \"Search By\" list of Search dialog box", 
-   "fieldname": "search_fields", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Search Fields", 
-   "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
-  }, 
+   "description": "Fields separated by comma (,) will be included in the \"Search By\" list of Search dialog box",
+   "fieldname": "search_fields",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Search Fields"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "doc_type", 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
+   "depends_on": "doc_type",
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sort_field", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sort Field", 
-   "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": "sort_field",
+   "fieldtype": "Select",
+   "label": "Sort Field"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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": "column_break_10",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sort_order", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sort Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "ASC\nDESC", 
-   "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": "sort_order",
+   "fieldtype": "Select",
+   "label": "Sort Order",
+   "options": "ASC\nDESC"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "doc_type", 
-   "description": "Customize Label, Print Hide, Default etc.", 
-   "fieldname": "fields_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fields", 
-   "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
-  }, 
+   "depends_on": "doc_type",
+   "description": "Customize Label, Print Hide, Default etc.",
+   "fieldname": "fields_section_break",
+   "fieldtype": "Section Break",
+   "label": "Fields"
+  },
   {
-   "allow_bulk_edit": 1, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fields", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fields", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customize Form Field", 
-   "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
+   "allow_bulk_edit": 1,
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "label": "Fields",
+   "options": "Customize Form Field"
+  },
+  {
+   "fieldname": "track_views",
+   "fieldtype": "Check",
+   "label": "Track Views"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 1, 
- "icon": "fa fa-glass", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-04-21 16:59:12.752428", 
- "modified_by": "Administrator", 
- "module": "Custom", 
- "name": "Customize Form", 
- "owner": "Administrator", 
+ ],
+ "hide_toolbar": 1,
+ "icon": "fa fa-glass",
+ "idx": 1,
+ "issingle": 1,
+ "modified": "2019-05-13 18:54:40.610862",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Customize Form",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "doc_type", 
- "show_name_in_global_search": 0, 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "search_fields": "doc_type",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index d1e2153603..800ce0d462 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -28,6 +28,7 @@ doctype_properties = {
 	'editable_grid': 'Check',
 	'max_attachments': 'Int',
 	'track_changes': 'Check',
+	'track_views': 'Check',
 }
 
 docfield_properties = {

From 41fa47af62da0c6da4a827a7713fd783428849f7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 May 2019 16:08:01 +0530
Subject: [PATCH 109/175] style: moved set_link_title to address_and_contact

---
 frappe/contacts/address_and_contact.py     |  8 ++++++++
 frappe/contacts/doctype/address/address.py | 11 ++---------
 frappe/contacts/doctype/contact/contact.py | 11 ++---------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 38d292e9b4..6523b0b1e5 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -152,3 +152,11 @@ def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, fil
 	valid_doctypes = [[doctype] for doctype in valid_doctypes]
 
 	return valid_doctypes
+
+def set_link_title(doc):
+	if not doc.links:
+		return
+	for link in doc.links:
+		if not link.link_title:
+			linked_doc = frappe.get_doc(link.link_doctype, link.link_name)
+			link.link_title = linked_doc.get("title_field") or linked_doc.get("name")
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 583643ad27..57ed4e937f 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -15,6 +15,7 @@ from frappe.model.naming import make_autoname
 from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
 from six import iteritems, string_types
 from past.builtins import cmp
+from frappe.contacts.address_and_contact import set_link_title
 
 import functools
 
@@ -39,7 +40,7 @@ class Address(Document):
 	def validate(self):
 		self.link_address()
 		self.validate_reference()
-		self.set_link_title()
+		set_link_title(self)
 		deduplicate_dynamic_links(self)
 
 	def link_address(self):
@@ -54,14 +55,6 @@ class Address(Document):
 
 		return False
 
-	def set_link_title(self):
-		if not self.links:
-			return
-		for address in self.links:
-			if not address.link_title:
-				linked_doc = frappe.get_doc(address.link_doctype, address.link_name)
-				address.link_title = linked_doc.get("title_field") or linked_doc.get("name")
-
 	def validate_reference(self):
 		if self.is_your_company_address:
 			if not [row for row in self.links if row.link_doctype == "Company"]:
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 28f150f0d4..0e0d9aeabc 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -10,6 +10,7 @@ from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_li
 from six import iteritems
 from past.builtins import cmp
 from frappe.model.naming import append_number_if_name_exists
+from frappe.contacts.address_and_contact import set_link_title
 
 import functools
 
@@ -31,7 +32,7 @@ class Contact(Document):
 		if self.email_id:
 			self.email_id = self.email_id.strip()
 		self.set_user()
-		self.set_link_title()
+		set_link_title(self)
 		if self.email_id and not self.image:
 			self.image = has_gravatar(self.email_id)
 
@@ -41,14 +42,6 @@ class Contact(Document):
 		if not self.user and self.email_id:
 			self.user = frappe.db.get_value("User", {"email": self.email_id})
 
-	def set_link_title(self):
-		if not self.links:
-			return
-		for contact in self.links:
-			if not contact.link_title:
-				linked_doc = frappe.get_doc(contact.link_doctype, contact.link_name)
-				contact.link_title = linked_doc.get("title_field") or linked_doc.get("name")
-
 	def get_link_for(self, link_doctype):
 		'''Return the link name, if exists for the given link DocType'''
 		for link in self.links:

From 90f62016f8f5360fbf3420cff3097aaa7b2894c2 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 14 May 2019 16:19:45 +0530
Subject: [PATCH 110/175] fix: Clear DuplicateEntry message in setup

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

diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
index cf8f5f502b..a18d4df9c4 100755
--- a/frappe/desk/page/setup_wizard/setup_wizard.py
+++ b/frappe/desk/page/setup_wizard/setup_wizard.py
@@ -389,7 +389,7 @@ def make_records(records, debug=False):
 			# pass DuplicateEntryError and continue
 			if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name:
 				# make sure DuplicateEntryError is for the exact same doc and not a related doc
-				pass
+				frappe.clear_messages()
 			else:
 				raise
 

From f2068db6dd8230abd2842f1c1c616431567ea021 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 14 May 2019 16:20:06 +0530
Subject: [PATCH 111/175] fix: Limit one notification request at a time

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

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index eee20b64e7..27b483b7aa 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -269,7 +269,10 @@ frappe.Application = Class.extend({
 	refresh_notifications: function() {
 		var me = this;
 		if(frappe.session_alive && frappe.boot && frappe.boot.home_page !== 'setup-wizard') {
-			return frappe.call({
+			if (this._refresh_notifications) {
+				this._refresh_notifications.abort();
+			}
+			this._refresh_notifications = frappe.call({
 				type: 'GET',
 				method: "frappe.desk.notifications.get_notifications",
 				callback: function(r) {

From 8828fcef24d8cb5608bc22802c2f5a54ec474e66 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 14 May 2019 17:22:24 +0530
Subject: [PATCH 112/175] fix: use inner join instead of left join

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

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 9c05e5c05a..b6277a5c31 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -167,7 +167,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			`tabCommunication`.creation, `tabCommunication`.subject, `tabCommunication`.delivery_status,
 			`tabCommunication`._liked_by, `tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
 			`tabCommunication`.link_doctype, `tabCommunication`.link_name, `tabCommunication`.read_by_recipient,
-			`tabCommunication`.rating, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name
+			`tabCommunication`.rating, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name, `tabDynamic Link`.parent
 		'''
 
 	conditions = '''
@@ -183,7 +183,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 
 	if not group_by:
 		group_by = '''
-			group by `tabCommunication`.name
+			group by `tabCommunication`.name, `tabDynamic Link`.parent
 		'''
 
 	if after:
@@ -200,7 +200,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	communications = frappe.db.sql('''
 		select {fields}
 		from `tabCommunication`
-			left join `tabDynamic Link`
+			inner join `tabDynamic Link`
 				on `tabCommunication`.name=`tabDynamic Link`.parent
 		where {conditions} {group_by}
 		order by `tabCommunication`.creation desc

From d230bf4cea1cc5af7c7e60839b5aa9844b1be7b8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Tue, 14 May 2019 17:39:55 +0530
Subject: [PATCH 113/175] patch: migarte timeline links to dynamic links

---
 .../doctype/dynamic_link/dynamic_link.json    | 163 +++++-------------
 frappe/patches.txt                            |   3 +
 .../move_timeline_links_to_dynamic_links.py   |  25 +++
 3 files changed, 73 insertions(+), 118 deletions(-)
 create mode 100644 frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py

diff --git a/frappe/core/doctype/dynamic_link/dynamic_link.json b/frappe/core/doctype/dynamic_link/dynamic_link.json
index 3689be6a3d..a8b871855c 100644
--- a/frappe/core/doctype/dynamic_link/dynamic_link.json
+++ b/frappe/core/doctype/dynamic_link/dynamic_link.json
@@ -1,125 +1,52 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-01-13 04:55:18.835023", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "creation": "2017-01-13 04:55:18.835023",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "link_doctype",
+  "link_title",
+  "cb_00",
+  "link_name"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "link_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Link DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "link_doctype",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Link DocType",
+   "options": "DocType",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "link_name", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Link Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "link_doctype", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "link_name",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Link Name",
+   "options": "link_doctype",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "link_title", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Link Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "link_title",
+   "fieldtype": "Read Only",
+   "in_list_view": 1,
+   "label": "Link Title",
+   "read_only": 1
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-01-17 14:25:49.140730", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Dynamic Link", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "modified": "2019-05-14 17:36:38.391805",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Dynamic Link",
+ "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/patches.txt b/frappe/patches.txt
index c0b2a8238f..15f9ad8c73 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -241,3 +241,6 @@ frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
 frappe.patches.v12_0.remove_feedback_rating
+execute:frappe.reload_doc('core', 'doctype', 'communication')
+execute:frappe.reload_doc('core', 'doctype', 'dynamic_link')
+frappe.patches.v12_0.move_timeline_links_to_dynamic_links
\ No newline at end of file
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
new file mode 100644
index 0000000000..0bb266269e
--- /dev/null
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -0,0 +1,25 @@
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+	comm_lists = []
+	for communication in frappe.get_list("Communication", filters={"communication_medium": "Email"},
+			fields=[
+				"name", "creation", "modified", "modified_by",
+				"timeline_doctype", "timeline_name",
+			]):
+		if communication.timeline_doctype and communication.timeline_name:
+			comm_lists.append((
+				"1", frappe.generate_hash(length=10), "dynamic_links", "Communication",
+				communication.name, communication.timeline_doctype, communication.timeline_name,
+				communication.creation, communication.modified, communication.modified_by
+			))
+
+	for comm_list in comm_lists:
+		frappe.db.sql("""
+			insert into table `tabDynamic Link` (idx, name, parentfield, parenttype, parent, link_doctype, link_name, creation, modified, modified_by)
+			values %(values)s""",
+		{
+			"values": comm_list
+		})
\ No newline at end of file

From 6f5ad343c95c5e4da8c918536551bb2215d1c6f6 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Tue, 14 May 2019 18:40:34 +0530
Subject: [PATCH 114/175] fix: filters for sending hourly updates in document
 follow (#7481)

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

diff --git a/frappe/desk/form/document_follow.py b/frappe/desk/form/document_follow.py
index 20cd1ec9b6..333e9e1333 100644
--- a/frappe/desk/form/document_follow.py
+++ b/frappe/desk/form/document_follow.py
@@ -275,7 +275,7 @@ def get_filters(search_by, name, frequency, user):
 	elif frequency == "Hourly":
 		filters = [
 			[search_by, "=", name],
-			["modified", ">", frappe.utils.add_to_date(frappe.utils.now_datetime(), 0, 0, 0, -1)],
+			["modified", ">", frappe.utils.add_to_date(frappe.utils.now_datetime(), hours=-1)],
 			["modified", "<", frappe.utils.now_datetime()],
 			["modified_by", "!=", user]
 		]

From a831abefdab2e530787ae70f3d974bba183f04ff Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 14 May 2019 18:56:24 +0530
Subject: [PATCH 115/175] fix(patch): reload dynamic link doctype

---
 frappe/patches/v11_0/create_contact_for_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches/v11_0/create_contact_for_user.py b/frappe/patches/v11_0/create_contact_for_user.py
index d5e9c87e8b..c91caf9189 100644
--- a/frappe/patches/v11_0/create_contact_for_user.py
+++ b/frappe/patches/v11_0/create_contact_for_user.py
@@ -6,6 +6,7 @@ import re
 def execute():
 	""" Create Contact for each User if not present """
 	frappe.reload_doc('contacts', 'doctype', 'contact')
+	frappe.reload_doc('core', 'doctype', 'dynamic_link')
 
 	users = frappe.get_all('User', filters={"name": ('not in', 'Administrator, Guest')}, fields=["*"])
 	for user in users:

From e29f07898b2436db96e5325e447b3101ad7b022e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 May 2019 11:29:22 +0530
Subject: [PATCH 116/175] fix: query

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

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index b6277a5c31..6d834b3b12 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -167,7 +167,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			`tabCommunication`.creation, `tabCommunication`.subject, `tabCommunication`.delivery_status,
 			`tabCommunication`._liked_by, `tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
 			`tabCommunication`.link_doctype, `tabCommunication`.link_name, `tabCommunication`.read_by_recipient,
-			`tabCommunication`.rating, `tabDynamic Link`.link_doctype, `tabDynamic Link`.link_name, `tabDynamic Link`.parent
+			`tabCommunication`.rating
 		'''
 
 	conditions = '''
@@ -181,11 +181,6 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			)
 	'''
 
-	if not group_by:
-		group_by = '''
-			group by `tabCommunication`.name, `tabDynamic Link`.parent
-		'''
-
 	if after:
 		# find after a particular date
 		conditions += '''
@@ -198,17 +193,13 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 		'''
 
 	communications = frappe.db.sql('''
-		select {fields}
+		select distinct {fields}
 		from `tabCommunication`
 			inner join `tabDynamic Link`
 				on `tabCommunication`.name=`tabDynamic Link`.parent
 		where {conditions} {group_by}
 		order by `tabCommunication`.creation desc
-		limit %(limit)s offset %(start)s'''.format(
-			fields = fields,
-			conditions=conditions,
-			group_by=group_by or ""
-		),{
+		limit %(limit)s offset %(start)s'''.format(fields = fields, conditions=conditions, group_by=group_by or ""),{
 			"doctype": doctype,
 			"name": name,
 			"start": frappe.utils.cint(start),

From a0b1ae732f66dc8f574783a8c0b9f31956ae3bc7 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 15 May 2019 11:39:31 +0530
Subject: [PATCH 117/175] fix: Add currency code for Surinamese dollar

---
 frappe/geo/country_info.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json
index bdd6414730..7a6ba56929 100644
--- a/frappe/geo/country_info.json
+++ b/frappe/geo/country_info.json
@@ -2330,6 +2330,7 @@
  },
  "Suriname": {
   "code": "sr",
+  "currency": "SRD",
   "currency_fraction": "Cent",
   "currency_fraction_units": 100,
   "currency_symbol": "$",

From 1bcdc0b7cb2cf110b2e3fad7f1e8c712866817b0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 15 May 2019 11:59:13 +0530
Subject: [PATCH 118/175] fix(report): Allow report export only if user has
 export permission on ref doctype (#7458)

* fix: Allow export only if user has export permission on reference doctype

* fix: Show only custom "no permission" error

* fix: while saving employee user getting user permissions error
---
 frappe/desk/query_report.py                           | 4 ++++
 frappe/model/rename_doc.py                            | 2 +-
 frappe/permissions.py                                 | 6 ++++--
 frappe/public/js/frappe/views/reports/query_report.js | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 561cd680b6..0890e2ad7a 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -282,6 +282,10 @@ def export_query():
 		filters = json.loads(data["filters"])
 	if isinstance(data.get("report_name"), string_types):
 		report_name = data["report_name"]
+		frappe.permissions.can_export(
+			frappe.get_cached_value('Report', report_name, 'ref_doctype'),
+			raise_exception=True
+		)
 	if isinstance(data.get("file_format_type"), string_types):
 		file_format_type = data["file_format_type"]
 
diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py
index a373554696..12c57f2780 100644
--- a/frappe/model/rename_doc.py
+++ b/frappe/model/rename_doc.py
@@ -161,7 +161,7 @@ def validate_rename(doctype, new, meta, merge, force, ignore_permissions):
 	if (not merge) and exists:
 		frappe.msgprint(_("Another {0} with name {1} exists, select another name").format(doctype, new), raise_exception=1)
 
-	if not (ignore_permissions or frappe.has_permission(doctype, "write")):
+	if not (ignore_permissions or frappe.permissions.has_permission(doctype, "write", raise_exception=False)):
 		frappe.msgprint(_("You need write permission to rename"), raise_exception=1)
 
 	if not (force or ignore_permissions) and not meta.allow_rename:
diff --git a/frappe/permissions.py b/frappe/permissions.py
index 3809bb3e9c..e5aa31d139 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -25,16 +25,18 @@ def print_has_permission_check_logs(func):
 		frappe.flags['has_permission_check_logs'] = []
 		result = func(*args, **kwargs)
 		self_perm_check = True if not kwargs.get('user') else kwargs.get('user') == frappe.session.user
+		raise_exception = False if kwargs.get('raise_exception') == False else True
+
 		# print only if access denied
 		# and if user is checking his own permission
-		if not result and self_perm_check:
+		if not result and self_perm_check and raise_exception:
 			msgprint(('<br>').join(frappe.flags.get('has_permission_check_logs')))
 		frappe.flags.pop('has_permission_check_logs', None)
 		return result
 	return inner
 
 @print_has_permission_check_logs
-def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None):
+def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None, raise_exception=True):
 	"""Returns True if user has permission `ptype` for given `doctype`.
 	If `doc` is passed, it also checks user, share and owner permissions.
 
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 485f26f952..7baff2a25e 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -970,6 +970,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			{
 				label: __('Export'),
 				action: () => this.export_report(),
+				condition: () => frappe.model.can_export(this.report_doc.ref_doctype),
 				standard: true
 			},
 			{

From 2ba5438c5fe3a391217c9bdbb038e04cfab10876 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 15 May 2019 13:47:33 +0530
Subject: [PATCH 119/175] feat: Allow multiple apps to be installed to site

Usage:

`bench --site sitename install-app erpnext foundation`
---
 frappe/commands/site.py                 | 9 +++++----
 frappe/public/js/frappe/roles_editor.js | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 3798c07e91..ee8131c1dc 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -157,16 +157,17 @@ def _reinstall(site, admin_password=None, mariadb_root_username=None, mariadb_ro
 		admin_password=admin_password)
 
 @click.command('install-app')
-@click.argument('app')
+@click.argument('apps', nargs=-1)
 @pass_context
-def install_app(context, app):
-	"Install a new app to site"
+def install_app(context, apps):
+	"Install a new app to site, supports multiple apps"
 	from frappe.installer import install_app as _install_app
 	for site in context.sites:
 		frappe.init(site=site)
 		frappe.connect()
 		try:
-			_install_app(app, verbose=context.verbose)
+			for app in apps:
+				_install_app(app, verbose=context.verbose)
 		finally:
 			frappe.destroy()
 
diff --git a/frappe/public/js/frappe/roles_editor.js b/frappe/public/js/frappe/roles_editor.js
index 0e5a85be68..50a3db776c 100644
--- a/frappe/public/js/frappe/roles_editor.js
+++ b/frappe/public/js/frappe/roles_editor.js
@@ -183,7 +183,7 @@ frappe.RoleEditor = Class.extend({
 						<td>%(set_user_permissions)s</td>\
 						</tr>', perm));
 				}
-
+				me.perm_dialog.set_title(role);
 				me.perm_dialog.show();
 			}
 		});
@@ -191,7 +191,7 @@ frappe.RoleEditor = Class.extend({
 	},
 	make_perm_dialog: function() {
 		this.perm_dialog = new frappe.ui.Dialog({
-			title:__('Role Permissions')
+			title: __('Role Permissions')
 		});
 
 		this.perm_dialog.$wrapper.find('.modal-dialog').css("width", "800px");

From 25b190bb9cde3ee7d41b16b268d5d1296346dc08 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 15 May 2019 13:48:21 +0530
Subject: [PATCH 120/175] fix: permission fix for prepared report

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

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 847f1a840b..29c069515f 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -54,14 +54,14 @@ def run_background(prepared_report):
 		instance.status = "Completed"
 		instance.columns = json.dumps(result["columns"])
 		instance.report_end_time = frappe.utils.now()
-		instance.save()
+		instance.save(ignore_permissions=True)
 
 	except Exception:
 		frappe.log_error(frappe.get_traceback())
 		instance = frappe.get_doc("Prepared Report", prepared_report)
 		instance.status = "Error"
 		instance.error_message = frappe.get_traceback()
-		instance.save()
+		instance.save(ignore_permissions=True)
 
 	frappe.publish_realtime(
 		'report_generated',

From 77d009747d30a4df3ff8ad3036121dfc4a1af36d Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 May 2019 14:00:25 +0530
Subject: [PATCH 121/175] fix: remove debug parameter

---
 frappe/desk/form/load.py   | 4 ++--
 frappe/model/delete_doc.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 6d834b3b12..102972f331 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -204,8 +204,8 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			"name": name,
 			"start": frappe.utils.cint(start),
 			"limit": limit
-		}, as_dict=as_dict, debug=True)
-	print(communications)
+		}, as_dict=as_dict)
+
 	return communications
 
 def get_assignments(dt, dn):
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 351cd5ca30..685f295b10 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -307,9 +307,10 @@ def clear_timeline_references(link_doctype, link_name):
 		["Dynamic Link", "link_name", "=", link_name]
 	], fields=["name"])
 
-	for comm in comms:
-		doc = frappe.get_doc("Communication", comm.name)
-		doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True)
+	if comms:
+		for comm in comms:
+			doc = frappe.get_doc("Communication", comm.name)
+			doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True, ignore_permissions=True)
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From 7c8cd45bbf284874aa2146797aa1e1bb3508363a Mon Sep 17 00:00:00 2001
From: cameron <cameron.p@cla.aero>
Date: Wed, 15 May 2019 16:35:00 +0800
Subject: [PATCH 122/175] ldap3 changes

---
 .../doctype/ldap_settings/ldap_settings.json  | 844 +++++++++++-------
 .../doctype/ldap_settings/ldap_settings.py    | 196 ++--
 frappe/templates/includes/login/login.js      |   2 +-
 frappe/www/login.py                           |   4 +-
 4 files changed, 615 insertions(+), 431 deletions(-)

diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.json b/frappe/integrations/doctype/ldap_settings/ldap_settings.json
index 6eb44a2db8..aa43b2e9d0 100644
--- a/frappe/integrations/doctype/ldap_settings/ldap_settings.json
+++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.json
@@ -1,317 +1,363 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-09-22 04:16:48.829658", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "System", 
- "editable_grid": 1, 
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-09-22 04:16:48.829658",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "System",
+ "editable_grid": 1,
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "enabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Enabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ldap_server_url", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "LDAP Server Url", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "organizational_unit", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Organizational Unit", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_dn", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Base Distinguished Name (DN)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "password", 
-   "fieldtype": "Password", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Password for Base DN", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_5", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "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
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ldap_search_string", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "LDAP Search String", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ldap_first_name_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "LDAP First Name Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ldap_email_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "LDAP Email Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "ldap_username_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "LDAP Username Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  },
-  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Enabled",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ldap_server_url",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "LDAP Server Url",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "organizational_unit",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Organizational Unit",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "base_dn",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Base Distinguished Name (DN)",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Password for Base DN",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "section_break_5",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ldap_search_string",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "LDAP Search String",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ldap_first_name_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "LDAP First Name Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ldap_email_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "LDAP Email Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "ldap_username_field",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "LDAP Username Field",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 1,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "ldap_security",
    "fieldtype": "Section Break",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "LDAP Security",
    "length": 0,
    "no_copy": 0,
@@ -325,22 +371,28 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
    "default": "Off",
    "description": "",
+   "fetch_if_empty": 0,
    "fieldname": "ssl_tls_mode",
    "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "SSL/TLS Mode",
    "length": 0,
    "no_copy": 0,
@@ -355,21 +407,27 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
    "columns": 0,
    "default": "No",
+   "fetch_if_empty": 0,
    "fieldname": "require_trusted_certificate",
    "fieldtype": "Select",
    "hidden": 0,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 0,
+   "in_standard_filter": 0,
    "label": "Require Trusted Certificate",
    "length": 0,
    "no_copy": 0,
@@ -384,53 +442,153 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "local_private_key_file",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Path to private Key File",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "local_server_certificate_file",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Path to Server Certificate",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "local_ca_certs_file",
+   "fieldtype": "Data",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Path to CA Certs File",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "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,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 1, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-30 11:02:41.011412", 
- "modified_by": "Administrator", 
- "module": "Integrations", 
- "name": "LDAP Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 1,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-04-29 10:56:42.322696",
+ "modified_by": "Administrator",
+ "module": "Integrations",
+ "name": "LDAP Settings",
+ "name_case": "",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 0,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 1,
+   "submit": 0,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 1, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 0,
+ "read_only": 1,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
index e12a6fce05..0a4d871be8 100644
--- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py
+++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
@@ -5,56 +5,90 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import cstr
 from frappe.model.document import Document
 
+
 class LDAPSettings(Document):
 	def validate(self):
 		if not self.flags.ignore_mandatory:
-			self.validate_ldap_credentails()
+			if self.ldap_search_string.endswith("={0}"):
+				if self.enabled:
+					connect_to_ldap(server_url=self.ldap_server_url,
+					                base_dn=self.base_dn,
+					                password=self.get_password(raise_exception=False),
+					                ssl_tls_mode=self.ssl_tls_mode,
+					                trusted_cert=self.require_trusted_certificate,
+					                private_key_file=self.local_private_key_file,
+					                server_cert_file=self.local_server_certificate_file,
+					                ca_certs_file=self.local_ca_certs_file)
+			else:
+				frappe.throw(_("LDAP Search String needs to end with a placeholder, eg sAMAccountName={0}"))
 
-	def validate_ldap_credentails(self):
-		try:
-			import ldap
-			conn = ldap.initialize(self.ldap_server_url)
-			try:
-				if self.ssl_tls_mode == 'StartTLS':
-					conn.set_option(ldap.OPT_X_TLS_DEMAND, True)
-					if self.require_trusted_certificate == 'Yes':
-						conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND)
-					conn.start_tls_s()
-			except:
-				frappe.throw(_("StartTLS is not supported"))
 
-			conn.simple_bind_s(self.base_dn, self.get_password(raise_exception=False))
-		except ImportError:
-			msg = """
-				<div>
-					{{_("Seems ldap is not installed on system.<br>Guidelines to install ldap dependancies and python package")}},
-					<a href="https://discuss.erpnext.com/t/frappe-v-7-1-beta-ldap-dependancies/15841" target="_blank">{{_("Click here")}}</a>,
-				</div>
-			"""
-			frappe.throw(msg, title=_("LDAP Not Installed"))
+def get_ldap_client_settings():
+	#return the settings to be used on the client side.
+	result = {
+		"enabled": False
+	}
+	settings = frappe.get_doc("LDAP Settings")
 
-		except ldap.LDAPError:
-			conn.unbind_s()
-			frappe.throw(_("Incorrect UserId or Password"))
+	if settings and settings.enabled:
+		result["enabled"] = True
+		result["method"] = "frappe.integrations.doctype.ldap_settings.ldap_settings.login"
+	return result
 
-def get_ldap_settings():
+
+def connect_to_ldap(server_url,
+                    base_dn,
+                    password,
+                    ssl_tls_mode,
+                    trusted_cert,
+                    private_key_file,
+                    server_cert_file,
+                    ca_certs_file):
 	try:
-		settings = frappe.get_doc("LDAP Settings")
+		import ldap3
+		import ssl
+
+		if trusted_cert == 'Yes':
+			tls_configuration = ldap3.Tls(validate=ssl.CERT_REQUIRED,
+			                              version=ssl.PROTOCOL_TLSv1)
+		else:
+			tls_configuration = ldap3.Tls(validate=ssl.CERT_NONE,
+			                              version=ssl.PROTOCOL_TLSv1)
+
+		if private_key_file:
+			tls_configuration.private_key_file = private_key_file
+		if server_cert_file:
+			tls_configuration.certificate_file = server_cert_file
+		if ca_certs_file:
+			tls_configuration.ca_certs_file = ca_certs_file
+
+		server = ldap3.Server(host=server_url,
+		                      tls=tls_configuration)
+		bind_type = ldap3.AUTO_BIND_TLS_BEFORE_BIND if ssl_tls_mode == "StartTLS" else True
+
+		conn = ldap3.Connection(server=server,
+		                        user=base_dn,
+		                        password=password,
+		                        auto_bind=bind_type,
+		                        read_only=True,
+		                        raise_exceptions=True)
+
+		return conn
+
+	except ImportError:
+		msg = _("Please Install the ldap3 library via pip to use ldap functionality.")
+		frappe.throw(msg, title=_("LDAP Not Installed"))
+	except ldap3.core.exceptions.LDAPInvalidCredentialsResult:
+		frappe.throw(_("Invalid Credentials"))
+	except Exception as ex:
+		frappe.throw(_(str(ex)))
 
-		settings.update({
-			"method": "frappe.integrations.doctype.ldap_settings.ldap_settings.login"
-		})
-		return settings
-	except Exception:
-		# this will return blank settings
-		return frappe._dict()
 
 @frappe.whitelist(allow_guest=True)
 def login():
-	#### LDAP LOGIN LOGIC #####
+	# LDAP LOGIN LOGIC
 	args = frappe.form_dict
 	user = authenticate_ldap_user(frappe.as_unicode(args.usr), frappe.as_unicode(args.pwd))
 
@@ -64,64 +98,57 @@ def login():
 	# because of a GET request!
 	frappe.db.commit()
 
-def authenticate_ldap_user(user=None, password=None):
-	dn = None
+
+def authenticate_ldap_user(user=None,
+                           password=None):
+
 	params = {}
-	settings = get_ldap_settings()
+	settings = frappe.get_doc("LDAP Settings")
+	if settings and settings.enabled:
+		conn = connect_to_ldap(server_url=settings.ldap_server_url,
+		                       base_dn=settings.base_dn,
+		                       password=settings.get_password(raise_exception=False),
+		                       ssl_tls_mode=settings.ssl_tls_mode,
+		                       trusted_cert=settings.require_trusted_certificate,
+		                       private_key_file=settings.local_private_key_file,
+		                       server_cert_file=settings.local_server_certificate_file,
+		                       ca_certs_file=settings.local_ca_certs_file)
 
-	try:
-		import ldap
-	except:
-		msg = """
-			<div>
-				{{_("Seems ldap is not installed on system.")}}<br>
-				<a href"https://discuss.erpnext.com/t/frappe-v-7-1-beta-ldap-dependancies/15841">{{_("Click here")}}</a>,
-					{{_("Guidelines to install ldap dependancies and python")}}
-			</div>
-		"""
-		frappe.throw(msg, title=_("LDAP Not Installed"))
+		user_filter = settings.ldap_search_string.format(user)
+		conn.search(search_base=settings.organizational_unit,
+		            search_filter="({0})".format(user_filter),
+		            attributes=[settings.ldap_email_field,
+		                        settings.ldap_username_field,
+		                        settings.ldap_first_name_field])
 
-	conn = ldap.initialize(settings.ldap_server_url)
-
-	try:
-		try:
-			# set TLS settings for secure connection
-			if settings.ssl_tls_mode == 'StartTLS':
-				conn.set_option(ldap.OPT_X_TLS_DEMAND, True)
-				if settings.require_trusted_certificate == 'Yes':
-					conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND)
-				conn.start_tls_s()
-		except:
-			frappe.throw(_("StartTLS is not supported"))
-
-		# simple_bind_s is synchronous binding to server, it takes two param  DN and password
-		conn.simple_bind_s(settings.base_dn, settings.get_password(raise_exception=False))
-
-		#search for surnames beginning with a
-		#available options for how deep a search you want.
-		#LDAP_SCOPE_BASE, LDAP_SCOPE_ONELEVEL,LDAP_SCOPE_SUBTREE,
-		result = conn.search_s(settings.organizational_unit, ldap.SCOPE_SUBTREE,
-			settings.ldap_search_string.format(user))
-
-		for dn, r in result:
-			dn = cstr(dn)
-			params["email"] = cstr(r[settings.ldap_email_field][0])
-			params["username"] = cstr(r[settings.ldap_username_field][0])
-			params["first_name"] = cstr(r[settings.ldap_first_name_field][0])
-
-		if dn:
-			conn.simple_bind_s(dn, frappe.as_unicode(password))
+		if len(conn.entries) > 0 and conn.entries[0]:
+			user = conn.entries[0]
+			params["email"] = str(user[settings.ldap_email_field])
+			params["username"] = str(user[settings.ldap_username_field])
+			params["first_name"] = str(user[settings.ldap_first_name_field])
+			connect_to_ldap(server_url=settings.ldap_server_url,
+			                base_dn=user.entry_dn,
+			                password=frappe.as_unicode(password),
+			                ssl_tls_mode=settings.ssl_tls_mode,
+			                trusted_cert=settings.require_trusted_certificate,
+			                private_key_file=settings.local_private_key_file,
+			                server_cert_file=settings.local_server_certificate_file,
+			                ca_certs_file=settings.local_ca_certs_file
+			                )
 			return create_user(params)
 		else:
 			frappe.throw(_("Not a valid LDAP user"))
+	else:
+		frappe.throw(_("LDAP is not enabled."))
 
-	except ldap.LDAPError:
-		conn.unbind_s()
-		frappe.throw(_("Incorrect UserId or Password"))
 
 def create_user(params):
 	if frappe.db.exists("User", params["email"]):
-		return frappe.get_doc("User", params["email"])
+		user = frappe.get_doc("User", params["email"])
+		user.first_name = params["first_name"]
+		user.username = params["username"]
+		user.save(ignore_permissions=True)
+		return user
 
 	else:
 		params.update({
@@ -135,6 +162,5 @@ def create_user(params):
 		})
 
 		user = frappe.get_doc(params).insert(ignore_permissions=True)
-		frappe.db.commit()
 
 		return user
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index dd0f57eb4c..992051bc45 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -66,7 +66,7 @@ login.bind_events = function() {
 		}
 	});
 
-	{% if ldap_settings %}
+	{% if ldap_settings.enabled %}
 		$(".btn-ldap-login").on("click", function(){
 			var args = {};
 			args.cmd = "{{ ldap_settings.method }}";
diff --git a/frappe/www/login.py b/frappe/www/login.py
index dd51dabeab..f34664e1e2 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -8,7 +8,7 @@ from frappe.utils.oauth import get_oauth2_authorize_url, get_oauth_keys, login_v
 import json
 from frappe import _
 from frappe.auth import LoginManager
-from frappe.integrations.doctype.ldap_settings.ldap_settings import get_ldap_settings
+from frappe.integrations.doctype.ldap_settings.ldap_settings import get_ldap_client_settings
 from frappe.utils.password import get_decrypted_password
 from frappe.utils.html_utils import get_icon_html
 
@@ -39,7 +39,7 @@ def get_context(context):
 			})
 			context["social_login"] = True
 
-	ldap_settings = get_ldap_settings()
+	ldap_settings = get_ldap_client_settings()
 	context["ldap_settings"] = ldap_settings
 
 	login_name_placeholder = [_("Email address")]

From f01f36b6e583c2ce2cf43b0c0d2c5219c92f7ae4 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Wed, 15 May 2019 15:41:50 +0530
Subject: [PATCH 123/175] fix: Don't show no value type fields in options for
 custom columns (#7497)

* fix: Don't show no value type fields in options for custom columns

* fix: Use filter instead of pushing in list
---
 frappe/public/js/frappe/views/reports/query_report.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 7baff2a25e..5e7e79312f 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -992,9 +992,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 								change: () => {
 									let doctype = d.get_value('doctype');
 									frappe.model.with_doctype(doctype, () => {
-										let fields = frappe.meta.get_docfields(doctype)
+										let options = frappe.meta.get_docfields(doctype)
+											.filter(frappe.model.is_value_type)
 											.map(df => ({ label: df.label, value: df.fieldname }));
-										d.set_df_property('field', 'options', fields);
+
+										d.set_df_property('field', 'options', options);
 
 									});
 								}

From b31070d427ea3995f67b523ff8c2203ee948155c Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 15 May 2019 18:00:16 +0530
Subject: [PATCH 124/175] fix: delete_doc for timeline references

---
 frappe/core/doctype/communication/email.py |  8 ++++----
 frappe/model/delete_doc.py                 | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index e554e5f7cf..aea2e148b8 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -74,10 +74,10 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		"has_attachment": 1 if attachments else 0
 	}).insert(ignore_permissions=True)
 
-	if not doctype:
-		# if no reference given, then send it against the communication
-		comm.reference_doctype = 'Communication'
-		comm.reference_name = comm.name
+	# if not doctype:
+	# 	# if no reference given, then send it against the communication
+	# 	comm.reference_doctype = 'Communication'
+	# 	comm.reference_name = comm.name
 
 	contacts = get_contacts([sender, recipients, cc, bcc])
 	for contact_name in contacts:
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 685f295b10..ecc7956b73 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -28,6 +28,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 		doctype = frappe.form_dict.get('dt')
 		name = frappe.form_dict.get('dn')
 
+	print(doctype, name)
 	names = name
 	if isinstance(name, string_types) or isinstance(name, integer_types):
 		names = [name]
@@ -302,15 +303,24 @@ def clear_references(doctype, reference_doctype, reference_name,
 		(reference_doctype, reference_name))
 
 def clear_timeline_references(link_doctype, link_name):
-	comms = frappe.get_list("Communication", filters=[
+	links = frappe.get_list("Communication", filters=[
 		["Dynamic Link", "link_doctype", "=", link_doctype],
 		["Dynamic Link", "link_name", "=", link_name]
 	], fields=["name"])
 
-	if comms:
-		for comm in comms:
-			doc = frappe.get_doc("Communication", comm.name)
-			doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True, ignore_permissions=True)
+	if links:
+		for link in links:
+			frappe.db.sql("""
+				delete
+				from `tabDynamic Link`
+				where `tabDynamic Link`.parent='%(parent)s',
+					and `tabDynamic Link`.link_doctype='%(doctype)s',
+					and `tabDynamic Link`.link_name='%(name)s'
+			""",{
+				"parent": link.name,
+				"doctype": link_doctype,
+				"name": link_name
+			})
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From 1a787984f496cd114ea31c8065af647120c2866c Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Thu, 16 May 2019 10:16:06 +0530
Subject: [PATCH 125/175] fix: get month diff between 2 dates (#7474) (#7500)

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

diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index 84ea04b593..bad5407b4b 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -108,6 +108,11 @@ def add_years(date, years):
 def date_diff(string_ed_date, string_st_date):
 	return (getdate(string_ed_date) - getdate(string_st_date)).days
 
+def month_diff(string_ed_date, string_st_date):
+	ed_date = getdate(string_ed_date)
+	st_date = getdate(string_st_date)
+	return (ed_date.year - st_date.year) * 12 + ed_date.month - st_date.month + 1
+
 def time_diff(string_ed_date, string_st_date):
 	return get_datetime(string_ed_date) - get_datetime(string_st_date)
 

From 18f4205cbdc6204dd1adda830dfd9f1f90790614 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 16 May 2019 10:16:10 +0530
Subject: [PATCH 126/175] fix: Upload form attachments to Attachments folder

---
 frappe/public/js/frappe/form/footer/attachments.js | 1 +
 frappe/public/js/legacy/form.js                    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frappe/public/js/frappe/form/footer/attachments.js b/frappe/public/js/frappe/form/footer/attachments.js
index 51636b4e82..11ce22862d 100644
--- a/frappe/public/js/frappe/form/footer/attachments.js
+++ b/frappe/public/js/frappe/form/footer/attachments.js
@@ -149,6 +149,7 @@ frappe.ui.form.Attachments = Class.extend({
 		new frappe.ui.FileUploader({
 			doctype: this.frm.doctype,
 			docname: this.frm.docname,
+			folder: 'Home/Attachments',
 			on_success: (file_doc) => {
 				this.attachment_uploaded(file_doc);
 			}
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 02730190b7..8d4ce9fa20 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -146,6 +146,7 @@ _f.Frm.prototype.setup_drag_drop = function() {
 				doctype: me.doctype,
 				docname: me.docname,
 				files: dataTransfer.files,
+				folder: 'Home/Attachments',
 				on_success(file_doc) {
 					me.attachments.attachment_uploaded(file_doc);
 				}

From b19f84120c7b608d5df521594a85c82fd99e5d16 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 10:24:43 +0530
Subject: [PATCH 127/175] fix(link-preview): show preview only if setup and
 cleanup style

---
 frappe/core/doctype/doctype/doctype.json      | 2343 ++++-------------
 frappe/database/mariadb/framework_mariadb.sql |    1 +
 .../database/postgres/framework_postgres.sql  |    1 +
 frappe/public/js/frappe/ui/link_preview.js    |   61 +-
 frappe/public/less/link_preview.less          |   20 +-
 frappe/www/login.html                         |    6 +-
 6 files changed, 505 insertions(+), 1927 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 599427f740..9aee40c2da 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -1,1889 +1,456 @@
 {
-   "allow_copy": 0,
-   "allow_events_in_timeline": 0,
-   "allow_guest_to_view": 0,
-   "allow_import": 0,
-   "allow_rename": 1,
-   "autoname": "Prompt",
-   "beta": 0,
-   "creation": "2013-02-18 13:36:19",
-   "custom": 0,
-   "description": "DocType is a Table / Form in the application.",
-   "docstatus": 0,
-   "doctype": "DocType",
-   "document_type": "Document",
-   "editable_grid": 0,
-   "engine": "InnoDB",
-   "fields": [
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "sb0",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Section Break",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "module",
-     "fieldtype": "Link",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 1,
-     "in_standard_filter": 1,
-     "label": "Module",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "module",
-     "oldfieldtype": "Link",
-     "options": "Module Def",
-     "permlevel": 0,
-     "print_hide": 0,
-     "print_hide_if_no_value": 0,
-     "read_only": 0,
-     "remember_last_selected_value": 0,
-     "report_hide": 0,
-     "reqd": 1,
-     "search_index": 1,
-     "set_only_once": 0,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "description": "Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended.",
-     "fetch_if_empty": 0,
-     "fieldname": "is_submittable",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Is Submittable",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Child Tables are shown as a Grid in other DocTypes",
-     "fetch_if_empty": 0,
-     "fieldname": "istable",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 1,
-     "label": "Is Child Table",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "istable",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "description": "Single Types have only one record no tables associated. Values are stored in tabSingles",
-     "fetch_if_empty": 0,
-     "fieldname": "issingle",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 1,
-     "label": "Is Single",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "issingle",
-     "oldfieldtype": "Check",
-     "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": 1,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "1",
-     "depends_on": "istable",
-     "fetch_if_empty": 0,
-     "fieldname": "editable_grid",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Editable Grid",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "1",
-     "depends_on": "eval:!doc.istable && !doc.issingle",
-     "description": "Open a dialog with mandatory fields to create a new record quickly",
-     "fetch_if_empty": 0,
-     "fieldname": "quick_entry",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Quick Entry",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "cb01",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "1",
-     "depends_on": "eval:!doc.istable",
-     "description": "If enabled, changes to the document are tracked and shown in timeline",
-     "fetch_if_empty": 0,
-     "fieldname": "track_changes",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Track Changes",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "description": "If enabled, the document is marked as seen, the first time a user opens it",
-     "fetch_if_empty": 0,
-     "fieldname": "track_seen",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Track Seen",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "0",
-     "depends_on": "eval:!doc.istable",
-     "description": "If enabled, document views are tracked, this can happen multiple times",
-     "fetch_if_empty": 0,
-     "fieldname": "track_views",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Track Views",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "custom",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Custom?",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "beta",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Beta",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "fields_section_break",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Fields",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldtype": "Section Break",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "fields",
-     "fieldtype": "Table",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Fields",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "fields",
-     "oldfieldtype": "Table",
-     "options": "DocField",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "sb1",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Naming",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
-     "fetch_if_empty": 0,
-     "fieldname": "autoname",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Auto Name",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "autoname",
-     "oldfieldtype": "Data",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "name_case",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Name Case",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "name_case",
-     "oldfieldtype": "Select",
-     "options": "\nTitle Case\nUPPER CASE",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "",
-     "fetch_if_empty": 0,
-     "fieldname": "column_break_15",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "description",
-     "fieldtype": "Small Text",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Description",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "description",
-     "oldfieldtype": "Text",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "form_settings_section",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Form Settings",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "Must be of type \"Attach Image\"",
-     "fetch_if_empty": 0,
-     "fieldname": "image_field",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Image Field",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "description": "Comments and Communications will be associated with this linked document",
-     "fetch_if_empty": 0,
-     "fieldname": "timeline_field",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Timeline Field",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "max_attachments",
-     "fieldtype": "Int",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Max Attachments",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "max_attachments",
-     "oldfieldtype": "Int",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "column_break_23",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "hide_toolbar",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Hide Sidebar and Menu",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "hide_toolbar",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "allow_copy",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Hide Copy",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "allow_copy",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "allow_rename",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Allow Rename",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "allow_rename",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "allow_import",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Allow Import (via Data Import Tool)",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "allow_events_in_timeline",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Allow events in timeline",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "view_settings",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "View Settings",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "title_field",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Title Field",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "fetch_if_empty": 0,
-     "fieldname": "search_fields",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Search Fields",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "search_fields",
-     "oldfieldtype": "Data",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "default_print_format",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Default Print Format",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "modified",
-     "depends_on": "eval:!doc.istable",
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "sort_field",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Default Sort Field",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "DESC",
-     "depends_on": "eval:!doc.istable",
-     "fetch_if_empty": 0,
-     "fieldname": "sort_order",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Default Sort Order",
-     "length": 0,
-     "no_copy": 0,
-     "options": "ASC\nDESC",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "column_break_29",
-     "fieldtype": "Column Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "document_type",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Show in Module Section",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "document_type",
-     "oldfieldtype": "Select",
-     "options": "\nDocument\nSetup\nSystem\nOther",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "icon",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Icon",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "color",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Color",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "show_name_in_global_search",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Make \"name\" searchable in Global Search",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "eval:!doc.istable",
-     "fetch_if_empty": 0,
-     "fieldname": "sb2",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Permission Rules",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "",
-     "fetch_if_empty": 0,
-     "fieldname": "permissions",
-     "fieldtype": "Table",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Permissions",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "permissions",
-     "oldfieldtype": "Table",
-     "options": "DocPerm",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "restrict_to_domain",
-     "fieldtype": "Link",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Restrict To Domain",
-     "length": 0,
-     "no_copy": 0,
-     "options": "Domain",
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "read_only",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "User Cannot Search",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "read_only",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "in_create",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "User Cannot Create",
-     "length": 0,
-     "no_copy": 0,
-     "oldfieldname": "in_create",
-     "oldfieldtype": "Check",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "description": "",
-     "fetch_if_empty": 0,
-     "fieldname": "web_view",
-     "fieldtype": "Section Break",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Web View",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "0",
-     "fetch_if_empty": 0,
-     "fieldname": "has_web_view",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Has Web View",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "0",
-     "depends_on": "has_web_view",
-     "fetch_if_empty": 0,
-     "fieldname": "allow_guest_to_view",
-     "fieldtype": "Check",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Allow Guest to View",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "depends_on": "has_web_view",
-     "fetch_if_empty": 0,
-     "fieldname": "route",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Route",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "",
-     "depends_on": "has_web_view",
-     "fetch_if_empty": 0,
-     "fieldname": "is_published_field",
-     "fieldtype": "Data",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Is Published Field",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 1,
-     "columns": 0,
-     "fetch_if_empty": 0,
-     "fieldname": "advanced",
-     "fieldtype": "Section Break",
-     "hidden": 1,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Advanced",
-     "length": 0,
-     "no_copy": 0,
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    },
-    {
-     "allow_bulk_edit": 0,
-     "allow_in_quick_entry": 0,
-     "allow_on_submit": 0,
-     "bold": 0,
-     "collapsible": 0,
-     "columns": 0,
-     "default": "InnoDB",
-     "depends_on": "eval:!doc.issingle",
-     "fetch_if_empty": 0,
-     "fieldname": "engine",
-     "fieldtype": "Select",
-     "hidden": 0,
-     "ignore_user_permissions": 0,
-     "ignore_xss_filter": 0,
-     "in_filter": 0,
-     "in_global_search": 0,
-     "in_list_view": 0,
-     "in_standard_filter": 0,
-     "label": "Database Engine",
-     "length": 0,
-     "no_copy": 0,
-     "options": "InnoDB\nMyISAM",
-     "permlevel": 0,
-     "precision": "",
-     "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,
-     "translatable": 0,
-     "unique": 0
-    }
-   ],
-   "has_web_view": 0,
-   "hide_heading": 0,
-   "hide_toolbar": 0,
-   "icon": "fa fa-bolt",
-   "idx": 6,
-   "image_field": "",
-   "image_view": 0,
-   "in_create": 0,
-   "is_submittable": 0,
-   "issingle": 0,
-   "istable": 0,
-   "max_attachments": 0,
-   "menu_index": 0,
-   "modified": "2019-03-22 00:02:14.963400",
-   "modified_by": "Administrator",
-   "module": "Core",
-   "name": "DocType",
-   "owner": "Administrator",
-   "permissions": [
-    {
-     "amend": 0,
-     "cancel": 0,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 0,
-     "if_owner": 0,
-     "import": 0,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "System Manager",
-     "set_user_permissions": 0,
-     "share": 0,
-     "submit": 0,
-     "write": 1
-    },
-    {
-     "amend": 0,
-     "cancel": 0,
-     "create": 1,
-     "delete": 1,
-     "email": 1,
-     "export": 0,
-     "if_owner": 0,
-     "import": 0,
-     "permlevel": 0,
-     "print": 1,
-     "read": 1,
-     "report": 1,
-     "role": "Administrator",
-     "set_user_permissions": 0,
-     "share": 1,
-     "submit": 0,
-     "write": 1
-    }
-   ],
-   "quick_entry": 0,
-   "read_only": 0,
-   "read_only_onload": 0,
-   "search_fields": "module",
-   "show_name_in_global_search": 1,
-   "sort_field": "modified",
-   "sort_order": "DESC",
-   "track_changes": 1,
-   "track_seen": 0,
-   "track_views": 0
-  }
\ No newline at end of file
+ "allow_rename": 1,
+ "autoname": "Prompt",
+ "creation": "2013-02-18 13:36:19",
+ "description": "DocType is a Table / Form in the application.",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "sb0",
+  "module",
+  "is_submittable",
+  "istable",
+  "issingle",
+  "editable_grid",
+  "quick_entry",
+  "cb01",
+  "track_changes",
+  "track_seen",
+  "track_views",
+  "custom",
+  "beta",
+  "fields_section_break",
+  "fields",
+  "sb1",
+  "autoname",
+  "name_case",
+  "column_break_15",
+  "description",
+  "form_settings_section",
+  "image_field",
+  "timeline_field",
+  "max_attachments",
+  "column_break_23",
+  "hide_toolbar",
+  "allow_copy",
+  "allow_rename",
+  "allow_import",
+  "allow_events_in_timeline",
+  "view_settings",
+  "title_field",
+  "search_fields",
+  "default_print_format",
+  "sort_field",
+  "sort_order",
+  "column_break_29",
+  "document_type",
+  "icon",
+  "color",
+  "show_preview_popup",
+  "show_name_in_global_search",
+  "sb2",
+  "permissions",
+  "restrict_to_domain",
+  "read_only",
+  "in_create",
+  "web_view",
+  "has_web_view",
+  "allow_guest_to_view",
+  "route",
+  "is_published_field",
+  "advanced",
+  "engine"
+ ],
+ "fields": [
+  {
+   "fieldname": "sb0",
+   "fieldtype": "Section Break",
+   "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Module",
+   "oldfieldname": "module",
+   "oldfieldtype": "Link",
+   "options": "Module Def",
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "description": "Once submitted, submittable documents cannot be changed. They can only be Cancelled and Amended.",
+   "fieldname": "is_submittable",
+   "fieldtype": "Check",
+   "label": "Is Submittable"
+  },
+  {
+   "description": "Child Tables are shown as a Grid in other DocTypes",
+   "fieldname": "istable",
+   "fieldtype": "Check",
+   "in_standard_filter": 1,
+   "label": "Is Child Table",
+   "oldfieldname": "istable",
+   "oldfieldtype": "Check"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "description": "Single Types have only one record no tables associated. Values are stored in tabSingles",
+   "fieldname": "issingle",
+   "fieldtype": "Check",
+   "in_standard_filter": 1,
+   "label": "Is Single",
+   "oldfieldname": "issingle",
+   "oldfieldtype": "Check",
+   "set_only_once": 1
+  },
+  {
+   "default": "1",
+   "depends_on": "istable",
+   "fieldname": "editable_grid",
+   "fieldtype": "Check",
+   "label": "Editable Grid"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:!doc.istable && !doc.issingle",
+   "description": "Open a dialog with mandatory fields to create a new record quickly",
+   "fieldname": "quick_entry",
+   "fieldtype": "Check",
+   "label": "Quick Entry"
+  },
+  {
+   "fieldname": "cb01",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:!doc.istable",
+   "description": "If enabled, changes to the document are tracked and shown in timeline",
+   "fieldname": "track_changes",
+   "fieldtype": "Check",
+   "label": "Track Changes"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "description": "If enabled, the document is marked as seen, the first time a user opens it",
+   "fieldname": "track_seen",
+   "fieldtype": "Check",
+   "label": "Track Seen"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:!doc.istable",
+   "description": "If enabled, document views are tracked, this can happen multiple times",
+   "fieldname": "track_views",
+   "fieldtype": "Check",
+   "label": "Track Views"
+  },
+  {
+   "fieldname": "custom",
+   "fieldtype": "Check",
+   "label": "Custom?"
+  },
+  {
+   "fieldname": "beta",
+   "fieldtype": "Check",
+   "label": "Beta"
+  },
+  {
+   "fieldname": "fields_section_break",
+   "fieldtype": "Section Break",
+   "label": "Fields",
+   "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "label": "Fields",
+   "oldfieldname": "fields",
+   "oldfieldtype": "Table",
+   "options": "DocField"
+  },
+  {
+   "fieldname": "sb1",
+   "fieldtype": "Section Break",
+   "label": "Naming"
+  },
+  {
+   "description": "Naming Options:\n<ol><li><b>field:[fieldname]</b> - By Field</li><li><b>naming_series:</b> - By Naming Series (field called naming_series must be present</li><li><b>Prompt</b> - Prompt user for a name</li><li><b>[series]</b> - Series by prefix (separated by a dot); for example PRE.#####</li>\n<li><b>format:EXAMPLE-{MM}morewords{fieldname1}-{fieldname2}-{#####}</b> - Replace all braced words (fieldnames, date words (DD, MM, YY), series) with their value. Outside braces, any characters can be used.</li></ol>",
+   "fieldname": "autoname",
+   "fieldtype": "Data",
+   "label": "Auto Name",
+   "oldfieldname": "autoname",
+   "oldfieldtype": "Data"
+  },
+  {
+   "fieldname": "name_case",
+   "fieldtype": "Select",
+   "label": "Name Case",
+   "oldfieldname": "name_case",
+   "oldfieldtype": "Select",
+   "options": "\nTitle Case\nUPPER CASE"
+  },
+  {
+   "fieldname": "column_break_15",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description",
+   "oldfieldname": "description",
+   "oldfieldtype": "Text"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "form_settings_section",
+   "fieldtype": "Section Break",
+   "label": "Form Settings"
+  },
+  {
+   "description": "Must be of type \"Attach Image\"",
+   "fieldname": "image_field",
+   "fieldtype": "Data",
+   "label": "Image Field"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "description": "Comments and Communications will be associated with this linked document",
+   "fieldname": "timeline_field",
+   "fieldtype": "Data",
+   "label": "Timeline Field"
+  },
+  {
+   "fieldname": "max_attachments",
+   "fieldtype": "Int",
+   "label": "Max Attachments",
+   "oldfieldname": "max_attachments",
+   "oldfieldtype": "Int"
+  },
+  {
+   "fieldname": "column_break_23",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "hide_toolbar",
+   "fieldtype": "Check",
+   "label": "Hide Sidebar and Menu",
+   "oldfieldname": "hide_toolbar",
+   "oldfieldtype": "Check"
+  },
+  {
+   "fieldname": "allow_copy",
+   "fieldtype": "Check",
+   "label": "Hide Copy",
+   "oldfieldname": "allow_copy",
+   "oldfieldtype": "Check"
+  },
+  {
+   "fieldname": "allow_rename",
+   "fieldtype": "Check",
+   "label": "Allow Rename",
+   "oldfieldname": "allow_rename",
+   "oldfieldtype": "Check"
+  },
+  {
+   "fieldname": "allow_import",
+   "fieldtype": "Check",
+   "label": "Allow Import (via Data Import Tool)"
+  },
+  {
+   "fieldname": "allow_events_in_timeline",
+   "fieldtype": "Check",
+   "label": "Allow events in timeline"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "view_settings",
+   "fieldtype": "Section Break",
+   "label": "View Settings"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "title_field",
+   "fieldtype": "Data",
+   "label": "Title Field"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "search_fields",
+   "fieldtype": "Data",
+   "label": "Search Fields",
+   "oldfieldname": "search_fields",
+   "oldfieldtype": "Data"
+  },
+  {
+   "fieldname": "default_print_format",
+   "fieldtype": "Data",
+   "label": "Default Print Format"
+  },
+  {
+   "default": "modified",
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sort_field",
+   "fieldtype": "Data",
+   "label": "Default Sort Field"
+  },
+  {
+   "default": "DESC",
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sort_order",
+   "fieldtype": "Select",
+   "label": "Default Sort Order",
+   "options": "ASC\nDESC"
+  },
+  {
+   "fieldname": "column_break_29",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Select",
+   "label": "Show in Module Section",
+   "oldfieldname": "document_type",
+   "oldfieldtype": "Select",
+   "options": "\nDocument\nSetup\nSystem\nOther"
+  },
+  {
+   "fieldname": "icon",
+   "fieldtype": "Data",
+   "label": "Icon"
+  },
+  {
+   "fieldname": "color",
+   "fieldtype": "Data",
+   "label": "Color"
+  },
+  {
+   "fieldname": "show_name_in_global_search",
+   "fieldtype": "Check",
+   "label": "Make \"name\" searchable in Global Search"
+  },
+  {
+   "depends_on": "eval:!doc.istable",
+   "fieldname": "sb2",
+   "fieldtype": "Section Break",
+   "label": "Permission Rules"
+  },
+  {
+   "fieldname": "permissions",
+   "fieldtype": "Table",
+   "label": "Permissions",
+   "oldfieldname": "permissions",
+   "oldfieldtype": "Table",
+   "options": "DocPerm"
+  },
+  {
+   "fieldname": "restrict_to_domain",
+   "fieldtype": "Link",
+   "label": "Restrict To Domain",
+   "options": "Domain"
+  },
+  {
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "label": "User Cannot Search",
+   "oldfieldname": "read_only",
+   "oldfieldtype": "Check"
+  },
+  {
+   "fieldname": "in_create",
+   "fieldtype": "Check",
+   "label": "User Cannot Create",
+   "oldfieldname": "in_create",
+   "oldfieldtype": "Check"
+  },
+  {
+   "fieldname": "web_view",
+   "fieldtype": "Section Break",
+   "label": "Web View"
+  },
+  {
+   "default": "0",
+   "fieldname": "has_web_view",
+   "fieldtype": "Check",
+   "label": "Has Web View"
+  },
+  {
+   "default": "0",
+   "depends_on": "has_web_view",
+   "fieldname": "allow_guest_to_view",
+   "fieldtype": "Check",
+   "label": "Allow Guest to View"
+  },
+  {
+   "depends_on": "has_web_view",
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "label": "Route"
+  },
+  {
+   "depends_on": "has_web_view",
+   "fieldname": "is_published_field",
+   "fieldtype": "Data",
+   "label": "Is Published Field"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "advanced",
+   "fieldtype": "Section Break",
+   "hidden": 1,
+   "label": "Advanced"
+  },
+  {
+   "default": "InnoDB",
+   "depends_on": "eval:!doc.issingle",
+   "fieldname": "engine",
+   "fieldtype": "Select",
+   "label": "Database Engine",
+   "options": "InnoDB\nMyISAM"
+  },
+  {
+   "fieldname": "show_preview_popup",
+   "fieldtype": "Check",
+   "label": "Show Preview Popup"
+  }
+ ],
+ "icon": "fa fa-bolt",
+ "idx": 6,
+ "modified": "2019-05-16 09:18:29.373576",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "DocType",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "module",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index 48c70afbbc..ad4cd7d5ef 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -37,6 +37,7 @@ CREATE TABLE `tabDocField` (
   `unique` int(1) NOT NULL DEFAULT 0,
   `no_copy` int(1) NOT NULL DEFAULT 0,
   `allow_on_submit` int(1) NOT NULL DEFAULT 0,
+  `show_preview_popup` int(1) NOT NULL DEFAULT 0,
   `trigger` varchar(255) DEFAULT NULL,
   `collapsible_depends_on` text,
   `depends_on` text,
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index 2ff024555d..756917ca97 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -37,6 +37,7 @@ CREATE TABLE "tabDocField" (
   "unique" smallint NOT NULL DEFAULT 0,
   "no_copy" smallint NOT NULL DEFAULT 0,
   "allow_on_submit" smallint NOT NULL DEFAULT 0,
+  "show_preview_popup" smallint NOT NULL DEFAULT 0,
   "trigger" varchar(255) DEFAULT NULL,
   "collapsible_depends_on" text,
   "depends_on" text,
diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index c0e2d162a6..538b187d9f 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -46,6 +46,9 @@ frappe.ui.LinkPreview = class {
 			});
 		} else {
 			this.popover_timeout = setTimeout(() => {
+				if (this.element.is(':focus')) {
+					return;
+				}
 				this.popover.show();
 			}, 1000);
 		}
@@ -53,6 +56,10 @@ frappe.ui.LinkPreview = class {
 	}
 
 	create_popover(e, preview_fields) {
+		if (this.element.is(':focus')) {
+			return;
+		}
+
 		this.get_preview_fields_value(preview_fields).then((preview_data)=> {
 			if(preview_data) {
 				if(this.popover_timeout) {
@@ -93,12 +100,6 @@ frappe.ui.LinkPreview = class {
 			this.clear_all_popovers();
 		});
 
-		$(document.body).on('mousemove', () => {
-			if (!this.link_hovered) {
-				this.clear_all_popovers();
-			}
-		});
-
 		$(window).on('hashchange', () => {
 			this.clear_all_popovers();
 		});
@@ -113,7 +114,15 @@ frappe.ui.LinkPreview = class {
 			let dt = this.doctype;
 			let fields = [];
 			frappe.model.with_doctype(dt, () => {
-				let meta_fields = frappe.get_meta(dt).fields;
+				let meta = frappe.get_meta(dt);
+				let meta_fields = meta.fields;
+
+				if (!meta.show_preview_popup) {
+					// no preview
+					resolve([]);
+					return;
+				}
+
 				meta_fields.filter((field) => {
 					// build list of fields to fetch
 					if(field.in_preview) {
@@ -171,41 +180,45 @@ frappe.ui.LinkPreview = class {
 		}
 
 		let image_html = '';
-		let title_html = '';
-		let content_html = `<table class="preview-table">`;
+		let id_html = '';
+		let content_html = '';
+		let meta = frappe.get_meta(this.doctype);
+		let title = preview_data[meta.title_field];
 
-		if(preview_data['image']) {
-			let image_url = encodeURI(preview_data['image']);
+		if(preview_data[meta.image_field]) {
+			let image_url = encodeURI(preview_data[meta.image_field]);
 			image_html += `
 			<div class="preview-header">
 				<img src=${image_url} class="preview-image"></img>
 			</div>`;
 		}
-		if(preview_data['title']) {
-			title_html+= `<a class="preview-title small" href=${this.href}>${preview_data['title']}</a>`;
+
+
+		if(title && title != preview_data.name) {
+			id_html+= `<a class="text-muted" href=${this.href}>${preview_data.name}</a>`;
 		}
 
 		Object.keys(preview_data).forEach(key => {
-			if(key!='image' && key!='name') {
+			if(key!=meta.image_field && key!='name' && key!=meta.title_field) {
 				let value = this.truncate_value(preview_data[key]);
 				let label = this.truncate_value(frappe.meta.get_label(this.doctype, key));
 				content_html += `
-				<tr class="preview-field">
-					<td class='text-muted small field-name'>${label}</td>
-					<td class="field-value small"> ${value} </td>
-				</tr>
+				<div class="preview-field">
+					<div class='small preview-label text-muted bold'>${label}</div>
+					<div class="small preview-value"> ${value} </div>
+				</div>
 				`;
 			}
 		});
-		content_html+=`</table>`;
+
+		content_html = `<div class="preview-table">${content_html}</div>`;
 
 		let popover_content =
 			`<div class="preview-popover-header">${image_html}
 				<div class="preview-header">
 					<div class="preview-main">
-						<a class="preview-name text-bold" href=${this.href}>${preview_data['name']}</a>
-						${title_html}
-						<span class="text-muted small">${this.doctype}</span>
+						<a class="preview-name bold" href=${this.href}>${title}</a>
+						<span class="text-muted small">${this.doctype} ${id_html}</span>
 					</div>
 				</div>
 			</div>
@@ -218,8 +231,8 @@ frappe.ui.LinkPreview = class {
 	}
 
 	truncate_value(value) {
-		if (value.length > 100) {
-			value = value.slice(0,100) + '...';
+		if (value.length > 280) {
+			value = value.slice(0,280) + '...';
 		}
 		return value;
 	}
diff --git a/frappe/public/less/link_preview.less b/frappe/public/less/link_preview.less
index 2a3ccce5b3..9e8ed30e57 100644
--- a/frappe/public/less/link_preview.less
+++ b/frappe/public/less/link_preview.less
@@ -4,8 +4,7 @@
     .popover-content {
         padding: 0;
         .preview-popover-header {
-            background: #f7fafc;
-            padding: 10px;
+            padding: 15px;
 
             .preview-header {
                 display: inline-block;
@@ -34,19 +33,16 @@
         }
 
         .preview-table {
-            margin: 10px;
+            padding: 15px;
+            padding-bottom: 5px;
             max-width: 330px;
             min-width: 200px;
-        }
 
-        .preview-field {
-            td {
-                padding: 3px;
-                vertical-align: top;
-            }
-
-            .field-name {
-                width: 39%;
+            .preview-field {
+                padding-bottom: 10px;
+                .preview-label {
+                    padding-bottom: 4px;
+                }
             }
         }
     }
diff --git a/frappe/www/login.html b/frappe/www/login.html
index 9d132cb718..d621ab0fbb 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -24,9 +24,9 @@
 			<div class="password-field" style="position: relative;">
 				<input type="password" id="login_password"
 						class="form-control" placeholder="{{ _('Password') }}" required>
-					
-				<span toggle="#login_password" class="fa fa-fw fa-eye toggle-password"></span>
-			</div>	
+
+				<span toggle="#login_password" class="fa fa-fw fa-eye toggle-password text-muted"></span>
+			</div>
 
 			<button class="btn btn-sm btn-primary btn-block btn-login" type="submit">
 				{{ _("Login") }}</button>

From 28c71a1724fed66fd5ebef94716088232b643a42 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 16 May 2019 10:29:01 +0530
Subject: [PATCH 128/175] fix(patch): Move attachments to attachment folder

---
 frappe/patches.txt                                        | 1 +
 .../v12_0/move_form_attachments_to_attachments_folder.py  | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index c0b2a8238f..71987228f1 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -241,3 +241,4 @@ frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
 frappe.patches.v12_0.remove_feedback_rating
+frappe.patches.v12_0.move_form_attachments_to_attachments_folder
\ No newline at end of file
diff --git a/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py b/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py
new file mode 100644
index 0000000000..da2bdd836b
--- /dev/null
+++ b/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py
@@ -0,0 +1,8 @@
+import frappe
+
+def execute():
+	frappe.db.sql('''
+		UPDATE tabFile
+		SET folder = 'Home/Attachments'
+		WHERE ifnull(attached_to_doctype, '') != ''
+	''')

From d075c3b748d86f12fd368bec23ce2e56e18af28b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 16 May 2019 13:26:35 +0530
Subject: [PATCH 129/175] fix: link error while deleting linked doc

---
 frappe/model/delete_doc.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index ecc7956b73..86f72e7416 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -83,6 +83,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 					doc.flags.in_delete = True
 					doc.run_method('on_change')
 
+				clear_timeline_references(doc.doctype, doc.name)
 				frappe.enqueue('frappe.model.delete_doc.delete_dynamic_links', doctype=doc.doctype, name=doc.name,
 					is_async=False if frappe.flags.in_test else True)
 
@@ -310,17 +311,8 @@ def clear_timeline_references(link_doctype, link_name):
 
 	if links:
 		for link in links:
-			frappe.db.sql("""
-				delete
-				from `tabDynamic Link`
-				where `tabDynamic Link`.parent='%(parent)s',
-					and `tabDynamic Link`.link_doctype='%(doctype)s',
-					and `tabDynamic Link`.link_name='%(name)s'
-			""",{
-				"parent": link.name,
-				"doctype": link_doctype,
-				"name": link_name
-			})
+			doc = frappe.get_doc("Communication", link.name)
+			doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True)
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From e5b97de25538fd23d38e13bee588e63dea697ba2 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 15:00:14 +0530
Subject: [PATCH 130/175] fix(minor): default check value to 0 and validate

---
 frappe/core/doctype/doctype/doctype.json | 3 ++-
 frappe/core/doctype/doctype/doctype.py   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 9aee40c2da..24a7a4c287 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -413,6 +413,7 @@
    "options": "InnoDB\nMyISAM"
   },
   {
+   "default": "0",
    "fieldname": "show_preview_popup",
    "fieldtype": "Check",
    "label": "Show Preview Popup"
@@ -420,7 +421,7 @@
  ],
  "icon": "fa fa-bolt",
  "idx": 6,
- "modified": "2019-05-16 09:18:29.373576",
+ "modified": "2019-05-16 14:58:33.405381",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 5db025f9fb..7efdba3237 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -616,7 +616,9 @@ def validate_fields(meta):
 				frappe.throw(_("Options 'Dynamic Link' type of field must point to another Link Field with options as 'DocType'"))
 
 	def check_illegal_default(d):
-		if d.fieldtype == "Check" and d.default and d.default not in ('0', '1'):
+		if d.fieldtype == "Check" and not d.default:
+			d.default = '0'
+		if d.fieldtype == "Check" and d.default not in ('0', '1'):
 			frappe.throw(_("Default for 'Check' type of field must be either '0' or '1'"))
 		if d.fieldtype == "Select" and d.default and (d.default not in d.options.split("\n")):
 			frappe.throw(_("Default for {0} must be an option").format(d.fieldname))

From e2d3b863745fb6264de4b9d6446104735a1dccac Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 15:20:31 +0530
Subject: [PATCH 131/175] fix(null-handling): for doctype, doctype, ignore null
 values

---
 frappe/model/base_document.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 8b03a21a2b..cea939abdc 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -197,7 +197,7 @@ class BaseDocument(object):
 
 		return value
 
-	def get_valid_dict(self, sanitize=True, convert_dates_to_str=False):
+	def get_valid_dict(self, sanitize=True, convert_dates_to_str=False, ignore_nulls = False):
 		d = frappe._dict()
 		for fieldname in self.meta.get_valid_columns():
 			d[fieldname] = self.get(fieldname)
@@ -234,6 +234,9 @@ class BaseDocument(object):
 				if convert_dates_to_str and isinstance(d[fieldname], (datetime.datetime, datetime.time, datetime.timedelta)):
 					d[fieldname] = str(d[fieldname])
 
+			if d[fieldname] == None and ignore_nulls:
+				del d[fieldname]
+
 		return d
 
 	def init_valid_columns(self):
@@ -306,7 +309,8 @@ class BaseDocument(object):
 			self.creation = self.modified = now()
 			self.created_by = self.modified_by = frappe.session.user
 
-		d = self.get_valid_dict(convert_dates_to_str=True)
+		# if doctype is "DocType", don't insert null values as we don't know who is valid yet
+		d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls=self.doctype in ('DocType', 'DocField', 'DocPerm'))
 
 		columns = list(d)
 		try:

From 0284b1a9655a80e28e3a59b8a1a847a74659eb87 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 15:37:23 +0530
Subject: [PATCH 132/175] fix(null-handling): for doctype, doctype, ignore null
 values

---
 frappe/core/doctype/comment/test_comment.py    |  4 ++--
 frappe/model/base_document.py                  |  4 ++--
 frappe/templates/includes/comments/comments.py | 15 ++++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frappe/core/doctype/comment/test_comment.py b/frappe/core/doctype/comment/test_comment.py
index 2f6583b7ba..2adc5eb899 100644
--- a/frappe/core/doctype/comment/test_comment.py
+++ b/frappe/core/doctype/comment/test_comment.py
@@ -48,10 +48,10 @@ class TestComment(unittest.TestCase):
 		add_comment('pleez vizits my site http://mysite.com', 'test@test.com', 'bad commentor',
 			'Blog Post', test_blog.name, test_blog.route)
 
-		self.assertEqual(frappe.get_all('Comment', fields = ['*'], filters = dict(
+		self.assertEqual(len(frappe.get_all('Comment', fields = ['*'], filters = dict(
 			reference_doctype = test_blog.doctype,
 			reference_name = test_blog.name
-		))[0].published, 0)
+		))), 0)
 
 
 
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index cea939abdc..ae4bc07b1a 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -310,7 +310,7 @@ class BaseDocument(object):
 			self.created_by = self.modified_by = frappe.session.user
 
 		# if doctype is "DocType", don't insert null values as we don't know who is valid yet
-		d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls=self.doctype in ('DocType', 'DocField', 'DocPerm'))
+		d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
 
 		columns = list(d)
 		try:
@@ -345,7 +345,7 @@ class BaseDocument(object):
 			self.db_insert()
 			return
 
-		d = self.get_valid_dict(convert_dates_to_str=True)
+		d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm'))
 
 		# don't update name, as case might've been changed
 		name = d['name']
diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index 52abb60b4d..8874f59d86 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -16,16 +16,17 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 		frappe.msgprint(_('Comment Should be atleast 10 characters'))
 		return ''
 
+	blacklist = ['http://', 'https://', '@gmail.com']
+
+	if any([b in comment.content for b in blacklist]):
+		frappe.msgprint(_('Comments cannot have links or email addresses'))
+		return ''
+
 	comment = doc.add_comment(
 		text = comment,
 		comment_email = comment_email,
-		comment_by = comment_by)
-
-	blacklist = ['http://', 'https://', '@gmail.com']
-
-	if not any([b in comment.content for b in blacklist]):
-		# probably not spam!
-		comment.db_set('published', 1)
+		comment_by = comment_by,
+		published = 1)
 
 	# since comments are embedded in the page, clear the web cache
 	if route:

From e4f70da7cdf0a1b6e0063604841fe2e76fc61ff0 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Thu, 16 May 2019 17:37:37 +0530
Subject: [PATCH 133/175] fix: Report Print format for indented rows (#7505)

---
 .../js/frappe/views/reports/print_grid.html   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/print_grid.html b/frappe/public/js/frappe/views/reports/print_grid.html
index 12854e74f3..e99600c2e6 100644
--- a/frappe/public/js/frappe/views/reports/print_grid.html
+++ b/frappe/public/js/frappe/views/reports/print_grid.html
@@ -31,15 +31,17 @@
                     {% var value = col.fieldname ? row[col.fieldname] : row[col.id]; %}
 
                     <td>
-                        {{
-                            col.formatter
-                                ? col.formatter(row._index, col._index, value, col, row, true)
-                                : col.format
-                                    ? col.format(value, row, col, data)
-                                    : col.docfield
-                                        ? frappe.format(value, col.docfield)
-                                        : value
-                        }}
+                        <span {% if col._index == 0 %} style="padding-left: {%= cint(row.indent) * 2 %}em" {% endif %}>
+                            {{
+                                col.formatter
+                                    ? col.formatter(row._index, col._index, value, col, row, true)
+                                    : col.format
+                                        ? col.format(value, row, col, data)
+                                        : col.docfield
+                                            ? frappe.format(value, col.docfield)
+                                            : value
+                            }}
+                        </span>
                     </td>
                 {% endif %}
             {% endfor %}

From 005c1a8de178b20f8efc0187049640430a2123fa Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 16 May 2019 17:40:58 +0530
Subject: [PATCH 134/175] fix: use frappe sql for query

---
 frappe/model/delete_doc.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 86f72e7416..88c5101617 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -83,7 +83,6 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 					doc.flags.in_delete = True
 					doc.run_method('on_change')
 
-				clear_timeline_references(doc.doctype, doc.name)
 				frappe.enqueue('frappe.model.delete_doc.delete_dynamic_links', doctype=doc.doctype, name=doc.name,
 					is_async=False if frappe.flags.in_test else True)
 
@@ -304,15 +303,8 @@ def clear_references(doctype, reference_doctype, reference_name,
 		(reference_doctype, reference_name))
 
 def clear_timeline_references(link_doctype, link_name):
-	links = frappe.get_list("Communication", filters=[
-		["Dynamic Link", "link_doctype", "=", link_doctype],
-		["Dynamic Link", "link_name", "=", link_name]
-	], fields=["name"])
-
-	if links:
-		for link in links:
-			doc = frappe.get_doc("Communication", link.name)
-			doc.remove_link(link_doctype=link_doctype, link_name=link_name, autosave=True)
+	frappe.db.sql('''delete from `tabDynamic Link`
+		where `tabDynamic Link`.link_doctype={0} and `tabDynamic Link`.link_name={1}'''.format(link_doctype, link_name)) # nosec
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From 29c0d6f16a855300cd540d6260da3029ac7e43d2 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 17:58:27 +0530
Subject: [PATCH 135/175] fix(minor): comments.py

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

diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index 8874f59d86..6a2cc1dfaa 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -18,7 +18,7 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 
 	blacklist = ['http://', 'https://', '@gmail.com']
 
-	if any([b in comment.content for b in blacklist]):
+	if any([b in comment for b in blacklist]):
 		frappe.msgprint(_('Comments cannot have links or email addresses'))
 		return ''
 

From 43bc6ca8d14ae4e99a8b688648cab5be41938ec7 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 16 May 2019 18:36:10 +0530
Subject: [PATCH 136/175] fix: missing quotes in where clause

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

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 88c5101617..75365ce9ba 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -303,8 +303,8 @@ def clear_references(doctype, reference_doctype, reference_name,
 		(reference_doctype, reference_name))
 
 def clear_timeline_references(link_doctype, link_name):
-	frappe.db.sql('''delete from `tabDynamic Link`
-		where `tabDynamic Link`.link_doctype={0} and `tabDynamic Link`.link_name={1}'''.format(link_doctype, link_name)) # nosec
+	frappe.db.sql("""delete from `tabDynamic Link`
+		where `tabDynamic Link`.link_doctype='{0}' and `tabDynamic Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From c89185aed8d07db98b3dacd9003da04f26de51e9 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 16 May 2019 18:45:41 +0530
Subject: [PATCH 137/175] fix(minor): comments.py

---
 frappe/templates/includes/comments/comments.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py
index 6a2cc1dfaa..cf2436da15 100644
--- a/frappe/templates/includes/comments/comments.py
+++ b/frappe/templates/includes/comments/comments.py
@@ -25,8 +25,9 @@ def add_comment(comment, comment_email, comment_by, reference_doctype, reference
 	comment = doc.add_comment(
 		text = comment,
 		comment_email = comment_email,
-		comment_by = comment_by,
-		published = 1)
+		comment_by = comment_by)
+
+	comment.db_set('published', 1)
 
 	# since comments are embedded in the page, clear the web cache
 	if route:

From aa98dd28a6413d6d49a966d9b96d58967e3325b6 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 16 May 2019 20:04:49 +0530
Subject: [PATCH 138/175] test: communication tests

---
 .../core/doctype/communication/test_communication.py  |  7 +++++++
 frappe/core/doctype/dynamic_link/dynamic_link.json    | 11 +++--------
 frappe/model/delete_doc.py                            |  3 +--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 53b0981af7..3b08aaeddb 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -58,6 +58,8 @@ class TestCommunication(unittest.TestCase):
 			"reference_name": a.name
 		}).insert()
 
+		b.add_link(link_doctype="Communication", link_name=a.name, autosave=True)
+
 		c = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
@@ -66,8 +68,13 @@ class TestCommunication(unittest.TestCase):
 			"reference_name": b.name
 		}).insert()
 
+		c.add_link(link_doctype="Communication", link_name=b.name, autosave=True)
+
 		a = frappe.get_doc("Communication", a.name)
 		a.reference_doctype = "Communication"
 		a.reference_name = c.name
 
 		self.assertRaises(frappe.CircularLinkingError, a.save)
+
+		a.add_link(link_doctype="Communication", link_name=c.name)
+		self.assertRaises(frappe.CircularLinkingError, c.save)
diff --git a/frappe/core/doctype/dynamic_link/dynamic_link.json b/frappe/core/doctype/dynamic_link/dynamic_link.json
index a8b871855c..abc47df100 100644
--- a/frappe/core/doctype/dynamic_link/dynamic_link.json
+++ b/frappe/core/doctype/dynamic_link/dynamic_link.json
@@ -5,9 +5,8 @@
  "engine": "InnoDB",
  "field_order": [
   "link_doctype",
-  "link_title",
-  "cb_00",
-  "link_name"
+  "link_name",
+  "link_title"
  ],
  "fields": [
   {
@@ -32,14 +31,10 @@
    "in_list_view": 1,
    "label": "Link Title",
    "read_only": 1
-  },
-  {
-   "fieldname": "cb_00",
-   "fieldtype": "Column Break"
   }
  ],
  "istable": 1,
- "modified": "2019-05-14 17:36:38.391805",
+ "modified": "2019-05-16 19:54:31.400026",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Dynamic Link",
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 75365ce9ba..73c6719d2b 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -28,7 +28,6 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 		doctype = frappe.form_dict.get('dt')
 		name = frappe.form_dict.get('dn')
 
-	print(doctype, name)
 	names = name
 	if isinstance(name, string_types) or isinstance(name, integer_types):
 		names = [name]
@@ -279,9 +278,9 @@ def delete_dynamic_links(doctype, name):
 	delete_references('Document Follow', doctype, name, 'ref_doctype', 'ref_docname')
 
 	# unlink communications
+	clear_timeline_references(doctype, name)
 	clear_references('Communication', doctype, name)
 	clear_references('Communication', doctype, name, 'link_doctype', 'link_name')
-	clear_timeline_references(doctype, name)
 
 	clear_references('Activity Log', doctype, name)
 	clear_references('Activity Log', doctype, name, 'timeline_doctype', 'timeline_name')

From 0d9b7048d94c97c577cf0f7c0f7508cb16bb15a0 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 17 May 2019 00:06:38 +0530
Subject: [PATCH 139/175] fix: tests for communication

---
 .../doctype/communication/test_communication.py     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 3b08aaeddb..715afe2cb3 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -48,7 +48,7 @@ class TestCommunication(unittest.TestCase):
 			"doctype": "Communication",
 			"communication_type": "Communication",
 			"content": "This was created to test circular linking: Communication A",
-		}).insert()
+		}).insert(ignore_permissions=True)
 
 		b = frappe.get_doc({
 			"doctype": "Communication",
@@ -56,9 +56,7 @@ class TestCommunication(unittest.TestCase):
 			"content": "This was created to test circular linking: Communication B",
 			"reference_doctype": "Communication",
 			"reference_name": a.name
-		}).insert()
-
-		b.add_link(link_doctype="Communication", link_name=a.name, autosave=True)
+		}).insert(ignore_permissions=True)
 
 		c = frappe.get_doc({
 			"doctype": "Communication",
@@ -66,15 +64,10 @@ class TestCommunication(unittest.TestCase):
 			"content": "This was created to test circular linking: Communication C",
 			"reference_doctype": "Communication",
 			"reference_name": b.name
-		}).insert()
-
-		c.add_link(link_doctype="Communication", link_name=b.name, autosave=True)
+		}).insert(ignore_permissions=True)
 
 		a = frappe.get_doc("Communication", a.name)
 		a.reference_doctype = "Communication"
 		a.reference_name = c.name
 
 		self.assertRaises(frappe.CircularLinkingError, a.save)
-
-		a.add_link(link_doctype="Communication", link_name=c.name)
-		self.assertRaises(frappe.CircularLinkingError, c.save)

From 08fb05233467e665e1e25e98db36a3ad41e7ab27 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 17 May 2019 14:21:37 +0530
Subject: [PATCH 140/175] fix: rename dynamic links to timeline links

---
 .../doctype/communication/communication.js    |  12 +-
 .../doctype/communication/communication.json  |  12 +-
 .../doctype/communication/communication.py    | 106 +++++++++++-------
 frappe/core/doctype/communication/email.py    |  46 +-------
 .../doctype/email_account/email_account.py    |   9 +-
 5 files changed, 80 insertions(+), 105 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 5d17a98315..4734f6a11a 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -43,17 +43,17 @@ frappe.ui.form.on("Communication", {
 			});
 		}
 
-		frm.add_custom_button(__("Relink"), function() {
+		frm.add_custom_button(__("Add Primary link"), function() {
 			frm.trigger('show_relink_dialog');
-		});
+		}, "Links");
 
-		frm.add_custom_button(__("Add link"), function() {
+		frm.add_custom_button(__("Add Timeline Link"), function() {
 			frm.trigger('show_add_link_dialog');
-		});
+		}, "Links");
 
-		frm.add_custom_button(__("Remove link"), function() {
+		frm.add_custom_button(__("Remove Timeline Link"), function() {
 			frm.trigger('show_remove_link_dialog');
-		});
+		}, "Links");
 
 		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Email"
diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index b315a4ce98..6642fd60f4 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -47,7 +47,7 @@
   "seen",
   "_user_tags",
   "timeline_links_sections",
-  "dynamic_links",
+  "timeline_links",
   "email_inbox",
   "message_id",
   "uid",
@@ -203,6 +203,7 @@
    "label": "Date"
   },
   {
+   "default": "0",
    "fieldname": "read_receipt",
    "fieldtype": "Check",
    "label": "Sent Read Receipt",
@@ -219,6 +220,7 @@
    "read_only": 1
   },
   {
+   "default": "0",
    "fieldname": "read_by_recipient",
    "fieldtype": "Check",
    "label": "Read by Recipient",
@@ -305,6 +307,7 @@
    "read_only": 1
   },
   {
+   "default": "0",
    "fieldname": "seen",
    "fieldtype": "Check",
    "label": "Seen",
@@ -348,6 +351,7 @@
    "options": "Open\nSpam\nTrash"
   },
   {
+   "default": "0",
    "fieldname": "has_attachment",
    "fieldtype": "Check",
    "hidden": 1,
@@ -385,15 +389,15 @@
    "label": "Timeline Links"
   },
   {
-   "fieldname": "dynamic_links",
+   "fieldname": "timeline_links",
    "fieldtype": "Table",
-   "label": "Dynamic Links",
+   "label": "Timeline Links",
    "options": "Dynamic Link"
   }
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-13 19:55:35.757242",
+ "modified": "2019-05-17 13:52:44.471256",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Communication",
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index f25264ceb3..72885d8288 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -8,10 +8,11 @@ from frappe.model.document import Document
 from frappe.utils import validate_email_address, get_fullname, strip_html, cstr
 from frappe.core.doctype.communication.email import (validate_email,
 	notify, _notify, update_parent_mins_to_first_response)
+from frappe.core.utils import get_parent_doc
 from frappe.utils.bot import BotReply
 from frappe.utils import parse_addr
 from frappe.core.doctype.comment.comment import update_comment_in_doc
-
+from email.utils import parseaddr
 from collections import Counter
 
 exclude_from_linked_with = True
@@ -56,10 +57,12 @@ class Communication(Document):
 		self.set_status()
 		self.set_sender_full_name()
 
-		self.validate_dynamic_links()
-		self.deduplicate_dynamic_links()
 		validate_email(self)
 
+		if self.communication_medium == "Email":
+			self.set_timeline_links()
+			self.deduplicate_timeline_links()
+
 	def validate_reference(self):
 		if self.reference_doctype and self.reference_name:
 			if not self.reference_owner:
@@ -73,14 +76,13 @@ class Communication(Document):
 			# Prevent circular linking of Communication DocTypes
 			if self.reference_doctype == "Communication":
 				circular_linking = False
-				doc = get_parent_doc(self.reference_doctype, self.reference_name)
-				if doc:
-					while doc.reference_doctype == "Communication":
-						if doc:
-							if doc.reference_name == self.name:
-								circular_linking = True
-								break
-						doc = get_parent_doc(doc.reference_doctype, doc.reference_name)
+				doc = get_parent_doc(self)
+				while doc.reference_doctype == "Communication":
+					if get_parent_doc(doc).name==self.name:
+						circular_linking = True
+						break
+					doc = get_parent_doc(doc)
+
 				if circular_linking:
 					frappe.throw(_("Please make sure the Reference Communication Docs are not circularly linked."), frappe.CircularLinkingError)
 
@@ -234,11 +236,19 @@ class Communication(Document):
 				frappe.db.commit()
 
 	# Timeline Links
-	def deduplicate_dynamic_links(self):
-		if self.dynamic_links:
+	def set_timeline_links(self):
+		contacts = get_contacts([self.sender, self.recipients, self.cc, self.bcc])
+		for contact_name in contacts:
+			self.add_link('Contact', contact_name)
+
+			#link contact's dynamic links to communication
+			add_contact_links_to_communication(self, contact_name)
+
+	def deduplicate_timeline_links(self):
+		if self.timeline_links:
 			links, duplicate = [], False
 
-			for l in self.dynamic_links:
+			for l in self.timeline_links:
 				t = (l.link_doctype, l.link_name)
 				if not t in links:
 					links.append(t)
@@ -246,29 +256,12 @@ class Communication(Document):
 					duplicate = True
 
 			if duplicate:
-				del self.dynamic_links[:] # make it python 2 compatible as list.clear() is python 3 only
+				del self.timeline_links[:] # make it python 2 compatible as list.clear() is python 3 only
 				for l in links:
 					self.add_link(link_doctype=l[0], link_name=l[1])
 
-	def validate_dynamic_links(self):
-		circular_linking = False
-		for dynamic_link in self.dynamic_links:
-
-			# Prevent circular linking of Timeline DocTypes
-			if dynamic_link.link_doctype == "Communication":
-				doc = get_parent_doc(dynamic_link.link_doctype, dynamic_link.link_name)
-				if doc:
-					while doc.reference_doctype == "Communication":
-						if doc:
-							if doc.reference_name == self.name:
-								circular_linking = True
-								break
-
-		if circular_linking:
-			frappe.throw(_("Please make sure the Timeline Communication Docs are not circularly linked."), frappe.CircularLinkingError)
-
 	def add_link(self, link_doctype, link_name, autosave=False):
-		self.append("dynamic_links",
+		self.append("timeline_links",
 			{
 				"link_doctype": link_doctype,
 				"link_name": link_name
@@ -279,12 +272,12 @@ class Communication(Document):
 			self.save(ignore_permissions=True)
 
 	def get_links(self):
-		return self.dynamic_links
+		return self.timeline_links
 
 	def remove_link(self, link_doctype, link_name, autosave=False, ignore_permissions=True):
-		for l in self.dynamic_links:
+		for l in self.timeline_links:
 			if l.link_doctype == link_doctype and l.link_name == link_name:
-				self.dynamic_links.remove(l)
+				self.timeline_links.remove(l)
 
 		if autosave:
 			self.save(ignore_permissions=ignore_permissions)
@@ -292,7 +285,6 @@ class Communication(Document):
 def on_doctype_update():
 	"""Add indexes in `tabCommunication`"""
 	frappe.db.add_index("Communication", ["reference_doctype", "reference_name"])
-	frappe.db.add_index("Communication", ["link_doctype", "link_name"])
 	frappe.db.add_index("Communication", ["status", "communication_type"])
 
 def has_permission(doc, ptype, user):
@@ -323,8 +315,38 @@ def get_permission_query_conditions_for_communication(user):
 		return """tabCommunication.email_account in ({email_accounts})"""\
 			.format(email_accounts=','.join(email_accounts))
 
-def get_parent_doc(link_doctype, link_name):
-	"""Returns document of `link_doctype`, `link_name`"""
-	if link_doctype and link_name:
-		parent_doc = frappe.get_doc(link_doctype, link_name)
-	return parent_doc if parent_doc else None
\ No newline at end of file
+def get_contacts(email_strings):
+	email_addrs = []
+
+	for email_string in email_strings:
+		if email_string:
+			for email in email_string.split(","):
+					parsed_email = parseaddr(email)[1]
+					if parsed_email:
+						email_addrs.append(parsed_email)
+
+	contacts = []
+	for email in email_addrs:
+		contact_name = frappe.db.get_value('Contact', {'email_id': email})
+
+		if not contact_name:
+			contact = frappe.get_doc({
+					"doctype": "Contact",
+					"first_name": frappe.unscrub(email.split("@")[0]),
+					"email_id": email
+				}).insert(ignore_permissions=True)
+			contact_name = contact.name
+
+		contacts.append(contact_name)
+
+	return contacts
+
+def add_contact_links_to_communication(communication, contact_name):
+	contact_links = frappe.get_list("Dynamic Link", filters={
+			"parenttype": "Contact",
+			"parent": contact_name
+		}, fields=["link_doctype", "link_name"])
+
+	if contact_links:
+		for contact_link in contact_links:
+			communication.add_link(contact_link.link_doctype, contact_link.link_name)
\ No newline at end of file
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index aea2e148b8..aab0bc9bd6 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -17,7 +17,6 @@ import frappe.email.smtp
 import time
 from frappe import _
 from frappe.utils.background_jobs import enqueue
-from email.utils import parseaddr
 
 @frappe.whitelist()
 def make(doctype=None, name=None, content=None, subject=None, sent_or_received = "Sent",
@@ -79,13 +78,6 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 	# 	comm.reference_doctype = 'Communication'
 	# 	comm.reference_name = comm.name
 
-	contacts = get_contacts([sender, recipients, cc, bcc])
-	for contact_name in contacts:
-		comm.add_link('Contact', contact_name)
-
-		#link contact's dynamic links to communication
-		add_contact_links_to_communication(comm, contact_name)
-
 	comm.save(ignore_permissions=True)
 
 	if isinstance(attachments, string_types):
@@ -567,40 +559,4 @@ def mark_email_as_seen(name=None):
 
 		frappe.response["type"] = 'binary'
 		frappe.response["filename"] = "imaginary_pixel.png"
-		frappe.response["filecontent"] = buffered_obj.getvalue()
-
-def get_contacts(email_strings):
-	email_addrs = []
-
-	for email_string in email_strings:
-		if email_string:
-			for email in email_string.split(","):
-					parsed_email = parseaddr(email)[1]
-					if parsed_email:
-						email_addrs.append(parsed_email)
-
-	contacts = []
-	for email in email_addrs:
-		contact_name = frappe.db.get_value('Contact', {'email_id': email})
-
-		if not contact_name:
-			contact = frappe.get_doc({
-					"doctype": "Contact",
-					"first_name": frappe.unscrub(email.split("@")[0]),
-					"email_id": email
-				}).insert(ignore_permissions=True)
-			contact_name = contact.name
-
-		contacts.append(contact_name)
-
-	return contacts
-
-def add_contact_links_to_communication(communication, contact_name):
-	contact_links = frappe.get_list("Dynamic Link", filters={
-			"parenttype": "Contact",
-			"parent": contact_name
-		}, fields=["link_doctype", "link_name"])
-
-	if contact_links:
-		for contact_link in contact_links:
-			communication.add_link(contact_link.link_doctype, contact_link.link_name)
\ No newline at end of file
+		frappe.response["filecontent"] = buffered_obj.getvalue()
\ No newline at end of file
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index fa8b409b1f..6ef94883f7 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -20,7 +20,7 @@ from datetime import datetime, timedelta
 from frappe.desk.form import assign_to
 from frappe.utils.user import get_system_managers
 from frappe.utils.background_jobs import enqueue, get_jobs
-from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts, get_contacts, add_contact_links_to_communication
+from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts
 from frappe.utils.scheduler import log
 from frappe.utils.html_utils import clean_email_html
 
@@ -386,13 +386,6 @@ class EmailAccount(Document):
 			users = list(set([ user.get("parent") for user in users ]))
 			communication._seen = json.dumps(users)
 
-		contacts = get_contacts([email.from_email, email.mail.get("To"), email.mail.get("CC"), email.from_email])
-		for contact_name in contacts:
-			communication.add_link('Contact', contact_name)
-
-			#link contact's dynamic links to communication
-			add_contact_links_to_communication(communication, contact_name)
-
 		communication.flags.in_receive = True
 		communication.insert(ignore_permissions=True)
 

From dbd0a79ffc7e3672e42de6fd635ac4951e6470dd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 17 May 2019 14:26:53 +0530
Subject: [PATCH 141/175] patch: move timeline and link to dynamic links

---
 .../v12_0/move_timeline_links_to_dynamic_links.py    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 0bb266269e..9a22f2d536 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -8,13 +8,23 @@ def execute():
 			fields=[
 				"name", "creation", "modified", "modified_by",
 				"timeline_doctype", "timeline_name",
+				"link_doctype", "link_name"
 			]):
+		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
 			comm_lists.append((
-				"1", frappe.generate_hash(length=10), "dynamic_links", "Communication",
+				counter, frappe.generate_hash(length=10), "timeline_links", "Communication",
 				communication.name, communication.timeline_doctype, communication.timeline_name,
 				communication.creation, communication.modified, communication.modified_by
 			))
+			counter += 1
+
+		if communication.link_doctype and communication.link_name:
+			comm_lists.append((
+				counter, frappe.generate_hash(length=10), "timeline_links", "Communication",
+				communication.name, communication.link_doctype, communication.link_name,
+				communication.creation, communication.modified, communication.modified_by
+			))
 
 	for comm_list in comm_lists:
 		frappe.db.sql("""

From 9f02f4284d156a2b9f4f6e197fd73295c513d642 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 18 May 2019 00:35:17 +0530
Subject: [PATCH 142/175] patch: optimisations

---
 .../doctype/communication/communication.json  | 19 +----
 .../move_timeline_links_to_dynamic_links.py   | 73 ++++++++++++++-----
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index 6642fd60f4..9492bd205b 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -41,8 +41,6 @@
   "user",
   "column_break_27",
   "email_template",
-  "link_doctype",
-  "link_name",
   "unread_notification_sent",
   "seen",
   "_user_tags",
@@ -285,20 +283,6 @@
    "fieldname": "column_break_27",
    "fieldtype": "Column Break"
   },
-  {
-   "fieldname": "link_doctype",
-   "fieldtype": "Link",
-   "label": "Link DocType",
-   "options": "DocType",
-   "read_only": 1
-  },
-  {
-   "fieldname": "link_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Link Name",
-   "options": "link_doctype",
-   "read_only": 1
-  },
   {
    "default": "0",
    "fieldname": "unread_notification_sent",
@@ -397,7 +381,7 @@
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-17 13:52:44.471256",
+ "modified": "2019-05-18 00:34:57.100559",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Communication",
@@ -432,6 +416,7 @@
   }
  ],
  "search_fields": "subject",
+ "sort_field": "modified",
  "sort_order": "DESC",
  "title_field": "subject",
  "track_changes": 1,
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 9a22f2d536..d8d249ae73 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -4,32 +4,65 @@ import frappe
 
 def execute():
 	comm_lists = []
-	for communication in frappe.get_list("Communication", filters={"communication_medium": "Email"},
-			fields=[
-				"name", "creation", "modified", "modified_by",
-				"timeline_doctype", "timeline_name",
-				"link_doctype", "link_name"
-			]):
+	for communication in frappe.db.sql("""
+				Select
+					`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
+					`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
+					`tabCommunication`.link_doctype, `tabCommunication`.link_name
+				from `tabCommunication`
+				where `tabCommunication`.communication_medium='Email'
+			""", as_dict=True):
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
-			comm_lists.append((
-				counter, frappe.generate_hash(length=10), "timeline_links", "Communication",
-				communication.name, communication.timeline_doctype, communication.timeline_name,
-				communication.creation, communication.modified, communication.modified_by
-			))
+			comm_lists.append(
+				{
+					"idx": counter,
+					"name": frappe.generate_hash(length=10),
+					"parentfield": "timeline_links",
+					"parenttype": "Communication",
+					"parent": communication.name,
+					"link_doctype": communication.timeline_doctype,
+					"link_name": communication.timeline_name,
+					"creation": communication.creation,
+					"modified": communication.modified,
+					"modified_by": communication.modified_by
+				}
+			)
 			counter += 1
 
 		if communication.link_doctype and communication.link_name:
-			comm_lists.append((
-				counter, frappe.generate_hash(length=10), "timeline_links", "Communication",
-				communication.name, communication.link_doctype, communication.link_name,
-				communication.creation, communication.modified, communication.modified_by
-			))
+			comm_lists.append(
+				{
+					"idx": counter,
+					"name": frappe.generate_hash(length=10),
+					"parentfield": "timeline_links",
+					"parenttype": "Communication",
+					"parent": communication.name,
+					"link_doctype": communication.link_doctype,
+					"link_name": communication.link_name,
+					"creation": communication.creation,
+					"modified": communication.modified,
+					"modified_by": communication.modified_by
+				}
+			)
 
 	for comm_list in comm_lists:
 		frappe.db.sql("""
-			insert into table `tabDynamic Link` (idx, name, parentfield, parenttype, parent, link_doctype, link_name, creation, modified, modified_by)
-			values %(values)s""",
-		{
-			"values": comm_list
+			INSERT INTO `tabDynamic Link`
+				(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+				`modified`, `modified_by`)
+			VALUES
+				(%(idx)s, %(name)s, %(parentfield)s, %(parenttype)s, %(parent)s, %(link_doctype)s, %(link_name)s,%(creation)s,
+				%(modified)s, %(modified_by)s)
+		""",{
+			"idx": comm_list.get("idx"),
+			"name": comm_list.get("name"),
+			"parentfield": comm_list.get("parentfield"),
+			"parenttype": comm_list.get("parenttype"),
+			"parent": comm_list.get("parent"),
+			"link_doctype": comm_list.get("link_doctype"),
+			"link_name": comm_list.get("link_name"),
+			"creation": comm_list.get("creation"),
+			"modified": comm_list.get("modified"),
+			"modified_by": comm_list.get("modified_by")
 		})
\ No newline at end of file

From 0050fb58ffe13f9afb7131768e237c16512c671b Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 18 May 2019 10:40:55 +0530
Subject: [PATCH 143/175] fix: remove clear reference links from delete doc

---
 frappe/model/delete_doc.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 73c6719d2b..8a557f3b3f 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -280,7 +280,6 @@ def delete_dynamic_links(doctype, name):
 	# unlink communications
 	clear_timeline_references(doctype, name)
 	clear_references('Communication', doctype, name)
-	clear_references('Communication', doctype, name, 'link_doctype', 'link_name')
 
 	clear_references('Activity Log', doctype, name)
 	clear_references('Activity Log', doctype, name, 'timeline_doctype', 'timeline_name')

From d6d0bc1cb34895fb97baaa7aba3bfd1ffdba3bf2 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Thu, 16 May 2019 16:45:05 +0530
Subject: [PATCH 144/175] Allow popover to be hovered on and other fixes

---
 frappe/public/js/frappe/ui/link_preview.js | 44 +++++++++++++++-------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/frappe/public/js/frappe/ui/link_preview.js b/frappe/public/js/frappe/ui/link_preview.js
index 538b187d9f..962adcf344 100644
--- a/frappe/public/js/frappe/ui/link_preview.js
+++ b/frappe/public/js/frappe/ui/link_preview.js
@@ -28,7 +28,9 @@ frappe.ui.LinkPreview = class {
 		if (this.is_link) {
 			this.doctype = this.element.attr('data-doctype');
 			this.name = this.element.attr('data-name');
+			this.href = this.element.attr('href');
 		} else {
+			this.href = this.element.parents('.control-input-wrapper').find('.control-value a').attr('href');
 			// input
 			this.doctype = this.element.attr('data-target');
 			this.name = this.element.val();
@@ -36,7 +38,11 @@ frappe.ui.LinkPreview = class {
 	}
 
 	setup_popover_control(e) {
-		if(!this.popover) {
+		//If control field value is changed, new popover has to be created
+		this.element.on('change',()=> {
+			this.new_popover = true;
+		});
+		if(!this.popover || this.new_popover) {
 			this.get_preview_fields().then(preview_fields => {
 				if(preview_fields.length) {
 					this.data_timeout = setTimeout(() => {
@@ -49,13 +55,14 @@ frappe.ui.LinkPreview = class {
 				if (this.element.is(':focus')) {
 					return;
 				}
-				this.popover.show();
+				this.show_popover(e);
 			}, 1000);
 		}
 		this.handle_popover_hide();
 	}
 
 	create_popover(e, preview_fields) {
+		this.new_popover = false;
 		if (this.element.is(':focus')) {
 			return;
 		}
@@ -73,31 +80,37 @@ frappe.ui.LinkPreview = class {
 					} else {
 						this.init_preview_popover(preview_data);
 					}
-
-					if(!this.is_link) {
-						var left = e.pageX;
-						this.element.popover('show');
-						var width = $('.popover').width();
-						$('.control-field-popover').css('left', (left-(width/2)) + 'px');
-					} else {
-						this.element.popover('show');
-					}
+					this.show_popover(e);
 
 				}, 1000);
 			}
 		});
 	}
 
+	show_popover(e) {
+		if(!this.is_link) {
+			var left = e.pageX;
+			this.element.popover('show');
+			var width = $('.popover').width();
+			$('.control-field-popover').css('left', (left-(width/2)) + 'px');
+		} else {
+			this.element.popover('show');
+		}
+	}
+
 	handle_popover_hide() {
 		$(document.body).on('mouseout', this.LINK_CLASSES, () => {
-			this.link_hovered = false;
+			// To allow popover to be hovered on
+			if (!$('.popover:hover').length) {
+				this.link_hovered = false;
+			}
 			if(this.data_timeout) {
 				clearTimeout(this.data_timeout);
 			}
 			if (this.popover_timeout) {
 				clearTimeout(this.popover_timeout);
 			}
-			this.clear_all_popovers();
+			if(!this.link_hovered) this.clear_all_popovers();
 		});
 
 		$(window).on('hashchange', () => {
@@ -183,7 +196,7 @@ frappe.ui.LinkPreview = class {
 		let id_html = '';
 		let content_html = '';
 		let meta = frappe.get_meta(this.doctype);
-		let title = preview_data[meta.title_field];
+		let title = preview_data.title;
 
 		if(preview_data[meta.image_field]) {
 			let image_url = encodeURI(preview_data[meta.image_field]);
@@ -197,6 +210,9 @@ frappe.ui.LinkPreview = class {
 		if(title && title != preview_data.name) {
 			id_html+= `<a class="text-muted" href=${this.href}>${preview_data.name}</a>`;
 		}
+		if(!title) {
+			title = preview_data.name;
+		}
 
 		Object.keys(preview_data).forEach(key => {
 			if(key!=meta.image_field && key!='name' && key!=meta.title_field) {

From defe1b2eef0da56261673d0c2887c391dce97037 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 18 May 2019 13:37:00 +0530
Subject: [PATCH 145/175] fix: miscellaneous changes

---
 .../doctype/communication/communication.js    |  2 +-
 frappe/desk/doctype/todo/todo.py              |  7 +-
 frappe/desk/form/load.py                      |  3 +-
 frappe/patches.txt                            |  2 -
 .../move_timeline_links_to_dynamic_links.py   | 85 ++++++-------------
 5 files changed, 35 insertions(+), 64 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 4734f6a11a..180ba8d25c 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -43,7 +43,7 @@ frappe.ui.form.on("Communication", {
 			});
 		}
 
-		frm.add_custom_button(__("Add Primary link"), function() {
+		frm.add_custom_button(__("Change Reference Link"), function() {
 			frm.trigger('show_relink_dialog');
 		}, "Links");
 
diff --git a/frappe/desk/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py
index 45c3874806..051d26d7be 100644
--- a/frappe/desk/doctype/todo/todo.py
+++ b/frappe/desk/doctype/todo/todo.py
@@ -43,8 +43,11 @@ class ToDo(Document):
 
 	def on_trash(self):
 		# unlink todo from linked comments
-		frappe.db.sql("""update `tabCommunication` set link_doctype=null, link_name=null
-			where link_doctype=%(doctype)s and link_name=%(name)s""", {"doctype": self.doctype, "name": self.name})
+		frappe.db.sql("""
+			delete from `tabDynamic Link`
+			where link_doctype=%(doctype)s and link_name=%(name)s""", {
+				"doctype": self.doctype, "name": self.name
+		})
 
 		self.update_in_reference()
 
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 102972f331..2985a8858e 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -166,8 +166,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			`tabCommunication`.sender, `tabCommunication`.sender_full_name, `tabCommunication`.cc, `tabCommunication`.bcc,
 			`tabCommunication`.creation, `tabCommunication`.subject, `tabCommunication`.delivery_status,
 			`tabCommunication`._liked_by, `tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
-			`tabCommunication`.link_doctype, `tabCommunication`.link_name, `tabCommunication`.read_by_recipient,
-			`tabCommunication`.rating
+			`tabCommunication`.read_by_recipient, `tabCommunication`.rating
 		'''
 
 	conditions = '''
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 15f9ad8c73..911e793687 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -241,6 +241,4 @@ frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
 frappe.patches.v12_0.remove_feedback_rating
-execute:frappe.reload_doc('core', 'doctype', 'communication')
-execute:frappe.reload_doc('core', 'doctype', 'dynamic_link')
 frappe.patches.v12_0.move_timeline_links_to_dynamic_links
\ No newline at end of file
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index d8d249ae73..9d6cfffb84 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -3,66 +3,37 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	comm_lists = []
-	for communication in frappe.db.sql("""
-				Select
-					`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
-					`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
-					`tabCommunication`.link_doctype, `tabCommunication`.link_name
-				from `tabCommunication`
-				where `tabCommunication`.communication_medium='Email'
-			""", as_dict=True):
+	frappe.reload_doc('core', 'doctype', 'communication')
+
+	sql_query =	"""INSERT INTO `tabDynamic Link`
+					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+					`modified`, `modified_by`)
+				VALUES """
+
+	communications = frappe.db.sql("""
+						Select
+							`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
+							`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
+							`tabCommunication`.link_doctype, `tabCommunication`.link_name
+						from `tabCommunication`
+						where `tabCommunication`.communication_medium='Email'
+					""", as_dict=True)
+
+	for communication in communications:
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
-			comm_lists.append(
-				{
-					"idx": counter,
-					"name": frappe.generate_hash(length=10),
-					"parentfield": "timeline_links",
-					"parenttype": "Communication",
-					"parent": communication.name,
-					"link_doctype": communication.timeline_doctype,
-					"link_name": communication.timeline_name,
-					"creation": communication.creation,
-					"modified": communication.modified,
-					"modified_by": communication.modified_by
-				}
-			)
+			sql_query += str((
+					counter, frappe.generate_hash(length=10), "timeline_links", "Communication", communication.name,
+					communication.timeline_doctype, communication.timeline_name, communication.creation,
+					communication.modified, communication.modified_by
+				)) + """, """
 			counter += 1
 
 		if communication.link_doctype and communication.link_name:
-			comm_lists.append(
-				{
-					"idx": counter,
-					"name": frappe.generate_hash(length=10),
-					"parentfield": "timeline_links",
-					"parenttype": "Communication",
-					"parent": communication.name,
-					"link_doctype": communication.link_doctype,
-					"link_name": communication.link_name,
-					"creation": communication.creation,
-					"modified": communication.modified,
-					"modified_by": communication.modified_by
-				}
-			)
+			sql_query += str((
+					counter, frappe.generate_hash(length=10), "timeline_links", "Communication", communication.name,
+					communication.link_doctype, communication.link_name, communication.creation,
+					communication.modified, communication.modified_by
+			)) + """, """
 
-	for comm_list in comm_lists:
-		frappe.db.sql("""
-			INSERT INTO `tabDynamic Link`
-				(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-				`modified`, `modified_by`)
-			VALUES
-				(%(idx)s, %(name)s, %(parentfield)s, %(parenttype)s, %(parent)s, %(link_doctype)s, %(link_name)s,%(creation)s,
-				%(modified)s, %(modified_by)s)
-		""",{
-			"idx": comm_list.get("idx"),
-			"name": comm_list.get("name"),
-			"parentfield": comm_list.get("parentfield"),
-			"parenttype": comm_list.get("parenttype"),
-			"parent": comm_list.get("parent"),
-			"link_doctype": comm_list.get("link_doctype"),
-			"link_name": comm_list.get("link_name"),
-			"creation": comm_list.get("creation"),
-			"modified": comm_list.get("modified"),
-			"modified_by": comm_list.get("modified_by")
-		})
\ No newline at end of file
+	frappe.db.sql(sql_query)

From 6c3130dc77c4e5a65fe8ebd46156791f9325a45f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sat, 18 May 2019 16:42:56 +0530
Subject: [PATCH 146/175] fix: Allow variables to be overridden using theme
 (#7514)

---
 frappe/public/scss/variables.scss | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/frappe/public/scss/variables.scss b/frappe/public/scss/variables.scss
index ac9bf6cf03..6ee7cda884 100644
--- a/frappe/public/scss/variables.scss
+++ b/frappe/public/scss/variables.scss
@@ -1,20 +1,20 @@
-$gray-100: #fafbfc;
-$gray-150: #f5f7fa;
-$gray-200: #ebecf1;
-$gray-300: #d1d8dd;
-$gray-400: #ced4da;
-$gray-500: #adb5bd;
-$gray-600: #8d99a6;
-$gray-700: #495057;
-$gray-800: #36414c;
-$gray-900: #2e3338;
-$primary:	#5e64ff;
+$gray-100: #fafbfc !default;
+$gray-150: #f5f7fa !default;
+$gray-200: #ebecf1 !default;
+$gray-300: #d1d8dd !default;
+$gray-400: #ced4da !default;
+$gray-500: #adb5bd !default;
+$gray-600: #8d99a6 !default;
+$gray-700: #495057 !default;
+$gray-800: #36414c !default;
+$gray-900: #2e3338 !default;
+$primary: #5e64ff !default;
 
-$black: #000;
+$black: #000 !default;
 
-$body-color: $gray-800;
-$text-muted: $gray-600;
-$border-color: $gray-200;
+$body-color: $gray-800 !default;
+$text-muted: $gray-600 !default;
+$border-color: $gray-200 !default;
 
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";

From 6403cf45ae2baf2110cb5cb2d03a324affcc87bb Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 18 May 2019 18:54:47 +0530
Subject: [PATCH 147/175] patch: optimisations

---
 .../move_timeline_links_to_dynamic_links.py   | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 9d6cfffb84..507ed05e18 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -5,11 +5,6 @@ import frappe
 def execute():
 	frappe.reload_doc('core', 'doctype', 'communication')
 
-	sql_query =	"""INSERT INTO `tabDynamic Link`
-					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-					`modified`, `modified_by`)
-				VALUES """
-
 	communications = frappe.db.sql("""
 						Select
 							`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
@@ -19,21 +14,32 @@ def execute():
 						where `tabCommunication`.communication_medium='Email'
 					""", as_dict=True)
 
-	for communication in communications:
+	values = []
+	for count, communication in enumerate(communications):
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
-			sql_query += str((
-					counter, frappe.generate_hash(length=10), "timeline_links", "Communication", communication.name,
-					communication.timeline_doctype, communication.timeline_name, communication.creation,
-					communication.modified, communication.modified_by
-				)) + """, """
+			values.append("""({0}, '{1}', 'timeline_links', 'Communication', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}')""".format(
+				counter, frappe.generate_hash(length=10), communication.name, communication.timeline_doctype,
+				communication.timeline_name, communication.creation, communication.modified, communication.modified_by
+			))
 			counter += 1
-
 		if communication.link_doctype and communication.link_name:
-			sql_query += str((
-					counter, frappe.generate_hash(length=10), "timeline_links", "Communication", communication.name,
-					communication.link_doctype, communication.link_name, communication.creation,
-					communication.modified, communication.modified_by
-			)) + """, """
-
-	frappe.db.sql(sql_query)
+			values.append("""({0}, '{1}', 'timeline_links', 'Communication', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}')""".format(
+				counter, frappe.generate_hash(length=10), communication.name, communication.link_doctype,
+				communication.link_name, communication.creation, communication.modified, communication.modified_by
+			))
+		if count % 200 == 0 or count == len(communications) - 1:
+			print("""
+				INSERT INTO `tabDynamic Link`
+					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+					`modified`, `modified_by`)
+				VALUES {0}
+			""".format(", ".join([d for d in values])))
+			frappe.db.sql("""
+				INSERT INTO `tabDynamic Link`
+					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+					`modified`, `modified_by`)
+				VALUES {0}
+			""".format(", ".join([d for d in values])))
+			# frappe.throw("YA")
+			values = []
\ No newline at end of file

From c52c1611cb462a7f7bf12f7735634db3e4e7edee Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sat, 18 May 2019 19:17:00 +0530
Subject: [PATCH 148/175] patch: optimisations

---
 .../v12_0/move_timeline_links_to_dynamic_links.py      | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 507ed05e18..cbc3846604 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -15,6 +15,7 @@ def execute():
 					""", as_dict=True)
 
 	values = []
+
 	for count, communication in enumerate(communications):
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
@@ -28,18 +29,11 @@ def execute():
 				counter, frappe.generate_hash(length=10), communication.name, communication.link_doctype,
 				communication.link_name, communication.creation, communication.modified, communication.modified_by
 			))
-		if count % 200 == 0 or count == len(communications) - 1:
-			print("""
-				INSERT INTO `tabDynamic Link`
-					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-					`modified`, `modified_by`)
-				VALUES {0}
-			""".format(", ".join([d for d in values])))
+		if count % 1000 == 0 or count == len(communications) - 1:
 			frappe.db.sql("""
 				INSERT INTO `tabDynamic Link`
 					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
 					`modified`, `modified_by`)
 				VALUES {0}
 			""".format(", ".join([d for d in values])))
-			# frappe.throw("YA")
 			values = []
\ No newline at end of file

From 05b3050b630501ef11c413bb280492eb4d32c063 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Sun, 19 May 2019 00:39:11 +0530
Subject: [PATCH 149/175] patch: batch 10000 query for patch

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

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index cbc3846604..ff61208bf4 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -29,7 +29,7 @@ def execute():
 				counter, frappe.generate_hash(length=10), communication.name, communication.link_doctype,
 				communication.link_name, communication.creation, communication.modified, communication.modified_by
 			))
-		if count % 1000 == 0 or count == len(communications) - 1:
+		if count % 10000 == 0 or count == len(communications) - 1:
 			frappe.db.sql("""
 				INSERT INTO `tabDynamic Link`
 					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,

From ba7af52caa3cf201b487f6e8b785aa1403b65a33 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sun, 19 May 2019 17:44:46 +0530
Subject: [PATCH 150/175] fix: Module view fix for custom reports

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

diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py
index a9a460b124..ccde3aad40 100644
--- a/frappe/desk/moduleview.py
+++ b/frappe/desk/moduleview.py
@@ -383,7 +383,7 @@ def get_report_list(module, is_standard="No"):
 		out.append({
 			"type": "report",
 			"doctype": r.ref_doctype,
-			"is_query_report": 1 if r.report_type in ("Query Report", "Script Report") else 0,
+			"is_query_report": 1 if r.report_type in ("Query Report", "Script Report", "Custom Report") else 0,
 			"label": _(r.name),
 			"name": r.name
 		})

From a873340d4e928e36c7182fa2e9dac153b1796859 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 20 May 2019 12:19:42 +0530
Subject: [PATCH 151/175] fix: Create new button for dynamic links (#7511)

* fix: Create new button for dynamic links

* fix: Use get_options for fetching options
---
 frappe/public/js/frappe/form/controls/link.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index a7ed3f8a72..750ad7a64c 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -168,13 +168,12 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 					}
 
 					if(!me.df.only_select) {
-						if(frappe.model.can_create(doctype)
-							&& me.df.fieldtype !== "Dynamic Link") {
+						if(frappe.model.can_create(doctype)) {
 							// new item
 							r.results.push({
 								label: "<span class='text-primary link-option'>"
 									+ "<i class='fa fa-plus' style='margin-right: 5px;'></i> "
-									+ __("Create a new {0}", [__(me.df.options)])
+									+ __("Create a new {0}", [__(me.get_options())])
 									+ "</span>",
 								value: "create_new__link_option",
 								action: me.new_doc

From 1a58c13966cb40d7ea7e04af5af50fde310ecb52 Mon Sep 17 00:00:00 2001
From: jibin jose <jibinjose.in@gmail.com>
Date: Thu, 16 May 2019 16:03:17 +0530
Subject: [PATCH 152/175] fix(postgres): Make db queries postgres compatible

---
 .../doctype/communication/communication.py    |  4 +-
 frappe/database/postgres/schema.py            | 17 +++++++-
 frappe/desk/doctype/todo/todo.py              |  4 +-
 frappe/model/__init__.py                      | 42 +++++++++++++------
 .../v11_0/set_default_letter_head_source.py   |  2 +-
 frappe/patches/v12_0/init_desk_settings.py    |  2 +-
 .../setup_comments_from_communications.py     |  2 +-
 7 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 77ccefba71..4f9f07d803 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -265,8 +265,8 @@ def get_permission_query_conditions_for_communication(user):
 			distinct=True, order_by="idx")
 
 		if not accounts:
-			return """tabCommunication.communication_medium!='Email'"""
+			return """`tabCommunication`.communication_medium!='Email'"""
 
 		email_accounts = [ '"%s"'%account.get("email_account") for account in accounts ]
-		return """tabCommunication.email_account in ({email_accounts})"""\
+		return """`tabCommunication`.email_account in ({email_accounts})"""\
 			.format(email_accounts=','.join(email_accounts))
diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index 05b6b19a9a..b5129b60bb 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -40,7 +40,20 @@ class PostgresTable(DBTable):
 			query.append("ADD COLUMN `{}` {}".format(col.fieldname, col.get_definition()))
 
 		for col in self.change_type:
-			query.append("ALTER COLUMN `{}` TYPE {}".format(col.fieldname, get_definition(col.fieldtype, precision=col.precision, length=col.length)))
+			using_clause = ""
+			if col.fieldtype in ("Datetime"):
+				# The USING option of SET DATA TYPE can actually specify any expression
+				# involving the old values of the row
+				# read more https://www.postgresql.org/docs/9.1/sql-altertable.html
+				using_clause = "USING {}::timestamp without time zone".format(col.fieldname)
+			elif col.fieldtype in ("Check"):
+				using_clause = "USING {}::smallint".format(col.fieldname)
+
+			query.append("ALTER COLUMN {0} TYPE {1} {2}".format(
+				col.fieldname,
+				get_definition(col.fieldtype, precision=col.precision, length=col.length),
+				using_clause)
+			)
 
 		for col in self.set_default:
 			if col.fieldname=="name":
@@ -93,4 +106,4 @@ class PostgresTable(DBTable):
 						fieldname, self.table_name)))
 					raise e
 				else:
-					raise e
\ No newline at end of file
+					raise e
diff --git a/frappe/desk/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py
index 45c3874806..c9fa96c716 100644
--- a/frappe/desk/doctype/todo/todo.py
+++ b/frappe/desk/doctype/todo/todo.py
@@ -94,7 +94,7 @@ def get_permission_query_conditions(user):
 	if "System Manager" in frappe.get_roles(user):
 		return None
 	else:
-		return """(tabToDo.owner = {user} or tabToDo.assigned_by = {user})"""\
+		return """(`tabToDo`.owner = {user} or `tabToDo`.assigned_by = {user})"""\
 			.format(user=frappe.db.escape(user))
 
 def has_permission(doc, user):
@@ -108,4 +108,4 @@ def new_todo(description):
 	frappe.get_doc({
 		'doctype': 'ToDo',
 		'description': description
-	}).insert()
\ No newline at end of file
+	}).insert()
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 5f804e3c36..3a8868ec2c 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -76,27 +76,43 @@ def delete_fields(args_dict, delete=0):
 		args_dict = { dt: [field names] }
 	"""
 	import frappe.utils
-	for dt in list(args_dict):
+	for dt in args_dict:
 		fields = args_dict[dt]
-		if not fields: continue
+		if not fields:
+			continue
 
-		frappe.db.sql("""\
+		frappe.db.sql("""
 			DELETE FROM `tabDocField`
-			WHERE parent=%s AND fieldname IN (%s)
-		""" % ('%s', ", ".join(['"' + f + '"' for f in fields])), dt)
+			WHERE parent='%s' AND fieldname IN (%s)
+		""" % (dt, ", ".join(["'{}'".format(f) for f in fields])))
 
-		# Delete the data / column only if delete is specified
-		if not delete: continue
+		# Delete the data/column only if delete is specified
+		if not delete:
+			continue
 
 		if frappe.db.get_value("DocType", dt, "issingle"):
-			frappe.db.sql("""\
+			frappe.db.sql("""
 				DELETE FROM `tabSingles`
-				WHERE doctype=%s AND field IN (%s)
-			""" % ('%s', ", ".join(['"' + f + '"' for f in fields])), dt)
+				WHERE doctype='%s' AND field IN (%s)
+			""" % (dt, ", ".join(["'{}'".format(f) for f in fields])))
 		else:
-			existing_fields = frappe.db.sql("desc `tab%s`" % dt)
+			existing_fields = frappe.db.multisql({
+					"mariadb": "DESC `tab%s`" % dt,
+					"postgres": """
+						SELECT
+ 							COLUMN_NAME
+						FROM
+ 							information_schema.COLUMNS
+						WHERE
+ 							TABLE_NAME = 'tab%s';
+					""" % dt,
+				})
 			existing_fields = existing_fields and [e[0] for e in existing_fields] or []
+			fields_need_to_delete = set(fields) & set(existing_fields)
+			if not fields_need_to_delete:
+				continue
 			query = "ALTER TABLE `tab%s` " % dt + \
-				", ".join(["DROP COLUMN `%s`" % f for f in fields if f in existing_fields])
-			frappe.db.commit()
+				", ".join(["DROP COLUMN `%s`" % f for f in fields_need_to_delete])
 			frappe.db.sql(query)
+		# commit the results to db
+		frappe.db.commit()
diff --git a/frappe/patches/v11_0/set_default_letter_head_source.py b/frappe/patches/v11_0/set_default_letter_head_source.py
index 069f4e3d2e..a43ea397e4 100644
--- a/frappe/patches/v11_0/set_default_letter_head_source.py
+++ b/frappe/patches/v11_0/set_default_letter_head_source.py
@@ -6,4 +6,4 @@ def execute():
     frappe.reload_doctype('Letter Head')
 
     # source of all existing letter heads must be HTML
-    frappe.db.sql('update `tabLetter Head` set source = "HTML"')
\ No newline at end of file
+    frappe.db.sql("update `tabLetter Head` set source = 'HTML'")
diff --git a/frappe/patches/v12_0/init_desk_settings.py b/frappe/patches/v12_0/init_desk_settings.py
index 782ced8a26..31c6cf9207 100644
--- a/frappe/patches/v12_0/init_desk_settings.py
+++ b/frappe/patches/v12_0/init_desk_settings.py
@@ -8,4 +8,4 @@ from frappe.desk.moduleview import get_onboard_items
 def execute():
 	"""Reset the initial customizations for desk, with modules, indices and links."""
 	frappe.reload_doc("core", "doctype", "user")
-	frappe.db.sql("""update tabUser set home_settings = %s""", (''), debug=True)
+	frappe.db.sql("""update `tabUser` set home_settings = %s""", (''), debug=True)
diff --git a/frappe/patches/v12_0/setup_comments_from_communications.py b/frappe/patches/v12_0/setup_comments_from_communications.py
index 1a7a5aef84..b52304bc05 100644
--- a/frappe/patches/v12_0/setup_comments_from_communications.py
+++ b/frappe/patches/v12_0/setup_comments_from_communications.py
@@ -25,4 +25,4 @@ def execute():
         new_comment.db_insert()
 
     # clean up
-    frappe.db.sql('delete from tabCommunication where communication_type = "Comment"')
\ No newline at end of file
+    frappe.db.sql("delete from `tabCommunication` where communication_type = 'Comment'")

From 480f1794d37c524893645e296e22a37490a2795e Mon Sep 17 00:00:00 2001
From: jibin jose <jibinjose.in@gmail.com>
Date: Mon, 20 May 2019 12:29:45 +0530
Subject: [PATCH 153/175] Make db query postgres compatible

---
 frappe/patches/v12_0/update_print_format_type.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/patches/v12_0/update_print_format_type.py b/frappe/patches/v12_0/update_print_format_type.py
index 33035abc2a..577dc68d94 100644
--- a/frappe/patches/v12_0/update_print_format_type.py
+++ b/frappe/patches/v12_0/update_print_format_type.py
@@ -3,11 +3,11 @@ import frappe
 def execute():
 	frappe.db.sql('''
 		UPDATE `tabPrint Format`
-		SET `print_format_type` = "Jinja"
-		WHERE `print_format_type` in ("Server", "Client")
+		SET `print_format_type` = 'Jinja'
+		WHERE `print_format_type` in ('Server', 'Client')
 	''')
 	frappe.db.sql('''
 		UPDATE `tabPrint Format`
-		SET `print_format_type` = "JS"
-		WHERE `print_format_type` = "Js"
+		SET `print_format_type` = 'JS'
+		WHERE `print_format_type` = 'Js'
 	''')

From 127cf29a2037c7f33afdcc151526d84265dd1dc5 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 20 May 2019 13:04:16 +0530
Subject: [PATCH 154/175] tests: added new test cases

---
 .../doctype/communication/communication.json  |  18 ++-
 .../doctype/communication/communication.py    |   6 +-
 frappe/core/doctype/communication/email.py    |   5 -
 .../communication/test_communication.py       | 107 ++++++++++++++++++
 .../move_timeline_links_to_dynamic_links.py   |  57 ++++++----
 5 files changed, 157 insertions(+), 36 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index 9492bd205b..3eeb63ceb9 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -368,6 +368,7 @@
    "read_only": 1
   },
   {
+   "collapsible": 1,
    "fieldname": "timeline_links_sections",
    "fieldtype": "Section Break",
    "label": "Timeline Links"
@@ -376,13 +377,14 @@
    "fieldname": "timeline_links",
    "fieldtype": "Table",
    "label": "Timeline Links",
-   "options": "Dynamic Link"
+   "options": "Dynamic Link",
+   "permlevel": 2
   }
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-18 00:34:57.100559",
- "modified_by": "Administrator",
+ "modified": "2019-05-20 12:34:21.021632",
+ "modified_by": "faris@erpnext.com",
  "module": "Core",
  "name": "Communication",
  "owner": "Administrator",
@@ -407,6 +409,16 @@
    "role": "System Manager",
    "share": 1
   },
+  {
+   "email": 1,
+   "export": 1,
+   "permlevel": 2,
+   "print": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
   {
    "delete": 1,
    "email": 1,
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 72885d8288..c164f7f8e0 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -321,9 +321,9 @@ def get_contacts(email_strings):
 	for email_string in email_strings:
 		if email_string:
 			for email in email_string.split(","):
-					parsed_email = parseaddr(email)[1]
-					if parsed_email:
-						email_addrs.append(parsed_email)
+				parsed_email = parseaddr(email)[1]
+				if parsed_email:
+					email_addrs.append(parsed_email)
 
 	contacts = []
 	for email in email_addrs:
diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index aab0bc9bd6..36377a90f7 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -73,11 +73,6 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
 		"has_attachment": 1 if attachments else 0
 	}).insert(ignore_permissions=True)
 
-	# if not doctype:
-	# 	# if no reference given, then send it against the communication
-	# 	comm.reference_doctype = 'Communication'
-	# 	comm.reference_name = comm.name
-
 	comm.save(ignore_permissions=True)
 
 	if isinstance(attachments, string_types):
diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 715afe2cb3..5b0ad3f3b0 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -71,3 +71,110 @@ class TestCommunication(unittest.TestCase):
 		a.reference_name = c.name
 
 		self.assertRaises(frappe.CircularLinkingError, a.save)
+
+	def test_deduplication_timeline_links(self):
+		todo = frappe.get_doc({
+			"doctype": "ToDo",
+			"description": "Test ToDo"
+		}).insert(ignore_permissions=True)
+
+		comm = frappe.get_doc({
+			"doctype": "Communication",
+			"communication_type": "Communication",
+			"content": "Deduplication of Links",
+			"communication_medium": "Email",
+			"timeline_links": [
+				{
+					"link_doctype": "ToDo",
+					"link_name": todo.name
+				},
+				{
+					"link_doctype": "ToDo",
+					"link_name": todo.name
+				}
+			]
+		}).insert(ignore_permissions=True)
+
+		comm = frappe.get_doc("Communication", comm.name)
+
+		self.assertNotEqual(2, len(comm.timeline_links))
+
+	def test_contacts_attached(self):
+		contact_sender = frappe.get_doc({
+			"doctype": "Contact",
+			"first_name": frappe.generate_hash(length=10),
+			"email_id": "comm_sender@example.com"
+		}).insert(ignore_permissions=True)
+
+		contact_recipient = frappe.get_doc({
+			"doctype": "Contact",
+			"first_name": frappe.generate_hash(length=10),
+			"email_id": "comm_recipient@example.com"
+		}).insert(ignore_permissions=True)
+
+		contact_cc = frappe.get_doc({
+			"doctype": "Contact",
+			"first_name": frappe.generate_hash(length=10),
+			"email_id": "comm_cc@example.com"
+		}).insert(ignore_permissions=True)
+
+		comm = frappe.get_doc({
+			"doctype": "Communication",
+			"communication_medium": "Email",
+			"subject": "Contacts Attached Test",
+			"sender": "comm_sender@example.com",
+			"recipients": "comm_recipient@example.com"
+		}).insert(ignore_permissions=True)
+
+		comm = frappe.get_doc("Communication", comm.name)
+
+		contact_links = []
+		for timeline_link in comm.timeline_links:
+			contact_links.append(timeline_link.link_name)
+
+		self.assertIn(contact_sender.name, contact_links)
+		self.assertIn(contact_recipient.name, contact_links)
+		self.assertIn(contact_cc.name, contact_links)
+
+	def test_get_communication_data(self):
+		from frappe.desk.form.load import get_communication_data
+
+		todo = frappe.get_doc({
+			"doctype": "ToDo",
+			"description": "Test ToDo"
+		}).insert(ignore_permissions=True)
+
+		comm_todo_1 = frappe.get_doc({
+			"doctype": "Communication",
+			"communication_type": "Communication",
+			"content": "Test Get Communication Data 1",
+			"communication_medium": "Email",
+			"timeline_links": [
+				{
+					"link_doctype": "ToDo",
+					"link_name": todo.name
+				}
+			]
+		}).insert(ignore_permissions=True)
+
+		comm_todo_2 = frappe.get_doc({
+			"doctype": "Communication",
+			"communication_type": "Communication",
+			"content": "Test Get Communication Data 2",
+			"communication_medium": "Email",
+			"timeline_links": [
+				{
+					"link_doctype": "ToDo",
+					"link_name": todo.name
+				}
+			]
+		}).insert(ignore_permissions=True)
+
+		comms = get_communication_data("ToDo", todo.name, as_dict=True)
+
+		data = []
+		for comm in comms:
+			data.append(comm.name)
+
+		self.assertIn(comm_todo_1.name, data)
+		self.assertIn(comm_todo_2.name, data)
\ No newline at end of file
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index ff61208bf4..cf1d22f27f 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -6,34 +6,41 @@ def execute():
 	frappe.reload_doc('core', 'doctype', 'communication')
 
 	communications = frappe.db.sql("""
-						Select
-							`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
-							`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
-							`tabCommunication`.link_doctype, `tabCommunication`.link_name
-						from `tabCommunication`
-						where `tabCommunication`.communication_medium='Email'
-					""", as_dict=True)
-
-	values = []
+			SELECT
+				`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
+				`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
+				`tabCommunication`.link_doctype, `tabCommunication`.link_name
+			FROM `tabCommunication`
+			WHERE `tabCommunication`.communication_medium='Email'
+		""", as_dict=True)
 
 	for count, communication in enumerate(communications):
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
-			values.append("""({0}, '{1}', 'timeline_links', 'Communication', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}')""".format(
-				counter, frappe.generate_hash(length=10), communication.name, communication.timeline_doctype,
-				communication.timeline_name, communication.creation, communication.modified, communication.modified_by
-			))
+			values = [
+				counter, frappe.generate_hash(length=10), 'timeline_links', 'Communication', communication.name,
+				communication.timeline_doctype, communication.timeline_name, communication.creation, communication.modified,
+				communication.modified_by
+			]
+			execute_query(values)
 			counter += 1
+
 		if communication.link_doctype and communication.link_name:
-			values.append("""({0}, '{1}', 'timeline_links', 'Communication', '{2}', '{3}', '{4}', '{5}', '{6}', '{7}')""".format(
-				counter, frappe.generate_hash(length=10), communication.name, communication.link_doctype,
-				communication.link_name, communication.creation, communication.modified, communication.modified_by
-			))
-		if count % 10000 == 0 or count == len(communications) - 1:
-			frappe.db.sql("""
-				INSERT INTO `tabDynamic Link`
-					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-					`modified`, `modified_by`)
-				VALUES {0}
-			""".format(", ".join([d for d in values])))
-			values = []
\ No newline at end of file
+			values = [
+				counter, frappe.generate_hash(length=10), 'timeline_links', 'Communication', communication.name,
+				communication.link_doctype, communication.link_name, communication.creation, communication.modified,
+				communication.modified_by
+			]
+			execute_query(values)
+
+def execute_query(values):
+	try:
+		frappe.db.sql("""
+			INSERT INTO `tabDynamic Link`
+				(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+				`modified`, `modified_by`)
+			VALUES ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9})
+		""".format(values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], values[8], values[9])
+	except IntegrityError as e:
+		values[1] = frappe.generate_hash(length=10)
+		execute_query(values)

From c86ba036327f89c174dd7d4f9d9df630b10fe3c8 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 20 May 2019 13:38:01 +0530
Subject: [PATCH 155/175] tests: fix test cases

---
 frappe/core/doctype/communication/test_communication.py      | 3 ++-
 frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 5b0ad3f3b0..77eb066b1d 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -123,7 +123,8 @@ class TestCommunication(unittest.TestCase):
 			"communication_medium": "Email",
 			"subject": "Contacts Attached Test",
 			"sender": "comm_sender@example.com",
-			"recipients": "comm_recipient@example.com"
+			"recipients": "comm_recipient@example.com",
+			"cc": "comm_cc@example.com"
 		}).insert(ignore_permissions=True)
 
 		comm = frappe.get_doc("Communication", comm.name)
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index cf1d22f27f..624be6ae40 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -41,6 +41,6 @@ def execute_query(values):
 				`modified`, `modified_by`)
 			VALUES ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9})
 		""".format(values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], values[8], values[9])
-	except IntegrityError as e:
+	except Exception as e:
 		values[1] = frappe.generate_hash(length=10)
 		execute_query(values)

From b4e561c047057fcd5c918e0b143257bd8b1b8ef7 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 20 May 2019 14:15:57 +0530
Subject: [PATCH 156/175] tests: fix test cases

---
 .../doctype/communication/communication.js    | 80 +------------------
 .../doctype/communication/communication.json  |  6 +-
 .../doctype/communication/communication.py    |  1 +
 .../communication/test_communication.py       | 60 ++++++--------
 4 files changed, 31 insertions(+), 116 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 180ba8d25c..924c29bee2 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -43,17 +43,9 @@ frappe.ui.form.on("Communication", {
 			});
 		}
 
-		frm.add_custom_button(__("Change Reference Link"), function() {
+		frm.add_custom_button(__("Relink"), function() {
 			frm.trigger('show_relink_dialog');
-		}, "Links");
-
-		frm.add_custom_button(__("Add Timeline Link"), function() {
-			frm.trigger('show_add_link_dialog');
-		}, "Links");
-
-		frm.add_custom_button(__("Remove Timeline Link"), function() {
-			frm.trigger('show_remove_link_dialog');
-		}, "Links");
+		});
 
 		if(frm.doc.communication_type=="Communication"
 			&& frm.doc.communication_medium == "Email"
@@ -149,74 +141,6 @@ frappe.ui.form.on("Communication", {
 		d.show();
 	},
 
-	show_add_link_dialog: function(frm){
-		var d = new frappe.ui.Dialog ({
-			title: __("Add new link to Communication"),
-			fields: [{
-				"fieldtype": "Link",
-				"options": "DocType",
-				"label": __("Document Type"),
-				"fieldname": "link_doctype",
-				"reqd": 1
-			},
-			{
-				"fieldtype": "Dynamic Link",
-				"options": "link_doctype",
-				"label": __("Document Name"),
-				"fieldname": "link_name",
-				"reqd": 1
-			}],
-			primary_action: ({ link_doctype, link_name }) => {
-				d.hide();
-				frm.call('add_link', {
-					link_doctype,
-					link_name,
-					autosave: true
-				}).then(() => frm.refresh());
-			},
-			primary_action_label: __('Add Link')
-		});
-		d.fields_dict.link_doctype.get_query = function() {
-			return {
-				"filters": {
-					"name": ["!=", "Communication"],
-				}
-			};
-		};
-		d.show();
-	},
-
-	show_remove_link_dialog: function(frm){
-		let options = '';
-
-		for(var link in frm.doc.dynamic_links){
-			let dynamic_link = frm.doc.dynamic_links[link];
-			options += '\n' + dynamic_link.link_doctype + ': ' + dynamic_link.link_name;
-		}
-
-		var d = new frappe.ui.Dialog ({
-			title: __("Remove link from Communication"),
-			fields: [{
-				"fieldtype": "Select",
-				"options": options,
-				"label": __("Link"),
-				"fieldname": "link",
-				"reqd": 1
-			}],
-			primary_action: ({ link }) => {
-				d.hide();
-				frm.call('remove_link', {
-					link_doctype: link.split(":")[0].trim(),
-					link_name: link.split(":")[1].trim(),
-					autosave: true,
-					ignore_permissions: false
-				}).then(() => frm.refresh());
-			},
-			primary_action_label: __('Remove Link')
-		});
-		d.show();
-	},
-
 	mark_as_read_unread: function(frm) {
 		var action = frm.doc.seen? "Unread": "Read";
 		var flag = "(\\SEEN)";
diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index 3eeb63ceb9..68a0adb634 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -383,8 +383,8 @@
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-20 12:34:21.021632",
- "modified_by": "faris@erpnext.com",
+ "modified": "2019-05-20 14:14:01.514493",
+ "modified_by": "Administrator",
  "module": "Core",
  "name": "Communication",
  "owner": "Administrator",
@@ -410,10 +410,12 @@
    "share": 1
   },
   {
+   "delete": 1,
    "email": 1,
    "export": 1,
    "permlevel": 2,
    "print": 1,
+   "read": 1,
    "report": 1,
    "role": "System Manager",
    "share": 1,
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index c164f7f8e0..aa70024eca 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -238,6 +238,7 @@ class Communication(Document):
 	# Timeline Links
 	def set_timeline_links(self):
 		contacts = get_contacts([self.sender, self.recipients, self.cc, self.bcc])
+		print(contacts)
 		for contact_name in contacts:
 			self.add_link('Contact', contact_name)
 
diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index 77eb066b1d..a783157dc0 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -73,28 +73,23 @@ class TestCommunication(unittest.TestCase):
 		self.assertRaises(frappe.CircularLinkingError, a.save)
 
 	def test_deduplication_timeline_links(self):
-		todo = frappe.get_doc({
-			"doctype": "ToDo",
-			"description": "Test ToDo"
+		note = frappe.get_doc({
+			"doctype": "Note",
+			"title": "deduplication timeline links",
+			"content": "deduplication timeline links"
 		}).insert(ignore_permissions=True)
 
 		comm = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
 			"content": "Deduplication of Links",
-			"communication_medium": "Email",
-			"timeline_links": [
-				{
-					"link_doctype": "ToDo",
-					"link_name": todo.name
-				},
-				{
-					"link_doctype": "ToDo",
-					"link_name": todo.name
-				}
-			]
+			"communication_medium": "Email"
 		}).insert(ignore_permissions=True)
 
+		#adding same link twice
+		comm.add_link(link_doctype="Note", link_name=note.name, autosave=True)
+		comm.add_link(link_doctype="Note", link_name=note.name, autosave=True)
+
 		comm = frappe.get_doc("Communication", comm.name)
 
 		self.assertNotEqual(2, len(comm.timeline_links))
@@ -140,42 +135,35 @@ class TestCommunication(unittest.TestCase):
 	def test_get_communication_data(self):
 		from frappe.desk.form.load import get_communication_data
 
-		todo = frappe.get_doc({
-			"doctype": "ToDo",
-			"description": "Test ToDo"
+		note = frappe.get_doc({
+			"doctype": "Note",
+			"title": "get communication data",
+			"content": "get communication data"
 		}).insert(ignore_permissions=True)
 
-		comm_todo_1 = frappe.get_doc({
+		comm_note_1 = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
 			"content": "Test Get Communication Data 1",
-			"communication_medium": "Email",
-			"timeline_links": [
-				{
-					"link_doctype": "ToDo",
-					"link_name": todo.name
-				}
-			]
+			"communication_medium": "Email"
 		}).insert(ignore_permissions=True)
 
-		comm_todo_2 = frappe.get_doc({
+		comm_note_1.add_link(link_doctype="Note", link_name=note.name, autosave=True)
+
+		comm_note_2 = frappe.get_doc({
 			"doctype": "Communication",
 			"communication_type": "Communication",
 			"content": "Test Get Communication Data 2",
-			"communication_medium": "Email",
-			"timeline_links": [
-				{
-					"link_doctype": "ToDo",
-					"link_name": todo.name
-				}
-			]
+			"communication_medium": "Email"
 		}).insert(ignore_permissions=True)
 
-		comms = get_communication_data("ToDo", todo.name, as_dict=True)
+		comm_note_2.add_link(link_doctype="Note", link_name=note.name, autosave=True)
+
+		comms = get_communication_data("Note", note.name, as_dict=True)
 
 		data = []
 		for comm in comms:
 			data.append(comm.name)
 
-		self.assertIn(comm_todo_1.name, data)
-		self.assertIn(comm_todo_2.name, data)
\ No newline at end of file
+		self.assertIn(comm_note_1.name, data)
+		self.assertIn(comm_note_2.name, data)
\ No newline at end of file

From 81d314bf102011e6cb0f406f4fd3f4fa1a345cee Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 20 May 2019 14:40:20 +0530
Subject: [PATCH 157/175] fix: typo fixes

---
 frappe/core/doctype/communication/communication.py           | 1 -
 frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index aa70024eca..c164f7f8e0 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -238,7 +238,6 @@ class Communication(Document):
 	# Timeline Links
 	def set_timeline_links(self):
 		contacts = get_contacts([self.sender, self.recipients, self.cc, self.bcc])
-		print(contacts)
 		for contact_name in contacts:
 			self.add_link('Contact', contact_name)
 
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 624be6ae40..873988c7f3 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -40,7 +40,7 @@ def execute_query(values):
 				(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
 				`modified`, `modified_by`)
 			VALUES ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9})
-		""".format(values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], values[8], values[9])
+		""".format(values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], values[8], values[9]))
 	except Exception as e:
 		values[1] = frappe.generate_hash(length=10)
 		execute_query(values)

From 90c62d0c99e2f1a0ff0eaa614fcb73d2c6a33588 Mon Sep 17 00:00:00 2001
From: Sachin Mane <sachin.mane@elastic.run>
Date: Mon, 20 May 2019 18:55:33 +0530
Subject: [PATCH 158/175] .get() does not work in JavaScript.

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index db0b4bbe46..9a3fe3699b 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -198,7 +198,7 @@ frappe.request.call = function(opts) {
 		headers: Object.assign({
 			"X-Frappe-CSRF-Token": frappe.csrf_token,
 			"Accept": "application/json",
-			"X-Frappe-CMD": opts.get('args', {}).get('cmd', '')
+ 			"X-Frappe-CMD": (opts.args && opts.args.cmd  || '') || ''
 		}, opts.headers),
 		cache: false
 	};

From 9c4e1eea5c24fe3b78ad309eeb4e3c207aedef31 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 20 May 2019 18:58:32 +0530
Subject: [PATCH 159/175] fix(print): semantic nested lists for text editor

---
 frappe/public/build.json                      |  5 ++
 .../js/frappe/form/controls/text_editor.js    | 75 ++++++++++++++++++-
 frappe/public/less/desk.less                  |  1 +
 frappe/public/less/print.less                 | 15 ++++
 .../print_formats/standard_macros.html        |  4 +-
 frappe/www/printview.html                     |  5 +-
 6 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 frappe/public/less/print.less

diff --git a/frappe/public/build.json b/frappe/public/build.json
index cd8f04b2c9..a279519d72 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -137,6 +137,11 @@
 		"public/css/desk-rtl.css",
 		"public/css/report-rtl.css"
 	],
+	"css/printview.css": [
+		"public/css/bootstrap.css",
+		"public/css/font-awesome.css",
+		"public/less/print.less"
+	],
 	"concat:js/libs.min.js": [
 		"public/js/lib/awesomplete/awesomplete.min.js",
 		"public/js/lib/Sortable.min.js",
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index ef6afde262..e616b9ef3e 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -57,7 +57,7 @@ Quill.register(DirectionStyle, true);
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 	make_wrapper() {
 		this._super();
-		this.$wrapper.find(".like-disabled-input").addClass("ql-editor");
+		this.$wrapper.find(".like-disabled-input").addClass('text-editor-print');
 	},
 
 	make_input() {
@@ -198,7 +198,78 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 			let $ul = $('<ul>').append($children);
 			$parent.replaceWith($ul);
 		});
-		value = $value.html();
+		value = this.convertLists($value.html());
 		return value;
+	},
+
+	// hack
+	// https://github.com/quilljs/quill/issues/979
+	convertLists(richtext) {
+		const tempEl = window.document.createElement('div');
+		tempEl.setAttribute('style', 'display: none;');
+		tempEl.innerHTML = richtext;
+		const startLi = '::startli::';
+		const endLi = '::endli::';
+
+		['ul','ol'].forEach((type) => {
+			const startTag = `::start${type}::`;
+			const endTag = `::end${type}::`;
+
+			// Grab each list, and work on it in turn
+			Array.from(tempEl.querySelectorAll(type)).forEach((outerListEl) => {
+				const listChildren = Array.from(outerListEl.children).filter((el) => el.tagName === 'LI');
+
+				let lastLiLevel = 0;
+				let currentLiLevel = 0;
+				let difference = 0;
+
+				// Now work through each li in this list
+				for (let i = 0; i < listChildren.length; i++) {
+					const currentLi = listChildren[i];
+					lastLiLevel = currentLiLevel;
+					currentLiLevel = this.getListLevel(currentLi);
+					difference = currentLiLevel - lastLiLevel;
+
+					// we only need to add tags if the level is changing
+					if (difference > 0) {
+						currentLi.before((startLi + startTag).repeat(difference));
+					} else if (difference < 0) {
+						currentLi.before((endTag + endLi).repeat(-difference));
+					}
+
+					if (i === listChildren.length - 1) {
+						// last li, account for the fact that it might not be at level 0
+						currentLi.after((endTag + endLi).repeat(currentLiLevel));
+					}
+				}
+			});
+		});
+
+		//  Get the content in the element and replace the temporary tags with new ones
+		let newContent = tempEl.innerHTML;
+
+		newContent = newContent.replace(/::startul::/g, '<ul>');
+		newContent = newContent.replace(/::endul::/g, '</ul>');
+		newContent = newContent.replace(/::startol::/g, '<ol>');
+		newContent = newContent.replace(/::endol::/g, '</ol>');
+		newContent = newContent.replace(/::startli::/g, '<li>');
+		newContent = newContent.replace(/::endli::/g, '</li>');
+
+		// remove quill classes
+		newContent = newContent.replace(/data-list=.bullet./g, '');
+		newContent = newContent.replace(/class=.ql-indent-../g, '');
+
+		// ul/ol should not be inside another li
+		newContent = newContent.replace(/<\/li><li><ul>/g, '<ul>');
+		newContent = newContent.replace(/<\/li><li><ol>/g, '<ol>');
+		tempEl.remove();
+
+		return newContent;
+	},
+
+	getListLevel(el) {
+		const className = el.className || '0';
+		return +className.replace(/[^\d]/g, '');
 	}
+
 });
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 5d043babc1..d9af075984 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -2,6 +2,7 @@
 @import "mixins.less";
 @import "common.less";
 @import "quill.less";
+@import "print.less";
 
 .nav-pills a, .nav-pills a:hover {
 	border-bottom: none;
diff --git a/frappe/public/less/print.less b/frappe/public/less/print.less
new file mode 100644
index 0000000000..203b1237c5
--- /dev/null
+++ b/frappe/public/less/print.less
@@ -0,0 +1,15 @@
+.text-editor-print {
+	ul li {
+		list-style-type: none;
+		padding-left: 1.5em;
+	}
+
+	ul li:before {
+		content: '\2022';
+		margin-left: -1.5em;
+		margin-right: 0.3em;
+		text-align: right;
+		white-space: nowrap;
+		width: 1.2em;
+	}
+}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index ea667704af..2d8035ac93 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -97,8 +97,10 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 	{%- if df.fieldtype=="Code" %}
 		<pre class="value">{{ doc.get(df.fieldname) }}</pre>
 	{% else -%}
+		{%- if df.fieldtype=="Text Editor" -%}<div class='text-editor-print'>{%- endif -%}
 		{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
-	{% endif -%}
+		{%- if df.fieldtype=="Text Editor" -%}</div>{%- endif -%}
+  {% endif -%}
 </div>
 {%- endif -%}
 {%- endmacro -%}
diff --git a/frappe/www/printview.html b/frappe/www/printview.html
index 2953ff2c90..b7077b5a12 100644
--- a/frappe/www/printview.html
+++ b/frappe/www/printview.html
@@ -5,10 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>{{ title }}</title>
 	<meta name="generator" content="frappe">
-	<link type="text/css" rel="stylesheet"
-        href="/assets/frappe/css/bootstrap.css">
-	<link type="text/css" rel="stylesheet"
-        href="/assets/frappe/css/font-awesome.css">
+	<link type="text/css" rel="stylesheet" href="/assets/css/printview.css">
 	{%- if has_rtl -%}
 		<link type="text/css" rel="stylesheet" href="assets/css/frappe-rtl.css">
 	{%- endif -%}

From 59c945bb84cdeea04eb77c1925d906f54f09d8db Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 21 May 2019 00:00:57 +0530
Subject: [PATCH 160/175] fix(communication): Make optimizations to the patch

* use batches to move Timeline and Links to Timeline Links doctype
---
 .../move_timeline_links_to_dynamic_links.py   | 60 +++++++++----------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 873988c7f3..ce544d658c 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -6,41 +6,39 @@ def execute():
 	frappe.reload_doc('core', 'doctype', 'communication')
 
 	communications = frappe.db.sql("""
-			SELECT
-				`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
-				`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
-				`tabCommunication`.link_doctype, `tabCommunication`.link_name
-			FROM `tabCommunication`
-			WHERE `tabCommunication`.communication_medium='Email'
-		""", as_dict=True)
+		SELECT
+			`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
+			`tabCommunication`.modified_by,`tabCommunication`.timeline_doctype, `tabCommunication`.timeline_name,
+			`tabCommunication`.link_doctype, `tabCommunication`.link_name
+		FROM `tabCommunication`
+		WHERE `tabCommunication`.communication_medium='Email'
+	""", as_dict=True)
+
+	name = 10000000000001234567
+	values = []
 
 	for count, communication in enumerate(communications):
 		counter = 1
 		if communication.timeline_doctype and communication.timeline_name:
-			values = [
-				counter, frappe.generate_hash(length=10), 'timeline_links', 'Communication', communication.name,
-				communication.timeline_doctype, communication.timeline_name, communication.creation, communication.modified,
-				communication.modified_by
-			]
-			execute_query(values)
+			name += 1
+			values.append("""({0}, "{1}", "timeline_links", "Communication", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}")""".format(
+				counter, str(name), communication.name, communication.timeline_doctype,
+				communication.timeline_name, communication.creation, communication.modified, communication.modified_by
+			))
 			counter += 1
-
 		if communication.link_doctype and communication.link_name:
-			values = [
-				counter, frappe.generate_hash(length=10), 'timeline_links', 'Communication', communication.name,
-				communication.link_doctype, communication.link_name, communication.creation, communication.modified,
-				communication.modified_by
-			]
-			execute_query(values)
+			name += 1
+			values.append("""({0}, "{1}", "timeline_links", "Communication", "{2}", "{3}", "{4}", "{5}", "{6}", "{7}")""".format(
+				counter, str(name), communication.name, communication.link_doctype,
+				communication.link_name, communication.creation, communication.modified, communication.modified_by
+			))
 
-def execute_query(values):
-	try:
-		frappe.db.sql("""
-			INSERT INTO `tabDynamic Link`
-				(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-				`modified`, `modified_by`)
-			VALUES ({0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9})
-		""".format(values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], values[8], values[9]))
-	except Exception as e:
-		values[1] = frappe.generate_hash(length=10)
-		execute_query(values)
+		if count % 10000 == 0 or count == len(communications) - 1:
+			frappe.db.sql("""
+				INSERT INTO `tabDynamic Link`
+					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+					`modified`, `modified_by`)
+				VALUES {0}
+			""".format(", ".join([d for d in values])))
+
+			values = []

From 105f9198c614bd22fae756c3f310732c9c6b6590 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 21 May 2019 11:25:13 +0530
Subject: [PATCH 161/175] fix(patch): move_timeline_links_to_dynamic_link.py
 handle empty set

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

diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index ce544d658c..41ca11a0a4 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -33,7 +33,7 @@ def execute():
 				communication.link_name, communication.creation, communication.modified, communication.modified_by
 			))
 
-		if count % 10000 == 0 or count == len(communications) - 1:
+		if values and (count % 10000 == 0 or count == len(communications) - 1):
 			frappe.db.sql("""
 				INSERT INTO `tabDynamic Link`
 					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,

From 7d7b229438f2eb67173629fcf4c7c9e9d5e025f4 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 21 May 2019 12:03:58 +0530
Subject: [PATCH 162/175] perf: Optimize get_communications

Split query with OR condition into two subqueries with UNION
---
 frappe/desk/form/load.py                      | 71 +++++++++++--------
 .../move_timeline_links_to_dynamic_links.py   | 13 ++--
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 2985a8858e..693efe610c 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -161,49 +161,58 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	'''Returns list of communications for a given document'''
 	if not fields:
 		fields = '''
-			`tabCommunication`.name, `tabCommunication`.communication_type, `tabCommunication`.communication_medium,
-			`tabCommunication`.comment_type, `tabCommunication`.communication_date, `tabCommunication`.content,
-			`tabCommunication`.sender, `tabCommunication`.sender_full_name, `tabCommunication`.cc, `tabCommunication`.bcc,
-			`tabCommunication`.creation, `tabCommunication`.subject, `tabCommunication`.delivery_status,
-			`tabCommunication`._liked_by, `tabCommunication`.reference_doctype, `tabCommunication`.reference_name,
-			`tabCommunication`.read_by_recipient, `tabCommunication`.rating
+			C.name, C.communication_type, C.communication_medium,
+			C.comment_type, C.communication_date, C.content,
+			C.sender, C.sender_full_name, C.cc, C.bcc,
+			C.creation, C.subject, C.delivery_status,
+			C._liked_by, C.reference_doctype, C.reference_name,
+			C.read_by_recipient, C.rating
 		'''
 
-	conditions = '''
-		`tabCommunication`.communication_type in ('Communication', 'Feedback')
-		and	(
-				(`tabCommunication`.reference_doctype=%(doctype)s and `tabCommunication`.reference_name=%(name)s)
-				or (
-					(`tabDynamic Link`.link_doctype=%(doctype)s and `tabDynamic Link`.link_name=%(name)s)
-					and (`tabCommunication`.communication_type='Communication')
-				)
-			)
-	'''
-
+	conditions = ''
 	if after:
 		# find after a particular date
 		conditions += '''
-			and `tabCommunication`.creation > {0}
+			AND C.creation > {0}
 		'''.format(after)
 
 	if doctype=='User':
 		conditions += '''
-			and not (`tabCommunication`.reference_doctype='User' and `tabCommunication`.communication_type='Communication')
+			AND NOT (C.reference_doctype='User' AND C.communication_type='Communication')
 		'''
 
+	# communications linked to reference_doctype
+	part1 = '''
+		SELECT {fields}
+		FROM `tabCommunication` as C
+		WHERE C.communication_type IN ('Communication', 'Feedback')
+		AND (C.reference_doctype = %(doctype)s AND C.reference_name = %(name)s)
+		{conditions}
+	'''.format(fields=fields, conditions=conditions)
+
+	# communications linked in Timeline Links
+	part2 = '''
+		SELECT {fields}
+		FROM `tabCommunication` as C
+		INNER JOIN `tabDynamic Link` ON C.name=`tabDynamic Link`.parent
+		WHERE C.communication_type IN ('Communication', 'Feedback')
+		AND `tabDynamic Link`.link_doctype = %(doctype)s AND `tabDynamic Link`.link_name = %(name)s
+		{conditions}
+	'''.format(fields=fields, conditions=conditions)
+
 	communications = frappe.db.sql('''
-		select distinct {fields}
-		from `tabCommunication`
-			inner join `tabDynamic Link`
-				on `tabCommunication`.name=`tabDynamic Link`.parent
-		where {conditions} {group_by}
-		order by `tabCommunication`.creation desc
-		limit %(limit)s offset %(start)s'''.format(fields = fields, conditions=conditions, group_by=group_by or ""),{
-			"doctype": doctype,
-			"name": name,
-			"start": frappe.utils.cint(start),
-			"limit": limit
-		}, as_dict=as_dict)
+		SELECT *
+		FROM (({part1}) UNION ({part2})) AS combined
+		{group_by}
+		ORDER BY combined.creation DESC
+		LIMIT %(limit)s
+		OFFSET %(start)s
+	'''.format(part1=part1, part2=part2, group_by=(group_by or '')), dict(
+		doctype=doctype,
+		name=name,
+		start=frappe.utils.cint(start),
+		limit=limit
+	), as_dict=as_dict)
 
 	return communications
 
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index ce544d658c..5dee253fa1 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -34,11 +34,12 @@ def execute():
 			))
 
 		if count % 10000 == 0 or count == len(communications) - 1:
-			frappe.db.sql("""
-				INSERT INTO `tabDynamic Link`
-					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
-					`modified`, `modified_by`)
-				VALUES {0}
-			""".format(", ".join([d for d in values])))
+			if values:
+				frappe.db.sql("""
+					INSERT INTO `tabDynamic Link`
+						(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
+						`modified`, `modified_by`)
+					VALUES {0}
+				""".format(", ".join([d for d in values])))
 
 			values = []

From 1fe6f7ceaaa747b95891701595a6fd6f6c18eac7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 21 May 2019 13:18:51 +0530
Subject: [PATCH 163/175] fix: Show "1 point" instead of "1 points" (#7489)

* fix: Show "1 point" instead of "1 points"

* fix: Make text translatable

* fix: Format string twice to avoid duplicate code

- First formatting to add points text
- Second formatting to add variables aftter translation

* fix(energy point): Alert messages translation
---
 .../energy_point_log/energy_point_log.py      | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 42e12c0374..c94c1bd371 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -31,36 +31,51 @@ class EnergyPointLog(Document):
 		frappe.publish_realtime('update_points', after_commit=True)
 
 def get_alert_dict(doc):
-	alert_dict = frappe._dict({
-		'message': '',
-		'indicator': 'green'
-	})
+	alert_dict = frappe._dict()
 	owner_name = get_fullname(doc.owner)
 	doc_link = frappe.get_desk_link(doc.reference_doctype, doc.reference_name)
-	points = frappe.bold(doc.points)
+	points = doc.points
+	bold_points = frappe.bold(doc.points)
 	if doc.type == 'Auto':
-		alert_dict.message=_('You gained {} points').format(points)
+		if points == 1:
+			message = _('You gained {0} point')
+		else:
+			message = _('You gained {0} points')
+		alert_dict.message = message.format(bold_points)
+		alert_dict.indicator = 'green'
 	elif doc.type == 'Appreciation':
-		alert_dict.message = _('{} appreciated your work on {} with {} points').format(
+		if points == 1:
+			message = _('{0} appreciated your work on {1} with {2} point')
+		else:
+			message = _('{0} appreciated your work on {1} with {2} points')
+		alert_dict.message = message.format(
 			owner_name,
 			doc_link,
-			points
+			bold_points
 		)
+		alert_dict.indicator = 'green'
 	elif doc.type == 'Criticism':
-		alert_dict.message = _('{} criticized your work on {} with {} points').format(
+		if points == 1:
+			message = _('{0} criticized your work on {1} with {2} point')
+		else:
+			message = _('{0} criticized your work on {1} with {2} points')
+
+		alert_dict.message = message.format(
 			owner_name,
 			doc_link,
-			points
+			bold_points
 		)
 		alert_dict.indicator = 'red'
 	elif doc.type == 'Revert':
-		alert_dict.message = _('{} reverted your points on {}').format(
+		if points == 1:
+			message = _('{0} reverted your point on {1}')
+		else:
+			message = _('{0} reverted your points on {1}')
+		alert_dict.message = message.format(
 			owner_name,
 			doc_link,
 		)
 		alert_dict.indicator = 'red'
-	else:
-		alert_dict = {}
 
 	return alert_dict
 
@@ -135,7 +150,7 @@ def get_user_energy_and_review_points(user=None, from_date=None, as_dict=True):
 		{conditions}
 		GROUP BY `user`
 		ORDER BY `energy_points` DESC
-	""".format(conditions=conditions), values=values or (), as_dict=1)
+	""".format(conditions=conditions), values=tuple(values), as_dict=1)
 
 	if not as_dict:
 		return points_list
@@ -245,7 +260,7 @@ def send_summary(timespan):
 
 def get_footer_message(timespan):
 	if timespan == 'Monthly':
-		return _("Stats based on last month's performance (from {} to {})")
+		return _("Stats based on last month's performance (from {0} to {1})")
 	else:
-		return _("Stats based on last week's performance (from {} to {})")
+		return _("Stats based on last week's performance (from {0} to {1})")
 

From d7527fab79a77c77b53a083656a77b4213769a5f Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 21 May 2019 14:49:59 +0530
Subject: [PATCH 164/175] fix: Allow eligible fields to be updated from
 notifications (#7518)

---
 frappe/email/doctype/notification/notification.py     | 11 ++++++++---
 .../doctype/ldap_settings/ldap_settings.py            |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py
index 61906f585e..f53d7845c5 100644
--- a/frappe/email/doctype/notification/notification.py
+++ b/frappe/email/doctype/notification/notification.py
@@ -126,9 +126,14 @@ def get_context(context):
 			self.send_a_slack_msg(doc, context)
 
 		if self.set_property_after_alert:
-			frappe.db.set_value(doc.doctype, doc.name, self.set_property_after_alert,
-				self.property_value, update_modified = False)
-			doc.set(self.set_property_after_alert, self.property_value)
+			allow_update = True
+			if doc.docstatus == 1 and not doc.meta.get_field(self.set_property_after_alert).allow_on_submit:
+				allow_update = False
+
+			if allow_update:
+				frappe.db.set_value(doc.doctype, doc.name, self.set_property_after_alert,
+					self.property_value, update_modified = False)
+				doc.set(self.set_property_after_alert, self.property_value)
 
 	def send_an_email(self, doc, context):
 		from email.utils import formataddr
diff --git a/frappe/integrations/doctype/ldap_settings/ldap_settings.py b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
index 0a4d871be8..e48619bfdd 100644
--- a/frappe/integrations/doctype/ldap_settings/ldap_settings.py
+++ b/frappe/integrations/doctype/ldap_settings/ldap_settings.py
@@ -10,6 +10,9 @@ from frappe.model.document import Document
 
 class LDAPSettings(Document):
 	def validate(self):
+		if not self.enabled:
+			return
+
 		if not self.flags.ignore_mandatory:
 			if self.ldap_search_string.endswith("={0}"):
 				if self.enabled:

From 0e7123d14146838d15c00076eeb7043ff4406f71 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 21 May 2019 14:50:49 +0530
Subject: [PATCH 165/175] fix(Addresses and Contacts Report): Frappe throw when
 no record present (#7504)

---
 .../report/addresses_and_contacts/addresses_and_contacts.py  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
index 0907476b30..f73858c8ab 100644
--- a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
+++ b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 from six import iteritems
 import frappe
-
+from frappe import _
 
 field_map = {
 	"Contact": [ "first_name", "last_name", "phone", "mobile_no", "email_id", "is_primary_contact" ],
@@ -94,6 +94,9 @@ def get_reference_details(reference_doctype, doctype, reference_list, reference_
 	for d in records:
 		temp_records.append(d[1:])
 
+	if not reference_list:
+		frappe.throw(_("No records present in {0}".format(reference_doctype)))
+
 	reference_details[reference_list[0]][frappe.scrub(doctype)] = temp_records
 	return reference_details
 

From 6655e45273d8c050f5d9eebe7141274ba9484612 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 21 May 2019 14:54:11 +0530
Subject: [PATCH 166/175] fix: Increase font size in Module View (#7513)

---
 frappe/public/js/frappe/views/components/ModuleLinkItem.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/views/components/ModuleLinkItem.vue b/frappe/public/js/frappe/views/components/ModuleLinkItem.vue
index eccd0b0c33..946bc8c4ac 100644
--- a/frappe/public/js/frappe/views/components/ModuleLinkItem.vue
+++ b/frappe/public/js/frappe/views/components/ModuleLinkItem.vue
@@ -92,6 +92,7 @@ a:hover, a:focus {
 
 .link-content {
 	flex: 1;
+	font-size: 1.1em;
 }
 
 .popover {

From 2b14c956447629b61635393319ddeac360b93802 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 21 May 2019 20:48:55 +0530
Subject: [PATCH 167/175] fix(Communication): New child doctype for
 Communication Timeline Links (#7524)

* fix: separate child doctype for communication

* fix: reload doc before running the patches

* fix: update_timeline_doc

* fix: manipulatetimeline fields in Comm Links

* fix: test cases

* fix: reload comm_link before communication

* patch: remove redundant patch
---
 .../doctype/communication/communication.json  |  4 +-
 .../doctype/communication/communication.py    |  1 +
 .../communication/test_communication.py       |  4 ++
 .../doctype/communication_link/__init__.py    |  0
 .../communication_link.json                   | 47 +++++++++++++++++++
 .../communication_link/communication_link.py  | 10 ++++
 frappe/desk/doctype/event/event.py            |  8 ++--
 frappe/desk/doctype/todo/todo.py              |  2 +-
 frappe/desk/form/load.py                      |  4 +-
 .../email_account/test_email_account.py       |  2 +-
 frappe/model/delete_doc.py                    |  4 +-
 frappe/model/document.py                      | 16 ++-----
 frappe/patches.txt                            |  2 +
 .../move_timeline_links_to_dynamic_links.py   |  8 ++--
 14 files changed, 84 insertions(+), 28 deletions(-)
 create mode 100644 frappe/core/doctype/communication_link/__init__.py
 create mode 100644 frappe/core/doctype/communication_link/communication_link.json
 create mode 100644 frappe/core/doctype/communication_link/communication_link.py

diff --git a/frappe/core/doctype/communication/communication.json b/frappe/core/doctype/communication/communication.json
index 68a0adb634..34d8d29bdb 100644
--- a/frappe/core/doctype/communication/communication.json
+++ b/frappe/core/doctype/communication/communication.json
@@ -377,13 +377,13 @@
    "fieldname": "timeline_links",
    "fieldtype": "Table",
    "label": "Timeline Links",
-   "options": "Dynamic Link",
+   "options": "Communication Link",
    "permlevel": 2
   }
  ],
  "icon": "fa fa-comment",
  "idx": 1,
- "modified": "2019-05-20 14:14:01.514493",
+ "modified": "2019-05-21 09:48:24.892143",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Communication",
diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index 0fb2efc7ec..7ed4aea4b5 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -286,6 +286,7 @@ def on_doctype_update():
 	"""Add indexes in `tabCommunication`"""
 	frappe.db.add_index("Communication", ["reference_doctype", "reference_name"])
 	frappe.db.add_index("Communication", ["status", "communication_type"])
+	frappe.db.add_index("Communication Link", ["link_doctype", "link_name"])
 
 def has_permission(doc, ptype, user):
 	if ptype=="read":
diff --git a/frappe/core/doctype/communication/test_communication.py b/frappe/core/doctype/communication/test_communication.py
index a783157dc0..21756280a9 100644
--- a/frappe/core/doctype/communication/test_communication.py
+++ b/frappe/core/doctype/communication/test_communication.py
@@ -73,6 +73,8 @@ class TestCommunication(unittest.TestCase):
 		self.assertRaises(frappe.CircularLinkingError, a.save)
 
 	def test_deduplication_timeline_links(self):
+		frappe.delete_doc_if_exists("Note", "deduplication timeline links")
+
 		note = frappe.get_doc({
 			"doctype": "Note",
 			"title": "deduplication timeline links",
@@ -135,6 +137,8 @@ class TestCommunication(unittest.TestCase):
 	def test_get_communication_data(self):
 		from frappe.desk.form.load import get_communication_data
 
+		frappe.delete_doc_if_exists("Note", "get communication data")
+
 		note = frappe.get_doc({
 			"doctype": "Note",
 			"title": "get communication data",
diff --git a/frappe/core/doctype/communication_link/__init__.py b/frappe/core/doctype/communication_link/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/core/doctype/communication_link/communication_link.json b/frappe/core/doctype/communication_link/communication_link.json
new file mode 100644
index 0000000000..1dd051bed2
--- /dev/null
+++ b/frappe/core/doctype/communication_link/communication_link.json
@@ -0,0 +1,47 @@
+{
+ "creation": "2019-05-21 09:47:23.043960",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "link_doctype",
+  "link_name",
+  "link_title"
+ ],
+ "fields": [
+  {
+   "fieldname": "link_doctype",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Link DocType",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "fieldname": "link_name",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Link Name",
+   "options": "link_doctype",
+   "reqd": 1
+  },
+  {
+   "fieldname": "link_title",
+   "fieldtype": "Read Only",
+   "in_list_view": 1,
+   "label": "Link Title",
+   "read_only": 1
+  }
+ ],
+ "istable": 1,
+ "modified": "2019-05-21 09:47:23.043960",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Communication Link",
+ "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/communication_link/communication_link.py b/frappe/core/doctype/communication_link/communication_link.py
new file mode 100644
index 0000000000..0328f2b86a
--- /dev/null
+++ b/frappe/core/doctype/communication_link/communication_link.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, 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 CommunicationLink(Document):
+	pass
diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py
index d99cc64436..1ad57246a6 100644
--- a/frappe/desk/doctype/event/event.py
+++ b/frappe/desk/doctype/event/event.py
@@ -46,8 +46,8 @@ class Event(Document):
 				comms = frappe.get_list("Communication", filters=[
 					["Communication", "reference_doctype", "=", self.doctype],
 					["Communication", "reference_name", "=", self.name],
-					["Dynamic Link", "link_doctype", "=", participant.reference_doctype],
-					["Dynamic Link", "link_name", "=", participant.reference_docname]
+					["Communication Link", "link_doctype", "=", participant.reference_doctype],
+					["Communication Link", "link_name", "=", participant.reference_docname]
 				], fields=["name"])
 
 				if comms:
@@ -85,8 +85,8 @@ def delete_communication(event, reference_doctype, reference_docname):
 	comms = frappe.get_list("Communication", filters=[
 		["Communication", "reference_doctype", "=", event.get("doctype")],
 		["Communication", "reference_name", "=", event.get("name")],
-		["Dynamic Link", "link_doctype", "=", deleted_participant.reference_doctype],
-		["Dynamic Link", "link_name", "=", deleted_participant.reference_docname]
+		["Communication Link", "link_doctype", "=", deleted_participant.reference_doctype],
+		["Communication Link", "link_name", "=", deleted_participant.reference_docname]
 	], fields=["name"])
 
 	if comms:
diff --git a/frappe/desk/doctype/todo/todo.py b/frappe/desk/doctype/todo/todo.py
index 16530c23dc..5d04f412c0 100644
--- a/frappe/desk/doctype/todo/todo.py
+++ b/frappe/desk/doctype/todo/todo.py
@@ -44,7 +44,7 @@ class ToDo(Document):
 	def on_trash(self):
 		# unlink todo from linked comments
 		frappe.db.sql("""
-			delete from `tabDynamic Link`
+			delete from `tabCommunication Link`
 			where link_doctype=%(doctype)s and link_name=%(name)s""", {
 				"doctype": self.doctype, "name": self.name
 		})
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 693efe610c..1538c07221 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -194,9 +194,9 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	part2 = '''
 		SELECT {fields}
 		FROM `tabCommunication` as C
-		INNER JOIN `tabDynamic Link` ON C.name=`tabDynamic Link`.parent
+		INNER JOIN `tabCommunication Link` ON C.name=`tabCommunication Link`.parent
 		WHERE C.communication_type IN ('Communication', 'Feedback')
-		AND `tabDynamic Link`.link_doctype = %(doctype)s AND `tabDynamic Link`.link_name = %(name)s
+		AND `tabCommunication Link`.link_doctype = %(doctype)s AND `tabCommunication Link`.link_name = %(name)s
 		{conditions}
 	'''.format(fields=fields, conditions=conditions)
 
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index ac16f12477..29b54d7f8b 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -204,4 +204,4 @@ def cleanup(sender=None):
 	names = frappe.get_list("Communication", filters=filters, fields=["name"])
 	for name in names:
 		frappe.delete_doc_if_exists("Communication", name.name)
-		frappe.delete_doc_if_exists("Dynamic Link", {"parent": name.name})
\ No newline at end of file
+		frappe.delete_doc_if_exists("Communication Link", {"parent": name.name})
\ No newline at end of file
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index 8a557f3b3f..cdf099e50e 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -301,8 +301,8 @@ def clear_references(doctype, reference_doctype, reference_name,
 		(reference_doctype, reference_name))
 
 def clear_timeline_references(link_doctype, link_name):
-	frappe.db.sql("""delete from `tabDynamic Link`
-		where `tabDynamic Link`.link_doctype='{0}' and `tabDynamic Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
+	frappe.db.sql("""delete from `tabCommunication Link`
+		where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname
diff --git a/frappe/model/document.py b/frappe/model/document.py
index e8add2d619..3ed3118571 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1195,18 +1195,10 @@ class Document(BaseDocument):
 			return
 
 		# update timeline doc in communication if it is different than current timeline doc
-		frappe.db.sql("""update `tabCommunication`
-			set timeline_doctype=%(timeline_doctype)s, timeline_name=%(timeline_name)s
-			where
-				reference_doctype=%(doctype)s and reference_name=%(name)s
-				and (timeline_doctype is null or timeline_doctype != %(timeline_doctype)s
-					or timeline_name is null or timeline_name != %(timeline_name)s)""",
-				{
-					"doctype": self.doctype,
-					"name": self.name,
-					"timeline_doctype": timeline_doctype,
-					"timeline_name": timeline_name
-				})
+		communication = frappe.get_doc("Communication", {"reference_doctype": self.doctype, "reference_name": self.name})
+		if communication.communication_medium == "Email":
+			# duplicate entries will be handled by deduplicate links in communication
+			communication.add_link(link_doctype=timeline_doctype, link_name=timeline_name, autosave=True)
 
 	def queue_action(self, action, **kwargs):
 		'''Run an action in background. If the action has an inner function,
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 911e793687..82a33920f3 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -241,4 +241,6 @@ frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
 frappe.patches.v12_0.remove_feedback_rating
+execute:frappe.reload_doc('core', 'doctype', 'communication_link')
+execute:frappe.reload_doc('core', 'doctype', 'communication')
 frappe.patches.v12_0.move_timeline_links_to_dynamic_links
\ No newline at end of file
diff --git a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
index 41ca11a0a4..8860c7c00d 100644
--- a/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
+++ b/frappe/patches/v12_0/move_timeline_links_to_dynamic_links.py
@@ -3,8 +3,6 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
-	frappe.reload_doc('core', 'doctype', 'communication')
-
 	communications = frappe.db.sql("""
 		SELECT
 			`tabCommunication`.name, `tabCommunication`.creation, `tabCommunication`.modified,
@@ -14,7 +12,7 @@ def execute():
 		WHERE `tabCommunication`.communication_medium='Email'
 	""", as_dict=True)
 
-	name = 10000000000001234567
+	name = 1000000000
 	values = []
 
 	for count, communication in enumerate(communications):
@@ -35,10 +33,12 @@ def execute():
 
 		if values and (count % 10000 == 0 or count == len(communications) - 1):
 			frappe.db.sql("""
-				INSERT INTO `tabDynamic Link`
+				INSERT INTO `tabCommunication Link`
 					(`idx`, `name`, `parentfield`, `parenttype`, `parent`, `link_doctype`, `link_name`, `creation`,
 					`modified`, `modified_by`)
 				VALUES {0}
 			""".format(", ".join([d for d in values])))
 
 			values = []
+
+	frappe.db.add_index("Communication Link", ["link_doctype", "link_name"])
\ No newline at end of file

From 01dc6bee5b662d1b7af9bced547ac37c5f4b9121 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 22 May 2019 13:21:07 +0530
Subject: [PATCH 168/175] fix(delete_fields): handle commit for DDL separately
 for MariaDB and Postgres

---
 frappe/model/__init__.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index 3a8868ec2c..40e8616f12 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -111,8 +111,15 @@ def delete_fields(args_dict, delete=0):
 			fields_need_to_delete = set(fields) & set(existing_fields)
 			if not fields_need_to_delete:
 				continue
+
+			if frappe.conf.db_type == 'mariadb':
+				# mariadb implicitly commits before DDL, make it explicit
+				frappe.db.commit()
+
 			query = "ALTER TABLE `tab%s` " % dt + \
 				", ".join(["DROP COLUMN `%s`" % f for f in fields_need_to_delete])
 			frappe.db.sql(query)
-		# commit the results to db
-		frappe.db.commit()
+
+		if frappe.conf.db_type == 'postgres':
+			# commit the results to db
+			frappe.db.commit()

From 1387c331bc965b02db20ff5bdb59b5f850b55b5d Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 22 May 2019 15:04:42 +0530
Subject: [PATCH 169/175] fix: print format builder setup (#7531)

---
 .../print_format_builder.js                   | 24 ++++++++++++-------
 .../print_format_builder.py                   |  4 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js
index aa733cbe31..160af10c6e 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.js
+++ b/frappe/printing/page/print_format_builder/print_format_builder.js
@@ -130,15 +130,21 @@ frappe.PrintFormatBuilder = Class.extend({
 		});
 	},
 	setup_new_print_format: function(doctype, name, based_on) {
-		frappe.call('frappe.printing.page.print_format_builder.print_format_builder.create_custom_format', {
-			doctype,
-			name,
-			based_on
-		}).then((r) => {
-			frappe.model.with_doc('Print Format', r.message.name)
-				.then(() => $(document).trigger({ type: 'new-print-format', print_format: r.message.name }));
-			this.print_format = r.message;
-			this.refresh();
+		frappe.call({
+			method: 'frappe.printing.page.print_format_builder.print_format_builder.create_custom_format',
+			args: {
+				doctype: doctype,
+				name: name,
+				based_on: based_on
+			},
+			callback: (r) => {
+				if(!r.exc) {
+					if(r.message) {
+						this.print_format = r.message;
+						this.refresh();
+					}
+				}
+			},
 		});
 	},
 	setup_print_format: function() {
diff --git a/frappe/printing/page/print_format_builder/print_format_builder.py b/frappe/printing/page/print_format_builder/print_format_builder.py
index 17baa9314e..d9f57762b0 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.py
+++ b/frappe/printing/page/print_format_builder/print_format_builder.py
@@ -1,7 +1,7 @@
 import frappe
 
 @frappe.whitelist()
-def create_custom_format(doctype, name, based_on):
+def create_custom_format(doctype, name, based_on='Standard'):
 	doc = frappe.new_doc('Print Format')
 	doc.doc_type = doctype
 	doc.name = name
@@ -9,4 +9,4 @@ def create_custom_format(doctype, name, based_on):
 	doc.format_data = frappe.db.get_value('Print Format', based_on, 'format_data') \
 		if based_on != 'Standard' else None
 	doc.insert()
-	return doc
+	return doc
\ No newline at end of file

From 2ffc939fb5093fb1fec44775748773bf4a7111d7 Mon Sep 17 00:00:00 2001
From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Date: Wed, 22 May 2019 18:11:45 +0530
Subject: [PATCH 170/175] fix: Doctype some tests and fix (#7536)

* test: some tests and fix

* Update test_doctype.py
---
 frappe/core/doctype/doctype/doctype.py      | 51 ++++++++++---------
 frappe/core/doctype/doctype/test_doctype.py | 54 +++++++++++++++++++++
 2 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 7efdba3237..acb43b5f19 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -23,6 +23,14 @@ import frappe.website.render
 import json
 
 class InvalidFieldNameError(frappe.ValidationError): pass
+class UniqueFieldnameError(frappe.ValidationError): pass
+class IllegalMandatoryError(frappe.ValidationError): pass
+class DoctypeLinkError(frappe.ValidationError): pass
+class WrongOptionsDoctypeLinkError(frappe.ValidationError): pass
+class HiddenAndMandatoryWithoutDefaultError(frappe.ValidationError): pass
+class NonUniqueError(frappe.ValidationError): pass
+class CannotIndexedError(frappe.ValidationError): pass
+class CannotCreateStandardDoctypeError(frappe.ValidationError): pass
 
 form_grid_templates = {
 	"fields": "templates/form_grid/fields.html"
@@ -101,7 +109,7 @@ class DocType(Document):
 			return
 
 		if not frappe.conf.get("developer_mode") and not self.custom:
-			frappe.throw(_("Not in Developer Mode! Set in site_config.json or make 'Custom' DocType."))
+			frappe.throw(_("Not in Developer Mode! Set in site_config.json or make 'Custom' DocType."), CannotCreateStandardDoctypeError)
 
 	def setup_fields_to_fetch(self):
 		'''Setup query to update values for newly set fetch values'''
@@ -542,7 +550,6 @@ def validate_fields_for_doctype(doctype):
 # this is separate because it is also called via custom field
 def validate_fields(meta):
 	"""Validate doctype fields. Checks
-
 	1. There are no illegal characters in fieldnames
 	2. If fieldnames are unique.
 	3. Validate column length.
@@ -562,38 +569,38 @@ def validate_fields(meta):
 	def check_illegal_characters(fieldname):
 		validate_column_name(fieldname)
 
-	def check_unique_fieldname(fieldname):
+	def check_unique_fieldname(docname, fieldname):
 		duplicates = list(filter(None, map(lambda df: df.fieldname==fieldname and str(df.idx) or None, fields)))
 		if len(duplicates) > 1:
-			frappe.throw(_("Fieldname {0} appears multiple times in rows {1}").format(fieldname, ", ".join(duplicates)))
+			frappe.throw(_("{0}: Fieldname {1} appears multiple times in rows {2}").format(docname, fieldname, ", ".join(duplicates)), UniqueFieldnameError)
 
 	def check_fieldname_length(fieldname):
 		validate_column_length(fieldname)
 
-	def check_illegal_mandatory(d):
+	def check_illegal_mandatory(docname, d):
 		if (d.fieldtype in no_value_fields) and d.fieldtype not in table_fields and d.reqd:
-			frappe.throw(_("Field {0} of type {1} cannot be mandatory").format(d.label, d.fieldtype))
+			frappe.throw(_("{0}: Field {1} of type {2} cannot be mandatory").format(docname, d.label, d.fieldtype), IllegalMandatoryError)
 
-	def check_link_table_options(d):
+	def check_link_table_options(docname, d):
 		if d.fieldtype in ("Link",) + table_fields:
 			if not d.options:
-				frappe.throw(_("Options required for Link or Table type field {0} in row {1}").format(d.label, d.idx))
+				frappe.throw(_("{0}: Options required for Link or Table type field {1} in row {2}").format(docname, d.label, d.idx), DoctypeLinkError)
 			if d.options=="[Select]" or d.options==d.parent:
 				return
 			if d.options != d.parent:
 				options = frappe.db.get_value("DocType", d.options, "name")
 				if not options:
-					frappe.throw(_("Options must be a valid DocType for field {0} in row {1}").format(d.label, d.idx))
+					frappe.throw(_("{0}: Options must be a valid DocType for field {1} in row {2}").format(docname, d.label, d.idx), WrongOptionsDoctypeLinkError)
 				elif not (options == d.options):
-					frappe.throw(_("Options {0} must be the same as doctype name {1} for the field {2}")
-						.format(d.options, options, d.label))
+					frappe.throw(_("{0}: Options {1} must be the same as doctype name {2} for the field {3}", DoctypeLinkError)
+						.format(docname, d.options, options, d.label))
 				else:
 					# fix case
 					d.options = options
 
-	def check_hidden_and_mandatory(d):
+	def check_hidden_and_mandatory(docname, d):
 		if d.hidden and d.reqd and not d.default:
-			frappe.throw(_("Field {0} in row {1} cannot be hidden and mandatory without default").format(d.label, d.idx))
+			frappe.throw(_("{0}: Field {1} in row {2} cannot be hidden and mandatory without default").format(docname, d.label, d.idx), HiddenAndMandatoryWithoutDefaultError)
 
 	def check_width(d):
 		if d.fieldtype == "Currency" and cint(d.width) < 100:
@@ -627,14 +634,14 @@ def validate_fields(meta):
 		if d.fieldtype in ("Currency", "Float", "Percent") and d.precision is not None and not (1 <= cint(d.precision) <= 6):
 			frappe.throw(_("Precision should be between 1 and 6"))
 
-	def check_unique_and_text(d):
+	def check_unique_and_text(docname, d):
 		if meta.issingle:
 			d.unique = 0
 			d.search_index = 0
 
 		if getattr(d, "unique", False):
 			if d.fieldtype not in ("Data", "Link", "Read Only"):
-				frappe.throw(_("Fieldtype {0} for {1} cannot be unique").format(d.fieldtype, d.label))
+				frappe.throw(_("{0}: Fieldtype {1} for {2} cannot be unique").format(docname, d.fieldtype, d.label), NonUniqueError)
 
 			if not d.get("__islocal") and frappe.db.has_column(d.parent, d.fieldname):
 				has_non_unique_values = frappe.db.sql("""select `{fieldname}`, count(*)
@@ -643,10 +650,10 @@ def validate_fields(meta):
 					doctype=d.parent, fieldname=d.fieldname))
 
 				if has_non_unique_values and has_non_unique_values[0][0]:
-					frappe.throw(_("Field '{0}' cannot be set as Unique as it has non-unique values").format(d.label))
+					frappe.throw(_("{0}: Field '{1}' cannot be set as Unique as it has non-unique values").format(docname, d.label), NonUniqueError)
 
 		if d.search_index and d.fieldtype in ("Text", "Long Text", "Small Text", "Code", "Text Editor"):
-			frappe.throw(_("Fieldtype {0} for {1} cannot be indexed").format(d.fieldtype, d.label))
+			frappe.throw(_("{0}:Fieldtype {1} for {2} cannot be indexed").format(docname, d.fieldtype, d.label), CannotIndexedError)
 
 	def check_fold(fields):
 		fold_exists = False
@@ -797,16 +804,16 @@ def validate_fields(meta):
 			d.fieldname = d.fieldname.lower()
 
 		check_illegal_characters(d.fieldname)
-		check_unique_fieldname(d.fieldname)
+		check_unique_fieldname(meta.get("name"), d.fieldname)
 		check_fieldname_length(d.fieldname)
-		check_illegal_mandatory(d)
-		check_link_table_options(d)
+		check_illegal_mandatory(meta.get("name"), d)
+		check_link_table_options(meta.get("name"), d)
 		check_dynamic_link_options(d)
-		check_hidden_and_mandatory(d)
+		check_hidden_and_mandatory(meta.get("name"), d)
 		check_in_list_view(d)
 		check_in_global_search(d)
 		check_illegal_default(d)
-		check_unique_and_text(d)
+		check_unique_and_text(meta.get("name"), d)
 		check_illegal_depends_on_conditions(d)
 		check_table_multiselect_option(d)
 		scrub_options_in_select(d)
diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py
index 4a0782340d..1b919106d5 100644
--- a/frappe/core/doctype/doctype/test_doctype.py
+++ b/frappe/core/doctype/doctype/test_doctype.py
@@ -5,6 +5,8 @@ from __future__ import unicode_literals
 
 import frappe
 import unittest
+from frappe.core.doctype.doctype.doctype import UniqueFieldnameError, IllegalMandatoryError, DoctypeLinkError, WrongOptionsDoctypeLinkError,\
+ HiddenAndMandatoryWithoutDefaultError, CannotIndexedError
 
 # test_records = frappe.get_test_records('DocType')
 
@@ -226,3 +228,55 @@ class TestDocType(unittest.TestCase):
 			raise
 		finally:
 			frappe.flags.allow_doctype_export = 0
+
+	def test_unique_field_name_for_two_fields(self):
+		doc = self.new_doctype('Test Unique Field')
+		field_1 = doc.append('fields', {})
+		field_1.fieldname  = 'some_fieldname_1'
+		field_1.fieldtype = 'Data'
+
+		field_2 = doc.append('fields', {})
+		field_2.fieldname  = 'some_fieldname_1'
+		field_2.fieldtype = 'Data'
+
+		self.assertRaises(UniqueFieldnameError, doc.insert)
+
+	def test_illegal_mandatory_validation(self):
+		doc = self.new_doctype('Test Illegal mandatory')
+		field_1 = doc.append('fields', {})
+		field_1.fieldname  = 'some_fieldname_1'
+		field_1.fieldtype = 'Section Break'
+		field_1.reqd = 1
+
+		self.assertRaises(IllegalMandatoryError, doc.insert)
+
+	def test_link_with_wrong_and_no_options(self):
+		doc = self.new_doctype('Test link')
+		field_1 = doc.append('fields', {})
+		field_1.fieldname  = 'some_fieldname_1'
+		field_1.fieldtype = 'Link'
+
+		self.assertRaises(DoctypeLinkError, doc.insert)
+
+		field_1.options = 'wrongdoctype'
+
+		self.assertRaises(WrongOptionsDoctypeLinkError, doc.insert)
+
+	def test_hidden_and_mandatory_without_default(self):
+		doc = self.new_doctype('Test hidden and mandatory')
+		field_1 = doc.append('fields', {})
+		field_1.fieldname  = 'some_fieldname_1'
+		field_1.fieldtype = 'Data'
+		field_1.reqd = 1
+		field_1.hidden = 1
+
+		self.assertRaises(HiddenAndMandatoryWithoutDefaultError, doc.insert)
+
+	def test_field_can_not_be_indexed_validation(self):
+		doc = self.new_doctype('Test index')
+		field_1 = doc.append('fields', {})
+		field_1.fieldname  = 'some_fieldname_1'
+		field_1.fieldtype = 'Long Text'
+		field_1.search_index = 1
+
+		self.assertRaises(CannotIndexedError, doc.insert)

From 51042b13596c9b7cee0171bd80edfc9b3472daf2 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Thu, 23 May 2019 09:35:53 +0530
Subject: [PATCH 171/175] fix(load): alias creation in get communications
 (#7538)

* fix: alias creation

* fix: fix update_timeline_doc

* fix: add timeline link irrespective of comm medium
---
 frappe/desk/form/load.py | 4 ++--
 frappe/model/document.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 1538c07221..3b67b78144 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -164,7 +164,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 			C.name, C.communication_type, C.communication_medium,
 			C.comment_type, C.communication_date, C.content,
 			C.sender, C.sender_full_name, C.cc, C.bcc,
-			C.creation, C.subject, C.delivery_status,
+			C.creation AS creation, C.subject, C.delivery_status,
 			C._liked_by, C.reference_doctype, C.reference_name,
 			C.read_by_recipient, C.rating
 		'''
@@ -204,7 +204,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 		SELECT *
 		FROM (({part1}) UNION ({part2})) AS combined
 		{group_by}
-		ORDER BY combined.creation DESC
+		ORDER BY creation DESC
 		LIMIT %(limit)s
 		OFFSET %(start)s
 	'''.format(part1=part1, part2=part2, group_by=(group_by or '')), dict(
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 3ed3118571..f368aad72d 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1195,8 +1195,9 @@ class Document(BaseDocument):
 			return
 
 		# update timeline doc in communication if it is different than current timeline doc
-		communication = frappe.get_doc("Communication", {"reference_doctype": self.doctype, "reference_name": self.name})
-		if communication.communication_medium == "Email":
+		communications = frappe.get_list("Communication", filters={"reference_doctype": self.doctype, "reference_name": self.name})
+		for communication in communications:
+			communication = frappe.get_doc("Communication", communication.name)
 			# duplicate entries will be handled by deduplicate links in communication
 			communication.add_link(link_doctype=timeline_doctype, link_name=timeline_name, autosave=True)
 

From 3bd1e228650f5248cc7606628af5477021f55b18 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Thu, 23 May 2019 09:37:25 +0530
Subject: [PATCH 172/175] patch: rearange order for reload_doc (#7540)

---
 frappe/patches.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 82a33920f3..c79efbc1b7 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -232,6 +232,8 @@ execute:frappe.delete_doc('Page', 'applications', ignore_missing=True)
 frappe.patches.v11_0.set_missing_creation_and_modified_value_for_user_permissions
 frappe.patches.v11_0.set_default_letter_head_source
 frappe.patches.v12_0.set_primary_key_in_series
+execute:frappe.reload_doc('core', 'doctype', 'communication_link')
+execute:frappe.reload_doc('core', 'doctype', 'communication')
 execute:frappe.delete_doc("Page", "modules", ignore_missing=True)
 frappe.patches.v11_0.set_default_letter_head_source
 frappe.patches.v12_0.setup_comments_from_communications
@@ -241,6 +243,4 @@ frappe.patches.v12_0.reset_home_settings
 frappe.patches.v12_0.update_print_format_type
 frappe.patches.v11_0.remove_doctype_user_permissions_for_page_and_report #2019-05-01
 frappe.patches.v12_0.remove_feedback_rating
-execute:frappe.reload_doc('core', 'doctype', 'communication_link')
-execute:frappe.reload_doc('core', 'doctype', 'communication')
 frappe.patches.v12_0.move_timeline_links_to_dynamic_links
\ No newline at end of file

From cc0ea13ec515a5c9614fa6aee33863447d5e4d16 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 23 May 2019 13:04:59 +0530
Subject: [PATCH 173/175] fix: has permission decorator

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

diff --git a/frappe/permissions.py b/frappe/permissions.py
index e5aa31d139..27eeb9be28 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -30,7 +30,7 @@ def print_has_permission_check_logs(func):
 		# print only if access denied
 		# and if user is checking his own permission
 		if not result and self_perm_check and raise_exception:
-			msgprint(('<br>').join(frappe.flags.get('has_permission_check_logs')))
+			msgprint(('<br>').join(frappe.flags.get('has_permission_check_logs', [])))
 		frappe.flags.pop('has_permission_check_logs', None)
 		return result
 	return inner

From 32e066988a902f19d171225891f0a52a13945526 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Thu, 23 May 2019 14:55:48 +0530
Subject: [PATCH 174/175] fix(patch): Move files only from Home folder

---
 .../patches/v12_0/move_form_attachments_to_attachments_folder.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py b/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py
index da2bdd836b..c96741cc3b 100644
--- a/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py
+++ b/frappe/patches/v12_0/move_form_attachments_to_attachments_folder.py
@@ -5,4 +5,5 @@ def execute():
 		UPDATE tabFile
 		SET folder = 'Home/Attachments'
 		WHERE ifnull(attached_to_doctype, '') != ''
+		AND folder = 'Home'
 	''')

From 7d49df12ceba4ceedaddbd46b66626005539a299 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 23 May 2019 15:16:29 +0530
Subject: [PATCH 175/175] fix: Update frappe datatable

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 59f402dae1..dd5a96d741 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "cookie": "^0.3.1",
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
-    "frappe-datatable": "^1.12.2",
+    "frappe-datatable": "^1.13.1",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",
diff --git a/yarn.lock b/yarn.lock
index 7ee8775740..64bc06edff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1753,10 +1753,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-datatable@^1.12.2:
-  version "1.12.2"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.12.2.tgz#cb7e32defd38426c63278249843baa91dcba79aa"
-  integrity sha512-e4prKv4klBW9I5iVIesoeJgt4LofzZDfDxP+eqvQN2GZRVs8KYEXgyPhcaH89FfuhIkzVK6kDbMHw+KbGfOJIA==
+frappe-datatable@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.1.tgz#dbfa27fe735832cea54a0b35e3d3bfb839778c8d"
+  integrity sha512-FOC8dpsOSI+KnF5sBrYja9b2Y+3qUvYy/H6108QchKSvXYvuWVr/uuLk2N5xlz38PWU3d7n5lK0dkx+zXTKJ0w==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"