From 3fd60b70eeec03b29d426407a3202d111bef7658 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 18 Aug 2021 11:42:44 +0530
Subject: [PATCH 1/9] fix: Length change for docfield not updated in Database

---
 frappe/custom/doctype/customize_form/customize_form.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 8de194fb00..94f25a41aa 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -193,6 +193,16 @@ class CustomizeForm(Document):
 		if prop == "fieldtype":
 			self.validate_fieldtype_change(df, meta_df[0].get(prop), df.get(prop))
 
+		elif prop == "length":
+			old_value_length = cint(meta_df[0].get(prop))
+			new_value_length = cint(df.get(prop))
+
+			if new_value_length and (old_value_length > new_value_length):
+				self.check_length_for_fieldtypes.append({'df': df, 'old_value': meta_df[0].get(prop)})
+				self.validate_fieldtype_length()
+			else:
+				self.flags.update_db = True
+
 		elif prop == "allow_on_submit" and df.get(prop):
 			if not frappe.db.get_value("DocField",
 				{"parent": self.doc_type, "fieldname": df.fieldname}, "allow_on_submit"):

From cd9b07b3bbdb80c27370301f9f786c537a9ff646 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Sat, 21 Aug 2021 19:07:44 +0530
Subject: [PATCH 2/9] test: Add test case for docfield length property update

---
 .../doctype/customize_form/test_customize_form.py   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py
index aef95cd676..6783e52d68 100644
--- a/frappe/custom/doctype/customize_form/test_customize_form.py
+++ b/frappe/custom/doctype/customize_form/test_customize_form.py
@@ -188,6 +188,19 @@ class TestCustomizeForm(unittest.TestCase):
 	def test_core_doctype_customization(self):
 		self.assertRaises(frappe.ValidationError, self.get_customize_form, 'User')
 
+	def test_save_customization_length_field_property(self):
+		# Using Notification Log doctype as it doesn't have any other custom fields
+		d = self.get_customize_form("Notification Log")
+
+		document_name = d.get("fields", {"fieldname": "document_name"})[0]
+		document_name.length = 255
+		d.run_method("save_customization")
+
+		self.assertEqual(frappe.db.get_value("Property Setter",
+			{"doc_type": "Notification Log", "property": "length", "field_name": "document_name"}, "value"), '255')
+
+		self.assertTrue(d.flags.update_db)
+
 	def test_custom_link(self):
 		try:
 			# create a dummy doctype linked to Event

From 863b462bbd4c0d9afb037610d7a5537bf51939b6 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 26 Aug 2021 10:58:59 +0530
Subject: [PATCH 3/9] fix: Pass get_query to link selector to get filtered list

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

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 05c70b214d..dd1d622bab 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -786,6 +786,7 @@ export default class Grid {
 				doctype: link_field.options,
 				fieldname: link,
 				qty_fieldname: qty,
+				get_query: link_field.get_query,
 				target: this,
 				txt: ""
 			});

From 8eb7f0f71915a071fbf560dee183ce06a94e0f4a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 26 Aug 2021 10:59:47 +0530
Subject: [PATCH 4/9] fix: Call search after value is set to get latest
 filtered results

---
 frappe/public/js/frappe/form/link_selector.js | 97 ++++++++++---------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/frappe/public/js/frappe/form/link_selector.js b/frappe/public/js/frappe/form/link_selector.js
