From a574c1ba88cd76d74065bfbcbf2c9c78dd208d0b Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Thu, 2 Dec 2021 23:20:40 +0530
Subject: [PATCH 01/36] chore: patching ValueWrapper

---
 frappe/query_builder/terms.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 frappe/query_builder/terms.py

diff --git a/frappe/query_builder/terms.py b/frappe/query_builder/terms.py
new file mode 100644
index 0000000000..c221dcb28e
--- /dev/null
+++ b/frappe/query_builder/terms.py
@@ -0,0 +1,27 @@
+from typing import Any, Optional, Dict
+from pypika.terms import ValueWrapper
+from pypika.utils import format_alias_sql
+
+
+class NamedParameterWrapper():
+	def __init__(self, parameters: Dict[str, Any]):
+		self.parameters = parameters
+
+	def update_parameters(self, param_key: Any, param_value: Any, **kwargs):
+		self.parameters[param_key[1:]] = param_value
+
+	def get_sql(self, **kwargs):
+		return f'@param{len(self.parameters) + 1}'
+
+
+class ParameterizedValueWrapper(ValueWrapper):
+	def get_sql(self, quote_char: Optional[str] = None, secondary_quote_char: str = "'", param_wrapper= None, **kwargs: Any) -> str:
+		if param_wrapper is None:
+			sql = self.get_value_sql(quote_char=quote_char, secondary_quote_char=secondary_quote_char, **kwargs)
+			return format_alias_sql(sql, self.alias, quote_char=quote_char, **kwargs)
+		else:
+			value_sql = self.get_value_sql(quote_char=quote_char, **kwargs)
+			param_sql = param_wrapper.get_sql(**kwargs)
+			param_wrapper.update_parameters(param_key=param_sql, param_value=value_sql, **kwargs)
+
+			return format_alias_sql(param_sql, self.alias, quote_char=quote_char, **kwargs)
\ No newline at end of file

From 9fdacedfc80889c81c4887c2f2f2581e5d0d56f6 Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Thu, 2 Dec 2021 23:23:25 +0530
Subject: [PATCH 02/36] feat: sanitise frappe.qb

---
 frappe/query_builder/__init__.py |  5 +++++
 frappe/query_builder/terms.py    |  8 ++++----
 frappe/query_builder/utils.py    | 14 ++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/frappe/query_builder/__init__.py b/frappe/query_builder/__init__.py
index 9c7432142f..06d499678f 100644
--- a/frappe/query_builder/__init__.py
+++ b/frappe/query_builder/__init__.py
@@ -1,2 +1,7 @@
+from frappe.query_builder.terms import ParameterizedValueWrapper
+import pypika
+
+pypika.terms.ValueWrapper = ParameterizedValueWrapper
+
 from pypika import *
 from frappe.query_builder.utils import Column, DocType, get_query_builder, patch_query_execute, patch_query_aggregation
diff --git a/frappe/query_builder/terms.py b/frappe/query_builder/terms.py
index c221dcb28e..c09d9595fb 100644
--- a/frappe/query_builder/terms.py
+++ b/frappe/query_builder/terms.py
@@ -1,4 +1,4 @@
-from typing import Any, Optional, Dict
+from typing import Any, List, Optional, Dict
 from pypika.terms import ValueWrapper
 from pypika.utils import format_alias_sql
 
@@ -8,10 +8,10 @@ class NamedParameterWrapper():
 		self.parameters = parameters
 
 	def update_parameters(self, param_key: Any, param_value: Any, **kwargs):
-		self.parameters[param_key[1:]] = param_value
+		self.parameters[param_key[2:-2]] = param_value
 
 	def get_sql(self, **kwargs):
-		return f'@param{len(self.parameters) + 1}'
+		return f'%(param{len(self.parameters) + 1})s'
 
 
 class ParameterizedValueWrapper(ValueWrapper):
@@ -20,7 +20,7 @@ class ParameterizedValueWrapper(ValueWrapper):
 			sql = self.get_value_sql(quote_char=quote_char, secondary_quote_char=secondary_quote_char, **kwargs)
 			return format_alias_sql(sql, self.alias, quote_char=quote_char, **kwargs)
 		else:
-			value_sql = self.get_value_sql(quote_char=quote_char, **kwargs)
+			value_sql = self.get_value_sql(quote_char=quote_char, **kwargs) if not isinstance(self.value,int) else self.value
 			param_sql = param_wrapper.get_sql(**kwargs)
 			param_wrapper.update_parameters(param_key=param_sql, param_value=value_sql, **kwargs)
 
diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py
index a7f52df012..7922825725 100644
--- a/frappe/query_builder/utils.py
+++ b/frappe/query_builder/utils.py
@@ -10,6 +10,7 @@ import frappe
 from .builder import MariaDB, Postgres
 from pypika.terms import PseudoColumn
 
+from frappe.query_builder.terms import NamedParameterWrapper
 
 class db_type_is(Enum):
 	MARIADB = "mariadb"
