From 0b1821b10a5a7053c8c9a807835e9d6d8fab50d5 Mon Sep 17 00:00:00 2001
From: Don-Leopardo <Nahuel713.-@hotmail.com>
Date: Wed, 22 Dec 2021 13:10:22 -0300
Subject: [PATCH 01/97] fix: Module path for external print formats

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

diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index 569ebe27d6..e9be76373f 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -2,7 +2,7 @@
 # License: MIT. See LICENSE
 
 import frappe, os, copy, json, re
-from frappe import _
+from frappe import _, get_module_path
 
 from frappe.modules import get_doc_path
 from frappe.core.doctype.access_log.access_log import make_access_log
@@ -251,8 +251,9 @@ def get_print_format(doctype, print_format):
 			frappe.DoesNotExistError)
 
 	# server, find template
-	path = os.path.join(get_doc_path(frappe.db.get_value("DocType", doctype, "module"),
-		"Print Format", print_format.name), frappe.scrub(print_format.name) + ".html")
+	module = print_format.module or frappe.db.get_value("DocType", doctype, "module")
+	path = os.path.join(get_module_path(module, "Print Format",print_format.name),
+		frappe.scrub(print_format.name) + ".html")
 
 	if os.path.exists(path):
 		with open(path, "r") as pffile:

From c9ce941554fccfcafc7d07501c587993a1c0d7b5 Mon Sep 17 00:00:00 2001
From: Don-Leopardo <Nahuel713.-@hotmail.com>
Date: Wed, 22 Dec 2021 14:19:08 -0300
Subject: [PATCH 02/97] fix: Unused imports

---
 frappe/www/printview.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index e9be76373f..088c9dc403 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -4,7 +4,6 @@
 import frappe, os, copy, json, re
 from frappe import _, get_module_path
 
-from frappe.modules import get_doc_path
 from frappe.core.doctype.access_log.access_log import make_access_log
 from frappe.utils import cint, sanitize_html, strip_html
 from frappe.utils.jinja_globals import is_rtl

From de391916245dc67d38ad899833f20744dff91efd Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 23 Dec 2021 23:04:52 +0530
Subject: [PATCH 03/97] refactor: my-account page

---
 frappe/www/me.html | 97 ++++++++++++++++++++++++++++++++++++++--------
 frappe/www/me.py   |  3 +-
 2 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/frappe/www/me.html b/frappe/www/me.html
index 4f9a59cac5..196457ae0b 100644
--- a/frappe/www/me.html
+++ b/frappe/www/me.html
@@ -1,31 +1,94 @@
+{% from "frappe/templates/includes/avatar_macro.html" import avatar %}
 {% extends "templates/web.html" %}
-
-{% block title %}{{ _("My Account") }}{% endblock %}
-{% block header %}<h1>{{ _("My Account") }}</h1>{% endblock %}
-
+{% block title %}
+{{ _("My Account") }}
+{% endblock %}
+{% block header %}
+<h3 class="my-account-header">{{_("My Account") }}</h3>
+{% endblock %}
 {% block page_content %}
-<div class="row your-account-info d-none d-sm-block">
-	<div class="col-sm-4">
-		<ul class="list-unstyled">
-			<li><a href="/update-password">{{ _("Reset Password") }}</a></li>
-			<li><a href="/update-profile?name={{ user }}">{{ _("Edit Profile") }}</a></li>
-			<li><a href="/third_party_apps">{{ _("Manage Third Party Apps") }}</a></li>
-			{% if frappe.db.get_single_value("Website Settings", "show_account_deletion_link") %}
-			<li><a href="/request-for-account-deletion?new=1">{{ _("Request for Account Deletion") }}</a></li>
-			{% endif %}
-		</ul>
+<div class="row account-info d-flex flex-column">
+	<div class="col d-flex justify-content-between align-items-center">
+		<div>
+			<span class="my-account-avatar">
+				{{avatar(current_user.name)}}
+			</span>
+			<span class="my-account-name ml-4">
+				{{current_user.full_name }}
+			</span>
+		</div>
+		<div>
+			<span class="my-account-item-link">
+				<a href="/update-profile?name={{ user }}">
+					<svg class="edit-profile-icon icon icon-md">
+						<use xlink:href="#icon-edit">
+						</use>
+					</svg>
+					<span class="item-link-text pl-2">
+						{{_("Edit Profile") }}
+					</span>
+				</a>
+			</span>
+		</div>
 	</div>
+	<div class="col d-flex justify-content-between align-items-center">
+		<span>
+			<div class="my-account-item">{{_("Reset Password") }}</div>
+			<div class="my-account-item-desc">{{_("Reset the password for your account") }}</div>
+		</span>
+		<span class="my-account-item-link">
+			<a href="/update-password">
+				<svg class="right-icon icon icon-md">
+					<use xlink:href="#icon-right">
+					</use>
+				</svg>
+				<span class="item-link-text">{{_("Reset Password") }}</span>
+			</a>
+		</span>
+	</div>
+	<div class="col d-flex justify-content-between align-items-center">
+		<span>
+			<div class="my-account-item">{{_("Manage third party apps") }}</div>
+			<div class="my-account-item-desc">{{_("To manage your authorized third party apps") }}</div>
+		</span>
+		<span class="my-account-item-link">
+			<a href="/third_party_apps">
+				<svg class="right-icon icon icon-md">
+					<use xlink:href="#icon-right">
+					</use>
+				</svg>
+				<span class="item-link-text">{{_("Manage your apps") }}</span>
+			</a>
+		</span>
+	</div>
+	{% if frappe.db.get_single_value("Website Settings", "show_account_deletion_link") %}
+	<div class="col d-flex justify-content-between align-items-center">
+		<span>
+			<div class="my-account-item">{{_("Request Account Deletion") }}</div>
+			<div class="my-account-item-desc">{{_("Send a request to delete your account") }}</div>
+		</span>
+		<span class="my-account-item-link">
+			<a href="/request-for-account-deletion?new=1">
+				<svg class="right-icon icon icon-md">
+					<use xlink:href="#icon-right">
+					</use>
+				</svg>
+				<span class="item-link-text">{{_("Delete Account") }}</span>
+			</a>
+		</span>
+	</div>
+	{% endif %}
 </div>
 <div class="row d-block d-sm-none">
-	<div class="col-12">
+	<div class="col-12 side-list">
 		<ul class="list-group">
 			{% for item in sidebar_items -%}
 				<a class="list-group-item" href="{{ item.route }}"
 					{% if item.target %}target="{{ item.target }}"{% endif %}>
 					{{ _(item.title or item.label) }}
 				</a>
-			{%- endfor %}
+			{%- endfor %}	
 		</ul>
 	</div>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/frappe/www/me.py b/frappe/www/me.py
index fbb6d53ac6..0ec73117ac 100644
--- a/frappe/www/me.py
+++ b/frappe/www/me.py
@@ -10,5 +10,6 @@ no_cache = 1
 def get_context(context):
 	if frappe.session.user=='Guest':
 		frappe.throw(_("You need to be logged in to access this page"), frappe.PermissionError)
-
+	
+	context.current_user = frappe.get_doc("User", frappe.session.user)
 	context.show_sidebar=True
\ No newline at end of file

From 92ac6d9c995fb5161928d24cdf5c6dbcf0277e5b Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 23 Dec 2021 23:05:21 +0530
Subject: [PATCH 04/97] fix: my-account page styles

---
 frappe/public/scss/website/index.scss      |   1 +
 frappe/public/scss/website/my_account.scss | 116 +++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 frappe/public/scss/website/my_account.scss

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index c4f66b803b..0dea8fa612 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -27,6 +27,7 @@
 @import 'navbar';
 @import 'footer';
 @import 'error-state';
+@import 'my_account';
 
 .ql-editor.read-mode {
 	padding: 0;
diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
new file mode 100644
index 0000000000..929f3d2876
--- /dev/null
+++ b/frappe/public/scss/website/my_account.scss
@@ -0,0 +1,116 @@
+//styles for my account and edit-profile page
+@include media-breakpoint-up(sm) {
+    body[data-path="me"] {
+        background-color: var(--bg-gray);
+    }
+}
+
+@include media-breakpoint-down(sm) {
+    #page-me {
+        .side-list {
+            .list-group {
+                display: none;
+            }
+        }
+    }
+}
+
+.my-account-header {
+    color: var(--gray-900);
+    margin-bottom: var(--margin-lg);
+    font-weight: bold;
+
+    @include media-breakpoint-down(sm) {
+        margin-left: -1rem;
+    }
+}
+
+.account-info {
+    background-color: var(--fg-color);
+    border-radius: var(--border-radius-md);
+    padding: var(--padding-sm) 25px;
+    max-width: 850px;
+
+    @include media-breakpoint-up(sm) {
+        margin-left: 0;
+    }
+
+    @include media-breakpoint-down(sm) {
+        padding: 0;
+    }
+
+    .my-account-name,
+    .my-account-item {
+        color: var(--gray-900);
+        font-weight: var(--text-bold);
+    }
+
+    .my-account-avatar {
+
+        .avatar {
+            height: 60px;
+            width: 60px;
+        }
+    }
+
+    .my-account-item-desc {
+        color: var(--gray-700);
+        font-size: var(--font-size-sm);
+    }
+
+    .my-account-item-link {
+        font-size: var(--font-size-sm);
+
+        a {
+            text-decoration: none;
+
+            .edit-profile-icon {
+                stroke: var(--blue-500);
+            }
+        }
+
+        .right-icon {
+            @include media-breakpoint-up(sm) {
+                display: none;
+            }
+        }
+
+        .item-link-text {
+            @include media-breakpoint-down(sm) {
+                display: none;
+            }
+        }
+    }
+
+    .col {
+        padding: var(--padding-md) 0;
+        border-bottom: 1px solid var(--border-color);
+
+        .form-group {
+            margin-right: var(--margin-lg);
+        }
+    }
+
+    :last-child {
+        border: 0;
+    }
+}
+
+//styles for third party apps page
+//center wrt to outer most container and not immediate parent
+.empty-apps-state {
+	position: relative;
+	padding-top: 18rem;
+	margin-left: -250px;
+	margin-top: -150px;
+	text-align: center;
+
+	@include media-breakpoint-down(sm) {
+		margin: auto;
+		padding-top: 5rem;
+	}	
+
+    @include media-breakpoint-down(md) {
+        margin-left: 0;
+    }
+}
\ No newline at end of file

From 06ac314ab45340e6e92f0323a90dead578fd4acc Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 23 Dec 2021 23:12:18 +0530
Subject: [PATCH 05/97] refactor: add svg for empty state

---
 frappe/public/images/ui-states/empty-app-state.svg |  6 ++++++
 frappe/www/third_party_apps.html                   | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 frappe/public/images/ui-states/empty-app-state.svg

diff --git a/frappe/public/images/ui-states/empty-app-state.svg b/frappe/public/images/ui-states/empty-app-state.svg
new file mode 100644
index 0000000000..b7e346f310
--- /dev/null
+++ b/frappe/public/images/ui-states/empty-app-state.svg
@@ -0,0 +1,6 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path d="M26.4844 25.3281V16.0781" stroke="#F56B6B" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+	<path d="M42.6719 25.3281V16.0781" stroke="#F56B6B" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+	<path d="M34.5781 50.7656C30.8982 50.7656 27.3691 49.3038 24.767 46.7017C22.165 44.0997 20.7031 40.5705 20.7031 36.8906V25.3281H48.4531V36.8906C48.4531 40.5705 46.9913 44.0997 44.3892 46.7017C41.7872 49.3038 38.258 50.7656 34.5781 50.7656Z" stroke="#98A1A9" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+	<path d="M57.7032 58.8594C63.3462 53.4851 66.9411 46.3131 67.8703 38.576C68.7994 30.8388 67.0046 23.0197 62.7944 16.4622C58.5842 9.90464 52.2215 5.01829 44.7997 2.64279C37.3778 0.267296 29.3604 0.550997 22.125 3.44515C14.8896 6.33929 8.8882 11.6632 5.15204 18.5018C1.41588 25.3405 0.178293 33.267 1.65196 40.9191C3.12562 48.5713 7.21851 55.4712 13.2273 60.4332C19.236 65.3952 26.7855 68.1094 34.5782 68.1094V56.5469" stroke="#98A1A9" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/frappe/www/third_party_apps.html b/frappe/www/third_party_apps.html
index db31a4d1c8..0763382f70 100644
--- a/frappe/www/third_party_apps.html
+++ b/frappe/www/third_party_apps.html
@@ -2,7 +2,7 @@
 
 {% block title %} {{ _("Third Party Apps") }} {% endblock %}
 {% block header %}
-	<h1>{{ _("Third Party Apps") }}</h1>
+	<h3 class="my-account-header">{{ _("Third Party Apps") }}</h3>
 {% endblock %}
 
 {% block page_sidebar %}
@@ -52,9 +52,15 @@
 	</div>
 	{% endfor %}
 {% else %}
-	<div class="text-muted">
+<div class="empty-apps-state">
+	<img src="/assets/frappe/images/ui-states/empty-app-state.svg"/>	
+	<div class="font-weight-bold mt-4">		
 		{{ _("No Active Sessions")}}
 	</div>
+	<div class="text-muted mt-2">
+		{{ _("Looks like you haven’t added any third party apps.")}}
+	</div>
+</div>
 {% endif %}
 <div class="padding"></div>
 <script>

From b5722a4495b9c3adda5cffea1f388def8ec5c695 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Fri, 24 Dec 2021 10:03:04 +0530
Subject: [PATCH 06/97] refactor: list view

---
 frappe/public/scss/website/index.scss      |  4 ++++
 frappe/public/scss/website/my_account.scss |  2 +-
 frappe/www/list.html                       | 12 ++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 0dea8fa612..37bc4498de 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -167,6 +167,10 @@ a.card {
 	font-size: inherit;
 }
 
+.indicator-pill {
+	font-size: var(--font-size-xs)
+}
+
 h4.modal-title {
 	font-size: 1em;
 }
diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index 929f3d2876..7bf3368a53 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -1,6 +1,6 @@
 //styles for my account and edit-profile page
 @include media-breakpoint-up(sm) {
-    body[data-path="me"] {
+    body[data-path="me"], body[data-path="list"] {
         background-color: var(--bg-gray);
     }
 }
diff --git a/frappe/www/list.html b/frappe/www/list.html
index 842d55ff92..1d77414391 100644
--- a/frappe/www/list.html
+++ b/frappe/www/list.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block header %}
-	<h1>{{ title or (_("{0} List").format(_(doctype))) }}</h1>
+	<h3 class="my-account-header">{{ title or (_("{0} List").format(_(doctype))) }}</h3>
 {% endblock %}
 
 {% block breadcrumbs %}
@@ -23,11 +23,11 @@
 {% endblock %}
 
 {% block page_content %}
-
-{% if introduction %}<p>{{ introduction }}</p>{% endif %}
-{% include list_template or "templates/includes/list/list.html" %}
-{% if list_footer %}{{ list_footer }}{% endif %}
-
+	<div class="list-container">
+		{% if introduction %}<p>{{ introduction }}</p>{% endif %}
+		{% include list_template or "templates/includes/list/list.html" %}
+		{% if list_footer %}{{ list_footer }}{% endif %}
+	</div>
 {% endblock %}
 
 {% block script %}

From 7e4aa9b3e8b41576146d01782147060a291746de Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 27 Dec 2021 13:07:25 +0530
Subject: [PATCH 07/97] refactor: bg-color

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

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index 7bf3368a53..f795da20b4 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -1,7 +1,7 @@
 //styles for my account and edit-profile page
 @include media-breakpoint-up(sm) {
     body[data-path="me"], body[data-path="list"] {
-        background-color: var(--bg-gray);
+        background-color: var(--bg-color);
     }
 }
 

From 1f7fa047b63a024c8db5b37c978e7fcbb63547cc Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 27 Dec 2021 13:26:45 +0530
Subject: [PATCH 08/97] refactor: footer subscribe button

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

diff --git a/frappe/public/scss/website/footer.scss b/frappe/public/scss/website/footer.scss
index dc73fd180e..3bd492bda8 100644
--- a/frappe/public/scss/website/footer.scss
+++ b/frappe/public/scss/website/footer.scss
@@ -94,6 +94,8 @@
 			max-width: 300px;
 			border: 1px solid var(--dark-border-color);
 			box-shadow: none;
+			border-radius: 0.375rem;
+			font-size: $font-size-sm;
 		}
 	}
 }
\ No newline at end of file

From dc3558e553114e31b8d6395ac82a48333867a59c Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 27 Dec 2021 19:36:23 +0530
Subject: [PATCH 09/97] refactor: remove list container

---
 frappe/www/list.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/frappe/www/list.html b/frappe/www/list.html
index 1d77414391..06c494b804 100644
--- a/frappe/www/list.html
+++ b/frappe/www/list.html
@@ -23,11 +23,9 @@
 {% endblock %}
 
 {% block page_content %}
-	<div class="list-container">
-		{% if introduction %}<p>{{ introduction }}</p>{% endif %}
-		{% include list_template or "templates/includes/list/list.html" %}
-		{% if list_footer %}{{ list_footer }}{% endif %}
-	</div>
+	{% if introduction %}<p>{{ introduction }}</p>{% endif %}
+	{% include list_template or "templates/includes/list/list.html" %}
+	{% if list_footer %}{{ list_footer }}{% endif %}
 {% endblock %}
 
 {% block script %}

From 3dfde0e98ff3c6ac8ba8e146d8bb6bdc1f69030f Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 10:54:44 +0530
Subject: [PATCH 10/97] refactor: move font variable from desk to common file

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

diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss
index a14c19af2a..e5a0052f04 100644
--- a/frappe/public/scss/common/css_variables.scss
+++ b/frappe/public/scss/common/css_variables.scss
@@ -165,6 +165,16 @@
 	--bg-pink: var(--pink-50);
 	--bg-cyan: var(--cyan-50);
 
+	//font sizes
+	--text-xs: 11px;
+	--text-sm: 12px;
+	--text-md: 13px;
+	--text-base: 14px;
+	--text-lg: 16px;
+	--text-xl: 18px;
+	--text-2xl: 20px;
+	--text-3xl: 22px;
+
 	--text-on-blue: var(--blue-600);
 	--text-on-light-blue: var(--blue-500);
 	--text-on-dark-blue: var(--blue-700);
diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss
index 4a2a27f8d1..0912cb278b 100644
--- a/frappe/public/scss/desk/css_variables.scss
+++ b/frappe/public/scss/desk/css_variables.scss
@@ -4,15 +4,6 @@ $input-height: 28px !default;
 
 :root,
 [data-theme="light"] {
-	--text-xs: 11px;
-	--text-sm: 12px;
-	--text-md: 13px;
-	--text-base: 14px;
-	--text-lg: 16px;
-	--text-xl: 18px;
-	--text-2xl: 20px;
-	--text-3xl: 22px;
-
 	// breakpoints
 	--xxl-width: map-get($grid-breakpoints, '2xl');
 	--xl-width: map-get($grid-breakpoints, 'xl');

From 82393c6918e7368a934f8b2daa8dff5b587bc49d Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 10:56:37 +0530
Subject: [PATCH 11/97] refactor: use text font sizes

---
 frappe/public/scss/website/my_account.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index f795da20b4..caddbec5df 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -55,11 +55,11 @@
 
     .my-account-item-desc {
         color: var(--gray-700);
-        font-size: var(--font-size-sm);
+        font-size: var(--text-md);
     }
 
     .my-account-item-link {
-        font-size: var(--font-size-sm);
+        font-size: var(--text-md);
 
         a {
             text-decoration: none;

From 9450da9ef1dc40eb43ff14ee206d1d2a93fa646d Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 18:31:18 +0530
Subject: [PATCH 12/97] refactor: bg color for mobile screen

---
 frappe/public/scss/login.bundle.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/scss/login.bundle.scss b/frappe/public/scss/login.bundle.scss
index 3963fbecc6..0c8c2d58e2 100644
--- a/frappe/public/scss/login.bundle.scss
+++ b/frappe/public/scss/login.bundle.scss
@@ -1,7 +1,9 @@
 @import "./desk/variables";
 
 body {
-	background-color: var(--bg-light-gray);
+	@include media-breakpoint-up(sm) {
+		background-color: var(--bg-light-gray);
+	}
 }
 
 .for-forgot,

From c7d1677597e304dce07cf67a68c1fa9479f15ab3 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 18:33:00 +0530
Subject: [PATCH 13/97] refactor: portal bg color

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

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 37bc4498de..675243209c 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -29,6 +29,13 @@
 @import 'error-state';
 @import 'my_account';
 
+
+body {
+	@include media-breakpoint-up(sm) {
+		background-color: var(--bg-color);
+	}
+}
+
 .ql-editor.read-mode {
 	padding: 0;
 	line-height: 1.6;

From 738a8d81d57392036d00e654253548ca4d11f1a9 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 18:35:30 +0530
Subject: [PATCH 14/97] refactor: web forms

---
 frappe/public/scss/website/web_form.scss      | 73 +++++++++++++------
 .../doctype/web_form/templates/web_form.html  |  2 +-
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index 6a6547d79e..e94d052253 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -1,27 +1,54 @@
 @import "../common/form";
 
+
+[data-doctype="Web Form"] {
+    .page-content-wrapper {
+		
+        .breadcrumb-container.container {
+            @include media-breakpoint-up(sm) {
+                padding-left: var(--padding-sm);
+            }
+        }
+
+        .container {
+            max-width: 800px;
+
+            &.my-4 {
+                background-color: var(--fg-color);
+
+                @include media-breakpoint-up(sm) {
+                    padding: 1.8rem 1.8rem 3.4rem;
+                    border-radius: var(--border-radius-md);
+                    box-shadow: var(--card-shadow);
+                }
+            }
+        }
+    }
+}
+
 .web-form-wrapper {
-	.form-control {
-		color: var(--text-color);
-		background-color: var(--control-bg);
-	}
-
-	.form-section {
-		.section-head {
-			font-weight: bold;
-			font-size: var(--text-xl);
-			padding: var(--padding-md) 0;
-		}
-	}
-
-	.form-column {
-		padding: 0 var(--padding-md);
-		&:first-child {
-			padding-left: 0;
-		}
-
-		&:last-child {
-			padding-right: 0;
-		}
-	}
+    .form-control {
+        color: var(--text-color);
+        background-color: var(--control-bg);
+    }
+
+    .form-section {
+        .section-head {
+            font-weight: bold;
+            font-size: var(--text-xl);
+            padding: var(--padding-md) 0;
+        }
+    }
+
+    .form-column {
+        padding: 0 var(--padding-md);
+
+        &:first-child {
+            padding-left: 0;
+        }
+
+        &:last-child {
+            padding-right: 0;
+        }
+    }
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index f511b3c27d..ff4c86f421 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -3,7 +3,7 @@
 {% block title %}{{ _(title) }}{% endblock %}
 
 {% block header %}
-<h2>{{ _(title) }}</h2>
+<h3>{{ _(title) }}</h3>
 {% endblock %}
 
 {% block breadcrumbs %}

From cf2e783e0ee52102c4be12473405fd92c5d0c049 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 30 Dec 2021 18:53:09 +0530
Subject: [PATCH 15/97] test: change h2 to h3 for form title

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

diff --git a/frappe/website/doctype/web_form/test_web_form.py b/frappe/website/doctype/web_form/test_web_form.py
index 91ee4195df..3e05b221d8 100644
--- a/frappe/website/doctype/web_form/test_web_form.py
+++ b/frappe/website/doctype/web_form/test_web_form.py
@@ -66,7 +66,7 @@ class TestWebForm(unittest.TestCase):
 
 	def test_webform_render(self):
 		content = get_response_content('request-data')
-		self.assertIn('<h2>Request Data</h2>', content)
+		self.assertIn('<h3>Request Data</h3>', content)
 		self.assertIn('data-doctype="Web Form"', content)
 		self.assertIn('data-path="request-data"', content)
 		self.assertIn('source-type="Generator"', content)

From a109034ea5642086bab444e5c759027aa611c667 Mon Sep 17 00:00:00 2001
From: Aradhya <aradhyatripathi51@gmail.com>
Date: Thu, 30 Dec 2021 19:15:11 +0530
Subject: [PATCH 16/97] fix: frappe.db.escape in query generated by frappe.qb

---
 frappe/sessions.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index f0609cd74e..112e7ff386 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -68,9 +68,14 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None):
 	session = DocType("Sessions")
 	session_id = frappe.qb.from_(session).where((session.user == user) & (session.device.isin(device)))
 	if keep_current:
-		session_id = session_id.where(session.sid != frappe.db.escape(frappe.session.sid))
-
-	query = session_id.select(session.sid).offset(offset).limit(100).orderby(session.lastupdate, order=Order.desc)
+		session_id = session_id.where(session.sid != frappe.session.sid)
+
+	query = (
+        session_id.select(session.sid)
+        .offset(offset)
+        .limit(100)
+        .orderby(session.lastupdate, order=Order.desc)
+    )
 
 	return query.run(pluck=True)
 

From 1ff3a0d51778ae47b46294f715c80a1fc2f113fa Mon Sep 17 00:00:00 2001
From: Aradhya <aradhyatripathi51@gmail.com>
Date: Thu, 30 Dec 2021 19:29:02 +0530
Subject: [PATCH 17/97] fix: fixed sider issues

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

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 112e7ff386..6c9acdba13 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -71,11 +71,11 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None):
 		session_id = session_id.where(session.sid != frappe.session.sid)
 
 	query = (
-        session_id.select(session.sid)
-        .offset(offset)
-        .limit(100)
-        .orderby(session.lastupdate, order=Order.desc)
-    )
+		session_id.select(session.sid)
+		.offset(offset)
+		.limit(100)
+		.orderby(session.lastupdate, order=Order.desc)
+	)
 
 	return query.run(pluck=True)
 

From 20c53665968aeaf52ba93995831256e784f2b6e2 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Fri, 31 Dec 2021 12:11:24 +0530
Subject: [PATCH 18/97] refactor(UI): web form data table

---
 .../js/frappe/web_form/web_form_list.js       |  2 --
 frappe/public/scss/website/web_form.scss      | 23 ++++++++++++++++++-
 .../doctype/web_form/templates/web_form.html  |  6 ++---
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/frappe/public/js/frappe/web_form/web_form_list.js b/frappe/public/js/frappe/web_form/web_form_list.js
index de45b3ac11..f4d41c2a0b 100644
--- a/frappe/public/js/frappe/web_form/web_form_list.js
+++ b/frappe/public/js/frappe/web_form/web_form_list.js
@@ -139,8 +139,6 @@ export default class WebFormList {
 	make_table_head() {
 		// Create Heading
 		let thead = this.table.createTHead();
-		thead.style.backgroundColor = "#f7fafc";
-		thead.style.color = "#8d99a6";
 		let row = thead.insertRow();
 
 		let th = document.createElement("th");
diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index e94d052253..9a754eeaa9 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -17,7 +17,7 @@
                 background-color: var(--fg-color);
 
                 @include media-breakpoint-up(sm) {
-                    padding: 1.8rem 1.8rem 3.4rem;
+                    padding: 1.8rem 1.8rem;
                     border-radius: var(--border-radius-md);
                     box-shadow: var(--card-shadow);
                 }
@@ -51,4 +51,25 @@
             padding-right: 0;
         }
     }
+}
+
+.web-form-wrapper~#datatable {
+    .table {
+        thead {
+            th {
+                border: 0;
+                font-weight: normal;
+                color: var(--text-muted)
+            }
+        }
+
+        tr {
+            color: var(--text-color);
+
+            td {
+                border-top: 1px solid var(--border-color);
+            }
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html
index ff4c86f421..e6ddcd4c9c 100644
--- a/frappe/website/doctype/web_form/templates/web_form.html
+++ b/frappe/website/doctype/web_form/templates/web_form.html
@@ -29,8 +29,8 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req
 	{% if is_list %}
 	{# web form list #}
 	<div class="web-form-wrapper" {{ container_attributes() }}></div>
-	<div id="list-filters" class="row"></div>
-	<div id="datatable" class="pt-4"></div>
+	<div id="list-filters" class="row mt-4"></div>
+	<div id="datatable" class="pt-4 overflow-auto"></div>
 	<div class="list-view-footer text-right"></div>
 	{% else %}
 	{# web form #}
@@ -38,7 +38,7 @@ data-web-form="{{ name }}" data-web-form-doctype="{{ doc_type }}" data-login-req
 		<div id="introduction" class="text-muted"></div>
 		<hr>
 		<div class="web-form-wrapper" {{ container_attributes() }}></div>
-		<div class="web-form-footer pull-right"></div>
+		<div class="web-form-footer text-right"></div>
 	</div>
 
 	{% if show_attachments and not frappe.form_dict.new and attachments %}

From e9c30c00384f22b02f68f524ba603e0d272a0f03 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Fri, 31 Dec 2021 13:27:26 +0530
Subject: [PATCH 19/97] refactor: remove redundant  padding

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

diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index 9a754eeaa9..1bb9c1a3a9 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -17,7 +17,7 @@
                 background-color: var(--fg-color);
 
                 @include media-breakpoint-up(sm) {
-                    padding: 1.8rem 1.8rem;
+                    padding: 1.8rem;
                     border-radius: var(--border-radius-md);
                     box-shadow: var(--card-shadow);
                 }

From 1d73afc539e68f35ad7d5607e3e867802b0fd445 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 3 Jan 2022 09:19:02 +0530
Subject: [PATCH 20/97] fix: add icon for empty list state

---
 frappe/public/scss/website/index.scss    | 4 ++++
 frappe/templates/includes/list/list.html | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 675243209c..69a7b205c4 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -310,3 +310,7 @@ h5.modal-title {
 	margin: 70px auto;
 	font-size: $font-size-sm;
 }
+
+.empty-list-icon {
+	height: 70px;
+}
\ No newline at end of file
diff --git a/frappe/templates/includes/list/list.html b/frappe/templates/includes/list/list.html
index fba5f20ed5..14769ccf93 100644
--- a/frappe/templates/includes/list/list.html
+++ b/frappe/templates/includes/list/list.html
@@ -2,8 +2,9 @@
 <h4 class="text-muted">{{ sub_title }}</h4>
 {% endif %}
 {% if not result -%}
-	<div class="text-muted" style="min-height: 300px;">
-		{{ no_result_message or _("Nothing to show") }}
+	<div class="empty-apps-state">
+		<img class="empty-list-icon" src="/assets/frappe/images/ui-states/list-empty-state.svg"/>
+		<div class="mt-4">{{ no_result_message or _("Nothing to show") }}</div>
 	</div>
 {% else %}
 	<div class="website-list" data-doctype="{{ doctype }}"

From b4f0bc72bbbba7f4c83ace66a998c53ae528d33f Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Tue, 4 Jan 2022 13:17:41 +0530
Subject: [PATCH 21/97] fix: mobile view for reset password page

---
 frappe/templates/styles/card_style.css | 90 ++++++++++++++------------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/frappe/templates/styles/card_style.css b/frappe/templates/styles/card_style.css
index 4a2ea38480..9e38ad70bf 100644
--- a/frappe/templates/styles/card_style.css
+++ b/frappe/templates/styles/card_style.css
@@ -2,79 +2,87 @@
 	background-color: var(--bg-color);
 }
 
-body {
-	background-color: var(--bg-color);
-}
+
+
 .page-card {
-	max-width: 360px;
-	padding: 15px;
-	margin: 70px auto;
-	border-radius: 4px;
-	background-color: var(--fg-color);
-	box-shadow: var(--shadow-base);
+    max-width: 360px;
+    padding: 15px;
+    margin: 70px auto;
+    border-radius: 4px;
+    background-color: var(--fg-color);
+    /* box-shadow: var(--shadow-base); */
 }
 
 .for-reset-password {
-	margin: 80px 0;
-} 
+    margin: 80px 0;
+}
 
 .for-reset-password .page-card {
-	border: 0;
-	max-width: 450px;
-	margin: auto;
-	padding: 40px 60px;
-	border-radius: 10px;
-	box-shadow:  var(--shadow-base);
+    border: 0;
+    max-width: 450px;
+    margin: auto;
+    border-radius: 10px;
+}
+
+@media (min-width: 567px) {
+	.for-reset-password .page-card {
+		box-shadow: var(--shadow-base);
+		padding: 40px 60px;
+
+	}
 }
 
 .page-card .page-card-head {
-	padding: 10px 15px;
-	margin: -15px;
-	margin-bottom: 15px;
-	border-bottom: 1px solid var(--border-color);
+    padding: 10px 15px;
+    margin: -15px;
+    margin-bottom: 15px;
+    border-bottom: 1px solid var(--border-color);
 }
 
-.for-reset-password .page-card .page-card-head { 
-	border-bottom: 0;
+.for-reset-password .page-card .page-card-head {
+    border-bottom: 0;
 }
 
 .page-card-head h4 {
-	font-size: 18px;
-	font-weight: 600;
+    font-size: 18px;
+    font-weight: 600;
 }
 
 #reset-password .form-group {
-	margin-bottom: 10px;
-	font-size: var(--font-size-sm);
+    margin-bottom: 10px;
+    font-size: var(--font-size-sm);
 }
+
 .page-card .page-card-head .indicator {
-	color: #36414C;
-	font-size: 14px;
+    color: #36414C;
+    font-size: 14px;
 }
 
 .sign-up-message {
-	margin-top: 20px;
-	font-size: 13px;
-	color: var(--text-color);
+    margin-top: 20px;
+    font-size: 13px;
+    color: var(--text-color);
 }
+
 .page-card .page-card-head .indicator::before {
-	margin: 0 6px 0.5px 0px;
+    margin: 0 6px 0.5px 0px;
 }
 
 button#update {
-	font-size: var(--font-size-sm);
+    font-size: var(--font-size-sm);
 }
+
 .page-card .btn {
-	margin-top: 30px;
+    margin-top: 30px;
 }
 
 .page-card p {
-	font-size: 14px;
+    font-size: 14px;
 }
 
 .ellipsis {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	max-width: 100%;
-	vertical-align: middle;
-}
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+    vertical-align: middle;
+}
\ No newline at end of file

From 069bcec0aa4c29c2611d2bd420d1dd6fd249c6ce Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 5 Jan 2022 14:11:35 +0530
Subject: [PATCH 22/97] refactor: TestAuth

* Made it easier to run locally :')
* Moved content in setupclass rather than class init
---
 frappe/tests/test_auth.py | 82 +++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 38 deletions(-)

diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py
index 4ab5eaef37..122f202135 100644
--- a/frappe/tests/test_auth.py
+++ b/frappe/tests/test_auth.py
@@ -4,35 +4,40 @@ import time
 import unittest
 
 import frappe
-from frappe.auth import HTTPRequest, LoginAttemptTracker
+import frappe.utils
+from frappe.auth import LoginAttemptTracker
 from frappe.frappeclient import FrappeClient, AuthError
-from frappe.utils import set_request
+
+
+def add_user(email, password, username=None, mobile_no=None):
+	first_name = email.split('@', 1)[0]
+	user = frappe.get_doc(
+			dict(doctype='User', email=email, first_name=first_name, username=username, mobile_no=mobile_no)
+		).insert()
+	user.new_password = password
+	user.add_roles("System Manager")
+	frappe.db.commit()
+
 
 class TestAuth(unittest.TestCase):
-	def __init__(self, *args, **kwargs):
-		super(TestAuth, self).__init__(*args, **kwargs)
-		self.test_user_email = 'test_auth@test.com'
-		self.test_user_name = 'test_auth_user'
-		self.test_user_mobile = '+911234567890'
-		self.test_user_password = 'pwd_012'
-
-	def setUp(self):
-		self.tearDown()
-
-		self.add_user(self.test_user_email, self.test_user_password,
-			username=self.test_user_name, mobile_no=self.test_user_mobile)
-
-	def tearDown(self):
-		frappe.delete_doc('User', self.test_user_email, force=True)
-
-	def add_user(self, email, password, username=None, mobile_no=None):
-		first_name = email.split('@', 1)[0]
-		user = frappe.get_doc(
-				dict(doctype='User', email=email, first_name=first_name, username=username, mobile_no=mobile_no)
-			).insert()
-		user.new_password = password
-		user.save()
-		frappe.db.commit()
+	@classmethod
+	def setUpClass(cls):
+		cls.HOST_NAME = (
+			frappe.get_site_config().host_name
+			or frappe.utils.get_site_url(frappe.local.site)
+		)
+		cls.test_user_email = 'test_auth@test.com'
+		cls.test_user_name = 'test_auth_user'
+		cls.test_user_mobile = '+911234567890'
+		cls.test_user_password = 'pwd_012'
+
+		cls.tearDownClass()
+		add_user(email=cls.test_user_email, password=cls.test_user_password,
+			username=cls.test_user_name, mobile_no=cls.test_user_mobile)
+
+	@classmethod
+	def tearDownClass(cls):
+		frappe.delete_doc('User', cls.test_user_email, force=True)
 
 	def set_system_settings(self, k, v):
 		frappe.db.set_value("System Settings", "System Settings", k, v)
@@ -43,12 +48,12 @@ class TestAuth(unittest.TestCase):
 		self.set_system_settings('allow_login_using_user_name', 0)
 
 		# Login by both email and mobile should work
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_mobile, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
 
 		# login by username should fail
 		with self.assertRaises(AuthError):
-			FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+			FrappeClient(self.HOST_NAME, self.test_user_name, self.test_user_password)
 
 	def test_allow_login_using_only_email(self):
 		self.set_system_settings('allow_login_using_mobile_number', 0)
@@ -56,14 +61,14 @@ class TestAuth(unittest.TestCase):
 
 		# Login by mobile number should fail
 		with self.assertRaises(AuthError):
-			FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+			FrappeClient(self.HOST_NAME, self.test_user_mobile, self.test_user_password)
 
 		# login by username should fail
 		with self.assertRaises(AuthError):
-			FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+			FrappeClient(self.HOST_NAME, self.test_user_name, self.test_user_password)
 
 		# Login by email should work
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
 
 	def test_allow_login_using_username(self):
 		self.set_system_settings('allow_login_using_mobile_number', 0)
@@ -71,20 +76,21 @@ class TestAuth(unittest.TestCase):
 
 		# Mobile login should fail
 		with self.assertRaises(AuthError):
-			FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
+			FrappeClient(self.HOST_NAME, self.test_user_mobile, self.test_user_password)
 
 		# Both email and username logins should work
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_name, self.test_user_password)
 
 	def test_allow_login_using_username_and_mobile(self):
 		self.set_system_settings('allow_login_using_mobile_number', 1)
 		self.set_system_settings('allow_login_using_user_name', 1)
 
 		# Both email and username and mobile logins should work
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_mobile, self.test_user_password)
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_email, self.test_user_password)
-		FrappeClient(frappe.get_site_config().host_name, self.test_user_name, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_mobile, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
+		FrappeClient(self.HOST_NAME, self.test_user_name, self.test_user_password)
+
 
 class TestLoginAttemptTracker(unittest.TestCase):
 	def test_account_lock(self):

From 73dc1b567d6388c3548407567ef69e5abf4acddc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 5 Jan 2022 14:13:00 +0530
Subject: [PATCH 23/97] test: Added test for deny_multiple_sessions

---
 frappe/tests/test_auth.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py
index 122f202135..472597c7c2 100644
--- a/frappe/tests/test_auth.py
+++ b/frappe/tests/test_auth.py
@@ -91,6 +91,26 @@ class TestAuth(unittest.TestCase):
 		FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
 		FrappeClient(self.HOST_NAME, self.test_user_name, self.test_user_password)
 
+	def test_deny_multiple_login(self):
+		self.set_system_settings('deny_multiple_sessions', 1)
+
+		first_login = FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
+		first_login.get_list("ToDo")
+
+		second_login = FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
+
+		second_login.get_list("ToDo")
+		with self.assertRaises(Exception):
+			first_login.get_list("ToDo")
+
+		third_login = FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
+
+		with self.assertRaises(Exception):
+			first_login.get_list("ToDo")
+		with self.assertRaises(Exception):
+			second_login.get_list("ToDo")
+		third_login.get_list("ToDo")
+
 
 class TestLoginAttemptTracker(unittest.TestCase):
 	def test_account_lock(self):

From eafb89f0598eb8f944c8e94e264de68fa7721d94 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 6 Jan 2022 11:13:04 +0530
Subject: [PATCH 24/97] refactor: use border radius variable

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

diff --git a/frappe/public/scss/website/footer.scss b/frappe/public/scss/website/footer.scss
index 3bd492bda8..f3bdfed07f 100644
--- a/frappe/public/scss/website/footer.scss
+++ b/frappe/public/scss/website/footer.scss
@@ -94,7 +94,7 @@
 			max-width: 300px;
 			border: 1px solid var(--dark-border-color);
 			box-shadow: none;
-			border-radius: 0.375rem;
+			border-radius: var(--border-radius);
 			font-size: $font-size-sm;
 		}
 	}

