From c822c54f558383f2f7c92a688d3db8b198aa2bb8 Mon Sep 17 00:00:00 2001
From: hasnain2808 <hasnain2808@gmail.com>
Date: Wed, 12 May 2021 17:03:25 +0530
Subject: [PATCH 01/22] fix: allow updating naming series

---
 .../document_naming_rule.js                   | 41 +++++++++++++++++++
 .../document_naming_rule.py                   |  5 +++
 2 files changed, 46 insertions(+)

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 56b5c2fdf4..dcb60cd7d5 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,6 +4,7 @@
 frappe.ui.form.on('Document Naming Rule', {
 	refresh: function(frm) {
 		frm.trigger('document_type');
+		frm.trigger("add_button")
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames
@@ -20,5 +21,45 @@ frappe.ui.form.on('Document Naming Rule', {
 				);
 			});
 		}
+	},
+	add_button: (frm) => {
+		frm.add_custom_button(__('Update Counter'), function() {
+
+			const fields = [{
+				fieldtype: 'Data',
+				fieldname: 'new_counter',
+				label: __('New Counter'),
+				default: frm.doc.counter,
+				reqd: 1,
+				description: __('This will update the counter and will affect all documents that will be created')
+			}]
+
+			let primary_action_label = __('Save');
+
+			let primary_action = (fields) => {
+				debugger
+				frappe.call({
+					method: 'frappe.core.doctype.document_naming_rule.document_naming_rule.update_current',
+					args: {
+						name: frm.doc.name,
+						new_counter: fields.new_counter
+					},
+					callback: function() {
+						frm.set_value("counter",  fields.new_counter)
+						dialog.hide()
+					}
+				})
+			};
+
+			var dialog = new frappe.ui.Dialog({
+				title: __('Update Counter Value for Prefix: ' + frm.doc.prefix),
+				fields,
+				primary_action_label,
+				primary_action
+			});
+
+			dialog.show()
+
+		});
 	}
 });
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 4b34293af6..13d54dffdd 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -30,3 +30,8 @@ class DocumentNamingRule(Document):
 		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)
 		frappe.db.set_value(self.doctype, self.name, 'counter', counter + 1)
+
+@frappe.whitelist()
+def update_current(name, new_counter):
+	frappe.db.set_value('Document Naming Rule', name, 'counter', new_counter)
+	frappe.db.commit()

From c246c82a85d8a83fc71193905bf75febef89634a Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Wed, 12 May 2021 17:10:35 +0530
Subject: [PATCH 02/22] fix: remove debugger

---
 frappe/core/doctype/document_naming_rule/document_naming_rule.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index dcb60cd7d5..5d1540588d 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -37,7 +37,6 @@ frappe.ui.form.on('Document Naming Rule', {
 			let primary_action_label = __('Save');
 
 			let primary_action = (fields) => {
-				debugger
 				frappe.call({
 					method: 'frappe.core.doctype.document_naming_rule.document_naming_rule.update_current',
 					args: {

From bb4be327511eb7f736282fee6eaf5ee6d88ebc7a Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Wed, 12 May 2021 17:15:18 +0530
Subject: [PATCH 03/22] chore: add semicolons

---
 .../document_naming_rule/document_naming_rule.js     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 5d1540588d..e837ca2d6c 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Document Naming Rule', {
 	refresh: function(frm) {
 		frm.trigger('document_type');
-		frm.trigger("add_button")
+		frm.trigger("add_button");
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames
@@ -32,7 +32,7 @@ frappe.ui.form.on('Document Naming Rule', {
 				default: frm.doc.counter,
 				reqd: 1,
 				description: __('This will update the counter and will affect all documents that will be created')
-			}]
+			}];
 
 			let primary_action_label = __('Save');
 
@@ -44,10 +44,10 @@ frappe.ui.form.on('Document Naming Rule', {
 						new_counter: fields.new_counter
 					},
 					callback: function() {
-						frm.set_value("counter",  fields.new_counter)
-						dialog.hide()
+						frm.set_value("counter",  fields.new_counter);
+						dialog.hide();
 					}
-				})
+				});
 			};
 
 			var dialog = new frappe.ui.Dialog({
@@ -57,7 +57,7 @@ frappe.ui.form.on('Document Naming Rule', {
 				primary_action
 			});
 
-			dialog.show()
+			dialog.show();
 
 		});
 	}