@@ -53,12 +54,16 @@ def patch_query_execute():
 	This excludes the use of `frappe.db.sql` method while
 	executing the query object
 	"""
-
 	def execute_query(query, *args, **kwargs):
-		query = str(query)
+		query, params = prepare_query(query)
+		return frappe.db.sql(query, params, *args, **kwargs)
+
+	def prepare_query(query):
+		params = {}
+		query = query.get_sql(param_wrapper = NamedParameterWrapper(params))
 		if frappe.flags.in_safe_exec and not query.lower().strip().startswith("select"):
 			raise frappe.PermissionError('Only SELECT SQL allowed in scripting')
-		return frappe.db.sql(query, *args, **kwargs)
+		return query, params
 
 	query_class = get_attr(str(frappe.qb).split("'")[1])
 	builder_class = get_type_hints(query_class._builder).get('return')
@@ -67,6 +72,7 @@ def patch_query_execute():
 		raise BuilderIdentificationFailed
 
 	builder_class.run = execute_query
+	builder_class.walk = prepare_query
 
 
 def patch_query_aggregation():
@@ -77,4 +83,4 @@ def patch_query_aggregation():
 	frappe.qb.max = _max
 	frappe.qb.min = _min
 	frappe.qb.avg = _avg
-	frappe.qb.sum = _sum
\ No newline at end of file
+	frappe.qb.sum = _sum

From 6120b4b3c1dbf17bc783be16ba41a5c73d5c5df1 Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Sat, 4 Dec 2021 20:12:48 +0530
Subject: [PATCH 03/36] fix: extend named parameters to frappe.qb.function

---
 frappe/query_builder/__init__.py |  3 ++-
 frappe/query_builder/terms.py    | 28 +++++++++++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/frappe/query_builder/__init__.py b/frappe/query_builder/__init__.py
index 06d499678f..bf7be84c51 100644
--- a/frappe/query_builder/__init__.py
+++ b/frappe/query_builder/__init__.py
@@ -1,7 +1,8 @@
-from frappe.query_builder.terms import ParameterizedValueWrapper
+from frappe.query_builder.terms import ParameterizedValueWrapper, ParameterizedFunction
 import pypika
 
 pypika.terms.ValueWrapper = ParameterizedValueWrapper
+pypika.terms.Function = ParameterizedFunction
 
 from pypika import *
 from frappe.query_builder.utils import Column, DocType, get_query_builder, patch_query_execute, patch_query_aggregation
diff --git a/frappe/query_builder/terms.py b/frappe/query_builder/terms.py
index c09d9595fb..2032cd8497 100644
--- a/frappe/query_builder/terms.py
+++ b/frappe/query_builder/terms.py
@@ -1,5 +1,6 @@
-from typing import Any, List, Optional, Dict
-from pypika.terms import ValueWrapper
+from typing import Any, Dict, Optional
+
+from pypika.terms import Function, ValueWrapper
 from pypika.utils import format_alias_sql
 
 
@@ -23,5 +24,26 @@ class ParameterizedValueWrapper(ValueWrapper):
 			value_sql = self.get_value_sql(quote_char=quote_char, **kwargs) if not isinstance(self.value,int) else self.value
 			param_sql = param_wrapper.get_sql(**kwargs)
 			param_wrapper.update_parameters(param_key=param_sql, param_value=value_sql, **kwargs)
+		return format_alias_sql(param_sql, self.alias, quote_char=quote_char, **kwargs)
 
-			return format_alias_sql(param_sql, self.alias, quote_char=quote_char, **kwargs)
\ No newline at end of file
+
+class ParameterizedFunction(Function):
+	def get_sql(self, **kwargs: Any) -> str:
+		with_alias = kwargs.pop("with_alias", False)
+		with_namespace = kwargs.pop("with_namespace", False)
+		quote_char = kwargs.pop("quote_char", None)
+		dialect = kwargs.pop("dialect", None)
+		param_wrapper = kwargs.pop("param_wrapper", None)
+
+		function_sql = self.get_function_sql(with_namespace=with_namespace, quote_char=quote_char, param_wrapper=param_wrapper, dialect=dialect)
+
+		if self.schema is not None:
+			function_sql = "{schema}.{function}".format(
+				schema=self.schema.get_sql(quote_char=quote_char, dialect=dialect, **kwargs),
+				function=function_sql,
+			)
+
+		if with_alias:
+			return format_alias_sql(function_sql, self.alias, quote_char=quote_char, **kwargs)
+
+		return function_sql

From aa855afe089d209d2a4796c8497d21ed5d12578a Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Mon, 6 Dec 2021 12:12:56 +0530
Subject: [PATCH 04/36] test: test for patches through walk

---
 frappe/tests/test_query_builder.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/frappe/tests/test_query_builder.py b/frappe/tests/test_query_builder.py
index 7a0935a63b..1d63d2041c 100644
--- a/frappe/tests/test_query_builder.py
+++ b/frappe/tests/test_query_builder.py
@@ -2,7 +2,7 @@ import unittest
 from typing import Callable
 
 import frappe
-from frappe.query_builder.functions import GroupConcat, Match
+from frappe.query_builder.functions import Coalesce, GroupConcat, Match
 from frappe.query_builder.utils import db_type_is
 
 
@@ -49,6 +49,25 @@ class TestBuilderBase(object):
 		self.assertIsInstance(query.run, Callable)
 		self.assertIsInstance(data, list)
 
+	def test_walk(self):
+		DocType = frappe.qb.DocType('DocType')
+		query = (
+			frappe.qb.from_(DocType)
+			.select(DocType.name)
+			.where((DocType.owner == "Administrator' --")
+					& (Coalesce(DocType.search_fields == "subject"))
+			)
+		)
+		self.assertTrue("walk" in dir(query))
+		query, params = query.walk()
+
+		self.assertIn("%(param1)s", query)
+		self.assertIn("%(param2)s", query)
+		self.assertIn("param1",params)
+		self.assertEqual(params["param1"],"Administrator' --")
+		self.assertEqual(params["param2"],"subject")
+
+
 @run_only_if(db_type_is.MARIADB)
 class TestBuilderMaria(unittest.TestCase, TestBuilderBase):
 	def test_adding_tabs_in_from(self):
@@ -59,7 +78,6 @@ class TestBuilderMaria(unittest.TestCase, TestBuilderBase):
 			"SELECT * FROM `__Auth`", frappe.qb.from_("__Auth").select("*").get_sql()
 		)
 
-
 @run_only_if(db_type_is.POSTGRES)
 class TestBuilderPostgres(unittest.TestCase, TestBuilderBase):
 	def test_adding_tabs_in_from(self):

From 99defea410080b20c1ded5792f4c8d7900d64972 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 7 Dec 2021 16:40:45 +0530
Subject: [PATCH 05/36] fix: Explicitly ignore semgrep warning

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

diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py
index 7922825725..2767e90242 100644
--- a/frappe/query_builder/utils.py
+++ b/frappe/query_builder/utils.py
@@ -56,7 +56,7 @@ def patch_query_execute():
 	"""
 	def execute_query(query, *args, **kwargs):
 		query, params = prepare_query(query)
-		return frappe.db.sql(query, params, *args, **kwargs)
+		return frappe.db.sql(query, params, *args, **kwargs) # nosemgrep
 
 	def prepare_query(query):
 		params = {}