From 55178101e85ec80b367cd88f84e251c4278c61ca Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 6 Jan 2022 12:48:06 +0530
Subject: [PATCH 25/97] fix: catch exceptions while parsing json on request
 failure

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index eff0391338..87309f4226 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -292,8 +292,15 @@ frappe.request.call = function(opts) {
 		.fail(function(xhr, textStatus) {
 			try {
 				if (xhr.responseText) {
-					var data = JSON.parse(xhr.responseText);
-					if (data.exception) {
+					var data;
+					try {
+						data = JSON.parse(xhr.responseText);
+					} catch (e) {
+						console.log("Unable to parse reponse text");
+						console.log(xhr.responseText);
+						console.log(e);
+					}
+					if (data && data.exception) {
 						// frappe.exceptions.CustomError -> CustomError
 						var exception = data.exception.split('.').at(-1);
 						var exception_handler = exception_handlers[exception];

From 379342d0caaed320e864343d888f24f66d36f067 Mon Sep 17 00:00:00 2001
From: Verequies <hamishclaxton@gmail.com>
Date: Tue, 22 Jun 2021 13:40:41 +1000
Subject: [PATCH 26/97] fix: Postgres Compatibility for Standard Views

Core/User DocType: Add 'group_by' for PostgreSQL

Signed-off-by: Verequies <hamishclaxton@gmail.com>

fix: Postgres Compatibility for Standard Views

Desk/Dashboard DocType: Fix lowercase table name

Signed-off-by: Verequies <hamishclaxton@gmail.com>

Desk/Page/Setup Wizard: Fix data not being commited to database

Signed-off-by: Verequies <hamishclaxton@gmail.com>

Model/db_query: Fix queries with order_by and group_by for PostgreSQL

Signed-off-by: Verequies <hamishclaxton@gmail.com>

Model/db_query: Fix order_by without table name for PostgreSQL

Signed-off-by: Verequies <hamishclaxton@gmail.com>
---
 frappe/core/doctype/user_type/user_type.py    |  7 ++-----
 frappe/desk/doctype/dashboard/dashboard.py    |  2 +-
 frappe/desk/page/setup_wizard/setup_wizard.py |  2 +-
 frappe/model/db_query.py                      | 14 ++++++++++++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/user_type/user_type.py b/frappe/core/doctype/user_type/user_type.py
index c1fd678141..6a07b5a23b 100644
--- a/frappe/core/doctype/user_type/user_type.py
+++ b/frappe/core/doctype/user_type/user_type.py
@@ -36,11 +36,8 @@ class UserType(Document):
 		if not self.user_doctypes:
 			return
 
-		modules = frappe.get_all("DocType",
-			fields=["module"],
-			filters={"name": ("in", [d.document_type for d in self.user_doctypes])},
-			distinct=True,
-		)
+		modules = frappe.get_all('DocType', fields=['distinct module as module'],
+			filters={'name': ('in', [d.document_type for d in self.user_doctypes])}, group_by='module')
 
 		self.set('user_type_modules', [])
 		for row in modules:
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 0dfd458a37..833447a00b 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -14,7 +14,7 @@ class Dashboard(Document):
 		if self.is_default:
 			# make all other dashboards non-default
 			frappe.db.sql('''update
-				tabDashboard set is_default = 0 where name != %s''', self.name)
+				`tabDashboard` set is_default = 0 where name != %s''', self.name)
 
 		if frappe.conf.developer_mode and self.is_standard:
 			export_to_files(record_list=[['Dashboard', self.name, self.module + ' Dashboard']], record_module=self.module)
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
index 83a5e16009..6d7ecce462 100755
--- a/frappe/desk/page/setup_wizard/setup_wizard.py
+++ b/frappe/desk/page/setup_wizard/setup_wizard.py
@@ -388,7 +388,6 @@ def make_records(records, debug=False):
 
 	# LOG every success and failure
 	for record in records:
-
 		doctype = record.get("doctype")
 		condition = record.get('__condition')
 
@@ -405,6 +404,7 @@ def make_records(records, debug=False):
 
 		try:
 			doc.insert(ignore_permissions=True)
+			frappe.db.commit()
 
 		except frappe.DuplicateEntryError as e:
 			# print("Failed to insert duplicate {0} {1}".format(doctype, doc.name))
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 16c0d18d9f..3c5d6e81ac 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -128,6 +128,20 @@ class DatabaseQuery(object):
 			args.fields = 'distinct ' + args.fields
 			args.order_by = '' # TODO: recheck for alternative
 
+		if args.order_by and args.group_by:
+			order_field = args.order_by
+
+			for r in (" order by ", " asc", " ASC", " desc", " DESC"):
+				order_field = order_field.replace(r, "")
+
+			if not order_field in args.fields:
+				order_fieldm = order_field.replace("`", "")
+				if "." in order_fieldm:
+					args.fields += ", MAX(" + order_fieldm.split(".")[1] + ") as `" + order_fieldm + "`"
+				else:
+					args.fields += ", MAX(" + order_fieldm + ") as `" + order_fieldm + "`"
+				args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
+
 		query = """select %(fields)s
 			from %(tables)s
 			%(conditions)s

From 6d988603866adae27fe75b935f96bbb0e10bcbab Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Thu, 6 Jan 2022 21:08:21 +0530
Subject: [PATCH 27/97] fix: my account link unclickable

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

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index caddbec5df..d3d372923b 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -100,9 +100,8 @@
 //center wrt to outer most container and not immediate parent
 .empty-apps-state {
 	position: relative;
-	padding-top: 18rem;
+	padding-top: 10rem;
 	margin-left: -250px;
-	margin-top: -150px;
 	text-align: center;
 
 	@include media-breakpoint-down(sm) {

From 40ba1ac9ba3909ffff30c03029e70a43b520c483 Mon Sep 17 00:00:00 2001
From: Conor <conor@millstone.studio>
Date: Sun, 19 Dec 2021 12:16:34 -0600
Subject: [PATCH 28/97] fix: Postgres Compatibility

* Handle inconsistencies in type handling in DatabaseQuery & Database
  APIs
* Update incompatible queries with frappe.qb notation
* Fixed use cases discovered by failing ERPNext CI tests

fix: db independent syntax for user_type

fix: handle postgres datetime values

feat: add ability to auto commit on db inserts

feat: add ability to escape underscore in postgres

fix: handle missing data in test runner bootstrapping

fix: db independent syntax for queries

fix: refactor to use qb

fix: update cache for language

fix: use pluck in email_queue

Co-authored-by: gavin <gavin18d@gmail.com>

fix: don't auto insert on tests for make_property_setter

fix: remove auto_commit in custom_field insertion

fix: remove auto_commit functionality

fix: review comments

fix: revert link validation

fix: style suggestion for readability

Co-authored-by: gavin <gavin18d@gmail.com>

fix: revert .lower() in link validation

fix: add rollback for setup_wizard

Revert "fix: add rollback for setup_wizard"

This reverts commit 83b3b0913db17718ccd5edae01858cff15603829.

Revert "feat: add ability to escape underscore in postgres"

This reverts commit 8ed9c2aa3306438e94bb813f60e65b416d0b947b.

fix: more concise representation of order fields

Co-authored-by: gavin <gavin18d@gmail.com>
---
 frappe/core/doctype/user_type/user_type.py    | 12 +++++--
 frappe/database/postgres/database.py          |  8 ++++-
 .../desk/doctype/bulk_update/bulk_update.py   |  3 +-
 frappe/desk/doctype/dashboard/dashboard.py    |  5 +--
 frappe/desk/page/setup_wizard/setup_wizard.py |  3 +-
 frappe/desk/treeview.py                       |  5 +--
 .../email/doctype/email_queue/email_queue.py  | 36 ++++++++-----------
 frappe/model/base_document.py                 |  4 ++-
 frappe/model/db_query.py                      | 13 ++++---
 frappe/test_runner.py                         |  5 ++-
 frappe/tests/test_website.py                  |  1 +
 frappe/utils/data.py                          |  3 ++
 frappe/utils/make_random.py                   | 10 ++++--
 frappe/utils/nestedset.py                     | 14 ++++----
 frappe/utils/response.py                      |  2 +-
 .../doctype/blog_post/test_blog_post.py       |  5 ++-
 16 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/frappe/core/doctype/user_type/user_type.py b/frappe/core/doctype/user_type/user_type.py
index 6a07b5a23b..5775d499bd 100644
--- a/frappe/core/doctype/user_type/user_type.py
+++ b/frappe/core/doctype/user_type/user_type.py
@@ -36,13 +36,19 @@ class UserType(Document):
 		if not self.user_doctypes:
 			return
 
-		modules = frappe.get_all('DocType', fields=['distinct module as module'],
-			filters={'name': ('in', [d.document_type for d in self.user_doctypes])}, group_by='module')
+		DocType = frappe.qb.DocType("DocType")
+
+		document_types = [d.document_type for d in self.user_doctypes] or ['']
+		modules = (frappe.qb.from_(DocType)
+					.select(DocType.module)
+					.where(DocType.name.isin(document_types))
+					.groupby(DocType.module)
+					.distinct()).run()
 
 		self.set('user_type_modules', [])
 		for row in modules:
 			self.append('user_type_modules', {
-				'module': row.module
+				'module': row[0]
 			})
 
 	def validate_document_type_limit(self):
diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 3cea1440cf..795d36eaeb 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -74,9 +74,15 @@ class PostgresDatabase(Database):
 		return conn
 
 	def escape(self, s, percent=True):
-		"""Excape quotes and percent in given string."""
+		"""Escape quotes and percent in given string."""
 		if isinstance(s, bytes):
 			s = s.decode('utf-8')
+				
+		# MariaDB's driver treats None as an empty string
+		# So Postgres should do the same
+
+		if s is None: 
+			s = ''
 
 		if percent:
 			s = s.replace("%", "%%")
diff --git a/frappe/desk/doctype/bulk_update/bulk_update.py b/frappe/desk/doctype/bulk_update/bulk_update.py
index b512ca175c..a0523d90cd 100644
--- a/frappe/desk/doctype/bulk_update/bulk_update.py
+++ b/frappe/desk/doctype/bulk_update/bulk_update.py
@@ -7,6 +7,7 @@ from frappe.model.document import Document
 from frappe import _
 from frappe.utils import cint
 
+
 class BulkUpdate(Document):
 	pass
 
@@ -22,7 +23,7 @@ def update(doctype, field, value, condition='', limit=500):
 		frappe.throw(_('; not allowed in condition'))
 
 	docnames = frappe.db.sql_list(
-		'''select name from `tab{0}`{1} limit 0, {2}'''.format(doctype, condition, limit)
+		'''select name from `tab{0}`{1} limit {2} offset 0'''.format(doctype, condition, limit)
 	)
 	data = {}
 	data[field] = value
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 833447a00b..55044cda4b 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -13,8 +13,9 @@ class Dashboard(Document):
 	def on_update(self):
 		if self.is_default:
 			# make all other dashboards non-default
-			frappe.db.sql('''update
-				`tabDashboard` set is_default = 0 where name != %s''', self.name)
+			DashBoard = frappe.qb.DocType("Dashboard")
+			
+			frappe.qb.update(DashBoard).set(DashBoard.is_default, 0).where(DashBoard.name != self.name).run()
 
 		if frappe.conf.developer_mode and self.is_standard:
 			export_to_files(record_list=[['Dashboard', self.name, self.module + ' Dashboard']], record_module=self.module)
diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py
index 6d7ecce462..b42d8c58b7 100755
--- a/frappe/desk/page/setup_wizard/setup_wizard.py
+++ b/frappe/desk/page/setup_wizard/setup_wizard.py
@@ -151,7 +151,7 @@ def update_system_settings(args):
 	system_settings = frappe.get_doc("System Settings", "System Settings")
 	system_settings.update({
 		"country": args.get("country"),
-		"language": get_language_code(args.get("language")),
+		"language": get_language_code(args.get("language")) or 'en',
 		"time_zone": args.get("timezone"),
 		"float_precision": 3,
 		'date_format': frappe.db.get_value("Country", args.get("country"), "date_format"),
@@ -417,6 +417,7 @@ def make_records(records, debug=False):
 				raise
 
 		except Exception as e:
+			frappe.db.rollback()
 			exception = record.get('__exception')
 			if exception:
 				config = _dict(exception)
diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py
index f40c135653..7e3efb5d48 100644
--- a/frappe/desk/treeview.py
+++ b/frappe/desk/treeview.py
@@ -4,6 +4,7 @@
 import frappe
 from frappe import _
 
+
 @frappe.whitelist()
 def get_all_nodes(doctype, label, parent, tree_method, **filters):
 	'''Recursively gets all data from tree nodes'''
@@ -40,8 +41,8 @@ def get_children(doctype, parent='', **filters):
 
 def _get_children(doctype, parent='', ignore_permissions=False):
 	parent_field = 'parent_' + doctype.lower().replace(' ', '_')
-	filters = [['ifnull(`{0}`,"")'.format(parent_field), '=', parent],
-		['docstatus', '<' ,'2']]
+	filters = [["ifnull(`{0}`,'')".format(parent_field), '=', parent],
+		['docstatus', '<' ,2]]
 
 	meta = frappe.get_meta(doctype)
 
diff --git a/frappe/email/doctype/email_queue/email_queue.py b/frappe/email/doctype/email_queue/email_queue.py
index d89a3d83be..9730004065 100644
--- a/frappe/email/doctype/email_queue/email_queue.py
+++ b/frappe/email/doctype/email_queue/email_queue.py
@@ -475,28 +475,20 @@ class QueueBuilder:
 		if self._unsubscribed_user_emails is not None:
 			return self._unsubscribed_user_emails
 
-		all_ids = tuple(set(self.recipients + self.cc))
-
-		unsubscribed = frappe.db.sql_list('''
-			SELECT
-				distinct email
-			from
-				`tabEmail Unsubscribe`
-			where
-				email in %(all_ids)s
-				and (
-					(
-						reference_doctype = %(reference_doctype)s
-						and reference_name = %(reference_name)s
-					)
-					or global_unsubscribe = 1
-				)
-		''', {
-			'all_ids': all_ids,
-			'reference_doctype': self.reference_doctype,
-			'reference_name': self.reference_name,
-		})
-
+		all_ids = list(set(self.recipients + self.cc))
+
+		EmailUnsubscribe = frappe.qb.DocType("Email Unsubscribe")
+
+		unsubscribed = (frappe.qb.from_(EmailUnsubscribe)
+						.select(EmailUnsubscribe.email)
+						.where(EmailUnsubscribe.email.isin(all_ids) & 	
+									(
+										(
+											(EmailUnsubscribe.reference_doctype == self.reference_doctype) & (EmailUnsubscribe.reference_name == self.reference_name)
+										) | EmailUnsubscribe.global_unsubscribe == 1
+									)
+								).distinct()
+						).run(pluck=True)
 		self._unsubscribed_user_emails = unsubscribed or []
 		return self._unsubscribed_user_emails
 
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 1fd3784fcc..d24c1722a8 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -771,7 +771,9 @@ class BaseDocument(object):
 
 				else:
 					self_value = self.get_value(key)
-
+				# Postgres stores values as `datetime.time`, MariaDB as `timedelta`
+				if isinstance(self_value, datetime.timedelta) and isinstance(db_value, datetime.time):
+					db_value = datetime.timedelta(hours=db_value.hour, minutes=db_value.minute, seconds=db_value.second, microseconds=db_value.microsecond)
 				if self_value != db_value:
 					frappe.throw(_("Not allowed to change {0} after submission").format(df.label),
 						frappe.UpdateAfterSubmitError)
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 3c5d6e81ac..73273917f7 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -127,19 +127,18 @@ class DatabaseQuery(object):
 		if self.distinct:
 			args.fields = 'distinct ' + args.fields
 			args.order_by = '' # TODO: recheck for alternative
-
+			
+		# Postgres requires any field that appears in the select clause to also 
+		# appear in the order by and group by clause
 		if args.order_by and args.group_by:
 			order_field = args.order_by
 
 			for r in (" order by ", " asc", " ASC", " desc", " DESC"):
 				order_field = order_field.replace(r, "")
 
-			if not order_field in args.fields:
-				order_fieldm = order_field.replace("`", "")
-				if "." in order_fieldm:
-					args.fields += ", MAX(" + order_fieldm.split(".")[1] + ") as `" + order_fieldm + "`"
-				else:
-					args.fields += ", MAX(" + order_fieldm + ") as `" + order_fieldm + "`"
+			if order_field not in args.fields:
+				order_fieldm = order_field.replace("`", '"')
+				args.fields += f", MAX({order_fieldm}) as `{order_fieldm}`"
 				args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
 
 		query = """select %(fields)s
diff --git a/frappe/test_runner.py b/frappe/test_runner.py
index 5f26842be2..1839f15ae8 100644
--- a/frappe/test_runner.py
+++ b/frappe/test_runner.py
@@ -335,7 +335,10 @@ def make_test_records_for_doctype(doctype, verbose=0, force=False):
 		frappe.local.test_objects[doctype] += test_module._make_test_records(verbose)
 
 	elif hasattr(test_module, "test_records"):
-		frappe.local.test_objects[doctype] += make_test_objects(doctype, test_module.test_records, verbose, force)
+		if doctype in frappe.local.test_objects:
+			frappe.local.test_objects[doctype] += make_test_objects(doctype, test_module.test_records, verbose, force)
+		else: 
+			frappe.local.test_objects[doctype] = make_test_objects(doctype, test_module.test_records, verbose, force)
 
 	else:
 		test_records = frappe.get_test_records(doctype)
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index 992d876243..e40a07c0ec 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -197,6 +197,7 @@ class TestWebsite(unittest.TestCase):
 		frappe.cache().delete_key('app_hooks')
 
 	def test_printview_page(self):
+		frappe.db.value_cache[('DocType', 'Language', 'name')] = (('Language',),)
 		content = get_response_content('/Language/ru')
 		self.assertIn('<div class="print-format">', content)
 		self.assertIn('<div>Language</div>', content)
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index de0242df07..cdd4d3d277 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -98,6 +98,9 @@ def get_timedelta(time: Optional[str] = None) -> Optional[datetime.timedelta]:
 def to_timedelta(time_str):
 	from dateutil import parser
 
+	if isinstance(time_str, datetime.time):
+		time_str = str(time_str)
+
 	if isinstance(time_str, str):
 		t = parser.parse(time_str)
 		return datetime.timedelta(hours=t.hour, minutes=t.minute, seconds=t.second, microseconds=t.microsecond)
diff --git a/frappe/utils/make_random.py b/frappe/utils/make_random.py
index 2ebabb78f9..bb4395b626 100644
--- a/frappe/utils/make_random.py
+++ b/frappe/utils/make_random.py
@@ -35,9 +35,13 @@ def get_random(doctype, filters=None, doc=False):
 		condition = " where " + " and ".join(condition)
 	else:
 		condition = ""
-
-	out = frappe.db.sql("""select name from `tab%s` %s
-		order by RAND() limit 0,1""" % (doctype, condition))
+	
+	out = frappe.db.multisql({
+		'mariadb': """select name from `tab%s` %s
+		order by RAND() limit 1 offset 0""" % (doctype, condition),
+		'postgres': """select name from `tab%s` %s
+		order by RANDOM() limit 1 offset 0""" % (doctype, condition)
+	})
 
 	out = out and out[0][0] or None
 
diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py
index 5c4beda71e..1fc2d7779a 100644
--- a/frappe/utils/nestedset.py
+++ b/frappe/utils/nestedset.py
@@ -16,6 +16,9 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder import DocType, Order
+from pypika import CustomFunction
+
+Replace = CustomFunction('REPLACE', ['input', 'substr_to_replace', 'substr_to_replace_with'])
 
 class NestedSetRecursionError(frappe.ValidationError): pass
 class NestedSetMultipleRootsError(frappe.ValidationError): pass
@@ -88,7 +91,7 @@ def update_move_node(doc, parent_field):
 
 	if parent:
 		new_parent = frappe.db.sql("""select lft, rgt from `tab{0}`
-			where name = %s for update""".format(doc.doctype), parent, as_dict=1)[0]
+		where name = %s for update""".format(doc.doctype), parent, as_dict=1)[0]
 
 		validate_loop(doc.doctype, doc.name, new_parent.lft, new_parent.rgt)
 
@@ -107,8 +110,7 @@ def update_move_node(doc, parent_field):
 
 	if parent:
 		new_parent = frappe.db.sql("""select lft, rgt from `tab%s`
-			where name = %s for update""" % (doc.doctype, '%s'), parent, as_dict=1)[0]
-
+		where name = %s for update""" % (doc.doctype, '%s'), parent, as_dict=1)[0]
 
 		# set parent lft, rgt
 		frappe.db.sql("""update `tab{0}` set rgt = rgt + %s
@@ -134,6 +136,7 @@ def update_move_node(doc, parent_field):
 	frappe.db.sql("""update `tab{0}` set lft = -lft + %s, rgt = -rgt + %s
 		where lft < 0""".format(doc.doctype), (new_diff, new_diff))
 
+
 @frappe.whitelist()
 def rebuild_tree(doctype, parent_field):
 	"""
@@ -148,13 +151,12 @@ def rebuild_tree(doctype, parent_field):
 	right = 1
 	table = DocType(doctype)
 	column = getattr(table, parent_field)
-
 	result = (
 		frappe.qb.from_(table)
 		.where(
 			(column == "") | (column.isnull())
 		)
-		.orderby(table.name, order=Order.asc)
+		.orderby(Replace(table.name, '_', ''), order=Order.asc)
 		.select(table.name)
 	).run()
 
@@ -177,7 +179,7 @@ def rebuild_node(doctype, parent, left, parent_field):
 	column = getattr(table, parent_field)
 
 	result = (
-		frappe.qb.from_(table).where(column == parent).select(table.name)
+		frappe.qb.from_(table).where(column == parent).select(table.name).orderby(Replace(table.name, '_', ''), order=Order.asc)
 	).run()
 
 	for r in result:
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 104c48527c..f6ad91dbd2 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -125,7 +125,7 @@ def json_handler(obj):
 	# serialize date
 	import collections.abc
 
-	if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime)):
+	if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime, datetime.time)):
 		return str(obj)
 
 	elif isinstance(obj, decimal.Decimal):
diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py
index 7a09d0a3ca..d649d25f7e 100644
--- a/frappe/website/doctype/blog_post/test_blog_post.py
+++ b/frappe/website/doctype/blog_post/test_blog_post.py
@@ -58,15 +58,18 @@ class TestBlogPost(unittest.TestCase):
 		category_page_link = list(soup.find_all('a', href=re.compile(blog.blog_category)))[0]
 		category_page_url = category_page_link["href"]
 
+		cached_value = frappe.db.value_cache[('DocType', 'Blog Post', 'name')]
+		frappe.db.value_cache[('DocType', 'Blog Post', 'name')] = (('Blog Post',),)
+
 		# Visit the category page (by following the link found in above stage)
 		set_request(path=category_page_url)
 		category_page_response = get_response()
 		category_page_html = frappe.safe_decode(category_page_response.get_data())
-
 		# Category page should contain the blog post title
 		self.assertIn(blog.title, category_page_html)
 
 		# Cleanup
+		frappe.db.value_cache[('DocType', 'Blog Post', 'name')] = cached_value
 		frappe.delete_doc("Blog Post", blog.name)
 		frappe.delete_doc("Blog Category", blog.blog_category)
 

From 1c40881c411f8d67dc399a6a4b2ded7eed1168d4 Mon Sep 17 00:00:00 2001
From: Conor <conor@millstone.studio>
Date: Wed, 29 Dec 2021 16:49:23 -0600
Subject: [PATCH 29/97] fix: refactor postgres arg prep into its own function

---
 frappe/model/db_query.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 73273917f7..d296c24362 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -130,16 +130,8 @@ class DatabaseQuery(object):
 			
 		# Postgres requires any field that appears in the select clause to also 
 		# appear in the order by and group by clause
-		if args.order_by and args.group_by:
-			order_field = args.order_by
-
-			for r in (" order by ", " asc", " ASC", " desc", " DESC"):
-				order_field = order_field.replace(r, "")
-
-			if order_field not in args.fields:
-				order_fieldm = order_field.replace("`", '"')
-				args.fields += f", MAX({order_fieldm}) as `{order_fieldm}`"
-				args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
+		if frappe.db.db_type == 'postgres' and args.order_by and args.group_by:
+			args = self.prepare_select_args(args)
 
 		query = """select %(fields)s
 			from %(tables)s
@@ -214,6 +206,19 @@ class DatabaseQuery(object):
 
 		return args
 
+	def prepare_select_args(self, args):
+		order_field = args.order_by
+
+		for r in (" order by ", " asc", " ASC", " desc", " DESC"):
+			order_field = order_field.replace(r, "")
+
+		if order_field not in args.fields:
+			order_fieldm = order_field.replace("`", '"')
+			args.fields += f", MAX({order_fieldm}) as `{order_fieldm}`"
+			args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
+
+		return args
+
 	def parse_args(self):
 		"""Convert fields and filters from strings to list, dicts"""
 		if isinstance(self.fields, str):

From 55392b64e7bbadcacee52959fd2b5d4d9614ef02 Mon Sep 17 00:00:00 2001
From: Conor <conor@millstone.studio>
Date: Wed, 29 Dec 2021 17:10:06 -0600
Subject: [PATCH 30/97] fix: Revert changes made to fix collation differences

Due to collation differences in MariaDB and Postgres, tests gave
inconsistent results. This was to be handled in tests alone instead of
the application. It was unnecessary. Collation changes should be made at DBMS config
level only. Accomodating for those in the application will unnecessarily
degrade performance for everyone.

Other changes:
* use pluck in user_type
* revert ordering in nestedset
* revert parsing in order_field
* use preferred APIs & styling

Co-authored-by: gavin <gavin18d@gmail.com>
---
 frappe/core/doctype/user_type/user_type.py | 23 +++++++----------
 frappe/desk/doctype/dashboard/dashboard.py | 29 ++++++++++++++--------
 frappe/model/db_query.py                   |  7 ++++--
 frappe/utils/nestedset.py                  | 13 ++++------
 4 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/frappe/core/doctype/user_type/user_type.py b/frappe/core/doctype/user_type/user_type.py
index 5775d499bd..661ac932e7 100644
--- a/frappe/core/doctype/user_type/user_type.py
+++ b/frappe/core/doctype/user_type/user_type.py
@@ -36,20 +36,15 @@ class UserType(Document):
 		if not self.user_doctypes:
 			return
 
-		DocType = frappe.qb.DocType("DocType")
-
-		document_types = [d.document_type for d in self.user_doctypes] or ['']
-		modules = (frappe.qb.from_(DocType)
-					.select(DocType.module)
-					.where(DocType.name.isin(document_types))
-					.groupby(DocType.module)
-					.distinct()).run()
-
-		self.set('user_type_modules', [])
-		for row in modules:
-			self.append('user_type_modules', {
-				'module': row[0]
-			})
+		modules = frappe.get_all("DocType",
+			filters={"name": ("in", [d.document_type for d in self.user_doctypes])},
+			distinct=True,
+			pluck="module",
+		)
+
+		self.set("user_type_modules", [])
+		for module in modules:
+			self.append("user_type_modules", {"module": module})
 
 	def validate_document_type_limit(self):
 		limit = frappe.conf.get('user_type_doctype_limit', {}).get(frappe.scrub(self.name))
diff --git a/frappe/desk/doctype/dashboard/dashboard.py b/frappe/desk/doctype/dashboard/dashboard.py
index 55044cda4b..ac62796dc2 100644
--- a/frappe/desk/doctype/dashboard/dashboard.py
+++ b/frappe/desk/doctype/dashboard/dashboard.py
@@ -1,24 +1,33 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies and contributors
+# Copyright (c) 2022, Frappe Technologies and contributors
 # License: MIT. See LICENSE
 
-from frappe.model.document import Document
-from frappe.modules.export_file import export_to_files
-from frappe.config import get_modules_from_all_apps_for_user
+import json
+
 import frappe
 from frappe import _
-import json
+from frappe.config import get_modules_from_all_apps_for_user
+from frappe.model.document import Document
+from frappe.modules.export_file import export_to_files
+from frappe.query_builder import DocType
+
 
 class Dashboard(Document):
 	def on_update(self):
 		if self.is_default:
 			# make all other dashboards non-default
-			DashBoard = frappe.qb.DocType("Dashboard")
-			
-			frappe.qb.update(DashBoard).set(DashBoard.is_default, 0).where(DashBoard.name != self.name).run()
+			DashBoard = DocType("Dashboard")
+
+			frappe.qb.update(DashBoard).set(
+				DashBoard.is_default, 0
+			).where(
+				DashBoard.name != self.name
+			).run()
 
 		if frappe.conf.developer_mode and self.is_standard:
-			export_to_files(record_list=[['Dashboard', self.name, self.module + ' Dashboard']], record_module=self.module)
+			export_to_files(
+				record_list=[["Dashboard", self.name, f"{self.module} Dashboard"]],
+				record_module=self.module
+			)
 
 	def validate(self):
 		if not frappe.conf.developer_mode and self.is_standard:
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index d296c24362..1bb42f9c97 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -213,8 +213,11 @@ class DatabaseQuery(object):
 			order_field = order_field.replace(r, "")
 
 		if order_field not in args.fields:
-			order_fieldm = order_field.replace("`", '"')
-			args.fields += f", MAX({order_fieldm}) as `{order_fieldm}`"
+			order_fieldm = order_field.replace("`", "")
+			if "." in order_fieldm:
+				args.fields += ", MAX(" + order_fieldm.split(".")[1] + ") as `" + order_fieldm + "`"
+			else:
+				args.fields += ", MAX(" + order_fieldm + ") as `" + order_fieldm + "`"
 			args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
 
 		return args
diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py
index 1fc2d7779a..34322092dc 100644
--- a/frappe/utils/nestedset.py
+++ b/frappe/utils/nestedset.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
 
 # Tree (Hierarchical) Nested Set Model (nsm)
@@ -16,9 +16,6 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.query_builder import DocType, Order
-from pypika import CustomFunction
-
-Replace = CustomFunction('REPLACE', ['input', 'substr_to_replace', 'substr_to_replace_with'])
 
 class NestedSetRecursionError(frappe.ValidationError): pass
 class NestedSetMultipleRootsError(frappe.ValidationError): pass
@@ -91,7 +88,7 @@ def update_move_node(doc, parent_field):
 
 	if parent:
 		new_parent = frappe.db.sql("""select lft, rgt from `tab{0}`
-		where name = %s for update""".format(doc.doctype), parent, as_dict=1)[0]
+			where name = %s for update""".format(doc.doctype), parent, as_dict=1)[0]
 
 		validate_loop(doc.doctype, doc.name, new_parent.lft, new_parent.rgt)
 
@@ -110,7 +107,7 @@ def update_move_node(doc, parent_field):
 
 	if parent:
 		new_parent = frappe.db.sql("""select lft, rgt from `tab%s`
-		where name = %s for update""" % (doc.doctype, '%s'), parent, as_dict=1)[0]
+			where name = %s for update""" % (doc.doctype, '%s'), parent, as_dict=1)[0]
 
 		# set parent lft, rgt
 		frappe.db.sql("""update `tab{0}` set rgt = rgt + %s
@@ -156,7 +153,7 @@ def rebuild_tree(doctype, parent_field):
 		.where(
 			(column == "") | (column.isnull())
 		)
-		.orderby(Replace(table.name, '_', ''), order=Order.asc)
+		.orderby(table.name, order=Order.asc)
 		.select(table.name)
 	).run()
 
@@ -179,7 +176,7 @@ def rebuild_node(doctype, parent, left, parent_field):
 	column = getattr(table, parent_field)
 
 	result = (
-		frappe.qb.from_(table).where(column == parent).select(table.name).orderby(Replace(table.name, '_', ''), order=Order.asc)
+		frappe.qb.from_(table).where(column == parent).select(table.name)
 	).run()
 
 	for r in result:

From d9b571cf43727d4ca6b4ff514f4199258cc0e3aa Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 7 Jan 2022 11:25:06 +0530
Subject: [PATCH 31/97] refactor(minor): DatabaseQuery.prepare_select_args

* Used regex to replace instead of re-iteration (for-loop)
* Used f-strings for better readability
* Renamed and re-ordered vars, code block
---
 frappe/model/db_query.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 1bb42f9c97..f973cbbb8a 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -127,8 +127,8 @@ class DatabaseQuery(object):
 		if self.distinct:
 			args.fields = 'distinct ' + args.fields
 			args.order_by = '' # TODO: recheck for alternative
-			
-		# Postgres requires any field that appears in the select clause to also 
+
+		# Postgres requires any field that appears in the select clause to also
 		# appear in the order by and group by clause
 		if frappe.db.db_type == 'postgres' and args.order_by and args.group_by:
 			args = self.prepare_select_args(args)
@@ -207,18 +207,15 @@ class DatabaseQuery(object):
 		return args
 
 	def prepare_select_args(self, args):
-		order_field = args.order_by
-
-		for r in (" order by ", " asc", " ASC", " desc", " DESC"):
-			order_field = order_field.replace(r, "")
+		order_field = re.sub(r"\ order\ by\ |\ asc|\ ASC|\ desc|\ DESC", "", args.order_by)
 
 		if order_field not in args.fields:
-			order_fieldm = order_field.replace("`", "")
-			if "." in order_fieldm:
-				args.fields += ", MAX(" + order_fieldm.split(".")[1] + ") as `" + order_fieldm + "`"
-			else:
-				args.fields += ", MAX(" + order_fieldm + ") as `" + order_fieldm + "`"
-			args.order_by = args.order_by.replace(order_field, "`" + order_fieldm + "`")
+			extracted_column = order_column = order_field.replace("`", "")
+			if "." in extracted_column:
+				extracted_column = extracted_column.split(".")[1]
+
+			args.fields += f", MAX({extracted_column}) as `{order_column}`"
+			args.order_by = args.order_by.replace(order_field, f"`{order_column}`")
 
 		return args
 

From 307c7ced69572ec56051f3a88e1e91422d2e94fb Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 14:55:54 +0530
Subject: [PATCH 32/97] chore: check custom exception handlers only for json
 response

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 87309f4226..16b113f079 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -291,7 +291,7 @@ frappe.request.call = function(opts) {
 		})
 		.fail(function(xhr, textStatus) {
 			try {
-				if (xhr.responseText) {
+				if (xhr.getResponseHeader('content-type') == 'application/json' && xhr.responseText) {
 					var data;
 					try {
 						data = JSON.parse(xhr.responseText);

From 1bde3b48bdd7a0d81f6d183b19f58ac8ecb8b72c Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 14:56:25 +0530
Subject: [PATCH 33/97] fix: parsing exception from traceback

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 16b113f079..35f946df65 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -301,8 +301,8 @@ frappe.request.call = function(opts) {
 						console.log(e);
 					}
 					if (data && data.exception) {
-						// frappe.exceptions.CustomError -> CustomError
-						var exception = data.exception.split('.').at(-1);
+						// frappe.exceptions.CustomError: (1024, ...) -> CustomError
+						var exception = data.exception.split('.').at(-1).split(':').at(0);
 						var exception_handler = exception_handlers[exception];
 						if (exception_handler) {
 							exception_handler(data);

From bf68f76405aeb1e5eba7bf4a272e199e5f33c5bb Mon Sep 17 00:00:00 2001
From: ruthra <ruthrab@gmail.com>
Date: Fri, 7 Jan 2022 15:49:05 +0530
Subject: [PATCH 34/97] fix: data exporter throwing exception

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

diff --git a/frappe/core/doctype/data_export/exporter.py b/frappe/core/doctype/data_export/exporter.py
index c5cf67ba57..79570d5048 100644
--- a/frappe/core/doctype/data_export/exporter.py
+++ b/frappe/core/doctype/data_export/exporter.py
@@ -314,7 +314,7 @@ class DataExporter:
 						.where(child_doctype_table.parentfield == c["parentfield"])
 						.orderby(child_doctype_table.idx)
 					)
-					for ci, child in enumerate(data_row.run()):
+					for ci, child in enumerate(data_row.run(as_dict=True)):
 						self.add_data_row(rows, c['doctype'], c['parentfield'], child, ci)
 
 			for row in rows:

From 10c5e732a5ce1d10e198f3fef1d1030af84f214c Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@parsimony.com>
Date: Fri, 7 Jan 2022 17:53:24 +0530
Subject: [PATCH 35/97] fix: allow longer authorization URIs

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

diff --git a/frappe/integrations/doctype/connected_app/connected_app.json b/frappe/integrations/doctype/connected_app/connected_app.json
index b5330f4d4f..b66cd9014b 100644
--- a/frappe/integrations/doctype/connected_app/connected_app.json
+++ b/frappe/integrations/doctype/connected_app/connected_app.json
@@ -96,7 +96,7 @@
   },
   {
    "fieldname": "authorization_uri",
-   "fieldtype": "Data",
+   "fieldtype": "Small Text",
    "label": "Authorization URI",
    "mandatory_depends_on": "eval:doc.redirect_uri"
   },
@@ -139,7 +139,7 @@
    "link_fieldname": "connected_app"
   }
  ],
- "modified": "2021-05-10 05:03:06.296863",
+ "modified": "2022-01-07 05:28:45.073041",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Connected App",

From 000625038cb204e2389edf8bc0248b4f6321860c Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Fri, 31 Dec 2021 15:15:00 +0530
Subject: [PATCH 36/97] fix: delete property setter

---
 frappe/custom/doctype/customize_form/customize_form.py   | 2 +-
 frappe/custom/doctype/property_setter/property_setter.py | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 24a5d1358b..488c468025 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -377,7 +377,7 @@ class CustomizeForm(Document):
 
 	def make_property_setter(self, prop, value, property_type, fieldname=None,
 		apply_on=None, row_name = None):
-		delete_property_setter(self.doc_type, prop, fieldname)
+		delete_property_setter(self.doc_type, prop, fieldname, row_name)
 
 		property_value = self.get_existing_property_value(prop, fieldname)
 
diff --git a/frappe/custom/doctype/property_setter/property_setter.py b/frappe/custom/doctype/property_setter/property_setter.py
index 7f40be9725..0a65aa6f5d 100644
--- a/frappe/custom/doctype/property_setter/property_setter.py
+++ b/frappe/custom/doctype/property_setter/property_setter.py
@@ -19,7 +19,7 @@ class PropertySetter(Document):
 	def validate(self):
 		self.validate_fieldtype_change()
 		if self.is_new():
-			delete_property_setter(self.doc_type, self.property, self.field_name)
+			delete_property_setter(self.doc_type, self.property, self.field_name, self.row_name)
 
 		# clear cache
 		frappe.clear_cache(doctype = self.doc_type)
@@ -91,11 +91,13 @@ def make_property_setter(doctype, fieldname, property, value, property_type, for
 	property_setter.insert()
 	return property_setter
 
-def delete_property_setter(doc_type, property, field_name=None):
+def delete_property_setter(doc_type, property, field_name=None, row_name=None):
 	"""delete other property setters on this, if this is new"""
-	filters = dict(doc_type = doc_type, property=property)
+	filters = dict(doc_type=doc_type, property=property)
 	if field_name:
 		filters['field_name'] = field_name
+	if row_name:
+		filters["row_name"] = row_name
 
 	frappe.db.delete('Property Setter', filters)
 

From d1852242a0acb37c799d00c2b9fc8ca6d71b3587 Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Mon, 10 Jan 2022 15:52:25 +0530
Subject: [PATCH 37/97] fix: limit in `Document.get`

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

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index eeef552a8a..6353eff95d 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -1008,15 +1008,12 @@ def _filter(data, filters, limit=None):
 			_filters[f] = fval
 
 	for d in data:
-		add = True
 		for f, fval in _filters.items():
 			if not frappe.compare(getattr(d, f, None), fval[0], fval[1]):
-				add = False
 				break
-
-		if add:
+		else:
 			out.append(d)
-			if limit and (len(out)-1)==limit:
+			if limit and len(out) >= limit:
 				break
 
 	return out

From a87899c2155a0c2576d551a31aa5f6535be6930b Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Tue, 11 Jan 2022 11:12:53 +0530
Subject: [PATCH 38/97] test: add test for limit

---
 frappe/tests/test_document.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 29cec8b230..34a1dd070c 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -252,3 +252,8 @@ class TestDocument(unittest.TestCase):
 			'currency': 100000
 		})
 		self.assertEquals(d.get_formatted('currency', currency='INR', format="#,###.##"), '₹ 100,000.00')
+
+	def test_limit_for_get(self):
+		doc = frappe.get_doc("DocType", "DocType")
+		# assuming DocType has more that 3 Data fields
+		self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3)
\ No newline at end of file

From 58f7b02c307db854386569612c87045ca5feb52c Mon Sep 17 00:00:00 2001
From: cpdeethree <conor@millstone.studio>
Date: Fri, 7 Jan 2022 18:06:53 -0600
Subject: [PATCH 39/97] fix: add test_for prepare_select_args

---
 frappe/tests/test_db_query.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py
index 48e97d5bb0..5cd6690209 100644
--- a/frappe/tests/test_db_query.py
+++ b/frappe/tests/test_db_query.py
@@ -1,6 +1,8 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
-import frappe, unittest
+import frappe
+import datetime
+import unittest
 
 from frappe.model.db_query import DatabaseQuery
 from frappe.desk.reportview import get_filters_cond
@@ -380,6 +382,22 @@ class TestReportview(unittest.TestCase):
 		owners = DatabaseQuery("DocType").execute(filters={"name": "DocType"}, pluck="owner")
 		self.assertEqual(owners, ["Administrator"])
 
+	def test_prepare_select_args(self):
+		# frappe.get_all inserts modified field into order_by clause
+		# test to make sure this is inserted into select field when postgres
+		doctypes = frappe.get_all("DocType",
+			filters={"docstatus": 0, "document_type": ("!=", "")},
+			group_by="document_type",
+			fields=["document_type", "sum(is_submittable) as is_submittable"],
+			limit=1,
+			as_list=True,
+		)
+		if frappe.conf.db_type == "mariadb":
+			self.assertTrue(len(doctypes[0]) == 2)
+		else:
+			self.assertTrue(len(doctypes[0]) == 3)
+			self.assertTrue(isinstance(doctypes[0][2], datetime.datetime))
+
 	def test_column_comparison(self):
 		"""Test DatabaseQuery.execute to test column comparison
 		"""

From 645fde2e675daf0fd7e13ad44a051a5453c2577c Mon Sep 17 00:00:00 2001
From: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com>
Date: Tue, 11 Jan 2022 13:41:38 +0530
Subject: [PATCH 40/97] fix: email fetch error for imaplib (#15581)

* fix: remove maxline for imaplib

* refactor: remove redundant line

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
---
 frappe/email/receive.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 4f4ed6d48e..dd64d0df80 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -27,11 +27,7 @@ from frappe.utils.html_utils import clean_email_html
 
 # fix due to a python bug in poplib that limits it to 2048
 poplib._MAXLINE = 20480
-imaplib._MAXLINE = 20480
 
-# fix due to a python bug in poplib that limits it to 2048
-poplib._MAXLINE = 20480
-imaplib._MAXLINE = 20480
 
 
 class EmailSizeExceededError(frappe.ValidationError): pass

From 1d1ed171a1fe84c2e7aba6f61f48817b79243d34 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 11 Jan 2022 13:47:27 +0530
Subject: [PATCH 41/97] fix: Pass date object instead of string for selectDate
 to work

"Today" button was not working because get_now_date was returning string
---
 frappe/public/js/frappe/form/controls/date.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/date.js b/frappe/public/js/frappe/form/controls/date.js
index 78eb3832cc..7ad1887d62 100644
--- a/frappe/public/js/frappe/form/controls/date.js
+++ b/frappe/public/js/frappe/form/controls/date.js
@@ -10,14 +10,16 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
 		this.set_t_for_today();
 	}
 	set_formatted_input(value) {
+		if (value === "Today") {
+			value = this.get_now_date();
+		}
+
 		super.set_formatted_input(value);
 		if (this.timepicker_only) return;
 		if (!this.datepicker) return;
 		if (!value) {
 			this.datepicker.clear();
 			return;
-		} else if (value === "Today") {
-			value = this.get_now_date();
 		}
 
 		let should_refresh = this.last_value && this.last_value !== value;
@@ -78,7 +80,7 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
 	}
 
 	get_start_date() {
-		return new Date(this.get_now_date());
+		return this.get_now_date();
 	}
 
 	set_datepicker() {
@@ -117,7 +119,7 @@ frappe.ui.form.ControlDate = class ControlDate extends frappe.ui.form.ControlDat
 		this.datepicker.update('position', position);
 	}
 	get_now_date() {
-		return frappe.datetime.convert_to_system_tz(frappe.datetime.now_date(true));
+		return frappe.datetime.convert_to_system_tz(frappe.datetime.now_date(true), false).toDate();
 	}
 	set_t_for_today() {
 		var me = this;

From eeff2a22f88b8f836a4cf0bc5935730318f58108 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Tue, 11 Jan 2022 18:13:11 +0530
Subject: [PATCH 42/97] fix: enable languages inserted during setup (#15588)

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

diff --git a/frappe/core/doctype/language/language.py b/frappe/core/doctype/language/language.py
index 511c8ddeb6..69942ffd6d 100644
--- a/frappe/core/doctype/language/language.py
+++ b/frappe/core/doctype/language/language.py
@@ -39,7 +39,8 @@ def sync_languages():
 			frappe.get_doc({
 				'doctype': 'Language',
 				'language_code': l['code'],
-				'language_name': l['name']
+				'language_name': l['name'],
+				'enabled': 1,
 			}).insert()
 
 def update_language_names():

From 425f6eca435309e862363092c4213647e816a5e9 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Tue, 11 Jan 2022 18:17:09 +0530
Subject: [PATCH 43/97] refactor: code indentation

---
 frappe/public/scss/website/my_account.scss | 177 +++++++++++----------
 frappe/public/scss/website/web_form.scss   | 107 ++++++-------
 2 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index d3d372923b..bdc52588aa 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -1,99 +1,100 @@
 //styles for my account and edit-profile page
 @include media-breakpoint-up(sm) {
-    body[data-path="me"], body[data-path="list"] {
-        background-color: var(--bg-color);
-    }
+	body[data-path="me"],
+	body[data-path="list"] {
+		background-color: var(--bg-color);
+	}
 }
 
 @include media-breakpoint-down(sm) {
-    #page-me {
-        .side-list {
-            .list-group {
-                display: none;
-            }
-        }
-    }
+	#page-me {
+		.side-list {
+			.list-group {
+				display: none;
+			}
+		}
+	}
 }
 
 .my-account-header {
-    color: var(--gray-900);
-    margin-bottom: var(--margin-lg);
-    font-weight: bold;
+	color: var(--gray-900);
+	margin-bottom: var(--margin-lg);
+	font-weight: bold;
 
-    @include media-breakpoint-down(sm) {
-        margin-left: -1rem;
-    }
+	@include media-breakpoint-down(sm) {
+		margin-left: -1rem;
+	}
 }
 
 .account-info {
-    background-color: var(--fg-color);
-    border-radius: var(--border-radius-md);
-    padding: var(--padding-sm) 25px;
-    max-width: 850px;
-
-    @include media-breakpoint-up(sm) {
-        margin-left: 0;
-    }
-
-    @include media-breakpoint-down(sm) {
-        padding: 0;
-    }
-
-    .my-account-name,
-    .my-account-item {
-        color: var(--gray-900);
-        font-weight: var(--text-bold);
-    }
-
-    .my-account-avatar {
-
-        .avatar {
-            height: 60px;
-            width: 60px;
-        }
-    }
-
-    .my-account-item-desc {
-        color: var(--gray-700);
-        font-size: var(--text-md);
-    }
-
-    .my-account-item-link {
-        font-size: var(--text-md);
-
-        a {
-            text-decoration: none;
-
-            .edit-profile-icon {
-                stroke: var(--blue-500);
-            }
-        }
-
-        .right-icon {
-            @include media-breakpoint-up(sm) {
-                display: none;
-            }
-        }
-
-        .item-link-text {
-            @include media-breakpoint-down(sm) {
-                display: none;
-            }
-        }
-    }
-
-    .col {
-        padding: var(--padding-md) 0;
-        border-bottom: 1px solid var(--border-color);
-
-        .form-group {
-            margin-right: var(--margin-lg);
-        }
-    }
-
-    :last-child {
-        border: 0;
-    }
+	background-color: var(--fg-color);
+	border-radius: var(--border-radius-md);
+	padding: var(--padding-sm) 25px;
+	max-width: 850px;
+
+	@include media-breakpoint-up(sm) {
+		margin-left: 0;
+	}
+
+	@include media-breakpoint-down(sm) {
+		padding: 0;
+	}
+
+	.my-account-name,
+	.my-account-item {
+		color: var(--gray-900);
+		font-weight: var(--text-bold);
+	}
+
+	.my-account-avatar {
+
+		.avatar {
+			height: 60px;
+			width: 60px;
+		}
+	}
+
+	.my-account-item-desc {
+		color: var(--gray-700);
+		font-size: var(--text-md);
+	}
+
+	.my-account-item-link {
+		font-size: var(--text-md);
+
+		a {
+			text-decoration: none;
+
+			.edit-profile-icon {
+				stroke: var(--blue-500);
+		}
+	}
+
+		.right-icon {
+			@include media-breakpoint-up(sm) {
+				display: none;
+			}
+		}
+
+		.item-link-text {
+			@include media-breakpoint-down(sm) {
+				display: none;
+			}
+		}
+	}
+
+	.col {
+		padding: var(--padding-md) 0;
+		border-bottom: 1px solid var(--border-color);
+
+		.form-group {
+			margin-right: var(--margin-lg);
+		}
+	}
+
+	:last-child {
+		border: 0;
+	}
 }
 
 //styles for third party apps page
@@ -107,9 +108,9 @@
 	@include media-breakpoint-down(sm) {
 		margin: auto;
 		padding-top: 5rem;
-	}	
+	}
 
-    @include media-breakpoint-down(md) {
-        margin-left: 0;
-    }
+	@include media-breakpoint-down(md) {
+		margin-left: 0;
+	}
 }
\ No newline at end of file
diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index 1bb9c1a3a9..4707632c6a 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -2,74 +2,73 @@
 
 
 [data-doctype="Web Form"] {
-    .page-content-wrapper {
+	.page-content-wrapper {
 		
-        .breadcrumb-container.container {
-            @include media-breakpoint-up(sm) {
-                padding-left: var(--padding-sm);
-            }
-        }
+		.breadcrumb-container.container {
+			@include media-breakpoint-up(sm) {
+				padding-left: var(--padding-sm);
+			}
+		}
 
-        .container {
-            max-width: 800px;
+		.container {
+			max-width: 800px;
 
-            &.my-4 {
-                background-color: var(--fg-color);
+			&.my-4 {
+				background-color: var(--fg-color);
 
-                @include media-breakpoint-up(sm) {
-                    padding: 1.8rem;
-                    border-radius: var(--border-radius-md);
-                    box-shadow: var(--card-shadow);
-                }
-            }
-        }
-    }
+					@include media-breakpoint-up(sm) {
+						padding: 1.8rem;
+						border-radius: var(--border-radius-md);
+						box-shadow: var(--card-shadow);
+					}
+			}
+		}
+	}
 }
 
 .web-form-wrapper {
-    .form-control {
-        color: var(--text-color);
-        background-color: var(--control-bg);
-    }
+	.form-control {
+		color: var(--text-color);
+		background-color: var(--control-bg);
+	}
 
-    .form-section {
-        .section-head {
-            font-weight: bold;
-            font-size: var(--text-xl);
-            padding: var(--padding-md) 0;
-        }
-    }
+	.form-section {
+		.section-head {
+			font-weight: bold;
+			font-size: var(--text-xl);
+			padding: var(--padding-md) 0;
+		}
+	}
 
-    .form-column {
-        padding: 0 var(--padding-md);
+	.form-column {
+		padding: 0 var(--padding-md);
 
-        &:first-child {
-            padding-left: 0;
-        }
+		&:first-child {
+			padding-left: 0;
+		}
 
-        &:last-child {
-            padding-right: 0;
-        }
-    }
+		&:last-child {
+			padding-right: 0;
+		}
+	}
 }
 
 .web-form-wrapper~#datatable {
-    .table {
-        thead {
-            th {
-                border: 0;
-                font-weight: normal;
-                color: var(--text-muted)
-            }
-        }
+	.table {
+		thead {
+			th {
+				border: 0;
+				font-weight: normal;
+				color: var(--text-muted)
+			}
+		}
 
-        tr {
-            color: var(--text-color);
+		tr {
+			color: var(--text-color);
 
-            td {
-                border-top: 1px solid var(--border-color);
-            }
-        }
-
-    }
+		td {
+			border-top: 1px solid var(--border-color);
+		}
+		}
+	}
 }
\ No newline at end of file

From 9ce0031d7cc9f88fe9c9a2ef0eed6e2e48dfd7c4 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Tue, 11 Jan 2022 18:18:50 +0530
Subject: [PATCH 44/97] refactor: code indentation

---
 frappe/public/scss/website/web_form.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index 4707632c6a..cb79f88266 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -66,9 +66,9 @@
 		tr {
 			color: var(--text-color);
 
-		td {
+			td {
 			border-top: 1px solid var(--border-color);
-		}
+			}
 		}
 	}
 }
\ No newline at end of file

From 75c0e760303d9022aa285f5a990a842fa11b94cb Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Tue, 11 Jan 2022 19:33:30 +0530
Subject: [PATCH 45/97] fix: html mode for ace editor

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

diff --git a/frappe/public/js/frappe/form/controls/markdown_editor.js b/frappe/public/js/frappe/form/controls/markdown_editor.js
index d9ba2df261..5acf4bd467 100644
--- a/frappe/public/js/frappe/form/controls/markdown_editor.js
+++ b/frappe/public/js/frappe/form/controls/markdown_editor.js
@@ -32,7 +32,9 @@ frappe.ui.form.ControlMarkdownEditor = class ControlMarkdownEditor extends frapp
 	}
 
 	set_language() {
-		this.df.options = 'Markdown';
+		if (!this.df.options) {
+			this.df.options = 'Markdown';
+		}
 		super.set_language();
 	}
 

From 9e281e7b19f038230b0ece20306d30dec1e05aca Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 12 Jan 2022 14:28:55 +0530
Subject: [PATCH 46/97] refactor: Test Commands

* Separate out test case for backup cases
  * Split each case into separate tests
  * Add teardown to remove files geenrated in custom paths
* Rename test that wasn't running
* Rename test cases for consistency
---
 frappe/tests/test_commands.py | 285 ++++++++++++++++++----------------
 1 file changed, 154 insertions(+), 131 deletions(-)

diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py
index b266f3f21f..692dde0f08 100644
--- a/frappe/tests/test_commands.py
+++ b/frappe/tests/test_commands.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 
 # imports - standard imports
 import gzip
@@ -133,134 +133,6 @@ class TestCommands(BaseTestCommands):
 		self.assertEqual(self.returncode, 0)
 		self.assertEqual(self.stdout[1:-1], frappe.bold(text="DocType"))
 
-	def test_backup(self):
-		backup = {
-			"includes": {
-				"includes": [
-					"ToDo",
-					"Note",
-				]
-			},
-			"excludes": {
-				"excludes": [
-					"Activity Log",
-					"Access Log",
-					"Error Log"
-				]
-			}
-		}
-		home = os.path.expanduser("~")
-		site_backup_path = frappe.utils.get_site_path("private", "backups")
-
-		# test 1: take a backup
-		before_backup = fetch_latest_backups()
-		self.execute("bench --site {site} backup")
-		after_backup = fetch_latest_backups()
-
-		self.assertEqual(self.returncode, 0)
-		self.assertIn("successfully completed", self.stdout)
-		self.assertNotEqual(before_backup["database"], after_backup["database"])
-
-		# test 2: take a backup with --with-files
-		before_backup = after_backup.copy()
-		self.execute("bench --site {site} backup --with-files")
-		after_backup = fetch_latest_backups()
-
-		self.assertEqual(self.returncode, 0)
-		self.assertIn("successfully completed", self.stdout)
-		self.assertIn("with files", self.stdout)
-		self.assertNotEqual(before_backup, after_backup)
-		self.assertIsNotNone(after_backup["public"])
-		self.assertIsNotNone(after_backup["private"])
-
-		# test 3: take a backup with --backup-path
-		backup_path = os.path.join(home, "backups")
-		self.execute("bench --site {site} backup --backup-path {backup_path}", {"backup_path": backup_path})
-
-		self.assertEqual(self.returncode, 0)
-		self.assertTrue(os.path.exists(backup_path))
-		self.assertGreaterEqual(len(os.listdir(backup_path)), 2)
-
-		# test 4: take a backup with --backup-path-db, --backup-path-files, --backup-path-private-files, --backup-path-conf
-		kwargs = {
-			key: os.path.join(home, key, value)
-			for key, value in {
-				"db_path": "database.sql.gz",
-				"files_path": "public.tar",
-				"private_path": "private.tar",
-				"conf_path": "config.json",
-			}.items()
-		}
-
-		self.execute(
-			"""bench
-			--site {site} backup --with-files
-			--backup-path-db {db_path}
-			--backup-path-files {files_path}
-			--backup-path-private-files {private_path}
-			--backup-path-conf {conf_path}""",
-			kwargs,
-		)
-
-		self.assertEqual(self.returncode, 0)
-		for path in kwargs.values():
-			self.assertTrue(os.path.exists(path))
-
-		# test 5: take a backup with --compress
-		self.execute("bench --site {site} backup --with-files --compress")
-		self.assertEqual(self.returncode, 0)
-		compressed_files = glob.glob(site_backup_path + "/*.tgz")
-		self.assertGreater(len(compressed_files), 0)
-
-		# test 6: take a backup with --verbose
-		self.execute("bench --site {site} backup --verbose")
-		self.assertEqual(self.returncode, 0)
-
-		# test 7: take a backup with frappe.conf.backup.includes
-		self.execute(
-			"bench --site {site} set-config backup '{includes}' --parse",
-			{"includes": json.dumps(backup["includes"])},
-		)
-		self.execute("bench --site {site} backup --verbose")
-		self.assertEqual(self.returncode, 0)
-		database = fetch_latest_backups(partial=True)["database"]
-		self.assertEqual([], missing_in_backup(backup["includes"]["includes"], database))
-
-		# test 8: take a backup with frappe.conf.backup.excludes
-		self.execute(
-			"bench --site {site} set-config backup '{excludes}' --parse",
-			{"excludes": json.dumps(backup["excludes"])},
-		)
-		self.execute("bench --site {site} backup --verbose")
-		self.assertEqual(self.returncode, 0)
-		database = fetch_latest_backups(partial=True)["database"]
-		self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database))
-		self.assertEqual([], missing_in_backup(backup["includes"]["includes"], database))
-
-		# test 9: take a backup with --include (with frappe.conf.excludes still set)
-		self.execute(
-			"bench --site {site} backup --include '{include}'",
-			{"include": ",".join(backup["includes"]["includes"])},
-		)
-		self.assertEqual(self.returncode, 0)
-		database = fetch_latest_backups(partial=True)["database"]
-		self.assertEqual([], missing_in_backup(backup["includes"]["includes"], database))
-
-		# test 10: take a backup with --exclude
-		self.execute(
-			"bench --site {site} backup --exclude '{exclude}'",
-			{"exclude": ",".join(backup["excludes"]["excludes"])},
-		)
-		self.assertEqual(self.returncode, 0)
-		database = fetch_latest_backups(partial=True)["database"]
-		self.assertFalse(exists_in_backup(backup["excludes"]["excludes"], database))
-
-		# test 11: take a backup with --ignore-backup-conf
-		self.execute("bench --site {site} backup --ignore-backup-conf")
-		self.assertEqual(self.returncode, 0)
-		database = fetch_latest_backups()["database"]
-		self.assertEqual([], missing_in_backup(backup["excludes"]["excludes"], database))
-
 	def test_restore(self):
 		# step 0: create a site to run the test on
 		global_config = {
@@ -474,7 +346,7 @@ class TestCommands(BaseTestCommands):
 		# cleanup
 		shutil.rmtree(test_app_path)
 
-	def disable_test_bench_drop_site_should_archive_site(self):
+	def test_bench_drop_site_should_archive_site(self):
 		site = 'test_site.localhost'
 
 		self.execute(
@@ -493,7 +365,158 @@ class TestCommands(BaseTestCommands):
 		self.assertTrue(os.path.exists(archive_directory))
 
 
-class RemoveAppUnitTests(unittest.TestCase):
+class TestBackups(BaseTestCommands):
+	backup_map = {
+		"includes": {
+			"includes": [
+				"ToDo",
+				"Note",
+			]
+		},
+		"excludes": {
+			"excludes": [
+				"Activity Log",
+				"Access Log",
+				"Error Log"
+			]
+		}
+	}
+	home = os.path.expanduser("~")
+	site_backup_path = frappe.utils.get_site_path("private", "backups")
+
+	def setUp(self):
+		self.files_to_trash = []
+
+	def tearDown(self):
+		if self._testMethodName == "test_backup":
+			for file in self.files_to_trash:
+				os.remove(file)
+				try:
+					os.rmdir(os.path.dirname(file))
+				except OSError:
+					pass
+
+	def test_backup_no_options(self):
+		# test 1: take a backup
+		before_backup = fetch_latest_backups()
+		self.execute("bench --site {site} backup")
+		after_backup = fetch_latest_backups()
+
+		self.assertEqual(self.returncode, 0)
+		self.assertIn("successfully completed", self.stdout)
+		self.assertNotEqual(before_backup["database"], after_backup["database"])
+
+	def test_backup_with_files(self):
+		# test 2: take a backup with --with-files
+		before_backup = fetch_latest_backups()
+		self.execute("bench --site {site} backup --with-files")
+		after_backup = fetch_latest_backups()
+
+		self.assertEqual(self.returncode, 0)
+		self.assertIn("successfully completed", self.stdout)
+		self.assertIn("with files", self.stdout)
+		self.assertNotEqual(before_backup, after_backup)
+		self.assertIsNotNone(after_backup["public"])
+		self.assertIsNotNone(after_backup["private"])
+
+	def test_backup_with_custom_path(self):
+		# test 3: take a backup with --backup-path
+		backup_path = os.path.join(self.home, "backups")
+		self.execute("bench --site {site} backup --backup-path {backup_path}", {"backup_path": backup_path})
+
+		self.assertEqual(self.returncode, 0)
+		self.assertTrue(os.path.exists(backup_path))
+		self.assertGreaterEqual(len(os.listdir(backup_path)), 2)
+
+	def test_backup_with_different_file_paths(self):
+		# test 4: take a backup with --backup-path-db, --backup-path-files, --backup-path-private-files, --backup-path-conf
+		kwargs = {
+			key: os.path.join(self.home, key, value)
+			for key, value in {
+				"db_path": "database.sql.gz",
+				"files_path": "public.tar",
+				"private_path": "private.tar",
+				"conf_path": "config.json",
+			}.items()
+		}
+
+		self.execute(
+			"""bench
+			--site {site} backup --with-files
+			--backup-path-db {db_path}
+			--backup-path-files {files_path}
+			--backup-path-private-files {private_path}
+			--backup-path-conf {conf_path}""",
+			kwargs,
+		)
+
+		self.assertEqual(self.returncode, 0)
+		for path in kwargs.values():
+			self.assertTrue(os.path.exists(path))
+
+	def test_backup_compress_files(self):
+		# test 5: take a backup with --compress
+		self.execute("bench --site {site} backup --with-files --compress")
+		self.assertEqual(self.returncode, 0)
+		compressed_files = glob.glob(f"{self.site_backup_path}/*.tgz")
+		self.assertGreater(len(compressed_files), 0)
+
+	def test_backup_verbose(self):
+		# test 6: take a backup with --verbose
+		self.execute("bench --site {site} backup --verbose")
+		self.assertEqual(self.returncode, 0)
+
+	def test_backup_only_specific_doctypes(self):
+		# test 7: take a backup with frappe.conf.backup.includes
+		self.execute(
+			"bench --site {site} set-config backup '{includes}' --parse",
+			{"includes": json.dumps(self.backup_map["includes"])},
+		)
+		self.execute("bench --site {site} backup --verbose")
+		self.assertEqual(self.returncode, 0)
+		database = fetch_latest_backups(partial=True)["database"]
+		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
+
+	def test_backup_excluding_specific_doctypes(self):
+		# test 8: take a backup with frappe.conf.backup.excludes
+		self.execute(
+			"bench --site {site} set-config backup '{excludes}' --parse",
+			{"excludes": json.dumps(self.backup_map["excludes"])},
+		)
+		self.execute("bench --site {site} backup --verbose")
+		self.assertEqual(self.returncode, 0)
+		database = fetch_latest_backups(partial=True)["database"]
+		self.assertFalse(exists_in_backup(self.backup_map["excludes"]["excludes"], database))
+		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
+
+		# test 9: take a backup with --exclude
+		self.execute(
+			"bench --site {site} backup --exclude '{exclude}'",
+			{"exclude": ",".join(self.backup_map["excludes"]["excludes"])},
+		)
+		self.assertEqual(self.returncode, 0)
+		database = fetch_latest_backups(partial=True)["database"]
+		self.assertFalse(exists_in_backup(self.backup_map["excludes"]["excludes"], database))
+
+	def test_selective_backup_priority_resolution(self):
+		# test 10: take a backup with --include (with frappe.conf.excludes still set)
+		self.execute(
+			"bench --site {site} backup --include '{include}'",
+			{"include": ",".join(self.backup_map["includes"]["includes"])},
+		)
+		self.assertEqual(self.returncode, 0)
+		database = fetch_latest_backups(partial=True)["database"]
+		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
+
+	def test_dont_backup_conf(self):
+		# test 11: take a backup with --ignore-backup-conf
+		self.execute("bench --site {site} backup --ignore-backup-conf")
+		self.assertEqual(self.returncode, 0)
+		database = fetch_latest_backups()["database"]
+		self.assertEqual([], missing_in_backup(self.backup_map["excludes"]["excludes"], database))
+
+
+class TestRemoveApp(unittest.TestCase):
 	def test_delete_modules(self):
 		from frappe.installer import (
 				_delete_doctypes,

From 7136106e3d7902b2c5970aa7e44b3931404e634d Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 12 Jan 2022 16:13:39 +0530
Subject: [PATCH 47/97] test: Clear cache on updating system settings

---
 frappe/tests/test_auth.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py
index 472597c7c2..ae4f78735b 100644
--- a/frappe/tests/test_auth.py
+++ b/frappe/tests/test_auth.py
@@ -41,6 +41,7 @@ class TestAuth(unittest.TestCase):
 
 	def set_system_settings(self, k, v):
 		frappe.db.set_value("System Settings", "System Settings", k, v)
+		frappe.clear_cache()
 		frappe.db.commit()
 
 	def test_allow_login_using_mobile(self):
@@ -98,13 +99,11 @@ class TestAuth(unittest.TestCase):
 		first_login.get_list("ToDo")
 
 		second_login = FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
-
 		second_login.get_list("ToDo")
 		with self.assertRaises(Exception):
 			first_login.get_list("ToDo")
 
 		third_login = FrappeClient(self.HOST_NAME, self.test_user_email, self.test_user_password)
-
 		with self.assertRaises(Exception):
 			first_login.get_list("ToDo")
 		with self.assertRaises(Exception):

From b878b71e3797e2e4cb66073d8e8eadcd3a725660 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 12 Jan 2022 20:19:05 +0530
Subject: [PATCH 48/97] fix(minor): Is Custom field placement in Role form

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

diff --git a/frappe/core/doctype/role/role.json b/frappe/core/doctype/role/role.json
index ba82e023a9..e370082fb5 100644
--- a/frappe/core/doctype/role/role.json
+++ b/frappe/core/doctype/role/role.json
@@ -12,6 +12,7 @@
   "restrict_to_domain",
   "column_break_4",
   "disabled",
+  "is_custom",
   "desk_access",
   "two_factor_auth",
   "navigation_settings_section",
@@ -24,8 +25,7 @@
   "form_settings_section",
   "form_sidebar",
   "timeline",
-  "dashboard",
-  "is_custom"
+  "dashboard"
  ],
  "fields": [
   {
@@ -148,7 +148,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-10-08 14:06:55.729364",
+ "modified": "2022-01-12 20:18:18.496230",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Role",
@@ -170,5 +170,6 @@
  "quick_entry": 1,
  "sort_field": "modified",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file

From d5b3fc04e09154e06c61d1c596fcf3ce8ea2aea1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 13 Jan 2022 13:25:32 +0530
Subject: [PATCH 49/97] fix: Breaking backup tests due to site settings

---
 frappe/tests/test_commands.py | 55 +++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py
index 692dde0f08..3511b360e4 100644
--- a/frappe/tests/test_commands.py
+++ b/frappe/tests/test_commands.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
+# License: MIT. See LICENSE
 
 # imports - standard imports
 import gzip
@@ -9,13 +10,14 @@ import shutil
 import subprocess
 from typing import List
 import unittest
-import glob
+from glob import glob
+from unittest.case import skipIf
 
 # imports - module imports
 import frappe
 import frappe.recorder
 from frappe.installer import add_to_installed_apps, remove_app
-from frappe.utils import add_to_date, get_bench_relative_path, now
+from frappe.utils import add_to_date, get_bench_path, get_bench_relative_path, now
 from frappe.utils.backups import fetch_latest_backups
 
 # imports - third party imports
@@ -277,7 +279,7 @@ class TestCommands(BaseTestCommands):
 		self.assertIsInstance(json.loads(self.stdout), dict)
 
 	def test_get_bench_relative_path(self):
-		bench_path = frappe.utils.get_bench_path()
+		bench_path = get_bench_path()
 		test1_path = os.path.join(bench_path, "test1.txt")
 		test2_path = os.path.join(bench_path, "sites", "test2.txt")
 
@@ -335,7 +337,7 @@ class TestCommands(BaseTestCommands):
 			b"MIT" # app_license
 		]
 		app_name = "testapp0"
-		apps_path = os.path.join(frappe.utils.get_bench_path(), "apps")
+		apps_path = os.path.join(get_bench_path(), "apps")
 		test_app_path = os.path.join(apps_path, app_name)
 		self.execute(f"bench make-app {apps_path} {app_name}", {"cmd_input": b'\n'.join(user_input)})
 		self.assertEqual(self.returncode, 0)
@@ -346,6 +348,10 @@ class TestCommands(BaseTestCommands):
 		# cleanup
 		shutil.rmtree(test_app_path)
 
+	@skipIf(
+		not (frappe.conf.root_password and frappe.conf.admin_password),
+		"DB Root password and Admin password not set in config"
+	)
 	def test_bench_drop_site_should_archive_site(self):
 		site = 'test_site.localhost'
 
@@ -358,7 +364,7 @@ class TestCommands(BaseTestCommands):
 		self.execute(f"bench drop-site {site} --force --root-password {frappe.conf.root_password}")
 		self.assertEqual(self.returncode, 0)
 
-		bench_path = frappe.utils.get_bench_path()
+		bench_path = get_bench_path()
 		site_directory = os.path.join(bench_path, f'sites/{site}')
 		self.assertFalse(os.path.exists(site_directory))
 		archive_directory = os.path.join(bench_path, f'archived/sites/{site}')
@@ -397,17 +403,19 @@ class TestBackups(BaseTestCommands):
 					pass
 
 	def test_backup_no_options(self):
-		# test 1: take a backup
-		before_backup = fetch_latest_backups()
+		"""Take a backup without any options
+		"""
+		before_backup = fetch_latest_backups(partial=True)
 		self.execute("bench --site {site} backup")
-		after_backup = fetch_latest_backups()
+		after_backup = fetch_latest_backups(partial=True)
 
 		self.assertEqual(self.returncode, 0)
 		self.assertIn("successfully completed", self.stdout)
 		self.assertNotEqual(before_backup["database"], after_backup["database"])
 
 	def test_backup_with_files(self):
-		# test 2: take a backup with --with-files
+		"""Take a backup with files (--with-files)
+		"""
 		before_backup = fetch_latest_backups()
 		self.execute("bench --site {site} backup --with-files")
 		after_backup = fetch_latest_backups()
@@ -420,7 +428,8 @@ class TestBackups(BaseTestCommands):
 		self.assertIsNotNone(after_backup["private"])
 
 	def test_backup_with_custom_path(self):
-		# test 3: take a backup with --backup-path
+		"""Backup to a custom path (--backup-path)
+		"""
 		backup_path = os.path.join(self.home, "backups")
 		self.execute("bench --site {site} backup --backup-path {backup_path}", {"backup_path": backup_path})
 
@@ -429,7 +438,8 @@ class TestBackups(BaseTestCommands):
 		self.assertGreaterEqual(len(os.listdir(backup_path)), 2)
 
 	def test_backup_with_different_file_paths(self):
-		# test 4: take a backup with --backup-path-db, --backup-path-files, --backup-path-private-files, --backup-path-conf
+		"""Backup with different file paths (--backup-path-db, --backup-path-files, --backup-path-private-files, --backup-path-conf)
+		"""
 		kwargs = {
 			key: os.path.join(self.home, key, value)
 			for key, value in {
@@ -455,19 +465,22 @@ class TestBackups(BaseTestCommands):
 			self.assertTrue(os.path.exists(path))
 
 	def test_backup_compress_files(self):
-		# test 5: take a backup with --compress
+		"""Take a compressed backup (--compress)
+		"""
 		self.execute("bench --site {site} backup --with-files --compress")
 		self.assertEqual(self.returncode, 0)
-		compressed_files = glob.glob(f"{self.site_backup_path}/*.tgz")
+		compressed_files = glob(f"{self.site_backup_path}/*.tgz")
 		self.assertGreater(len(compressed_files), 0)
 
 	def test_backup_verbose(self):
-		# test 6: take a backup with --verbose
+		"""Take a verbose backup (--verbose)
+		"""
 		self.execute("bench --site {site} backup --verbose")
 		self.assertEqual(self.returncode, 0)
 
 	def test_backup_only_specific_doctypes(self):
-		# test 7: take a backup with frappe.conf.backup.includes
+		"""Take a backup with (include) backup options set in the site config `frappe.conf.backup.includes`
+		"""
 		self.execute(
 			"bench --site {site} set-config backup '{includes}' --parse",
 			{"includes": json.dumps(self.backup_map["includes"])},
@@ -478,7 +491,9 @@ class TestBackups(BaseTestCommands):
 		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
 
 	def test_backup_excluding_specific_doctypes(self):
-		# test 8: take a backup with frappe.conf.backup.excludes
+		"""Take a backup with (exclude) backup options set (`frappe.conf.backup.excludes`, `--exclude`)
+		"""
+		# test 1: take a backup with frappe.conf.backup.excludes
 		self.execute(
 			"bench --site {site} set-config backup '{excludes}' --parse",
 			{"excludes": json.dumps(self.backup_map["excludes"])},
@@ -489,7 +504,7 @@ class TestBackups(BaseTestCommands):
 		self.assertFalse(exists_in_backup(self.backup_map["excludes"]["excludes"], database))
 		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
 
-		# test 9: take a backup with --exclude
+		# test 2: take a backup with --exclude
 		self.execute(
 			"bench --site {site} backup --exclude '{exclude}'",
 			{"exclude": ",".join(self.backup_map["excludes"]["excludes"])},
@@ -499,7 +514,8 @@ class TestBackups(BaseTestCommands):
 		self.assertFalse(exists_in_backup(self.backup_map["excludes"]["excludes"], database))
 
 	def test_selective_backup_priority_resolution(self):
-		# test 10: take a backup with --include (with frappe.conf.excludes still set)
+		"""Take a backup with conflicting backup options set (`frappe.conf.excludes`, `--include`)
+		"""
 		self.execute(
 			"bench --site {site} backup --include '{include}'",
 			{"include": ",".join(self.backup_map["includes"]["includes"])},
@@ -509,7 +525,8 @@ class TestBackups(BaseTestCommands):
 		self.assertEqual([], missing_in_backup(self.backup_map["includes"]["includes"], database))
 
 	def test_dont_backup_conf(self):
-		# test 11: take a backup with --ignore-backup-conf
+		"""Take a backup ignoring frappe.conf.backup settings (with --ignore-backup-conf option)
+		"""
 		self.execute("bench --site {site} backup --ignore-backup-conf")
 		self.assertEqual(self.returncode, 0)
 		database = fetch_latest_backups()["database"]

From 023269d9279dad80afaab6578549fb1d2aacd822 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 13 Jan 2022 14:01:50 +0530
Subject: [PATCH 50/97] test(fix): Remove options passed in archive backup
 tests

* Run archive tests only for MariaDB
* Removed and added the options for root and admin passwd because they
  were in the site_config and not in common_ :')
---
 frappe/tests/test_commands.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py
index 3511b360e4..408d644042 100644
--- a/frappe/tests/test_commands.py
+++ b/frappe/tests/test_commands.py
@@ -349,15 +349,22 @@ class TestCommands(BaseTestCommands):
 		shutil.rmtree(test_app_path)
 
 	@skipIf(
-		not (frappe.conf.root_password and frappe.conf.admin_password),
+		not (
+			frappe.conf.root_password
+			and frappe.conf.admin_password
+			and frappe.conf.db_type == "mariadb"
+		),
 		"DB Root password and Admin password not set in config"
 	)
 	def test_bench_drop_site_should_archive_site(self):
+		# TODO: Make this test postgres compatible
 		site = 'test_site.localhost'
 
 		self.execute(
-			f"bench new-site {site} --force --verbose --admin-password {frappe.conf.admin_password} "
-			f"--mariadb-root-password {frappe.conf.root_password}"
+			f"bench new-site {site} --force --verbose "
+			f"--admin-password {frappe.conf.admin_password} "
+			f"--mariadb-root-password {frappe.conf.root_password} "
+			f"--db-type {frappe.conf.db_type or 'mariadb'} "
 		)
 		self.assertEqual(self.returncode, 0)
 

From 853287f49d6231587abb8b729a26dafa3b551fa5 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 13 Jan 2022 16:39:24 +0530
Subject: [PATCH 51/97] fix: load user_info on-demand

---
 frappe/__init__.py                           |  3 +
 frappe/auth.py                               |  3 +-
 frappe/boot.py                               | 17 ++--
 frappe/core/doctype/user/user.py             |  2 +-
 frappe/desk/form/load.py                     | 93 +++++++++++++++++---
 frappe/desk/reportview.py                    | 12 ++-
 frappe/model/base_document.py                |  4 +-
 frappe/public/js/frappe/form/form_viewers.js | 49 ++++++++---
 frappe/public/js/frappe/list/base_list.js    |  5 ++
 frappe/public/js/frappe/model/sync.js        | 31 ++++---
 frappe/public/js/frappe/utils/user.js        | 31 -------
 frappe/realtime.py                           |  2 +
 frappe/utils/__init__.py                     | 16 +++-
 frappe/utils/scheduler.py                    |  1 -
 frappe/utils/user.py                         |  5 +-
 15 files changed, 181 insertions(+), 93 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 08c0f794b3..a8bf114b9b 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -12,6 +12,8 @@ Read the documentation: https://frappeframework.com/docs
 """
 import os, warnings
 
+STANDARD_USERS = ('Guest', 'Administrator')
+
 _dev_server = os.environ.get('DEV_SERVER', False)
 
 if _dev_server:
@@ -121,6 +123,7 @@ def set_user_lang(user, user_language=None):
 	local.lang = get_user_lang(user)
 
 # local-globals
+
 db = local("db")
 qb = local("qb")
 conf = local("conf")
diff --git a/frappe/auth.py b/frappe/auth.py
index 078a6bb165..a87edb6460 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -250,8 +250,7 @@ class LoginManager:
 		if not self.user:
 			return
 
-		from frappe.core.doctype.user.user import STANDARD_USERS
-		if self.user in STANDARD_USERS:
+		if self.user in frappe.STANDARD_USERS:
 			return False
 
 		reset_pwd_after_days = cint(frappe.db.get_single_value("System Settings",
diff --git a/frappe/boot.py b/frappe/boot.py
index e671d8b37d..d5d992343a 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -17,7 +17,7 @@ from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_p
 from frappe.model.base_document import get_controller
 from frappe.social.doctype.post.post import frequently_visited_links
 from frappe.core.doctype.navbar_settings.navbar_settings import get_navbar_settings, get_app_logo
-from frappe.utils import get_time_zone
+from frappe.utils import get_time_zone, add_user_info
 
 def get_bootinfo():
 	"""build and return boot info"""
@@ -222,17 +222,14 @@ def load_translations(bootinfo):
 	bootinfo["__messages"] = messages
 
 def get_user_info():
-	user_info = frappe.db.get_all('User', fields=['`name`', 'full_name as fullname', 'user_image as image', 'gender',
-		'email', 'username', 'bio', 'location', 'interest', 'banner_image', 'allowed_in_mentions', 'user_type', 'time_zone'],
-		filters=dict(enabled=1))
+	# get info for current user
+	user_info = frappe._dict()
+	add_user_info(frappe.session.user, user_info)
 
-	user_info_map = {d.name: d for d in user_info}
+	if frappe.session.user == 'Administrator' and user_info.Administrator.email:
+		user_info[user_info.Administrator.email] = user_info.Administrator
 
-	admin_data = user_info_map.get('Administrator')
-	if admin_data:
-		user_info_map[admin_data.email] = admin_data
-
-	return user_info_map
+	return user_info
 
 def get_user(bootinfo):
 	"""get user info"""
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index ef7845d3b0..b674ea6891 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -19,7 +19,7 @@ from frappe.core.doctype.user_type.user_type import user_linked_with_permission_
 from frappe.query_builder import DocType
 
 
-STANDARD_USERS = ("Guest", "Administrator")
+STANDARD_USERS = frappe.STANDARD_USERS
 
 class User(Document):
 	__new_password = None
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 0e644c3cf5..0e0d53e365 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -94,30 +94,78 @@ def get_docinfo(doc=None, doctype=None, name=None):
 	automated_messages = filter(lambda x: x['communication_type'] == 'Automated Message', all_communications)
 	communications_except_auto_messages = filter(lambda x: x['communication_type'] != 'Automated Message', all_communications)
 
-	frappe.response["docinfo"] = {
+	docinfo = frappe._dict(user_info = {})
+
+	add_comments(doc, docinfo)
+
+	docinfo.update({
 		"attachments": get_attachments(doc.doctype, doc.name),
-		"attachment_logs": get_comments(doc.doctype, doc.name, 'attachment'),
 		"communications": communications_except_auto_messages,
 		"automated_messages": automated_messages,
-		'comments': get_comments(doc.doctype, doc.name),
 		'total_comments': len(json.loads(doc.get('_comments') or '[]')),
 		'versions': get_versions(doc),
 		"assignments": get_assignments(doc.doctype, doc.name),
-		"assignment_logs": get_comments(doc.doctype, doc.name, 'assignment'),
 		"permissions": get_doc_permissions(doc),
 		"shared": frappe.share.get_users(doc.doctype, doc.name),
-		"info_logs": get_comments(doc.doctype, doc.name, comment_type=['Info', 'Edit', 'Label']),
-		"share_logs": get_comments(doc.doctype, doc.name, 'share'),
-		"like_logs": get_comments(doc.doctype, doc.name, 'Like'),
-		"workflow_logs": get_comments(doc.doctype, doc.name, comment_type="Workflow"),
 		"views": get_view_logs(doc.doctype, doc.name),
 		"energy_point_logs": get_point_logs(doc.doctype, doc.name),
 		"additional_timeline_content": get_additional_timeline_content(doc.doctype, doc.name),
 		"milestones": get_milestones(doc.doctype, doc.name),
 		"is_document_followed": is_document_followed(doc.doctype, doc.name, frappe.session.user),
 		"tags": get_tags(doc.doctype, doc.name),
-		"document_email": get_document_email(doc.doctype, doc.name)
-	}
+		"document_email": get_document_email(doc.doctype, doc.name),
+	})
+
+	update_user_info(docinfo)
+
+	frappe.response["docinfo"] = docinfo
+
+def add_comments(doc, docinfo):
+	# divide comments into separate lists
+	docinfo.comments = []
+	docinfo.shared = []
+	docinfo.assignment_logs = []
+	docinfo.attachment_logs = []
+	docinfo.info_logs = []
+	docinfo.like_logs = []
+	docinfo.workflow_logs = []
+
+	comments = frappe.get_all("Comment",
+		fields=["name", "creation", "content", "owner", "comment_type"],
+		filters={
+			"reference_doctype": doc.doctype,
+			"reference_name": doc.name
+		}
+	)
+
+	for c in comments:
+		if c.comment_type == "Comment":
+			c.content = frappe.utils.markdown(c.content)
+			docinfo.comments.append(c)
+
+		elif c.comment_type in ('Shared', 'Unshared'):
+			docinfo.shared.append(c)
+
+		elif c.comment_type in ('Assignment Completed', 'Assigned'):
+			docinfo.assignment_logs.append(c)
+
+		elif c.comment_type == ('Attachment', 'Attachment Removed'):
+			docinfo.attachment_logs.append(c)
+
+		elif c.comment_type in ('Info', 'Edit', 'Label'):
+			docinfo.info_logs.append(c)
+
+		elif c.comment_type == "Like":
+			docinfo.like_logs.append(c)
+
+		elif c.comment_type == "Workflow":
+			docinfo.workflow_logs.append(c)
+
+		frappe.utils.add_user_info(c.owner, docinfo.user_info)
+
+
+	return comments
+
 
 def get_milestones(doctype, name):
 	return frappe.db.get_all('Milestone', fields = ['creation', 'owner', 'track_field', 'value'],
@@ -252,7 +300,7 @@ def get_communication_data(doctype, name, start=0, limit=20, after=None, fields=
 	return communications
 
 def get_assignments(dt, dn):
-	cl = frappe.get_all("ToDo",
+	return frappe.get_all("ToDo",
 		fields=['name', 'allocated_to as owner', 'description', 'status'],
 		filters={
 			'reference_type': dt,
@@ -260,8 +308,6 @@ def get_assignments(dt, dn):
 			'status': ('!=', 'Cancelled'),
 		})
 
-	return cl
-
 @frappe.whitelist()
 def get_badge_info(doctypes, filters):
 	filters = json.loads(filters)
@@ -319,3 +365,24 @@ def get_additional_timeline_content(doctype, docname):
 		contents.extend(frappe.get_attr(method)(doctype, docname) or [])
 
 	return contents
+
+def update_user_info(docinfo):
+	for d in docinfo.communications:
+		frappe.utils.add_user_info(d.sender, docinfo.user_info)
+
+	for d in docinfo.shared:
+		frappe.utils.add_user_info(d.user, docinfo.user_info)
+
+	for d in docinfo.assignments:
+		frappe.utils.add_user_info(d.owner, docinfo.user_info)
+
+	for d in docinfo.views:
+		frappe.utils.add_user_info(d.owner, docinfo.user_info)
+
+@frappe.whitelist()
+def get_user_info_for_viewers(users):
+	user_info = {}
+	for user in json.loads(users):
+		frappe.utils.add_user_info(user, user_info)
+
+	return user_info
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index fb150e4bea..e81ed0767b 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -12,7 +12,7 @@ from io import StringIO
 from frappe.core.doctype.access_log.access_log import make_access_log
 from frappe.utils import cstr, format_duration
 from frappe.model.base_document import get_controller
-
+from frappe.utils import add_user_info
 
 @frappe.whitelist()
 @frappe.read_only()
@@ -219,6 +219,8 @@ def compress(data, args=None):
 	"""separate keys and values"""
 	from frappe.desk.query_report import add_total_row
 
+	user_info = {}
+
 	if not data: return data
 	if args is None:
 		args = {}
@@ -230,13 +232,19 @@ def compress(data, args=None):
 			new_row.append(row.get(key))
 		values.append(new_row)
 
+		# add user info for assignments (avatar)
+		if row._assign:
+			for user in json.loads(row._assign):
+				add_user_info(user, user_info)
+
 	if args.get("add_total_row"):
 		meta = frappe.get_meta(args.doctype)
 		values = add_total_row(values, keys, meta)
 
 	return {
 		"keys": keys,
-		"values": values
+		"values": values,
+		"user_info": user_info
 	}
 
 @frappe.whitelist()
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 26a4658c36..631174b4db 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -646,8 +646,6 @@ class BaseDocument(object):
 					value, comma_options))
 
 	def _validate_data_fields(self):
-		from frappe.core.doctype.user.user import STANDARD_USERS
-
 		# data_field options defined in frappe.model.data_field_options
 		for data_field in self.meta.get_data_fields():
 			data = self.get(data_field.fieldname)
@@ -658,7 +656,7 @@ class BaseDocument(object):
 				continue
 
 			if data_field_options == "Email":
-				if (self.owner in STANDARD_USERS) and (data in STANDARD_USERS):
+				if (self.owner in frappe.STANDARD_USERS) and (data in frappe.STANDARD_USERS):
 					continue
 				for email_address in frappe.utils.split_emails(data):
 					frappe.utils.validate_email_address(email_address, throw=True)
diff --git a/frappe/public/js/frappe/form/form_viewers.js b/frappe/public/js/frappe/form/form_viewers.js
index 964576ef8a..ec07651d95 100644
--- a/frappe/public/js/frappe/form/form_viewers.js
+++ b/frappe/public/js/frappe/form/form_viewers.js
@@ -27,19 +27,40 @@ frappe.ui.form.FormViewers.set_users = function(data, type) {
 	const users = data.users || [];
 	const new_users = users.filter(user => !past_users.includes(user));
 
-	frappe.model.set_docinfo(doctype, docname, type, {
-		past: past_users.concat(new_users),
-		new: new_users,
-		current: users
-	});
-
-	if (
-		cur_frm &&
-		cur_frm.doc &&
-		cur_frm.doc.doctype === doctype &&
-		cur_frm.doc.name == docname &&
-		cur_frm.viewers
-	) {
-		cur_frm.viewers.refresh(true, type);
+	if (new_users.length===0) return;
+
+	const set_and_refresh = () => {
+		const info = {
+			past: past_users.concat(new_users),
+			new: new_users,
+			current: users
+		};
+
+		frappe.model.set_docinfo(doctype, docname, type, info);
+
+		if (
+			cur_frm &&
+			cur_frm.doc &&
+			cur_frm.doc.doctype === doctype &&
+			cur_frm.doc.name == docname &&
+			cur_frm.viewers
+		) {
+			cur_frm.viewers.refresh(true, type);
+		}
+	}
+
+	let unknown_users = []
+	for (let user of users) {
+		if (!frappe.boot.user_info[user]) unknown_users.push(user);
+	}
+
+	if (unknown_users.length===0) {
+		set_and_refresh();
+	} else {
+		// load additional user info
+		frappe.xcall('frappe.desk.form.load.get_user_info_for_viewers', {users: unknown_users}).then((data) => {
+			Object.assign(frappe.boot.user_info, data);
+			set_and_refresh();
+		})
 	}
 };
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index aa1101c64e..8fa512bfc0 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -484,6 +484,11 @@ frappe.views.BaseList = class BaseList {
 
 	prepare_data(r) {
 		let data = r.message || {};
+
+		// extract user_info for assignments
+		Object.assign(frappe.boot.user_info, data.user_info);
+		delete data.user_info;
+
 		data = !Array.isArray(data)
 			? frappe.utils.dict(data.keys, data.values)
 			: data;
diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js
index 753046fa13..5092e24f76 100644
--- a/frappe/public/js/frappe/model/sync.js
+++ b/frappe/public/js/frappe/model/sync.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
-$.extend(frappe.model, {
+Object.assign(frappe.model, {
 	docinfo: {},
 	sync: function(r) {
 		/* docs:
@@ -33,22 +33,28 @@ $.extend(frappe.model, {
 				}
 
 				if(d.localname) {
-					frappe.model.new_names[d.localname] = d.name;
-					$(document).trigger('rename', [d.doctype, d.localname, d.name]);
-					delete locals[d.doctype][d.localname];
-
-					// update docinfo to new dict keys
-					if(i===0) {
-						frappe.model.docinfo[d.doctype][d.name] = frappe.model.docinfo[d.doctype][d.localname];
-						frappe.model.docinfo[d.doctype][d.localname] = undefined;
-					}
+					frappe.model.rename_after_save(d);
 				}
 			}
+		}
 
+		frappe.model.sync_docinfo(r);
+
+	},
 
+	rename_after_save: (d) => {
+		frappe.model.new_names[d.localname] = d.name;
+		$(document).trigger('rename', [d.doctype, d.localname, d.name]);
+		delete locals[d.doctype][d.localname];
 
+		// update docinfo to new dict keys
+		if(i===0) {
+			frappe.model.docinfo[d.doctype][d.name] = frappe.model.docinfo[d.doctype][d.localname];
+			frappe.model.docinfo[d.doctype][d.localname] = undefined;
 		}
+	},
 
+	sync_docinfo: (r) => {
 		// set docinfo (comments, assign, attachments)
 		if(r.docinfo) {
 			var doc;
@@ -62,10 +68,14 @@ $.extend(frappe.model, {
 					frappe.model.docinfo[doc.doctype] = {};
 				frappe.model.docinfo[doc.doctype][doc.name] = r.docinfo;
 			}
+
+			// copy values to frappe.boot.user_info
+			Object.assign(frappe.boot.user_info, r.docinfo.user_info);
 		}
 
 		return r.docs;
 	},
+
 	add_to_locals: function(doc) {
 		if(!locals[doc.doctype])
 			locals[doc.doctype] = {};
@@ -100,6 +110,7 @@ $.extend(frappe.model, {
 			}
 		}
 	},
+
 	update_in_locals: function(doc) {
 		// update values in the existing local doc instead of replacing
 		let local_doc = locals[doc.doctype][doc.name];
diff --git a/frappe/public/js/frappe/utils/user.js b/frappe/public/js/frappe/utils/user.js
index f22611b515..a5a7801cc1 100644
--- a/frappe/public/js/frappe/utils/user.js
+++ b/frappe/public/js/frappe/utils/user.js
@@ -2,14 +2,6 @@ frappe.user_info = function(uid) {
 	if(!uid)
 		uid = frappe.session.user;
 
-	if(uid.toLowerCase()==="bot") {
-		return {
-			fullname: __("Bot"),
-			image: "/assets/frappe/images/ui/bot.png",
-			abbr: "B"
-		};
-	}
-
 	if(!(frappe.boot.user_info && frappe.boot.user_info[uid])) {
 		var user_info = {fullname: uid || "Unknown"};
 	} else {
@@ -22,29 +14,6 @@ frappe.user_info = function(uid) {
 	return user_info;
 };
 
-frappe.ui.set_user_background = function(src, selector, style) {
-	if(!selector) selector = "#page-desktop";
-	if(!style) style = "Fill Screen";
-	if(src) {
-		if (window.cordova && src.indexOf("http") === -1) {
-			src = frappe.base_url + src;
-		}
-		var background = repl('background: url("%(src)s") center center;', {src: src});
-	} else {
-		var background = "background-color: #4B4C9D;";
-	}
-
-	frappe.dom.set_style(repl('%(selector)s { \
-		%(background)s \
-		background-attachment: fixed; \
-		%(style)s \
-	}', {
-		selector:selector,
-		background:background,
-		style: style==="Fill Screen" ? "background-size: cover;" : ""
-	}));
-};
-
 frappe.provide('frappe.user');
 
 $.extend(frappe.user, {
diff --git a/frappe/realtime.py b/frappe/realtime.py
index aa0e2fddad..78ea7e473b 100644
--- a/frappe/realtime.py
+++ b/frappe/realtime.py
@@ -101,6 +101,8 @@ def can_subscribe_doc(doctype, docname):
 	if os.environ.get('CI'):
 		return True
 
+	print (frappe.session.user, doctype, docname)
+
 	from frappe.sessions import Session
 	from frappe.exceptions import PermissionError
 	session = Session(None, resume=True).get_session_data()
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index ffff7032aa..2d4c5ab565 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -56,7 +56,7 @@ 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()
@@ -623,12 +623,11 @@ def get_installed_apps_info():
 	return out
 
 def get_site_info():
-	from frappe.core.doctype.user.user import STANDARD_USERS
 	from frappe.email.queue import get_emails_sent_this_month
 	from frappe.utils.user import get_system_managers
 
 	# only get system users
-	users = frappe.get_all('User', filters={'user_type': 'System User', 'name': ('not in', STANDARD_USERS)},
+	users = frappe.get_all('User', filters={'user_type': 'System User', 'name': ('not in', frappe.STANDARD_USERS)},
 		fields=['name', 'enabled', 'last_login', 'last_active', 'language', 'time_zone'])
 	system_managers = get_system_managers(only_name=True)
 	for u in users:
@@ -898,3 +897,14 @@ def dictify(arg):
 		arg = frappe._dict(arg)
 
 	return arg
+
+def add_user_info(user, user_info):
+	if user not in user_info:
+		info = frappe.db.get_value("User",
+			user, ["full_name", "user_image", "name", 'email'], as_dict=True)
+		user_info[user] = frappe._dict(
+			fullname = info.full_name,
+			image = info.user_image,
+			name = user,
+			email = info.email
+		)
diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py
index 43580c1287..8ebb4b2937 100755
--- a/frappe/utils/scheduler.py
+++ b/frappe/utils/scheduler.py
@@ -17,7 +17,6 @@ import schedule
 
 # imports - module imports
 import frappe
-from frappe.core.doctype.user.user import STANDARD_USERS
 from frappe.installer import update_site_config
 from frappe.utils import get_sites, now_datetime
 from frappe.utils.background_jobs import get_jobs
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index e5acb53daf..cbf38f6acb 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -230,7 +230,6 @@ def get_fullname_and_avatar(user):
 def get_system_managers(only_name=False):
 	"""returns all system manager's user details"""
 	import email.utils
-	from frappe.core.doctype.user.user import STANDARD_USERS
 	system_managers = frappe.db.sql("""SELECT DISTINCT `name`, `creation`,
 		CONCAT_WS(' ',
 			CASE WHEN `first_name`= '' THEN NULL ELSE `first_name` END,
@@ -245,8 +244,8 @@ def get_system_managers(only_name=False):
 				FROM `tabHas Role` AS ur
 				WHERE ur.parent = p.name
 				AND ur.role='System Manager')
-		ORDER BY `creation` DESC""".format(", ".join(["%s"]*len(STANDARD_USERS))),
-			STANDARD_USERS, as_dict=True)
+		ORDER BY `creation` DESC""".format(", ".join(["%s"]*len(frappe.STANDARD_USERS))),
+			frappe.STANDARD_USERS, as_dict=True)
 
 	if only_name:
 		return [p.name for p in system_managers]

From 5b5662ed9ae21402732d5d3fb823476aec126b18 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 13 Jan 2022 16:41:47 +0530
Subject: [PATCH 52/97] fix(minor): remove print

---
 frappe/realtime.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/realtime.py b/frappe/realtime.py
index 78ea7e473b..aa0e2fddad 100644
--- a/frappe/realtime.py
+++ b/frappe/realtime.py
@@ -101,8 +101,6 @@ def can_subscribe_doc(doctype, docname):
 	if os.environ.get('CI'):
 		return True
 
-	print (frappe.session.user, doctype, docname)
-
 	from frappe.sessions import Session
 	from frappe.exceptions import PermissionError
 	session = Session(None, resume=True).get_session_data()

From d2b9fc89ed1001f5f507d19767904e43d2d054cc Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 13 Jan 2022 16:55:28 +0530
Subject: [PATCH 53/97] fix(minor): incorrect condition

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

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 0e0d53e365..38b671d629 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -149,7 +149,7 @@ def add_comments(doc, docinfo):
 		elif c.comment_type in ('Assignment Completed', 'Assigned'):
 			docinfo.assignment_logs.append(c)
 
-		elif c.comment_type == ('Attachment', 'Attachment Removed'):
+		elif c.comment_type in ('Attachment', 'Attachment Removed'):
 			docinfo.attachment_logs.append(c)
 
 		elif c.comment_type in ('Info', 'Edit', 'Label'):

From b08f9f3649000e1c117e61246fe1f151f5b16391 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 13 Jan 2022 17:13:34 +0530
Subject: [PATCH 54/97] fix(minor): linting errors

---
 frappe/public/js/frappe/form/form_viewers.js | 6 +++---
 frappe/public/js/frappe/model/sync.js        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/form/form_viewers.js b/frappe/public/js/frappe/form/form_viewers.js
index ec07651d95..ecf5eea504 100644
--- a/frappe/public/js/frappe/form/form_viewers.js
+++ b/frappe/public/js/frappe/form/form_viewers.js
@@ -47,9 +47,9 @@ frappe.ui.form.FormViewers.set_users = function(data, type) {
 		) {
 			cur_frm.viewers.refresh(true, type);
 		}
-	}
+	};
 
-	let unknown_users = []
+	let unknown_users = [];
 	for (let user of users) {
 		if (!frappe.boot.user_info[user]) unknown_users.push(user);
 	}
@@ -61,6 +61,6 @@ frappe.ui.form.FormViewers.set_users = function(data, type) {
 		frappe.xcall('frappe.desk.form.load.get_user_info_for_viewers', {users: unknown_users}).then((data) => {
 			Object.assign(frappe.boot.user_info, data);
 			set_and_refresh();
-		})
+		});
 	}
 };
diff --git a/frappe/public/js/frappe/model/sync.js b/frappe/public/js/frappe/model/sync.js
index 5092e24f76..2cb7ca1a32 100644
--- a/frappe/public/js/frappe/model/sync.js
+++ b/frappe/public/js/frappe/model/sync.js
@@ -33,7 +33,7 @@ Object.assign(frappe.model, {
 				}
 
 				if(d.localname) {
-					frappe.model.rename_after_save(d);
+					frappe.model.rename_after_save(d, i);
 				}
 			}
 		}
@@ -42,7 +42,7 @@ Object.assign(frappe.model, {
 
 	},
 
-	rename_after_save: (d) => {
+	rename_after_save: (d, i) => {
 		frappe.model.new_names[d.localname] = d.name;
 		$(document).trigger('rename', [d.doctype, d.localname, d.name]);
 		delete locals[d.doctype][d.localname];

From 545a3a3ac427d4bb2aac64f934047bae0cadb3c2 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 13 Jan 2022 18:49:18 +0530
Subject: [PATCH 55/97] fix(minor): handle for illegal user

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

diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 2d4c5ab565..54a6f0b7e8 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -901,9 +901,9 @@ def dictify(arg):
 def add_user_info(user, user_info):
 	if user not in user_info:
 		info = frappe.db.get_value("User",
-			user, ["full_name", "user_image", "name", 'email'], as_dict=True)
+			user, ["full_name", "user_image", "name", 'email'], as_dict=True) or frappe._dict()
 		user_info[user] = frappe._dict(
-			fullname = info.full_name,
+			fullname = info.full_name or user,
 			image = info.user_image,
 			name = user,
 			email = info.email

From 645f23a9a7c28dfa0271888e419ff13b4b4b2986 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 13 Jan 2022 19:45:48 +0530
Subject: [PATCH 56/97] fix: Add toggle theme as standard dropdown option

- For new sites toggle theme was not available. It was added via patch for old sites.
---
 frappe/utils/install.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/utils/install.py b/frappe/utils/install.py
index 5ca8c4878a..cf76c9fffc 100644
--- a/frappe/utils/install.py
+++ b/frappe/utils/install.py
@@ -219,6 +219,12 @@ def add_standard_navbar_items():
 			'action': 'frappe.ui.toolbar.toggle_full_width()',
 			'is_standard': 1
 		},
+		{
+			'item_label': 'Toggle Theme',
+			'item_type': 'Action',
+			'action': 'new frappe.ui.ThemeSwitcher().show()',
+			'is_standard': 1
+		},
 		{
 			'item_label': 'Background Jobs',
 			'item_type': 'Route',

From 93ae7006120754f7bb2ff35f718756a09265702a Mon Sep 17 00:00:00 2001
From: ruthra <ruthrab@gmail.com>
Date: Fri, 14 Jan 2022 11:54:42 +0530
Subject: [PATCH 57/97] test: add test cases for Data Export tool

---
 .../doctype/data_export/test_data_exporter.py | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 frappe/core/doctype/data_export/test_data_exporter.py

diff --git a/frappe/core/doctype/data_export/test_data_exporter.py b/frappe/core/doctype/data_export/test_data_exporter.py
new file mode 100644
index 0000000000..8d05707cf1
--- /dev/null
+++ b/frappe/core/doctype/data_export/test_data_exporter.py
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2019, Frappe Technologies and Contributors
+# License: MIT. See LICENSE
+import unittest
+import frappe
+from frappe.core.doctype.data_export.exporter import DataExporter
+
+class TestDataExporter(unittest.TestCase):
+	def setUp(self):
+		self.doctype_name = 'Test DocType for Export Tool'
+		self.doc_name = 'Test Data for Export Tool'
+		self.create_doctype_if_not_exists(doctype_name=self.doctype_name)
+		self.create_test_data()
+
+	def create_doctype_if_not_exists(self, doctype_name, force=False):
+		"""
+		Helper Function for setting up doctypes
+		"""
+		if force:
+			frappe.delete_doc_if_exists('DocType', doctype_name)
+			frappe.delete_doc_if_exists('DocType', 'Child 1 of ' + doctype_name)
+
+		if frappe.db.exists('DocType', doctype_name):
+			return
+
+		# Child Table 1
+		table_1_name = 'Child 1 of ' + doctype_name
+		frappe.get_doc({
+			'doctype': 'DocType',
+			'name': table_1_name,
+			'module': 'Custom',
+			'custom': 1,
+			'istable': 1,
+			'fields': [
+				{'label': 'Child Title', 'fieldname': 'child_title', 'reqd': 1, 'fieldtype': 'Data'},
+				{'label': 'Child Number', 'fieldname': 'child_number', 'fieldtype': 'Int'},
+			]
+		}).insert()
+
+		# Main Table
+		frappe.get_doc({
+			'doctype': 'DocType',
+			'name': doctype_name,
+			'module': 'Custom',
+			'custom': 1,
+			'autoname': 'field:title',
+			'fields': [
+				{'label': 'Title', 'fieldname': 'title', 'reqd': 1, 'fieldtype': 'Data'},
+				{'label': 'Number', 'fieldname': 'number', 'fieldtype': 'Int'},
+				{'label': 'Table Field 1', 'fieldname': 'table_field_1', 'fieldtype': 'Table', 'options': table_1_name},
+			],
+			'permissions': [
+				{'role': 'System Manager'}
+			]
+		}).insert()
+
+	def create_test_data(self, force=False):
+		"""
+		Helper Function creating test data
+		"""
+		if force:
+			frappe.delete_doc(self.doctype_name, self.doc_name)
+
+		if not frappe.db.exists(self.doctype_name, self.doc_name):
+			self.doc = frappe.get_doc(
+				doctype=self.doctype_name,
+				title=self.doc_name,
+				number="100",
+				table_field_1=[
+					{"child_title": "Child Title 1", "child_number": "50"},
+					{"child_title": "Child Title 2", "child_number": "51"},
+				]
+			).insert()
+		else:
+			self.doc = frappe.get_doc(self.doctype_name, self.doc_name)
+
+	def test_export_content(self):
+		exp = DataExporter(doctype=self.doctype_name, file_type='CSV')
+		exp.build_response()
+
+		self.assertEqual(frappe.response['type'],'csv')
+		self.assertEqual(frappe.response['doctype'], self.doctype_name)
+		self.assertTrue(frappe.response['result'])
+		self.assertIn('Child Title 1\",50',frappe.response['result'])
+		self.assertIn('Child Title 2\",51',frappe.response['result'])
+
+	def test_export_type(self):
+		for type in ['csv', 'Excel']:
+			with self.subTest(type=type):
+				exp = DataExporter(doctype=self.doctype_name, file_type=type)
+				exp.build_response()
+
+				self.assertEqual(frappe.response['doctype'], self.doctype_name)
+				self.assertTrue(frappe.response['result'])
+
+				if type == 'csv':
+					self.assertEqual(frappe.response['type'],'csv')
+				elif type == 'Excel':
+					self.assertEqual(frappe.response['type'],'binary')
+					self.assertEqual(frappe.response['filename'], self.doctype_name+'.xlsx') # 'Test DocType for Export Tool.xlsx')
+					self.assertTrue(frappe.response['filecontent'])
+
+	def tearDown(self):
+		pass
+

From d09fd25ad7dbcaec1fad124dd0bf59d203e1ec26 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Fri, 14 Jan 2022 18:03:21 +0530
Subject: [PATCH 58/97] fix: import permissions

For some reason not importing this is causing issue with running the
functionality directly; specifically when running from background job.
---
 frappe/model/document.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index e25469c68a..e055a12950 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -188,6 +188,8 @@ class Document(BaseDocument):
 		is not set.
 
 		:param permtype: one of `read`, `write`, `submit`, `cancel`, `delete`"""
+		import frappe.permissions
+
 		if self.flags.ignore_permissions:
 			return True
 		return frappe.permissions.has_permission(self.doctype, permtype, self, verbose=verbose)

From c3409c818eba2e0d4e30bf27a8bd8aabadd4c566 Mon Sep 17 00:00:00 2001
From: Shadrak Gurupnor <30501401+shadrak98@users.noreply.github.com>
Date: Sat, 15 Jan 2022 20:15:01 +0530
Subject: [PATCH 59/97] fix: patch for validating options field (#15565)

* fix: patch for validating options field

* fix: reorder patch execution

* refactor: reduce queries for patching

* refactor: change patch name and license

Co-authored-by: Ankush Menat <ankush@frappe.io>
---
 frappe/patches.txt                              |  1 +
 .../remove_invalid_options_for_data_fields.py   | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 frappe/patches/v13_0/remove_invalid_options_for_data_fields.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index af7e4d6e3f..4231a59466 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -123,6 +123,7 @@ frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
 frappe.patches.v12_0.remove_example_email_thread_notify
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
 frappe.patches.v12_0.set_correct_url_in_files
+frappe.patches.v13_0.remove_invalid_options_for_data_fields
 frappe.patches.v13_0.website_theme_custom_scss
 frappe.patches.v13_0.make_user_type
 frappe.patches.v13_0.set_existing_dashboard_charts_as_public
diff --git a/frappe/patches/v13_0/remove_invalid_options_for_data_fields.py b/frappe/patches/v13_0/remove_invalid_options_for_data_fields.py
new file mode 100644
index 0000000000..90e4b3c5c6
--- /dev/null
+++ b/frappe/patches/v13_0/remove_invalid_options_for_data_fields.py
@@ -0,0 +1,17 @@
+# Copyright (c) 2022, Frappe and Contributors
+# License: MIT. See LICENSE
+
+
+import frappe
+from frappe.model import data_field_options
+
+
+def execute():
+	custom_field = frappe.qb.DocType('Custom Field')
+	(frappe.qb
+		.update(custom_field)
+		.set(custom_field.options, None)
+		.where(
+			(custom_field.fieldtype == "Data")
+			& (custom_field.options.notin(data_field_options)))
+	).run()

From b6cb0fc1e7e66fb22c2324756b5535f54332065e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 17 Jan 2022 10:01:29 +0530
Subject: [PATCH 60/97] fix: Pass SQL string of lastupdate instead of normal
 string

- Normal string of pypika field has additional quotes
which creates a invalid query
- `get_sql` returns column name without additional quotes
---
 frappe/sessions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/sessions.py b/frappe/sessions.py
index 6c9acdba13..d2d1a8fcbc 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -112,7 +112,7 @@ def get_expired_sessions():
 			frappe.db.get_values(
 				sessions,
 				filters=(
-					PseudoColumn(f"({Now() - sessions.lastupdate})")
+					PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})")
 					> get_expiry_period_for_query(device)
 				)
 				& (sessions.device == device),
@@ -334,7 +334,7 @@ class Session:
 			sessions,
 			filters=(sessions.sid == self.sid)
 			& (
-				PseudoColumn(f"({Now() - sessions.lastupdate})")
+				PseudoColumn(f"({Now()} - {sessions.lastupdate.get_sql()})")
 				< get_expiry_period_for_query(self.device)
 			),
 			fieldname=["user", "sessiondata"],

From b1383df15aff40c2626263605806a895948bd2ef Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 17 Jan 2022 10:37:51 +0100
Subject: [PATCH 61/97] refactor: use `is None` instead of `== None`

---
 frappe/__init__.py                             |  6 +++---
 frappe/core/doctype/user/user.py               |  2 +-
 frappe/defaults.py                             |  4 ++--
 frappe/desk/moduleview.py                      |  2 +-
 frappe/desk/page/user_profile/user_profile.py  |  2 +-
 frappe/desk/search.py                          |  2 +-
 frappe/model/base_document.py                  |  4 ++--
 frappe/model/db_query.py                       |  2 +-
 frappe/model/document.py                       | 18 +++++++++---------
 frappe/model/dynamic_links.py                  |  2 +-
 .../patches/v11_0/remove_skip_for_doctype.py   |  2 +-
 frappe/permissions.py                          |  4 +++-
 frappe/sessions.py                             |  2 +-
 .../energy_point_rule/energy_point_rule.py     |  2 +-
 frappe/tests/test_twofactor.py                 |  2 +-
 frappe/translate.py                            |  2 +-
 frappe/utils/__init__.py                       |  2 +-
 frappe/utils/csvutils.py                       |  2 +-
 frappe/utils/data.py                           |  2 +-
 frappe/utils/minify.py                         |  2 +-
 frappe/website/doctype/web_form/web_form.py    |  2 +-
 frappe/website/utils.py                        |  2 +-
 22 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index a8bf114b9b..20fc41b83a 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -102,7 +102,7 @@ def as_unicode(text, encoding='utf-8'):
 	'''Convert to unicode if required'''
 	if isinstance(text, str):
 		return text
-	elif text==None:
+	elif text is None:
 		return ''
 	elif isinstance(text, bytes):
 		return str(text, encoding)
@@ -294,7 +294,7 @@ def get_conf(site=None):
 
 class init_site:
 	def __init__(self, site=None):
-		'''If site==None, initialize it for empty site ('') to load common_site_config.json'''
+		'''If site is None, initialize it for empty site ('') to load common_site_config.json'''
 		self.site = site or ''
 
 	def __enter__(self):
@@ -1661,7 +1661,7 @@ def local_cache(namespace, key, generator, regenerate_if_none=False):
 	if key not in local.cache[namespace]:
 		local.cache[namespace][key] = generator()
 
-	elif local.cache[namespace][key]==None and regenerate_if_none:
+	elif local.cache[namespace][key] is None and regenerate_if_none:
 		# if key exists but the previous result was None
 		local.cache[namespace][key] = generator()
 
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index b674ea6891..f1ccc25c6e 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -344,7 +344,7 @@ class User(Document):
 
 		frappe.sendmail(recipients=self.email, sender=sender, subject=subject,
 			template=template, args=args, header=[subject, "green"],
-			delayed=(not now) if now!=None else self.flags.delay_emails, retry=3)
+			delayed=(not now) if now is not None else self.flags.delay_emails, retry=3)
 
 	def a_system_manager_should_exist(self):
 		if not self.get_other_system_managers():
diff --git a/frappe/defaults.py b/frappe/defaults.py
index eb98db449f..e249ef2099 100644
--- a/frappe/defaults.py
+++ b/frappe/defaults.py
@@ -126,7 +126,7 @@ def set_default(key, value, parent, parenttype="__default"):
 			"defkey": key,
 			"parent": parent
 		})
-	if value != None:
+	if value is not None:
 		add_default(key, value, parent)
 	else:
 		_clear_cache(parent)
@@ -187,7 +187,7 @@ def get_defaults_for(parent="__default"):
 	"""get all defaults"""
 	defaults = frappe.cache().hget("defaults", parent)
 
-	if defaults==None:
+	if defaults is None:
 		# sort descending because first default must get precedence
 		table = DocType("DefaultValue")
 		res = frappe.qb.from_(table).where(
diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py
index e2e2c4c155..7a9c211c3c 100644
--- a/frappe/desk/moduleview.py
+++ b/frappe/desk/moduleview.py
@@ -524,7 +524,7 @@ def get_last_modified(doctype):
 				raise
 
 		# hack: save as -1 so that it is cached
-		if last_modified==None:
+		if last_modified is None:
 			last_modified = -1
 
 		return last_modified
diff --git a/frappe/desk/page/user_profile/user_profile.py b/frappe/desk/page/user_profile/user_profile.py
index 73df6d78cb..0d91fd0d91 100644
--- a/frappe/desk/page/user_profile/user_profile.py
+++ b/frappe/desk/page/user_profile/user_profile.py
@@ -30,7 +30,7 @@ def get_energy_points_percentage_chart_data(user, field):
 		as_list = True)
 
 	return {
-		"labels": [r[0] for r in result if r[0] != None],
+		"labels": [r[0] for r in result if r[0] is not None],
 		"datasets": [{
 			"values": [r[1] for r in result]
 		}]
diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index db88e6ec52..95397070ae 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -107,7 +107,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 					else:
 						filters.append([doctype, f[0], "=", f[1]])
 
-			if filters==None:
+			if filters is None:
 				filters = []
 			or_filters = []
 
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 631174b4db..11e97a38b9 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -172,7 +172,7 @@ class BaseDocument(object):
 				...
 			})
 		"""
-		if value==None:
+		if value is None:
 			value={}
 		if isinstance(value, (dict, BaseDocument)):
 			if not self.__dict__.get(key):
@@ -272,7 +272,7 @@ class BaseDocument(object):
 			)):
 				d[fieldname] = str(d[fieldname])
 
-			if d[fieldname] == None and ignore_nulls:
+			if d[fieldname] is None and ignore_nulls:
 				del d[fieldname]
 
 		return d
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 51d53c69a5..79be261981 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -545,7 +545,7 @@ class DatabaseQuery(object):
 
 			elif f.operator.lower() in ("like", "not like") or (isinstance(f.value, str) and
 				(not df or df.fieldtype not in ["Float", "Int", "Currency", "Percent", "Check"])):
-					value = "" if f.value==None else f.value
+					value = "" if f.value is None else f.value
 					fallback = "''"
 
 					if f.operator.lower() in ("like", "not like") and isinstance(value, str):
diff --git a/frappe/model/document.py b/frappe/model/document.py
index e055a12950..db4b7703ba 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -211,13 +211,13 @@ class Document(BaseDocument):
 
 		self.flags.notifications_executed = []
 
-		if ignore_permissions!=None:
+		if ignore_permissions is not None:
 			self.flags.ignore_permissions = ignore_permissions
 
-		if ignore_links!=None:
+		if ignore_links is not None:
 			self.flags.ignore_links = ignore_links
 
-		if ignore_mandatory!=None:
+		if ignore_mandatory is not None:
 			self.flags.ignore_mandatory = ignore_mandatory
 
 		self.set("__islocal", True)
@@ -297,7 +297,7 @@ class Document(BaseDocument):
 
 		self.flags.notifications_executed = []
 
-		if ignore_permissions!=None:
+		if ignore_permissions is not None:
 			self.flags.ignore_permissions = ignore_permissions
 
 		self.flags.ignore_version = frappe.flags.in_test if ignore_version is None else ignore_version
@@ -441,7 +441,7 @@ class Document(BaseDocument):
 			values = self.as_dict()
 			# format values
 			for key, value in values.items():
-				if value==None:
+				if value is None:
 					values[key] = ""
 			return values
 
@@ -489,7 +489,7 @@ class Document(BaseDocument):
 		frappe.flags.currently_saving.append((self.doctype, self.name))
 
 	def set_docstatus(self):
-		if self.docstatus==None:
+		if self.docstatus is None:
 			self.docstatus=0
 
 		for d in self.get_all_children():
@@ -887,14 +887,14 @@ class Document(BaseDocument):
 		if (frappe.flags.in_import and frappe.flags.mute_emails) or frappe.flags.in_patch or frappe.flags.in_install:
 			return
 
-		if self.flags.notifications_executed==None:
+		if self.flags.notifications_executed is None:
 			self.flags.notifications_executed = []
 
 		from frappe.email.doctype.notification.notification import evaluate_alert
 
-		if self.flags.notifications == None:
+		if self.flags.notifications is None:
 			alerts = frappe.cache().hget('notifications', self.doctype)
-			if alerts==None:
+			if alerts is None:
 				alerts = frappe.get_all('Notification', fields=['name', 'event', 'method'],
 					filters={'enabled': 1, 'document_type': self.doctype})
 				frappe.cache().hset('notifications', self.doctype, alerts)
diff --git a/frappe/model/dynamic_links.py b/frappe/model/dynamic_links.py
index 7311b39b30..03f616ef60 100644
--- a/frappe/model/dynamic_links.py
+++ b/frappe/model/dynamic_links.py
@@ -32,7 +32,7 @@ def get_dynamic_link_map(for_delete=False):
 
 	Note: Will not map single doctypes
 	'''
-	if getattr(frappe.local, 'dynamic_link_map', None)==None or frappe.flags.in_test:
+	if getattr(frappe.local, 'dynamic_link_map', None) is None or frappe.flags.in_test:
 		# Build from scratch
 		dynamic_link_map = {}
 		for df in get_dynamic_links():
diff --git a/frappe/patches/v11_0/remove_skip_for_doctype.py b/frappe/patches/v11_0/remove_skip_for_doctype.py
index 1bbe74bb6d..6e66c75f68 100644
--- a/frappe/patches/v11_0/remove_skip_for_doctype.py
+++ b/frappe/patches/v11_0/remove_skip_for_doctype.py
@@ -33,7 +33,7 @@ def execute():
 				continue
 			skip_for_doctype = user_permission.skip_for_doctype.split('\n')
 		else: # while migrating from v10 -> v11
-			if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) == None:
+			if skip_for_doctype_map.get((user_permission.allow, user_permission.user)) is None:
 				skip_for_doctype = get_doctypes_to_skip(user_permission.allow, user_permission.user)
 				# cache skip for doctype for same user and doctype
 				skip_for_doctype_map[(user_permission.allow, user_permission.user)] = skip_for_doctype
diff --git a/frappe/permissions.py b/frappe/permissions.py
index 5faaf7dcfb..59ca9c2cb2 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -559,7 +559,9 @@ def filter_allowed_docs_for_doctype(user_permissions, doctype, with_default_doc=
 	return (allowed_doc, default_doc) if with_default_doc else allowed_doc
 
 def push_perm_check_log(log):
-	if frappe.flags.get('has_permission_check_logs') == None: return
+	if frappe.flags.get('has_permission_check_logs') is None:
+		return
+
 	frappe.flags.get('has_permission_check_logs').append(_(log))
 
 def has_child_table_permission(child_doctype, ptype="read", child_doc=None,
diff --git a/frappe/sessions.py b/frappe/sessions.py
index d2d1a8fcbc..6a5771b617 100644
--- a/frappe/sessions.py
+++ b/frappe/sessions.py
@@ -374,7 +374,7 @@ class Session:
 
 		# database persistence is secondary, don't update it too often
 		updated_in_db = False
-		if force or (time_diff==None) or (time_diff > 600):
+		if force or (time_diff is None) or (time_diff > 600):
 			# update sessions table
 			frappe.db.sql("""update `tabSessions` set sessiondata=%s,
 				lastupdate=NOW() where sid=%s""" , (str(self.data['data']),
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index b48ec396de..ab860eb1aa 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -57,7 +57,7 @@ class EnergyPointRule(Document):
 	def rule_condition_satisfied(self, doc):
 		if self.for_doc_event == 'New':
 			# indicates that this was a new doc
-			return doc.get_doc_before_save() == None
+			return doc.get_doc_before_save() is None
 		if self.for_doc_event == 'Submit':
 			return doc.docstatus == 1
 		if self.for_doc_event == 'Cancel':
diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py
index 72c29cd47b..a1a2bf9b9c 100644
--- a/frappe/tests/test_twofactor.py
+++ b/frappe/tests/test_twofactor.py
@@ -222,7 +222,7 @@ def disable_2fa():
 def toggle_2fa_all_role(state=None):
 	'''Enable or disable 2fa for 'all' role on the system.'''
 	all_role = frappe.get_doc('Role','All')
-	if state == None:
+	if state is None:
 		state = False if all_role.two_factor_auth == True else False
 	if state not in [True, False]: return
 	all_role.two_factor_auth = cint(state)
diff --git a/frappe/translate.py b/frappe/translate.py
index c5ef24bc2a..c883e63de3 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -206,7 +206,7 @@ def make_dict_from_messages(messages, full_dict=None, load_user_translation=True
 	:param messages: List of untranslated messages
 	"""
 	out = {}
-	if full_dict==None:
+	if full_dict is None:
 		if load_user_translation:
 			full_dict = get_full_dict(frappe.local.lang)
 		else:
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 54a6f0b7e8..351c0413ce 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -290,7 +290,7 @@ def remove_blanks(d):
 	"""
 	empty_keys = []
 	for key in d:
-		if d[key]=='' or d[key]==None:
+		if d[key] == "" or d[key] is None:
 			# del d[key] raises runtime exception, using a workaround
 			empty_keys.append(key)
 	for key in empty_keys:
diff --git a/frappe/utils/csvutils.py b/frappe/utils/csvutils.py
index e26da3da1c..2fb212ea3c 100644
--- a/frappe/utils/csvutils.py
+++ b/frappe/utils/csvutils.py
@@ -112,7 +112,7 @@ def check_record(d):
 		docfield = doc.meta.get_field(key)
 		val = d[key]
 		if docfield:
-			if docfield.reqd and (val=='' or val==None):
+			if docfield.reqd and (val=='' or val is None):
 				frappe.msgprint(_("{0} is required").format(docfield.label), raise_exception=1)
 
 			if docfield.fieldtype=='Select' and val and docfield.options:
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index b4ac5e7fef..891a55deda 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -129,7 +129,7 @@ def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, minutes=0, se
 	from dateutil.parser._parser import ParserError
 	from dateutil.relativedelta import relativedelta
 
-	if date==None:
+	if date is None:
 		date = now_datetime()
 
 	if hours:
diff --git a/frappe/utils/minify.py b/frappe/utils/minify.py
index b2cc93e554..634aa11038 100644
--- a/frappe/utils/minify.py
+++ b/frappe/utils/minify.py
@@ -70,7 +70,7 @@ class JavascriptMinify(object):
 		"""
 		c = self.theLookahead
 		self.theLookahead = None
-		if c == None:
+		if c is None:
 			c = self.instream.read(1)
 		if c >= ' ' or c == '\n':
 			return c
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index cef1a8d8a3..2e4d7a247b 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -305,7 +305,7 @@ def get_context(context):
 				if not section:
 					section = add_section()
 					column = None
-				if column==None:
+				if column is None:
 					column = add_column()
 				column.append(df)
 
diff --git a/frappe/website/utils.py b/frappe/website/utils.py
index cb8008277c..d4d0cead63 100644
--- a/frappe/website/utils.py
+++ b/frappe/website/utils.py
@@ -301,7 +301,7 @@ def get_html_content_based_on_type(doc, fieldname, content_type):
 		elif content_type == 'HTML':
 			content = doc.get(fieldname + '_html')
 
-		if content == None:
+		if content is None:
 			content = ''
 
 		return content

From 4b1eb4786034a5f2b7a9db02e77798a962f05726 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Mon, 17 Jan 2022 16:00:27 +0530
Subject: [PATCH 62/97] fix: the YYYY.MM.DD format not working for the document
 naming rule

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.py b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
index 8013f9df6f..5c445fd058 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -5,6 +5,7 @@
 import frappe
 from frappe.model.document import Document
 from frappe.utils.data import evaluate_filters
+from frappe.model.naming import parse_naming_series
 from frappe import _
 
 class DocumentNamingRule(Document):
@@ -27,7 +28,9 @@ class DocumentNamingRule(Document):
 				return
 
 		counter = frappe.db.get_value(self.doctype, self.name, 'counter', for_update=True) or 0
-		doc.name = self.prefix + ('%0'+str(self.prefix_digits)+'d') % (counter + 1)
+		naming_series = parse_naming_series(self.prefix, doc=doc)
+
+		doc.name = naming_series + ('%0'+str(self.prefix_digits)+'d') % (counter + 1)
 		frappe.db.set_value(self.doctype, self.name, 'counter', counter + 1)
 
 @frappe.whitelist()

From 6ef4b6833d60afaa33475a08f0dee42e34a4e390 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 17 Jan 2022 17:00:53 +0530
Subject: [PATCH 63/97] fix: datatable column resize in rtl

---
 frappe/public/scss/desk/frappe_datatable.scss | 5 +++++
 package.json                                  | 2 +-
 yarn.lock                                     | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frappe/public/scss/desk/frappe_datatable.scss b/frappe/public/scss/desk/frappe_datatable.scss
index 48645bbbfc..fb7d795ced 100644
--- a/frappe/public/scss/desk/frappe_datatable.scss
+++ b/frappe/public/scss/desk/frappe_datatable.scss
@@ -87,6 +87,11 @@
 		}
 	}
 
+	.dt-cell__resize-handle {
+		right: -3px !important;
+		left: unset !important;
+	}
+
 	.dt-row.dt-row-totalRow {
 		font-weight: bold;
 	}
diff --git a/package.json b/package.json
index 1bbedb33fc..afde0ea978 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "express": "^4.17.1",
     "fast-deep-equal": "^2.0.1",
     "frappe-charts": "^2.0.0-rc13",
-    "frappe-datatable": "^1.16.0",
+    "frappe-datatable": "^1.16.1",
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
     "highlight.js": "^10.4.1",
diff --git a/yarn.lock b/yarn.lock
index a7cbf0cf60..cfb0f1aedb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1601,10 +1601,10 @@ frappe-charts@^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.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.0.tgz#822dbcaaf48e5171f47ce2909da88e9a31bb2cbc"
-  integrity sha512-FkeHcaxxz4+BQLhwiegk94602PlnWNG4LiBPehgKdEL+OpJcwl8oNKWb/wPNw9lgW25u0LaaQwq/11sw7mnEbA==
+frappe-datatable@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.16.1.tgz#a5844b7ad8259ef45606608f492ca4b343006818"
+  integrity sha512-TRj3459YWyJdoP9MgHfOAEq7ylyoT3TVkwxLQGEmn5Xj6UAJOFa7F9j4TaWnFXW8tuoy69z/TktDclOurMeT2w==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"

From 3f7ede278df62a6a5b63802cdbe4475dd4060683 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 17 Jan 2022 18:45:00 +0530
Subject: [PATCH 64/97] build: Upgrade Frappe Gantt from 0.5.0 to 0.6.0
 (#15635)

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

diff --git a/package.json b/package.json
index 1bbedb33fc..2623d9fd38 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "fast-deep-equal": "^2.0.1",
     "frappe-charts": "^2.0.0-rc13",
     "frappe-datatable": "^1.16.0",
-    "frappe-gantt": "^0.5.0",
+    "frappe-gantt": "^0.6.0",
     "fuse.js": "^3.4.6",
     "highlight.js": "^10.4.1",
     "html5-qrcode": "^2.0.11",
diff --git a/yarn.lock b/yarn.lock
index a7cbf0cf60..c9e81f7628 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1610,10 +1610,10 @@ frappe-datatable@^1.16.0:
     lodash "^4.17.5"
     sortablejs "^1.7.0"
 
-frappe-gantt@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.5.0.tgz#4dc7aa125f318efea64b4ae0e38f67a720238c1d"
-  integrity sha512-RAskVuBmnTcPJXh87oVhYmnNGy/9lvZlLHGui8QFB8yRBuUjzpZoZfZ+hKmDtBDmWNrE2/LRta06W5WmhTzzWQ==
+frappe-gantt@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/frappe-gantt/-/frappe-gantt-0.6.0.tgz#fece2fdecc0b8d6065d3c420d9681b719b827047"
+  integrity sha512-/P7s9edP6EoLD09EX2HPqsy1u0v4zYcurMy4ByExArvj7t0UDJlpxp88nISFtMkQe+aofaO9dR0fd61ZwX0O6g==
 
 fresh@0.5.2:
   version "0.5.2"

From dac9349aef5e9d476b228157f70948cb9dac2e44 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Mon, 17 Jan 2022 15:40:33 +0100
Subject: [PATCH 65/97] refactor: use `is bool` instead of `== bool`

---
 frappe/__init__.py             | 2 +-
 frappe/auth.py                 | 3 ++-
 frappe/installer.py            | 2 +-
 frappe/permissions.py          | 2 +-
 frappe/tests/test_twofactor.py | 7 ++++---
 frappe/utils/redis_wrapper.py  | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 frappe/installer.py

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 20fc41b83a..c6cbfead43 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -446,7 +446,7 @@ def throw(msg, exc=ValidationError, title=None, is_minimizable=None, wide=None,
 	msgprint(msg, raise_exception=exc, title=title, indicator='red', is_minimizable=is_minimizable, wide=wide, as_list=as_list)
 
 def emit_js(js, user=False, **kwargs):
-	if user == False:
+	if user is False:
 		user = session.user
 	publish_realtime('eval_js', js, user=user, **kwargs)
 
diff --git a/frappe/auth.py b/frappe/auth.py
index a87edb6460..d4778eb0c1 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -111,7 +111,8 @@ class LoginManager:
 		self.user_type = None
 
 		if frappe.local.form_dict.get('cmd')=='login' or frappe.local.request.path=="/api/method/login":
-			if self.login()==False: return
+			if self.login() is False:
+				return
 			self.resume = False
 
 			# run login triggers
diff --git a/frappe/installer.py b/frappe/installer.py
old mode 100755
new mode 100644
index b50fa4a3b5..b24dd7db41
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -154,7 +154,7 @@ def install_app(name, verbose=False, set_as_patched=True):
 
 	for before_install in app_hooks.before_install or []:
 		out = frappe.get_attr(before_install)()
-		if out==False:
+		if out is False:
 			return
 
 	if name != "frappe":
diff --git a/frappe/permissions.py b/frappe/permissions.py
index 59ca9c2cb2..af17faba01 100644
--- a/frappe/permissions.py
+++ b/frappe/permissions.py
@@ -23,7 +23,7 @@ def print_has_permission_check_logs(func):
 		frappe.flags['has_permission_check_logs'] = []
 		result = func(*args, **kwargs)
 		self_perm_check = True if not kwargs.get('user') else kwargs.get('user') == frappe.session.user
-		raise_exception = False if kwargs.get('raise_exception') == False else True
+		raise_exception = False if kwargs.get('raise_exception') is False else True
 
 		# print only if access denied
 		# and if user is checking his own permission
diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py
index a1a2bf9b9c..fadc61a551 100644
--- a/frappe/tests/test_twofactor.py
+++ b/frappe/tests/test_twofactor.py
@@ -222,9 +222,10 @@ def disable_2fa():
 def toggle_2fa_all_role(state=None):
 	'''Enable or disable 2fa for 'all' role on the system.'''
 	all_role = frappe.get_doc('Role','All')
-	if state is None:
-		state = False if all_role.two_factor_auth == True else False
-	if state not in [True, False]: return
+	state = state if state is not None else False
+	if type(state) != bool:
+		return
+
 	all_role.two_factor_auth = cint(state)
 	all_role.save(ignore_permissions=True)
 	frappe.db.commit()
diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py
index dac9ab7a6d..9ca5bbfd4f 100644
--- a/frappe/utils/redis_wrapper.py
+++ b/frappe/utils/redis_wrapper.py
@@ -22,7 +22,7 @@ class RedisWrapper(redis.Redis):
 		if shared:
 			return key
 		if user:
-			if user == True:
+			if user is True:
 				user = frappe.session.user
 
 			key = "user:{0}:{1}".format(user, key)

From 115bb8faedae45031b5b08093552fd2d48c483f4 Mon Sep 17 00:00:00 2001
From: John Bulcher <jbulcher@starkartthenala.com>
Date: Mon, 17 Jan 2022 10:10:18 -0800
Subject: [PATCH 66/97] feat: Add click-drag scrolling to kanban boards

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

diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js
index c1e3c3bfe6..37862370bd 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -337,6 +337,7 @@ frappe.provide("frappe.views");
 
 		function bind_events() {
 			bind_add_column();
+			bind_clickdrag();
 		}
 
 		function setup_sortable() {
@@ -392,6 +393,45 @@ frappe.provide("frappe.views");
 			});
 		}
 
+		function bind_clickdrag() {
+			let isDown = false;
+			let startX;
+			let scrollLeft;
+			let draggable = self.$kanban_board[0];
+
+			draggable.addEventListener('mousedown', (e) => {
+				// don't trigger scroll if one of the ancestors of the
+				// clicked element matches any of these selectors
+				let ignoreEl = [
+					'.kanban-column .kanban-column-header',
+					'.kanban-column .add-card',
+					'.kanban-column .kanban-card.new-card-area',
+					'.kanban-card-wrapper',
+				];
+				if (ignoreEl.some((el) => e.target.closest(el))) return;
+
+				isDown = true;
+				draggable.classList.add('clickdrag-active');
+				startX = e.pageX - draggable.offsetLeft;
+				scrollLeft = draggable.scrollLeft;
+			});
+			draggable.addEventListener('mouseleave', () => {
+				isDown = false;
+				draggable.classList.remove('clickdrag-active');
+			});
+			draggable.addEventListener('mouseup', () => {
+				isDown = false;
+				draggable.classList.remove('clickdrag-active');
+			});
+			draggable.addEventListener('mousemove', (e) => {
+				if(!isDown) return;
+				e.preventDefault();
+				const x = e.pageX - draggable.offsetLeft;
+				const walk = (x - startX);
+				draggable.scrollLeft = scrollLeft - walk;
+			});
+		}
+
 		function setup_restore_columns() {
 			var cur_list = store.getState().cur_list;
 			var columns = store.getState().columns;

From a6307638498fb181c2dab8207c501a21f4bd34d7 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 18 Jan 2022 09:13:42 +0530
Subject: [PATCH 67/97] style: Fix formatting

---
 frappe/public/js/frappe/views/kanban/kanban_board.js | 2 +-
 1 file changed, 1 insertion(+), 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 37862370bd..dac14936a0 100644
--- a/frappe/public/js/frappe/views/kanban/kanban_board.js
+++ b/frappe/public/js/frappe/views/kanban/kanban_board.js
@@ -424,7 +424,7 @@ frappe.provide("frappe.views");
 				draggable.classList.remove('clickdrag-active');
 			});
 			draggable.addEventListener('mousemove', (e) => {
-				if(!isDown) return;
+				if (!isDown) return;
 				e.preventDefault();
 				const x = e.pageX - draggable.offsetLeft;
 				const walk = (x - startX);

From 53dc9f528d434410bbabf4d351953c7a02f3005d Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Tue, 18 Jan 2022 07:21:32 +0100
Subject: [PATCH 68/97] fix: document email in timeline (#15592)

---
 cypress/integration/timeline_email.js         |  6 +--
 .../js/frappe/form/footer/base_timeline.js    |  9 ++--
 .../js/frappe/form/footer/form_timeline.js    |  8 ++--
 frappe/public/scss/desk/timeline.scss         | 46 +++++++------------
 4 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/cypress/integration/timeline_email.js b/cypress/integration/timeline_email.js
index dfe80e0019..1b7634d211 100644
--- a/cypress/integration/timeline_email.js
+++ b/cypress/integration/timeline_email.js
@@ -19,7 +19,7 @@ context('Timeline Email', () => {
 		cy.get('.list-row > .level-left > .list-subject').eq(0).click();
 
 		//Creating a new email
-		cy.get('.timeline-actions > .btn').click();
+		cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click();
 		cy.fill_field('recipients', 'test@example.com', 'MultiSelect');
 		cy.get('.modal.show > .modal-dialog > .modal-content > .modal-body > :nth-child(1) > .form-layout > .form-page > :nth-child(3) > .section-body > .form-column > form > [data-fieldtype="Text Editor"] > .form-group > .control-input-wrapper > .control-input > .ql-container > .ql-editor').type('Test Mail');
 
@@ -57,11 +57,11 @@ context('Timeline Email', () => {
 		cy.wait(500);
 
 		//To check if the discard button functionality in email is working correctly
-		cy.get('.timeline-actions > .btn').click();
+		cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click();
 		cy.fill_field('recipients', 'test@example.com', 'MultiSelect');
 		cy.get('.modal-footer > .standard-actions > .btn-secondary').contains('Discard').click();
 		cy.wait(500);
-		cy.get('.timeline-actions > .btn').click();
+		cy.get('.timeline-actions > .timeline-item > .action-buttons > .action-btn').click();
 		cy.wait(500);
 		cy.get_field('recipients', 'MultiSelect').should('have.text', '');
 		cy.get('.modal-header:visible > .modal-actions > .btn-modal-close > .icon').click();
diff --git a/frappe/public/js/frappe/form/footer/base_timeline.js b/frappe/public/js/frappe/form/footer/base_timeline.js
index beeba16459..ba7a4eb565 100644
--- a/frappe/public/js/frappe/form/footer/base_timeline.js
+++ b/frappe/public/js/frappe/form/footer/base_timeline.js
@@ -12,8 +12,11 @@ class BaseTimeline {
 		this.wrapper = this.timeline_wrapper;
 		this.timeline_items_wrapper = $(`<div class="timeline-items">`);
 		this.timeline_actions_wrapper = $(`
-			<div class="timeline-actions">
-				<div class="timeline-dot"></div>
+			<div class="timeline-items timeline-actions">
+				<div class="timeline-item">
+					<div class="timeline-dot"></div>
+					<div class="timeline-content action-buttons"></div>
+				</div>
 			</div>
 		`);
 
@@ -37,7 +40,7 @@ class BaseTimeline {
 			${label}
 		</button>`);
 		action_btn.click(action);
-		this.timeline_actions_wrapper.append(action_btn);
+		this.timeline_actions_wrapper.find('.action-buttons').append(action_btn);
 		return action_btn;
 	}
 
diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js
index f278d1b64b..d440874f36 100644
--- a/frappe/public/js/frappe/form/footer/form_timeline.js
+++ b/frappe/public/js/frappe/form/footer/form_timeline.js
@@ -77,12 +77,14 @@ class FormTimeline extends BaseTimeline {
 			const message = __("Add to this activity by mailing to {0}", [link.bold()]);
 
 			this.document_email_link_wrapper = $(`
-				<div class="document-email-link-container">
+				<div class="timeline-item">
 					<div class="timeline-dot"></div>
-					<span class="ellipsis">${message}</span>
+					<div class="timeline-content">
+						<span>${message}</span>
+					</div>
 				</div>
 			`);
-			this.timeline_wrapper.append(this.document_email_link_wrapper);
+			this.timeline_actions_wrapper.append(this.document_email_link_wrapper);
 
 			this.document_email_link_wrapper
 				.find('.document-email-link')
diff --git a/frappe/public/scss/desk/timeline.scss b/frappe/public/scss/desk/timeline.scss
index 1861ee018b..a99f2648e8 100644
--- a/frappe/public/scss/desk/timeline.scss
+++ b/frappe/public/scss/desk/timeline.scss
@@ -57,35 +57,6 @@ $threshold: 34;
 			}
 		}
 	}
-	.timeline-actions {
-		display: inline-flex;
-		width: 100%;
-		margin-bottom: var(--timeline-item-bottom-margin);
-		padding: var(--padding-sm);
-		position: relative;
-		.action-btn {
-			margin-left: var(--margin-md);
-			display: flex;
-			align-items: center;
-			line-height: var(--text-xl);
-			.icon {
-				margin-right: var(--margin-xs);
-			}
-		}
-		.action-btn:first-of-type {
-			margin-left: var(--timeline-item-left-margin);
-		}
-	}
-	.document-email-link-container {
-		@extend .ellipsis;
-		position: relative;
-		padding: var(--padding-sm);
-		font-size: var(--text-sm);
-		margin-bottom: var(--timeline-item-bottom-margin);
-		span:first-of-type {
-			margin-left: var(--timeline-item-left-margin);
-		}
-	}
 	.timeline-item {
 		font-size: var(--text-md);
 		position: relative;
@@ -94,6 +65,23 @@ $threshold: 34;
 			color: var(--text-color);
 			font-weight: var(--text-bold);
 		}
+		.action-buttons {
+			display: inline-flex;
+			white-space: nowrap;
+			overflow: auto;
+			.action-btn {
+				margin-left: var(--margin-md);
+				display: flex;
+				align-items: center;
+				line-height: var(--text-xl);
+				.icon {
+					margin-right: var(--margin-xs);
+				}
+			}
+			.action-btn:first-of-type {
+				margin-left: 0;
+			}
+		}
 		.timeline-content {
 			max-width: var(--timeline-content-max-width);
 			padding: var(--padding-sm);

From abaa2dc35e8355af9a13d7887cf24dcb6f0f89c8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:57:38 +0530
Subject: [PATCH 69/97] style: Fix formatting issue

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

diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index 088c9dc403..bea1300764 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -251,7 +251,7 @@ def get_print_format(doctype, print_format):
 
 	# server, find template
 	module = print_format.module or frappe.db.get_value("DocType", doctype, "module")
-	path = os.path.join(get_module_path(module, "Print Format",print_format.name),
+	path = os.path.join(get_module_path(module, "Print Format", print_format.name),
 		frappe.scrub(print_format.name) + ".html")
 
 	if os.path.exists(path):

From 53d4ddca43b114414f1b81c58944064559a3e823 Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Tue, 18 Jan 2022 13:24:28 +0530
Subject: [PATCH 70/97] fix: Recursive routing for Form route (#15539)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/router.js         | 7 ++++---
 frappe/public/js/frappe/views/formview.js | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index 7874ffcdde..4fcf0dbd14 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -282,7 +282,7 @@ frappe.router = {
 					resolve();
 				});
 			}, 100);
-		});
+		}).finally(() => frappe.route_flags = {});
 	},
 
 	get_route_from_arguments(route) {
@@ -374,8 +374,9 @@ frappe.router = {
 		// change the URL and call the router
 		if (window.location.pathname !== url) {
 
-			// push state so the browser looks fine
-			history.pushState(null, null, url);
+			// push/replace state so the browser looks fine
+			const method = frappe.route_flags.replace_route ? "replaceState" : "pushState";
+			history[method](null, null, url);
 
 			// now process the route
 			this.route();
diff --git a/frappe/public/js/frappe/views/formview.js b/frappe/public/js/frappe/views/formview.js
index 6708a6ffb1..5da11afd71 100644
--- a/frappe/public/js/frappe/views/formview.js
+++ b/frappe/public/js/frappe/views/formview.js
@@ -98,6 +98,7 @@ frappe.views.FormFactory = class FormFactory extends frappe.views.Factory {
 		if (new_name===name) {
 			this.render(doctype_layout, name);
 		} else {
+			frappe.route_flags.replace_route = true;
 			frappe.set_route("Form", doctype_layout, new_name);
 		}
 	}

From 6752460f1ef64549eee95b626b9a65b4d480c3a4 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 18 Jan 2022 17:37:16 +0530
Subject: [PATCH 71/97] fix(minor): smaller default image for empty list

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

diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss
index 91bd942889..f0a9152cfb 100644
--- a/frappe/public/scss/desk/page.scss
+++ b/frappe/public/scss/desk/page.scss
@@ -164,7 +164,7 @@
 
 		// To compensate for perceived centering
 		.null-state {
-			height: 85px;
+			height: 60px;
 			width: auto;
 			margin-bottom: var(--margin-md);
 			img {

From acac60d061bbb1ee4957ca613c92e1526098aa3b Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 18 Jan 2022 18:06:27 +0530
Subject: [PATCH 72/97] fix(minor): allow auto close without permission check

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

diff --git a/frappe/automation/doctype/assignment_rule/assignment_rule.py b/frappe/automation/doctype/assignment_rule/assignment_rule.py
index a8c75bffd9..90099eebb6 100644
--- a/frappe/automation/doctype/assignment_rule/assignment_rule.py
+++ b/frappe/automation/doctype/assignment_rule/assignment_rule.py
@@ -272,7 +272,7 @@ def apply(doc=None, method=None, doctype=None, name=None):
 					for todo in todos_to_close:
 						_todo = frappe.get_doc("ToDo", todo)
 						_todo.status = "Closed"
-						_todo.save()
+						_todo.save(ignore_permissions=True)
 					break
 
 				else:

From e153a087ca180e021d73ba26e51fe821763acc74 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 12:57:32 +0530
Subject: [PATCH 73/97] fix(patch): reload property setter for new fields
 (#15654) (#15655)

(cherry picked from commit 8f05cdb5d57c4f8d0525554f3ac0ca6b0c689d9f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
---
 frappe/patches.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index 4231a59466..16ae349941 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -123,6 +123,8 @@ frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
 frappe.patches.v12_0.remove_example_email_thread_notify
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
 frappe.patches.v12_0.set_correct_url_in_files
+execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True)
+execute:frappe.reload_doc('custom', 'doctype', 'property_setter')
 frappe.patches.v13_0.remove_invalid_options_for_data_fields
 frappe.patches.v13_0.website_theme_custom_scss
 frappe.patches.v13_0.make_user_type
@@ -154,7 +156,6 @@ frappe.patches.v13_0.rename_notification_fields
 frappe.patches.v13_0.remove_duplicate_navbar_items
 frappe.patches.v13_0.set_social_icons
 frappe.patches.v12_0.set_default_password_reset_limit
-execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True)
 frappe.patches.v13_0.set_route_for_blog_category
 frappe.patches.v13_0.enable_custom_script
 frappe.patches.v13_0.update_newsletter_content_type
@@ -180,7 +181,6 @@ 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
-execute:frappe.reload_doc('core', 'doctype', 'doctype')
 frappe.patches.v13_0.jinja_hook
 frappe.patches.v13_0.update_notification_channel_if_empty
 frappe.patches.v13_0.set_first_day_of_the_week

From a7a265c4b1e04998cc949c0fa3cc6e49858366db Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 19 Jan 2022 14:29:50 +0530
Subject: [PATCH 74/97] fix: Set toast's background color based on alert type

---
 frappe/public/js/frappe/ui/messages.js |  9 ++++++---
 frappe/public/scss/desk/dark.scss      | 22 ++++++++++++++++++++++
 frappe/public/scss/desk/toast.scss     | 22 +++++++++++++++++++++-
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 185d275ac3..17845c0787 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -365,7 +365,7 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
 	let indicator_icon_map = {
 		'orange': "solid-warning",
 		'yellow': "solid-warning",
-		'blue': "solid-success",
+		'blue': "solid-info",
 		'green': "solid-success",
 		'red': "solid-error"
 	};
@@ -387,8 +387,10 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
 		icon = 'solid-info';
 	}
 
+	const indicator = message.indicator || 'blue';
+
 	const div = $(`
-		<div class="alert desk-alert">
+		<div class="alert desk-alert ${indicator}">
 			<div class="alert-message-container">
 				<div class="alert-title-container">
 					<div>${frappe.utils.icon(icon, 'lg')}</div>
@@ -398,7 +400,8 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
 			</div>
 			<div class="alert-body" style="display: none"></div>
 			<a class="close">${frappe.utils.icon('close-alt')}</a>
-		</div>`);
+		</div>
+	`);
 
 	div.hide().appendTo("#alert-container").show();
 
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index f894704ca2..d2c2c70fda 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -166,4 +166,26 @@
 		color: var(--text-color);
 		background: var(--gray-500);
 	}
+
+	.desk-alert {
+		&.red {
+			--toast-bg: var(--red-900);
+		}
+
+		&.yellow {
+			--toast-bg: var(--yellow-900);
+		}
+
+		&.orange {
+			--toast-bg: var(--orange-900);
+		}
+
+		&.blue {
+			--toast-bg: var(--blue-900);
+		}
+
+		&.green {
+			--toast-bg: var(--green-900);
+		}
+	}
 }
diff --git a/frappe/public/scss/desk/toast.scss b/frappe/public/scss/desk/toast.scss
index d10cfd871e..18d7ef9944 100644
--- a/frappe/public/scss/desk/toast.scss
+++ b/frappe/public/scss/desk/toast.scss
@@ -9,7 +9,27 @@
 	}
 }
 
-#alert-container .desk-alert {
+.desk-alert {
+	&.red {
+		--toast-bg: var(--red-100);
+	}
+
+	&.yellow {
+		--toast-bg: var(--yellow-50);
+	}
+
+	&.orange {
+		--toast-bg: var(--orange-50);
+	}
+
+	&.blue {
+		--toast-bg: var(--blue-50);
+	}
+
+	&.green {
+		--toast-bg: var(--green-50);
+	}
+
 	box-shadow: var(--modal-shadow);
 	width: 400px;
 	min-height: 50px;

From 377eb881983aff2330052e0480dd9b834ecccde4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 20 Jan 2022 09:29:29 +0530
Subject: [PATCH 75/97] fix: Update alert colors according to the new design

---
 frappe/public/js/frappe/ui/messages.js       |  2 +-
 frappe/public/scss/common/alert.scss         | 12 ++++++++
 frappe/public/scss/common/css_variables.scss | 10 ++++++
 frappe/public/scss/desk/dark.scss            | 32 ++++++--------------
 frappe/public/scss/desk/index.scss           |  1 +
 frappe/public/scss/desk/toast.scss           | 12 ++++----
 frappe/public/scss/website/index.scss        |  3 +-
 7 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 frappe/public/scss/common/alert.scss

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 17845c0787..0e0b6527e6 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -390,7 +390,7 @@ frappe.show_alert = frappe.toast = function(message, seconds=7, actions={}) {
 	const indicator = message.indicator || 'blue';
 
 	const div = $(`
-		<div class="alert desk-alert ${indicator}">
+		<div class="alert desk-alert ${indicator}" role="alert">
 			<div class="alert-message-container">
 				<div class="alert-title-container">
 					<div>${frappe.utils.icon(icon, 'lg')}</div>
diff --git a/frappe/public/scss/common/alert.scss b/frappe/public/scss/common/alert.scss
new file mode 100644
index 0000000000..ba026fa48a
--- /dev/null
+++ b/frappe/public/scss/common/alert.scss
@@ -0,0 +1,12 @@
+// Color overrides for https://getbootstrap.com/docs/4.0/components/alerts
+$alert-types: info, success, warning, danger;
+
+.alert {
+	@each $alert-type in $alert-types {
+		&.alert-#{$alert-type} {
+			color: var(--alert-text-#{$alert-type});
+			background-color: var(--alert-bg-#{$alert-type});
+			border: none;
+		}
+	}
+}
\ No newline at end of file
diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss
index e5a0052f04..5cc030516f 100644
--- a/frappe/public/scss/common/css_variables.scss
+++ b/frappe/public/scss/common/css_variables.scss
@@ -189,6 +189,16 @@
 	--text-on-pink: var(--pink-500);
 	--text-on-cyan: var(--cyan-600);
 
+	// alert colors
+	--alert-text-danger: var(--red-600);
+	--alert-text-warning: var(--yellow-700);
+	--alert-text-info: var(--blue-700);
+	--alert-text-success: var(--green-700);
+	--alert-bg-danger: var(--red-50);
+	--alert-bg-warning: var(--yellow-50);
+	--alert-bg-info: var(--blue-50);
+	--alert-bg-success: var(--green-50);
+
 	// Layout Colors
 	--bg-color: var(--gray-50);
 	--fg-color: white;
diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss
index d2c2c70fda..8cab845d35 100644
--- a/frappe/public/scss/desk/dark.scss
+++ b/frappe/public/scss/desk/dark.scss
@@ -63,6 +63,16 @@
 	--text-on-light-gray: var(--gray-100);
 	--text-on-purple: var(--purple-100);
 
+	// alert colors
+	--alert-text-danger: var(--red-300);
+	--alert-text-warning: var(--yellow-300);
+	--alert-text-info: var(--blue-300);
+	--alert-text-success: var(--green-300);
+	--alert-bg-danger: var(--red-900);
+	--alert-bg-warning: var(--yellow-900);
+	--alert-bg-info: var(--blue-900);
+	--alert-bg-success: var(--green-900);
+
 	--sidebar-select-color: var(--gray-800);
 
 	--scrollbar-thumb-color: var(--gray-600);
@@ -166,26 +176,4 @@
 		color: var(--text-color);
 		background: var(--gray-500);
 	}
-
-	.desk-alert {
-		&.red {
-			--toast-bg: var(--red-900);
-		}
-
-		&.yellow {
-			--toast-bg: var(--yellow-900);
-		}
-
-		&.orange {
-			--toast-bg: var(--orange-900);
-		}
-
-		&.blue {
-			--toast-bg: var(--blue-900);
-		}
-
-		&.green {
-			--toast-bg: var(--green-900);
-		}
-	}
 }
diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss
index 1d1124bd58..5d712f7ad6 100644
--- a/frappe/public/scss/desk/index.scss
+++ b/frappe/public/scss/desk/index.scss
@@ -2,6 +2,7 @@
 @import "../common/mixins.scss";
 @import "../common/global.scss";
 @import "../common/icons.scss";
+@import "../common/alert.scss";
 
 @import "~bootstrap/scss/bootstrap";
 @import "global";
diff --git a/frappe/public/scss/desk/toast.scss b/frappe/public/scss/desk/toast.scss
index 18d7ef9944..862b42cd76 100644
--- a/frappe/public/scss/desk/toast.scss
+++ b/frappe/public/scss/desk/toast.scss
@@ -11,23 +11,23 @@
 
 .desk-alert {
 	&.red {
-		--toast-bg: var(--red-100);
+		--toast-bg: var(--alert-bg-danger);
 	}
 
 	&.yellow {
-		--toast-bg: var(--yellow-50);
+		--toast-bg: var(--alert-bg-warning);
 	}
 
 	&.orange {
-		--toast-bg: var(--orange-50);
+		--toast-bg: var(--alert-bg-warning);
 	}
 
 	&.blue {
-		--toast-bg: var(--blue-50);
+		--toast-bg: var(--alert-bg-info);
 	}
 
 	&.green {
-		--toast-bg: var(--green-50);
+		--toast-bg: var(--alert-bg-success);
 	}
 
 	box-shadow: var(--modal-shadow);
@@ -66,7 +66,7 @@
 		.alert-subtitle {
 			font-size: var(--text-md);
 			padding-left: 34px;
-			color: var(--text-muted);
+			color: var(--text-light);
 		}
 	}
 
diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 69a7b205c4..970e9cab88 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -4,6 +4,7 @@
 @import "../common/mixins";
 @import "../common/global";
 @import "../common/icons";
+@import "../common/alert";
 @import 'base';
 @import "../common/flex";
 @import "../common/buttons";
@@ -137,7 +138,7 @@ body {
 	a {
 		color: var(--text-color)
 	}
-	
+
 	li.disabled {
 		a {
 			color: var(--text-muted);

From b88a215da6fb37659ea7a253e8a9b2343903a504 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Thu, 20 Jan 2022 14:50:16 +0530
Subject: [PATCH 76/97] fix(ux): increase modal dialog size for diffview
 (#15666)

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

diff --git a/frappe/public/js/frappe/utils/diffview.js b/frappe/public/js/frappe/utils/diffview.js
index ebface7f05..a898a318a1 100644
--- a/frappe/public/js/frappe/utils/diffview.js
+++ b/frappe/public/js/frappe/utils/diffview.js
@@ -54,7 +54,7 @@ frappe.ui.DiffView = class DiffView {
 					fieldname: "diff",
 				},
 			],
-			size: "large",
+			size: "extra-large",
 		});
 		return dialog;
 	}

From a053e8b33c2d3e1bc85562013f284bac0945e23c Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 20 Jan 2022 09:34:32 +0000
Subject: [PATCH 77/97] fix: allow custom queues (backport #15653) (#15667)

* fix: allow custom queues

(cherry picked from commit ab7077dd31c854f5a739f1a1a653e0fbffb2c53c)

* fix: remove site config and reformat the code

(cherry picked from commit b3e11c01ee08533e8ce151873e974730b16f26f7)

* fix: remove redundant code

(cherry picked from commit 51ae9a57fde9276877ef47a22d3a468a3fcfb479)

Co-authored-by: Lucas Vazquez <lucas5zvazquez@gmail.com>
---
 frappe/utils/background_jobs.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py
index b2592e9e8f..2c8b7f5fd3 100755
--- a/frappe/utils/background_jobs.py
+++ b/frappe/utils/background_jobs.py
@@ -20,11 +20,17 @@ from frappe.utils.redis_queue import RedisQueue
 from frappe.utils.commands import log
 
 
+common_site_config = frappe.get_file_json("common_site_config.json")
+custom_workers_config = common_site_config.get("workers", {})
 default_timeout = 300
 queue_timeout = {
-	'long': 1500,
-	'default': 300,
-	'short': 300
+	"default": default_timeout,
+	"short": default_timeout,
+	"long": 1500,
+	**{
+		worker: config.get("timeout", default_timeout)
+		for worker, config in custom_workers_config.items()
+	}
 }
 
 redis_connection = None

From a55ef8477b1969aa4629c50ccaa9a143d95a54e9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 20 Jan 2022 15:46:16 +0530
Subject: [PATCH 78/97] fix: Set first day of the week for date range (#15669)

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

diff --git a/frappe/public/js/frappe/form/controls/date_range.js b/frappe/public/js/frappe/form/controls/date_range.js
index 727e9d55c2..170404f575 100644
--- a/frappe/public/js/frappe/form/controls/date_range.js
+++ b/frappe/public/js/frappe/form/controls/date_range.js
@@ -11,7 +11,8 @@ frappe.ui.form.ControlDateRange = class ControlDateRange extends frappe.ui.form.
 			language: "en",
 			range: true,
 			autoClose: true,
-			toggleSelected: false
+			toggleSelected: false,
+			firstDay: frappe.datetime.get_first_day_of_the_week_index()
 		};
 		this.datepicker_options.dateFormat =
 			(frappe.boot.sysdefaults.date_format || 'yyyy-mm-dd');

From d49199876ad8e03fd2795c543f612cbc3be384ae Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Fri, 21 Jan 2022 08:00:18 +0100
Subject: [PATCH 79/97] chore: add translation context to strings(#15649)

* chore: add translation context

* revert: changes to some translatable strings

This way existing translations will continue to work until the translation process is improved.

* style: sider
---
 frappe/public/js/frappe/desk.js              |  5 +-
 frappe/public/js/frappe/form/form.js         |  5 +-
 frappe/public/js/frappe/form/save.js         | 17 ++---
 frappe/public/js/frappe/list/list_view.js    | 77 +++++++++++---------
 frappe/public/js/frappe/ui/dialog.js         |  6 +-
 frappe/public/js/frappe/ui/messages.js       |  2 +-
 frappe/public/js/frappe/web_form/web_form.js | 14 ++--
 7 files changed, 70 insertions(+), 56 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 202cee645a..51ada70948 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -214,19 +214,20 @@ frappe.Application = class Application {
 
 	email_password_prompt(email_account,user,i) {
 		var me = this;
+		const email_id = email_account[i]["email_id"];
 		let d = new frappe.ui.Dialog({
 			title: __('Password missing in Email Account'),
 			fields: [
 				{
 					'fieldname': 'password',
 					'fieldtype': 'Password',
-					'label': __('Please enter the password for: <b>{0}</b>', [email_account[i]["email_id"]]),
+					'label': __('Please enter the password for: <b>{0}</b>', [email_id], "Email Account"),
 					'reqd': 1
 				},
 				{
 					"fieldname": "submit",
 					"fieldtype": "Button",
-					"label": __("Submit")
+					"label": __("Submit", null, "Submit password for Email Account")
 				}
 			]
 		});
diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 1459b38df6..510426a444 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -943,7 +943,10 @@ frappe.ui.form.Form = class FrappeForm {
 				// re-enable buttons
 				resolve();
 			}
-			frappe.throw (__("No permission to '{0}' {1}", [__(action), __(this.doc.doctype)]));
+
+			frappe.throw(
+				__("No permission to '{0}' {1}", [__(action), __(this.doc.doctype)], "{0} = verb, {1} = object")
+			);
 		}
 	}
 
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 65d84e2202..934c90f017 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -7,12 +7,12 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 	$(btn).prop("disabled", true);
 
 	// specified here because there are keyboard shortcuts to save
-	var working_label = {
-		"Save": __("Saving"),
-		"Submit": __("Submitting"),
-		"Update": __("Updating"),
-		"Amend": __("Amending"),
-		"Cancel": __("Cancelling")
+	const working_label = {
+		"Save": __("Saving", null, "Freeze message while saving a document"),
+		"Submit": __("Submitting", null, "Freeze message while submitting a document"),
+		"Update": __("Updating", null, "Freeze message while updating a document"),
+		"Amend": __("Amending", null, "Freeze message while amending a document"),
+		"Cancel": __("Cancelling", null, "Freeze message while cancelling a document"),
 	}[toTitle(action)];
 
 	var freeze_message = working_label ? __(working_label) : "";
@@ -154,8 +154,8 @@ frappe.ui.form.save = function (frm, action, callback, btn) {
 			if (error_fields.length) {
 				let meta = frappe.get_meta(doc.doctype);
 				if (meta.istable) {
-					var message = __('Mandatory fields required in table {0}, Row {1}',
-						[__(frappe.meta.docfield_map[doc.parenttype][doc.parentfield].label).bold(), doc.idx]);
+					const table_label = __(frappe.meta.docfield_map[doc.parenttype][doc.parentfield].label).bold();
+					var message = __('Mandatory fields required in table {0}, Row {1}', [table_label, doc.idx]);
 				} else {
 					var message = __('Mandatory fields required in {0}', [__(doc.doctype)]);
 				}
@@ -276,4 +276,3 @@ frappe.ui.form.update_calling_link = (newdoc) => {
 		frappe._from_link = null;
 	}
 }
-
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 22f8377a57..3cde04313f 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -200,7 +200,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			frappe.render_template("list_view_permission_restrictions", {
 				condition_list: match_rules_list,
 			}),
-			__("Restrictions")
+			__("Restrictions", null, "Title of message showing restrictions in list view")
 		);
 	}
 
@@ -255,8 +255,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	set_primary_action() {
 		if (this.can_create) {
+			const doctype_name = __(frappe.router.doctype_layout) || __(this.doctype);
+
+			// Better style would be __("Add {0}", [doctype_name], "Primary action in list view")
+			// Keeping it like this to not disrupt existing translations
+			const label = `${__("Add", null, "Primary action in list view")} ${doctype_name}`;
 			this.page.set_primary_action(
-				`${__("Add")} ${frappe.router.doctype_layout || __(this.doctype)}`,
+				label,
 				() => {
 					if (this.settings.primary_action) {
 						this.settings.primary_action();
@@ -320,9 +325,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 	setup_freeze_area() {
 		this.$freeze = $(
-			`<div class="freeze flex justify-center align-center text-muted">${__(
-				"Loading"
-			)}...</div>`
+			`<div class="freeze flex justify-center align-center text-muted">
+				${__("Loading")}...
+			</div>`
 		).hide();
 		this.$result.append(this.$freeze);
 	}
@@ -460,8 +465,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			? __("No {0} found", [__(this.doctype)])
 			: __("You haven't created a {0} yet", [__(this.doctype)]);
 		let new_button_label = filters && filters.length
-			? __("Create a new {0}", [__(this.doctype)])
-			: __("Create your first {0}", [__(this.doctype)]);
+			? __("Create a new {0}", [__(this.doctype)], "Create a new document from list view")
+			: __("Create your first {0}", [__(this.doctype)], "Create a new document from list view");
 		let empty_state_image =
 			this.settings.empty_state_image ||
 			"/assets/frappe/images/ui-states/list-empty-state.svg";
@@ -469,7 +474,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		const new_button = this.can_create
 			? `<p><button class="btn btn-primary btn-sm btn-new-doc hidden-xs">
 				${new_button_label}
-			</button> <button class="btn btn-primary btn-new-doc visible-xs">${__('Create New')}</button></p>`
+			</button> <button class="btn btn-primary btn-new-doc visible-xs">
+				${__("Create New", null, "Create a new document from list view")}
+			</button></p>`
 			: "";
 
 		return `<div class="msg-box no-border">
@@ -486,7 +493,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		if (this.list_view_settings && !this.list_view_settings.disable_count) {
 			this.$result
 				.find(".list-count")
-				.html(`<span>${__("Refreshing")}...</span>`);
+				.html(`<span>${__("Refreshing", null, "Document count in list view")}...</span>`);
 		}
 	}
 
@@ -1081,14 +1088,14 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		frappe.ui.keys.add_shortcut({
 			shortcut: "down",
 			action: () => handle_navigation("down"),
-			description: __("Navigate list down"),
+			description: __("Navigate list down", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 
 		frappe.ui.keys.add_shortcut({
 			shortcut: "up",
 			action: () => handle_navigation("up"),
-			description: __("Navigate list up"),
+			description: __("Navigate list up", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 
@@ -1100,7 +1107,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				check_row($list_row);
 				focus_next();
 			},
-			description: __("Select multiple list items"),
+			description: __("Select multiple list items", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 
@@ -1112,7 +1119,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				check_row($list_row);
 				focus_prev();
 			},
-			description: __("Select multiple list items"),
+			description: __("Select multiple list items", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 
@@ -1126,7 +1133,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				}
 				return false;
 			},
-			description: __("Open list item"),
+			description: __("Open list item", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 
@@ -1140,7 +1147,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				}
 				return false;
 			},
-			description: __("Select list item"),
+			description: __("Select list item", null, "Description of a list view shortcut"),
 			page: this.page,
 		});
 	}
@@ -1515,7 +1522,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		if (frappe.model.can_import(doctype, null, this.meta)) {
 			items.push({
-				label: __("Import"),
+				label: __("Import", null, "Button in list view menu"),
 				action: () =>
 					frappe.set_route("list", "data-import", {
 						reference_doctype: doctype,
@@ -1526,7 +1533,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		if (frappe.model.can_set_user_permissions(doctype)) {
 			items.push({
-				label: __("User Permissions"),
+				label: __("User Permissions", null, "Button in list view menu"),
 				action: () =>
 					frappe.set_route("list", "user-permission", {
 						allow: doctype,
@@ -1537,7 +1544,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		if (frappe.user_roles.includes("System Manager")) {
 			items.push({
-				label: __("Role Permissions Manager"),
+				label: __("Role Permissions Manager", null, "Button in list view menu"),
 				action: () =>
 					frappe.set_route("permission-manager", {
 						doctype,
@@ -1546,7 +1553,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			});
 
 			items.push({
-				label: __("Customize"),
+				label: __("Customize", null, "Button in list view menu"),
 				action: () => {
 					if (!this.meta) return;
 					if (this.meta.custom) {
@@ -1563,7 +1570,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		}
 
 		items.push({
-			label: __("Toggle Sidebar"),
+			label: __("Toggle Sidebar", null, "Button in list view menu"),
 			action: () => this.toggle_side_bar(),
 			condition: () => !this.hide_sidebar,
 			standard: true,
@@ -1571,7 +1578,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		});
 
 		items.push({
-			label: __("Share URL"),
+			label: __("Share URL", null, "Button in list view menu"),
 			action: () => this.share_url(),
 			standard: true,
 			shortcut: "Ctrl+L",
@@ -1583,7 +1590,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		) {
 			// edit doctype
 			items.push({
-				label: __("Edit DocType"),
+				label: __("Edit DocType", null, "Button in list view menu"),
 				action: () => frappe.set_route("form", "doctype", doctype),
 				standard: true,
 			});
@@ -1591,7 +1598,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		if (frappe.user.has_role("System Manager")) {
 			items.push({
-				label: __("List Settings"),
+				label: __("List Settings", null, "Button in list view menu"),
 				action: () => this.show_list_settings(),
 				standard: true,
 			});
@@ -1682,7 +1689,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		// utility
 		const bulk_assignment = () => {
 			return {
-				label: __("Assign To"),
+				label: __("Assign To", null, "Button in list view actions menu"),
 				action: () => {
 					this.disable_list_update = true;
 					bulk_operations.assign(
@@ -1700,7 +1707,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_assignment_rule = () => {
 			return {
-				label: __("Apply Assignment Rule"),
+				label: __("Apply Assignment Rule", null, "Button in list view actions menu"),
 				action: () => {
 					this.disable_list_update = true;
 					bulk_operations.apply_assignment_rule(
@@ -1718,7 +1725,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_add_tags = () => {
 			return {
-				label: __("Add Tags"),
+				label: __("Add Tags", null, "Button in list view actions menu"),
 				action: () => {
 					this.disable_list_update = true;
 					bulk_operations.add_tags(
@@ -1736,7 +1743,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_printing = () => {
 			return {
-				label: __("Print"),
+				label: __("Print", null, "Button in list view actions menu"),
 				action: () => bulk_operations.print(this.get_checked_items()),
 				standard: true,
 			};
@@ -1744,13 +1751,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_delete = () => {
 			return {
-				label: __("Delete"),
+				label: __("Delete", null, "Button in list view actions menu"),
 				action: () => {
 					const docnames = this.get_checked_items(true).map(
 						(docname) => docname.toString()
 					);
 					frappe.confirm(
-						__("Delete {0} items permanently?", [docnames.length]),
+						__("Delete {0} items permanently?", [docnames.length], "Title of confirmation dialog"),
 						() => {
 							this.disable_list_update = true;
 							bulk_operations.delete(docnames, () => {
@@ -1767,12 +1774,12 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_cancel = () => {
 			return {
-				label: __("Cancel"),
+				label: __("Cancel", null, "Button in list view actions menu"),
 				action: () => {
 					const docnames = this.get_checked_items(true);
 					if (docnames.length > 0) {
 						frappe.confirm(
-							__("Cancel {0} documents?", [docnames.length]),
+							__("Cancel {0} documents?", [docnames.length], "Title of confirmation dialog"),
 							() => {
 								this.disable_list_update = true;
 								bulk_operations.submit_or_cancel(
@@ -1793,12 +1800,12 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_submit = () => {
 			return {
-				label: __("Submit"),
+				label: __("Submit", null, "Button in list view actions menu"),
 				action: () => {
 					const docnames = this.get_checked_items(true);
 					if (docnames.length > 0) {
 						frappe.confirm(
-							__("Submit {0} documents?", [docnames.length]),
+							__("Submit {0} documents?", [docnames.length], "Title of confirmation dialog"),
 							() => {
 								this.disable_list_update = true;
 								bulk_operations.submit_or_cancel(
@@ -1820,7 +1827,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_edit = () => {
 			return {
-				label: __("Edit"),
+				label: __("Edit", null, "Button in list view actions menu"),
 				action: () => {
 					let field_mappings = {};
 
@@ -1850,7 +1857,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		const bulk_export = () => {
 			return {
-				label: __("Export"),
+				label: __("Export", null, "Button in list view actions menu"),
 				action: () => {
 					const docnames = this.get_checked_items(true);
 
diff --git a/frappe/public/js/frappe/ui/dialog.js b/frappe/public/js/frappe/ui/dialog.js
index e2e51ce501..1618db9939 100644
--- a/frappe/public/js/frappe/ui/dialog.js
+++ b/frappe/public/js/frappe/ui/dialog.js
@@ -57,8 +57,10 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
 		// show footer
 		this.action = this.action || { primary: { }, secondary: { } };
 		if (this.primary_action || (this.action.primary && this.action.primary.onsubmit)) {
-			this.set_primary_action(this.primary_action_label || this.action.primary.label || __("Submit"),
-				this.primary_action || this.action.primary.onsubmit);
+			this.set_primary_action(
+				this.primary_action_label || this.action.primary.label || __("Submit", null, "Primary action in dialog"),
+				this.primary_action || this.action.primary.onsubmit
+			);
 		}
 
 		if (this.secondary_action) {
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 0e0b6527e6..ac0c01c406 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -63,7 +63,7 @@ frappe.warn = function(title, message_html, proceed_action, primary_label, is_mi
 			if (proceed_action) proceed_action();
 			d.hide();
 		},
-		secondary_action_label: __("Cancel"),
+		secondary_action_label: __("Cancel", null, "Secondary button in warning dialog"),
 		secondary_action: () => d.hide(),
 		minimizable: is_minimizable
 	});
diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 1f540958df..a45fc941d3 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -160,17 +160,17 @@ export default class WebForm extends frappe.ui.FieldGroup {
 	}
 
 	setup_primary_action() {
-		this.add_button_to_header(this.button_label || "Save", "primary", () =>
+		this.add_button_to_header(this.button_label || __("Save", null, "Button in web form"), "primary", () =>
 			this.save()
 		);
 
-		this.add_button_to_footer(this.button_label || "Save", "primary", () =>
+		this.add_button_to_footer(this.button_label || __("Save", null, "Button in web form"), "primary", () =>
 			this.save()
 		);
 	}
 
 	setup_cancel_button() {
-		this.add_button_to_header(__("Cancel"), "light", () => this.cancel());
+		this.add_button_to_header(__("Cancel", null, "Button in web form"), "light", () => this.cancel());
 	}
 
 	setup_delete_button() {
@@ -216,16 +216,18 @@ export default class WebForm extends frappe.ui.FieldGroup {
 
 		let message = '';
 		if (invalid_values.length) {
-			message += __('Invalid values for fields:') + '<br><br><ul><li>' + invalid_values.join('<li>') + '</ul>';
+			message += __('Invalid values for fields:', null, 'Error message in web form');
+			message += '<br><br><ul><li>' + invalid_values.join('<li>') + '</ul>';
 		}
 
 		if (errors.length) {
-			message += __('Mandatory fields required:') + '<br><br><ul><li>' + errors.join('<li>') + '</ul>';
+			message += __('Mandatory fields required:', null, 'Error message in web form');
+			message += '<br><br><ul><li>' + errors.join('<li>') + '</ul>';
 		}
 
 		if (invalid_values.length || errors.length) {
 			frappe.msgprint({
-				title: __('Error'),
+				title: __('Error', null, 'Title of error message in web form'),
 				message: message,
 				indicator: 'orange'
 			});

From c0fe37b94eb21cc756c53d5de91073177a1bd474 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 21 Jan 2022 21:18:16 +0530
Subject: [PATCH 80/97] fix: Sync "index" & "Unique" constraint changes in DB

---
 frappe/database/mariadb/database.py | 11 +++++++++--
 frappe/database/mariadb/schema.py   | 30 +++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py
index 6b827a4e89..de28dad900 100644
--- a/frappe/database/mariadb/database.py
+++ b/frappe/database/mariadb/database.py
@@ -245,9 +245,16 @@ class MariaDBDatabase(Database):
 			column_name as 'name',
 			column_type as 'type',
 			column_default as 'default',
-			column_key = 'MUL' as 'index',
+			COALESCE(
+				(select 1
+				from information_schema.statistics
+				where table_name="{table_name}"
+					and column_name=columns.column_name
+					and NON_UNIQUE=1
+					limit 1
+			), 0) as 'index',
 			column_key = 'UNI' as 'unique'
-			from information_schema.columns
+			from information_schema.columns as columns
 			where table_name = '{table_name}' '''.format(table_name=table_name), as_dict=1)
 
 	def has_index(self, table_name, index_name):
diff --git a/frappe/database/mariadb/schema.py b/frappe/database/mariadb/schema.py
index 5768a2f23d..f1691765b5 100644
--- a/frappe/database/mariadb/schema.py
+++ b/frappe/database/mariadb/schema.py
@@ -58,18 +58,32 @@ class MariaDBTable(DBTable):
 			modify_column_query.append("MODIFY `{}` {}".format(col.fieldname, col.get_definition()))
 
 		for col in self.add_index:
-			# if index key not exists
-			if not frappe.db.sql("SHOW INDEX FROM `%s` WHERE key_name = %s" %
-					(self.table_name, '%s'), col.fieldname):
-				add_index_query.append("ADD INDEX `{}`(`{}`)".format(col.fieldname, col.fieldname))
+			# if index key does not exists
+			if not frappe.db.has_index(self.table_name, col.fieldname + '_index'):
+				add_index_query.append("ADD INDEX `{}_index`(`{}`)".format(col.fieldname, col.fieldname))
 
 		for col in self.drop_index:
 			if col.fieldname != 'name': # primary key
+				current_column = self.current_columns.get(col.fieldname.lower())
+				unique_constraint_changed = current_column.unique != col.unique
+				if unique_constraint_changed and not col.unique:
+					unique_index_record = frappe.db.sql("""
+						SHOW INDEX FROM `{0}`
+						WHERE Column_name=%s
+						AND Non_unique=0
+					""".format(self.table_name), (col.fieldname), as_dict=1)
+					if unique_index_record:
+						drop_index_query.append("DROP INDEX `{}`".format(unique_index_record[0].Key_name))
+				index_constraint_changed = current_column.index != col.set_index
 				# if index key exists
-				if frappe.db.sql("""SHOW INDEX FROM `{0}`
-					WHERE key_name=%s
-					AND Non_unique=%s""".format(self.table_name), (col.fieldname, col.unique)):
-					drop_index_query.append("drop index `{}`".format(col.fieldname))
+				if index_constraint_changed and not col.set_index:
+					index_record = frappe.db.sql("""
+						SHOW INDEX FROM `{0}`
+						WHERE Column_name=%s
+						AND Non_unique=1
+					""".format(self.table_name), (col.fieldname), as_dict=1)
+					if index_record:
+						drop_index_query.append("DROP INDEX `{}`".format(index_record[0].Key_name))
 
 		try:
 			for query_parts in [add_column_query, modify_column_query, add_index_query, drop_index_query]:

From b3f9e8e2cf00e85488dfbaef0fd5ba60af80a130 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 21 Jan 2022 21:20:47 +0530
Subject: [PATCH 81/97] test: Add cases to validate index and unique
 constraints

---
 frappe/tests/test_db_update.py | 52 +++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/frappe/tests/test_db_update.py b/frappe/tests/test_db_update.py
index 4ae33a2fab..7831ecd5f4 100644
--- a/frappe/tests/test_db_update.py
+++ b/frappe/tests/test_db_update.py
@@ -34,6 +34,52 @@ class TestDBUpdate(unittest.TestCase):
 			self.assertEqual(fieldtype, table_column.type)
 			self.assertIn(cstr(table_column.default) or 'NULL', [cstr(default), "'{}'".format(default)])
 
+	def test_index_and_unique_constraints(self):
+		doctype = "User"
+		frappe.reload_doctype('User', force=True)
+		frappe.model.meta.trim_tables('User')
+
+		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.unique, 1)
+
+		make_property_setter(doctype, 'restrict_ip', 'unique', '0', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.unique, 0)
+
+		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.index, 1)
+
+		make_property_setter(doctype, 'restrict_ip', 'search_index', '0', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.index, 0)
+
+		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
+		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.index, 1)
+		self.assertEqual(restrict_ip_in_table.unique, 1)
+
+		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
+		make_property_setter(doctype, 'restrict_ip', 'unique', '0', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.index, 1)
+		self.assertEqual(restrict_ip_in_table.unique, 0)
+
+		make_property_setter(doctype, 'restrict_ip', 'search_index', '0', 'Int')
+		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
+		frappe.db.updatedb(doctype)
+		restrict_ip_in_table = get_table_column("User", "restrict_ip")
+		self.assertEqual(restrict_ip_in_table.index, 0)
+		self.assertEqual(restrict_ip_in_table.unique, 1)
+
 def get_fieldtype_from_def(field_def):
 	fieldtuple = frappe.db.type_map.get(field_def.fieldtype, ('', 0))
 	fieldtype = fieldtuple[0]
@@ -69,4 +115,8 @@ def get_other_fields_meta(meta):
 	fields = dict(default_fields_map, **optional_fields_map)
 	field_map =  [frappe._dict({'fieldname': field, 'fieldtype': _type, 'length': _length}) for field, (_type, _length) in fields.items()]
 
-	return field_map
\ No newline at end of file
+	return field_map
+
+def get_table_column(doctype, fieldname):
+	table_columns = frappe.db.get_table_columns_description('tab{}'.format(doctype))
+	return find(table_columns, lambda d: d.get('name') == fieldname)
\ No newline at end of file

From e1497e1aadf81e26c65793d592a3e2109027310a Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 21 Jan 2022 17:03:54 +0100
Subject: [PATCH 82/97] fix: translate fieldname in report dialog and alert

---
 frappe/public/js/frappe/views/reports/report_view.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 6d8e281793..f5d9f3e110 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -340,7 +340,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 								options: columns_in_picker
 							},
 							{
-								label: __('Insert Column Before {0}', [datatabe_col.docfield.label.bold()]),
+								label: __('Insert Column Before {0}', [__(datatabe_col.docfield.label).bold()]),
 								fieldname: 'insert_before',
 								fieldtype: 'Check'
 							}
@@ -789,7 +789,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			} else {
 				this.fields.splice(col_index, 0, field);
 			}
-			frappe.show_alert(__('Also adding the dependent currency field {0}', [field[0].bold()]));
+			const field_label = frappe.meta.get_label(doctype, field[0]);
+			frappe.show_alert(
+				__('Also adding the dependent currency field {0}', [__(field_label).bold()])
+			);
 		}
 	}
 
@@ -799,7 +802,10 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			const field = [col, doctype];
 			this.fields.push(field);
 			this.refresh();
-			frappe.show_alert(__('Also adding the status dependency field {0}', [field[0].bold()]));
+			const field_label = frappe.meta.get_label(doctype, field[0]);
+			frappe.show_alert(
+				__('Also adding the status dependency field {0}', [__(field_label).bold()])
+			);
 		}
 	}
 

From ae80c7e37290aad6b2f5e8e01ed2959a1af6a032 Mon Sep 17 00:00:00 2001
From: hrwx <himanshuwarekar@yahoo.com>
Date: Fri, 21 Jan 2022 19:29:14 +0000
Subject: [PATCH 83/97] chore: add exists check for web form ui test

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

diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index 79868b0b76..b299df522c 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -248,10 +248,11 @@ def create_topic_and_reply(web_page):
 
 @frappe.whitelist()
 def update_webform_to_multistep():
-	doc = frappe.get_doc("Web Form", "edit-profile")
-	_doc = frappe.copy_doc(doc)
-	_doc.is_multi_step_form = 1
-	_doc.title = "update-profile-duplicate"
-	_doc.route = "update-profile-duplicate"
-	_doc.is_standard = False
-	_doc.save()
+	if not frappe.db.exists("Web Form", "update-profile-duplicate"):
+		doc = frappe.get_doc("Web Form", "edit-profile")
+		_doc = frappe.copy_doc(doc)
+		_doc.is_multi_step_form = 1
+		_doc.title = "update-profile-duplicate"
+		_doc.route = "update-profile-duplicate"
+		_doc.is_standard = False
+		_doc.save()

From 39031d18ed5ff063d50a045b3f3a947fc642fa86 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 23 Jan 2022 17:44:07 +0530
Subject: [PATCH 84/97] fix: Check if index exists with specific key_name

---
 frappe/database/mariadb/schema.py | 6 +++---
 frappe/database/schema.py         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/database/mariadb/schema.py b/frappe/database/mariadb/schema.py
index f1691765b5..f7abac6547 100644
--- a/frappe/database/mariadb/schema.py
+++ b/frappe/database/mariadb/schema.py
@@ -69,7 +69,7 @@ class MariaDBTable(DBTable):
 				if unique_constraint_changed and not col.unique:
 					unique_index_record = frappe.db.sql("""
 						SHOW INDEX FROM `{0}`
-						WHERE Column_name=%s
+						WHERE Key_name=%s
 						AND Non_unique=0
 					""".format(self.table_name), (col.fieldname), as_dict=1)
 					if unique_index_record:
@@ -79,9 +79,9 @@ class MariaDBTable(DBTable):
 				if index_constraint_changed and not col.set_index:
 					index_record = frappe.db.sql("""
 						SHOW INDEX FROM `{0}`
-						WHERE Column_name=%s
+						WHERE Key_name=%s
 						AND Non_unique=1
-					""".format(self.table_name), (col.fieldname), as_dict=1)
+					""".format(self.table_name), (col.fieldname + '_index'), as_dict=1)
 					if index_record:
 						drop_index_query.append("DROP INDEX `{}`".format(index_record[0].Key_name))
 
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 10582eff8f..5b4788a9c2 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -230,7 +230,7 @@ class DbColumn:
 			self.table.set_default.append(self)
 
 		# index should be applied or dropped irrespective of type change
-		if ((current_def['index'] and not self.set_index and not self.unique)
+		if ((current_def['index'] and not self.set_index)
 			or (current_def['unique'] and not self.unique)):
 			# to drop unique you have to drop index
 			self.table.drop_index.append(self)

From 4d384f308b888f8b3c6fad197afb4b180a03dc61 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 23 Jan 2022 22:57:33 +0530
Subject: [PATCH 85/97] fix: Unique and Index constraints

---
 frappe/database/mariadb/schema.py    |  2 +-
 frappe/database/postgres/database.py | 16 ++++----
 frappe/database/postgres/schema.py   | 58 +++++++++++++++++-----------
 frappe/database/schema.py            |  9 +++--
 4 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/frappe/database/mariadb/schema.py b/frappe/database/mariadb/schema.py
index f7abac6547..d5a1096ba4 100644
--- a/frappe/database/mariadb/schema.py
+++ b/frappe/database/mariadb/schema.py
@@ -62,7 +62,7 @@ class MariaDBTable(DBTable):
 			if not frappe.db.has_index(self.table_name, col.fieldname + '_index'):
 				add_index_query.append("ADD INDEX `{}_index`(`{}`)".format(col.fieldname, col.fieldname))
 
-		for col in self.drop_index:
+		for col in self.drop_index + self.drop_unique:
 			if col.fieldname != 'name': # primary key
 				current_column = self.current_columns.get(col.fieldname.lower())
 				unique_constraint_changed = current_column.unique != col.unique
diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 33f07990af..3547907e58 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -77,11 +77,11 @@ class PostgresDatabase(Database):
 		"""Escape quotes and percent in given string."""
 		if isinstance(s, bytes):
 			s = s.decode('utf-8')
-				
+
 		# MariaDB's driver treats None as an empty string
 		# So Postgres should do the same
 
-		if s is None: 
+		if s is None:
 			s = ''
 
 		if percent:
@@ -308,18 +308,20 @@ class PostgresDatabase(Database):
 				WHEN 'timestamp without time zone' THEN 'timestamp'
 				ELSE a.data_type
 			END AS type,
-			COUNT(b.indexdef) AS Index,
+			BOOL_OR(b.index) AS index,
 			SPLIT_PART(COALESCE(a.column_default, NULL), '::', 1) AS default,
 			BOOL_OR(b.unique) AS unique
 			FROM information_schema.columns a
 			LEFT JOIN
-				(SELECT indexdef, tablename, indexdef LIKE '%UNIQUE INDEX%' AS unique
+				(SELECT indexdef, tablename,
+					indexdef LIKE '%UNIQUE INDEX%' AS unique,
+					indexdef NOT LIKE '%UNIQUE INDEX%' AS index
 					FROM pg_indexes
 					WHERE tablename='{table_name}') b
-					ON SUBSTRING(b.indexdef, '\(.*\)') LIKE CONCAT('%', a.column_name, '%')
+				ON SUBSTRING(b.indexdef, '\(.*\)') LIKE CONCAT('%', a.column_name, '%')
 			WHERE a.table_name = '{table_name}'
-			GROUP BY a.column_name, a.data_type, a.column_default, a.character_maximum_length;'''
-			.format(table_name=table_name), as_dict=1)
+			GROUP BY a.column_name, a.data_type, a.column_default, a.character_maximum_length;
+		'''.format(table_name=table_name), as_dict=1)
 
 	def get_database_list(self, target):
 		return [d[0] for d in self.sql("SELECT datname FROM pg_database;")]
diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index 58153ca6ce..a7c96a5532 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -52,8 +52,8 @@ class PostgresTable(DBTable):
 			query.append("ALTER COLUMN `{0}` TYPE {1} {2}".format(
 				col.fieldname,
 				get_definition(col.fieldtype, precision=col.precision, length=col.length),
-				using_clause)
-			)
+				using_clause
+			))
 
 		for col in self.set_default:
 			if col.fieldname=="name":
@@ -73,37 +73,49 @@ class PostgresTable(DBTable):
 
 			query.append("ALTER COLUMN `{}` SET DEFAULT {}".format(col.fieldname, col_default))
 
-		create_index_query = ""
+		create_contraint_query = ""
 		for col in self.add_index:
 			# if index key not exists
-			create_index_query += 'CREATE INDEX IF NOT EXISTS "{index_name}" ON `{table_name}`(`{field}`);'.format(
+			create_contraint_query += 'CREATE INDEX IF NOT EXISTS "{index_name}" ON `{table_name}`(`{field}`);'.format(
 				index_name=col.fieldname,
 				table_name=self.table_name,
 				field=col.fieldname)
 
-		drop_index_query = ""
+		for col in self.add_unique:
+			# if index key not exists
+			create_contraint_query += 'CREATE UNIQUE INDEX IF NOT EXISTS "unique_{index_name}" ON `{table_name}`(`{field}`);'.format(
+				index_name=col.fieldname,
+				table_name=self.table_name,
+				field=col.fieldname
+			)
+
+		drop_contraint_query = ""
 		for col in self.drop_index:
 			# primary key
 			if col.fieldname != 'name':
 				# if index key exists
-				if not frappe.db.has_index(self.table_name, col.fieldname):
-					drop_index_query += 'DROP INDEX IF EXISTS "{}" ;'.format(col.fieldname)
+				drop_contraint_query += 'DROP INDEX IF EXISTS "{}" ;'.format(col.fieldname)
 
-		if query:
-			try:
+		for col in self.drop_unique:
+			# primary key
+			if col.fieldname != 'name':
+				# if index key exists
+				drop_contraint_query += 'DROP INDEX IF EXISTS "unique_{}" ;'.format(col.fieldname)
+		try:
+			if query:
 				final_alter_query = "ALTER TABLE `{}` {}".format(self.table_name, ", ".join(query))
 				if final_alter_query: frappe.db.sql(final_alter_query)
-				if create_index_query: frappe.db.sql(create_index_query)
-				if drop_index_query: frappe.db.sql(drop_index_query)
-			except Exception as e:
-				# sanitize
-				if frappe.db.is_duplicate_fieldname(e):
-					frappe.throw(str(e))
-				elif frappe.db.is_duplicate_entry(e):
-					fieldname = str(e).split("'")[-2]
-					frappe.throw(_("""{0} field cannot be set as unique in {1},
-						as there are non-unique existing values""".format(
-						fieldname, self.table_name)))
-					raise e
-				else:
-					raise e
+			if create_contraint_query: frappe.db.sql(create_contraint_query)
+			if drop_contraint_query: frappe.db.sql(drop_contraint_query)
+		except Exception as e:
+			# sanitize
+			if frappe.db.is_duplicate_fieldname(e):
+				frappe.throw(str(e))
+			elif frappe.db.is_duplicate_entry(e):
+				fieldname = str(e).split("'")[-2]
+				frappe.throw(_("""{0} field cannot be set as unique in {1},
+					as there are non-unique existing values""".format(
+					fieldname, self.table_name)))
+				raise e
+			else:
+				raise e
diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 5b4788a9c2..1767f90af0 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -21,6 +21,7 @@ class DBTable:
 		self.change_name = []
 		self.add_unique = []
 		self.add_index = []
+		self.drop_unique = []
 		self.drop_index = []
 		self.set_default = []
 
@@ -219,8 +220,10 @@ class DbColumn:
 			self.table.change_type.append(self)
 
 		# unique
-		if((self.unique and not current_def['unique']) and column_type not in ('text', 'longtext')):
+		if ((self.unique and not current_def['unique']) and column_type not in ('text', 'longtext')):
 			self.table.add_unique.append(self)
+		elif (current_def['unique'] and not self.unique):
+			self.table.drop_unique.append(self)
 
 		# default
 		if (self.default_changed(current_def)
@@ -230,9 +233,7 @@ class DbColumn:
 			self.table.set_default.append(self)
 
 		# index should be applied or dropped irrespective of type change
-		if ((current_def['index'] and not self.set_index)
-			or (current_def['unique'] and not self.unique)):
-			# to drop unique you have to drop index
+		if (current_def['index'] and not self.set_index):
 			self.table.drop_index.append(self)
 
 		elif (not current_def['index'] and self.set_index) and not (column_type in ('text', 'longtext')):

From 72af9c7366dab2259813a45268f394e408c8f223 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 23 Jan 2022 22:59:13 +0530
Subject: [PATCH 86/97] test: Fix test_index_and_unique_constraints

---
 frappe/tests/test_db_update.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frappe/tests/test_db_update.py b/frappe/tests/test_db_update.py
index 7831ecd5f4..74254718e6 100644
--- a/frappe/tests/test_db_update.py
+++ b/frappe/tests/test_db_update.py
@@ -42,43 +42,43 @@ class TestDBUpdate(unittest.TestCase):
 		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.unique, 1)
+		self.assertTrue(restrict_ip_in_table.unique)
 
 		make_property_setter(doctype, 'restrict_ip', 'unique', '0', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.unique, 0)
+		self.assertFalse(restrict_ip_in_table.unique)
 
 		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.index, 1)
+		self.assertTrue(restrict_ip_in_table.index)
 
 		make_property_setter(doctype, 'restrict_ip', 'search_index', '0', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.index, 0)
+		self.assertFalse(restrict_ip_in_table.index)
 
 		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
 		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.index, 1)
-		self.assertEqual(restrict_ip_in_table.unique, 1)
+		self.assertTrue(restrict_ip_in_table.index)
+		self.assertTrue(restrict_ip_in_table.unique)
 
 		make_property_setter(doctype, 'restrict_ip', 'search_index', '1', 'Int')
 		make_property_setter(doctype, 'restrict_ip', 'unique', '0', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.index, 1)
-		self.assertEqual(restrict_ip_in_table.unique, 0)
+		self.assertTrue(restrict_ip_in_table.index)
+		self.assertFalse(restrict_ip_in_table.unique)
 
 		make_property_setter(doctype, 'restrict_ip', 'search_index', '0', 'Int')
 		make_property_setter(doctype, 'restrict_ip', 'unique', '1', 'Int')
 		frappe.db.updatedb(doctype)
 		restrict_ip_in_table = get_table_column("User", "restrict_ip")
-		self.assertEqual(restrict_ip_in_table.index, 0)
-		self.assertEqual(restrict_ip_in_table.unique, 1)
+		self.assertFalse(restrict_ip_in_table.index)
+		self.assertTrue(restrict_ip_in_table.unique)
 
 def get_fieldtype_from_def(field_def):
 	fieldtuple = frappe.db.type_map.get(field_def.fieldtype, ('', 0))

From 47393bcb85b5f3a53a9799d5a4db842ef6a14d04 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 24 Jan 2022 09:44:25 +0530
Subject: [PATCH 87/97] style: Fix formatting issues

---
 frappe/database/postgres/database.py |  2 +-
 frappe/database/postgres/schema.py   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py
index 3547907e58..d5495c6879 100644
--- a/frappe/database/postgres/database.py
+++ b/frappe/database/postgres/database.py
@@ -318,7 +318,7 @@ class PostgresDatabase(Database):
 					indexdef NOT LIKE '%UNIQUE INDEX%' AS index
 					FROM pg_indexes
 					WHERE tablename='{table_name}') b
-				ON SUBSTRING(b.indexdef, '\(.*\)') LIKE CONCAT('%', a.column_name, '%')
+				ON SUBSTRING(b.indexdef, '(.*)') LIKE CONCAT('%', a.column_name, '%')
 			WHERE a.table_name = '{table_name}'
 			GROUP BY a.column_name, a.data_type, a.column_default, a.character_maximum_length;
 		'''.format(table_name=table_name), as_dict=1)
diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index a7c96a5532..6c40a4e91d 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -104,18 +104,20 @@ class PostgresTable(DBTable):
 		try:
 			if query:
 				final_alter_query = "ALTER TABLE `{}` {}".format(self.table_name, ", ".join(query))
-				if final_alter_query: frappe.db.sql(final_alter_query)
-			if create_contraint_query: frappe.db.sql(create_contraint_query)
-			if drop_contraint_query: frappe.db.sql(drop_contraint_query)
+				frappe.db.sql(final_alter_query)
+			if create_contraint_query:
+				frappe.db.sql(create_contraint_query)
+			if drop_contraint_query:
+				frappe.db.sql(drop_contraint_query)
 		except Exception as e:
 			# sanitize
 			if frappe.db.is_duplicate_fieldname(e):
 				frappe.throw(str(e))
 			elif frappe.db.is_duplicate_entry(e):
 				fieldname = str(e).split("'")[-2]
-				frappe.throw(_("""{0} field cannot be set as unique in {1},
-					as there are non-unique existing values""".format(
-					fieldname, self.table_name)))
-				raise e
+				frappe.throw(
+					_("{0} field cannot be set as unique in {1}, as there are non-unique existing values")
+						.format(fieldname, self.table_name)
+				)
 			else:
 				raise e

From 9a5409892d929d54e4cc101c916d39014eec5880 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 24 Jan 2022 10:26:38 +0530
Subject: [PATCH 88/97] fix(postgres): Create indexes while creating table

Previously, indexes were not getting created based on "search_index" configuration while creating new table
---
 frappe/database/postgres/schema.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index 6c40a4e91d..99e64ce08d 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -11,8 +11,6 @@ class PostgresTable(DBTable):
 		column_defs = self.get_column_definitions()
 		if column_defs: add_text += ',\n'.join(column_defs)
 
-		# index
-		# index_defs = self.get_index_definitions()
 		# TODO: set docstatus length
 		# create table
 		frappe.db.sql("""create table `%s` (
@@ -28,8 +26,24 @@ class PostgresTable(DBTable):
 			idx bigint not null default '0',
 			%s)""".format(varchar_len=frappe.db.VARCHAR_LEN) % (self.table_name, add_text))
 
+		self.create_indexes()
 		frappe.db.commit()
 
+	def create_indexes(self):
+		create_index_query = ""
+		for key, col in self.columns.items():
+			if (col.set_index
+				and col.fieldtype in frappe.db.type_map
+				and frappe.db.type_map.get(col.fieldtype)[0]
+				not in ('text', 'longtext')):
+				create_index_query += 'CREATE INDEX IF NOT EXISTS "{index_name}" ON `{table_name}`(`{field}`);'.format(
+					index_name=col.fieldname,
+					table_name=self.table_name,
+					field=col.fieldname
+				)
+		if create_index_query:
+			frappe.db.sql(create_index_query)
+
 	def alter(self):
 		for col in self.columns.values():
 			col.build_for_alter_table(self.current_columns.get(col.fieldname.lower()))

From 490b2f61cd0136b8e97e15fbaf6f0f3a00cc7231 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 24 Jan 2022 11:00:18 +0530
Subject: [PATCH 89/97] chore: Add nosemgrep comment to avoid semgrep warnings

---
 frappe/database/mariadb/schema.py  | 2 ++
 frappe/database/postgres/schema.py | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/frappe/database/mariadb/schema.py b/frappe/database/mariadb/schema.py
index d5a1096ba4..07bb4d5d7c 100644
--- a/frappe/database/mariadb/schema.py
+++ b/frappe/database/mariadb/schema.py
@@ -67,6 +67,7 @@ class MariaDBTable(DBTable):
 				current_column = self.current_columns.get(col.fieldname.lower())
 				unique_constraint_changed = current_column.unique != col.unique
 				if unique_constraint_changed and not col.unique:
+					# nosemgrep
 					unique_index_record = frappe.db.sql("""
 						SHOW INDEX FROM `{0}`
 						WHERE Key_name=%s
@@ -77,6 +78,7 @@ class MariaDBTable(DBTable):
 				index_constraint_changed = current_column.index != col.set_index
 				# if index key exists
 				if index_constraint_changed and not col.set_index:
+					# nosemgrep
 					index_record = frappe.db.sql("""
 						SHOW INDEX FROM `{0}`
 						WHERE Key_name=%s
diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py
index 99e64ce08d..a2d5be0b70 100644
--- a/frappe/database/postgres/schema.py
+++ b/frappe/database/postgres/schema.py
@@ -42,6 +42,7 @@ class PostgresTable(DBTable):
 					field=col.fieldname
 				)
 		if create_index_query:
+			# nosemgrep
 			frappe.db.sql(create_index_query)
 
 	def alter(self):
@@ -118,10 +119,13 @@ class PostgresTable(DBTable):
 		try:
 			if query:
 				final_alter_query = "ALTER TABLE `{}` {}".format(self.table_name, ", ".join(query))
+				# nosemgrep
 				frappe.db.sql(final_alter_query)
 			if create_contraint_query:
+				# nosemgrep
 				frappe.db.sql(create_contraint_query)
 			if drop_contraint_query:
+				# nosemgrep
 				frappe.db.sql(drop_contraint_query)
 		except Exception as e:
 			# sanitize

From e58c557e12b31d1944b8cc3847280570d8af3744 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Mon, 24 Jan 2022 11:10:03 +0530
Subject: [PATCH 90/97] fix: correctly compute doctype name from table name

---
 frappe/cache_manager.py  | 2 +-
 frappe/commands/site.py  | 4 ++--
 frappe/database/query.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py
index 0df8878da4..94a845639b 100644
--- a/frappe/cache_manager.py
+++ b/frappe/cache_manager.py
@@ -148,7 +148,7 @@ def build_table_count_cache():
 	data = (
 		frappe.qb.from_(information_schema.tables).select(table_name, table_rows)
 	).run(as_dict=True)
-	counts = {d.get('name').lstrip('tab'): d.get('count', None) for d in data}
+	counts = {d.get('name').replace('tab', '', 1): d.get('count', None) for d in data}
 	_cache.set_value("information_schema:counts", counts)
 
 	return counts
diff --git a/frappe/commands/site.py b/frappe/commands/site.py
index 677325e02d..62488525b0 100755
--- a/frappe/commands/site.py
+++ b/frappe/commands/site.py
@@ -952,7 +952,7 @@ def trim_database(context, dry_run, format, no_backup):
 		doctype_tables = frappe.get_all("DocType", pluck="name")
 
 		for x in database_tables:
-			doctype = x.lstrip("tab")
+			doctype = x.replace("tab", "", 1)
 			if not (doctype in doctype_tables or x.startswith("__") or x in STANDARD_TABLES):
 				TABLES_TO_DROP.append(x)
 
@@ -966,7 +966,7 @@ def trim_database(context, dry_run, format, no_backup):
 
 				odb = scheduled_backup(
 					ignore_conf=False,
-					include_doctypes=",".join(x.lstrip("tab") for x in TABLES_TO_DROP),
+					include_doctypes=",".join(x.replace("tab", "", 1) for x in TABLES_TO_DROP),
 					ignore_files=True,
 					force=True,
 				)
diff --git a/frappe/database/query.py b/frappe/database/query.py
index 6d2be5fa25..587378b32f 100644
--- a/frappe/database/query.py
+++ b/frappe/database/query.py
@@ -308,7 +308,7 @@ class Permission:
 			doctype = [doctype]
 
 		for dt in doctype:
-			dt = re.sub("tab", "", dt)
+			dt = re.sub("^tab", "", dt)
 			if not frappe.has_permission(
 				dt,
 				"select",

From 30b3c9caeffcef1dbfd7259023c7b06a46f46eea Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 24 Jan 2022 13:48:17 +0530
Subject: [PATCH 91/97] fix: remove extra padding

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

diff --git a/frappe/public/scss/website/web_form.scss b/frappe/public/scss/website/web_form.scss
index cb79f88266..8f55bf8104 100644
--- a/frappe/public/scss/website/web_form.scss
+++ b/frappe/public/scss/website/web_form.scss
@@ -6,7 +6,7 @@
 		
 		.breadcrumb-container.container {
 			@include media-breakpoint-up(sm) {
-				padding-left: var(--padding-sm);
+				padding-left: 0;
 			}
 		}
 

From a569b3e37f97e2d47c04c3a3cb401e301e5d3b05 Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 24 Jan 2022 13:48:41 +0530
Subject: [PATCH 92/97] fix: remove global bg color

---
 frappe/public/scss/website/index.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss
index 69a7b205c4..8259669195 100644
--- a/frappe/public/scss/website/index.scss
+++ b/frappe/public/scss/website/index.scss
@@ -30,12 +30,6 @@
 @import 'my_account';
 
 
-body {
-	@include media-breakpoint-up(sm) {
-		background-color: var(--bg-color);
-	}
-}
-
 .ql-editor.read-mode {
 	padding: 0;
 	line-height: 1.6;

From 294810b5b1c107bedbd8861db45e4fe2a99b488b Mon Sep 17 00:00:00 2001
From: Summayya <frappe@Summayyas-MacBook-Air.local>
Date: Mon, 24 Jan 2022 13:49:22 +0530
Subject: [PATCH 93/97] refactor: add bg color for profile webform

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

diff --git a/frappe/public/scss/website/my_account.scss b/frappe/public/scss/website/my_account.scss
index bdc52588aa..22b29cc3ec 100644
--- a/frappe/public/scss/website/my_account.scss
+++ b/frappe/public/scss/website/my_account.scss
@@ -1,7 +1,8 @@
 //styles for my account and edit-profile page
 @include media-breakpoint-up(sm) {
 	body[data-path="me"],
-	body[data-path="list"] {
+	body[data-path="list"],
+	body[data-path="update-profile"] {
 		background-color: var(--bg-color);
 	}
 }

From 632b19da28169f3930c3daf8b92dca60578c011c Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Date: Mon, 24 Jan 2022 12:24:33 +0100
Subject: [PATCH 94/97] fix(translation): Update de.csv (#15697)

---
 frappe/translations/de.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv
index 1dc542f55d..f17ceb63cb 100644
--- a/frappe/translations/de.csv
+++ b/frappe/translations/de.csv
@@ -1393,6 +1393,7 @@ Is Spam,ist Spam,
 Is Standard,Ist Standard,
 Is Submittable,Ist übertragbar,
 Is Table,ist eine Tabelle,
+Is Template, Ist Vorlage,
 Is Your Company Address,Ist Ihre Unternehmensadresse,
 It is risky to delete this file: {0}. Please contact your System Manager.,"Es ist riskant, diese Datei zu löschen: {0}. Bitte kontaktieren Sie Ihren System-Manager.",
 Item cannot be added to its own descendents,Artikel kann nicht zu seinen eigenen Abkömmlingen hinzugefügt werden,

From 5d2d9f6a25b0618a8a2dc6dac85fc282bf670544 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jan 2022 16:55:38 +0530
Subject: [PATCH 95/97] build(deps): bump nanoid from 3.1.22 to 3.2.0 (#15685)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a2fb689c7d..18a8610a2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2774,15 +2774,10 @@ nan@^2.13.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
   integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
 
-nanoid@^3.1.22:
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
-  integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
-
-nanoid@^3.1.23:
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
-  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+nanoid@^3.1.22, nanoid@^3.1.23:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
 native-request@^1.0.5:
   version "1.0.8"

From 1b6f94dfe63133a62b7db06cd99227d6943c0b04 Mon Sep 17 00:00:00 2001
From: phot0n <ritwikpuri5678@gmail.com>
Date: Mon, 24 Jan 2022 21:18:48 +0530
Subject: [PATCH 96/97] fix: permissions for payment gateway doctype

---
 .../payment_gateway/payment_gateway.json      | 191 +++++-------------
 1 file changed, 47 insertions(+), 144 deletions(-)

diff --git a/frappe/core/doctype/payment_gateway/payment_gateway.json b/frappe/core/doctype/payment_gateway/payment_gateway.json
index b97d72c771..f548b0dffb 100644
--- a/frappe/core/doctype/payment_gateway/payment_gateway.json
+++ b/frappe/core/doctype/payment_gateway/payment_gateway.json
@@ -1,154 +1,57 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:gateway", 
- "beta": 0, 
- "creation": "2015-12-15 22:26:45.221162", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "field:gateway",
+ "creation": "2022-01-24 21:09:47.229371",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "gateway",
+  "gateway_settings",
+  "gateway_controller"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gateway", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Gateway", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "gateway",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Gateway",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gateway_settings", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Gateway Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "gateway_settings",
+   "fieldtype": "Link",
+   "label": "Gateway Settings",
+   "options": "DocType",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "gateway_controller", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Gateway Controller", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "gateway_settings", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "gateway_controller",
+   "fieldtype": "Dynamic Link",
+   "label": "Gateway Controller",
+   "options": "gateway_settings",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 1, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-02-05 14:24:33.526645", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "Payment Gateway", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2022-01-24 21:17:03.864719",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Payment Gateway",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "create": 1,
+   "delete": 1,
+   "read": 1,
+   "role": "System Manager",
+   "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file

From b550096161006b17890e430705ca2f779f08662d Mon Sep 17 00:00:00 2001
From: hrwx <himanshuwarekar@yahoo.com>
Date: Mon, 24 Jan 2022 20:51:55 +0000
Subject: [PATCH 97/97] feat: time field in webform

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

diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json
index 2770f03e80..94a8851739 100644
--- a/frappe/website/doctype/web_form_field/web_form_field.json
+++ b/frappe/website/doctype/web_form_field/web_form_field.json
@@ -39,7 +39,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Fieldtype",
-   "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nDuration\nFloat\nHTML\nInt\nLink\nPassword\nRating\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break"
+   "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nDuration\nFloat\nHTML\nInt\nLink\nPassword\nRating\nSelect\nSmall Text\nText\nText Editor\nTable\nTime\nSection Break\nColumn Break"
   },
   {
    "fieldname": "label",
@@ -146,7 +146,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-04-30 12:02:25.422345",
+ "modified": "2022-01-24 20:43:25.422345",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Form Field",