From 15eab8fb8000f814db4c2cd499cd667a55ef4c76 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 29 Apr 2020 12:28:08 +0530
Subject: [PATCH 001/319] perf: Cache get_tables values - To avoid redundant db
 calls

---
 frappe/database/database.py | 11 ++++++++++-
 frappe/database/schema.py   |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index b083ff1014..cc76745c2e 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -769,7 +769,16 @@ class Database(object):
 		return ("tab" + doctype) in self.get_tables()
 
 	def get_tables(self):
-		return [d[0] for d in self.sql("select table_name from information_schema.tables where table_schema not in ('pg_catalog', 'information_schema')")]
+		tables = frappe.cache().get_value('db_tables')
+		if not tables:
+			table_rows = self.sql("""
+				SELECT table_name
+				FROM information_schema.tables
+				WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
+			""")
+			tables = set([d[0] for d in table_rows])
+		frappe.cache().set_value('db_tables', tables)
+		return tables
 
 	def a_row_exists(self, doctype):
 		"""Returns True if atleast one row exists."""
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 28e055f382..3d484a1f1b 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -31,6 +31,7 @@ class DBTable:
 
 	def sync(self):
 		if self.is_new():
+			frappe.cache().delete_key('db_tables')
 			self.create()
 		else:
 			frappe.cache().hdel('table_columns', self.table_name)

From c06234802b3e2409d88fe188b9766bc1a1a54f27 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 29 Apr 2020 14:07:51 +0530
Subject: [PATCH 002/319] fix: Translatable string

---
 frappe/database/schema.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 3d484a1f1b..9c7008a8ed 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -144,10 +144,9 @@ class DBTable:
 					if max_length and max_length[0][0] and max_length[0][0] > new_length:
 						if col.fieldname in self.columns:
 							self.columns[col.fieldname].length = current_length
-
-						frappe.msgprint(_("""Reverting length to {0} for '{1}' in '{2}';
-							Setting the length as {3} will cause truncation of data.""")
-							.format(current_length, col.fieldname, self.doctype, new_length))
+						info_message = _("Reverting length to {0} for '{1}' in '{2}'. Setting the length as {3} will cause truncation of data.") \
+							.format(current_length, col.fieldname, self.doctype, new_length)
+						frappe.msgprint(info_message)
 
 	def is_new(self):
 		return self.table_name not in frappe.db.get_tables()

From 93d9fbb10b4a1ff372356a17f93e0e5720fe5342 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 29 Apr 2020 14:39:14 +0530
Subject: [PATCH 003/319] fix: Directly used set comprehension

As indicated by deepsource
---
 frappe/database/database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index cc76745c2e..103538944c 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -776,7 +776,7 @@ class Database(object):
 				FROM information_schema.tables
 				WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
 			""")
-			tables = set([d[0] for d in table_rows])
+			tables = set(d[0] for d in table_rows)
 		frappe.cache().set_value('db_tables', tables)
 		return tables
 

From 04fb48165f7de69763b314080eb92406ecad1302 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Tue, 28 Apr 2020 19:22:20 +0530
Subject: [PATCH 004/319] fix: do not check for frappe.conf.monitor while
 stopping monitor

(cherry picked from commit a195421097b0ded8b531ce74ad9cf831f95780b1)
---
 frappe/monitor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/monitor.py b/frappe/monitor.py
index 7181bd92ad..cd365fd13f 100644
--- a/frappe/monitor.py
+++ b/frappe/monitor.py
@@ -23,7 +23,7 @@ def start(transaction_type="request", method=None, kwargs=None):
 
 
 def stop(response=None):
-	if frappe.conf.monitor and hasattr(frappe.local, "monitor"):
+	if hasattr(frappe.local, "monitor"):
 		frappe.local.monitor.dump(response)
 
 

From 9d7829761c1f0c595d4301263d56622dc9faf9e2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 14:16:29 +0530
Subject: [PATCH 005/319] fix: Clear db_tables cache whenever a table is
 created or dropped

---
 frappe/database/database.py | 7 +++++++
 frappe/database/schema.py   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 103538944c..b81a26bb81 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -124,6 +124,8 @@ class Database(object):
 		# in transaction validations
 		self.check_transaction_status(query)
 
+		self.clear_db_table_cache(query)
+
 		# autocommit
 		if auto_commit: self.commit()
 
@@ -277,6 +279,11 @@ class Database(object):
 			ret.append(frappe._dict(zip(keys, values)))
 		return ret
 
+	@staticmethod
+	def clear_db_table_cache(query):
+		if query and query.strip().split()[0].lower() in {'drop', 'create'}:
+			frappe.cache().delete_key('db_tables')
+
 	@staticmethod
 	def needs_formatting(result, formatted):
 		"""Returns true if the first row in the result has a Date, Datetime, Long Int."""
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 9c7008a8ed..fc6215061a 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -31,7 +31,6 @@ class DBTable:
 
 	def sync(self):
 		if self.is_new():
-			frappe.cache().delete_key('db_tables')
 			self.create()
 		else:
 			frappe.cache().hdel('table_columns', self.table_name)

From b7d077589299ae305a70471e9dccc29e7f8dec67 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 14:36:42 +0530
Subject: [PATCH 006/319] fix: Add db_tables to global cache keys

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

diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index 78f452db21..2daed59074 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -16,7 +16,7 @@ global_cache_keys = ("app_hooks", "installed_apps",
 		'scheduler_events', 'time_zone', 'webhooks', 'active_domains',
 		'active_modules', 'assignment_rule', 'server_script_map', 'wkhtmltopdf_version',
 		'domain_restricted_doctypes', 'domain_restricted_pages', 'information_schema:counts',
-		'sitemap_routes')
+		'sitemap_routes', 'db_tables')
 
 user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang",
 		"defaults", "user_permissions", "home_page", "linked_with",

From 53f0387e217ffd57732b89a408802f1d946b5fe2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 29 Apr 2020 16:43:01 +0530
Subject: [PATCH 007/319] refactor: Fix redundant cache value set

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

diff --git a/frappe/database/database.py b/frappe/database/database.py
index b81a26bb81..90d07e457c 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -784,7 +784,7 @@ class Database(object):
 				WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
 			""")
 			tables = set(d[0] for d in table_rows)
-		frappe.cache().set_value('db_tables', tables)
+			frappe.cache().set_value('db_tables', tables)
 		return tables
 
 	def a_row_exists(self, doctype):

From 056d3d382ce71ca1c5b376100342fe1d13afc3cc Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Wed, 29 Apr 2020 21:58:00 +0530
Subject: [PATCH 008/319] chore: fix deepsource issues

* use set comprehension instead of generator
* remove redundant else statement

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/database/database.py | 2 +-
 frappe/database/schema.py   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 90d07e457c..101b97c915 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -783,7 +783,7 @@ class Database(object):
 				FROM information_schema.tables
 				WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
 			""")
-			tables = set(d[0] for d in table_rows)
+			tables = {d[0] for d in table_rows}
 			frappe.cache().set_value('db_tables', tables)
 		return tables
 
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index fc6215061a..52dc2ba917 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -137,8 +137,7 @@ class DBTable:
 						if frappe.db.is_missing_column(e):
 							# Unknown column 'column_name' in 'field list'
 							continue
-						else:
-							raise
+						raise
 
 					if max_length and max_length[0][0] and max_length[0][0] > new_length:
 						if col.fieldname in self.columns:

From f01f03ac771a6bbf67e19c4e253c81f8e370a03c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 30 Apr 2020 14:32:00 +0530
Subject: [PATCH 009/319] fix: check for self linking and circular linking
 while getting submitted linked docs

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

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

From f387f1b54f92340d3d3e4d65a578d1f35247dc6d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 30 Apr 2020 15:16:53 +0530
Subject: [PATCH 010/319] fix: check for self linking

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

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index 5f5f6e4f82..72917d0341 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -43,6 +43,9 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
 			linked[link_doctype] = []
 
 		for link in link_names:
+			if link['name'] == name:
+				continue
+
 			if linked and name in linked[link_doctype]:
 				continue
 

From aaeccae2b014c641f4892ba72e7fa30780dcd0ad Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 28 Apr 2020 14:07:29 +0530
Subject: [PATCH 011/319] fix: Add `__unsaved` flag for newly created doc

(cherry picked from commit 689b68341e04cfadf067eeea6b9e04e23ec2f1c4)
---
 frappe/model/create_new.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/model/create_new.py b/frappe/model/create_new.py
index 91fb079fca..2142d544fe 100644
--- a/frappe/model/create_new.py
+++ b/frappe/model/create_new.py
@@ -45,6 +45,7 @@ def make_new_doc(doctype):
 	doc = doc.get_valid_dict(sanitize=False)
 	doc["doctype"] = doctype
 	doc["__islocal"] = 1
+	doc["__unsaved"] = 1
 
 	return doc
 

From cd344d888acbe49209f6a6d98a43e359b88c7ef8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 28 Apr 2020 14:07:43 +0530
Subject: [PATCH 012/319] fix: Fix message for doc save without changes

- To avoid confusion

(cherry picked from commit 0c62b0629e6391801db4d3ae47a65622ac31d3f4)
---
 frappe/public/js/frappe/form/save.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 7efbbe2d3d..8f88ff8db0 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -36,7 +36,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 				freeze_message: freeze_message
 			});
 		} else {
-			frappe.show_alert({message: __("Document not updated"), indicator: "yellow"});
+			frappe.show_alert({message: __("No changes in document"), indicator: "blue"});
 			$(btn).prop("disabled", false);
 		}
 	};

From 4c746b7b721fb4acb4defb0c67e30877f7526727 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Sat, 25 Apr 2020 11:56:55 +0530
Subject: [PATCH 013/319] fix: Clear `__unsaved` flag in insert method (#10094)

(cherry picked from commit 1c3077b2599540cb698fd6914bce45aa24bfe898)
---
 frappe/model/document.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index f2495e9e20..3dbb1e232a 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -268,6 +268,10 @@ class Document(BaseDocument):
 		if hasattr(self, "__islocal"):
 			delattr(self, "__islocal")
 
+		# clear unsaved flag
+		if hasattr(self, "__unsaved"):
+			delattr(self, "__unsaved")
+
 		if not (frappe.flags.in_migrate or frappe.local.flags.in_install or frappe.flags.in_setup_wizard):
 			follow_document(self.doctype, self.name, frappe.session.user)
 		return self

From bc8b5c01656bdbd742bbfa47556b2a2cb00f75f0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 24 Apr 2020 11:25:36 +0530
Subject: [PATCH 014/319] fix: Clear `__unsaved` flag after document save
 (#10082)

(cherry picked from commit d678fc62abf8c5b8495a1ac3e97655ef704b6022)
---
 frappe/model/document.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index f2495e9e20..5e01f5e65f 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -329,6 +329,10 @@ class Document(BaseDocument):
 		self.update_children()
 		self.run_post_save_methods()
 
+		# clear unsaved flag
+		if hasattr(self, "__unsaved"):
+			delattr(self, "__unsaved")
+
 		return self
 
 	def copy_attachments_from_amended_from(self):

From 67c9cda529a3d8872f918a450996c67408e338a9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 23 Apr 2020 20:38:33 +0530
Subject: [PATCH 015/319] fix: Consider `__unsaved` flag while getting doc
 as_dict (#10067)

Co-authored-by: Prssanna Desai <prssud@gmail.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
(cherry picked from commit 9122866c625c40032fd22d04718bbba2db8cb208)
---
 frappe/model/base_document.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index b2b0f6380d..f5612c1ec0 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -289,7 +289,7 @@ class BaseDocument(object):
 				if k in default_fields:
 					del doc[k]
 
-		for key in ("_user_tags", "__islocal", "__onload", "_liked_by", "__run_link_triggers"):
+		for key in ("_user_tags", "__islocal", "__onload", "_liked_by", "__run_link_triggers", "__unsaved"):
 			if self.get(key):
 				doc[key] = self.get(key)
 

From 9535268ab4618fcf632f61032834c89529c45e8c Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Sun, 26 Apr 2020 21:26:28 +0530
Subject: [PATCH 016/319] fix: initialise filters in Dashboard Chart

(cherry picked from commit c4c71bc5391fc1294a8fb6c020f6464723278cb1)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index b2a6f0a0ff..34994b8035 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -79,7 +79,7 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 			to_date = chart.to_date
 
 	timegrain = time_interval or chart.time_interval
-	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
+	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json) or []
 
 	# don't include cancelled documents
 	filters.append([chart.document_type, 'docstatus', '<', 2, False])

From 5ffb18c725d61bd0c2318cd4c818013af6e9d6e7 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Sun, 26 Apr 2020 22:40:57 +0530
Subject: [PATCH 017/319] fix: Labels in Users Desk Page

(cherry picked from commit 273df7d51cbf473c3cac857788b1fc4d6521348e)
---
 frappe/core/desk_page/users/users.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/core/desk_page/users/users.json b/frappe/core/desk_page/users/users.json
index 30455b86e6..f1f43a4ef0 100644
--- a/frappe/core/desk_page/users/users.json
+++ b/frappe/core/desk_page/users/users.json
@@ -27,7 +27,7 @@
  "idx": 0,
  "is_standard": 1,
  "label": "Users",
- "modified": "2020-04-01 11:24:40.767676",
+ "modified": "2020-04-26 22:36:14.311554",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Users",
@@ -46,12 +46,12 @@
    "type": "DocType"
   },
   {
-   "label": "permission-manager",
+   "label": "Permission Manager",
    "link_to": "permission-manager",
    "type": "Page"
   },
   {
-   "label": "user-profile",
+   "label": "User Profile",
    "link_to": "user-profile",
    "type": "Page"
   }

From e44188e1d2e3be6061aab065aa2fb3549a11fb4f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 26 Apr 2020 20:32:51 +0530
Subject: [PATCH 018/319] fix: Only make form-area scrollable

- Exclude grid-form-footer from scrolling area

(cherry picked from commit 84a3d9271e1dca021e43738d680f3d74a1635126)
---
 frappe/public/less/form_grid.less | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index ed457a9ce8..88c5cf7bbc 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -263,8 +263,10 @@
 }
 
 .grid-form-body {
-	max-height: 75vh;
-	overflow-y: auto;
+	.form-area {
+		max-height: 70vh;
+		overflow-y: auto;
+	}
 }
 
 .grid-header-toolbar {

From 6685f65bccdcd756a44218385da35bbc6f5b2e22 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 26 Apr 2020 20:36:01 +0530
Subject: [PATCH 019/319] fix(style): Make grid form look visually centered &
 fix scrolling

- Scroll -15px to make grid form look visually centered
- Do not scroll if grid is displayed in modal

(cherry picked from commit 3292cfb82d7a186bf28fbe1c56b45550724ad8c9)
---
 frappe/public/js/frappe/dom.js           |  4 ++++
 frappe/public/js/frappe/form/grid_row.js | 16 ++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js
index 819ecb526e..7b59f9da08 100644
--- a/frappe/public/js/frappe/dom.js
+++ b/frappe/public/js/frappe/dom.js
@@ -85,6 +85,10 @@ frappe.dom = {
 		);
 	},
 
+	is_element_in_modal(element) {
+		return Boolean($(element).parents('.modal').length);
+	},
+
 	set_style: function(txt, id) {
 		if(!txt) return;
 
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 31d62dc445..5ed31e6e49 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -527,7 +527,7 @@ export default class GridRow {
 		return this;
 	}
 	show_form() {
-		if(!this.grid_form) {
+		if (!this.grid_form) {
 			this.grid_form = new GridRowForm({
 				row: this
 			});
@@ -536,13 +536,15 @@ export default class GridRow {
 		this.row.toggle(false);
 		// this.form_panel.toggle(true);
 		frappe.dom.freeze("", "dark");
-		if(cur_frm) cur_frm.cur_grid = this;
+		if (cur_frm) cur_frm.cur_grid = this;
 		this.wrapper.addClass("grid-row-open");
-		if(!frappe.dom.is_element_in_viewport(this.wrapper)) {
-			frappe.utils.scroll_to(this.wrapper, true, 15);
+		if (!frappe.dom.is_element_in_viewport(this.wrapper)
+			&& !frappe.dom.is_element_in_modal(this.wrapper)) {
+			// -15 offset to make form look visually centered
+			frappe.utils.scroll_to(this.wrapper, true, -15);
 		}
 
-		if(this.frm) {
+		if (this.frm) {
 			this.frm.script_manager.trigger(this.doc.parentfield + "_on_form_rendered");
 			this.frm.script_manager.trigger("form_render", this.doc.doctype, this.doc.name);
 		}
@@ -550,7 +552,9 @@ export default class GridRow {
 	hide_form() {
 		frappe.dom.unfreeze();
 		this.row.toggle(true);
-		frappe.utils.scroll_to(this.row, true, 15);
+		if (!frappe.dom.is_element_in_modal(this.row)) {
+			frappe.utils.scroll_to(this.row, true, 15);
+		}
 		this.refresh();
 		if(cur_frm) cur_frm.cur_grid = null;
 		this.wrapper.removeClass("grid-row-open");

From c085af1b5d323b6f00481f7a6ca7e27fc461df2a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Sun, 26 Apr 2020 17:18:11 +0530
Subject: [PATCH 020/319] Revert "fix: Set fields in grid form as read only for
 non-editable grids"

(cherry picked from commit 75031287652d9d76914ef5c199345d8a9e2f8d1e)
---
 frappe/public/js/frappe/form/grid_row.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 31d62dc445..8738efc1ee 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -22,9 +22,6 @@ export default class GridRow {
 				if(me.grid.allow_on_grid_editing() && me.grid.is_editable()) {
 					// pass
 				} else {
-					if (!me.grid.is_editable()) {
-						me.docfields.map(df => df.read_only = 1);
-					}
 					me.toggle_view();
 					return false;
 				}

From e2c8a23fa99685527096a3c64c43f21faab4762c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 24 Apr 2020 13:44:37 +0530
Subject: [PATCH 021/319] fix: fix file permissions

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
(cherry picked from commit b9baa63cfda84d69cea978b71cffbaf48cb9d3cc)
---
 frappe/core/doctype/file/file.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 8741101976..2ff3a72b38 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -714,7 +714,10 @@ def has_permission(doc, ptype=None, user=None):
 	has_access = False
 	user = user or frappe.session.user
 
-	if not doc.is_private or doc.owner == user or user == 'Administrator':
+	if ptype == 'create':
+		has_access = frappe.has_permission('File', 'create', user=user)
+
+	if not doc.is_private or doc.owner in [user, 'Guest'] or user == 'Administrator':
 		has_access = True
 
 	if doc.attached_to_doctype and doc.attached_to_name:

From 057e5b345b87e4e2d3452f5209b6d960153d311f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 21:48:44 +0530
Subject: [PATCH 022/319] chore: Add change log

---
 frappe/change_log/v13/v13_0_0_beta_1.md | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0_beta_1.md

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0_beta_1.md
new file mode 100644
index 0000000000..6a31d143c5
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0_beta_1.md
@@ -0,0 +1,28 @@
+# Version 13.0.0 Beta 1 Release Notes
+
+## Major Features
+
+- New Desk (#9617)
+- Child table pagination (#8786)
+- Offsite backup (#8241)
+- Events Streaming (#8567)
+- Mandatory Depends On & Read Only Depends On for Document Fields (#8820)
+
+### Dashboard Enhancements
+
+- Onboarding Wizard with configurable slides (#8880)
+- Save Dashboard Chart config per user (#9830)
+- Dashboard permissions (#9789)
+- Create Dashboard Charts from Reports  (#9518)
+- Web Page tracking (#9959)
+
+### Other Minor Features
+
+- Ability to cancel all linked document with a single click (#8905)
+- Custom JS & CSS support in Web Form (#9121) (#9610)
+- System Setting to remove seconds from datetime field (#8531)
+- Added empty list graphics for list view (#8863)
+- Validation for Data options and Data values (#9784)
+- Introduced tnum font feature for reports (#9430)
+- Allow list structure to be changed for the web view (#9431)
+- Added Google API Indexing (#9411)

From f4a6c34a2b8dd1ac086ae93a27b85452f95de6e4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 22:35:06 +0530
Subject: [PATCH 023/319] chore: Add PR Links

---
 frappe/change_log/v13/v13_0_0_beta_1.md | 39 +++++++++++++------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0_beta_1.md
index 6a31d143c5..144b3e34ae 100644
--- a/frappe/change_log/v13/v13_0_0_beta_1.md
+++ b/frappe/change_log/v13/v13_0_0_beta_1.md
@@ -2,27 +2,28 @@
 
 ## Major Features
 
-- New Desk (#9617)
-- Child table pagination (#8786)
-- Offsite backup (#8241)
-- Events Streaming (#8567)
-- Mandatory Depends On & Read Only Depends On for Document Fields (#8820)
+- New Desk ([#9617](https://github.com/frappe/frappe/pull/9617))
+- Child table pagination ([#8786](https://github.com/frappe/frappe/pull/8786))
+- Events Streaming ([#8567](https://github.com/frappe/frappe/pull/8567))
+
 
 ### Dashboard Enhancements
 
-- Onboarding Wizard with configurable slides (#8880)
-- Save Dashboard Chart config per user (#9830)
-- Dashboard permissions (#9789)
-- Create Dashboard Charts from Reports  (#9518)
-- Web Page tracking (#9959)
+- Onboarding Wizard with configurable slides ([#8880](https://github.com/frappe/frappe/pull/8880))
+- Save Dashboard Chart config per user ([#9830](https://github.com/frappe/frappe/pull/9830))
+- Dashboard permissions ([#9789](https://github.com/frappe/frappe/pull/9789))
+- Create Dashboard Charts from Reports  ([#9518](https://github.com/frappe/frappe/pull/9518))
+- Web Page tracking ([#9959](https://github.com/frappe/frappe/pull/9959))
 
-### Other Minor Features
+### Other Features
 
-- Ability to cancel all linked document with a single click (#8905)
-- Custom JS & CSS support in Web Form (#9121) (#9610)
-- System Setting to remove seconds from datetime field (#8531)
-- Added empty list graphics for list view (#8863)
-- Validation for Data options and Data values (#9784)
-- Introduced tnum font feature for reports (#9430)
-- Allow list structure to be changed for the web view (#9431)
-- Added Google API Indexing (#9411)
+- Ability to cancel all linked document with a single click ([#8905](https://github.com/frappe/frappe/pull/8905))
+- Custom JS & CSS support in Web Form ([#9121](https://github.com/frappe/frappe/pull/9121)) ([#9610](https://github.com/frappe/frappe/pull/9610))
+- System Setting to remove seconds from datetime field ([#8531](https://github.com/frappe/frappe/pull/8531))
+- Added empty list graphics for list view ([#8863](https://github.com/frappe/frappe/pull/8863))
+- Validation for Data options and Data values ([#9784](https://github.com/frappe/frappe/pull/9784))
+- Introduced tnum font feature for reports ([#9430](https://github.com/frappe/frappe/pull/9430))
+- Allow list structure to be changed for the web view ([#9431](https://github.com/frappe/frappe/pull/9431))
+- Offsite backup ([#8241](https://github.com/frappe/frappe/pull/8241))
+- Mandatory Depends On & Read Only Depends On for Document Fields ([#8820](https://github.com/frappe/frappe/pull/8820))
+- Added Google API Indexing ([#9411](https://github.com/frappe/frappe/pull/9411))

From 5275db5269157a8b993038c2d577a072ceab733c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 22:37:57 +0530
Subject: [PATCH 024/319] chore: Fix structure issue

---
 frappe/change_log/v13/v13_0_0_beta_1.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0_beta_1.md
index 144b3e34ae..6bdbd5d69b 100644
--- a/frappe/change_log/v13/v13_0_0_beta_1.md
+++ b/frappe/change_log/v13/v13_0_0_beta_1.md
@@ -5,18 +5,17 @@
 - New Desk ([#9617](https://github.com/frappe/frappe/pull/9617))
 - Child table pagination ([#8786](https://github.com/frappe/frappe/pull/8786))
 - Events Streaming ([#8567](https://github.com/frappe/frappe/pull/8567))
-
+- Onboarding Wizard with configurable slides ([#8880](https://github.com/frappe/frappe/pull/8880))
 
 ### Dashboard Enhancements
 
-- Onboarding Wizard with configurable slides ([#8880](https://github.com/frappe/frappe/pull/8880))
 - Save Dashboard Chart config per user ([#9830](https://github.com/frappe/frappe/pull/9830))
 - Dashboard permissions ([#9789](https://github.com/frappe/frappe/pull/9789))
 - Create Dashboard Charts from Reports  ([#9518](https://github.com/frappe/frappe/pull/9518))
-- Web Page tracking ([#9959](https://github.com/frappe/frappe/pull/9959))
 
 ### Other Features
 
+- Web Page tracking ([#9959](https://github.com/frappe/frappe/pull/9959))
 - Ability to cancel all linked document with a single click ([#8905](https://github.com/frappe/frappe/pull/8905))
 - Custom JS & CSS support in Web Form ([#9121](https://github.com/frappe/frappe/pull/9121)) ([#9610](https://github.com/frappe/frappe/pull/9610))
 - System Setting to remove seconds from datetime field ([#8531](https://github.com/frappe/frappe/pull/8531))

From 6ee02b161864115c6ebcddb3dd5d772f0d4a96d1 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 1 May 2020 19:09:24 +0530
Subject: [PATCH 025/319] feat: disable onboarding pop-up

---
 frappe/public/js/frappe/desk.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index b5046d4b12..71898e3d1b 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -96,10 +96,6 @@ frappe.Application = Class.extend({
 
 		this.show_notes();
 
-		if (frappe.boot.is_first_startup) {
-			this.setup_onboarding_wizard();
-		}
-
 		if (frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) {
 			frappe.ui.startup_setup_dialog.pre_show();
 			frappe.ui.startup_setup_dialog.show();

From bd43fe887772949c4200ee8fd1534eb74f445f0e Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Fri, 1 May 2020 19:10:04 +0530
Subject: [PATCH 026/319] chore: update change log

---
 frappe/change_log/v13/v13_0_0_beta_1.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0_beta_1.md
index 6bdbd5d69b..87b4d265d9 100644
--- a/frappe/change_log/v13/v13_0_0_beta_1.md
+++ b/frappe/change_log/v13/v13_0_0_beta_1.md
@@ -5,7 +5,6 @@
 - New Desk ([#9617](https://github.com/frappe/frappe/pull/9617))
 - Child table pagination ([#8786](https://github.com/frappe/frappe/pull/8786))
 - Events Streaming ([#8567](https://github.com/frappe/frappe/pull/8567))
-- Onboarding Wizard with configurable slides ([#8880](https://github.com/frappe/frappe/pull/8880))
 
 ### Dashboard Enhancements
 

From 7a72707d16fb8155bc755800a7fd1dfb1430f935 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 29 Apr 2020 18:59:33 +0530
Subject: [PATCH 027/319] refactor: Remove Webview feature

---
 frappe/website/doctype/css_class/__init__.py  |   0
 frappe/website/doctype/css_class/css_class.js |   8 -
 .../website/doctype/css_class/css_class.json  |  60 -------
 frappe/website/doctype/css_class/css_class.py |  10 --
 .../doctype/css_class/test_css_class.py       |  10 --
 frappe/website/doctype/web_view/__init__.py   |   0
 .../doctype/web_view/templates/web_view.html  |   7 -
 .../web_view/templates/web_view_content.html  |  83 ----------
 .../web_view/templates/web_view_row.html      |   4 -
 .../website/doctype/web_view/test_web_view.py | 115 -------------
 frappe/website/doctype/web_view/web_view.js   |   8 -
 frappe/website/doctype/web_view/web_view.json | 154 ------------------
 frappe/website/doctype/web_view/web_view.py   | 104 ------------
 .../doctype/web_view_component/__init__.py    |   0
 .../web_view_component.json                   | 146 -----------------
 .../web_view_component/web_view_component.py  |  10 --
 16 files changed, 719 deletions(-)
 delete mode 100644 frappe/website/doctype/css_class/__init__.py
 delete mode 100644 frappe/website/doctype/css_class/css_class.js
 delete mode 100644 frappe/website/doctype/css_class/css_class.json
 delete mode 100644 frappe/website/doctype/css_class/css_class.py
 delete mode 100644 frappe/website/doctype/css_class/test_css_class.py
 delete mode 100644 frappe/website/doctype/web_view/__init__.py
 delete mode 100644 frappe/website/doctype/web_view/templates/web_view.html
 delete mode 100644 frappe/website/doctype/web_view/templates/web_view_content.html
 delete mode 100644 frappe/website/doctype/web_view/templates/web_view_row.html
 delete mode 100644 frappe/website/doctype/web_view/test_web_view.py
 delete mode 100644 frappe/website/doctype/web_view/web_view.js
 delete mode 100644 frappe/website/doctype/web_view/web_view.json
 delete mode 100644 frappe/website/doctype/web_view/web_view.py
 delete mode 100644 frappe/website/doctype/web_view_component/__init__.py
 delete mode 100644 frappe/website/doctype/web_view_component/web_view_component.json
 delete mode 100644 frappe/website/doctype/web_view_component/web_view_component.py

diff --git a/frappe/website/doctype/css_class/__init__.py b/frappe/website/doctype/css_class/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/css_class/css_class.js b/frappe/website/doctype/css_class/css_class.js
deleted file mode 100644
index 4544e249bf..0000000000
--- a/frappe/website/doctype/css_class/css_class.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('CSS Class', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/css_class/css_class.json b/frappe/website/doctype/css_class/css_class.json
deleted file mode 100644
index 2a7e1e010e..0000000000
--- a/frappe/website/doctype/css_class/css_class.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "actions": [],
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "Prompt",
- "creation": "2020-03-17 15:03:31.431344",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "is_global",
-  "is_dynamic",
-  "css"
- ],
- "fields": [
-  {
-   "default": "0",
-   "fieldname": "is_global",
-   "fieldtype": "Check",
-   "label": "Is Global?"
-  },
-  {
-   "fieldname": "css",
-   "fieldtype": "Code",
-   "in_list_view": 1,
-   "label": "CSS",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "description": "Website Theme elements are accessible as Jinja variables. Example: \"{{ primary_color }}\"",
-   "fieldname": "is_dynamic",
-   "fieldtype": "Check",
-   "label": "Is Dynamic?"
-  }
- ],
- "links": [],
- "modified": "2020-03-17 17:01:14.874631",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "CSS Class",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Website Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/css_class/css_class.py b/frappe/website/doctype/css_class/css_class.py
deleted file mode 100644
index cb9e7483d4..0000000000
--- a/frappe/website/doctype/css_class/css_class.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class CSSClass(Document):
-	pass
diff --git a/frappe/website/doctype/css_class/test_css_class.py b/frappe/website/doctype/css_class/test_css_class.py
deleted file mode 100644
index 551b44e3f2..0000000000
--- a/frappe/website/doctype/css_class/test_css_class.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestCSSClass(unittest.TestCase):
-	pass
diff --git a/frappe/website/doctype/web_view/__init__.py b/frappe/website/doctype/web_view/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/web_view/templates/web_view.html b/frappe/website/doctype/web_view/templates/web_view.html
deleted file mode 100644
index bf993c05fb..0000000000
--- a/frappe/website/doctype/web_view/templates/web_view.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "templates/web.html" %}
-
-{% block page_content %}
-	{% include "frappe/website/doctype/web_view/templates/web_view_content.html" %}
-{% endblock %}
-
-<!-- this is a sample default web page template -->
\ No newline at end of file
diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html
deleted file mode 100644
index a1ac143639..0000000000
--- a/frappe/website/doctype/web_view/templates/web_view_content.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{%- if css_rules or css -%}
-
-<style>
-{%- for css_rule in css_rules -%}
-	{{ css_rule }}
-{%- endfor -%}
-{{ css or "" }}
-</style>
-{%- endif -%}
-
-{%- macro render_element(element) -%}
-	{%- if element.element_type in ('Content', 'Web View') -%}
-		<div class="web-content {{ element_class(element) }}" {{ element_style(element) }}>
-		{{ element.web_content_html }}
-		</div>
-	{%- elif element.element_type=='Image' -%}
-		<img src='{{ element.image_url }}'
-			{%- if element.element_class -%}class='{{ element.element_class }}'{%- endif -%}
-			{{ element_style(element) }}>
-	{%- endif -%}
-{%- endmacro -%}
-
-{%- macro element_class(element) -%}
-	{{ element.element_class or "" }}
-{%- endmacro -%}
-
-{%- macro element_style(element) -%}
-	{%- if element.element_style or element.background_color -%}
-	style = "{{ element.element_style or '' }} {%if element.background_color %}background-color: {{ element.background_color }};{% endif %}"
-	{%- endif -%}
-{%- endmacro -%}
-
-{%- macro render_sections(sections) -%}
-{%- for section in sections -%}
-<section class='section {{ section.element_class or "" }} {{ section.hide and "hidden" or "" }}' {{ element_style(section) }}>
-	<div class='section-body {% if section.contain_section_width %}container{% endif %}'>
-	{%- if section.section_intro -%}
-		<div class='section-intro'>{{ section.section_intro }}</div>
-	{%- endif -%}
-
-	{%- if section.section_type == 'List' -%}
-		{%- for element in section.elements -%}
-			{{ render_element(element) }}
-		{%- endfor -%}
-
-	{%- elif section.section_type == 'Grid' -%}
-		<div class='row'>
-		{%- for element in section.elements -%}
-			<div class='col-md-{{ element.columns or 6 }}'>
-			{{ render_element(element) }}
-			</div>
-		{%- endfor -%}
-		</div>
-
-	{%- elif section.section_type == 'Tabbed' -%}
-		<ul class="nav" role="tablist">
-			{%- for element in section.elements -%}
-			<li class="nav-item">
-				<a class="nav-link {{ loop.index == 1 and 'active' or ''}}" href="#{{ element.element_id }}" role="tab" data-toggle="tab">
-					{{ element.title }}
-				</a>
-			</li>
-			{%- endfor -%}
-		</ul>
-		<div class="tab-content">
-			{%- for element in section.elements -%}
-			<div class="tab-pane {{ loop.index == 1 and 'show active' or ''}}" role="tabpanel" id="{{ element.element_id }}">
-				{{ render_element(element) }}
-			</div>
-			{%- endfor -%}
-		</div>
-
-	{%- endif -%}
-	</div>
-</section>
-{%- endfor -%}
-{%- endmacro -%}
-
-{% if content_type == 'HTML' -%}
-{{ content_html }}
-{%- else -%}
-{{ render_sections(sections) }}
-{%- endif -%}
\ No newline at end of file
diff --git a/frappe/website/doctype/web_view/templates/web_view_row.html b/frappe/website/doctype/web_view/templates/web_view_row.html
deleted file mode 100644
index 2b999819cb..0000000000
--- a/frappe/website/doctype/web_view/templates/web_view_row.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-	<a href={{ route }}>{{ title }}</a>
-</div>
-<!-- this is a sample default list template -->
\ No newline at end of file
diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py
deleted file mode 100644
index 3dc072a6dd..0000000000
--- a/frappe/website/doctype/web_view/test_web_view.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-from frappe.website.doctype.web_page.test_web_page import get_page_content
-
-test_dependencies = ['Web Page'] # for test
-
-class TestWebView(unittest.TestCase):
-	@classmethod
-	def setUpClass(cls):
-		frappe.delete_doc_if_exists('Web View', 'test-web-view')
-		frappe.delete_doc_if_exists('Web View', 'html-web-view')
-		frappe.delete_doc_if_exists('CSS Class', 'test-css-class')
-
-		frappe.get_doc(dict(
-			doctype = 'CSS Class',
-			name = 'test-css-class',
-			css = '.test-class { color: red; }'
-		)).insert()
-
-		# simple html webview
-		frappe.get_doc(dict(
-			doctype = 'Web View',
-			title = 'HTML Web View',
-			route = 'html-web-view',
-			published = 1,
-			content_type = 'HTML',
-			content_html = '<h1>Hello HTML</h1>'
-		)).insert()
-
-		# simple web view with components
-
-		frappe.get_doc(dict(
-			doctype = 'Web View',
-			title = 'Test Web View',
-			route = 'test-web-view',
-			published = 1,
-			content_type = 'Components',
-			components = [
-				dict(
-					element_type = 'Section',
-					section_type = 'List'
-				),
-				dict(
-					element_type = 'Content',
-					web_content_type = 'Markdown',
-					web_content_markdown = '## Heading\n\nBody'
-				),
-				dict(
-					element_type = 'Content',
-					web_content_type = 'HTML',
-					web_content_html = '<div>Here is some HTML</div>'
-				),
-				dict(
-					element_type = 'Section',
-					section_type = 'Grid'
-				),
-				dict(
-					element_type = 'Content',
-					element_class = 'test-css-class',
-					web_content_type = 'Markdown',
-					web_content_markdown = 'Column 1'
-				),
-				dict(
-					element_type = 'Content',
-					web_content_type = 'Markdown',
-					web_content_markdown = 'Column 2'
-				),
-				dict(
-					element_type = 'Web View',
-					web_view = 'html-web-view',
-				),
-			]
-		)).insert()
-
-	def test_web_view(self):
-		html = get_page_content('test-web-view')
-		self.assert_web_view_in_html(html)
-
-	def test_html_web_view(self):
-		html = get_page_content('html-web-view')
-		self.assertTrue('Hello HTML' in html)
-
-	def assert_web_view_in_html(self, html):
-		self.assertTrue('<h2 id="heading">Heading</h2>' in html)
-		self.assertTrue('<div>Here is some HTML</div>' in html)
-		self.assertTrue('Column 1' in html)
-		self.assertTrue('Column 2' in html)
-		self.assertTrue('Hello HTML' in html)
-		self.assertTrue('.test-class { color: red; }' in html)
-
-	def test_web_view_in_footer(self):
-		website_settings = frappe.get_single("Website Settings")
-		website_settings.footer_type = 'Web View'
-		website_settings.footer_web_view = 'test-web-view'
-		website_settings.save()
-
-		html = get_page_content('test-web-page-1')
-
-		website_settings.footer_type = 'Standard'
-		website_settings.footer_web_view = ''
-		website_settings.save()
-
-		# web view should still come as footer
-		self.assert_web_view_in_html(html)
-
-		html_without_footer = get_page_content('test-web-page-1')
-
-		# no more footer
-		self.assertFalse('Column 1' in html_without_footer)
diff --git a/frappe/website/doctype/web_view/web_view.js b/frappe/website/doctype/web_view/web_view.js
deleted file mode 100644
index 449c0949b6..0000000000
--- a/frappe/website/doctype/web_view/web_view.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Web View', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json
deleted file mode 100644
index d4ccbad0e4..0000000000
--- a/frappe/website/doctype/web_view/web_view.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
- "actions": [],
- "allow_guest_to_view": 1,
- "allow_import": 1,
- "allow_rename": 1,
- "beta": 1,
- "creation": "2020-03-16 15:28:03.828741",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "route",
-  "column_break_4",
-  "full_width",
-  "published",
-  "section_break_6",
-  "content_type",
-  "content_html",
-  "components",
-  "style_section",
-  "css",
-  "metatags_section",
-  "meta_title",
-  "meta_description",
-  "meta_image"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "route",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Route"
-  },
-  {
-   "default": "0",
-   "fieldname": "published",
-   "fieldtype": "Check",
-   "label": "Published"
-  },
-  {
-   "fieldname": "css",
-   "fieldtype": "Code",
-   "label": "CSS"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "full_width",
-   "fieldtype": "Check",
-   "label": "Full Width"
-  },
-  {
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "label": "Content"
-  },
-  {
-   "default": "Components",
-   "fieldname": "content_type",
-   "fieldtype": "Select",
-   "label": "Content Type",
-   "options": "Components\nHTML",
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval:doc.content_type==='Components'",
-   "fieldname": "components",
-   "fieldtype": "Table",
-   "label": "Components",
-   "options": "Web View Component"
-  },
-  {
-   "depends_on": "eval:doc.content_type===\"HTML\"",
-   "fieldname": "content_html",
-   "fieldtype": "HTML Editor",
-   "label": "Content HTML"
-  },
-  {
-   "fieldname": "style_section",
-   "fieldtype": "Section Break",
-   "label": "Style"
-  },
-  {
-   "fieldname": "metatags_section",
-   "fieldtype": "Section Break",
-   "label": "Meta Tags"
-  },
-  {
-   "fieldname": "meta_title",
-   "fieldtype": "Data",
-   "label": "Title"
-  },
-  {
-   "fieldname": "meta_description",
-   "fieldtype": "Small Text",
-   "label": "Description"
-  },
-  {
-   "fieldname": "meta_image",
-   "fieldtype": "Attach Image",
-   "label": "Image"
-  }
- ],
- "has_web_view": 1,
- "is_published_field": "published",
- "links": [],
- "modified": "2020-04-22 00:54:23.413077",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Web View",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Website Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "route": "route",
- "sort_field": "creation",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py
deleted file mode 100644
index 8b441579b6..0000000000
--- a/frappe/website/doctype/web_view/web_view.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.website.website_generator import WebsiteGenerator
-from frappe.utils import markdown
-import frappe
-
-class WebView(WebsiteGenerator):
-	def get_context(self, context):
-		# group components into sections
-		if self.content_type=='Components':
-			self.build_components(context)
-
-		self.set_metatags(context)
-		return context
-
-	def build_components(self, context):
-		context.sections = []
-		context.css_rules = []
-		for component in self.components:
-			if not context.sections and component.element_type!='Section':
-				self.add_default_section(context)
-
-			if component.element_type=='Section':
-				self.add_section(context, component)
-			else:
-				self.add_component(context, component)
-
-			self.add_css_class(context, component)
-			self.add_color(component)
-			self.add_missing_semi(component)
-
-		return context
-
-	def add_section(self, context, component):
-		component.elements = []
-		context.sections.append(component)
-
-		if component.section_intro:
-			component.section_intro = markdown(component.section_intro)
-
-	def add_component(self, context, component):
-		if component.hide:
-			return
-
-		if component.element_type == 'Web View' and component.web_view:
-			component.web_content_html = frappe.get_doc('Web View', component.web_view).render_content()
-
-		elif component.web_content_type == 'Markdown':
-			component.web_content_html = markdown(component.web_content_markdown)
-
-		if component.title:
-			component.element_id = frappe.scrub(component.title)
-
-		context.sections[-1].elements.append(component)
-
-	def add_css_class(self, context, component):
-		# add css class definitions selected by the user
-		if component.element_class and not component.hide:
-			css, is_dynamic = frappe.db.get_value('CSS Class', component.element_class, ['css', 'is_dynamic'])
-			if is_dynamic:
-				css = frappe.render_template(css, self.get_theme())
-			context.css_rules.append(css)
-
-	def add_color(self, component):
-		# convert to css color
-		if component.background_color and not component.hide:
-			component.background_color = frappe.db.get_value('Color',
-				component.background_color, 'color', cache=True)
-
-	def add_missing_semi(self, component):
-		if component.element_style and not component.element_style.strip().endswith(';'):
-			component.element_style = component.element_style.strip() + ';'
-
-	def render_content(self):
-		# webview can be rendered as an object (see footer)
-		return frappe.render_template("frappe/website/doctype/web_view/templates/web_view_content.html", self.get_context(self.as_dict()))
-
-	def get_theme(self):
-		# get theme properties
-		if not hasattr(self, '_theme'):
-			default_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme")
-			self._theme = frappe.get_value('Website Theme', default_theme, '*')
-		return self._theme
-
-	def add_default_section(self, context):
-		# add a default section if not added
-		context.sections.append(frappe._dict(
-			element_type='Section',
-			section_type='List',
-			title='Default Section',
-			elements=[]
-		))
-
-	def set_metatags(self, context):
-		context.metatags = {
-			"name": self.meta_title or context.title,
-			"description": self.meta_description,
-			"image": self.meta_image
-		}
-
diff --git a/frappe/website/doctype/web_view_component/__init__.py b/frappe/website/doctype/web_view_component/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/web_view_component/web_view_component.json b/frappe/website/doctype/web_view_component/web_view_component.json
deleted file mode 100644
index 15dd761c81..0000000000
--- a/frappe/website/doctype/web_view_component/web_view_component.json
+++ /dev/null
@@ -1,146 +0,0 @@
-{
- "actions": [],
- "creation": "2020-03-16 15:25:17.530296",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "element_type",
-  "title",
-  "hide",
-  "contain_section_width",
-  "column_break_3",
-  "columns",
-  "background_color",
-  "element_class",
-  "element_style",
-  "section_break_5",
-  "web_view",
-  "section_type",
-  "web_content_type",
-  "web_content_html",
-  "web_content_markdown",
-  "image_url",
-  "section_intro"
- ],
- "fields": [
-  {
-   "fieldname": "element_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Element Type",
-   "options": "Section\nContent\nImage\nWeb View",
-   "reqd": 1
-  },
-  {
-   "default": "List",
-   "depends_on": "eval:doc.element_type==='Section'",
-   "fieldname": "section_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Section Type",
-   "options": "List\nTabbed\nGrid"
-  },
-  {
-   "default": "Markdown",
-   "depends_on": "eval:doc.element_type==='Content'",
-   "fieldname": "web_content_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Web Content Type",
-   "options": "Markdown\nHTML"
-  },
-  {
-   "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'HTML'",
-   "fieldname": "web_content_html",
-   "fieldtype": "HTML Editor",
-   "label": "Web Content HTML"
-  },
-  {
-   "depends_on": "eval:doc.element_type === 'Content' && doc.web_content_type === 'Markdown'",
-   "fieldname": "web_content_markdown",
-   "fieldtype": "Markdown Editor",
-   "label": "Web Content Markdown"
-  },
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title"
-  },
-  {
-   "fieldname": "columns",
-   "fieldtype": "Int",
-   "label": "Columns"
-  },
-  {
-   "fieldname": "element_class",
-   "fieldtype": "Link",
-   "label": "Element Class",
-   "options": "CSS Class"
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "depends_on": "eval:doc.element_type==='Image'",
-   "fieldname": "image_url",
-   "fieldtype": "Small Text",
-   "label": "Image URL"
-  },
-  {
-   "depends_on": "eval:doc.element_type==='Section'",
-   "fieldname": "section_intro",
-   "fieldtype": "Markdown Editor",
-   "label": "Section Intro"
-  },
-  {
-   "default": "0",
-   "fieldname": "hide",
-   "fieldtype": "Check",
-   "label": "Hide"
-  },
-  {
-   "fieldname": "element_style",
-   "fieldtype": "Small Text",
-   "label": "Element Style"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.element_type==='Section'",
-   "fieldname": "contain_section_width",
-   "fieldtype": "Check",
-   "label": "Contain Section Width"
-  },
-  {
-   "fieldname": "background_color",
-   "fieldtype": "Link",
-   "label": "Background Color",
-   "options": "Color"
-  },
-  {
-   "depends_on": "eval:doc.element_type==='Web View'",
-   "fieldname": "web_view",
-   "fieldtype": "Link",
-   "label": "Web View",
-   "options": "Web View"
-  }
- ],
- "istable": 1,
- "links": [],
- "modified": "2020-04-19 03:02:53.233036",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Web View Component",
- "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/website/doctype/web_view_component/web_view_component.py b/frappe/website/doctype/web_view_component/web_view_component.py
deleted file mode 100644
index dcf1726c4a..0000000000
--- a/frappe/website/doctype/web_view_component/web_view_component.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class WebViewComponent(Document):
-	pass

From 993c5cbf9f107a74d871bd1f06d1d73adae9221d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 29 Apr 2020 20:05:54 +0530
Subject: [PATCH 028/319] fix: Patch to remove webview

---
 frappe/patches/v13_0/remove_web_view.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 frappe/patches/v13_0/remove_web_view.py

diff --git a/frappe/patches/v13_0/remove_web_view.py b/frappe/patches/v13_0/remove_web_view.py
new file mode 100644
index 0000000000..7c9109fd03
--- /dev/null
+++ b/frappe/patches/v13_0/remove_web_view.py
@@ -0,0 +1,6 @@
+import frappe
+
+def execute():
+	frappe.delete_doc_if_exists("DocType", "Web View")
+	frappe.delete_doc_if_exists("DocType", "Web View Component")
+	frappe.delete_doc_if_exists("DocType", "CSS Class")
\ No newline at end of file

From 3c049185db65ba36d0c7d272b13a1bb1ecb15555 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 09:15:14 +0530
Subject: [PATCH 029/319] refactor: Remove webview related code

---
 .../doctype/website_settings/website_settings.py     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index ead48425ed..ff94bd15a3 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -149,7 +149,6 @@ def get_website_settings():
 			context[key] = context[key][-1]
 
 	add_website_theme(context)
-	add_webviews(context, settings)
 
 	if not context.get("favicon"):
 		context["favicon"] = "/assets/frappe/images/favicon.png"
@@ -159,17 +158,6 @@ def get_website_settings():
 
 	return context
 
-def add_webviews(context, settings):
-	# render footer as webview, not standard view
-	# see base.html for how this is handled
-	if settings.footer_type=='Web View' and settings.footer_web_view:
-		context.footer_content = frappe.get_doc('Web View',
-			settings.footer_web_view).render_content()
-
-	if settings.top_bar_type=='Web View' and settings.top_bar_web_view:
-		context.navbar_content = frappe.get_doc('Web View',
-			settings.top_bar_web_view).render_content()
-
 def get_items(parentfield):
 	all_top_items = frappe.db.sql("""\
 		select * from `tabTop Bar Item`

From 76e421dc3c0a9393239ca23aba481500a80cef17 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 30 Apr 2020 18:18:29 +0530
Subject: [PATCH 030/319] refactor: Remove unused fields in website settings

---
 .../website_settings/website_settings.json    | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 708d2a0473..b2d765b81f 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -19,15 +19,11 @@
   "set_banner_from_image",
   "favicon",
   "top_bar",
-  "top_bar_type",
-  "top_bar_web_view",
   "navbar_search",
   "top_bar_items",
   "banner",
   "banner_html",
   "footer",
-  "footer_type",
-  "footer_web_view",
   "copyright",
   "address",
   "footer_items",
@@ -135,13 +131,11 @@
   },
   {
    "default": "0",
-   "depends_on": "eval:doc.top_bar_type==='Standard'",
    "fieldname": "navbar_search",
    "fieldtype": "Check",
    "label": "Include Search in Top Bar"
   },
   {
-   "depends_on": "eval:doc.top_bar_type==='Standard'",
    "fieldname": "top_bar_items",
    "fieldtype": "Table",
    "label": "Top Bar Items",
@@ -336,34 +330,6 @@
    "fieldname": "enable_view_tracking",
    "fieldtype": "Check",
    "label": "Enable In App Website Tracking"
-  },
-  {
-   "default": "Standard",
-   "fieldname": "footer_type",
-   "fieldtype": "Select",
-   "label": "Footer Type",
-   "options": "Standard\nWeb View"
-  },
-  {
-   "depends_on": "eval:doc.footer_type==='Web View'",
-   "fieldname": "footer_web_view",
-   "fieldtype": "Link",
-   "label": "Footer Web View",
-   "options": "Web View"
-  },
-  {
-   "default": "Standard",
-   "fieldname": "top_bar_type",
-   "fieldtype": "Select",
-   "label": "Top Bar Type",
-   "options": "Standard\nWeb View"
-  },
-  {
-   "depends_on": "eval:doc.top_bar_type==='Web View'",
-   "fieldname": "top_bar_web_view",
-   "fieldtype": "Link",
-   "label": "Top Bar Web View",
-   "options": "Web View"
   }
  ],
  "icon": "fa fa-cog",
@@ -371,7 +337,7 @@
  "issingle": 1,
  "links": [],
  "max_attachments": 10,
- "modified": "2020-04-21 12:37:44.070662",
+ "modified": "2020-04-30 12:37:44.070662",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Settings",

From 473ccc4be60f1120b3e6addf2f2a0a4a2c0a2ff6 Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Fri, 1 May 2020 20:48:03 +0530
Subject: [PATCH 031/319] fix: update init.py

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 912d0b0e42..6b05344b48 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.0-dev'
+__version__ = '13.0.0-dev'
 __title__ = "Frappe Framework"
 
 local = Local()

From 5bc388e8c2dad38892f666f15c9af508e796ec04 Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Fri, 1 May 2020 20:49:50 +0530
Subject: [PATCH 032/319] fix: update init.py

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 6b05344b48..260874adde 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-dev'
+__version__ = '13.0.0'
 __title__ = "Frappe Framework"
 
 local = Local()

From 24b5d0212d713bb7f238bd550be3e7171015c5b9 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Fri, 1 May 2020 21:10:36 +0550
Subject: [PATCH 033/319] bumped to version 13.0.1-beta.1

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 260874adde..1de03f0632 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0'
+__version__ = '13.0.1-beta.1'
 __title__ = "Frappe Framework"
 
 local = Local()

From b8d618260f8ef893081dd47e0d8580f84ef18b0f Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Fri, 1 May 2020 21:02:26 +0530
Subject: [PATCH 034/319] fix: correct version

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 1de03f0632..ebb5e2a4b8 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.1-beta.1'
+__version__ = '13.0.0-beta.1'
 __title__ = "Frappe Framework"
 
 local = Local()

From af9250e8932442e5c83f276f4f6600d210eb6396 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Sat, 2 May 2020 22:30:44 +0530
Subject: [PATCH 035/319] chore: Rename change log

---
 frappe/change_log/v13/{v13_0_0_beta_1.md => v13_0_0-beta_1.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frappe/change_log/v13/{v13_0_0_beta_1.md => v13_0_0-beta_1.md} (100%)

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0-beta_1.md
similarity index 100%
rename from frappe/change_log/v13/v13_0_0_beta_1.md
rename to frappe/change_log/v13/v13_0_0-beta_1.md

From 08612837efa2e63a05a37fd4c50faa38197c8c34 Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Thu, 21 May 2020 15:29:14 +0530
Subject: [PATCH 036/319] chore: pin redis version to 3.5.1 (#10440)

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

diff --git a/requirements.txt b/requirements.txt
index 431f216afa..4ef3e5abf1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -49,7 +49,7 @@ python-dateutil==2.8.1
 pytz==2019.3
 PyYAML==5.3.1
 rauth==0.7.3
-redis>=3.0
+redis==3.5.1
 requests-oauthlib==1.3.0
 requests==2.23.0
 RestrictedPython==5.0

From a0a722fd6e391a9734125bec17ab7b37ba33cdab Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 09:47:53 +0530
Subject: [PATCH 037/319] fix: use get-all instead of get-list (bp #10444)
 (#10445)

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

diff --git a/frappe/boot.py b/frappe/boot.py
index 0eb6265942..e615cc49fa 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -106,7 +106,7 @@ def load_desktop_data(bootinfo):
 	from frappe.desk.desktop import get_desk_sidebar_items
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
 	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
-	bootinfo.dashboards = frappe.get_list("Dashboard")
+	bootinfo.dashboards = frappe.get_all("Dashboard")
 
 def get_allowed_pages(cache=False):
 	return get_user_pages_or_reports('Page', cache=cache)

From 22b59eefa826353d928327ec87abedac38b5ee30 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 10:02:55 +0530
Subject: [PATCH 038/319] fix(background-jobs): Include traceback in error logs
 (bp #10432) (#10443)

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

diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py
index 4b37e850f0..2701ca9bc6 100755
--- a/frappe/utils/background_jobs.py
+++ b/frappe/utils/background_jobs.py
@@ -116,12 +116,12 @@ def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True,
 				is_async=is_async, retry=retry+1)
 
 		else:
-			frappe.log_error(method_name)
+			frappe.log_error(title=method_name)
 			raise
 
 	except:
 		frappe.db.rollback()
-		frappe.log_error(method_name)
+		frappe.log_error(title=method_name)
 		frappe.db.commit()
 		print(frappe.get_traceback())
 		raise

From 115c5377b2e9744abd1d39f01d4d1bec8d2cb6c5 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 11:16:29 +0530
Subject: [PATCH 039/319] fix: chart auto color (bp #10461) (#10465)

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

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index e5378cf2ab..35e5fc223e 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -577,7 +577,7 @@ export default class ChartWidget extends Widget {
 				colors.push(field.color);
 			});
 		} else if (["Line", "Bar"].includes(this.chart_doc.type)) {
-			colors = [this.chart_doc.color || "light-blue"];
+			colors = [this.chart_doc.color || []];
 		}  else if (this.chart_doc.type == "Heatmap") {
 			colors = [];
 		}

From 90687a5d4e84ab6aa178da24d2c4a16f333d4c99 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 12:28:53 +0530
Subject: [PATCH 040/319] fix: fixed the reports print format (bp #10304)
 (#10471)

---
 frappe/templates/styles/standard.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css
index f5eeb1c7fb..b87aa46d23 100644
--- a/frappe/templates/styles/standard.css
+++ b/frappe/templates/styles/standard.css
@@ -145,6 +145,11 @@ table.no-border, table.no-border td {
 	margin: 3px 0px 3px;
 }
 
+.print-format table td pre {
+	white-space: normal;
+	word-break: normal;
+}
+
 table td div {
 	{% if not print_settings.allow_page_break_inside_tables %}
 	/* needed to avoid partial cutting of text between page break in wkhtmltopdf */

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

(cherry picked from commit 952c3840149e42b9df68d93548fbe5e3b98ecc32)
---
 frappe/public/js/frappe/form/controls/multiselect_pills.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

From 49392beaa6fe7f39e7af1fb9545d3cdb43a9c438 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Sat, 2 May 2020 22:30:44 +0530
Subject: [PATCH 042/319] chore: Rename change log

---
 frappe/change_log/v13/{v13_0_0_beta_1.md => v13_0_0-beta_1.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frappe/change_log/v13/{v13_0_0_beta_1.md => v13_0_0-beta_1.md} (100%)

diff --git a/frappe/change_log/v13/v13_0_0_beta_1.md b/frappe/change_log/v13/v13_0_0-beta_1.md
similarity index 100%
rename from frappe/change_log/v13/v13_0_0_beta_1.md
rename to frappe/change_log/v13/v13_0_0-beta_1.md

From bfc1319d9330402043b6d17227bdbf05b477dd95 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 21:49:30 +0530
Subject: [PATCH 043/319] fix: call onload if defined in report script (bp
 #10467) (#10481)

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 ++
 frappe/public/js/frappe/widgets/chart_widget.js        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index e2be095fce..9053a9ab7f 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -353,6 +353,8 @@ frappe.ui.form.on('Dashboard Chart', {
 			dialog.show();
 			//Set query report object so that it can be used while fetching filter values in the report
 			frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+			frappe.query_reports[frm.doc.report_name].onload
+				&& frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
 			dialog.set_values(filters);
 		});
 	},
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 35e5fc223e..d32ca6f4d8 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -412,6 +412,8 @@ export default class ChartWidget extends Widget {
 		dialog.show();
 		//Set query report object so that it can be used while fetching filter values in the report
 		frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+		frappe.query_reports[this.chart_doc.report_name].onload
+				&& frappe.query_reports[this.chart_doc.report_name].onload(frappe.query_report);
 		dialog.set_values(this.filters);
 	}
 

From 40fde8561f900c60dff205caa749fb2245c28039 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 21:50:01 +0530
Subject: [PATCH 044/319] fix(timeline): Escape timeline content properly (bp
 #10472) (#10480)

---
 .../public/js/frappe/form/footer/timeline.js  | 44 ++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index beec168dfd..bb44408c2a 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -589,7 +589,6 @@ frappe.ui.form.Timeline = class Timeline {
 							out.push(me.get_version_comment(version, message));
 						}
 					} else {
-						p = p.map(frappe.utils.escape_html);
 						const df = frappe.meta.get_docfield(me.frm.doctype, p[0], me.frm.docname);
 						if (df && !df.hidden) {
 							const field_display_status = frappe.perm.get_field_display_status(df, null,
@@ -597,8 +596,8 @@ frappe.ui.form.Timeline = class Timeline {
 							if (field_display_status === 'Read' || field_display_status === 'Write') {
 								parts.push(__('{0} from {1} to {2}', [
 									__(df.label),
-									(frappe.ellipsis(frappe.utils.html2text(p[1]), 40) || '""').bold(),
-									(frappe.ellipsis(frappe.utils.html2text(p[2]), 40) || '""').bold()
+									me.format_content_for_timeline(p[1]),
+									me.format_content_for_timeline(p[2])
 								]));
 							}
 						}
@@ -608,9 +607,9 @@ frappe.ui.form.Timeline = class Timeline {
 				if (parts.length) {
 					let message;
 					if (updater_reference_link) {
-						message = __("changed value of {0} {1}", [parts.join(', ').bold(), updater_reference_link]);
+						message = __("changed value of {0} {1}", [parts.join(', '), updater_reference_link]);
 					} else {
-						message = __("changed value of {0}", [parts.join(', ').bold()]);
+						message = __("changed value of {0}", [parts.join(', ')]);
 					}
 					out.push(me.get_version_comment(version, message));
 				}
@@ -618,23 +617,23 @@ frappe.ui.form.Timeline = class Timeline {
 
 			// value changed in table field
 			if (data.row_changed && data.row_changed.length) {
-				var parts = [], count = 0;
+				let parts = [];
 				data.row_changed.every(function(row) {
 					row[3].every(function(p) {
 						var df = me.frm.fields_dict[row[0]] &&
 							frappe.meta.get_docfield(me.frm.fields_dict[row[0]].grid.doctype,
 								p[0], me.frm.docname);
 
-						if(df && !df.hidden) {
+						if (df && !df.hidden) {
 							var field_display_status = frappe.perm.get_field_display_status(df,
 								null, me.frm.perm);
 
-							if(field_display_status === 'Read' || field_display_status === 'Write') {
+							if (field_display_status === 'Read' || field_display_status === 'Write') {
 								parts.push(__('{0} from {1} to {2} in row #{3}', [
 									frappe.meta.get_label(me.frm.fields_dict[row[0]].grid.doctype,
 										p[0]),
-									(frappe.ellipsis(p[1], 40) || '""').bold(),
-									(frappe.ellipsis(p[2], 40) || '""').bold(),
+									me.format_content_for_timeline(p[1]),
+									me.format_content_for_timeline(p[2]),
 									row[1]
 								]));
 							}
@@ -657,20 +656,22 @@ frappe.ui.form.Timeline = class Timeline {
 			// rows added / removed
 			// __('added'), __('removed') # for translation, don't remove
 			['added', 'removed'].forEach(function(key) {
-				if(data[key] && data[key].length) {
-					parts = (data[key] || []).map(function(p) {
+				if (data[key] && data[key].length) {
+					let parts = (data[key] || []).map(function(p) {
 						var df = frappe.meta.get_docfield(me.frm.doctype, p[0], me.frm.docname);
-						if(df && !df.hidden) {
+						if (df && !df.hidden) {
 							var field_display_status = frappe.perm.get_field_display_status(df, null,
 								me.frm.perm);
 
-							if(field_display_status === 'Read' || field_display_status === 'Write') {
+							if (field_display_status === 'Read' || field_display_status === 'Write') {
 								return frappe.meta.get_label(me.frm.doctype, p[0])
 							}
 						}
 					});
-					parts = parts.filter(function(p) { return p; });
-					if(parts.length) {
+					parts = parts.filter(function(p) {
+						return p;
+					});
+					if (parts.length) {
 						out.push(me.get_version_comment(version, __("{0} rows for {1}",
 							[__(key), parts.join(', ')])));
 					}
@@ -717,6 +718,17 @@ frappe.ui.form.Timeline = class Timeline {
 
 	}
 
+	format_content_for_timeline(content) {
+		// text to HTML
+		// limits content to 40 characters
+		// escapes HTML
+		// and makes it bold
+		content = frappe.utils.html2text(content);
+		content = frappe.ellipsis(content, 40) || '""';
+		content = frappe.utils.escape_html(content);
+		return content.bold();
+	}
+
 	delete_comment(name) {
 		var me = this;
 

From 5be32206c5ba1cda9ebf5ca3679cccc3a8b452d8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 25 May 2020 22:58:07 +0530
Subject: [PATCH 045/319] fix: Empty sidebar filter list html not updated (bp
 #10478) (#10482)

---
 frappe/public/js/frappe/list/list_sidebar_group_by.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/list_sidebar_group_by.js b/frappe/public/js/frappe/list/list_sidebar_group_by.js
index 3d64c42f6a..d9324297a7 100644
--- a/frappe/public/js/frappe/list/list_sidebar_group_by.js
+++ b/frappe/public/js/frappe/list/list_sidebar_group_by.js
@@ -103,7 +103,11 @@ frappe.views.ListGroupBy = class ListGroupBy {
 					this.render_dropdown_items(field_count_list, fieldtype, dropdown);
 					frappe.utils.setup_search(dropdown, '.group-by-item', '.group-by-value', 'data-name');
 				} else {
-					dropdown.find('.group-by-loading').html(`${__("No filters found")}`);
+					dropdown.html(
+						`<div class="list-loading text-center group-by-empty text-muted">
+						${__("No filters found")}
+						</div>`
+					);
 				}
 			});
 		});

From e3e7d678447ac1c337b298376d557f09df859395 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 26 May 2020 19:35:21 +0530
Subject: [PATCH 046/319] fix: find element by fieldname

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

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index bad7c877fc..da52a0bcb8 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1586,7 +1586,7 @@ frappe.ui.form.Form = class FrappeForm {
 		let steps = frappe.tour[this.doctype].map(step => {
 			let field = this.get_docfield(step.fieldname);
 			return {
-				element: `.frappe-control[title='${step.fieldname}']`,
+				element: `.frappe-control[data-fieldname='${step.fieldname}']`,
 				popover: {
 					title: step.title || field.label,
 					description: step.description

From ea21cf8812e143460b08b57b9e547a7e158aa818 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 27 May 2020 21:13:01 +0530
Subject: [PATCH 047/319] fix: trigger after submit route hook after on_submit

---
 frappe/public/js/frappe/form/form.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index bad7c877fc..aa0fc6e2ac 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -650,13 +650,14 @@ frappe.ui.form.Form = class FrappeForm {
 							frappe.utils.play_sound("submit");
 							callback && callback();
 							me.script_manager.trigger("on_submit")
-								.then(() => resolve(me));
-							if (frappe.route_hooks.after_submit) {
-								let route_callback = frappe.route_hooks.after_submit;
-								delete frappe.route_hooks.after_submit;
-
-								route_callback(me);
-							}
+								.then(() => resolve(me))
+								.then(() => {
+									if (frappe.route_hooks.after_submit) {
+										let route_callback = frappe.route_hooks.after_submit;
+										delete frappe.route_hooks.after_submit;
+										route_callback(me);
+									}
+								});
 						}
 					}, btn, () => me.handle_save_fail(btn, on_error), resolve);
 				});

From f1657d6573d8836ea01b1dd34d03da70f2a7e8d8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 28 May 2020 00:10:32 +0530
Subject: [PATCH 048/319] chore: Add Release Notes for V13.0.0-beta.2

---
 frappe/change_log/v13/v13_0_0-beta_2.md | 27 +++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_2.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_2.md b/frappe/change_log/v13/v13_0_0-beta_2.md
new file mode 100644
index 0000000000..746fee26dc
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_2.md
@@ -0,0 +1,27 @@
+# Version 13.0.0 Beta 2 Release Notes
+
+## Features
+
+- Export and Import Customizations in Packages ([#9692](https://github.com/frappe/frappe/pull/9692))
+- Dashboard view for each DocTypes ([#10000](https://github.com/frappe/frappe/pull/10000))
+- Introduced HeatMap chart type option for Dashboard Charts ([#10193](https://github.com/frappe/frappe/pull/10193))
+- Translation Tool ([#9636](https://github.com/frappe/frappe/pull/9636))
+
+## Enhancements
+
+- Configure dependency mapping and default values for Event Streaming sync ([#9742](https://github.com/frappe/frappe/pull/9742))
+- Config for Section Break without border ([#10116](https://github.com/frappe/frappe/pull/10116))
+- Onboarding Enhancements ([#10356](https://github.com/frappe/frappe/pull/10356)) ([#10364](https://github.com/frappe/frappe/pull/10364))
+- Introduced Page Builder option in Web Page ([#10035](https://github.com/frappe/frappe/pull/10035)) ([#10154](https://github.com/frappe/frappe/pull/10154))
+- Module-wise onboarding via new desk ([#10194](https://github.com/frappe/frappe/pull/10194))
+- 2FA for LDAP users ([#10001](https://github.com/frappe/frappe/pull/10001))
+- Assign to multiple people at once ([#9957](https://github.com/frappe/frappe/pull/9957))
+- Desk page enhancements ([#10359](https://github.com/frappe/frappe/pull/10359)) ([#10384](https://github.com/frappe/frappe/pull/10384)) ([#10338](https://github.com/frappe/frappe/pull/10338))
+- Search in column picker and filter dialog ([#10111](https://github.com/frappe/frappe/pull/10111))
+
+## Performance Improvements
+
+- Application ([#10229](https://github.com/frappe/frappe/pull/10229)) ([#10147](https://github.com/frappe/frappe/pull/10147))
+- Recorder ([#10272](https://github.com/frappe/frappe/pull/10272))
+- Desk ([#9930](https://github.com/frappe/frappe/pull/9930))
+- Scheduler Job ([#9928](https://github.com/frappe/frappe/pull/9928))

From cbba2f5fa778b79fe3cb588362a078bfa8b0b059 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 09:53:52 +0530
Subject: [PATCH 049/319] fix(dropbox): dropbox timeout for large files (bp
 #10501) (#10513)

(cherry picked from commit bba7336b6ce55a23edca7fc9805100902500afd3)

Co-authored-by: karthikeyan5 <skarthikeyan1410@gmail.com>
---
 .../integrations/doctype/dropbox_settings/dropbox_settings.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
index 2a036f4838..4b595b1abf 100644
--- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
+++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
@@ -90,7 +90,7 @@ def backup_to_dropbox(upload_db_backup=True):
 		dropbox_settings['access_token'] = access_token['oauth2_token']
 		set_dropbox_access_token(access_token['oauth2_token'])
 
-	dropbox_client = dropbox.Dropbox(dropbox_settings['access_token'])
+	dropbox_client = dropbox.Dropbox(dropbox_settings['access_token'], timeout=None)
 
 	if upload_db_backup:
 		if frappe.flags.create_new_backup:

From 2ceb8e62e4aed17973aec82e703131efd96ab884 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 27 May 2020 17:06:56 +0530
Subject: [PATCH 050/319] fix: fetch date filters with default values set
 dynamically

---
 .../dashboard_chart/dashboard_chart.js        | 23 +++++++++-
 .../public/js/frappe/widgets/chart_widget.js  | 42 ++++++++++++++++---
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 9053a9ab7f..8ce22d6d27 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -251,6 +251,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	render_filters_table: function(frm) {
 		frm.set_df_property("filters_section", "hidden", 0);
 		let is_document_type = frm.doc.chart_type!== 'Report' && frm.doc.chart_type!=='Custom';
+		let is_dynamic_filter = f => ['Date', 'DateRange'].includes(f.fieldtype) && f.default;
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
 		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
@@ -268,6 +269,18 @@ frappe.ui.form.on('Dashboard Chart', {
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
 		var filters_set = false;
 
+		// Set dynamic filters for reports
+		if (frm.doc.chart_type == 'Report') {
+			let set_filters = false;
+			frm.chart_filters.forEach(f => {
+				if (is_dynamic_filter(f)) {
+					filters[f.fieldname] = f.default;
+					set_filters = true;
+				}
+			});
+			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
+		}
+
 		let fields;
 		if (is_document_type) {
 			fields = [
@@ -291,7 +304,15 @@ frappe.ui.form.on('Dashboard Chart', {
 				});
 			}
 		} else if (frm.chart_filters.length) {
-			fields = frm.chart_filters.filter(f => f.fieldname);
+			fields = frm.chart_filters.filter(f => {
+				// Set dynamic filters as read only
+				if (is_dynamic_filter(f)) {
+					f.read_only = 1;
+				}
+				if (f.fieldname) {
+					return true;
+				}
+			});
 			fields.map( f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index d32ca6f4d8..77ea2847d7 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -97,7 +97,6 @@ export default class ChartWidget extends Widget {
 				this.chart_settings = {};
 			}
 			this.setup_container();
-			this.prepare_chart_object();
 			if (!this.in_customize_mode) {
 				this.action_area.empty();
 				this.prepare_chart_actions();
@@ -110,7 +109,10 @@ export default class ChartWidget extends Widget {
 					this.render_time_series_filters();
 				}
 			}
-			this.fetch_and_update_chart();
+			frappe.run_serially([
+				() => this.prepare_chart_object(),
+				() => this.fetch_and_update_chart(),
+			]);
 		});
 	}
 
@@ -625,13 +627,41 @@ export default class ChartWidget extends Widget {
 	}
 
 	prepare_chart_object() {
-		let saved_filters = this.chart_settings.filters || null;
-		this.filters =
-			saved_filters || this.filters || JSON.parse(this.chart_doc.filters_json || "[]");
-
 		if (this.chart_doc.type == 'Heatmap' && !this.chart_doc.heatmap_year) {
 			this.chart_doc.heatmap_year = frappe.dashboard_utils.get_year(frappe.datetime.now_date());
 		}
+
+		return this.set_chart_filters();
+	}
+
+	set_chart_filters() {
+		let user_saved_filters = this.chart_settings.filters || null;
+		let chart_saved_filters = JSON.parse(this.chart_doc.filters_json || "null");
+
+		if (this.chart_doc.chart_type == 'Report') {
+			return frappe.dashboard_utils
+				.get_filters_for_chart_type(this.chart_doc).then(filters => {
+					chart_saved_filters = this.update_default_date_filters(filters, chart_saved_filters);
+					this.filters =
+						user_saved_filters || this.filters || chart_saved_filters;
+				});
+		} else {
+			this.filters =
+				user_saved_filters || this.filters || chart_saved_filters;
+			return Promise.resolve();
+		}
+	}
+
+	update_default_date_filters(report_filters, chart_filters) {
+		report_filters.map(f => {
+			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
+				if (chart_filters[f.fieldname]) {
+					chart_filters[f.fieldname] = f.default;
+				}
+			}
+		});
+
+		return chart_filters;
 	}
 
 	get_settings() {

From 6434bcfded9e7338dfb4a3819870e119c3b9eed4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 28 May 2020 12:36:34 +0530
Subject: [PATCH 051/319] fix: also set required filters

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

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 77ea2847d7..8a0eca9eaf 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -655,7 +655,7 @@ export default class ChartWidget extends Widget {
 	update_default_date_filters(report_filters, chart_filters) {
 		report_filters.map(f => {
 			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
-				if (chart_filters[f.fieldname]) {
+				if (f.reqd || chart_filters[f.fieldname]) {
 					chart_filters[f.fieldname] = f.default;
 				}
 			}

From 8119bd85c7a44366d643e91026f93a943f52c6fd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 28 May 2020 12:37:02 +0530
Subject: [PATCH 052/319] fix: don't show dynamic filters in dialog

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

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 8ce22d6d27..59a88d65fb 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -304,15 +304,8 @@ frappe.ui.form.on('Dashboard Chart', {
 				});
 			}
 		} else if (frm.chart_filters.length) {
-			fields = frm.chart_filters.filter(f => {
-				// Set dynamic filters as read only
-				if (is_dynamic_filter(f)) {
-					f.read_only = 1;
-				}
-				if (f.fieldname) {
-					return true;
-				}
-			});
+			fields = frm.chart_filters.filter(f => f.fieldname);
+
 			fields.map( f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
@@ -339,7 +332,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Filters'),
-				fields: fields,
+				fields: fields.filter(f => !is_dynamic_filter(f)),
 				primary_action: function() {
 					let values = this.get_values();
 					if (values) {

From e38225346d01f10a929e33ca6e531fc6b740485d Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Thu, 28 May 2020 14:09:19 +0530
Subject: [PATCH 053/319] chore: use correct version for beta release

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 598bbf3bf8..9db9bb0c93 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.1-beta.1'
+__version__ = '13.0.0-beta.1'
 __title__ = "Frappe Framework"
 
 local = Local()

From d67656bdf6a20d0238b776173440b4c46af95fdf Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 28 May 2020 08:43:29 +0000
Subject: [PATCH 054/319] feat: patch to delete onboarding slide doctype
 (#10520)

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

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 8ab9418e6c..09995e6e72 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -281,3 +281,6 @@ frappe.patches.v13_0.remove_web_view
 frappe.patches.v13_0.remove_tailwind_from_page_builder
 frappe.patches.v13_0.rename_onboarding
 frappe.patches.v13_0.email_unsubscribe
+execute:frappe.delete_doc("DocType", "Onboarding Slide")
+execute:frappe.delete_doc("DocType", "Onboarding Slide Field")
+execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
\ No newline at end of file

From e222961b3385cb3d44f84d38b2b325c75b869bcc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 28 May 2020 09:44:39 +0000
Subject: [PATCH 055/319] refactor: handle exception in syncing dashboard
 (#10522)

---
 frappe/utils/dashboard.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frappe/utils/dashboard.py b/frappe/utils/dashboard.py
index f06f9272b8..c1884d62fb 100644
--- a/frappe/utils/dashboard.py
+++ b/frappe/utils/dashboard.py
@@ -89,10 +89,14 @@ def sync_dashboards(app=None):
 			config = get_config(app_name, module_name)
 			if config:
 				frappe.flags.in_import = True
-				make_records(config.charts, "Dashboard Chart")
-				make_records(config.number_cards, "Number Card")
-				make_records(config.dashboards, "Dashboard")
-				frappe.flags.in_import = False
+				try:
+					make_records(config.charts, "Dashboard Chart")
+					make_records(config.number_cards, "Number Card")
+					make_records(config.dashboards, "Dashboard")
+				except Exception as e:
+					frappe.log_error(e, _("Dashboard Import Error"))
+				finally:
+					frappe.flags.in_import = False
 
 def make_records(config, doctype):
 	if not config:

From 50dbe17e812ec5567394d7f6e70fae6bb67d80b3 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 28 May 2020 18:49:20 +0530
Subject: [PATCH 056/319] fix: check chart type before setting report object

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

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 59a88d65fb..a10d3d96f2 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -365,10 +365,15 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 
 			dialog.show();
-			//Set query report object so that it can be used while fetching filter values in the report
-			frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
-			frappe.query_reports[frm.doc.report_name].onload
-				&& frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
+
+			if (frm.doc.chart_type == 'Report') {
+				//Set query report object so that it can be used while fetching filter values in the report
+				frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+				frappe.query_reports[frm.doc.report_name]
+					&& frappe.query_reports[frm.doc.report_name].onload
+						&& frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
+			}
+
 			dialog.set_values(filters);
 		});
 	},

From 2b3197b922372bb09c23e24ee082c2a7c44f5422 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Thu, 28 May 2020 20:38:43 +0550
Subject: [PATCH 057/319] bumped to version 13.0.0-beta.2

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9db9bb0c93..7aa6eb3351 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.1'
+__version__ = '13.0.0-beta.2'
 __title__ = "Frappe Framework"
 
 local = Local()

From fce5f477d1f08aa44feceb810b57225499ae3f54 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 3 Jun 2020 13:47:28 +0530
Subject: [PATCH 058/319] feat: added decorator to catch does not exist error

(cherry picked from commit d9279e75d7910e13a8c274e55eb5d00fae4f4092)
---
 frappe/desk/desktop.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 6ca101c3a8..4e5692c16e 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -8,12 +8,26 @@ from json import loads, dumps
 from frappe import _, DoesNotExistError, ValidationError, _dict
 from frappe.boot import get_allowed_pages, get_allowed_reports
 from six import string_types
+from functools import wraps
 from frappe.cache_manager import (
 	build_domain_restriced_doctype_cache,
 	build_domain_restriced_page_cache,
 	build_table_count_cache
 )
 
+def handle_not_exist(fn):
+	@wraps(fn)
+	def wrapper(*args, **kwargs):
+		try:
+			return fn(*args, **kwargs)
+		except DoesNotExistError:
+			if frappe.message_log:
+				frappe.message_log.pop()
+			return []
+
+	return wrapper
+
+
 class Workspace:
 	def __init__(self, page_name):
 		self.page_name = page_name
@@ -157,7 +171,7 @@ class Workspace:
 				'user_can_dismiss': self.onboarding_doc.user_can_dismiss,
 				'items': self.get_onboarding_steps()
 			}
-
+	@handle_not_exist
 	def get_cards(self):
 		cards = self.doc.cards
 		if not self.doc.hide_custom:
@@ -227,6 +241,7 @@ class Workspace:
 
 		return new_data
 
+	@handle_not_exist
 	def get_charts(self):
 		all_charts = []
 		if frappe.has_permission("Dashboard Chart", throw=False):
@@ -242,6 +257,7 @@ class Workspace:
 
 		return all_charts
 
+	@handle_not_exist
 	def get_shortcuts(self):
 
 		def _in_active_domains(item):
@@ -272,6 +288,7 @@ class Workspace:
 
 		return items
 
+	@handle_not_exist
 	def get_onboarding_steps(self):
 		steps = []
 		for doc in self.onboarding_doc.get_steps():

From 502a385d2941cd56f55018389bdd0fd3f4be6098 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 3 Jun 2020 13:47:54 +0530
Subject: [PATCH 059/319] refactor: remove workspace build from try block

(cherry picked from commit 5f2bef2fc7cdd4dc7f3614cbcecfff3a4c29f5f3)
---
 frappe/desk/desktop.py | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 4e5692c16e..aca1abb3c8 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -313,21 +313,15 @@ def get_desktop_page(page):
 	Returns:
 		dict: dictionary of cards, charts and shortcuts to be displayed on website
 	"""
-	try:
-		wspace = Workspace(page)
-		wspace.build_workspace()
-		return {
-			'charts': wspace.charts,
-			'shortcuts': wspace.shortcuts,
-			'cards': wspace.cards,
-			'onboarding': wspace.onboarding,
-			'allow_customization': not wspace.doc.disable_user_customization
-		}
-
-	except DoesNotExistError:
-		if frappe.message_log:
-			frappe.message_log.pop()
-		return None
+	wspace = Workspace(page)
+	wspace.build_workspace()
+	return {
+		'charts': wspace.charts,
+		'shortcuts': wspace.shortcuts,
+		'cards': wspace.cards,
+		'onboarding': wspace.onboarding,
+		'allow_customization': not wspace.doc.disable_user_customization
+	}
 
 @frappe.whitelist()
 def get_desk_sidebar_items(flatten=False):

From 587b69f68b61333595849bb58c901ba919fa00e9 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 4 Jun 2020 10:41:58 +0530
Subject: [PATCH 060/319] fix: don't cache zero count

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

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index aca1abb3c8..956308568b 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -183,8 +183,8 @@ class Workspace:
 
 		def _doctype_contains_a_record(name):
 			exists = self.table_counts.get(name, None)
-			if exists is None:
-				if not frappe.db.get_value('DocType', name, 'issingle', cache=True):
+			if not exists:
+				if not frappe.db.get_value('DocType', name, 'issingle'):
 					exists = frappe.db.count(name)
 				else:
 					exists = True

From de4c46c73922c91851f260d9275ddcd81239e6d3 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 5 Jun 2020 20:51:12 +0530
Subject: [PATCH 061/319] fix: DO NOT ever delete site folder

this is very stupid, never delete folders that you do not know the
importance of

all the site data is stored in the sites folder, and may it even be
new-site, the data should not be deleted at any cost

please never add anything to the code that "deletes folders" on failure.
this is highly risky, and it should never be a practice to delete anything
without user confirmation.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/commands/site.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 82ed72dd5c..effa212bca 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -79,7 +79,6 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N
 	make_site_dirs()
 
 	installing = touch_file(get_site_path('locks', 'installing.lock'))
-	atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password)
 
 	install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, db_name=db_name,
 		admin_password=admin_password, verbose=verbose, source_sql=source_sql, force=force, reinstall=reinstall,
@@ -96,15 +95,6 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N
 	scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled"
 	print("*** Scheduler is", scheduler_status, "***")
 
-def _new_site_cleanup(site, mariadb_root_username, mariadb_root_password):
-	installing = get_site_path('locks', 'installing.lock')
-
-	if installing and os.path.exists(installing):
-		if mariadb_root_password:
-			_drop_site(site, mariadb_root_username, mariadb_root_password, force=True, no_backup=True)
-		shutil.rmtree(site)
-
-	frappe.destroy()
 
 @click.command('restore')
 @click.argument('sql-file-path')

From 7ca2ef45231a3e37593088e1e6aeb70ba06b13ce Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 8 Jun 2020 15:37:25 +0530
Subject: [PATCH 062/319] refactor: remove grid and use default typography

---
 .../js/frappe/widgets/onboarding_widget.js    |  6 ----
 frappe/public/less/desktop.less               | 29 -------------------
 2 files changed, 35 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 821824a2d2..68a7857418 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -7,12 +7,6 @@ export default class OnboardingWidget extends Widget {
 	}
 
 	make_body() {
-		this.body.addClass("grid");
-		if (this.steps.length < 5) {
-			this.body.addClass(`grid-rows-${this.steps.length}`);
-		} else if (this.steps.length >= 5) {
-			this.body.addClass("grid-rows-5");
-		}
 		this.steps.forEach((step) => {
 			this.add_step(step);
 		});
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 0b17d75861..c592253d07 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -369,12 +369,7 @@
 		.widget-head {
 			display: flex;
 
-			.widget-title {
-				font-size: 20px;
-			}
-
 			.widget-subtitle {
-				font-size: 16px;
 				margin-top: 5px;
 				color: @text-muted;
 			}
@@ -388,33 +383,9 @@
 
 		.widget-body {
 			margin-top: 20px;
-			padding-right: 200px;
-
-			&.grid {
-				display: grid;
-				grid-template-columns: 1fr 1fr;
-				grid-auto-flow: column;
-
-				&.grid-rows-2 {
-					grid-template-rows: repeat(3, 1fr);
-				}
-
-				&.grid-rows-3 {
-					grid-template-rows: repeat(3, 1fr);
-				}
-
-				&.grid-rows-4 {
-					grid-template-rows: repeat(4, 1fr);
-				}
-
-				&.grid-rows-5 {
-					grid-template-rows: repeat(5, 1fr);
-				}
-			}
 
 			.onboarding-step {
 				margin-bottom: 8px;
-				font-size: 16px;
 				letter-spacing: 0.015em;
 
 				i {

From 95d42b230f1f084bed084595a9272dde06b6c2fc Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 17 Jun 2020 08:21:03 +0000
Subject: [PATCH 063/319] fix: minor styling fixes for onboarding subtitle
 (#10717)

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

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index c592253d07..98ae9c4927 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -371,6 +371,8 @@
 
 			.widget-subtitle {
 				margin-top: 5px;
+				font-size: 14px;
+				font-weight: 400;
 				color: @text-muted;
 			}
 

From 43190c9ef7c3bcad9b2b362357e64f560f2797ba Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:35:38 +0530
Subject: [PATCH 064/319] fix(text-editor): List UI (bp #10598) (#10823)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 frappe/public/css/desk-rtl.css                |   5 +
 frappe/public/js/frappe/form/controls/code.js |   2 +-
 .../js/frappe/form/controls/text_editor.js    |  94 +----
 frappe/public/less/print.less                 |  16 +-
 frappe/public/less/quill.less                 | 162 ++++-----
 .../print_formats/standard_macros.html        |   2 +-
 frappe/utils/html_utils.py                    |   5 +-
 package.json                                  |   3 +-
 yarn.lock                                     | 333 ++++++++++++++++--
 9 files changed, 401 insertions(+), 221 deletions(-)

diff --git a/frappe/public/css/desk-rtl.css b/frappe/public/css/desk-rtl.css
index 31321be17d..a38f6864ff 100644
--- a/frappe/public/css/desk-rtl.css
+++ b/frappe/public/css/desk-rtl.css
@@ -110,4 +110,9 @@ ul.tree-children {
 }
 .section-header {
   direction: ltr;
+}
+
+.ql-editor {
+  direction: rtl;
+  text-align: right;
 }
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 60825c82ad..726a83db72 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -39,7 +39,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 
 	toggle_label() {
 		const button_label = this.expanded ? __('Collapse') : __('Expand');
-		this.$expand_button.text(button_label);
+		this.$expand_button && this.$expand_button.text(button_label);
 	},
 
 	set_language() {
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 5e73889490..3c0f7d5110 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -1,10 +1,5 @@
 import Quill from 'quill';
 
-// replace <p> tag with <div>
-const Block = Quill.import('blots/block');
-Block.tagName = 'DIV';
-Quill.register(Block, true);
-
 const CodeBlockContainer = Quill.import('formats/code-block-container');
 CodeBlockContainer.tagName = 'PRE';
 Quill.register(CodeBlockContainer, true);
@@ -17,7 +12,8 @@ Table.create = (value) => {
 	node.classList.add('table');
 	node.classList.add('table-bordered');
 	return node;
-}
+};
+
 Quill.register(Table, true);
 
 // link without href
@@ -28,7 +24,7 @@ class MyLink extends Link {
 		let node = super.create(value);
 		value = this.sanitize(value);
 		node.setAttribute('href', value);
-		if(value.startsWith('/') || value.indexOf(window.location.host)) {
+		if (value.startsWith('/') || value.indexOf(window.location.host)) {
 			// no href if internal link
 			node.removeAttribute('target');
 		}
@@ -73,7 +69,7 @@ Quill.register(CustomColor, true);
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 	make_wrapper() {
 		this._super();
-		this.$wrapper.find(".like-disabled-input").addClass('text-editor-print');
+		this.$wrapper.find(".like-disabled-input").addClass('ql-editor');
 	},
 
 	make_input() {
@@ -203,91 +199,9 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 
 	get_input_value() {
 		let value = this.quill ? this.quill.root.innerHTML : '';
-		// quill keeps ol as a common container for both type of lists
-		// and uses css for appearances, this is not semantic
-		// so we convert ol to ul if it is unordered
-		const $value = $(`<div>${value}</div>`);
-		$value.find('ol li[data-list=bullet]:first-child').each((i, li) => {
-			let $li = $(li);
-			let $parent = $li.parent();
-			let $children = $parent.children();
-			let $ul = $('<ul>').append($children);
-			$parent.replaceWith($ul);
-		});
-		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, '');
-	},
-
 	set_focus() {
 		this.quill.focus();
 	}
diff --git a/frappe/public/less/print.less b/frappe/public/less/print.less
index 203b1237c5..813659ffd8 100644
--- a/frappe/public/less/print.less
+++ b/frappe/public/less/print.less
@@ -1,15 +1 @@
-.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;
-	}
-}
+@import "quill.less";
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index 0a1384c11d..17351c0026 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -1,38 +1,47 @@
-@import "variables.less";
-@import (less) "quill/dist/quill.snow.css";
-@import (less) "quill/dist/quill.bubble.css";
-@import (less) "../js/frappe/form/controls/quill-mention/quill.mention.css";
+@import 'variables.less';
+@import (less) 'quill/dist/quill.snow.css';
+@import (less) 'quill/dist/quill.bubble.css';
+@import (less) '../js/frappe/form/controls/quill-mention/quill.mention.css';
 
-.ql-toolbar.ql-snow, .ql-container.ql-snow {
-    border-color: @border-color;
-    font-family: inherit;
+.ql-toolbar.ql-snow,
+.ql-container.ql-snow {
+	border-color: @border-color;
+	font-family: inherit;
 }
 
 .ql-editor {
-    font-family: @font-stack;
-    line-height: 1.6;
+	white-space: normal;
+}
 
-	h1, h2, h3, h4, h5 {
+.ql-editor {
+	font-family: @font-stack;
+	line-height: 1.6;
+
+	h1,
+	h2,
+	h3,
+	h4,
+	h5 {
 		margin-top: 0.5em;
 		margin-bottom: 0.25em;
 	}
 }
 
 .ql-toolbar.ql-snow {
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    background-color: @panel-bg;
-    padding-bottom: 0;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
+	background-color: @panel-bg;
+	padding-bottom: 0;
 }
 
 .ql-container.ql-snow {
-    border-bottom-left-radius: 4px;
-    border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
 }
 
 .ql-snow .ql-editor {
-    min-height: 400px;
-    max-height: 600px;
+	min-height: 400px;
+	max-height: 600px;
 }
 
 .ql-snow .ql-picker {
@@ -40,87 +49,87 @@
 }
 
 .ql-snow .ql-picker-label {
-    outline: none;
+	outline: none;
 }
 
 .ql-formats {
-    margin-bottom: 8px;
+	margin-bottom: 8px;
 }
 
 .ql-bubble .ql-editor {
-    min-height: 100px;
-    max-height: 300px;
-    border: 1px solid @light-border-color;
-    border-radius: 4px;
+	min-height: 100px;
+	max-height: 300px;
+	border: 1px solid @light-border-color;
+	border-radius: 4px;
 }
 
 .ql-mention-list-container {
-    z-index: 1;
+	z-index: 1;
 }
 
 .ql-mention-list {
-    border-radius: 4px;
+	border-radius: 4px;
 }
 
 .ql-mention-list-item {
-    font-size: @text-small;
-    padding: 10px 12px;
-    height: initial;
-    line-height: initial;
+	font-size: @text-small;
+	padding: 10px 12px;
+	height: initial;
+	line-height: initial;
 
-    &.selected {
-        background-color: @btn-bg;
-    }
+	&.selected {
+		background-color: @btn-bg;
+	}
 }
 
 .ql-editor .mention {
-    height: auto;
-    width: auto;
-    border-radius: 10px;
-    border: 1px solid @light-border-color;
-    padding: 2px 3px;
-    background-color: @btn-bg;
+	height: auto;
+	width: auto;
+	border-radius: 10px;
+	border: 1px solid @light-border-color;
+	padding: 2px 3px;
+	background-color: @btn-bg;
 }
 
 // table
 
 .ql-table {
-    width: 66px;
-
-    .ql-picker-label::before {
-        content: 'Table';
-    }
-
-    .ql-picker-options {
-        [data-value='insert-table']::before {
-            content: 'Insert Table';
-        }
-        [data-value='insert-row-above']::before {
-            content: 'Insert Row Above';
-        }
-        [data-value='insert-row-below']::before {
-            content: 'Insert Row Below';
-        }
-        [data-value='insert-column-right']::before {
-            content: 'Insert Column Right';
-        }
-        [data-value='insert-column-left']::before {
-            content: 'Insert Column Left';
-        }
-        [data-value='delete-row']::before {
-            content: 'Delete Row';
-        }
-        [data-value='delete-column']::before {
-            content: 'Delete Column';
-        }
-        [data-value='delete-table']::before {
-            content: 'Delete Table';
-        }
-    }
+	width: 66px;
+
+	.ql-picker-label::before {
+		content: 'Table';
+	}
+
+	.ql-picker-options {
+		[data-value='insert-table']::before {
+			content: 'Insert Table';
+		}
+		[data-value='insert-row-above']::before {
+			content: 'Insert Row Above';
+		}
+		[data-value='insert-row-below']::before {
+			content: 'Insert Row Below';
+		}
+		[data-value='insert-column-right']::before {
+			content: 'Insert Column Right';
+		}
+		[data-value='insert-column-left']::before {
+			content: 'Insert Column Left';
+		}
+		[data-value='delete-row']::before {
+			content: 'Delete Row';
+		}
+		[data-value='delete-column']::before {
+			content: 'Delete Column';
+		}
+		[data-value='delete-table']::before {
+			content: 'Delete Table';
+		}
+	}
 }
 
 .ql-editor td {
-    border: 1px solid @border-color;
+	border: 1px solid @border-color;
 }
 
 .ql-snow .ql-editor blockquote {
@@ -132,12 +141,3 @@
 .ql-editor ol {
 	padding-left: 2.5em;
 }
-
-.ql-editor li[data-list=ordered] {
-	list-style-type: decimal;
-	padding-left: 0;
-
-	&::before {
-		content: none;
-	}
-}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index a94032efbe..c330bc7619 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -100,7 +100,7 @@ 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 -%}
+		{%- if df.fieldtype=="Text Editor" -%}<div class='ql-editor'>{%- endif -%}
 		{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
 		{%- if df.fieldtype=="Text Editor" -%}</div>{%- endif -%}
   {% endif -%}
diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py
index c740252b5c..302813645e 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -68,13 +68,10 @@ def sanitize_html(html, linkify=False):
 	styles = bleach_whitelist.all_styles
 	strip_comments = False
 
-	# retuns html with escaped tags, escaped orphan >, <, etc.
+	# returns html with escaped tags, escaped orphan >, <, etc.
 	escaped_html = bleach.clean(html, tags=tags, attributes=attributes, styles=styles,
 		strip_comments=strip_comments, protocols=['cid', 'http', 'https', 'mailto'])
 
-	if linkify:
-		escaped_html = bleach.linkify(escaped_html, callbacks=[])
-
 	return escaped_html
 
 def is_json(text):
diff --git a/package.json b/package.json
index d944bd5bb6..3167db9e13 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "moment": "^2.20.1",
     "moment-timezone": "^0.5.28",
     "quagga": "^0.12.1",
-    "quill": "2.0.0-dev.2",
+    "quill": "2.0.0-dev.4",
     "qz-tray": "^2.0.8",
     "redis": "^2.8.0",
     "showdown": "^1.9.1",
@@ -54,6 +54,7 @@
     "chalk": "^2.3.2",
     "cypress": "3",
     "cypress-file-upload": "^3.1.0",
+    "graphlib": "^2.1.8",
     "less": "^3.11.1",
     "node-sass": "^4.13.1",
     "rollup": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index 96641604ab..45a33c5d42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -532,6 +532,11 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-filter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83"
+  integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM=
+
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -616,6 +621,13 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
+  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
+  dependencies:
+    array-filter "^1.0.0"
+
 awesomplete@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/awesomplete/-/awesomplete-1.1.5.tgz#1b2b5dd106d3955595619c03da472a1dc0faf0af"
@@ -1040,7 +1052,7 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
-clone@^2.1.1, clone@^2.1.2:
+clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
@@ -1587,6 +1599,26 @@ deep-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
   integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
 
+deep-equal@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.3.tgz#cad1c15277ad78a5c01c49c2dee0f54de8a6a7b0"
+  integrity sha512-Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA==
+  dependencies:
+    es-abstract "^1.17.5"
+    es-get-iterator "^1.1.0"
+    is-arguments "^1.0.4"
+    is-date-object "^1.0.2"
+    is-regex "^1.0.5"
+    isarray "^2.0.5"
+    object-is "^1.1.2"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    regexp.prototype.flags "^1.3.0"
+    side-channel "^1.0.2"
+    which-boxed-primitive "^1.0.1"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.2"
+
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
@@ -1849,6 +1881,36 @@ es-abstract@^1.12.0, es-abstract@^1.5.1:
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
+es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5:
+  version "1.17.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
+  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  dependencies:
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+    is-callable "^1.1.5"
+    is-regex "^1.0.5"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimleft "^2.1.1"
+    string.prototype.trimright "^2.1.1"
+
+es-get-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.0.tgz#bb98ad9d6d63b31aacdc8f89d5d0ee57bcb5b4c8"
+  integrity sha512-UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ==
+  dependencies:
+    es-abstract "^1.17.4"
+    has-symbols "^1.0.1"
+    is-arguments "^1.0.4"
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-string "^1.0.5"
+    isarray "^2.0.5"
+
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -1858,6 +1920,15 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es-to-primitive@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  dependencies:
+    is-callable "^1.1.4"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.2"
+
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -1944,10 +2015,10 @@ eventemitter2@4.1.2:
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15"
   integrity sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=
 
-eventemitter3@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+eventemitter3@^4.0.0:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.4.tgz#b5463ace635a083d018bdc7c917b4c5f10a85384"
+  integrity sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==
 
 execa@0.10.0:
   version "0.10.0"
@@ -2071,7 +2142,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.2:
+extend@^3.0.0, extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -2129,10 +2200,10 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
-fast-diff@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154"
-  integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==
+fast-diff@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
@@ -2226,6 +2297,11 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -2531,6 +2607,13 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+graphlib@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
+  integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
+  dependencies:
+    lodash "^4.17.15"
+
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
@@ -2585,6 +2668,11 @@ has-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
   integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
+has-symbols@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -2875,6 +2963,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-arguments@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3"
+  integrity sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -2885,6 +2978,16 @@ is-arrayish@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
+is-bigint@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.0.tgz#73da8c33208d00f130e9b5e15d23eac9215601c4"
+  integrity sha512-t5mGUXC/xRheCK431ylNiSkGGpBp8bHENBcENTkDT6ppwPzEVxNGZRvgvmOEfbWkFhA7D2GEuE2mmQTr78sl2g==
+
+is-boolean-object@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e"
+  integrity sha512-TqZuVwa/sppcrhUCAYkGBk7w0yxfQQnxq28fjkO53tnK9FQXmdwz2JS5+GjsWQ6RByES1K40nI+yDic5c9/aAQ==
+
 is-buffer@^1.0.2, is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -2895,6 +2998,11 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-callable@^1.1.5:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz#83336560b54a38e35e3a2df7afd0454d691468bb"
+  integrity sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==
+
 is-ci@1.2.1, is-ci@^1.0.10:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
@@ -2933,6 +3041,11 @@ is-date-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
   integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
+is-date-object@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
+  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -3010,6 +3123,11 @@ is-installed-globally@0.1.0, is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+is-map@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1"
+  integrity sha512-T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw==
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -3020,6 +3138,11 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
+is-number-object@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -3068,6 +3191,13 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-regex@^1.0.5:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz#ece38e389e490df0dc21caea2bd596f987f767ff"
+  integrity sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-resolvable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -3078,6 +3208,11 @@ is-retry-allowed@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
   integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
 
+is-set@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
+  integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
+
 is-ssh@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
@@ -3090,6 +3225,11 @@ is-stream@^1.0.0, is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-string@^1.0.4, is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
 is-svg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
@@ -3104,6 +3244,16 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
+is-typed-array@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.3.tgz#a4ff5a5e672e1a55f99c7f54e59597af5c1df04d"
+  integrity sha512-BSYUBOK/HJibQ30wWkWold5txYwMUXQct9YHAQJr8fSwvZoiglcqB0pd7vEN23+Tsi9IUEjztdOSzl4qLVYGTQ==
+  dependencies:
+    available-typed-arrays "^1.0.0"
+    es-abstract "^1.17.4"
+    foreach "^2.0.5"
+    has-symbols "^1.0.1"
+
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -3119,6 +3269,16 @@ is-valid-glob@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
   integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
 
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
+is-weakset@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83"
+  integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw==
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -3146,6 +3306,11 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -4025,6 +4190,24 @@ object-hash@^2.0.3:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
   integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
+object-inspect@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
+  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+
+object-is@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.2.tgz#c5d2e87ff9e119f78b7a088441519e2eec1573b6"
+  integrity sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+object-keys@^1.0.11, object-keys@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+
 object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
@@ -4037,6 +4220,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
@@ -4235,9 +4428,10 @@ pako@~1.0.2:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
-parchment@quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb:
-  version "2.0.0-dev"
-  resolved "https://codeload.github.com/quilljs/parchment/tar.gz/487850f7eb030a6c4e750ba809e58b09444e0bdb"
+parchment@2.0.0-dev.2:
+  version "2.0.0-dev.2"
+  resolved "https://registry.yarnpkg.com/parchment/-/parchment-2.0.0-dev.2.tgz#9d6fe57b3721317bd1c481ea38ffa9b287d496b8"
+  integrity sha512-4fgRny4pPISoML08Zp7poi52Dff3E2G1ORTi2D/acJ/RiROdDAMDB6VcQNfBcmehrX5Wixp6dxh6JjLyE5yUNQ==
 
 parse-data-uri@^0.2.0:
   version "0.2.0"
@@ -4921,26 +5115,26 @@ querystring@0.2.0, querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-quill-delta@^3.6.2:
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-3.6.3.tgz#b19fd2b89412301c60e1ff213d8d860eac0f1032"
-  integrity sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==
+quill-delta@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/quill-delta/-/quill-delta-4.2.1.tgz#ad4f191cdf3be5079c5dc3991b9603a5cc0db69a"
+  integrity sha512-Y2nksOj6Q+4hizre8n0dml76vLNGK4/y86EoI1d7rv6EL1bx7DPDYRmqQMPu1UqFQO/uQuVHQ3fOmm4ZSzWrfA==
   dependencies:
     deep-equal "^1.0.1"
     extend "^3.0.2"
-    fast-diff "1.1.2"
+    fast-diff "1.2.0"
 
-quill@2.0.0-dev.2:
-  version "2.0.0-dev.2"
-  resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.2.tgz#0f8bc962da28e3ebbb856f246200e7d32e39fc9f"
-  integrity sha512-jqP2ar0EaPZLLyeYmyJ01l07+l3NKjUiq79i7OQiYv7Rm3wHTaejgq2oIqmXUCZjGQd2f5jlFUABkf8quZVcIw==
+quill@2.0.0-dev.4:
+  version "2.0.0-dev.4"
+  resolved "https://registry.yarnpkg.com/quill/-/quill-2.0.0-dev.4.tgz#130e38efe7a16b3766d767d750c8aacc038945e7"
+  integrity sha512-9WmMVCEIhf3lDdhzl+i+GBDeDl0BFi65waC4Im8Y4HudEJ9kEEb1lciAz9A8pcDmLMjiMbvz84lNt/U5OBS8Vg==
   dependencies:
-    clone "^2.1.1"
-    deep-equal "^1.0.1"
-    eventemitter3 "^3.1.0"
-    extend "^3.0.1"
-    parchment quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb
-    quill-delta "^3.6.2"
+    clone "^2.1.2"
+    deep-equal "^2.0.2"
+    eventemitter3 "^4.0.0"
+    extend "^3.0.2"
+    parchment "2.0.0-dev.2"
+    quill-delta "4.2.1"
 
 qz-tray@^2.0.8:
   version "2.0.8"
@@ -5118,6 +5312,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp.prototype.flags@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
+  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0-next.1"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -5598,6 +5800,14 @@ showdown@^1.9.1:
   dependencies:
     yargs "^14.2"
 
+side-channel@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
+  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
+  dependencies:
+    es-abstract "^1.17.0-next.1"
+    object-inspect "^1.7.0"
+
 signal-exit@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -6171,6 +6381,40 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string.prototype.trimend@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
+  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
+string.prototype.trimleft@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
+  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimstart "^1.0.0"
+
+string.prototype.trimright@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
+  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+    string.prototype.trimend "^1.0.0"
+
+string.prototype.trimstart@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
+  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.17.5"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -6743,6 +6987,27 @@ vue@^2.6.11:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5"
   integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==
 
+which-boxed-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.1.tgz#cbe8f838ebe91ba2471bb69e9edbda67ab5a5ec1"
+  integrity sha512-7BT4TwISdDGBgaemWU0N0OU7FeAEJ9Oo2P1PHRm/FCWoEi2VLWC9b6xvxAA3C/NMpxg3HXVgi0sMmGbNUbNepQ==
+  dependencies:
+    is-bigint "^1.0.0"
+    is-boolean-object "^1.0.0"
+    is-number-object "^1.0.3"
+    is-string "^1.0.4"
+    is-symbol "^1.0.2"
+
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  dependencies:
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -6753,6 +7018,18 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which-typed-array@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.2.tgz#e5f98e56bda93e3dac196b01d47c1156679c00b2"
+  integrity sha512-KT6okrd1tE6JdZAy3o2VhMoYPh3+J6EMZLyrxBQsZflI1QCZIxMrIYLkosd8Twf+YfknVIHmYQPgJt238p8dnQ==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    es-abstract "^1.17.5"
+    foreach "^2.0.5"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.1"
+    is-typed-array "^1.1.3"
+
 which@1, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

From af86b5a1bad66995b3d0d22adb8e3578d0054145 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:36:00 +0530
Subject: [PATCH 065/319] fix(prettyDate): Convert datetime to user's timezone
 first (bp #10808) (#10821)

(cherry picked from commit f328d7928cdc2ac4c413b62c5dcc695d7ebae016)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 frappe/public/js/frappe/utils/pretty_date.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js
index 7618d58829..84fd276068 100644
--- a/frappe/public/js/frappe/utils/pretty_date.js
+++ b/frappe/public/js/frappe/utils/pretty_date.js
@@ -1,8 +1,10 @@
 function prettyDate(date, mini) {
 	if (!date) return '';
 
-	if (typeof (date) == "string")
+	if (typeof (date) == "string") {
+		date = frappe.datetime.convert_to_user_tz(date);
 		date = new Date((date || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, ""));
+	}
 
 	let diff = (((new Date()).getTime() - date.getTime()) / 1000);
 	let day_diff = Math.floor(diff / 86400);

From 86cf74417bd30e372498588517bc8d92f011aa32 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:36:21 +0530
Subject: [PATCH 066/319] fix: Page primary action reset (bp #10801) (#10822)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/form/toolbar.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 3ba326f022..01e8fdbb98 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -380,10 +380,10 @@ frappe.ui.form.Toolbar = Class.extend({
 		var status = this.get_action_status();
 		if (status) {
 			// When moving from a page with status amend to another page with status amend
-			// We need to check if document is already amened specifcally and hide
+			// We need to check if document is already amend specifically and hide
 			// or clear the menu actions accordingly
 
-			if (status !== this.current_status || status === 'Amend') {
+			if (status !== this.current_status && status === 'Amend') {
 				let doc = this.frm.doc;
 				frappe.xcall('frappe.client.is_document_amended', {
 					'doctype': doc.doctype,
@@ -400,7 +400,7 @@ frappe.ui.form.Toolbar = Class.extend({
 			}
 		} else {
 			this.page.clear_actions();
-			this.current_status = null
+			this.current_status = null;
 		}
 	},
 	get_action_status: function() {

From 076e8caa5f06b4961601c1cd4bf8da7618802b90 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:38:09 +0530
Subject: [PATCH 067/319] fix: Custom ol padding removed in text editor (bp
 #10804) (#10824)

Co-authored-by: KanchanChauhan <angel143.dr@gmail.com>
---
 frappe/public/less/quill.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index 17351c0026..a72602697a 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -137,7 +137,3 @@
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
-
-.ql-editor ol {
-	padding-left: 2.5em;
-}

From b82dce9021aa9d78b5f8f143e62709259a84518e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 29 Jun 2020 11:29:52 +0530
Subject: [PATCH 068/319] fix: handle condition that "Setters" could be "Array"
 or "Object" (bp #10829) (#10845)

Co-authored-by: Afshan <afshan13k@gmail.com>
---
 .../js/frappe/form/multi_select_dialog.js     | 64 ++++++++++++-------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 41b87e0207..a0bb927563 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -101,19 +101,25 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		columns[1] = [];
 		columns[2] = [];
 
-		Object.keys(this.setters).forEach((setter, index) => {
-			let df_prop = frappe.meta.docfield_map[this.doctype][setter];
-
-			// Index + 1 to start filling from index 1
-			// Since Search is a standrd field already pushed
-			columns[(index + 1) % 3].push({
-				fieldtype: df_prop.fieldtype,
-				label: df_prop.label,
-				fieldname: setter,
-				options: df_prop.options,
-				default: this.setters[setter]
+		if ($.isArray(this.setters)) {
+			this.setters.forEach((setter, index) => {
+				columns[(index + 1) % 3].push(setter);
 			});
-		});
+		} else {
+			Object.keys(this.setters).forEach((setter, index) => {
+				let df_prop = frappe.meta.docfield_map[this.doctype][setter];
+
+				// Index + 1 to start filling from index 1
+				// Since Search is a standrd field already pushed
+				columns[(index + 1) % 3].push({
+					fieldtype: df_prop.fieldtype,
+					label: df_prop.label,
+					fieldname: setter,
+					options: df_prop.options,
+					default: this.setters[setter]
+				});
+			});
+		}
 
 		// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/seal
 		if (Object.seal) {
@@ -217,7 +223,13 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		let contents = ``;
 		let columns = ["name"];
 
-		columns = columns.concat(Object.keys(this.setters));
+		if ($.isArray(this.setters)) {
+			for (let df of this.setters) {
+				columns.push(df.fieldname);
+			}
+		} else {
+			columns = columns.concat(Object.keys(this.setters));
+		}
 
 		columns.forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
@@ -290,16 +302,24 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		let filters = this.get_query ? this.get_query().filters : {} || {};
 		let filter_fields = [];
 
-		Object.keys(this.setters).forEach(function (setter) {
-			var value = me.dialog.fields_dict[setter].get_value();
-			if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
-				filters[setter] = ["like", "%" + value + "%"];
-			} else {
-				filters[setter] = value || undefined;
-				me.args[setter] = filters[setter];
-				filter_fields.push(setter);
+		if ($.isArray(this.setters)) {
+			for (let df of this.setters) {
+				filters[df.fieldname] = me.dialog.fields_dict[df.fieldname].get_value() || undefined;
+				me.args[df.fieldname] = filters[df.fieldname];
+				filter_fields.push(df.fieldname);
 			}
-		});
+		} else {
+			Object.keys(this.setters).forEach(function (setter) {
+				var value = me.dialog.fields_dict[setter].get_value();
+				if (me.dialog.fields_dict[setter].df.fieldtype == "Data" && value) {
+					filters[setter] = ["like", "%" + value + "%"];
+				} else {
+					filters[setter] = value || undefined;
+					me.args[setter] = filters[setter];
+					filter_fields.push(setter);
+				}
+			});
+		}
 
 		let filter_group = this.get_custom_filters();
 		Object.assign(filters, filter_group);

From a34d17f4fdcd3f79d348202f0b6347153ff9199c Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 29 Jun 2020 12:00:54 +0530
Subject: [PATCH 069/319] fix: prevent infinite recursion while fetching linked
 documents (#10847)

---
 frappe/desk/form/linked_with.py | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index 72917d0341..5bae49ea95 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -13,7 +13,7 @@ from frappe.modules import load_doctype_module
 
 
 @frappe.whitelist()
-def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
+def get_submitted_linked_docs(doctype, name, docs=None, visited=None):
 	"""
 	Get all nested submitted linked doctype linkinfo
 
@@ -31,26 +31,27 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
 	if not docs:
 		docs = []
 
-	if not linked:
-		linked = {}
+	if not visited:
+		visited = {}
+
+	if doctype not in visited:
+		visited[doctype] = []
+
+	if name in visited[doctype]:
+		return
 
 	linkinfo = get_linked_doctypes(doctype)
 	linked_docs = get_linked_docs(doctype, name, linkinfo)
 
 	link_count = 0
+	visited[doctype].append(name)
+
 	for link_doctype, link_names in linked_docs.items():
-		if link_doctype not in linked:
-			linked[link_doctype] = []
 
 		for link in link_names:
 			if link['name'] == name:
 				continue
 
-			if linked and name in linked[link_doctype]:
-				continue
-
-			linked[link_doctype].append(link['name'])
-
 			docinfo = link.update({"doctype": link_doctype})
 			validated_doc = validate_linked_doc(docinfo)
 
@@ -58,16 +59,15 @@ def get_submitted_linked_docs(doctype, name, docs=None, linked=None):
 				continue
 
 			link_count += 1
-			if link.name in [doc.get("name") for doc in docs]:
-				continue
 
-			links = get_submitted_linked_docs(link_doctype, link.name, docs, linked)
-			docs.append({
-				"doctype": link_doctype,
-				"name": link.name,
-				"docstatus": link.docstatus,
-				"link_count": links.get("count")
-			})
+			links = get_submitted_linked_docs(link_doctype, link.name, docs, visited)
+			if links:
+				docs.append({
+					"doctype": link_doctype,
+					"name": link.name,
+					"docstatus": link.docstatus,
+					"link_count": links.get("count")
+				})
 
 	# sort linked documents by ascending number of links
 	docs.sort(key=lambda doc: doc.get("link_count"))

From d03c5d9a3e7caa82c37e5f4729ed03302f9fadf9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 25 Jun 2020 23:12:25 +0530
Subject: [PATCH 070/319] fix: include start date in chart result

(cherry picked from commit 04d0ce54af6873aed342c193be9080c9f486c11e)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index c6343dd187..7592d60b48 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -258,7 +258,7 @@ def get_aggregate_function(chart_type):
 def get_result(data, timegrain, from_date, to_date):
 	start_date = getdate(from_date)
 	end_date = getdate(to_date)
-	result = []
+	result = [[start_date, 0.0]]
 
 	while start_date <= end_date:
 		next_date = get_next_expected_date(start_date, timegrain)

From aca33091d3c3deb7777b0c28cf27e4569dd196a3 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Jun 2020 00:03:35 +0530
Subject: [PATCH 071/319] fix: append start date only if timegrain is daily

(cherry picked from commit 1379a722f5bc0a5e8c1cdd1aa9a3a89b86575d47)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7592d60b48..6ea043cabe 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -258,7 +258,10 @@ def get_aggregate_function(chart_type):
 def get_result(data, timegrain, from_date, to_date):
 	start_date = getdate(from_date)
 	end_date = getdate(to_date)
-	result = [[start_date, 0.0]]
+
+	result = []
+	if timegrain == 'Daily':
+		result.append([start_date, 0.0])
 
 	while start_date <= end_date:
 		next_date = get_next_expected_date(start_date, timegrain)

From be212a43c5d2f3e98d6f417fe3742ec913369f40 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Jun 2020 17:47:59 +0530
Subject: [PATCH 072/319] fix: test for daily charts

(cherry picked from commit b482b2ce5c0821683d72d08f6bd1a83105cb85b8)
---
 .../dashboard_chart/test_dashboard_chart.py   | 88 +++++++++++++------
 1 file changed, 59 insertions(+), 29 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index dfc6edbf58..1a300e471a 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -35,9 +35,6 @@ class TestDashboardChart(unittest.TestCase):
 		self.assertEqual(get_period_ending('2019-10-01', 'Quarterly'),
 			getdate('2019-12-31'))
 
-		self.assertEqual(get_period_ending('2019-10-01', 'Yearly'),
-			getdate('2019-12-31'))
-
 	def test_dashboard_chart(self):
 		if frappe.db.exists('Dashboard Chart', 'Test Dashboard Chart'):
 			frappe.delete_doc('Dashboard Chart', 'Test Dashboard Chart')
@@ -50,7 +47,7 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '[]',
+			filters_json = '{}',
 			timeseries = 1
 		)).insert()
 
@@ -82,7 +79,7 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '[]',
+			filters_json = '{}',
 			timeseries = 1
 		)).insert()
 
@@ -114,7 +111,7 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '[]',
+			filters_json = '{}',
 			timeseries = 1
 		)).insert()
 
@@ -132,59 +129,92 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
-	def test_weekly_dashboard_chart(self):
+	def test_group_by_chart_type(self):
+		if frappe.db.exists('Dashboard Chart', 'Test Group By Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Group By Dashboard Chart')
+
+		frappe.get_doc({"doctype":"ToDo", "description": "test"}).insert()
+
+		frappe.get_doc(dict(
+			doctype = 'Dashboard Chart',
+			chart_name = 'Test Group By Dashboard Chart',
+			chart_type = 'Group By',
+			document_type = 'ToDo',
+			group_by_based_on = 'status',
+			filters_json = '{}',
+		)).insert()
+
+		result = get(chart_name ='Test Group By Dashboard Chart', refresh = 1)
+		todo_status_count = frappe.db.count('ToDo', {'status': result.get('labels')[0]})
+
+		self.assertEqual(result.get('datasets')[0].get('values')[0], todo_status_count)
+
+		frappe.db.rollback()
+
+	def test_daily_dashboard_chart(self):
 		insert_test_records()
 
-		if frappe.db.exists('Dashboard Chart', 'Test Weekly Dashboard Chart'):
-			frappe.delete_doc('Dashboard Chart', 'Test Weekly Dashboard Chart')
+		if frappe.db.exists('Dashboard Chart', 'Test Daily Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Daily Dashboard Chart')
 
 		frappe.get_doc(dict(
 			doctype = 'Dashboard Chart',
-			chart_name = 'Test Weekly Dashboard Chart',
+			chart_name = 'Test Daily Dashboard Chart',
 			chart_type = 'Sum',
 			document_type = 'Communication',
 			based_on = 'communication_date',
 			value_based_on = 'rating',
 			timespan = 'Select Date Range',
-			time_interval = 'Weekly',
-			from_date = datetime(2018, 12, 30),
-			to_date = datetime(2019, 1, 15),
-			filters_json = '[]',
+			time_interval = 'Daily',
+			from_date = datetime(2019, 1, 6),
+			to_date = datetime(2019, 1, 11),
+			filters_json = '{}',
 			timeseries = 1
 		)).insert()
 
-		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
+		result = get(chart_name ='Test Daily Dashboard Chart', refresh = 1)
 
-		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 0.0])
-		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
+		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 300.0, 0.0, 100.0, 0.0])
+		self.assertEqual(
+			result.get('labels'),
+			[formatdate('2019-01-06'), formatdate('2019-01-07'), formatdate('2019-01-08'),\
+			formatdate('2019-01-09'), formatdate('2019-01-10'), formatdate('2019-01-11')]
+		)
 
 		frappe.db.rollback()
 
-	def test_group_by_chart_type(self):
-		if frappe.db.exists('Dashboard Chart', 'Test Group By Dashboard Chart'):
-			frappe.delete_doc('Dashboard Chart', 'Test Group By Dashboard Chart')
+	def test_weekly_dashboard_chart(self):
+		insert_test_records()
 
-		frappe.get_doc({"doctype":"ToDo", "description": "test"}).insert()
+		if frappe.db.exists('Dashboard Chart', 'Test Weekly Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Weekly Dashboard Chart')
 
 		frappe.get_doc(dict(
 			doctype = 'Dashboard Chart',
-			chart_name = 'Test Group By Dashboard Chart',
-			chart_type = 'Group By',
-			document_type = 'ToDo',
-			group_by_based_on = 'status',
-			filters_json = '[]',
+			chart_name = 'Test Weekly Dashboard Chart',
+			chart_type = 'Sum',
+			document_type = 'Communication',
+			based_on = 'communication_date',
+			value_based_on = 'rating',
+			timespan = 'Select Date Range',
+			time_interval = 'Weekly',
+			from_date = datetime(2018, 12, 30),
+			to_date = datetime(2019, 1, 15),
+			filters_json = '{}',
+			timeseries = 1
 		)).insert()
 
-		result = get(chart_name ='Test Group By Dashboard Chart', refresh = 1)
-		todo_status_count = frappe.db.count('ToDo', {'status': result.get('labels')[0]})
+		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
 
-		self.assertEqual(result.get('datasets')[0].get('values')[0], todo_status_count)
+		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 800.0, 0.0])
+		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
 
 		frappe.db.rollback()
 
 def insert_test_records():
 	create_new_communication(datetime(2019, 1, 10), 100)
 	create_new_communication(datetime(2019, 1, 6), 200)
+	create_new_communication(datetime(2019, 1, 7), 400)
 	create_new_communication(datetime(2019, 1, 8), 300)
 
 def create_new_communication(date, rating):

From 280b6393f36b8a9ad0b94d88af1d95cc603b2db0 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Wed, 24 Jun 2020 19:23:03 +0530
Subject: [PATCH 073/319] fix(Dashboard Chart): use now_datetime() for user
 timezone (#10788)

(cherry picked from commit 5f94964b3226b4bfdd9180c0bd8784bb6e1c88a8)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 6ea043cabe..a5c5504db2 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -8,7 +8,8 @@ from frappe import _
 import datetime
 import json
 from frappe.utils.dashboard import cache_source, get_from_date_from_timespan
-from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime, cint
+from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate,\
+	get_datetime, cint, now_datetime
 from frappe.model.naming import append_number_if_name_exists
 from frappe.boot import get_allowed_reports
 from frappe.model.document import Document
@@ -134,7 +135,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 	if not from_date:
 		from_date = get_from_date_from_timespan(to_date, timespan)
 	if not to_date:
-		to_date = datetime.datetime.now()
+		to_date = now_datetime()
 
 	doctype = chart.document_type
 	datefield = chart.based_on
@@ -263,7 +264,7 @@ def get_result(data, timegrain, from_date, to_date):
 	if timegrain == 'Daily':
 		result.append([start_date, 0.0])
 
-	while start_date <= end_date:
+	while start_date < end_date:
 		next_date = get_next_expected_date(start_date, timegrain)
 		result.append([next_date, 0.0])
 		start_date = next_date

From 166a2573b8d3e911d045275134125e5c41dd76a8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 23 Jun 2020 15:32:30 +0530
Subject: [PATCH 074/319] fix: hide form sidebar users

(cherry picked from commit 8c37d20dac7d4a2eadbb62159628168fa3e41b4e)
---
 frappe/public/js/frappe/form/templates/form_sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 296eb160bd..1f5c8b5cf6 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -74,11 +74,11 @@
 	<li class="h6 shared-with-label">{%= __("Shared With") %}</li>
 	<li class="form-shared"></li>
 </ul>
-<ul class="list-unstyled sidebar-menu">
+<ul class="list-unstyled sidebar-menu hidden">
 	<li class="h6 viewers-label">{%= __("Currently Viewing") %}</li>
 	<li class="form-viewers"></li>
 </ul>
-<ul class="list-unstyled sidebar-menu">
+<ul class="list-unstyled sidebar-menu hidden">
 	<li class="h6 viewers-label">{%= __("Currently Replying") %}</li>
 	<li class="form-typers"></li>
 </ul>

From 86adf721f6f12764afd8a2b2b47c19f62809f3bf Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Mon, 29 Jun 2020 19:30:43 +0530
Subject: [PATCH 075/319] fix: declare site_config_backup_path variable before
 referencing

(cherry picked from commit 94bfc16bfb3db6706431d448c4e94d4f3c231c90)
---
 frappe/utils/backups.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index b933230e52..2396eda4ec 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -90,6 +90,7 @@ class BackupGenerator:
 		backup_path_files = None
 		backup_path_db = None
 		backup_path_private_files = None
+		site_config_backup_path = None
 
 		for this_file in file_list:
 			this_file = cstr(this_file)

From 7771c93cd4f98a7f008fc852ada2ebce4bc3ad1b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Jun 2020 15:49:53 +0530
Subject: [PATCH 076/319] fix(Dashboard Chart): always append start date to
 result (bp #10872) (#10874)

(cherry picked from commit 63cdb5f506902e460e509a83eb01f5b45561c234)

Co-authored-by: prssanna <prssud@gmail.com>
---
 .../dashboard_chart/dashboard_chart.py        | 11 +---
 .../dashboard_chart/test_dashboard_chart.py   | 55 ++++++++++++-------
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a5c5504db2..4ad6943e0b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -260,9 +260,7 @@ def get_result(data, timegrain, from_date, to_date):
 	start_date = getdate(from_date)
 	end_date = getdate(to_date)
 
-	result = []
-	if timegrain == 'Daily':
-		result.append([start_date, 0.0])
+	result = [[start_date, 0.0]]
 
 	while start_date < end_date:
 		next_date = get_next_expected_date(start_date, timegrain)
@@ -280,11 +278,8 @@ def get_result(data, timegrain, from_date, to_date):
 
 def get_next_expected_date(date, timegrain):
 	next_date = None
-	if timegrain=='Daily':
-		next_date = add_to_date(date, days=1)
-	else:
-		# given date is always assumed to be the period ending date
-		next_date = get_period_ending(add_to_date(date, days=1), timegrain)
+	# given date is always assumed to be the period ending date
+	next_date = get_period_ending(add_to_date(date, days=1), timegrain)
 	return getdate(next_date)
 
 def get_period_ending(date, timegrain):
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index 1a300e471a..5e39998e62 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -4,13 +4,12 @@
 from __future__ import unicode_literals
 
 import unittest, frappe
-from frappe.utils import getdate, formatdate
+from frappe.utils import getdate, formatdate, get_last_day
 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):
@@ -53,16 +52,18 @@ class TestDashboardChart(unittest.TestCase):
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		result = get(chart_name ='Test Dashboard Chart', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		result = get(chart_name='Test Dashboard Chart', refresh=1)
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			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])
-
 		frappe.db.rollback()
 
 	def test_empty_dashboard_chart(self):
@@ -79,15 +80,20 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
-		result = get(chart_name ='Test Empty Dashboard Chart', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		result = get(chart_name ='Test Empty Dashboard Chart', refresh=1)
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			self.assertEqual(result.get('labels')[idx], month)
 			cur_date += relativedelta(months=1)
@@ -111,15 +117,20 @@ class TestDashboardChart(unittest.TestCase):
 			based_on = 'creation',
 			timespan = 'Last Year',
 			time_interval = 'Monthly',
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		cur_date = datetime.now() - relativedelta(years=1)
 
 		result = get(chart_name ='Test Empty Dashboard Chart 2', refresh = 1)
-		for idx in range(13):
-			month = datetime(int(cur_date.year), int(cur_date.strftime('%m')), int(calendar.monthrange(cur_date.year, cur_date.month)[1]))
+		self.assertEqual(result.get('labels')[0], formatdate(cur_date.strftime('%Y-%m-%d')))
+
+		if formatdate(cur_date.strftime('%Y-%m-%d')) == formatdate(get_last_day(cur_date).strftime('%Y-%m-%d')):
+			cur_date += relativedelta(months=1)
+
+		for idx in range(1, 13):
+			month = get_last_day(cur_date)
 			month = formatdate(month.strftime('%Y-%m-%d'))
 			self.assertEqual(result.get('labels')[idx], month)
 			cur_date += relativedelta(months=1)
@@ -141,7 +152,7 @@ class TestDashboardChart(unittest.TestCase):
 			chart_type = 'Group By',
 			document_type = 'ToDo',
 			group_by_based_on = 'status',
-			filters_json = '{}',
+			filters_json = '[]',
 		)).insert()
 
 		result = get(chart_name ='Test Group By Dashboard Chart', refresh = 1)
@@ -168,7 +179,7 @@ class TestDashboardChart(unittest.TestCase):
 			time_interval = 'Daily',
 			from_date = datetime(2019, 1, 6),
 			to_date = datetime(2019, 1, 11),
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
@@ -200,22 +211,24 @@ class TestDashboardChart(unittest.TestCase):
 			time_interval = 'Weekly',
 			from_date = datetime(2018, 12, 30),
 			to_date = datetime(2019, 1, 15),
-			filters_json = '{}',
+			filters_json = '[]',
 			timeseries = 1
 		)).insert()
 
 		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
 
-		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 800.0, 0.0])
-		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
+		self.assertEqual(result.get('datasets')[0].get('values'), [50.0, 300.0, 800.0, 0.0])
+		self.assertEqual(result.get('labels'), [formatdate('2018-12-30'), formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
 
 		frappe.db.rollback()
 
 def insert_test_records():
-	create_new_communication(datetime(2019, 1, 10), 100)
+	create_new_communication(datetime(2018, 12, 30), 50)
+	create_new_communication(datetime(2019, 1, 4), 100)
 	create_new_communication(datetime(2019, 1, 6), 200)
 	create_new_communication(datetime(2019, 1, 7), 400)
 	create_new_communication(datetime(2019, 1, 8), 300)
+	create_new_communication(datetime(2019, 1, 10), 100)
 
 def create_new_communication(date, rating):
 	communication = {

From 1ef20169190dbeae48bfa8af8df3ecf343847f22 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:01:37 +0530
Subject: [PATCH 077/319] fix: Column mapping

---
 .../core/doctype/data_import/data_import.js   |  4 +-
 frappe/core/doctype/data_import/importer.py   |  6 ++-
 .../js/frappe/data_import/import_preview.js   | 37 ++++++++++++++++---
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 81a7bc9705..9ccf43436b 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -301,8 +301,8 @@ frappe.ui.form.on('Data Import', {
 				events: {
 					remap_column(changed_map) {
 						let template_options = JSON.parse(frm.doc.template_options || '{}');
-						template_options.remap_column = template_options.remap_column || {};
-						Object.assign(template_options.remap_column, changed_map);
+						template_options.column_to_field_map = template_options.column_to_field_map || {};
+						Object.assign(template_options.column_to_field_map, changed_map);
 						frm.set_value('template_options', JSON.stringify(template_options));
 						frm.save().then(() => frm.trigger('import_file'));
 					}
diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 4761652c70..09849dd5b9 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -766,8 +766,9 @@ class Header(Row):
 
 		for j, header in enumerate(row):
 			column_values = [get_item_at_index(r, j) for r in raw_data]
+			map_to_field = column_to_field_map.get(str(j))
 			column = Column(
-				j, header, self.doctype, column_values, column_to_field_map.get(header), self.seen
+				j, header, self.doctype, column_values, map_to_field, self.seen
 			)
 			self.seen.append(header)
 			self.columns.append(column)
@@ -944,6 +945,9 @@ class Column:
 		d.map_to_field = self.map_to_field
 		d.date_format = self.date_format
 		d.df = self.df
+		if hasattr(self.df, 'is_child_table_field'):
+			d.is_child_table_field = self.df.is_child_table_field
+			d.child_table_df = self.df.child_table_df
 		d.skip_import = self.skip_import
 		d.warnings = self.warnings
 		return d
diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js
index 7cf8431456..4edcb87aeb 100644
--- a/frappe/public/js/frappe/data_import/import_preview.js
+++ b/frappe/public/js/frappe/data_import/import_preview.js
@@ -245,11 +245,12 @@ frappe.data_import.ImportPreview = class ImportPreview {
 			let fieldname;
 			if (!df) {
 				fieldname = null;
+			} else if (col.map_to_field) {
+				fieldname = col.map_to_field;
+			} else if (col.is_child_table_field) {
+				fieldname = `${col.child_table_df.fieldname}.${df.fieldname}`;
 			} else {
-				fieldname =
-					df.parent === this.doctype
-						? df.fieldname
-						: `${df.parent}:${df.fieldname}`;
+				fieldname = df.fieldname;
 			}
 			return [
 				{
@@ -272,7 +273,7 @@ frappe.data_import.ImportPreview = class ImportPreview {
 							label: __("Don't Import"),
 							value: "Don't Import"
 						}
-					].concat(column_picker_fields.get_fields_as_options()),
+					].concat(get_fields_as_options(this.doctype, column_picker_fields)),
 					default: fieldname || "Don't Import",
 					change() {
 						changed.push(i);
@@ -328,3 +329,29 @@ frappe.data_import.ImportPreview = class ImportPreview {
 		});
 	}
 };
+
+function get_fields_as_options(doctype, column_map) {
+	let keys = [doctype];
+	frappe.meta.get_table_fields(doctype).forEach(df => {
+		keys.push(df.fieldname);
+	});
+	// flatten array
+	return [].concat(
+		...keys.map(key => {
+			return column_map[key].map(df => {
+				let label = df.label;
+				let value = df.fieldname;
+				if (doctype !== key) {
+					let table_field = frappe.meta.get_docfield(doctype, key);
+					label = `${df.label} (${table_field.label})`;
+					value = `${table_field.fieldname}.${df.fieldname}`;
+				}
+				return {
+					label,
+					value,
+					description: value
+				};
+			});
+		})
+	);
+}
\ No newline at end of file

From 91f8e5c853f034cfe69cf60a342d3acfc7b46562 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:02:07 +0530
Subject: [PATCH 078/319] fix: Serialize df manually

---
 frappe/core/doctype/data_import/importer.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 09849dd5b9..13684aaad3 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -607,7 +607,7 @@ class Row:
 				self.warnings.append(
 					{
 						"row": self.row_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": msg,
 					}
 				)
@@ -622,7 +622,7 @@ class Row:
 				self.warnings.append(
 					{
 						"row": self.row_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": msg,
 					}
 				)
@@ -635,7 +635,7 @@ class Row:
 					{
 						"row": self.row_number,
 						"col": col.column_number,
-						"field": df.as_dict(convert_dates_to_str=True),
+						"field": df_as_json(df),
 						"message": _("Value {0} must in {1} format").format(
 							frappe.bold(value), frappe.bold(get_user_format(col.date_format))
 						),
@@ -646,7 +646,7 @@ class Row:
 		return value
 
 	def link_exists(self, value, df):
-		key = df.options + "::" + value
+		key = df.options + "::" + cstr(value)
 		if Row.link_values_exist_map.get(key) is None:
 			Row.link_values_exist_map[key] = frappe.db.exists(df.options, value)
 		return Row.link_values_exist_map.get(key)
@@ -1117,3 +1117,13 @@ def get_user_format(date_format):
 		.replace("%m", "mm")
 		.replace("%d", "dd")
 	)
+
+def df_as_json(df):
+	return {
+		'fieldname': df.fieldname,
+		'fieldtype': df.fieldtype,
+		'label': df.label,
+		'options': df.options,
+		'parent': df.parent,
+		'default': df.default
+	}

From dc22eeafced80efcc37001682a518c208acdca87 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Jun 2020 09:03:00 +0530
Subject: [PATCH 079/319] fix(exporter): Count for child table filters

- Extract count method from list_view.js for reuse
---
 .../js/frappe/data_import/data_exporter.js    |  8 +++---
 frappe/public/js/frappe/db.js                 | 26 ++++++++++++++-----
 frappe/public/js/frappe/list/list_view.js     | 24 +++--------------
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 735237189d..6ee4e907fc 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -285,11 +285,9 @@ frappe.data_import.DataExporter = class DataExporter {
 	}
 
 	get_filters() {
-		return this.filter_group.get_filters().reduce((acc, filter) => {
-			return Object.assign(acc, {
-				[filter[1]]: [filter[2], filter[3]]
-			});
-		}, {});
+		return this.filter_group.get_filters().map(filter => {
+			return filter.slice(0, 4)
+		});
 	}
 
 	get_multicheck_options(doctype, child_fieldname = null) {
diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js
index 1b6fb0e438..cf716c67e5 100644
--- a/frappe/public/js/frappe/db.js
+++ b/frappe/public/js/frappe/db.js
@@ -91,12 +91,26 @@ frappe.db = {
 		});
 	},
 	count: function(doctype, args={}) {
-		return new Promise(resolve => {
-			frappe.call({
-				method: 'frappe.client.get_count',
-				type: 'GET',
-				args: Object.assign(args, { doctype })
-			}).then(r => resolve(r.message));
+		let filters = args.filters || {};
+		const with_child_table_filter = Array.isArray(filters) && filters.some(filter => {
+			return filter[0] !== 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', doctype)}) AS total_count`
+		];
+
+		return frappe.call({
+			type: 'GET',
+			method: 'frappe.desk.reportview.get',
+			args: {
+				doctype,
+				filters,
+				fields,
+			}
+		}).then(r => {
+			return r.message.values[0][0];
 		});
 	},
 	get_link_options(doctype, txt = '', filters={}) {
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 9e1ba1b9bd..8da73b0dec 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -760,26 +760,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		let current_count = this.data.length;
 		let count_without_children = this.data.uniqBy(d => d.name).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,
-				fields,
-			}
-		}).then(r => {
-			this.total_count = r.message.values[0][0] || current_count;
+		return frappe.db.count(this.doctype, {
+			filters: this.get_filters_for_args()
+		}).then(total_count => {
+			this.total_count = total_count || current_count;
 			let str = __('{0} of {1}', [current_count, this.total_count]);
 			if (count_without_children !== current_count) {
 				str = __('{0} of {1} ({2} rows with children)', [count_without_children, this.total_count, current_count]);

From bfbc6e0aedc0e0ca62af07315a409a322909a938 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 13:36:15 +0530
Subject: [PATCH 080/319] fix(patch): Drop DI Legacy if exists

- Ignore patch if already run
---
 frappe/patches.txt                              | 2 +-
 frappe/patches/v13_0/replace_old_data_import.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index a03d31918b..f883d2a7bb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -289,4 +289,4 @@ execute:frappe.delete_doc("DocType", "Onboarding Slide Field")
 execute:frappe.delete_doc("DocType", "Onboarding Slide Help Link")
 frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
-frappe.patches.v13_0.replace_old_data_import
+frappe.patches.v13_0.replace_old_data_import # 2020-06-24
diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index 1c00ae5f34..469703e172 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -6,6 +6,10 @@ import frappe
 
 
 def execute():
+	if not frappe.db.exists("DocType", "Data Import Beta"):
+		return
+
+	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import Legacy`")
 	frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy')
 	frappe.db.commit()
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`")

From ba8e69d7411e7dd458dc38428006f12a8c893e41 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:06:25 +0530
Subject: [PATCH 081/319] fix: Data Exporter

- Set options as mandatory only when inserting new records
- Hide Select Mandatory button during update
---
 .../core/doctype/data_import/data_import.js   | 28 +++++------
 .../js/frappe/data_import/data_exporter.js    | 49 ++++---------------
 2 files changed, 22 insertions(+), 55 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 9ccf43436b..6a922618cb 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -102,6 +102,10 @@ frappe.ui.form.on('Data Import', {
 	},
 
 	update_primary_action(frm) {
+		if (frm.is_dirty()) {
+			frm.enable_save();
+			return;
+		}
 		frm.disable_save();
 		if (frm.doc.status !== 'Success') {
 			if (!frm.is_new() && (frm.has_import_file())) {
@@ -199,20 +203,12 @@ frappe.ui.form.on('Data Import', {
 	},
 
 	download_template(frm) {
-		if (
-			frm.data_exporter &&
-			frm.data_exporter.doctype === frm.doc.reference_doctype
-		) {
-			frm.data_exporter.exporting_for = frm.doc.import_type;
-			frm.data_exporter.dialog.show();
-		} else {
-			frappe.require('/assets/js/data_import_tools.min.js', () => {
-				frm.data_exporter = new frappe.data_import.DataExporter(
-					frm.doc.reference_doctype,
-					frm.doc.import_type
-				);
-			});
-		}
+		frappe.require('/assets/js/data_import_tools.min.js', () => {
+			frm.data_exporter = new frappe.data_import.DataExporter(
+				frm.doc.reference_doctype,
+				frm.doc.import_type
+			);
+		});
 	},
 
 	reference_doctype(frm) {
@@ -435,10 +431,10 @@ frappe.ui.form.on('Data Import', {
 						.join('');
 					let id = frappe.dom.get_unique_id();
 					html = `${messages}
-						<button class="btn btn-default btn-xs margin-top" type="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false" aria-controls="${id}">
+						<button class="btn btn-default btn-xs" type="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false" aria-controls="${id}" style="margin-top: 15px;">
 							${__('Show Traceback')}
 						</button>
-						<div class="collapse margin-top" id="${id}">
+						<div class="collapse" id="${id}" style="margin-top: 15px;">
 							<div class="well">
 								<pre>${log.exception}</pre>
 							</div>
diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 6ee4e907fc..238e916c34 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -13,36 +13,6 @@ frappe.data_import.DataExporter = class DataExporter {
 		this.dialog = new frappe.ui.Dialog({
 			title: __('Export Data'),
 			fields: [
-				{
-					fieldtype: 'Select',
-					fieldname: 'exporting_for',
-					label: __('Exporting For'),
-					options: [
-						{
-							label: __('Insert New Records'),
-							value: 'Insert New Records'
-						},
-						{
-							label: __('Update Existing Records'),
-							value: 'Update Existing Records'
-						}
-					],
-					change: () => {
-						let exporting_for = this.dialog.get_value('exporting_for');
-						this.dialog.set_value(
-							'export_records',
-							exporting_for === 'Insert New Records' ? 'blank_template' : 'all'
-						);
-
-						// Force ID field to be exported when updating existing records
-						let id_field = this.dialog.get_field(this.doctype).options[0];
-						if (id_field.value === 'name' && id_field.$checkbox) {
-							id_field.$checkbox
-								.find('input')
-								.prop('disabled', exporting_for === 'Update Existing Records');
-						}
-					}
-				},
 				{
 					fieldtype: 'Select',
 					fieldname: 'export_records',
@@ -65,7 +35,7 @@ frappe.data_import.DataExporter = class DataExporter {
 							value: 'blank_template'
 						}
 					],
-					default: 'blank_template',
+					default: this.exporting_for === 'Insert New Records' ? 'blank_template' : 'all',
 					change: () => {
 						this.update_record_count_message();
 					}
@@ -119,10 +89,6 @@ frappe.data_import.DataExporter = class DataExporter {
 			on_page_show: () => this.select_mandatory()
 		});
 
-		if (this.exporting_for) {
-			this.dialog.set_value('exporting_for', this.exporting_for);
-		}
-
 		this.make_filter_area();
 		this.make_select_all_buttons();
 		this.update_record_count_message();
@@ -172,15 +138,17 @@ frappe.data_import.DataExporter = class DataExporter {
 	}
 
 	make_select_all_buttons() {
+		let for_insert = this.exporting_for === 'Insert New Records';
+		let section_title = for_insert ? __('Select Fields To Insert') : __('Select Fields To Update');
 		let $select_all_buttons = $(`
 			<div>
-				<h6 class="form-section-heading uppercase">${__('Select fields to export')}</h6>
+				<h6 class="form-section-heading uppercase">${section_title}</h6>
 				<button class="btn btn-default btn-xs" data-action="select_all">
 					${__('Select All')}
 				</button>
-				<button class="btn btn-default btn-xs" data-action="select_mandatory">
+				${for_insert ? `<button class="btn btn-default btn-xs" data-action="select_mandatory">
 					${__('Select Mandatory')}
-				</button>
+				</button>`: ''}
 				<button class="btn btn-default btn-xs" data-action="unselect_all">
 					${__('Unselect All')}
 				</button>
@@ -306,6 +274,9 @@ frappe.data_import.DataExporter = class DataExporter {
 			? this.column_map[child_fieldname]
 			: this.column_map[doctype];
 
+		let is_field_mandatory = df => (df.fieldname === 'name' && !child_fieldname)
+			|| (df.reqd && this.exporting_for == 'Insert New Records')
+
 		return fields
 			.filter(df => {
 				if (autoname_field && df.fieldname === autoname_field.fieldname) {
@@ -321,7 +292,7 @@ frappe.data_import.DataExporter = class DataExporter {
 				return {
 					label,
 					value: df.fieldname,
-					danger: df.reqd,
+					danger: is_field_mandatory(df),
 					checked: false,
 					description: `${df.fieldname} ${df.reqd ? __('(Mandatory)') : ''}`
 				};

From a4f53b2441562fd4b91ec9c32fea658e125aeffa Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:07:23 +0530
Subject: [PATCH 082/319] fix: Data Import form

- Hide Download Template button for new doc
- Hide Refresh Google Sheet button if doc is dirty
---
 frappe/core/doctype/data_import/data_import.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.json b/frappe/core/doctype/data_import/data_import.json
index 177252ea22..8b1b6c4e07 100644
--- a/frappe/core/doctype/data_import/data_import.json
+++ b/frappe/core/doctype/data_import/data_import.json
@@ -119,7 +119,7 @@
   {
    "fieldname": "import_warnings_section",
    "fieldtype": "Section Break",
-   "label": "Warnings"
+   "label": "Import File Errors and Warnings"
   },
   {
    "fieldname": "import_warnings",
@@ -127,7 +127,7 @@
    "label": "Import Warnings"
   },
   {
-   "depends_on": "reference_doctype",
+   "depends_on": "eval:!doc.__islocal",
    "fieldname": "download_template",
    "fieldtype": "Button",
    "label": "Download Template"
@@ -159,7 +159,7 @@
    "label": "Import from Google Sheets"
   },
   {
-   "depends_on": "eval:doc.google_sheets_url",
+   "depends_on": "eval:doc.google_sheets_url && !doc.__unsaved",
    "fieldname": "refresh_google_sheet",
    "fieldtype": "Button",
    "label": "Refresh Google Sheet"
@@ -167,7 +167,7 @@
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2020-06-18 16:05:54.211034",
+ "modified": "2020-06-24 14:33:03.173876",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Data Import",

From 44bb9839f4bff810010db9158309aa54a03aa7d4 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:09:54 +0530
Subject: [PATCH 083/319] fix: Data Import for Update

- Update doc only if changed else throw error
- Check for mandatory only for inserting
---
 frappe/core/doctype/data_import/importer.py | 84 +++++++++++++--------
 1 file changed, 51 insertions(+), 33 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 13684aaad3..11228b834b 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -16,6 +16,7 @@ from frappe.utils.xlsxutils import (
 	read_xls_file_from_attached_file,
 )
 from frappe.model import no_value_fields, table_fields as table_fieldtypes
+from frappe.core.doctype.version.version import get_diff
 
 INVALID_VALUES = ("", None)
 MAX_ROWS_IN_PREVIEW = 10
@@ -216,14 +217,22 @@ class Importer:
 	def update_record(self, doc):
 		id_field = get_id_field(self.doctype)
 		existing_doc = frappe.get_doc(self.doctype, doc.get(id_field.fieldname))
-		existing_doc.flags.updater_reference = {
-			"doctype": self.data_import.doctype,
-			"docname": self.data_import.name,
-			"label": _("via Data Import"),
-		}
-		existing_doc.update(doc)
-		existing_doc.save()
-		return existing_doc
+
+		updated_doc = frappe.get_doc(self.doctype, doc.get(id_field.fieldname))
+		updated_doc.update(doc)
+
+		if get_diff(existing_doc, updated_doc):
+			# update doc if there are changes
+			updated_doc.flags.updater_reference = {
+				"doctype": self.data_import.doctype,
+				"docname": self.data_import.name,
+				"label": _("via Data Import"),
+			}
+			updated_doc.save()
+			return updated_doc
+		else:
+			# throw if no changes
+			frappe.throw('No changes to update')
 
 	def get_eta(self, current, total, processing_time):
 		self.last_eta = getattr(self, "last_eta", 0)
@@ -306,8 +315,9 @@ class ImportFile:
 		)
 		self.column_to_field_map = self.template_options.column_to_field_map
 		self.import_type = import_type
+		self.warnings = []
 
-		self.file_doc = self.file_path = None
+		self.file_doc = self.file_path = self.google_sheets_url = None
 		if isinstance(file, frappe.string_types):
 			if frappe.db.exists("File", {"file_url": file}):
 				self.file_doc = frappe.get_doc("File", {"file_url": file})
@@ -462,38 +472,46 @@ class ImportFile:
 					parent_doc[table_df.fieldname].append(child_doc)
 
 		doc = parent_doc
-		# check if there is atleast one row for mandatory table fields
-		meta = frappe.get_meta(self.doctype)
-		mandatory_table_fields = [
-			df
-			for df in meta.fields
-			if df.fieldtype in table_fieldtypes
-			and df.reqd
-			and len(doc.get(df.fieldname, [])) == 0
-		]
-		if len(mandatory_table_fields) == 1:
-			self.warnings.append(
-				{
-					"row": first_row.row_number,
-					"message": _("There should be atleast one row for {0} table").format(
-						mandatory_table_fields[0].label
-					),
-				}
-			)
-		elif mandatory_table_fields:
-			fields_string = ", ".join([df.label for df in mandatory_table_fields])
-			message = _("There should be atleast one row for the following tables: {0}").format(
-				fields_string
-			)
-			self.warnings.append({"row": first_row.row_number, "message": message})
+
+		if self.import_type == INSERT:
+			# check if there is atleast one row for mandatory table fields
+			meta = frappe.get_meta(self.doctype)
+			mandatory_table_fields = [
+				df
+				for df in meta.fields
+				if df.fieldtype in table_fieldtypes
+				and df.reqd
+				and len(doc.get(df.fieldname, [])) == 0
+			]
+			if len(mandatory_table_fields) == 1:
+				self.warnings.append(
+					{
+						"row": first_row.row_number,
+						"message": _("There should be atleast one row for {0} table").format(
+							frappe.bold(mandatory_table_fields[0].label)
+						),
+					}
+				)
+			elif mandatory_table_fields:
+				fields_string = ", ".join([df.label for df in mandatory_table_fields])
+				message = _("There should be atleast one row for the following tables: {0}").format(
+					fields_string
+				)
+				self.warnings.append({"row": first_row.row_number, "message": message})
 
 		return doc, rows, data[len(rows) :]
 
 	def get_warnings(self):
 		warnings = []
+
+		# ImportFile warnings
+		warnings += self.warnings
+
+		# Column warnings
 		for col in self.header.columns:
 			warnings += col.warnings
 
+		# Row warnings
 		for row in self.data:
 			warnings += row.warnings
 

From 0dc4093e69e1d09bd9f6de43375dcf4b5cc39480 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:10:21 +0530
Subject: [PATCH 084/319] fix: Column

- Check if values exists in Link Column
---
 frappe/core/doctype/data_import/importer.py | 26 +++++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 11228b834b..6e530f93db 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -843,7 +843,7 @@ class Column:
 
 		self.meta = frappe.get_meta(doctype)
 		self.parse()
-		self.parse_date_format()
+		self.validate_values()
 
 	def parse(self):
 		header_title = self.header_title
@@ -916,10 +916,6 @@ class Column:
 		self.df = df
 		self.skip_import = skip_import
 
-	def parse_date_format(self):
-		if self.df and self.df.fieldtype in ("Date", "Time", "Datetime"):
-			self.date_format = self.guess_date_format_for_column()
-
 	def guess_date_format_for_column(self):
 		""" Guesses date format for a column by parsing all the values in the column,
 		getting the date format and then returning the one which has the maximum frequency
@@ -954,6 +950,26 @@ class Column:
 
 		return max_occurred_date_format
 
+	def validate_values(self):
+		if not self.df:
+			return
+
+		if self.df.fieldtype == 'Link':
+			# find all values that dont exist
+			values = list(set([v for v in self.column_values[1:] if v]))
+			exists = [d.name for d in frappe.db.get_all(self.df.options, filters={'name': ('in', values)})]
+			not_exists = list(set(values) - set(exists))
+			if not_exists:
+				missing_values = ', '.join(not_exists)
+				self.warnings.append({
+					'col': self.column_number,
+					'message': "The following values do not exist for {}: {}".format(self.df.options, missing_values),
+					'type': 'warning'
+				})
+		elif self.df.fieldtype in ("Date", "Time", "Datetime"):
+			# guess date format
+			self.date_format = self.guess_date_format_for_column()
+
 	def as_dict(self):
 		d = frappe._dict()
 		d.index = self.index

From 6773553ddd951b1cebf52327352edb1ef7c89900 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Jun 2020 15:18:22 +0530
Subject: [PATCH 085/319] fix: Handle empty column_to_field_map

---
 frappe/core/doctype/data_import/importer.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 6e530f93db..ec3cccc1b1 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -773,11 +773,12 @@ class Row:
 
 
 class Header(Row):
-	def __init__(self, index, row, doctype, raw_data, column_to_field_map):
+	def __init__(self, index, row, doctype, raw_data, column_to_field_map=None):
 		self.index = index
 		self.row_number = index + 1
 		self.data = row
 		self.doctype = doctype
+		column_to_field_map = column_to_field_map or frappe._dict()
 
 		self.seen = []
 		self.columns = []

From 2553c0d1c5928fcf96d9fa5875de76d150033083 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 10:21:23 +0530
Subject: [PATCH 086/319] fix: Missing semicolon

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

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 238e916c34..f6af338235 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -254,7 +254,7 @@ frappe.data_import.DataExporter = class DataExporter {
 
 	get_filters() {
 		return this.filter_group.get_filters().map(filter => {
-			return filter.slice(0, 4)
+			return filter.slice(0, 4);
 		});
 	}
 
@@ -275,7 +275,7 @@ frappe.data_import.DataExporter = class DataExporter {
 			: this.column_map[doctype];
 
 		let is_field_mandatory = df => (df.fieldname === 'name' && !child_fieldname)
-			|| (df.reqd && this.exporting_for == 'Insert New Records')
+			|| (df.reqd && this.exporting_for == 'Insert New Records');
 
 		return fields
 			.filter(df => {

From 2ea93c2f182c15e37e1a3d6995a4bbe504823bd0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 12:14:48 +0530
Subject: [PATCH 087/319] fix: Extract gid from google sheets url

---
 frappe/utils/csvutils.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py
index 1d326bd1c5..f73f80582a 100644
--- a/frappe/utils/csvutils.py
+++ b/frappe/utils/csvutils.py
@@ -175,12 +175,18 @@ def getlink(doctype, name):
 	return '<a href="#Form/%(doctype)s/%(name)s">%(name)s</a>' % locals()
 
 def get_csv_content_from_google_sheets(url):
+	# https://docs.google.com/spreadsheets/d/{sheetid}}/edit#gid={gid}
 	validate_google_sheets_url(url)
-
+	# get gid, defaults to first sheet
+	if "gid=" in url:
+		gid = url.rsplit('gid=', 1)[1]
+	else:
+		gid = 0
 	# remove /edit path
 	url = url.rsplit('/edit', 1)[0]
-	# add /export path, defaults to first sheet
-	url = url + '/export?format=csv&gid=0'
+	# add /export path,
+	url = url + '/export?format=csv&gid={0}'.format(gid)
+
 	headers = {
 		'Accept': 'text/csv'
 	}

From 120dbfc8bedd5e5b20f038e83771bd64a68a1f3f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 30 Jun 2020 13:13:56 +0530
Subject: [PATCH 088/319] fix(patch): Use rename_doc

---
 frappe/patches/v13_0/replace_old_data_import.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/patches/v13_0/replace_old_data_import.py b/frappe/patches/v13_0/replace_old_data_import.py
index 469703e172..f3eed6253c 100644
--- a/frappe/patches/v13_0/replace_old_data_import.py
+++ b/frappe/patches/v13_0/replace_old_data_import.py
@@ -13,6 +13,4 @@ def execute():
 	frappe.rename_doc('DocType', 'Data Import', 'Data Import Legacy')
 	frappe.db.commit()
 	frappe.db.sql("DROP TABLE IF EXISTS `tabData Import`")
-	frappe.reload_doc("core", "doctype", "data_import")
-	frappe.get_doc("DocType", "Data Import").on_update()
-	frappe.delete_doc_if_exists("DocType", "Data Import Beta")
+	frappe.rename_doc('DocType', 'Data Import Beta', 'Data Import')

From 883af109f81e9df55c65306592fe31e653e007b3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 30 Jun 2020 17:58:02 +0530
Subject: [PATCH 089/319] chore: Add release notes for v13_0_0_beta_3 (#10879)

---
 frappe/change_log/v13/v13_0_0-beta_3.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_3.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_3.md b/frappe/change_log/v13/v13_0_0-beta_3.md
new file mode 100644
index 0000000000..5d1f7433bf
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_3.md
@@ -0,0 +1,10 @@
+# Version 13.0.0 Beta 3 Release Notes
+
+## Fixes
+
+- Fixed circular linking while getting submitted linked doc ([#10425](https://github.com/frappe/frappe/pull/10425))
+- Fixed currency formatting in report print view ([#10584](https://github.com/frappe/frappe/pull/10584))
+- Now assignment filter in sidebar will also list closed assignments ([#10532](https://github.com/frappe/frappe/pull/10532)) ([#10714](https://github.com/frappe/frappe/pull/10714))
+- Fixed Data Import issues ([#10876](https://github.com/frappe/frappe/pull/10876))
+- Make delivery status in timeline item translatable ([#10616](https://github.com/frappe/frappe/pull/10616))
+- Website desk pages ([#10519](https://github.com/frappe/frappe/pull/10519))
\ No newline at end of file

From 48dd440d70f4ef61ead92cb7a64050e8d95090b6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Jun 2020 17:58:40 +0530
Subject: [PATCH 090/319] fix: Initialize email_sent_to_any_recipient outsite
 try block (bp #10866) (#10877)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/email/queue.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index ce512de276..8bffc108b9 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -347,7 +347,7 @@ def flush(from_test=False):
 			if not smtpserver:
 				smtpserver = SMTPServer()
 				smtpserver_dict[email.sender] = smtpserver
-				
+
 			if from_test:
 				send_one(email.name, smtpserver, auto_commit)
 			else:
@@ -390,12 +390,12 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False):
 		where
 			name=%s
 		for update''', email, as_dict=True)
-	
+
 	if len(email):
 		email = email[0]
 	else:
 		return
-	
+
 	recipients_list = frappe.db.sql('''select name, recipient, status from
 		`tabEmail Queue Recipient` where parent=%s''', email.name, as_dict=1)
 
@@ -417,6 +417,8 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False):
 	if email.communication:
 		frappe.get_doc('Communication', email.communication).set_delivery_status(commit=auto_commit)
 
+	email_sent_to_any_recipient = None
+
 	try:
 		message = None
 

From 98b4e47edd7d90b696b569717b93ece5c6292b7d Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 30 Jun 2020 17:55:25 +0530
Subject: [PATCH 091/319] chore: only validate s3 settings if enabled

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit adadb26732c106bd37a4e0915babf09e46ef27cd)
---
 .../doctype/s3_backup_settings/s3_backup_settings.py           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
index 6cfd3646b2..c8b007ba7b 100755
--- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
+++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py
@@ -19,6 +19,9 @@ from botocore.exceptions import ClientError
 class S3BackupSettings(Document):
 
 	def validate(self):
+		if not self.enabled:
+			return
+
 		if not self.endpoint_url:
 			self.endpoint_url = 'https://s3.amazonaws.com'
 		conn = boto3.client(

From 01eec844bc1d09c9fde275999be6be20a2d1c5ff Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 30 Jun 2020 19:04:52 +0550
Subject: [PATCH 092/319] bumped to version 13.0.0-beta.3

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 3bbc4a1a57..a51689ac44 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.2'
+__version__ = '13.0.0-beta.3'
 __title__ = "Frappe Framework"
 
 local = Local()

From b6aa3724c0852e126fe177ca9dea19594e3bf54a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 20:45:27 +0530
Subject: [PATCH 093/319] fix: get value from filter lsit if base list doesn't
 exist

(cherry picked from commit 1d9903bfdd51a42dae0034c1a0ceecde4b7fe5f2)
---
 frappe/public/js/frappe/ui/filters/filter.js      | 4 +++-
 frappe/public/js/frappe/ui/filters/filter_list.js | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 5e41ed645e..d4fb6db436 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,9 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list.get_filter_value(field_name);
+				const filter_value = this.base_list
+					? this.base_list.get_filter_value(field_name)
+					: this.filter_list.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ed9ddefe64..7ae48bc7d9 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,13 +104,18 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list
+			base_list: this.base_list,
+			filter_list: this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);
 		return filter;
 	}
 
+	get_filter_value(fieldname) {
+		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+	}
+
 	filter_exists(filter_value) {
 		// filter_value of form: [doctype, fieldname, condition, value]
 		let exists = false;

From 880235d20003b5434b058c188ce9c064f819b03f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:53:03 +0530
Subject: [PATCH 094/319] fix: reduce code complexity

(cherry picked from commit 95aa4a72dcd81b98a9f318b35979964bdedbc032)
---
 frappe/public/js/frappe/ui/filters/filter.js      | 8 +++++---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index d4fb6db436..7c6d532f5c 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,9 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list
-					? this.base_list.get_filter_value(field_name)
-					: this.filter_list.get_filter_value(field_name);
+				const filter_value = this.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -267,6 +265,10 @@ frappe.ui.Filter = class {
 		}
 	}
 
+	get_filter_value(fieldname) {
+		return this.filter_list.get_filter_value(fieldname);
+	}
+
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 7ae48bc7d9..9a35a9bb5f 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,8 +104,7 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list,
-			filter_list: this,
+			filter_list: this.base_list || this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);

From 6d2bf8d76c4b5e48b33abcc2d522027c06126317 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:55:02 +0530
Subject: [PATCH 095/319] refactor: delete unused file filters.js

(cherry picked from commit 0c475792cd3f1860af674c9f0073855de4753665)
---
 frappe/public/js/frappe/ui/filters/filters.js | 684 ------------------
 1 file changed, 684 deletions(-)
 delete mode 100644 frappe/public/js/frappe/ui/filters/filters.js

diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
deleted file mode 100644
index a775413d39..0000000000
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ /dev/null
@@ -1,684 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.FilterList = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-		this.filters = [];
-		this.wrapper = this.parent;
-		this.stats = [];
-		this.make();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper.find('.show_filters, .filter_area').remove();
-		this.wrapper.append(`
-			<div class="show_filters">
-				<div class="set-filters">
-					<button
-						style="margin-right: 10px;"
-						class="btn btn-default btn-xs new-filter text-muted">
-						${__("Add Filter")}</button>
-				</div>
-			</div>
-			<div class="filter_area"></div>`);
-	},
-	set_events: function() {
-		var me = this;
-		// show filters
-		this.wrapper.find('.new-filter').bind('click', function() {
-			me.add_filter();
-		});
-
-		this.wrapper.find('.clear-filters').bind('click', function() {
-			me.clear_filters();
-			$('.date-range-picker').val('')
-			me.base_list.run();
-			$(this).addClass("hide");
-		});
-	},
-
-	show_filters: function() {
-		this.wrapper.find('.show_filters').toggle();
-		if(!this.filters.length) {
-			this.add_filter(this.doctype, 'name');
-			this.filters[0].wrapper.find(".filter_field input").focus();
-		}
-	},
-
-	clear_filters: function() {
-		$.each(this.filters, function(i, f) { f.remove(true); });
-		if(this.base_list.page.fields_dict) {
-			$.each(this.base_list.page.fields_dict, (key, value) => {
-				value.set_input('');
-			});
-		}
-		this.filters = [];
-	},
-
-	add_filter: function(doctype, fieldname, condition, value, hidden) {
-		// adds a new filter, returns true if filter has been added
-
-		// allow equal to be used as like
-		let base_filter = this.base_list.page.fields_dict[fieldname];
-		if (base_filter
-			&& (base_filter.df.condition==condition
-				|| (condition==='=' && base_filter.df.condition==='like'))) {
-			// if filter exists in base_list, then exit
-			this.base_list.page.fields_dict[fieldname].set_input(value);
-
-			return true;
-		}
-
-		if(doctype && fieldname
-			&& !frappe.meta.has_field(doctype, fieldname)
-			&& !in_list(frappe.model.std_fields_list, fieldname)) {
-			frappe.msgprint({
-				message: __('Filter {0} missing', [fieldname.bold()]),
-				title: 'Invalid Filter',
-				indicator: 'red'
-			});
-			return false;
-		}
-
-		this.wrapper.find('.show_filters').toggle(true);
-		var is_new_filter = arguments.length===0;
-
-		if (is_new_filter && this.wrapper.find(".is-new-filter:visible").length) {
-			// only allow 1 new filter at a time!
-			return false;
-		}
-
-		var filter = this.push_new_filter(doctype, fieldname, condition, value);
-		if (!filter) return;
-
-		if(this.wrapper.find('.clear-filters').hasClass("hide")) {
-			this.wrapper.find('.clear-filters').removeClass("hide");
-		}
-
-		if (filter && is_new_filter) {
-			filter.wrapper.addClass("is-new-filter");
-		} else {
-			filter.freeze();
-		}
-
-		if (hidden) {
-			filter.$btn_group.addClass("hide");
-		}
-
-		return true;
-	},
-	push_new_filter: function(doctype, fieldname, condition, value) {
-		if(this.filter_exists(doctype, fieldname, condition, value)) {
-			return;
-		}
-
-		// if standard filter exists, then clear it.
-		if(this.base_list.page.fields_dict[fieldname]) {
-			this.base_list.page.fields_dict[fieldname].set_input('');
-		}
-
-		var filter = new frappe.ui.Filter({
-			flist: this,
-			_doctype: doctype,
-			fieldname: fieldname,
-			condition: condition,
-			value: value
-		});
-
-		this.filters.push(filter);
-
-		return filter;
-	},
-
-	remove: function(filter) {
-		// remove `filter` from flist
-		for (var i in this.filters) {
-			if (this.filters[i] === filter) {
-				break;
-			}
-		}
-		if (i!==undefined) {
-			// remove index
-			this.filters.splice(i, 1);
-		}
-	},
-
-	filter_exists: function(doctype, fieldname, condition, value) {
-		var flag = false;
-		for(var i in this.filters) {
-			if(this.filters[i].field) {
-				var f = this.filters[i].get_value();
-
-				if(f[0]==doctype && f[1]==fieldname && f[2]==condition && f[3]==value) {
-					flag = true;
-				} else if($.isArray(value) && frappe.utils.arrays_equal(value, f[3])) {
-					flag = true;
-				}
-			}
-		}
-		return flag;
-	},
-
-	get_filters: function() {
-		// get filter values as dict
-		var values = [];
-		$.each(this.filters, function(i, filter) {
-			if(filter.field) {
-				filter.freeze();
-				values.push(filter.get_value());
-			}
-		});
-		this.base_list.update_standard_filters(values);
-
-		return values;
-	},
-
-	// remove hidden filters
-	update_filters: function() {
-		var fl = [];
-		$.each(this.filters, function(i, f) {
-			if(f.field) fl.push(f);
-		})
-		this.filters = fl;
-		if(this.filters.length === 0) {
-			this.wrapper.find('.clear-filters').addClass("hide");
-		}
-	},
-
-	get_filter: function(fieldname) {
-		for(var i in this.filters) {
-			if(this.filters[i].field && this.filters[i].field.df.fieldname==fieldname)
-				return this.filters[i];
-		}
-	},
-
-	get_formatted_value: function(field, val){
-		var value = val;
-
-		if(field.df.fieldname==="docstatus") {
-			value = {0:"Draft", 1:"Submitted", 2:"Cancelled"}[value] || value;
-		} else if(field.df.original_type==="Check") {
-			value = {0:"No", 1:"Yes"}[cint(value)];
-		} else if (field.df.original_type === "Duration") {
-			let duration_options = {
-				hide_days: field.df.hide_days,
-				hide_seconds: field.df.hide_seconds
-			};
-			value = frappe.utils.get_formatted_duration(value, duration_options);
-		}
-
-		value = frappe.format(value, field.df, {only_value: 1});
-		return value;
-	}
-});
-
-frappe.ui.Filter = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-
-		this.doctype = this.flist.doctype;
-		this.make();
-		this.make_select();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper = $(frappe.render_template("edit_filter", {}))
-			.appendTo(this.flist.wrapper.find('.filter_area'));
-	},
-	make_select: function() {
-		var me = this;
-		this.fieldselect = new frappe.ui.FieldSelect({
-			parent: this.wrapper.find('.fieldname_select_area'),
-			doctype: this.doctype,
-			filter_fields: this.filter_fields,
-			select: function(doctype, fieldname) {
-				me.set_field(doctype, fieldname);
-			}
-		});
-		if(this.fieldname) {
-			this.fieldselect.set_value(this._doctype || this.doctype, this.fieldname);
-		}
-	},
-	set_events: function() {
-		var me = this;
-
-		this.wrapper.find("a.remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.wrapper.find(".set-filter-and-run").on("click", function() {
-			me.wrapper.removeClass("is-new-filter");
-			me.flist.base_list.run();
-			me.apply();
-		});
-
-		// add help for "in" codition
-		me.wrapper.find('.condition').change(function() {
-			if(!me.field) return;
-			var condition = $(this).val();
-			if(in_list(["in", "like", "not in", "not like"], condition)) {
-				me.set_field(me.field.df.parent, me.field.df.fieldname, 'Data', condition);
-				if(!me.field.desc_area) {
-					me.field.desc_area = $('<div class="text-muted small">').appendTo(me.field.wrapper);
-				}
-				// set description
-				me.field.desc_area.html((in_list(["in", "not in"], condition)==="in"
-					? __("values separated by commas")
-					: __("use % as wildcard"))+'</div>');
-			} else {
-				//if condition selected after refresh
-				me.set_field(me.field.df.parent, me.field.df.fieldname, null, condition);
-			}
-		});
-
-		// set the field
-		if(me.fieldname) {
-			// pre-sets given (could be via tags!)
-			return this.set_values(me._doctype, me.fieldname, me.condition, me.value);
-		} else {
-			me.set_field(me.doctype, 'name');
-		}
-	},
-
-	apply: function() {
-		var f = this.get_value();
-
-		this.flist.remove(this);
-		this.flist.push_new_filter(f[0], f[1], f[2], f[3]);
-		this.remove();
-	},
-
-	remove: function(dont_run) {
-		this.wrapper.remove();
-		this.$btn_group && this.$btn_group.remove();
-		this.field = null;
-		this.flist.update_filters();
-
-		if(!dont_run) {
-			this.flist.base_list.refresh(true);
-		}
-	},
-
-	set_values: function(doctype, fieldname, condition, value) {
-		// presents given (could be via tags!)
-		this.set_field(doctype, fieldname);
-
-		// change 0,1 to Yes, No for check field type
-		if(this.field.df.original_type==='Check') {
-			if(value==0) value = 'No';
-			else if(value==1) value = 'Yes';
-		}
-
-		if(condition) {
-			this.wrapper.find('.condition').val(condition).change();
-		}
-		if(value!=null) {
-			return this.field.set_value(value);
-		}
-	},
-
-	set_field: function(doctype, fieldname, fieldtype, condition) {
-		var me = this;
-
-		// set in fieldname (again)
-		var cur = me.field ? {
-			fieldname: me.field.df.fieldname,
-			fieldtype: me.field.df.fieldtype,
-			parent: me.field.df.parent,
-		} : {};
-
-		var original_docfield = me.fieldselect.fields_by_name[doctype][fieldname];
-		if(!original_docfield) {
-			frappe.msgprint(__("Field {0} is not selectable.", [fieldname]));
-			return;
-		}
-
-		var df = copy_dict(me.fieldselect.fields_by_name[doctype][fieldname]);
-
-		// filter field shouldn't be read only or hidden
-		df.read_only = 0;
-		df.hidden = 0;
-
-		if(!condition) this.set_default_condition(df, fieldtype);
-		this.set_fieldtype(df, fieldtype);
-
-		// called when condition is changed,
-		// don't change if all is well
-		if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype &&
-			df.parent == cur.parent) {
-			return;
-		}
-
-		// clear field area and make field
-		me.fieldselect.selected_doctype = doctype;
-		me.fieldselect.selected_fieldname = fieldname;
-
-		// save old text
-		var old_text = null;
-		if(me.field) {
-			old_text = me.field.get_value();
-		}
-
-		var field_area = me.wrapper.find('.filter_field').empty().get(0);
-		var f = frappe.ui.form.make_control({
-			df: df,
-			parent: field_area,
-			only_input: true,
-		})
-		f.refresh();
-
-		me.field = f;
-		if(old_text && me.field.df.fieldtype===cur.fieldtype) {
-			me.field.set_value(old_text);
-		}
-
-		// run on enter
-		$(me.field.wrapper).find(':input').keydown(function(ev) {
-			if(ev.which==13) {
-				me.flist.base_list.run();
-			}
-		})
-	},
-
-	set_fieldtype: function(df, fieldtype) {
-		// reset
-		if(df.original_type)
-			df.fieldtype = df.original_type;
-		else
-			df.original_type = df.fieldtype;
-
-		df.description = ''; df.reqd = 0;
-		df.ignore_link_validation = true;
-
-		// given
-		if(fieldtype) {
-			df.fieldtype = fieldtype;
-			return;
-		}
-
-		// scrub
-		if(df.fieldname=="docstatus") {
-			df.fieldtype="Select",
-			df.options=[
-				{value:0, label:__("Draft")},
-				{value:1, label:__("Submitted")},
-				{value:2, label:__("Cancelled")}
-			]
-		} else if(df.fieldtype=='Check') {
-			df.fieldtype='Select';
-			df.options='No\nYes';
-		} else if(['Text','Small Text','Text Editor','Code','Tag','Comments',
-			'Dynamic Link','Read Only','Assign'].indexOf(df.fieldtype)!=-1) {
-			df.fieldtype = 'Data';
-		} else if(df.fieldtype=='Link' && ['=', '!='].indexOf(this.wrapper.find('.condition').val())==-1) {
-			df.fieldtype = 'Data';
-		}
-		if(df.fieldtype==="Data" && (df.options || "").toLowerCase()==="email") {
-			df.options = null;
-		}
-		if(this.wrapper.find('.condition').val()== "Between" && (df.fieldtype == 'Date' || df.fieldtype == 'Datetime')){
-			df.fieldtype = 'DateRange';
-		}
-	},
-
-	set_default_condition: function(df, fieldtype) {
-		if(!fieldtype) {
-			// set as "like" for data fields
-			if (df.fieldtype == 'Data') {
-				this.wrapper.find('.condition').val('like');
-			} else if (df.fieldtype == 'Date' || df.fieldtype == 'Datetime'){
-				this.wrapper.find('.condition').val('Between');
-			}else{
-				this.wrapper.find('.condition').val('=');
-			}
-		}
-	},
-
-	get_value: function() {
-		return [this.fieldselect.selected_doctype,
-			this.field.df.fieldname, this.get_condition(), this.get_selected_value()];
-	},
-
-	get_selected_value: function() {
-		var val = this.field.get_value();
-
-		if(typeof val==='string') {
-			val = strip(val);
-		}
-
-		if(this.field.df.original_type == 'Check') {
-			val = (val=='Yes' ? 1 :0);
-		}
-
-		if(this.get_condition().indexOf('like', 'not like')!==-1) {
-			// automatically append wildcards
-			if(val) {
-				if(val.slice(0,1) !== "%") {
-					val = "%" + val;
-				}
-				if(val.slice(-1) !== "%") {
-					val = val + "%";
-				}
-			}
-		} else if(in_list(["in", "not in"], this.get_condition())) {
-			if(val) {
-				val = $.map(val.split(","), function(v) { return strip(v); });
-			}
-		} if(val === '%') {
-			val = "";
-		}
-
-		return val;
-	},
-
-	get_condition: function() {
-		return this.wrapper.find('.condition').val();
-	},
-
-	freeze: function() {
-		if(this.$btn_group) {
-			// already made, just hide the condition setter
-			this.set_filter_button_text();
-			this.wrapper.toggle(false);
-			return;
-		}
-
-		var me = this;
-
-		// add a button for new filter if missing
-		this.$btn_group = $(`<div class="btn-group">
-			<button class="btn btn-default btn-xs toggle-filter"
-				title="${ __("Edit Filter") }">
-			</button>
-			<button class="btn btn-default btn-xs remove-filter"
-				title="${ __("Remove Filter") }">
-				<i class="fa fa-remove text-muted"></i>
-			</button></div>`)
-			.insertAfter(this.flist.wrapper.find(".set-filters .new-filter"));
-
-		this.set_filter_button_text();
-
-		this.$btn_group.find(".remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.$btn_group.find(".toggle-filter").on("click", function() {
-			$(this).closest('.show_filters').find('.filter_area').show();
-			me.wrapper.toggle();
-		})
-		this.wrapper.toggle(false);
-	},
-
-	set_filter_button_text: function() {
-		var value = this.get_selected_value();
-		value = this.flist.get_formatted_value(this.field, value);
-
-		// for translations
-		// __("like"), __("not like"), __("in")
-
-		this.$btn_group.find(".toggle-filter")
-			.html(repl('%(label)s %(condition)s "%(value)s"', {
-				label: __(this.field.df.label),
-				condition: __(this.get_condition()),
-				value: __(value),
-			}));
-	}
-
-});
-
-// <select> widget with all fields of a doctype as options
-frappe.ui.FieldSelect = Class.extend({
-	// opts parent, doctype, filter_fields, with_blank, select
-	init: function(opts) {
-		var me = this;
-		$.extend(this, opts);
-		this.fields_by_name = {};
-		this.options = [];
-		this.$select = $('<input class="form-control">')
-			.appendTo(this.parent)
-			.on("click", function () { $(this).select(); });
-		this.select_input = this.$select.get(0);
-		this.awesomplete = new Awesomplete(this.select_input, {
-			minChars: 0,
-			maxItems: 99,
-			autoFirst: true,
-			list: me.options,
-			item: function(item, input) {
-				return $(repl('<li class="filter-field-select"><p>%(label)s</p></li>', item))
-				.data("item.autocomplete", item)
-				.get(0);
-			}
-		});
-		this.$select.on("awesomplete-select", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.selected_doctype = item.doctype;
-			me.selected_fieldname = item.fieldname;
-			if(me.select) me.select(item.doctype, item.fieldname);
-		});
-		this.$select.on("awesomplete-selectcomplete", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.$select.val(item.label);
-		});
-
-		if(this.filter_fields) {
-			for(var i in this.filter_fields)
-				this.add_field_option(this.filter_fields[i])
-		} else {
-			this.build_options();
-		}
-		this.set_value(this.doctype, "name");
-		window.last_filter = this;
-	},
-	get_value: function() {
-		return this.selected_doctype ? this.selected_doctype + "." + this.selected_fieldname : null;
-	},
-	val: function(value) {
-		if(value===undefined) {
-			return this.get_value();
-		} else {
-			this.set_value(value);
-		}
-	},
-	clear: function() {
-		this.selected_doctype = null;
-		this.selected_fieldname = null;
-		this.$select.val("");
-	},
-	set_value: function(doctype, fieldname) {
-		var me = this;
-		this.clear();
-		if(!doctype) return;
-
-		// old style
-		if(doctype.indexOf(".")!==-1) {
-			var parts = doctype.split(".");
-			doctype = parts[0];
-			fieldname = parts[1];
-		}
-
-		$.each(this.options, function(i, v) {
-			if(v.doctype===doctype && v.fieldname===fieldname) {
-				me.selected_doctype = doctype;
-				me.selected_fieldname = fieldname;
-				me.$select.val(v.label);
-				return false;
-			}
-		});
-	},
-	build_options: function() {
-		var me = this;
-		me.table_fields = [];
-		var std_filters = $.map(frappe.model.std_fields, function(d) {
-			var opts = {parent: me.doctype}
-			if(d.fieldname=="name") opts.options = me.doctype;
-			return $.extend(copy_dict(d), opts);
-		});
-
-		// add parenttype column
-		var doctype_obj = locals['DocType'][me.doctype];
-		if(doctype_obj && cint(doctype_obj.istable)) {
-			std_filters = std_filters.concat([{
-				fieldname: 'parent',
-				fieldtype: 'Data',
-				label: 'Parent',
-				parent: me.doctype,
-			}]);
-		}
-
-		// blank
-		if(this.with_blank) {
-			this.options.push({
-				label:"",
-				value:"",
-			})
-		}
-
-		// main table
-		var main_table_fields = std_filters.concat(frappe.meta.docfield_list[me.doctype]);
-		$.each(frappe.utils.sort(main_table_fields, "label", "string"), function(i, df) {
-			// show fields where user has read access and if report hide flag is not set
-			if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-				me.add_field_option(df);
-		});
-
-		// child tables
-		$.each(me.table_fields, function(i, table_df) {
-			if(table_df.options) {
-				var child_table_fields = [].concat(frappe.meta.docfield_list[table_df.options]);
-				$.each(frappe.utils.sort(child_table_fields, "label", "string"), function(i, df) {
-					// show fields where user has read access and if report hide flag is not set
-					if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-						me.add_field_option(df);
-				});
-			}
-		});
-	},
-
-	add_field_option: function(df) {
-		var me = this;
-		if(me.doctype && df.parent==me.doctype) {
-			var label = __(df.label);
-			var table = me.doctype;
-			if(frappe.model.table_fields.includes(df.fieldtype)) me.table_fields.push(df);
-		} else {
-			var label = __(df.label) + ' (' + __(df.parent) + ')';
-			var table = df.parent;
-		}
-		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
-			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
-			this.options.push({
-				label: label,
-				value: table + "." + df.fieldname,
-				fieldname: df.fieldname,
-				doctype: df.parent
-			});
-			if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {};
-			me.fields_by_name[df.parent][df.fieldname] = df;
-		}
-	},
-})

From ecb42232f44f4d0e8ece04d9976d66f9c10207d4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 16:51:17 +0530
Subject: [PATCH 096/319] fix: use get_filter_value in filter_list

(cherry picked from commit c64df2787f8328e6d7e46c4cb722ec27820eb722)
---
 frappe/public/js/frappe/ui/filters/filter.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 7c6d532f5c..bfc0b1449d 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.get_filter_value(field_name);
+				const filter_value = this.filter_list.get_filter_value(fieldname);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -265,10 +265,6 @@ frappe.ui.Filter = class {
 		}
 	}
 
-	get_filter_value(fieldname) {
-		return this.filter_list.get_filter_value(fieldname);
-	}
-
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);

From 74068afa68d454d25d53b005750b83107b50dd8f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 23 Jul 2020 17:34:18 +0530
Subject: [PATCH 097/319] fix: Use find instead of filter

(cherry picked from commit 24adc8c3625f146ecae895ac57bdd8ff081d92b8)
---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 9a35a9bb5f..ee04fb6077 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,8 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		return filter_obj.value;
 	}
 
 	filter_exists(filter_value) {

From 8ca1f085769c98eb45598cd17243716d037c6cb3 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:55:23 +0530
Subject: [PATCH 098/319] fix: use correct variable

(cherry picked from commit 160a84cee4177cf4fa828fd098ebdae89d307040)
---
 frappe/public/js/frappe/ui/filters/filter_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ee04fb6077..6c577aa0bc 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,7 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		let filter_obj = this.filters.find(f => f.fieldname == fieldname) || {};
 		return filter_obj.value;
 	}
 

From c8c60a32f4567807ae37432089c913b629515415 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:40:28 +0530
Subject: [PATCH 099/319] fix: filter out standard dashboards if not in
 developer mode

(cherry picked from commit 1e56fcc85765681c79631116dd48bd13c1ff3368)
---
 .../dashboard_chart/dashboard_chart.js        | 36 +++-----------
 .../dashboard_chart/dashboard_chart.py        |  8 ++-
 .../desk/doctype/number_card/number_card.js   | 36 +++-----------
 .../desk/doctype/number_card/number_card.py   |  6 +++
 .../public/js/frappe/utils/dashboard_utils.js | 49 +++++++++++++++++++
 5 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ee6eb3289d..65db4839a1 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -28,38 +28,16 @@ frappe.ui.form.on('Dashboard Chart', {
 		}
 
 		frm.add_custom_button('Add Chart to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.chart_name = frm.doc.chart_name;
-					frappe.xcall(
-						'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard',
-						{args: values}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Dashboard Chart ${values.chart_name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Dashboard Chart',
+				'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard'
+			);
 
 			if (!frm.doc.chart_name) {
 				frappe.msgprint(__('Please create chart first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 
@@ -338,7 +316,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		} else if (frm.chart_filters.length) {
 			fields = frm.chart_filters.filter(f => f.fieldname);
 
-			fields.map( f => {
+			fields.map(f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
 					const filter_row =
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 70aece3ee7..a25e0cab9e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -128,7 +128,13 @@ def add_chart_to_dashboard(args):
 
 	dashboard = frappe.get_doc('Dashboard', args.dashboard)
 	dashboard_link = frappe.new_doc('Dashboard Chart Link')
-	dashboard_link.chart = args.chart_name
+	dashboard_link.chart = args.chart_name or args.name
+
+	if args.set_standard:
+		chart = frappe.get_doc('Dashboard Chart', dashboard_link.chart)
+		chart.is_standard = 1
+		chart.module = dashboard.module
+		chart.save()
 
 	dashboard.append('charts', dashboard_link)
 	dashboard.save()
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 42899a4ebb..2ae163d7aa 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -32,40 +32,16 @@ frappe.ui.form.on('Number Card', {
 
 	create_add_to_dashboard_button: function(frm) {
 		frm.add_custom_button('Add Card to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.name = frm.doc.name;
-					frappe.xcall(
-						'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard',
-						{
-							args: values
-						}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Number Card ${values.name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Number Card',
+				'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard'
+			);
 
 			if (!frm.doc.name) {
 				frappe.msgprint(__('Please create Card first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 	},
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 5b52b60474..3eb08ec00a 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -172,5 +172,11 @@ def add_card_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Number Card Link')
 	dashboard_link.card = args.name
 
+	if args.set_standard:
+		card = frappe.get_doc('Number Card', dashboard_link.card)
+		card.is_standard = 1
+		card.module = dashboard.module
+		card.save()
+
 	dashboard.append('cards', dashboard_link)
 	dashboard.save()
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 8618f6dd59..4074404aa3 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -199,6 +199,55 @@ frappe.dashboard_utils = {
 		}
 
 		return filters;
+	},
+
+	get_dashboard_link_field() {
+		let field = {
+			label: __('Select Dashboard'),
+			fieldtype: 'Link',
+			fieldname: 'dashboard',
+			options: 'Dashboard',
+		}
+
+		if (!frappe.boot.developer_mode) {
+			field.get_query = () => {
+				return {
+					filters: {
+						is_standard: 0
+					}
+				};
+			};
+		}
+
+		return field;
+	},
+
+	get_add_to_dashboard_dialog(docname, doctype, method) {
+		const field = this.get_dashboard_link_field();
+
+		const dialog = new frappe.ui.Dialog({
+			title: __('Add to Dashboard'),
+			fields: [field],
+			primary_action: (values) => {
+				values.name = docname;
+				values.set_standard = frappe.boot.developer_mode;
+				frappe.xcall(
+					method,
+					{args: values}
+				).then(()=> {
+					let dashboard_route_html =
+						`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
+					let message =
+						__(`${doctype} ${values.name} added to Dashboard ` + dashboard_route_html);
+
+					frappe.msgprint(message);
+				});
+
+				dialog.hide();
+			}
+		});
+
+		return dialog;
 	}
 
 };
\ No newline at end of file

From 9b8975a7e0d06371d772a31e598b53552cb6f0ea Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:42:13 +0530
Subject: [PATCH 100/319] fix: filter out standard dashboards while creating
 from reports

(cherry picked from commit cdd7cb2f177492e24423f3ac15bb575bbf94e22a)
---
 .../js/frappe/views/reports/query_report.js   | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 9b094149b8..777be2aaa1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -157,6 +157,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_card_to_dashboard() {
 		let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
+		const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+		const set_standard = frappe.boot.developer_mode;
+
 		const dialog = new frappe.ui.Dialog({
 			title: __('Create Card'),
 			fields: [
@@ -181,12 +184,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					label: __('Add to Dashboard'),
 					fieldtype: 'Section Break'
 				},
-				{
-					fieldname: 'dashboard',
-					label: __('Choose Dashboard'),
-					fieldtype: 'Link',
-					options: 'Dashboard',
-				},
+				dashboard_field,
 				{
 					fieldname: 'cb_2',
 					fieldtype: 'Column Break'
@@ -202,7 +200,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				if (!values.label) {
 					values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
 				}
-				this.create_number_card(values, values.dashboard, values.label);
+				this.create_number_card(values, values.dashboard, values.label, set_standard);
 				dialog.hide();
 			}
 		});
@@ -213,27 +211,26 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_chart_to_dashboard() {
 		if (this.chart_fields || this.chart_options) {
+			const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+			const set_standard = frappe.boot.developer_mode;
+
 			const dialog = new frappe.ui.Dialog({
 				title: __('Create Chart'),
 				fields: [
-					{
-						fieldname: 'dashboard',
-						label: 'Choose Dashboard',
-						fieldtype: 'Link',
-						options: 'Dashboard',
-					},
 					{
 						fieldname: 'dashboard_chart_name',
 						label: 'Chart Name',
 						fieldtype: 'Data',
-					}
+					},
+					dashboard_field,
 				],
 				primary_action_label: __('Add'),
 				primary_action: (values) => {
 					this.create_dashboard_chart(
 						this.chart_fields || this.chart_options,
 						values.dashboard,
-						values.dashboard_chart_name
+						values.dashboard_chart_name,
+						set_standard
 					);
 					dialog.hide();
 				}
@@ -245,12 +242,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}
 	}
 
-	create_number_card(values, dashboard_name, card_name) {
+	create_number_card(values, dashboard_name, card_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'type': 'Report',
 			'report_name': this.report_name,
 			'filters_json': JSON.stringify(this.get_filter_values()),
+			set_standard: set_standard,
 		};
 		Object.assign(args, values);
 
@@ -263,7 +261,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		);
 	}
 
-	create_dashboard_chart(chart_args, dashboard_name, chart_name) {
+	create_dashboard_chart(chart_args, dashboard_name, chart_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'chart_type': 'Report',
@@ -271,7 +269,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type),
 			'color': chart_args.color,
 			'filters_json': JSON.stringify(this.get_filter_values()),
-			'custom_options': {}
+			'custom_options': {},
+			'set_standard': set_standard,
 		};
 
 		for (let key in chart_args) {

From a2bb34881ac1a8050a143119091e881c69695860 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:43:37 +0530
Subject: [PATCH 101/319] fix: disable dashboard form only if doc is standard

(cherry picked from commit 7f1a5adb0e221452019076aa05b3dafae7d153e0)
---
 frappe/desk/doctype/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 237b549433..61300b920b 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -5,7 +5,7 @@ frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
 		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 
-		if (!frappe.boot.developer_mode) {
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.disable_form();
 		}
 

From cc7ecd47d5c063a6cb54f40db44f183664cf0d4c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:44:21 +0530
Subject: [PATCH 102/319] fix: don't show is_standard if not in developer mode

(cherry picked from commit dd6a361058e425ec03d162f8e4f88a3251f5537a)
---
 frappe/desk/doctype/dashboard/dashboard.json             | 3 ++-
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 3 ++-
 frappe/desk/doctype/number_card/number_card.json         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c7128823fe..0c54f1ee7f 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,6 +52,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -66,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-10 17:48:19.468813",
+ "modified": "2020-07-22 11:23:37.858568",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index a25d0cc6c5..f0616dddd0 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,6 +238,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -270,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-21 16:37:07.763482",
+ "modified": "2020-07-22 11:32:51.185499",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 333885a7f9..0d1cc279c8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,6 +113,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -190,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-18 17:08:22.882538",
+ "modified": "2020-07-22 11:26:32.039023",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 395fef2f827f87d0312d0495e9b76df43cc184a9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:51:32 +0530
Subject: [PATCH 103/319] fix: separate patch to rename is_custom field

(cherry picked from commit 1bd610f858a29a0d32681d175b418bc675a2817d)
---
 frappe/patches.txt                                    |  1 +
 .../create_custom_dashboards_cards_and_charts.py      |  5 -----
 .../rename_is_custom_field_in_dashboard_chart.py      | 11 +++++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index f8c767f5a3..b207a325cb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -295,3 +295,4 @@ frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
+frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index f61941bf01..9a075a22cc 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,7 +1,6 @@
 import frappe
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
-from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	if not frappe.db.table_exists('Dashboard Chart')\
@@ -9,14 +8,10 @@ def execute():
 		or not frappe.db.table_exists('Dashboard'):
 		return
 
-
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
 	frappe.reload_doc('desk', 'doctype', 'number_card')
 	frappe.reload_doc('desk', 'doctype', 'dashboard')
 
-	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
-		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
-
 	modified_charts = get_modified_docs('Dashboard Chart')
 	modified_cards = get_modified_docs('Number Card')
 	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]
diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
new file mode 100644
index 0000000000..90860e211b
--- /dev/null
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -0,0 +1,11 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	if not frappe.db.table_exists('Dashboard Chart')
+		return
+
+	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
+
+	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
+		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
\ No newline at end of file

From 2f81f075f13b872c3b52b9c62704b8ef1f61add5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:59:17 +0530
Subject: [PATCH 104/319] style: fix formatting

(cherry picked from commit c25100cb47260f2e898f85cd820b952735cd97e7)
---
 .../patches/v13_0/rename_is_custom_field_in_dashboard_chart.py  | 2 +-
 frappe/public/js/frappe/utils/dashboard_utils.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
index 90860e211b..4da0f8164a 100644
--- a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -2,7 +2,7 @@ import frappe
 from frappe.model.utils.rename_field import rename_field
 
 def execute():
-	if not frappe.db.table_exists('Dashboard Chart')
+	if not frappe.db.table_exists('Dashboard Chart'):
 		return
 
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 4074404aa3..fca26d6ece 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -207,7 +207,7 @@ frappe.dashboard_utils = {
 			fieldtype: 'Link',
 			fieldname: 'dashboard',
 			options: 'Dashboard',
-		}
+		};
 
 		if (!frappe.boot.developer_mode) {
 			field.get_query = () => {

From d510b68459d2ff15ad2eb7d635dc6745024c9b35 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 11:12:13 +0530
Subject: [PATCH 105/319] fix: make is_standard read only if not in developer
 mode

(cherry picked from commit 6187de8e3da34cc4f0f74198f1148170c3d9d83d)
---
 frappe/desk/doctype/dashboard/dashboard.json             | 6 +++---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 6 +++---
 frappe/desk/doctype/number_card/number_card.json         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 0c54f1ee7f..95b0846452 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,10 +52,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -67,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:23:37.858568",
+ "modified": "2020-07-23 11:05:41.890459",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index f0616dddd0..d4bba53068 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,10 +238,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -271,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:32:51.185499",
+ "modified": "2020-07-23 11:10:33.509497",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 0d1cc279c8..d3e9598eb7 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,10 +113,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -191,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:26:32.039023",
+ "modified": "2020-07-23 11:11:03.391719",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 94fdd135bf7e513f1197ee963a42410caf02c4f9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:40:51 +0530
Subject: [PATCH 106/319] fix: set frm.filters to empty array for number card

(cherry picked from commit 5f5facfb0a0c6d7725c309708eadb90af50c7278)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 65db4839a1..8d89cc2f31 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -291,7 +291,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 2ae163d7aa..63b41b956e 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -116,6 +116,7 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	report_name: function(frm) {
+		frm.filters = [];
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
 		frm.set_df_property('report_field', 'options', []);
@@ -247,7 +248,7 @@ frappe.ui.form.on('Number Card', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{

From 2e9002b117068f87fb75efd6269646dcfac7c91c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:41:55 +0530
Subject: [PATCH 107/319] feat: remove restricted button in dashboard

(cherry picked from commit 771feca0730a563cd3278fc4de11b10060389b27)
---
 frappe/core/page/dashboard/dashboard.js                   | 7 -------
 frappe/public/js/frappe/views/dashboard/dashboard_view.js | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index cee230265f..7e45163a7e 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -26,13 +26,6 @@ class Dashboard {
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
 		this.page = wrapper.page;
-
-		this.page.set_title_sub(
-			$(`<button class="restricted-button">
-				<span class="octicon octicon-lock"></span>
-				<span>${__('Restricted')}</span>
-			</button>`)
-		);
 	}
 
 	show() {
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 83f45da5be..6f6279fd08 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -44,10 +44,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 				<div class="text-muted">
 					<span class="uppercase header-title"> ${dashboard_name} </span>
 				</div>
-				<button class="restricted-button">
-					<span class="octicon octicon-lock"></span>
-					<span>${__('Restricted')}</span>
-				</button>
 				<div class="text-muted customize-dashboard" data-action="customize">${__('Customize')}</div>
 				<div class="small text-muted customize-options small-bounce">
 					<span class="reset-customization customize-option" data-action="reset_dashboard_customization">${__('Reset')}</span>

From 5f81baf269a986f743623335c4aceea027dfd3b4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:43:01 +0530
Subject: [PATCH 108/319] fix: remove unused style

(cherry picked from commit b95d28d5f126785e2198eae1b5eba556599dd814)
---
 frappe/core/page/dashboard/dashboard.css | 5 -----
 frappe/public/less/dashboard_view.less   | 7 -------
 2 files changed, 12 deletions(-)
 delete mode 100644 frappe/core/page/dashboard/dashboard.css

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
deleted file mode 100644
index b319cc1ed2..0000000000
--- a/frappe/core/page/dashboard/dashboard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.restricted-button {
-	cursor: default;
-	position: relative;
-	right: -5px;
-}
\ No newline at end of file
diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less
index ab78fa5b2a..17fa52cc0f 100644
--- a/frappe/public/less/dashboard_view.less
+++ b/frappe/public/less/dashboard_view.less
@@ -33,13 +33,6 @@
 				line-height: 1.5em;
 				vertical-align: text-bottom;
 			}
-
-			.restricted-button {
-				cursor: default;
-				position: relative;
-				right: 5px;
-				top: -3px;
-			}
 		}
 
 		.customize-dashboard {

From 4838f39c60cba2a49b77bb2434e4026a2492e66b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 10:25:56 +0530
Subject: [PATCH 109/319] fix: check for empty report filters while creating
 report type dashboard chart (bp #11125) (#11128)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
---
 .../public/js/frappe/widgets/chart_widget.js  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 4aa0b23a63..ccec5b3ef4 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -615,9 +615,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_last_synced() {
-		let last_synced_text = __("Last synced {0}", [
-			comment_when(this.chart_doc.last_synced_on)
-		]);
+		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]);
 		this.footer.html(last_synced_text);
 	}
 
@@ -656,14 +654,15 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_default_date_filters(report_filters, chart_filters) {
-		report_filters.map(f => {
-			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
-				if (f.reqd || chart_filters[f.fieldname]) {
-					chart_filters[f.fieldname] = f.default;
+		if (report_filters) {
+			report_filters.map(f => {
+				if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
+					if (f.reqd || chart_filters[f.fieldname]) {
+						chart_filters[f.fieldname] = f.default;
+					}
 				}
-			}
-		});
-
+			});
+		}
 		return chart_filters;
 	}
 

From e8274067a2777062758234c436aec027307571e7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 10:44:39 +0530
Subject: [PATCH 110/319] fix: route to new doc 1 explicitly (bp #11115)
 (#11121)

(cherry picked from commit 8844c2b690d2e6a1011963b1a63fd24c40445b22)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 9b4c9973e2..8c1d2cbb5b 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`;
+			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`;
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`);
+		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`);
 	}
 
 	show_quick_entry(step) {

From 799c75bdc0eae4214125786a05c01b7b97416965 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 11:43:39 +0530
Subject: [PATCH 111/319] fix(Number Card): undefined value on card (bp #11117)
 (#11129)

(cherry picked from commit 28605191b1f1359b4b71ae9fd9435d47d26e9ad1)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/widgets/number_card_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 220394919c..6b38412ebd 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -164,7 +164,7 @@ export default class NumberCardWidget extends Widget {
 
 	get_number() {
 		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
-			this.settings.get_number(res);
+			return this.settings.get_number(res);
 		});
 	}
 

From ada29cf1b81fd6b3b37c2d6b2e0daf3f68e8d420 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 14:28:45 +0530
Subject: [PATCH 112/319] fix: fetch latest backups

updated behaviour of fetch latest backups. doesnt take new backups
and accepts no args
---
 frappe/utils/backups.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 9f9a64f296..c16f26c9a7 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -206,6 +206,25 @@ def get_backup():
 	recipient_list = odb.send_email()
 	frappe.msgprint(_("Download link for your backup will be emailed on the following email address: {0}").format(', '.join(recipient_list)))
 
+@frappe.whitelist()
+def fetch_latest_backups():
+	"""Fetches paths of the latest backup taken in the last 30 days
+	Only for: System Managers
+
+	Returns:
+		dict: relative Backup Paths
+	"""
+	frappe.only_for("System Manager")
+	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
+	database, public, private, config = odb.get_recent_backup(older_than=24 * 30)
+
+	return {
+		"database": database,
+		"public": public,
+		"private": private,
+		"config": config
+	}
+
 def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False):
 	"""this function is called from scheduler
 		deletes backups older than 7 days

From 0ccc21a4c005a182e9470e7f6d9028825d0ddea3 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2020 12:57:49 +0530
Subject: [PATCH 113/319] fix: push fieldtype in invalid conditions map (bp
 #11119) (#11155)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/ui/filters/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index bfc0b1449d..4dedfb32fe 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -57,7 +57,7 @@ frappe.ui.Filter = class {
 				this.conditions.push([key, __(`{0}`, [filter.label])]);
 				for (let fieldtype of Object.keys(this.invalid_condition_map)) {
 					if (!filter.valid_for_fieldtypes.includes(fieldtype)) {
-						this.invalid_condition_map[fieldtype].push(filter.label);
+						this.invalid_condition_map[fieldtype].push(key);
 					}
 				}
 			}

From d37d15c00e34fa5fc72dbce2b1ba94f621af57d0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:36:48 +0530
Subject: [PATCH 114/319] fix: do not sanitize code field (bp #11133) (#11157)

Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit 8ce340046ee27fccb1232e80d1aa3d3d5f8d4128)

Co-authored-by: Sahil Khan <sahilkhan28297@gmail.com>
---
 frappe/model/base_document.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 7d56736cdc..09d303bec7 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,8 +703,8 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype") in ("Data", "Small Text", "Text") and df.get("options")=="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode", "Code")
 
 				# cancelled and submit but not update after submit should be ignored
 				or self.docstatus==2

From 973b01cd026e35461bc45afa885ec81bc565d78e Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:20 +0530
Subject: [PATCH 115/319] fix: Add site validation for logger

(cherry picked from commit 476e625261ab4954b7429978b24840e52967c9c0)
---
 frappe/__init__.py     | 4 ++--
 frappe/app.py          | 5 +++--
 frappe/utils/logger.py | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 039e75eebb..36e499735c 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False):
+def logger(module=None, with_more_info=False, _site=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 57db867882..83a9b8c149 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,8 +99,9 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		frappe.logger("frappe.web").info({
-			"site": get_site_name(request.host),
+		_site = get_site_name(request.host)
+		frappe.logger("frappe.web", _site=_site).info({
+			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 89e3711b0f..bea83297d2 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,7 +17,7 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False):
+def get_logger(module, with_more_info=False, _site=None):
 	global site
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -38,7 +38,7 @@ def get_logger(module, with_more_info=False):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 #
-	if site:
+	if site == _site:
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From ddb3303919a50aacf5e8def04593223a6889515a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:53 +0530
Subject: [PATCH 116/319] docs(get_logger): add docstring

(cherry picked from commit e92a612ba231eebb8dbe7ac42d24ac002a89fbe1)
---
 frappe/utils/logger.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index bea83297d2..afe4335aea 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -18,7 +18,24 @@ site = getattr(frappe.local, 'site', None)
 
 
 def get_logger(module, with_more_info=False, _site=None):
+	"""Application Logger for your given module
+
+	Args:
+		module (str): Name of your logger and consequently your log file.
+		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
+		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+
+	Returns:
+		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
+	"""
 	global site
+
+	def allow_site():
+		allow = False
+		if site: allow = True
+		if _site: allow = site == _site
+		return allow
+
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -37,8 +54,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
-#
-	if site == _site:
+
+	if allow_site():
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From fd3963b50190612ddf25c93a1b21f04184c4a97c Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 17 Jul 2020 17:35:08 +0530
Subject: [PATCH 117/319] refactor: less word do trick

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
(cherry picked from commit c87d598480e006a88a4374d0ab17d15429701441)
---
 frappe/utils/logger.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index afe4335aea..9254c0aedd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -31,10 +31,7 @@ def get_logger(module, with_more_info=False, _site=None):
 	global site
 
 	def allow_site():
-		allow = False
-		if site: allow = True
-		if _site: allow = site == _site
-		return allow
+		return (_site and _site == site) or bool(site)
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]

From cae05b547aca11bc31afc73c7898a5abc6a9fb75 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:13:18 +0530
Subject: [PATCH 118/319] feat: override site name via _site

added filter parameter for logger

(cherry picked from commit ad1152f8e8367f8d7c46d0e4e9a14ee9e2d0df9b)
---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 36e499735c..9172061b95 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None):
+def logger(module=None, with_more_info=False, _site=None, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 9254c0aedd..56fcf9857a 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,22 +17,20 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None):
+def get_logger(module, with_more_info=False, _site=None, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 	global site
 
-	def allow_site():
-		return (_site and _site == site) or bool(site)
-
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -42,6 +40,7 @@ def get_logger(module, with_more_info=False, _site=None):
 
 	logfile = module + '.log'
 	site = getattr(frappe.local, 'site', None)
+	equivalent_site = _site or site
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -52,8 +51,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if allow_site():
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+	if equivalent_site:
+		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -61,6 +60,9 @@ def get_logger(module, with_more_info=False, _site=None):
 	if with_more_info:
 		handler.addFilter(SiteContextFilter())
 
+	if filter:
+		logger.addFilter(filter)
+
 	handler.setFormatter(formatter)
 
 	frappe.loggers[module] = logger

From 1de50505f957f9112bdbdbe7907e124024a6d581 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:31:12 +0530
Subject: [PATCH 119/319] feat: Allow_site flag in frappe.logger

(cherry picked from commit 1345c2feb311bf7abb06b3f1969c4a2a43dc9b94)
---
 frappe/__init__.py     |  4 ++--
 frappe/app.py          |  2 +-
 frappe/utils/logger.py | 22 +++++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9172061b95..66062215f9 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 83a9b8c149..100b10e9ef 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -100,7 +100,7 @@ def application(request):
 		frappe.recorder.dump()
 
 		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", _site=_site).info({
+		frappe.logger("frappe.web", allow_site=_site).info({
 			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 56fcf9857a..e7058ce42d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -14,22 +14,20 @@ import frappe
 
 
 default_log_level = logging.DEBUG
-site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
-	global site
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -39,8 +37,14 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 		with_more_info = True
 
 	logfile = module + '.log'
-	site = getattr(frappe.local, 'site', None)
-	equivalent_site = _site or site
+
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -51,8 +55,8 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if equivalent_site:
-		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
+	if site:
+		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,7 +77,7 @@ class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, getattr(frappe.local, 'form_dict', None))
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
 			return True
 
 def set_log_level(level):

From a4c20880056d8895dd8bc22251e3df13ace3081a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 13:33:04 +0530
Subject: [PATCH 120/319] fix: save frappe loggers site wise

(cherry picked from commit ae3ee5b2eb5c64fa00f4461ad1a11841ced65c54)
---
 frappe/utils/logger.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index e7058ce42d..c38e0e6997 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,8 +29,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	if module in frappe.loggers:
-		return frappe.loggers[module]
+		try:
+			return frappe.loggers[module][site or "all"]
+		except:
+			pass
 
 	if not module:
 		module = "frappe"
@@ -38,12 +48,6 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	logfile = module + '.log'
 
-	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
-	elif allow_site:
-		site = allow_site
-	else:
-		site = False
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
@@ -69,7 +73,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	frappe.loggers[module] = logger
+	try:
+		frappe.loggers[module][site or "all"] = logger
+	except KeyError:
+		frappe.loggers[module] = {}
+		frappe.loggers[module][site or "all"] = logger
 
 	return logger
 

From f49ab8061b1d70f94515e10d1787f46eb5d28e67 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:47:01 +0530
Subject: [PATCH 121/319] fix: suffix logger name with site

(cherry picked from commit 7bf69c62c1cc942d394d40484502c51b96e98b9f)
---
 frappe/utils/logger.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index c38e0e6997..1fbd54dd38 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -36,9 +36,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	if module in frappe.loggers:
+	LOGGER_NAME = "{}-{}".format(module, site or "all")
+
+	if LOGGER_NAME in frappe.loggers:
 		try:
-			return frappe.loggers[module][site or "all"]
+			return frappe.loggers[LOGGER_NAME]
 		except:
 			pass
 
@@ -51,7 +53,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
-	logger = logging.getLogger(module)
+	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
@@ -73,11 +75,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	try:
-		frappe.loggers[module][site or "all"] = logger
-	except KeyError:
-		frappe.loggers[module] = {}
-		frappe.loggers[module][site or "all"] = logger
+	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 

From 06acc9cb5d582ebfa30843c2d12cab7d5694d3d8 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:59:01 +0530
Subject: [PATCH 122/319] style: black + restructure

(cherry picked from commit 090b81f2f268447581eac496bb245af3a17224c5)
---
 frappe/utils/logger.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 1fbd54dd38..79ea93e3bd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -30,7 +30,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""
 
 	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
+		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site
 	else:
@@ -48,21 +48,21 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		module = "frappe"
 		with_more_info = True
 
-	logfile = module + '.log'
+	logfile = module + ".log"
 
-
-	LOG_FILENAME = os.path.join('..', 'logs', logfile)
+	LOG_FILENAME = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
+	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,20 +73,23 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	handler.setFormatter(formatter)
-
 	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 
+
 class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
+
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
+			site = getattr(frappe.local, "site", None)
+			form_dict = getattr(frappe.local, "form_dict", None)
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, form_dict)
 			return True
 
+
 def set_log_level(level):
-	'''Use this method to set log level to something other than the default DEBUG'''
-	frappe.log_level = getattr(logging, (level or '').upper(), None) or default_log_level
+	"""Use this method to set log level to something other than the default DEBUG"""
+	frappe.log_level = getattr(logging, (level or "").upper(), None) or default_log_level
 	frappe.loggers = {}

From 8e6c58a1452b6562b57994c8d15e82092fe6cfa4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 18:49:59 +0530
Subject: [PATCH 123/319] fix: original log format + EAFP

(cherry picked from commit fac7f359ae0b49064003e7424989579d580b7535)
---
 frappe/utils/logger.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 79ea93e3bd..46269fe909 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -38,26 +38,24 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOGGER_NAME = "{}-{}".format(module, site or "all")
 
-	if LOGGER_NAME in frappe.loggers:
-		try:
-			return frappe.loggers[LOGGER_NAME]
-		except:
-			pass
+	try:
+		return frappe.loggers[LOGGER_NAME]
+	except KeyError:
+		pass
 
 	if not module:
 		module = "frappe"
 		with_more_info = True
 
 	logfile = module + ".log"
-
-	LOG_FILENAME = os.path.join("..", "logs", logfile)
+	log_filename = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
-	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
+	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 

From 732e802a633aac31f988db64244214b7a47f08fc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 19:04:04 +0530
Subject: [PATCH 124/319] fix: Slider

(cherry picked from commit faa9a5466eacc4d07e19286309f36aeb8468f7ec)
---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 46269fe909..6d24eef9d3 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,7 +29,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
-	if allow_site == True:
+	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site

From 2440e72be24f14e934fdb093f73c825cd277ac9a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:07:51 +0530
Subject: [PATCH 125/319] feat(logger): allow max_size and file_count params

(cherry picked from commit 94116ae93c416958619e98aa47ad979481ec9dd1)
---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 66062215f9..a2276ee149 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, allow_site=True, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter, max_size=max_size, file_count=file_count)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 6d24eef9d3..b3295cccdf 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,14 +16,16 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
-		filter (function, optional): Add a filter function for your logger
+		filter (function, optional): Add a filter function for your logger. Defaults to None.
+		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
@@ -36,10 +38,10 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	LOGGER_NAME = "{}-{}".format(module, site or "all")
+	logger_name = "{0}-{1}".format(module, site or "all")
 
 	try:
-		return frappe.loggers[LOGGER_NAME]
+		return frappe.loggers[logger_name]
 	except KeyError:
 		pass
 
@@ -50,18 +52,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	logfile = module + ".log"
 	log_filename = os.path.join("..", "logs", logfile)
 
-	logger = logging.getLogger(LOGGER_NAME)
+	logger = logging.getLogger(logger_name)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
 	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
-	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
+	handler = RotatingFileHandler(log_filename, maxBytes=max_size, backupCount=file_count)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
-		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
+		sitelog_filename = os.path.join(site, "logs", logfile)
+		site_handler = RotatingFileHandler(sitelog_filename, maxBytes=max_size, backupCount=file_count)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
 
@@ -71,7 +73,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	frappe.loggers[LOGGER_NAME] = logger
+	frappe.loggers[logger_name] = logger
 
 	return logger
 

From c414e73e98ff4a6c508a4fe9fbddad657aa68de2 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:11:39 +0530
Subject: [PATCH 126/319] chore: Typo

(cherry picked from commit f04ce5dd7a7957d46ef12d2d5e2216bb93e753e1)
---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index b3295cccdf..451211b74b 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -24,7 +24,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_s
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.
-		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		max_size (int, optional): Max file size of each log file in bytes. Defaults to 100_000.
 		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:

From a4c239f2c1e94f02f9bf02046ea4afcf97617351 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 17:26:37 +0530
Subject: [PATCH 127/319] fix(get_logger): allow None for module

(cherry picked from commit a87531e1d0a808f69ce9d12a7e2fc9a9bb962641)
---
 frappe/utils/logger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 451211b74b..398cdd0bfc 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,11 +16,11 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
+def get_logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
-		module (str): Name of your logger and consequently your log file.
+		module (str, optional): Name of your logger and consequently your log file. Defaults to None.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.

From e8a9bf2494e91903641237a2df5d17f73215f22a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2020 15:38:11 +0530
Subject: [PATCH 128/319] revert: "fix(image-with-blur): Set width, height in
 CSS" (bp #11170) (#11179)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/templates/includes/image_with_blur.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/templates/includes/image_with_blur.html b/frappe/templates/includes/image_with_blur.html
index dbddb9d8ef..20b0380b88 100644
--- a/frappe/templates/includes/image_with_blur.html
+++ b/frappe/templates/includes/image_with_blur.html
@@ -1,9 +1,7 @@
 {%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%}
 {%- if res and res['base64'].startswith('data:') -%}
 <img src="{{ res['base64'] }}" class="image-with-blur {{ resolve_class(class) }}"
-	data-src="{{ src or '' }}" alt="{{ alt or '' }}"
-	width="{{ res['width'] }}" height="{{ res['height'] }}"
-	style="width: {{ res['width'] }}px; height: {{ res['height'] }}px;" />
+	alt="{{ alt or '' }}" width="{{ res['width'] }}" height="{{ res['height'] }}" data-src="{{ src or '' }}" />
 {%- else -%}
 <img src="{{ src or '' }}" class="{{ resolve_class(class) }}" alt="{{ alt or '' }}" />
 {%- endif -%}

From f6f3fba485e27b361d7669904cbc56138e1dd2c4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 3 Aug 2020 17:23:32 +0530
Subject: [PATCH 129/319] fix: Log site only if exists

(cherry picked from commit 4b93f75eba40625bba5b83cca2470aa179e3f082)
---
 frappe/app.py          | 5 ++---
 frappe/utils/logger.py | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/app.py b/frappe/app.py
index 100b10e9ef..450e3b5f17 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,9 +99,8 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", allow_site=_site).info({
-			"site": _site,
+		frappe.logger("frappe.web", allow_site=frappe.local.site).info({
+			"site": get_site_name(request.host),
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 398cdd0bfc..364ffa776d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -11,6 +11,7 @@ from six import text_type
 
 # imports - module imports
 import frappe
+from frappe.utils import get_sites
 
 
 default_log_level = logging.DEBUG
@@ -33,7 +34,7 @@ def get_logger(module=None, with_more_info=False, allow_site=True, filter=None,
 
 	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
-	elif allow_site:
+	elif allow_site in get_sites():
 		site = allow_site
 	else:
 		site = False

From 6aeebe153fe4b42e928d5a9cebe74f970c6672a8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 3 Aug 2020 15:41:36 +0530
Subject: [PATCH 130/319] fix: check if is_standard is "Yes"

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

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index b4c30f5bbd..c410e9aa1a 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
+		if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
 			// make the document read-only
 			frm.set_read_only();
 		}

From 5411599a44521494996a612b4df484913c3c1d6e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2020 12:22:41 +0530
Subject: [PATCH 131/319] fix: whitelist functions called through search widget
  (bp #11153) (#11187)

(cherry picked from commit 645331799af44feb4629ccc50f214278579be200)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/core/doctype/user_permission/user_permission.py        | 1 +
 .../permitted_documents_for_user.py                           | 1 +
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py        | 1 +
 frappe/desk/doctype/number_card/number_card.py                | 4 ++++
 frappe/email/__init__.py                                      | 1 +
 5 files changed, 8 insertions(+)

diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index 48d4fcb5d4..325c41622d 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -119,6 +119,7 @@ def user_permission_exists(user, allow, for_value, applicable_for=None):
 
 	return has_same_user_permission
 
+@frappe.whitelist()
 def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters):
 	linked_doctypes_map = get_linked_doctypes(doctype, True)
 
diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 8b2d1e01fa..5ca21b811e 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -41,6 +41,7 @@ def get_columns_and_fields(doctype):
 
 	return columns, fields
 
+@frappe.whitelist()
 def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a25e0cab9e..7547efa234 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -344,6 +344,7 @@ def get_year_ending(date):
 	# last day of this month
 	return add_to_date(date, days=-1)
 
+@frappe.whitelist()
 def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters):
 	or_filters = {'owner': frappe.session.user, 'is_public': 1}
 	return frappe.db.get_list('Dashboard Chart',
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 3eb08ec00a..f44893d950 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -124,11 +124,15 @@ def create_number_card(args):
 	doc.insert(ignore_permissions=True)
 	return doc
 
+@frappe.whitelist()
 def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 	meta = frappe.get_meta(doctype)
 	searchfields = meta.get_search_fields()
 	search_conditions = []
 
+	if not frappe.db.exists('DocType', doctype):
+		return
+
 	if txt:
 		for field in searchfields:
 			search_conditions.append('`tab{doctype}`.`{field}` like %(txt)s'.format(field=field, doctype=doctype, txt=txt))
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index d58b35040e..0b874a03bb 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -57,6 +57,7 @@ def relink(name, reference_doctype=None, reference_name=None):
 			communication_type = "Communication" and
 			name = %s""", (reference_doctype, reference_name, name))
 
+@frappe.whitelist()
 def get_communication_doctype(doctype, txt, searchfield, start, page_len, filters):
 	user_perms = frappe.utils.user.UserPermissions(frappe.session.user)
 	user_perms.build_permissions()

From 543b47cb2043addef3fe0db39cbe43cd06cf60c9 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2020 13:28:46 +0530
Subject: [PATCH 132/319] feat: don't load user translation in
 make_dict_from_messages (bp #11120) (#11188)

(cherry picked from commit 9b267027b5ce2c0674a4dd1cb476d5b80b873632)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/translate.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index 2fc2d3f328..ee1f8fa5ff 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -119,7 +119,7 @@ def get_dict(fortype, name=None):
 			messages += frappe.db.sql("select 'Role:', name from tabRole")
 			messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
 
-		message_dict = make_dict_from_messages(messages)
+		message_dict = make_dict_from_messages(messages, load_user_translation=False)
 		message_dict.update(get_dict_from_hooks(fortype, name))
 		# remove untranslated
 		message_dict = {k:v for k, v in iteritems(message_dict) if k!=v}
@@ -127,6 +127,7 @@ def get_dict(fortype, name=None):
 		cache.hset("translation_assets", frappe.local.lang, translation_assets, shared=True)
 
 	translation_map = translation_assets[asset_key]
+
 	if fortype == "boot":
 		translation_map.update(get_user_translations(frappe.local.lang))
 
@@ -144,14 +145,17 @@ def get_dict_from_hooks(fortype, name):
 
 	return translated_dict
 
-def make_dict_from_messages(messages, full_dict=None):
+def make_dict_from_messages(messages, full_dict=None, load_user_translation=True):
 	"""Returns translated messages as a dict in Language specified in `frappe.local.lang`
 
 	:param messages: List of untranslated messages
 	"""
 	out = {}
 	if full_dict==None:
-		full_dict = get_full_dict(frappe.local.lang)
+		if load_user_translation:
+			full_dict = get_full_dict(frappe.local.lang)
+		else:
+			full_dict = load_lang(frappe.local.lang)
 
 	for m in messages:
 		if m[1] in full_dict:
@@ -189,11 +193,9 @@ def get_full_dict(lang):
 	try:
 		# get user specific transaltion data
 		user_translations = get_user_translations(lang)
-	except Exception:
-		user_translations = None
-
-	if user_translations:
 		frappe.local.lang_full_dict.update(user_translations)
+	except Exception:
+		pass
 
 	return frappe.local.lang_full_dict
 

From 8e01d253e96838a7d62d6e4d7f6c99bced68c266 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:47:45 +0530
Subject: [PATCH 133/319] fix: Permission query in Dashboard Chart (bp #10981)
 (#11191)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 .../dashboard_chart/dashboard_chart.py        | 25 ++++++++++++++-----
 .../desk/doctype/number_card/number_card.py   | 14 +++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7547efa234..88c9623945 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -28,15 +28,28 @@ def get_permission_query_conditions(user):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
-	allowed_reports = ['"%s"' % key if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+	doctype_condition = False
+	report_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+	allowed_reports = [frappe.db.escape(key) if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabDashboard Chart`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
+	if allowed_reports:
+		report_condition = '`tabDashboard Chart`.`report_name` in ({allowed_reports})'.format(
+			allowed_reports=','.join(allowed_reports))
 
 	return '''
-			`tabDashboard Chart`.`document_type` in ({allowed_doctypes})
-			or `tabDashboard Chart`.`report_name` in ({allowed_reports})
+			(`tabDashboard Chart`.`chart_type` in ('Count', 'Sum', 'Average')
+			and {doctype_condition})
+			or
+			(`tabDashboard Chart`.`chart_type` = 'Report'
+			and {report_condition})
 		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes),
-			allowed_reports=','.join(allowed_reports)
+			doctype_condition=doctype_condition,
+			report_condition=report_condition
 		)
 
 
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index f44893d950..68ed79e64b 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -32,13 +32,17 @@ def get_permission_query_conditions(user=None):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
+	doctype_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabNumber Card`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
 
 	return '''
-			`tabNumber Card`.`document_type` in ({allowed_doctypes})
-		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes)
-		)
+			{doctype_condition}
+		'''.format(doctype_condition=doctype_condition)
 
 def has_permission(doc, ptype, user):
 	roles = frappe.get_roles(user)

From e43bdb0c4fea843a17b69e16b5c908a8ba3dbf48 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 15:01:08 +0530
Subject: [PATCH 134/319] fix: Dashboard fixes (bp #11186) (#11199)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js |  6 ------
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py |  2 +-
 frappe/desk/doctype/number_card/number_card.py         |  2 +-
 frappe/public/js/frappe/widgets/utils.js               | 10 ++++++++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 8d89cc2f31..7f26bd9101 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -23,7 +23,6 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.chart_filters = null;
 
 		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.set_df_property('chart_options_section', 'hidden', 1);
 			frm.disable_form();
 		}
 
@@ -57,11 +56,6 @@ frappe.ui.form.on('Dashboard Chart', {
 		if (frm.doc.report_name) {
 			frm.trigger('set_chart_report_filters');
 		}
-
-		if (!frappe.boot.developer_mode) {
-			frm.set_df_property("custom_options", "hidden", 1);
-		}
-
 	},
 
 	is_standard: function(frm) {
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 88c9623945..7be97f8e24 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -143,7 +143,7 @@ def add_chart_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Dashboard Chart Link')
 	dashboard_link.chart = args.chart_name or args.name
 
-	if args.set_standard:
+	if args.set_standard and dashboard.is_standard:
 		chart = frappe.get_doc('Dashboard Chart', dashboard_link.chart)
 		chart.is_standard = 1
 		chart.module = dashboard.module
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 68ed79e64b..8b79cf4052 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -180,7 +180,7 @@ def add_card_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Number Card Link')
 	dashboard_link.card = args.name
 
-	if args.set_standard:
+	if args.set_standard and dashboard.is_standard:
 		card = frappe.get_doc('Number Card', dashboard_link.card)
 		card.is_standard = 1
 		card.module = dashboard.module
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 22b3167977..4599b4adc8 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -122,7 +122,8 @@ function shorten_number(number, country) {
 	const number_system = get_number_system(country);
 	let x = Math.abs(Math.round(number));
 	for (const map of number_system) {
-		if (x >= map.divisor) {
+		const condition = map.condition ? map.condition(x) : x >= map.divisor;
+		if (condition) {
 			return Math.round(number/map.divisor) +  ' ' + map.symbol;
 		}
 	}
@@ -152,9 +153,14 @@ function get_number_system(country) {
 			{
 				divisor: 1.0e+6,
 				symbol: 'M'
+			},
+			{
+				divisor: 1.0e+3,
+				symbol: 'K',
+				condition: (num) => num.toFixed().length > 5
 			}]
 	};
 	return number_system_map[country];
 }
 
-export { generate_route, generate_grid, build_summary_item, shorten_number };
\ No newline at end of file
+export { generate_route, generate_grid, build_summary_item, shorten_number };

From 84544cb7c26e966bc1ddc3bf0947f2eb18984308 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 15:26:04 +0530
Subject: [PATCH 135/319] test: Make email accounts in email_account test (bp
 #11139) (#11150)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/core/doctype/server_script/test_server_script.py  | 7 ++++---
 frappe/email/doctype/email_account/test_email_account.py | 5 ++++-
 frappe/model/workflow.py                                 | 2 +-
 frappe/tests/test_naming.py                              | 1 +
 frappe/workflow/doctype/workflow/test_workflow.py        | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py
index 3e6b7a3a98..5c12858e8a 100644
--- a/frappe/core/doctype/server_script/test_server_script.py
+++ b/frappe/core/doctype/server_script/test_server_script.py
@@ -52,9 +52,10 @@ class TestServerScript(unittest.TestCase):
 
 		frappe.db.commit()
 
-	# @classmethod
-	# def tearDownClass(cls):
-	# 	frappe.db.sql('truncate `tabServer Script`')
+	@classmethod
+	def tearDownClass(cls):
+		frappe.db.commit()
+		frappe.db.sql('truncate `tabServer Script`')
 
 	def setUp(self):
 		frappe.cache().delete_value('server_script_map')
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index 29b54d7f8b..f87ee32bb1 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -5,7 +5,10 @@ from __future__ import unicode_literals
 import frappe, os
 import unittest, email
 
-test_records = frappe.get_test_records('Email Account')
+from frappe.test_runner import make_test_records
+
+make_test_records("User")
+make_test_records("Email Account")
 
 from frappe.core.doctype.communication.email import make
 from frappe.desk.form.load import get_attachments
diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py
index ea563dfc13..32919b3333 100644
--- a/frappe/model/workflow.py
+++ b/frappe/model/workflow.py
@@ -307,4 +307,4 @@ def set_workflow_state_on_action(doc, workflow_name, action):
 	for state in workflow.states:
 		if state.doc_status == docstatus:
 			doc.set(workflow_state_field, state.state)
-			return
\ No newline at end of file
+			return
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 90ab6a6a94..b47fb809ca 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -88,6 +88,7 @@ class TestNaming(unittest.TestCase):
 		series = 'TEST-'
 		key = 'TEST-'
 		name = 'TEST-00003'
+		frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
 		frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
 		revert_series_if_last(key, name)
 		count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 9999df40cb..2719bc7cf0 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -10,6 +10,7 @@ from frappe.model.workflow import apply_workflow, WorkflowTransitionError, Workf
 class TestWorkflow(unittest.TestCase):
 	def setUp(self):
 		frappe.db.sql('DELETE FROM `tabToDo`')
+		frappe.db.sql("DELETE FROM `tabHas Role` WHERE `role`='Test Approver'")
 		if not getattr(self, 'workflow', None):
 			self.workflow = create_todo_workflow()
 		frappe.set_user('Administrator')
@@ -146,4 +147,4 @@ def create_todo_workflow():
 		return workflow
 
 def create_new_todo():
-	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()
\ No newline at end of file
+	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()

From da9645c9253936a14db7f8fc7f9c04b596baa602 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 19:59:44 +0530
Subject: [PATCH 136/319] feat: Add validate_and_sanitize_search_inputs
 decorator (#11194) (#11204)

* feat: Add validate_and_sanitize_search_inputs decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Move validate_and_sanitize_search_inputs to init

* refactor: Move validate_and_sanitize_search_inputs to search.py

* test: validate_and_sanitize_search_inputs decorator

* chore: Add wrapt module

* refactor: Use @wrapt to define validate_and_sanitize_search_inputs decorator

* test: Add a case to make sure frappe.call works as well

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
(cherry picked from commit cd1ab8e23c4a1de4bbd5137c34a864af53788237)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/__init__.py          |  4 ++++
 frappe/desk/search.py       | 13 +++++++++++++
 frappe/tests/test_search.py | 28 ++++++++++++++++++++++++++++
 requirements.txt            |  3 ++-
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index a2276ee149..206283fd3a 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1707,3 +1707,7 @@ def mock(type, size=1, locale='en'):
 
 	from frappe.chat.util import squashify
 	return squashify(results)
+
+def validate_and_sanitize_search_inputs(fn):
+	from frappe.desk.search import validate_and_sanitize_search_inputs as func
+	return func(fn)
diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index b4b54b4b6e..798e499bb9 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -10,6 +10,7 @@ from frappe.handler import is_whitelisted
 from frappe import _
 from six import string_types
 import re
+import wrapt
 
 UNTRANSLATED_DOCTYPES = ["DocType", "Role"]
 
@@ -206,3 +207,15 @@ def scrub_custom_query(query, key, txt):
 	if '%s' in query:
 		query = query.replace('%s', ((txt or '') + '%'))
 	return query
+
+@wrapt.decorator
+def validate_and_sanitize_search_inputs(fn, instance, args, kwargs):
+	kwargs.update(dict(zip(fn.__code__.co_varnames, args)))
+	sanitize_searchfield(kwargs['searchfield'])
+	kwargs['start'] = cint(kwargs['start'])
+	kwargs['page_len'] = cint(kwargs['page_len'])
+
+	if kwargs['doctype'] and not frappe.db.exists('DocType', kwargs['doctype']):
+		return []
+
+	return fn(**kwargs)
\ No newline at end of file
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 5cab827218..192fe9dd25 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -50,3 +50,31 @@ class TestSearch(unittest.TestCase):
 
 	def tearDown(self):
 		frappe.local.lang = 'en'
+
+	def test_validate_and_sanitize_search_inputs(self):
+
+		# should raise error if searchfield is injectable
+		self.assertRaises(frappe.DataError,
+			get_data, *('User', 'Random', 'select * from tabSessions) --', '1', '10', dict()))
+
+		# page_len and start should be converted to int
+		self.assertListEqual(get_data('User', 'Random', 'email', 'name or (select * from tabSessions)', '10', dict()),
+			['User', 'Random', 'email', 0, 10, {}])
+		self.assertListEqual(get_data('User', 'Random', 'email', page_len='2', start='10', filters=dict()),
+			['User', 'Random', 'email', 10, 2, {}])
+
+		# DocType can be passed as None which should be accepted
+		self.assertListEqual(get_data(None, 'Random', 'email', '2', '10', dict()),
+			[None, 'Random', 'email', 2, 10, {}])
+
+		# return empty string if passed doctype is invalid
+		self.assertListEqual(get_data("Random DocType", 'Random', 'email', '2', '10', dict()), [])
+
+		# should not fail if function is called via frappe.call with extra arguments
+		args = ("Random DocType", 'Random', 'email', '2', '10', dict())
+		kwargs = {'as_dict': False}
+		self.assertListEqual(frappe.call('frappe.tests.test_search.get_data', *args, **kwargs), [])
+
+@frappe.validate_and_sanitize_search_inputs
+def get_data(doctype, txt, searchfield, start, page_len, filters):
+	return [doctype, txt, searchfield, start, page_len, filters]
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 33cd292bf6..2995553541 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -69,4 +69,5 @@ Whoosh==2.7.4
 xlrd==1.2.0
 zxcvbn-python==4.4.24
 pycryptodome==3.9.8
-paytmchecksum==1.7.0
\ No newline at end of file
+paytmchecksum==1.7.0
+wrapt==1.10.11
\ No newline at end of file

From 31269a4efb2549faf9aeeb4922b2bd4674e7485c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 19:59:58 +0530
Subject: [PATCH 137/319] fix: Validate and sanitise whitelisted search methods
 using decorator (#11197) (#11205)

* fix: Validate and sanitize whitelisted search methods using decorator

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Replace decorator name

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
(cherry picked from commit 21a0cafe6209334906441c07c7f2e085afc82ade)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/automation/doctype/auto_repeat/auto_repeat.py             | 1 +
 frappe/contacts/address_and_contact.py                           | 1 +
 frappe/contacts/doctype/address/address.py                       | 1 +
 frappe/contacts/doctype/contact/contact.py                       | 1 +
 frappe/core/doctype/user/user.py                                 | 1 +
 frappe/core/doctype/user_permission/user_permission.py           | 1 +
 .../permitted_documents_for_user/permitted_documents_for_user.py | 1 +
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py           | 1 +
 frappe/desk/doctype/number_card/number_card.py                   | 1 +
 frappe/email/__init__.py                                         | 1 +
 10 files changed, 10 insertions(+)

diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py
index a946fcc81c..c09e347e71 100644
--- a/frappe/automation/doctype/auto_repeat/auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py
@@ -374,6 +374,7 @@ def make_auto_repeat(doctype, docname, frequency = 'Daily', start_date = None, e
 
 # method for reference_doctype filter
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_auto_repeat_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	res = frappe.db.get_all('Property Setter', {
 		'property': 'allow_auto_repeat',
diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 51f13fb1a1..3ca9547188 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -147,6 +147,7 @@ def delete_contact_and_address(doctype, docname):
 				doc.delete()
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	if not txt: txt = ""
 
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 57dea8284c..e82ab9b26e 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -231,6 +231,7 @@ def get_company_address(company):
 	return ret
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def address_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 8240940d2f..f82946dc5e 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -183,6 +183,7 @@ def update_contact(doc, method):
 		contact.save(ignore_permissions=True)
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 64bff32189..ef2de679ae 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -812,6 +812,7 @@ def reset_password(user):
 		return 'not found'
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def user_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index 325c41622d..ba14583c2f 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -120,6 +120,7 @@ def user_permission_exists(user, allow, for_value, applicable_for=None):
 	return has_same_user_permission
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters):
 	linked_doctypes_map = get_linked_doctypes(doctype, True)
 
diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 5ca21b811e..97209cd8ea 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -42,6 +42,7 @@ def get_columns_and_fields(doctype):
 	return columns, fields
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7be97f8e24..4ea61ec6a9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -358,6 +358,7 @@ def get_year_ending(date):
 	return add_to_date(date, days=-1)
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters):
 	or_filters = {'owner': frappe.session.user, 'is_public': 1}
 	return frappe.db.get_list('Dashboard Chart',
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 8b79cf4052..d4a2b00c57 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -129,6 +129,7 @@ def create_number_card(args):
 	return doc
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 	meta = frappe.get_meta(doctype)
 	searchfields = meta.get_search_fields()
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index 0b874a03bb..b05aef7639 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -58,6 +58,7 @@ def relink(name, reference_doctype=None, reference_name=None):
 			name = %s""", (reference_doctype, reference_name, name))
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_communication_doctype(doctype, txt, searchfield, start, page_len, filters):
 	user_perms = frappe.utils.user.UserPermissions(frappe.session.user)
 	user_perms.build_permissions()

From b105fabf3df72baf55cabce7c61853f36ff1fbe2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 5 Aug 2020 21:34:21 +0530
Subject: [PATCH 138/319] chore: Add change log for v13.beta.4 (#11207)

---
 frappe/change_log/v13/v13_0_0-beta_4.md | 44 +++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_4.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_4.md b/frappe/change_log/v13/v13_0_0-beta_4.md
new file mode 100644
index 0000000000..26034d79bf
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_4.md
@@ -0,0 +1,44 @@
+# Version 13.0.0 Beta 4 Release Notes
+
+## Fixes and Enhancements
+
+- Fixed backup file naming ([#11056](https://github.com/frappe/frappe/pull/11056))
+- Fixed "File already attached" error in some cases ([#10815](https://github.com/frappe/frappe/pull/10815))
+- Text Editor fixes ([#10598](https://github.com/frappe/frappe/pull/10598)) ([#10984](https://github.com/frappe/frappe/pull/10984)) ([#10804](https://github.com/frappe/frappe/pull/10804))
+- Fixed "Permitted Documents for User" page ([#10864](https://github.com/frappe/frappe/pull/10864))
+- Fixed issue in report saving ([#10998](https://github.com/frappe/frappe/pull/10998))
+- Fixed issue where website was not loading JS code ([#11067](https://github.com/frappe/frappe/pull/11067))
+- Fixed website footer links ([#11078](https://github.com/frappe/frappe/pull/11078))
+- Data Import fixes ([#10759](https://github.com/frappe/frappe/pull/10759)) ([#10935](https://github.com/frappe/frappe/pull/10935)) ([#11003](https://github.com/frappe/frappe/pull/11003))
+- Fixed email reply thread where message-id is not returned ([#10803](https://github.com/frappe/frappe/pull/10803))
+- Dashboard Chart and Number Card fixes ([#10872](https://github.com/frappe/frappe/pull/10872)) ([#11074](https://github.com/frappe/frappe/pull/11074)) ([#10816](https://github.com/frappe/frappe/pull/10816)) ([#10788](https://github.com/frappe/frappe/pull/10788)) ([#11117](https://github.com/frappe/frappe/pull/11117))
+- Fixed email encoding issue inside email queue ([#11036](https://github.com/frappe/frappe/pull/11036))
+- Moved checkbox from Print Settings to System Settings ([#10905](https://github.com/frappe/frappe/pull/10905))
+- Code fields will now be sanitized ([#11133](https://github.com/frappe/frappe/pull/11133))
+- Fixed API login inconsistency  ([#10427](https://github.com/frappe/frappe/pull/10427))
+- Fixed RTL layout for desk ([#11006](https://github.com/frappe/frappe/pull/11006))
+- Fixed Google Calendar integration sync token issue ([#10764](https://github.com/frappe/frappe/pull/10764))
+- Google Drive integration fixes ([#10767](https://github.com/frappe/frappe/pull/10767)) ([#10966](https://github.com/frappe/frappe/pull/10966))
+
+## Features
+
+- Introduced PayTM integration ([#9955](https://github.com/frappe/frappe/pull/9955))
+- Standard Dashboards will be synced via JSON ([#10585](https://github.com/frappe/frappe/pull/10585))
+- Introduced a bench command to open ngrok tunnel ([#11024](https://github.com/frappe/frappe/pull/11024))
+- Ability to create Number Cards using reports ([#11022](https://github.com/frappe/frappe/pull/11022))
+- Introduced Help Article Feedback system ([#10260](https://github.com/frappe/frappe/pull/10260))
+- Option to add custom timeline contents ([#10677](https://github.com/frappe/frappe/pull/10677))
+- Made checkboxes navigable via tab key ([#11030](https://github.com/frappe/frappe/pull/11030))
+
+## Performance
+
+- Theme files will now be compressed to make website load faster ([#11048](https://github.com/frappe/frappe/pull/11048))
+- Confirmation emails will be sent instantly ([#10790](https://github.com/frappe/frappe/pull/10790))
+
+## Security
+
+- Made cookies more secure ([#10734](https://github.com/frappe/frappe/pull/10734)) ([#11035](https://github.com/frappe/frappe/pull/11035))
+- Added a check to verify if the query is whitelisted before calling from search ([#10492](https://github.com/frappe/frappe/pull/10492))
+- Disallowed global variable access through SQL ([#10875](https://github.com/frappe/frappe/pull/10875))
+- Escaped user input before regex search ([#10812](https://github.com/frappe/frappe/pull/10812))
+- Prevent rendering arbitrary HTML ([#10948](https://github.com/frappe/frappe/pull/10948))
\ No newline at end of file

From bf2d88cd4018f3da19c6bf3d7e9c7ca6feebc9a9 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 6 Aug 2020 13:46:53 +0550
Subject: [PATCH 139/319] bumped to version 13.0.0-beta.4

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 206283fd3a..ceae97c49d 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.3'
+__version__ = '13.0.0-beta.4'
 __title__ = "Frappe Framework"
 
 local = Local()

From e8c0d566759364337d396d84731909da3c13f984 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 13 Aug 2020 21:02:35 +0530
Subject: [PATCH 140/319] fix: set samesite none for mobile (#11266)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 frappe/__init__.py | 2 +-
 frappe/auth.py     | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index ceae97c49d..630a30cd66 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.4'
+__version__ = '13.0.1-beta.4'
 __title__ = "Frappe Framework"
 
 local = Local()
diff --git a/frappe/auth.py b/frappe/auth.py
index 64fea36748..97d638c277 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -340,6 +340,11 @@ class CookieManager:
 	def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Lax"):
 		if not secure:
 			secure = frappe.local.request.scheme == "https"
+
+		# Cordova does not work with Lax
+		if frappe.local.session.data.device == "mobile":
+			samesite = None
+
 		self.cookies[key] = {
 			"value": value,
 			"expires": expires,

From f9d53e2d5f671653a91ca4f43b6121adcb47a40c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 13 Aug 2020 22:16:41 +0530
Subject: [PATCH 141/319] chore: Fix Version

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 630a30cd66..2846ccd115 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.1-beta.4'
+__version__ = '13.0.0-beta.5'
 __title__ = "Frappe Framework"
 
 local = Local()

From b11a8d78bf2375349adc6e4b2c5e9d3185471945 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 10 Aug 2020 16:51:37 +0530
Subject: [PATCH 142/319] refactor: catch exceptions

(cherry picked from commit 64f913fa36721f7477a03507f780ab6b03ff56be)
---
 frappe/public/js/frappe/form/formatters.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index a7adc9175a..39541757a5 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -230,9 +230,14 @@ frappe.form.formatters = {
 	TextEditor: function(value) {
 		let formatted_value = frappe.form.formatters.Text(value);
 		// to use ql-editor styles
-		if (!$(formatted_value).find('.ql-editor').length) {
+		try {
+			if (!$(formatted_value).find('.ql-editor').length) {
+				formatted_value = `<div class="ql-editor read-mode">${formatted_value}</div>`;
+			}
+		} catch(e) {
 			formatted_value = `<div class="ql-editor read-mode">${formatted_value}</div>`;
 		}
+
 		return formatted_value;
 	},
 	Code: function(value) {

From f3d0d25782c363282287442c4262c5a4cd97ac03 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 11 Aug 2020 20:13:56 +0530
Subject: [PATCH 143/319] feat: catch exceptions on tokenizing values in
 get_value

(cherry picked from commit 23975d5a70e24d3f90dd4c6e24231fa3d1752d10)
---
 frappe/public/js/frappe/form/controls/text_editor.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 3fe0b60ae0..5881e52d74 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -201,9 +201,14 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		// hack to retain space sequence.
 		value = value.replace(/(\s)(\s)/g, ' &nbsp;');
 
-		if (!$(value).find('.ql-editor').length) {
+		try {
+			if (!$(value).find('.ql-editor').length) {
+				value = `<div class="ql-editor read-mode">${value}</div>`;
+			}
+		} catch(e) {
 			value = `<div class="ql-editor read-mode">${value}</div>`;
 		}
+
 		return value;
 	},
 

From 1fcc0e803f39f8c88a65d98f92297238eeca3d95 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 7 Sep 2020 09:50:47 +0530
Subject: [PATCH 144/319] fix: contact not showing in form (bp #11363) (#11379)

Co-authored-by: Afshan <afshan13k@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index f82946dc5e..987ba7d3d6 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -188,7 +188,7 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
 	if not frappe.get_meta("Contact").get_field(searchfield)\
-		or searchfield not in frappe.db.DEFAULT_COLUMNS:
+		and searchfield not in frappe.db.DEFAULT_COLUMNS:
 		return []
 
 	link_doctype = filters.pop('link_doctype')

From ffc726bcc0c005bb20c685db7f63d91dad5da8a6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 10 Sep 2020 12:56:53 +0530
Subject: [PATCH 145/319] fix: boot if module is not present in desk (bp
 #11470) (#11471)

(cherry picked from commit 40748d7fa88c18f64600081b986d95f3b5cf0721)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 frappe/desk/desktop.py                     | 2 +-
 frappe/desk/doctype/desk_page/desk_page.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 68b57a93d4..29624807e0 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -40,7 +40,7 @@ class Workspace:
 
 		self.doc = self.get_page_for_user()
 
-		if self.doc.module not in self.allowed_modules:
+		if self.doc.module and self.doc.module not in self.allowed_modules:
 			raise frappe.PermissionError
 
 		self.can_read = self.get_cached('user_perm_can_read', self.get_can_read_items)
diff --git a/frappe/desk/doctype/desk_page/desk_page.py b/frappe/desk/doctype/desk_page/desk_page.py
index f14535cb5f..fecf1ab3dd 100644
--- a/frappe/desk/doctype/desk_page/desk_page.py
+++ b/frappe/desk/doctype/desk_page/desk_page.py
@@ -29,7 +29,7 @@ class DeskPage(Document):
 
 		pages = frappe.get_all("Desk Page", fields=["name", "module"], filters=filters, as_list=1)
 
-		return { page[1]: page[0]  for page in pages }
+		return { page[1]: page[0] for page in pages if page[1] }
 
 def disable_saving_as_standard():
 	return frappe.flags.in_install or \

From e7e3a7a6ca889bed186407ef6b1016af9c11fe21 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Mon, 14 Sep 2020 13:28:03 +0530
Subject: [PATCH 146/319] fix: oauth code pointing to older desktop page

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

diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py
index 969623c369..6ac5a4fdcd 100644
--- a/frappe/utils/oauth.py
+++ b/frappe/utils/oauth.py
@@ -305,7 +305,7 @@ def redirect_post_login(desk_user, redirect_to=None):
 	frappe.local.response["type"] = "redirect"
 
 	if not redirect_to:
-		# the #desktop is added to prevent a facebook redirect bug
-		redirect_to = "/desk#desktop" if desk_user else "/me"
+		# the #workspace is added to prevent a facebook redirect bug
+		redirect_to = "/desk#workspace" if desk_user else "/me"
 
 	frappe.local.response["location"] = redirect_to

From ebcc88c2c4cc9c09c20ed8dfedd3916a5ec6fd4e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 26 Oct 2020 21:07:42 +0530
Subject: [PATCH 147/319] feat: Add module field in get_desk_sidebar_items (bp
 #11781) (#11782)

(cherry picked from commit 00310ea783980229dd7708694a0f7369bf337f25)

Co-authored-by: Sumit Bhanushali <sumit.bhanushali63@gmail.com>
---
 frappe/desk/desktop.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 72c4519120..4dab313892 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -375,7 +375,7 @@ def get_desk_sidebar_items(flatten=False, cache=True):
 
 		# pages sorted based on pinned to top and then by name
 		order_by = "pin_to_top desc, pin_to_bottom asc, name asc"
-		all_pages = frappe.get_all("Desk Page", fields=["name", "category"], filters=filters, order_by=order_by, ignore_permissions=True)
+		all_pages = frappe.get_all("Desk Page", fields=["name", "category", "module"], filters=filters, order_by=order_by, ignore_permissions=True)
 		pages = []
 
 		# Filter Page based on Permission

From 0b30ea2a5fb45f7c24b3a64b6375c7944170fb10 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 24 Oct 2020 15:22:14 +0530
Subject: [PATCH 148/319] fix: customize options in desk page rtl layout

(cherry picked from commit e1316814a22cb9bb7ea37fd73194af2e61a7d5d2)
---
 frappe/public/less/desktop.less | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index a738679cc8..dc0ff458e9 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -147,6 +147,12 @@
 	.desk-body {
 		padding-left: 0px;
 		padding-right: calc(20rem + 15px);
+
+		.desk-page.allow-customization {
+			.customize-options {
+				text-align: left;
+			}
+		}
 	}
 }
 

From a128f14c750775373146efcb6637a37567c37e5c Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Thu, 29 Oct 2020 14:50:18 +0530
Subject: [PATCH 149/319] fix(Help Article): show 0 instead of undefined when
 value not set in dashboard

(cherry picked from commit 6e04e0d6cb0bea862baa7c03ce17f00c34a77b1c)
---
 frappe/website/doctype/help_article/help_article.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 0a87b22e2c..2fc81ec613 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -9,12 +9,12 @@ frappe.ui.form.on('Help Article', {
 			<div class="row">
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap green">
-						<span>Helpful ${frm.doc.helpful}</span>
+						<span>Helpful ${frm.doc.helpful || 0}</span>
 					</span>
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.not_helpful}</span>
+						<span>Not Helpful ${frm.doc.not_helpful || 0}</span>
 					</span>
 				</div>
 			</div>

From 0ecb0b97fb52779953cc1b1d6034ed7943afa7f1 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Thu, 29 Oct 2020 15:03:14 +0530
Subject: [PATCH 150/319] fix: add colon between key and value

(cherry picked from commit 218431372aa55c2d525a0984aea753983c5bba89)
---
 frappe/website/doctype/help_article/help_article.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 2fc81ec613..c1b262ebfe 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -9,12 +9,12 @@ frappe.ui.form.on('Help Article', {
 			<div class="row">
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap green">
-						<span>Helpful ${frm.doc.helpful || 0}</span>
+						<span>Helpful: ${frm.doc.helpful || 0}</span>
 					</span>
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.not_helpful || 0}</span>
+						<span>Not Helpful: ${frm.doc.not_helpful || 0}</span>
 					</span>
 				</div>
 			</div>

From 17e74cdd050e952fffc25fa5531db6d087db23e0 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 2 Nov 2020 16:55:47 +0530
Subject: [PATCH 151/319] fix: disable chart form condition (#11844)

(cherry picked from commit 6e931e6b2a21417efb604c34bd48e007dfd19c33)
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 72be9ca349..f5d1ee0df5 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -23,7 +23,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.chart_filters = null;
 		frm.is_disabled = !frappe.boot.developer_mode && frm.doc.is_standard;
 
-		if (!frm.is_disabled) {
+		if (frm.is_disabled) {
 			!frm.doc.custom_options && frm.set_df_property('chart_options_section', 'hidden', 1);
 			frm.disable_form();
 		}

From 12f59a74d2faa05ee344415baf5cf4cadb977842 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Nov 2020 18:21:30 +0530
Subject: [PATCH 152/319] fix: shorten number card percentage stat (bp #11846)
 (#11848)

(cherry picked from commit 8d70e3ec5b94ee5413e51845997506cf89d405d5)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/widgets/number_card_widget.js | 2 +-
 frappe/public/js/frappe/widgets/utils.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 6b38412ebd..3708e78d3a 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -268,7 +268,7 @@ export default class NumberCardWidget extends Widget {
 			result: this.number
 		}).then(res => {
 			if (res !== undefined) {
-				this.percentage_stat = +res.toFixed(2);
+				this.percentage_stat = shorten_number(res);
 			}
 		});
 	}
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 9a255d0776..d95c7baf4f 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -154,7 +154,7 @@ function shorten_number(number, country) {
 			return (number/map.divisor).toFixed(2) + ' ' + map.symbol;
 		}
 	}
-	return number.toFixed();
+	return number.toFixed(2);
 }
 
 function get_number_system(country) {

From ed0ae391719a585ae06b2e19985891b4638a84dc Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Nov 2020 18:22:07 +0530
Subject: [PATCH 153/319] fix: Max slices for aggregate charts (bp #11808)
 (#11847)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/widgets/chart_widget.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index c89ee96520..8509eac7a4 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -547,6 +547,7 @@ export default class ChartWidget extends Widget {
 			type: chart_type_map[this.chart_doc.type],
 			colors: colors,
 			height: this.height,
+			maxSlices: ['Pie', 'Donut'].includes(this.chart_doc.type) ? 6 : 9,
 			axisOptions: {
 				xIsSeries: this.chart_doc.timeseries,
 				shortenYAxisNumbers: 1

From 1a5fa9d8190d655f13d4b58937d7223cd1104324 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 2 Nov 2020 20:31:09 +0530
Subject: [PATCH 154/319] fix: Navbar logo height and width (bp #11822)
 (#11849)

(cherry picked from commit 25052afc9b6284e832f996eaaad41a61a6dba9f9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
---
 frappe/public/less/navbar.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less
index 5cb050b10f..ba9c0e242a 100644
--- a/frappe/public/less/navbar.less
+++ b/frappe/public/less/navbar.less
@@ -266,6 +266,8 @@
 
 .navbar-brand > img {
 	display: inline-block;
+	height: 24px;
+	max-width: 150px;
 }
 
 .toggle-sidebar {

From 97c93642c4fa90935bf7f655aa385961b6395155 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:55:07 +0530
Subject: [PATCH 155/319] fix: Email password prompt missing field name for
 submit button (bp #11840) (#11850)

(cherry picked from commit 8aca710c850a7a169d45f2c4ebd0494d038167f0)

Co-authored-by: Andy Zhu <andy007yan@gmail.com>
---
 frappe/public/js/frappe/desk.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 99c1647455..c8ed29fb76 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -199,6 +199,7 @@ frappe.Application = Class.extend({
 					'reqd': 1
 				},
 				{
+					"fieldname": "submit",
 					"fieldtype": "Button",
 					"label": __("Submit")
 				}

From b7fa72b42f4d5ca30e64bb0ec61a004bc241f712 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:59:02 +0530
Subject: [PATCH 156/319] fix: Remove @ from relevance query (bp #11837)
 (#11851)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/desk/search.py          | 2 +-
 frappe/tests/test_scheduler.py | 2 ++
 frappe/tests/test_search.py    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index 798e499bb9..f249c36746 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -141,7 +141,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 
 			# find relevance as location of search term from the beginning of string `name`. used for sorting results.
 			formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format(
-				_txt=frappe.db.escape((txt or "").replace("%", "")), doctype=doctype))
+				_txt=frappe.db.escape((txt or "").replace("%", "").replace("@", "")), doctype=doctype))
 
 
 			# In order_by, `idx` gets second priority, because it stores link count
diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py
index df3d735488..694ce31050 100644
--- a/frappe/tests/test_scheduler.py
+++ b/frappe/tests/test_scheduler.py
@@ -6,6 +6,7 @@ from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
 from frappe.utils.background_jobs import enqueue, get_jobs
 from frappe.utils.scheduler import enqueue_events, is_dormant, schedule_jobs_based_on_activity
 from frappe.utils import add_days, get_datetime
+from frappe.utils.doctor import purge_pending_jobs
 
 import frappe
 import time
@@ -21,6 +22,7 @@ def test_method():
 
 class TestScheduler(TestCase):
 	def setUp(self):
+		purge_pending_jobs()
 		if not frappe.get_all('Scheduled Job Type', limit=1):
 			sync_jobs()
 
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 192fe9dd25..5c17ce66c0 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -75,6 +75,10 @@ class TestSearch(unittest.TestCase):
 		kwargs = {'as_dict': False}
 		self.assertListEqual(frappe.call('frappe.tests.test_search.get_data', *args, **kwargs), [])
 
+		# should not fail if query has @ symbol in it
+		search_link('User', 'user@random', searchfield='name')
+		self.assertListEqual(frappe.response['results'], [])
+
 @frappe.validate_and_sanitize_search_inputs
 def get_data(doctype, txt, searchfield, start, page_len, filters):
 	return [doctype, txt, searchfield, start, page_len, filters]
\ No newline at end of file

From 4278628a2be1d3dfedeed45124aecc0880ab1fff Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:59:23 +0530
Subject: [PATCH 157/319] fix: Show total text with value if first column is
 numeric (bp #11813) (#11852)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../js/frappe/views/reports/report_view.js    | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 2cbe4eca14..026e120c50 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -1058,17 +1058,32 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					name: __('Totals Row'),
 					content: totals[col.id],
 					format: value => {
-						return frappe.format(value, col.docfield, { always_show_decimals: true }, data[0]);
+						let formatted_value = frappe.format(value, col.docfield, {
+							always_show_decimals: true
+						}, data[0]);
+						if (i === 0) {
+							return this.format_total_cell(formatted_value, col);
+						}
+						return formatted_value;
 					}
-				}
-			})
+				};
+			});
 
-			totals_row[0].content = __('Totals').bold();
 			out.push(totals_row);
 		}
 		return out;
 	}
 
+	format_total_cell(formatted_value, df) {
+		let cell_value = __('Totals').bold();
+		if (frappe.model.is_numeric_field(df.docfield)) {
+			cell_value = `<span class="flex justify-between">
+				${cell_value} ${$(formatted_value).text()}
+			</span>`;
+		}
+		return cell_value;
+	}
+
 	build_row(d) {
 		return this.columns.map(col => {
 			if (col.docfield.parent !== this.doctype) {
@@ -1249,8 +1264,9 @@ 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 677f8b08d32a9a7a2fb364a64d9d1a034a33eb0d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 3 Nov 2020 15:01:14 +0530
Subject: [PATCH 158/319] fix: Show custom message for invalid login
 credentials (bp #11853) (#11855)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 .../doctype/email_account/email_account.py    | 64 +++++++++++++------
 frappe/email/receive.py                       |  4 --
 frappe/email/smtp.py                          |  7 +-
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 14a3cfd9f1..343141c66d 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -25,7 +25,11 @@ from frappe.core.doctype.communication.email import set_incoming_outgoing_accoun
 from frappe.utils.html_utils import clean_email_html
 from frappe.email.utils import get_port
 
-class SentEmailInInbox(Exception): pass
+class SentEmailInInbox(Exception):
+	pass
+
+class InvalidEmailCredentials(frappe.ValidationError):
+	pass
 
 class EmailAccount(Document):
 	def autoname(self):
@@ -148,7 +152,7 @@ class EmailAccount(Document):
 			return None
 
 		args = frappe._dict({
-			"email_account":self.name,
+			"email_account": self.name,
 			"host": self.email_server,
 			"use_ssl": self.use_ssl,
 			"username": getattr(self, "login_id", None) or self.email_id,
@@ -166,21 +170,45 @@ class EmailAccount(Document):
 			frappe.throw(_("{0} is required").format("Email Server"))
 
 		email_server = EmailServer(frappe._dict(args))
+		self.check_email_server_connection(email_server, in_receive)
+
+		if not in_receive and self.use_imap:
+			email_server.imap.logout()
+
+		# reset failed attempts count
+		self.set_failed_attempts_count(0)
+
+		return email_server
+
+	def check_email_server_connection(self, email_server, in_receive):
+		# tries to connect to email server and handles failure
 		try:
 			email_server.connect()
 		except (error_proto, imaplib.IMAP4.error) as e:
-			e = cstr(e)
-			message = e.lower().replace(" ","")
-			if in_receive and any(map(lambda t: t in message, ['authenticationfailed', 'loginviayourwebbrowser', #abbreviated to work with both failure and failed
-				'loginfailed', 'err[auth]', 'errtemporaryerror'])): #temporary error to deal with godaddy
-				# if called via self.receive and it leads to authentication error, disable incoming
-				# and send email to system manager
-				self.handle_incoming_connect_error(
-					description=_('Authentication failed while receiving emails from Email Account {0}. Message from server: {1}').format(self.name, e)
-				)
+			message = cstr(e).lower().replace(" ","")
+			auth_error_codes = [
+				'authenticationfailed',
+				'loginfailed',
+			]
+
+			other_error_codes = [
+				'err[auth]',
+				'errtemporaryerror',
+				'loginviayourwebbrowser'
+			]
+
+			all_error_codes = auth_error_codes + other_error_codes
 
+			if in_receive and any(map(lambda t: t in message, all_error_codes)):
+				# if called via self.receive and it leads to authentication error,
+				# disable incoming and send email to System Manager
+				error_message = _("Authentication failed while receiving emails from Email Account: {0}.").format(self.name)
+				error_message += "<br>" + _("Message from server: {0}").format(cstr(e))
+				self.handle_incoming_connect_error(description=error_message)
 				return None
 
+			elif not in_receive and any(map(lambda t: t in message, auth_error_codes)):
+				self.throw_invalid_credentials_exception()
 			else:
 				frappe.throw(e)
 
@@ -195,16 +223,16 @@ class EmailAccount(Document):
 				else:
 					frappe.cache().set_value("workers:no-internet", True)
 				return None
-
 			else:
 				raise
-		if not in_receive:
-			if self.use_imap:
-				email_server.imap.logout()
-		# reset failed attempts count
-		self.set_failed_attempts_count(0)
 
-		return email_server
+	@classmethod
+	def throw_invalid_credentials_exception(cls):
+		frappe.throw(
+			_("Incorrect email or password. Please check your login credentials."),
+			exc=InvalidEmailCredentials,
+			title=_("Invalid Credentials")
+		)
 
 	def handle_incoming_connect_error(self, description):
 		if test_internet():
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 9ba080bfda..9eda1ba96c 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -59,10 +59,6 @@ class EmailServer:
 			frappe.msgprint(_('Invalid Mail Server. Please rectify and try again.'))
 			raise
 
-		except Exception as e:
-			frappe.msgprint(_('Cannot connect: {0}').format(str(e)))
-			raise
-
 	def connect_pop(self):
 		#this method return pop connection
 		try:
diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py
index 7d179884b8..f53b835757 100644
--- a/frappe/email/smtp.py
+++ b/frappe/email/smtp.py
@@ -242,11 +242,8 @@ class SMTPServer:
 			return self._sess
 
 		except smtplib.SMTPAuthenticationError as e:
-			frappe.throw(
-				_("Incorrect email or password. Please check your login credentials."),
-				exc=frappe.ValidationError,
-				title=_("Invalid Credentials")
-			)
+			from frappe.email.doctype.email_account.email_account import EmailAccount
+			EmailAccount.throw_invalid_credentials_exception()
 
 		except _socket.error as e:
 			# Invalid mail server -- due to refusing connection

From a8a22d93f0e041d93a3d73c137426132cd69ab7b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 4 Nov 2020 13:36:34 +0530
Subject: [PATCH 159/319] fix: Update child values for existing rows (bp
 #11737) (#11860)

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
---
 .../sample_import_file_for_update.csv         |  4 +--
 frappe/core/doctype/data_import/importer.py   |  4 ++-
 .../core/doctype/data_import/test_importer.py | 27 +++++++++++++------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/frappe/core/doctype/data_import/fixtures/sample_import_file_for_update.csv b/frappe/core/doctype/data_import/fixtures/sample_import_file_for_update.csv
index 656985b519..e48208ea72 100644
--- a/frappe/core/doctype/data_import/fixtures/sample_import_file_for_update.csv
+++ b/frappe/core/doctype/data_import/fixtures/sample_import_file_for_update.csv
@@ -1,2 +1,2 @@
-Title  ,Description        ,Number ,another_number ,ID (Table Field 1) ,Child Title (Table Field 1) ,Child Description (Table Field 1) ,Child 2 Title (Table Field 2) ,Child 2 Date (Table Field 2) ,Child 2 Number (Table Field 2) ,Child Title (Table Field 1 Again) ,Child Date (Table Field 1 Again) ,Child Number (Table Field 1 Again) ,table_field_1_again.child_another_number
-Test 26  ,test description   ,1      ,2              ,""                 ,child title                 ,child description                 ,child title                   ,14-08-2019                   ,4                              ,child title again                 ,22-09-2020                       ,5                                  , 7
+Title,Description,Number,another_number,ID (Table Field 1),Child Title (Table Field 1),Child Description (Table Field 1),Child 2 Title (Table Field 2),Child 2 Date (Table Field 2),Child 2 Number (Table Field 2),Child Title (Table Field 1 Again),Child Date (Table Field 1 Again),Child Number (Table Field 1 Again),table_field_1_again.child_another_number
+Test 26,test description,1,2,"",child title,child description,child title,14-08-2019,4,child title again,22-09-2020,5,7
diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 5271690527..7880648b6f 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -616,7 +616,9 @@ class Row:
 			id_field = get_id_field(doctype)
 			id_value = doc.get(id_field.fieldname)
 			if id_value and frappe.db.exists(doctype, id_value):
-				doc = frappe.get_doc(doctype, id_value)
+				existing_doc = frappe.get_doc(doctype, id_value)
+				existing_doc.update(doc)
+				doc = existing_doc
 			else:
 				# for table rows being inserted in update
 				# create a new doc with defaults set
diff --git a/frappe/core/doctype/data_import/test_importer.py b/frappe/core/doctype/data_import/test_importer.py
index 249451fd4d..b083b9eaaa 100644
--- a/frappe/core/doctype/data_import/test_importer.py
+++ b/frappe/core/doctype/data_import/test_importer.py
@@ -5,12 +5,14 @@ from __future__ import unicode_literals
 
 import unittest
 import frappe
+from frappe.core.doctype.data_import.importer import Importer
 from frappe.utils import getdate, format_duration
 
 doctype_name = 'DocType for Import'
 
 class TestImporter(unittest.TestCase):
-	def setUp(self):
+	@classmethod
+	def setUpClass(cls):
 		create_doctype_if_not_exists(doctype_name)
 
 	def test_data_import_from_file(self):
@@ -71,19 +73,28 @@ class TestImporter(unittest.TestCase):
 		self.assertEqual(warnings[2]['message'], "<b>Title</b> is a mandatory field")
 
 	def test_data_import_update(self):
-		if not frappe.db.exists(doctype_name, 'Test 26'):
-			frappe.get_doc(
-				doctype=doctype_name,
-				title='Test 26'
-			).insert()
+		existing_doc = frappe.get_doc(
+			doctype=doctype_name,
+			title=frappe.generate_hash(doctype_name, 8),
+			table_field_1=[{'child_title': 'child title to update'}]
+		)
+		existing_doc.save()
+		frappe.db.commit()
 
 		import_file = get_import_file('sample_import_file_for_update')
 		data_import = self.get_importer(doctype_name, import_file, update=True)
-		data_import.start_import()
+		i = Importer(data_import.reference_doctype, data_import=data_import)
+
+		# update child table id in template date
+		i.import_file.raw_data[1][4] = existing_doc.table_field_1[0].name
+		i.import_file.raw_data[1][0] = existing_doc.name
+		i.import_file.parse_data_from_template()
+		i.import_data()
 
-		updated_doc = frappe.get_doc(doctype_name, 'Test 26')
+		updated_doc = frappe.get_doc(doctype_name, existing_doc.name)
 		self.assertEqual(updated_doc.description, 'test description')
 		self.assertEqual(updated_doc.table_field_1[0].child_title, 'child title')
+		self.assertEqual(updated_doc.table_field_1[0].name, existing_doc.table_field_1[0].name)
 		self.assertEqual(updated_doc.table_field_1[0].child_description, 'child description')
 		self.assertEqual(updated_doc.table_field_1_again[0].child_title, 'child title again')
 

From 199ad3b7ccb2732d9b52bb2d7b37c02ef63350f1 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 4 Nov 2020 15:09:39 +0530
Subject: [PATCH 160/319] fix: Doctype query in create new shortcut (bp #11864)
 (#11865)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 .../permitted_documents_for_user.py                        | 2 +-
 frappe/public/js/frappe/widgets/widget_dialog.js           | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 97209cd8ea..c928939119 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -47,7 +47,7 @@ def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
 	user_perms.build_permissions()
-	can_read = user_perms.can_read
+	can_read = user_perms.can_read # Does not include child tables
 
 	single_doctypes = [d[0] for d in frappe.db.get_values("DocType", {"issingle": 1})]
 
diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index c111158bad..d368a1f152 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -150,7 +150,12 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						this.dialog.fields_dict.link_to.get_query = () => {
-							return { filters: { istable: false } };
+							return {
+								query: "frappe.core.report.permitted_documents_for_user.permitted_documents_for_user.query_doctypes",
+								filters: {
+									user: frappe.session.user
+								}
+							};
 						};
 					} else {
 						this.dialog.fields_dict.link_to.get_query = null;

From d3e64eb4838b3f93e93a1fd0a20193c2eacca23a Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 4 Nov 2020 15:01:32 +0530
Subject: [PATCH 161/319] fix(minor): minor fixes in document_naming.py and
 mandatory

---
 .../document_naming_rule/document_naming_rule.json     | 10 ++++++----
 .../document_naming_rule/document_naming_rule.py       |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.json b/frappe/core/doctype/document_naming_rule/document_naming_rule.json
index 79eebdbe64..4a88e3be6e 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.json
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.json
@@ -34,7 +34,8 @@
    "fieldname": "prefix",
    "fieldtype": "Data",
    "label": "Prefix",
-   "mandatory_depends_on": "eval:doc.naming_by===\"Numbered\""
+   "mandatory_depends_on": "eval:doc.naming_by===\"Numbered\"",
+   "reqd": 1
   },
   {
    "fieldname": "counter",
@@ -48,7 +49,8 @@
    "fieldname": "prefix_digits",
    "fieldtype": "Int",
    "label": "Digits",
-   "mandatory_depends_on": "eval:doc.naming_by===\"Numbered\""
+   "mandatory_depends_on": "eval:doc.naming_by===\"Numbered\"",
+   "reqd": 1
   },
   {
    "fieldname": "naming_section",
@@ -69,7 +71,7 @@
    "options": "Document Naming Rule Condition"
   },
   {
-   "description": "Rules with higher priority will be applied first.",
+   "description": "Rules with higher priority number will be applied first.",
    "fieldname": "priority",
    "fieldtype": "Int",
    "label": "Priority"
@@ -77,7 +79,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-09-21 10:23:34.401539",
+ "modified": "2020-11-04 14:38:14.836056",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Document Naming Rule",
diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.py b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
index 2de7552dc1..3ff47facc3 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -13,7 +13,7 @@ class DocumentNamingRule(Document):
 		Apply naming rules for the given document. Will set `name` if the rule is matched.
 		'''
 		if self.conditions:
-			if not evaluate_filters(doc, [(d.field, d.condition, d.value) for d in self.conditions]):
+			if not evaluate_filters(doc, [(self.document_type, d.field, d.condition, d.value) for d in self.conditions]):
 				return
 
 		counter = frappe.db.get_value(self.doctype, self.name, 'counter', for_update=True) or 0

From 93b4187c173e85d1639e53f829225491392eeade Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Wed, 4 Nov 2020 23:18:39 +0530
Subject: [PATCH 162/319] fix: Total Row in Checkbox Column Reports

---
 frappe/public/js/frappe/views/reports/query_report.js | 3 ++-
 1 file changed, 2 insertions(+), 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 53cee5b348..2d2282be43 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1043,7 +1043,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					// applied to Float, Currency fields, needed only for currency formatting.
 					// make first data column have value 'Total'
 					let index = 1;
-					if (this.datatable && this.datatable.options.checkboxColumn) index = 2;
+					let datatable = this.report_settings.get_datatable_options({});
+					if (datatable && datatable.checkboxColumn) index = 2;
 
 					if (column.colIndex === index && !value) {
 						value = "Total";

From 5ace940f4dac609e22a975db80657c30430056d4 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 5 Nov 2020 10:28:41 +0530
Subject: [PATCH 163/319] fix: Check of `get_datatable_options` exists in
 report settings

---
 frappe/public/js/frappe/views/reports/query_report.js | 7 +++++--
 1 file changed, 5 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 2d2282be43..f8bd1cdea8 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -1043,8 +1043,11 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					// applied to Float, Currency fields, needed only for currency formatting.
 					// make first data column have value 'Total'
 					let index = 1;
-					let datatable = this.report_settings.get_datatable_options({});
-					if (datatable && datatable.checkboxColumn) index = 2;
+
+					if (this.report_settings.get_datatable_options) {
+						let datatable = this.report_settings.get_datatable_options({});
+						if (datatable && datatable.checkboxColumn) index = 2;
+					}
 
 					if (column.colIndex === index && !value) {
 						value = "Total";

From 39e3279f667e2cec47cbed6de5bfd7626815e093 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2020 11:21:46 +0530
Subject: [PATCH 164/319] fix: enable disable save when navigating between docs
 (bp #11867) (#11876)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
---
 frappe/core/doctype/report/report.js | 6 +++---
 frappe/public/js/frappe/form/form.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index 14e9b3a901..f78fd3e812 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -2,7 +2,9 @@ frappe.ui.form.on('Report', {
 	refresh: function(frm) {
 		if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
 			// make the document read-only
-			frm.set_read_only();
+			frm.disable_form();
+		} else {
+			frm.enable_save();
 		}
 
 		let doc = frm.doc;
@@ -32,8 +34,6 @@ frappe.ui.form.on('Report', {
 				});
 			}, doc.disabled ? "fa fa-check" : "fa fa-off");
 		}
-
-		frm.events.report_type(frm);
 	},
 
 	ref_doctype: function(frm) {
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 1c1c7b1f01..bb9e8c22d1 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -261,7 +261,7 @@ frappe.ui.form.Form = class FrappeForm {
 		cur_frm = this;
 
 		if(this.docname) { // document to show
-
+			this.save_disabled = false;
 			// set the doc
 			this.doc = frappe.get_doc(this.doctype, this.docname);
 

From e42e741a5fc85e9bf744176aecbd26175ecf5e41 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 5 Nov 2020 19:22:53 +0530
Subject: [PATCH 165/319] chore: Add Release Notes for v13-beta-6 (#11882)

---
 frappe/change_log/v13/v13_0_0-beta_6.md | 47 +++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_6.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_6.md b/frappe/change_log/v13/v13_0_0-beta_6.md
new file mode 100644
index 0000000000..a750af1f66
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_6.md
@@ -0,0 +1,47 @@
+# Version 13.0.0 Beta 6 Release Notes
+
+## Fixes and Enhancements
+
+- Fixed back navigation on user-profile ([#11627](https://github.com/frappe/frappe/pull/11627))
+- Multiple fixes related to reports ([#11593](https://github.com/frappe/frappe/pull/11593)) ([#10959](https://github.com/frappe/frappe/pull/10959)) ([#11533](https://github.com/frappe/frappe/pull/11533)) ([#11459](https://github.com/frappe/frappe/pull/11459)) ([#10987](https://github.com/frappe/frappe/pull/10987)) ([#11612](https://github.com/frappe/frappe/pull/11612)) ([#11468](https://github.com/frappe/frappe/pull/11468)) ([#11593](https://github.com/frappe/frappe/pull/11593))
+- Fixed breaking of website theme on updating site ([#11663](https://github.com/frappe/frappe/pull/11663))
+- Fixed `@` character failure in link field search ([#11851](https://github.com/frappe/frappe/pull/11851))
+- Freeze buttons during request in Form view ([#11570](https://github.com/frappe/frappe/pull/11570))
+- Fixed images shown as broken in comment ([#11337](https://github.com/frappe/frappe/pull/11337))
+- Mute badges in desk shortcut if the count is zero ([#11515](https://github.com/frappe/frappe/pull/11515))
+- Now system will use hostname config in sitemap.xml ([#11160](https://github.com/frappe/frappe/pull/11160))
+- Enhancements in notifications ([#11398](https://github.com/frappe/frappe/pull/11398)) ([#11409](https://github.com/frappe/frappe/pull/11409))
+- Fixed "undefined" value on Number Card ([#11117](https://github.com/frappe/frappe/pull/11117))
+- Dashboard fixes ([#11074](https://github.com/frappe/frappe/pull/11074)) ([#11186](https://github.com/frappe/frappe/pull/11186)) ([#11773](https://github.com/frappe/frappe/pull/11773))  ([#11340](https://github.com/frappe/frappe/pull/11340)) ([#11277](https://github.com/frappe/frappe/pull/11277))
+- Data Import fixes ([#11083](https://github.com/frappe/frappe/pull/11083)) ([#11159](https://github.com/frappe/frappe/pull/11159))
+- Newsletter fixes ([#11401](https://github.com/frappe/frappe/pull/11401)) ([#11321](https://github.com/frappe/frappe/pull/11321))
+- Website Enhancements ([#11285](https://github.com/frappe/frappe/pull/11285)) ([#11584](https://github.com/frappe/frappe/pull/11584)) ([#11646](https://github.com/frappe/frappe/pull/11646)) ([#11315](https://github.com/frappe/frappe/pull/11315))
+- Cleaned up layout of DocType, User, Role and added home_page to Portal Settings & Role ([#11225](https://github.com/frappe/frappe/pull/11225))
+
+## Features
+
+- Added ability to override doctype classes from hooks ([#11527](https://github.com/frappe/frappe/pull/11527))
+- Introduced Razorpay client ([#11418](https://github.com/frappe/frappe/pull/11418))
+- Introduced option to configurable navbar logo and dropdowns ([#11213](https://github.com/frappe/frappe/pull/11213))
+- Added Paytm integration ([#9955](https://github.com/frappe/frappe/pull/9955))
+- Introduced Log Settings ([#11699](https://github.com/frappe/frappe/pull/11699))
+- Added option to set custom due_date for assignments in Assignment Rule ([#11669](https://github.com/frappe/frappe/pull/11669))
+- Added option to anonymize IP for Google Analytics ([#11594](https://github.com/frappe/frappe/pull/11594))
+- Introduced System Settings to automatically delete old Prepared Reports ([#9751](https://github.com/frappe/frappe/pull/9751))
+- Added option in assignment rule to assign based on field value ([#11619](https://github.com/frappe/frappe/pull/11619))
+- Rule based naming of documents ([#11439](https://github.com/frappe/frappe/pull/11439))
+- Added WhatsApp/SMS channels for Notification ([#9623](https://github.com/frappe/frappe/pull/9623))
+- Added option to resize images in text editor ([#10820](https://github.com/frappe/frappe/pull/10820))
+- Now usage of `get_print`, `attach_print` and `send_mail` is allowed in Server Scripts ([#11260](https://github.com/frappe/frappe/pull/11260)) ([#11162](https://github.com/frappe/frappe/pull/11162))
+- Introduced option to disable custom script ([#11342](https://github.com/frappe/frappe/pull/11342))
+- Option to show child table row index number in report builder ([#11246](https://github.com/frappe/frappe/pull/11246))
+
+## Performance
+
+- Used get_list with limit instead of count for faster form load ([#11701](https://github.com/frappe/frappe/pull/11701))
+
+## Security
+
+- Removed `ignore_permissions` flag from API request to avoid unauthorized data access ([#11452](https://github.com/frappe/frappe/pull/11452))
+- Added noreferrer policy to footer links to avoid token key abuse ([#11747](https://github.com/frappe/frappe/pull/11747))
+- Restricted cookies to the host domain ([#11469](https://github.com/frappe/frappe/pull/11469)) ([#11231](https://github.com/frappe/frappe/pull/11231))

From 3f5af825ed2294f8f0896f3b1c59d9c5772cc347 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 6 Nov 2020 14:02:27 +0530
Subject: [PATCH 166/319] fix(pdf): PDF generation shouldn't fail in background
 jobs and tests (bp #11792) (#11886)

Co-authored-by: Aditya Hase <aditya@adityahase.com>
---
 frappe/tests/test_pdf.py | 7 ++++++-
 frappe/utils/pdf.py      | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frappe/tests/test_pdf.py b/frappe/tests/test_pdf.py
index 73a49bb832..be287e0d92 100644
--- a/frappe/tests/test_pdf.py
+++ b/frappe/tests/test_pdf.py
@@ -46,4 +46,9 @@ class TestPdf(unittest.TestCase):
 		self.assertTrue(reader.isEncrypted)
 		if six.PY2:
 			password = frappe.safe_encode(password)
-		self.assertTrue(reader.decrypt(password))
\ No newline at end of file
+		self.assertTrue(reader.decrypt(password))
+
+	def test_pdf_generation_as_a_user(self):
+		frappe.set_user("Administrator")
+		pdf = pdfgen.get_pdf(self.html)
+		self.assertTrue(pdf)
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index aabe033e26..ce9dab58d1 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -112,8 +112,7 @@ def prepare_options(html, options):
 	options.update(html_options or {})
 
 	# cookies
-	if not frappe.flags.in_test:
-		options.update(get_cookie_options())
+	options.update(get_cookie_options())
 
 	# page size
 	if not options.get("page-size"):
@@ -130,7 +129,7 @@ def get_cookie_options():
 
 		# Remove port from request.host
 		# https://werkzeug.palletsprojects.com/en/0.16.x/wrappers/#werkzeug.wrappers.BaseRequest.host
-		domain = frappe.local.request.host.split(":", 1)[0]
+		domain = frappe.utils.get_host_name().split(":", 1)[0]
 		with open(cookiejar, "w") as f:
 			f.write("sid={}; Domain={};\n".format(frappe.session.sid, domain))
 

From 99f9b2c5487544f85a9b52226ae47f7dacaa207e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 6 Nov 2020 15:25:03 +0530
Subject: [PATCH 167/319] fix: Remove scrolling on focusout event for
 touchscreen devices (bp #11888) (#11889)

(cherry picked from commit 59c5437af7d5768fa3301dbf13e5378596fc3d3d)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
---
 frappe/public/js/frappe/form/controls/base_input.js | 12 ------------
 frappe/public/js/frappe/form/controls/data.js       |  1 -
 2 files changed, 13 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/base_input.js b/frappe/public/js/frappe/form/controls/base_input.js
index f3f04ec4d8..2f051a4701 100644
--- a/frappe/public/js/frappe/form/controls/base_input.js
+++ b/frappe/public/js/frappe/form/controls/base_input.js
@@ -133,18 +133,6 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
 			me.parse_validate_and_set_in_model(me.get_input_value(), e);
 		});
 	},
-	bind_focusout: function() {
-		// on touchscreen devices, scroll to top
-		// so that static navbar and page head don't overlap the input
-		if (frappe.dom.is_touchscreen()) {
-			var me = this;
-			this.$input && this.$input.on("focusout", function() {
-				if (frappe.dom.is_touchscreen()) {
-					frappe.utils.scroll_to(me.$wrapper);
-				}
-			});
-		}
-	},
 	set_label: function(label) {
 		if(label) this.df.label = label;
 
diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js
index bbf9a89072..4db2553bd1 100644
--- a/frappe/public/js/frappe/form/controls/data.js
+++ b/frappe/public/js/frappe/form/controls/data.js
@@ -21,7 +21,6 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
 		this.input = this.$input.get(0);
 		this.has_input = true;
 		this.bind_change_event();
-		this.bind_focusout();
 		this.setup_autoname_check();
 		if (this.df.options == 'Phone') {
 			this.setup_phone();

From 1cfbf61fbeaedd9a8c0de5952879fc9bcebdf9d7 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 30 Oct 2020 17:34:40 +0530
Subject: [PATCH 168/319] fix: Clear cache after updating defaults manually

(cherry picked from commit 823aec2d872314ca5add8e1e5c5ed81ba932e57e)
---
 frappe/installer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/installer.py b/frappe/installer.py
index c6549f16ee..c0092d7c78 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -3,7 +3,7 @@
 
 import json
 import os
-
+from frappe.defaults import _clear_cache
 import frappe
 
 
@@ -111,8 +111,8 @@ def remove_from_installed_apps(app_name):
 	installed_apps = frappe.get_installed_apps()
 	if app_name in installed_apps:
 		installed_apps.remove(app_name)
-		frappe.db.set_global("installed_apps", json.dumps(installed_apps))
-		frappe.get_single("Installed Applications").update_versions()
+		frappe.db.set_value("DefaultValue", {"defkey": "installed_apps"}, "defvalue", json.dumps(installed_apps))
+		_clear_cache("__global")
 		frappe.db.commit()
 		if frappe.flags.in_install:
 			post_install()

From e14056413627c452c081a7235f2bf8ec408fad28 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 3 Nov 2020 13:55:26 +0530
Subject: [PATCH 169/319] test: Added tests for bench
 remove-from-installed-apps

(cherry picked from commit cb44492febb27deb167af374c4c76c5bde3f357d)

# Conflicts:
#	frappe/tests/test_commands.py
---
 frappe/tests/test_commands.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py
index e7e639c775..9fe3857195 100644
--- a/frappe/tests/test_commands.py
+++ b/frappe/tests/test_commands.py
@@ -119,3 +119,31 @@ class TestCommands(BaseTestCommands):
 		# test 6: take a backup with --verbose
 		self.execute("bench --site {site} backup --verbose")
 		self.assertEquals(self.returncode, 0)
+<<<<<<< HEAD
+=======
+
+	def test_recorder(self):
+		frappe.recorder.stop()
+
+		self.execute("bench --site {site} start-recording")
+		frappe.local.cache = {}
+		self.assertEqual(frappe.recorder.status(), True)
+
+		self.execute("bench --site {site} stop-recording")
+		frappe.local.cache = {}
+		self.assertEqual(frappe.recorder.status(), False)
+
+	def test_remove_from_installed_apps(self):
+		from frappe.installer import add_to_installed_apps
+		app = "test_remove_app"
+		add_to_installed_apps(app)
+
+		# check: confirm that add_to_installed_apps added the app in the default
+		self.execute("bench --site {site} list-apps")
+		self.assertIn(app, self.stdout)
+
+		# test 1: remove app from installed_apps global default
+		self.execute("bench --site {site} remove-from-installed-apps {app}", {"app": app})
+		self.execute("bench --site {site} list-apps")
+		self.assertNotIn(app, self.stdout)
+>>>>>>> cb44492feb... test: Added tests for bench remove-from-installed-apps

From 7d19294a2901650941cb9af685e80b08fbdc6f32 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 6 Nov 2020 17:35:46 +0530
Subject: [PATCH 170/319] chore: Resolve conflicts

---
 frappe/tests/test_commands.py | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py
index 9fe3857195..71188e3957 100644
--- a/frappe/tests/test_commands.py
+++ b/frappe/tests/test_commands.py
@@ -119,19 +119,6 @@ class TestCommands(BaseTestCommands):
 		# test 6: take a backup with --verbose
 		self.execute("bench --site {site} backup --verbose")
 		self.assertEquals(self.returncode, 0)
-<<<<<<< HEAD
-=======
-
-	def test_recorder(self):
-		frappe.recorder.stop()
-
-		self.execute("bench --site {site} start-recording")
-		frappe.local.cache = {}
-		self.assertEqual(frappe.recorder.status(), True)
-
-		self.execute("bench --site {site} stop-recording")
-		frappe.local.cache = {}
-		self.assertEqual(frappe.recorder.status(), False)
 
 	def test_remove_from_installed_apps(self):
 		from frappe.installer import add_to_installed_apps
@@ -146,4 +133,3 @@ class TestCommands(BaseTestCommands):
 		self.execute("bench --site {site} remove-from-installed-apps {app}", {"app": app})
 		self.execute("bench --site {site} list-apps")
 		self.assertNotIn(app, self.stdout)
->>>>>>> cb44492feb... test: Added tests for bench remove-from-installed-apps

From c9b58db2a387f03bcf8552425ff87a9bd9c44f0d Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh@erpnext.com>
Date: Fri, 6 Nov 2020 18:55:05 +0530
Subject: [PATCH 171/319] chore: update version

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 381abc6599..507266d578 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.4'
+__version__ = '13.0.0-beta.5'
 __title__ = "Frappe Framework"
 
 local = Local()

From f21b14f5857c73562aa6c59dac2378006f809bce Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Fri, 6 Nov 2020 19:16:34 +0550
Subject: [PATCH 172/319] bumped to version 13.0.0-beta.6

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 507266d578..2224bdfc97 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.5'
+__version__ = '13.0.0-beta.6'
 __title__ = "Frappe Framework"
 
 local = Local()

From 54f0889847360a9d3cf96cf7f9e4c585d5fa1c86 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 9 Nov 2020 15:31:49 +0530
Subject: [PATCH 173/319] refactor: Move get_build_version to utils.py

(cherry picked from commit 01312889f8834facfa7ab8f111a4334db6c2b47b)
---
 frappe/utils/__init__.py |  8 ++++++++
 frappe/www/desk.py       | 10 +---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index d3bf1dd10c..b8866b53eb 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -721,3 +721,11 @@ def get_file_size(path, format=False):
 		num /= 1024
 
 	return "{0:.1f}{1}{2}".format(num, 'Yi', suffix)
+
+def get_build_version():
+	try:
+		return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build')))
+	except OSError:
+		# .build can sometimes not exist
+		# this is not a major problem so send fallback
+		return frappe.utils.random_string(8)
\ No newline at end of file
diff --git a/frappe/www/desk.py b/frappe/www/desk.py
index c6bce850a5..e5c3c6af5c 100644
--- a/frappe/www/desk.py
+++ b/frappe/www/desk.py
@@ -36,7 +36,7 @@ def get_context(context):
 
 	context.update({
 		"no_cache": 1,
-		"build_version": get_build_version(),
+		"build_version": frappe.utils.get_build_version(),
 		"include_js": hooks["app_include_js"],
 		"include_css": hooks["app_include_css"],
 		"sounds": hooks["sounds"],
@@ -82,11 +82,3 @@ def get_desk_assets(build_version):
 		"boot": data["boot"],
 		"assets": assets
 	}
-
-def get_build_version():
-	try:
-		return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build')))
-	except OSError:
-		# .build can sometimes not exist
-		# this is not a major problem so send fallback
-		return frappe.utils.random_string(8)

From ea66343ad862348066be67ec821089b5a4026dfa Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 9 Nov 2020 15:54:17 +0530
Subject: [PATCH 174/319] fix(website): Bust cache by passing build_version to
 link and script sources

(cherry picked from commit 13175a8bc4615ec8eab31045413c2fe5c4052a04)
---
 frappe/templates/base.html | 8 ++++----
 frappe/utils/__init__.py   | 2 +-
 frappe/website/router.py   | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index aaed0035b9..dc87ab72dd 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -30,11 +30,11 @@
 		{%- if theme.name != 'Standard' -%}
 		<link type="text/css" rel="stylesheet" href="{{ theme.theme_url }}">
 		{%- else -%}
-		<link type="text/css" rel="stylesheet" href="/assets/css/frappe-web-b4.css">
+		<link type="text/css" rel="stylesheet" href="/assets/css/frappe-web-b4.css?ver={{ build_version }}">
 		{%- endif -%}
 
 		{%- for link in web_include_css %}
-		<link type="text/css" rel="stylesheet" href="{{ link|abs_url }}">
+		<link type="text/css" rel="stylesheet" href="{{ link|abs_url }}?ver={{ build_version }}">
 		{%- endfor -%}
 	{%- endblock -%}
 
@@ -94,12 +94,12 @@
 	{% block base_scripts %}
 	<!-- js should be loaded in body! -->
 	<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
+	<script type="text/javascript" src="/assets/js/frappe-web.min.js?ver={{ build_version }}"></script>
 	<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
 	{% endblock %}
 
 	{%- for link in web_include_js %}
-	<script type="text/javascript" src="{{ link | abs_url }}"></script>
+	<script type="text/javascript" src="{{ link | abs_url }}?ver={{ build_version }}"></script>
 	{%- endfor -%}
 
 	{%- block script %}
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index b8866b53eb..c209ee13c9 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -728,4 +728,4 @@ def get_build_version():
 	except OSError:
 		# .build can sometimes not exist
 		# this is not a major problem so send fallback
-		return frappe.utils.random_string(8)
\ No newline at end of file
+		return frappe.utils.random_string(8)
diff --git a/frappe/website/router.py b/frappe/website/router.py
index 2aa9cebe30..9e9eb64cbb 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -275,8 +275,7 @@ def get_page_info(path, app, start, basepath=None, app_path=None, fname=None):
 	# extract properties from controller attributes
 	load_properties_from_controller(page_info)
 
-	# if not page_info.title:
-	# 	print('no-title-for', page_info.route)
+	page_info.build_version = frappe.utils.get_build_version()
 
 	return page_info
 

From c8c08b6830dae30ecd271980a463c4e0dc6d6dc0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 15:48:41 +0530
Subject: [PATCH 175/319] fix(website): Bust cache by passing build_version to
 link and script src (bp #11903) (#11909)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 frappe/templates/base.html |  8 ++++----
 frappe/utils/__init__.py   |  8 ++++++++
 frappe/website/router.py   |  3 +--
 frappe/www/desk.py         | 10 +---------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index aaed0035b9..dc87ab72dd 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -30,11 +30,11 @@
 		{%- if theme.name != 'Standard' -%}
 		<link type="text/css" rel="stylesheet" href="{{ theme.theme_url }}">
 		{%- else -%}
-		<link type="text/css" rel="stylesheet" href="/assets/css/frappe-web-b4.css">
+		<link type="text/css" rel="stylesheet" href="/assets/css/frappe-web-b4.css?ver={{ build_version }}">
 		{%- endif -%}
 
 		{%- for link in web_include_css %}
-		<link type="text/css" rel="stylesheet" href="{{ link|abs_url }}">
+		<link type="text/css" rel="stylesheet" href="{{ link|abs_url }}?ver={{ build_version }}">
 		{%- endfor -%}
 	{%- endblock -%}
 
@@ -94,12 +94,12 @@
 	{% block base_scripts %}
 	<!-- js should be loaded in body! -->
 	<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="/assets/js/frappe-web.min.js"></script>
+	<script type="text/javascript" src="/assets/js/frappe-web.min.js?ver={{ build_version }}"></script>
 	<script type="text/javascript" src="/assets/js/bootstrap-4-web.min.js"></script>
 	{% endblock %}
 
 	{%- for link in web_include_js %}
-	<script type="text/javascript" src="{{ link | abs_url }}"></script>
+	<script type="text/javascript" src="{{ link | abs_url }}?ver={{ build_version }}"></script>
 	{%- endfor -%}
 
 	{%- block script %}
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index d3bf1dd10c..c209ee13c9 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -721,3 +721,11 @@ def get_file_size(path, format=False):
 		num /= 1024
 
 	return "{0:.1f}{1}{2}".format(num, 'Yi', suffix)
+
+def get_build_version():
+	try:
+		return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build')))
+	except OSError:
+		# .build can sometimes not exist
+		# this is not a major problem so send fallback
+		return frappe.utils.random_string(8)
diff --git a/frappe/website/router.py b/frappe/website/router.py
index 2aa9cebe30..9e9eb64cbb 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -275,8 +275,7 @@ def get_page_info(path, app, start, basepath=None, app_path=None, fname=None):
 	# extract properties from controller attributes
 	load_properties_from_controller(page_info)
 
-	# if not page_info.title:
-	# 	print('no-title-for', page_info.route)
+	page_info.build_version = frappe.utils.get_build_version()
 
 	return page_info
 
diff --git a/frappe/www/desk.py b/frappe/www/desk.py
index c6bce850a5..e5c3c6af5c 100644
--- a/frappe/www/desk.py
+++ b/frappe/www/desk.py
@@ -36,7 +36,7 @@ def get_context(context):
 
 	context.update({
 		"no_cache": 1,
-		"build_version": get_build_version(),
+		"build_version": frappe.utils.get_build_version(),
 		"include_js": hooks["app_include_js"],
 		"include_css": hooks["app_include_css"],
 		"sounds": hooks["sounds"],
@@ -82,11 +82,3 @@ def get_desk_assets(build_version):
 		"boot": data["boot"],
 		"assets": assets
 	}
-
-def get_build_version():
-	try:
-		return str(os.path.getmtime(os.path.join(frappe.local.sites_path, '.build')))
-	except OSError:
-		# .build can sometimes not exist
-		# this is not a major problem so send fallback
-		return frappe.utils.random_string(8)

From e7025eba0c65d76c6c9eaa007d0ca0ce549c2022 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Fri, 30 Oct 2020 14:04:03 +0530
Subject: [PATCH 176/319] fix: create auto_repeat field if docfield/custom
 field does not exist

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

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 1aa6beb6a6..3a80decc80 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -570,7 +570,8 @@ class DocType(Document):
 	def make_repeatable(self):
 		"""If allow_auto_repeat is set, add auto_repeat custom field."""
 		if self.allow_auto_repeat:
-			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.name}):
+			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.name}) and \
+				not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}):
 				insert_after = self.fields[len(self.fields) - 1].fieldname
 				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
 				create_custom_field(self.name, df)
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 5c4e16fad7..9a60fd23dc 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -125,7 +125,8 @@ class CustomizeForm(Document):
 
 		#If allow_auto_repeat is set, add auto_repeat custom field.
 		if self.allow_auto_repeat:
-			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}):
+			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}) and \
+				not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}):
 				insert_after = self.fields[len(self.fields) - 1].fieldname
 				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
 				create_custom_field(self.doc_type, df)

From e40ab35c3a3ef27a223f98e7bed78f3ae80efa4d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 17 Nov 2020 19:20:44 +0530
Subject: [PATCH 177/319] feat: check if auto_repeat field is already present

---
 .../doctype/customize_form/customize_form.py  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 9a60fd23dc..6eae8e4c86 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -125,11 +125,20 @@ class CustomizeForm(Document):
 
 		#If allow_auto_repeat is set, add auto_repeat custom field.
 		if self.allow_auto_repeat:
-			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}) and \
-				not frappe.db.exists('DocField', {'fieldname': 'auto_repeat', 'parent': self.name}):
-				insert_after = self.fields[len(self.fields) - 1].fieldname
-				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
-				create_custom_field(self.doc_type, df)
+			all_fields = [df.fieldname for df in meta.fields]
+
+			if "auto_repeat" in all_fields:
+				return
+
+			insert_after = self.fields[len(self.fields) - 1].fieldname
+			create_custom_field(self.doc_type, dict(
+				fieldname='auto_repeat',
+				label='Auto Repeat',
+				fieldtype='Link',
+				options='Auto Repeat',
+				insert_after=insert_after,
+				read_only=1, no_copy=1, print_hide=1
+			))
 
 		# NOTE doc is sent to clientside by run_method
 

From b57d1b9111f024807e5f0dc7786ce6d917a07a88 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 23 Nov 2020 17:18:44 +0530
Subject: [PATCH 178/319] chore: Bump version to 13.0.0-beta.7

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index bd6fb7f712..9363a51716 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.6'
+__version__ = '13.0.0-beta.7'
 
 __title__ = "Frappe Framework"
 

From 2f18487d7a294471fdc82cf2830609596fe7938e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 23 Nov 2020 17:23:07 +0530
Subject: [PATCH 179/319] chore: Bump version to 13.0.0-beta.7

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index bd6fb7f712..9363a51716 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.6'
+__version__ = '13.0.0-beta.7'
 
 __title__ = "Frappe Framework"
 

From c1e50d34d7e3f2b863ca06fa92d506a00f4560c8 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 10 Nov 2020 11:49:03 +0530
Subject: [PATCH 180/319] fix(query-report): Show scrollbar for datatable

Show report-wrapper before rendering datatable

(cherry picked from commit e7fb4d0ef3bff2c6da3b77038a90d6b0849f031a)
---
 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 f8bd1cdea8..a17ea2a4ba 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -813,6 +813,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			data.splice(-1, 1);
 		}
 
+		this.$report.show();
 		if (this.datatable && this.datatable.options
 			&& (this.datatable.options.showTotalRow ===this.raw_data.add_total_row)) {
 			this.datatable.options.treeView = this.tree_report;
@@ -844,7 +845,6 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		if (this.report_settings.after_datatable_render) {
 			this.report_settings.after_datatable_render(this.datatable);
 		}
-		this.$report.show();
 	}
 
 	get_chart_options(data) {

From 727f24586b6bb02196473e725d922ed8947b7ec4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 26 Oct 2020 13:01:30 +0530
Subject: [PATCH 181/319] fix(Email): use set_header to set Message-Id in
 header

(cherry picked from commit 8c1187840094bc900553f84ebdc9bcb15e82e2c5)
---
 frappe/email/email_body.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 5bb654abf3..8ac071fa61 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -198,12 +198,15 @@ class EMail:
 
 	def set_message_id(self, message_id, is_notification=False):
 		if message_id:
-			self.msg_root["Message-Id"] = '<' + message_id + '>'
+			message_id = '<' + message_id + '>'
 		else:
-			self.msg_root["Message-Id"] = get_message_id()
-			self.msg_root["isnotification"] = '<notification>'
+			message_id = get_message_id()
+			self.set_header('isnotification', '<notification>')
+
 		if is_notification:
-			self.msg_root["isnotification"] = '<notification>'
+			self.set_header('isnotification', '<notification>')
+
+		self.set_header('Message-Id', message_id)
 
 	def set_in_reply_to(self, in_reply_to):
 		"""Used to send the Message-Id of a received email back as In-Reply-To"""

From 89ba5499d76a97d6fa65068dc803e95d042d494d Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 9 Dec 2020 15:49:31 +0530
Subject: [PATCH 182/319] chore: Bump version to 13.0.0-beta.8

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9363a51716..d15ed84084 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.7'
+__version__ = '13.0.0-beta.8'
 
 __title__ = "Frappe Framework"
 

From 2aaf97dc0a70d3bb2cf2b0f7a7bd2b057a36091b Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 11 Dec 2020 16:24:10 +0530
Subject: [PATCH 183/319] fix: Reload server script via patch (#12079)

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

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 0daf29e001..b459019dd7 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -21,6 +21,7 @@ execute:frappe.reload_doc('email', 'doctype', 'document_follow')
 execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02
 execute:frappe.reload_doc('core', 'doctype', 'has_role')
 execute:frappe.reload_doc('core', 'doctype', 'communication') #2019-10-02
+execute:frappe.reload_doc('core', 'doctype', 'server_script')
 frappe.patches.v11_0.replicate_old_user_permissions
 frappe.patches.v11_0.reload_and_rename_view_log #2019-01-03
 frappe.patches.v7_1.rename_scheduler_log_to_error_log

From 2532cf6af45a93f10c9a63f71af108a50d096fe5 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 20:53:44 +0530
Subject: [PATCH 184/319] fix(workflow): Update modified timestamp (bp #12093)
 (#12094)

To sync changes in https://github.com/frappe/frappe/pull/11787 after migrate

(cherry picked from commit 41a3b8c2842ff066194970cffb2fa8cb446e9246)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/workflow/doctype/workflow/workflow.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/workflow/doctype/workflow/workflow.json b/frappe/workflow/doctype/workflow/workflow.json
index 3cb72d0eed..e8db8dcb10 100644
--- a/frappe/workflow/doctype/workflow/workflow.json
+++ b/frappe/workflow/doctype/workflow/workflow.json
@@ -99,7 +99,7 @@
  "icon": "fa fa-random",
  "idx": 1,
  "links": [],
- "modified": "2020-07-16 04:29:20.898040",
+ "modified": "2020-12-17 20:35:16.898040",
  "modified_by": "Administrator",
  "module": "Workflow",
  "name": "Workflow",

From 865536cb71fed3b6ae02593f4c352d4357108376 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 19 Dec 2020 08:56:04 +0530
Subject: [PATCH 185/319] fix: Link attachment in webform for new file (bp
 #12097) (bp #12102) (#12103)

(cherry picked from commit 85d6a640358fa0337aaac405e71b7d14395fb298)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit a6705135dcb8679d3f82deacf1cd93476182d867)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 frappe/public/js/frappe/web_form/web_form.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 4dc1a50bc4..0421147d49 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -103,6 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 	}
 
 	save() {
+		let is_new = this.is_new;
 		if (this.validate && !this.validate()) {
 			frappe.throw(__("Couldn't save, please check the data you have entered"), __("Validation Error"));
 		}
@@ -139,6 +140,18 @@ export default class WebForm extends frappe.ui.FieldGroup {
 					this.handle_success(response.message);
 					frappe.web_form.events.trigger('after_save');
 					this.after_save && this.after_save();
+					// args doctype and docname added to link doctype in file manager
+					if (is_new) {
+						frappe.call({
+							type: 'POST',
+							method: "frappe.handler.upload_file",
+							args: {
+								file_url: response.message.attachment,
+								doctype: response.message.doctype,
+								docname: response.message.name
+							}
+						});
+					}
 				}
 			},
 			always: function() {

From 888c0ba36fb0f57f28ff00438c8bc4665275125a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 24 Dec 2020 18:51:18 +0530
Subject: [PATCH 186/319] fix(patch): Remove Package Publish Tool doctypes
 (#12113) (#12124)

(cherry picked from commit bc9d6cff2e2a3be17101f0957f771ab9e4f5b377)

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 frappe/patches.txt                                  |  1 +
 frappe/patches/v13_0/delete_package_publish_tool.py | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 frappe/patches/v13_0/delete_package_publish_tool.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index b459019dd7..1a086303ba 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -317,3 +317,4 @@ frappe.patches.v13_0.web_template_set_module #2020-10-05
 frappe.patches.v13_0.remove_custom_link
 execute:frappe.delete_doc("DocType", "Footer Item")
 frappe.patches.v13_0.replace_field_target_with_open_in_new_tab
+frappe.patches.v13_0.delete_package_publish_tool
diff --git a/frappe/patches/v13_0/delete_package_publish_tool.py b/frappe/patches/v13_0/delete_package_publish_tool.py
new file mode 100644
index 0000000000..25024f58dd
--- /dev/null
+++ b/frappe/patches/v13_0/delete_package_publish_tool.py
@@ -0,0 +1,11 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	frappe.delete_doc("DocType", "Package Publish Tool", ignore_missing=True)
+	frappe.delete_doc("DocType", "Package Document Type", ignore_missing=True)
+	frappe.delete_doc("DocType", "Package Publish Target", ignore_missing=True)

From 808cea862797fd6f1207c4f1e04ace5cfa06bbbe Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Sat, 26 Dec 2020 11:10:46 +0530
Subject: [PATCH 187/319] chore: Added change log (#12127)

---
 frappe/change_log/v13/v13_0_0-beta_9.md | 121 ++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_9.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_9.md b/frappe/change_log/v13/v13_0_0-beta_9.md
new file mode 100644
index 0000000000..a31a258d94
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_9.md
@@ -0,0 +1,121 @@
+### Version 13.0.0 Beta 9 Release Notes
+
+#### Features and Enhancements
+
+- Permission Query via Server Script ([#12034](https://github.com/frappe/frappe/pull/12034))
+- Option to strip EXIF data from image files before uploading ([#12014](https://github.com/frappe/frappe/pull/12014))
+- Provision to open child table in customize form ([#12030](https://github.com/frappe/frappe/pull/12030))
+- Added date format support DD-Mon-YY ([#12056](https://github.com/frappe/frappe/pull/12056))
+- Partial Backups & Restores ([#11104](https://github.com/frappe/frappe/pull/11104))
+- Non negative check for Int, Float and Currency fields ([#11818](https://github.com/frappe/frappe/pull/11818))
+- Allow html in email templates ([#12018](https://github.com/frappe/frappe/pull/12018))
+- Web form fields support for property depends on fields (read-on… ([#11927](https://github.com/frappe/frappe/pull/11927))
+- Conditional Events in Event Streaming ([#10868](https://github.com/frappe/frappe/pull/10868))
+- Added filters and order_by fields in frappe.get_last_doc API ([#11870](https://github.com/frappe/frappe/pull/11870))
+- Check if auto_repeat field is already present ([#11970](https://github.com/frappe/frappe/pull/11970))
+- as_raw update to display content inline not always download as attachment ([#11569](https://github.com/frappe/frappe/pull/11569))
+- Reset scroll position on list paging ([#11673](https://github.com/frappe/frappe/pull/11673))
+- Validate sql file before restoring site ([#11878](https://github.com/frappe/frappe/pull/11878))
+- Allow custom freeze message in Open Mapped Doc ([#11976](https://github.com/frappe/frappe/pull/11976))
+- Show absolute value in print format ([#12019](https://github.com/frappe/frappe/pull/12019))
+- Add links and actions to customize form and cleanup code ([#11565](https://github.com/frappe/frappe/pull/11565))
+- Add module field in get_desk_sidebar_items ([#11781](https://github.com/frappe/frappe/pull/11781))
+
+#### Fixes
+
+- Maximum attachment limit validation ([#11940](https://github.com/frappe/frappe/pull/11940))
+- Define chunk size based on backup file size to avoid timeout issues ([#11526](https://github.com/frappe/frappe/pull/11526))
+- Fetch doc from db in get_transitions ([#11883](https://github.com/frappe/frappe/pull/11883))
+- Remove Package Publish Tool ([#11863](https://github.com/frappe/frappe/pull/11863))
+- Make strings translatable ([#11825](https://github.com/frappe/frappe/pull/11825))
+- Clear cache after updating defaults manually ([#11830](https://github.com/frappe/frappe/pull/11830))
+- Doctype query in create new shortcut ([#11864](https://github.com/frappe/frappe/pull/11864))
+- Ace editor fixes ([#11920](https://github.com/frappe/frappe/pull/11920))
+- Shorten number card percentage stat ([#11846](https://github.com/frappe/frappe/pull/11846))
+- Error page rendering shouldn't fail when recorder is active ([#11806](https://github.com/frappe/frappe/pull/11806))
+- Rename Doc considers invalid table name on renaming record ([#11743](https://github.com/frappe/frappe/pull/11743))
+- Use modified by or owner to send notification from ([#11981](https://github.com/frappe/frappe/pull/11981))
+- Bust cache by passing build_version to link and script src ([#11903](https://github.com/frappe/frappe/pull/11903))
+- Customize options in desk page rtl layout ([#11772](https://github.com/frappe/frappe/pull/11772))
+- Use sql_ddl to avoid exception triggered while running drop sql ([#11831](https://github.com/frappe/frappe/pull/11831))
+- Render template for HTML content type ([#12035](https://github.com/frappe/frappe/pull/12035))
+- Display style removed from emails ([#11963](https://github.com/frappe/frappe/pull/11963))
+- Handle FileAlreadyAttachedException while pulling email ([#11713](https://github.com/frappe/frappe/pull/11713))
+- Skip Email Account and Email Domain in Document Follow ([#11973](https://github.com/frappe/frappe/pull/11973))
+- URI encode in case white spaces exist in docname ([#11783](https://github.com/frappe/frappe/pull/11783))
+- Don't run a query when table is missing ([#11801](https://github.com/frappe/frappe/pull/11801))
+- Submit on Creation configuration in Auto Repeat ([#12069](https://github.com/frappe/frappe/pull/12069))
+- Add missing space in description ([#11787](https://github.com/frappe/frappe/pull/11787))
+- Query to handle user value having special characters ([#11694](https://github.com/frappe/frappe/pull/11694))
+- TypeError on saving report with child table ([#11925](https://github.com/frappe/frappe/pull/11925))
+- Translate Kanban board title ([#11985](https://github.com/frappe/frappe/pull/11985))
+- Set label as State/Province in Address instead of just State ([#11748](https://github.com/frappe/frappe/pull/11748))
+- Allow "Default Print Language" for custom Print Format ([#11800](https://github.com/frappe/frappe/pull/11800))
+- Validate SQL files better ([#11930](https://github.com/frappe/frappe/pull/11930))
+- Validate links table data ([#11884](https://github.com/frappe/frappe/pull/11884))
+- Use html.unescape for Python 3.9 compatibility. ([#12005](https://github.com/frappe/frappe/pull/12005))
+- Use set_header to set Message-Id in header ([#11778](https://github.com/frappe/frappe/pull/11778))
+- Typo when creating an SMTP server without port ([#11996](https://github.com/frappe/frappe/pull/11996))
+- Add rename_doc utils for external API usages ([#12011](https://github.com/frappe/frappe/pull/12011))
+- Treats the scrollbar as an overlay ([#11790](https://github.com/frappe/frappe/pull/11790))
+- Dashboard not visible bug ([#11918](https://github.com/frappe/frappe/pull/11918))
+- Total Row in Checkbox Column Reports ([#11872](https://github.com/frappe/frappe/pull/11872))
+- Remove scrolling on focusout event for touchscreen devices ([#11888](https://github.com/frappe/frappe/pull/11888))
+- Add default to Web Template Field ([#11780](https://github.com/frappe/frappe/pull/11780))
+- Order of HTML closing tags ([#11923](https://github.com/frappe/frappe/pull/11923))
+- Show total text with value if first column is numeric ([#11813](https://github.com/frappe/frappe/pull/11813))
+- Milestone not created for fields updated after submission ([#11793](https://github.com/frappe/frappe/pull/11793))
+- Cint seconds before operations ([#12067](https://github.com/frappe/frappe/pull/12067))
+- Validate email id before passing to formataddr ([#11720](https://github.com/frappe/frappe/pull/11720))
+- Use frappe.utils.shorten_number ([#12039](https://github.com/frappe/frappe/pull/12039))
+- Mandatory depends on in grid form ([#11834](https://github.com/frappe/frappe/pull/11834))
+- Calculate chart data from beginning of period ([#11794](https://github.com/frappe/frappe/pull/11794))
+- Move unnecessary compileall outside migrate ([#11833](https://github.com/frappe/frappe/pull/11833))
+- PDF generation shouldn't fail in background jobs and tests ([#11792](https://github.com/frappe/frappe/pull/11792))
+- Throw exception if template not found ([#11843](https://github.com/frappe/frappe/pull/11843))
+- Security upgrade snyk from 1.398.1 to 1.425.4 ([#11990](https://github.com/frappe/frappe/pull/11990))
+- Show custom message for invalid login credentials ([#11853](https://github.com/frappe/frappe/pull/11853))
+- Remove twilio integration ([#11841](https://github.com/frappe/frappe/pull/11841))
+- Navbar logo height and width ([#11822](https://github.com/frappe/frappe/pull/11822))
+- Allow all Data, Link, Dynamic Link fields to be set in based on field ([#11922](https://github.com/frappe/frappe/pull/11922))
+- Error on trying to check semantic version ([#11916](https://github.com/frappe/frappe/pull/11916))
+- Notification settings ([#11862](https://github.com/frappe/frappe/pull/11862))
+- Manage private images via get_local_image ([#11935](https://github.com/frappe/frappe/pull/11935))
+- Filter dashboards, dashboard charts, number cards by modules ([#12057](https://github.com/frappe/frappe/pull/12057))
+- Label for _assign field ([#12038](https://github.com/frappe/frappe/pull/12038))
+- Bypass validation if force is passed ([#11915](https://github.com/frappe/frappe/pull/11915))
+- Max slices for aggregate charts ([#11808](https://github.com/frappe/frappe/pull/11808))
+- Delete prepared reports in batches ([#11869](https://github.com/frappe/frappe/pull/11869))
+- Allow empty type for Web Templates that are not sections ([#11628](https://github.com/frappe/frappe/pull/11628))
+- Allow other github links in same PR ([#11982](https://github.com/frappe/frappe/pull/11982))
+- Don't set context.no_cache ([#11799](https://github.com/frappe/frappe/pull/11799))
+- Remove telephony related code ([#12017](https://github.com/frappe/frappe/pull/12017))
+- Don't throw if filter is invalid ([#11866](https://github.com/frappe/frappe/pull/11866))
+- Show 0 instead of undefined when value not set in dashboard ([#11816](https://github.com/frappe/frappe/pull/11816))
+- Disable chart form condition ([#11844](https://github.com/frappe/frappe/pull/11844))
+- Enable disable save when navigating between docs ([#11867](https://github.com/frappe/frappe/pull/11867))
+- Don't enqueue a job if it is being executed ([#11655](https://github.com/frappe/frappe/pull/11655))
+- Clear localstorage if quota exceeds ([#12002](https://github.com/frappe/frappe/pull/12002))
+- Uninstall app enhancements ([#11911](https://github.com/frappe/frappe/pull/11911))
+- Make route and action readonly for standard navbar items ([#11842](https://github.com/frappe/frappe/pull/11842))
+- Show scrollbar for datatable ([#11910](https://github.com/frappe/frappe/pull/11910))
+- Open console even if Frappe imports failed ([#11832](https://github.com/frappe/frappe/pull/11832))
+- Set user selected timezone in user defaults ([#11902](https://github.com/frappe/frappe/pull/11902))
+- Email password prompt missing field name for submit button ([#11840](https://github.com/frappe/frappe/pull/11840))
+- Add semicolons to end unicode  ([#11993](https://github.com/frappe/frappe/pull/11993))
+- Replace target field in Top Bar Item table with a checkbox ([#11763](https://github.com/frappe/frappe/pull/11763))
+- shorten_number function ([#12050](https://github.com/frappe/frappe/pull/12050))
+- Not able to save Domain Settings ([#11984](https://github.com/frappe/frappe/pull/11984))
+- uninstall-app enhancements ([#11969](https://github.com/frappe/frappe/pull/11969))
+- Remove @ from relevance query ([#11837](https://github.com/frappe/frappe/pull/11837))
+- Login Code Size too Small on Mobile ([#11742](https://github.com/frappe/frappe/pull/11742))
+- Add namespaces to build_summary_item, generate_route, short… ([#11868](https://github.com/frappe/frappe/pull/11868))
+- allow "only image" in comments ([#11914](https://github.com/frappe/frappe/pull/11914))
+- oauth2 ([#11966](https://github.com/frappe/frappe/pull/11966))
+- Server scripts enhancements ([#12008](https://github.com/frappe/frappe/pull/12008))
+- Multiple y rows in charts ([#12031](https://github.com/frappe/frappe/pull/12031))
+- Update child values for existing rows ([#11737](https://github.com/frappe/frappe/pull/11737))
+- Auto contact creation in email account ([#11732](https://github.com/frappe/frappe/pull/11732))
+- Display web template after save ([#11809](https://github.com/frappe/frappe/pull/11809))
+- Create auto_repeat field only if docfield/custom field does not exist ([#11827](https://github.com/frappe/frappe/pull/11827))
+- frappe.utils.formatdate not working in the jinja template ([#11871](https://github.com/frappe/frappe/pull/11871))
\ No newline at end of file

From d12fde9e1febdaf98419f3f4ff2bf674ae4a9cdf Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh@erpnext.com>
Date: Sat, 26 Dec 2020 14:09:42 +0530
Subject: [PATCH 188/319] fix: beta version tag from version-13-beta

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 3951ad838f..469d1e32e1 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.7'
+__version__ = '13.0.0-beta.8'
 
 __title__ = "Frappe Framework"
 

From 093157953e623ab31520e65688558e4dba63c1e5 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Sat, 26 Dec 2020 15:12:11 +0550
Subject: [PATCH 189/319] bumped to version 13.0.0-beta.9

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 469d1e32e1..4729993dee 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.8'
+__version__ = '13.0.0-beta.9'
 
 __title__ = "Frappe Framework"
 

From cdf8114531b3edacf2bb6a5b98f4bb1cc8854660 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh@erpnext.com>
Date: Mon, 1 Feb 2021 15:26:46 +0530
Subject: [PATCH 190/319] fix: validate user permissions while user has select
 perms (#12287)

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

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index c799586d61..6f4e1fc53c 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -597,7 +597,7 @@ class DatabaseQuery(object):
 				self.match_conditions.append("`tab{0}`.`owner` = {1}".format(self.doctype,
 					frappe.db.escape(self.user, percent=False)))
 			# add user permission only if role has read perm
-			elif role_permissions.get("read"):
+			elif role_permissions.get("read") or role_permissions.get("select"):
 				# get user permissions
 				user_permissions = frappe.permissions.get_user_permissions(self.user)
 				self.add_user_permissions(user_permissions)

From 6984f4949155d460372541da6f2619b43297de0a Mon Sep 17 00:00:00 2001
From: Saqib <nextchamp.saqib@gmail.com>
Date: Mon, 1 Feb 2021 15:29:12 +0530
Subject: [PATCH 191/319] feat: ability to set default desk page (#12286)

* feat: ability to set default desk page

* chore: add description

* fix: validate single default page

* fix: error message

Co-authored-by: Prssanna Desai <prssud@gmail.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/desk/desktop.py                       | 15 ++++++++++++---
 frappe/desk/doctype/desk_page/desk_page.json | 11 ++++++++++-
 frappe/desk/doctype/desk_page/desk_page.py   |  7 ++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 4dab313892..a476573b1a 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -108,9 +108,18 @@ class Workspace:
 			'extends': self.page_name,
 			'for_user': frappe.session.user
 		}
-		pages = frappe.get_all("Desk Page", filters=filters, limit=1)
-		if pages:
-			return frappe.get_cached_doc("Desk Page", pages[0])
+		user_pages = frappe.get_all("Desk Page", filters=filters, limit=1)
+		if user_pages:
+			return frappe.get_cached_doc("Desk Page", user_pages[0])
+
+		filters = {
+			'extends_another_page': 1,
+			'extends': self.page_name,
+			'is_default': 1
+		}
+		default_page = frappe.get_all("Desk Page", filters=filters, limit=1)
+		if default_page:
+			return frappe.get_cached_doc("Desk Page", default_page[0])
 
 		self.get_pages_to_extend()
 		return frappe.get_cached_doc("Desk Page", self.page_name)
diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json
index 2b8aea5e6c..016d6c89d4 100644
--- a/frappe/desk/doctype/desk_page/desk_page.json
+++ b/frappe/desk/doctype/desk_page/desk_page.json
@@ -16,6 +16,7 @@
   "onboarding",
   "column_break_3",
   "extends_another_page",
+  "is_default",
   "is_standard",
   "developer_mode_only",
   "disable_user_customization",
@@ -197,10 +198,18 @@
    "fieldname": "hide_custom",
    "fieldtype": "Check",
    "label": "Hide Custom DocTypes and Reports"
+  },
+  {
+   "default": "0",
+   "depends_on": "extends_another_page",
+   "description": "Sets the current page as default for all users",
+   "fieldname": "is_default",
+   "fieldtype": "Check",
+   "label": "Is Default"
   }
  ],
  "links": [],
- "modified": "2020-05-18 19:17:27.206646",
+ "modified": "2021-01-21 12:09:36.156614",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",
diff --git a/frappe/desk/doctype/desk_page/desk_page.py b/frappe/desk/doctype/desk_page/desk_page.py
index e92844ac0b..fcc3c08135 100644
--- a/frappe/desk/doctype/desk_page/desk_page.py
+++ b/frappe/desk/doctype/desk_page/desk_page.py
@@ -15,6 +15,11 @@ class DeskPage(Document):
 		if (self.is_standard and not frappe.conf.developer_mode and not disable_saving_as_standard()):
 			frappe.throw(_("You need to be in developer mode to edit this document"))
 
+		if self.is_default and self.name and frappe.db.exists("Desk Page", {
+			"name": ["!=", self.name], 'is_default': 1, 'extends': self.extends
+		}):
+			frappe.throw(_("You can only have one default page that extends a particular standard page."))
+
 	def validate_cards_json(self):
 		for card in self.cards:
 			try:
@@ -45,4 +50,4 @@ def disable_saving_as_standard():
 			frappe.flags.in_patch or \
 			frappe.flags.in_test or \
 			frappe.flags.in_fixtures or \
-			frappe.flags.in_migrate
\ No newline at end of file
+			frappe.flags.in_migrate

From 8d413fc69594a660cbe3b368421ea147fe84da2d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 19:52:10 +0530
Subject: [PATCH 192/319] fix: cannot extend a desk page with developer mode
 off (bp #12294) (#12295)

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
---
 frappe/desk/doctype/desk_page/desk_page.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.js b/frappe/desk/doctype/desk_page/desk_page.js
index 503859eb61..86fea6df40 100644
--- a/frappe/desk/doctype/desk_page/desk_page.js
+++ b/frappe/desk/doctype/desk_page/desk_page.js
@@ -5,7 +5,6 @@ frappe.ui.form.on('Desk Page', {
 	refresh: function(frm) {
 		frm.enable_save();
 		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
-		frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
 		frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);
 
 		if (frm.doc.for_user) {

From f8dc985ef3dc52412ac41d20487c3ed8c8e45fb0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 2 Feb 2021 07:02:17 +0530
Subject: [PATCH 193/319] chore: Add release notes for v13-beta-10 (#12296)

---
 frappe/change_log/v13/v13_0_0-beta_10.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0-beta_10.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_10.md b/frappe/change_log/v13/v13_0_0-beta_10.md
new file mode 100644
index 0000000000..ff98a8f9c2
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0-beta_10.md
@@ -0,0 +1,21 @@
+### Version 13.0.0 Beta 10 Release Notes
+
+#### Features and Enhancements
+
+- Option to hide child records for a nested DocType via User Permissions ([12209](https://github.com/frappe/frappe/pull/12209))
+- Added option to grant only `Select` access to document ([12063](https://github.com/frappe/frappe/pull/12063))
+- Introduced map view ([11202](https://github.com/frappe/frappe/pull/11202))
+- Enabled image rendering from links in Print View ([12101](https://github.com/frappe/frappe/pull/12101))
+- Introduced "Yesterday" and "Tomorrow" options for Timespan filter ([12179](https://github.com/frappe/frappe/pull/12179))
+
+#### Fixes
+
+- Fixed HTML download of Auto Email Report that used to break in some cases ([12202](https://github.com/frappe/frappe/pull/12202))
+- Fixed reset customizations functionality ([12152](https://github.com/frappe/frappe/pull/12152))
+- Fixed the rendering of percentage stat in Dashboard Chart ([12090](https://github.com/frappe/frappe/pull/12090))
+- Fixed permission issues in Dashboard Chart ([12243](https://github.com/frappe/frappe/pull/12243))
+- Fixed an issue with grid row index ([12188](https://github.com/frappe/frappe/pull/12188))
+- Fixed an issue where fields used to get reordered after adding new columns ([12058](https://github.com/frappe/frappe/pull/12058))
+- Fixed currency formatting in Print Format ([11897](https://github.com/frappe/frappe/pull/11897))
+- Added a fieldlevel permission check for report data ([12163](https://github.com/frappe/frappe/pull/12163))
+- Fixed an issue with percent precision ([12010](https://github.com/frappe/frappe/pull/12010))
\ No newline at end of file

From 195e9cb5db422db6af24f4bc1a48bbc0ac7ce2b7 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Tue, 2 Feb 2021 21:13:54 +0550
Subject: [PATCH 194/319] bumped to version 13.0.0-beta.10

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 663036b2c8..7929e62acb 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.9'
+__version__ = '13.0.0-beta.10'
 
 __title__ = "Frappe Framework"
 

From 7e6ce22d64e845cacaf27f76d91b56ef6d91effa Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 22 Feb 2021 19:17:30 +0530
Subject: [PATCH 195/319] perf: optimise set_cors_headers (bp #12460) (#12462)

(cherry picked from commit 68c6fc4a4417c6c36132ef25ec96af522d351dd6)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
---
 frappe/app.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/app.py b/frappe/app.py
index adf2bfa8c9..7ec88b06cf 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -152,10 +152,10 @@ def process_response(response):
 
 def set_cors_headers(response):
 	origin = frappe.request.headers.get('Origin')
-	if not origin:
+	allow_cors = frappe.conf.allow_cors
+	if not (origin and allow_cors):
 		return
 
-	allow_cors = frappe.conf.allow_cors
 	if allow_cors != "*":
 		if not isinstance(allow_cors, list):
 			allow_cors = [allow_cors]

From cb43b906ede3e571cbac525331e65c1322da43bf Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 18 Feb 2021 13:33:12 +0530
Subject: [PATCH 196/319] fix: ignore notify update in patch execution

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

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 9efd8b6c94..3545ac3857 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1015,6 +1015,8 @@ class Document(BaseDocument):
 
 	def notify_update(self):
 		"""Publish realtime that the current document is modified"""
+		if frappe.flags.in_patch: return
+
 		frappe.publish_realtime("doc_update", {"modified": self.modified, "doctype": self.doctype, "name": self.name},
 			doctype=self.doctype, docname=self.name, after_commit=True)
 

From 0ccdd9317324786eca77e39a7b5a58bff8a6a4de Mon Sep 17 00:00:00 2001
From: Administrator <Administrator>
Date: Wed, 24 Feb 2021 10:03:57 +0530
Subject: [PATCH 197/319] chore: Bump to v13.0.0-beta.11

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7929e62acb..efe03bb3a5 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.10'
+__version__ = '13.0.0-beta.11'
 
 __title__ = "Frappe Framework"
 

From 84bc7e66acf2a974b20b28a3a4263193289d23a2 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 14:07:38 +0530
Subject: [PATCH 198/319] fix: allow on submit for child table not working (bp
 #12381) (#12472)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: hasnain2808@gmail.com <hasnain2808@gmail.com>
---
 frappe/public/js/frappe/form/controls/base_control.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index d7f873bee0..9981398b84 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -74,7 +74,7 @@ frappe.ui.form.Control = Class.extend({
 			frappe.model.get_doc(this.doctype, this.docname), this.perm || (this.frm && this.frm.perm), explain);
 
 		// Match parent grid controls read only status
-		if (status === 'Write' && (this.grid || (this.layout && this.layout.grid))) {
+		if (status === 'Write' && (this.grid || (this.layout && this.layout.grid) && !cint(this.df.allow_on_submit))) {
 			var grid = this.grid || this.layout.grid;
 			if (grid.display_status == 'Read') {
 				status = 'Read';

From a34393b14625b37d367a1308ad6d72ce43da37f7 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 24 Feb 2021 14:56:43 +0530
Subject: [PATCH 199/319] Revert "chore: Bump to v13.0.0-beta.11"

This reverts commit 0ccdd9317324786eca77e39a7b5a58bff8a6a4de.
---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index efe03bb3a5..7929e62acb 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.11'
+__version__ = '13.0.0-beta.10'
 
 __title__ = "Frappe Framework"
 

From 94e797a787f8db0417f5697c448ac3c09333d02c Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 24 Feb 2021 15:20:23 +0550
Subject: [PATCH 200/319] bumped to version 13.0.0-beta.11

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7929e62acb..efe03bb3a5 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.10'
+__version__ = '13.0.0-beta.11'
 
 __title__ = "Frappe Framework"
 

From 74268c2219f8b38776c6dc56e1e4348b180dc422 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 10 Mar 2021 16:02:52 +0530
Subject: [PATCH 201/319] fix: uncomment conditions that handle guest access
 for desk

(cherry picked from commit aa8f7cc3c5470811d4851b7d4a80c8332d2aa541)
---
 frappe/www/app.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/www/app.py b/frappe/www/app.py
index 79b430019e..6088c413dc 100644
--- a/frappe/www/app.py
+++ b/frappe/www/app.py
@@ -12,10 +12,10 @@ from frappe import _
 import frappe.sessions
 
 def get_context(context):
-	# if frappe.session.user == "Guest":
-	# 	frappe.throw(_("Log in to access this page."), frappe.PermissionError)
-	# elif frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User":
-	# 	frappe.throw(_("You are not permitted to access this page."), frappe.PermissionError)
+	if frappe.session.user == "Guest":
+		frappe.throw(_("Log in to access this page."), frappe.PermissionError)
+	elif frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User":
+		frappe.throw(_("You are not permitted to access this page."), frappe.PermissionError)
 
 	hooks = frappe.get_hooks()
 	try:

From 7b44421e356ec90e5807fa3a8b51a6e5256b3090 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 10 Mar 2021 18:14:33 +0530
Subject: [PATCH 202/319] fix: don't show social login icon if not set

(cherry picked from commit 91cb71f0c9f4d3469b99ccf160b62d8ebe5e76a2)
---
 frappe/www/login.html |  5 ++++-
 frappe/www/login.py   | 14 ++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index 2edec28375..deafc2015c 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -85,7 +85,10 @@
 							<div class="login-button-wrapper">
 								<a href="{{ provider.auth_url }}"
 									class="btn btn-block btn-default btn-sm btn-login-option btn-{{ provider.name }}">
-									{{ provider.icon }} {{ _("Login With") }} {{ provider.provider_name }}</a>
+									{% if provider.icon %}
+										{{ provider.icon }}
+									{% endif %}
+									{{ _("Login With") }} {{ provider.provider_name }}</a>
 							</div>
 							{% endfor %}
 							<p class="text-muted login-divider">{{ _("or") }}</p>
diff --git a/frappe/www/login.py b/frappe/www/login.py
index 54d3ccfb1e..76b232f8ee 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -25,7 +25,7 @@ def get_context(context):
 				redirect_to = get_home_page()
 			else:
 				redirect_to = "/app"
-		
+
 		if redirect_to != 'login':
 			frappe.local.flags.redirect_location = redirect_to
 			raise frappe.Redirect
@@ -44,11 +44,13 @@ def get_context(context):
 		client_secret = get_decrypted_password("Social Login Key", provider, "client_secret")
 		provider_name = frappe.get_value("Social Login Key", provider, "provider_name")
 
-		if provider_name != "Custom":
-			icon_url = frappe.get_value("Social Login Key", provider, "icon")
-			icon = "<img src='{0}' alt={1}>".format(icon_url, provider_name)
-		else:
-			icon = get_icon_html(frappe.get_value("Social Login Key", provider, "icon"), small=True)
+		icon = None
+		icon_url = frappe.get_value("Social Login Key", provider, "icon")
+		if icon_url:
+			if provider_name != "Custom":
+				icon = "<img src='{0}' alt={1}>".format(icon_url, provider_name)
+			else:
+				icon = get_icon_html(icon_url, small=True)
 
 		if (get_oauth_keys(provider) and client_secret and client_id and base_url):
 			context.provider_logins.append({

From 982522aa3fa3adf8a9dbb4a5cb11885c7fef39fb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 10 Mar 2021 18:14:52 +0530
Subject: [PATCH 203/319] chore: update frappe charts

(cherry picked from commit 89b9c29802e2f8c505a615971d06b8b6b4d9ca9d)
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 43cedc158a..40bed18cb7 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "driver.js": "^0.9.8",
     "express": "^4.17.1",
     "fast-deep-equal": "^2.0.1",
-    "frappe-charts": "^2.0.0-rc5",
+    "frappe-charts": "^2.0.0-rc10",
     "frappe-datatable": "^1.15.3",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
diff --git a/yarn.lock b/yarn.lock
index daca81cfda..921c174e6c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2467,10 +2467,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-charts@^2.0.0-rc5:
-  version "2.0.0-rc5"
-  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc5.tgz#16f5c744c3cdb134a41bb4581ea3c816e6b8601f"
-  integrity sha512-4wEsSeGVlEBxr3qA2FF/CTrn+XRjf73txdID+vEBhr22Osc+wcJNhY5sJWFtq4wrihz3WHFnNOTGu+uUNdb0lw==
+frappe-charts@^2.0.0-rc10:
+  version "2.0.0-rc10"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc10.tgz#6e4cfbb99eb48374f78c0c048e1b04f278a3848a"
+  integrity sha512-qj1yFdBF7e0aW6xES/SK7cb4plimcm63ENG/0HOMKprijNj0V938/v9uhe1lSATvuqu65pPkHNbt93zfCLx9gQ==
 
 frappe-datatable@^1.15.3:
   version "1.15.3"

From fe65c99c3bb74c01063c7df70ca6e6e4bbb8c4bf Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 10 Mar 2021 18:23:59 +0530
Subject: [PATCH 204/319] fix: missing bracket in get_inner_group_button

(cherry picked from commit 882ea6e3d141a8144aa9f45a69f10598dd3f3670)
---
 frappe/public/js/frappe/ui/page.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 705d1ac8cd..96e31c7d62 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -537,7 +537,7 @@ frappe.ui.Page = Class.extend({
 	},
 
 	get_inner_group_button: function(label) {
-		return this.inner_toolbar.find(`.inner-group-button[data-label="${encodeURIComponent(label)}"`);
+		return this.inner_toolbar.find(`.inner-group-button[data-label="${encodeURIComponent(label)}"]`);
 	},
 
 	set_inner_btn_group_as_primary: function(label) {

From 98ae10efddaca13db0c393b31afbda64909b6b92 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 10 Mar 2021 18:42:43 +0530
Subject: [PATCH 205/319] fix: toast red indicator icon

(cherry picked from commit dcbce242a92d5fd924382f756436c8fe452288bb)
---
 frappe/public/js/frappe/ui/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index a4b1ad9f79..b3cbef1b8e 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -357,7 +357,7 @@ frappe.show_alert = function(message, seconds=7, actions={}) {
 		'yellow': "solid-warning",
 		'blue': "solid-success",
 		'green': "solid-success",
-		'red': "solid-red"
+		'red': "solid-error"
 	};
 
 	if (typeof message==='string') {

From bbfdd040009f3bebe4650df26067bf90fb938fd5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:21:00 +0530
Subject: [PATCH 206/319] fix: web form buttons

(cherry picked from commit 1937a1e558e7e5cb377369ad87fef279a711fe39)
---
 frappe/public/js/frappe/web_form/web_form.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 0421147d49..44d11b1e20 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -88,16 +88,16 @@ export default class WebForm extends frappe.ui.FieldGroup {
 
 	setup_delete_button() {
 		this.add_button_to_header(
-			'<i class="fa fa-trash" aria-hidden="true"></i>',
-			"light",
+			frappe.utils.icon('delete'),
+			"danger",
 			() => this.delete()
 		);
 	}
 
 	setup_print_button() {
 		this.add_button_to_header(
-			'<i class="fa fa-print" aria-hidden="true"></i>',
-			"light",
+			frappe.utils.icon('print'),
+			"primary",
 			() => this.print()
 		);
 	}

From 0e81d0d25c50574a744471f0088774002b67c054 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:22:38 +0530
Subject: [PATCH 207/319] fix: web form style

(cherry picked from commit 72192e4a1028fae116ef0a63eb90a2cd3f5640ca)
---
 frappe/public/scss/website/web_form.scss        | 17 +++++++++++++++++
 .../doctype/web_form/templates/web_form.html    |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 frappe/public/scss/website/web_form.scss

diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
new file mode 100644
index 0000000000..48f77000bf
--- /dev/null
+++ b/frappe/public/scss/website/web_form.scss
@@ -0,0 +1,17 @@
+@import "../common/form";
+
+.web-form-wrapper {
+	.form-control {
+		color: var(--text-color);
+	}
+
+	.form-column {
+		&:first-child {
+			padding-left: 0;
+		}
+
+		&:last-child {
+			padding-right: 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index 228898df66..96bd9209cc 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -62,7 +62,7 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req
 	{% endif %} {# attachments #}
 
 	{% if allow_comments and not frappe.form_dict.new and not is_list -%}
-	<div class="comments">
+	<div class="comments mt-6">
 		<h3>{{ _("Comments") }}</h3>
 		{% include 'templates/includes/comments/comments.html' %}
 	</div>

From 8188f07aa19aca30922e5c3fe2fc532b4f458999 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:26:53 +0530
Subject: [PATCH 208/319] refactor: common form styles

(cherry picked from commit ec004cc1b750abc558e55f6bc719f846e941c211)
---
 frappe/public/scss/common/form.scss | 29 +++++++++++++++++++++++++++++
 frappe/public/scss/desk/form.scss   | 24 +-----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 frappe/public/scss/common/form.scss

diff --git a/frappe/public/scss/common/form.scss b/frappe/public/scss/common/form.scss
new file mode 100644
index 0000000000..2fa6ab619e
--- /dev/null
+++ b/frappe/public/scss/common/form.scss
@@ -0,0 +1,29 @@
+.form-control {
+	border: none;
+	font-size: var(--text-md);
+	position: relative;
+}
+
+.form-control.bold {
+	font-weight: 500;
+}
+
+.like-disabled-input {
+	.for-description {
+		font-weight: normal;
+		font-size: var(--text-sm);
+	}
+	min-height: var(--input-height);
+	border-radius: $border-radius;
+	font-weight: 400;
+	padding: 8px 12px;
+	cursor: default;
+	color: var(--disabled-text-color);
+	background-color: var(--disabled-control-bg);
+}
+
+.head-title {
+	font-size: var(--text-lg);
+	font-weight: 700;
+	color: var(--heading-color);
+}
\ No newline at end of file
diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss
index 9f22d9283a..0bb686f045 100644
--- a/frappe/public/scss/desk/form.scss
+++ b/frappe/public/scss/desk/form.scss
@@ -1,8 +1,4 @@
-.form-control {
-	border: none;
-	font-size: var(--text-md);
-	position: relative;
-}
+@import "../common/form.scss";
 
 .form-section, .form-dashboard-section {
 	margin: 0px;
@@ -82,24 +78,6 @@
 	text-align: right;
 }
 
-.form-control.bold {
-	font-weight: 500;
-}
-
-.like-disabled-input {
-	.for-description {
-		font-weight: normal;
-		font-size: var(--text-sm);
-	}
-	min-height: var(--input-height);
-	border-radius: $border-radius;
-	font-weight: 400;
-	padding: 8px 12px;
-	cursor: default;
-	color: var(--disabled-text-color);
-	background-color: var(--disabled-control-bg);
-}
-
 .form-control:disabled, .form-control[readonly] {
 	cursor: not-allowed;
 }

From 1aeb5f684c9f2ce6c431595c4e7d5be37a9cc3ef Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:27:35 +0530
Subject: [PATCH 209/319] fix: commonify quill styles for website and desk

(cherry picked from commit 1581c99da72ad0d3ccf8f6138e12d7c2d38b8960)
---
 frappe/public/scss/{desk => common}/quill.scss | 0
 frappe/public/scss/desk/index.scss             | 2 +-
 frappe/public/scss/print.scss                  | 2 +-
 frappe/public/scss/website/index.scss          | 5 ++---
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename frappe/public/scss/{desk => common}/quill.scss (100%)

diff --git a/frappe/public/scss/desk/quill.scss b/frappe/public/scss/common/quill.scss
similarity index 100%
rename from frappe/public/scss/desk/quill.scss
rename to frappe/public/scss/common/quill.scss
diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss
index 5f5fef251b..f7449640fd 100644
--- a/frappe/public/scss/desk/index.scss
+++ b/frappe/public/scss/desk/index.scss
@@ -43,5 +43,5 @@
 @import "user_profile";
 @import "theme_switcher";
 @import "link_preview";
-@import "quill";
+@import "../common/quill";
 @import "plyr";
diff --git a/frappe/public/scss/print.scss b/frappe/public/scss/print.scss
index 2539ff82d2..a610299159 100644
--- a/frappe/public/scss/print.scss
+++ b/frappe/public/scss/print.scss
@@ -1,5 +1,5 @@
 // @import "~bootstrap/scss/bootstrap";
-@import './desk/quill';
+@import './common/quill';
 @import "./desk/css_variables";
 
 
diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index c6b3771562..de81174d3b 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -1,6 +1,4 @@
-@import '~quill/dist/quill.core';
-@import '~quill/dist/quill.snow.css';
-@import '~quill/dist/quill.bubble.css';
+@import '../common/quill';
 @import 'variables';
 @import '~bootstrap/scss/bootstrap';
 @import "../common/mixins";
@@ -15,6 +13,7 @@
 @import 'multilevel_dropdown';
 @import 'website_image';
 @import 'website_avatar';
+@import 'web_form';
 @import 'page_builder';
 @import 'blog';
 @import 'markdown';

From dcd6a356929568ae4fa20c6effe9193198c1eb28 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:28:02 +0530
Subject: [PATCH 210/319] fix: more button in web list

(cherry picked from commit 9386dbc1d316128d447223f771159a9e7ac6ade7)
---
 frappe/templates/includes/list/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/templates/includes/list/list.html b/frappe/templates/includes/list/list.html
index cfe25f3682..fba5f20ed5 100644
--- a/frappe/templates/includes/list/list.html
+++ b/frappe/templates/includes/list/list.html
@@ -18,7 +18,7 @@
 				{{ item }}
 			{% endfor %}
 		</div>
-		<div class="more-block {% if not show_more -%} hidden {%- endif %}">
+		<div class="more-block mt-6 {% if not show_more -%} hidden {%- endif %}">
 			<button class="btn btn-light btn-more btn-sm">{{ _("More") }}</button>
 		</div>
 	</div>

From b1df2730cca15655c52535bf9999b3528518f915 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 14:31:42 +0530
Subject: [PATCH 211/319] fix: web form print button

(cherry picked from commit 4246f8f3d8f3c901cb45ca4003028d7010c4622a)
---
 frappe/public/js/frappe/web_form/web_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 44d11b1e20..c490c5c66c 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -97,7 +97,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 	setup_print_button() {
 		this.add_button_to_header(
 			frappe.utils.icon('print'),
-			"primary",
+			"light",
 			() => this.print()
 		);
 	}

From 970e1421dbf3d9902efdd9f15db87a1eb9d5bb83 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 11 Mar 2021 18:55:11 +0530
Subject: [PATCH 212/319] fix: select field condition to check if value is
 selected

(cherry picked from commit 97f7f6345bdcedc8c3a51b0af89cf6b3934f884f)
---
 frappe/public/js/frappe/form/controls/select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/select.js b/frappe/public/js/frappe/form/controls/select.js
index 2ea32e032c..0fcfadb47d 100644
--- a/frappe/public/js/frappe/form/controls/select.js
+++ b/frappe/public/js/frappe/form/controls/select.js
@@ -96,7 +96,7 @@ frappe.ui.form.ControlSelect = frappe.ui.form.ControlData.extend({
 		}
 	},
 	toggle_placeholder: function() {
-		const input_set = Boolean(this.$input.val());
+		const input_set = Boolean(this.$input.find('option:selected').text());
 		this.$wrapper.find('.placeholder').toggle(!input_set);
 	}
 });

From 46351b505434ac68355e2a535f2b831ae5a54d4e Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 15 Mar 2021 10:39:25 +0530
Subject: [PATCH 213/319] fix: use single statememt

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 7d1e04fac3569653fcdb3cb99720bda3ad0728b8)
---
 frappe/www/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index deafc2015c..338e572309 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -88,7 +88,7 @@
 									{% if provider.icon %}
 										{{ provider.icon }}
 									{% endif %}
-									{{ _("Login With") }} {{ provider.provider_name }}</a>
+									{{ _("Login With {0}").format(provider.provider_name) }}</a>
 							</div>
 							{% endfor %}
 							<p class="text-muted login-divider">{{ _("or") }}</p>

From 62b6ca8a22549bbf2019b5218181585b69e53278 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 17:33:05 +0530
Subject: [PATCH 214/319] feat: Client Script for List views

---
 .../doctype/client_script/client_script.json  | 10 ++++++++-
 .../doctype/client_script/client_script.py    | 18 +++++++++++++--
 frappe/desk/form/meta.py                      | 22 ++++++++++++++++---
 frappe/public/js/frappe/model/model.js        |  3 +++
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/frappe/custom/doctype/client_script/client_script.json b/frappe/custom/doctype/client_script/client_script.json
index 57e6c68094..eca4fdb4b7 100644
--- a/frappe/custom/doctype/client_script/client_script.json
+++ b/frappe/custom/doctype/client_script/client_script.json
@@ -8,6 +8,7 @@
  "engine": "InnoDB",
  "field_order": [
   "dt",
+  "apply_to_view",
   "enabled",
   "script",
   "sample"
@@ -43,13 +44,20 @@
    "fieldname": "enabled",
    "fieldtype": "Check",
    "label": "Enabled"
+  },
+  {
+   "default": "Form",
+   "fieldname": "apply_to_view",
+   "fieldtype": "Select",
+   "label": "Apply To",
+   "options": "List\nForm"
   }
  ],
  "icon": "fa fa-glass",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-02-04 13:57:56.509437",
+ "modified": "2021-03-16 17:09:25.918859",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Client Script",
diff --git a/frappe/custom/doctype/client_script/client_script.py b/frappe/custom/doctype/client_script/client_script.py
index e252e2a750..a84b9ce6e4 100644
--- a/frappe/custom/doctype/client_script/client_script.py
+++ b/frappe/custom/doctype/client_script/client_script.py
@@ -3,15 +3,29 @@
 from __future__ import unicode_literals
 import frappe
 
+from frappe import _
 from frappe.model.document import Document
 
+
 class ClientScript(Document):
 	def autoname(self):
-		self.name = self.dt
+		self.name = f"{self.dt}-{self.apply_to_view}"
+
+	def validate(self):
+		if not self.is_new():
+			return
+
+		exists = frappe.db.exists(
+			"Client Script", {"dt": self.dt, "apply_to_view": self.apply_to_view}
+		)
+		if exists:
+			frappe.throw(
+				_("Client Script for {0} {1} already exists").format(frappe.bold(self.dt), self.apply_to_view),
+				frappe.DuplicateEntryError,
+			)
 
 	def on_update(self):
 		frappe.clear_cache(doctype=self.dt)
 
 	def on_trash(self):
 		frappe.clear_cache(doctype=self.dt)
-
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index c63da93a33..fc741b0f64 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -63,7 +63,7 @@ class FormMeta(Meta):
 			"__linked_with", "__messages", "__print_formats", "__workflow_docs",
 			"__form_grid_templates", "__listview_template", "__tree_js",
 			"__dashboard", "__kanban_column_fields", '__templates',
-			'__custom_js'):
+			'__custom_js', '__custom_list_js'):
 			d[k] = self.get(k)
 
 		# d['fields'] = d.get('fields', [])
@@ -130,9 +130,25 @@ class FormMeta(Meta):
 	def add_custom_script(self):
 		"""embed all require files"""
 		# custom script
-		custom = frappe.db.get_value("Client Script", {"dt": self.name, "enabled": 1}, "script") or ""
+		client_scripts = frappe.db.get_all("Client Script",
+			filters={"dt": self.name, "enabled": 1},
+			fields=["script", "apply_to_view"],
+			order_by="creation asc"
+		) or ""
 
-		self.set("__custom_js", custom)
+		print(client_scripts)
+
+		list_script = ''
+		form_script = ''
+		for script in client_scripts:
+			if script.apply_to_view == 'List':
+				list_script += script.script
+
+			if script.apply_to_view == 'Form':
+				form_script += script.script
+
+		self.set("__custom_js", form_script)
+		self.set("__custom_list_js", list_script)
 
 	def add_search_fields(self):
 		"""add search fields found in the doctypes indicated by link fields' options"""
diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 9ec7b0e931..22a5180a2b 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -181,6 +181,9 @@ $.extend(frappe.model, {
 		if(meta.__list_js) {
 			eval(meta.__list_js);
 		}
+		if(meta.__custom_list_js) {
+			eval(meta.__custom_list_js);
+		}
 		if(meta.__calendar_js) {
 			eval(meta.__calendar_js);
 		}

From 10737a8a6149cc304fe7b0f2b9f64eb3da863184 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 17:42:40 +0530
Subject: [PATCH 215/319] fix: remove print statement

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

diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index fc741b0f64..cd0e1b6fa1 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -136,8 +136,6 @@ class FormMeta(Meta):
 			order_by="creation asc"
 		) or ""
 
-		print(client_scripts)
-
 		list_script = ''
 		form_script = ''
 		for script in client_scripts:

From 6f89e29b4690b819f484dbbf1c56d7d46eb5d54c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 17:48:12 +0530
Subject: [PATCH 216/319] fix: rename field to simply "view"

---
 frappe/custom/doctype/client_script/client_script.json | 6 +++---
 frappe/custom/doctype/client_script/client_script.py   | 6 +++---
 frappe/desk/form/meta.py                               | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/custom/doctype/client_script/client_script.json b/frappe/custom/doctype/client_script/client_script.json
index eca4fdb4b7..782f2a1185 100644
--- a/frappe/custom/doctype/client_script/client_script.json
+++ b/frappe/custom/doctype/client_script/client_script.json
@@ -8,7 +8,7 @@
  "engine": "InnoDB",
  "field_order": [
   "dt",
-  "apply_to_view",
+  "view",
   "enabled",
   "script",
   "sample"
@@ -47,7 +47,7 @@
   },
   {
    "default": "Form",
-   "fieldname": "apply_to_view",
+   "fieldname": "view",
    "fieldtype": "Select",
    "label": "Apply To",
    "options": "List\nForm"
@@ -57,7 +57,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-16 17:09:25.918859",
+ "modified": "2021-03-16 17:47:02.758919",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Client Script",
diff --git a/frappe/custom/doctype/client_script/client_script.py b/frappe/custom/doctype/client_script/client_script.py
index a84b9ce6e4..049f979263 100644
--- a/frappe/custom/doctype/client_script/client_script.py
+++ b/frappe/custom/doctype/client_script/client_script.py
@@ -9,18 +9,18 @@ from frappe.model.document import Document
 
 class ClientScript(Document):
 	def autoname(self):
-		self.name = f"{self.dt}-{self.apply_to_view}"
+		self.name = f"{self.dt}-{self.view}"
 
 	def validate(self):
 		if not self.is_new():
 			return
 
 		exists = frappe.db.exists(
-			"Client Script", {"dt": self.dt, "apply_to_view": self.apply_to_view}
+			"Client Script", {"dt": self.dt, "view": self.view}
 		)
 		if exists:
 			frappe.throw(
-				_("Client Script for {0} {1} already exists").format(frappe.bold(self.dt), self.apply_to_view),
+				_("Client Script for {0} {1} already exists").format(frappe.bold(self.dt), self.view),
 				frappe.DuplicateEntryError,
 			)
 
diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py
index cd0e1b6fa1..e637f4969a 100644
--- a/frappe/desk/form/meta.py
+++ b/frappe/desk/form/meta.py
@@ -132,17 +132,17 @@ class FormMeta(Meta):
 		# custom script
 		client_scripts = frappe.db.get_all("Client Script",
 			filters={"dt": self.name, "enabled": 1},
-			fields=["script", "apply_to_view"],
+			fields=["script", "view"],
 			order_by="creation asc"
 		) or ""
 
 		list_script = ''
 		form_script = ''
 		for script in client_scripts:
-			if script.apply_to_view == 'List':
+			if script.view == 'List':
 				list_script += script.script
 
-			if script.apply_to_view == 'Form':
+			if script.view == 'Form':
 				form_script += script.script
 
 		self.set("__custom_js", form_script)

From fc64532f3a7d3b51d478a7620ff503a7efb7b163 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 18:25:35 +0530
Subject: [PATCH 217/319] fix: List view formatters should override standard
 formatters

---
 frappe/public/js/frappe/list/list_view.js | 48 +++++++++++++----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 396cd983fb..6e6635caf6 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -707,25 +707,18 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		const field_html = () => {
 			let html;
 			let _value;
-			// listview_setting formatter
-			if (
-				this.settings.formatters &&
-				this.settings.formatters[fieldname]
-			) {
-				_value = this.settings.formatters[fieldname](value, df, doc);
+			let strip_html_required =
+				df.fieldtype == "Text Editor" ||
+				(df.fetch_from &&
+					["Text", "Small Text"].includes(df.fieldtype));
+
+			if (strip_html_required) {
+				_value = strip_html(value);
 			} else {
-				let strip_html_required =
-					df.fieldtype == "Text Editor" ||
-					(df.fetch_from &&
-						["Text", "Small Text"].includes(df.fieldtype));
-				if (strip_html_required) {
-					_value = strip_html(value);
-				} else {
-					_value =
-						typeof value === "string"
-							? frappe.utils.escape_html(value)
-							: value;
-				}
+				_value =
+					typeof value === "string"
+						? frappe.utils.escape_html(value)
+						: value;
 			}
 
 			if (df.fieldtype === "Image") {
@@ -781,7 +774,15 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			Subject: this.get_subject_html(doc),
 			Field: field_html(),
 		};
-		const column_html = html_map[col.type];
+		let column_html = html_map[col.type];
+
+		// listview_setting formatter
+		if (
+			this.settings.formatters &&
+			this.settings.formatters[fieldname]
+		) {
+			column_html = this.settings.formatters[fieldname](value, df, doc);
+		}
 
 		return `
 			<div class="${css_class}">
@@ -912,7 +913,14 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	get_subject_html(doc) {
 		let subject_field = this.columns[0].df;
-		let value = doc[subject_field.fieldname] || doc.name;
+		let value = doc[subject_field.fieldname];
+		if (this.settings.formatters && this.settings.formatters[subject_field.fieldname]) {
+			let formatter = this.settings.formatters[subject_field.fieldname];
+			value = formatter(value, subject_field, doc);
+		}
+		if (!value) {
+			value = doc.name;
+		}
 		let subject = strip_html(value.toString());
 		let escaped_subject = frappe.utils.escape_html(subject);
 

From 41a472fa3b1f053f12345c2f25e52776ca6769ca Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 18:36:39 +0530
Subject: [PATCH 218/319] fix: Don't add child table button for List script

---
 .../doctype/client_script/client_script.js    | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/frappe/custom/doctype/client_script/client_script.js b/frappe/custom/doctype/client_script/client_script.js
index 21e7334b82..3ef1932ff3 100644
--- a/frappe/custom/doctype/client_script/client_script.js
+++ b/frappe/custom/doctype/client_script/client_script.js
@@ -8,40 +8,42 @@ frappe.ui.form.on('Client Script', {
 				() => frappe.set_route('List', frm.doc.dt, 'List'));
 		}
 
-		frm.add_custom_button(__('Add script for Child Table'), () => {
-			frappe.model.with_doctype(frm.doc.dt, () => {
-				const child_tables = frappe.meta.get_docfields(frm.doc.dt, null, {
-					fieldtype: 'Table'
-				}).map(df => df.options);
+		if (frm.doc.view == 'Form') {
+			frm.add_custom_button(__('Add script for Child Table'), () => {
+				frappe.model.with_doctype(frm.doc.dt, () => {
+					const child_tables = frappe.meta.get_docfields(frm.doc.dt, null, {
+						fieldtype: 'Table'
+					}).map(df => df.options);
 
-				const d = new frappe.ui.Dialog({
-					title: __('Select Child Table'),
-					fields: [
-						{
-							label: __('Select Child Table'),
-							fieldtype: 'Link',
-							fieldname: 'cdt',
-							options: 'DocType',
-							get_query: () => {
-								return {
-									filters: {
-										istable: 1,
-										name: ['in', child_tables]
-									}
-								};
+					const d = new frappe.ui.Dialog({
+						title: __('Select Child Table'),
+						fields: [
+							{
+								label: __('Select Child Table'),
+								fieldtype: 'Link',
+								fieldname: 'cdt',
+								options: 'DocType',
+								get_query: () => {
+									return {
+										filters: {
+											istable: 1,
+											name: ['in', child_tables]
+										}
+									};
+								}
 							}
+						],
+						primary_action: ({ cdt }) => {
+							cdt = d.get_field('cdt').value;
+							frm.events.add_script_for_doctype(frm, cdt);
+							d.hide();
 						}
-					],
-					primary_action: ({ cdt }) => {
-						cdt = d.get_field('cdt').value;
-						frm.events.add_script_for_doctype(frm, cdt);
-						d.hide();
-					}
-				});
+					});
 
-				d.show();
+					d.show();
+				});
 			});
-		});
+		}
 
 		frm.set_query('dt', {
 			filters: {

From 7abf44a68f8080fe44955387da176cd224a2c017 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 16 Mar 2021 20:34:39 +0530
Subject: [PATCH 219/319] fix: DocType and Apply To should be set only once

---
 frappe/custom/doctype/client_script/client_script.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/custom/doctype/client_script/client_script.json b/frappe/custom/doctype/client_script/client_script.json
index 782f2a1185..db02d8d4bc 100644
--- a/frappe/custom/doctype/client_script/client_script.json
+++ b/frappe/custom/doctype/client_script/client_script.json
@@ -23,7 +23,8 @@
    "oldfieldname": "dt",
    "oldfieldtype": "Link",
    "options": "DocType",
-   "reqd": 1
+   "reqd": 1,
+   "set_only_once": 1
   },
   {
    "fieldname": "script",
@@ -50,14 +51,15 @@
    "fieldname": "view",
    "fieldtype": "Select",
    "label": "Apply To",
-   "options": "List\nForm"
+   "options": "List\nForm",
+   "set_only_once": 1
   }
  ],
  "icon": "fa fa-glass",
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-03-16 17:47:02.758919",
+ "modified": "2021-03-16 20:33:51.400191",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Client Script",

From fbaacd1c46ad805006865b5dd09015f5f02fa2aa Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 17 Mar 2021 11:30:42 +0530
Subject: [PATCH 220/319] fix: Hide Apply To for Single doctypes

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

diff --git a/frappe/custom/doctype/client_script/client_script.js b/frappe/custom/doctype/client_script/client_script.js
index 3ef1932ff3..c9de85e449 100644
--- a/frappe/custom/doctype/client_script/client_script.js
+++ b/frappe/custom/doctype/client_script/client_script.js
@@ -53,6 +53,8 @@ frappe.ui.form.on('Client Script', {
 	},
 
 	dt(frm) {
+		frm.toggle_display('view', !frappe.boot.single_types.includes(frm.doc.dt));
+
 		if (!frm.doc.script) {
 			frm.events.add_script_for_doctype(frm, frm.doc.dt);
 		}

From 3d7f4991629c23254271775a9ac6d16e8a51b2e8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 17 Mar 2021 12:06:54 +0530
Subject: [PATCH 221/319] fix: Reset form boilerplate if view is List

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

diff --git a/frappe/custom/doctype/client_script/client_script.js b/frappe/custom/doctype/client_script/client_script.js
index c9de85e449..27d11af4d1 100644
--- a/frappe/custom/doctype/client_script/client_script.js
+++ b/frappe/custom/doctype/client_script/client_script.js
@@ -65,7 +65,18 @@ frappe.ui.form.on('Client Script', {
 		}
 	},
 
+	view(frm) {
+		let has_form_boilerplate = frm.doc.script.includes('frappe.ui.form.on')
+		if (frm.doc.view === 'List' && has_form_boilerplate) {
+			frm.set_value('script', '');
+		}
+		if (frm.doc.view === 'Form' && !has_form_boilerplate) {
+			frm.trigger('dt');
+		}
+	},
+
 	add_script_for_doctype(frm, doctype) {
+		if (!doctype) return;
 		let boilerplate = `
 frappe.ui.form.on('${doctype}', {
 	refresh(frm) {

From 25fb3c339bd4a61b35c9d130ed0e871ab2623d20 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 13:30:28 +0530
Subject: [PATCH 222/319] chore(sider): add sider default config for flake8 +
 ignore tab errors (W191) (bp #12587) (#12598)

Co-authored-by: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
---
 .flake8   | 32 ++++++++++++++++++++++++++++++++
 sider.yml |  3 +++
 2 files changed, 35 insertions(+)
 create mode 100644 .flake8
 create mode 100644 sider.yml

diff --git a/.flake8 b/.flake8
new file mode 100644
index 0000000000..399b176e1d
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,32 @@
+[flake8]
+ignore =
+    E121,
+    E126,
+    E127,
+    E128,
+    E203,
+    E225,
+    E226,
+    E231,
+    E241,
+    E251,
+    E261,
+    E265,
+    E302,
+    E303,
+    E305,
+    E402,
+    E501,
+    E741,
+    W291,
+    W292,
+    W293,
+    W391,
+    W503,
+    W504,
+    F403,
+    B007,
+    B950,
+    W191,
+
+max-line-length = 200
\ No newline at end of file
diff --git a/sider.yml b/sider.yml
new file mode 100644
index 0000000000..2ca6e8deb1
--- /dev/null
+++ b/sider.yml
@@ -0,0 +1,3 @@
+linter:
+  flake8:
+    config: .flake8
\ No newline at end of file

From 907d418cfdfc04a0891be1ce86522d462b8fd9ef Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 15:08:18 +0530
Subject: [PATCH 223/319] test: encoding @ since we encode each url (bp #12567)
 (#12599)

Co-authored-by: hasnain2808@gmail.com <hasnain2808@gmail.com>
---
 cypress/integration/table_multiselect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/table_multiselect.js b/cypress/integration/table_multiselect.js
index faa72d63a5..bdcf5d1ff0 100644
--- a/cypress/integration/table_multiselect.js
+++ b/cypress/integration/table_multiselect.js
@@ -45,6 +45,6 @@ context('Table MultiSelect', () => {
 		cy.get(`.list-subject:contains("table multiselect")`).last().find('a').click();
 		cy.get('.frappe-control[data-fieldname="users"] .form-control .tb-selected-value').as('existing_value');
 		cy.get('@existing_value').find('.btn-link-to-form').click();
-		cy.location('pathname').should('contain', '/user/test@erpnext.com');
+		cy.location('pathname').should('contain', '/user/test%40erpnext.com');
 	});
 });

From 57b7eeae7fc1b68b8e624b5f4569bee81b57fcae Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 16:06:56 +0530
Subject: [PATCH 224/319] fix: Average Chart compute inaccurate average (bp
 #12254) (#12595)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: shariquerik <sharique.rik@gmail.com>
Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Co-authored-by: prssanna <prssud@gmail.com>
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../dashboard_chart/dashboard_chart.py        | 14 +++--
 .../dashboard_chart/test_dashboard_chart.py   | 53 +++++++++++++++----
 frappe/test_runner.py                         |  2 +
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index b19f6cf9f0..48b34e6cd9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -171,7 +171,6 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 
 	doctype = chart.document_type
 	datefield = chart.based_on
-	aggregate_function = get_aggregate_function(chart.chart_type)
 	value_field = chart.value_based_on or '1'
 	from_date = from_date.strftime('%Y-%m-%d')
 	to_date = to_date
@@ -183,7 +182,8 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 		doctype,
 		fields = [
 			'{} as _unit'.format(datefield),
-			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
+			'SUM({})'.format(value_field),
+			'COUNT(*)'
 		],
 		filters = filters,
 		group_by = '_unit',
@@ -192,7 +192,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 		ignore_ifnull = True
 	)
 
-	result = get_result(data, timegrain, from_date, to_date)
+	result = get_result(data, timegrain, from_date, to_date, chart.chart_type)
 
 	chart_config = {
 		"labels": [get_period(r[0], timegrain) for r in result],
@@ -288,15 +288,21 @@ def get_aggregate_function(chart_type):
 	}[chart_type]
 
 
-def get_result(data, timegrain, from_date, to_date):
+def get_result(data, timegrain, from_date, to_date, chart_type):
 	dates = get_dates_from_timegrain(from_date, to_date, timegrain)
 	result = [[date, 0] for date in dates]
 	data_index = 0
 	if data:
 		for i, d in enumerate(result):
+			count = 0
 			while data_index < len(data) and getdate(data[data_index][0]) <= d[0]:
 				d[1] += data[data_index][1]
+				count += data[data_index][2]
 				data_index += 1
+			if chart_type == 'Average' and not count == 0:
+				d[1] = d[1]/count
+			if chart_type == 'Count':
+				d[1] = count
 
 	return result
 
diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
index 3c37ad4a09..72ab18385d 100644
--- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py
@@ -212,19 +212,52 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
+	def test_avg_dashboard_chart(self):
+		insert_test_records()
+
+		if frappe.db.exists('Dashboard Chart', 'Test Average Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Average Dashboard Chart')
+
+		frappe.get_doc(dict(
+			doctype = 'Dashboard Chart',
+			chart_name = 'Test Average Dashboard Chart',
+			chart_type = 'Average',
+			document_type = 'Communication',
+			based_on = 'communication_date',
+			value_based_on = 'rating',
+			timespan = 'Select Date Range',
+			time_interval = 'Weekly',
+			from_date = datetime(2018, 12, 30),
+			to_date = datetime(2019, 1, 15),
+			filters_json = '[]',
+			timeseries = 1
+		)).insert()
+
+		result = get(chart_name='Test Average Dashboard Chart', refresh = 1)
+
+		self.assertEqual(result.get('datasets')[0].get('values'), [50.0, 150.0, 266.6666666666667, 0.0])
+		self.assertEqual(
+			result.get('labels'),
+			['30-12-18', '06-01-19', '13-01-19', '20-01-19']
+		)
+
+		frappe.db.rollback()
+
 def insert_test_records():
-	create_new_communication(datetime(2018, 12, 30), 50)
-	create_new_communication(datetime(2019, 1, 4), 100)
-	create_new_communication(datetime(2019, 1, 6), 200)
-	create_new_communication(datetime(2019, 1, 7), 400)
-	create_new_communication(datetime(2019, 1, 8), 300)
-	create_new_communication(datetime(2019, 1, 10), 100)
-
-def create_new_communication(date, rating):
+	create_new_communication('Communication 1', datetime(2018, 12, 30), 50)
+	create_new_communication('Communication 2', datetime(2019, 1, 4), 100)
+	create_new_communication('Communication 3', datetime(2019, 1, 6), 200)
+	create_new_communication('Communication 4', datetime(2019, 1, 7), 400)
+	create_new_communication('Communication 5', datetime(2019, 1, 8), 300)
+	create_new_communication('Communication 6', datetime(2019, 1, 10), 100)
+
+def create_new_communication(subject, date, rating):
 	communication = {
 		'doctype': 'Communication',
-		'subject': 'Test Communication',
+		'subject': subject,
 		'rating': rating,
 		'communication_date': date
 	}
-	frappe.get_doc(communication).insert()
+	comm = frappe.get_doc(communication)
+	if not frappe.db.exists("Communication", {'subject' : comm.subject}):
+		comm.insert()
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index b66a96595d..0e81d69593 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -179,6 +179,8 @@ def run_tests_for_module(module, verbose=False, tests=(), profile=False, junit_x
 	return _run_unittest(module, verbose=verbose, tests=tests, profile=profile, junit_xml_output=junit_xml_output)
 
 def _run_unittest(modules, verbose=False, tests=(), profile=False, junit_xml_output=False):
+	frappe.db.begin()
+
 	test_suite = unittest.TestSuite()
 
 	if not isinstance(modules, (list, tuple)):

From 08a75c42df9a147cf53f617847407bc19704fa8c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Mar 2021 18:44:05 +0530
Subject: [PATCH 225/319] feat: Add quoting parameter in the UnicodeWriter
 constructor (bp #12578) (#12602)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Britlog <info@britlog.com>
---
 frappe/utils/csvutils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py
index 06ae221255..00163ade5f 100644
--- a/frappe/utils/csvutils.py
+++ b/frappe/utils/csvutils.py
@@ -107,10 +107,10 @@ def build_csv_response(data, filename):
 	frappe.response["type"] = "csv"
 
 class UnicodeWriter:
-	def __init__(self, encoding="utf-8"):
+	def __init__(self, encoding="utf-8", quoting=csv.QUOTE_NONNUMERIC):
 		self.encoding = encoding
 		self.queue = StringIO()
-		self.writer = csv.writer(self.queue, quoting=csv.QUOTE_NONNUMERIC)
+		self.writer = csv.writer(self.queue, quoting=quoting)
 
 	def writerow(self, row):
 		if six.PY2:

From 2a270f7b5063986a16a96806a7178e66ee8bd673 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 12:27:02 +0530
Subject: [PATCH 226/319] fix: Remove list.min.css from hook  (bp #12606)
 (#12607)

(cherry picked from commit cf2eacbb3a6a20eaec11d20b39d5f25ae03c5504)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/hooks.py            |   1 -
 frappe/public/css/list.css | 527 -------------------------------------
 2 files changed, 528 deletions(-)
 delete mode 100644 frappe/public/css/list.css

diff --git a/frappe/hooks.py b/frappe/hooks.py
index c9914237fe..027e3cf2fe 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -38,7 +38,6 @@ app_include_js = [
 ]
 app_include_css = [
 	"/assets/css/desk.min.css",
-	"/assets/css/list.min.css",
 	"/assets/css/report.min.css",
 ]
 
diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css
deleted file mode 100644
index 88ad147d33..0000000000
--- a/frappe/public/css/list.css
+++ /dev/null
@@ -1,527 +0,0 @@
-.frappe-list .result,
-.frappe-list .no-result,
-.frappe-list .freeze {
-  min-height: calc(100vh - 284px);
-}
-.freeze-row .level-left,
-.freeze-row .level-right,
-.freeze-row .list-row-col {
-  height: 100%;
-  width: 100%;
-}
-.freeze-row .list-row-col {
-  background-color: #d1d8dd;
-  border-radius: 2px;
-  animation: 2s breathe infinite;
-}
-@keyframes breathe {
-  0% {
-    opacity: 0.2;
-  }
-  50% {
-    opacity: 0.5;
-  }
-  100% {
-    opacity: 0.2;
-  }
-}
-.sort-selector .dropdown:hover {
-  text-decoration: underline;
-}
-.filter-list {
-  position: relative;
-}
-.filter-list .sort-selector {
-  position: absolute;
-  top: 15px;
-  right: 15px;
-}
-.tag-filters-area {
-  padding: 15px 15px 0px;
-  border-bottom: 1px solid #d1d8dd;
-}
-.active-tag-filters {
-  padding-bottom: 4px;
-  padding-right: 120px;
-}
-@media (max-width: 767px) {
-  .active-tag-filters {
-    padding-right: 80px;
-  }
-}
-.active-tag-filters .btn {
-  margin-bottom: 10px;
-}
-.active-tag-filters .btn-group {
-  margin-left: 10px;
-  /*white-space: nowrap;*/
-  font-size: 0;
-}
-.active-tag-filters .btn-group .btn-default {
-  background-color: transparent;
-  border: 1px solid #d1d8dd;
-  color: #8D99A6;
-  float: none;
-}
-.filter-box {
-  border-bottom: 1px solid #d1d8dd;
-  padding: 10px 15px 3px;
-}
-.filter-box .remove-filter {
-  margin-top: 6px;
-  margin-left: 15px;
-}
-.filter-box .filter-field {
-  padding-right: 15px;
-  width: calc(100% - 36px);
-}
-.filter-box .filter-field .frappe-control {
-  position: relative;
-}
-@media (min-width: 767px) {
-  .filter-box .row > div[class*="col-sm-"] {
-    padding-right: 0px;
-  }
-  .filter-field {
-    width: 65% !important;
-  }
-  .filter-field .frappe-control {
-    position: relative;
-  }
-}
-.list-row-container {
-  border-bottom: 1px solid #d1d8dd;
-  display: flex;
-  flex-direction: column;
-}
-.list-row {
-  padding: 12px 15px;
-  height: 40px;
-  cursor: pointer;
-  transition: color 0.2s;
-  -webkit-transition: color 0.2s;
-}
-.list-row:hover {
-  background-color: #F7FAFC;
-}
-.list-row:last-child {
-  border-bottom: 0px;
-}
-.list-row .level-left {
-  flex: 3;
-  width: 75%;
-}
-.list-row .level-right {
-  flex: 1;
-}
-.list-row-head {
-  background-color: #F7FAFC;
-  border-bottom: 1px solid #d1d8dd !important;
-}
-.list-row-head .list-subject {
-  font-weight: normal;
-}
-.list-row-head .checkbox-actions {
-  display: none;
-}
-.list-row-col {
-  flex: 1;
-  margin-right: 15px;
-}
-.list-subject {
-  flex: 2;
-  justify-content: start;
-}
-.list-subject .level-item {
-  margin-right: 8px;
-}
-.list-subject.seen {
-  font-weight: normal;
-}
-.list-row-activity {
-  justify-content: flex-end;
-  min-width: 120px;
-}
-.list-row-activity .avatar:not(.avatar-empty) {
-  margin: 0;
-}
-.list-row-activity > span {
-  display: inline-block;
-}
-.list-row-activity > span:not(:last-child) {
-  margin-right: 8px;
-}
-.list-row-activity .comment-count {
-  min-width: 35px;
-}
-.list-paging-area,
-.footnote-area {
-  padding: 10px 15px;
-  border-top: 1px solid #d1d8dd;
-  overflow: auto;
-}
-.progress {
-  height: 10px;
-}
-.likes-count {
-  display: none;
-}
-.list-liked-by-me {
-  margin-bottom: 1px;
-}
-input.list-check-all,
-input.list-row-checkbox {
-  margin-top: 0px;
-}
-.filterable {
-  cursor: pointer;
-}
-.listview-main-section .octicon-heart {
-  cursor: pointer;
-}
-.listview-main-section .page-form {
-  padding-left: 17px;
-}
-@media (max-width: 991px) {
-  .listview-main-section .page-form {
-    padding-left: 25px;
-  }
-}
-.listview-main-section .page-form .octicon-search {
-  float: left;
-  padding-top: 7px;
-  margin-left: -4px;
-  margin-right: -4px;
-}
-@media (max-width: 991px) {
-  .listview-main-section .page-form .octicon-search {
-    margin-left: -12px;
-  }
-}
-.like-action.octicon-heart {
-  color: #ff5858;
-}
-.list-comment-count {
-  display: inline-block;
-  width: 37px;
-  text-align: left;
-}
-.result.tags-shown .tag-row {
-  display: block;
-}
-.tag-row {
-  display: none;
-  margin-left: 50px;
-}
-.taggle_placeholder {
-  top: 0;
-  left: 5px;
-  font-size: 11px;
-  color: #8D99A6;
-}
-.taggle_list {
-  padding-left: 5px;
-  margin-bottom: 3px;
-}
-.taggle_list .taggle {
-  font-size: 11px;
-  padding: 2px 4px;
-  font-weight: normal;
-  background-color: #F0F4F7;
-  white-space: normal;
-}
-.taggle_list .taggle:hover {
-  padding: 2px 15px 2px 4px;
-  background: #cfdce5;
-  transition: all 0.2s;
-}
-.taggle_list li {
-  margin-bottom: 0;
-}
-.taggle_list li .awesomplete > ul > li {
-  width: 100%;
-}
-.taggle_list li .awesomplete > ul {
-  top: 15px;
-  z-index: 100;
-}
-.taggle_list .close {
-  right: 5px;
-  color: #36414C;
-  font-size: 11px;
-}
-.page-form .awesomplete > ul {
-  min-width: 300px;
-}
-.taggle_input {
-  padding: 0;
-  margin-top: 3px;
-  font-size: 11px;
-  max-width: 100px;
-}
-.image-view-container {
-  display: flex;
-  flex-wrap: wrap;
-}
-.image-view-container .image-view-row {
-  display: flex;
-  border-bottom: 1px solid #ebeff2;
-}
-.image-view-container .image-view-item {
-  flex: 0 0 25%;
-  padding: 15px;
-  border-bottom: 1px solid #EBEFF2;
-  border-right: 1px solid #EBEFF2;
-  max-width: 25%;
-}
-.image-view-container .image-view-item:nth-child(4n) {
-  border-right: none;
-}
-.image-view-container .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1),
-.image-view-container .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1) ~ .image-view-item {
-  border-bottom: none;
-}
-.image-view-container .image-view-header {
-  margin-bottom: 10px;
-}
-.image-view-container .image-view-body:hover .zoom-view {
-  opacity: 0.7;
-}
-.image-view-container .image-view-body a {
-  text-decoration: none;
-}
-.image-view-container .image-field {
-  display: flex;
-  align-content: center;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  height: 200px;
-}
-.image-view-container .image-field img {
-  max-height: 100%;
-}
-.image-view-container .image-field.no-image {
-  background-color: #fafbfc;
-}
-.image-view-container .placeholder-text {
-  font-size: 72px;
-  color: #d1d8dd;
-}
-.image-view-container .zoom-view {
-  bottom: 10px !important;
-  right: 10px !important;
-  width: 36px;
-  height: 36px;
-  opacity: 0;
-  font-size: 16px;
-  color: #36414C;
-  position: absolute;
-}
-@media (max-width: 767px) {
-  .image-view-container .zoom-view {
-    opacity: 0.5;
-  }
-}
-@media (max-width: 991px) {
-  .image-view-container .image-view-item {
-    flex: 0 0 33.33333333%;
-    max-width: 33.33333333%;
-  }
-  .image-view-container .image-view-item:nth-child(3n) {
-    border-right: none;
-  }
-  .image-view-container .image-view-item:nth-last-child(-n + 3):nth-child(3n + 1),
-  .image-view-container .image-view-item:nth-last-child(-n + 3):nth-child(3n + 1) ~ .image-view-item {
-    border-bottom: none;
-  }
-  .image-view-container .image-view-item:nth-child(4n) {
-    border-right: 1px solid #EBEFF2;
-  }
-  .image-view-container .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1),
-  .image-view-container .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1) ~ .image-view-item {
-    border-bottom: 1px solid #EBEFF2;
-  }
-}
-.item-selector {
-  border: 1px solid #d1d8dd;
-}
-.item-selector .image-view-row {
-  width: 100%;
-}
-.item-selector .image-field {
-  height: 120px;
-}
-.item-selector .placeholder-text {
-  font-size: 48px;
-}
-.image-view-container.three-column .image-view-item {
-  flex: 0 0 33.33333333%;
-  max-width: 33.33333333%;
-}
-.image-view-container.three-column .image-view-item:nth-child(3n) {
-  border-right: none;
-}
-.image-view-container.three-column .image-view-item:nth-last-child(-n + 3):nth-child(3n + 1),
-.image-view-container.three-column .image-view-item:nth-last-child(-n + 3):nth-child(3n + 1) ~ .image-view-item {
-  border-bottom: none;
-}
-.image-view-container.three-column .image-view-item:nth-child(4n) {
-  border-right: 1px solid #EBEFF2;
-}
-.image-view-container.three-column .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1),
-.image-view-container.three-column .image-view-item:nth-last-child(-n + 4):nth-child(4n + 1) ~ .image-view-item {
-  border-bottom: 1px solid #EBEFF2;
-}
-.pswp--svg .pswp__button,
-.pswp--svg .pswp__button--arrow--left:before,
-.pswp--svg .pswp__button--arrow--right:before {
-  background-image: url('/assets/frappe/images/default-skin.svg') !important;
-}
-.pswp--svg .pswp__button--arrow--left,
-.pswp--svg .pswp__button--arrow--right {
-  background: none !important;
-}
-.pswp__bg {
-  background-color: #fff !important;
-}
-.pswp__more-items {
-  position: absolute;
-  bottom: 12px;
-  left: 50%;
-  transform: translateX(-50%);
-}
-.pswp__more-item {
-  display: inline-block;
-  margin: 5px;
-  height: 100px;
-  cursor: pointer;
-  border: 1px solid #d1d8dd;
-}
-.pswp__more-item img {
-  max-height: 100%;
-}
-.map-view-container {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-  height: calc(100vh - 284px);
-  z-index: 0;
-}
-.list-paging-area .gantt-view-mode {
-  margin-left: 15px;
-  margin-right: 15px;
-}
-.gantt .details-container .heading {
-  margin-bottom: 10px;
-  font-size: 12px;
-}
-.gantt .details-container .avatar-small {
-  width: 16px;
-  height: 16px;
-}
-.gantt .details-container .standard-image {
-  display: block;
-}
-.inbox-attachment,
-.inbox-link {
-  margin-right: 7px;
-}
-.select-inbox {
-  padding: 30px 30px;
-}
-.inbox-value {
-  padding-top: 2px;
-}
-.list-items {
-  width: 100%;
-}
-.list-item-container {
-  border-bottom: 1px solid #d1d8dd;
-}
-.list-item-container:last-child {
-  border-bottom: none;
-}
-.list-item-table {
-  border: 1px solid #d1d8dd;
-  border-radius: 3px;
-}
-.list-item {
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  height: 40px;
-  padding-left: 15px;
-  font-size: 12px;
-}
-.list-item:hover {
-  background-color: #F7FAFC;
-}
-@media (max-width: 767px) {
-  .list-item {
-    height: 50px;
-    padding-left: 10px;
-    font-size: 14px;
-    font-weight: normal;
-  }
-}
-.list-item--head {
-  background-color: #F7FAFC;
-  border-bottom: 1px solid #d1d8dd;
-  cursor: auto;
-}
-.list-item input[type=checkbox] {
-  margin: 0;
-  margin-right: 5px;
-  flex: 0 0 12px;
-}
-.list-item .liked-by,
-.list-item .liked-by-filter-button {
-  display: inline-block;
-  width: 20px;
-  margin-right: 10px;
-}
-.list-item__content {
-  flex: 1;
-  margin-right: 15px;
-  display: flex;
-  align-items: center;
-}
-.list-item__content--flex-2 {
-  flex: 2;
-}
-.list-item__content--activity {
-  justify-content: flex-end;
-  margin-right: 5px;
-  min-width: 110px;
-}
-.list-item__content--activity .list-row-modified,
-.list-item__content--activity .avatar-small {
-  margin-right: 10px;
-}
-.list-item__content--indicator span::before {
-  height: 12px;
-  width: 12px;
-}
-.list-item__content--id {
-  justify-content: flex-end;
-}
-.frappe-timestamp {
-  white-space: nowrap;
-}
-.file-grid {
-  display: flex;
-  flex-wrap: wrap;
-  align-content: flex-start;
-}
-.file-grid a {
-  height: 100%;
-}
-.file-wrapper {
-  width: 120px;
-  flex-direction: column;
-  align-items: center;
-}
-.file-title {
-  margin-top: 5px;
-}

From 430468824a49c7b60c1ad2125133bcdcda2b6543 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 17:01:24 +0530
Subject: [PATCH 227/319] fix: Redesign Fixes (bp #12591) (#12611)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/desk/leaderboard.py             |  2 +-
 frappe/public/js/frappe/utils/utils.js | 23 +++++++++++++++++++++++
 frappe/public/scss/common/quill.scss   |  1 -
 frappe/tests/ui_test_helpers.py        |  4 ++--
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/leaderboard.py b/frappe/desk/leaderboard.py
index 2a981f061b..d651687256 100644
--- a/frappe/desk/leaderboard.py
+++ b/frappe/desk/leaderboard.py
@@ -47,6 +47,6 @@ def get_energy_point_leaderboard(date_range, company = None, field = None, limit
 	for user in energy_point_users:
 		user_id = user['name']
 		user['name'] = get_fullname(user['name'])
-		user['formatted_name'] = '<a href="#user-profile/{}">{}</a>'.format(user_id, get_fullname(user_id))
+		user['formatted_name'] = '<a href="/app/user-profile/{}">{}</a>'.format(user_id, get_fullname(user_id))
 
 	return energy_point_users
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index b0fb39235f..a5d3fa2175 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1272,4 +1272,27 @@ Object.assign(frappe.utils, {
 			});
 		return names_for_mentions;
 	},
+	print(doctype, docname, print_format, letterhead, lang_code) {
+		let w = window.open(
+			frappe.urllib.get_full_url(
+				'/printview?doctype=' +
+				encodeURIComponent(doctype) +
+				'&name=' +
+				encodeURIComponent(docname) +
+				'&trigger_print=1' +
+				'&format=' +
+				encodeURIComponent(print_format) +
+				'&no_letterhead=' +
+				(letterhead ? '0' : '1') +
+				'&letterhead=' +
+				encodeURIComponent(letterhead) +
+				(lang_code ? '&_lang=' + lang_code : '')
+			)
+		);
+
+		if (!w) {
+			frappe.msgprint(__('Please enable pop-ups'));
+			return;
+		}
+	}
 });
diff --git a/frappe/public/scss/common/quill.scss b/frappe/public/scss/common/quill.scss
index fae7eb5502..e5303be5cf 100644
--- a/frappe/public/scss/common/quill.scss
+++ b/frappe/public/scss/common/quill.scss
@@ -36,7 +36,6 @@
 	border-bottom-left-radius: var(--border-radius);
 	border-bottom-right-radius: var(--border-radius);
 	overflow: hidden;
-	position: initial !important;
 }
 
 .ql-snow {
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index 54a5a24acf..f56311b2e3 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -41,12 +41,12 @@ def create_todo_records():
 
 	frappe.get_doc({
 		"doctype": "ToDo",
-		"date": add_to_date(now(), days=3),
+		"date": add_to_date(now(), days=7),
 		"description": "this is first todo"
 	}).insert()
 	frappe.get_doc({
 		"doctype": "ToDo",
-		"date": add_to_date(now(), days=-3),
+		"date": add_to_date(now(), days=-7),
 		"description": "this is second todo"
 	}).insert()
 	frappe.get_doc({

From 7013e58e2557e2bc6fe69af99ebd5d52ae495217 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 19 Mar 2021 14:30:31 +0530
Subject: [PATCH 228/319] chore: Update frappe-charts (bp #12617) (#12618)

(cherry picked from commit 19a092feecd27660712ae1609d0a84fb585be517)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 40bed18cb7..55f3a6a443 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "driver.js": "^0.9.8",
     "express": "^4.17.1",
     "fast-deep-equal": "^2.0.1",
-    "frappe-charts": "^2.0.0-rc10",
+    "frappe-charts": "^2.0.0-rc11",
     "frappe-datatable": "^1.15.3",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
diff --git a/yarn.lock b/yarn.lock
index 921c174e6c..f9fbc849b2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2467,10 +2467,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-charts@^2.0.0-rc10:
-  version "2.0.0-rc10"
-  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc10.tgz#6e4cfbb99eb48374f78c0c048e1b04f278a3848a"
-  integrity sha512-qj1yFdBF7e0aW6xES/SK7cb4plimcm63ENG/0HOMKprijNj0V938/v9uhe1lSATvuqu65pPkHNbt93zfCLx9gQ==
+frappe-charts@^2.0.0-rc11:
+  version "2.0.0-rc11"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc11.tgz#0724fa0d43593362c075c3805ebbbe1a608fcef7"
+  integrity sha512-DY3tThT1lNGcJlRMOtIhnILtSm5h1iKysWhZAyj7yrGiOnOWbZpYx/NZzXZYwtRrWwMlYiLX2ylV76qo31ONsg==
 
 frappe-datatable@^1.15.3:
   version "1.15.3"

From 25814f7b150d653a9fd7352c72da4f9b599d664c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 20 Mar 2021 01:00:54 +0530
Subject: [PATCH 229/319] revert: "fix: include space and tab in special
 characters to match to encode url" (bp #12619) (#12620)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 67f34644f701e6672fa3f1e204836e77f924a29c)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/public/js/frappe/router.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index c800f31d55..d9bd24d1b4 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -335,7 +335,10 @@ frappe.router = {
 				return null;
 			} else {
 				a = String(a);
-				a = encodeURIComponent(a);
+				if (a && a.match(/[%'"]/)) {
+					// if special chars, then encode
+					a = encodeURIComponent(a);
+				}
 				return a;
 			}
 		}).join('/');

From 60a0aaefc1f892049e9ebf43a6627d4c538d7c3e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 20 Mar 2021 01:12:02 +0530
Subject: [PATCH 230/319] fix: Double signature in emails (bp #12520) (#12622)

Co-authored-by: pateljannat <pateljannat2308@gmail.com>
---
 frappe/email/email_body.py                     | 6 +++++-
 frappe/public/js/frappe/views/communication.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 3fb1dfa0da..3dcdf00a8e 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -252,13 +252,17 @@ def get_formatted_html(subject, message, footer=None, print_html=None,
 	if not email_account:
 		email_account = get_outgoing_email_account(False, sender=sender)
 
+	signature = None
+	if "<!-- signature-included -->" not in message:
+		signature = get_signature(email_account)
+
 	rendered_email = frappe.get_template("templates/emails/standard.html").render({
 		"brand_logo": get_brand_logo(email_account) if with_container or header else None,
 		"with_container": with_container,
 		"site_url": get_url(),
 		"header": get_header(header),
 		"content": message,
-		"signature": get_signature(email_account),
+		"signature": signature,
 		"footer": get_footer(email_account, footer),
 		"title": subject,
 		"print_html": print_html,
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index a5f078fc7d..430024a1d0 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -718,7 +718,7 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		if (!signature) {
 			const res = await this.get_default_outgoing_email_account_signature();
-			signature = res.message.signature;
+			signature = "<!-- signature-included -->" + res.message.signature;
 		}
 
 		if (signature && !frappe.utils.is_html(signature)) {

From ccc8deed075552432e1e85ffc1d69fff40573c5e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Sat, 20 Mar 2021 07:51:50 +0530
Subject: [PATCH 231/319] revert: "test: encoding @ since we encode each url
 (bp #12567)" (#12626)

This reverts commit 907d418cfdfc04a0891be1ce86522d462b8fd9ef.
---
 cypress/integration/table_multiselect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/table_multiselect.js b/cypress/integration/table_multiselect.js
index bdcf5d1ff0..faa72d63a5 100644
--- a/cypress/integration/table_multiselect.js
+++ b/cypress/integration/table_multiselect.js
@@ -45,6 +45,6 @@ context('Table MultiSelect', () => {
 		cy.get(`.list-subject:contains("table multiselect")`).last().find('a').click();
 		cy.get('.frappe-control[data-fieldname="users"] .form-control .tb-selected-value').as('existing_value');
 		cy.get('@existing_value').find('.btn-link-to-form').click();
-		cy.location('pathname').should('contain', '/user/test%40erpnext.com');
+		cy.location('pathname').should('contain', '/user/test@erpnext.com');
 	});
 });

From cd96c56087a03a5489f9f28ed2df95cba221b82a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 13:48:03 +0530
Subject: [PATCH 232/319] fix: include space and tab in special characters to
 match to encode url (bp #12632) (#12634)

(cherry picked from commit 6827b6b3a083a4a48f94dc754cab012aab98313e)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index d9bd24d1b4..e4c0f0c55c 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -335,7 +335,7 @@ frappe.router = {
 				return null;
 			} else {
 				a = String(a);
-				if (a && a.match(/[%'"]/)) {
+				if (a && a.match(/[%'"\s\t]/)) {
 					// if special chars, then encode
 					a = encodeURIComponent(a);
 				}

From 661f83f7bcf4270c3171d62ef1049dd7c76d5b83 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 20:13:13 +0530
Subject: [PATCH 233/319] fix: Auth failing (bp #12637) (#12638)

Co-authored-by: leela <leela.vadlamudi@gmail.com>
---
 frappe/core/doctype/user/user.py | 10 ++++++++--
 frappe/tests/test_auth.py        | 17 +++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index c103ad7e4a..7d7c9ee73b 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -536,9 +536,15 @@ class User(Document):
 		"""Find the user by credentials.
 		"""
 		login_with_mobile = cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_mobile_number"))
-		filter = {"mobile_no": user_name} if login_with_mobile else {"name": user_name}
 
-		user = frappe.db.get_value("User", filters=filter, fieldname=['name', 'enabled'], as_dict=True) or {}
+		user = None
+		if login_with_mobile:
+			filter = {"mobile_no": user_name}
+			user = frappe.db.get_value("User", filters=filter, fieldname=['name', 'enabled'], as_dict=True)
+		if not user:
+			filter = {"name": user_name}
+			user = frappe.db.get_value("User", filters=filter, fieldname=['name', 'enabled'], as_dict=True)
+
 		if not user:
 			return
 
diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py
index c0f61b4863..662ddc10fc 100644
--- a/frappe/tests/test_auth.py
+++ b/frappe/tests/test_auth.py
@@ -4,7 +4,24 @@ from __future__ import unicode_literals
 
 import time
 import unittest
+
+import frappe
 from frappe.auth import LoginAttemptTracker
+from frappe.frappeclient import FrappeClient
+
+
+class TestAuth(unittest.TestCase):
+	def test_admin_login(self):
+		# Make sure that authentication works when allow_login_using_mobile_number is set to 0
+		frappe.db.set_value("System Settings", "System Settings", "allow_login_using_mobile_number", 0)
+		frappe.db.commit()
+		FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False)
+
+		# Make sure that authentication works when allow_login_using_mobile_number is set to 1
+		frappe.db.set_value("System Settings", "System Settings", "allow_login_using_mobile_number", 1)
+		frappe.db.commit()
+		FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False)
+
 
 class TestLoginAttemptTracker(unittest.TestCase):
 	def test_account_lock(self):

From 137c9d35aecc9339f016501c5a758e7c0750a891 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 23 Mar 2021 09:54:02 +0530
Subject: [PATCH 234/319] fix: Remove 'ignore_user_type' from user filter

(cherry picked from commit d9bb0c7a9931393c37d1befdf944d3ebdfe16218)
---
 frappe/core/doctype/user/user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 7d7c9ee73b..4d3f58713a 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -874,6 +874,7 @@ def user_query(doctype, txt, searchfield, start, page_len, filters):
 	user_type_condition = "and user_type = 'System User'"
 	if filters and filters.get('ignore_user_type'):
 		user_type_condition = ''
+		filters.pop('ignore_user_type')
 
 	txt = "%{}%".format(txt)
 	return frappe.db.sql("""SELECT `name`, CONCAT_WS(' ', first_name, middle_name, last_name)

From 80d3fd293fc2a6c915f682e7a91862e89d3ec3f3 Mon Sep 17 00:00:00 2001
From: Anupam <anupamvns0099@gmail.com>
Date: Tue, 16 Feb 2021 15:25:06 +0530
Subject: [PATCH 235/319] feat: allowed the auto name in Customize Form

(cherry picked from commit 2e70c1c77cb88f7a9b87a3728ebc16612d74df0f)
---
 frappe/core/doctype/doctype/doctype.py        | 74 +++++++++----------
 .../customize_form/customize_form.json        | 16 +++-
 .../doctype/customize_form/customize_form.py  |  6 +-
 3 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index cbcfa350f5..3edb66bd42 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -67,7 +67,7 @@ class DocType(Document):
 		self.scrub_field_names()
 		self.set_default_in_list_view()
 		self.set_default_translatable()
-		self.validate_series()
+		validate_series(self)
 		self.validate_document_type()
 		validate_fields(self)
 
@@ -238,44 +238,6 @@ class DocType(Document):
 			# unique is automatically an index
 			if d.unique: d.search_index = 0
 
-	def validate_series(self, autoname=None, name=None):
-		"""Validate if `autoname` property is correctly set."""
-		if not autoname: autoname = self.autoname
-		if not name: name = self.name
-
-		if not autoname and self.get("fields", {"fieldname":"naming_series"}):
-			self.autoname = "naming_series:"
-		elif self.autoname == "naming_series:" and not self.get("fields", {"fieldname":"naming_series"}):
-			frappe.throw(_("Invalid fieldname '{0}' in autoname").format(self.autoname))
-
-		# validate field name if autoname field:fieldname is used
-		# Create unique index on autoname field automatically.
-		if autoname and autoname.startswith('field:'):
-			field = autoname.split(":")[1]
-			if not field or field not in [ df.fieldname for df in self.fields ]:
-				frappe.throw(_("Invalid fieldname '{0}' in autoname").format(field))
-			else:
-				for df in self.fields:
-					if df.fieldname == field:
-						df.unique = 1
-						break
-
-		if autoname and (not autoname.startswith('field:')) \
-			and (not autoname.startswith('eval:')) \
-			and (not autoname.lower() in ('prompt', 'hash')) \
-			and (not autoname.startswith('naming_series:')) \
-			and (not autoname.startswith('format:')):
-
-			prefix = autoname.split('.')[0]
-			used_in = frappe.db.sql("""
-				SELECT `name`
-				FROM `tabDocType`
-				WHERE `autoname` LIKE CONCAT(%s, '.%%')
-				AND `name`!=%s
-			""", (prefix, name))
-			if used_in:
-				frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))
-
 	def on_update(self):
 		"""Update database schema, make controller templates if `custom` is not set and clear cache."""
 		try:
@@ -666,6 +628,40 @@ class DocType(Document):
 
 		validate_route_conflict(self.doctype, self.name)
 
+def validate_series(dt):
+	if not dt.autoname and dt.get("fields", {"fieldname":"naming_series"}):
+		dt.autoname = "naming_series:"
+	elif dt.autoname == "naming_series:" and not dt.get("fields", {"fieldname":"naming_series"}):
+		frappe.throw(_("Invalid fieldname '{0}' in autoname").format(dt.autoname))
+
+	# validate field name if autoname field:fieldname is used
+	# Create unique index on autoname field automatically.
+	if dt.autoname and dt.autoname.startswith('field:'):
+		field = dt.autoname.split(":")[1]
+		if not field or field not in [ df.fieldname for df in dt.fields ]:
+			frappe.throw(_("Invalid fieldname '{0}' in autoname").format(field))
+		else:
+			for df in dt.fields:
+				if df.fieldname == field:
+					df.unique = 1
+					break
+
+	if dt.autoname and (not dt.autoname.startswith('field:')) \
+		and (not dt.autoname.startswith('eval:')) \
+		and (not dt.autoname.lower() in ('prompt', 'hash')) \
+		and (not dt.autoname.startswith('naming_series:')) \
+		and (not dt.autoname.startswith('format:')):
+
+		prefix = dt.autoname.split('.')[0]
+		used_in = frappe.db.sql("""
+			SELECT `name`
+			FROM `tabDocType`
+			WHERE `autoname` LIKE CONCAT(%s, '.%%')
+			AND `name`!=%s
+		""", (prefix, dt.name))
+		if used_in:
+			frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))
+
 def validate_links_table_fieldnames(meta):
 	"""Validate fieldnames in Links table"""
 	if frappe.flags.in_patch: return
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index ff102b3c08..77f62b3ec3 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -23,6 +23,8 @@
   "allow_import",
   "fields_section_break",
   "fields",
+  "naming_section",
+  "autoname",
   "view_settings_section",
   "title_field",
   "image_field",
@@ -261,6 +263,18 @@
    "fieldtype": "Table",
    "label": "Actions",
    "options": "DocType Action"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "naming_section",
+   "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"
   }
  ],
  "hide_toolbar": 1,
@@ -269,7 +283,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-09-24 14:16:49.594012",
+ "modified": "2021-02-16 15:22:11.108256",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 50acab46b5..74742551a4 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -17,6 +17,7 @@ from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype, che
 from frappe.custom.doctype.custom_field.custom_field import create_custom_field
 from frappe.custom.doctype.property_setter.property_setter import delete_property_setter
 from frappe.model.docfield import supports_translation
+from frappe.core.doctype.doctype.doctype import validate_series
 
 class CustomizeForm(Document):
 	def on_update(self):
@@ -135,7 +136,7 @@ class CustomizeForm(Document):
 	def save_customization(self):
 		if not self.doc_type:
 			return
-
+		validate_series(self)
 		self.flags.update_db = False
 		self.flags.rebuild_doctype_for_global_search = False
 		self.set_property_setters()
@@ -485,7 +486,8 @@ doctype_properties = {
 	'show_preview_popup': 'Check',
 	'email_append_to': 'Check',
 	'subject_field': 'Data',
-	'sender_field': 'Data'
+	'sender_field': 'Data',
+	'autoname': 'Data'
 }
 
 docfield_properties = {

From 7150638d8bcef04adeac0cd6a811bdbbd4441b16 Mon Sep 17 00:00:00 2001
From: Anupam <anupamvns0099@gmail.com>
Date: Tue, 23 Mar 2021 11:14:10 +0530
Subject: [PATCH 236/319] feat: allowed the auto name in Customize Form

(cherry picked from commit 607dcce21bfccca2252b597d3f045d8cc44bdf3a)
---
 frappe/core/doctype/doctype/doctype.py        | 30 +++++++++++--------
 .../doctype/customize_form/customize_form.py  |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 3edb66bd42..c0a82c594a 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -628,17 +628,23 @@ class DocType(Document):
 
 		validate_route_conflict(self.doctype, self.name)
 
-def validate_series(dt):
-	if not dt.autoname and dt.get("fields", {"fieldname":"naming_series"}):
+def validate_series(dt, autoname=None, name=None):
+	"""Validate if `autoname` property is correctly set."""
+	if not autoname:
+		autoname = dt.autoname
+	if not name:
+		name = dt.name
+
+	if not autoname and dt.get("fields", {"fieldname":"naming_series"}):
 		dt.autoname = "naming_series:"
 	elif dt.autoname == "naming_series:" and not dt.get("fields", {"fieldname":"naming_series"}):
 		frappe.throw(_("Invalid fieldname '{0}' in autoname").format(dt.autoname))
 
 	# validate field name if autoname field:fieldname is used
 	# Create unique index on autoname field automatically.
-	if dt.autoname and dt.autoname.startswith('field:'):
-		field = dt.autoname.split(":")[1]
-		if not field or field not in [ df.fieldname for df in dt.fields ]:
+	if autoname and autoname.startswith('field:'):
+		field = autoname.split(":")[1]
+		if not field or field not in [df.fieldname for df in dt.fields]:
 			frappe.throw(_("Invalid fieldname '{0}' in autoname").format(field))
 		else:
 			for df in dt.fields:
@@ -646,19 +652,19 @@ def validate_series(dt):
 					df.unique = 1
 					break
 
-	if dt.autoname and (not dt.autoname.startswith('field:')) \
-		and (not dt.autoname.startswith('eval:')) \
-		and (not dt.autoname.lower() in ('prompt', 'hash')) \
-		and (not dt.autoname.startswith('naming_series:')) \
-		and (not dt.autoname.startswith('format:')):
+	if autoname and (not autoname.startswith('field:')) \
+		and (not autoname.startswith('eval:')) \
+		and (not autoname.lower() in ('prompt', 'hash')) \
+		and (not autoname.startswith('naming_series:')) \
+		and (not autoname.startswith('format:')):
 
-		prefix = dt.autoname.split('.')[0]
+		prefix = autoname.split('.')[0]
 		used_in = frappe.db.sql("""
 			SELECT `name`
 			FROM `tabDocType`
 			WHERE `autoname` LIKE CONCAT(%s, '.%%')
 			AND `name`!=%s
-		""", (prefix, dt.name))
+		""", (prefix, name))
 		if used_in:
 			frappe.throw(_("Series {0} already used in {1}").format(prefix, used_in[0][0]))
 
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 74742551a4..ad8d80e675 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -136,7 +136,7 @@ class CustomizeForm(Document):
 	def save_customization(self):
 		if not self.doc_type:
 			return
-		validate_series(self)
+		validate_series(self, self.autoname, self.doc_type)
 		self.flags.update_db = False
 		self.flags.rebuild_doctype_for_global_search = False
 		self.set_property_setters()

From 72c98a6716598dc4325c98ff64aade1c78dbf627 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 23 Mar 2021 14:26:00 +0530
Subject: [PATCH 237/319] fix: Make scrolling separate for sidebar and main
 content

(cherry picked from commit 6e22902ae14026ff4a2cf8c9201ad89640ed1fbc)
---
 frappe/public/scss/desk/desktop.scss | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index 4dad0a4349..eaa9c7a7f7 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -733,3 +733,18 @@ body {
 		height: 200px;
 	}
 }
+
+[data-page-route="Workspaces"] {
+	@media (min-width: map-get($grid-breakpoints, "lg")) {
+		.layout-main {
+			height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px);
+			.layout-side-section, .layout-main-section-wrapper {
+				height: 100%;
+				overflow-y: scroll;
+			}
+			.desk-sidebar {
+				margin-bottom: var(--margin-2xl);
+			}
+		}
+	}
+}

From 574bd11c2d9fe260f9ce7c0e1690023b3ce4f1e3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 23 Mar 2021 14:26:26 +0530
Subject: [PATCH 238/319] fix: Mobile view for workspace

(cherry picked from commit 228cbb1a17a82ba94c9384ac2d8770a7530b4140)
---
 frappe/public/scss/desk/desktop.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index eaa9c7a7f7..ac58f203ea 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -485,6 +485,19 @@ body {
 				}
 			}
 		}
+
+		@media (max-width: map-get($grid-breakpoints, "sm")) {
+			.widget-body {
+				flex-direction: column;
+				.onboarding-steps-wrapper {
+					min-width: none;
+				}
+				.onboarding-step-preview {
+					padding-left: 0;
+					padding-top: var(--padding-lg);
+				}
+			}
+		}
 	}
 
 	&.shortcut-widget-box {

From 42c3cc4ee101f10a4cd10fc05cc904cfe3a38b86 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 13:05:42 +0530
Subject: [PATCH 239/319] fix(Workspace): Remove forced scrollbar (bp #12655)
 (#12656)

(cherry picked from commit 8be8d4ba554563b4aec5b27b47b0c22580428ad9)

Co-authored-by: Aditya Hase <aditya@adityahase.com>
---
 frappe/public/scss/desk/desktop.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss
index ac58f203ea..1bb91090e6 100644
--- a/frappe/public/scss/desk/desktop.scss
+++ b/frappe/public/scss/desk/desktop.scss
@@ -753,7 +753,7 @@ body {
 			height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px);
 			.layout-side-section, .layout-main-section-wrapper {
 				height: 100%;
-				overflow-y: scroll;
+				overflow-y: auto;
 			}
 			.desk-sidebar {
 				margin-bottom: var(--margin-2xl);

From 4de5562f66003d801e725da963d2f17dd1be0d81 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 21:40:08 +0530
Subject: [PATCH 240/319] fix: Login with username fails (bp #12658) (#12663)

With the recent refactoring we missed to include username check in auth
flow. Added test cases along with the fix.

(cherry picked from commit 29840260352649c274c642c8e0677379a8258d86)

Co-authored-by: Leela vadlamudi <leela@users.noreply.github.com>
---
 frappe/core/doctype/user/user.py | 24 ++++++----
 frappe/tests/test_auth.py        | 82 ++++++++++++++++++++++++++++----
 2 files changed, 88 insertions(+), 18 deletions(-)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 4d3f58713a..93acd5ec7d 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -534,30 +534,36 @@ class User(Document):
 	@classmethod
 	def find_by_credentials(cls, user_name: str, password: str, validate_password: bool = True):
 		"""Find the user by credentials.
+
+		This is a login utility that needs to check login related system settings while finding the user.
+		1. Find user by email ID by default
+		2. If allow_login_using_mobile_number is set, you can use mobile number while finding the user.
+		3. If allow_login_using_user_name is set, you can use username while finding the user.
 		"""
+
 		login_with_mobile = cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_mobile_number"))
+		login_with_username = cint(frappe.db.get_value("System Settings", "System Settings", "allow_login_using_user_name"))
 
-		user = None
+		or_filters = [{"name": user_name}]
 		if login_with_mobile:
-			filter = {"mobile_no": user_name}
-			user = frappe.db.get_value("User", filters=filter, fieldname=['name', 'enabled'], as_dict=True)
-		if not user:
-			filter = {"name": user_name}
-			user = frappe.db.get_value("User", filters=filter, fieldname=['name', 'enabled'], as_dict=True)
+			or_filters.append({"mobile_no": user_name})
+		if login_with_username:
+			or_filters.append({"username": user_name})
 
-		if not user:
+		users = frappe.db.get_all('User', fields=['name', 'enabled'], or_filters=or_filters, limit=1)
+		if not users:
 			return
 
+		user = users[0]
 		user['is_authenticated'] = True
 		if validate_password:
 			try:
-				check_password(user_name, password)
+				check_password(user['name'], password)
 			except frappe.AuthenticationError:
 				user['is_authenticated'] = False
 
 		return user
 
-
 @frappe.whitelist()
 def get_timezones():
 	import pytz
diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py
index 662ddc10fc..78e2ce5a90 100644
--- a/frappe/tests/test_auth.py
+++ b/frappe/tests/test_auth.py
@@ -7,21 +7,85 @@ import unittest
 
 import frappe
 from frappe.auth import LoginAttemptTracker
-from frappe.frappeclient import FrappeClient
-
+from frappe.frappeclient import FrappeClient, AuthError
 
 class TestAuth(unittest.TestCase):
-	def test_admin_login(self):
-		# Make sure that authentication works when allow_login_using_mobile_number is set to 0
-		frappe.db.set_value("System Settings", "System Settings", "allow_login_using_mobile_number", 0)
+	def __init__(self, *args, **kwargs):
+		super(TestAuth, self).__init__(*args, **kwargs)
+		self.test_user_email = 'test@test.com'
+		self.test_user_name = 'test_user'
+		self.test_user_mobile = '+911234567890'
+		self.test_user_password = 'pwd_012'
+
+	def setUp(self):
+		self.tearDown()
+
+		self.add_user(self.test_user_email, self.test_user_password,
+			username=self.test_user_name, mobile_no=self.test_user_mobile)
+
+	def tearDown(self):
+		frappe.delete_doc('User', self.test_user_email, force=True)
+
+	def add_user(self, email, password, username=None, mobile_no=None):
+		first_name = email.split('@', 1)[0]
+		user = frappe.get_doc(
+				dict(doctype='User', email=email, first_name=first_name, username=username, mobile_no=mobile_no)
+			).insert()
+		user.new_password = password
+		user.save()
 		frappe.db.commit()
-		FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False)
 
-		# Make sure that authentication works when allow_login_using_mobile_number is set to 1
-		frappe.db.set_value("System Settings", "System Settings", "allow_login_using_mobile_number", 1)
+	def set_system_settings(self, k, v):
+		frappe.db.set_value("System Settings", "System Settings", k, v)
 		frappe.db.commit()
-		FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False)
 
+	def test_allow_login_using_mobile(self):
+		self.set_system_settings('allow_login_using_mobile_number', 1)
+		self.set_system_settings('allow_login_using_user_name', 0)
+
+		# Login by both email and mobile should work
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+
+		# login by username should fail
+		with self.assertRaises(AuthError):
+			FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+
+	def test_allow_login_using_only_email(self):
+		self.set_system_settings('allow_login_using_mobile_number', 0)
+		self.set_system_settings('allow_login_using_user_name', 0)
+
+		# Login by mobile number should fail
+		with self.assertRaises(AuthError):
+			FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+
+		# login by username should fail
+		with self.assertRaises(AuthError):
+			FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+
+		# Login by email should work
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+
+	def test_allow_login_using_username(self):
+		self.set_system_settings('allow_login_using_mobile_number', 0)
+		self.set_system_settings('allow_login_using_user_name', 1)
+
+		# Mobile login should fail
+		with self.assertRaises(AuthError):
+			FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+
+		# Both email and username logins should work
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+
+	def test_allow_login_using_username_and_mobile(self):
+		self.set_system_settings('allow_login_using_mobile_number', 1)
+		self.set_system_settings('allow_login_using_user_name', 1)
+
+		# Both email and username and mobile logins should work
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+		FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
 
 class TestLoginAttemptTracker(unittest.TestCase):
 	def test_account_lock(self):

From 877ff4ca2d361f6fe1300b0e9924be4e206c192d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 14:22:48 +0530
Subject: [PATCH 241/319] feat: flag to delete docs permanently

---
 frappe/__init__.py         |  6 +++---
 frappe/model/delete_doc.py | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index fb49e5841f..6ef5e95a79 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -855,8 +855,8 @@ def get_meta_module(doctype):
 	import frappe.modules
 	return frappe.modules.load_doctype_module(doctype)
 
-def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None,
-	for_reload=False, ignore_permissions=False, flags=None, ignore_on_trash=False, ignore_missing=True):
+def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reload=False,
+	ignore_permissions=False, flags=None, ignore_on_trash=False, ignore_missing=True, delete_permanently=False):
 	"""Delete a document. Calls `frappe.model.delete_doc.delete_doc`.
 
 	:param doctype: DocType of document to be delete.
@@ -867,7 +867,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None,
 	:param ignore_permissions: Ignore user permissions."""
 	import frappe.model.delete_doc
 	frappe.model.delete_doc.delete_doc(doctype, name, force, ignore_doctypes, for_reload,
-		ignore_permissions, flags, ignore_on_trash, ignore_missing)
+		ignore_permissions, flags, ignore_on_trash, ignore_missing, delete_permanently)
 
 def delete_doc_if_exists(doctype, name, force=0):
 	"""Delete document if exists."""
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index d0e0a6fb1a..f0fe5daed4 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -22,8 +22,8 @@ from frappe.exceptions import FileNotFoundError
 doctypes_to_skip = ("Communication", "ToDo", "DocShare", "Email Unsubscribe", "Activity Log", "File",
 	"Version", "Document Follow", "Comment" , "View Log", "Tag Link", "Notification Log", "Email Queue")
 
-def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reload=False,
-	ignore_permissions=False, flags=None, ignore_on_trash=False, ignore_missing=True):
+def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reload=False, ignore_permissions=False,
+	flags=None, ignore_on_trash=False, ignore_missing=True, delete_permanently=False):
 	"""
 		Deletes a doc(dt, dn) and validates if it is not submitted and not linked in a live record
 	"""
@@ -125,8 +125,13 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 		# delete tag link entry
 		delete_tags_for_document(doc)
 
-		if doc and not for_reload:
+		if for_reload:
+			delete_permanently = True
+
+		if not delete_permanently:
 			add_to_deleted_document(doc)
+
+		if doc and not for_reload:
 			if not frappe.flags.in_patch:
 				try:
 					doc.notify_update()

From 6d0c68106deff450bf05c7495e17c1ea5b14874c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 14:45:32 +0530
Subject: [PATCH 242/319] feat: flag to delete attached files permanently

---
 frappe/core/doctype/file/file.py | 11 ++++++-----
 frappe/model/delete_doc.py       |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index c237b8e436..0cf38508b8 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -718,7 +718,7 @@ def delete_file(path):
 			os.remove(path)
 
 
-def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_delete=False):
+def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_delete=False, delete_permanently=False):
 	"""Remove file and File entry"""
 	file_name = None
 	if not (attached_to_doctype and attached_to_name):
@@ -736,7 +736,7 @@ def remove_file(fid=None, attached_to_doctype=None, attached_to_name=None, from_
 		if not file_name:
 			file_name = frappe.db.get_value("File", fid, "file_name")
 		comment = doc.add_comment("Attachment Removed", _("Removed {0}").format(file_name))
-		frappe.delete_doc("File", fid, ignore_permissions=ignore_permissions)
+		frappe.delete_doc("File", fid, ignore_permissions=ignore_permissions, delete_permanently=delete_permanently)
 
 	return comment
 
@@ -745,17 +745,18 @@ def get_max_file_size():
 	return cint(conf.get('max_file_size')) or 10485760
 
 
-def remove_all(dt, dn, from_delete=False):
+def remove_all(dt, dn, from_delete=False, delete_permanently=False):
 	"""remove all files in a transaction"""
 	try:
 		for fid in frappe.db.sql_list("""select name from `tabFile` where
 			attached_to_doctype=%s and attached_to_name=%s""", (dt, dn)):
 			if from_delete:
 				# If deleting a doc, directly delete files
-				frappe.delete_doc("File", fid, ignore_permissions=True)
+				frappe.delete_doc("File", fid, ignore_permissions=True, delete_permanently=delete_permanently)
 			else:
 				# Removes file and adds a comment in the document it is attached to
-				remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn, from_delete=from_delete)
+				remove_file(fid=fid, attached_to_doctype=dt, attached_to_name=dn,
+					from_delete=from_delete, delete_permanently=delete_permanently)
 	except Exception as e:
 		if e.args[0]!=1054: raise # (temp till for patched)
 
diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index f0fe5daed4..ccdb8ca8b3 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -110,7 +110,7 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 			doc.run_method("after_delete")
 
 			# delete attachments
-			remove_all(doctype, name, from_delete=True)
+			remove_all(doctype, name, from_delete=True, delete_permanently=delete_permanently)
 
 			if not for_reload:
 				# Enqueued at the end, because it gets committed

From ec71f21dc60059ec6139f3210000ef673c89bb83 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 14:46:38 +0530
Subject: [PATCH 243/319] fix: remove redundant code

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

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 1d0d6ebb09..c575ce409c 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -24,8 +24,6 @@ class PreparedReport(Document):
 	def enqueue_report(self):
 		enqueue(run_background, prepared_report=self.name, timeout=6000)
 
-	def on_trash(self):
-		remove_all("Prepared Report", self.name)
 
 
 def run_background(prepared_report):

From 08afcb6b4bae39ab1453d4af5f6e8d4b581ef59e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 14:47:13 +0530
Subject: [PATCH 244/319] fix: auto delete prepared reports permanently

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

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index c575ce409c..e947cee8ed 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -98,7 +98,7 @@ def delete_expired_prepared_reports():
 def delete_prepared_reports(reports):
 	reports = frappe.parse_json(reports)
 	for report in reports:
-		frappe.delete_doc('Prepared Report', report['name'], ignore_permissions=True)
+		frappe.delete_doc('Prepared Report', report['name'], ignore_permissions=True, delete_permanently=True)
 
 def create_json_gz_file(data, dt, dn):
 	# Storing data in CSV file causes information loss

From 78f56fd9c81172f28db7f33ffb68dca3697a28f8 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 16:37:59 +0530
Subject: [PATCH 245/319] chore: update docstring for delete_doc

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 6ef5e95a79..fdcfac817d 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -864,7 +864,8 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 	:param force: Allow even if document is linked. Warning: This may lead to data integrity errors.
 	:param ignore_doctypes: Ignore if child table is one of these.
 	:param for_reload: Call `before_reload` trigger before deleting.
-	:param ignore_permissions: Ignore user permissions."""
+	:param ignore_permissions: Ignore user permissions.
+	:param delete_permanently: Do not create a Deleted Document for the document."""
 	import frappe.model.delete_doc
 	frappe.model.delete_doc.delete_doc(doctype, name, force, ignore_doctypes, for_reload,
 		ignore_permissions, flags, ignore_on_trash, ignore_missing, delete_permanently)

From 2e044e6af5c1f220279b7eaa5e823911b48047b9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 22 Mar 2021 16:56:13 +0530
Subject: [PATCH 246/319] fix: update description for
 prepared_report_expiry_period

- remove duplicate field
---
 .../core/doctype/system_settings/system_settings.json | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 13dbc32620..f052f0024a 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -1,5 +1,7 @@
 {
  "actions": [],
+ "allow_read": 1,
+ "allow_workflow": 1,
  "creation": "2014-04-17 16:53:52.640856",
  "doctype": "DocType",
  "document_type": "System",
@@ -446,7 +448,7 @@
   {
    "default": "30",
    "depends_on": "enable_prepared_report_auto_deletion",
-   "description": "System will automatically delete Prepared Reports after these many days since creation",
+   "description": "System will auto-delete Prepared Reports permanently after these many days since creation",
    "fieldname": "prepared_report_expiry_period",
    "fieldtype": "Int",
    "label": "Prepared Report Expiry Period (Days)"
@@ -469,13 +471,6 @@
    "fieldtype": "Data",
    "label": "App Name"
   },
-  {
-   "default": "3",
-   "description": "Hourly rate limit for generating password reset links",
-   "fieldname": "password_reset_limit",
-   "fieldtype": "Int",
-   "label": "Password Reset Link Generation Limit"
-  },
   {
    "default": "1",
    "fieldname": "strip_exif_metadata_from_uploaded_images",

From 74fef045f3dd6f95d2aa04739ec168f6c1de5632 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 15:50:40 +0530
Subject: [PATCH 247/319] chore: Remove unused code (bp #12671) (#12675)

(cherry picked from commit c4b0f54943696fb7b4534f9eb18ea65a4c97ae69)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
---
 .../system_settings/system_settings.json      |  13 +-
 frappe/public/js/frappe/socketio_client.js    | 112 ------------------
 socketio.js                                   |  41 -------
 3 files changed, 3 insertions(+), 163 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 13dbc32620..0b1abbab06 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -67,8 +67,7 @@
   "enable_prepared_report_auto_deletion",
   "prepared_report_expiry_period",
   "chat",
-  "enable_chat",
-  "use_socketio_to_upload_file"
+  "enable_chat"
  ],
  "fields": [
   {
@@ -394,12 +393,6 @@
    "fieldtype": "Check",
    "label": "Enable Chat"
   },
-  {
-   "default": "1",
-   "fieldname": "use_socketio_to_upload_file",
-   "fieldtype": "Check",
-   "label": "Use socketio to upload file"
-  },
   {
    "fieldname": "column_break_21",
    "fieldtype": "Column Break"
@@ -486,7 +479,7 @@
  "icon": "fa fa-cog",
  "issingle": 1,
  "links": [],
- "modified": "2020-12-30 18:52:22.161391",
+ "modified": "2021-03-25 13:58:12.750629",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "System Settings",
@@ -504,4 +497,4 @@
  "sort_field": "modified",
  "sort_order": "ASC",
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index e274ef952f..c9c98bd937 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -54,7 +54,6 @@ frappe.socketio = {
 
 		frappe.socketio.setup_listeners();
 		frappe.socketio.setup_reconnect();
-		frappe.socketio.uploader = new frappe.socketio.SocketIOUploader();
 
 		$(document).on('form-load form-rename', function(e, frm) {
 			if (frm.is_new()) {
@@ -257,114 +256,3 @@ frappe.realtime.publish = function(event, message) {
 	}
 }
 
-frappe.socketio.SocketIOUploader = class SocketIOUploader {
-	constructor() {
-		frappe.socketio.socket.on('upload-request-slice', (data) => {
-			var place = data.currentSlice * this.chunk_size,
-				slice = this.file.slice(place,
-					place + Math.min(this.chunk_size, this.file.size - place));
-
-			if (this.on_progress) {
-				// update progress
-				this.on_progress(place / this.file.size * 100);
-			}
-
-			this.reader.readAsArrayBuffer(slice);
-			this.started = true;
-			this.keep_alive();
-		});
-
-		frappe.socketio.socket.on('upload-end', (data) => {
-			this.reader = null;
-			this.file = null;
-			if (data.file_url.substr(0, 7)==='/public') {
-				data.file_url = data.file_url.substr(7);
-			}
-			this.callback(data);
-		});
-
-		frappe.socketio.socket.on('upload-error', (data) => {
-			this.disconnect(false);
-			frappe.msgprint({
-				title: __('Upload Failed'),
-				message: data.error,
-				indicator: 'red'
-			});
-		});
-
-		frappe.socketio.socket.on('disconnect', () => {
-			this.disconnect();
-		});
-	}
-
-	start({file=null, is_private=0, filename='', callback=null, on_progress=null,
-		chunk_size=24576, fallback=null} = {}) {
-
-		if (this.reader) {
-			frappe.throw(__('File Upload in Progress. Please try again in a few moments.'));
-		}
-
-		function fallback_required() {
-			return !frappe.socketio.socket.connected
-				|| !( !frappe.boot.sysdefaults || frappe.boot.sysdefaults.use_socketio_to_upload_file );
-		}
-
-		if (fallback_required()) {
-			return fallback ? fallback() : frappe.throw(__('Socketio is not connected. Cannot upload'));
-		}
-
-		this.reader = new FileReader();
-		this.file = file;
-		this.chunk_size = chunk_size;
-		this.callback = callback;
-		this.on_progress = on_progress;
-		this.fallback = fallback;
-		this.started = false;
-
-		this.reader.onload = () => {
-			frappe.socketio.socket.emit('upload-accept-slice', {
-				is_private: is_private,
-				name: filename,
-				type: this.file.type,
-				size: this.file.size,
-				data: this.reader.result
-			});
-			this.keep_alive();
-		};
-
-		var slice = file.slice(0, this.chunk_size);
-		this.reader.readAsArrayBuffer(slice);
-	}
-
-	keep_alive() {
-		if (this.next_check) {
-			clearTimeout (this.next_check);
-		}
-		this.next_check = setTimeout (() => {
-			if (!this.started) {
-				// upload never started, so try fallback
-				if (this.fallback) {
-					this.fallback();
-				} else {
-					this.disconnect();
-				}
-			}
-			this.disconnect();
-		}, 3000);
-	}
-
-	disconnect(with_message = true) {
-		if (this.reader) {
-			this.reader = null;
-			this.file = null;
-			frappe.hide_progress();
-			if (with_message) {
-				frappe.msgprint({
-					title: __('File Upload'),
-					message: __('File Upload Disconnected. Please try again.'),
-					indicator: 'red'
-				});
-			}
-		}
-	}
-}
diff --git a/socketio.js b/socketio.js
index 136787858a..796b8aa94d 100644
--- a/socketio.js
+++ b/socketio.js
@@ -216,47 +216,6 @@ io.on('connection', function (socket) {
 			'type'
 		);
 	});
-
-	socket.on('upload-accept-slice', (data) => {
-		try {
-			if (!socket.files[data.name]) {
-				socket.files[data.name] = Object.assign({}, files_struct, data);
-				socket.files[data.name].data = [];
-			}
-
-			//convert the ArrayBuffer to Buffer
-			data.data = new Buffer(new Uint8Array(data.data));
-			//save the data
-			socket.files[data.name].data.push(data.data);
-			socket.files[data.name].slice++;
-
-			if (socket.files[data.name].slice * 24576 >= socket.files[data.name].size) {
-				// do something with the data
-				var fileBuffer = Buffer.concat(socket.files[data.name].data);
-
-				const file_url = path.join((socket.files[data.name].is_private ? 'private' : 'public'),
-					'files', data.name);
-				const file_path = path.join('sites', get_site_name(socket), file_url);
-
-				fs.writeFile(file_path, fileBuffer, (err) => {
-					delete socket.files[data.name];
-					if (err) return socket.emit('upload error');
-					socket.emit('upload-end', {
-						file_url: '/' + file_url
-					});
-				});
-			} else {
-				socket.emit('upload-request-slice', {
-					currentSlice: socket.files[data.name].slice
-				});
-			}
-		} catch (e) {
-			log(e);
-			socket.emit('upload-error', {
-				error: e.message
-			});
-		}
-	});
 });
 
 subscriber.on("message", function (_channel, message) {

From 0f02750939a15b1665ca12668c3a22954a24ea56 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 25 Mar 2021 17:57:41 +0530
Subject: [PATCH 248/319] fix: Hide tooltip on route change (bp #12579)
 (#12684)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/desk.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index d59bd4cdb7..250d308b7e 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -173,6 +173,9 @@ frappe.Application = Class.extend({
 			frappe.router.route();
 		}
 		frappe.after_ajax(() => frappe.flags.setting_original_route = false);
+		frappe.router.on('change', () => {
+			$(".tooltip").hide();
+		});
 	},
 
 	setup_frappe_vue() {

From 483bd606699df2c2d67acf8335f651b1d8c4425a Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 18 Mar 2021 20:24:00 +0530
Subject: [PATCH 249/319] fix: Format currency values in dashboard chart

(cherry picked from commit 8fcee4e5f8d69ffbe1b5da606cdd5024a20bc2b1)
---
 frappe/public/js/frappe/widgets/chart_widget.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index c1f5e6053f..104c457991 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -208,6 +208,7 @@ export default class ChartWidget extends Widget {
 
 		this.fetch(this.filters, true, this.args).then(data => {
 			if (this.chart_doc.chart_type == "Report") {
+				this.report_result = data;
 				this.summary = data.report_summary;
 				data = this.get_report_chart_data(data);
 			}
@@ -571,6 +572,13 @@ export default class ChartWidget extends Widget {
 			axisOptions: {
 				xIsSeries: this.chart_doc.timeseries,
 				shortenYAxisNumbers: 1
+			},
+			tooltipOptions: {
+				formatTooltipY: value =>
+					frappe.format(value, {
+						fieldtype: this.report_result.chart.fieldtype,
+						options: this.report_result.chart.options
+					}, { always_show_decimals: true, inline: true })
 			}
 		};
 
@@ -750,4 +758,4 @@ export default class ChartWidget extends Widget {
 			this.dashboard_chart && this.dashboard_chart.draw(true);
 		});
 	}
-}
\ No newline at end of file
+}

From e4312479e19cd84d63013ff731e32e8c722984ec Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 15:24:45 +0530
Subject: [PATCH 250/319] fix: missing help links in navbar help dropdown (bp
 #12657) (#12691)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/ui/toolbar/navbar.html |  3 ++-
 frappe/public/js/frappe/ui/toolbar/toolbar.js  |  3 ++-
 frappe/public/js/frappe/utils/help_links.js    | 10 +++++-----
 frappe/public/scss/desk/global.scss            |  5 +++++
 frappe/public/scss/desk/sidebar.scss           |  2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 2f22bf5909..73767d2019 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -68,7 +68,8 @@
 						</span>
 					</a>
 					<div class="dropdown-menu dropdown-menu-right" id="toolbar-help" role="menu">
-						<div class="divider documentation-links"></div>
+						<div id="help-links"></div>
+						<div class="dropdown-divider documentation-links"></div>
 						{% for item in navbar_settings.help_dropdown %}
 							{% if (!item.hidden) { %}
 								{% if (item.route) { %}
diff --git a/frappe/public/js/frappe/ui/toolbar/toolbar.js b/frappe/public/js/frappe/ui/toolbar/toolbar.js
index 5cc0fc5ce4..e4359b5efb 100644
--- a/frappe/public/js/frappe/ui/toolbar/toolbar.js
+++ b/frappe/public/js/frappe/ui/toolbar/toolbar.js
@@ -95,7 +95,8 @@ frappe.ui.toolbar.Toolbar = class {
 				var link = links[i];
 				var url = link.url;
 				$("<a>", {
-					href: link.url,
+					href: url,
+					class: "dropdown-item",
 					text: link.label,
 					target: "_blank"
 				}).appendTo($help_links);
diff --git a/frappe/public/js/frappe/utils/help_links.js b/frappe/public/js/frappe/utils/help_links.js
index 6665db39c1..0c4cf37599 100644
--- a/frappe/public/js/frappe/utils/help_links.js
+++ b/frappe/public/js/frappe/utils/help_links.js
@@ -12,7 +12,7 @@ frappe.help.help_links['modules/Setup'] = [
 	{ label: 'Printing', url: 'http://frappe.github.io/erpnext/user/manual/en/setting-up/print/' },
 ]
 
-frappe.help.help_links['user'] = [
+frappe.help.help_links['List/User'] = [
 	{ label: 'Adding Users', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/adding-users' },
 	{ label: 'Rename User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/rename-user' },
 ]
@@ -25,19 +25,19 @@ frappe.help.help_links['user-permissions'] = [
 	{ label: 'User Permissions', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/user-permissions' },
 ]
 
-frappe.help.help_links['system-settings'] = [
+frappe.help.help_links['Form/System Settings'] = [
 	{ label: 'System Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/system-settings' },
 ]
 
-frappe.help.help_links['email-account'] = [
+frappe.help.help_links['List/Email Account'] = [
 	{ label: 'Email Account', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-account' },
 ]
 
-frappe.help.help_links['notification'] = [
+frappe.help.help_links['List/Notification'] = [
 	{ label: 'Notification', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' },
 ]
 
-frappe.help.help_links['print-settings'] = [
+frappe.help.help_links['Form/Print Settings'] = [
 	{ label: 'Print Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' },
 ]
 
diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss
index b145879e1f..0124516312 100644
--- a/frappe/public/scss/desk/global.scss
+++ b/frappe/public/scss/desk/global.scss
@@ -266,6 +266,11 @@ select.input-xs {
 	.dropdown-divider {
 		margin: 4px 0;
 	}
+
+	.divider {
+		@extend .dropdown-divider;
+	}
+
 	a:not([href]):hover:active {
 		color: $component-active-color;
 	}
diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
index c46717caae..7430044878 100644
--- a/frappe/public/scss/desk/sidebar.scss
+++ b/frappe/public/scss/desk/sidebar.scss
@@ -225,7 +225,7 @@ body[data-route^="Module"] .main-menu {
 
 			.divider {
 				height: 1px;
-				background-color: #d8dfe5;
+				background-color: var(--border-color);
 				opacity: 0.7;
 			}
 

From 8c5334026c8935e8d042dbaf33ef5a435c1580e3 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Mar 2021 18:28:29 +0530
Subject: [PATCH 251/319] fix: Typography for markdown content (bp #12692)
 (#12698)

Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
---
 frappe/public/scss/website/doc.scss      |  49 --------
 frappe/public/scss/website/markdown.scss | 151 +++++++++++++++++------
 frappe/templates/doc.html                |  15 ---
 frappe/website/js/website.js             |   6 +-
 4 files changed, 118 insertions(+), 103 deletions(-)

diff --git a/frappe/public/scss/website/doc.scss b/frappe/public/scss/website/doc.scss
index 1585f428f9..8cc12e7e55 100644
--- a/frappe/public/scss/website/doc.scss
+++ b/frappe/public/scss/website/doc.scss
@@ -169,25 +169,6 @@ $navbar-height-lg: 4.5rem;
 		margin-top: 3rem;
 	}
 
-	h1 {
-		font-size: $font-size-3xl;
-		font-weight: 500;
-	}
-
-	h1 + p {
-		font-size: $font-size-lg;
-	}
-
-	h2 {
-		font-size: $font-size-2xl;
-		font-weight: 500;
-	}
-
-	h3 {
-		font-size: $font-size-xl;
-		font-weight: 500;
-	}
-
 	h1,
 	h2,
 	h3,
@@ -202,36 +183,6 @@ $navbar-height-lg: 4.5rem;
 			visibility: hidden;
 		}
 	}
-
-	h4 {
-		font-size: $font-size-lg;
-		font-weight: 500;
-	}
-
-	strong {
-		font-weight: 600;
-	}
-
-	table {
-		border-color: $gray-200;
-	}
-
-	table thead {
-		background-color: $light;
-	}
-
-	.table-bordered,
-	.table-bordered th,
-	.table-bordered td {
-		border-left: none;
-		border-right: none;
-		border-color: $gray-200;
-	}
-
-	.table-bordered thead th,
-	.table-bordered thead td {
-		border-bottom-width: 1px;
-	}
 }
 
 // next links
diff --git a/frappe/public/scss/website/markdown.scss b/frappe/public/scss/website/markdown.scss
index 4b0c20cbc4..c5f44d20d8 100644
--- a/frappe/public/scss/website/markdown.scss
+++ b/frappe/public/scss/website/markdown.scss
@@ -1,9 +1,29 @@
+$font-sizes-desktop: (
+	"sm": 0.75rem,
+	"base": 1rem,
+	"lg": 1.125rem,
+	"xl": 1.41rem,
+	"2xl": 1.6rem,
+	"3xl": 2rem
+);
+
+$font-sizes-mobile: (
+	"sm": 0.75rem,
+	"base": 1rem,
+	"lg": 1.125rem,
+	"xl": 1.25rem,
+	"2xl": 1.5rem,
+	"3xl": 1.75rem
+);
+
 .from-markdown {
 	color: $gray-700;
-	line-height: 1.625;
+	line-height: 1.7;
+	letter-spacing: -0.011em;
 
 	> * + * {
-		margin-top: 1rem;
+		margin-top: 0.75rem;
+		margin-bottom: 0;
 	}
 
 	> :first-child {
@@ -16,7 +36,7 @@
 
 	ul,
 	ol {
-		padding-left: 2.5rem;
+		padding-left: 2rem;
 	}
 
 	ul {
@@ -27,17 +47,27 @@
 		list-style: decimal;
 	}
 
-	li > * + * {
-		margin-top: 1rem;
+	li {
+		text-indent: 0.25rem;
+		padding-top: 1px;
+		padding-bottom: 1px;
+	}
+
+	li > ul, li > ol {
+		padding-left: 1.5rem;
 	}
 
-	> ul > * + *,
-	> ol > * + * {
-		margin-top: 1rem;
+	ul > li:first-child {
+		margin-top: 3px;
+	}
+
+	ul > * + *,
+	ol > * + * {
+		margin-top: 2px;
 	}
 
 	> blockquote {
-		padding: 1.25rem 1rem;
+		padding: 0.75rem 1rem 0.75rem 1.25rem;
 		font-size: $font-size-sm;
 		font-weight: 500;
 		border: 1px solid $gray-200;
@@ -55,60 +85,87 @@
 
 	b, strong {
 		color: $gray-800;
+		font-weight: 600;
 	}
 
 	h1, h2, h3, h4, h5, h6 {
 		color: $gray-900;
 	}
 
-	h1 + p {
-		margin-top: 0.75rem;
-		font-size: $font-size-base;
+	h2, h3, h4, h5, h6 {
+		font-weight: 600;
+	}
+
+	h1 {
+		font-size: map-get($font-sizes-mobile, '3xl');
+		line-height: 1.5;
+		letter-spacing: -0.021em;
+		font-weight: 700;
 
-		@include media-breakpoint-up(sm) {
-			margin-top: 1.25rem;
-			font-size: 1.125rem;
-		}
 		@include media-breakpoint-up(md) {
-			font-size: 1.25rem;
+			font-size: map-get($font-sizes-desktop, '3xl');
+			letter-spacing: -0.024em;
+		}
+
+		// for byline
+		& + p {
+			margin-top: 1.5rem;
+			font-size: map-get($font-sizes-mobile, 'xl');
+			letter-spacing: -0.014em;
+			line-height: 1.4;
+
+			@include media-breakpoint-up(md) {
+				font-size: map-get($font-sizes-desktop, 'xl');
+				letter-spacing: -0.0175em;
+			}
 		}
 	}
 
 	h2 {
-		margin-bottom: 1rem;
-		margin-top: 3.5rem;
+		font-size: map-get($font-sizes-mobile, '2xl');
+		line-height: 1.56;
+		letter-spacing: -0.015em;
+		margin-top: 4rem;
+
+		@include media-breakpoint-up(md) {
+			font-size: map-get($font-sizes-desktop, '2xl');
+			letter-spacing: -0.0195em;
+		}
 	}
 
 	h3 {
-		margin-top: 3rem;
-		margin-bottom: 1rem;
-		font-weight: 600;
-		line-height: 1.25;
-		font-size: $font-size-xl;
+		font-size: map-get($font-sizes-mobile, 'xl');
+		line-height: 1.56;
+		letter-spacing: -0.014em;
+		margin-top: 2.25rem;
+
+		@include media-breakpoint-up(md) {
+			font-size: map-get($font-sizes-desktop, 'xl');
+			letter-spacing: -0.0175em;
+		}
 	}
 
 	h4 {
+		font-size: map-get($font-sizes-mobile, 'lg');
+		line-height: 1.56;
+		letter-spacing: -0.014em;
 		margin-top: 2.5rem;
-		margin-bottom: 1rem;
-		font-size: 1.125rem;
-		font-weight: 600;
-		line-height: 1.25;
 	}
 
 	h5 {
-		margin-top: 2rem;
-		margin-bottom: 1rem;
-		font-size: $font-size-base;
+		font-size: map-get($font-sizes-mobile, 'base');
+		line-height: 1.5;
+		letter-spacing: -0.011em;
 		font-weight: 600;
-		line-height: 1.25;
+		margin-top: 2rem;
 	}
 
 	h6 {
-		margin-top: 1.5rem;
-		margin-bottom: 1rem;
-		font-size: $font-size-sm;
+		font-size: map-get($font-sizes-mobile, 'sm');
+		line-height: 1.35;
 		font-weight: 600;
-		line-height: 1.25;
+		text-transform: uppercase;
+		margin-top: 1.5rem;
 	}
 
 	tr > td,
@@ -124,6 +181,7 @@
 	.screenshot {
 		border: 1px solid $gray-400;
 		border-radius: 0.375rem;
+		margin-top: 0.5rem;
 	}
 
 	.screenshot + em {
@@ -138,4 +196,25 @@
 		background: $light;
 		border-radius: 0.125rem;
 	}
+
+	table {
+		border-color: $gray-200;
+	}
+
+	table thead {
+		background-color: $light;
+	}
+
+	.table-bordered,
+	.table-bordered th,
+	.table-bordered td {
+		border-left: none;
+		border-right: none;
+		border-color: $gray-200;
+	}
+
+	.table-bordered thead th,
+	.table-bordered thead td {
+		border-bottom-width: 1px;
+	}
 }
diff --git a/frappe/templates/doc.html b/frappe/templates/doc.html
index 3a566a1227..f3a8ab8cc8 100644
--- a/frappe/templates/doc.html
+++ b/frappe/templates/doc.html
@@ -23,21 +23,6 @@
 			<div class="col-12 col-lg-8">
 				<div class="doc-search-container">
 					<div class="website-search doc-search" id="search-container">
-						<div class="dropdown">
-							<div class="search-icon">
-								<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"
-									fill="none"
-									stroke="currentColor" stroke-width="2" stroke-linecap="round"
-									stroke-linejoin="round"
-									class="feather feather-search">
-									<circle cx="11" cy="11" r="8"></circle>
-									<line x1="21" y1="21" x2="16.65" y2="16.65"></line>
-								</svg>
-							</div>
-							<input type="search" class="form-control" placeholder="Search the docs (Press / to focus)" />
-							<div class="overflow-hidden shadow dropdown-menu w-100">
-							</div>
-						</div>
 					</div>
 					<button class="navbar-toggler" type="button"
 						data-toggle="collapse"
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index bcbf7f762f..b8360e68ca 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -385,6 +385,9 @@ frappe.setup_search = function (target, search_scope) {
 	}
 
 	let $search_input = $(`<div class="dropdown" id="dropdownMenuSearch">
+			<input type="search" class="form-control" placeholder="Search the docs (Press / to focus)" />
+			<div class="overflow-hidden shadow dropdown-menu w-100" aria-labelledby="dropdownMenuSearch">
+			</div>
 			<div class="search-icon">
 				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"
 					fill="none"
@@ -395,9 +398,6 @@ frappe.setup_search = function (target, search_scope) {
 					<line x1="21" y1="21" x2="16.65" y2="16.65"></line>
 				</svg>
 			</div>
-			<input type="search" class="form-control" placeholder="Search the docs (Press / to focus)" />
-			<div class="overflow-hidden shadow dropdown-menu w-100" aria-labelledby="dropdownMenuSearch">
-			</div>
 		</div>`);
 
 	target.empty();

From 4854b7952bb5768f660fc4afb3d812ba5967e4af Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sat, 27 Mar 2021 18:07:59 +0530
Subject: [PATCH 252/319] fix: Always validate file URLs (bp #12685) (#12704)

* feat: validate file urls

* fix: validate file url while downloading content

* fix: cleaner validation

* fix: added separate validation for web URLs

Co-authored-by: Saurabh <saurabh6790@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit bbeb24123230593d7b5b237dd0eb0e21f9248f85)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
---
 frappe/core/doctype/file/file.py      | 127 +++++++++++++++-----------
 frappe/core/doctype/file/test_file.py |  19 +++-
 2 files changed, 92 insertions(+), 54 deletions(-)

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 0cf38508b8..f55214d160 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -94,52 +94,89 @@ class File(Document):
 			self.set_file_name()
 			self.validate_duplicate_entry()
 			self.validate_attachment_limit()
+
 		self.validate_folder()
 
-		if not self.file_url and not self.flags.ignore_file_validate:
-			if not self.is_folder:
+		if self.is_folder:
+			self.file_url = ""
+		else:
+			self.validate_url()
+
+		self.file_size = frappe.form_dict.file_size or self.file_size
+
+	def validate_url(self):
+		if not self.file_url or self.file_url.startswith(("http://", "https://")):
+			if not self.flags.ignore_file_validate:
 				self.validate_file()
-			self.generate_content_hash()
 
-		if frappe.db.exists('File', {'name': self.name, 'is_folder': 0}):
-			old_file_url = self.file_url
-			if not self.is_folder and (self.is_private != self.db_get('is_private')):
-				private_files = frappe.get_site_path('private', 'files')
-				public_files = frappe.get_site_path('public', 'files')
+			return
 
-				file_name = self.file_url.split('/')[-1]
-				if not self.is_private:
-					shutil.move(os.path.join(private_files, file_name),
-						os.path.join(public_files, file_name))
+		# Probably an invalid web URL
+		if not self.file_url.startswith(("/files/", "/private/files/")):
+			frappe.throw(
+				_("URL must start with http:// or https://"),
+				title=_('Invalid URL')
+			)
+
+		# Ensure correct formatting and type
+		self.file_url = unquote(self.file_url)
+		self.is_private = cint(self.is_private)
+
+		self.handle_is_private_changed()
+
+		base_path = os.path.realpath(get_files_path(is_private=self.is_private))
+		if not os.path.realpath(self.get_full_path()).startswith(base_path):
+			frappe.throw(
+				_("The File URL you've entered is incorrect"),
+				title=_('Invalid File URL')
+			)
+
+	def handle_is_private_changed(self):
+		if not frappe.db.exists(
+			'File', {
+				'name': self.name,
+				'is_private': cint(not self.is_private)
+			}
+		):
+			return
 
-					self.file_url = "/files/{0}".format(file_name)
+		old_file_url = self.file_url
 
-				else:
-					shutil.move(os.path.join(public_files, file_name),
-						os.path.join(private_files, file_name))
+		file_name = self.file_url.split('/')[-1]
+		private_file_path = frappe.get_site_path('private', 'files', file_name)
+		public_file_path = frappe.get_site_path('public', 'files', file_name)
 
-					self.file_url = "/private/files/{0}".format(file_name)
+		if self.is_private:
+			shutil.move(public_file_path, private_file_path)
+			url_starts_with = "/private/files/"
+		else:
+			shutil.move(private_file_path, public_file_path)
+			url_starts_with = "/files/"
 
-				update_existing_file_docs(self)
+		self.file_url = "{0}{1}".format(url_starts_with, file_name)
+		update_existing_file_docs(self)
 
-			# update documents image url with new file url
-			if self.attached_to_doctype and self.attached_to_name:
-				if not self.attached_to_field:
-					field_name = None
-					reference_dict = frappe.get_doc(self.attached_to_doctype, self.attached_to_name).as_dict()
-					for key, value in reference_dict.items():
-						if value == old_file_url:
-							field_name = key
-							break
-					self.attached_to_field = field_name
-				if self.attached_to_field:
-					frappe.db.set_value(self.attached_to_doctype, self.attached_to_name,
-						self.attached_to_field, self.file_url)
+		if (
+			not self.attached_to_doctype
+			or not self.attached_to_name
+			or not self.fetch_attached_to_field(old_file_url)
+		):
+			return
 
-		self.validate_url()
+		frappe.db.set_value(self.attached_to_doctype, self.attached_to_name,
+			self.attached_to_field, self.file_url)
+
+	def fetch_attached_to_field(self, old_file_url):
+		if self.attached_to_field:
+			return True
 
-		if self.file_url and (self.is_private != self.file_url.startswith('/private')):
-			frappe.throw(_('Invalid file URL. Please contact System Administrator.'))
+		reference_dict = frappe.get_doc(
+			self.attached_to_doctype, self.attached_to_name).as_dict()
+
+		for key, value in reference_dict.items():
+			if value == old_file_url:
+				self.attached_to_field = key
+				return True
 
 	def validate_attachment_limit(self):
 		attachment_limit = 0
@@ -335,8 +372,13 @@ class File(Document):
 
 	def get_content(self):
 		"""Returns [`file_name`, `content`] for given file name `fname`"""
+		if self.is_folder:
+			frappe.throw(_("Cannot get file contents of a Folder"))
+
 		if self.get('content'):
 			return self.content
+
+		self.validate_url()
 		file_path = self.get_full_path()
 
 		# read the file
@@ -423,23 +465,6 @@ class File(Document):
 		else:
 			raise Exception
 
-
-	def validate_url(self, df=None):
-		if self.file_url:
-			if not self.file_url.startswith(("http://", "https://", "/files/", "/private/files/")):
-				frappe.throw(_("URL must start with 'http://' or 'https://'"))
-				return
-
-			if not self.file_url.startswith(("http://", "https://")):
-				# local file
-				root_files_path = get_files_path(is_private=self.is_private)
-				if not os.path.commonpath([root_files_path]) == os.path.commonpath([root_files_path, self.get_full_path()]):
-					# basically the file url is skewed to not point to /files/ or /private/files
-					frappe.throw(_("{0} is not a valid file url").format(self.file_url))
-			self.file_url = unquote(self.file_url)
-			self.file_size = frappe.form_dict.file_size or self.file_size
-
-
 	def get_uploaded_content(self):
 		# should not be unicode when reading a file, hence using frappe.form
 		if 'filedata' in frappe.form_dict:
diff --git a/frappe/core/doctype/file/test_file.py b/frappe/core/doctype/file/test_file.py
index e627558680..216dfd5495 100644
--- a/frappe/core/doctype/file/test_file.py
+++ b/frappe/core/doctype/file/test_file.py
@@ -192,13 +192,10 @@ class TestSameContent(unittest.TestCase):
 
 
 class TestFile(unittest.TestCase):
-
-
 	def setUp(self):
 		self.delete_test_data()
 		self.upload_file()
 
-
 	def tearDown(self):
 		try:
 			frappe.get_doc("File", {"file_name": "file_copy.txt"}).delete()
@@ -352,6 +349,22 @@ class TestFile(unittest.TestCase):
 		self.assertEqual(file1.file_url, file2.file_url)
 		self.assertTrue(os.path.exists(file2.get_full_path()))
 
+	def test_parent_directory_validation_in_file_url(self):
+		file1 = frappe.get_doc({
+			"doctype": "File",
+			"file_name": 'parent_dir.txt',
+			"attached_to_doctype": "",
+			"attached_to_name": "",
+			"is_private": 1,
+			"content": test_content1}).insert()
+
+		file1.file_url = '/private/files/../test.txt'
+		self.assertRaises(frappe.exceptions.ValidationError, file1.save)
+
+		# No validation to see if file exists
+		file1.reload()
+		file1.file_url = '/private/files/parent_dir2.txt'
+		file1.save()
 
 class TestAttachment(unittest.TestCase):
 	test_doctype = 'Test For Attachment'

From 8137bf5d82d24a972d8a72fff2234bb61d60de17 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 24 Mar 2021 17:36:23 +0530
Subject: [PATCH 253/319] fix: Read only mode for color input - fix style color
 readonly field - fix case where color control is hidden

(cherry picked from commit 0d20d1a5d55104c07e3003d09814968ecd2281a4)
---
 frappe/public/js/frappe/form/controls/color.js |  2 +-
 frappe/public/js/frappe/form/formatters.js     |  6 ++++++
 frappe/public/scss/common/color_picker.scss    | 15 ++++++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index 7890ea755c..bf04581abd 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -76,7 +76,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
 	refresh() {
 		this._super();
 		let color = this.get_color();
-		if (this.picker.color !== color) {
+		if (this.picker && this.picker.color !== color) {
 			this.picker.color = color;
 			this.picker.refresh();
 		}
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 4578cf2ded..f792d5b173 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -293,6 +293,12 @@ frappe.form.formatters = {
 			return frappe.format(value, link_field, options, row);
 		});
 		return formatted_values.join(', ');
+	},
+	Color: (value) => {
+		return `<div>
+			<div class="selected-color" style="background-color: ${value}"></div>
+			<span class="color-value">${value}</span>
+		</div>`;
 	}
 }
 
diff --git a/frappe/public/scss/common/color_picker.scss b/frappe/public/scss/common/color_picker.scss
index 627ab12a2e..7ab9b0c504 100644
--- a/frappe/public/scss/common/color_picker.scss
+++ b/frappe/public/scss/common/color_picker.scss
@@ -92,7 +92,7 @@
 	}
 }
 
-.frappe-control[data-fieldtype='Color']  {
+.frappe-control[data-fieldtype='Color'] {
 	input {
 		padding-left: 40px;
 	}
@@ -104,11 +104,20 @@
 		background-color: red;
 		position: absolute;
 		top: calc(50% + 1px);
-		left: 5px;
+		left: 8px;
 		content: ' ';
 		&.no-value {
 			background: url('/assets/frappe/images/color-circle.png');
 			background-size: contain;
 		}
 	}
-}
\ No newline at end of file
+	.like-disabled-input {
+		.color-value {
+			padding-left: 25px;
+		}
+		.selected-color {
+			top: 20%;
+			cursor: default;
+		}
+	}
+}

From 1b8710fc45470aaa15cb71baeaf1d161e20e7ed7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 24 Mar 2021 17:37:44 +0530
Subject: [PATCH 254/319] fix: Set color control as Data while adding filter

(cherry picked from commit b22e5ddcb2d91c8b2fc69f6caefa5be052081219)
---
 frappe/public/js/frappe/ui/filters/filter.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 945115af82..b2b2b623e2 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -495,6 +495,7 @@ frappe.ui.filter_utils = {
 				'Dynamic Link',
 				'Read Only',
 				'Assign',
+				'Color',
 			].indexOf(df.fieldtype) != -1
 		) {
 			df.fieldtype = 'Data';

From 58608d40a28d21f4686b304c750d11ee5bd7360c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 29 Mar 2021 17:56:58 +0530
Subject: [PATCH 255/319] fix: Add version link to version content

(cherry picked from commit f202953654b42e34c32fe5240ed6cf68ea5186c6)
---
 .../version_timeline_content_builder.js       | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
index 0f57998475..a563286413 100644
--- a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
+++ b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
@@ -144,6 +144,27 @@ function get_version_timeline_content(version_doc, frm) {
 
 
 function get_version_comment(version_doc, text) {
+	// TODO: Replace with a better solution
+	if (text.includes("<a")) {
+		// if text already has linked content in it
+		// then just add a version link to unlinked content
+		let version_comment = "";
+		let unlinked_content = "";
+
+		Array.from($(text)).forEach(element => {
+			if ($(element).is('a')) {
+				version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : "";
+				unlinked_content = "";
+				version_comment += element.outerHTML;
+			} else {
+				unlinked_content += element.outerHTML || element.textContent;
+			}
+		});
+		if (unlinked_content) {
+			version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content);
+		}
+		return version_comment;
+	}
 	return frappe.utils.get_form_link('Version', version_doc.name, true, text);
 }
 
@@ -164,4 +185,5 @@ function get_user_link(doc) {
 	return frappe.utils.get_form_link('User', user, true, user_display_text);
 }
 
-export { get_version_timeline_content };
\ No newline at end of file
+export { get_version_timeline_content };
+

From 363c76da610a49e9393728feafd56cb9f35f58f7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 24 Mar 2021 17:06:08 +0530
Subject: [PATCH 256/319] fix: awesomplete style in page form

(cherry picked from commit 1c0e5c20c9b5509688f6f11980356411619b9e79)
---
 frappe/public/scss/desk/list.scss | 4 ----
 frappe/public/scss/desk/page.scss | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss
index b7a195718e..ea3401b09e 100644
--- a/frappe/public/scss/desk/list.scss
+++ b/frappe/public/scss/desk/list.scss
@@ -332,10 +332,6 @@ input.list-check-all, input.list-row-checkbox {
 }
 
 .page-form {
-	// .awesomplete > ul {
-	// 	min-width: 300px;
-	// }
-
 	.standard-filter-section {
 		flex-wrap: wrap;
 		// width: 65%;
diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss
index 85831dc2a0..65d535facc 100644
--- a/frappe/public/scss/desk/page.scss
+++ b/frappe/public/scss/desk/page.scss
@@ -117,6 +117,10 @@
 			display: none;
 		}
 	}
+
+	.awesomplete > ul {
+		min-width: 300px;
+	}
 }
 
 .form-inner-toolbar {

From d4fa6e128646ecd8203f75362c1c11046b01b173 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 25 Mar 2021 10:07:36 +0530
Subject: [PATCH 257/319] fix: render info type comments on form timeline

(cherry picked from commit e286cbfc8bcc830096c53c853b3eb5f5c78ef735)
---
 frappe/desk/form/load.py                             |  1 +
 frappe/public/js/frappe/form/footer/form_timeline.js | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 1f5c437330..c1429d361f 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -100,6 +100,7 @@ def get_docinfo(doc=None, doctype=None, name=None):
 		"assignment_logs": get_comments(doc.doctype, doc.name, 'assignment'),
 		"permissions": get_doc_permissions(doc),
 		"shared": frappe.share.get_users(doc.doctype, doc.name),
+		"info_logs": get_comments(doc.doctype, doc.name, 'Info'),
 		"share_logs": get_comments(doc.doctype, doc.name, 'share'),
 		"like_logs": get_comments(doc.doctype, doc.name, 'Like'),
 		"views": get_view_logs(doc.doctype, doc.name),
diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js
index 7b8d36d90b..1da59a2fdf 100644
--- a/frappe/public/js/frappe/form/footer/form_timeline.js
+++ b/frappe/public/js/frappe/form/footer/form_timeline.js
@@ -139,6 +139,7 @@ class FormTimeline extends BaseTimeline {
 			this.timeline_items.push(...this.get_custom_timeline_contents());
 			this.timeline_items.push(...this.get_assignment_timeline_contents());
 			this.timeline_items.push(...this.get_attachment_timeline_contents());
+			this.timeline_items.push(...this.get_info_timeline_contents());
 			this.timeline_items.push(...this.get_milestone_timeline_contents());
 		}
 	}
@@ -269,6 +270,17 @@ class FormTimeline extends BaseTimeline {
 		return assignment_timeline_contents;
 	}
 
+	get_info_timeline_contents() {
+		let info_timeline_contents = [];
+		(this.doc_info.info_logs || []).forEach(info_log => {
+			info_timeline_contents.push({
+				creation: info_log.creation,
+				content: `${this.get_user_link(info_log.comment_email)} ${info_log.content}`,
+			});
+		});
+		return info_timeline_contents;
+	}
+
 	get_attachment_timeline_contents() {
 		let attachment_timeline_contents = [];
 		(this.doc_info.attachment_logs || []).forEach(attachment_log => {

From fcdb9c991592d4250581087b35f8a2645ba54593 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 12:24:54 +0530
Subject: [PATCH 258/319] fix: toggle modal scroll for field select in modal

(cherry picked from commit 64d2d99ba8b1eac311c3bd63ab7634cfa95a6ba7)
---
 frappe/public/js/frappe/ui/filters/field_select.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/public/js/frappe/ui/filters/field_select.js b/frappe/public/js/frappe/ui/filters/field_select.js
index ed271a73aa..b7384ad8f1 100644
--- a/frappe/public/js/frappe/ui/filters/field_select.js
+++ b/frappe/public/js/frappe/ui/filters/field_select.js
@@ -36,6 +36,19 @@ frappe.ui.FieldSelect = Class.extend({
 			var item = me.awesomplete.get_item(value);
 			me.$input.val(item.label);
 		});
+		this.$input.on("awesomplete-open", () => {
+			let modal = this.$input.parents('.modal-dialog')[0];
+			console.log('opened', modal);
+			if (modal) {
+				$(modal).removeClass("modal-dialog-scrollable");
+			}
+		})
+		this.$input.on("awesomplete-close", () => {
+			let modal = this.$input.parents('.modal-dialog')[0];
+			if (modal) {
+				$(modal).addClass("modal-dialog-scrollable");
+			}
+		});
 
 		if(this.filter_fields) {
 			for(var i in this.filter_fields)

From ad0beb3810a9804457092d97d2cd2f9afa4f87d4 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 12:25:17 +0530
Subject: [PATCH 259/319] fix: don't show apply filter button if no filter
 button

(cherry picked from commit ab65f7a7f050bc823b14472791e555a72aec8701)
---
 frappe/public/js/frappe/ui/filters/filter_list.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 0b2218ceda..709e2290b3 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -299,9 +299,12 @@ frappe.ui.FilterGroup = class {
 						<button class="btn btn-secondary btn-xs clear-filters">
 							${__('Clear Filters')}
 						</button>
-						<button class="btn btn-primary btn-xs apply-filters">
-							${__('Apply Filters')}
-						</button>
+						${this.filter_button ?
+							`<button class="btn btn-primary btn-xs apply-filters">
+								${__('Apply Filters')}
+							</button>`
+							: ''
+						}
 					</div>
 				</div>
 			</div>`

From 2081d37269b5a6fc4cc41793ac42bc0f6bf25513 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 13:13:21 +0530
Subject: [PATCH 260/319] fix: check if report result exists before formatting

(cherry picked from commit c0e949e8093255101f2f4b0592c696e8f0f10f04)
---
 frappe/public/js/frappe/widgets/chart_widget.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 104c457991..47cb947a10 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -573,14 +573,17 @@ export default class ChartWidget extends Widget {
 				xIsSeries: this.chart_doc.timeseries,
 				shortenYAxisNumbers: 1
 			},
-			tooltipOptions: {
+		};
+
+		if (this.report_result && this.report_result.chart) {
+			chart_args.tooltipOptions = {
 				formatTooltipY: value =>
 					frappe.format(value, {
 						fieldtype: this.report_result.chart.fieldtype,
 						options: this.report_result.chart.options
 					}, { always_show_decimals: true, inline: true })
 			}
-		};
+		}
 
 		if (this.chart_doc.type == "Heatmap") {
 			const heatmap_year = parseInt(this.selected_heatmap_year || this.chart_settings.heatmap_year || this.chart_doc.heatmap_year);

From 6d80c9e1ba0fc9dff00c95c8a73cec9e5e7a5e81 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 14:12:07 +0530
Subject: [PATCH 261/319] feat: don't render filters, sort, add doc button for
 dashbaord view

(cherry picked from commit e22542a2b143f797fb1600897d57d50b1e07923b)
---
 frappe/public/js/frappe/list/base_list.js          |  4 +++-
 frappe/public/js/frappe/list/list_view.js          | 14 +++++++-------
 .../js/frappe/views/dashboard/dashboard_view.js    |  6 ++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 24e14ffc38..a2dc51d69b 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -285,6 +285,7 @@ frappe.views.BaseList = class BaseList {
 	}
 
 	setup_filter_area() {
+		if (this.hide_filters) return;
 		this.filter_area = new FilterArea(this);
 
 		if (this.filters && this.filters.length > 0) {
@@ -293,6 +294,7 @@ frappe.views.BaseList = class BaseList {
 	}
 
 	setup_sort_selector() {
+		if (this.hide_sort_selector) return;
 		this.sort_selector = new frappe.ui.SortSelector({
 			parent: this.$filter_section,
 			doctype: this.doctype,
@@ -410,7 +412,7 @@ frappe.views.BaseList = class BaseList {
 			doctype: this.doctype,
 			fields: this.get_fields(),
 			filters: this.get_filters_for_args(),
-			order_by: this.sort_selector.get_sql_string(),
+			order_by: this.sort_selector && this.sort_selector.get_sql_string(),
 			start: this.start,
 			page_length: this.page_length,
 			view: this.view,
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 6e6635caf6..aca88817fc 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -417,11 +417,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	get_no_result_message() {
 		let help_link = this.get_documentation_link();
-		let filters = this.filter_area.get();
-		let no_result_message = filters.length
+		let filters = this.filter_area && this.filter_area.get();
+		let no_result_message = filters && filters.length
 			? __("No {0} found", [__(this.doctype)])
 			: __("You haven't created a {0} yet", [__(this.doctype)]);
-		let new_button_label = filters.length
+		let new_button_label = filters && filters.length
 			? __("Create a new {0}", [__(this.doctype)])
 			: __("Create your first {0}", [__(this.doctype)]);
 		let empty_state_image =
@@ -461,7 +461,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	}
 
 	before_refresh() {
-		if (frappe.route_options) {
+		if (frappe.route_options && this.filter_area) {
 			this.filters = this.parse_filters_from_route_options();
 			frappe.route_options = null;
 
@@ -527,9 +527,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			this.view_name
 		);
 		this.save_view_user_settings({
-			filters: this.filter_area.get(),
-			sort_by: this.sort_selector.sort_by,
-			sort_order: this.sort_selector.sort_order,
+			filters: this.filter_area && this.filter_area.get(),
+			sort_by: this.sort_selector && this.sort_selector.sort_by,
+			sort_order: this.sort_selector && this.sort_selector.sort_order,
 		});
 		this.toggle_paging && this.$paging_area.toggle(false);
 	}
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 5137d840ec..252024463e 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -20,6 +20,8 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 	setup_page() {
 		this.hide_sidebar = true;
 		this.hide_page_form = true;
+		this.hide_filters = true;
+		this.hide_sort_selector = true;
 		super.setup_page();
 	}
 
@@ -74,6 +76,10 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 		this.toggle_customization_buttons(false);
 	}
 
+	set_primary_action() {
+		// Don't render Add doc button for dashboard view
+	}
+
 	toggle_customization_buttons(show) {
 		this.save_customizations_button.toggle(show);
 		this.discard_customizations_button.toggle(show);

From d11ed6a217a1a1b9f57d441ddc2ed6946a5cf62b Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 14:30:39 +0530
Subject: [PATCH 262/319] style: fix formatting

(cherry picked from commit 7fe570c297eb5cbbc46acde82637138db2251fe4)
---
 frappe/public/js/frappe/ui/filters/field_select.js | 3 +--
 frappe/public/js/frappe/ui/filters/filter_list.js  | 2 ++
 frappe/public/js/frappe/widgets/chart_widget.js    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/field_select.js b/frappe/public/js/frappe/ui/filters/field_select.js
index b7384ad8f1..c362214ce2 100644
--- a/frappe/public/js/frappe/ui/filters/field_select.js
+++ b/frappe/public/js/frappe/ui/filters/field_select.js
@@ -38,11 +38,10 @@ frappe.ui.FieldSelect = Class.extend({
 		});
 		this.$input.on("awesomplete-open", () => {
 			let modal = this.$input.parents('.modal-dialog')[0];
-			console.log('opened', modal);
 			if (modal) {
 				$(modal).removeClass("modal-dialog-scrollable");
 			}
-		})
+		});
 		this.$input.on("awesomplete-close", () => {
 			let modal = this.$input.parents('.modal-dialog')[0];
 			if (modal) {
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 709e2290b3..3dff0013b9 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -283,6 +283,7 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_area_template() {
+		/* eslint-disable indent */
 		return $(`
 			<div class="filter-area">
 				<div class="filter-edit-area">
@@ -309,6 +310,7 @@ frappe.ui.FilterGroup = class {
 				</div>
 			</div>`
 		);
+		/* eslint-disable indent */
 	}
 
 	get_filters_as_object() {
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 47cb947a10..01314b436f 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -582,7 +582,7 @@ export default class ChartWidget extends Widget {
 						fieldtype: this.report_result.chart.fieldtype,
 						options: this.report_result.chart.options
 					}, { always_show_decimals: true, inline: true })
-			}
+			};
 		}
 
 		if (this.chart_doc.type == "Heatmap") {

From 04b1cf5b94a9b8ac339724353ccbe4eecb9699ec Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 26 Mar 2021 17:00:11 +0530
Subject: [PATCH 263/319] fix: render map view in Views menu

(cherry picked from commit 8af1616656b18b02b5d891ec4ab3cdb388a1e662)
---
 frappe/public/icons/timeless/symbol-defs.svg     | 6 ++++++
 frappe/public/js/frappe/list/base_list.js        | 4 +++-
 frappe/public/js/frappe/list/list_view_select.js | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg
index 2b0cc8b696..d2c162161f 100644
--- a/frappe/public/icons/timeless/symbol-defs.svg
+++ b/frappe/public/icons/timeless/symbol-defs.svg
@@ -693,4 +693,10 @@
 	<symbol viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-star">
 		<path d="M11.5516 2.90849C11.735 2.53687 12.265 2.53687 12.4484 2.90849L14.8226 7.71919C14.8954 7.86677 15.0362 7.96905 15.1991 7.99271L20.508 8.76415C20.9181 8.82374 21.0818 9.32772 20.7851 9.61699L16.9435 13.3616C16.8257 13.4765 16.7719 13.642 16.7997 13.8042L17.7066 19.0916C17.7766 19.5001 17.3479 19.8116 16.9811 19.6187L12.2327 17.1223C12.087 17.0457 11.913 17.0457 11.7673 17.1223L7.01888 19.6187C6.65207 19.8116 6.22335 19.5001 6.29341 19.0916L7.20028 13.8042C7.2281 13.642 7.17433 13.4765 7.05648 13.3616L3.21491 9.61699C2.91815 9.32772 3.08191 8.82374 3.49202 8.76415L8.80094 7.99271C8.9638 7.96905 9.10458 7.86677 9.17741 7.71919L11.5516 2.90849Z" fill="var(--star-fill)" stroke="var(--star-fill)"/>
 	</symbol>
+	<symbol fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" id="icon-map">
+		<g stroke="#111" stroke-miterlimit="10">
+		<path d="M11.467 3.458c1.958 1.957 1.958 5.088.027 7.02L7.97 14l-3.523-3.523a4.945 4.945 0 010-6.993l.026-.026a4.922 4.922 0 016.993 0zm0 0c-.026-.026-.026-.026 0 0z"></path>
+		<path d="M7.971 8.259a1.305 1.305 0 100-2.61 1.305 1.305 0 000 2.61z"></path>
+		</g>
+	</symbol>
 </svg>
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index a2dc51d69b..beacb136e6 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -179,7 +179,8 @@ frappe.views.BaseList = class BaseList {
 			'Calendar': 'calendar',
 			'Gantt': 'gantt',
 			'Kanban': 'kanban',
-			'Dashboard': 'dashboard'
+			'Dashboard': 'dashboard',
+			'Map': 'map',
 		};
 
 		if (frappe.boot.desk_settings.view_switcher) {
@@ -823,6 +824,7 @@ frappe.views.view_modes = [
 	"Image",
 	"Inbox",
 	"Tree",
+	"Map",
 ];
 frappe.views.is_valid = (view_mode) =>
 	frappe.views.view_modes.includes(view_mode);
diff --git a/frappe/public/js/frappe/list/list_view_select.js b/frappe/public/js/frappe/list/list_view_select.js
index 826158ff3f..9607be6e90 100644
--- a/frappe/public/js/frappe/list/list_view_select.js
+++ b/frappe/public/js/frappe/list/list_view_select.js
@@ -123,7 +123,14 @@ frappe.views.ListViewSelect = class ListViewSelect {
 						kanbans => this.setup_kanban_switcher(kanbans)
 					);
 				}
-			}
+			},
+			Map: {
+				condition: this.list_view.settings.get_coords_method ||
+					(this.list_view.meta.fields.find(i => i.fieldname === "latitude") &&
+					this.list_view.meta.fields.find(i => i.fieldname === "longitude")) ||
+					(this.list_view.meta.fields.find(i => i.fieldname === 'location' && i.fieldtype == 'Geolocation')),
+				action: () => this.set_route("map")
+			},
 		};
 
 		frappe.views.view_modes.forEach(view => {

From ceb029ae51897ea699d6e57506a6ebd63e825d68 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 30 Mar 2021 10:42:34 +0530
Subject: [PATCH 264/319] fix: translation syntax

(cherry picked from commit a638618788612825c0ef526a1204f6c6025a877e)
---
 frappe/public/js/frappe/ui/filters/filter_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 3dff0013b9..38950db29d 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -294,7 +294,7 @@ frappe.ui.FilterGroup = class {
 				<hr class="divider"></hr>
 				<div class="filter-action-buttons">
 					<button class="text-muted add-filter btn btn-xs">
-						${__('+ Add a Filter')}
+						+ ${__(' Add a Filter')}
 					</button>
 					<div>
 						<button class="btn btn-secondary btn-xs clear-filters">

From afe6d1cc3130e9c9c741d7028199e99df6178ec7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 30 Mar 2021 10:52:57 +0530
Subject: [PATCH 265/319] style: Remove unnecessary space

(cherry picked from commit fdb94a5177112f345ea2629ee63e6ce003372d58)
---
 frappe/public/js/frappe/ui/filters/filter_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 38950db29d..611ab024bf 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -294,7 +294,7 @@ frappe.ui.FilterGroup = class {
 				<hr class="divider"></hr>
 				<div class="filter-action-buttons">
 					<button class="text-muted add-filter btn btn-xs">
-						+ ${__(' Add a Filter')}
+						+ ${__('Add a Filter')}
 					</button>
 					<div>
 						<button class="btn btn-secondary btn-xs clear-filters">

From 16684995e0f5cb610211f7047cf1b7069aace647 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 16:41:44 +0530
Subject: [PATCH 266/319] fix: pull modules from Module Def instead of desktop
 config file (bp #12631) (#12723)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 875056bb15233b03645e535e8427c05201398932)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/config/__init__.py | 46 ++++-----------------------------------
 1 file changed, 4 insertions(+), 42 deletions(-)

diff --git a/frappe/config/__init__.py b/frappe/config/__init__.py
index cc9d0e6c67..30be82d0df 100644
--- a/frappe/config/__init__.py
+++ b/frappe/config/__init__.py
@@ -36,48 +36,10 @@ def get_modules_from_all_apps():
 	return modules_list
 
 def get_modules_from_app(app):
-	try:
-		modules = frappe.get_attr(app + '.config.desktop.get_data')() or {}
-	except ImportError:
-		return []
-
-	active_domains = frappe.get_active_domains()
-
-	if isinstance(modules, dict):
-		active_modules_list = []
-		for m, module in iteritems(modules):
-			module['module_name'] = m
-			module['app'] = app
-			active_modules_list.append(module)
-	else:
-		for m in modules:
-			if m.get("type") == "module" and "category" not in m:
-				m["category"] = "Modules"
-
-		# Only newly formatted modules that have a category to be shown on desk
-		modules = [m for m in modules if m.get("category")]
-		active_modules_list = []
-
-		for m in modules:
-			to_add = True
-			module_name = m.get("module_name")
-
-			# Check Domain
-			if is_domain(m) and module_name not in active_domains:
-				to_add = False
-
-			# Check if config
-			if is_module(m) and not config_exists(app, frappe.scrub(module_name)):
-				to_add = False
-
-			if "condition" in m and not m["condition"]:
-				to_add = False
-
-			if to_add:
-				m["app"] = app
-				active_modules_list.append(m)
-
-	return active_modules_list
+	return frappe.get_all('Module Def',
+		filters={'app_name': app},
+		fields=['module_name', 'app_name as app']
+	)
 
 def get_all_empty_tables_by_module():
 	empty_tables = set(r[0] for r in frappe.db.multisql({

From 524b12f0cdba3465259b481062554827301c4a1c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 20:31:56 +0530
Subject: [PATCH 267/319] fix: System Notification fix (bp #12719) (#12724)

(cherry picked from commit 93e6cc4ac129a6880ebd09f1d7c02ae35101e1ab)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/desk/doctype/notification_log/notification_log.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index a6126f1f9b..20551559fd 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -61,7 +61,7 @@ def make_notification_logs(doc, users):
 	from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
 
 	for user in users:
-		if frappe.db.exists('User', {"name": user, "enabled": 1}):
+		if frappe.db.exists('User', {"email": user, "enabled": 1}):
 			if is_notifications_enabled(user):
 				if doc.type == 'Energy Point' and not is_energy_point_enabled():
 					return

From 7947b07baa8b2bcc721af2b9e526a4613bc5b516 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Mar 2021 20:42:49 +0530
Subject: [PATCH 268/319] fix: enable fetch from for Check fieldtype (bp
 #12727) (#12728)

(cherry picked from commit 8d3e0c244027c3edb0574465932240707a659818)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/form/script_manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index 770319ba53..6af178f11e 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -184,7 +184,7 @@ frappe.ui.form.ScriptManager = Class.extend({
 		}
 
 		function setup_add_fetch(df) {
-			if((['Data', 'Read Only', 'Text', 'Small Text', 'Currency',
+			if ((['Data', 'Read Only', 'Text', 'Small Text', 'Currency', 'Check',
 				'Text Editor', 'Code', 'Link', 'Float', 'Int', 'Date', 'Select'].includes(df.fieldtype) || df.read_only==1)
 				&& df.fetch_from && df.fetch_from.indexOf(".")!=-1) {
 				var parts = df.fetch_from.split(".");

From 6ba3a95c031c6c0ce31d2442a11581ae61173584 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 29 Mar 2021 21:44:08 +0530
Subject: [PATCH 269/319] fix(refactor): lockdown frappe.desk.reportview

(cherry picked from commit a2ffea53f278d6101ec430bd7c026ef0c9204226)
---
 frappe/__init__.py            |   2 +-
 frappe/desk/reportview.py     | 153 ++++++++++++++++++++++++----------
 frappe/model/db_query.py      |  41 +--------
 frappe/public/js/frappe/db.js |   2 +-
 4 files changed, 114 insertions(+), 84 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index fdcfac817d..cef3b23252 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1379,7 +1379,7 @@ def get_list(doctype, *args, **kwargs):
 		frappe.get_list("ToDo", fields="*", filters = {"description": ("like", "test%")})
 	"""
 	import frappe.model.db_query
-	return frappe.model.db_query.DatabaseQuery(doctype).execute(None, *args, **kwargs)
+	return frappe.model.db_query.DatabaseQuery(doctype).execute(*args, **kwargs)
 
 def get_all(doctype, *args, **kwargs):
 	"""List database query via `frappe.model.db_query`. Will **not** check for permissions.
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 3003385601..e5c87d9603 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -8,6 +8,7 @@ import frappe, json
 from six.moves import range
 import frappe.permissions
 from frappe.model.db_query import DatabaseQuery
+from frappe.model import default_fields, optional_fields
 from frappe import _
 from six import string_types, StringIO
 from frappe.core.doctype.access_log.access_log import make_access_log
@@ -18,10 +19,13 @@ from frappe.utils import cstr, format_duration
 @frappe.read_only()
 def get():
 	args = get_form_params()
+	return compress(execute(**args), args=args)
 
-	data = compress(execute(**args), args = args)
-
-	return data
+@frappe.whitelist()
+@frappe.read_only()
+def get_list():
+	# uncompressed (refactored from frappe.model.db_query.get_list)
+	return execute(**get_form_params())
 
 def execute(doctype, *args, **kwargs):
 	return DatabaseQuery(doctype).execute(*args, **kwargs)
@@ -29,9 +33,104 @@ def execute(doctype, *args, **kwargs):
 def get_form_params():
 	"""Stringify GET request parameters."""
 	data = frappe._dict(frappe.local.form_dict)
+	clean_params(data)
+	parse_json(data)
+
+	validate_fields(data)
+	if data.filters:
+		validate_filters(data, data.filters)
+	if data.or_filters:
+		validate_filters(data, data.or_filters)
+
+	data.strict = None
+
+	return data
+
+def get_fields(data):
+	if ((isinstance(fields, string_types) and fields == "*")
+		or (isinstance(fields, (list, tuple)) and len(fields) == 1 and fields[0] == "*")):
+		data["fields"] = frappe.db.get_table_columns(data.doctype)
+		fields = data["fields"]
+
+def validate_fields(data):
+	update_star_field_param(data)
+
+	for field in data.fields:
+		fieldname = extract_fieldname(field)
+		if is_standard(fieldname): continue
+
+		meta, df = get_meta_and_docfield(fieldname, data)
+
+		if not df:
+			raise_invalid_field(fieldname)
+
+		# remove the field from the query if the report hide flag is set and current view is Report
+		if df.report_hide and data.view == 'Report':
+			data.fields.remove(field)
+			continue
+
+		if df.fieldname in [_df.fieldname for _df in meta.get_high_permlevel_fields()]:
+			if df.get('permlevel') not in meta.get_permlevel_access(parenttype=data.doctype):
+				data.fields.remove(field)
+
+def validate_filters(data, filters):
+	if isinstance(filters, list):
+		# filters as list
+		for condition in filters:
+			if len(condition)==3:
+				# [fieldname, condition, value]
+				fieldname = condition[0]
+				if is_standard(fieldname): continue
+				meta, df = get_meta_and_docfield(fieldname, data)
+				if not df:
+					raise_invalid_field(condition[0])
+			else:
+				# [doctype, fieldname, condition, value]
+				fieldname = condition[1]
+				if is_standard(fieldname): continue
+				meta = frappe.get_meta(condition[0])
+				if not meta.get_field(fieldname):
+					raise_invalid_field(fieldname)
+
+	else:
+		for fieldname in filters:
+			if is_standard(fieldname): continue
+			meta, df = get_meta_and_docfield(fieldname, data)
+			if not df:
+				raise_invalid_field(fieldname)
+
+def raise_invalid_field(fieldname):
+	frappe.throw(_('Field not permitted in query') + ': {0}'.format(fieldname), frappe.DataError)
+
+def is_standard(fieldname):
+	if '.' in fieldname:
+		parenttype, fieldname = get_parenttype_and_fieldname(fieldname, None)
+	return fieldname in default_fields or fieldname in optional_fields
+
+def extract_fieldname(field):
+	fieldname = field.split(" as ")[0]
 
-	is_report = data.get('view') == 'Report'
+	# certain functions allowed, extract the fieldname from the function
+	if (fieldname.startswith('count(')
+		or fieldname.startswith('sum(')
+		or fieldname.startswith('avg(')):
+		fieldname = fieldname.split('(', 1)[1].split(')')[0]
 
+	return fieldname
+
+def get_meta_and_docfield(fieldname, data):
+	parenttype, fieldname = get_parenttype_and_fieldname(fieldname, data)
+	meta = frappe.get_meta(parenttype)
+	df = meta.get_field(fieldname)
+	return meta, df
+
+def update_star_field_param(data):
+	if ((isinstance(data.fields, string_types) and data.fields == "*")
+		or (isinstance(data.fields, (list, tuple)) and len(data.fields) == 1 and data.fields[0] == "*")):
+		data.fields = frappe.db.get_table_columns(data.doctype)
+
+
+def clean_params(data):
 	data.pop('cmd', None)
 	data.pop('data', None)
 	data.pop('ignore_permissions', None)
@@ -41,8 +140,12 @@ def get_form_params():
 	if "csrf_token" in data:
 		del data["csrf_token"]
 
+
+def parse_json(data):
 	if isinstance(data.get("filters"), string_types):
 		data["filters"] = json.loads(data["filters"])
+	if isinstance(data.get("or_filters"), string_types):
+		data["or_filters"] = json.loads(data["or_filters"])
 	if isinstance(data.get("fields"), string_types):
 		data["fields"] = json.loads(data["fields"])
 	if isinstance(data.get("docstatus"), string_types):
@@ -52,47 +155,8 @@ def get_form_params():
 	else:
 		data["save_user_settings"] = True
 
-	fields = data["fields"]
-
-	if ((isinstance(fields, string_types) and fields == "*")
-		or (isinstance(fields, (list, tuple)) and len(fields) == 1 and fields[0] == "*")):
-		parenttype = data.doctype
-		data["fields"] = frappe.db.get_table_columns(parenttype)
-		fields = data["fields"]
-
-	for field in fields:
-		key = field.split(" as ")[0]
-
-		if key.startswith('count('): continue
-		if key.startswith('sum('): continue
-		if key.startswith('avg('): continue
-
-		parenttype, fieldname = get_parent_dt_and_field(key, data)
-
-		if fieldname == "*":
-			# * inside list is not allowed with other fields
-			fields.remove(field)
-
-		meta = frappe.get_meta(parenttype)
-		df = meta.get_field(fieldname)
-
-		report_hide = df.report_hide if df else None
-
-		# remove the field from the query if the report hide flag is set and current view is Report
-		if report_hide and is_report:
-			fields.remove(field)
 
-		if df and fieldname in [df.fieldname for df in meta.get_high_permlevel_fields()]:
-			if df.get('permlevel') not in meta.get_permlevel_access(parenttype=data.doctype) and field in fields:
-				fields.remove(field)
-
-	# queries must always be server side
-	data.query = None
-	data.strict = None
-
-	return data
-
-def get_parent_dt_and_field(field, data):
+def get_parenttype_and_fieldname(field, data):
 	if "." in field:
 		parenttype, fieldname = field.split(".")[0][4:-1], field.split(".")[1].strip("`")
 	else:
@@ -101,7 +165,6 @@ def get_parent_dt_and_field(field, data):
 
 	return parenttype, fieldname
 
-
 def compress(data, args = {}):
 	"""separate keys and values"""
 	from frappe.desk.query_report import add_total_row
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 8eac75eb65..924686299a 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -32,7 +32,7 @@ class DatabaseQuery(object):
 		self.flags = frappe._dict()
 		self.reference_doctype = None
 
-	def execute(self, query=None, fields=None, filters=None, or_filters=None,
+	def execute(self, fields=None, filters=None, or_filters=None,
 		docstatus=None, group_by=None, order_by=None, limit_start=False,
 		limit_page_length=None, as_list=False, with_childnames=False, debug=False,
 		ignore_permissions=False, user=None, with_comment_count=False,
@@ -104,12 +104,9 @@ class DatabaseQuery(object):
 		# no table & ignore_ddl, return
 		if not self.columns: return []
 
-		if query:
-			result = self.run_custom_query(query)
-		else:
-			result = self.build_and_run()
-			if return_query:
-				return result
+		result = self.build_and_run()
+		if return_query:
+			return result
 
 		if with_comment_count and not as_list and self.doctype:
 			self.add_comment_count(result)
@@ -707,12 +704,6 @@ class DatabaseQuery(object):
 
 		return " and ".join(conditions) if conditions else ""
 
-
-	def run_custom_query(self, query):
-		if '%(key)s' in query:
-			query = query.replace('%(key)s', '`name`')
-		return frappe.db.sql(query, as_dict = (not self.as_list))
-
 	def set_order_by(self, args):
 		meta = frappe.get_meta(self.doctype)
 
@@ -819,30 +810,6 @@ def get_order_by(doctype, meta):
 
 	return order_by
 
-
-@frappe.whitelist()
-def get_list(doctype, *args, **kwargs):
-	'''wrapper for DatabaseQuery'''
-	kwargs.pop('cmd', None)
-	kwargs.pop('ignore_permissions', None)
-	kwargs.pop('data', None)
-	kwargs.pop('strict', None)
-	kwargs.pop('user', None)
-
-	# If doctype is child table
-	if frappe.is_table(doctype):
-		# Example frappe.db.get_list('Purchase Receipt Item', {'parent': 'Purchase Receipt'})
-		# Here purchase receipt is the parent doctype of the child doctype Purchase Receipt Item
-
-		if not kwargs.get('parent'):
-			frappe.flags.error_message = _('Parent is required to get child table data')
-			raise frappe.PermissionError(doctype)
-
-		check_parent_permission(kwargs.get('parent'), doctype)
-		del kwargs['parent']
-
-	return DatabaseQuery(doctype).execute(None, *args, **kwargs)
-
 def is_parent_only_filter(doctype, filters):
 	#check if filters contains only parent doctype
 	only_parent_doctype = True
diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js
index cf716c67e5..1cfc6f3696 100644
--- a/frappe/public/js/frappe/db.js
+++ b/frappe/public/js/frappe/db.js
@@ -15,7 +15,7 @@ frappe.db = {
 		}
 		return new Promise ((resolve) => {
 			frappe.call({
-				method: 'frappe.model.db_query.get_list',
+				method: 'frappe.desk.reportview.get_list',
 				args: args,
 				type: 'GET',
 				callback: function(r) {

From 0fab70f39b3e34b491e57b56758ec1292f4fedec Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 29 Mar 2021 22:02:21 +0530
Subject: [PATCH 270/319] fix(minor): fieldnames can't have commas

(cherry picked from commit 511a5ddc4bbb9bf3652b75c7f1ba644be6ac2d7e)
---
 frappe/desk/reportview.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index e5c87d9603..69bc94f383 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -108,6 +108,9 @@ def is_standard(fieldname):
 	return fieldname in default_fields or fieldname in optional_fields
 
 def extract_fieldname(field):
+	if ',' in field:
+		raise_invalid_field(field)
+
 	fieldname = field.split(" as ")[0]
 
 	# certain functions allowed, extract the fieldname from the function

From 64f21730b11c4552fdcf93c4cf66c0983d7b4fcc Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 29 Mar 2021 22:04:04 +0530
Subject: [PATCH 271/319] fix(minor): functions must end with bracket

(cherry picked from commit 0c995940c126ba8685111bbba5d2b2d3b5249de2)
---
 frappe/desk/reportview.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 69bc94f383..72c452ce0c 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -117,6 +117,8 @@ def extract_fieldname(field):
 	if (fieldname.startswith('count(')
 		or fieldname.startswith('sum(')
 		or fieldname.startswith('avg(')):
+		if not fieldname.endswith(')'):
+			raise_invalid_field(field)
 		fieldname = fieldname.split('(', 1)[1].split(')')[0]
 
 	return fieldname

From 5e8cbfa72e2c6fad6047d2e595b19bf996d886b8 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 29 Mar 2021 22:22:20 +0530
Subject: [PATCH 272/319] fix(minor): handle as fieldnames

(cherry picked from commit 0def97543b2d16c75acb9449d7558a4ced39b8c1)
---
 frappe/desk/reportview.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 72c452ce0c..8bad1a2612 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -111,15 +111,18 @@ def extract_fieldname(field):
 	if ',' in field:
 		raise_invalid_field(field)
 
-	fieldname = field.split(" as ")[0]
+	fieldname = field
+	for sep in (' as ', ' AS '):
+		if sep in fieldname:
+			fieldname = fieldname.split(sep)[0]
 
 	# certain functions allowed, extract the fieldname from the function
 	if (fieldname.startswith('count(')
 		or fieldname.startswith('sum(')
 		or fieldname.startswith('avg(')):
-		if not fieldname.endswith(')'):
+		if not fieldname.strip().endswith(')'):
 			raise_invalid_field(field)
-		fieldname = fieldname.split('(', 1)[1].split(')')[0]
+		fieldname = fieldname.split('(', 1)[1][:-1]
 
 	return fieldname
 

From 6d2a90913ee615852c24a26e02958477f20a6dd4 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 29 Mar 2021 23:16:33 +0530
Subject: [PATCH 273/319] fix(minor): make group_by validation tighter

(cherry picked from commit c9b367933a3de7e587acd12060a6da53cce4de3f)
---
 frappe/model/db_query.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 924686299a..2d553335ee 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -745,7 +745,7 @@ class DatabaseQuery(object):
 			return
 
 		_lower = parameters.lower()
-		if 'select' in _lower and ' from ' in _lower:
+		if 'select' in _lower and 'from' in _lower:
 			frappe.throw(_('Cannot use sub-query in order by'))
 
 		if re.compile(r".*[^a-z0-9-_ ,`'\"\.\(\)].*").match(_lower):

From 939b5a9e26ed917960f943ca91021fe937f70176 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 09:47:07 +0530
Subject: [PATCH 274/319] fix(report): move count, aggregation to serverside

(cherry picked from commit 6d978a1df0b7c7cbebf244fa134a7fde6ad88a79)
---
 frappe/desk/reportview.py                     | 24 +++++++++++++++++++
 frappe/public/js/frappe/db.js                 | 14 +++++------
 .../public/js/frappe/ui/group_by/group_by.js  | 16 ++-----------
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 8bad1a2612..ae58f3baea 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -27,6 +27,13 @@ def get_list():
 	# uncompressed (refactored from frappe.model.db_query.get_list)
 	return execute(**get_form_params())
 
+@frappe.whitelist()
+@frappe.read_only()
+def get_count():
+	args = get_form_params()
+	args.fields = ['{distinct}count(name) as total_count'.format(distinct = 'distinct ' if args.distinct=='true' else '')]
+	return execute(**args)[0].get('total_count')
+
 def execute(doctype, *args, **kwargs):
 	return DatabaseQuery(doctype).execute(*args, **kwargs)
 
@@ -35,6 +42,7 @@ def get_form_params():
 	data = frappe._dict(frappe.local.form_dict)
 	clean_params(data)
 	parse_json(data)
+	setup_group_by(data)
 
 	validate_fields(data)
 	if data.filters:
@@ -99,6 +107,22 @@ def validate_filters(data, filters):
 			if not df:
 				raise_invalid_field(fieldname)
 
+def setup_group_by(data):
+	'''
+	Add columns for aggregated values e.g. count(name)
+	'''
+	if data.group_by:
+		if data.aggregate_function.lower() not in ('count', 'sum', 'avg'):
+			frappe.throw('Invalid aggregate function')
+		if '`' in data.aggregate_on:
+			raise_invalid_field(data.aggregate_on)
+		data.fields.append('{aggregate_function}(`tab{doctype}`.`{aggregate_on}`) AS _aggregate_column'.format(**data))
+		if data.aggregate_on:
+			data.fields.append(data.aggregate_on)
+
+		data.pop('aggregate_on')
+		data.pop('aggregate_function')
+
 def raise_invalid_field(fieldname):
 	frappe.throw(_('Field not permitted in query') + ': {0}'.format(fieldname), frappe.DataError)
 
diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js
index 1cfc6f3696..6073c7d3f0 100644
--- a/frappe/public/js/frappe/db.js
+++ b/frappe/public/js/frappe/db.js
@@ -92,25 +92,25 @@ frappe.db = {
 	},
 	count: function(doctype, args={}) {
 		let filters = args.filters || {};
-		const with_child_table_filter = Array.isArray(filters) && filters.some(filter => {
+
+		// has a filter with childtable?
+		const distinct = Array.isArray(filters) && filters.some(filter => {
 			return filter[0] !== 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', doctype)}) AS total_count`
-		];
+		const fields = [];
 
 		return frappe.call({
 			type: 'GET',
-			method: 'frappe.desk.reportview.get',
+			method: 'frappe.desk.reportview.get_count',
 			args: {
 				doctype,
 				filters,
 				fields,
+				distinct,
 			}
 		}).then(r => {
-			return r.message.values[0][0];
+			return r.message.values;
 		});
 	},
 	get_link_options(doctype, txt = '', filters={}) {
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 fa699b1a91..53e4914f0d 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -286,15 +286,6 @@ frappe.ui.GroupBy = class {
 
 	set_args(args) {
 		if (this.aggregate_function && this.group_by) {
-			let aggregate_column, aggregate_on_field;
-
-			if (this.aggregate_function === 'count') {
-				aggregate_column = 'count(`tab' + this.doctype + '`.`name`)';
-			} else {
-				aggregate_column = `${this.aggregate_function}(${this.aggregate_on})`;
-				aggregate_on_field = this.aggregate_on;
-			}
-
 			this.report_view.group_by = this.group_by;
 			this.report_view.sort_by = '_aggregate_column';
 			this.report_view.sort_order = 'desc';
@@ -316,17 +307,14 @@ frappe.ui.GroupBy = class {
 				'_aggregate_column',
 				this.aggregate_on_doctype || this.doctype,
 			]);
-			args.fields.push(aggregate_column + ' as _aggregate_column');
-
-			if (aggregate_on_field) {
-				args.fields.push(aggregate_on_field);
-			}
 
 			// setup columns in datatable
 			this.report_view.setup_columns();
 
 			Object.assign(args, {
 				with_comment_count: false,
+				aggregate_on: this.aggregate_on || 'name',
+				aggregate_function: this.aggregate_function || 'count',
 				group_by: this.report_view.group_by || null,
 				order_by: '_aggregate_column desc',
 			});

From 97a0f6f3ab88b8cb1f609a452e1eec0df0b124b7 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 10:30:20 +0530
Subject: [PATCH 275/319] fix(minor): disallow comments in fields

(cherry picked from commit f1f64772a5bfae07583c8a9217f6d895ba46c6af)
---
 frappe/desk/reportview.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index ae58f3baea..1e6b4e35b5 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -132,8 +132,9 @@ def is_standard(fieldname):
 	return fieldname in default_fields or fieldname in optional_fields
 
 def extract_fieldname(field):
-	if ',' in field:
-		raise_invalid_field(field)
+	for text in (',', '/*', '#'):
+		if text in field:
+			raise_invalid_field(field)
 
 	fieldname = field
 	for sep in (' as ', ' AS '):

From 80c26612eab710ef4ff3c4c6f9a2f65daec36354 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 11:25:40 +0530
Subject: [PATCH 276/319] fix(minor): lockdown frappe.client.get_list

(cherry picked from commit 2248c6c410d8cd9db18e6bc71942a3e42d9af3d8)
---
 frappe/client.py          | 34 +++++++++++++++++-----------------
 frappe/desk/reportview.py |  3 +++
 frappe/model/db_query.py  | 13 ++++++++++++-
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/frappe/client.py b/frappe/client.py
index 2217b53673..62317055fb 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -8,6 +8,8 @@ import frappe.model
 import frappe.utils
 import json, os
 from frappe.utils import get_safe_filters
+from frappe.desk.reportview import validate_args
+from frappe.model.db_query import check_parent_permission
 
 from six import iteritems, string_types, integer_types
 
@@ -31,8 +33,18 @@ def get_list(doctype, fields=None, filters=None, order_by=None,
 	if frappe.is_table(doctype):
 		check_parent_permission(parent, doctype)
 
-	return frappe.get_list(doctype, fields=fields, filters=filters, order_by=order_by,
-		limit_start=limit_start, limit_page_length=limit_page_length, ignore_permissions=False)
+	args = dict(
+		doctype=doctype,
+		fields=fields,
+		filters=filters,
+		order_by=order_by,
+		limit_start=limit_start,
+		limit_page_length=limit_page_length,
+	)
+
+	validate_args(args)
+
+	return frappe.get_list(**args)
 
 @frappe.whitelist()
 def get_count(doctype, filters=None, debug=False, cache=False):
@@ -91,12 +103,12 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
 	if frappe.get_meta(doctype).issingle:
 		value = frappe.db.get_values_from_single(fields, filters, doctype, as_dict=as_dict, debug=debug)
 	else:
-		value = frappe.get_list(doctype, filters=filters, fields=fields, debug=debug, limit=1)
+		value = get_list(doctype, filters=filters, fields=fields, limit_page_length=1)
 
 	if as_dict:
 		value = value[0] if value else {}
 	else:
-		value = value[0].fieldname
+		value = value[0][fieldname]
 
 	return value
 
@@ -378,18 +390,6 @@ def attach_file(filename=None, filedata=None, doctype=None, docname=None, folder
 def get_hooks(hook, app_name=None):
 	return frappe.get_hooks(hook, app_name)
 
-def check_parent_permission(parent, child_doctype):
-	if parent:
-		# User may pass fake parent and get the information from the child table
-		if child_doctype and not frappe.db.exists('DocField',
-			{'parent': parent, 'options': child_doctype}):
-			raise frappe.PermissionError
-
-		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
-
 @frappe.whitelist()
 def is_document_amended(doctype, docname):
 	if frappe.permissions.has_permission(doctype):
@@ -400,4 +400,4 @@ def is_document_amended(doctype, docname):
 		except frappe.db.InternalError:
 			pass
 
-	return False
\ No newline at end of file
+	return False
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 1e6b4e35b5..7f1fec826d 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -41,6 +41,9 @@ def get_form_params():
 	"""Stringify GET request parameters."""
 	data = frappe._dict(frappe.local.form_dict)
 	clean_params(data)
+	validate_args(data)
+
+def validate_args(data):
 	parse_json(data)
 	setup_group_by(data)
 
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 2d553335ee..b29e143759 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -14,7 +14,6 @@ import frappe.permissions
 from datetime import datetime
 import frappe, json, copy, re
 from frappe.model import optional_fields
-from frappe.client import check_parent_permission
 from frappe.model.utils.user_settings import get_user_settings, update_user_settings
 from frappe.utils import flt, cint, get_time, make_filter_tuple, get_filter, add_to_date, cstr, get_timespan_date_range
 from frappe.model.meta import get_table_columns
@@ -786,6 +785,18 @@ class DatabaseQuery(object):
 
 		update_user_settings(self.doctype, user_settings)
 
+def check_parent_permission(parent, child_doctype):
+	if parent:
+		# User may pass fake parent and get the information from the child table
+		if child_doctype and not frappe.db.exists('DocField',
+			{'parent': parent, 'options': child_doctype}):
+			raise frappe.PermissionError
+
+		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
+
 def get_order_by(doctype, meta):
 	order_by = ""
 

From 8c3debca6946ead768d2703aa8f3cff02e8c09aa Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 11:52:46 +0530
Subject: [PATCH 277/319] fix(minor): tests and linting

(cherry picked from commit d959fc7310fc0315d7983a4eb919a8bd69b741e1)
---
 frappe/client.py          |  2 +-
 frappe/desk/reportview.py | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frappe/client.py b/frappe/client.py
index 62317055fb..156c31e554 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -33,7 +33,7 @@ def get_list(doctype, fields=None, filters=None, order_by=None,
 	if frappe.is_table(doctype):
 		check_parent_permission(parent, doctype)
 
-	args = dict(
+	args = frappe._dict(
 		doctype=doctype,
 		fields=fields,
 		filters=filters,
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 7f1fec826d..9244023a5a 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -57,18 +57,14 @@ def validate_args(data):
 
 	return data
 
-def get_fields(data):
-	if ((isinstance(fields, string_types) and fields == "*")
-		or (isinstance(fields, (list, tuple)) and len(fields) == 1 and fields[0] == "*")):
-		data["fields"] = frappe.db.get_table_columns(data.doctype)
-		fields = data["fields"]
-
 def validate_fields(data):
+	expand_fields(data)
 	update_star_field_param(data)
 
 	for field in data.fields:
 		fieldname = extract_fieldname(field)
-		if is_standard(fieldname): continue
+		if is_standard(fieldname):
+			continue
 
 		meta, df = get_meta_and_docfield(fieldname, data)
 
@@ -91,29 +87,30 @@ def validate_filters(data, filters):
 			if len(condition)==3:
 				# [fieldname, condition, value]
 				fieldname = condition[0]
-				if is_standard(fieldname): continue
+				if is_standard(fieldname):
+					continue
 				meta, df = get_meta_and_docfield(fieldname, data)
 				if not df:
 					raise_invalid_field(condition[0])
 			else:
 				# [doctype, fieldname, condition, value]
 				fieldname = condition[1]
-				if is_standard(fieldname): continue
+				if is_standard(fieldname):
+					continue
 				meta = frappe.get_meta(condition[0])
 				if not meta.get_field(fieldname):
 					raise_invalid_field(fieldname)
 
 	else:
 		for fieldname in filters:
-			if is_standard(fieldname): continue
+			if is_standard(fieldname):
+				continue
 			meta, df = get_meta_and_docfield(fieldname, data)
 			if not df:
 				raise_invalid_field(fieldname)
 
 def setup_group_by(data):
-	'''
-	Add columns for aggregated values e.g. count(name)
-	'''
+	'''Add columns for aggregated values e.g. count(name)'''
 	if data.group_by:
 		if data.aggregate_function.lower() not in ('count', 'sum', 'avg'):
 			frappe.throw('Invalid aggregate function')
@@ -126,6 +123,11 @@ def setup_group_by(data):
 		data.pop('aggregate_on')
 		data.pop('aggregate_function')
 
+def expand_fields(data):
+	if ((isinstance(data.fields, string_types) and data.fields == "*")
+		or (isinstance(data.fields, (list, tuple)) and len(data.fields) == 1 and data.fields[0] == "*")):
+		data.fields = frappe.db.get_table_columns(data.doctype)
+
 def raise_invalid_field(fieldname):
 	frappe.throw(_('Field not permitted in query') + ': {0}'.format(fieldname), frappe.DataError)
 

From cf526d714d7723daf232862fd8534d79b1d8eb37 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 12:57:15 +0530
Subject: [PATCH 278/319] fix(minor): return value in reportview.py

(cherry picked from commit 1aa8adadcb7eae05b452f78ef5d30cfea8840213)
---
 frappe/desk/reportview.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 9244023a5a..64413b2728 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -42,6 +42,7 @@ def get_form_params():
 	data = frappe._dict(frappe.local.form_dict)
 	clean_params(data)
 	validate_args(data)
+	return data
 
 def validate_args(data):
 	parse_json(data)

From 2acaf1a464e570e5598ccbf307da3f8d8a8f2da4 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 15:50:47 +0530
Subject: [PATCH 279/319] fix(minor): tests

(cherry picked from commit 868228bdea0b043402d53223685a28eaa2760980)
---
 frappe/desk/reportview.py | 11 ++++++++---
 frappe/frappeclient.py    |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 64413b2728..fd61224b19 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -60,9 +60,11 @@ def validate_args(data):
 
 def validate_fields(data):
 	expand_fields(data)
-	update_star_field_param(data)
+	if update_wildcard_field_param(data):
+		# no need to validate wildcard fields
+		return
 
-	for field in data.fields:
+	for field in data.fields or []:
 		fieldname = extract_fieldname(field)
 		if is_standard(fieldname):
 			continue
@@ -163,10 +165,13 @@ def get_meta_and_docfield(fieldname, data):
 	df = meta.get_field(fieldname)
 	return meta, df
 
-def update_star_field_param(data):
+def update_wildcard_field_param(data):
 	if ((isinstance(data.fields, string_types) and data.fields == "*")
 		or (isinstance(data.fields, (list, tuple)) and len(data.fields) == 1 and data.fields[0] == "*")):
 		data.fields = frappe.db.get_table_columns(data.doctype)
+		return True
+
+	return False
 
 
 def clean_params(data):
diff --git a/frappe/frappeclient.py b/frappe/frappeclient.py
index 919c334e51..054a8c9369 100644
--- a/frappe/frappeclient.py
+++ b/frappe/frappeclient.py
@@ -86,7 +86,7 @@ class FrappeClient(object):
 			'cmd': 'logout',
 		}, verify=self.verify, headers=self.headers)
 
-	def get_list(self, doctype, fields='"*"', filters=None, limit_start=0, limit_page_length=0):
+	def get_list(self, doctype, fields='["name"]', filters=None, limit_start=0, limit_page_length=0):
 		"""Returns list of records of a particular type"""
 		if not isinstance(fields, string_types):
 			fields = json.dumps(fields)

From 5a8c89ccb4556ee46b99e36738874bc4e32cd4fe Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 16:37:53 +0530
Subject: [PATCH 280/319] fix(minor): tests

(cherry picked from commit 82399ddfba3d03b08491aa82d23aec45df9e5663)
---
 frappe/desk/reportview.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index fd61224b19..e9914ef4cf 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -59,7 +59,6 @@ def validate_args(data):
 	return data
 
 def validate_fields(data):
-	expand_fields(data)
 	if update_wildcard_field_param(data):
 		# no need to validate wildcard fields
 		return
@@ -126,11 +125,6 @@ def setup_group_by(data):
 		data.pop('aggregate_on')
 		data.pop('aggregate_function')
 
-def expand_fields(data):
-	if ((isinstance(data.fields, string_types) and data.fields == "*")
-		or (isinstance(data.fields, (list, tuple)) and len(data.fields) == 1 and data.fields[0] == "*")):
-		data.fields = frappe.db.get_table_columns(data.doctype)
-
 def raise_invalid_field(fieldname):
 	frappe.throw(_('Field not permitted in query') + ': {0}'.format(fieldname), frappe.DataError)
 

From aa6288a265605acf1c86fe8b833a06406c5dfeb5 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 30 Mar 2021 18:35:44 +0530
Subject: [PATCH 281/319] fix(reportview): test

(cherry picked from commit 337bdc976c2a2c60c50b0924c0d9fad0d8935c6a)
---
 frappe/desk/reportview.py     | 9 +++++----
 frappe/tests/test_db_query.py | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index e9914ef4cf..2d6c18440a 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -59,9 +59,7 @@ def validate_args(data):
 	return data
 
 def validate_fields(data):
-	if update_wildcard_field_param(data):
-		# no need to validate wildcard fields
-		return
+	wildcard = update_wildcard_field_param(data)
 
 	for field in data.fields or []:
 		fieldname = extract_fieldname(field)
@@ -71,7 +69,10 @@ def validate_fields(data):
 		meta, df = get_meta_and_docfield(fieldname, data)
 
 		if not df:
-			raise_invalid_field(fieldname)
+			if wildcard:
+				continue
+			else:
+				raise_invalid_field(fieldname)
 
 		# remove the field from the query if the report hide flag is set and current view is Report
 		if df.report_hide and data.view == 'Report':
diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py
index 836bb4bbf5..085c257550 100644
--- a/frappe/tests/test_db_query.py
+++ b/frappe/tests/test_db_query.py
@@ -17,6 +17,9 @@ from frappe.utils.testutils import add_custom_field, clear_custom_fields
 test_dependencies = ['User', 'Blog Post', 'Blog Category', 'Blogger']
 
 class TestReportview(unittest.TestCase):
+	def setUp(self):
+		frappe.set_user("Administrator")
+
 	def test_basic(self):
 		self.assertTrue({"name":"DocType"} in DatabaseQuery("DocType").execute(limit_page_length=None))
 

From 8203ab6ff704ec7e962fcfca6e2c9746c1138d6a Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 31 Mar 2021 10:10:46 +0530
Subject: [PATCH 282/319] Update frappe/desk/reportview.py

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 375cdea1458ee6ef24d76b3120d4378c36312d55)
---
 frappe/desk/reportview.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 2d6c18440a..296dfb94f1 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -116,7 +116,7 @@ def setup_group_by(data):
 	'''Add columns for aggregated values e.g. count(name)'''
 	if data.group_by:
 		if data.aggregate_function.lower() not in ('count', 'sum', 'avg'):
-			frappe.throw('Invalid aggregate function')
+			frappe.throw(_('Invalid aggregate function'))
 		if '`' in data.aggregate_on:
 			raise_invalid_field(data.aggregate_on)
 		data.fields.append('{aggregate_function}(`tab{doctype}`.`{aggregate_on}`) AS _aggregate_column'.format(**data))

From 40cd028c34e0d06a3d97594fb9c729a6b05cdb12 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:36:23 +0530
Subject: [PATCH 283/319] fix: first column padding in datatable (bp #12733)
 (#12734)

(cherry picked from commit 1c3688e0ed8524888f83fb267901d18cf02a5046)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/public/scss/desk/frappe_datatable.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss
index 7e4e5b0ef8..48645bbbfc 100644
--- a/frappe/public/scss/desk/frappe_datatable.scss
+++ b/frappe/public/scss/desk/frappe_datatable.scss
@@ -123,6 +123,10 @@
 		font-feature-settings: "tnum";
 	}
 
+	.dt-cell__content--header-0, .dt-cell__content--col-0 {
+		padding: 0.5rem;
+	}
+
 	.dt-scrollable--highlight-all {
 		.dt-cell__content {
 			background: var(--dt-selection-highlight-color);

From ab7f9c0b1b76c9c2fc2572b6061fd89c5ae39bb1 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:48:21 +0530
Subject: [PATCH 284/319] fix: copy paste rows more than 50 (one page) (bp
 #12548) (#12736)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Fisher Yu <12823863+szufisher@users.noreply.github.com>
---
 frappe/public/js/frappe/form/controls/table.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/table.js b/frappe/public/js/frappe/form/controls/table.js
index bde08e4cee..0373564074 100644
--- a/frappe/public/js/frappe/form/controls/table.js
+++ b/frappe/public/js/frappe/form/controls/table.js
@@ -19,6 +19,7 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			var cur_table_field =$(e.target).closest('div [data-fieldtype="Table"]').data('fieldname');
 			var cur_field = $(e.target).data('fieldname');
 			var cur_grid= cur_frm.get_field(cur_table_field).grid;
+			var grid_pagination = cur_grid.grid_pagination;
 			var cur_grid_rows = cur_grid.grid_rows;
 			var cur_doctype = cur_grid.doctype;
 			var cur_row_docname =$(e.target).closest('div .grid-row').data('name');
@@ -30,17 +31,18 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			if (!pastedData) return;
 			var data = frappe.utils.csv_to_array(pastedData,'\t');
 			if (data.length === 1 & data[0].length === 1) return;
-			if (data.length > 100){
-				data = data.slice(0, 100);
-				frappe.msgprint(__('For performance, only the first 100 rows were processed.'));
+			if (data.length > 500) {
+				data = data.slice(0, 500);
+				frappe.msgprint(__('For performance, only the first 500 rows were processed.'));
 			}
 			var fieldnames = [];
-			var get_field = function(name_or_label){
+			var get_field = function(name_or_label) {
 				var fieldname;
 				$.each(cur_grid.meta.fields,(ci,field)=>{
 					name_or_label = name_or_label.toLowerCase()
 					if (field.fieldname.toLowerCase() === name_or_label ||
-						(field.label && field.label.toLowerCase() === name_or_label)){
+						(field.label && !in_list(frappe.model.no_value_type, field.fieldtype) && 
+						field.label.toLowerCase() === name_or_label)) {
 						  fieldname = field.fieldname;
 						  return false;
 						}
@@ -71,6 +73,9 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 					if (row_idx > cur_frm.doc[cur_table_field].length){
 						cur_grid.add_new_row();
 					}
+					if (row_idx > 1 && (row_idx - 1) % grid_pagination.page_length === 0) {
+						grid_pagination.go_to_page(grid_pagination.page_index + 1);
+					}
 					var cur_row = cur_grid_rows[row_idx - 1];
 					row_idx ++;
 					var row_name = cur_row.doc.name;

From 1d37a43059cd845396ac47e9b22e95d4c150d0db Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 12:50:36 +0530
Subject: [PATCH 285/319] refactor: Grid paste code (bp #12633) (#12737)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 .../public/js/frappe/form/controls/table.js   | 136 ++++++++++--------
 1 file changed, 74 insertions(+), 62 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/table.js b/frappe/public/js/frappe/form/controls/table.js
index 0373564074..f974a90119 100644
--- a/frappe/public/js/frappe/form/controls/table.js
+++ b/frappe/public/js/frappe/form/controls/table.js
@@ -12,83 +12,95 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			parent: this.wrapper,
 			control: this
 		});
-		if(this.frm) {
+
+		if (this.frm) {
 			this.frm.grids[this.frm.grids.length] = this;
 		}
-		this.$wrapper.on('paste',':text', function(e) {
-			var cur_table_field =$(e.target).closest('div [data-fieldtype="Table"]').data('fieldname');
-			var cur_field = $(e.target).data('fieldname');
-			var cur_grid= cur_frm.get_field(cur_table_field).grid;
-			var grid_pagination = cur_grid.grid_pagination;
-			var cur_grid_rows = cur_grid.grid_rows;
-			var cur_doctype = cur_grid.doctype;
-			var cur_row_docname =$(e.target).closest('div .grid-row').data('name');
-			var row_idx = locals[cur_doctype][cur_row_docname].idx;
-			var clipboardData, pastedData;
-			// Get pasted data via clipboard API
-			clipboardData = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
-			pastedData = clipboardData.getData('Text');
-			if (!pastedData) return;
-			var data = frappe.utils.csv_to_array(pastedData,'\t');
-			if (data.length === 1 & data[0].length === 1) return;
-			if (data.length > 500) {
-				data = data.slice(0, 500);
-				frappe.msgprint(__('For performance, only the first 500 rows were processed.'));
-			}
-			var fieldnames = [];
-			var get_field = function(name_or_label) {
-				var fieldname;
-				$.each(cur_grid.meta.fields,(ci,field)=>{
-					name_or_label = name_or_label.toLowerCase()
-					if (field.fieldname.toLowerCase() === name_or_label ||
-						(field.label && !in_list(frappe.model.no_value_type, field.fieldtype) && 
-						field.label.toLowerCase() === name_or_label)) {
-						  fieldname = field.fieldname;
-						  return false;
-						}
+
+		this.$wrapper.on('paste', ':text', e => {
+			const table_field = this.df.fieldname;
+			const grid = this.grid;
+			const grid_pagination = grid.grid_pagination;
+			const grid_rows = grid.grid_rows;
+			const doctype = grid.doctype;
+			const row_docname = $(e.target).closest('.grid-row').data('name');
+
+			let clipboard_data = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
+			let pasted_data = clipboard_data.getData('Text');
+
+			if (!pasted_data) return;
+
+			let data = frappe.utils.csv_to_array(pasted_data, '\t');
+			let fieldnames = [];
+			// for raw data with column header
+			if (this.get_field(data[0][0])) {
+				data[0].forEach(column => {
+					fieldnames.push(this.get_field(column));
 				});
-				return fieldname;
-			}
-			if (get_field(data[0][0])){ // for raw data with column header
-				$.each(data[0], (ci, column)=>{fieldnames.push(get_field(column));});
 				data.shift();
-			}
-			else{ // no column header, map to the existing visible columns
-				var visible_columns = cur_grid_rows[0].get_visible_columns();
-				var find;
-				$.each(visible_columns, (ci, column)=>{
-					if (column.fieldname === cur_field) find = true;
-					find && fieldnames.push(column.fieldname);
-				})
-			}
-			$.each(data, function(i, row) {
-				var blank_row = true;
-				$.each(row, function(ci, value) {
-					if(value) {
-						blank_row = false;
-						return false;
+			} else {
+				// no column header, map to the existing visible columns
+				const visible_columns = grid_rows[0].get_visible_columns();
+				visible_columns.forEach(column => {
+					if (column.fieldname === $(e.target).data('fieldname')) {
+						fieldnames.push(column.fieldname);
 					}
 				});
-				if(!blank_row) {
-					if (row_idx > cur_frm.doc[cur_table_field].length){
-						cur_grid.add_new_row();
+			}
+
+			let row_idx = locals[doctype][row_docname].idx;
+			data.forEach((row, i) => {
+				let blank_row = !row.filter(Boolean).length;
+				if (blank_row) return;
+
+				setTimeout(() => {
+					if (row_idx > this.frm.doc[table_field].length) {
+						this.grid.add_new_row();
 					}
 					if (row_idx > 1 && (row_idx - 1) % grid_pagination.page_length === 0) {
 						grid_pagination.go_to_page(grid_pagination.page_index + 1);
 					}
-					var cur_row = cur_grid_rows[row_idx - 1];
-					row_idx ++;
-					var row_name = cur_row.doc.name;
-					$.each(row, function(ci, value) {
-						if (fieldnames[ci]) frappe.model.set_value(cur_doctype, row_name, fieldnames[ci], value);
+
+					const row_name = grid_rows[row_idx - 1].doc.name;
+					row.forEach((value, data_index) => {
+						if (fieldnames[data_index]) {
+							frappe.model.set_value(doctype, row_name, fieldnames[data_index], value);
+						}
 					});
-					frappe.show_progress(__('Processing'), i, data.length);
-				}
+					row_idx++;
+
+					let progress = i + 1;
+					frappe.show_progress(__('Processing'), progress, data.length);
+					if (progress === data.length) {
+						frappe.hide_progress();
+					}
+				}, 0);
 			});
-			frappe.hide_progress();
 			return false; // Prevent the default handler from running.
 		});
 	},
+	get_field(field_name) {
+		let fieldname;
+		this.grid.meta.fields.some(field => {
+			if (frappe.model.no_value_type.includes(field.fieldtype)) {
+				return false;
+			}
+
+			field_name = field_name.toLowerCase();
+			const is_field_matching = field_name => {
+				return (
+					field.fieldname.toLowerCase() === field_name ||
+					(field.label || '').toLowerCase() === field_name
+				);
+			};
+
+			if (is_field_matching()) {
+				fieldname = field.fieldname;
+				return true;
+			}
+		});
+		return fieldname;
+	},
 	refresh_input: function() {
 		this.grid.refresh();
 	},

From ee92355ab962b9978dc4e6ad7e29eed1b691e981 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 13:07:43 +0530
Subject: [PATCH 286/319] fix: Miscellaneous changes (bp #12730) (#12738)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../system_settings/system_settings.json      | 10 ++---
 .../public/js/frappe/form/controls/table.js   | 44 ++++++++++---------
 frappe/public/js/frappe/ui/messages.js        | 32 +++++++++-----
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json
index 9a985ce598..4b53983702 100644
--- a/frappe/core/doctype/system_settings/system_settings.json
+++ b/frappe/core/doctype/system_settings/system_settings.json
@@ -1,7 +1,5 @@
 {
  "actions": [],
- "allow_read": 1,
- "allow_workflow": 1,
  "creation": "2014-04-17 16:53:52.640856",
  "doctype": "DocType",
  "document_type": "System",
@@ -460,9 +458,11 @@
   },
   {
    "default": "Frappe",
+   "description": "The application name will be used in the Login page.",
    "fieldname": "app_name",
    "fieldtype": "Data",
-   "label": "App Name"
+   "hidden": 1,
+   "label": "Application Name"
   },
   {
    "default": "1",
@@ -474,7 +474,7 @@
  "icon": "fa fa-cog",
  "issingle": 1,
  "links": [],
- "modified": "2021-03-25 13:58:12.750629",
+ "modified": "2021-03-30 11:47:47.330437",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "System Settings",
@@ -492,4 +492,4 @@
  "sort_field": "modified",
  "sort_order": "ASC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/frappe/public/js/frappe/form/controls/table.js b/frappe/public/js/frappe/form/controls/table.js
index f974a90119..075608aa8c 100644
--- a/frappe/public/js/frappe/form/controls/table.js
+++ b/frappe/public/js/frappe/form/controls/table.js
@@ -24,13 +24,17 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			const grid_rows = grid.grid_rows;
 			const doctype = grid.doctype;
 			const row_docname = $(e.target).closest('.grid-row').data('name');
+			const in_grid_form = $(e.target).closest('.form-in-grid').length;
 
 			let clipboard_data = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData;
 			let pasted_data = clipboard_data.getData('Text');
 
-			if (!pasted_data) return;
+			if (!pasted_data || in_grid_form) return;
 
 			let data = frappe.utils.csv_to_array(pasted_data, '\t');
+
+			if (data.length === 1 && data[0].length === 1) return;
+
 			let fieldnames = [];
 			// for raw data with column header
 			if (this.get_field(data[0][0])) {
@@ -49,30 +53,30 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			}
 
 			let row_idx = locals[doctype][row_docname].idx;
+			let data_length = data.length;
 			data.forEach((row, i) => {
-				let blank_row = !row.filter(Boolean).length;
-				if (blank_row) return;
-
 				setTimeout(() => {
-					if (row_idx > this.frm.doc[table_field].length) {
-						this.grid.add_new_row();
-					}
-					if (row_idx > 1 && (row_idx - 1) % grid_pagination.page_length === 0) {
-						grid_pagination.go_to_page(grid_pagination.page_index + 1);
-					}
+					let blank_row = !row.filter(Boolean).length;
+					if (!blank_row) {
+						if (row_idx > this.frm.doc[table_field].length) {
+							this.grid.add_new_row();
+						}
 
-					const row_name = grid_rows[row_idx - 1].doc.name;
-					row.forEach((value, data_index) => {
-						if (fieldnames[data_index]) {
-							frappe.model.set_value(doctype, row_name, fieldnames[data_index], value);
+						if (row_idx > 1 && (row_idx - 1) % grid_pagination.page_length === 0) {
+							grid_pagination.go_to_page(grid_pagination.page_index + 1);
 						}
-					});
-					row_idx++;
 
-					let progress = i + 1;
-					frappe.show_progress(__('Processing'), progress, data.length);
-					if (progress === data.length) {
-						frappe.hide_progress();
+						const row_name = grid_rows[row_idx - 1].doc.name;
+						row.forEach((value, data_index) => {
+							if (fieldnames[data_index]) {
+								frappe.model.set_value(doctype, row_name, fieldnames[data_index], value);
+							}
+						});
+						row_idx++;
+						if (data_length >= 10) {
+							let progress = i + 1;
+							frappe.show_progress(__('Processing'), progress, data_length, null, true);
+						}
 					}
 				}, 0);
 			});
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index b3cbef1b8e..2e8ba7d206 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -316,12 +316,17 @@ frappe.verify_password = function(callback) {
 	}, __("Verify Password"), __("Verify"))
 }
 
-frappe.show_progress = function(title, count, total=100, description) {
-	if(frappe.cur_progress && frappe.cur_progress.title === title && frappe.cur_progress.is_visible) {
-		var dialog = frappe.cur_progress;
+frappe.show_progress = (title, count, total = 100, description, hide_on_completion = false) => {
+	let dialog;
+	if (
+		frappe.cur_progress &&
+		frappe.cur_progress.title === title &&
+		frappe.cur_progress.is_visible
+	) {
+		dialog = frappe.cur_progress;
 	} else {
-		var dialog = new frappe.ui.Dialog({
-			title: title,
+		dialog = new frappe.ui.Dialog({
+			title: title
 		});
 		dialog.progress = $(`<div>
 			<div class="progress">
@@ -329,19 +334,24 @@ frappe.show_progress = function(title, count, total=100, description) {
 			</div>
 			<p class="description text-muted small"></p>
 		</div`).appendTo(dialog.body);
-		dialog.progress_bar = dialog.progress.css({"margin-top": "10px"})
-			.find(".progress-bar");
-		dialog.$wrapper.removeClass("fade");
+		dialog.progress_bar = dialog.progress
+			.css({ 'margin-top': '10px' })
+			.find('.progress-bar');
+		dialog.$wrapper.removeClass('fade');
 		dialog.show();
 		frappe.cur_progress = dialog;
 	}
 	if (description) {
 		dialog.progress.find('.description').text(description);
 	}
-	dialog.percent = cint(flt(count) * 100 / total);
-	dialog.progress_bar.css({"width": dialog.percent + "%" });
+	dialog.percent = cint((flt(count) * 100) / total);
+	dialog.progress_bar.css({ width: dialog.percent + '%' });
+	if (hide_on_completion && dialog.percent === 100) {
+		// timeout to avoid abrupt hide
+		setTimeout(frappe.hide_progress, 500);
+	}
 	return dialog;
-}
+};
 
 frappe.hide_progress = function() {
 	if(frappe.cur_progress) {

From 7018c0457d602d6e7633da8868edd9adafc28e17 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Tue, 30 Mar 2021 14:23:15 +0530
Subject: [PATCH 287/319] chore: add semicolon

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

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index e4c0f0c55c..249d3414e9 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -389,6 +389,8 @@ frappe.router = {
 	set_route_options_from_url(route) {
 		// set query parameters as frappe.route_options
 		var last_part = route[route.length - 1];
+		// add routing v2 compatability
+		if (!last_part.includes("?")) last_part = route[route.length - 1] + window.location.search;
 		if (last_part.indexOf("?") < last_part.indexOf("=")) {
 			// has ? followed by =
 			let parts = last_part.split("?");

From cd18d947a7d002dd7a348dbdcaf126dbfa0e488d Mon Sep 17 00:00:00 2001
From: "hasnain2808@gmail.com" <hasnain2808@gmail.com>
Date: Wed, 31 Mar 2021 13:01:33 +0530
Subject: [PATCH 288/319] fix: use pathname on window.location

---
 frappe/public/js/frappe/router.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 249d3414e9..5378294855 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -364,7 +364,7 @@ frappe.router = {
 		// return clean sub_path from hash or url
 		// supports both v1 and v2 routing
 		if (!route) {
-			route = window.location.hash || window.location.pathname;
+			route = window.location.hash || (window.location.pathname + window.location.search);
 		}
 
 		return this.strip_prefix(route);
@@ -389,8 +389,6 @@ frappe.router = {
 	set_route_options_from_url(route) {
 		// set query parameters as frappe.route_options
 		var last_part = route[route.length - 1];
-		// add routing v2 compatability
-		if (!last_part.includes("?")) last_part = route[route.length - 1] + window.location.search;
 		if (last_part.indexOf("?") < last_part.indexOf("=")) {
 			// has ? followed by =
 			let parts = last_part.split("?");

From 4e09f36eef053a0f417d30c1cc856239317ec97d Mon Sep 17 00:00:00 2001
From: "hasnain2808@gmail.com" <hasnain2808@gmail.com>
Date: Wed, 31 Mar 2021 15:43:19 +0530
Subject: [PATCH 289/319] fix: checkbox bleed

(cherry picked from commit b12714ae20f4e23ee8c1fa14b1b122db6a3efb2b)
---
 frappe/public/scss/desk/list.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss
index ea3401b09e..0230138e8f 100644
--- a/frappe/public/scss/desk/list.scss
+++ b/frappe/public/scss/desk/list.scss
@@ -261,7 +261,6 @@ input.list-check-all, input.list-row-checkbox {
 	input[type=checkbox] {
 		margin: 0;
 		margin-right: 5px;
-		flex: 0 0 12px;
 	}
 
 	.liked-by, .liked-by-filter-button {

From 79233f007d25e686efe701d886739f9e46a2e96b Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Tue, 30 Mar 2021 20:53:56 +0530
Subject: [PATCH 290/319] fix: Make authentication check mandatory even in case
 of 2FA

(cherry picked from commit 2227b910d3a18f47f2971fcbec894394c215c0c9)
---
 frappe/auth.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 946a8c52d5..cdc68e6822 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -215,9 +215,7 @@ class LoginManager:
 		if not (user and pwd):
 			self.fail(_('Incomplete login details'), user=user)
 
-		# Ignore password check if tmp_id is set, 2FA takes care of authentication.
-		validate_password = not bool(frappe.form_dict.get('tmp_id'))
-		user = User.find_by_credentials(user, pwd, validate_password=validate_password)
+		user = User.find_by_credentials(user, pwd)
 
 		if not user:
 			self.fail('Invalid login credentials')

From bda37b541b43a3288fb08ac972fb1ce372d148eb Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Tue, 30 Mar 2021 12:04:09 +0530
Subject: [PATCH 291/319] refactor: Cleanup name confusion

Using `delete_session` name for a function and also as a method name is
confusing. Cleaned that up.

(cherry picked from commit 9200192c1cbb2125894aa59150f361d031d55afb)
---
 frappe/sessions.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 3babf1db12..5f13dfb7af 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -296,8 +296,7 @@ class Session:
 			expiry = get_expiry_in_seconds(session_data.get("session_expiry"))
 
 			if self.time_diff > expiry:
-				print('deleting...')
-				self.delete_session()
+				self._delete_session()
 				data = None
 
 		return data and data.data
@@ -316,12 +315,12 @@ class Session:
 			data = frappe._dict(eval(rec and rec[0][1] or '{}'))
 			data.user = rec[0][0]
 		else:
-			self.delete_session()
+			self._delete_session()
 			data = None
 
 		return data
 
-	def delete_session(self):
+	def _delete_session(self):
 		delete_session(self.sid, reason="Session Expired")
 
 	def start_as_guest(self):

From e94ea125682686dcb49f53426a34609173505eab Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Wed, 31 Mar 2021 09:09:28 +0530
Subject: [PATCH 292/319] fix: Track 2FA OTP attempts using login tracker

(cherry picked from commit 1f6f02fd5a7f80842094ce43fefc0e4bb70260d7)
---
 frappe/auth.py                   | 45 ++++++++++++++++++++------------
 frappe/core/doctype/user/user.py |  2 +-
 frappe/twofactor.py              |  8 ++++++
 frappe/utils/password.py         |  8 ++++--
 4 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index cdc68e6822..32deb1bb48 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -220,28 +220,20 @@ class LoginManager:
 		if not user:
 			self.fail('Invalid login credentials')
 
-		sys_settings = frappe.get_doc("System Settings")
-		track_login_attempts = (sys_settings.allow_consecutive_login_attempts >0)
-
-		tracker_kwargs = {}
-		if track_login_attempts:
-			tracker_kwargs['lock_interval'] = sys_settings.allow_login_after_fail
-			tracker_kwargs['max_consecutive_login_attempts'] = sys_settings.allow_consecutive_login_attempts
-
-		tracker = LoginAttemptTracker(user.name, **tracker_kwargs)
-
-		if track_login_attempts and not tracker.is_user_allowed():
-			frappe.throw(_("Your account has been locked and will resume after {0} seconds")
-				.format(sys_settings.allow_login_after_fail), frappe.SecurityException)
+		# Current login flow uses cached credentials for authentication while checking OTP.
+		# Incase of OTP check, tracker for auth needs to be disabled(If not, it can remove tracker history as it is going to succeed anyway)
+		# Tracker is activated for 2FA incase of OTP.
+		ignore_tracker = should_run_2fa(user.name) and ('otp' in frappe.form_dict)
+		tracker = None if ignore_tracker else get_login_attempt_tracker(user.name)
 
 		if not user.is_authenticated:
-			tracker.add_failure_attempt()
+			tracker and tracker.add_failure_attempt()
 			self.fail('Invalid login credentials', user=user.name)
 		elif not (user.name == 'Administrator' or user.enabled):
-			tracker.add_failure_attempt()
+			tracker and tracker.add_failure_attempt()
 			self.fail('User disabled or missing', user=user.name)
 		else:
-			tracker.add_success_attempt()
+			tracker and tracker.add_success_attempt()
 		self.user = user.name
 
 	def force_user_to_reset_password(self):
@@ -404,6 +396,27 @@ def validate_ip_address(user):
 
 	frappe.throw(_("Access not allowed from this IP Address"), frappe.AuthenticationError)
 
+def get_login_attempt_tracker(user_name: str, raise_locked_exception: bool=True):
+	"""Get login attempt tracker instance.
+
+	:param user_name: Name of the loggedin user
+	:param raise_locked_exception: If set, raises an exception incase of user not allowed to login
+	"""
+	sys_settings = frappe.get_doc("System Settings")
+	track_login_attempts = (sys_settings.allow_consecutive_login_attempts >0)
+	tracker_kwargs = {}
+
+	if track_login_attempts:
+		tracker_kwargs['lock_interval'] = sys_settings.allow_login_after_fail
+		tracker_kwargs['max_consecutive_login_attempts'] = sys_settings.allow_consecutive_login_attempts
+
+	tracker = LoginAttemptTracker(user_name, **tracker_kwargs)
+
+	if raise_locked_exception and track_login_attempts and not tracker.is_user_allowed():
+		frappe.throw(_("Your account has been locked and will resume after {0} seconds")
+			.format(sys_settings.allow_login_after_fail), frappe.SecurityException)
+	return tracker
+
 
 class LoginAttemptTracker(object):
 	"""Track login attemts of a user.
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 93acd5ec7d..db2653486f 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -558,7 +558,7 @@ class User(Document):
 		user['is_authenticated'] = True
 		if validate_password:
 			try:
-				check_password(user['name'], password)
+				check_password(user['name'], password, delete_tracker_cache=False)
 			except frappe.AuthenticationError:
 				user['is_authenticated'] = False
 
diff --git a/frappe/twofactor.py b/frappe/twofactor.py
index 7ee3b510ba..0a120d5287 100644
--- a/frappe/twofactor.py
+++ b/frappe/twofactor.py
@@ -118,6 +118,7 @@ def get_verification_method():
 
 def confirm_otp_token(login_manager, otp=None, tmp_id=None):
 	'''Confirm otp matches.'''
+	from frappe.auth import get_login_attempt_tracker
 	if not otp:
 		otp = frappe.form_dict.get('otp')
 	if not otp:
@@ -130,12 +131,17 @@ def confirm_otp_token(login_manager, otp=None, tmp_id=None):
 	otp_secret = frappe.cache().get(tmp_id + '_otp_secret')
 	if not otp_secret:
 		raise ExpiredLoginException(_('Login session expired, refresh page to retry'))
+
+	tracker = get_login_attempt_tracker(login_manager.user)
+
 	hotp = pyotp.HOTP(otp_secret)
 	if hotp_token:
 		if hotp.verify(otp, int(hotp_token)):
 			frappe.cache().delete(tmp_id + '_token')
+			tracker.add_success_attempt()
 			return True
 		else:
+			tracker.add_failure_attempt()
 			login_manager.fail(_('Incorrect Verification code'), login_manager.user)
 
 	totp = pyotp.TOTP(otp_secret)
@@ -144,8 +150,10 @@ def confirm_otp_token(login_manager, otp=None, tmp_id=None):
 		if not frappe.db.get_default(login_manager.user + '_otplogin'):
 			frappe.db.set_default(login_manager.user + '_otplogin', 1)
 			delete_qrimage(login_manager.user)
+		tracker.add_success_attempt()
 		return True
 	else:
+		tracker.add_failure_attempt()
 		login_manager.fail(_('Incorrect Verification code'), login_manager.user)
 
 
diff --git a/frappe/utils/password.py b/frappe/utils/password.py
index 19a538f703..6a63fc39d7 100644
--- a/frappe/utils/password.py
+++ b/frappe/utils/password.py
@@ -65,7 +65,7 @@ def set_encrypted_password(doctype, name, pwd, fieldname='password'):
 		raise e
 
 
-def check_password(user, pwd, doctype='User', fieldname='password'):
+def check_password(user, pwd, doctype='User', fieldname='password', delete_tracker_cache=True):
 	'''Checks if user and password are correct, else raises frappe.AuthenticationError'''
 
 	auth = frappe.db.sql("""select `name`, `password` from `__Auth`
@@ -77,7 +77,11 @@ def check_password(user, pwd, doctype='User', fieldname='password'):
 
 	# lettercase agnostic
 	user = auth[0].name
-	delete_login_failed_cache(user)
+
+	# TODO: This need to be deleted after checking side effects of it.
+	# We have a `LoginAttemptTracker` that can take care of tracking related cache.
+	if delete_tracker_cache:
+		delete_login_failed_cache(user)
 
 	if not passlibctx.needs_update(auth[0].password):
 		update_password(user, pwd, doctype, fieldname)

From e7b5ea282c39bc05f49e7536a79975de893ddde7 Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Wed, 31 Mar 2021 13:24:18 +0530
Subject: [PATCH 293/319] test: OTP atempt tracker tests

(cherry picked from commit 8fcb97ae31522a36d1fc2a10607aa0702ac9bcdb)
---
 frappe/auth.py                 |  2 +-
 frappe/tests/__init__.py       |  9 ++++++++
 frappe/tests/test_twofactor.py | 40 +++++++++++++++++++++++++++++++++-
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 32deb1bb48..ca97bbc17d 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -396,7 +396,7 @@ def validate_ip_address(user):
 
 	frappe.throw(_("Access not allowed from this IP Address"), frappe.AuthenticationError)
 
-def get_login_attempt_tracker(user_name: str, raise_locked_exception: bool=True):
+def get_login_attempt_tracker(user_name: str, raise_locked_exception: bool = True):
 	"""Get login attempt tracker instance.
 
 	:param user_name: Name of the loggedin user
diff --git a/frappe/tests/__init__.py b/frappe/tests/__init__.py
index e69de29bb2..f4dc7f33e2 100644
--- a/frappe/tests/__init__.py
+++ b/frappe/tests/__init__.py
@@ -0,0 +1,9 @@
+import frappe
+
+def update_system_settings(args):
+	doc = frappe.get_doc('System Settings')
+	doc.update(args)
+	doc.save()
+
+def get_system_setting(key):
+	return frappe.db.get_single_value("System Settings", key)
diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py
index d18a25b43e..7acb0a36e8 100644
--- a/frappe/tests/test_twofactor.py
+++ b/frappe/tests/test_twofactor.py
@@ -6,23 +6,34 @@ import unittest, frappe, pyotp
 from frappe.auth import HTTPRequest
 from frappe.utils import cint
 from frappe.utils import set_request
-from frappe.auth import validate_ip_address
+from frappe.auth import validate_ip_address, get_login_attempt_tracker
 from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, get_cached_user_pass,
 	two_factor_is_enabled_for_, confirm_otp_token, get_otpsecret_for_, get_verification_obj)
+from . import update_system_settings, get_system_setting
 
 import time
 
 class TestTwoFactor(unittest.TestCase):
+	def __init__(self, *args, **kwargs):
+		super(TestTwoFactor, self).__init__(*args, **kwargs)
+		self.default_allowed_login_attempts = get_system_setting('allow_consecutive_login_attempts')
+
 	def setUp(self):
 		self.http_requests = create_http_request()
 		self.login_manager = frappe.local.login_manager
 		self.user = self.login_manager.user
+		update_system_settings({
+			'allow_consecutive_login_attempts': 2
+		})
 
 	def tearDown(self):
 		frappe.local.response['verification'] = None
 		frappe.local.response['tmp_id'] = None
 		disable_2fa()
 		frappe.clear_cache(user=self.user)
+		update_system_settings({
+			'allow_consecutive_login_attempts': self.default_allowed_login_attempts
+		})
 
 	def test_should_run_2fa(self):
 		'''Should return true if enabled.'''
@@ -153,6 +164,33 @@ class TestTwoFactor(unittest.TestCase):
 		enable_2fa()
 		self.assertIsNone(validate_ip_address(self.user))
 
+	def test_otp_attempt_tracker(self):
+		"""Check that OTP login attempts are tracked.
+		"""
+		authenticate_for_2factor(self.user)
+		tmp_id = frappe.local.response['tmp_id']
+		otp = 'wrongotp'
+		with self.assertRaises(frappe.AuthenticationError):
+			confirm_otp_token(self.login_manager,otp=otp,tmp_id=tmp_id)
+
+		with self.assertRaises(frappe.AuthenticationError):
+			confirm_otp_token(self.login_manager,otp=otp,tmp_id=tmp_id)
+
+		# REMOVE ME: current logic allows allow_consecutive_login_attempts+1 attempts
+		# before raising security exception, remove below line when that is fixed.
+		with self.assertRaises(frappe.AuthenticationError):
+			confirm_otp_token(self.login_manager,otp=otp,tmp_id=tmp_id)
+
+		with self.assertRaises(frappe.SecurityException):
+			confirm_otp_token(self.login_manager,otp=otp,tmp_id=tmp_id)
+
+		# Remove tracking cache so that user can try loging in again
+		tracker = get_login_attempt_tracker(self.user, raise_locked_exception=False)
+		tracker.add_success_attempt()
+
+		otp = get_otp(self.user)
+		self.assertTrue(confirm_otp_token(self.login_manager,otp=otp,tmp_id=tmp_id))
+
 def create_http_request():
 	'''Get http request object.'''
 	set_request(method='POST', path='login')

From cbf4288a541b09f13735a4891e4e68ba8e987114 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 20:20:21 +0530
Subject: [PATCH 294/319] fix: change z-index even when list is empty (bp
 #12745) (#12747)

(cherry picked from commit bbcfee9b488e7c5d57d46e592754095495caa74c)

Co-authored-by: hasnain2808@gmail.com <hasnain2808@gmail.com>
---
 frappe/public/js/frappe/form/multi_select_dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/multi_select_dialog.js b/frappe/public/js/frappe/form/multi_select_dialog.js
index 26baee05ea..dd96b57fb5 100644
--- a/frappe/public/js/frappe/form/multi_select_dialog.js
+++ b/frappe/public/js/frappe/form/multi_select_dialog.js
@@ -251,7 +251,6 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		head ? $row.addClass('list-item--head')
 			: $row = $(`<div class="list-item-container" data-item-name="${result.name}"></div>`).append($row);
 
-		$(".modal-dialog .list-item--head").css("z-index", 0);
 		return $row;
 	}
 
@@ -264,6 +263,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 			this.empty_list();
 		}
 		more_btn.hide();
+		$(".modal-dialog .list-item--head").css("z-index", 0);
 
 		if (results.length === 0) return;
 		if (more) more_btn.show();

From c26a009ff57f5bf456ecbfea684860e4e687d793 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 22:13:22 +0530
Subject: [PATCH 295/319] fix: get frappe.client.get_value() to work when
 as_dict is false (bp #12739) (#12749)

(cherry picked from commit 193dbec47cf7f31bd0bd94afe986f36a3d67aa7c)

Co-authored-by: Walstan Baptista <38958184+walstanb@users.noreply.github.com>
---
 frappe/client.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/client.py b/frappe/client.py
index 156c31e554..58cfbd2edd 100644
--- a/frappe/client.py
+++ b/frappe/client.py
@@ -21,7 +21,7 @@ Requests via FrappeClient are also handled here.
 
 @frappe.whitelist()
 def get_list(doctype, fields=None, filters=None, order_by=None,
-	limit_start=None, limit_page_length=20, parent=None):
+	limit_start=None, limit_page_length=20, parent=None, debug=False, as_dict=True):
 	'''Returns a list of records by filters, fields, ordering and limit
 
 	:param doctype: DocType of the data to be queried
@@ -40,10 +40,11 @@ def get_list(doctype, fields=None, filters=None, order_by=None,
 		order_by=order_by,
 		limit_start=limit_start,
 		limit_page_length=limit_page_length,
+		debug=debug,
+		as_list=not as_dict
 	)
 
 	validate_args(args)
-
 	return frappe.get_list(**args)
 
 @frappe.whitelist()
@@ -103,14 +104,15 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
 	if frappe.get_meta(doctype).issingle:
 		value = frappe.db.get_values_from_single(fields, filters, doctype, as_dict=as_dict, debug=debug)
 	else:
-		value = get_list(doctype, filters=filters, fields=fields, limit_page_length=1)
+		value = get_list(doctype, filters=filters, fields=fields, debug=debug, limit_page_length=1, as_dict=as_dict)
 
 	if as_dict:
-		value = value[0] if value else {}
-	else:
-		value = value[0][fieldname]
+		return value[0] if value else {}
 
-	return value
+	if not value:
+		return
+
+	return value[0] if len(fields) > 1 else value[0][0]
 
 @frappe.whitelist()
 def get_single_value(doctype, field):

From 2bd53e95ab62e9753038e807d990e772582cd2f0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 22:29:56 +0530
Subject: [PATCH 296/319] fix: Return correct value from frappe.db.count (bp
 #12748) (#12750)

(cherry picked from commit b279ca2c0f30cbaad6064e1e10aa1228c24363d4)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/db.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js
index 6073c7d3f0..89054e3791 100644
--- a/frappe/public/js/frappe/db.js
+++ b/frappe/public/js/frappe/db.js
@@ -100,17 +100,11 @@ frappe.db = {
 
 		const fields = [];
 
-		return frappe.call({
-			type: 'GET',
-			method: 'frappe.desk.reportview.get_count',
-			args: {
-				doctype,
-				filters,
-				fields,
-				distinct,
-			}
-		}).then(r => {
-			return r.message.values;
+		return frappe.xcall('frappe.desk.reportview.get_count', {
+			doctype,
+			filters,
+			fields,
+			distinct,
 		});
 	},
 	get_link_options(doctype, txt = '', filters={}) {

From 88617dd2ae0586b5b9d073f54bc5f288671ad896 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 31 Mar 2021 23:46:34 +0530
Subject: [PATCH 297/319] fix: Chart style in Dark Mode (bp #12751) (#12752)

(cherry picked from commit 8d07768a07beea9d07ac554c0a7c87c01bb6ca81)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/build.json          |  4 ++--
 frappe/public/scss/desk/dark.scss | 22 ++++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 51a2f55a37..f2252b8dfe 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -79,9 +79,9 @@
 		"public/less/controls.less",
 		"public/less/chat.less",
 		"public/css/fonts/inter/inter.css",
-		"public/scss/desk.scss",
 		"node_modules/frappe-charts/dist/frappe-charts.min.css",
-		"node_modules/plyr/dist/plyr.css"
+		"node_modules/plyr/dist/plyr.css",
+		"public/scss/desk.scss"
 	],
 	"css/frappe-rtl.css": [
 		"public/css/bootstrap-rtl.css",
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index 7bbf582af0..39ad3fa321 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -114,19 +114,21 @@
 	// --criticism-bg: var(--red-600);
 
 	// Frappe Charts Colors
-	--charts-label-color: var(--gray-300);
-	--charts-axis-line-color: var(--gray-500);
+	.chart-container {
+		--charts-label-color: var(--gray-300);
+		--charts-axis-line-color: var(--gray-500);
 
-	--charts-stroke-width: 5px;
-	--charts-dataset-circle-stroke: #ffffff;
-	--charts-dataset-circle-stroke-width: var(--charts-stroke-width);
+		--charts-stroke-width: 5px;
+		--charts-dataset-circle-stroke: #ffffff;
+		--charts-dataset-circle-stroke-width: var(--charts-stroke-width);
 
-	--charts-tooltip-title: var(--charts-label-color);
-	--charts-tooltip-label: var(--charts-label-color);
-	--charts-tooltip-value: white;
-	--charts-tooltip-bg: var(--gray-900);
+		--charts-tooltip-title: var(--charts-label-color);
+		--charts-tooltip-label: var(--charts-label-color);
+		--charts-tooltip-value: white;
+		--charts-tooltip-bg: var(--gray-900);
 
-	--charts-legend-label: var(--charts-label-color);
+		--charts-legend-label: var(--charts-label-color);
+	}
 
 	// find better fix
 	.heatmap-chart {

From 8e53913e7e490b63fa44080c10caa3ac70cffb81 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 09:47:14 +0530
Subject: [PATCH 298/319] fix: Miscellaneous changes (bp #12754) (#12755)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../scss/{desk/awesomebar.scss => common/awesomeplete.scss}   | 0
 frappe/public/scss/desk/dark.scss                             | 4 ++--
 frappe/public/scss/desk/index.scss                            | 2 +-
 frappe/public/scss/website/index.scss                         | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename frappe/public/scss/{desk/awesomebar.scss => common/awesomeplete.scss} (100%)

diff --git a/frappe/public/scss/desk/awesomebar.scss b/frappe/public/scss/common/awesomeplete.scss
similarity index 100%
rename from frappe/public/scss/desk/awesomebar.scss
rename to frappe/public/scss/common/awesomeplete.scss
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index 39ad3fa321..743107af47 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -11,8 +11,8 @@
 	--gray-900: #161a1f;
 
 	// Type Colors
-	--text-muted: var(--gray-300);
-	--text-light: var(--gray-400);
+	--text-muted: var(--gray-400);
+	--text-light: var(--gray-300);
 	--text-color: var(--gray-50);
 	--heading-color: var(--gray-50);
 
diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss
index f7449640fd..31eae63776 100644
--- a/frappe/public/scss/desk/index.scss
+++ b/frappe/public/scss/desk/index.scss
@@ -23,7 +23,7 @@
 @import "notification";
 @import "global_search";
 @import "desktop";
-@import "awesomebar";
+@import "../common/awesomeplete";
 @import "sidebar";
 @import "filters";
 @import "list";
diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index de81174d3b..1fb5badc6c 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -10,6 +10,7 @@
 @import "../common/modal";
 @import "../common/indicator";
 @import "../common/controls";
+@import "../common/awesomeplete";
 @import 'multilevel_dropdown';
 @import 'website_image';
 @import 'website_avatar';

From 6ca947a41bf50fd63e046d18a4e1f417c0772a18 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 1 Apr 2021 12:54:50 +0530
Subject: [PATCH 299/319] fix: only focus on first input if form is new (bp
 #12758) (#12759)

(cherry picked from commit 4fb544cb0a1cf373c775e59bd62f8b8d745ed4c0)

Co-authored-by: prssanna <prssud@gmail.com>
---
 frappe/public/js/frappe/form/form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 49b234d540..c7ed2e4df5 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -451,7 +451,7 @@ frappe.ui.form.Form = class FrappeForm {
 						return this.script_manager.trigger("onload_post_render");
 					}
 				},
-				() => this.focus_on_first_input(),
+				() => this.is_new() && this.focus_on_first_input(),
 				() => this.run_after_load_hook(),
 				() => this.dashboard.after_refresh()
 			]);

From c2c9df632cd29d97102c8b5a49afae31ca42387f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 31 Mar 2021 17:40:22 +0530
Subject: [PATCH 300/319] fix: Grid validation

- Use separate docfields list for each child table row to
avoid cross row validation issue

(cherry picked from commit be857c753bf9b721bd18dc881f67ef8d1f9e0e55)
---
 frappe/public/js/frappe/form/form.js     | 20 ++++---
 frappe/public/js/frappe/form/grid_row.js | 75 ++++++++++++------------
 frappe/public/js/frappe/form/layout.js   |  4 +-
 frappe/public/js/frappe/form/save.js     |  5 +-
 4 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index c7ed2e4df5..c40838e9f3 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1075,7 +1075,7 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	refresh_field(fname) {
-		if(this.fields_dict[fname] && this.fields_dict[fname].refresh) {
+		if (this.fields_dict[fname] && this.fields_dict[fname].refresh) {
 			this.fields_dict[fname].refresh();
 			this.layout.refresh_dependency();
 		}
@@ -1241,20 +1241,22 @@ frappe.ui.form.Form = class FrappeForm {
 		}
 	}
 
-	set_df_property(fieldname, property, value, docname, table_field) {
-		var df;
+	set_df_property(fieldname, property, value, docname, table_field, table_row_name=null) {
+		let df;
 		if (!docname || !table_field) {
 			df = this.get_docfield(fieldname);
 		} else {
-			var grid = this.fields_dict[fieldname].grid,
-				fname = frappe.utils.filter_dict(grid.docfields, {'fieldname': table_field});
-			if (fname && fname.length)
-				df = frappe.meta.get_docfield(fname[0].parent, table_field, docname);
+			const grid = this.fields_dict[fieldname].grid;
+			const filtered_fields = frappe.utils.filter_dict(grid.docfields, {'fieldname': table_field});
+			if (filtered_fields.length) {
+				df = frappe.meta.get_docfield(filtered_fields[0].parent, table_field, table_row_name);
+			}
 		}
 		if (df && df[property] != value) {
 			df[property] = value;
-			if (!docname || !table_field) {
-				// do not refresh childtable fields since `this.fields_dict` doesn't have child table fields
+			if (table_field && table_row_name) {
+				this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name].refresh_field(fieldname);
+			} else {
 				this.refresh_field(fieldname);
 			}
 		}
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 9fdd4a8e36..bebf46e93d 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -4,9 +4,12 @@ export default class GridRow {
 	constructor(opts) {
 		this.on_grid_fields_dict = {};
 		this.on_grid_fields = [];
+		$.extend(this, opts);
+		if (this.doc) {
+			this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
+		}
 		this.columns = {};
 		this.columns_list = [];
-		$.extend(this, opts);
 		this.row_check_html = '<input type="checkbox" class="grid-row-check pull-left">';
 		this.make();
 	}
@@ -153,7 +156,7 @@ export default class GridRow {
 			this.render_row(true);
 		}
 
-		// refersh form fields
+		// refresh form fields
 		if(this.grid_form) {
 			this.grid_form.layout && this.grid_form.layout.refresh(this.doc);
 		}
@@ -249,27 +252,28 @@ export default class GridRow {
 		this.focus_set = false;
 		this.grid.setup_visible_columns();
 
-		for(var ci in this.grid.visible_columns) {
-			var df = this.grid.visible_columns[ci][0],
-				colsize = this.grid.visible_columns[ci][1],
-				txt = this.doc ?
-					frappe.format(this.doc[df.fieldname], df, null, this.doc) :
-					__(df.label);
+		this.grid.visible_columns.forEach((col, ci) => {
+			// to get update df for the row
+			let df = this.docfields.find(field => field.fieldname === col[0].fieldname);
+			let colsize = col[1];
+			let txt = this.doc ?
+				frappe.format(this.doc[df.fieldname], df, null, this.doc) :
+				__(df.label);
 
-			if(this.doc && df.fieldtype === "Select") {
+			if (this.doc && df.fieldtype === "Select") {
 				txt = __(txt);
 			}
-
-			if(!this.columns[df.fieldname]) {
-				var column = this.make_column(df, colsize, txt, ci);
+			let column;
+			if (!this.columns[df.fieldname]) {
+				column = this.make_column(df, colsize, txt, ci);
 			} else {
-				var column = this.columns[df.fieldname];
+				column = this.columns[df.fieldname];
 				this.refresh_field(df.fieldname, txt);
 			}
 
-			// background color for cellz
-			if(this.doc) {
-				if(df.reqd && !txt) {
+			// background color for cell
+			if (this.doc) {
+				if (df.reqd && !txt) {
 					column.addClass('error');
 				}
 				if (column.is_invalid) {
@@ -278,7 +282,7 @@ export default class GridRow {
 					column.addClass('bold');
 				}
 			}
-		}
+		});
 	}
 
 	make_column(df, colsize, txt, ci) {
@@ -403,9 +407,9 @@ export default class GridRow {
 
 		if (!field.df.onchange_modified) {
 			var field_on_change_function = field.df.onchange;
-			field.df.onchange = function(e) {
+			field.df.onchange = (e) => {
 				field_on_change_function && field_on_change_function(e);
-				me.grid.grid_rows[this.doc.idx - 1].refresh_field(this.df.fieldname);
+				this.refresh_field(field.df.fieldname);
 			};
 
 			field.df.onchange_modified = true;
@@ -589,42 +593,37 @@ export default class GridRow {
 		}
 	}
 	refresh_field(fieldname, txt) {
-		var df = this.grid.get_docfield(fieldname) || undefined;
+		let df = this.docfields.find(col => {
+			return col.fieldname === fieldname;
+		});
 
 		// format values if no frm
-		if(!df) {
-			df = this.grid.visible_columns.find((col) => {
-				return col[0].fieldname === fieldname;
-			});
-			if(df && this.doc) {
-				var txt = frappe.format(this.doc[fieldname], df[0],
-					null, this.doc);
-			}
+		if (df && this.doc) {
+			txt = frappe.format(this.doc[fieldname], df, null, this.doc);
 		}
 
-		if(txt===undefined && this.frm) {
-			var txt = frappe.format(this.doc[fieldname], df,
-				null, this.frm.doc);
+		if (!txt && this.frm) {
+			txt = frappe.format(this.doc[fieldname], df, null, this.frm.doc);
 		}
 
 		// reset static value
-		var column = this.columns[fieldname];
-		if(column) {
+		let column = this.columns[fieldname];
+		if (column) {
 			column.static_area.html(txt || "");
-			if(df && df.reqd) {
-				column.toggleClass('error', !!(txt===null || txt===''));
+			if (df && df.reqd) {
+				column.toggleClass('error', !!(txt === null || txt === ''));
 			}
 		}
 
+		let field = this.on_grid_fields_dict[fieldname];
 		// reset field value
-		var field = this.on_grid_fields_dict[fieldname];
-		if(field) {
+		if (field) {
 			field.docname = this.doc.name;
 			field.refresh();
 		}
 
 		// in form
-		if(this.grid_form) {
+		if (this.grid_form) {
 			this.grid_form.refresh_field(fieldname);
 		}
 	}
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index d3480b1b75..8b6c627882 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -319,7 +319,7 @@ frappe.ui.form.Layout = Class.extend({
 				fieldobj.doctype = me.doc.doctype;
 				fieldobj.docname = me.doc.name;
 				fieldobj.df = frappe.meta.get_docfield(me.doc.doctype,
-					fieldobj.df.fieldname, me.frm ? me.frm.doc.name : me.doc.name) || fieldobj.df;
+					fieldobj.df.fieldname, me.doc.name) || fieldobj.df;
 
 				// on form change, permissions can change
 				if (me.frm) {
@@ -512,7 +512,7 @@ frappe.ui.form.Layout = Class.extend({
 		if (form_obj) {
 			if (this.doc && this.doc.parent) {
 				form_obj.setting_dependency = true;
-				form_obj.set_df_property(this.doc.parentfield, property, value, this.doc.parent, fieldname);
+				form_obj.set_df_property(this.doc.parentfield, property, value, this.doc.parent, fieldname, this.doc.name);
 				form_obj.setting_dependency = false;
 				// refresh child fields
 				this.fields_dict[fieldname] && this.fields_dict[fieldname].refresh();
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 8ac0a0109b..65d84e2202 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -112,7 +112,6 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 	};
 
 	var check_mandatory = function () {
-		var me = this;
 		var has_errors = false;
 		frm.scroll_set = false;
 
@@ -124,8 +123,8 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 
 			$.each(frappe.meta.docfield_list[doc.doctype] || [], function (i, docfield) {
 				if (docfield.fieldname) {
-					var df = frappe.meta.get_docfield(doc.doctype,
-						docfield.fieldname, frm.doc.name);
+					const df = frappe.meta.get_docfield(doc.doctype,
+						docfield.fieldname, doc.name);
 
 					if (df.fieldtype === "Fold") {
 						folded = frm.layout.folded;

From 88ddf21110e34f5be240dc6d6bd14193fae9c71e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 1 Apr 2021 12:38:40 +0530
Subject: [PATCH 301/319] test: Add a test case for grid validation

(cherry picked from commit 108c728298bb55cf536b9fe21fa919b3e2fe0c6c)
---
 cypress/integration/form.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/cypress/integration/form.js b/cypress/integration/form.js
index 9c63fe4e8b..5302ed0964 100644
--- a/cypress/integration/form.js
+++ b/cypress/integration/form.js
@@ -42,18 +42,33 @@ context('Form', () => {
 	it('validates behaviour of Data options validations in child table', () => {
 		// test email validations for set_invalid controller
 		let website_input = 'website.in';
+		let valid_email = 'user@email.com';
 		let expectBackgroundColor = 'rgb(255, 245, 245)';
 
 		cy.visit('/app/contact/new');
 		cy.get('.frappe-control[data-fieldname="email_ids"]').as('table');
 		cy.get('@table').find('button.grid-add-row').click();
-		cy.get('.grid-body .rows [data-fieldname="email_id"]').click();
-		cy.get('@table').find('input.input-with-feedback.form-control').as('email_input');
-		cy.get('@email_input').type(website_input, { waitForAnimations: false });
+		cy.get('@table').find('button.grid-add-row').click();
+		cy.get('@table').find('[data-idx="1"]').as('row1');
+		cy.get('@table').find('[data-idx="2"]').as('row2');
+		cy.get('@row1').click();
+		cy.get('@row1').find('input.input-with-feedback.form-control').as('email_input1');
+
+		cy.get('@email_input1').type(website_input, { waitForAnimations: false });
 		cy.fill_field('company_name', 'Test Company');
-		cy.get('@email_input').should($div => {
+
+		cy.get('@row2').click();
+		cy.get('@row2').find('input.input-with-feedback.form-control').as('email_input2');
+		cy.get('@email_input2').type(valid_email, { waitForAnimations: false });
+
+		cy.get('@row1').click();
+		cy.get('@email_input1').should($div => {
 			const style = window.getComputedStyle($div[0]);
 			expect(style.backgroundColor).to.equal(expectBackgroundColor);
 		});
+		cy.get('@email_input1').should('have.class', 'invalid');
+
+		cy.get('@row2').click();
+		cy.get('@email_input2').should('not.have.class', 'invalid');
 	});
 });

From 9908191594ef7367cee6af1cbfa443650ebe2d14 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 1 Apr 2021 14:44:12 +0530
Subject: [PATCH 302/319] chore: Remove change logs of beta releases

---
 frappe/change_log/v13/v13_0_0-beta_1.md  |  27 -----
 frappe/change_log/v13/v13_0_0-beta_10.md |  21 ----
 frappe/change_log/v13/v13_0_0-beta_2.md  |  27 -----
 frappe/change_log/v13/v13_0_0-beta_3.md  |  10 --
 frappe/change_log/v13/v13_0_0-beta_4.md  |  44 ---------
 frappe/change_log/v13/v13_0_0-beta_6.md  |  47 ---------
 frappe/change_log/v13/v13_0_0-beta_9.md  | 121 -----------------------
 7 files changed, 297 deletions(-)
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_1.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_10.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_2.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_3.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_4.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_6.md
 delete mode 100644 frappe/change_log/v13/v13_0_0-beta_9.md

diff --git a/frappe/change_log/v13/v13_0_0-beta_1.md b/frappe/change_log/v13/v13_0_0-beta_1.md
deleted file mode 100644
index 87b4d265d9..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_1.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Version 13.0.0 Beta 1 Release Notes
-
-## Major Features
-
-- New Desk ([#9617](https://github.com/frappe/frappe/pull/9617))
-- Child table pagination ([#8786](https://github.com/frappe/frappe/pull/8786))
-- Events Streaming ([#8567](https://github.com/frappe/frappe/pull/8567))
-
-### Dashboard Enhancements
-
-- Save Dashboard Chart config per user ([#9830](https://github.com/frappe/frappe/pull/9830))
-- Dashboard permissions ([#9789](https://github.com/frappe/frappe/pull/9789))
-- Create Dashboard Charts from Reports  ([#9518](https://github.com/frappe/frappe/pull/9518))
-
-### Other Features
-
-- Web Page tracking ([#9959](https://github.com/frappe/frappe/pull/9959))
-- Ability to cancel all linked document with a single click ([#8905](https://github.com/frappe/frappe/pull/8905))
-- Custom JS & CSS support in Web Form ([#9121](https://github.com/frappe/frappe/pull/9121)) ([#9610](https://github.com/frappe/frappe/pull/9610))
-- System Setting to remove seconds from datetime field ([#8531](https://github.com/frappe/frappe/pull/8531))
-- Added empty list graphics for list view ([#8863](https://github.com/frappe/frappe/pull/8863))
-- Validation for Data options and Data values ([#9784](https://github.com/frappe/frappe/pull/9784))
-- Introduced tnum font feature for reports ([#9430](https://github.com/frappe/frappe/pull/9430))
-- Allow list structure to be changed for the web view ([#9431](https://github.com/frappe/frappe/pull/9431))
-- Offsite backup ([#8241](https://github.com/frappe/frappe/pull/8241))
-- Mandatory Depends On & Read Only Depends On for Document Fields ([#8820](https://github.com/frappe/frappe/pull/8820))
-- Added Google API Indexing ([#9411](https://github.com/frappe/frappe/pull/9411))
diff --git a/frappe/change_log/v13/v13_0_0-beta_10.md b/frappe/change_log/v13/v13_0_0-beta_10.md
deleted file mode 100644
index ff98a8f9c2..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_10.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### Version 13.0.0 Beta 10 Release Notes
-
-#### Features and Enhancements
-
-- Option to hide child records for a nested DocType via User Permissions ([12209](https://github.com/frappe/frappe/pull/12209))
-- Added option to grant only `Select` access to document ([12063](https://github.com/frappe/frappe/pull/12063))
-- Introduced map view ([11202](https://github.com/frappe/frappe/pull/11202))
-- Enabled image rendering from links in Print View ([12101](https://github.com/frappe/frappe/pull/12101))
-- Introduced "Yesterday" and "Tomorrow" options for Timespan filter ([12179](https://github.com/frappe/frappe/pull/12179))
-
-#### Fixes
-
-- Fixed HTML download of Auto Email Report that used to break in some cases ([12202](https://github.com/frappe/frappe/pull/12202))
-- Fixed reset customizations functionality ([12152](https://github.com/frappe/frappe/pull/12152))
-- Fixed the rendering of percentage stat in Dashboard Chart ([12090](https://github.com/frappe/frappe/pull/12090))
-- Fixed permission issues in Dashboard Chart ([12243](https://github.com/frappe/frappe/pull/12243))
-- Fixed an issue with grid row index ([12188](https://github.com/frappe/frappe/pull/12188))
-- Fixed an issue where fields used to get reordered after adding new columns ([12058](https://github.com/frappe/frappe/pull/12058))
-- Fixed currency formatting in Print Format ([11897](https://github.com/frappe/frappe/pull/11897))
-- Added a fieldlevel permission check for report data ([12163](https://github.com/frappe/frappe/pull/12163))
-- Fixed an issue with percent precision ([12010](https://github.com/frappe/frappe/pull/12010))
\ No newline at end of file
diff --git a/frappe/change_log/v13/v13_0_0-beta_2.md b/frappe/change_log/v13/v13_0_0-beta_2.md
deleted file mode 100644
index 746fee26dc..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_2.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Version 13.0.0 Beta 2 Release Notes
-
-## Features
-
-- Export and Import Customizations in Packages ([#9692](https://github.com/frappe/frappe/pull/9692))
-- Dashboard view for each DocTypes ([#10000](https://github.com/frappe/frappe/pull/10000))
-- Introduced HeatMap chart type option for Dashboard Charts ([#10193](https://github.com/frappe/frappe/pull/10193))
-- Translation Tool ([#9636](https://github.com/frappe/frappe/pull/9636))
-
-## Enhancements
-
-- Configure dependency mapping and default values for Event Streaming sync ([#9742](https://github.com/frappe/frappe/pull/9742))
-- Config for Section Break without border ([#10116](https://github.com/frappe/frappe/pull/10116))
-- Onboarding Enhancements ([#10356](https://github.com/frappe/frappe/pull/10356)) ([#10364](https://github.com/frappe/frappe/pull/10364))
-- Introduced Page Builder option in Web Page ([#10035](https://github.com/frappe/frappe/pull/10035)) ([#10154](https://github.com/frappe/frappe/pull/10154))
-- Module-wise onboarding via new desk ([#10194](https://github.com/frappe/frappe/pull/10194))
-- 2FA for LDAP users ([#10001](https://github.com/frappe/frappe/pull/10001))
-- Assign to multiple people at once ([#9957](https://github.com/frappe/frappe/pull/9957))
-- Desk page enhancements ([#10359](https://github.com/frappe/frappe/pull/10359)) ([#10384](https://github.com/frappe/frappe/pull/10384)) ([#10338](https://github.com/frappe/frappe/pull/10338))
-- Search in column picker and filter dialog ([#10111](https://github.com/frappe/frappe/pull/10111))
-
-## Performance Improvements
-
-- Application ([#10229](https://github.com/frappe/frappe/pull/10229)) ([#10147](https://github.com/frappe/frappe/pull/10147))
-- Recorder ([#10272](https://github.com/frappe/frappe/pull/10272))
-- Desk ([#9930](https://github.com/frappe/frappe/pull/9930))
-- Scheduler Job ([#9928](https://github.com/frappe/frappe/pull/9928))
diff --git a/frappe/change_log/v13/v13_0_0-beta_3.md b/frappe/change_log/v13/v13_0_0-beta_3.md
deleted file mode 100644
index 5d1f7433bf..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_3.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Version 13.0.0 Beta 3 Release Notes
-
-## Fixes
-
-- Fixed circular linking while getting submitted linked doc ([#10425](https://github.com/frappe/frappe/pull/10425))
-- Fixed currency formatting in report print view ([#10584](https://github.com/frappe/frappe/pull/10584))
-- Now assignment filter in sidebar will also list closed assignments ([#10532](https://github.com/frappe/frappe/pull/10532)) ([#10714](https://github.com/frappe/frappe/pull/10714))
-- Fixed Data Import issues ([#10876](https://github.com/frappe/frappe/pull/10876))
-- Make delivery status in timeline item translatable ([#10616](https://github.com/frappe/frappe/pull/10616))
-- Website desk pages ([#10519](https://github.com/frappe/frappe/pull/10519))
\ No newline at end of file
diff --git a/frappe/change_log/v13/v13_0_0-beta_4.md b/frappe/change_log/v13/v13_0_0-beta_4.md
deleted file mode 100644
index 26034d79bf..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_4.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Version 13.0.0 Beta 4 Release Notes
-
-## Fixes and Enhancements
-
-- Fixed backup file naming ([#11056](https://github.com/frappe/frappe/pull/11056))
-- Fixed "File already attached" error in some cases ([#10815](https://github.com/frappe/frappe/pull/10815))
-- Text Editor fixes ([#10598](https://github.com/frappe/frappe/pull/10598)) ([#10984](https://github.com/frappe/frappe/pull/10984)) ([#10804](https://github.com/frappe/frappe/pull/10804))
-- Fixed "Permitted Documents for User" page ([#10864](https://github.com/frappe/frappe/pull/10864))
-- Fixed issue in report saving ([#10998](https://github.com/frappe/frappe/pull/10998))
-- Fixed issue where website was not loading JS code ([#11067](https://github.com/frappe/frappe/pull/11067))
-- Fixed website footer links ([#11078](https://github.com/frappe/frappe/pull/11078))
-- Data Import fixes ([#10759](https://github.com/frappe/frappe/pull/10759)) ([#10935](https://github.com/frappe/frappe/pull/10935)) ([#11003](https://github.com/frappe/frappe/pull/11003))
-- Fixed email reply thread where message-id is not returned ([#10803](https://github.com/frappe/frappe/pull/10803))
-- Dashboard Chart and Number Card fixes ([#10872](https://github.com/frappe/frappe/pull/10872)) ([#11074](https://github.com/frappe/frappe/pull/11074)) ([#10816](https://github.com/frappe/frappe/pull/10816)) ([#10788](https://github.com/frappe/frappe/pull/10788)) ([#11117](https://github.com/frappe/frappe/pull/11117))
-- Fixed email encoding issue inside email queue ([#11036](https://github.com/frappe/frappe/pull/11036))
-- Moved checkbox from Print Settings to System Settings ([#10905](https://github.com/frappe/frappe/pull/10905))
-- Code fields will now be sanitized ([#11133](https://github.com/frappe/frappe/pull/11133))
-- Fixed API login inconsistency  ([#10427](https://github.com/frappe/frappe/pull/10427))
-- Fixed RTL layout for desk ([#11006](https://github.com/frappe/frappe/pull/11006))
-- Fixed Google Calendar integration sync token issue ([#10764](https://github.com/frappe/frappe/pull/10764))
-- Google Drive integration fixes ([#10767](https://github.com/frappe/frappe/pull/10767)) ([#10966](https://github.com/frappe/frappe/pull/10966))
-
-## Features
-
-- Introduced PayTM integration ([#9955](https://github.com/frappe/frappe/pull/9955))
-- Standard Dashboards will be synced via JSON ([#10585](https://github.com/frappe/frappe/pull/10585))
-- Introduced a bench command to open ngrok tunnel ([#11024](https://github.com/frappe/frappe/pull/11024))
-- Ability to create Number Cards using reports ([#11022](https://github.com/frappe/frappe/pull/11022))
-- Introduced Help Article Feedback system ([#10260](https://github.com/frappe/frappe/pull/10260))
-- Option to add custom timeline contents ([#10677](https://github.com/frappe/frappe/pull/10677))
-- Made checkboxes navigable via tab key ([#11030](https://github.com/frappe/frappe/pull/11030))
-
-## Performance
-
-- Theme files will now be compressed to make website load faster ([#11048](https://github.com/frappe/frappe/pull/11048))
-- Confirmation emails will be sent instantly ([#10790](https://github.com/frappe/frappe/pull/10790))
-
-## Security
-
-- Made cookies more secure ([#10734](https://github.com/frappe/frappe/pull/10734)) ([#11035](https://github.com/frappe/frappe/pull/11035))
-- Added a check to verify if the query is whitelisted before calling from search ([#10492](https://github.com/frappe/frappe/pull/10492))
-- Disallowed global variable access through SQL ([#10875](https://github.com/frappe/frappe/pull/10875))
-- Escaped user input before regex search ([#10812](https://github.com/frappe/frappe/pull/10812))
-- Prevent rendering arbitrary HTML ([#10948](https://github.com/frappe/frappe/pull/10948))
\ No newline at end of file
diff --git a/frappe/change_log/v13/v13_0_0-beta_6.md b/frappe/change_log/v13/v13_0_0-beta_6.md
deleted file mode 100644
index a750af1f66..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_6.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Version 13.0.0 Beta 6 Release Notes
-
-## Fixes and Enhancements
-
-- Fixed back navigation on user-profile ([#11627](https://github.com/frappe/frappe/pull/11627))
-- Multiple fixes related to reports ([#11593](https://github.com/frappe/frappe/pull/11593)) ([#10959](https://github.com/frappe/frappe/pull/10959)) ([#11533](https://github.com/frappe/frappe/pull/11533)) ([#11459](https://github.com/frappe/frappe/pull/11459)) ([#10987](https://github.com/frappe/frappe/pull/10987)) ([#11612](https://github.com/frappe/frappe/pull/11612)) ([#11468](https://github.com/frappe/frappe/pull/11468)) ([#11593](https://github.com/frappe/frappe/pull/11593))
-- Fixed breaking of website theme on updating site ([#11663](https://github.com/frappe/frappe/pull/11663))
-- Fixed `@` character failure in link field search ([#11851](https://github.com/frappe/frappe/pull/11851))
-- Freeze buttons during request in Form view ([#11570](https://github.com/frappe/frappe/pull/11570))
-- Fixed images shown as broken in comment ([#11337](https://github.com/frappe/frappe/pull/11337))
-- Mute badges in desk shortcut if the count is zero ([#11515](https://github.com/frappe/frappe/pull/11515))
-- Now system will use hostname config in sitemap.xml ([#11160](https://github.com/frappe/frappe/pull/11160))
-- Enhancements in notifications ([#11398](https://github.com/frappe/frappe/pull/11398)) ([#11409](https://github.com/frappe/frappe/pull/11409))
-- Fixed "undefined" value on Number Card ([#11117](https://github.com/frappe/frappe/pull/11117))
-- Dashboard fixes ([#11074](https://github.com/frappe/frappe/pull/11074)) ([#11186](https://github.com/frappe/frappe/pull/11186)) ([#11773](https://github.com/frappe/frappe/pull/11773))  ([#11340](https://github.com/frappe/frappe/pull/11340)) ([#11277](https://github.com/frappe/frappe/pull/11277))
-- Data Import fixes ([#11083](https://github.com/frappe/frappe/pull/11083)) ([#11159](https://github.com/frappe/frappe/pull/11159))
-- Newsletter fixes ([#11401](https://github.com/frappe/frappe/pull/11401)) ([#11321](https://github.com/frappe/frappe/pull/11321))
-- Website Enhancements ([#11285](https://github.com/frappe/frappe/pull/11285)) ([#11584](https://github.com/frappe/frappe/pull/11584)) ([#11646](https://github.com/frappe/frappe/pull/11646)) ([#11315](https://github.com/frappe/frappe/pull/11315))
-- Cleaned up layout of DocType, User, Role and added home_page to Portal Settings & Role ([#11225](https://github.com/frappe/frappe/pull/11225))
-
-## Features
-
-- Added ability to override doctype classes from hooks ([#11527](https://github.com/frappe/frappe/pull/11527))
-- Introduced Razorpay client ([#11418](https://github.com/frappe/frappe/pull/11418))
-- Introduced option to configurable navbar logo and dropdowns ([#11213](https://github.com/frappe/frappe/pull/11213))
-- Added Paytm integration ([#9955](https://github.com/frappe/frappe/pull/9955))
-- Introduced Log Settings ([#11699](https://github.com/frappe/frappe/pull/11699))
-- Added option to set custom due_date for assignments in Assignment Rule ([#11669](https://github.com/frappe/frappe/pull/11669))
-- Added option to anonymize IP for Google Analytics ([#11594](https://github.com/frappe/frappe/pull/11594))
-- Introduced System Settings to automatically delete old Prepared Reports ([#9751](https://github.com/frappe/frappe/pull/9751))
-- Added option in assignment rule to assign based on field value ([#11619](https://github.com/frappe/frappe/pull/11619))
-- Rule based naming of documents ([#11439](https://github.com/frappe/frappe/pull/11439))
-- Added WhatsApp/SMS channels for Notification ([#9623](https://github.com/frappe/frappe/pull/9623))
-- Added option to resize images in text editor ([#10820](https://github.com/frappe/frappe/pull/10820))
-- Now usage of `get_print`, `attach_print` and `send_mail` is allowed in Server Scripts ([#11260](https://github.com/frappe/frappe/pull/11260)) ([#11162](https://github.com/frappe/frappe/pull/11162))
-- Introduced option to disable custom script ([#11342](https://github.com/frappe/frappe/pull/11342))
-- Option to show child table row index number in report builder ([#11246](https://github.com/frappe/frappe/pull/11246))
-
-## Performance
-
-- Used get_list with limit instead of count for faster form load ([#11701](https://github.com/frappe/frappe/pull/11701))
-
-## Security
-
-- Removed `ignore_permissions` flag from API request to avoid unauthorized data access ([#11452](https://github.com/frappe/frappe/pull/11452))
-- Added noreferrer policy to footer links to avoid token key abuse ([#11747](https://github.com/frappe/frappe/pull/11747))
-- Restricted cookies to the host domain ([#11469](https://github.com/frappe/frappe/pull/11469)) ([#11231](https://github.com/frappe/frappe/pull/11231))
diff --git a/frappe/change_log/v13/v13_0_0-beta_9.md b/frappe/change_log/v13/v13_0_0-beta_9.md
deleted file mode 100644
index a31a258d94..0000000000
--- a/frappe/change_log/v13/v13_0_0-beta_9.md
+++ /dev/null
@@ -1,121 +0,0 @@
-### Version 13.0.0 Beta 9 Release Notes
-
-#### Features and Enhancements
-
-- Permission Query via Server Script ([#12034](https://github.com/frappe/frappe/pull/12034))
-- Option to strip EXIF data from image files before uploading ([#12014](https://github.com/frappe/frappe/pull/12014))
-- Provision to open child table in customize form ([#12030](https://github.com/frappe/frappe/pull/12030))
-- Added date format support DD-Mon-YY ([#12056](https://github.com/frappe/frappe/pull/12056))
-- Partial Backups & Restores ([#11104](https://github.com/frappe/frappe/pull/11104))
-- Non negative check for Int, Float and Currency fields ([#11818](https://github.com/frappe/frappe/pull/11818))
-- Allow html in email templates ([#12018](https://github.com/frappe/frappe/pull/12018))
-- Web form fields support for property depends on fields (read-on… ([#11927](https://github.com/frappe/frappe/pull/11927))
-- Conditional Events in Event Streaming ([#10868](https://github.com/frappe/frappe/pull/10868))
-- Added filters and order_by fields in frappe.get_last_doc API ([#11870](https://github.com/frappe/frappe/pull/11870))
-- Check if auto_repeat field is already present ([#11970](https://github.com/frappe/frappe/pull/11970))
-- as_raw update to display content inline not always download as attachment ([#11569](https://github.com/frappe/frappe/pull/11569))
-- Reset scroll position on list paging ([#11673](https://github.com/frappe/frappe/pull/11673))
-- Validate sql file before restoring site ([#11878](https://github.com/frappe/frappe/pull/11878))
-- Allow custom freeze message in Open Mapped Doc ([#11976](https://github.com/frappe/frappe/pull/11976))
-- Show absolute value in print format ([#12019](https://github.com/frappe/frappe/pull/12019))
-- Add links and actions to customize form and cleanup code ([#11565](https://github.com/frappe/frappe/pull/11565))
-- Add module field in get_desk_sidebar_items ([#11781](https://github.com/frappe/frappe/pull/11781))
-
-#### Fixes
-
-- Maximum attachment limit validation ([#11940](https://github.com/frappe/frappe/pull/11940))
-- Define chunk size based on backup file size to avoid timeout issues ([#11526](https://github.com/frappe/frappe/pull/11526))
-- Fetch doc from db in get_transitions ([#11883](https://github.com/frappe/frappe/pull/11883))
-- Remove Package Publish Tool ([#11863](https://github.com/frappe/frappe/pull/11863))
-- Make strings translatable ([#11825](https://github.com/frappe/frappe/pull/11825))
-- Clear cache after updating defaults manually ([#11830](https://github.com/frappe/frappe/pull/11830))
-- Doctype query in create new shortcut ([#11864](https://github.com/frappe/frappe/pull/11864))
-- Ace editor fixes ([#11920](https://github.com/frappe/frappe/pull/11920))
-- Shorten number card percentage stat ([#11846](https://github.com/frappe/frappe/pull/11846))
-- Error page rendering shouldn't fail when recorder is active ([#11806](https://github.com/frappe/frappe/pull/11806))
-- Rename Doc considers invalid table name on renaming record ([#11743](https://github.com/frappe/frappe/pull/11743))
-- Use modified by or owner to send notification from ([#11981](https://github.com/frappe/frappe/pull/11981))
-- Bust cache by passing build_version to link and script src ([#11903](https://github.com/frappe/frappe/pull/11903))
-- Customize options in desk page rtl layout ([#11772](https://github.com/frappe/frappe/pull/11772))
-- Use sql_ddl to avoid exception triggered while running drop sql ([#11831](https://github.com/frappe/frappe/pull/11831))
-- Render template for HTML content type ([#12035](https://github.com/frappe/frappe/pull/12035))
-- Display style removed from emails ([#11963](https://github.com/frappe/frappe/pull/11963))
-- Handle FileAlreadyAttachedException while pulling email ([#11713](https://github.com/frappe/frappe/pull/11713))
-- Skip Email Account and Email Domain in Document Follow ([#11973](https://github.com/frappe/frappe/pull/11973))
-- URI encode in case white spaces exist in docname ([#11783](https://github.com/frappe/frappe/pull/11783))
-- Don't run a query when table is missing ([#11801](https://github.com/frappe/frappe/pull/11801))
-- Submit on Creation configuration in Auto Repeat ([#12069](https://github.com/frappe/frappe/pull/12069))
-- Add missing space in description ([#11787](https://github.com/frappe/frappe/pull/11787))
-- Query to handle user value having special characters ([#11694](https://github.com/frappe/frappe/pull/11694))
-- TypeError on saving report with child table ([#11925](https://github.com/frappe/frappe/pull/11925))
-- Translate Kanban board title ([#11985](https://github.com/frappe/frappe/pull/11985))
-- Set label as State/Province in Address instead of just State ([#11748](https://github.com/frappe/frappe/pull/11748))
-- Allow "Default Print Language" for custom Print Format ([#11800](https://github.com/frappe/frappe/pull/11800))
-- Validate SQL files better ([#11930](https://github.com/frappe/frappe/pull/11930))
-- Validate links table data ([#11884](https://github.com/frappe/frappe/pull/11884))
-- Use html.unescape for Python 3.9 compatibility. ([#12005](https://github.com/frappe/frappe/pull/12005))
-- Use set_header to set Message-Id in header ([#11778](https://github.com/frappe/frappe/pull/11778))
-- Typo when creating an SMTP server without port ([#11996](https://github.com/frappe/frappe/pull/11996))
-- Add rename_doc utils for external API usages ([#12011](https://github.com/frappe/frappe/pull/12011))
-- Treats the scrollbar as an overlay ([#11790](https://github.com/frappe/frappe/pull/11790))
-- Dashboard not visible bug ([#11918](https://github.com/frappe/frappe/pull/11918))
-- Total Row in Checkbox Column Reports ([#11872](https://github.com/frappe/frappe/pull/11872))
-- Remove scrolling on focusout event for touchscreen devices ([#11888](https://github.com/frappe/frappe/pull/11888))
-- Add default to Web Template Field ([#11780](https://github.com/frappe/frappe/pull/11780))
-- Order of HTML closing tags ([#11923](https://github.com/frappe/frappe/pull/11923))
-- Show total text with value if first column is numeric ([#11813](https://github.com/frappe/frappe/pull/11813))
-- Milestone not created for fields updated after submission ([#11793](https://github.com/frappe/frappe/pull/11793))
-- Cint seconds before operations ([#12067](https://github.com/frappe/frappe/pull/12067))
-- Validate email id before passing to formataddr ([#11720](https://github.com/frappe/frappe/pull/11720))
-- Use frappe.utils.shorten_number ([#12039](https://github.com/frappe/frappe/pull/12039))
-- Mandatory depends on in grid form ([#11834](https://github.com/frappe/frappe/pull/11834))
-- Calculate chart data from beginning of period ([#11794](https://github.com/frappe/frappe/pull/11794))
-- Move unnecessary compileall outside migrate ([#11833](https://github.com/frappe/frappe/pull/11833))
-- PDF generation shouldn't fail in background jobs and tests ([#11792](https://github.com/frappe/frappe/pull/11792))
-- Throw exception if template not found ([#11843](https://github.com/frappe/frappe/pull/11843))
-- Security upgrade snyk from 1.398.1 to 1.425.4 ([#11990](https://github.com/frappe/frappe/pull/11990))
-- Show custom message for invalid login credentials ([#11853](https://github.com/frappe/frappe/pull/11853))
-- Remove twilio integration ([#11841](https://github.com/frappe/frappe/pull/11841))
-- Navbar logo height and width ([#11822](https://github.com/frappe/frappe/pull/11822))
-- Allow all Data, Link, Dynamic Link fields to be set in based on field ([#11922](https://github.com/frappe/frappe/pull/11922))
-- Error on trying to check semantic version ([#11916](https://github.com/frappe/frappe/pull/11916))
-- Notification settings ([#11862](https://github.com/frappe/frappe/pull/11862))
-- Manage private images via get_local_image ([#11935](https://github.com/frappe/frappe/pull/11935))
-- Filter dashboards, dashboard charts, number cards by modules ([#12057](https://github.com/frappe/frappe/pull/12057))
-- Label for _assign field ([#12038](https://github.com/frappe/frappe/pull/12038))
-- Bypass validation if force is passed ([#11915](https://github.com/frappe/frappe/pull/11915))
-- Max slices for aggregate charts ([#11808](https://github.com/frappe/frappe/pull/11808))
-- Delete prepared reports in batches ([#11869](https://github.com/frappe/frappe/pull/11869))
-- Allow empty type for Web Templates that are not sections ([#11628](https://github.com/frappe/frappe/pull/11628))
-- Allow other github links in same PR ([#11982](https://github.com/frappe/frappe/pull/11982))
-- Don't set context.no_cache ([#11799](https://github.com/frappe/frappe/pull/11799))
-- Remove telephony related code ([#12017](https://github.com/frappe/frappe/pull/12017))
-- Don't throw if filter is invalid ([#11866](https://github.com/frappe/frappe/pull/11866))
-- Show 0 instead of undefined when value not set in dashboard ([#11816](https://github.com/frappe/frappe/pull/11816))
-- Disable chart form condition ([#11844](https://github.com/frappe/frappe/pull/11844))
-- Enable disable save when navigating between docs ([#11867](https://github.com/frappe/frappe/pull/11867))
-- Don't enqueue a job if it is being executed ([#11655](https://github.com/frappe/frappe/pull/11655))
-- Clear localstorage if quota exceeds ([#12002](https://github.com/frappe/frappe/pull/12002))
-- Uninstall app enhancements ([#11911](https://github.com/frappe/frappe/pull/11911))
-- Make route and action readonly for standard navbar items ([#11842](https://github.com/frappe/frappe/pull/11842))
-- Show scrollbar for datatable ([#11910](https://github.com/frappe/frappe/pull/11910))
-- Open console even if Frappe imports failed ([#11832](https://github.com/frappe/frappe/pull/11832))
-- Set user selected timezone in user defaults ([#11902](https://github.com/frappe/frappe/pull/11902))
-- Email password prompt missing field name for submit button ([#11840](https://github.com/frappe/frappe/pull/11840))
-- Add semicolons to end unicode  ([#11993](https://github.com/frappe/frappe/pull/11993))
-- Replace target field in Top Bar Item table with a checkbox ([#11763](https://github.com/frappe/frappe/pull/11763))
-- shorten_number function ([#12050](https://github.com/frappe/frappe/pull/12050))
-- Not able to save Domain Settings ([#11984](https://github.com/frappe/frappe/pull/11984))
-- uninstall-app enhancements ([#11969](https://github.com/frappe/frappe/pull/11969))
-- Remove @ from relevance query ([#11837](https://github.com/frappe/frappe/pull/11837))
-- Login Code Size too Small on Mobile ([#11742](https://github.com/frappe/frappe/pull/11742))
-- Add namespaces to build_summary_item, generate_route, short… ([#11868](https://github.com/frappe/frappe/pull/11868))
-- allow "only image" in comments ([#11914](https://github.com/frappe/frappe/pull/11914))
-- oauth2 ([#11966](https://github.com/frappe/frappe/pull/11966))
-- Server scripts enhancements ([#12008](https://github.com/frappe/frappe/pull/12008))
-- Multiple y rows in charts ([#12031](https://github.com/frappe/frappe/pull/12031))
-- Update child values for existing rows ([#11737](https://github.com/frappe/frappe/pull/11737))
-- Auto contact creation in email account ([#11732](https://github.com/frappe/frappe/pull/11732))
-- Display web template after save ([#11809](https://github.com/frappe/frappe/pull/11809))
-- Create auto_repeat field only if docfield/custom field does not exist ([#11827](https://github.com/frappe/frappe/pull/11827))
-- frappe.utils.formatdate not working in the jinja template ([#11871](https://github.com/frappe/frappe/pull/11871))
\ No newline at end of file

From 92a8750e51cc35515b8625bcd730a1e8a807960c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 1 Apr 2021 15:16:17 +0530
Subject: [PATCH 303/319] fix: users currently viewing a form

(cherry picked from commit 0952e5d2d00e734ead14c78de590abaf9a952e2c)
---
 frappe/public/js/frappe/form/form_viewers.js | 9 ++++-----
 frappe/public/js/frappe/form/toolbar.js      | 5 ++++-
 frappe/public/js/frappe/socketio_client.js   | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/form_viewers.js b/frappe/public/js/frappe/form/form_viewers.js
index d9d5ba6e68..3d488e4729 100644
--- a/frappe/public/js/frappe/form/form_viewers.js
+++ b/frappe/public/js/frappe/form/form_viewers.js
@@ -6,11 +6,10 @@ frappe.ui.form.FormViewers = class FormViewers {
 	}
 
 	refresh() {
-		// REDESIGN-TODO: fix this
-		// let users = this.frm.get_docinfo()['viewers'];
-		// let currently_viewing = users.current.filter(user => user != frappe.session.user);
-		// let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
-		this.parent.empty(); //.append(avatar_group);
+		let users = this.frm.get_docinfo()['viewers'];
+		let currently_viewing = users.current.filter(user => user != frappe.session.user);
+		let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
+		this.parent.empty().append(avatar_group);
 	}
 };
 
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 7e2502e58a..2f5b84fb1a 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -210,7 +210,10 @@ frappe.ui.form.Toolbar = class Toolbar {
 	}
 
 	make_viewers() {
-		if (this.frm.viewers) return;
+		if (this.frm.viewers) {
+			this.frm.viewers.parent.empty();
+			return;
+		}
 		this.frm.viewers = new frappe.ui.form.FormViewers({
 			frm: this.frm,
 			parent: $('<div class="form-viewers d-flex"></div>').prependTo(this.frm.page.page_actions)
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index c9c98bd937..68bfc60a9e 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -159,8 +159,8 @@ frappe.socketio = {
 	},
 	doc_open: function(doctype, docname) {
 		// notify that the user has opened this doc, if not already notified
-		if(!frappe.socketio.last_doc
-			|| (frappe.socketio.last_doc[0]!=doctype && frappe.socketio.last_doc[1]!=docname)) {
+		if (!frappe.socketio.last_doc
+			|| (frappe.socketio.last_doc[0] != doctype || frappe.socketio.last_doc[1] != docname)) {
 			frappe.socketio.socket.emit('doc_open', doctype, docname);
 		}
 		frappe.socketio.last_doc = [doctype, docname];

From 9c9f13d4940c7270f6d99ba8f98e9b348eb65ac3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 1 Apr 2021 15:52:29 +0530
Subject: [PATCH 304/319] chore: Version 13 change log

---
 frappe/change_log/v13/v13_0_0.md | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 frappe/change_log/v13/v13_0_0.md

diff --git a/frappe/change_log/v13/v13_0_0.md b/frappe/change_log/v13/v13_0_0.md
new file mode 100644
index 0000000000..e1b6639076
--- /dev/null
+++ b/frappe/change_log/v13/v13_0_0.md
@@ -0,0 +1,54 @@
+# Version 13.0.0 Release Notes
+
+## Highlights
+
+- Re-branded UI 💎 ✨🎊 ([#12277](https://github.com/frappe/frappe/pull/12277))
+- New Page Builder in Web Page ([#10035](https://github.com/frappe/frappe/pull/10035))
+- Customizable desk ([#9617](https://github.com/frappe/frappe/pull/9617))
+- Custom Dashboard for DocTypes ([#9872](https://github.com/frappe/frappe/pull/9872))
+- Widgets to make dashboards ([#9693](https://github.com/frappe/frappe/pull/9693))
+- Events Streaming ([#8567](https://github.com/frappe/frappe/pull/8567))
+- Contextual translation and Translation Tool ([#9636](https://github.com/frappe/frappe/pull/9636))
+
+### Other Features & Enhancements
+
+- Added permission to grant only `Select` access ([#12063](https://github.com/frappe/frappe/pull/12063))
+- Add columns and filters for reports via configuration ([#11287](https://github.com/frappe/frappe/pull/11287))
+- Configurable Navbar logo and dropdowns ([#11213](https://github.com/frappe/frappe/pull/11213))
+- Rule based naming of documents ([#11439](https://github.com/frappe/frappe/pull/11439))
+- New routing style, not using hashes, also /desk -> /app ([#11917](https://github.com/frappe/frappe/pull/11917))
+- Web Page tracking ([#9959](https://github.com/frappe/frappe/pull/9959))
+- Introduced "Yesterday" and "Tomorrow" options for Timespan filter ([12179](https://github.com/frappe/frappe/pull/12179))
+- Child table pagination ([#8786](https://github.com/frappe/frappe/pull/8786))
+- Introduced Duration Control ([#10248](https://github.com/frappe/frappe/pull/10248))
+- Form Tour feature ([#10287](https://github.com/frappe/frappe/pull/10287))
+<details>
+<summary>More</summary>
+
+- Introduced Map View ([#11202](https://github.com/frappe/frappe/pull/11202))
+- Custom JS & CSS support in Web Form ([#9121](https://github.com/frappe/frappe/pull/9121)) ([#9610](https://github.com/frappe/frappe/pull/9610))
+- Ability to attach photo from webcam ([#12160](https://github.com/frappe/frappe/pull/12160))
+- Added a System Console to help in debugging ([#11306](https://github.com/frappe/frappe/pull/11306))
+- Introduced System Settings to automatically delete old Prepared Reports ([#9751](https://github.com/frappe/frappe/pull/9751))
+- "Mandatory Depends On" and "Read Only Depends On" option for document fields ([#8820](https://github.com/frappe/frappe/pull/8820))
+- Added 2FA for LDAP users ([#10001](https://github.com/frappe/frappe/pull/10001))
+- Introduced Help Article Feedback system ([#10260](https://github.com/frappe/frappe/pull/10260))
+- Introduced Razorpay client ([#11418](https://github.com/frappe/frappe/pull/11418))
+- Rate Limiting ([#10310](https://github.com/frappe/frappe/pull/10310))
+- Introduced Log Settings ([#11699](https://github.com/frappe/frappe/pull/11699))
+- Enhancements in notifications ([#11398](https://github.com/frappe/frappe/pull/11398)) ([#11409](https://github.com/frappe/frappe/pull/11409))
+- Added a field-level permission check for report data ([12163](https://github.com/frappe/frappe/pull/12163))
+- Ability to cancel all linked document with a single click ([#8905](https://github.com/frappe/frappe/pull/8905))
+- Made checkboxes navigable via tab key ([#11030](https://github.com/frappe/frappe/pull/11030))
+- Renamed "Custom Script" to "Client Script" ([#12324](https://github.com/frappe/frappe/pull/12324))
+
+</details>
+
+### Performance
+
+- Faster application load ([#12364](https://github.com/frappe/frappe/pull/12364)) ([#10229](https://github.com/frappe/frappe/pull/10229)) ([#10147](https://github.com/frappe/frappe/pull/10147)) ([#9930](https://github.com/frappe/frappe/pull/9930))
+- Theme files will now be compressed to make the website load faster ([#11048](https://github.com/frappe/frappe/pull/11048))
+- Confirmation emails will be sent instantly ([#10790](https://github.com/frappe/frappe/pull/10790))
+- Faster scheduled job processing ([#9928](https://github.com/frappe/frappe/pull/9928))
+- Faster data imports ([#12565](https://github.com/frappe/frappe/pull/12565))
+- Faster CLI commands ([#12447](https://github.com/frappe/frappe/pull/12447))

From d7162c361e461564b98cccdb84e121e09b7bbce1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 1 Apr 2021 17:05:44 +0530
Subject: [PATCH 305/319] fix: also emit doc close event on doc change

(cherry picked from commit 987b3e23ca5d13d4418be7c021ec8eccd18a066a)
---
 frappe/public/js/frappe/socketio_client.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index 68bfc60a9e..606ed42444 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -162,6 +162,9 @@ frappe.socketio = {
 		if (!frappe.socketio.last_doc
 			|| (frappe.socketio.last_doc[0] != doctype || frappe.socketio.last_doc[1] != docname)) {
 			frappe.socketio.socket.emit('doc_open', doctype, docname);
+
+			frappe.socketio.last_doc &&
+				frappe.socketio.doc_close(frappe.socketio.last_doc[0], frappe.socketio.last_doc[1]);
 		}
 		frappe.socketio.last_doc = [doctype, docname];
 	},

From 5747ff39bba6f4e38a7200995ffcf0f1e5a19424 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 1 Apr 2021 18:29:03 +0530
Subject: [PATCH 306/319] fix: get_route_options_for_new_doc in link field

- Used correct df where get_route_options_for_new_doc
function is attached

It stopped working after https://github.com/frappe/frappe/pull/12744

(cherry picked from commit e25fae3f8f925d9f82caaf1c9b9b9bf0094cc132)
---
 frappe/public/js/frappe/form/controls/link.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index e0a72ed8c1..1a483c5968 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -83,11 +83,16 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 		var doctype = this.get_options();
 		var me = this;
 
-		if(!doctype) return;
+		if (!doctype) return;
 
+		let df = this.df;
+		if (this.frm && this.frm.doctype !== this.df.parent) {
+			// incase of grid use common df set in grid
+			df = this.frm.get_docfield(this.doc.parentfield, this.df.fieldname);
+		}
 		// set values to fill in the new document
-		if(this.df.get_route_options_for_new_doc) {
-			frappe.route_options = this.df.get_route_options_for_new_doc(this);
+		if (df && df.get_route_options_for_new_doc) {
+			frappe.route_options = df.get_route_options_for_new_doc(this);
 		} else {
 			frappe.route_options = {};
 		}

From 7a36ba5bbd68903cd9795115f073339a42d6b357 Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Thu, 1 Apr 2021 19:08:37 +0530
Subject: [PATCH 307/319] fix: get_count API endpoint

Make get_count work with join queries

(cherry picked from commit 566f8ba12af9f9acc11839f1478cf7b7eb3d6e17)
---
 frappe/desk/reportview.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 296dfb94f1..0037112ed8 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -31,7 +31,9 @@ def get_list():
 @frappe.read_only()
 def get_count():
 	args = get_form_params()
-	args.fields = ['{distinct}count(name) as total_count'.format(distinct = 'distinct ' if args.distinct=='true' else '')]
+
+	distinct = 'distinct ' if args.distinct=='true' else ''
+	args.fields = [f"count({distinct}`tab{args.doctype}`.name) as total_count"]
 	return execute(**args)[0].get('total_count')
 
 def execute(doctype, *args, **kwargs):

From 10d0391fccc28388416445869e4e4e31f0241896 Mon Sep 17 00:00:00 2001
From: "hasnain2808@gmail.com" <hasnain2808@gmail.com>
Date: Thu, 1 Apr 2021 20:31:57 +0530
Subject: [PATCH 308/319] fix: fix patch to pluralize list view setting

(cherry picked from commit 872151f32e0fe04340da722e10a0910019c0166e)
---
 .../v13_0/rename_list_view_setting_to_list_view_settings.py   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py b/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
index fcf8afc826..b637db3d87 100644
--- a/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
+++ b/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
@@ -7,6 +7,9 @@ import frappe
 
 def execute():
 	if frappe.db.table_exists('List View Setting'):
+		if not frappe.db.table_exists('List View Settings'):
+			frappe.reload_doctype("List View Settings")
+
 		existing_list_view_settings = frappe.get_all('List View Settings', as_list=True)
 		for list_view_setting in frappe.get_all('List View Setting', fields = ['disable_count', 'disable_sidebar_stats', 'disable_auto_refresh', 'name']):
 			name = list_view_setting.pop('name')
@@ -16,5 +19,6 @@ def execute():
 				# setting name here is necessary because autoname is set as prompt
 				list_view_settings.name = name
 				list_view_settings.insert()
+
 		frappe.delete_doc("DocType", "List View Setting", force=True)
 		frappe.db.commit()

From 8290f0d3203345e5b0481626af9b484efb06b0c4 Mon Sep 17 00:00:00 2001
From: "hasnain2808@gmail.com" <hasnain2808@gmail.com>
Date: Thu, 1 Apr 2021 21:14:10 +0530
Subject: [PATCH 309/319] fix: list view setting patch

(cherry picked from commit 86ddc1b2a3aa849eb83e4f3e5e457d01fedde1dc)
---
 .../v13_0/rename_list_view_setting_to_list_view_settings.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py b/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
index b637db3d87..7c3aec9510 100644
--- a/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
+++ b/frappe/patches/v13_0/rename_list_view_setting_to_list_view_settings.py
@@ -8,7 +8,7 @@ import frappe
 def execute():
 	if frappe.db.table_exists('List View Setting'):
 		if not frappe.db.table_exists('List View Settings'):
-			frappe.reload_doctype("List View Settings")
+			frappe.reload_doc("desk", "doctype", "List View Settings")
 
 		existing_list_view_settings = frappe.get_all('List View Settings', as_list=True)
 		for list_view_setting in frappe.get_all('List View Setting', fields = ['disable_count', 'disable_sidebar_stats', 'disable_auto_refresh', 'name']):

From c062af9749e2008f706935378333f04cf4ad9e6b Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Thu, 1 Apr 2021 22:46:52 +0530
Subject: [PATCH 310/319] chore: Bump version to v13.0.0

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index cef3b23252..25d835bec3 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -33,7 +33,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0-beta.11'
+__version__ = '13.0.0'
 
 __title__ = "Frappe Framework"
 

From e1120eed5d8fab7fc8bd70046c26d47eb105de1a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 2 Apr 2021 13:31:40 +0530
Subject: [PATCH 311/319] fix: Reload website_theme_ignore_app before Website
 Theme

(cherry picked from commit aaea55ed7de6a0b7adca469d19bc5abf9706b46f)
---
 frappe/patches/v13_0/website_theme_custom_scss.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py
index a5f08324e8..569d19111b 100644
--- a/frappe/patches/v13_0/website_theme_custom_scss.py
+++ b/frappe/patches/v13_0/website_theme_custom_scss.py
@@ -1,9 +1,9 @@
 import frappe
 
 def execute():
-	frappe.reload_doctype('Website Theme')
 	frappe.reload_doc('website', 'doctype', 'website_theme_ignore_app')
 	frappe.reload_doc('website', 'doctype', 'color')
+	frappe.reload_doctype('Website Theme')
 
 	for theme in frappe.get_all('Website Theme'):
 		doc = frappe.get_doc('Website Theme', theme.name)

From 4d218fe10839e5810300d748ce83770e010c0d40 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 4 Apr 2021 10:12:10 +0530
Subject: [PATCH 312/319] fix: Check if df.options exists before setting
 docfields

Fixes: https://github.com/frappe/frappe/issues/12793
(cherry picked from commit a71066f3a42f0888e967f51e44886f7db9c4dd8f)
---
 frappe/public/js/frappe/form/grid_row.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index bebf46e93d..5e3a2b8ccd 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -5,7 +5,7 @@ export default class GridRow {
 		this.on_grid_fields_dict = {};
 		this.on_grid_fields = [];
 		$.extend(this, opts);
-		if (this.doc) {
+		if (this.doc && this.parent_df.options) {
 			this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
 		}
 		this.columns = {};
@@ -255,6 +255,7 @@ export default class GridRow {
 		this.grid.visible_columns.forEach((col, ci) => {
 			// to get update df for the row
 			let df = this.docfields.find(field => field.fieldname === col[0].fieldname);
+
 			let colsize = col[1];
 			let txt = this.doc ?
 				frappe.format(this.doc[df.fieldname], df, null, this.doc) :

From a4b166e71fa8985b920e4b8230273c51dcb60b34 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 4 Apr 2021 12:30:21 +0530
Subject: [PATCH 313/319] chore: Bump version to v13.0.1

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 25d835bec3..0645dce367 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -33,7 +33,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.0'
+__version__ = '13.0.1'
 
 __title__ = "Frappe Framework"
 

From 4453303b4c3d18610352dbeea250bff976c80a46 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 5 Apr 2021 12:16:04 +0530
Subject: [PATCH 314/319] fix: Handle exception while building version comment
 (bp #12801) (#12802)

(cherry picked from commit 13e7f453fcc70e90fd5dfff4d81bc3ddddc2b1d5)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../version_timeline_content_builder.js       | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
index a563286413..cbfd620e4c 100644
--- a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
+++ b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js
@@ -151,19 +151,23 @@ function get_version_comment(version_doc, text) {
 		let version_comment = "";
 		let unlinked_content = "";
 
-		Array.from($(text)).forEach(element => {
-			if ($(element).is('a')) {
-				version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : "";
-				unlinked_content = "";
-				version_comment += element.outerHTML;
-			} else {
-				unlinked_content += element.outerHTML || element.textContent;
+		try {
+			Array.from($(text)).forEach(element => {
+				if ($(element).is('a')) {
+					version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : "";
+					unlinked_content = "";
+					version_comment += element.outerHTML;
+				} else {
+					unlinked_content += element.outerHTML || element.textContent;
+				}
+			});
+			if (unlinked_content) {
+				version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content);
 			}
-		});
-		if (unlinked_content) {
-			version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content);
+			return version_comment;
+		} catch (e) {
+			// pass
 		}
-		return version_comment;
 	}
 	return frappe.utils.get_form_link('Version', version_doc.name, true, text);
 }

From bad52991a49e0112b143c72873002d0126f0fca3 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 6 Apr 2021 17:17:58 +0530
Subject: [PATCH 315/319] fix: Patch fixes for v13 upgrade (#12806)

---
 frappe/patches/v13_0/website_theme_custom_scss.py     | 2 +-
 frappe/website/doctype/website_theme/website_theme.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py
index 569d19111b..2acb73e11a 100644
--- a/frappe/patches/v13_0/website_theme_custom_scss.py
+++ b/frappe/patches/v13_0/website_theme_custom_scss.py
@@ -3,7 +3,7 @@ import frappe
 def execute():
 	frappe.reload_doc('website', 'doctype', 'website_theme_ignore_app')
 	frappe.reload_doc('website', 'doctype', 'color')
-	frappe.reload_doctype('Website Theme')
+	frappe.reload_doc('website', 'doctype', 'website_theme', force=True)
 
 	for theme in frappe.get_all('Website Theme'):
 		doc = frappe.get_doc('Website Theme', theme.name)
diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py
index bb612c5d3e..da60e83f32 100644
--- a/frappe/website/doctype/website_theme/website_theme.py
+++ b/frappe/website/doctype/website_theme/website_theme.py
@@ -178,7 +178,7 @@ def after_migrate():
 	the end of every `bench migrate`.
 	"""
 	website_theme = frappe.db.get_single_value('Website Settings', 'website_theme')
-	if website_theme == 'Standard':
+	if not website_theme or website_theme == 'Standard':
 		return
 
 	doc = frappe.get_doc('Website Theme', website_theme)

From 6708d89da06c20464e281f7a20aa9649fdacdaf8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 18:22:06 +0530
Subject: [PATCH 316/319] fix: ZeroDivision error in progress (bp #12586)
 (#12808)

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
---
 frappe/desk/form/linked_with.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index 733ee1774c..a62e2837d5 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -79,28 +79,30 @@ def get_submitted_linked_docs(doctype, name, docs=None, visited=None):
 @frappe.whitelist()
 def cancel_all_linked_docs(docs, ignore_doctypes_on_cancel_all=[]):
 	"""
-	Cancel all linked doctype
+	Cancel all linked doctype, optionally ignore doctypes specified in a list.
 
 	Arguments:
-		docs (str) - It contains all list of dictionaries of a linked documents.
+		docs (json str) - It contains list of dictionaries of a linked documents.
+		ignore_doctypes_on_cancel_all (list) - List of doctypes to ignore while cancelling.
 	"""
 
 	docs = json.loads(docs)
 	if isinstance(ignore_doctypes_on_cancel_all, string_types):
 		ignore_doctypes_on_cancel_all = json.loads(ignore_doctypes_on_cancel_all)
 	for i, doc in enumerate(docs, 1):
-		if validate_linked_doc(doc, ignore_doctypes_on_cancel_all) is True:
-			frappe.publish_progress(percent=i * 100 / ((len(docs) - len(ignore_doctypes_on_cancel_all))), title=_("Cancelling documents"))
+		if validate_linked_doc(doc, ignore_doctypes_on_cancel_all):
 			linked_doc = frappe.get_doc(doc.get("doctype"), doc.get("name"))
 			linked_doc.cancel()
+		frappe.publish_progress(percent=i/len(docs) * 100, title=_("Cancelling documents"))
 
 
 def validate_linked_doc(docinfo, ignore_doctypes_on_cancel_all=[]):
 	"""
 	Validate a document to be submitted and non-exempted from auto-cancel.
 
-	Args:
-		docs (dict): The document to check for submitted and non-exempt from auto-cancel
+	Arguments:
+		docinfo (dict): The document to check for submitted and non-exempt from auto-cancel
+		ignore_doctypes_on_cancel_all (list) - List of doctypes to ignore while cancelling.
 
 	Returns:
 		bool: True if linked document passes all validations, else False

From ef83ebeb3cf7e6e6fbcd82d759b373eece214364 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Wed, 7 Apr 2021 11:32:01 +0550
Subject: [PATCH 317/319] bumped to version 13.0.2

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 0645dce367..ebc3945bed 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -33,7 +33,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.1'
+__version__ = '13.0.2'
 
 __title__ = "Frappe Framework"
 

From 462e3b83b55c6b125fd6a3562cfa997d9d2fd6a8 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 12 Apr 2021 21:44:49 +0530
Subject: [PATCH 318/319] fix: Include dropped and renamed tables in touched
 tables list

(cherry picked from commit 2b1458e3fbabedf9ab0740b63e0ed6424b91a44b)
---
 frappe/database/database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 4fcf10efda..ea278f377e 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -983,7 +983,7 @@ class Database(object):
 	def log_touched_tables(self, query, values=None):
 		if values:
 			query = frappe.safe_decode(self._cursor.mogrify(query, values))
-		if query.strip().lower().split()[0] in ('insert', 'delete', 'update', 'alter'):
+		if query.strip().lower().split()[0] in ('insert', 'delete', 'update', 'alter', 'drop', 'rename'):
 			# single_word_regex is designed to match following patterns
 			# `tabXxx`, tabXxx and "tabXxx"
 

From eb73955bc09b5e903048f738d26f427bb97434de Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 14 Apr 2021 12:56:23 +0550
Subject: [PATCH 319/319] bumped to version 13.0.3

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index ebc3945bed..8b2c1890fb 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -33,7 +33,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.0.2'
+__version__ = '13.0.3'
 
 __title__ = "Frappe Framework"