From ed1a9e15591b7e8d4e1053fd97e528bbfb9cc43d Mon Sep 17 00:00:00 2001
From: hasnain2808 <hasnain2808@gmail.com>
Date: Thu, 13 May 2021 09:55:27 +0530
Subject: [PATCH 04/22] fix: do not show counter on unsaved forms

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index e837ca2d6c..23a22ee33c 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Document Naming Rule', {
 	refresh: function(frm) {
 		frm.trigger('document_type');
-		frm.trigger("add_button");
+		if(!frm.doc.__islocal) frm.trigger("add_button");
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames

From 90f786b0e5641f8c03b7e7e33988c82412aa4d4b Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 13 May 2021 09:57:10 +0530
Subject: [PATCH 05/22] chore: spaces

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 23a22ee33c..7dbf533975 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Document Naming Rule', {
 	refresh: function(frm) {
 		frm.trigger('document_type');
-		if(!frm.doc.__islocal) frm.trigger("add_button");
+		if (!frm.doc.__islocal) frm.trigger("add_button");
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames

From 2e1c4650baf004c2a0e756d388bd4389c9335853 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 13 May 2021 19:54:56 +0530
Subject: [PATCH 06/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 7dbf533975..5e77e71820 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -51,7 +51,7 @@ frappe.ui.form.on('Document Naming Rule', {
 			};
 
 			var dialog = new frappe.ui.Dialog({
-				title: __('Update Counter Value for Prefix: ' + frm.doc.prefix),
+				title: __('Update Counter Value for Prefix: {0}', [frm.doc.prefix]),
 				fields,
 				primary_action_label,
 				primary_action

From c551338c0d7a665730ba845ccda5b4f09107301e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 18 May 2021 15:41:31 +0530
Subject: [PATCH 07/22] fix: ensure website theme is applied correctly

---
 frappe/public/scss/website/css_variables.scss         |  2 ++
 frappe/public/scss/website/sidebar.scss               |  6 +++---
 .../doctype/website_theme/website_theme_template.scss | 11 +++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/frappe/public/scss/website/css_variables.scss b/frappe/public/scss/website/css_variables.scss
index 2aeb842802..463a0db49e 100644
--- a/frappe/public/scss/website/css_variables.scss
+++ b/frappe/public/scss/website/css_variables.scss
@@ -28,4 +28,6 @@
 	--font-size-4xl: #{$font-size-4xl};
 	--font-size-5xl: #{$font-size-5xl};
 	--font-size-6xl: #{$font-size-6xl};
+
+	--card-border-radius: #{$card-border-radius};
 }
diff --git a/frappe/public/scss/website/sidebar.scss b/frappe/public/scss/website/sidebar.scss
index b13eaf2a74..76956c9136 100644
--- a/frappe/public/scss/website/sidebar.scss
+++ b/frappe/public/scss/website/sidebar.scss
@@ -10,7 +10,7 @@
 	margin-top: 0.25rem;
 	border-radius: 0.375rem;
 	font-size: $font-size-sm;
-	color: $gray-600;
+	color: var(--text-color);
 	text-decoration: none;
 	font-weight: 500;
 	@include transition();
@@ -26,8 +26,8 @@
 }
 
 .sidebar-item a.active {
-	color: $primary;
-	background-color: $primary-light;
+	color: var(--primary);
+	background-color: var(--primary-light);
 }
 
 .sidebar-item-icon {
diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss
index fbd640690b..2a67baf541 100644
--- a/frappe/website/doctype/website_theme/website_theme_template.scss
+++ b/frappe/website/doctype/website_theme/website_theme_template.scss
@@ -30,3 +30,14 @@ body {
 
 // Custom Theme
 {{ custom_scss or '' }}
+
+:root {
+	--primary: #{$primary};
+	--primary-color: #{$primary};
+	--primary-light: #{$primary-light};
+	--light: #{$light};
+	--bg-color: #{$body-bg};
+	--text-color: #{$body-color};
+	--text-light: #{$body-color};
+}
+

From a74352cfad16c3ba3650087c7403aaee7431bae1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 18 May 2021 16:19:25 +0530
Subject: [PATCH 08/22] fix: button colors

---
 frappe/public/scss/common/buttons.scss | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/public/scss/common/buttons.scss b/frappe/public/scss/common/buttons.scss
index 591dc5bba6..de3a4cfc20 100644
--- a/frappe/public/scss/common/buttons.scss
+++ b/frappe/public/scss/common/buttons.scss
@@ -48,13 +48,13 @@
 		$active-border: darken($primary-light, 12.5%)
 	);
 
-	color: var(--blue-500);
+	color: var(--primary);
 	&:hover, &:active {
-		color: var(--blue-500);
+		color: var(--primary);
 	}
 
 	&:focus {
-		box-shadow: 0 0 0 0.2rem var(--blue-50)
+		box-shadow: 0 0 0 0.2rem var(--primary-light);
 	}
 }
 
@@ -77,11 +77,11 @@
 }
 
 .btn.btn-primary {
-	background-color: var(--primary-color);
+	background-color: var(--primary);
 	color: var(--white);
 	white-space: nowrap;
 	--icon-stroke: currentColor;
-	--icon-fill-bg: var(--primary-color);
+	--icon-fill-bg: var(--primary);
 }
 
 .btn.btn-danger {

From 969e2b6db95d1c865730776921e853cdeb0284ef Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 20 May 2021 20:04:40 +0530
Subject: [PATCH 09/22] fix: allow only system manager

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

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 13d54dffdd..7fa7c73efd 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -33,5 +33,6 @@ class DocumentNamingRule(Document):
 
 @frappe.whitelist()
 def update_current(name, new_counter):
+	frappe.only_for('System Manager')
 	frappe.db.set_value('Document Naming Rule', name, 'counter', new_counter)
 	frappe.db.commit()

From 730bcc8c035bc5aec5173f1feb0b06a2e5c664de Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 20 May 2021 20:05:00 +0530
Subject: [PATCH 10/22] fix: do not explicitly commit

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/core/doctype/document_naming_rule/document_naming_rule.py | 1 -
 1 file changed, 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 7fa7c73efd..653c056caa 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.py
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.py
@@ -35,4 +35,3 @@ class DocumentNamingRule(Document):
 def update_current(name, new_counter):
 	frappe.only_for('System Manager')
 	frappe.db.set_value('Document Naming Rule', name, 'counter', new_counter)
-	frappe.db.commit()

From e16988b887d129c13fe30f9d67e27ff0fad93a82 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Thu, 20 May 2021 20:05:58 +0530
Subject: [PATCH 11/22] chore: change description

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 5e77e71820..f4b7428aff 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -31,7 +31,7 @@ frappe.ui.form.on('Document Naming Rule', {
 				label: __('New Counter'),
 				default: frm.doc.counter,
 				reqd: 1,
-				description: __('This will update the counter and will affect all documents that will be created')
+				description: __('Updating counter may lead to document name conflicts if not done properly')
 			}];
 
 			let primary_action_label = __('Save');

From c9dc4ee441eae931b0d1918ba18fd0ce81df5967 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Fri, 21 May 2021 11:38:36 +0530
Subject: [PATCH 12/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index f4b7428aff..cd85615f5f 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -31,7 +31,7 @@ frappe.ui.form.on('Document Naming Rule', {
 				label: __('New Counter'),
 				default: frm.doc.counter,
 				reqd: 1,
-				description: __('Updating counter may lead to document name conflicts if not done properly')
+				description: __('Warning: Updating counter may lead to document name conflicts if not done properly')
 			}];
 
 			let primary_action_label = __('Save');

From bcb4c5182ffdb9d7d70b239d8ee6b222ece63f0e Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Fri, 21 May 2021 11:38:43 +0530
Subject: [PATCH 13/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index cd85615f5f..b1123cba28 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -50,7 +50,7 @@ frappe.ui.form.on('Document Naming Rule', {
 				});
 			};
 
-			var dialog = new frappe.ui.Dialog({
+			const dialog = new frappe.ui.Dialog({
 				title: __('Update Counter Value for Prefix: {0}', [frm.doc.prefix]),
 				fields,
 				primary_action_label,

From 3f056d147dea656dd531c7e794da05a513aa44f7 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Fri, 21 May 2021 11:38:49 +0530
Subject: [PATCH 14/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index b1123cba28..3aea9e04a7 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Document Naming Rule', {
 	refresh: function(frm) {
 		frm.trigger('document_type');
-		if (!frm.doc.__islocal) frm.trigger("add_button");
+		if (!frm.doc.__islocal) frm.trigger("add_update_counter_button");
 	},
 	document_type: (frm) => {
 		// update the select field options with fieldnames

From fa53c47e58cf7f8c85bd1ba13ad6973ec998b2d0 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Fri, 21 May 2021 11:38:57 +0530
Subject: [PATCH 15/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 3aea9e04a7..0f0bdd149c 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -22,7 +22,7 @@ frappe.ui.form.on('Document Naming Rule', {
 			});
 		}
 	},
-	add_button: (frm) => {
+	add_update_counter_button: (frm) => {
 		frm.add_custom_button(__('Update Counter'), function() {
 
 			const fields = [{

From 58400d6214ec61ff9733a4caf46bad18dff71880 Mon Sep 17 00:00:00 2001
From: Mohammad Hasnain Mohsin Rajan <hasnain2808@gmail.com>
Date: Fri, 21 May 2021 14:15:14 +0530
Subject: [PATCH 16/22] Update
 frappe/core/doctype/document_naming_rule/document_naming_rule.js

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

diff --git a/frappe/core/doctype/document_naming_rule/document_naming_rule.js b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
index 0f0bdd149c..097a4e9a6e 100644
--- a/frappe/core/doctype/document_naming_rule/document_naming_rule.js
+++ b/frappe/core/doctype/document_naming_rule/document_naming_rule.js
@@ -44,7 +44,7 @@ frappe.ui.form.on('Document Naming Rule', {
 						new_counter: fields.new_counter
 					},
 					callback: function() {
-						frm.set_value("counter",  fields.new_counter);
+						frm.set_value("counter", fields.new_counter);
 						dialog.hide();
 					}
 				});

From 71632073ecbb88996ce355a353715eba02b50304 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 26 May 2021 15:45:02 +0530
Subject: [PATCH 17/22] chore: Fix status badge link

---
 README.md | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e00bea7857..11343a632a 100644
--- a/README.md
+++ b/README.md
@@ -14,18 +14,21 @@
 </div>
 
 <div align="center">
-    <a href="https://github.com/frappe/frappe/actions/workflows/ci-tests.yml">
-        <img src="https://github.com/frappe/frappe/actions/workflows/ci-tests.yml/badge.svg?branch=develop">
-    </a>
-    <a href='https://frappeframework.com/docs'>
-        <img src='https://img.shields.io/badge/docs-📖-7575FF.svg?style=flat-square'/>
-    </a>
+	<a href="https://github.com/frappe/frappe/actions/workflows/server-mariadb-tests.yml">
+		<img src="https://github.com/frappe/frappe/actions/workflows/server-mariadb-tests.yml/badge.svg">
+	</a>
+	<a href="https://github.com/frappe/frappe/actions/workflows/ui-tests.yml">
+		<img src="https://github.com/frappe/frappe/actions/workflows/ui-tests.yml/badge.svg?branch=develop">
+	</a>
+	<a href='https://frappeframework.com/docs'>
+		<img src='https://img.shields.io/badge/docs-📖-7575FF.svg?style=flat-square'/>
+	</a>
 	<a href='https://www.codetriage.com/frappe/frappe'>
 		<img src='https://www.codetriage.com/frappe/frappe/badges/users.svg'>
 	</a>
-    <a href='https://coveralls.io/github/frappe/frappe?branch=develop'>
-        <img src='https://coveralls.io/repos/github/frappe/frappe/badge.svg?branch=develop'>
-    </a>
+	<a href='https://coveralls.io/github/frappe/frappe?branch=develop'>
+		<img src='https://coveralls.io/repos/github/frappe/frappe/badge.svg?branch=develop'>
+	</a>
 </div>
 
 

From ab9b6bf36ec142fe4fc3bb47b46c9455fb4fa8b1 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 26 May 2021 15:46:41 +0530
Subject: [PATCH 18/22] ci: Run ui tests after PR merge for status badge

---
 .github/workflows/ui-tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
index d9ccb07da0..f2f43f10f8 100644
--- a/.github/workflows/ui-tests.yml
+++ b/.github/workflows/ui-tests.yml
@@ -3,6 +3,8 @@ name: UI
 on:
   pull_request:
   workflow_dispatch:
+  push:
+    branches: [ develop ]
 
 jobs:
   test:

From 2ccea73aa28af560ebc7eae31c9f49e0a891937f Mon Sep 17 00:00:00 2001
From: Krishna Kant Hati <krishnakanthati@outlook.com>
Date: Thu, 27 May 2021 01:52:28 +0530
Subject: [PATCH 19/22] fix: tooltip displays correct title

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

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 43bd7443ab..af92f3b7a9 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -200,10 +200,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 						if(frappe.model.can_create(doctype)) {
 							// new item
 							r.results.push({
-								label: "<span class='text-primary link-option'>"
+								html: "<span class='text-primary link-option'>"
 									+ "<i class='fa fa-plus' style='margin-right: 5px;'></i> "
 									+ __("Create a new {0}", [__(me.get_options())])
 									+ "</span>",
+								label: __("Create a new {0}", [__(me.get_options())]),
 								value: "create_new__link_option",
 								action: me.new_doc
 							});
@@ -213,10 +214,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 						if (locals && locals['DocType']) {
 							// not applicable in web forms
 							r.results.push({
-								label: "<span class='text-primary link-option'>"
+								html: "<span class='text-primary link-option'>"
 									+ "<i class='fa fa-search' style='margin-right: 5px;'></i> "
 									+ __("Advanced Search")
 									+ "</span>",
+								label: __("Advanced Search"),
 								value: "advanced_search__link_option",
 								action: me.open_advanced_search
 							});

From 23406d031a7b6f849424f12203cf20537d94ff2e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 27 May 2021 11:50:56 +0530
Subject: [PATCH 20/22] fix: Store assets.json directly in assets folder

assets.json stores assets of all apps, so doesn't make sense to put it in frappe folder
---
 esbuild/esbuild.js       | 7 +------
 frappe/build.py          | 2 +-
 frappe/utils/__init__.py | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js
index ecf0d49511..5154adb634 100644
--- a/esbuild/esbuild.js
+++ b/esbuild/esbuild.js
@@ -343,12 +343,7 @@ async function write_assets_json(metafile) {
 		}
 	}
 
-	let assets_json_path = path.resolve(
-		assets_path,
-		"frappe",
-		"dist",
-		"assets.json"
-	);
+	let assets_json_path = path.resolve(assets_path, "assets.json");
 	let assets_json;
 	try {
 		assets_json = await fs.promises.readFile(assets_json_path, "utf-8");
diff --git a/frappe/build.py b/frappe/build.py
index c970ae3a28..1df42ca2e6 100644
--- a/frappe/build.py
+++ b/frappe/build.py
@@ -50,7 +50,7 @@ def build_missing_files():
 	development = frappe.local.conf.developer_mode or frappe.local.dev_server
 	build_mode = "development" if development else "production"
 
-	assets_json = frappe.read_file(frappe.get_app_path('frappe', 'public', 'dist', 'assets.json'))
+	assets_json = frappe.read_file("assets/assets.json")
 	if assets_json:
 		assets_json = frappe.parse_json(assets_json)
 
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 436dcba028..1470616ca9 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -809,7 +809,7 @@ def get_assets_json():
 			assets_json = None
 
 		if not assets_json:
-			assets_json = frappe.read_file("assets/frappe/dist/assets.json")
+			assets_json = frappe.read_file("assets/assets.json")
 			cache.set_value("assets_json", assets_json, shared=True)
 		frappe.local.assets_json = frappe.safe_decode(assets_json)
 

From 38efba692db8461df920bff5102b5ed9ab0b5b31 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 28 May 2021 08:44:41 +0530
Subject: [PATCH 21/22] fix: Conditionally set css variables

---
 .../website_theme/website_theme_template.scss | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss
index 2a67baf541..34cd66a4fe 100644
--- a/frappe/website/doctype/website_theme/website_theme_template.scss
+++ b/frappe/website/doctype/website_theme/website_theme_template.scss
@@ -1,13 +1,13 @@
 {% if google_font %}
 @import url("https://fonts.googleapis.com/css2?family={{ google_font.replace(' ', '+') }}:{{ font_properties }}&display=swap");
 $font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont,
-    "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
-    "Droid Sans", "Helvetica Neue", sans-serif;
+	"Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans",
+	"Droid Sans", "Helvetica Neue", sans-serif;
 {% endif -%}
 
 {% if primary_color %}$primary: {{ frappe.db.get_value('Color', primary_color, 'color') }};{% endif -%}
 {% if dark_color %}$dark: {{ frappe.db.get_value('Color', dark_color, 'color') }};{% endif -%}
-{% if text_color %}$body-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif -%}
+{% if text_color %}$body-text-color: {{ frappe.db.get_value('Color', text_color, 'color') }};{% endif -%}
 {% if background_color %}$body-bg: {{ frappe.db.get_value('Color', background_color, 'color') }};{% endif -%}
 
 $enable-shadows: {{ button_shadows and "true" or "false" }};
@@ -24,7 +24,7 @@ $enable-rounded: {{ button_rounded_corners and "true" or "false" }};
 
 {% if font_size -%}
 body {
-    font-size: {{ font_size }};
+	font-size: {{ font_size }};
 }
 {%- endif %}
 
@@ -32,12 +32,16 @@ body {
 {{ custom_scss or '' }}
 
 :root {
+	{% if primary_color %}
 	--primary: #{$primary};
 	--primary-color: #{$primary};
-	--primary-light: #{$primary-light};
-	--light: #{$light};
+	{% endif -%}
+	{% if background_color %}
 	--bg-color: #{$body-bg};
-	--text-color: #{$body-color};
-	--text-light: #{$body-color};
+	{% endif -%}
+	{% if text_color %}
+	--text-color: #{$body-text-color};
+	--text-light: #{$body-text-color};
+	{% endif -%}
 }
 

From a4402868774af0ac1721fd48520cd12c158e0eb7 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 28 May 2021 09:14:27 +0530
Subject: [PATCH 22/22] fix: check if salutation already exists in email body
 (backport #13196) (#13358)

---
 frappe/public/js/frappe/views/communication.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index f65f1a83c2..e2aaec553d 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -724,9 +724,14 @@ frappe.views.CommunicationComposer = class {
 		}
 
 		message += await this.get_signature();
-		if (this.real_name && !message.includes("<!-- salutation-ends -->")) {
-			message = `<p>${__('Dear')} ${this.real_name},</p>
-				<!-- salutation-ends --><br>${message}`;
+
+		const SALUTATION_END_COMMENT = "<!-- salutation-ends -->";
+		if (this.real_name && !message.includes(SALUTATION_END_COMMENT)) {
+			this.message = `
+				<p>${__('Dear')} ${this.real_name},</p>
+				${SALUTATION_END_COMMENT}<br>
+				${message}
+			`;
 		}
 
 		if (this.is_a_reply) {