From 68829ab2e6d2ca8238bd9d5bd44844e032cee089 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 21 Jan 2021 19:06:33 +0100
Subject: [PATCH 001/106] feat: default_email_template

---
 frappe/core/doctype/doctype/doctype.json       | 13 ++++++++++++-
 frappe/public/js/frappe/views/communication.js |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 215ef8cd62..55c74a4e63 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -55,6 +55,8 @@
   "show_preview_popup",
   "show_name_in_global_search",
   "email_settings_sb",
+  "default_email_template",
+  "column_break_51",
   "email_append_to",
   "sender_field",
   "subject_field",
@@ -528,6 +530,15 @@
    "fieldname": "index_web_pages_for_search",
    "fieldtype": "Check",
    "label": "Index Web Pages for Search"
+  },
+  {
+   "fieldname": "default_email_template",
+   "fieldtype": "Data",
+   "label": "Default Email Template"
+  },
+  {
+   "fieldname": "column_break_51",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-bolt",
@@ -609,7 +620,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2020-09-24 13:13:58.227153",
+ "modified": "2021-01-21 18:09:47.135696",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index c69be04347..7b9668a96e 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -159,6 +159,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.setup_last_edited_communication();
 		this.setup_email_template();
 
+		this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
 		this.dialog.set_value("recipients", this.recipients || '');
 		this.dialog.set_value("cc", this.cc || '');
 		this.dialog.set_value("bcc", this.bcc || '');

From 2618ee74d898f48a0899691c045e2ce1e0a4b4da Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:55:54 +0100
Subject: [PATCH 002/106] feat: add default_email_template to Customize Form

---
 .../doctype/customize_form/customize_form.json      | 13 ++++++++++++-
 .../custom/doctype/customize_form/customize_form.py |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index ff102b3c08..dee2dfce0d 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -31,6 +31,8 @@
   "show_preview_popup",
   "image_view",
   "email_settings_section",
+  "default_email_template",
+  "column_break_26",
   "email_append_to",
   "sender_field",
   "subject_field",
@@ -261,6 +263,15 @@
    "fieldtype": "Table",
    "label": "Actions",
    "options": "DocType Action"
+  },
+  {
+   "fieldname": "default_email_template",
+   "fieldtype": "Data",
+   "label": "Default Email Template"
+  },
+  {
+   "fieldname": "column_break_26",
+   "fieldtype": "Column Break"
   }
  ],
  "hide_toolbar": 1,
@@ -269,7 +280,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-09-24 14:16:49.594012",
+ "modified": "2021-01-27 18:26:59.705786",
  "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 82513783c7..0718f5d84c 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -479,6 +479,7 @@ doctype_properties = {
 	'allow_auto_repeat': 'Check',
 	'allow_import': 'Check',
 	'show_preview_popup': 'Check',
+	'default_email_template': 'Data',
 	'email_append_to': 'Check',
 	'subject_field': 'Data',
 	'sender_field': 'Data'

From b14b28d7650001af5d7812bda07c15cb74e883ff Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:59:00 +0100
Subject: [PATCH 003/106] fix: check if frm is available

Prevents error when creating new Communication from list view.
---
 frappe/public/js/frappe/views/communication.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 7b9668a96e..073ce44206 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -159,7 +159,10 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.setup_last_edited_communication();
 		this.setup_email_template();
 
-		this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
+		if ('frm' in this) {
+			this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
+		}
+
 		this.dialog.set_value("recipients", this.recipients || '');
 		this.dialog.set_value("cc", this.cc || '');
 		this.dialog.set_value("bcc", this.bcc || '');

From fa39484571d993ed5562149b6c85615e39cdc27b Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Wed, 27 Jan 2021 18:59:47 +0100
Subject: [PATCH 004/106] fix: check if email_template is set