From 4f7c8d066ad76ac39ac7bbd9666ce58c5fd5e24c Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Tue, 7 Dec 2021 20:55:38 +0530
Subject: [PATCH 06/36] feat: build constant value cols

---
 frappe/query_builder/custom.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frappe/query_builder/custom.py b/frappe/query_builder/custom.py
index 5aaed463d9..978c9858d3 100644
--- a/frappe/query_builder/custom.py
+++ b/frappe/query_builder/custom.py
@@ -1,7 +1,8 @@
-from typing import Optional
+from typing import Any, Optional
 
 from pypika.functions import DistinctOptionFunction
-from pypika.utils import builder
+from pypika.terms import Term
+from pypika.utils import builder, format_alias_sql
 
 import frappe
 
@@ -81,3 +82,11 @@ class TO_TSVECTOR(DistinctOptionFunction):
 			text (str): [ the text string that we match it against ]
 		"""
 		self._PLAINTO_TSQUERY = text
+
+
+class ConstantColumn(Term):
+	def __init__(self, name: str) -> None:
+		self.name = name
+
+	def get_sql(self, quote_char: Optional[str] = None, **kwargs: Any) -> str:
+		return format_alias_sql('"{name}"'.format(name=self.name), self.alias, quote_char=quote_char, **kwargs)

From 9a393e5654c17011c86b0badf44b2e3c24c40de4 Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Wed, 8 Dec 2021 15:43:22 +0530
Subject: [PATCH 07/36] fix: postgres compatibility

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

diff --git a/frappe/query_builder/custom.py b/frappe/query_builder/custom.py
index 978c9858d3..65eccac838 100644
--- a/frappe/query_builder/custom.py
+++ b/frappe/query_builder/custom.py
@@ -2,7 +2,7 @@ from typing import Any, Optional
 
 from pypika.functions import DistinctOptionFunction
 from pypika.terms import Term
-from pypika.utils import builder, format_alias_sql
+from pypika.utils import builder, format_alias_sql, format_quotes
 
 import frappe
 
@@ -85,8 +85,15 @@ class TO_TSVECTOR(DistinctOptionFunction):
 
 
 class ConstantColumn(Term):
+	alias = None
+	
 	def __init__(self, name: str) -> None:
 		self.name = name
 
 	def get_sql(self, quote_char: Optional[str] = None, **kwargs: Any) -> str:
-		return format_alias_sql('"{name}"'.format(name=self.name), self.alias, quote_char=quote_char, **kwargs)
+		return format_alias_sql(
+					format_quotes(self.name,kwargs.get("secondary_quote_char") or ""),
+					self.alias or self.name,
+					quote_char=quote_char,
+					**kwargs
+				)

From a71795afec8d4bb0132c527dbe7e330c5fbf0b5c Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Wed, 8 Dec 2021 15:46:30 +0530
Subject: [PATCH 08/36] docs: ConstantColumn

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

diff --git a/frappe/query_builder/custom.py b/frappe/query_builder/custom.py
index 65eccac838..c86132e44d 100644
--- a/frappe/query_builder/custom.py
+++ b/frappe/query_builder/custom.py
@@ -86,14 +86,19 @@ class TO_TSVECTOR(DistinctOptionFunction):
 
 class ConstantColumn(Term):
 	alias = None
-	
-	def __init__(self, name: str) -> None:
-		self.name = name
+
+	def __init__(self, value: str) -> None:
+		"""[ Returns a pseudo column with a constant value in all the rows]
+
+		Args:
+			value (str): [ Value of the column ]
+		"""
+		self.value = value
 
 	def get_sql(self, quote_char: Optional[str] = None, **kwargs: Any) -> str:
 		return format_alias_sql(
-					format_quotes(self.name,kwargs.get("secondary_quote_char") or ""),
-					self.alias or self.name,
+					format_quotes(self.value, kwargs.get("secondary_quote_char") or ""),
+					self.alias or self.value,
 					quote_char=quote_char,
 					**kwargs
 				)

From d7b2822ce80d859c6a820253bad12202785e73ae Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Wed, 8 Dec 2021 18:01:07 +0530
Subject: [PATCH 09/36] refactor: move rnl arrow to common variable file

---
 frappe/public/scss/common/css_variables.scss | 3 +++
 frappe/public/scss/desk/css_variables.scss   | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss
index ede3dd8ba9..a14c19af2a 100644
--- a/frappe/public/scss/common/css_variables.scss
+++ b/frappe/public/scss/common/css_variables.scss
@@ -225,4 +225,7 @@
 	--checkbox-right-margin: var(--margin-xs);
 	--checkbox-size: 14px;
 	--checkbox-focus-shadow: 0 0 0 2px var(--gray-300);
+
+	--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'/></svg>");
+	--left-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M7.5 9.5L4 6l3.5-3.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'></path></svg>");
 }
diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss
index 255d0a91e4..4a2a27f8d1 100644
--- a/frappe/public/scss/desk/css_variables.scss
+++ b/frappe/public/scss/desk/css_variables.scss
@@ -63,7 +63,4 @@ $input-height: 28px !default;
 	// skeleton
 	--skeleton-bg: var(--gray-100);
 
-	--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'/></svg>");
-
-	--left-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M7.5 9.5L4 6l3.5-3.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'></path></svg>");
 }

From 0f08c53c7cf2ea0897f532c99a37158c7d38c172 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Wed, 8 Dec 2021 18:02:03 +0530
Subject: [PATCH 10/36] refactor: breadcrumb style for portal pages

---
 frappe/public/scss/website/index.scss | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 58f5ca79c6..606415ed97 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -112,9 +112,30 @@
 }
 
 .breadcrumb {
-	padding: 0;
+	padding-left: 0;
+	padding-right: 0;
 	font-size: $font-size-sm;
-	background-color: $breadcrumb-bg;
+}
+
+.breadcrumb-item {
+	+ .breadcrumb-item
+	 {
+		font-size: $font-size-sm;
+		&::before {
+			content: #{"/*!rtl:var(--left-arrow-svg);*/"}var(--right-arrow-svg);
+			display: inline-block;
+		}
+	}
+	a {
+		color: var(--text-color)
+	}
+	
+	li.disabled {
+		a {
+			color: var(--text-muted);
+			pointer-events: none;
+		}
+	}
 }
 
 a.card {

From 3baa09401e1d3abd8ff14b88b7b0a8b53257b87a Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Thu, 9 Dec 2021 09:59:19 +0530
Subject: [PATCH 11/36] ci: update apt cache before install (#15226)

---
 .github/helper/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/helper/install.sh b/.github/helper/install.sh
index 454cc89694..19a7c68e19 100644
--- a/.github/helper/install.sh
+++ b/.github/helper/install.sh
@@ -17,7 +17,7 @@ if [ "$TYPE" == "server" ]; then
 fi
 
 if [ "$DB" == "mariadb" ];then
-      sudo apt install mariadb-client-10.3
+      sudo apt update && sudo apt install mariadb-client-10.3
       mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'";
       mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
 

From f589342c7061f6eefca30534676712fd0995b1f5 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 8 Dec 2021 22:35:27 +0530
Subject: [PATCH 12/36] fix: missing content in communication composer

`message` is used as args in some places and `txt` in another.
Supporting both since there's no clear interface to this arguments for
this component.
---
 frappe/public/js/frappe/views/communication.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index beeea40c5e..1ed79a9758 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -351,7 +351,7 @@ frappe.views.CommunicationComposer = class {
 	}
 
 	async set_values_from_last_edited_communication() {
-		if (this.txt) return;
+		if (this.txt || this.message) return;
 
 		const last_edited = this.get_last_edited_communication();
 		if (!last_edited.content) return;
@@ -713,7 +713,7 @@ frappe.views.CommunicationComposer = class {
 	async set_content() {
 		if (this.content_set) return;
 
-		let message = this.txt || "";
+		let message = this.txt || this.message || "";
 		if (!message && this.frm) {
 			const { doctype, docname } = this.frm;
 			message = await localforage.getItem(doctype + docname) || "";
@@ -727,7 +727,7 @@ frappe.views.CommunicationComposer = class {
 
 		const SALUTATION_END_COMMENT = "<!-- salutation-ends -->";
 		if (this.real_name && !message.includes(SALUTATION_END_COMMENT)) {
-			this.message = `
+			message = `
 				<p>${__('Dear {0},', [this.real_name], 'Salutation in new email')},</p>
 				${SALUTATION_END_COMMENT}<br>
 				${message}

From 5b6012d0d3944153bb3bb8156c21482a1a8583da Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 8 Dec 2021 22:52:02 +0530
Subject: [PATCH 13/36] feat: copy error to clipboard

Currently error can be reported if email is setup but other than that
only way to find error info is use browser's console.

This change adds a secondary button to copy error info to clipboard.
---
 frappe/public/js/frappe/request.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index adc3bb5626..eff0391338 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -481,6 +481,24 @@ frappe.request.report_error = function(xhr, request_opts) {
 		exc = "";
 	}
 
+	const copy_markdown_to_clipboard = () => {
+		const code_block = snippet => '```\n' + snippet + '\n```';
+		const traceback_info = [
+			'### App Versions',
+			code_block(JSON.stringify(frappe.boot.versions, null, "\t")),
+			'### Route',
+			code_block(frappe.get_route_str()),
+			'### Trackeback',
+			code_block(exc),
+			'### Request Data',
+			code_block(JSON.stringify(request_opts, null, "\t")),
+			'### Response Data',
+			code_block(JSON.stringify(data, null, '\t')),
+		].join("\n");
+		frappe.utils.copy_to_clipboard(traceback_info);
+	};
+
+
 	var show_communication = function() {
 		var error_report_message = [
 			'<h5>Please type some additional information that could help us reproduce this issue:</h5>',
@@ -532,6 +550,11 @@ frappe.request.report_error = function(xhr, request_opts) {
 						frappe.msgprint(__('Support Email Address Not Specified'));
 					}
 					frappe.error_dialog.hide();
+				},
+				secondary_action_label: __('Copy error to clipboard'),
+				secondary_action: () => {
+					copy_markdown_to_clipboard();
+					frappe.error_dialog.hide();
 				}
 			});
 			frappe.error_dialog.wrapper.classList.add('msgprint-dialog');

From ecdb8932864ced64c9969fe351b492cabdfd10da Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 8 Dec 2021 23:01:59 +0530
Subject: [PATCH 14/36] fix: copy to clipboard strips off newlines

input element isn't suitable for this hack, switch to textarea for
supporting newlines in text to be copied.
---
 frappe/public/js/frappe/utils/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 5f546c22da..47aba903b9 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -957,7 +957,7 @@ Object.assign(frappe.utils, {
 		return decoded;
 	},
 	copy_to_clipboard(string) {
-		let input = $("<input>");
+		let input = $("<textarea>");
 		$("body").append(input);
 		input.val(string).select();
 

From f3cbaf9df782b16558d9ea7a6811c8ae71c84602 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Wed, 8 Dec 2021 23:11:12 +0530
Subject: [PATCH 15/36] refactor: use navigator api for clipboard

---
 frappe/public/js/frappe/utils/utils.js | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 47aba903b9..38e66571bd 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -957,17 +957,24 @@ Object.assign(frappe.utils, {
 		return decoded;
 	},
 	copy_to_clipboard(string) {
-		let input = $("<textarea>");
-		$("body").append(input);
-		input.val(string).select();
+		const show_success_alert = () => {
+			frappe.show_alert({
+				indicator: 'green',
+				message: __('Copied to clipboard.')
+			});
+		};
+		if (navigator.clipboard && window.isSecureContext) {
+			navigator.clipboard.writeText(string).then(show_success_alert);
+		} else {
+			let input = $("<textarea>");
+			$("body").append(input);
+			input.val(string).select();
 
-		document.execCommand("copy");
-		input.remove();
+			document.execCommand("copy");
+			show_success_alert();
+			input.remove();
+		}
 
-		frappe.show_alert({
-			indicator: 'green',
-			message: __('Copied to clipboard.')
-		});
 	},
 	is_rtl(lang=null) {
 		return ["ar", "he", "fa", "ps"].includes(lang || frappe.boot.lang);

From 13b660ca113710ca4144b6138774b3391c9a0b54 Mon Sep 17 00:00:00 2001
From: Jannat Patel <pateljannat2308@gmail.com>
Date: Thu, 9 Dec 2021 11:17:45 +0530
Subject: [PATCH 16/36] fix: web form table scroll issue

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

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 2dbad5427d..698bac9baa 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -316,7 +316,7 @@ Object.assign(frappe.utils, {
 		}
 	},
 	get_scroll_position: function(element, additional_offset) {
-		let header_offset = $(".navbar").height() + $(".page-head:visible").height();
+		let header_offset = $(".navbar").height() + $(".page-head:visible").height() || $(".navbar").height();
 		let scroll_top = $(element).offset().top - header_offset - cint(additional_offset);
 		return scroll_top;
 	},

From bac62ea014a01d013f8abf502a3ce0481351f84f Mon Sep 17 00:00:00 2001
From: Kenneth Sequeira <33246109+kennethsequeira@users.noreply.github.com>
Date: Thu, 9 Dec 2021 15:49:56 +0530
Subject: [PATCH 17/36] fix: valid parent doctype error (#15233)

Co-authored by: Ankush Menat <me@ankush.dev>
---
 .../doctype/global_search_settings/global_search_settings.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py
index 9ffe9aaf06..e9a47cecd1 100644
--- a/frappe/desk/doctype/global_search_settings/global_search_settings.py
+++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py
@@ -33,7 +33,7 @@ class GlobalSearchSettings(Document):
 
 def get_doctypes_for_global_search():
 	def get_from_db():
-		doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC")
+		doctypes = frappe.get_all("Global Search DocType", fields=["document_type"], order_by="idx ASC")
 		return [d.document_type for d in doctypes] or []
 
 	return frappe.cache().hget("global_search", "search_priorities", get_from_db)

From 7118fb2e815e6f8567b81e7a0017b2129c9358d1 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 9 Dec 2021 19:18:14 +0530
Subject: [PATCH 18/36] fix: record name creating based on naming seires and
 not as per the use set

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

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index cd20a5c0f3..28880e7e38 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -199,7 +199,7 @@ class Importer:
 		new_doc = frappe.new_doc(self.doctype)
 		new_doc.update(doc)
 
-		if (meta.autoname or "").lower() != "prompt":
+		if not doc.name and (meta.autoname or "").lower() != "prompt":
 			# name can only be set directly if autoname is prompt
 			new_doc.set("name", None)
 

From 07ee1bdc0c01492860c251032d528c1b03a4d164 Mon Sep 17 00:00:00 2001
From: saxenabhishek <as7122000@gmail.com>
Date: Fri, 10 Dec 2021 12:30:19 +0530
Subject: [PATCH 19/36] test: ConstantColumn

---
 frappe/tests/test_query_builder.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/tests/test_query_builder.py b/frappe/tests/test_query_builder.py
index 7a0935a63b..0b7382d4bd 100644
--- a/frappe/tests/test_query_builder.py
+++ b/frappe/tests/test_query_builder.py
@@ -2,6 +2,7 @@ import unittest
 from typing import Callable
 
 import frappe
+from frappe.query_builder.custom import ConstantColumn
 from frappe.query_builder.functions import GroupConcat, Match
 from frappe.query_builder.utils import db_type_is
 
@@ -23,7 +24,9 @@ class TestCustomFunctionsMariaDB(unittest.TestCase):
 			" MATCH('Notes') AGAINST ('+text*' IN BOOLEAN MODE)", query.get_sql()
 		)
 
-
+	def test_constant_column(self):
+		query = frappe.qb.from_("DocType").select("name", ConstantColumn("John").as_("User"))
+		self.assertEqual(query.get_sql(), "SELECT `name`,'John' `User` FROM `tabDocType`")
 @run_only_if(db_type_is.POSTGRES)
 class TestCustomFunctionsPostgres(unittest.TestCase):
 	def test_concat(self):
@@ -35,6 +38,9 @@ class TestCustomFunctionsPostgres(unittest.TestCase):
 			"TO_TSVECTOR('Notes') @@ PLAINTO_TSQUERY('text')", query.get_sql()
 		)
 
+	def test_constant_column(self):
+		query = frappe.qb.from_("DocType").select("name", ConstantColumn("John").as_("User"))
+		self.assertEqual(query.get_sql(), 'SELECT "name",\'John\' "User" FROM "tabDocType"')
 
 class TestBuilderBase(object):
 	def test_adding_tabs(self):

From 2b8328715e1c084a94c9ddcdccc6a12c8551eebf Mon Sep 17 00:00:00 2001
From: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Date: Fri, 10 Dec 2021 13:21:27 +0530
Subject: [PATCH 20/36] fix: Sales invoice cancellation error due to get_list
 (#15243)

* fix: Sales invoice cancellation error due to get_list

* fix: missed out one `get_list`
---
 frappe/desk/form/linked_with.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/desk/form/linked_with.py b/frappe/desk/form/linked_with.py
index cbf459e8ae..14ea2712e2 100644
--- a/frappe/desk/form/linked_with.py
+++ b/frappe/desk/form/linked_with.py
@@ -410,11 +410,11 @@ def get_linked_docs(doctype, name, linkinfo=None, for_doctype=None):
 
 			try:
 				if link.get("filters"):
-					ret = frappe.get_list(doctype=dt, fields=fields, filters=link.get("filters"))
+					ret = frappe.get_all(doctype=dt, fields=fields, filters=link.get("filters"))
 
 				elif link.get("get_parent"):
 					if me and me.parent and me.parenttype == dt:
-						ret = frappe.get_list(doctype=dt, fields=fields,
+						ret = frappe.get_all(doctype=dt, fields=fields,
 							filters=[[dt, "name", '=', me.parent]])
 					else:
 						ret = None
@@ -426,7 +426,7 @@ def get_linked_docs(doctype, name, linkinfo=None, for_doctype=None):
 					if link.get("doctype_fieldname"):
 						filters.append([link.get('child_doctype'), link.get("doctype_fieldname"), "=", doctype])
 
-					ret = frappe.get_list(doctype=dt, fields=fields, filters=filters, or_filters=or_filters, distinct=True)
+					ret = frappe.get_all(doctype=dt, fields=fields, filters=filters, or_filters=or_filters, distinct=True)
 
 				else:
 					link_fieldnames = link.get("fieldname")
@@ -437,7 +437,7 @@ def get_linked_docs(doctype, name, linkinfo=None, for_doctype=None):
 						# dynamic link
 						if link.get("doctype_fieldname"):
 							filters.append([dt, link.get("doctype_fieldname"), "=", doctype])
-						ret = frappe.get_list(doctype=dt, fields=fields, filters=filters, or_filters=or_filters)
+						ret = frappe.get_all(doctype=dt, fields=fields, filters=filters, or_filters=or_filters)
 
 					else:
 						ret = None

From 2ab030c4d813decdc19ecf43bba6601e34a7d721 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 10 Dec 2021 12:26:32 +0100
Subject: [PATCH 21/36] fix: update modified of Singles

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

diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py
index cf8ec46d76..50a56d9dbb 100644
--- a/frappe/modules/import_file.py
+++ b/frappe/modules/import_file.py
@@ -189,7 +189,7 @@ def update_modified(original_modified, doc):
 		).set(
 			singles_table.value,original_modified
 		).where(
-			singles_table.field == "modified"
+			singles_table["field"] == "modified",  # singles_table.field is a method of pypika Selectable
 		).where(
 			singles_table.doctype == doc["name"]
 		).run()

From a4b99cd7b4af05dcc1ff50913fb6bb3c9974b881 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 10 Dec 2021 17:21:19 +0530
Subject: [PATCH 22/36] feat: Zip files

---
 frappe/core/doctype/file/file.py              | 28 +++++++++++++++++++
 .../public/js/frappe/views/file/file_view.js  |  9 ++++++
 2 files changed, 37 insertions(+)

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index af9c8a48fa..91090bdd77 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -569,6 +569,24 @@ class File(Document):
 		frappe.local.rollback_observers.append(self)
 		self.save()
 
+	@staticmethod
+	def zip_files(files):
+		from six import string_types
+
+		zip_file = io.BytesIO()
+		zf = zipfile.ZipFile(zip_file, "w", zipfile.ZIP_DEFLATED)
+		for _file in files:
+			if isinstance(_file, string_types):
+				_file = frappe.get_doc("File", _file)
+			if not isinstance(_file, File):
+				continue
+			if _file.is_folder:
+				continue
+			zf.writestr(_file.file_name, _file.get_content())
+		zf.close()
+		return zip_file.getvalue()
+
+
 def on_doctype_update():
 	frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"])
 
@@ -612,6 +630,16 @@ def move_file(file_list, new_parent, old_parent):
 	frappe.get_doc("File", old_parent).save()
 	frappe.get_doc("File", new_parent).save()
 
+
+@frappe.whitelist()
+def zip_files(files):
+	files = frappe.parse_json(files)
+	zipped_files = File.zip_files(files)
+	frappe.response["filename"] = "files.zip"
+	frappe.response["filecontent"] = zipped_files
+	frappe.response["type"] = "download"
+
+
 def setup_folder_path(filename, new_parent):
 	file = frappe.get_doc("File", filename)
 	file.folder = new_parent
diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js
index 11204bb660..b351ce6109 100644
--- a/frappe/public/js/frappe/views/file/file_view.js
+++ b/frappe/public/js/frappe/views/file/file_view.js
@@ -169,6 +169,15 @@ frappe.views.FileView = class FileView extends frappe.views.ListView {
 				frappe.file_manager.paste(this.current_folder)
 			)
 			.hide();
+
+		this.page.add_actions_menu_item(__('Export as zip'), () => {
+			let docnames = this.get_checked_items(true);
+			if (docnames.length) {
+				open_url_post('/api/method/frappe.core.doctype.file.file.zip_files', {
+					files: JSON.stringify(docnames)
+				});
+			}
+		});
 	}
 
 	set_fields() {

From 0e31393326617dc0ae5aeb3224a41d118b9d9601 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 10 Dec 2021 16:34:45 +0100
Subject: [PATCH 23/36] fix: reload doctype IMAP Folder in patch

---
 frappe/patches/v14_0/copy_mail_data.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/patches/v14_0/copy_mail_data.py b/frappe/patches/v14_0/copy_mail_data.py
index 362d23d0e1..d3a5c59209 100644
--- a/frappe/patches/v14_0/copy_mail_data.py
+++ b/frappe/patches/v14_0/copy_mail_data.py
@@ -3,7 +3,9 @@ import frappe
 
 
 def execute():
+	frappe.reload_doc("email", "doctype", "imap_folder")
 	frappe.reload_doc("email", "doctype", "email_account")
+
 	# patch for all Email Account with the flag use_imap
 	for email_account in frappe.get_list("Email Account", filters={"enable_incoming": 1, "use_imap": 1}):
 		# get all data from Email Account

From 6acbfd5e7466141b134db6091e33d17d74e136e6 Mon Sep 17 00:00:00 2001
From: Shridhar Patil <shridhar.p@zerodha.com>
Date: Sun, 12 Dec 2021 10:31:06 +0530
Subject: [PATCH 24/36] fix: Make query Postgres compatible (#15240)

* fix: updated query compatibale with postgres

* fix: updated query compatible with postgres
---
 frappe/patches/v13_0/update_date_filters_in_user_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/patches/v13_0/update_date_filters_in_user_settings.py b/frappe/patches/v13_0/update_date_filters_in_user_settings.py
index 3b1b07fe0a..fa13a6789e 100644
--- a/frappe/patches/v13_0/update_date_filters_in_user_settings.py
+++ b/frappe/patches/v13_0/update_date_filters_in_user_settings.py
@@ -10,7 +10,7 @@ def execute():
 			select
 				* from `__UserSettings`
 			where
-				user="{user}"
+				user='{user}'
 		'''.format(user = user.user), as_dict=True)
 
 		for setting in user_settings:

From 92aeb972b6e6fb0533bd44119b91e7dc5acdcb5e Mon Sep 17 00:00:00 2001
From: Shridhar Patil <shridhar.p@zerodha.com>
Date: Sun, 12 Dec 2021 10:40:25 +0530
Subject: [PATCH 25/36] fix: fixed query to run on postgres db (#15239)

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

diff --git a/frappe/patches/v13_0/set_path_for_homepage_in_web_page_view.py b/frappe/patches/v13_0/set_path_for_homepage_in_web_page_view.py
index 66f878e4bf..d4fe2d2f36 100644
--- a/frappe/patches/v13_0/set_path_for_homepage_in_web_page_view.py
+++ b/frappe/patches/v13_0/set_path_for_homepage_in_web_page_view.py
@@ -2,4 +2,4 @@ import frappe
 
 def execute():
 	frappe.reload_doc('website', 'doctype', 'web_page_view', force=True)
-	frappe.db.sql("""UPDATE `tabWeb Page View` set path="/" where path=''""")
+	frappe.db.sql("""UPDATE `tabWeb Page View` set path='/' where path=''""")

From 38cd12a95b33fae974e4227e62babfbf3f70e998 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Sun, 12 Dec 2021 11:46:15 +0530
Subject: [PATCH 26/36] fix: remove bench path from traceback

This is mostly useless for debugging and clutters the error message.
---
 frappe/utils/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 1623fa7002..b29b2fb7d6 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -240,7 +240,9 @@ def get_traceback() -> str:
 		return ""
 
 	trace_list = traceback.format_exception(exc_type, exc_value, exc_tb)
-	return "".join(cstr(t) for t in trace_list)
+	bench_path = get_bench_path()
+
+	return "".join(cstr(t) for t in trace_list).replace(bench_path, "")
 
 def log(event, details):
 	frappe.logger().info(details)

From 41bb12a2065a7065fa5fdb63f887f3fa64f95b42 Mon Sep 17 00:00:00 2001
From: phot0n <ritwikpuri5678@gmail.com>
Date: Sat, 11 Dec 2021 23:47:39 +0530
Subject: [PATCH 27/36] fix: not able to go back from user profile page

credit: @ankush
---
 .../user_profile/user_profile_controller.js   | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/frappe/desk/page/user_profile/user_profile_controller.js b/frappe/desk/page/user_profile/user_profile_controller.js
index c1a89f316e..7cfebdd8b5 100644
--- a/frappe/desk/page/user_profile/user_profile_controller.js
+++ b/frappe/desk/page/user_profile/user_profile_controller.js
@@ -17,21 +17,15 @@ class UserProfile {
 	show() {
 		let route = frappe.get_route();
 		this.user_id = route[1] || frappe.session.user;
-
-		//validate if user
-		if (route.length > 1) {
-			frappe.dom.freeze(__('Loading user profile') + '...');
-			frappe.db.exists('User', this.user_id).then(exists => {
-				frappe.dom.unfreeze();
-				if (exists) {
-					this.make_user_profile();
-				} else {
-					frappe.msgprint(__('User does not exist'));
-				}
-			});
-		} else {
-			frappe.set_route('user-profile', frappe.session.user);
-		}
+		frappe.dom.freeze(__('Loading user profile') + '...');
+		frappe.db.exists('User', this.user_id).then(exists => {
+			frappe.dom.unfreeze();
+			if (exists) {
+				this.make_user_profile();
+			} else {
+				frappe.msgprint(__('User does not exist'));
+			}
+		});
 	}
 
 	make_user_profile() {

From faa8c371fb89534777beb37f34317ae33d69c2de Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Sun, 12 Dec 2021 12:47:59 +0530
Subject: [PATCH 28/36] fix: change route when browsing someone else's profile

---
 frappe/desk/page/user_profile/user_profile_controller.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/desk/page/user_profile/user_profile_controller.js b/frappe/desk/page/user_profile/user_profile_controller.js
index 7cfebdd8b5..40b542d5c3 100644
--- a/frappe/desk/page/user_profile/user_profile_controller.js
+++ b/frappe/desk/page/user_profile/user_profile_controller.js
@@ -68,8 +68,7 @@ class UserProfile {
 			primary_action_label: __('Go'),
 			primary_action: ({ user }) => {
 				dialog.hide();
-				this.user_id = user;
-				this.make_user_profile();
+				frappe.set_route('user-profile', user);
 			}
 		});
 		dialog.show();

From a7a05701780f242ff3b562ccae9561e81c87f381 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Sun, 12 Dec 2021 12:52:09 +0530
Subject: [PATCH 29/36] fix: leaderboard link in sidebar

---
 frappe/desk/page/user_profile/user_profile_sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/page/user_profile/user_profile_sidebar.html b/frappe/desk/page/user_profile/user_profile_sidebar.html
index 4a35c6cf9c..9f8889fd03 100644
--- a/frappe/desk/page/user_profile/user_profile_sidebar.html
+++ b/frappe/desk/page/user_profile/user_profile_sidebar.html
@@ -51,10 +51,10 @@
 			<p><a class="edit-profile-link">{%=__("Edit Profile") %}</a></p>
 			<p><a class="user-settings-link">{%=__("User Settings") %}</a></p>
 			<p>
-				<a class="leaderboard-link" href="#leaderboard/User"
+				<a class="leaderboard-link" href="/app/leaderboard/User"
 					>{%=__("Leaderboard") %}</a
 				>
 			</p>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>

From 00d38d568c0f5f82cca908a08421b1d4d32906b5 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Sun, 12 Dec 2021 15:20:50 +0530
Subject: [PATCH 30/36] fix: remove slash prefix

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

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index b29b2fb7d6..ec150125cb 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -240,7 +240,7 @@ def get_traceback() -> str:
 		return ""
 
 	trace_list = traceback.format_exception(exc_type, exc_value, exc_tb)
-	bench_path = get_bench_path()
+	bench_path = get_bench_path() + "/"
 
 	return "".join(cstr(t) for t in trace_list).replace(bench_path, "")
 

From 1ec54c87c80d3b7c6e91dcdd45fd10579bdd55e2 Mon Sep 17 00:00:00 2001
From: Rutwik Hiwalkar <50401596+rutwikhdev@users.noreply.github.com>
Date: Sun, 12 Dec 2021 21:09:31 +0530
Subject: [PATCH 31/36] feat: patched frappe email to work with frappecloud
 mail app (#15248)

* feat: patched EmailQueue.send and frappe.utils.get_formatted_email

* chore: renamed hooks and handled an edge case

* fix: if the get_sender_details hook is defined but it returns invalid input
---
 frappe/email/doctype/email_queue/email_queue.py | 12 ++++++++----
 frappe/utils/__init__.py                        |  6 ++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py
index 077a5dd40b..d89a3d83be 100644
--- a/frappe/email/doctype/email_queue/email_queue.py
+++ b/frappe/email/doctype/email_queue/email_queue.py
@@ -18,7 +18,7 @@ from frappe import _, safe_encode, task
 from frappe.model.document import Document
 from frappe.email.queue import get_unsubcribed_url, get_unsubscribe_message
 from frappe.email.email_body import add_attachment, get_formatted_html, get_email
-from frappe.utils import cint, split_emails, add_days, nowdate, cstr
+from frappe.utils import cint, split_emails, add_days, nowdate, cstr, get_hook_method
 from frappe.email.doctype.email_account.email_account import EmailAccount
 
 
@@ -121,9 +121,13 @@ class EmailQueue(Document):
 					continue
 
 				message = ctx.build_message(recipient.recipient)
-				if not frappe.flags.in_test:
-					ctx.smtp_session.sendmail(from_addr=self.sender, to_addrs=recipient.recipient, msg=message)
-				ctx.add_to_sent_list(recipient)
+				method = get_hook_method('override_email_send')
+				if method:
+					method(self, self.sender, recipient.recipient, message)
+				else:
+					if not frappe.flags.in_test:
+						ctx.smtp_session.sendmail(from_addr=self.sender, to_addrs=recipient.recipient, msg=message)
+					ctx.add_to_sent_list(recipient)
 
 			if frappe.flags.in_test:
 				frappe.flags.sent_mail = message
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index ec150125cb..ffff7032aa 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -56,6 +56,12 @@ def get_email_address(user=None):
 def get_formatted_email(user, mail=None):
 	"""get Email Address of user formatted as: `John Doe <johndoe@example.com>`"""
 	fullname = get_fullname(user)
+	
+	method = get_hook_method('get_sender_details')
+	if method:
+		sender_name, mail = method()
+		# if method exists but sender_name is ""
+		fullname = sender_name or fullname
 
 	if not mail:
 		mail = get_email_address(user) or validate_email_address(user)

From f490f20822146aac02fe75e0bde3228e8f9c8fca Mon Sep 17 00:00:00 2001
From: Lucas James <lucas.james@ldjcs.com.au>
Date: Mon, 13 Dec 2021 11:16:11 +1100
Subject: [PATCH 32/36] chore: VS2022 uses .vs instead of .vscode. Add .vs to
 .gitignore.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c9dd8f38f3..7e3d178630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ dist/
 frappe/docs/current
 frappe/public/dist
 .vscode
+.vs
 node_modules
 .kdev4/
 *.kdev4

From 66febd024ab0e698b5006dbb22a9124ec38edc76 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 13 Dec 2021 12:45:23 +0530
Subject: [PATCH 33/36] fix: remove display none class

---
 frappe/public/scss/website/index.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 606415ed97..c4f66b803b 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -217,11 +217,14 @@ h5.modal-title {
 
 .btn-xs {
 	@extend .btn-sm;
+
 }
 
 .hidden-xs {
 	@extend .d-block;
-	@extend .d-sm-none;
+	@include media-breakpoint-between(xs, sm) {
+		display: none !important;
+	}
 }
 
 .visible-xs {

From 22b89f2152edf8a0e1cc75b1a295be5fdb514a21 Mon Sep 17 00:00:00 2001
From: ahmadpak <mohammad.ahmad.zulfiqar1@gmail.com>
Date: Thu, 2 Dec 2021 17:33:16 +0100
Subject: [PATCH 34/36] fix: method-get_doc_permissions

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

diff --git a/frappe/permissions.py b/frappe/permissions.py
index 96e1910462..6ad1399742 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -108,7 +108,7 @@ def get_doc_permissions(doc, user=None, ptype=None):
 	meta = frappe.get_meta(doc.doctype)
 
 	def is_user_owner():
-		return (doc.get("owner") or "").lower() == frappe.session.user.lower()
+		return (doc.get("owner") or "").lower() == user
 
 	if has_controller_permissions(doc, ptype, user=user) is False:
 		push_perm_check_log('Not allowed via controller permission check')

From bc675bab4af83f6c53aa2582782ca072a6033193 Mon Sep 17 00:00:00 2001
From: Ahmad <7881486+ahmadpak@users.noreply.github.com>
Date: Fri, 3 Dec 2021 12:34:24 +0100
Subject: [PATCH 35/36] fix: Convert user to lower case before equating

Co-authored-by: Sagar Vora <sagar@resilient.tech>
---
 frappe/permissions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/permissions.py b/frappe/permissions.py
index 6ad1399742..5faaf7dcfb 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -108,7 +108,7 @@ def get_doc_permissions(doc, user=None, ptype=None):
 	meta = frappe.get_meta(doc.doctype)
 
 	def is_user_owner():
-		return (doc.get("owner") or "").lower() == user
+		return (doc.get("owner") or "").lower() == user.lower()
 
 	if has_controller_permissions(doc, ptype, user=user) is False:
 		push_perm_check_log('Not allowed via controller permission check')

From 65dfd87f49a857cdc4a8f82d490c43820dbb33a6 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 13 Dec 2021 21:18:09 +0530
Subject: [PATCH 36/36] chore: add icon classes for each event type

---
 frappe/public/js/frappe/form/footer/form_timeline.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js
index b9ec9a5438..f278d1b64b 100644
--- a/frappe/public/js/frappe/form/footer/form_timeline.js
+++ b/frappe/public/js/frappe/form/footer/form_timeline.js
@@ -172,9 +172,11 @@ class FormTimeline extends BaseTimeline {
 
 	get_communication_timeline_contents() {
 		let communication_timeline_contents = [];
+		let icon_set = {Email: "mail", Phone: "call", Meeting: "calendar", Other: "dot-horizontal"};
 		(this.doc_info.communications|| []).forEach(communication => {
+			let medium = communication.communication_medium;
 			communication_timeline_contents.push({
-				icon: 'mail',
+				icon: icon_set[medium],
 				icon_size: 'sm',
 				creation: communication.creation,
 				is_card: true,