index b8f1b3a842..3ae03dbe91 100644
--- a/frappe/public/js/frappe/form/link_selector.js
+++ b/frappe/public/js/frappe/form/link_selector.js
@@ -96,10 +96,10 @@ frappe.ui.form.LinkSelector = class LinkSelector {
 						.attr('data-value', v[0])
 						.click(function () {
 							var value = $(this).attr("data-value");
-							var $link = this;
 							if (me.target.is_grid) {
 								// set in grid
-								me.set_in_grid(value);
+								// call search after value is set to get latest filtered results
+								me.set_in_grid(value).then(() => me.search());
 							} else {
 								if (me.target.doctype)
 									me.target.parse_validate_and_set_in_model(value);
@@ -110,8 +110,8 @@ frappe.ui.form.LinkSelector = class LinkSelector {
 								me.dialog.hide();
 							}
 							return false;
-						})
-				})
+						});
+				});
 			} else {
 				$('<p><br><span class="text-muted">' + __("No Results") + '</span>'
 					+ (frappe.model.can_create(me.doctype) ?
@@ -130,49 +130,56 @@ frappe.ui.form.LinkSelector = class LinkSelector {
 		}, this.dialog.get_primary_btn());
 
 	}
-	set_in_grid (value) {
-		var me = this, updated = false;
-		var d = null;
-		if (this.qty_fieldname) {
-			frappe.prompt({
-				fieldname: "qty", fieldtype: "Float", label: "Qty",
-				"default": 1, reqd: 1
-			}, function (data) {
-				$.each(me.target.frm.doc[me.target.df.fieldname] || [], function (i, d) {
-					if (d[me.fieldname] === value) {
-						frappe.model.set_value(d.doctype, d.name, me.qty_fieldname, data.qty);
-						frappe.show_alert(__("Added {0} ({1})", [value, d[me.qty_fieldname]]));
-						updated = true;
-						return false;
+	set_in_grid(value) {
+		return new Promise((resolve) => {
+			if (this.qty_fieldname) {
+				frappe.prompt({
+					fieldname: "qty",
+					fieldtype: "Float",
+					label: "Qty",
+					default: 1,
+					reqd: 1
+				}, (data) => {
+					let updated = (this.target.frm.doc[this.target.df.fieldname] || []).some(d => {
+						if (d[this.fieldname] === value) {
+							frappe.model.set_value(d.doctype, d.name, this.qty_fieldname, data.qty).then(() => {
+								frappe.show_alert(__("Added {0} ({1})", [value, d[this.qty_fieldname]]));
+								resolve();
+							});
+							return true;
+						}
+					});
+					if (!updated) {
+						let d = null;
+						frappe.run_serially([
+							() => d = this.target.add_new_row(),
+							() => frappe.timeout(0.1),
+							() => {
+								let args = {};
+								args[this.fieldname] = value;
+								args[this.qty_fieldname] = data.qty;
+								return frappe.model.set_value(d.doctype, d.name, args);
+							},
+							() => frappe.show_alert(__("Added {0} ({1})", [value, data.qty])),
+							() => resolve()
+						]);
 					}
+				}, __("Set Quantity"), __("Set"));
+			} else if (this.dynamic_link_field) {
+				let d = this.target.add_new_row();
+				frappe.model.set_value(d.doctype, d.name, this.dynamic_link_field, this.dynamic_link_reference);
+				frappe.model.set_value(d.doctype, d.name, this.fieldname, value).then(() => {
+					frappe.show_alert(__("{0} {1} added", [this.dynamic_link_reference, value]));
+					resolve();
 				});
-				if (!updated) {
-					frappe.run_serially([
-						() => {
-							d = me.target.add_new_row();
-						},
-						() => frappe.timeout(0.1),
-						() => {
-							let args = {};
-							args[me.fieldname] = value;
-							args[me.qty_fieldname] = data.qty;
-
-							return frappe.model.set_value(d.doctype, d.name, args);
-						},
-						() => frappe.show_alert(__("Added {0} ({1})", [value, data.qty]))
-					]);
-				}
-			}, __("Set Quantity"), __("Set"));
-		} else if (me.dynamic_link_field) {
-			var d = me.target.add_new_row();
-			frappe.model.set_value(d.doctype, d.name, me.dynamic_link_field, me.dynamic_link_reference);
-			frappe.model.set_value(d.doctype, d.name, me.fieldname, value);
-			frappe.show_alert(__("{0} {1} added", [me.dynamic_link_reference, value]));
-		} else {
-			var d = me.target.add_new_row();
-			frappe.model.set_value(d.doctype, d.name, me.fieldname, value);
-			frappe.show_alert(__("{0} added", [value]));
-		}
+			} else {
+				let d = this.target.add_new_row();
+				frappe.model.set_value(d.doctype, d.name, this.fieldname, value).then(() => {
+					frappe.show_alert(__("{0} added", [value]));
+					resolve();
+				});
+			}
+		});
 	}
 };
 

From 783165c01e4bd0433814bd145a4960b92130100b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 30 Aug 2021 12:00:31 +0530
Subject: [PATCH 5/9] fix: Retry get_redis_conn until "sure"

If ConnectionError or BusyLoadingError occurs, try every second for
up-to 10 times.

Why: `bench start` exits just as i run it at times. This happens when
the worker's processes each try to fetch a redis conn but redis isnt up
yet. The 3 workeer processes exit with 1 and our procman gives up too.
---
 frappe/utils/background_jobs.py | 9 ++++++++-
 requirements.txt                | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py
index 567268f760..b8f3372540 100755
--- a/frappe/utils/background_jobs.py
+++ b/frappe/utils/background_jobs.py
@@ -3,12 +3,14 @@ import socket
 import time
 from uuid import uuid4
 from collections import defaultdict
+from typing import List
 
 
 import redis
-from typing import List
+from redis.exceptions import BusyLoadingError, ConnectionError
 from rq import Connection, Queue, Worker
 from rq.logutils import setup_loghandlers
+from tenacity import retry, retry_if_exception_type, stop_after_attempt, wait_fixed
 
 import frappe
 from frappe import _
@@ -233,6 +235,11 @@ def validate_queue(queue, default_queue_list=None):
 	if queue not in default_queue_list:
 		frappe.throw(_("Queue should be one of {0}").format(', '.join(default_queue_list)))
 
+@retry(
+	retry=retry_if_exception_type(BusyLoadingError) | retry_if_exception_type(ConnectionError),
+	stop=stop_after_attempt(10),
+	wait=wait_fixed(1)
+)
 def get_redis_conn(username=None, password=None):
 	if not hasattr(frappe.local, 'conf'):
 		raise Exception('You need to call frappe.init')
diff --git a/requirements.txt b/requirements.txt
index 51327953d5..be96520a02 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -77,3 +77,4 @@ Whoosh~=2.7.4
 wrapt~=1.12.1
 xlrd~=2.0.1
 zxcvbn-python~=4.4.24
+tenacity~=8.0.1

From a5ded007a53390e2fdf8ca0cd9010b4106c5c68f Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 30 Aug 2021 12:54:37 +0530
Subject: [PATCH 6/9] fix(ci): Run all builds on github push events

Issue: No PR number is detected on Push events and all builds are
skipped. We want the opposite to be true, so we're running all builds on
merges in hopes of testing better.
---
 .github/helper/roulette.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py
index dd3081822e..9831df7f30 100644
--- a/.github/helper/roulette.py
+++ b/.github/helper/roulette.py
@@ -38,8 +38,12 @@ if __name__ == "__main__":
 	pr_number = os.environ.get("PR_NUMBER")
 	repo = os.environ.get("REPO_NAME")
 
-	if not files_list and pr_number:
-		files_list = get_files_list(pr_number=pr_number, repo=repo)
+	# this is a push build, run all builds
+	if not pr_number:
+		os.system('echo "::set-output name=build::strawberry"')
+		sys.exit(0)
+
+	files_list = files_list or get_files_list(pr_number=pr_number, repo=repo)
 
 	if not files_list:
 		print("No files' changes detected. Build is shutting")

From 0c7c1dcb890410ba6c5b18f2e6fec01609a31ca3 Mon Sep 17 00:00:00 2001
From: Saqib <nextchamp.saqib@gmail.com>
Date: Mon, 30 Aug 2021 20:02:29 +0530
Subject: [PATCH 7/9] feat: Bulk export from list view (#13906)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../js/frappe/data_import/data_exporter.js       | 16 ++++++++--------
 frappe/public/js/frappe/list/bulk_operations.js  | 10 ++++++++++
 frappe/public/js/frappe/list/list_view.js        | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 03e6288856..8fa5a08945 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -13,6 +13,13 @@ frappe.data_import.DataExporter = class DataExporter {
 		this.dialog = new frappe.ui.Dialog({
 			title: __('Export Data'),
 			fields: [
+				{
+					fieldtype: 'Select',
+					fieldname: 'file_type',
+					label: __('File Type'),
+					options: ['Excel', 'CSV'],
+					default: 'CSV'
+				},
 				{
 					fieldtype: 'Select',
 					fieldname: 'export_records',
@@ -45,13 +52,6 @@ frappe.data_import.DataExporter = class DataExporter {
 					fieldname: 'filter_area',
 					depends_on: doc => doc.export_records === 'by_filter'
 				},
-				{
-					fieldtype: 'Select',
-					fieldname: 'file_type',
-					label: __('File Type'),
-					options: ['Excel', 'CSV'],
-					default: 'CSV'
-				},
 				{
 					fieldtype: 'Section Break'
 				},
@@ -141,7 +141,7 @@ frappe.data_import.DataExporter = class DataExporter {
 		let for_insert = this.exporting_for === 'Insert New Records';
 		let section_title = for_insert ? __('Select Fields To Insert') : __('Select Fields To Update');
 		let $select_all_buttons = $(`
-			<div>
+			<div class="mb-3">
 				<h6 class="form-section-heading uppercase">${section_title}</h6>
 				<button class="btn btn-default btn-xs" data-action="select_all">
 					${__('Select All')}
diff --git a/frappe/public/js/frappe/list/bulk_operations.js b/frappe/public/js/frappe/list/bulk_operations.js
index 369c8e7a5a..3b99560411 100644
--- a/frappe/public/js/frappe/list/bulk_operations.js
+++ b/frappe/public/js/frappe/list/bulk_operations.js
@@ -261,4 +261,14 @@ export default class BulkOperations {
 		});
 		dialog.show();
 	}
+
+	export(doctype, docnames) {
+		frappe.require('data_import_tools.bundle.js', () => {
+			const data_exporter = new frappe.data_import.DataExporter(doctype, 'Insert New Records');
+			data_exporter.dialog.set_value('export_records', 'by_filter');
+			data_exporter.filter_group.add_filters_to_filter_group(
+				[[doctype, "name", "in", docnames, false]]
+			);
+		});
+	}
 }
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 0edae6c29a..81b2c4ff8d 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1732,11 +1732,25 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			};
 		};
 
+		const bulk_export = () => {
+			return {
+				label: __("Export"),
+				action: () => {
+					const docnames = this.get_checked_items(true);
+
+					bulk_operations.export(doctype, docnames);
+				},
+				standard: true
+			};
+		};
+
 		// bulk edit
 		if (has_editable_fields(doctype)) {
 			actions_menu_items.push(bulk_edit());
 		}
 
+		actions_menu_items.push(bulk_export());
+
 		// bulk assignment
 		actions_menu_items.push(bulk_assignment());
 

From cd17ca274ca3684fa53450415ff2d2292dbcdb61 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Tue, 31 Aug 2021 10:44:11 +0530
Subject: [PATCH 8/9] fix: Check column length from information schema

---
 .../custom/doctype/customize_form/test_customize_form.py   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frappe/custom/doctype/customize_form/test_customize_form.py b/frappe/custom/doctype/customize_form/test_customize_form.py
index 6783e52d68..266ece8a1e 100644
--- a/frappe/custom/doctype/customize_form/test_customize_form.py
+++ b/frappe/custom/doctype/customize_form/test_customize_form.py
@@ -201,6 +201,13 @@ class TestCustomizeForm(unittest.TestCase):
 
 		self.assertTrue(d.flags.update_db)
 
+		length = frappe.db.sql("""SELECT character_maximum_length
+			FROM information_schema.columns
+			WHERE table_name = 'tabNotification Log'
+			AND column_name = 'document_name'""")[0][0]
+
+		self.assertEqual(length, 255)
+
 	def test_custom_link(self):
 		try:
 			# create a dummy doctype linked to Event

From cec53b595a50afc323942cb39f6414f351369676 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 31 Aug 2021 15:27:25 +0530
Subject: [PATCH 9/9] fix(cleanup): cleanup email account, bug fix for
 web_template.js and more

---
 frappe/core/doctype/doctype/doctype.json      |   6 +-
 .../doctype/email_account/email_account.js    |  12 --
 .../doctype/email_account/email_account.json  | 109 ++++++++++++------
 frappe/public/js/frappe/utils/web_template.js |   5 +-
 frappe/public/scss/desk/page.scss             |   4 +-
 frappe/website/doctype/web_page/web_page.js   |  10 +-
 6 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 6a427f71e1..63e0426eb3 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -28,6 +28,7 @@
   "sb1",
   "autoname",
   "name_case",
+  "allow_rename",
   "column_break_15",
   "description",
   "documentation",
@@ -39,7 +40,6 @@
   "column_break_23",
   "hide_toolbar",
   "allow_copy",
-  "allow_rename",
   "allow_import",
   "allow_events_in_timeline",
   "allow_auto_repeat",
@@ -276,7 +276,7 @@
    "oldfieldtype": "Check"
   },
   {
-   "default": "0",
+   "default": "1",
    "fieldname": "allow_rename",
    "fieldtype": "Check",
    "label": "Allow Rename",
@@ -635,7 +635,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2021-06-17 23:31:44.974199",
+ "modified": "2021-08-31 15:26:19.077164",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 83896e0af7..277bf43eb6 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -151,18 +151,6 @@ frappe.ui.form.on("Email Account", {
 			callback: function (r) {
 				if (r.message) {
 					frm.events.set_domain_fields(frm, r.message);
-				} else {
-					frm.set_value("domain", "");
-					frappe.confirm(__('Email Domain not configured for this account, Create one?'),
-						function () {
-							frappe.model.with_doctype("Email Domain", function() {
-								frappe.route_options = { email_id: frm.doc.email_id };
-								frappe.route_flags.return_to_email_account = 1;
-								var doc = frappe.model.get_new_doc("Email Domain");
-								frappe.set_route("Form", "Email Domain", doc.name);
-							});
-						}
-					);
 				}
 			}
 		});
diff --git a/frappe/email/doctype/email_account/email_account.json b/frappe/email/doctype/email_account/email_account.json
index 6d811b801f..8cfd75d839 100644
--- a/frappe/email/doctype/email_account/email_account.json
+++ b/frappe/email/doctype/email_account/email_account.json
@@ -7,30 +7,34 @@
  "document_type": "Setup",
  "engine": "InnoDB",
  "field_order": [
+  "account_section",
   "email_id",
-  "login_id_is_different",
-  "login_id",
+  "email_account_name",
+  "column_break_3",
+  "domain",
+  "service",
+  "authentication_column",
   "password",
   "awaiting_password",
   "ascii_encode_password",
-  "email_account_name",
-  "email_settings",
-  "domain",
-  "service",
+  "column_break_10",
+  "login_id_is_different",
+  "login_id",
   "mailbox_settings",
   "enable_incoming",
-  "use_imap",
-  "email_server",
-  "use_ssl",
-  "append_emails_to_sent_folder",
-  "incoming_port",
-  "attachment_limit",
-  "append_to",
   "default_incoming",
+  "use_imap",
+  "use_ssl",
+  "email_server",
+  "incoming_port",
+  "column_break_18",
+  "attachment_limit",
   "email_sync_option",
   "initial_sync_count",
-  "create_contact",
   "section_break_12",
+  "append_emails_to_sent_folder",
+  "append_to",
+  "create_contact",
   "enable_automatic_linking",
   "section_break_13",
   "notify_if_unreplied",
@@ -42,6 +46,7 @@
   "use_tls",
   "use_ssl_for_outgoing",
   "smtp_port",
+  "column_break_38",
   "default_outgoing",
   "always_use_account_email_id_as_sender",
   "always_use_account_name_as_sender_name",
@@ -80,7 +85,7 @@
    "fieldtype": "Check",
    "hide_days": 1,
    "hide_seconds": 1,
-   "label": "Use Different Email Login ID"
+   "label": "Use different login"
   },
   {
    "depends_on": "login_id_is_different",
@@ -122,12 +127,6 @@
    "label": "Email Account Name",
    "unique": 1
   },
-  {
-   "fieldname": "email_settings",
-   "fieldtype": "Section Break",
-   "hide_days": 1,
-   "hide_seconds": 1
-  },
   {
    "depends_on": "eval:!doc.service",
    "fieldname": "domain",
@@ -136,7 +135,7 @@
    "hide_seconds": 1,
    "in_list_view": 1,
    "in_standard_filter": 1,
-   "label": "Domain",
+   "label": "Domain (optional)",
    "options": "Email Domain"
   },
   {
@@ -145,18 +144,18 @@
    "fieldtype": "Select",
    "hide_days": 1,
    "hide_seconds": 1,
-   "label": "Service",
+   "label": "Service (optional)",
    "options": "\nGMail\nSendgrid\nSparkPost\nYahoo Mail\nOutlook.com\nYandex.Mail"
   },
   {
    "fieldname": "mailbox_settings",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Incoming (POP/IMAP) Settings"
   },
   {
    "default": "0",
-   "description": "Check this to pull emails from your mailbox",
    "fieldname": "enable_incoming",
    "fieldtype": "Check",
    "hide_days": 1,
@@ -237,6 +236,7 @@
   },
   {
    "default": "250",
+   "depends_on": "eval: doc.enable_incoming",
    "description": "Total number of emails to sync in initial sync process ",
    "fieldname": "initial_sync_count",
    "fieldtype": "Select",
@@ -248,7 +248,7 @@
   {
    "depends_on": "enable_incoming",
    "fieldname": "section_break_13",
-   "fieldtype": "Section Break",
+   "fieldtype": "Column Break",
    "hide_days": 1,
    "hide_seconds": 1
   },
@@ -282,7 +282,8 @@
    "fieldname": "outgoing_mail_settings",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Outgoing (SMTP) Settings"
   },
   {
    "default": "0",
@@ -336,22 +337,20 @@
   {
    "default": "0",
    "depends_on": "enable_outgoing",
-   "description": "Uses the Email Address mentioned in this Account as the Sender for all emails sent using this Account. ",
    "fieldname": "always_use_account_email_id_as_sender",
    "fieldtype": "Check",
    "hide_days": 1,
    "hide_seconds": 1,
-   "label": "Always use Account's Email Address as Sender"
+   "label": "Always use this email address as sender address"
   },
   {
    "default": "0",
    "depends_on": "enable_outgoing",
-   "description": "Uses the Email Address Name mentioned in this Account as the Sender's Name for all emails sent using this Account.",
    "fieldname": "always_use_account_name_as_sender_name",
    "fieldtype": "Check",
    "hide_days": 1,
    "hide_seconds": 1,
-   "label": "Always use Account's Name as Sender's Name"
+   "label": "Always use this name as sender name"
   },
   {
    "default": "1",
@@ -379,10 +378,13 @@
    "label": "Disable SMTP server authentication"
   },
   {
+   "collapsible": 1,
+   "collapsible_depends_on": "add_signature",
    "fieldname": "signature_section",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Signature"
   },
   {
    "default": "0",
@@ -401,10 +403,13 @@
    "label": "Signature"
   },
   {
+   "collapsible": 1,
+   "collapsible_depends_on": "enable_auto_reply",
    "fieldname": "auto_reply",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Auto Reply"
   },
   {
    "default": "0",
@@ -424,17 +429,20 @@
    "label": "Auto Reply Message"
   },
   {
+   "collapsible": 1,
+   "collapsible_depends_on": "eval:frappe.utils.html2text(doc.footer || '')!=''",
    "fieldname": "set_footer",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Footer"
   },
   {
    "fieldname": "footer",
    "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
-   "label": "Footer"
+   "label": "Footer Content"
   },
   {
    "fieldname": "uidvalidity",
@@ -477,7 +485,8 @@
    "fieldname": "section_break_12",
    "fieldtype": "Section Break",
    "hide_days": 1,
-   "hide_seconds": 1
+   "hide_seconds": 1,
+   "label": "Document Linking"
   },
   {
    "default": "0",
@@ -527,12 +536,38 @@
    "fieldname": "brand_logo",
    "fieldtype": "Attach Image",
    "label": "Brand Logo"
+  },
+  {
+   "fieldname": "authentication_column",
+   "fieldtype": "Section Break",
+   "label": "Authentication"
+  },
+  {
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_18",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_38",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "account_section",
+   "fieldtype": "Section Break",
+   "label": "Account"
   }
  ],
  "icon": "fa fa-inbox",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-01-21 10:05:24.820597",
+ "modified": "2021-08-31 15:23:25.714366",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Account",
diff --git a/frappe/public/js/frappe/utils/web_template.js b/frappe/public/js/frappe/utils/web_template.js
index 64cf17b2d7..e6b43e2633 100644
--- a/frappe/public/js/frappe/utils/web_template.js
+++ b/frappe/public/js/frappe/utils/web_template.js
@@ -31,8 +31,6 @@ function open_web_template_values_editor(template, current_values = {}) {
 		let current_table = null;
 		for (let df of doc.fields) {
 			if (current_table) {
-				current_table.fields = current_table.fields || [];
-
 				if (df.fieldtype != 'Table Break') {
 					current_table.fields.push(df);
 				} else {
@@ -44,6 +42,9 @@ function open_web_template_values_editor(template, current_values = {}) {
 			} else {
 				table_fields.push(df);
 				current_table = df;
+
+				// start capturing fields in current_table till the next table break
+				current_table.fields = [];
 			}
 		}
 
diff --git a/frappe/public/scss/desk/page.scss b/frappe/public/scss/desk/page.scss
index 65d535facc..339dd755d0 100644
--- a/frappe/public/scss/desk/page.scss
+++ b/frappe/public/scss/desk/page.scss
@@ -66,7 +66,7 @@
 		padding: 4px 10px;
 	}
 	.btn-primary, .btn-secondary {
-		min-width: 70px;
+		min-width: 40px;
 	}
 	.custom-btn-group {
 		display: inline-flex;
@@ -183,4 +183,4 @@
 .page-only-label {
 	margin-top: var(--margin-xs);
 	text-align: center;
-}
\ No newline at end of file
+}
diff --git a/frappe/website/doctype/web_page/web_page.js b/frappe/website/doctype/web_page/web_page.js
index a58c854e5c..070d1b2ad5 100644
--- a/frappe/website/doctype/web_page/web_page.js
+++ b/frappe/website/doctype/web_page/web_page.js
@@ -2,11 +2,6 @@
 // MIT License. See license.txt
 
 frappe.ui.form.on('Web Page', {
-	title: function(frm) {
-		if (frm.doc.title && !frm.doc.route) {
-			frm.set_value('route', frappe.scrub(frm.doc.title, '-'));
-		}
-	},
 	layout: function(frm) {
 		if (frm.is_new()) {
 			if (frm.doc.insert_code) {
@@ -28,6 +23,11 @@ frappe.ui.form.on('Web Page', {
 			};
 		});
 	},
+	validate: function(frm) {
+		if (frm.doc.title && !frm.doc.route) {
+			frm.set_value('route', frappe.scrub(frm.doc.title, '-'));
+		}
+	},
 	refresh: function(frm) {
 		if (frm.doc.template_path) {
 			frm.set_read_only();