Prevents error on empty email_template.
---
 frappe/public/js/frappe/views/communication.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 073ce44206..c5c6cdced9 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -232,6 +232,9 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		this.dialog.fields_dict["email_template"].df.onchange = () => {
 			var email_template = me.dialog.fields_dict.email_template.get_value();
+			if (email_template === '') {
+				return;
+			}
 
 			var prepend_reply = function(reply) {
 				if(me.reply_added===email_template) {

From 885d198622703ef50b0f6443f3a00ee76b0c2d58 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Thu, 4 Feb 2021 12:20:12 +0100
Subject: [PATCH 005/106] fix: don't apply default email template for reply

---
 frappe/public/js/frappe/views/communication.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index f1feb4f6a3..66e050f3d1 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -196,10 +196,6 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.setup_last_edited_communication();
 		this.setup_email_template();
 
-		if ('frm' in this) {
-			this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
-		}
-
 		this.dialog.set_value("recipients", this.recipients || '');
 		this.dialog.set_value("cc", this.cc || '');
 		this.dialog.set_value("bcc", this.bcc || '');
@@ -210,6 +206,11 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.dialog.fields_dict.subject.set_value(this.subject || '');
 
 		this.setup_earlier_reply();
+
+		if ('frm' in this && !this.is_a_reply) {
+			// set default email template for the first email in a document
+			this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
+		}
 	},
 
 	setup_subject_and_recipients: function() {

From cb211c6272669662d1012aa7331538ba856c1579 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 8 Feb 2021 12:51:47 +0100
Subject: [PATCH 006/106] fix: signature should be an empty string by default

(would become undefined if the server message was empty)
---
 frappe/public/js/frappe/views/communication.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 66e050f3d1..5329967e12 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -726,7 +726,7 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		if (!signature) {
 			const res = await this.get_default_outgoing_email_account_signature();
-			signature = res.message.signature;
+			signature = res.message.signature || "";
 		}
 
 		if(!frappe.utils.is_html(signature)) {

From 87326625fed3f0ce0b72977f2e988783e59741c8 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 22 Mar 2021 12:31:58 +0100
Subject: [PATCH 007/106] fix: make Default Email Template a link field

---
 frappe/core/doctype/doctype/doctype.json                 | 7 ++++---
 frappe/custom/doctype/customize_form/customize_form.json | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 7bf91892ee..fb24c095f3 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -533,8 +533,9 @@
   },
   {
    "fieldname": "default_email_template",
-   "fieldtype": "Data",
-   "label": "Default Email Template"
+   "fieldtype": "Link",
+   "label": "Default Email Template",
+   "options": "Email Template"
   },
   {
    "fieldname": "column_break_51",
@@ -620,7 +621,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2021-02-23 15:10:09.227205",
+ "modified": "2021-03-22 12:26:41.031135",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index dee2dfce0d..f8db73137e 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -266,8 +266,9 @@
   },
   {
    "fieldname": "default_email_template",
-   "fieldtype": "Data",
-   "label": "Default Email Template"
+   "fieldtype": "Link",
+   "label": "Default Email Template",
+   "options": "Email Template"
   },
   {
    "fieldname": "column_break_26",
@@ -280,7 +281,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-01-27 18:26:59.705786",
+ "modified": "2021-03-22 12:27:15.462727",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",

From 6df8479525c4e7af1cfd3b0428700c40cad0c9a9 Mon Sep 17 00:00:00 2001
From: Richard Case <richard@casesolved.co.uk>
Date: Thu, 11 Mar 2021 01:18:16 +0000
Subject: [PATCH 008/106] fix: build priority on computers with low memory
 fixes:frappe/bench#1135

---
 frappe/commands/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/commands/__init__.py b/frappe/commands/__init__.py
index b9ae02e112..61ee62d352 100644
--- a/frappe/commands/__init__.py
+++ b/frappe/commands/__init__.py
@@ -62,11 +62,24 @@ def popen(command, *args, **kwargs):
 	if env:
 		env = dict(environ, **env)
 
+	def set_low_prio():
+		import psutil
+		if psutil.LINUX:
+			psutil.Process().nice(19)
+			psutil.Process().ionice(psutil.IOPRIO_CLASS_IDLE)
+		elif psutil.WINDOWS:
+			psutil.Process().nice(psutil.IDLE_PRIORITY_CLASS)
+			psutil.Process().ionice(psutil.IOPRIO_VERYLOW)
+		else:
+			psutil.Process().nice(19)
+			# ionice not supported
+
 	proc = subprocess.Popen(command,
 		stdout=None if output else subprocess.PIPE,
 		stderr=None if output else subprocess.PIPE,
 		shell=shell,
 		cwd=cwd,
+		preexec_fn=set_low_prio,
 		env=env
 	)
 

From 5290b4c65f15642c5bc7c84d70fcfc4c14c3d883 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Sat, 27 Mar 2021 15:01:37 +0100
Subject: [PATCH 009/106] fix: add back column break that was lost in merge

---
 frappe/custom/doctype/customize_form/customize_form.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index fc74f0881b..442b8dbb31 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -272,6 +272,10 @@
    "label": "Default Email Template",
    "options": "Email Template"
   },
+  {
+   "fieldname": "column_break_26",
+   "fieldtype": "Column Break"
+  },
   {
    "collapsible": 1,
    "fieldname": "naming_section",
@@ -312,4 +316,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 08d8e67946d02d01bf4e385171e8f2df5c8cebed Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Tue, 6 Apr 2021 14:56:28 +0530
Subject: [PATCH 010/106] fix(backups): ensure delete_temp_backups always
 respects config

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

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 77c5761527..3c14cd9d5e 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -15,7 +15,7 @@ import click
 # imports - module imports
 import frappe
 from frappe import _, conf
-from frappe.utils import get_file_size, get_url, now, now_datetime
+from frappe.utils import get_file_size, get_url, now, now_datetime, cint
 
 # backup variable for backwards compatibility
 verbose = False
@@ -474,29 +474,6 @@ download only after 24 hours.""" % {
 		return recipient_list
 
 
-@frappe.whitelist()
-def get_backup():
-	"""
-	This function is executed when the user clicks on
-	Toos > Download Backup
-	"""
-	delete_temp_backups()
-	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,
-	)
-	odb.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(partial=False):
 	"""Fetches paths of the latest backup taken in the last 30 days
@@ -570,7 +547,7 @@ def new_backup(
 	force=False,
 	verbose=False,
 ):
-	delete_temp_backups(older_than=frappe.conf.keep_backups_for_hours or 24)
+	delete_temp_backups()
 	odb = BackupGenerator(
 		frappe.conf.db_name,
 		frappe.conf.db_name,
@@ -593,10 +570,11 @@ def new_backup(
 	return odb
 
 
-def delete_temp_backups(older_than=24):
+def delete_temp_backups():
 	"""
 	Cleans up the backup_link_path directory by deleting files older than 24 hours
 	"""
+	older_than = cint(frappe.conf.keep_backups_for_hours) or 24
 	backup_path = get_backup_path()
 	if os.path.exists(backup_path):
 		file_list = os.listdir(get_backup_path())

From c6497abcd143946c72d0b04fdc029b0edd853df3 Mon Sep 17 00:00:00 2001
From: walstanb <walstanb@gmail.com>
Date: Fri, 9 Apr 2021 13:06:58 +0530
Subject: [PATCH 011/106] fix: minor changes

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

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 3c14cd9d5e..9a6747a0cf 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -570,11 +570,11 @@ def new_backup(
 	return odb
 
 
-def delete_temp_backups():
+def delete_temp_backups(older_than=24):
 	"""
-	Cleans up the backup_link_path directory by deleting files older than 24 hours
+	Cleans up the backup_link_path directory by deleting older files
 	"""
-	older_than = cint(frappe.conf.keep_backups_for_hours) or 24
+	older_than = cint(frappe.conf.keep_backups_for_hours) or older_than
 	backup_path = get_backup_path()
 	if os.path.exists(backup_path):
 		file_list = os.listdir(get_backup_path())

From 6004125469cc78053e753546324a9d145e7f1161 Mon Sep 17 00:00:00 2001
From: "hasnain2808@gmail.com" <hasnain2808@gmail.com>
Date: Wed, 14 Apr 2021 13:52:43 +0530
Subject: [PATCH 012/106] feat: allow button of different sizes in df

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

diff --git a/frappe/public/js/frappe/form/controls/button.js b/frappe/public/js/frappe/form/controls/button.js
index b44c9d9dcd..d09e9c3a95 100644
--- a/frappe/public/js/frappe/form/controls/button.js
+++ b/frappe/public/js/frappe/form/controls/button.js
@@ -6,7 +6,10 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
 	make_input: function() {
 		var me = this;
 		const btn_type = this.df.primary ? 'btn-primary': 'btn-default';
-		this.$input = $(`<button class="btn btn-xs ${btn_type}">`)
+		const btn_size = this.df.btn_size
+			? `btn-${this.df.btn_size}`
+			: "btn-xs";
+		this.$input = $(`<button class="btn ${btn_size} ${btn_type}">`)
 			.prependTo(me.input_area)
 			.on("click", function() {
 				me.onclick();

From 86851028ea472029b74628a3202b766ad3fa3418 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@parsimony.com>
Date: Fri, 2 Apr 2021 15:33:12 +0530
Subject: [PATCH 013/106] feat: manage Python 3 compatiblity with dependencies

---
 .github/workflows/ci-tests.yml                |   6 +-
 frappe/commands/site.py                       |   6 +-
 .../scheduled_job_type/scheduled_job_type.py  |  11 +-
 frappe/database/mariadb/database.py           |  42 +++--
 frappe/email/receive.py                       |  33 ++--
 .../dropbox_settings/dropbox_settings.py      |  54 ++++---
 .../google_calendar/google_calendar.py        |  34 ++--
 .../google_contacts/google_contacts.py        |  23 +--
 .../doctype/google_drive/google_drive.py      |  37 +++--
 frappe/utils/xlsxutils.py                     |  21 +--
 .../website_settings/google_indexing.py       |  24 +--
 requirements.txt                              | 152 +++++++++---------
 12 files changed, 238 insertions(+), 205 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index bfe2002f69..08a2823dca 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -149,9 +149,9 @@ jobs:
         run: |
           cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
           cd ${GITHUB_WORKSPACE}
-          pip install coveralls==2.2.0
-          pip install coverage==4.5.4
-          coveralls
+          pip install coveralls==3.0.1
+          pip install coverage==5.5
+          coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 0fadf2a294..0102d3ac40 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -676,10 +676,8 @@ def start_ngrok(context):
 	frappe.init(site=site)
 
 	port = frappe.conf.http_port or frappe.conf.webserver_port
-	public_url = ngrok.connect(port=port, options={
-		'host_header': site
-	})
-	print(f'Public URL: {public_url}')
+	tunnel = ngrok.connect(addr=str(port), host_header=site)
+	print(f'Public URL: {tunnel.public_url}')
 	print('Inspect logs at http://localhost:4040')
 
 	ngrok_process = ngrok.get_ngrok_process()
diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
index 92493a593a..59089d12ad 100644
--- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
+++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py
@@ -2,14 +2,15 @@
 # Copyright (c) 2019, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
+import json
+from datetime import datetime
 from typing import Dict, List
 
-import frappe, json
-from frappe.model.document import Document
-from frappe.utils import now_datetime, get_datetime
-from datetime import datetime
 from croniter import croniter
+
+import frappe
+from frappe.model.document import Document
+from frappe.utils import get_datetime, now_datetime
 from frappe.utils.background_jobs import enqueue, get_jobs
 
 
diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py
index f9997d1526..7d1d92408c 100644
--- a/frappe/database/mariadb/database.py
+++ b/frappe/database/mariadb/database.py
@@ -1,17 +1,13 @@
-from __future__ import unicode_literals
-
-import frappe
 import warnings
 
 import pymysql
-from pymysql.times import TimeDelta
-from pymysql.constants 	import ER, FIELD_TYPE
-from pymysql.converters import conversions
+from pymysql.constants import ER, FIELD_TYPE
+from pymysql.converters import conversions, escape_string
 
-from frappe.utils import get_datetime, cstr, UnicodeWithAttrs
+import frappe
 from frappe.database.database import Database
-from six import PY2, binary_type, text_type, string_types
 from frappe.database.mariadb.schema import MariaDBTable
+from frappe.utils import UnicodeWithAttrs, cstr, get_datetime
 
 
 class MariaDBDatabase(Database):
@@ -72,22 +68,20 @@ class MariaDBDatabase(Database):
 		conversions.update({
 			FIELD_TYPE.NEWDECIMAL: float,
 			FIELD_TYPE.DATETIME: get_datetime,
-			UnicodeWithAttrs: conversions[text_type]
+			UnicodeWithAttrs: conversions[str]
 		})
 
-		if PY2:
-			conversions.update({
-				TimeDelta: conversions[binary_type]
-			})
-
-		if usessl:
-			conn = pymysql.connect(self.host, self.user or '', self.password or '',
-				port=self.port, charset='utf8mb4', use_unicode = True, ssl=ssl_params,
-				conv = conversions, local_infile = frappe.conf.local_infile)
-		else:
-			conn = pymysql.connect(self.host, self.user or '', self.password or '',
-				port=self.port, charset='utf8mb4', use_unicode = True, conv = conversions,
-				local_infile = frappe.conf.local_infile)
+		conn = pymysql.connect(
+			user=self.user or '',
+			password=self.password or '',
+			host=self.host,
+			port=self.port,
+			charset='utf8mb4',
+			use_unicode=True,
+			ssl=ssl_params if usessl else None,
+			conv=conversions,
+			local_infile=frappe.conf.local_infile
+		)
 
 		# MYSQL_OPTION_MULTI_STATEMENTS_OFF = 1
 		# # self._conn.set_server_option(MYSQL_OPTION_MULTI_STATEMENTS_OFF)
@@ -111,7 +105,7 @@ class MariaDBDatabase(Database):
 	def escape(s, percent=True):
 		"""Excape quotes and percent in given string."""
 		# pymysql expects unicode argument to escape_string with Python 3
-		s = frappe.as_unicode(pymysql.escape_string(frappe.as_unicode(s)), "utf-8").replace("`", "\\`")
+		s = frappe.as_unicode(escape_string(frappe.as_unicode(s)), "utf-8").replace("`", "\\`")
 
 		# NOTE separating % escape, because % escape should only be done when using LIKE operator
 		# or when you use python format string to generate query that already has a %s
@@ -260,7 +254,7 @@ class MariaDBDatabase(Database):
 				ADD INDEX `%s`(%s)""" % (table_name, index_name, ", ".join(fields)))
 
 	def add_unique(self, doctype, fields, constraint_name=None):
-		if isinstance(fields, string_types):
+		if isinstance(fields, str):
 			fields = [fields]
 		if not constraint_name:
 			constraint_name = "unique_" + "_".join(fields)
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index cf6c13ee76..949da4a343 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -1,18 +1,27 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
 
-from __future__ import unicode_literals
-import six
-from six import iteritems, text_type
-from six.moves import range
-import time, _socket, poplib, imaplib, email, email.utils, datetime, chardet, re
-from email_reply_parser import EmailReplyParser
+import datetime
+import email
+import email.utils
+import imaplib
+import poplib
+import re
+import time
 from email.header import decode_header
+
+import _socket
+import chardet
+import six
+from email_reply_parser import EmailReplyParser
+
 import frappe
 from frappe import _, safe_decode, safe_encode
-from frappe.utils import (extract_email_id, convert_utc_to_user_timezone, now,
-	cint, cstr, strip, markdown, parse_addr)
-from frappe.core.doctype.file.file import get_random_filename, MaxFileSizeReachedError
+from frappe.core.doctype.file.file import (MaxFileSizeReachedError,
+	get_random_filename)
+from frappe.utils import (cint, convert_utc_to_user_timezone, cstr,
+	extract_email_id, markdown, now, parse_addr, strip)
+
 
 class EmailSizeExceededError(frappe.ValidationError): pass
 class EmailTimeoutError(frappe.ValidationError): pass
@@ -337,7 +346,7 @@ class EmailServer:
 			return
 
 		self.imap.select("Inbox")
-		for uid, operation in iteritems(uid_list):
+		for uid, operation in uid_list.items():
 			if not uid: continue
 
 			op = "+FLAGS" if operation == "Read" else "-FLAGS"
@@ -473,7 +482,7 @@ class Email:
 			self.html_content += markdown(text_content)
 
 	def get_charset(self, part):
-		"""Detect chartset."""
+		"""Detect charset."""
 		charset = part.get_content_charset()
 		if not charset:
 			charset = chardet.detect(safe_encode(cstr(part)))['encoding']
@@ -484,7 +493,7 @@ class Email:
 		charset = self.get_charset(part)
 
 		try:
-			return text_type(part.get_payload(decode=True), str(charset), "ignore")
+			return str(part.get_payload(decode=True), str(charset), "ignore")
 		except LookupError:
 			return part.get_payload()
 
diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
index 09da1ecc42..53f0935c80 100644
--- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
+++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py
@@ -2,22 +2,23 @@
 # Copyright (c) 2015, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
-import dropbox
 import json
-import frappe
 import os
-from frappe import _
-from frappe.model.document import Document
-from frappe.integrations.offsite_backup_utils import get_latest_backup_file, send_email, validate_file_size, get_chunk_site
-from frappe.integrations.utils import make_post_request
-from frappe.utils import (cint, get_request_site_address,
-	get_files_path, get_backups_path, get_url, encode)
-from frappe.utils.backups import new_backup
-from frappe.utils.background_jobs import enqueue
-from six.moves.urllib.parse import urlparse, parse_qs
+from urllib.parse import parse_qs, urlparse
+
+import dropbox
 from rq.timeouts import JobTimeoutException
-from six import text_type
+
+import frappe
+from frappe import _
+from frappe.integrations.offsite_backup_utils import (get_chunk_site,
+	get_latest_backup_file, send_email, validate_file_size)
+from frappe.integrations.utils import make_post_request
+from frappe.model.document import Document
+from frappe.utils import (cint, encode, get_backups_path, get_files_path,
+	get_request_site_address, get_url)
+from frappe.utils.background_jobs import enqueue
+from frappe.utils.backups import new_backup
 
 ignore_list = [".DS_Store"]
 
@@ -91,7 +92,10 @@ 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'], timeout=None)
+	dropbox_client = dropbox.Dropbox(
+		oauth2_access_token=dropbox_settings['access_token'],
+		timeout=None
+	)
 
 	if upload_db_backup:
 		if frappe.flags.create_new_backup:
@@ -127,7 +131,7 @@ def upload_from_folder(path, is_private, dropbox_folder, dropbox_client, did_not
 	else:
 		response = frappe._dict({"entries": []})
 
-	path = text_type(path)
+	path = str(path)
 
 	for f in frappe.get_all("File", filters={"is_folder": 0, "is_private": is_private,
 		"uploaded_to_dropbox": 0}, fields=['file_url', 'name', 'file_name']):
@@ -286,11 +290,11 @@ def get_redirect_url():
 def get_dropbox_authorize_url():
 	app_details = get_dropbox_settings(redirect_uri=True)
 	dropbox_oauth_flow = dropbox.DropboxOAuth2Flow(
-		app_details["app_key"],
-		app_details["app_secret"],
-		app_details["redirect_uri"],
-		{},
-		"dropbox-auth-csrf-token"
+		consumer_key=app_details["app_key"],
+		redirect_uri=app_details["redirect_uri"],
+		session={},
+		csrf_token_session_key="dropbox-auth-csrf-token",
+		consumer_secret=app_details["app_secret"]
 	)
 
 	auth_url = dropbox_oauth_flow.start()
@@ -307,13 +311,13 @@ def dropbox_auth_finish(return_access_token=False):
 	close = '<p class="text-muted">' + _('Please close this window') + '</p>'
 
 	dropbox_oauth_flow = dropbox.DropboxOAuth2Flow(
-		app_details["app_key"],
-		app_details["app_secret"],
-		app_details["redirect_uri"],
-		{
+		consumer_key=app_details["app_key"],
+		redirect_uri=app_details["redirect_uri"],
+		session={
 			'dropbox-auth-csrf-token': callback.state
 		},
-		"dropbox-auth-csrf-token"
+		csrf_token_session_key="dropbox-auth-csrf-token",
+		consumer_secret=app_details["app_secret"]
 	)
 
 	if callback.state or callback.code:
diff --git a/frappe/integrations/doctype/google_calendar/google_calendar.py b/frappe/integrations/doctype/google_calendar/google_calendar.py
index fbedd75029..f93be35aa7 100644
--- a/frappe/integrations/doctype/google_calendar/google_calendar.py
+++ b/frappe/integrations/doctype/google_calendar/google_calendar.py
@@ -2,22 +2,23 @@
 # Copyright (c) 2019, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
-import frappe
-import requests
-import googleapiclient.discovery
-import google.oauth2.credentials
 
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import get_request_site_address
-from googleapiclient.errors import HttpError
-from frappe.utils.password import set_encrypted_password
-from frappe.utils import add_days, get_datetime, get_weekdays, now_datetime, add_to_date, get_time_zone
-from dateutil import parser
 from datetime import datetime, timedelta
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
+
+import google.oauth2.credentials
+import requests
+from dateutil import parser
+from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
+
+import frappe
+from frappe import _
 from frappe.integrations.doctype.google_settings.google_settings import get_auth_url
+from frappe.model.document import Document
+from frappe.utils import (add_days, add_to_date, get_datetime,
+	get_request_site_address, get_time_zone, get_weekdays, now_datetime)
+from frappe.utils.password import set_encrypted_password
 
 SCOPES = "https://www.googleapis.com/auth/calendar"
 
@@ -171,7 +172,12 @@ def get_google_calendar_object(g_calendar):
 	}
 
 	credentials = google.oauth2.credentials.Credentials(**credentials_dict)
-	google_calendar = googleapiclient.discovery.build("calendar", "v3", credentials=credentials)
+	google_calendar = build(
+		serviceName="calendar",
+		version="v3",
+		credentials=credentials,
+		static_discovery=False
+	)
 
 	check_google_calendar(account, google_calendar)
 
diff --git a/frappe/integrations/doctype/google_contacts/google_contacts.py b/frappe/integrations/doctype/google_contacts/google_contacts.py
index 4c8c3b67f6..1705f98e91 100644
--- a/frappe/integrations/doctype/google_contacts/google_contacts.py
+++ b/frappe/integrations/doctype/google_contacts/google_contacts.py
@@ -2,17 +2,17 @@
 # Copyright (c) 2019, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
-import frappe
-import requests
-import googleapiclient.discovery
-import google.oauth2.credentials
 
-from frappe.model.document import Document
-from frappe import _
+import google.oauth2.credentials
+import requests
+from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
-from frappe.utils import get_request_site_address
+
+import frappe
+from frappe import _
 from frappe.integrations.doctype.google_settings.google_settings import get_auth_url
+from frappe.model.document import Document
+from frappe.utils import get_request_site_address
 
 SCOPES = "https://www.googleapis.com/auth/contacts"
 
@@ -118,7 +118,12 @@ def get_google_contacts_object(g_contact):
 	}
 
 	credentials = google.oauth2.credentials.Credentials(**credentials_dict)
-	google_contacts = googleapiclient.discovery.build("people", "v1", credentials=credentials)
+	google_contacts = build(
+		serviceName="people",
+		version="v1",
+		credentials=credentials,
+		static_discovery=False
+	)
 
 	return google_contacts, account
 
diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py
index 859c769018..93b6fa3f8d 100644
--- a/frappe/integrations/doctype/google_drive/google_drive.py
+++ b/frappe/integrations/doctype/google_drive/google_drive.py
@@ -2,27 +2,29 @@
 # Copyright (c) 2019, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
-import frappe
-import requests
-import googleapiclient.discovery
-import google.oauth2.credentials
 import os
+from urllib.parse import quote
 
-from frappe import _
-from googleapiclient.errors import HttpError
-from frappe.model.document import Document
-from frappe.utils import get_request_site_address
-from frappe.utils.background_jobs import enqueue
-from six.moves.urllib.parse import quote
+import google.oauth2.credentials
+import requests
 from apiclient.http import MediaFileUpload
-from frappe.utils import get_backups_path, get_bench_path
-from frappe.utils.backups import new_backup
+from googleapiclient.discovery import build
+from googleapiclient.errors import HttpError
+
+import frappe
+from frappe import _
 from frappe.integrations.doctype.google_settings.google_settings import get_auth_url
-from frappe.integrations.offsite_backup_utils import get_latest_backup_file, send_email, validate_file_size
+from frappe.integrations.offsite_backup_utils import (get_latest_backup_file,
+	send_email, validate_file_size)
+from frappe.model.document import Document
+from frappe.utils import (get_backups_path, get_bench_path,
+	get_request_site_address)
+from frappe.utils.background_jobs import enqueue
+from frappe.utils.backups import new_backup
 
 SCOPES = "https://www.googleapis.com/auth/drive"
 
+
 class GoogleDrive(Document):
 
 	def validate(self):
@@ -126,7 +128,12 @@ def get_google_drive_object():
 	}
 
 	credentials = google.oauth2.credentials.Credentials(**credentials_dict)
-	google_drive = googleapiclient.discovery.build("drive", "v3", credentials=credentials)
+	google_drive = build(
+		serviceName="drive",
+		version="v3",
+		credentials=credentials,
+		static_discovery=False
+	)
 
 	return google_drive, account
 
diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py
index 3c7b027470..356e2ddfdb 100644
--- a/frappe/utils/xlsxutils.py
+++ b/frappe/utils/xlsxutils.py
@@ -1,18 +1,19 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
-from __future__ import unicode_literals
-
-import frappe
+import re
+from io import BytesIO
 
 import openpyxl
 import xlrd
-import re
-from openpyxl.styles import Font
 from openpyxl import load_workbook
+from openpyxl.styles import Font
 from openpyxl.utils import get_column_letter
-from six import BytesIO, string_types
+
+import frappe
 
 ILLEGAL_CHARACTERS_RE = re.compile(r'[\000-\010]|[\013-\014]|[\016-\037]')
+
+
 # return xlsx file object
 def make_xlsx(data, sheet_name, wb=None, column_widths=None):
 	column_widths = column_widths or []
@@ -31,12 +32,12 @@ def make_xlsx(data, sheet_name, wb=None, column_widths=None):
 	for row in data:
 		clean_row = []
 		for item in row:
-			if isinstance(item, string_types) and (sheet_name not in ['Data Import Template', 'Data Export']):
+			if isinstance(item, str) and (sheet_name not in ['Data Import Template', 'Data Export']):
 				value = handle_html(item)
 			else:
 				value = item
 
-			if isinstance(item, string_types) and next(ILLEGAL_CHARACTERS_RE.finditer(value), None):
+			if isinstance(item, str) and next(ILLEGAL_CHARACTERS_RE.finditer(value), None):
 				# Remove illegal characters from the string
 				value = re.sub(ILLEGAL_CHARACTERS_RE, '', value)
 
@@ -80,12 +81,12 @@ def handle_html(data):
 
 	return value
 
+
 def read_xlsx_file_from_attached_file(file_url=None, fcontent=None, filepath=None):
 	if file_url:
 		_file = frappe.get_doc("File", {"file_url": file_url})
 		filename = _file.get_full_path()
 	elif fcontent:
-		from io import BytesIO
 		filename = BytesIO(fcontent)
 	elif filepath:
 		filename = filepath
@@ -102,6 +103,7 @@ def read_xlsx_file_from_attached_file(file_url=None, fcontent=None, filepath=Non
 		rows.append(tmp_list)
 	return rows
 
+
 def read_xls_file_from_attached_file(content):
 	book = xlrd.open_workbook(file_contents=content)
 	sheets = book.sheets()
@@ -111,6 +113,7 @@ def read_xls_file_from_attached_file(content):
 		rows.append(sheet.row_values(i))
 	return rows
 
+
 def build_xlsx_response(data, filename):
 	xlsx_file = make_xlsx(data, filename)
 	# write out response as a xlsx type
diff --git a/frappe/website/doctype/website_settings/google_indexing.py b/frappe/website/doctype/website_settings/google_indexing.py
index 599de5a2b6..75095bd7df 100644
--- a/frappe/website/doctype/website_settings/google_indexing.py
+++ b/frappe/website/doctype/website_settings/google_indexing.py
@@ -2,17 +2,18 @@
 # Copyright (c) 2020, Frappe Technologies and contributors
 # For license information, please see license.txt
 
-from __future__ import unicode_literals
-import frappe
-import requests
-import googleapiclient.discovery
-import google.oauth2.credentials
 
-from frappe import _
+from urllib.parse import quote
+
+import google.oauth2.credentials
+import requests
+from googleapiclient.discovery import build
 from googleapiclient.errors import HttpError
-from frappe.utils import get_request_site_address
-from six.moves.urllib.parse import quote
+
+import frappe
+from frappe import _
 from frappe.integrations.doctype.google_settings.google_settings import get_auth_url
+from frappe.utils import get_request_site_address
 
 SCOPES = "https://www.googleapis.com/auth/indexing"
 
@@ -82,7 +83,12 @@ def get_google_indexing_object():
 	}
 
 	credentials = google.oauth2.credentials.Credentials(**credentials_dict)
-	google_indexing = googleapiclient.discovery.build("indexing", "v3", credentials=credentials)
+	google_indexing = build(
+		serviceName="indexing",
+		version="v3",
+		credentials=credentials,
+		static_discovery=False
+	)
 
 	return google_indexing
 
diff --git a/requirements.txt b/requirements.txt
index 0f88a48f73..8cbe0e800b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,79 +1,79 @@
-Babel==2.6.0
-beautifulsoup4==4.8.2
-bleach-whitelist==0.0.10
-bleach==3.3.0
-boto3==1.10.18
-braintree==3.57.1
-chardet==3.0.4
-Click==7.0
-coverage==4.5.4
-croniter==0.3.31
-cryptography==3.3.2
-dropbox==9.1.0
-email-reply-parser==0.5.9
-Faker==2.0.4
+Babel~=2.9.0
+beautifulsoup4~=4.9.3
+bleach-whitelist~=0.0.11
+bleach~=3.3.0
+boto3~=1.17.48
+braintree~=4.8.0
+chardet~=4.0.0
+Click~=7.1.2
+coverage~=5.5
+croniter~=1.0.11
+cryptography~=3.4.7
+dropbox~=11.6.0
+email-reply-parser~=0.5.12
+Faker~=8.1.0
 future==0.18.2
-gitdb2==2.0.6;python_version<'3.4'
-GitPython==2.1.15
-git-url-parse==1.2.2
-google-api-python-client==1.9.3
-google-auth-httplib2==0.0.3
-google-auth-oauthlib==0.4.1
-google-auth==1.18.0
-googlemaps==3.1.1
-gunicorn==19.10.0
-html2text==2016.9.19
-html5lib==1.0.1
-ipython==7.14.0
-jedi==0.17.2  # not directly required. Pinned to fix upstream issue with ipython.
-Jinja2==2.11.3
-ldap3==2.7
-markdown2==2.4.0
+git-url-parse~=1.2.2
+gitdb~=4.0.7
+GitPython~=3.1.14
+google-api-python-client~=2.2.0
+google-auth-httplib2~=0.1.0
+google-auth-oauthlib~=0.4.4
+google-auth~=1.28.1
+googlemaps~=4.4.5
+gunicorn~=20.1.0
+html2text==2020.1.16
+html5lib~=1.1
+ipython~=7.16.1
+jedi==0.17.2  # not directly required. Pinned to fix upstream IPython issue (https://github.com/ipython/ipython/issues/12740)
+Jinja2~=2.11.3
+ldap3~=2.9
+markdown2~=2.4.0
 maxminddb-geolite2==2018.703
-ndg-httpsclient==0.5.1
-num2words==0.5.10
-oauthlib==3.1.0
-openpyxl==2.6.4
-passlib==1.7.3
-pdfkit==0.6.1
-Pillow>=8.0.0
-premailer==3.6.1
-psutil==5.7.2
-psycopg2-binary==2.8.4
-pyasn1==0.4.8
-PyJWT==1.7.1
-PyMySQL==0.9.3
-pyngrok==4.1.6
-pyOpenSSL==19.1.0
-pyotp==2.3.0
-PyPDF2==1.26.0
-pypng==0.0.20
-PyQRCode==1.2.1
-python-dateutil==2.8.1
-pytz==2019.3
-PyYAML==5.4
-rauth==0.7.3
-redis==3.5.3
-requests-oauthlib==1.3.0
-requests==2.23.0
-RestrictedPython==5.0
-rq>=1.1.0
-schedule==0.6.0
-semantic-version==2.8.4
-simple-chalk==0.1.0
-six==1.14.0
-sqlparse==0.2.4
-stripe==2.40.0
-terminaltables==3.1.0
-unittest-xml-reporting==2.5.2
-urllib3==1.25.9
-watchdog==0.8.0
-Werkzeug==0.16.1
-Whoosh==2.7.4
-xlrd==1.2.0
-zxcvbn-python==4.4.24
-pycryptodome==3.9.8
-paytmchecksum==1.7.0
-wrapt==1.10.11
-razorpay==1.2.0
+ndg-httpsclient~=0.5.1
+num2words~=0.5.10
+oauthlib~=3.1.0
+openpyxl~=3.0.7
+passlib~=1.7.4
+paytmchecksum~=1.7.0
+pdfkit~=0.6.1
+Pillow~=8.2.0
+premailer~=3.7.0
+psutil~=5.8.0
+psycopg2-binary~=2.8.6
+pyasn1~=0.4.8
+pycryptodome~=3.10.1
+PyJWT~=1.7.1
+PyMySQL~=1.0.2
+pyngrok~=5.0.5
+pyOpenSSL~=20.0.1
+pyotp~=2.6.0
+PyPDF2~=1.26.0
+pypng~=0.0.20
+PyQRCode~=1.2.1
+python-dateutil~=2.8.1
+pytz==2021.1
+PyYAML~=5.4.1
+rauth~=0.7.3
+razorpay~=1.2.0
+redis~=3.5.3
+requests-oauthlib~=1.3.0
+requests~=2.25.1
+RestrictedPython~=5.1
+rq~=1.8.0
 rsa>=4.1 # not directly required, pinned by Snyk to avoid a vulnerability
+schedule~=1.1.0
+semantic-version~=2.8.5
+simple-chalk~=0.1.0
+six~=1.15.0
+sqlparse~=0.4.1
+stripe~=2.56.0
+terminaltables~=3.1.0
+unittest-xml-reporting~=3.0.4
+urllib3~=1.26.4
+watchdog~=2.0.2
+Werkzeug~=0.16.1
+Whoosh~=2.7.4
+wrapt~=1.12.1
+xlrd~=2.0.1
+zxcvbn-python~=4.4.24

From 56f82cc89dae2503a95f2d90f1adc053ec287887 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:20:59 +0530
Subject: [PATCH 014/106] fix: Load server translations in boot (backport
 #12848) (#12852)

(cherry picked from commit a373c00abd1db85a4a8304fecc299890c74e163e)

Co-authored-by: thebachy1 <manuelcu2299@hotmail.com>
---
 frappe/translate.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frappe/translate.py b/frappe/translate.py
index cdcaa31920..62ee733f5f 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -109,6 +109,13 @@ def get_dict(fortype, name=None):
 		elif fortype=="jsfile":
 			messages = get_messages_from_file(name)
 		elif fortype=="boot":
+			messages = []
+			apps = frappe.get_all_apps(True)
+			for app in apps:
+				messages.extend(get_server_messages(app))
+			messages = deduplicate_messages(messages)
+
+			messages += frappe.db.sql("""select "navbar", item_label from `tabNavbar Item` where item_label is not null""")
 			messages = get_messages_from_include_files()
 			messages += frappe.db.sql("select 'Print Format:', name from `tabPrint Format`")
 			messages += frappe.db.sql("select 'DocType:', name from tabDocType")

From 4265b31ba4ca7ac6197baa88cbf58dc3d710ccc5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 15 Apr 2021 16:33:07 +0530
Subject: [PATCH 015/106] fix: Multi-column paste in grid (#12861)

(cherry picked from commit ccadda21d501867f8a2be1a6457eca3912dcc949)
---
 frappe/public/js/frappe/form/controls/table.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/table.js b/frappe/public/js/frappe/form/controls/table.js
index 075608aa8c..c40f471939 100644
--- a/frappe/public/js/frappe/form/controls/table.js
+++ b/frappe/public/js/frappe/form/controls/table.js
@@ -45,9 +45,12 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
 			} else {
 				// no column header, map to the existing visible columns
 				const visible_columns = grid_rows[0].get_visible_columns();
+				let target_column_matched = false;
 				visible_columns.forEach(column => {
-					if (column.fieldname === $(e.target).data('fieldname')) {
+					// consider all columns after the target column.
+					if (target_column_matched || column.fieldname === $(e.target).data('fieldname')) {
 						fieldnames.push(column.fieldname);
+						target_column_matched = true;
 					}
 				});
 			}

From b103dbd0675e30eed44ce58057d95f6904ebf14a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 07:57:38 +0530
Subject: [PATCH 016/106] fix: attachment pill lock icon redirects to File
 (backport #12864) (#12868)

(cherry picked from commit d216acaaaec3e872fc78bf1e4ef5c6d5f9bb9ce1)

Co-authored-by: walstanb <walstanb@gmail.com>
---
 .../public/js/frappe/form/sidebar/attachments.js | 16 +++-------------
 .../js/frappe/form/templates/attachment.html     | 10 ----------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 frappe/public/js/frappe/form/templates/attachment.html

diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js
index 9e1ea30c6e..ffd0b513a2 100644
--- a/frappe/public/js/frappe/form/sidebar/attachments.js
+++ b/frappe/public/js/frappe/form/sidebar/attachments.js
@@ -1,8 +1,6 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
-
-
 frappe.ui.form.Attachments = Class.extend({
 	init: function(opts) {
 		$.extend(this, opts);
@@ -84,17 +82,9 @@ frappe.ui.form.Attachments = Class.extend({
 			};
 		}
 
-		let icon;
-		// REDESIGN-TODO: set icon using frappe.utils.icon
-		if (attachment.is_private) {
-			icon = `<div><svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path fill-rule="evenodd" clip-rule="evenodd" d="M8.07685 1.45015H8.02155C7.13255 1.44199 6.2766 1.78689 5.64159 2.40919C5.00596 3.0321 4.64377 3.88196 4.63464 4.77188L4.63462 4.77188V4.77701V5.12157H3.75C2.64543 5.12157 1.75 6.017 1.75 7.12157V12.5132C1.75 13.6177 2.64543 14.5132 3.75 14.5132H12.2885C13.393 14.5132 14.2885 13.6177 14.2885 12.5132V7.12157C14.2885 6.017 13.393 5.12157 12.2885 5.12157H11.4037V4.83708C11.4119 3.94809 11.067 3.09213 10.4447 2.45713C9.82175 1.8215 8.97189 1.4593 8.08198 1.45018L8.08198 1.45015H8.07685ZM10.4037 5.12157V4.8347V4.82972L10.4037 4.82972C10.4099 4.20495 10.1678 3.60329 9.73045 3.15705C9.29371 2.7114 8.69805 2.4572 8.07417 2.45015H8.01916H8.01418L8.01419 2.45013C7.38942 2.44391 6.78776 2.68609 6.34152 3.12341C5.89586 3.56015 5.64166 4.15581 5.63462 4.77969V5.12157H10.4037ZM3.75 6.12157C3.19772 6.12157 2.75 6.56929 2.75 7.12157V12.5132C2.75 13.0655 3.19772 13.5132 3.75 13.5132H12.2885C12.8407 13.5132 13.2885 13.0655 13.2885 12.5132V7.12157C13.2885 6.56929 12.8407 6.12157 12.2885 6.12157H3.75ZM8.01936 10.3908C8.33605 10.3908 8.59279 10.134 8.59279 9.81734C8.59279 9.50064 8.33605 9.24391 8.01936 9.24391C7.70266 9.24391 7.44593 9.50064 7.44593 9.81734C7.44593 10.134 7.70266 10.3908 8.01936 10.3908ZM9.59279 9.81734C9.59279 10.6863 8.88834 11.3908 8.01936 11.3908C7.15038 11.3908 6.44593 10.6863 6.44593 9.81734C6.44593 8.94836 7.15038 8.24391 8.01936 8.24391C8.88834 8.24391 9.59279 8.94836 9.59279 9.81734Z" fill="currentColor"/>
-			</svg></div>`;
-		} else {
-			icon = `<div><svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-				<path fill-rule="evenodd" clip-rule="evenodd" d="M8.07685 1.45014H8.02155C7.13255 1.44198 6.2766 1.78687 5.64159 2.40918C5.00596 3.03209 4.64377 3.88195 4.63464 4.77187L4.63462 4.77187V4.777V5.12156H3.75C2.64543 5.12156 1.75 6.01699 1.75 7.12156V12.5132C1.75 13.6177 2.64543 14.5132 3.75 14.5132H12.2885C13.393 14.5132 14.2885 13.6177 14.2885 12.5132V7.12156C14.2885 6.01699 13.393 5.12156 12.2885 5.12156H5.63462V4.77968C5.64166 4.1558 5.89586 3.56014 6.34152 3.12339C6.78776 2.68608 7.38942 2.4439 8.01419 2.45012L8.01418 2.45014H8.01916H8.07417C8.69805 2.45718 9.29371 2.71138 9.73045 3.15704C9.92373 3.35427 10.2403 3.35746 10.4375 3.16418C10.6347 2.9709 10.6379 2.65434 10.4447 2.45711C9.82175 1.82149 8.97189 1.45929 8.08198 1.45017L8.08198 1.45014H8.07685ZM3.75 6.12156C3.19772 6.12156 2.75 6.56927 2.75 7.12156V12.5132C2.75 13.0655 3.19772 13.5132 3.75 13.5132H12.2885C12.8407 13.5132 13.2885 13.0655 13.2885 12.5132V7.12156C13.2885 6.56927 12.8407 6.12156 12.2885 6.12156H3.75ZM8.01936 10.3908C8.33605 10.3908 8.59279 10.134 8.59279 9.81732C8.59279 9.50063 8.33605 9.2439 8.01936 9.2439C7.70266 9.2439 7.44593 9.50063 7.44593 9.81732C7.44593 10.134 7.70266 10.3908 8.01936 10.3908ZM9.59279 9.81732C9.59279 10.6863 8.88834 11.3908 8.01936 11.3908C7.15038 11.3908 6.44593 10.6863 6.44593 9.81732C6.44593 8.94835 7.15038 8.2439 8.01936 8.2439C8.88834 8.2439 9.59279 8.94835 9.59279 9.81732Z" fill="currentColor"/>
-			</svg></div>`;
-		}
+		const icon = `<a href="/app/file/${fileid}">
+				${frappe.utils.icon(attachment.is_private ? 'lock' : 'unlock', 'sm ml-0')}
+			</a>`;
 
 		$(`<li class="attachment-row">`)
 			.append(frappe.get_data_pill(
diff --git a/frappe/public/js/frappe/form/templates/attachment.html b/frappe/public/js/frappe/form/templates/attachment.html
deleted file mode 100644
index c1fe3f3c85..0000000000
--- a/frappe/public/js/frappe/form/templates/attachment.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<li class="attachment-row flex align-center">
-	<a class="close">&times;</a>
-	<a href="{{ file_path }}">
-		<i class="{{ icon }} fa-fw text-warning"></i>
-	</a>
-	<a href="{{ file_url }}" target="_blank" title="{{ file_name }}" class="ellipsis" style="max-width: calc(100% - 43px);">
-		<span>{{ file_name }}</span>
-	</a>
-</li>
-

From 289b9b6dad7d1b5611aaf4a2bc7e255ed3544a77 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 08:06:01 +0530
Subject: [PATCH 017/106] fix(Workspace): Newly created Workspace not being
 accessible (backport #12866) (#12869)

(cherry picked from commit de7087722871b18c2fa56d680638b9b5a6e981a0)

Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.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 5b6e2fdd21..d1b5e27a2f 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -63,7 +63,7 @@ class Workspace:
 		for section in cards:
 			links = loads(section.get('links')) if isinstance(section.get('links'), string_types) else section.get('links')
 			for item in links:
-				if self.is_item_allowed(item.get('name'), item.get('type')):
+				if self.is_item_allowed(item.get('link_to'), item.get('link_type')):
 					return True
 
 		def _in_active_domains(item):

From 73662a50feab196e71e7f4903a3b94f19a3ae1c1 Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Fri, 16 Apr 2021 16:21:19 +0530
Subject: [PATCH 018/106] fix: kanban board sync issue

Recent refactoring introduced an issue of not syncing board data(comes from
reference doctype) into kanban board columns db. Changed to sync it at time
of creating kanban board.
---
 frappe/public/js/frappe/views/kanban/kanban_board.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index f563f64cb4..bbc2051e4c 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -306,6 +306,7 @@ frappe.provide("frappe.views");
 			store.on('change:cur_list', setup_restore_columns);
 			store.on('change:columns', setup_restore_columns);
 			store.on('change:empty_state', show_empty_state);
+			fluxify.doAction('update_order');
 		}
 
 		function prepare() {

From d12c47681e05e7ce6db7097d82a1963ece82563e Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 01:34:11 +0530
Subject: [PATCH 019/106] refactor: frappe.views.CommunicationComposer

---
 .../js/frappe/form/controls/multiselect.js    |   2 +-
 .../public/js/frappe/views/communication.js   | 521 +++++++++---------
 2 files changed, 258 insertions(+), 265 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/multiselect.js b/frappe/public/js/frappe/form/controls/multiselect.js
index 64ca4fc83d..bbd7aef822 100644
--- a/frappe/public/js/frappe/form/controls/multiselect.js
+++ b/frappe/public/js/frappe/form/controls/multiselect.js
@@ -68,7 +68,7 @@ frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
 		let data;
 		if(this.df.get_data) {
 			data = this.df.get_data();
-			this.set_data(data);
+			if (data) this.set_data(data);
 		} else {
 			data = this._super();
 		}
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 0c294d5869..7cf7b32797 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -2,16 +2,15 @@
 // MIT License. See license.txt
 
 frappe.last_edited_communication = {};
-frappe.standard_replies = {};
-frappe.separator_element = '<div>---</div>';
+const separator_element = '<div>---</div>';
 
 frappe.views.CommunicationComposer = Class.extend({
-	init: function(opts) {
+	init(opts) {
 		$.extend(this, opts);
 		this.make();
 	},
-	make: function() {
-		var me = this;
+	make() {
+		const me = this;
 
 		this.dialog = new frappe.ui.Dialog({
 			title: (this.title || this.subject || __("New Email")),
@@ -19,56 +18,35 @@ frappe.views.CommunicationComposer = Class.extend({
 			fields: this.get_fields(),
 			primary_action_label: __("Send"),
 			size: 'large',
-			primary_action: function() {
-				me.delete_saved_draft();
+			primary_action() {
 				me.send_action();
+				me.clear_cache();
+			},
+			secondary_action_label: __("Discard"),
+			secondary_action() {
+				me.dialog.hide();
+				me.clear_cache();
 			},
 			minimizable: true
 		});
 
 		this.dialog.sections[0].wrapper.addClass('to_section');
 
-		['recipients', 'cc', 'bcc'].forEach(field => {
-			this.dialog.fields_dict[field].get_data = function() {
-				const data = me.dialog.fields_dict[field].get_value();
-				const txt = data.match(/[^,\s*]*$/)[0] || '';
-				let options = [];
-
-				frappe.call({
-					method: "frappe.email.get_contact_list",
-					args: {
-						txt: txt,
-					},
-					callback: (r) => {
-						options = r.message;
-						me.dialog.fields_dict[field].set_data(options);
-					}
-				});
-				return options;
-			}
-		});
-
 		this.prepare();
 		this.dialog.show();
 
 		if (this.frm) {
 			$(document).trigger('form-typing', [this.frm]);
 		}
-
-		if (this.cc || this.bcc) {
-			this.toggle_more_options(true);
-		}
 	},
 
-	get_fields: function() {
-		let contactList = [];
-		let fields = [
+	get_fields() {
+		const fields = [
 			{
 				label: __("To"),
 				fieldtype: "MultiSelect",
 				reqd: 0,
 				fieldname: "recipients",
-				options: contactList
 			},
 			{
 				fieldtype: "Button",
@@ -87,13 +65,11 @@ frappe.views.CommunicationComposer = Class.extend({
 				label: __("CC"),
 				fieldtype: "MultiSelect",
 				fieldname: "cc",
-				options: contactList
 			},
 			{
 				label: __("BCC"),
 				fieldtype: "MultiSelect",
 				fieldname: "bcc",
-				options: contactList
 			},
 			{
 				label: __("Email Template"),
@@ -163,18 +139,16 @@ frappe.views.CommunicationComposer = Class.extend({
 			);
 		});
 
-		if (frappe.boot.email_accounts && email_accounts.length > 1) {
-			fields = [
-				{
-					label: __("From"),
-					fieldtype: "Select",
-					reqd: 1,
-					fieldname: "sender",
-					options: email_accounts.map(function(e) {
-						return e.email_id;
-					})
-				}
-			].concat(fields);
+		if (email_accounts.length > 1) {
+			fields.unshift({
+				label: __("From"),
+				fieldtype: "Select",
+				reqd: 1,
+				fieldname: "sender",
+				options: email_accounts.map(function(e) {
+					return e.email_id;
+				})
+			});
 		}
 
 		return fields;
@@ -183,56 +157,58 @@ frappe.views.CommunicationComposer = Class.extend({
 	toggle_more_options(show_options) {
 		show_options = show_options || this.dialog.fields_dict.more_options.df.hidden;
 		this.dialog.set_df_property('more_options', 'hidden', !show_options);
-		let label = frappe.utils.icon(show_options ? 'up-line': 'down');
+
+		const label = frappe.utils.icon(show_options ? 'up-line': 'down');
 		this.dialog.get_field('option_toggle_button').set_label(label);
 	},
 
-	prepare: function() {
+	prepare() {
+		this.setup_multiselect_queries();
 		this.setup_subject_and_recipients();
 		this.setup_print_language();
 		this.setup_print();
 		this.setup_attach();
 		this.setup_email();
-		this.setup_last_edited_communication();
 		this.setup_email_template();
-
-		this.dialog.set_value("recipients", this.recipients || '');
-		this.dialog.set_value("cc", this.cc || '');
-		this.dialog.set_value("bcc", this.bcc || '');
-
-		if(this.dialog.fields_dict.sender) {
-			this.dialog.fields_dict.sender.set_value(this.sender || '');
-		}
-		this.dialog.fields_dict.subject.set_value(
-			frappe.utils.html2text(this.subject) || ''
-		);
-
-		this.setup_earlier_reply();
-
-		if ('frm' in this && !this.is_a_reply) {
-			// set default email template for the first email in a document
-			this.dialog.set_value("email_template", this.frm.meta.default_email_template || '');
-		}
+		this.setup_last_edited_communication();
+		this.set_values();
 	},
 
-	setup_subject_and_recipients: function() {
+	setup_multiselect_queries() {
+		['recipients', 'cc', 'bcc'].forEach(field => {
+			this.dialog.fields_dict[field].get_data = () => {
+				const data = this.dialog.fields_dict[field].get_value();
+				const txt = data.match(/[^,\s*]*$/)[0] || '';
+
+				frappe.call({
+					method: "frappe.email.get_contact_list",
+					args: {txt},
+					callback: (r) => {
+						this.dialog.fields_dict[field].set_data(r.message);
+					}
+				});
+			}
+		});
+	},
+
+	setup_subject_and_recipients() {
 		this.subject = this.subject || "";
 
-		if(!this.forward && !this.recipients && this.last_email) {
+		if (!this.forward && !this.recipients && this.last_email) {
 			this.recipients = this.last_email.sender;
 			this.cc = this.last_email.cc;
 			this.bcc = this.last_email.bcc;
 		}
 
-		if(!this.forward && !this.recipients) {
+		if (!this.forward && !this.recipients) {
 			this.recipients = this.frm && this.frm.timeline.get_recipient();
 		}
 
-		if(!this.subject && this.frm) {
+		if (!this.subject && this.frm) {
 			// get subject from last communication
-			var last = this.frm.timeline.get_last_email();
+			const last = this.frm.timeline.get_last_email();
 
-			if(last) {
+			if (last) {
 				this.subject = last.subject;
 				if(!this.recipients) {
 					this.recipients = last.sender;
@@ -256,7 +232,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			// always add an identifier to catch a reply
 			// some email clients (outlook) may not send the message id to identify
 			// the thread. So as a backup we use the name of the document as identifier
-			let identifier = `#${this.frm.doc.name}`;
+			const identifier = `#${this.frm.doc.name}`;
 			if (!this.subject.includes(identifier)) {
 				this.subject = `${this.subject} (${identifier})`;
 			}
@@ -267,34 +243,23 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 	},
 
-	setup_email_template: function() {
-		var me = this;
+	setup_email_template() {
+		const me = this;
 
 		this.dialog.fields_dict["email_template"].df.onchange = () => {
-			var email_template = me.dialog.fields_dict.email_template.get_value();
-			if (email_template === '') {
-				return;
-			}
+			const email_template = me.dialog.fields_dict.email_template.get_value();
+			if (!email_template) return;
 
-			var prepend_reply = function(reply) {
-				if(me.reply_added===email_template) {
-					return;
-				}
-				var content_field = me.dialog.fields_dict.content;
-				var subject_field = me.dialog.fields_dict.subject;
-				var content = content_field.get_value() || "";
-				var subject = subject_field.get_value() || "";
+			function prepend_reply(reply) {
+				if (me.reply_added === email_template) return;
 
-				var parts = content.split('<!-- salutation-ends -->');
+				const content_field = me.dialog.fields_dict.content;
+				const subject_field = me.dialog.fields_dict.subject;
 
-				if(parts.length===2) {
-					content = [reply.message, "<br>", parts[1]];
-				} else {
-					content = [reply.message, "<br>", content];
-				}
-
-				content_field.set_value(content.join(''));
+				let content = content_field.get_value() || "";
+				content = content.split('<!-- salutation-ends -->')[1] || content;
 
+				content_field.set_value(`${reply.message}<br>${content}`);
 				subject_field.set_value(reply.subject);
 
 				me.reply_added = email_template;
@@ -307,83 +272,105 @@ frappe.views.CommunicationComposer = Class.extend({
 					doc: me.frm.doc,
 					_lang: me.dialog.get_value("language_sel")
 				},
-				callback: function(r) {
+				callback(r) {
 					prepend_reply(r.message);
 				},
 			});
 		}
 	},
 
-	setup_last_edited_communication: function() {
-		var me = this;
-		if (!this.doc){
-			if (cur_frm){
-				this.doc = cur_frm.doctype;
-			}else{
-				this.doc = "Inbox";
-			}
-		}
-		if (cur_frm && cur_frm.docname) {
-			this.key = cur_frm.docname;
+	setup_last_edited_communication() {
+		if (this.frm) {
+			this.doctype = this.frm.doctype;
+			this.key = this.frm.docname;
 		} else {
-			this.key = "Inbox";
+			this.doctype = this.key = "Inbox";
 		}
-		if(this.last_email) {
+
+		if (this.last_email) {
 			this.key = this.key + ":" + this.last_email.name;
 		}
-		if(this.subject){
+
+		if (this.subject) {
 			this.key = this.key + ":" + this.subject;
 		}
-		this.dialog.onhide = function() {
-			var last_edited_communication = me.get_last_edited_communication();
-			$.extend(last_edited_communication, {
-				sender: me.dialog.get_value("sender"),
-				recipients: me.dialog.get_value("recipients"),
-				cc: me.dialog.get_value("cc"),
-				bcc: me.dialog.get_value("bcc"),
-				subject: me.dialog.get_value("subject"),
-				content: me.dialog.get_value("content"),
-			});
 
-			if (me.frm) {
-				$(document).trigger("form-stopped-typing", [me.frm]);
+		this.dialog.on_hide = () => {
+			$.extend(
+				this.get_last_edited_communication(true),
+				this.dialog.get_values(true)
+			);
+
+			if (this.frm) {
+				$(document).trigger("form-stopped-typing", [this.frm]);
 			}
 		}
+	},
 
-		this.dialog.on_page_show = function() {
-			if (!me.txt) {
-				var last_edited_communication = me.get_last_edited_communication();
-				if(last_edited_communication.content) {
-					me.dialog.set_value("sender", last_edited_communication.sender || "");
-					me.dialog.set_value("subject", last_edited_communication.subject || "");
-					me.dialog.set_value("recipients", last_edited_communication.recipients || "");
-					me.dialog.set_value("cc", last_edited_communication.cc || "");
-					me.dialog.set_value("bcc", last_edited_communication.bcc || "");
-					me.dialog.set_value("content", last_edited_communication.content || "");
-				}
+	get_last_edited_communication(clear) {
+		if (!frappe.last_edited_communication[this.doctype]) {
+			frappe.last_edited_communication[this.doctype] = {};
+		}
+
+		if (clear || !frappe.last_edited_communication[this.doctype][this.key]) {
+			frappe.last_edited_communication[this.doctype][this.key] = {};
+			console.log('cleared!');
+		}
+
+		return frappe.last_edited_communication[this.doctype][this.key];
+	},
+
+	set_values: async function () {
+		for (const fieldname of ["recipients", "cc", "bcc", "sender"]) {
+			await this.dialog.set_value(fieldname, this[fieldname] || "");
+		}
+
+		const subject = frappe.utils.html2text(this.subject) || '';
+		await this.dialog.set_value("subject", subject);
+
+		await this.set_values_from_last_edited_communication();
+		await this.set_content();
+
+		// set default email template for the first email in a document
+		if (this.frm && !this.is_a_reply && !this.content_set) {
+			const email_template = this.frm.meta.default_email_template || '';
+			await this.dialog.set_value("email_template", email_template);
+		}
+
+		for (const fieldname of ['email_template', 'cc', 'bcc']) {
+			if (this.dialog.get_value(fieldname)) {
+				this.toggle_more_options(true);
+				break;
 			}
-
 		}
-
 	},
 
-	get_last_edited_communication: function() {
-		if (!frappe.last_edited_communication[this.doc]) {
-			frappe.last_edited_communication[this.doc] = {};
+	set_values_from_last_edited_communication: async function () {
+		if (this.txt) return;
+
+		const last_edited = this.get_last_edited_communication();
+		if (!last_edited.content) return;
+
+		// prevent re-triggering of email template
+		if (last_edited.email_template) {
+			const template_field = this.dialog.fields_dict.email_template;
+			await template_field.set_model_value(last_edited.email_template);
+			delete last_edited.email_template;
 		}
 
-		if(!frappe.last_edited_communication[this.doc][this.key]) {
-			frappe.last_edited_communication[this.doc][this.key] = {};
-		}
-
-		return frappe.last_edited_communication[this.doc][this.key];
+		await this.dialog.set_values(last_edited);
+		this.content_set = true;
 	},
 
-	selected_format: function() {
-		return this.dialog.fields_dict.select_print_format.input.value || (this.frm && this.frm.meta.default_print_format) || "Standard";
+	selected_format() {
+		return (
+			this.dialog.fields_dict.select_print_format.input.value
+			|| this.frm && this.frm.meta.default_print_format
+			|| "Standard"
+		);
 	},
 
-	get_print_format: function(format) {
+	get_print_format(format) {
 		if (!format) {
 			format = this.selected_format();
 		}
@@ -395,9 +382,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 	},
 
-	setup_print_language: function() {
-		var doc = this.doc || cur_frm.doc;
-		var fields = this.dialog.fields_dict;
+	setup_print_language() {
+		const doc = this.frm && this.frm.doc;
+		const fields = this.dialog.fields_dict;
 
 		//Load default print language from doctype
 		this.lang_code = doc.language
@@ -407,7 +394,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		//On selection of language retrieve language code
-		var me = this;
+		const me = this;
 		$(fields.language_sel.input).change(function(){
 			me.lang_code = this.value
 		})
@@ -422,9 +409,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 	},
 
-	setup_print: function() {
+	setup_print() {
 		// print formats
-		var fields = this.dialog.fields_dict;
+		const fields = this.dialog.fields_dict;
 
 		// toggle print format
 		$(fields.attach_document_print.input).click(function() {
@@ -434,8 +421,8 @@ frappe.views.CommunicationComposer = Class.extend({
 		// select print format
 		$(fields.select_print_format.wrapper).toggle(false);
 
-		if (cur_frm) {
-			const print_formats = frappe.meta.get_print_formats(cur_frm.meta.name);
+		if (this.frm) {
+			const print_formats = frappe.meta.get_print_formats(this.frm.meta.name);
 			$(fields.select_print_format.input)
 				.empty()
 				.add_options(print_formats)
@@ -446,9 +433,9 @@ frappe.views.CommunicationComposer = Class.extend({
 
 	},
 
-	setup_attach: function() {
-		var fields = this.dialog.fields_dict;
-		var attach = $(fields.select_attachments.wrapper);
+	setup_attach() {
+		const fields = this.dialog.fields_dict;
+		const attach = $(fields.select_attachments.wrapper);
 
 		if (!this.attachments) {
 			this.attachments = [];
@@ -493,7 +480,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.render_attachment_rows();
 	},
 
-	render_attachment_rows: function(attachment) {
+	render_attachment_rows(attachment) {
 		const select_attachments = this.dialog.fields_dict.select_attachments;
 		const attachment_rows = $(select_attachments.wrapper).find(".attach-list");
 		if (attachment) {
@@ -536,9 +523,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		</p>`);
 	},
 
-	setup_email: function() {
+	setup_email() {
 		// email
-		var fields = this.dialog.fields_dict;
+		const fields = this.dialog.fields_dict;
 
 		if(this.attach_document_print) {
 			$(fields.attach_document_print.input).click();
@@ -547,21 +534,20 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		$(fields.send_me_a_copy.input).on('click', () => {
 			// update send me a copy (make it sticky)
-			let val = fields.send_me_a_copy.get_value();
+			const val = fields.send_me_a_copy.get_value();
 			frappe.db.set_value('User', frappe.session.user, 'send_me_a_copy', val);
 			frappe.boot.user.send_me_a_copy = val;
 		});
 
 	},
 
-	send_action: function() {
-		var me = this;
-		var btn = me.dialog.get_primary_btn();
-
-		var form_values = this.get_values();
+	send_action() {
+		const me = this;
+		const btn = me.dialog.get_primary_btn();
+		const form_values = this.get_values();
 		if(!form_values) return;
 
-		var selected_attachments =
+		const selected_attachments =
 			$.map($(me.dialog.wrapper).find("[data-file-name]:checked"), function (element) {
 				return $(element).attr("data-file-name");
 			});
@@ -574,16 +560,16 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 	},
 
-	get_values: function() {
-		var form_values = this.dialog.get_values();
+	get_values() {
+		const form_values = this.dialog.get_values();
 
 		// cc
-		for ( var i=0, l=this.dialog.fields.length; i < l; i++ ) {
-			var df = this.dialog.fields[i];
+		for (let i = 0, l = this.dialog.fields.length; i < l; i++) {
+			const df = this.dialog.fields[i];
 
-			if ( df.is_cc_checkbox ) {
+			if (df.is_cc_checkbox) {
 				// concat in cc
-				if ( form_values[df.fieldname] ) {
+				if (form_values[df.fieldname]) {
 					form_values.cc = ( form_values.cc ? (form_values.cc + ", ") : "" ) + df.fieldname;
 					form_values.bcc = ( form_values.bcc ? (form_values.bcc + ", ") : "" ) + df.fieldname;
 				}
@@ -595,35 +581,40 @@ frappe.views.CommunicationComposer = Class.extend({
 		return form_values;
 	},
 
-	save_as_draft: function() {
+	save_as_draft() {
 		if (this.dialog && this.frm) {
 			let message = this.dialog.get_value('content');
-			message = message.split(frappe.separator_element)[0];
+			message = message.split(separator_element)[0];
 			localforage.setItem(this.frm.doctype + this.frm.docname, message).catch(e => {
 				if (e) {
 					// silently fail
 					console.log(e); // eslint-disable-line
-					console.warn('[Communication] localStorage is full. Cannot save message as draft'); // eslint-disable-line
+					console.warn('[Communication] IndexedDB is full. Cannot save message as draft'); // eslint-disable-line
 				}
 			});
 
 		}
 	},
 
+	clear_cache() {
+		this.delete_saved_draft();
+		this.get_last_edited_communication(true);
+	},
+
 	delete_saved_draft() {
 		if (this.dialog && this.frm) {
 			localforage.removeItem(this.frm.doctype + this.frm.docname).catch(e => {
 				if (e) {
 					// silently fail
 					console.log(e); // eslint-disable-line
-					console.warn('[Communication] localStorage is full. Cannot save message as draft'); // eslint-disable-line
+					console.warn('[Communication] IndexedDB is full. Cannot save message as draft'); // eslint-disable-line
 				}
 			});
 		}
 	},
 
-	send_email: function(btn, form_values, selected_attachments, print_html, print_format) {
-		var me = this;
+	send_email(btn, form_values, selected_attachments, print_html, print_format) {
+		const me = this;
 		me.dialog.hide();
 
 		if(!form_values.recipients) {
@@ -637,7 +628,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 
-		if(cur_frm && !frappe.model.can_email(me.doc.doctype, cur_frm)) {
+		if(this.frm && !frappe.model.can_email(me.doc.doctype, this.frm)) {
 			frappe.msgprint(__("You are not allowed to send emails related to this document"));
 			return;
 		}
@@ -658,15 +649,17 @@ frappe.views.CommunicationComposer = Class.extend({
 				send_me_a_copy: form_values.send_me_a_copy,
 				print_format: print_format,
 				sender: form_values.sender,
-				sender_full_name: form_values.sender?frappe.user.full_name():undefined,
+				sender_full_name: form_values.sender
+					? frappe.user.full_name()
+					: undefined,
 				email_template: form_values.email_template,
 				attachments: selected_attachments,
 				_lang : me.lang_code,
 				read_receipt:form_values.send_read_receipt,
 				print_letterhead: me.is_print_letterhead_checked(),
 			},
-			btn: btn,
-			callback: function(r) {
+			btn,
+			callback(r) {
 				if(!r.exc) {
 					frappe.utils.play_sound("email");
 
@@ -678,8 +671,8 @@ frappe.views.CommunicationComposer = Class.extend({
 					if ((frappe.last_edited_communication[me.doc] || {})[me.key]) {
 						delete frappe.last_edited_communication[me.doc][me.key];
 					}
-					if (cur_frm) {
-						cur_frm.reload_doc();
+					if (this.frm) {
+						this.frm.reload_doc();
 					}
 
 					// try the success callback if it exists
@@ -707,7 +700,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		});
 	},
 
-	is_print_letterhead_checked: function() {
+	is_print_letterhead_checked() {
 		if (this.frm && $(this.frm.wrapper).find('.form-print-wrapper').is(':visible')){
 			return $(this.frm.wrapper).find('.print-letterhead').prop('checked') ? 1 : 0;
 		} else {
@@ -716,96 +709,96 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 	},
 
-	get_default_outgoing_email_account_signature: function() {
-		return frappe.db.get_value('Email Account', { 'default_outgoing': 1, 'add_signature': 1 }, 'signature');
-	},
+	set_content: async function() {
+		if (this.content_set) return;
 
-	setup_earlier_reply: async function() {
-		let fields = this.dialog.fields_dict;
-		let signature = frappe.boot.user.email_signature || "";
-
-		if (!signature) {
-			const res = await this.get_default_outgoing_email_account_signature();
-			signature = "<!-- signature-included -->" + res.message.signature;
+		let message = this.txt || "";
+		if (!message && this.frm) {
+			const { doctype, docname } = this.frm;
+			message = await localforage.getItem(doctype + docname) || "";
 		}
 
-		if (signature && !frappe.utils.is_html(signature)) {
-			signature = signature.replace(/\n/g, "<br>");
+		if (message) {
+			this.content_set = true;
 		}
 
-		if(this.txt) {
-			this.message = this.txt + (this.message ? ("<br><br>" + this.message) : "");
-		} else {
-			// saved draft in localStorage
-			const { doctype, docname } = this.frm || {};
-			if (doctype && docname) {
-				this.message = await localforage.getItem(doctype + docname) || '';
-			}
-		}
-
-		if(this.real_name) {
-			this.message = '<p>'+__('Dear') +' '
-				+ this.real_name + ",</p><!-- salutation-ends --><br>" + (this.message || "");
-		}
-
-		if(this.message && signature && this.message.includes(signature)) {
-			signature = "";
-		}
-
-		let reply = (this.message || "") + (signature ? ("<br>" + signature) : "");
-		let content = '';
-
-		if (this.is_a_reply === 'undefined') {
-			this.is_a_reply = true;
+		message += await this.get_signature();
+		if (this.real_name && !message.includes("<!-- salutation-ends -->")) {
+			message = `<p>${__('Dear')} ${this.real_name},</p>
+				<!-- salutation-ends --><br>${message}`;
 		}
 
 		if (this.is_a_reply) {
-			let last_email = this.last_email;
-
-			if (!last_email) {
-				last_email = this.frm && this.frm.timeline.get_last_email(true);
-			}
-
-			if (!last_email) return;
-
-			let last_email_content = last_email.original_comment || last_email.content;
-
-			// convert the email context to text as we are enclosing
-			// this inside <blockquote>
-			last_email_content = this.html2text(last_email_content).replace(/\n/g, '<br>');
-
-			// clip last email for a maximum of 20k characters
-			// to prevent the email content from getting too large
-			if (last_email_content.length > 20 * 1024) {
-				last_email_content += '<div>' + __('Message clipped') + '</div>' + last_email_content;
-				last_email_content = last_email_content.slice(0, 20 * 1024);
-			}
-
-			let communication_date = last_email.communication_date || last_email.creation;
-			content = `
-				${reply}
-				<div><br></div>
-				${frappe.separator_element || ''}
-				<p>${__("On {0}, {1} wrote:", [frappe.datetime.global_date_format(communication_date) , last_email.sender])}</p>
-				<blockquote>
-				${last_email_content}
-				</blockquote>
-			`;
-		} else {
-			content = reply;
+			message += this.get_earlier_reply();
 		}
-		fields.content.set_value(content);
+
+		await this.dialog.set_value("content", message);
 	},
 
-	html2text: function(html) {
+	get_signature: async function () {
+		let signature = frappe.boot.user.email_signature;
+
+		if (!signature) {
+			const response = await frappe.db.get_value(
+				'Email Account',
+				{'default_outgoing': 1, 'add_signature': 1},
+				'signature'
+			);
+
+			signature = response.message.signature;
+		}
+
+		if (!signature) return "";
+
+		if (!frappe.utils.is_html(signature)) {
+			signature = signature.replace(/\n/g, "<br>");
+		}
+
+		return "<br>" + signature;
+	},
+
+	get_earlier_reply() {
+		const last_email = (
+			this.last_email
+			|| this.frm && this.frm.timeline.get_last_email(true)
+		);
+
+		if (!last_email) return "";
+		let last_email_content = last_email.original_comment || last_email.content;
+
+		// convert the email context to text as we are enclosing
+		// this inside <blockquote>
+		last_email_content = this.html2text(last_email_content).replace(/\n/g, '<br>');
+
+		// clip last email for a maximum of 20k characters
+		// to prevent the email content from getting too large
+		if (last_email_content.length > 20 * 1024) {
+			last_email_content += '<div>' + __('Message clipped') + '</div>' + last_email_content;
+			last_email_content = last_email_content.slice(0, 20 * 1024);
+		}
+
+		const communication_date = last_email.communication_date || last_email.creation;
+		return `
+			<div><br></div>
+			${separator_element || ''}
+			<p>${__("On {0}, {1} wrote:", [
+				frappe.datetime.global_date_format(communication_date),
+				last_email.sender
+			])}</p>
+			<blockquote>
+			${last_email_content}
+			</blockquote>
+		`;
+	},
+
+	html2text(html) {
 		// convert HTML to text and try and preserve whitespace
-		var d = document.createElement( 'div' );
+		const d = document.createElement( 'div' );
 		d.innerHTML = html.replace(/<\/div>/g, '<br></div>')  // replace end of blocks
 			.replace(/<\/p>/g, '<br></p>') // replace end of paragraphs
 			.replace(/<br>/g, '\n');
-		let text = d.textContent;
 
 		// replace multiple empty lines with just one
-		return text.replace(/\n{3,}/g, '\n\n');
+		return d.textContent.replace(/\n{3,}/g, '\n\n');
 	}
 });

From e4527284d735e7b472bbbf0fad1ed7d299d5335a Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 02:12:12 +0530
Subject: [PATCH 020/106] fix: sider issues

---
 .../public/js/frappe/views/communication.js   | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 7cf7b32797..c3e6dfe00a 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -187,7 +187,7 @@ frappe.views.CommunicationComposer = Class.extend({
 						this.dialog.fields_dict[field].set_data(r.message);
 					}
 				});
-			}
+			};
 		});
 	},
 
@@ -210,12 +210,12 @@ frappe.views.CommunicationComposer = Class.extend({
 
 			if (last) {
 				this.subject = last.subject;
-				if(!this.recipients) {
+				if (!this.recipients) {
 					this.recipients = last.sender;
 				}
 
 				// prepend "Re:"
-				if(strip(this.subject.toLowerCase().split(":")[0])!="re") {
+				if (strip(this.subject.toLowerCase().split(":")[0])!="re") {
 					this.subject = __("Re: {0}", [this.subject]);
 				}
 			}
@@ -304,7 +304,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			if (this.frm) {
 				$(document).trigger("form-stopped-typing", [this.frm]);
 			}
-		}
+		};
 	},
 
 	get_last_edited_communication(clear) {
@@ -314,7 +314,6 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		if (clear || !frappe.last_edited_communication[this.doctype][this.key]) {
 			frappe.last_edited_communication[this.doctype][this.key] = {};
-			console.log('cleared!');
 		}
 
 		return frappe.last_edited_communication[this.doctype][this.key];
@@ -527,7 +526,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		// email
 		const fields = this.dialog.fields_dict;
 
-		if(this.attach_document_print) {
+		if (this.attach_document_print) {
 			$(fields.attach_document_print.input).click();
 			$(fields.select_print_format.wrapper).toggle(true);
 		}
@@ -545,7 +544,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		const me = this;
 		const btn = me.dialog.get_primary_btn();
 		const form_values = this.get_values();
-		if(!form_values) return;
+		if (!form_values) return;
 
 		const selected_attachments =
 			$.map($(me.dialog.wrapper).find("[data-file-name]:checked"), function (element) {
@@ -553,7 +552,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			});
 
 
-		if(form_values.attach_document_print) {
+		if (form_values.attach_document_print) {
 			me.send_email(btn, form_values, selected_attachments, null, form_values.select_print_format || "");
 		} else {
 			me.send_email(btn, form_values, selected_attachments);
@@ -617,18 +616,18 @@ frappe.views.CommunicationComposer = Class.extend({
 		const me = this;
 		me.dialog.hide();
 
-		if(!form_values.recipients) {
+		if (!form_values.recipients) {
 			frappe.msgprint(__("Enter Email Recipient(s)"));
 			return;
 		}
 
-		if(!form_values.attach_document_print) {
+		if (!form_values.attach_document_print) {
 			print_html = null;
 			print_format = null;
 		}
 
 
-		if(this.frm && !frappe.model.can_email(me.doc.doctype, this.frm)) {
+		if (this.frm && !frappe.model.can_email(me.doc.doctype, this.frm)) {
 			frappe.msgprint(__("You are not allowed to send emails related to this document"));
 			return;
 		}
@@ -660,10 +659,10 @@ frappe.views.CommunicationComposer = Class.extend({
 			},
 			btn,
 			callback(r) {
-				if(!r.exc) {
+				if (!r.exc) {
 					frappe.utils.play_sound("email");
 
-					if(r.message["emails_not_sent_to"]) {
+					if (r.message["emails_not_sent_to"]) {
 						frappe.msgprint(__("Email not sent to {0} (unsubscribed / disabled)",
 							[ frappe.utils.escape_html(r.message["emails_not_sent_to"]) ]) );
 					}
@@ -680,7 +679,7 @@ frappe.views.CommunicationComposer = Class.extend({
 						try {
 							me.success(r);
 						} catch (e) {
-							console.log(e);
+							console.log(e); // eslint-disable-line
 						}
 					}
 
@@ -692,7 +691,7 @@ frappe.views.CommunicationComposer = Class.extend({
 						try {
 							me.error(r);
 						} catch (e) {
-							console.log(e);
+							console.log(e); // eslint-disable-line
 						}
 					}
 				}
@@ -777,14 +776,16 @@ frappe.views.CommunicationComposer = Class.extend({
 			last_email_content = last_email_content.slice(0, 20 * 1024);
 		}
 
-		const communication_date = last_email.communication_date || last_email.creation;
+		const communication_date = frappe.datetime.global_date_format(
+			last_email.communication_date || last_email.creation
+		);
+
 		return `
 			<div><br></div>
 			${separator_element || ''}
-			<p>${__("On {0}, {1} wrote:", [
-				frappe.datetime.global_date_format(communication_date),
-				last_email.sender
-			])}</p>
+			<p>
+			${__("On {0}, {1} wrote:", [communication_date, last_email.sender])}
+			</p>
 			<blockquote>
 			${last_email_content}
 			</blockquote>

From 4a28b2f20285fe4d481a28f50b0473c20147e095 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 02:36:52 +0530
Subject: [PATCH 021/106] fix: set lang to frappe.boot.lang by default

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

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index c3e6dfe00a..34201a7900 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -387,10 +387,8 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		//Load default print language from doctype
 		this.lang_code = doc.language
-
-		if (!this.lang_code && this.get_print_format().default_print_language) {
-			this.lang_code = this.get_print_format().default_print_language;
-		}
+			|| this.get_print_format().default_print_language
+			|| frappe.boot.lang;
 
 		//On selection of language retrieve language code
 		const me = this;

From 354e89f4c60e241bbc16b64d0fd6c8dd995f1130 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 03:24:01 +0530
Subject: [PATCH 022/106] fix: clear_cache only on success; use me instead of
 this

---
 frappe/public/js/frappe/views/communication.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 34201a7900..ef05ef5857 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -17,16 +17,15 @@ frappe.views.CommunicationComposer = Class.extend({
 			no_submit_on_enter: true,
 			fields: this.get_fields(),
 			primary_action_label: __("Send"),
-			size: 'large',
 			primary_action() {
 				me.send_action();
-				me.clear_cache();
 			},
 			secondary_action_label: __("Discard"),
 			secondary_action() {
 				me.dialog.hide();
 				me.clear_cache();
 			},
+			size: 'large',
 			minimizable: true
 		});
 
@@ -665,11 +664,10 @@ frappe.views.CommunicationComposer = Class.extend({
 							[ frappe.utils.escape_html(r.message["emails_not_sent_to"]) ]) );
 					}
 
-					if ((frappe.last_edited_communication[me.doc] || {})[me.key]) {
-						delete frappe.last_edited_communication[me.doc][me.key];
-					}
-					if (this.frm) {
-						this.frm.reload_doc();
+					me.clear_cache();
+
+					if (me.frm) {
+						me.frm.reload_doc();
 					}
 
 					// try the success callback if it exists

From 47d13a40c754949fc2110ab667dfaad6716c3f3d Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 12:21:19 +0530
Subject: [PATCH 023/106] style: use ES6 class

---
 .../public/js/frappe/views/communication.js   | 75 ++++++++++---------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index ef05ef5857..77cc91b4ba 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -4,11 +4,12 @@
 frappe.last_edited_communication = {};
 const separator_element = '<div>---</div>';
 
-frappe.views.CommunicationComposer = Class.extend({
-	init(opts) {
+frappe.views.CommunicationComposer = class {
+	constructor(opts) {
 		$.extend(this, opts);
 		this.make();
-	},
+	}
+
 	make() {
 		const me = this;
 
@@ -37,7 +38,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		if (this.frm) {
 			$(document).trigger('form-typing', [this.frm]);
 		}
-	},
+	}
 
 	get_fields() {
 		const fields = [
@@ -151,7 +152,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		return fields;
-	},
+	}
 
 	toggle_more_options(show_options) {
 		show_options = show_options || this.dialog.fields_dict.more_options.df.hidden;
@@ -159,7 +160,7 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		const label = frappe.utils.icon(show_options ? 'up-line': 'down');
 		this.dialog.get_field('option_toggle_button').set_label(label);
-	},
+	}
 
 	prepare() {
 		this.setup_multiselect_queries();
@@ -171,7 +172,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.setup_email_template();
 		this.setup_last_edited_communication();
 		this.set_values();
-	},
+	}
 
 	setup_multiselect_queries() {
 		['recipients', 'cc', 'bcc'].forEach(field => {
@@ -188,7 +189,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				});
 			};
 		});
-	},
+	}
 
 	setup_subject_and_recipients() {
 		this.subject = this.subject || "";
@@ -240,7 +241,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		if (this.frm && !this.recipients) {
 			this.recipients = this.frm.doc[this.frm.email_field];
 		}
-	},
+	}
 
 	setup_email_template() {
 		const me = this;
@@ -276,7 +277,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				},
 			});
 		}
-	},
+	}
 
 	setup_last_edited_communication() {
 		if (this.frm) {
@@ -304,7 +305,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				$(document).trigger("form-stopped-typing", [this.frm]);
 			}
 		};
-	},
+	}
 
 	get_last_edited_communication(clear) {
 		if (!frappe.last_edited_communication[this.doctype]) {
@@ -316,9 +317,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		return frappe.last_edited_communication[this.doctype][this.key];
-	},
+	}
 
-	set_values: async function () {
+	async set_values() {
 		for (const fieldname of ["recipients", "cc", "bcc", "sender"]) {
 			await this.dialog.set_value(fieldname, this[fieldname] || "");
 		}
@@ -341,9 +342,9 @@ frappe.views.CommunicationComposer = Class.extend({
 				break;
 			}
 		}
-	},
+	}
 
-	set_values_from_last_edited_communication: async function () {
+	async set_values_from_last_edited_communication() {
 		if (this.txt) return;
 
 		const last_edited = this.get_last_edited_communication();
@@ -358,7 +359,7 @@ frappe.views.CommunicationComposer = Class.extend({
 
 		await this.dialog.set_values(last_edited);
 		this.content_set = true;
-	},
+	}
 
 	selected_format() {
 		return (
@@ -366,7 +367,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			|| this.frm && this.frm.meta.default_print_format
 			|| "Standard"
 		);
-	},
+	}
 
 	get_print_format(format) {
 		if (!format) {
@@ -378,7 +379,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		} else {
 			return {};
 		}
-	},
+	}
 
 	setup_print_language() {
 		const doc = this.frm && this.frm.doc;
@@ -403,7 +404,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		if (this.lang_code) {
 			$(fields.language_sel.input).val(this.lang_code);
 		}
-	},
+	}
 
 	setup_print() {
 		// print formats
@@ -427,7 +428,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			$(fields.attach_document_print.wrapper).toggle(false);
 		}
 
-	},
+	}
 
 	setup_attach() {
 		const fields = this.dialog.fields_dict;
@@ -474,7 +475,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			.find(".add-more-attachments button")
 			.on('click', () => new frappe.ui.FileUploader(args));
 		this.render_attachment_rows();
-	},
+	}
 
 	render_attachment_rows(attachment) {
 		const select_attachments = this.dialog.fields_dict.select_attachments;
@@ -500,7 +501,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				});
 			}
 		}
-	},
+	}
 
 	get_attachment_row(attachment, checked) {
 		return $(`<p class="checkbox flex">
@@ -517,7 +518,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				${frappe.utils.icon('link-url')}
 			</a>
 		</p>`);
-	},
+	}
 
 	setup_email() {
 		// email
@@ -535,7 +536,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			frappe.boot.user.send_me_a_copy = val;
 		});
 
-	},
+	}
 
 	send_action() {
 		const me = this;
@@ -554,7 +555,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		} else {
 			me.send_email(btn, form_values, selected_attachments);
 		}
-	},
+	}
 
 	get_values() {
 		const form_values = this.dialog.get_values();
@@ -575,7 +576,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		return form_values;
-	},
+	}
 
 	save_as_draft() {
 		if (this.dialog && this.frm) {
@@ -590,12 +591,12 @@ frappe.views.CommunicationComposer = Class.extend({
 			});
 
 		}
-	},
+	}
 
 	clear_cache() {
 		this.delete_saved_draft();
 		this.get_last_edited_communication(true);
-	},
+	}
 
 	delete_saved_draft() {
 		if (this.dialog && this.frm) {
@@ -607,7 +608,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				}
 			});
 		}
-	},
+	}
 
 	send_email(btn, form_values, selected_attachments, print_html, print_format) {
 		const me = this;
@@ -693,7 +694,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				}
 			}
 		});
-	},
+	}
 
 	is_print_letterhead_checked() {
 		if (this.frm && $(this.frm.wrapper).find('.form-print-wrapper').is(':visible')){
@@ -702,9 +703,9 @@ frappe.views.CommunicationComposer = Class.extend({
 			return (frappe.model.get_doc(":Print Settings", "Print Settings") ||
 				{ with_letterhead: 1 }).with_letterhead ? 1 : 0;
 		}
-	},
+	}
 
-	set_content: async function() {
+	async set_content() {
 		if (this.content_set) return;
 
 		let message = this.txt || "";
@@ -728,9 +729,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		await this.dialog.set_value("content", message);
-	},
+	}
 
-	get_signature: async function () {
+	async get_signature() {
 		let signature = frappe.boot.user.email_signature;
 
 		if (!signature) {
@@ -750,7 +751,7 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 
 		return "<br>" + signature;
-	},
+	}
 
 	get_earlier_reply() {
 		const last_email = (
@@ -786,7 +787,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			${last_email_content}
 			</blockquote>
 		`;
-	},
+	}
 
 	html2text(html) {
 		// convert HTML to text and try and preserve whitespace
@@ -798,4 +799,4 @@ frappe.views.CommunicationComposer = Class.extend({
 		// replace multiple empty lines with just one
 		return d.textContent.replace(/\n{3,}/g, '\n\n');
 	}
-});
+};

From c02fbb27b641153be54dd5025e7b183e19ac181a Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 12:24:00 +0530
Subject: [PATCH 024/106] fix: sider issue

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

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 77cc91b4ba..0479ec6d31 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -276,7 +276,7 @@ frappe.views.CommunicationComposer = class {
 					prepend_reply(r.message);
 				},
 			});
-		}
+		};
 	}
 
 	setup_last_edited_communication() {

From 1fd08d39606d71b9fc2a3be368e3558d65cf8b36 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 17 Apr 2021 07:31:24 +0530
Subject: [PATCH 025/106] refactor: Jinja hooks

- Rename hook from "jenv" to "jinja"
- You can now pass the path to the module and all of the methods in that
module will be added as methods
- You can also pass module path of a method

BREAKING CHANGE: Previous use of "jenv" hook won't work anymore
---
 frappe/hooks.py               |   4 ++
 frappe/utils/jinja.py         | 111 +++++++++-------------------------
 frappe/utils/jinja_globals.py |  71 ++++++++++++++++++++++
 3 files changed, 102 insertions(+), 84 deletions(-)
 create mode 100644 frappe/utils/jinja_globals.py

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 74c538c5df..c47afadf58 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -130,6 +130,10 @@ has_website_permission = {
 	"Address": "frappe.contacts.doctype.address.address.has_website_permission"
 }
 
+jinja = {
+	"methods": "frappe.utils.jinja_globals"
+}
+
 standard_queries = {
 	"User": "frappe.core.doctype.user.user.user_query"
 }
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index cd74b2a283..1b2ef9f47f 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -18,13 +18,10 @@ def get_jenv():
 		set_filters(jenv)
 
 		jenv.globals.update(get_safe_globals())
-		jenv.globals.update(get_jenv_customization('methods'))
-		jenv.globals.update({
-			'resolve_class': resolve_class,
-			'inspect': inspect,
-			'web_blocks': web_blocks,
-			'web_block': web_block
-		})
+
+		methods, filters = get_jinja_hooks('methods')
+		jenv.globals.update(methods or {})
+		jenv.filters.update(filters or {})
 
 		frappe.local.jenv = jenv
 
@@ -143,88 +140,34 @@ def set_filters(jenv):
 	if frappe.flags.in_setup_help:
 		return
 
-	jenv.filters.update(get_jenv_customization('filters'))
-
-
-def get_jenv_customization(customization_type):
-	'''Returns a dict with filter/method name as key and definition as value'''
 
+def get_jinja_hooks():
+	"""Returns a tuple of (methods, filters) each containing a dict of method name and method definition pair."""
 	import frappe
 
-	out = {}
 	if not getattr(frappe.local, "site", None):
+		return (None, None)
+
+	from types import FunctionType, ModuleType
+	from inspect import getmembers, isfunction
+
+	def get_obj_dict_from_paths(object_paths):
+		out = {}
+		for obj_path in object_paths:
+			obj = frappe.get_attr(obj_path)
+			if isinstance(obj, ModuleType):
+				functions = getmembers(obj, isfunction)
+				for function_name, function in functions:
+					out[function_name] = function
+			elif isinstance(obj, FunctionType):
+				function_name = obj.__name__
+				out[function_name] = obj
 		return out
 
-	values = frappe.get_hooks("jenv", {}).get(customization_type)
-	if not values:
-		return out
+	values = frappe.get_hooks("jinja")
+	methods, filters = values.get("methods", []), values.get("filters", [])
 
-	for value in values:
-		fn_name, fn_string = value.split(":")
-		out[fn_name] = frappe.get_attr(fn_string)
+	method_dict = get_obj_dict_from_paths(methods)
+	filter_dict = get_obj_dict_from_paths(filters)
 
-	return out
-
-
-def resolve_class(classes):
-	import frappe
-
-	if classes is None:
-		return ''
-
-	if isinstance(classes, frappe.string_types):
-		return classes
-
-	if isinstance(classes, (list, tuple)):
-		return ' '.join([resolve_class(c) for c in classes]).strip()
-
-	if isinstance(classes, dict):
-		return ' '.join([classname for classname in classes if classes[classname]]).strip()
-
-	return classes
-
-
-def inspect(var, render=True):
-	context = { "var": var }
-	if render:
-		html = "<pre>{{ var | pprint | e }}</pre>"
-	else:
-		html = ""
-	return get_jenv().from_string(html).render(context)
-
-
-def web_block(template, values=None, **kwargs):
-	options = {"template": template, "values": values}
-	options.update(kwargs)
-	return web_blocks([options])
-
-
-def web_blocks(blocks):
-	from frappe import throw, _dict
-	from frappe.website.doctype.web_page.web_page import get_web_blocks_html
-
-	web_blocks = []
-	for block in blocks:
-		if not block.get('template'):
-			throw('Web Template is not specified')
-
-		doc = _dict({
-			'doctype': 'Web Page Block',
-			'web_template': block['template'],
-			'web_template_values': block.get('values', {}),
-			'add_top_padding': 1,
-			'add_bottom_padding': 1,
-			'add_container': 1,
-			'hide_block': 0,
-			'css_class': ''
-		})
-		doc.update(block)
-		web_blocks.append(doc)
-
-	out = get_web_blocks_html(web_blocks)
-
-	html = out.html
-	for script in out.scripts:
-		html += '<script>{}</script>'.format(script)
-
-	return html
+	return method_dict, filter_dict
diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py
new file mode 100644
index 0000000000..e63926a109
--- /dev/null
+++ b/frappe/utils/jinja_globals.py
@@ -0,0 +1,71 @@
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+from frappe.utils.jinja import get_jenv
+import frappe
+
+
+def resolve_class(classes):
+	if classes is None:
+		return ""
+
+	if isinstance(classes, frappe.string_types):
+		return classes
+
+	if isinstance(classes, (list, tuple)):
+		return " ".join([resolve_class(c) for c in classes]).strip()
+
+	if isinstance(classes, dict):
+		return " ".join([classname for classname in classes if classes[classname]]).strip()
+
+	return classes
+
+
+def inspect(var, render=True):
+	context = {"var": var}
+	if render:
+		html = "<pre>{{ var | pprint | e }}</pre>"
+	else:
+		return ""
+	return get_jenv().from_string(html).render(context)
+
+
+def web_block(template, values=None, **kwargs):
+	options = {"template": template, "values": values}
+	options.update(kwargs)
+	return web_blocks([options])
+
+
+def web_blocks(blocks):
+	from frappe import throw, _dict
+	from frappe.website.doctype.web_page.web_page import get_web_blocks_html
+
+	web_blocks = []
+	for block in blocks:
+		if not block.get("template"):
+			throw("Web Template is not specified")
+
+		doc = _dict(
+			{
+				"doctype": "Web Page Block",
+				"web_template": block["template"],
+				"web_template_values": block.get("values", {}),
+				"add_top_padding": 1,
+				"add_bottom_padding": 1,
+				"add_container": 1,
+				"hide_block": 0,
+				"css_class": "",
+			}
+		)
+		doc.update(block)
+		web_blocks.append(doc)
+
+	out = get_web_blocks_html(web_blocks)
+
+	html = out.html
+	for script in out.scripts:
+		html += "<script>{}</script>".format(script)
+
+	return html
+

From a62ef80cddedec855e592fbe77a4ab7cdede8bad Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 17 Apr 2021 07:41:04 +0530
Subject: [PATCH 026/106] fix: Add jinja hook boilerplate

---
 frappe/utils/boilerplate.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index e59f579f75..80eda0af13 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -190,6 +190,15 @@ app_license = "{app_license}"
 # automatically create page for each record of this doctype
 # website_generators = ["Web Page"]
 
+# Jinja
+# ----------
+
+# add methods and filters to jinja environment
+# jinja = {{
+# 	"methods": "{app_name}.utils.jinja_methods",
+# 	"filters": "{app_name}.utils.jinja_filters"
+# }}
+
 # Installation
 # ------------
 

From a78fed4ffccbe3faa628eb7d6a25affc9887023e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 17 Apr 2021 07:52:04 +0530
Subject: [PATCH 027/106] fix: Move standard filters to jinja hooks

---
 frappe/hooks.py       | 8 +++++++-
 frappe/utils/jinja.py | 7 +------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/hooks.py b/frappe/hooks.py
index c47afadf58..1c78d47755 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -131,7 +131,13 @@ has_website_permission = {
 }
 
 jinja = {
-	"methods": "frappe.utils.jinja_globals"
+	"methods": "frappe.utils.jinja_globals",
+	"filters": [
+		"frappe.utils.data.global_date_format",
+		"frappe.utils.markdown",
+		"frappe.website.utils.get_shade",
+		"frappe.website.utils.abs_url",
+	]
 }
 
 standard_queries = {
diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 1b2ef9f47f..6d25f4a405 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -124,18 +124,13 @@ def get_jloader():
 
 def set_filters(jenv):
 	import frappe
-	from frappe.utils import global_date_format, cint, cstr, flt, markdown
-	from frappe.website.utils import get_shade, abs_url
+	from frappe.utils import cint, cstr, flt
 
-	jenv.filters["global_date_format"] = global_date_format
-	jenv.filters["markdown"] = markdown
 	jenv.filters["json"] = frappe.as_json
-	jenv.filters["get_shade"] = get_shade
 	jenv.filters["len"] = len
 	jenv.filters["int"] = cint
 	jenv.filters["str"] = cstr
 	jenv.filters["flt"] = flt
-	jenv.filters["abs_url"] = abs_url
 
 	if frappe.flags.in_setup_help:
 		return

From b32db6e329a006c1e0eedd93ceb53930db1753f5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 17 Apr 2021 16:03:25 +0530
Subject: [PATCH 028/106] fix: method call

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

diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 6d25f4a405..42ab267381 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -19,7 +19,7 @@ def get_jenv():
 
 		jenv.globals.update(get_safe_globals())
 
-		methods, filters = get_jinja_hooks('methods')
+		methods, filters = get_jinja_hooks()
 		jenv.globals.update(methods or {})
 		jenv.filters.update(filters or {})
 

From 34c1235111f877d669a42ff024d43e72e62b40b6 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sat, 17 Apr 2021 03:53:41 +0530
Subject: [PATCH 029/106] fix: Cannot read property `current` of undefined

(cherry picked from commit 01cd2308bbc6a5e7029eecc67dd4ab3ac55dd4e5)
---
 frappe/public/js/frappe/form/form_viewers.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/public/js/frappe/form/form_viewers.js b/frappe/public/js/frappe/form/form_viewers.js
index 3d488e4729..964576ef8a 100644
--- a/frappe/public/js/frappe/form/form_viewers.js
+++ b/frappe/public/js/frappe/form/form_viewers.js
@@ -7,6 +7,11 @@ frappe.ui.form.FormViewers = class FormViewers {
 
 	refresh() {
 		let users = this.frm.get_docinfo()['viewers'];
+		if (!users || !users.current || !users.current.length) {
+			this.parent.empty();
+			return;
+		}
+
 		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);

From edef0a467d2ad993a68bfd78e2ad844a210851ff Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sat, 17 Apr 2021 18:31:43 +0200
Subject: [PATCH 030/106] fix: test_token_cache PermissionError

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

diff --git a/frappe/integrations/doctype/token_cache/test_token_cache.py b/frappe/integrations/doctype/token_cache/test_token_cache.py
index 73c9f38fce..7aa069647d 100644
--- a/frappe/integrations/doctype/token_cache/test_token_cache.py
+++ b/frappe/integrations/doctype/token_cache/test_token_cache.py
@@ -13,7 +13,7 @@ class TestTokenCache(unittest.TestCase):
 	def setUp(self):
 		self.token_cache = frappe.get_last_doc('Token Cache')
 		self.token_cache.update({'connected_app': frappe.get_last_doc('Connected App').name})
-		self.token_cache.save()
+		self.token_cache.save(ignore_permissions=True)
 
 	def test_get_auth_header(self):
 		self.token_cache.get_auth_header()

From d927d393eeecd825189d6364af5ffbefcc912341 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 17 Apr 2021 23:09:16 +0530
Subject: [PATCH 031/106] fix: Add autocompletion items in Server Script

- API to add autocompletion items in Code field
---
 frappe/cache_manager.py                       |  2 +-
 .../doctype/server_script/server_script.js    |  6 +++
 .../doctype/server_script/server_script.py    | 23 ++++++++-
 frappe/public/js/frappe/form/controls/code.js | 50 +++++++++++++++++++
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index bad879d2fa..4e0fe0cf44 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -18,7 +18,7 @@ global_cache_keys = ("app_hooks", "installed_apps", 'all_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', 'db_tables') + doctype_map_keys
+		'sitemap_routes', 'db_tables', 'server_script_autocompletion_items') + doctype_map_keys
 
 user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang",
 		"defaults", "user_permissions", "home_page", "linked_with",
diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js
index 95a63780f8..e12200b6fc 100644
--- a/frappe/core/doctype/server_script/server_script.js
+++ b/frappe/core/doctype/server_script/server_script.js
@@ -9,6 +9,12 @@ frappe.ui.form.on('Server Script', {
 		if (frm.doc.script_type != 'Scheduler Event') {
 			frm.dashboard.hide();
 		}
+
+		frm.call('get_autocompletion_items')
+			.then(r => r.message)
+			.then(items => {
+				frm.set_df_property('script', 'autocompletions', items)
+			});
 	},
 
 	setup_help(frm) {
diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py
index 8838d9e954..6a8eb59c3a 100644
--- a/frappe/core/doctype/server_script/server_script.py
+++ b/frappe/core/doctype/server_script/server_script.py
@@ -5,11 +5,12 @@
 from __future__ import unicode_literals
 
 import ast
+from types import FunctionType, ModuleType
 from typing import Dict, List
 
 import frappe
 from frappe.model.document import Document
-from frappe.utils.safe_exec import safe_exec
+from frappe.utils.safe_exec import get_safe_globals, safe_exec, NamespaceDict
 from frappe import _
 
 
@@ -122,6 +123,26 @@ class ServerScript(Document):
 		if locals["conditions"]:
 			return locals["conditions"]
 
+	@frappe.whitelist()
+	def get_autocompletion_items(self):
+		def get_keys(obj):
+			out = []
+			for key in obj:
+				if key.startswith('_'):
+					continue
+				value = obj[key]
+				if isinstance(value, (FunctionType, ModuleType)):
+					out.append(key)
+				elif isinstance(value, (NamespaceDict, dict)):
+					out += [f'{key}.{subkey}' for subkey in get_keys(value)]
+			return out
+
+		items = frappe.cache().get_value('server_script_autocompletion_items')
+		if not items:
+			items = get_keys(get_safe_globals())
+			frappe.cache().set_value('server_script_autocompletion_items', items)
+		return items
+
 
 @frappe.whitelist()
 def setup_scheduler_events(script_name, frequency):
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index eec450b390..8d2609b836 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -31,6 +31,56 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 			const input_value = this.get_input_value();
 			this.parse_validate_and_set_in_model(input_value);
 		}, 300));
+
+		// setup autocompletion when it is set the first time
+		Object.defineProperty(this.df, 'autocompletions', {
+			get() {
+				return this._autocompletions || [];
+			},
+			set: (value) => {
+				this.setup_autocompletion();
+				this.df._autocompletions = value;
+			}
+		});
+	},
+
+	setup_autocompletion() {
+		if (this._autocompletion_setup) return;
+
+		const ace = window.ace;
+		const get_autocompletions = () => this.df.autocompletions;
+
+		ace.config.loadModule("ace/ext/language_tools", langTools => {
+			this.editor.setOptions({
+				enableBasicAutocompletion: true,
+				enableSnippets: true,
+				enableLiveAutocompletion: true
+			});
+
+			let completer = {
+				getCompletions: function(editor, session, pos, prefix, callback) {
+					if (prefix.length === 0) {
+						callback(null, []);
+						return;
+					}
+					let autocompletions = get_autocompletions();
+					if (autocompletions.length) {
+						callback(
+							null,
+							autocompletions.map(a => ({
+								name: 'frappe',
+								value: a,
+								score: 100,
+								meta: 'Frappe API'
+							}))
+						);
+					}
+				}
+			}
+			langTools.addCompleter(completer);
+		});
+
+		this._autocompletion_setup = true;
 	},
 
 	refresh_height() {

From 75822a323a2553c2f2190e12269fd0e36ed1cecc Mon Sep 17 00:00:00 2001
From: mustafaelagamey <eng.mustafaelagamey@gmail.com>
Date: Sun, 18 Apr 2021 06:46:19 +0200
Subject: [PATCH 032/106] fix: Remove `cmd` only if exist (#12886)

* only remove cmd if exist

When calling this function from backend this line raises key error as there's no such key called cmd

* style: Simplify code

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

diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index 12fdb0dadc..d479b71b52 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -66,7 +66,7 @@ def add_node():
 	doc.save()
 
 def make_tree_args(**kwarg):
-	del kwarg['cmd']
+	kwarg.pop('cmd', None)
 
 	doctype = kwarg['doctype']
 	parent_field = 'parent_' + doctype.lower().replace(' ', '_')

From 762f74b590ff21a9629485221d860e75e967b5b6 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Sun, 18 Apr 2021 10:23:41 +0530
Subject: [PATCH 033/106] fix: Kanban board sync issue (backport #12874)
 (#12889)

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

diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index f563f64cb4..bbc2051e4c 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -306,6 +306,7 @@ frappe.provide("frappe.views");
 			store.on('change:cur_list', setup_restore_columns);
 			store.on('change:columns', setup_restore_columns);
 			store.on('change:empty_state', show_empty_state);
+			fluxify.doAction('update_order');
 		}
 
 		function prepare() {

From 2bf968e753bbd35cf9cc37399ffc34adc67c093b Mon Sep 17 00:00:00 2001
From: Ernesto Ruiz <ernesto_ruiz89@hotmail.com>
Date: Sat, 17 Apr 2021 22:54:12 -0600
Subject: [PATCH 034/106] fix: Make strings translatable (#12877)

Make strings translatable.
---
 .../desk/doctype/notification_settings/notification_settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/notification_settings/notification_settings.js b/frappe/desk/doctype/notification_settings/notification_settings.js
index 88dc145be2..cc2fd95204 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.js
+++ b/frappe/desk/doctype/notification_settings/notification_settings.js
@@ -19,7 +19,7 @@ frappe.ui.form.on('Notification Settings', {
 
 	refresh: (frm) => {
 		if (frappe.user.has_role('System Manager')) {
-			frm.add_custom_button('Go to Notification Settings List', () => {
+			frm.add_custom_button(__('Go to Notification Settings List'), () => {
 				frappe.set_route('List', 'Notification Settings');
 			});
 		}

From 0d87ad2133e730c326cc0b7b81565ff5b251b343 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Sun, 18 Apr 2021 11:58:20 +0530
Subject: [PATCH 035/106] fix(minor): Add a delete trigger in grid, and use it
 to refresh labels in Website Settings

---
 frappe/public/js/frappe/form/grid.js           |  6 +++++-
 .../website_settings/website_settings.js       | 18 +++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index b211476e63..86feefed7a 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -194,7 +194,10 @@ export default class Grid {
 		}
 
 		tasks.push(() => {
-			if (dirty) this.refresh();
+			if (dirty) {
+				this.refresh();
+				this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
+			}
 		});
 
 		frappe.run_serially(tasks);
@@ -210,6 +213,7 @@ export default class Grid {
 			this.frm.doc[this.df.fieldname] = [];
 			$(this.parent).find('.rows').empty();
 			this.grid_rows = [];
+			this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
 
 			this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
 			this.refresh();
diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index 422deb244e..2f15b4c00e 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -33,20 +33,12 @@ frappe.ui.form.on('Website Settings', {
 		frm.fields_dict.top_bar_items.grid.update_docfield_property(
 			'parent_label', 'options', frm.events.get_parent_options(frm, "top_bar_items")
 		);
-
-		if ($(frm.fields_dict.top_bar_items.grid.wrapper).find(".grid-row-open")) {
-			frm.fields_dict.top_bar_items.grid.refresh();
-		}
 	},
 
 	set_parent_label_options_footer: function(frm) {
 		frm.fields_dict.footer_items.grid.update_docfield_property(
-			'parent_label', 'options', frm.events.get_parent_options(frm, "top_bar_items")
+			'parent_label', 'options', frm.events.get_parent_options(frm, "footer_items")
 		);
-
-		if ($(frm.fields_dict.footer_items.grid.wrapper).find(".grid-row-open")) {
-			frm.fields_dict.footer_items.grid.refresh();
-		}
 	},
 
 	authorize_api_indexing_access: function(frm) {
@@ -122,10 +114,18 @@ frappe.ui.form.on('Website Settings', {
 });
 
 frappe.ui.form.on('Top Bar Item', {
+	top_bar_items_delete(frm) {
+		frm.events.set_parent_label_options(frm);
+	},
+
 	footer_items_add(frm, cdt, cdn) {
 		frappe.model.set_value(cdt, cdn, 'right', 0);
 	},
 
+	footer_items_delete(frm) {
+		frm.events.set_parent_label_options_footer(frm);
+	},
+
 	parent_label: function(frm, doctype, name) {
 		frm.events.set_parent_options(frm, doctype, name);
 	},

From 33b12d91f988ae7dfb030d1bd30eeeb5acecc48e Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sun, 18 Apr 2021 12:38:19 +0530
Subject: [PATCH 036/106] fix: cannot read property `doc` of undefined (#12891)

---
 .../doctype/communication/communication_list.js     |  2 +-
 frappe/public/js/frappe/views/communication.js      | 13 ++++++++-----
 frappe/public/js/frappe/views/inbox/inbox_view.js   |  4 +---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frappe/core/doctype/communication/communication_list.js b/frappe/core/doctype/communication/communication_list.js
index 454897b865..315b74a39c 100644
--- a/frappe/core/doctype/communication/communication_list.js
+++ b/frappe/core/doctype/communication/communication_list.js
@@ -20,6 +20,6 @@ frappe.listview_settings['Communication'] = {
 	},
 
 	primary_action: function() {
-		new frappe.views.CommunicationComposer({ doc: {} });
+		new frappe.views.CommunicationComposer();
 	}
 };
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 0479ec6d31..6501018c88 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -7,6 +7,10 @@ const separator_element = '<div>---</div>';
 frappe.views.CommunicationComposer = class {
 	constructor(opts) {
 		$.extend(this, opts);
+		if (!this.doc) {
+			this.doc = this.frm && this.frm.doc || {};
+		}
+
 		this.make();
 	}
 
@@ -269,7 +273,7 @@ frappe.views.CommunicationComposer = class {
 				method: 'frappe.email.doctype.email_template.email_template.get_email_template',
 				args: {
 					template_name: email_template,
-					doc: me.frm.doc,
+					doc: me.doc,
 					_lang: me.dialog.get_value("language_sel")
 				},
 				callback(r) {
@@ -382,11 +386,10 @@ frappe.views.CommunicationComposer = class {
 	}
 
 	setup_print_language() {
-		const doc = this.frm && this.frm.doc;
 		const fields = this.dialog.fields_dict;
 
 		//Load default print language from doctype
-		this.lang_code = doc.language
+		this.lang_code = this.doc.language
 			|| this.get_print_format().default_print_language
 			|| frappe.boot.lang;
 
@@ -612,7 +615,7 @@ frappe.views.CommunicationComposer = class {
 
 	send_email(btn, form_values, selected_attachments, print_html, print_format) {
 		const me = this;
-		me.dialog.hide();
+		this.dialog.hide();
 
 		if (!form_values.recipients) {
 			frappe.msgprint(__("Enter Email Recipient(s)"));
@@ -625,7 +628,7 @@ frappe.views.CommunicationComposer = class {
 		}
 
 
-		if (this.frm && !frappe.model.can_email(me.doc.doctype, this.frm)) {
+		if (this.frm && !frappe.model.can_email(this.doc.doctype, this.frm)) {
 			frappe.msgprint(__("You are not allowed to send emails related to this document"));
 			return;
 		}
diff --git a/frappe/public/js/frappe/views/inbox/inbox_view.js b/frappe/public/js/frappe/views/inbox/inbox_view.js
index 1085e93e6c..8b53bd49a9 100644
--- a/frappe/public/js/frappe/views/inbox/inbox_view.js
+++ b/frappe/public/js/frappe/views/inbox/inbox_view.js
@@ -204,9 +204,7 @@ frappe.views.InboxView = class InboxView extends frappe.views.ListView {
 			};
 			frappe.new_doc('Email Account');
 		} else {
-			new frappe.views.CommunicationComposer({
-				doc: {}
-			});
+			new frappe.views.CommunicationComposer();
 		}
 	}
 };

From c8763859aec2332040b2e0392cfcf5a5fdef327c Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Sun, 18 Apr 2021 13:22:43 +0530
Subject: [PATCH 037/106] test: multiple cypress fixes

---
 cypress/integration/relative_time_filters.js |  3 ---
 cypress/integration/table_multiselect.js     |  2 +-
 frappe/commands/utils.py                     | 11 +++++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cypress/integration/relative_time_filters.js b/cypress/integration/relative_time_filters.js
index 80e6387d99..cbb0524c24 100644
--- a/cypress/integration/relative_time_filters.js
+++ b/cypress/integration/relative_time_filters.js
@@ -1,7 +1,4 @@
 context('Relative Timeframe', () => {
-	beforeEach(() => {
-		cy.login();
-	});
 	before(() => {
 		cy.login();
 		cy.visit('/app/website');
diff --git a/cypress/integration/table_multiselect.js b/cypress/integration/table_multiselect.js
index faa72d63a5..25cab78ba2 100644
--- a/cypress/integration/table_multiselect.js
+++ b/cypress/integration/table_multiselect.js
@@ -1,5 +1,5 @@
 context('Table MultiSelect', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.login();
 	});
 
diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py
index 5ff66171fc..a203c8c6d9 100644
--- a/frappe/commands/utils.py
+++ b/frappe/commands/utils.py
@@ -11,7 +11,7 @@ import click
 import frappe
 from frappe.commands import get_site, pass_context
 from frappe.exceptions import SiteNotSpecifiedError
-from frappe.utils import get_bench_path, update_progress_bar
+from frappe.utils import get_bench_path, update_progress_bar, cint
 
 
 @click.command('build')
@@ -567,11 +567,14 @@ def run_ui_tests(context, app, headless=False):
 
 	node_bin = subprocess.getoutput("npm bin")
 	cypress_path = "{0}/cypress".format(node_bin)
-	plugin_path = "{0}/cypress-file-upload".format(node_bin)
+	plugin_path = "{0}/../cypress-file-upload".format(node_bin)
 
 	# check if cypress in path...if not, install it.
-	if not (os.path.exists(cypress_path) or os.path.exists(plugin_path)) \
-		or not subprocess.getoutput("npm view cypress version").startswith("6."):
+	if not (
+		os.path.exists(cypress_path)
+		and os.path.exists(plugin_path)
+		and cint(subprocess.getoutput("npm view cypress version")[:1]) >= 6
+	):
 		# install cypress
 		click.secho("Installing Cypress...", fg="yellow")
 		frappe.commands.popen("yarn add cypress@^6 cypress-file-upload@^5 --no-lockfile")

From d309343c6fa43b8a2a28fa615a534647a6c3e069 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sun, 18 Apr 2021 18:56:45 +0530
Subject: [PATCH 038/106] feat(hooks): auth hooks

hook for request authentication
---
 frappe/api.py               | 33 +++++++++++++++------------------
 frappe/utils/boilerplate.py |  7 +++++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/frappe/api.py b/frappe/api.py
index 6a09b795b0..3a1be2593e 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -149,24 +149,17 @@ def get_request_form_data():
 	return frappe.parse_json(data)
 
 def validate_auth():
-	if frappe.get_request_header("Authorization") is None:
-		return
-
 	VALID_AUTH_PREFIX_TYPES = ['basic', 'bearer', 'token']
 	VALID_AUTH_PREFIX_STRING = ", ".join(VALID_AUTH_PREFIX_TYPES).title()
 
 	authorization_header = frappe.get_request_header("Authorization", str()).split(" ")
 	authorization_type = authorization_header[0].lower()
 
-	if len(authorization_header) == 1:
-		frappe.throw(_('Invalid Authorization headers, add a token with a prefix from one of the following: {0}.').format(VALID_AUTH_PREFIX_STRING), frappe.InvalidAuthorizationHeader)
-
-	if authorization_type == "bearer":
+	if len(authorization_header) == 2:
 		validate_oauth(authorization_header)
-	elif authorization_type in VALID_AUTH_PREFIX_TYPES:
 		validate_auth_via_api_keys(authorization_header)
-	else:
-		frappe.throw(_('Invalid Authorization Type {0}, must be one of {1}.').format(authorization_type, VALID_AUTH_PREFIX_STRING), frappe.InvalidAuthorizationPrefix)
+
+	validate_auth_via_hooks()
 
 
 def validate_oauth(authorization_header):
@@ -192,14 +185,13 @@ def validate_oauth(authorization_header):
 
 	try:
 		required_scopes = frappe.db.get_value("OAuth Bearer Token", token, "scopes").split(get_url_delimiter())
+		valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
+
+		if valid:
+			frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
+			frappe.local.form_dict = form_dict
 	except AttributeError:
-		frappe.throw(_("Invalid Bearer token, please provide a valid access token with prefix 'Bearer'."), frappe.InvalidAuthorizationToken)
-
-	valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
-
-	if valid:
-		frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
-		frappe.local.form_dict = form_dict
+		pass
 
 
 def validate_auth_via_api_keys(authorization_header):
@@ -222,7 +214,7 @@ def validate_auth_via_api_keys(authorization_header):
 	except binascii.Error:
 		frappe.throw(_("Failed to decode token, please provide a valid base64-encoded token."), frappe.InvalidAuthorizationToken)
 	except (AttributeError, TypeError, ValueError):
-		frappe.throw(_("Invalid token, please provide a valid token with prefix 'Basic' or 'Token'."), frappe.InvalidAuthorizationToken)
+		pass
 
 
 
@@ -248,3 +240,8 @@ def validate_api_key_secret(api_key, api_secret, frappe_authorization_source=Non
 		if frappe.local.login_manager.user in ('', 'Guest'):
 			frappe.set_user(user)
 		frappe.local.form_dict = form_dict
+
+
+def validate_auth_via_hooks():
+	for auth_hook in frappe.get_hooks('auth_hooks', []):
+		frappe.get_attr(auth_hook)()
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index e59f579f75..ffcb64cff2 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -303,6 +303,13 @@ user_data_fields = [
 	}}
 ]
 
+# Authentication and authorization
+# --------------------------------
+
+# auth_hooks = [
+# 	"{app_name}.auth.validate"
+# ]
+
 """
 
 desktop_template = """# -*- coding: utf-8 -*-

From c16584bbf186183f970583d3793f2e7e670f60f8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 19 Apr 2021 10:45:54 +0530
Subject: [PATCH 039/106] chore: Upgrade frappe-charts to rc13 (#12896)

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

diff --git a/package.json b/package.json
index 3c8da66242..6e82890617 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-rc11",
+    "frappe-charts": "^2.0.0-rc13",
     "frappe-datatable": "^1.15.3",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
diff --git a/yarn.lock b/yarn.lock
index 4f6f62ac0a..8ac348011d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2699,10 +2699,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-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-charts@^2.0.0-rc13:
+  version "2.0.0-rc13"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072"
+  integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w==
 
 frappe-datatable@^1.15.3:
   version "1.15.3"

From eed1b6961edd8558729642be36410817cb470fe0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 10:51:01 +0530
Subject: [PATCH 040/106] chore: Upgrade frappe-charts to rc13 (backport
 #12896) (#12897)

(cherry picked from commit c16584bbf186183f970583d3793f2e7e670f60f8)

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 3c8da66242..6e82890617 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-rc11",
+    "frappe-charts": "^2.0.0-rc13",
     "frappe-datatable": "^1.15.3",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
diff --git a/yarn.lock b/yarn.lock
index 4f6f62ac0a..8ac348011d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2699,10 +2699,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-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-charts@^2.0.0-rc13:
+  version "2.0.0-rc13"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc13.tgz#fdb251d7ae311c41e38f90a3ae108070ec6b9072"
+  integrity sha512-Bv7IfllIrjRbKWHn5b769dOSenqdBixAr6m5kurf8ZUOJSLOgK4HOXItJ7BA8n9PvviH9/k5DaloisjLM2Bm1w==
 
 frappe-datatable@^1.15.3:
   version "1.15.3"

From f617bfeba6910f10fec7a03530f0ca848ee3f715 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@parsimony.com>
Date: Mon, 19 Apr 2021 12:51:48 +0530
Subject: [PATCH 041/106] fix: update dependencies

---
 requirements.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8cbe0e800b..91f235159f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,14 +2,14 @@ Babel~=2.9.0
 beautifulsoup4~=4.9.3
 bleach-whitelist~=0.0.11
 bleach~=3.3.0
-boto3~=1.17.48
+boto3~=1.17.53
 braintree~=4.8.0
 chardet~=4.0.0
 Click~=7.1.2
 coverage~=5.5
 croniter~=1.0.11
 cryptography~=3.4.7
-dropbox~=11.6.0
+dropbox~=11.7.0
 email-reply-parser~=0.5.12
 Faker~=8.1.0
 future==0.18.2
@@ -19,7 +19,7 @@ GitPython~=3.1.14
 google-api-python-client~=2.2.0
 google-auth-httplib2~=0.1.0
 google-auth-oauthlib~=0.4.4
-google-auth~=1.28.1
+google-auth~=1.29.0
 googlemaps~=4.4.5
 gunicorn~=20.1.0
 html2text==2020.1.16
@@ -38,7 +38,7 @@ passlib~=1.7.4
 paytmchecksum~=1.7.0
 pdfkit~=0.6.1
 Pillow~=8.2.0
-premailer~=3.7.0
+premailer~=3.8.0
 psutil~=5.8.0
 psycopg2-binary~=2.8.6
 pyasn1~=0.4.8

From 7cff552dd43fe3905185a18c460a1fde107909f7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 13:11:18 +0530
Subject: [PATCH 042/106] fix(minor): Add a delete trigger in grid, and use it
 to refresh labels in Website Settings (backport #12890) (#12900)

(cherry picked from commit 0d87ad2133e730c326cc0b7b81565ff5b251b343)

Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
---
 frappe/public/js/frappe/form/grid.js           |  6 +++++-
 .../website_settings/website_settings.js       | 18 +++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index b211476e63..86feefed7a 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -194,7 +194,10 @@ export default class Grid {
 		}
 
 		tasks.push(() => {
-			if (dirty) this.refresh();
+			if (dirty) {
+				this.refresh();
+				this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
+			}
 		});
 
 		frappe.run_serially(tasks);
@@ -210,6 +213,7 @@ export default class Grid {
 			this.frm.doc[this.df.fieldname] = [];
 			$(this.parent).find('.rows').empty();
 			this.grid_rows = [];
+			this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
 
 			this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
 			this.refresh();
diff --git a/frappe/website/doctype/website_settings/website_settings.js b/frappe/website/doctype/website_settings/website_settings.js
index 422deb244e..2f15b4c00e 100644
--- a/frappe/website/doctype/website_settings/website_settings.js
+++ b/frappe/website/doctype/website_settings/website_settings.js
@@ -33,20 +33,12 @@ frappe.ui.form.on('Website Settings', {
 		frm.fields_dict.top_bar_items.grid.update_docfield_property(
 			'parent_label', 'options', frm.events.get_parent_options(frm, "top_bar_items")
 		);
-
-		if ($(frm.fields_dict.top_bar_items.grid.wrapper).find(".grid-row-open")) {
-			frm.fields_dict.top_bar_items.grid.refresh();
-		}
 	},
 
 	set_parent_label_options_footer: function(frm) {
 		frm.fields_dict.footer_items.grid.update_docfield_property(
-			'parent_label', 'options', frm.events.get_parent_options(frm, "top_bar_items")
+			'parent_label', 'options', frm.events.get_parent_options(frm, "footer_items")
 		);
-
-		if ($(frm.fields_dict.footer_items.grid.wrapper).find(".grid-row-open")) {
-			frm.fields_dict.footer_items.grid.refresh();
-		}
 	},
 
 	authorize_api_indexing_access: function(frm) {
@@ -122,10 +114,18 @@ frappe.ui.form.on('Website Settings', {
 });
 
 frappe.ui.form.on('Top Bar Item', {
+	top_bar_items_delete(frm) {
+		frm.events.set_parent_label_options(frm);
+	},
+
 	footer_items_add(frm, cdt, cdn) {
 		frappe.model.set_value(cdt, cdn, 'right', 0);
 	},
 
+	footer_items_delete(frm) {
+		frm.events.set_parent_label_options_footer(frm);
+	},
+
 	parent_label: function(frm, doctype, name) {
 		frm.events.set_parent_options(frm, doctype, name);
 	},

From 557235471ed3540f12d5b9ac883e682f9dbf3daa Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@parsimony.com>
Date: Mon, 19 Apr 2021 13:39:39 +0530
Subject: [PATCH 043/106] fix: remove unused variables

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

diff --git a/frappe/api.py b/frappe/api.py
index 3a1be2593e..59f14b54c8 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -1,12 +1,10 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # MIT License. See license.txt
-from __future__ import unicode_literals
 
 import base64
 import binascii
 import json
-
-from six.moves.urllib.parse import urlencode, urlparse
+from urllib.parse import urlencode, urlparse
 
 import frappe
 import frappe.client
@@ -14,6 +12,7 @@ import frappe.handler
 from frappe import _
 from frappe.utils.response import build_response
 
+
 def handle():
 	"""
 	Handler for `/api` methods
@@ -38,7 +37,6 @@ def handle():
 	`/api/resource/{doctype}/{name}?run_method={method}` will run a whitelisted controller method
 	"""
 
-
 	validate_auth()
 
 	parts = frappe.request.path[1:].split("/",3)
@@ -116,7 +114,7 @@ def handle():
 						frappe.local.form_dict['fields'] = json.loads(frappe.local.form_dict['fields'])
 					frappe.local.form_dict.setdefault('limit_page_length', 20)
 					frappe.local.response.update({
-						"data":  frappe.call(
+						"data": frappe.call(
 							frappe.client.get_list,
 							doctype,
 							**frappe.local.form_dict
@@ -140,6 +138,7 @@ def handle():
 
 	return build_response("json")
 
+
 def get_request_form_data():
 	if frappe.local.form_dict.data is None:
 		data = frappe.safe_decode(frappe.local.request.get_data())
@@ -148,12 +147,9 @@ def get_request_form_data():
 
 	return frappe.parse_json(data)
 
-def validate_auth():
-	VALID_AUTH_PREFIX_TYPES = ['basic', 'bearer', 'token']
-	VALID_AUTH_PREFIX_STRING = ", ".join(VALID_AUTH_PREFIX_TYPES).title()
 
+def validate_auth():
 	authorization_header = frappe.get_request_header("Authorization", str()).split(" ")
-	authorization_type = authorization_header[0].lower()
 
 	if len(authorization_header) == 2:
 		validate_oauth(authorization_header)
@@ -170,8 +166,8 @@ def validate_oauth(authorization_header):
 		authorization_header (list of str): The 'Authorization' header containing the prefix and token
 	"""
 
-	from frappe.oauth import get_url_delimiter
 	from frappe.integrations.oauth2 import get_oauth_server
+	from frappe.oauth import get_url_delimiter
 
 	form_dict = frappe.local.form_dict
 	token = authorization_header[1]
@@ -185,14 +181,14 @@ def validate_oauth(authorization_header):
 
 	try:
 		required_scopes = frappe.db.get_value("OAuth Bearer Token", token, "scopes").split(get_url_delimiter())
-		valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
-
-		if valid:
-			frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
-			frappe.local.form_dict = form_dict
 	except AttributeError:
 		pass
 
+	valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
+	if valid:
+		frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
+		frappe.local.form_dict = form_dict
+
 
 def validate_auth_via_api_keys(authorization_header):
 	"""
@@ -217,7 +213,6 @@ def validate_auth_via_api_keys(authorization_header):
 		pass
 
 
-
 def validate_api_key_secret(api_key, api_secret, frappe_authorization_source=None):
 	"""frappe_authorization_source to provide api key and secret for a doctype apart from User"""
 	doctype = frappe_authorization_source or 'User'

From 1600d852796a48b733f832cad0e67faa0e69ae66 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:15:30 +0530
Subject: [PATCH 044/106] fix:  Typo in get_all_language_with_name (#12902)

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

diff --git a/frappe/translate.py b/frappe/translate.py
index 62ee733f5f..a65a1c28c1 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -827,7 +827,7 @@ def get_all_languages(with_language_name=False):
 		return frappe.db.sql_list('select name from tabLanguage')
 
 	def get_all_language_with_name():
-		return frappe.db.get_all('language', ['language_code', 'language_name'])
+		return frappe.db.get_all('Language', ['language_code', 'language_name'])
 
 	if not frappe.db:
 		frappe.connect()

From 6587744b096b21c8d316167f0115abe1a52f3600 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:29:58 +0530
Subject: [PATCH 045/106] fix:  Typo in get_all_language_with_name (backport
 #12902) (#12903)

(cherry picked from commit 1600d852796a48b733f832cad0e67faa0e69ae66)

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

diff --git a/frappe/translate.py b/frappe/translate.py
index 62ee733f5f..a65a1c28c1 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -827,7 +827,7 @@ def get_all_languages(with_language_name=False):
 		return frappe.db.sql_list('select name from tabLanguage')
 
 	def get_all_language_with_name():
-		return frappe.db.get_all('language', ['language_code', 'language_name'])
+		return frappe.db.get_all('Language', ['language_code', 'language_name'])
 
 	if not frappe.db:
 		frappe.connect()

From fe73a0b22af3b29eb60f31ba5cc0b73c1bf7d828 Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Mon, 19 Apr 2021 14:43:44 +0530
Subject: [PATCH 046/106] refactor: removed unused code

---
 frappe/www/login.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/frappe/www/login.py b/frappe/www/login.py
index 76b232f8ee..1ce25a81d9 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -95,14 +95,6 @@ def login_via_frappe(code, state):
 def login_via_office365(code, state):
 	login_via_oauth2_id_token("office_365", code, state, decoder=decoder_compat)
 
-@frappe.whitelist(allow_guest=True)
-def login_oauth_user(data=None, provider=None, state=None, email_id=None, key=None, generate_login_token=False):
-	if not ((data and provider and state) or (email_id and key)):
-		frappe.respond_as_web_page(_("Invalid Request"), _("Missing parameters for login"), http_status_code=417)
-		return
-
-	_login_oauth_user(data, provider, state, email_id, key, generate_login_token)
-
 @frappe.whitelist(allow_guest=True)
 def login_via_token(login_token):
 	sid = frappe.cache().get_value("login_token:{0}".format(login_token), expires=True)

From 1c2d69fbe72aae0f4c146096ef4732fed624ecff Mon Sep 17 00:00:00 2001
From: leela <leela.vadlamudi@gmail.com>
Date: Mon, 19 Apr 2021 14:45:38 +0530
Subject: [PATCH 047/106] fix: remove the token validation check

Let token be part of state to make state dynamic. But there is no need
to have validation for token.
---
 frappe/utils/oauth.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py
index 6596701ee3..6a92737a0d 100644
--- a/frappe/utils/oauth.py
+++ b/frappe/utils/oauth.py
@@ -64,8 +64,6 @@ def get_oauth2_authorize_url(provider, redirect_to):
 
 	state = { "site": frappe.utils.get_url(), "token": frappe.generate_hash(), "redirect_to": redirect_to 	}
 
-	frappe.cache().set_value("{0}:{1}".format(provider, state["token"]), True, expires_in_sec=120)
-
 	# relative to absolute url
 	data = {
 		"redirect_uri": get_redirect_uri(provider),
@@ -176,11 +174,6 @@ def login_oauth_user(data=None, provider=None, state=None, email_id=None, key=No
 		frappe.respond_as_web_page(_("Invalid Request"), _("Token is missing"), http_status_code=417)
 		return
 
-	token = frappe.cache().get_value("{0}:{1}".format(provider, state["token"]), expires=True)
-	if not token:
-		frappe.respond_as_web_page(_("Invalid Request"), _("Invalid Token"), http_status_code=417)
-		return
-
 	user = get_email(data)
 
 	if not user:

From 6ecbf55de5f5f050248432726dcd0e9e5d58d27f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 19 Apr 2021 15:12:00 +0530
Subject: [PATCH 048/106] fix: do not empty viewers parent on form refresh

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

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index ef728e730e..de9331a726 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -360,6 +360,7 @@ frappe.ui.form.Form = class FrappeForm {
 			grid_obj.grid.grid_pagination.go_to_page(1, true);
 		});
 		frappe.ui.form.close_grid_form();
+		this.viewers && this.viewers.parent.empty();
 		this.docname = docname;
 		this.setup_docinfo_change_listener();
 	}
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 145b8d3eed..22787b70c1 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -211,7 +211,6 @@ frappe.ui.form.Toolbar = class Toolbar {
 
 	make_viewers() {
 		if (this.frm.viewers) {
-			this.frm.viewers.parent.empty();
 			return;
 		}
 		this.frm.viewers = new frappe.ui.form.FormViewers({

From 8c74df6cc3b5bf4b1664b6ba76f38d9fc8d6b19f Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 19 Apr 2021 15:18:15 +0530
Subject: [PATCH 049/106] fix: duplicate validate_auth calls

---
 frappe/api.py     | 8 ++++----
 frappe/handler.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/api.py b/frappe/api.py
index 59f14b54c8..4117c49333 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -181,13 +181,13 @@ def validate_oauth(authorization_header):
 
 	try:
 		required_scopes = frappe.db.get_value("OAuth Bearer Token", token, "scopes").split(get_url_delimiter())
+		valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
+		if valid:
+			frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
+			frappe.local.form_dict = form_dict
 	except AttributeError:
 		pass
 
-	valid, oauthlib_request = get_oauth_server().verify_request(uri, http_method, body, headers, required_scopes)
-	if valid:
-		frappe.set_user(frappe.db.get_value("OAuth Bearer Token", token, "user"))
-		frappe.local.form_dict = form_dict
 
 
 def validate_auth_via_api_keys(authorization_header):
diff --git a/frappe/handler.py b/frappe/handler.py
index 82c1ea65c6..1897abe019 100755
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -24,7 +24,7 @@ ALLOWED_MIMETYPES = ('image/png', 'image/jpeg', 'application/pdf', 'application/
 
 def handle():
 	"""handle request"""
-	validate_auth()
+
 	cmd = frappe.local.form_dict.cmd
 	data = None
 

From 1d0e72834d3f67ec84089190a32ddb28b53963e5 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 19 Apr 2021 15:54:16 +0530
Subject: [PATCH 050/106] fix: remove unused imports

---
 frappe/api.py     | 5 +++--
 frappe/app.py     | 1 +
 frappe/handler.py | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/api.py b/frappe/api.py
index 4117c49333..4a120f228a 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -37,8 +37,6 @@ def handle():
 	`/api/resource/{doctype}/{name}?run_method={method}` will run a whitelisted controller method
 	"""
 
-	validate_auth()
-
 	parts = frappe.request.path[1:].split("/",3)
 	call = doctype = name = None
 
@@ -149,6 +147,9 @@ def get_request_form_data():
 
 
 def validate_auth():
+	"""
+	Authenticate and sets user for the request.
+	"""
 	authorization_header = frappe.get_request_header("Authorization", str()).split(" ")
 
 	if len(authorization_header) == 2:
diff --git a/frappe/app.py b/frappe/app.py
index 607479ad52..c9e993a853 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -56,6 +56,7 @@ def application(request):
 		frappe.recorder.record()
 		frappe.monitor.start()
 		frappe.rate_limiter.apply()
+		frappe.api.validate_auth()
 
 		if request.method == "OPTIONS":
 			response = Response()
diff --git a/frappe/handler.py b/frappe/handler.py
index 1897abe019..a38feb90fa 100755
--- a/frappe/handler.py
+++ b/frappe/handler.py
@@ -9,7 +9,6 @@ import frappe
 import frappe.utils
 import frappe.sessions
 from frappe.utils import cint
-from frappe.api import validate_auth
 from frappe import _, is_whitelisted
 from frappe.utils.response import build_response
 from frappe.utils.csvutils import build_csv_response

From 10d9611e6a0ae7983199628a651623f1a115c00e Mon Sep 17 00:00:00 2001
From: shariquerik <sharique.rik@gmail.com>
Date: Mon, 19 Apr 2021 16:05:01 +0530
Subject: [PATCH 051/106] fix: Grid Form buttons Insert Above, Insert Below not
 hidden when cannot_add_rows is true

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

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 5e3a2b8ccd..0a88beaa37 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -555,6 +555,15 @@ export default class GridRow {
 		this.grid_form.render();
 		this.row.toggle(false);
 		// this.form_panel.toggle(true);
+
+		if (this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows)) {
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+				.addClass('hidden')
+		} else {
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+				.removeClass('hidden')
+		}
+
 		frappe.dom.freeze("", "dark");
 		if (cur_frm) cur_frm.cur_grid = this;
 		this.wrapper.addClass("grid-row-open");

From ccb76ce56bceaca3cbe72e932ec01f681b685758 Mon Sep 17 00:00:00 2001
From: shariquerik <sharique.rik@gmail.com>
Date: Mon, 19 Apr 2021 16:58:26 +0530
Subject: [PATCH 052/106] fix: sider fix

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

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 0a88beaa37..e0fe1b3b54 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -558,10 +558,10 @@ export default class GridRow {
 
 		if (this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows)) {
 			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
-				.addClass('hidden')
+				.addClass('hidden');
 		} else {
 			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
-				.removeClass('hidden')
+				.removeClass('hidden');
 		}
 
 		frappe.dom.freeze("", "dark");

From 3b5b908d8a9bfda328517450f3922aee6d7900a5 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:20:54 +0530
Subject: [PATCH 053/106] =?UTF-8?q?fix:=20Grid=20Form=20buttons=20Insert?=
 =?UTF-8?q?=20Above,=20Insert=20Below=20not=20hidden=20when=20can=E2=80=A6?=
 =?UTF-8?q?=20(backport=20#12906)=20(#12907)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: shariquerik <sharique.rik@gmail.com>
---
 frappe/public/js/frappe/form/grid_row.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 5e3a2b8ccd..e0fe1b3b54 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -555,6 +555,15 @@ export default class GridRow {
 		this.grid_form.render();
 		this.row.toggle(false);
 		// this.form_panel.toggle(true);
+
+		if (this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows)) {
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+				.addClass('hidden');
+		} else {
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+				.removeClass('hidden');
+		}
+
 		frappe.dom.freeze("", "dark");
 		if (cur_frm) cur_frm.cur_grid = this;
 		this.wrapper.addClass("grid-row-open");

From 47228e65125084dede270e85dfbc201a8f52d479 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:23:51 +0530
Subject: [PATCH 054/106] fix: do not empty viewers parent on form refresh
 (backport #12905) (#12908)

(cherry picked from commit 6ecbf55de5f5f050248432726dcd0e9e5d58d27f)

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

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index ef728e730e..de9331a726 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -360,6 +360,7 @@ frappe.ui.form.Form = class FrappeForm {
 			grid_obj.grid.grid_pagination.go_to_page(1, true);
 		});
 		frappe.ui.form.close_grid_form();
+		this.viewers && this.viewers.parent.empty();
 		this.docname = docname;
 		this.setup_docinfo_change_listener();
 	}
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 2f5b84fb1a..3bbfd63a46 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -211,7 +211,6 @@ frappe.ui.form.Toolbar = class Toolbar {
 
 	make_viewers() {
 		if (this.frm.viewers) {
-			this.frm.viewers.parent.empty();
 			return;
 		}
 		this.frm.viewers = new frappe.ui.form.FormViewers({

From 496445aac3915bfebbd439248b6193598b7ebdb9 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 19 Apr 2021 17:25:52 +0530
Subject: [PATCH 055/106] fix(website): Make language select optional and fix
 breakpoint issues (backport #12860) (#12909)

Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
---
 frappe/public/scss/website/index.scss         |  7 +++
 frappe/public/scss/website/navbar.scss        | 14 ++++-
 frappe/templates/base.html                    | 36 +------------
 frappe/templates/includes/navbar/navbar.html  |  4 +-
 .../website_settings/website_settings.json    | 21 ++++++--
 .../website_settings/website_settings.py      |  7 +--
 frappe/website/js/website.js                  | 53 ++++++++++++++-----
 7 files changed, 85 insertions(+), 57 deletions(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 1fb5badc6c..823ec9b08a 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -90,6 +90,13 @@
 	margin: 2rem 0;
 }
 
+@media (max-width: map-get($grid-breakpoints, "lg")) {
+	.page-content-wrapper .container {
+		padding-left: 1rem;
+		padding-right: 1rem;
+	}
+}
+
 .breadcrumb-container {
 	margin-top: 1rem;
 	padding-top:  0.25rem;
diff --git a/frappe/public/scss/website/navbar.scss b/frappe/public/scss/website/navbar.scss
index 4d2ccfece9..3496a8907c 100644
--- a/frappe/public/scss/website/navbar.scss
+++ b/frappe/public/scss/website/navbar.scss
@@ -1,3 +1,15 @@
+.navbar {
+	padding-left: 0;
+	padding-right: 0;
+}
+
+@media (max-width: map-get($grid-breakpoints, "lg")) {
+	.navbar {
+		padding-left: 1rem;
+		padding-right: 1rem;
+	}
+}
+
 .navbar-light {
 	border-bottom: 1px solid $border-color;
 	background: $navbar-bg;
@@ -96,4 +108,4 @@
 	@extend .ellipsis;
 	max-width: 100%;
 	vertical-align: middle;
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 18c9e9d99a..78aa573c99 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -56,6 +56,8 @@
 		}
 		window.dev_server = {{ dev_server }};
 		window.socketio_port = {{ (frappe.socketio_port or 'null') }};
+		window.show_language_picker = {{ show_language_picker }};
+		window.is_chat_enabled = {{ chat_enable }};
 	</script>
 </head>
 <body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="{{ body_class or ''}}">
@@ -110,39 +112,5 @@
 	{%- endblock %}
 	<!-- csrf_token -->
 	{%- block body_include %}{{ body_include or "" }}{% endblock -%}
-	<script>
-		frappe.ready(() => {
-			if (frappe.session.user === 'Guest') {
-				frappe.call("frappe.translate.get_all_languages", {
-					with_language_name: true
-				}).then(res => {
-					let language_list = res.message;
-					let language = frappe.get_cookie('preferred_language');
-					let language_codes = [];
-					language_list.forEach(language_doc => {
-						language_codes.push(language_doc.language_code)
-						$("#language-switcher")
-							.append(
-								$("<option></option>")
-									.attr("value", language_doc.language_code)
-									.text(language_doc.language_name)
-							);
-					});
-					$("#language-switcher").removeClass('hide');
-					language = language || (language_codes.includes(navigator.language) ? navigator.language : 'en');
-					$("#language-switcher").val(language);
-					document.documentElement.lang = language;
-					$("#language-switcher").change((e) => {
-						let lang = $("#language-switcher").val();
-						frappe.call("frappe.translate.set_preferred_language_cookie", {
-							"preferred_language": lang
-						}).then(() => {
-							window.location.reload();
-						});
-					});
-				});
-			}
-		})
-	</script>
 </body>
 </html>
diff --git a/frappe/templates/includes/navbar/navbar.html b/frappe/templates/includes/navbar/navbar.html
index 7856413602..1fb4ae9fb0 100644
--- a/frappe/templates/includes/navbar/navbar.html
+++ b/frappe/templates/includes/navbar/navbar.html
@@ -21,8 +21,8 @@
 		<div class="collapse navbar-collapse" id="navbarSupportedContent">
 			{% include "templates/includes/navbar/navbar_items.html" %}
 		</div>
-		<div class="form-group mb-0">
-			<select class="form-control hide" id="language-switcher"></select>
+		<div class="form-group mb-0 hide" id="language-switcher">
+			<select class="form-control"></select>
 		</div>
 	</div>
 </nav>
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index 3ca02e2a37..9e04cf3795 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -25,9 +25,11 @@
   "set_banner_from_image",
   "favicon",
   "top_bar",
-  "navbar_search",
-  "hide_login",
   "top_bar_items",
+  "hide_login",
+  "navbar_search",
+  "show_language_picker",
+  "navbar_template_section",
   "navbar_template",
   "navbar_template_values",
   "edit_navbar_template_values",
@@ -410,6 +412,19 @@
    "fieldname": "google_analytics_anonymize_ip",
    "fieldtype": "Check",
    "label": "Google Analytics Anonymize IP"
+  },
+  {
+   "default": "0",
+   "fieldname": "show_language_picker",
+   "fieldtype": "Check",
+   "label": "Show Language Picker"
+  },
+  {
+   "collapsible": 1,
+   "collapsible_depends_on": "navbar_template",
+   "fieldname": "navbar_template_section",
+   "fieldtype": "Section Break",
+   "label": "Navbar Template"
   }
  ],
  "icon": "fa fa-cog",
@@ -418,7 +433,7 @@
  "issingle": 1,
  "links": [],
  "max_attachments": 10,
- "modified": "2021-04-13 10:22:51.888788",
+ "modified": "2021-04-14 17:39:56.609771",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Website Settings",
diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 89def9bf8d..f7f22aa2df 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -121,7 +121,8 @@ def get_website_settings(context=None):
 		"facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
 		"disable_signup", "hide_footer_signup", "head_html", "title_prefix",
 		"navbar_template", "footer_template", "navbar_search", "enable_view_tracking",
-		"footer_logo", "call_to_action", "call_to_action_url"]:
+		"footer_logo", "call_to_action", "call_to_action_url", "show_language_picker",
+		"chat_enable"]:
 		if hasattr(settings, k):
 			context[k] = settings.get(k)
 
@@ -178,7 +179,3 @@ def get_items(parentfield):
 					t['child_items'].append(d)
 					break
 	return top_items
-
-@frappe.whitelist(allow_guest=True)
-def is_chat_enabled():
-	return bool(frappe.db.get_single_value('Website Settings', 'chat_enable'))
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index b8360e68ca..ea0b9aedfa 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -376,6 +376,39 @@ $.extend(frappe, {
 			// Start observing an element
 			io.observe(el);
 		});
+	},
+	show_language_picker() {
+		if (frappe.session.user === 'Guest' && window.show_language_picker) {
+			frappe.call("frappe.translate.get_all_languages", {
+				with_language_name: true
+			}).then(res => {
+				let language_list = res.message;
+				let language = frappe.get_cookie('preferred_language');
+				let language_codes = [];
+				let language_switcher = $("#language-switcher .form-control");
+				language_list.forEach(language_doc => {
+					language_codes.push(language_doc.language_code);
+					language_switcher
+						.append(
+							$("<option></option>")
+								.attr("value", language_doc.language_code)
+								.text(language_doc.language_name)
+						);
+				});
+				$("#language-switcher").removeClass('hide');
+				language = language || (language_codes.includes(navigator.language) ? navigator.language : 'en');
+				language_switcher.val(language);
+				document.documentElement.lang = language;
+				language_switcher.change(() => {
+					let lang = language_switcher.val();
+					frappe.call("frappe.translate.set_preferred_language_cookie", {
+						"preferred_language": lang
+					}).then(() => {
+						window.location.reload();
+					});
+				});
+			});
+		}
 	}
 });
 
@@ -599,17 +632,13 @@ $(document).on("page-change", function() {
 
 
 frappe.ready(function() {
-	frappe.call({
-		method: 'frappe.website.doctype.website_settings.website_settings.is_chat_enabled',
-		callback: (r) => {
-			if (r.message) {
-				frappe.require(['/assets/js/moment-bundle.min.js', "/assets/css/frappe-chat-web.css", "/assets/frappe/js/lib/socket.io.min.js"], () => {
-					frappe.require('/assets/js/chat.js', () => {
-						frappe.chat.setup();
-					});
-				});
-			}
-		}
-	});
+	frappe.show_language_picker();
+	if (window.is_chat_enabled) {
+		frappe.require(['/assets/js/moment-bundle.min.js', "/assets/css/frappe-chat-web.css", "/assets/frappe/js/lib/socket.io.min.js"], () => {
+			frappe.require('/assets/js/chat.js', () => {
+				frappe.chat.setup();
+			});
+		});
+	}
 	frappe.socketio.init(window.socketio_port);
 });

From 46d68e252f03d4d7856ce85566938bd6c76cd3b3 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 19 Apr 2021 20:01:52 +0530
Subject: [PATCH 056/106] fix: id_token format

decode bytes to utf-8 string
---
 frappe/integrations/oauth2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py
index c444964a16..3ebaaffcff 100644
--- a/frappe/integrations/oauth2.py
+++ b/frappe/integrations/oauth2.py
@@ -133,7 +133,7 @@ def get_token(*args, **kwargs):
 			}
 
 			id_token_encoded = jwt.encode(id_token, client_secret, algorithm='HS256', headers=id_token_header)
-			out.update({"id_token": str(id_token_encoded)})
+			out.update({"id_token": frappe.safe_decode(id_token_encoded)})
 
 		frappe.local.response = out
 

From e21b1e40c4aae7134e414afa127fe7de9a748c08 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Mon, 19 Apr 2021 23:27:38 +0530
Subject: [PATCH 057/106] fix: whitelist login method to fetch session remotely

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

diff --git a/frappe/auth.py b/frappe/auth.py
index ca97bbc17d..73cb8e8c15 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -120,6 +120,7 @@ class LoginManager:
 				self.make_session()
 				self.set_user_info()
 
+	@frappe.whitelist()
 	def login(self):
 		# clear cache
 		frappe.clear_cache(user = frappe.form_dict.get('usr'))

From a19207c2f12162aafb19752176dcee412fc0a67b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 20 Apr 2021 14:21:25 +0530
Subject: [PATCH 058/106] fix: Pass aggregate_on_doctype to properly create the
 query

---
 frappe/desk/reportview.py                       | 13 +++++++------
 frappe/public/js/frappe/ui/group_by/group_by.js |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 3d04c171a7..86f8ec0aa7 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -126,13 +126,14 @@ def setup_group_by(data):
 	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')
+		if frappe.db.has_column(data.aggregate_on_doctype, data.aggregate_on_field):
+			data.fields.append('{aggregate_function}(`tab{aggregate_on_doctype}`.`{aggregate_on_field}`) AS _aggregate_column'.format(**data))
+		else:
+			raise_invalid_field(data.aggregate_on_field)
+
+		data.pop('aggregate_on_doctype')
+		data.pop('aggregate_on_field')
 		data.pop('aggregate_function')
 
 def raise_invalid_field(fieldname):
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 53e4914f0d..3ebf9c9d3d 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -313,7 +313,8 @@ frappe.ui.GroupBy = class {
 
 			Object.assign(args, {
 				with_comment_count: false,
-				aggregate_on: this.aggregate_on || 'name',
+				aggregate_on_field: this.aggregate_on_field || 'name',
+				aggregate_on_doctype: this.aggregate_on_doctype || this.doctype,
 				aggregate_function: this.aggregate_function || 'count',
 				group_by: this.report_view.group_by || null,
 				order_by: '_aggregate_column desc',

From b7e75e5305d247c592efba7a601726ba250108c9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 20 Apr 2021 14:36:41 +0530
Subject: [PATCH 059/106] fix: aggregate column in auto email report

---
 frappe/core/doctype/report/report.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index af2c4e5dc2..8a0f9a99f5 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -325,9 +325,8 @@ def get_group_by_field(args, doctype):
 	if args['aggregate_function'] == 'count':
 		group_by_field = 'count(*) as _aggregate_column'
 	else:
-		group_by_field = '{0}(`tab{1}`.{2}) as _aggregate_column'.format(
+		group_by_field = '{0}({1}) as _aggregate_column'.format(
 			args.aggregate_function,
-			doctype,
 			args.aggregate_on
 		)
 

From 06ea52b9647781a888733766457f9807b7017d0e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 20 Apr 2021 14:54:40 +0530
Subject: [PATCH 060/106] fix(treeview): Accept filters as kwargs to avoid
 TypeError (#12920)

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

diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index d479b71b52..6f0d7d3d5f 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -36,7 +36,7 @@ def get_all_nodes(doctype, label, parent, tree_method, **filters):
 	return out
 
 @frappe.whitelist()
-def get_children(doctype, parent=''):
+def get_children(doctype, parent='', **filters):
 	return _get_children(doctype, parent)
 
 def _get_children(doctype, parent='', ignore_permissions=False):

From d47870d449ae3bec3deef739858ba6b3718b217c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 14:57:03 +0530
Subject: [PATCH 061/106] fix: whitelist login method to fetch session id
 remotely (backport #12913) (#12916)

(cherry picked from commit e21b1e40c4aae7134e414afa127fe7de9a748c08)

Co-authored-by: Abhishek Balam <abhishekbalam96@gmail.com>
---
 frappe/auth.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/auth.py b/frappe/auth.py
index ca97bbc17d..73cb8e8c15 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -120,6 +120,7 @@ class LoginManager:
 				self.make_session()
 				self.set_user_info()
 
+	@frappe.whitelist()
 	def login(self):
 		# clear cache
 		frappe.clear_cache(user = frappe.form_dict.get('usr'))

From c5c5da51a24c04035131d7f1ab959ed8d51d693a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 14:57:28 +0530
Subject: [PATCH 062/106] fix(treeview): Accept filters as kwargs to avoid
 TypeError (backport #12920) (#12921)

(cherry picked from commit 06ea52b9647781a888733766457f9807b7017d0e)

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

diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index 12fdb0dadc..29c9b0c30d 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -36,7 +36,7 @@ def get_all_nodes(doctype, label, parent, tree_method, **filters):
 	return out
 
 @frappe.whitelist()
-def get_children(doctype, parent=''):
+def get_children(doctype, parent='', **filters):
 	return _get_children(doctype, parent)
 
 def _get_children(doctype, parent='', ignore_permissions=False):

From 98f0aca0bbfaff34d2028446dc0a383def649058 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 15:01:28 +0530
Subject: [PATCH 063/106] fix: Pass aggregate_on_doctype to properly create the
 query (backport #12917) (#12922)

(cherry picked from commit a19207c2f12162aafb19752176dcee412fc0a67b)

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
---
 frappe/desk/reportview.py                       | 13 +++++++------
 frappe/public/js/frappe/ui/group_by/group_by.js |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 3d04c171a7..86f8ec0aa7 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -126,13 +126,14 @@ def setup_group_by(data):
 	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')
+		if frappe.db.has_column(data.aggregate_on_doctype, data.aggregate_on_field):
+			data.fields.append('{aggregate_function}(`tab{aggregate_on_doctype}`.`{aggregate_on_field}`) AS _aggregate_column'.format(**data))
+		else:
+			raise_invalid_field(data.aggregate_on_field)
+
+		data.pop('aggregate_on_doctype')
+		data.pop('aggregate_on_field')
 		data.pop('aggregate_function')
 
 def raise_invalid_field(fieldname):
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 53e4914f0d..3ebf9c9d3d 100644
--- a/frappe/public/js/frappe/ui/group_by/group_by.js
+++ b/frappe/public/js/frappe/ui/group_by/group_by.js
@@ -313,7 +313,8 @@ frappe.ui.GroupBy = class {
 
 			Object.assign(args, {
 				with_comment_count: false,
-				aggregate_on: this.aggregate_on || 'name',
+				aggregate_on_field: this.aggregate_on_field || 'name',
+				aggregate_on_doctype: this.aggregate_on_doctype || this.doctype,
 				aggregate_function: this.aggregate_function || 'count',
 				group_by: this.report_view.group_by || null,
 				order_by: '_aggregate_column desc',

From 8aa26c728609f7e6277b5abf9f8d1592f288f320 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 20 Apr 2021 16:01:56 +0530
Subject: [PATCH 064/106] fix: Include all keys and sort by score

---
 .../doctype/server_script/server_script.js    |  2 +-
 .../doctype/server_script/server_script.py    | 40 +++++++++++++++----
 frappe/public/js/frappe/form/controls/code.js |  7 +---
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js
index e12200b6fc..dda39115bf 100644
--- a/frappe/core/doctype/server_script/server_script.js
+++ b/frappe/core/doctype/server_script/server_script.js
@@ -13,7 +13,7 @@ frappe.ui.form.on('Server Script', {
 		frm.call('get_autocompletion_items')
 			.then(r => r.message)
 			.then(items => {
-				frm.set_df_property('script', 'autocompletions', items)
+				frm.set_df_property('script', 'autocompletions', items);
 			});
 	},
 
diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py
index 6a8eb59c3a..ea27a2ac83 100644
--- a/frappe/core/doctype/server_script/server_script.py
+++ b/frappe/core/doctype/server_script/server_script.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 
 import ast
-from types import FunctionType, ModuleType
+from types import FunctionType, MethodType, ModuleType
 from typing import Dict, List
 
 import frappe
@@ -125,21 +125,47 @@ class ServerScript(Document):
 
 	@frappe.whitelist()
 	def get_autocompletion_items(self):
+		"""Generates a list of a autocompletion strings from the context dict
+		that is used while executing a Server Script.
+
+		Returns:
+			list: Returns list of autocompletion items.
+			For e.g., ["frappe.utils.cint", "frappe.db.get_all", ...]
+		"""
 		def get_keys(obj):
 			out = []
 			for key in obj:
 				if key.startswith('_'):
 					continue
 				value = obj[key]
-				if isinstance(value, (FunctionType, ModuleType)):
-					out.append(key)
-				elif isinstance(value, (NamespaceDict, dict)):
-					out += [f'{key}.{subkey}' for subkey in get_keys(value)]
+				if isinstance(value, (NamespaceDict, dict)) and value:
+					if key == 'form_dict':
+						out.append(['form_dict', 3])
+						continue
+					for subkey, score in get_keys(value):
+						fullkey = f'{key}.{subkey}'
+						out.append([fullkey, score])
+				else:
+					if isinstance(value, ModuleType):
+						score = 0
+					elif isinstance(value, (FunctionType, MethodType)):
+						score = 1
+					elif isinstance(value, type) and issubclass(value, Exception):
+						score = 9
+					elif isinstance(value, type):
+						score = 2
+					elif isinstance(value, dict):
+						score = 3
+					else:
+						score = 4
+					out.append([key, score])
 			return out
 
 		items = frappe.cache().get_value('server_script_autocompletion_items')
-		if not items:
-			items = get_keys(get_safe_globals())
+		if not items or True:
+			unsorted_items = get_keys(get_safe_globals())
+			sorted_items = sorted(unsorted_items, key=lambda k: k[1])
+			items = [d[0] for d in sorted_items]
 			frappe.cache().set_value('server_script_autocompletion_items', items)
 		return items
 
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 8d2609b836..635146563e 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -53,11 +53,10 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 		ace.config.loadModule("ace/ext/language_tools", langTools => {
 			this.editor.setOptions({
 				enableBasicAutocompletion: true,
-				enableSnippets: true,
 				enableLiveAutocompletion: true
 			});
 
-			let completer = {
+			langTools.addCompleter({
 				getCompletions: function(editor, session, pos, prefix, callback) {
 					if (prefix.length === 0) {
 						callback(null, []);
@@ -76,10 +75,8 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 						);
 					}
 				}
-			}
-			langTools.addCompleter(completer);
+			});
 		});
-
 		this._autocompletion_setup = true;
 	},
 

From 8ca7ba6b5619df286609624f94923a38ae9ca1dd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 20 Apr 2021 16:08:11 +0530
Subject: [PATCH 065/106] fix: remove hardcoded value

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

diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py
index ea27a2ac83..b791997a8b 100644
--- a/frappe/core/doctype/server_script/server_script.py
+++ b/frappe/core/doctype/server_script/server_script.py
@@ -162,7 +162,7 @@ class ServerScript(Document):
 			return out
 
 		items = frappe.cache().get_value('server_script_autocompletion_items')
-		if not items or True:
+		if not items:
 			unsorted_items = get_keys(get_safe_globals())
 			sorted_items = sorted(unsorted_items, key=lambda k: k[1])
 			items = [d[0] for d in sorted_items]

From c309cb2d29d1dd791632d37cf5d5952728440703 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 20 Apr 2021 16:23:20 +0530
Subject: [PATCH 066/106] fix: Pass score to ace to let it handle sorting

---
 .../doctype/server_script/server_script.py    | 19 +++++++++----------
 frappe/public/js/frappe/form/controls/code.js | 16 ++++++++++------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py
index b791997a8b..f80a067cf1 100644
--- a/frappe/core/doctype/server_script/server_script.py
+++ b/frappe/core/doctype/server_script/server_script.py
@@ -140,32 +140,31 @@ class ServerScript(Document):
 				value = obj[key]
 				if isinstance(value, (NamespaceDict, dict)) and value:
 					if key == 'form_dict':
-						out.append(['form_dict', 3])
+						out.append(['form_dict', 7])
 						continue
 					for subkey, score in get_keys(value):
 						fullkey = f'{key}.{subkey}'
 						out.append([fullkey, score])
 				else:
-					if isinstance(value, ModuleType):
+					if isinstance(value, type) and issubclass(value, Exception):
 						score = 0
+					elif isinstance(value, ModuleType):
+						score = 10
 					elif isinstance(value, (FunctionType, MethodType)):
-						score = 1
-					elif isinstance(value, type) and issubclass(value, Exception):
 						score = 9
 					elif isinstance(value, type):
-						score = 2
+						score = 8
 					elif isinstance(value, dict):
-						score = 3
+						score = 7
 					else:
-						score = 4
+						score = 6
 					out.append([key, score])
 			return out
 
 		items = frappe.cache().get_value('server_script_autocompletion_items')
 		if not items:
-			unsorted_items = get_keys(get_safe_globals())
-			sorted_items = sorted(unsorted_items, key=lambda k: k[1])
-			items = [d[0] for d in sorted_items]
+			items = get_keys(get_safe_globals())
+			items = [{'value': d[0], 'score': d[1]} for d in items]
 			frappe.cache().set_value('server_script_autocompletion_items', items)
 		return items
 
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 635146563e..33579b3b88 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -66,12 +66,16 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 					if (autocompletions.length) {
 						callback(
 							null,
-							autocompletions.map(a => ({
-								name: 'frappe',
-								value: a,
-								score: 100,
-								meta: 'Frappe API'
-							}))
+							autocompletions.map(a => {
+								if (typeof a === 'string') {
+									a = { value: a };
+								}
+								return {
+									name: 'frappe',
+									value: a.value,
+									score: a.score
+								}
+							})
 						);
 					}
 				}

From ec0c628c84bbb7481318f37e86f26c4231d03e8f Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 20 Apr 2021 21:39:59 +0530
Subject: [PATCH 067/106] fix: Get defaults from user_defaults based on
 fieldname

---
 frappe/public/js/frappe/model/create_new.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index dc6ee56fca..1b09a451eb 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -177,7 +177,9 @@ $.extend(frappe.model, {
 						// Use User Permission value when only when it has a single value
 						user_default = user_defaults[0];
 					}
-				} else if (!user_default) {
+				}
+				
+				if (!user_default) {
 					user_default = frappe.defaults.get_user_default(df.fieldname);
 				} else if (
 					!user_default &&

From 0dcf02c114f407bf5b8c8f1d0d46f3cffcbd5c36 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 20 Apr 2021 21:41:39 +0530
Subject: [PATCH 068/106] fix: Resolve value in promise while validating link
 field

---
 frappe/public/js/frappe/form/controls/link.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 1a483c5968..1377ecc9ae 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -462,9 +462,10 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 				if(this.frm && this.frm.fetch_dict[df.fieldname]) {
 					fetch = this.frm.fetch_dict[df.fieldname].columns.join(', ');
 				}
-
 				// if default and no fetch, no need to validate
-				if (!fetch && df.__default_value && df.__default_value===value) return value;
+				if (!fetch && df.__default_value && df.__default_value===value) {
+					resolve(value);
+				};
 
 				this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch);
 			});

From 273e6b01db9f4c62e6f71b582da8eaaa97ca52b8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 20 Apr 2021 21:46:20 +0530
Subject: [PATCH 069/106] style: missing semicolon

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

diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 33579b3b88..9600763588 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -74,7 +74,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
 									name: 'frappe',
 									value: a.value,
 									score: a.score
-								}
+								};
 							})
 						);
 					}

From e784828fe0c0f32a9fb6f900548e68f3d4cc5e50 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 20 Apr 2021 22:03:43 +0530
Subject: [PATCH 070/106] style(sider): Remove unnecessary semicolon

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

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 1377ecc9ae..c0ff128088 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -465,7 +465,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 				// if default and no fetch, no need to validate
 				if (!fetch && df.__default_value && df.__default_value===value) {
 					resolve(value);
-				};
+				}
 
 				this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch);
 			});

From 09b0097e48bb8ead37a4d560ab8d72bc985cd9d9 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 22:09:43 +0530
Subject: [PATCH 071/106] fix: Get defaults from user_defaults based on
 fieldname (backport #12924) (#12927)

(cherry picked from commit ec0c628c84bbb7481318f37e86f26c4231d03e8f)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
---
 frappe/public/js/frappe/model/create_new.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/model/create_new.js b/frappe/public/js/frappe/model/create_new.js
index dc6ee56fca..1b09a451eb 100644
--- a/frappe/public/js/frappe/model/create_new.js
+++ b/frappe/public/js/frappe/model/create_new.js
@@ -177,7 +177,9 @@ $.extend(frappe.model, {
 						// Use User Permission value when only when it has a single value
 						user_default = user_defaults[0];
 					}
-				} else if (!user_default) {
+				}
+				
+				if (!user_default) {
 					user_default = frappe.defaults.get_user_default(df.fieldname);
 				} else if (
 					!user_default &&

From 96bfeb63c3ef49c722c718b26be5c94df2a8e3fc Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 22:26:34 +0530
Subject: [PATCH 072/106] fix: Resolve value in promise while validating link
 field (backport #12925) (#12929)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/form/controls/link.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 1a483c5968..c0ff128088 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -462,9 +462,10 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 				if(this.frm && this.frm.fetch_dict[df.fieldname]) {
 					fetch = this.frm.fetch_dict[df.fieldname].columns.join(', ');
 				}
-
 				// if default and no fetch, no need to validate
-				if (!fetch && df.__default_value && df.__default_value===value) return value;
+				if (!fetch && df.__default_value && df.__default_value===value) {
+					resolve(value);
+				}
 
 				this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch);
 			});

From 87d8666c60bfdf3ea6c1ef375a99cb9db8bd3a2c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 21 Apr 2021 11:42:01 +0530
Subject: [PATCH 073/106] fix: Handle error while session start (#12933)

- The occurs randomly at the time of boot
---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index cab9b0da76..55cafa917a 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -975,7 +975,7 @@ def get_pymodule_path(modulename, *joins):
 	:param *joins: Join additional path elements using `os.path.join`."""
 	if not "public" in joins:
 		joins = [scrub(part) for part in joins]
-	return os.path.join(os.path.dirname(get_module(scrub(modulename)).__file__), *joins)
+	return os.path.join(os.path.dirname(get_module(scrub(modulename)).__file__ or ''), *joins)
 
 def get_module_list(app_name):
 	"""Get list of modules for given all via `app/modules.txt`."""

From bc95dc277c3ba12c29e4987ff0e435fe87ca984d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 21 Apr 2021 11:43:34 +0530
Subject: [PATCH 074/106] chore: Add release notes for v13.1.0 (#12932)

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

diff --git a/frappe/change_log/v13/v13_1_0.md b/frappe/change_log/v13/v13_1_0.md
new file mode 100644
index 0000000000..87c3bd0906
--- /dev/null
+++ b/frappe/change_log/v13/v13_1_0.md
@@ -0,0 +1,22 @@
+# Version 13.1.0 Release Notes
+
+### Features & Enhancements
+
+- Automated mail notifications will be shown in timeline ([#12693](https://github.com/frappe/frappe/pull/12693))
+- Introduced Client Script for List views ([#12590](https://github.com/frappe/frappe/pull/12590))
+- Introduced language switcher for guest users on website navbar ([#12813](https://github.com/frappe/frappe/pull/12813))
+- Option to give submit permission while sharing a document ([#12799](https://github.com/frappe/frappe/pull/12799))
+- Added option to set `autoname` in Customize Form ([#12413](https://github.com/frappe/frappe/pull/12413))
+- Virtual DocType ([#12121](https://github.com/frappe/frappe/pull/12121))
+
+### Fixes
+
+- Workspace fixes ([#12650](https://github.com/frappe/frappe/pull/12650)) ([#12655](https://github.com/frappe/frappe/pull/12655)) ([#12869](https://github.com/frappe/frappe/pull/12869))
+- Fixed an issue where select options were not getting updated in Grid ([#12839](https://github.com/frappe/frappe/pull/12839))
+- Webform Fixes ([#12630](https://github.com/frappe/frappe/pull/12630)) ([#12756](https://github.com/frappe/frappe/pull/12756)) ([#12819](https://github.com/frappe/frappe/pull/12819))
+- Fixed timespan filter for next and last timespans ([#12509](https://github.com/frappe/frappe/pull/12509))
+- System Notification fixes ([#12719](https://github.com/frappe/frappe/pull/12719))
+- Design Fixes ([#12669](https://github.com/frappe/frappe/pull/12669)) ([#12591](https://github.com/frappe/frappe/pull/12591)) ([#12557](https://github.com/frappe/frappe/pull/12557)) ([#12751](https://github.com/frappe/frappe/pull/12751)) ([#12864](https://github.com/frappe/frappe/pull/12864))
+- Fixed Multi-column paste in grid ([#12861](https://github.com/frappe/frappe/pull/12861))
+- Fixed grid validation ([#12744](https://github.com/frappe/frappe/pull/12744))
+- Fixed currency value formatting in dashboard chart ([#12613](https://github.com/frappe/frappe/pull/12613))

From d296688b35480fc3b7d3c4d9a45bcd5eca29ae3e Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 11:43:47 +0530
Subject: [PATCH 075/106] fix: Handle error while session start (backport
 #12933) (#12934)

- The occurs randomly at the time of boot

(cherry picked from commit 87d8666c60bfdf3ea6c1ef375a99cb9db8bd3a2c)

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 4e7017d8fe..5f66d2d0e5 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -966,7 +966,7 @@ def get_pymodule_path(modulename, *joins):
 	:param *joins: Join additional path elements using `os.path.join`."""
 	if not "public" in joins:
 		joins = [scrub(part) for part in joins]
-	return os.path.join(os.path.dirname(get_module(scrub(modulename)).__file__), *joins)
+	return os.path.join(os.path.dirname(get_module(scrub(modulename)).__file__ or ''), *joins)
 
 def get_module_list(app_name):
 	"""Get list of modules for given all via `app/modules.txt`."""

From 1ce0b898871bd5c35d18c48aabd9c90ffaa3fffa Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Wed, 21 Apr 2021 12:15:54 +0530
Subject: [PATCH 076/106] fix: Ignore non utf-8 files for translation scan
 (#12935)

---
 frappe/translate.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index a65a1c28c1..3565bbc32c 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -518,8 +518,13 @@ def get_messages_from_file(path):
 	apps_path = get_bench_dir()
 	if os.path.exists(path):
 		with open(path, 'r') as sourcefile:
+			try:
+				file_contents = sourcefile.read()
+			except Exception:
+				print("Could not scan file for translation: {0}".format(path))
+				return []
 			data = [(os.path.relpath(path, apps_path), message, context, line) \
-				for line, message, context in  extract_messages_from_code(sourcefile.read())]
+				for line, message, context in extract_messages_from_code(file_contents)]
 			return data
 	else:
 		# print "Translate: {0} missing".format(os.path.abspath(path))

From eae7f74d1e8ec7d2770e05cd5cd3e2c9da8c79ea Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 21 Apr 2021 12:18:11 +0530
Subject: [PATCH 077/106] fix: Ignore non utf-8 files for translation scan
 (backport #12935) (#12936)

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 frappe/translate.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index a65a1c28c1..3565bbc32c 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -518,8 +518,13 @@ def get_messages_from_file(path):
 	apps_path = get_bench_dir()
 	if os.path.exists(path):
 		with open(path, 'r') as sourcefile:
+			try:
+				file_contents = sourcefile.read()
+			except Exception:
+				print("Could not scan file for translation: {0}".format(path))
+				return []
 			data = [(os.path.relpath(path, apps_path), message, context, line) \
-				for line, message, context in  extract_messages_from_code(sourcefile.read())]
+				for line, message, context in extract_messages_from_code(file_contents)]
 			return data
 	else:
 		# print "Translate: {0} missing".format(os.path.abspath(path))

From f4472cc3846b5ed4653348bda18859e56518e6af Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Wed, 21 Apr 2021 12:53:59 +0550
Subject: [PATCH 078/106] bumped to version 13.1.0

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 5f66d2d0e5..d323068d65 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-dev'
+__version__ = '13.1.0'
 
 __title__ = "Frappe Framework"
 

From acfa1c1cca561c8e4880b0eaf8e554158f1c5656 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 21 Apr 2021 14:44:26 +0530
Subject: [PATCH 079/106] fix: Use grid docfield list while creating row
 docfield copy

Previously, it was using doctype level docfield list
which did not had the updated docfields for a grid.
---
 frappe/public/js/frappe/form/grid_row.js | 1 +
 frappe/public/js/frappe/model/meta.js    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index e0fe1b3b54..4afa251c27 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -6,6 +6,7 @@ export default class GridRow {
 		this.on_grid_fields = [];
 		$.extend(this, opts);
 		if (this.doc && this.parent_df.options) {
+			frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
 			this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
 		}
 		this.columns = {};
diff --git a/frappe/public/js/frappe/model/meta.js b/frappe/public/js/frappe/model/meta.js
index c2fd6b1ae6..6ee9084adc 100644
--- a/frappe/public/js/frappe/model/meta.js
+++ b/frappe/public/js/frappe/model/meta.js
@@ -38,14 +38,14 @@ $.extend(frappe.meta, {
 		frappe.meta.docfield_list[df.parent].push(df);
 	},
 
-	make_docfield_copy_for: function(doctype, docname) {
+	make_docfield_copy_for: function(doctype, docname, docfield_list=null) {
 		var c = frappe.meta.docfield_copy;
 		if(!c[doctype])
 			c[doctype] = {};
 		if(!c[doctype][docname])
 			c[doctype][docname] = {};
 
-		var docfield_list = frappe.meta.docfield_list[doctype] || [];
+		docfield_list = docfield_list || frappe.meta.docfield_list[doctype] || [];
 		for(var i=0, j=docfield_list.length; i<j; i++) {
 			var df = docfield_list[i];
 			c[doctype][docname][df.fieldname || df.label] = copy_dict(df);

From 2128a0d766e97df6e8180c3744e1bc3024a244df Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Wed, 21 Apr 2021 15:22:41 +0530
Subject: [PATCH 080/106] ci: Fix coveralls (#12926)

---
 .github/workflows/ci-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 08a2823dca..363191fd05 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -151,7 +151,7 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           pip install coveralls==3.0.1
           pip install coverage==5.5
-          coveralls --service=github
+          coveralls --service=github-actions
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

From 4d552c241f7b9a2e6b9a5dfa9bd6d430a6f2cbac Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 22 Apr 2021 00:24:22 +0530
Subject: [PATCH 081/106] fix: Form Dashboard reference link (#12945)

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

diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js
index 9b6d15c1fc..c1c95d94cf 100644
--- a/frappe/public/js/frappe/form/dashboard.js
+++ b/frappe/public/js/frappe/form/dashboard.js
@@ -290,7 +290,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 		// bind links
 		transactions_area_body.find(".badge-link").on('click', function() {
-			me.open_document_list($(this).parent());
+			me.open_document_list($(this).closest('.document-link'));
 		});
 
 		// bind reports

From 6225f9b35eaa760e817793c2f42f40a1038d720e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 22 Apr 2021 00:41:13 +0530
Subject: [PATCH 082/106] fix(query): Use single quotes for string constant
 (#12948)

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

diff --git a/frappe/translate.py b/frappe/translate.py
index 3565bbc32c..5be41f3568 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -115,7 +115,7 @@ def get_dict(fortype, name=None):
 				messages.extend(get_server_messages(app))
 			messages = deduplicate_messages(messages)
 
-			messages += frappe.db.sql("""select "navbar", item_label from `tabNavbar Item` where item_label is not null""")
+			messages += frappe.db.sql("""select 'navbar', item_label from `tabNavbar Item` where item_label is not null""")
 			messages = get_messages_from_include_files()
 			messages += frappe.db.sql("select 'Print Format:', name from `tabPrint Format`")
 			messages += frappe.db.sql("select 'DocType:', name from tabDocType")

From 32d3f1f09986b139094eadb8c1319751294ee262 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 22 Apr 2021 01:12:38 +0530
Subject: [PATCH 083/106] fix: build-message-files command (#12950)

---
 frappe/translate.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index 5be41f3568..4baf4bdd89 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -606,11 +606,23 @@ def write_csv_file(path, app_messages, lang_dict):
 	from csv import writer
 	with open(path, 'w', newline='') as msgfile:
 		w = writer(msgfile, lineterminator='\n')
-		for p, m in app_messages:
-			t = lang_dict.get(m, '')
+
+		for app_message in app_messages:
+			context = None
+			if len(app_message) == 2:
+				path, message = app_message
+			elif len(app_message) == 3:
+				path, message, lineno = app_message
+			elif len(app_message) == 4:
+				path, message, context, lineno = app_message
+			else:
+				continue
+
+			t = lang_dict.get(message, '')
 			# strip whitespaces
-			t = re.sub('{\s?([0-9]+)\s?}', "{\g<1>}", t)
-			w.writerow([p if p else '', m, t])
+			translated_string = re.sub('{\s?([0-9]+)\s?}', "{\g<1>}", t)
+			if translated_string:
+				w.writerow([message, translated_string, context])
 
 def get_untranslated(lang, untranslated_file, get_all=False):
 	"""Returns all untranslated strings for a language and writes in a file

From 976ebd5b2c2d4188db1bfe38b29f9badd709eb5b Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 22 Apr 2021 06:03:35 +0530
Subject: [PATCH 084/106] fix: Check if path is a module first then function

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

diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py
index 42ab267381..a77eca4977 100644
--- a/frappe/utils/jinja.py
+++ b/frappe/utils/jinja.py
@@ -149,7 +149,11 @@ def get_jinja_hooks():
 	def get_obj_dict_from_paths(object_paths):
 		out = {}
 		for obj_path in object_paths:
-			obj = frappe.get_attr(obj_path)
+			try:
+				obj = frappe.get_module(obj_path)
+			except ModuleNotFoundError:
+				obj = frappe.get_attr(obj_path)
+
 			if isinstance(obj, ModuleType):
 				functions = getmembers(obj, isfunction)
 				for function_name, function in functions:

From 1a30e11b5f54cb7f13309ae3851c3e7f3394d7ab Mon Sep 17 00:00:00 2001
From: Anand Chitipothu <anandology@gmail.com>
Date: Thu, 22 Apr 2021 09:01:59 +0530
Subject: [PATCH 085/106] fix: Invalid HTML generated by the base template
 (#12953)

Closes #12952
---
 frappe/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 78aa573c99..d59c4b0f2b 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -60,7 +60,7 @@
 		window.is_chat_enabled = {{ chat_enable }};
 	</script>
 </head>
-<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="{{ body_class or ''}}">
+<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {%- endif %} class="{{ body_class or ''}}">
 	{% include "public/icons/timeless/symbol-defs.svg" %}
 	{%- block banner -%}
 		{% include "templates/includes/banner_extension.html" ignore missing %}

From edf92d4450b95fab8cce11e809570597c24ec167 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Thu, 22 Apr 2021 12:41:31 +0530
Subject: [PATCH 086/106] fix(cli): Trigger Scheduler Event (#12955)

* Triggers events via Scheduled Job Type's execute method
* Exits with code 1 if no event with that name found or process
termination
* Added feedback if event not found
---
 frappe/commands/scheduler.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/frappe/commands/scheduler.py b/frappe/commands/scheduler.py
index bd9c9d2cb0..e9638800cd 100755
--- a/frappe/commands/scheduler.py
+++ b/frappe/commands/scheduler.py
@@ -18,22 +18,33 @@ def _is_scheduler_enabled():
 
 	return enable_scheduler
 
-@click.command('trigger-scheduler-event')
-@click.argument('event')
+
+@click.command("trigger-scheduler-event", help="Trigger a scheduler event")
+@click.argument("event")
 @pass_context
 def trigger_scheduler_event(context, event):
-	"Trigger a scheduler event"
 	import frappe.utils.scheduler
+
+	exit_code = 0
+
 	for site in context.sites:
 		try:
 			frappe.init(site=site)
 			frappe.connect()
-			frappe.utils.scheduler.trigger(site, event, now=True)
+			try:
+				frappe.get_doc("Scheduled Job Type", {"method": event}).execute()
+			except frappe.DoesNotExistError:
+				click.secho(f"Event {event} does not exist!", fg="red")
+				exit_code = 1
 		finally:
 			frappe.destroy()
+
 	if not context.sites:
 		raise SiteNotSpecifiedError
 
+	sys.exit(exit_code)
+
+
 @click.command('enable-scheduler')
 @pass_context
 def enable_scheduler(context):

From 165607565ee29985490c6f3f059e0c6f6a05ad61 Mon Sep 17 00:00:00 2001
From: shariquerik <sharique.rik@gmail.com>
Date: Thu, 22 Apr 2021 12:43:30 +0530
Subject: [PATCH 087/106] fix: Hide grid Add Row & Add Multiple buttons when
 document grid is not editable

---
 frappe/public/js/frappe/form/grid.js          | 2 ++
 frappe/public/js/frappe/form/grid_row.js      | 4 ++--
 frappe/public/js/frappe/form/grid_row_form.js | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 86feefed7a..30a3597ec7 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -387,6 +387,8 @@ export default class Grid {
 			this.wrapper.find('.grid-footer').toggle(false);
 		}
 
+		this.wrapper.find('.grid-add-row, .grid-add-multiple-rows').toggle(this.is_editable())
+
 	}
 
 	truncate_rows() {
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 4afa251c27..08267112de 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -558,10 +558,10 @@ export default class GridRow {
 		// this.form_panel.toggle(true);
 
 		if (this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows)) {
-			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row, .grid-append-row')
 				.addClass('hidden');
 		} else {
-			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row')
+			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row, .grid-append-row')
 				.removeClass('hidden');
 		}
 
diff --git a/frappe/public/js/frappe/form/grid_row_form.js b/frappe/public/js/frappe/form/grid_row_form.js
index 68e4178ae7..f5a4af206f 100644
--- a/frappe/public/js/frappe/form/grid_row_form.js
+++ b/frappe/public/js/frappe/form/grid_row_form.js
@@ -119,7 +119,7 @@ export default class GridRowForm {
 		});
 	}
 	toggle_add_delete_button_display($parent) {
-		$parent.find(".row-actions")
+		$parent.find(".row-actions, .grid-append-row")
 			.toggle(this.row.grid.is_editable());
 	}
 	refresh_field(fieldname) {

From 9d3be5160fc21eaefcb655aa5ca38bc51e18b424 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Thu, 22 Apr 2021 12:24:12 +0530
Subject: [PATCH 088/106] perf: low priority for backup processes

---
 frappe/utils/__init__.py | 13 +++++++++++--
 frappe/utils/backups.py  | 14 ++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index efa69d4453..251a095343 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -307,14 +307,23 @@ def unesc(s, esc_chars):
 		s = s.replace(esc_str, c)
 	return s
 
-def execute_in_shell(cmd, verbose=0):
+def execute_in_shell(cmd, verbose=0, low_priority=False):
 	# using Popen instead of os.system - as recommended by python docs
 	import tempfile
 	from subprocess import Popen
 
 	with tempfile.TemporaryFile() as stdout:
 		with tempfile.TemporaryFile() as stderr:
-			p = Popen(cmd, shell=True, stdout=stdout, stderr=stderr)
+			kwargs = {
+				"shell": True,
+				"stdout": stdout,
+				"stderr": stderr
+			}
+
+			if low_priority:
+				kwargs["preexec_fn"] = lambda: os.nice(10)
+
+			p = Popen(cmd, **kwargs)
 			p.wait()
 
 			stdout.seek(0)
diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 9a6747a0cf..90a6b94ff0 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -315,8 +315,6 @@ class BackupGenerator:
 			print(template.format(_type.title(), info["path"], info["size"]))
 
 	def backup_files(self):
-		import subprocess
-
 		for folder in ("public", "private"):
 			files_path = frappe.get_site_path(folder, "files")
 			backup_path = (
@@ -327,12 +325,12 @@ class BackupGenerator:
 				cmd_string = "tar cf - {1} | gzip > {0}"
 			else:
 				cmd_string = "tar -cf {0} {1}"
-			output = subprocess.check_output(
-				cmd_string.format(backup_path, files_path), shell=True
-			)
 
-			if self.verbose and output:
-				print(output.decode("utf8"))
+			frappe.utils.execute_in_shell(
+				cmd_string.format(backup_path, files_path),
+				verbose=self.verbose,
+				low_priority=True
+			)
 
 	def copy_site_config(self):
 		site_config_backup_path = self.backup_path_conf
@@ -436,7 +434,7 @@ class BackupGenerator:
 		if self.verbose:
 			print(command + "\n")
 
-		err, out = frappe.utils.execute_in_shell(command)
+		err, out = frappe.utils.execute_in_shell(command, low_priority=True)
 
 	def send_email(self):
 		"""

From ab3be339fdc6c6aef314f46e6bcb73e0f1cb8a6b Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Thu, 22 Apr 2021 12:56:21 +0530
Subject: [PATCH 089/106] fix: remove unsused variables

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

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 90a6b94ff0..b21efc5e89 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -434,7 +434,7 @@ class BackupGenerator:
 		if self.verbose:
 			print(command + "\n")
 
-		err, out = frappe.utils.execute_in_shell(command, low_priority=True)
+		frappe.utils.execute_in_shell(command, low_priority=True)
 
 	def send_email(self):
 		"""

From b4fa6d56df154f3b659a46243b2f73c733d85121 Mon Sep 17 00:00:00 2001
From: shariquerik <sharique.rik@gmail.com>
Date: Thu, 22 Apr 2021 13:34:45 +0530
Subject: [PATCH 090/106] refactor: Using toggle instead of
 addClass-removeClass

---
 frappe/public/js/frappe/form/grid.js     |  2 +-
 frappe/public/js/frappe/form/grid_row.js | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 30a3597ec7..4d381c9be7 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -387,7 +387,7 @@ export default class Grid {
 			this.wrapper.find('.grid-footer').toggle(false);
 		}
 
-		this.wrapper.find('.grid-add-row, .grid-add-multiple-rows').toggle(this.is_editable())
+		this.wrapper.find('.grid-add-row, .grid-add-multiple-rows').toggle(this.is_editable());
 
 	}
 
diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index 08267112de..9a689fabf4 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -557,13 +557,10 @@ export default class GridRow {
 		this.row.toggle(false);
 		// this.form_panel.toggle(true);
 
-		if (this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows)) {
-			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row, .grid-append-row')
-				.addClass('hidden');
-		} else {
-			this.wrapper.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row, .grid-append-row')
-				.removeClass('hidden');
-		}
+		let cannot_add_rows = this.grid.cannot_add_rows || (this.grid.df && this.grid.df.cannot_add_rows);
+		this.wrapper
+			.find('.grid-insert-row-below, .grid-insert-row, .grid-duplicate-row, .grid-append-row')
+			.toggle(!cannot_add_rows);
 
 		frappe.dom.freeze("", "dark");
 		if (cur_frm) cur_frm.cur_grid = this;

From 162f191b7727bc2b8359aff2fcf5efe849d35e4a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 22 Apr 2021 14:21:05 +0530
Subject: [PATCH 091/106] fix(control): Check if same value is set to avoid
 unnecessary change trigger

---
 .eslintrc                                             | 1 +
 frappe/public/js/frappe/form/controls/base_control.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index d123023a68..8a509f0df4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -143,6 +143,7 @@
 		"Cypress": true,
 		"cy": true,
 		"it": true,
+		"describe": true,
 		"expect": true,
 		"context": true,
 		"before": true,
diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index 9981398b84..b17ce973ec 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -159,9 +159,10 @@ frappe.ui.form.Control = Class.extend({
 	},
 	validate_and_set_in_model: function(value, e) {
 		var me = this;
-		if(this.inside_change_event) {
+		if (this.inside_change_event || this.get_model_value() === value) {
 			return Promise.resolve();
 		}
+
 		this.inside_change_event = true;
 		var set = function(value) {
 			me.inside_change_event = false;

From d61f5afcdd1b71d9d7bc3c261369626e79fd550c Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 22 Apr 2021 15:53:52 +0530
Subject: [PATCH 092/106] ci: Set COVERALLS_SERVICE_NAME as github (#12961)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .github/workflows/ci-tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 363191fd05..d2a00ab05f 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -151,7 +151,8 @@ jobs:
           cd ${GITHUB_WORKSPACE}
           pip install coveralls==3.0.1
           pip install coverage==5.5
-          coveralls --service=github-actions
+          coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
+          COVERALLS_SERVICE_NAME: github

From 1ef4a58aa8b4720592124b991051363f1a98a2a2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 22 Apr 2021 15:59:33 +0530
Subject: [PATCH 093/106] fix: Override get_model_value for table multiselect

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

diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index c306146f90..eb3f1bce6e 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -66,6 +66,10 @@ frappe.ui.form.ControlTableMultiSelect = frappe.ui.form.ControlLink.extend({
 		this._rows_list = this.rows.map(row => row[link_field.fieldname]);
 		return this.rows;
 	},
+	get_model_value() {
+		let value = this._super();
+		return value ? value.filter(d => !d.__islocal) : value;
+	},
 	validate(value) {
 		const rows = (value || []).slice();
 

From aaa165c7840959e54d2905f9e050b5a765211017 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 22 Apr 2021 17:00:55 +0530
Subject: [PATCH 094/106] fix: Show upgrade message in patch

- Will only be shown if the old style "jenv" hook is being used
---
 frappe/patches.txt                 |  1 +
 frappe/patches/v13_0/jinja_hook.py | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 frappe/patches/v13_0/jinja_hook.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 516ddb6094..60c3112f4a 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -335,3 +335,4 @@ frappe.patches.v13_0.rename_list_view_setting_to_list_view_settings
 frappe.patches.v13_0.remove_twilio_settings
 frappe.patches.v12_0.rename_uploaded_files_with_proper_name
 frappe.patches.v13_0.queryreport_columns
+frappe.patches.v13_0.jinja_hook
diff --git a/frappe/patches/v13_0/jinja_hook.py b/frappe/patches/v13_0/jinja_hook.py
new file mode 100644
index 0000000000..3e9efc5896
--- /dev/null
+++ b/frappe/patches/v13_0/jinja_hook.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from click import secho
+
+def execute():
+	if frappe.get_hooks('jenv') or True:
+		print()
+		secho('WARNING: The hook "jenv" is deprecated. Follow the migration guide to use the new "jinja" hook.', fg='yellow')
+		secho('https://github.com/frappe/frappe/wiki/Migrating-to-Version-13', fg='yellow')
+		print()

From 87f3038272a33954437d50759caa05ec3916df12 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 22 Apr 2021 17:31:34 +0530
Subject: [PATCH 095/106] fix: remove hardcoding

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

diff --git a/frappe/patches/v13_0/jinja_hook.py b/frappe/patches/v13_0/jinja_hook.py
index 3e9efc5896..84ed6e6cff 100644
--- a/frappe/patches/v13_0/jinja_hook.py
+++ b/frappe/patches/v13_0/jinja_hook.py
@@ -6,7 +6,7 @@ import frappe
 from click import secho
 
 def execute():
-	if frappe.get_hooks('jenv') or True:
+	if frappe.get_hooks('jenv'):
 		print()
 		secho('WARNING: The hook "jenv" is deprecated. Follow the migration guide to use the new "jinja" hook.', fg='yellow')
 		secho('https://github.com/frappe/frappe/wiki/Migrating-to-Version-13', fg='yellow')

From c3b087643b4842d5c74654875f2bc157540b1a8f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 22 Apr 2021 23:31:51 +0530
Subject: [PATCH 096/106] fix: Use node.string to extract style and script

- node.text stopped working in beautifulsoup 4.9.x
---
 frappe/website/doctype/web_page/web_page.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py
index 86774c79c4..cce00564ff 100644
--- a/frappe/website/doctype/web_page/web_page.py
+++ b/frappe/website/doctype/web_page/web_page.py
@@ -242,11 +242,11 @@ def extract_script_and_style_tags(html):
 	styles = []
 
 	for script in soup.find_all('script'):
-		scripts.append(script.text)
+		scripts.append(script.string)
 		script.extract()
 
 	for style in soup.find_all('style'):
-		styles.append(style.text)
+		styles.append(style.string)
 		style.extract()
 
 	return str(soup), scripts, styles

From 5881c5dbecfa3a21f558c6d93985dd139c999b94 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@iwebnotes.com>
Date: Fri, 23 Apr 2021 09:04:34 +0530
Subject: [PATCH 097/106] ci(semgrep): add more rules, r/python.correctness
 (#12876)

* ci(semgrep): add more rules, r/python.correctness

- Added file for defining rules as per frappe data model:
frappe_correctness.yml
- Add rule for SQLi, with WARNING only for now
- Add rule file for UX
- WARNING | INFO do not fail the build now

* ci(semgrep): on_cancel, on_submit correctness rule

* ci(semgrep): split workflow in steps

* ci(semgrep): catch line breaks in _()

* chore: fix sider issue
---
 .../semgrep_rules/frappe_correctness.py       |  28 ++++
 .../semgrep_rules/frappe_correctness.yml      | 135 ++++++++++++++++++
 .github/helper/semgrep_rules/security.yml     |  15 ++
 .github/helper/semgrep_rules/translate.yml    |   3 +-
 .github/helper/semgrep_rules/ux.py            |  31 ++++
 .github/helper/semgrep_rules/ux.yml           |  15 ++
 .github/workflows/semgrep.yml                 |  14 +-
 7 files changed, 238 insertions(+), 3 deletions(-)
 create mode 100644 .github/helper/semgrep_rules/frappe_correctness.py
 create mode 100644 .github/helper/semgrep_rules/frappe_correctness.yml
 create mode 100644 .github/helper/semgrep_rules/ux.py
 create mode 100644 .github/helper/semgrep_rules/ux.yml

diff --git a/.github/helper/semgrep_rules/frappe_correctness.py b/.github/helper/semgrep_rules/frappe_correctness.py
new file mode 100644
index 0000000000..37889fbbb1
--- /dev/null
+++ b/.github/helper/semgrep_rules/frappe_correctness.py
@@ -0,0 +1,28 @@
+import frappe
+from frappe import _, flt
+
+from frappe.model.document import Document
+
+
+def on_submit(self):
+	if self.value_of_goods == 0:
+		frappe.throw(_('Value of goods cannot be 0'))
+	# ruleid: frappe-modifying-after-submit
+	self.status = 'Submitted'
+
+def on_submit(self):   # noqa
+	if flt(self.per_billed) < 100:
+		self.update_billing_status()
+	else:
+		# todook: frappe-modifying-after-submit
+		self.status = "Completed"
+		self.db_set("status", "Completed")
+
+class TestDoc(Document):
+	pass
+
+	def validate(self):
+		#ruleid: frappe-modifying-child-tables-while-iterating
+		for item in self.child_table:
+			if item.value < 0:
+				self.remove(item)
diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml
new file mode 100644
index 0000000000..faab3344a6
--- /dev/null
+++ b/.github/helper/semgrep_rules/frappe_correctness.yml
@@ -0,0 +1,135 @@
+# This file specifies rules for correctness according to how frappe doctype data model works.
+
+rules:
+- id: frappe-modifying-but-not-comitting
+  patterns:
+    - pattern: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+          ...
+          self.db_set(..., self.$ATTR, ...)
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.db_set(..., $SOME_VAR, ...)
+    - pattern-not: |
+        def $METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.save()
+    - metavariable-regex:
+        metavariable: '$ATTR'
+        # this is negative look-ahead, add more attrs to ignore like (ignore|ignore_this_too|ignore_me)
+        regex: '^(?!ignore_linked_doctypes|status_updater)(.*)$'
+    - metavariable-regex:
+        metavariable: "$METHOD"
+        regex: "(on_submit|on_cancel)"
+  message: |
+    DocType modified in self.$METHOD. Please check if modification of self.$ATTR is commited to database.
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-modifying-but-not-comitting-other-method
+  patterns:
+  - pattern: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+          ...
+          self.db_set(..., self.$ATTR, ...)
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = $SOME_VAR
+          ...
+          self.db_set(..., $SOME_VAR, ...)
+  - pattern-not: |
+      class $DOCTYPE(...):
+        def $METHOD(self, ...):
+          ...
+          self.$ANOTHER_METHOD()
+          ...
+          self.save()
+        def $ANOTHER_METHOD(self, ...):
+          ...
+          self.$ATTR = ...
+  - metavariable-regex:
+      metavariable: "$METHOD"
+      regex: "(on_submit|on_cancel)"
+  message: |
+    self.$ANOTHER_METHOD is called from self.$METHOD, check if changes to self.$ATTR are commited to database.
+  languages: [python]
+  severity: ERROR
+
+- id: frappe-print-function-in-doctypes
+  pattern: print(...)
+  message: |
+      Did you mean to leave this print statement in? Consider using msgprint or logger instead of print statement.
+  languages: [python]
+  severity: WARNING
+  paths:
+      exclude:
+        - test_*.py
+      include:
+        - "*/**/doctype/*"
+
+- id: frappe-modifying-child-tables-while-iterating
+  pattern-either:
+    - pattern: |
+        for $ROW in self.$TABLE:
+            ...
+            self.remove(...)
+    - pattern: |
+        for $ROW in self.$TABLE:
+            ...
+            self.append(...)
+  message: |
+      Child table being modified while iterating on it.
+  languages: [python]
+  severity: ERROR
+  paths:
+      include:
+        - "*/**/doctype/*"
+
+- id: frappe-same-key-assigned-twice
+  pattern-either:
+    - pattern: |
+        {..., $X: $A, ..., $X: $B, ...}
+    - pattern: |
+        dict(..., ($X, $A), ..., ($X, $B), ...)
+    - pattern: |
+        _dict(..., ($X, $A), ..., ($X, $B), ...)
+  message: |
+      key `$X` is uselessly assigned twice. This could be a potential bug.
+  languages: [python]
+  severity: ERROR
diff --git a/.github/helper/semgrep_rules/security.yml b/.github/helper/semgrep_rules/security.yml
index 1937fc0e52..b2cc4b16fc 100644
--- a/.github/helper/semgrep_rules/security.yml
+++ b/.github/helper/semgrep_rules/security.yml
@@ -12,3 +12,18 @@ rules:
     exclude:
       - frappe/__init__.py
       - frappe/commands/utils.py
+
+- id: frappe-sqli-format-strings
+  patterns:
+    - pattern-inside: |
+        @frappe.whitelist()
+        def $FUNC(...):
+            ...
+    - pattern-either:
+        - pattern: frappe.db.sql("..." % ...)
+        - pattern: frappe.db.sql(f"...", ...)
+        - pattern: frappe.db.sql("...".format(...), ...)
+  message: |
+      Detected use of raw string formatting for SQL queries. This can lead to sql injection vulnerabilities. Refer security guidelines - https://github.com/frappe/erpnext/wiki/Code-Security-Guidelines
+  languages: [python]
+  severity: WARNING
diff --git a/.github/helper/semgrep_rules/translate.yml b/.github/helper/semgrep_rules/translate.yml
index 3737da5a7e..df55089b9f 100644
--- a/.github/helper/semgrep_rules/translate.yml
+++ b/.github/helper/semgrep_rules/translate.yml
@@ -44,7 +44,8 @@ rules:
   pattern-either:
   - pattern: _(...) + ... + _(...)
   - pattern: _("..." + "...")
-  - pattern-regex: '_\([^\)]*\\\s*'
+  - pattern-regex: '_\([^\)]*\\\s*'    # lines broken by `\`
+  - pattern-regex: '_\(\s*\n'          # line breaks allowed by python for using ( )
   message: |
     Do not split strings inside translate function. Do not concatenate using translate functions.
     Please refer: https://frappeframework.com/docs/user/en/translations
diff --git a/.github/helper/semgrep_rules/ux.py b/.github/helper/semgrep_rules/ux.py
new file mode 100644
index 0000000000..4a74457435
--- /dev/null
+++ b/.github/helper/semgrep_rules/ux.py
@@ -0,0 +1,31 @@
+import frappe
+from frappe import msgprint, throw, _
+
+
+# ruleid: frappe-missing-translate-function
+throw("Error Occured")
+
+# ruleid: frappe-missing-translate-function
+frappe.throw("Error Occured")
+
+# ruleid: frappe-missing-translate-function
+frappe.msgprint("Useful message")
+
+# ruleid: frappe-missing-translate-function
+msgprint("Useful message")
+
+
+# ok: frappe-missing-translate-function
+translatedmessage = _("Hello")
+
+# ok: frappe-missing-translate-function
+throw(translatedmessage)
+
+# ok: frappe-missing-translate-function
+msgprint(translatedmessage)
+
+# ok: frappe-missing-translate-function
+msgprint(_("Helpful message"))
+
+# ok: frappe-missing-translate-function
+frappe.throw(_("Error occured"))
diff --git a/.github/helper/semgrep_rules/ux.yml b/.github/helper/semgrep_rules/ux.yml
new file mode 100644
index 0000000000..ed06a6a80c
--- /dev/null
+++ b/.github/helper/semgrep_rules/ux.yml
@@ -0,0 +1,15 @@
+rules:
+- id: frappe-missing-translate-function
+  pattern-either:
+  - patterns:
+      - pattern: frappe.msgprint("...", ...)
+      - pattern-not: frappe.msgprint(_("..."), ...)
+      - pattern-not: frappe.msgprint(__("..."), ...)
+  - patterns:
+      - pattern: frappe.throw("...", ...)
+      - pattern-not: frappe.throw(_("..."), ...)
+      - pattern-not: frappe.throw(__("..."), ...)
+  message: |
+      All user facing text must be wrapped in translate function. Please refer to translation documentation. https://frappeframework.com/docs/user/en/guides/basics/translations
+  languages: [python, javascript, json]
+  severity: ERROR
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index 1d5694f521..5092bf4705 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -14,9 +14,19 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - name: Run semgrep
+
+    - name: Setup semgrep
       run: |
         python -m pip install -q semgrep
         git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
+
+    - name: Semgrep errors
+      run: |
         files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
-        [[ -d .github/helper/semgrep_rules ]] && semgrep --config=.github/helper/semgrep_rules --quiet --error $files
+        [[ -d .github/helper/semgrep_rules ]] && semgrep --severity ERROR --config=.github/helper/semgrep_rules --quiet --error $files
+        semgrep --config="r/python.lang.correctness" --quiet --error $files
+
+    - name: Semgrep warnings
+      run: |
+        files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
+        [[ -d .github/helper/semgrep_rules ]] && semgrep --severity WARNING --severity INFO --config=.github/helper/semgrep_rules --quiet $files

From f911b2d9ce82d1fc8ef41c3c157af662145b1a77 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Fri, 23 Apr 2021 14:40:47 +0530
Subject: [PATCH 098/106] docs: add docker repo link in README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b00d291b96..e00bea7857 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,8 @@ Full-stack web application framework that uses Python and MariaDB on the server
 
 ### Installation
 
-[Install via Frappe Bench](https://github.com/frappe/bench)
+* [Install via Docker](https://github.com/frappe/frappe_docker)
+* [Install via Frappe Bench](https://github.com/frappe/bench)
 
 ## Contributing
 

From 669fead7991bb57a6c7996276850e62f4d56d7fe Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Fri, 23 Apr 2021 20:03:41 +0530
Subject: [PATCH 099/106] fix: Default values were not triggering change event
 (#12975)

---
 frappe/public/js/frappe/form/controls/base_control.js | 5 ++++-
 1 file changed, 4 insertions(+), 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 b17ce973ec..8c2c5c4338 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -159,7 +159,10 @@ frappe.ui.form.Control = Class.extend({
 	},
 	validate_and_set_in_model: function(value, e) {
 		var me = this;
-		if (this.inside_change_event || this.get_model_value() === value) {
+		let force_value_set = (this.doc && this.doc.__run_link_triggers);
+		let is_value_same = (this.get_model_value() === value);
+
+		if (this.inside_change_event || (!force_value_set && is_value_same)) {
 			return Promise.resolve();
 		}
 

From 2c7136761eefc976eb280b45d386ecd1d80f0dfc Mon Sep 17 00:00:00 2001
From: Saqib <nextchamp.saqib@gmail.com>
Date: Fri, 23 Apr 2021 20:35:55 +0530
Subject: [PATCH 100/106] fix: Currency labels in grids (#12974)

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

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index de9331a726..2b7562f836 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1203,8 +1203,7 @@ frappe.ui.form.Form = class FrappeForm {
 
 		$.each(grid_field_label_map, function(fname, label) {
 			fname = fname.split("-");
-			var df = frappe.meta.get_docfield(fname[0], fname[1], me.doc.name);
-			if(df) df.label = label;
+			me.fields_dict[parentfield].grid.update_docfield_property(fname[1], 'label', label);
 		});
 	}
 

From 796d241bb174f84e98873934668e3042f8139173 Mon Sep 17 00:00:00 2001
From: walstanb <walstanb@gmail.com>
Date: Sat, 24 Apr 2021 13:48:40 +0530
Subject: [PATCH 101/106] chore: frappe.whitelist for doc methods

---
 frappe/email/doctype/newsletter/newsletter.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index c792347c09..6412338e96 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -24,6 +24,7 @@ class Newsletter(WebsiteGenerator):
 		if self.send_from:
 			validate_email_address(self.send_from, True)
 
+	@frappe.whitelist()
 	def test_send(self, doctype="Lead"):
 		self.recipients = frappe.utils.split_emails(self.test_email_id)
 		self.queue_all(test_email=True)

From 0a0967e35ad458f877830887d5737651ed4fa6bc Mon Sep 17 00:00:00 2001
From: Fahim Ali Zain <faztp12@gmail.com>
Date: Fri, 23 Apr 2021 01:33:32 +0530
Subject: [PATCH 102/106] fix: multipart/form-data breaks with OAuth tokens

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

diff --git a/frappe/api.py b/frappe/api.py
index 6a09b795b0..54b4be6d2a 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -187,8 +187,10 @@ def validate_oauth(authorization_header):
 	access_token = {"access_token": token}
 	uri = parsed_url.scheme + "://" + parsed_url.netloc + parsed_url.path + "?" + urlencode(access_token)
 	http_method = req.method
-	body = req.get_data()
 	headers = req.headers
+	body = req.get_data()
+	if req.content_type and "multipart/form-data" in req.content_type:
+		body = None
 
 	try:
 		required_scopes = frappe.db.get_value("OAuth Bearer Token", token, "scopes").split(get_url_delimiter())

From 8de131dab29b69b33729240a66bc3483513dafc4 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Sun, 25 Apr 2021 11:00:52 +0530
Subject: [PATCH 103/106] refactor: Remove events to redraw charts (#12973)

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

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 01314b436f..0c36f013ec 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -25,7 +25,6 @@ export default class ChartWidget extends Widget {
 		delete this.dashboard_chart;
 		this.set_body();
 		this.make_chart();
-		this.setup_events();
 	}
 
 	set_chart_title() {
@@ -747,18 +746,4 @@ export default class ChartWidget extends Widget {
 				}
 			});
 	}
-
-	setup_events() {
-		$(document.body).on('toggleSidebar', () => {
-			this.dashboard_chart && this.dashboard_chart.draw(true);
-		});
-
-		$(document.body).on('toggleListSidebar', () => {
-			this.dashboard_chart && this.dashboard_chart.draw(true);
-		});
-
-		$(document.body).on('toggleFullWidth', () => {
-			this.dashboard_chart && this.dashboard_chart.draw(true);
-		});
-	}
 }

From 9070cdc73d7fac42435493cef596b2385dc0b124 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Mon, 26 Apr 2021 20:28:15 +0530
Subject: [PATCH 104/106] ci: fix coveralls (#12971)

* fix: add service

* Update ci-tests.yml

* Update ci-tests.yml

* fix: coverage version

* fix: coveralls

* Update requirements.txt

* fix: add service name env var

* ci: Set COVERALLS_SERVICE_NAME as github

* ci: add tokens

* Update ci-tests.yml

* ci: no rcfile

* fix: pin versions

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .github/workflows/ci-tests.yml | 4 ++--
 requirements.txt               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index d2a00ab05f..e21a1f7ac6 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -149,8 +149,8 @@ jobs:
         run: |
           cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
           cd ${GITHUB_WORKSPACE}
-          pip install coveralls==3.0.1
-          pip install coverage==5.5
+          pip install coveralls==2.2.0
+          pip install coverage==4.5.4
           coveralls --service=github
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/requirements.txt b/requirements.txt
index 91f235159f..193c5a86b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ boto3~=1.17.53
 braintree~=4.8.0
 chardet~=4.0.0
 Click~=7.1.2
-coverage~=5.5
+coverage~=4.5.4
 croniter~=1.0.11
 cryptography~=3.4.7
 dropbox~=11.7.0

From e7832b3198258aef54d019023720c52c3c4ec56c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 27 Apr 2021 11:36:52 +0530
Subject: [PATCH 105/106] fix: Freeze screen till the background request is
 complete

---
 frappe/public/js/frappe/views/kanban/kanban_board.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index bbc2051e4c..50f911c808 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -1,3 +1,5 @@
+// TODO: Refactor for better UX
+
 frappe.provide("frappe.views");
 
 (function() {
@@ -185,7 +187,7 @@ frappe.provide("frappe.views");
 						new_index: card.new_index,
 					};
 				}
-
+				frappe.dom.freeze();
 				frappe.call({
 					method: method_prefix + method_name,
 					args: args,
@@ -198,6 +200,7 @@ frappe.provide("frappe.views");
 							cards: cards,
 							columns: columns
 						});
+						frappe.dom.unfreeze();
 					}
 				}).fail(function() {
 					// revert original order
@@ -205,6 +208,7 @@ frappe.provide("frappe.views");
 						cards: _cards,
 						columns: _columns
 					});
+					frappe.dom.unfreeze();
 				});
 			},
 			update_order: function(updater) {

From b60bcdcac3a37ae560d1a162ad1d313bcfb52324 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:21:49 +0530
Subject: [PATCH 106/106] chore: Bump develop branch version to v14 (#13003)

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 1bcf47e986..5680ba86b5 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -34,7 +34,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '13.1.0'
+__version__ = '14.0.0-dev'
 
 __title__ = "Frappe Framework"