From d056beb0ef6c736807c1ef2efe50a257c6bbe9ec Mon Sep 17 00:00:00 2001
From: hrwx <himanshuwarekar@yahoo.com>
Date: Tue, 3 Aug 2021 15:55:32 +0530
Subject: [PATCH 01/74] feat: show title links in Link Fields

---
 cypress/integration/control_link.js           |  41 +++++-
 frappe/boot.py                                |   7 +
 frappe/core/doctype/doctype/doctype.json      |   9 +-
 .../customize_form/customize_form.json        |   9 +-
 .../doctype/customize_form/customize_form.py  |   3 +-
 frappe/database/mariadb/framework_mariadb.sql |   1 +
 .../database/postgres/framework_postgres.sql  |   1 +
 frappe/desk/form/load.py                      |  54 ++++++-
 frappe/desk/search.py                         |  47 ++++++-
 frappe/public/js/controls.bundle.js           |   1 +
 frappe/public/js/frappe/form/controls/link.js | 133 +++++++++++++++---
 .../frappe/form/controls/table_multiselect.js |   7 +-
 frappe/public/js/frappe/form/formatters.js    |  13 +-
 frappe/public/js/frappe/form/save.js          |  55 +++++---
 frappe/public/js/frappe/link_title.js         |  34 +++++
 frappe/public/js/frappe/request.js            |   5 +
 frappe/public/js/frappe/ui/filters/filter.js  |  12 +-
 frappe/www/printview.py                       |  33 +++++
 18 files changed, 404 insertions(+), 61 deletions(-)
 create mode 100644 frappe/public/js/frappe/link_title.js

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index 8f9257e9c4..e691150925 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -65,16 +65,49 @@ context('Control Link', () => {
 		cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
 
 		cy.get('@todos').then(todos => {
-			cy.get('.frappe-control[data-fieldname=link] input').as('input');
-			cy.get('@input').focus();
+			cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
 			cy.wait('@search_link');
-			cy.get('@input').type(todos[0]).blur();
+			cy.get('@input').type(todos[0]);
+			cy.wait('@search_link');
+			cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
+			cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
 			cy.wait('@validate_link');
 			cy.get('@input').focus();
 			cy.get('.frappe-control[data-fieldname=link] .link-btn')
 				.should('be.visible')
 				.click();
-			cy.location('pathname').should('eq', `/app/todo/${todos[0]}`);
+			cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`);
+		});
+	});
+
+	it('show title field in link', () => {
+		get_dialog_with_link().as('dialog');
+
+		cy.server();
+		cy.insert_doc("Property Setter", {
+			property: "show_title_field_in_link",
+			doc_type: "ToDo",
+			value: 1,
+			doctype_or_field: "DocType"
+		}, true);
+		cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
+
+		cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
+		cy.wait('@search_link');
+		cy.get('@input').type('todo for link');
+		cy.wait('@search_link');
+		cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
+		cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
+		cy.get('.frappe-control[data-fieldname=link] input').blur();
+		cy.get('@dialog').then(dialog => {
+			cy.get('@todos').then(todos => {
+				let field = dialog.get_field('link');
+				let value = field.get_value();
+				let label = field.get_label_value();
+
+				expect(value).to.eq(todos[0]);
+				expect(label).to.eq('this is a test todo for link');
+			});
 		});
 	});
 });
diff --git a/frappe/boot.py b/frappe/boot.py
index 0589e32ac8..8f02b67934 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -87,6 +87,7 @@ def get_bootinfo():
 	bootinfo.additional_filters_config = get_additional_filters_from_hooks()
 	bootinfo.desk_settings = get_desk_settings()
 	bootinfo.app_logo_url = get_app_logo()
+	bootinfo.doctypes_with_show_link_field_title = doctypes_with_show_link_field_title()
 
 	return bootinfo
 
@@ -324,3 +325,9 @@ def get_desk_settings():
 
 def get_notification_settings():
 	return frappe.get_cached_doc('Notification Settings', frappe.session.user)
+
+def doctypes_with_show_link_field_title():
+	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
+	custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1})
+
+	return [d.name for d in dts + custom_dts if d]
\ No newline at end of file
diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index 6a427f71e1..3024fb32a2 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -45,6 +45,7 @@
   "allow_auto_repeat",
   "view_settings",
   "title_field",
+  "show_title_field_in_link",
   "search_fields",
   "default_print_format",
   "sort_field",
@@ -554,6 +555,12 @@
    "fieldname": "website_search_field",
    "fieldtype": "Data",
    "label": "Website Search Field"
+  },
+  {
+   "default": "0",
+   "fieldname": "show_title_field_in_link",
+   "fieldtype": "Check",
+   "label": "Show Title in Link and Table MultiSelect Field"
   }
  ],
  "icon": "fa fa-bolt",
@@ -635,7 +642,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2021-06-17 23:31:44.974199",
+ "modified": "2021-08-03 13:41:50.319555",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index c2940a92e3..cdcac1582a 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -27,6 +27,7 @@
   "autoname",
   "view_settings_section",
   "title_field",
+  "show_title_field_in_link",
   "image_field",
   "default_print_format",
   "column_break_29",
@@ -280,6 +281,12 @@
    "fieldname": "autoname",
    "fieldtype": "Data",
    "label": "Auto Name"
+  },
+  {
+   "default": "0",
+   "fieldname": "show_title_field_in_link",
+   "fieldtype": "Check",
+   "label": "Show Title in Link and Table MultiSelect Field"
   }
  ],
  "hide_toolbar": 1,
@@ -288,7 +295,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-06-21 19:01:06.920663",
+ "modified": "2021-08-03 13:43:27.938781",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 8de194fb00..1866f4d368 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -495,7 +495,8 @@ doctype_properties = {
 	'email_append_to': 'Check',
 	'subject_field': 'Data',
 	'sender_field': 'Data',
-	'autoname': 'Data'
+	'autoname': 'Data',
+	'show_title_field_in_link': 'Check'
 }
 
 docfield_properties = {
diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql
index f8841e9417..a74ece8478 100644
--- a/frappe/database/mariadb/framework_mariadb.sql
+++ b/frappe/database/mariadb/framework_mariadb.sql
@@ -224,6 +224,7 @@ CREATE TABLE `tabDocType` (
   `email_append_to` int(1) NOT NULL DEFAULT 0,
   `subject_field` varchar(255) DEFAULT NULL,
   `sender_field` varchar(255) DEFAULT NULL,
+  `show_title_field_in_link` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`)
 ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql
index a4e94aa326..f65a832bc6 100644
--- a/frappe/database/postgres/framework_postgres.sql
+++ b/frappe/database/postgres/framework_postgres.sql
@@ -229,6 +229,7 @@ CREATE TABLE "tabDocType" (
   "email_append_to" smallint NOT NULL DEFAULT 0,
   "subject_field" varchar(255) DEFAULT NULL,
   "sender_field" varchar(255) DEFAULT NULL,
+  "show_title_field_in_link" smallint NOT NULL DEFAULT 0,
   PRIMARY KEY ("name")
 ) ;
 
diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index a62bfd01d0..994a50f938 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -48,7 +48,7 @@ def getdoc(doctype, name, user=None):
 		raise
 
 	doc.add_seen()
-
+	set_link_titles(doc)
 	frappe.response.docs.append(doc)
 
 @frappe.whitelist(allow_guest=True)
@@ -310,3 +310,55 @@ def get_additional_timeline_content(doctype, docname):
 		contents.extend(frappe.get_attr(method)(doctype, docname) or [])
 
 	return contents
+
+def set_link_titles(doc):
+	meta = frappe.get_meta(doc.doctype)
+	link_titles = {}
+	link_titles.update(get_title_values_for_link_and_dynamic_link_fields(meta, doc))
+	link_titles.update(get_title_values_for_table_and_multiselect_fields(meta, doc))
+
+	send_link_titles(link_titles)
+
+def get_title_values_for_link_and_dynamic_link_fields(meta, doc, link_fields=None):
+	link_titles = {}
+
+	if not link_fields:
+		link_fields = meta.get_link_fields() + meta.get_dynamic_link_fields()
+
+	for field in link_fields:
+		if not doc.get(field.fieldname):
+			continue
+
+		doctype = field.options if field.fieldtype == "Link" else doc.get(field.options)
+
+		meta = frappe.get_meta(doctype)
+		if not meta or not (meta.title_field and meta.show_title_field_in_link):
+			continue
+
+		link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field)
+		link_titles.update({doctype + "::" + doc.get(field.fieldname): link_title})
+
+	return link_titles
+
+def get_title_values_for_table_and_multiselect_fields(meta, doc, table_fields=None):
+	link_titles = {}
+
+	if not table_fields:
+		table_fields = meta.get_table_fields()
+
+	for field in table_fields:
+		if not doc.get(field.fieldname):
+			continue
+
+		_meta = frappe.get_meta(field.options)
+		for value in doc.get(field.fieldname):
+			link_titles.update(get_title_values_for_link_and_dynamic_link_fields(_meta, value))
+
+	return link_titles
+
+def send_link_titles(link_titles):
+	"""Append link titles dict in `frappe.local.response`."""
+	if "_link_titles" not in frappe.local.response:
+		frappe.local.response["_link_titles"] = {}
+
+	frappe.local.response["_link_titles"].update(link_titles)
diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index f9b65fc98e..a64d6efec4 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -49,8 +49,11 @@ def sanitize_searchfield(searchfield):
 # this is called by the Link Field
 @frappe.whitelist()
 def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfield=None, reference_doctype=None, ignore_user_permissions=False):
-	search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions)
-	frappe.response['results'] = build_for_autosuggest(frappe.response["values"])
+	search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters,
+		reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions)
+
+	frappe.response["results"] = build_for_autosuggest(frappe.response["values"], doctype=doctype,
+		is_query=True if query else False)
 	del frappe.response["values"]
 
 # this is called by the search box
@@ -138,6 +141,11 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 				fields = list(set(fields + json.loads(filter_fields)))
 			formatted_fields = ['`tab%s`.`%s`' % (meta.name, f.strip()) for f in fields]
 
+			title_field_query = get_title_field_query(meta)
+
+			# Insert title field query after name
+			formatted_fields.insert(1, title_field_query)
+
 			# find relevance as location of search term from the beginning of string `name`. used for sorting results.
 			formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format(
 				_txt=frappe.db.escape((txt or "").replace("%", "").replace("@", "")), doctype=doctype))
@@ -205,10 +213,32 @@ def get_std_fields_list(meta, key):
 
 	return sflist
 
-def build_for_autosuggest(res):
+def get_title_field_query(meta):
+	title_field = meta.title_field if meta.title_field else None
+	show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None
+	field = "NULL as `label`"
+
+	if title_field and show_title_field_in_link:
+		field = "`tab{0}`.{1} as `label`".format(meta.name, title_field)
+
+	return field
+
+def build_for_autosuggest(res, doctype, is_query):
 	results = []
 	for r in res:
-		out = {"value": r[0], "description": ", ".join(unique(cstr(d) for d in r if d)[1:])}
+		r = list(r)
+		if is_query or doctype in (frappe.get_hooks().standard_queries or {}):
+			out = {
+				"value": r[0],
+				"description": ", ".join(unique(cstr(d) for d in r[1:] if d))
+			}
+		else:
+			out = {
+				"value": r[0],
+				"label": r[1],
+				"description": ", ".join(unique(cstr(d) for d in r[2:] if d))
+			}
+
 		results.append(out)
 	return results
 
@@ -271,3 +301,12 @@ def get_user_groups():
 	return frappe.get_all('User Group', fields=['name as id', 'name as value'], update={
 		'is_group': True
 	})
+
+@frappe.whitelist()
+def get_link_title(doctype, docname):
+	meta = frappe.get_meta(doctype)
+
+	if meta.title_field and meta.show_title_field_in_link:
+		return frappe.get_cached_value(doctype, docname, meta.title_field)
+
+	return docname
\ No newline at end of file
diff --git a/frappe/public/js/controls.bundle.js b/frappe/public/js/controls.bundle.js
index 30b5d43905..b08cbb336d 100644
--- a/frappe/public/js/controls.bundle.js
+++ b/frappe/public/js/controls.bundle.js
@@ -16,3 +16,4 @@ import "air-datepicker/dist/js/i18n/datepicker.sk.js";
 import "air-datepicker/dist/js/i18n/datepicker.zh.js";
 import "./frappe/ui/capture.js";
 import "./frappe/form/controls/control.js";
+import "./frappe/link_title.js";
diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 83f3f8dd70..82481d5303 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -29,12 +29,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			setTimeout(function() {
 				if(me.$input.val() && me.get_options()) {
 					let doctype = me.get_options();
-					let name = me.$input.val();
+					let name = me.get_input_value();
 					me.$link.toggle(true);
 					me.$link_open.attr('href', frappe.utils.get_form_link(doctype, name));
 				}
 
 				if(!me.$input.val()) {
+					me.reset_value();
+					me.reset_fetch_values(me.df, me.docname);
 					me.$input.val("").trigger("input");
 				}
 			}, 500);
@@ -69,6 +71,76 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			this.$input_area.find(".link-btn").remove();
 		}
 	}
+	set_formatted_input(value) {
+		super.set_formatted_input();
+		if (!value) return;
+		let doctype = this.get_options();
+		this.set_data_value(frappe.get_link_title(doctype, value) || value, value);
+	}
+	set_data_value(link_display, value) {
+		if (!this.$input) {
+			return;
+		}
+
+		this.$input.val(__(link_display));
+		this.data_value = value;
+	}
+	parse_validate_and_set_in_model(value, label, e) {
+		if (this.parse) value = this.parse(value, label);
+		if (label) {
+			this.label = label;
+			frappe.add_link_title(this.doctype, value, label);
+		}
+
+		return this.validate_and_set_in_model(value, e);
+	}
+	validate_and_set_in_model(value, e) {
+		var me = this;
+		if (this.inside_change_event) {
+			return Promise.resolve();
+		}
+		this.inside_change_event = true;
+		var set = function(value) {
+			me.inside_change_event = false;
+			return frappe.run_serially([
+				() => me.set_model_value(value),
+				() => {
+					me.set_mandatory && me.set_mandatory(value);
+
+					if (me.df.change || me.df.onchange) {
+						// onchange event specified in df
+						frappe.set_link_title(me);
+						return (me.df.change || me.df.onchange).apply(me, [e]);
+					}
+				}
+			]);
+		};
+
+		value = this.validate(value);
+		if (value && value.then) {
+			// got a promise
+			return value.then((value) => set(value));
+		} else {
+			// all clear
+			return set(value);
+		}
+	}
+	get_input_value() {
+		return (this.$input && this.data_value && this.$input.val()) ? this.data_value : "";
+	}
+	get_label_value() {
+		return this.$input ? this.$input.val() : "";
+	}
+	set_input_label(label) {
+		this.$input && this.$input.val(__(label));
+	}
+	reset_value() {
+		if (!this.$input) {
+			return;
+		}
+		this.$input.val("");
+		this.data_value = null;
+	}
 	open_advanced_search() {
 		var doctype = this.get_options();
 		if(!doctype) return;
@@ -98,7 +170,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		}
 
 		// partially entered name field
-		frappe.route_options.name_field = this.get_value();
+		frappe.route_options.name_field = this.get_label_value();
 
 		// reference to calling link
 		frappe._from_link = this;
@@ -120,6 +192,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			maxItems: 99,
 			autoFirst: true,
 			list: [],
+			replace: function (suggestion) {
+				// Override Awesomeplete replace function as it is used to set the input value
+				// https://github.com/LeaVerou/awesomplete/issues/17104#issuecomment-359185403
+				this.input.value = suggestion.label || suggestion.value;
+			},
 			data: function (item) {
 				return {
 					label: item.label || item.value,
@@ -236,9 +313,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 				me.selected = false;
 				return;
 			}
-			var value = me.get_input_value();
-			if(value!==me.last_value) {
-				me.parse_validate_and_set_in_model(value);
+			let value = me.get_input_value();
+			let label = me.get_label_value();
+
+			if (value !== me.last_value || me.label !== label) {
+				me.parse_validate_and_set_in_model(value, label);
 			}
 		});
 
@@ -258,14 +337,15 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 			// prevent selection on tab
 			var TABKEY = 9;
-			if(e.keyCode === TABKEY) {
+			if (e.keyCode === TABKEY) {
 				e.preventDefault();
 				me.awesomplete.close();
 				return false;
 			}
 
-			if(item.action) {
+			if (item.action) {
 				item.value = "";
+				item.label = "";
 				item.action.apply(me);
 			}
 
@@ -277,13 +357,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 				frappe.boot.user.last_selected_values[me.df.options] = item.value;
 			}
 
-			me.parse_validate_and_set_in_model(item.value);
+			me.parse_validate_and_set_in_model(item.value, item.label);
 		});
 
 		this.$input.on("awesomplete-selectcomplete", function(e) {
-			var o = e.originalEvent;
-			if(o.text.value.indexOf("__link_option") !== -1) {
-				me.$input.val("");
+			let o = e.originalEvent;
+			if (o.text.value.indexOf("__link_option") !== -1) {
+				me.reset_value();
+				me.reset_fetch_values(me.df, me.docname);
 			}
 		});
 	}
@@ -452,10 +533,13 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			this.docname, value);
 	}
 	validate_link_and_fetch(df, doctype, docname, value) {
-		if(value) {
+		let me = this;
+
+		if (value) {
 			return new Promise((resolve) => {
-				var fetch = '';
-				if(this.frm && this.frm.fetch_dict[df.fieldname]) {
+				let fetch = '';
+
+				if (this.frm && this.frm.fetch_dict[df.fieldname]) {
 					fetch = this.frm.fetch_dict[df.fieldname].columns.join(', ');
 				}
 				// if default and no fetch, no need to validate
@@ -465,10 +549,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 				this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch);
 			});
+		} else {
+			me.reset_value();
+			me.reset_fetch_values(df, docname);
 		}
 	}
-
 	fetch_and_validate_link(resolve, df, doctype, docname, value, fetch) {
+		let me = this;
+
 		frappe.call({
 			method: 'frappe.desk.form.utils.validate_link',
 			type: "GET",
@@ -485,18 +573,27 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 					}
 					resolve(r.valid_value);
 				} else {
+					me.reset_value();
+					me.reset_fetch_values(df, docname);
 					resolve("");
 				}
 			}
 		});
 	}
-
 	set_fetch_values(df, docname, fetch_values) {
-		var fl = this.frm.fetch_dict[df.fieldname].fields;
-		for(var i=0; i < fl.length; i++) {
+		let fl = this.frm.fetch_dict[df.fieldname].fields;
+
+		for (var i=0; i < fl.length; i++) {
 			frappe.model.set_value(df.parent, docname, fl[i], fetch_values[i], df.fieldtype);
 		}
 	}
+	reset_fetch_values(df, docname) {
+		let fields = this.frm && this.frm.fetch_dict && this.frm.fetch_dict[df.fieldname] ? this.frm.fetch_dict[df.fieldname].fields : [];
+
+		fields.forEach(field => {
+			frappe.model.set_value(df.parent, docname, field, null, df.fieldtype);
+		});
+	}
 };
 
 if (Awesomplete) {
diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index 15dfd9649e..f74e0837ff 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -62,6 +62,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 					[link_field.fieldname]: value
 				});
 			}
+			frappe.add_link_title(link_field.options, value, label);
 		}
 		this._rows_list = this.rows.map(row => row[link_field.fieldname]);
 		return this.rows;
@@ -126,10 +127,12 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 		this.$input_area.prepend(html);
 	}
 	get_pill_html(value) {
-		const encoded_value = encodeURIComponent(value);
+		const link_field = this.get_link_field();
+		const encoded_value = encodeURIComponent(value.name);
+		const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name;
 		return `
 			<button class="data-pill btn tb-selected-value" data-value="${encoded_value}">
-				<span class="btn-link-to-form">${__(value)}</span>
+				<span class="btn-link-to-form">${__(pill_name)}</span>
 				<span class="btn-remove">${frappe.utils.icon('close')}</span>
 			</button>
 		`;
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index b9a838688d..c4f042533d 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -106,12 +106,14 @@ frappe.form.formatters = {
 	Link: function(value, docfield, options, doc) {
 		var doctype = docfield._options || docfield.options;
 		var original_value = value;
+		let link_title = frappe.get_link_title(doctype, value);
+
 		if(value && value.match && value.match(/^['"].*['"]$/)) {
 			value.replace(/^.(.*).$/, "$1");
 		}
 
 		if(options && (options.for_print || options.only_value)) {
-			return value;
+			return link_title || value;
 		}
 
 		if(frappe.form.link_formatters[doctype]) {
@@ -135,13 +137,14 @@ frappe.form.formatters = {
 				return `<a
 					href="/app/${encodeURIComponent(frappe.router.slug(doctype))}/${encodeURIComponent(original_value)}"
 					data-doctype="${doctype}"
-					data-name="${original_value}">
-					${__(options && options.label || value)}</a>`;
+					data-name="${original_value}"
+					data-value="${original_value}">
+					${__(options && options.label || link_title || value)}</a>`;
 			} else {
-				return value;
+				return link_title || value;
 			}
 		} else {
-			return value;
+			return link_title || value;
 		}
 	},
 	Date: function(value) {
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 65d84e2202..612e449a7e 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -249,31 +249,40 @@ frappe.ui.form.update_calling_link = (newdoc) => {
 	};
 
 	if (is_valid_doctype()) {
-		// set value
-		if (doc && doc.parentfield) {
-			//update values for child table
-			$.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) {
-				if (field.doc && field.doc.name === frappe._from_link.docname) {
-					frappe._from_link.set_value(newdoc.name);
-				}
-			});
-		} else {
-			frappe._from_link.set_value(newdoc.name);
-		}
-
-		// refresh field
-		frappe._from_link.refresh();
-
-		// if from form, switch
-		if (frappe._from_link.frm) {
-			frappe.set_route("Form",
-				frappe._from_link.frm.doctype, frappe._from_link.frm.docname)
-				.then(() => {
-					frappe.utils.scroll_to(frappe._from_link_scrollY);
+		frappe.model.with_doctype(newdoc.doctype, () => {
+			let meta = frappe.get_meta(newdoc.doctype);
+			// set value
+			if (doc && doc.parentfield) {
+				//update values for child table
+				$.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) {
+					if (field.doc && field.doc.name === frappe._from_link.docname) {
+						if (meta.title_field && meta.show_title_field_in_link) {
+							frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
+						}
+						frappe._from_link.set_value(newdoc.name);
+					}
 				});
-		}
+			} else {
+				if (meta.title_field && meta.show_title_field_in_link) {
+					frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
+				}
+				frappe._from_link.set_value(newdoc.name);
+			}
 
-		frappe._from_link = null;
+			// refresh field
+			frappe._from_link.refresh();
+
+			// if from form, switch
+			if (frappe._from_link.frm) {
+				frappe.set_route("Form",
+					frappe._from_link.frm.doctype, frappe._from_link.frm.docname)
+					.then(() => {
+						frappe.utils.scroll_to(frappe._from_link_scrollY);
+					});
+			}
+
+			frappe._from_link = null;
+		});
 	}
 }
 
diff --git a/frappe/public/js/frappe/link_title.js b/frappe/public/js/frappe/link_title.js
new file mode 100644
index 0000000000..82bc6c149c
--- /dev/null
+++ b/frappe/public/js/frappe/link_title.js
@@ -0,0 +1,34 @@
+// for link titles
+frappe._link_titles = {};
+
+frappe.get_link_title = function(doctype, name) {
+	if (!doctype || !name) {
+		return;
+	}
+
+	return frappe._link_titles[doctype + "::" + name];
+};
+
+frappe.add_link_title = function (doctype, name, value) {
+	if (!doctype || !name) {
+		return;
+	}
+
+	frappe._link_titles[doctype + "::" + name] = value;
+};
+
+frappe.set_link_title =  function(f) {
+	let doctype = f.get_options();
+	let docname = f.get_input_value();
+
+	if ((!in_list(frappe.boot.doctypes_with_show_link_field_title, doctype)) || (!doctype || !docname) ||
+		(frappe.get_link_title(doctype, docname))) {
+		return;
+	}
+
+	frappe.xcall("frappe.desk.search.get_link_title", {"doctype": doctype, "docname": docname}).then((r) => {
+		if (r && docname !== r) {
+			f.set_input_label(r);
+		}
+	});
+};
\ No newline at end of file
diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 12fa9c8e21..9f09b288b6 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -241,6 +241,11 @@ frappe.request.call = function(opts) {
 					$.extend(frappe._messages, data.__messages);
 				}
 
+				// sync link titles
+				if (data._link_titles) {
+					$.extend(frappe._link_titles, data._link_titles);
+				}
+
 				// callbacks
 				var status_code_handler = statusCode[xhr.statusCode().status];
 				if (status_code_handler) {
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index b2b2b623e2..d8bc760668 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -313,6 +313,10 @@ frappe.ui.Filter = class {
 		return this.utils.get_selected_value(this.field, this.get_condition());
 	}
 
+	get_selected_label() {
+		return this.utils.get_selected_label(this.field);
+	}
+
 	get_condition() {
 		return this.filter_edit_area.find('.condition').val();
 	}
@@ -360,7 +364,7 @@ frappe.ui.Filter = class {
 	get_filter_button_text() {
 		let value = this.utils.get_formatted_value(
 			this.field,
-			this.get_selected_value()
+			this.get_selected_label() || this.get_selected_value()
 		);
 		return `${__(this.field.df.label)} ${__(this.get_condition())} ${__(
 			value
@@ -448,6 +452,12 @@ frappe.ui.filter_utils = {
 		return val;
 	},
 
+	get_selected_label(field) {
+		if (in_list(["Link", "Dynamic Link"], field.df.fieldtype)) {
+			return field.get_label_value();
+		}
+	},
+
 	get_default_condition(df) {
 		if (df.fieldtype == 'Data') {
 			return 'like';
diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index cdf47790eb..268a01eafb 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -170,6 +170,38 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None,
 
 	return html
 
+def set_link_titles(doc):
+	# Replaces name with title of link field doctype
+
+	meta = frappe.get_meta(doc.doctype)
+	set_title_values_for_link_and_dynamic_link_fields(meta, doc)
+	set_title_values_for_table_and_multiselect_fields(meta, doc)
+
+def set_title_values_for_link_and_dynamic_link_fields(meta, doc):
+	for field in meta.get_link_fields() + meta.get_dynamic_link_fields():
+		if not doc.get(field.fieldname):
+			continue
+
+		# If link field, then get doctype from options
+		# If dynamic link field, then get doctype from dependent field
+		doctype = field.options if field.fieldtype == "Link" else doc.get(field.options)
+
+		meta = frappe.get_meta(doctype)
+		if not meta or not (meta.title_field and meta.show_title_field_in_link):
+			continue
+
+		link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field)
+		setattr(doc, field.fieldname, link_title)
+
+def set_title_values_for_table_and_multiselect_fields(meta, doc):
+	for field in meta.get_table_fields():
+		if not doc.get(field.fieldname):
+			continue
+
+		_meta = frappe.get_meta(field.options)
+		for value in doc.get(field.fieldname):
+			set_title_values_for_link_and_dynamic_link_fields(_meta, value)
+
 def convert_markdown(doc, meta):
 	'''Convert text field values to markdown if necessary'''
 	for field in meta.fields:
@@ -191,6 +223,7 @@ def get_html_and_style(doc, name=None, print_format=None, meta=None,
 		doc = frappe.get_doc(json.loads(doc))
 
 	print_format = get_print_format_doc(print_format, meta=meta or frappe.get_meta(doc.doctype))
+	set_link_titles(doc)
 
 	try:
 		html = get_rendered_template(doc, name=name, print_format=print_format, meta=meta,

From bee72ee6ff3ad906a5ac83f5e4ba67d4cc153b34 Mon Sep 17 00:00:00 2001
From: hrwx <himanshuwarekar@yahoo.com>
Date: Tue, 3 Aug 2021 17:15:29 +0530
Subject: [PATCH 02/74] fix: Null query error

---
 frappe/desk/search.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index a64d6efec4..6d259e3a3d 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -144,7 +144,8 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 			title_field_query = get_title_field_query(meta)
 
 			# Insert title field query after name
-			formatted_fields.insert(1, title_field_query)
+			if title_field_query:
+				formatted_fields.insert(1, title_field_query)
 
 			# find relevance as location of search term from the beginning of string `name`. used for sorting results.
 			formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format(
@@ -216,7 +217,7 @@ def get_std_fields_list(meta, key):
 def get_title_field_query(meta):
 	title_field = meta.title_field if meta.title_field else None
 	show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None
-	field = "NULL as `label`"
+	field = None
 
 	if title_field and show_title_field_in_link:
 		field = "`tab{0}`.{1} as `label`".format(meta.name, title_field)
@@ -224,10 +225,13 @@ def get_title_field_query(meta):
 	return field
 
 def build_for_autosuggest(res, doctype, is_query):
+	meta = frappe.get_meta(doctype)
+	title_field = get_title_field_query(meta)
+	_from = 2 if title_field else 1
 	results = []
 	for r in res:
 		r = list(r)
-		if is_query or doctype in (frappe.get_hooks().standard_queries or {}):
+		if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}):
 			out = {
 				"value": r[0],
 				"description": ", ".join(unique(cstr(d) for d in r[1:] if d))
@@ -235,8 +239,8 @@ def build_for_autosuggest(res, doctype, is_query):
 		else:
 			out = {
 				"value": r[0],
-				"label": r[1],
-				"description": ", ".join(unique(cstr(d) for d in r[2:] if d))
+				"label": r[1] if title_field else None,
+				"description": ", ".join(unique(cstr(d) for d in r[_from:] if d))
 			}
 
 		results.append(out)

From 1b3d202eb6e5a10d51500f82b0eabfd7f395260e Mon Sep 17 00:00:00 2001
From: hrwx <himanshuwarekar@yahoo.com>
Date: Fri, 6 Aug 2021 11:31:08 +0530
Subject: [PATCH 03/74] fix: do not modify doc for print formats

---
 frappe/utils/formatters.py | 15 +++++++++++++++
 frappe/www/printview.py    | 18 ++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py
index 9efccc15f0..2ef3ab4fce 100644
--- a/frappe/utils/formatters.py
+++ b/frappe/utils/formatters.py
@@ -95,4 +95,19 @@ def format_value(value, df=None, doc=None, currency=None, translated=False):
 	elif df.get("fieldtype") == "Text Editor":
 		return "<div class='ql-snow'>{}</div>".format(value)
 
+	elif df.get("fieldtype") in ["Link", "Dynamic Link"]:
+		if not doc or not doc.get("__link_titles") or not df.options:
+			return value
+
+		doctype = df.options
+		if df.get("fieldtype") == "Dynamic Link":
+			if not df.parent:
+				return value
+
+			meta = frappe.get_meta(df.parent)
+			_field = meta.get_field(df.options)
+			doctype = _field.options
+
+		return doc.__link_titles.get("{0}::{1}".format(doctype, value), value)
+
 	return value
diff --git a/frappe/www/printview.py b/frappe/www/printview.py
index 268a01eafb..77fbd0b8e4 100644
--- a/frappe/www/printview.py
+++ b/frappe/www/printview.py
@@ -171,13 +171,20 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None,
 	return html
 
 def set_link_titles(doc):
-	# Replaces name with title of link field doctype
+	# Adds name with title of link field doctype to __link_titles
+	if not doc.get("__link_titles"):
+		setattr(doc, "__link_titles", {})
 
 	meta = frappe.get_meta(doc.doctype)
 	set_title_values_for_link_and_dynamic_link_fields(meta, doc)
 	set_title_values_for_table_and_multiselect_fields(meta, doc)
 
-def set_title_values_for_link_and_dynamic_link_fields(meta, doc):
+def set_title_values_for_link_and_dynamic_link_fields(meta, doc, parent_doc=None):
+	if parent_doc and not parent_doc.get("__link_titles"):
+		setattr(parent_doc, "__link_titles", {})
+	elif doc and not doc.get("__link_titles"):
+		setattr(doc, "__link_titles", {})
+
 	for field in meta.get_link_fields() + meta.get_dynamic_link_fields():
 		if not doc.get(field.fieldname):
 			continue
@@ -191,7 +198,10 @@ def set_title_values_for_link_and_dynamic_link_fields(meta, doc):
 			continue
 
 		link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field)
-		setattr(doc, field.fieldname, link_title)
+		if parent_doc:
+			parent_doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title
+		elif doc:
+			doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title
 
 def set_title_values_for_table_and_multiselect_fields(meta, doc):
 	for field in meta.get_table_fields():
@@ -200,7 +210,7 @@ def set_title_values_for_table_and_multiselect_fields(meta, doc):
 
 		_meta = frappe.get_meta(field.options)
 		for value in doc.get(field.fieldname):
-			set_title_values_for_link_and_dynamic_link_fields(_meta, value)
+			set_title_values_for_link_and_dynamic_link_fields(_meta, value, doc)
 
 def convert_markdown(doc, meta):
 	'''Convert text field values to markdown if necessary'''

From 0adff72877bac3b9ce400454e65bd9bb9f965d1a Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Wed, 15 Dec 2021 20:03:56 +0530
Subject: [PATCH 04/74] fix: link title for link fields

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

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index a3c876fae2..a884399360 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -89,7 +89,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		if (this.parse) value = this.parse(value, label);
 		if (label) {
 			this.label = label;
-			frappe.add_link_title(this.doctype, value, label);
+			frappe.add_link_title(this.df.options, value, label);
 		}
 
 		return this.validate_and_set_in_model(value, e);

From d83bcc83542c32a759d1c4df1c067f83f15f548b Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Wed, 15 Dec 2021 20:14:43 +0530
Subject: [PATCH 05/74] fix: title in table multiselect pills

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

diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index f74e0837ff..6e26a15249 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -49,7 +49,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 	setup_buttons() {
 		this.$input_area.find('.link-btn').remove();
 	}
-	parse(value) {
+	parse(value, label) {
 		const link_field = this.get_link_field();
 
 		if (value) {
@@ -128,8 +128,8 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 	}
 	get_pill_html(value) {
 		const link_field = this.get_link_field();
-		const encoded_value = encodeURIComponent(value.name);
-		const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name;
+		const encoded_value = encodeURIComponent(value);
+		const pill_name = frappe.get_link_title(link_field.options, value) || value;
 		return `
 			<button class="data-pill btn tb-selected-value" data-value="${encoded_value}">
 				<span class="btn-link-to-form">${__(pill_name)}</span>

From e6a87332f86416507e5b9a38ad78273b450af8f1 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 16:08:31 +0530
Subject: [PATCH 06/74] chore: make label concise

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

diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json
index e67b78aef5..2bba4127bb 100644
--- a/frappe/core/doctype/doctype/doctype.json
+++ b/frappe/core/doctype/doctype/doctype.json
@@ -588,7 +588,7 @@
    "default": "0",
    "fieldname": "show_title_field_in_link",
    "fieldtype": "Check",
-   "label": "Show Title in Link and Table MultiSelect Field"
+   "label": "Show Title in Link Fields"
   }
  ],
  "icon": "fa fa-bolt",
@@ -670,7 +670,7 @@
    "link_fieldname": "reference_doctype"
   }
  ],
- "modified": "2021-12-15 14:53:10.717788",
+ "modified": "2022-01-07 16:07:06.196534",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocType",
diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json
index d266b8688a..1ee9d4a02a 100644
--- a/frappe/custom/doctype/customize_form/customize_form.json
+++ b/frappe/custom/doctype/customize_form/customize_form.json
@@ -302,7 +302,7 @@
    "default": "0",
    "fieldname": "show_title_field_in_link",
    "fieldtype": "Check",
-   "label": "Show Title in Link and Table MultiSelect Field"
+   "label": "Show Title in Link Fields"
   }
  ],
  "hide_toolbar": 1,
@@ -311,7 +311,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-12-15 16:45:04.308690",
+ "modified": "2022-01-07 16:07:06.196534",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form",

From 74276ef69b32c0174ac85d63a169be20c86b14d2 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 16:22:15 +0530
Subject: [PATCH 07/74] chore: undo changes to link ui test

---
 cypress/integration/control_link.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index 70e3f629e6..2a7d2b5096 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -65,18 +65,16 @@ context('Control Link', () => {
 		cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
 
 		cy.get('@todos').then(todos => {
-			cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
+			cy.get('.frappe-control[data-fieldname=link] input').as('input');
+			cy.get('@input').focus();
 			cy.wait('@search_link');
-			cy.get('@input').type(todos[0]);
-			cy.wait('@search_link');
-			cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
-			cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });
+			cy.get('@input').type(todos[0]).blur();
 			cy.wait('@validate_link');
 			cy.get('@input').focus();
 			cy.findByTitle('Open Link')
 				.should('be.visible')
 				.click();
-			cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`);
+			cy.location('pathname').should('eq', `/app/todo/${todos[0]}`);
 		});
 	});
 

From f760aa1de2ad3dcbea261ab6dc1ef5257caf53eb Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 16:43:58 +0530
Subject: [PATCH 08/74] perf: use get_value instead of get_cached_value

get_cached_value internally calls get_doc which is much slower than fetching a value from db
---
 frappe/desk/form/load.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index 6a0340d024..649491e9bc 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -321,17 +321,17 @@ def get_additional_timeline_content(doctype, docname):
 	return contents
 
 def set_link_titles(doc):
-	meta = frappe.get_meta(doc.doctype)
 	link_titles = {}
-	link_titles.update(get_title_values_for_link_and_dynamic_link_fields(meta, doc))
-	link_titles.update(get_title_values_for_table_and_multiselect_fields(meta, doc))
+	link_titles.update(get_title_values_for_link_and_dynamic_link_fields(doc))
+	link_titles.update(get_title_values_for_table_and_multiselect_fields(doc))
 
 	send_link_titles(link_titles)
 
-def get_title_values_for_link_and_dynamic_link_fields(meta, doc, link_fields=None):
+def get_title_values_for_link_and_dynamic_link_fields(doc, link_fields=None):
 	link_titles = {}
 
 	if not link_fields:
+		meta = frappe.get_meta(doc.doctype)
 		link_fields = meta.get_link_fields() + meta.get_dynamic_link_fields()
 
 	for field in link_fields:
@@ -344,24 +344,24 @@ def get_title_values_for_link_and_dynamic_link_fields(meta, doc, link_fields=Non
 		if not meta or not (meta.title_field and meta.show_title_field_in_link):
 			continue
 
-		link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field)
+		link_title = frappe.db.get_value(doctype, doc.get(field.fieldname), meta.title_field)
 		link_titles.update({doctype + "::" + doc.get(field.fieldname): link_title})
 
 	return link_titles
 
-def get_title_values_for_table_and_multiselect_fields(meta, doc, table_fields=None):
+def get_title_values_for_table_and_multiselect_fields(doc, table_fields=None):
 	link_titles = {}
 
 	if not table_fields:
+		meta = frappe.get_meta(doc.doctype)
 		table_fields = meta.get_table_fields()
 
 	for field in table_fields:
 		if not doc.get(field.fieldname):
 			continue
 
-		_meta = frappe.get_meta(field.options)
 		for value in doc.get(field.fieldname):
-			link_titles.update(get_title_values_for_link_and_dynamic_link_fields(_meta, value))
+			link_titles.update(get_title_values_for_link_and_dynamic_link_fields(value))
 
 	return link_titles
 

From 2b80cabaeaeb29c2b686002f7a934bde1ac36a62 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 16:46:49 +0530
Subject: [PATCH 09/74] chore: remove unused parameter

---
 frappe/desk/search.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index 23b5c47fd1..c2475bc7b2 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -52,8 +52,7 @@ def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfi
 	search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters,
 		reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions)
 
-	frappe.response["results"] = build_for_autosuggest(frappe.response["values"], doctype=doctype,
-		is_query=True if query else False)
+	frappe.response["results"] = build_for_autosuggest(frappe.response["values"], doctype=doctype)
 	del frappe.response["values"]
 
 # this is called by the search box
@@ -224,7 +223,7 @@ def get_title_field_query(meta):
 
 	return field
 
-def build_for_autosuggest(res, doctype, is_query):
+def build_for_autosuggest(res, doctype):
 	meta = frappe.get_meta(doctype)
 	title_field = get_title_field_query(meta)
 	_from = 2 if title_field else 1

From 05d80e3b6d434349c6dd154c6fc08578dcc03043 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 18:39:31 +0530
Subject: [PATCH 10/74] refactor: build_for_autosuggest

---
 frappe/desk/search.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index c2475bc7b2..9800637cb0 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -224,25 +224,27 @@ def get_title_field_query(meta):
 	return field
 
 def build_for_autosuggest(res, doctype):
-	meta = frappe.get_meta(doctype)
-	title_field = get_title_field_query(meta)
-	_from = 2 if title_field else 1
 	results = []
-	for r in res:
-		r = list(r)
-		if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}):
-			out = {
+	meta = frappe.get_meta(doctype)
+	if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}):
+		for r in res:
+			r = list(r)
+			results.append({
 				"value": r[0],
 				"description": ", ".join(unique(cstr(d) for d in r[1:] if d))
-			}
-		else:
-			out = {
-				"value": r[0],
-				"label": r[1] if title_field else None,
-				"description": ", ".join(unique(cstr(d) for d in r[_from:] if d))
-			}
+			})
+
+	else:
+		title_field_exists = meta.title_field and meta.show_title_field_in_link
+		_from = 2 if title_field_exists else 1 # to exclude title from description if title_field_exists
+		for r in res:
+			r = list(r)
+			results.append({
+				"value": r[0],
+				"label": r[1] if title_field_exists else None,
+				"description": ", ".join(unique(cstr(d) for d in r[_from:] if d))
+			})
 
-		results.append(out)
 	return results
 
 def scrub_custom_query(query, key, txt):

From d7aa7ac7622765e8215a691e5646b7549c0c5f3a Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 7 Jan 2022 20:03:32 +0530
Subject: [PATCH 11/74] refactor: format multiselect table fields based on
 fieldtype

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

diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py
index ea828a99c5..9ab7497b88 100644
--- a/frappe/utils/formatters.py
+++ b/frappe/utils/formatters.py
@@ -83,9 +83,14 @@ def format_value(value, df=None, doc=None, currency=None, translated=False, form
 		return frappe.utils.markdown(value)
 
 	elif df.get("fieldtype") == "Table MultiSelect":
+		values = []
 		meta = frappe.get_meta(df.options)
 		link_field = [df for df in meta.fields if df.fieldtype == 'Link'][0]
-		values = [v.get(link_field.fieldname, 'asdf') for v in value]
+		for v in value:
+			v.update({'__link_titles': doc.get('__link_titles')})
+			formatted_value = frappe.format_value(v.get(link_field.fieldname, ''), link_field, v)
+			values.append(formatted_value)
+
 		return ', '.join(values)
 
 	elif df.get("fieldtype") == "Duration":

From 87b4f3162c4d6bfe9eca561d501defe4275e92f5 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Tue, 11 Jan 2022 18:45:49 +0530
Subject: [PATCH 12/74] refactor: update validate_and_set_in_model of link.js

---
 frappe/public/js/frappe/form/controls/link.js | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 9d1cbf9cc9..9a20bdb48a 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -82,7 +82,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			return;
 		}
 
-		this.$input.val(__(link_display));
+		this.$input.val(link_display);
 		this.data_value = value;
 	}
 	parse_validate_and_set_in_model(value, label, e) {
@@ -96,26 +96,34 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 	}
 	validate_and_set_in_model(value, e) {
 		var me = this;
-		if (this.inside_change_event) {
+		let force_value_set = (this.doc && this.doc.__run_link_triggers);
+		let is_value_same = (this.get_model_value() === value);
+
+		if (this.inside_change_event || (!force_value_set && is_value_same)) {
 			return Promise.resolve();
 		}
+
 		this.inside_change_event = true;
-		var set = function(value) {
+		function set(value) {
 			me.inside_change_event = false;
 			return frappe.run_serially([
+				() => me._validated = true,
 				() => me.set_model_value(value),
+				() => delete me._validated,
 				() => {
 					me.set_mandatory && me.set_mandatory(value);
 
-					if (me.df.change || me.df.onchange) {
+					if(me.df.change || me.df.onchange) {
 						// onchange event specified in df
 						frappe.set_link_title(me);
-						return (me.df.change || me.df.onchange).apply(me, [e]);
+						let set = (me.df.change || me.df.onchange).apply(me, [e]);
+						me.set_invalid && me.set_invalid();
+						return set;
 					}
+					me.set_invalid && me.set_invalid();
 				}
 			]);
 		};
-
 		value = this.validate(value);
 		if (value && value.then) {
 			// got a promise
@@ -132,7 +140,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		return this.$input ? this.$input.val() : "";
 	}
 	set_input_label(label) {
-		this.$input && this.$input.val(__(label));
+		this.$input && this.$input.val(label);
 	}
 	reset_value() {
 		if (!this.$input) {
@@ -542,6 +550,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		if (!value) {
 			this.reset_value();
 			this.reset_fetch_values(df, docname);
+			return;
 		};
 
 

From d9daefc54ddb1ea3ed5d109964acc1a9eed8219c Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 27 Oct 2021 13:44:06 +0530
Subject: [PATCH 13/74] fix: Calculate dynamic properties for as_dict

If you have a @property in the controller class, this data used to not
be accessible anywhere other than directly through the object via
`frappe.get_doc`. This fix changes that.
---
 frappe/model/base_document.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 26a4658c36..232f108615 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -264,6 +264,11 @@ class BaseDocument(object):
 				if isinstance(d[fieldname], list) and df.fieldtype not in table_fields:
 					frappe.throw(_('Value for {0} cannot be a list').format(_(df.label)))
 
+				if d[fieldname] == None:
+					_val = getattr(self, fieldname, None)
+					if not callable(_val):
+						d[fieldname] = _val
+
 			if convert_dates_to_str and isinstance(d[fieldname], (
 				datetime.datetime,
 				datetime.date,
@@ -307,6 +312,7 @@ class BaseDocument(object):
 	def as_dict(self, no_nulls=False, no_default_fields=False, convert_dates_to_str=False):
 		doc = self.get_valid_dict(convert_dates_to_str=convert_dates_to_str)
 		doc["doctype"] = self.doctype
+
 		for df in self.meta.get_table_fields():
 			children = self.get(df.fieldname) or []
 			doc[df.fieldname] = [d.as_dict(convert_dates_to_str=convert_dates_to_str, no_nulls=no_nulls, no_default_fields=no_default_fields) for d in children]

From 36a0ecde771cda844d0dd95391ac0455d691b303 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 27 Oct 2021 14:10:34 +0530
Subject: [PATCH 14/74] refactor: check_fieldname_conflicts

- Don't raise if docfield is read only. This allows for dynamic data
fields whose values don't need to be stored in the database
- After 1599f422d320122391acacf91a2206ba42165517, it's possible to pass
  dynamic properties' data to Desk/APIs

This makes it possible to show Person.age on Desk/Api if you have their
DOB saved in the table
---
 frappe/core/doctype/doctype/doctype.py             | 10 +++++-----
 frappe/custom/doctype/custom_field/custom_field.py |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 3754288145..e5dc185aef 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -1295,10 +1295,9 @@ def make_module_and_roles(doc, perm_fieldname="permissions"):
 		else:
 			raise
 
-def check_fieldname_conflicts(doctype, fieldname):
+def check_fieldname_conflicts(docfield):
 	"""Checks if fieldname conflicts with methods or properties"""
-
-	doc = frappe.get_doc({"doctype": doctype})
+	doc = frappe.get_doc({"doctype": docfield.dt})
 	available_objects = [x for x in dir(doc) if isinstance(x, str)]
 	property_list = [
 		x for x in available_objects if isinstance(getattr(type(doc), x, None), property)
@@ -1306,9 +1305,10 @@ def check_fieldname_conflicts(doctype, fieldname):
 	method_list = [
 		x for x in available_objects if x not in property_list and callable(getattr(doc, x))
 	]
+	msg = _("Fieldname {0} conflicting with meta object").format(docfield.fieldname)
 
-	if fieldname in method_list + property_list:
-		frappe.throw(_("Fieldname {0} conflicting with meta object").format(fieldname))
+	if docfield.fieldname in method_list + property_list:
+		frappe.msgprint(msg, raise_exception=not docfield.read_only)
 
 def clear_linked_doctype_cache():
 	frappe.cache().delete_value('linked_doctypes_without_ignore_user_permissions_enabled')
diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py
index 8f7b21dd24..2d03bfc0c8 100644
--- a/frappe/custom/doctype/custom_field/custom_field.py
+++ b/frappe/custom/doctype/custom_field/custom_field.py
@@ -65,7 +65,7 @@ class CustomField(Document):
 
 		if not self.flags.ignore_validate:
 			from frappe.core.doctype.doctype.doctype import check_fieldname_conflicts
-			check_fieldname_conflicts(self.dt, self.fieldname)
+			check_fieldname_conflicts(self)
 
 	def on_update(self):
 		if not frappe.flags.in_setup_wizard:

From 6502c4b340fb02e82c00a07a662d1ed9f55519a9 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 12 Jan 2022 14:50:27 +0530
Subject: [PATCH 15/74] fix: Don't add property value if NoneType or Falsy

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

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 232f108615..a48a41c303 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -264,9 +264,9 @@ class BaseDocument(object):
 				if isinstance(d[fieldname], list) and df.fieldtype not in table_fields:
 					frappe.throw(_('Value for {0} cannot be a list').format(_(df.label)))
 
-				if d[fieldname] == None:
+				if d[fieldname] is None:
 					_val = getattr(self, fieldname, None)
-					if not callable(_val):
+					if _val and not callable(_val):
 						d[fieldname] = _val
 
 			if convert_dates_to_str and isinstance(d[fieldname], (

From 57f89c8b050873ceeabb5db4260382399c45984e Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 13 Jan 2022 12:23:50 +0530
Subject: [PATCH 16/74] test: Add test for dynamic docfield

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

diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 34a1dd070c..8027bde504 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -1,11 +1,20 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
-import os
 import unittest
+from contextlib import contextmanager
+from datetime import timedelta
+from unittest.mock import patch
 
 import frappe
-from frappe.utils import cint
-from frappe.model.naming import revert_series_if_last, make_autoname, parse_naming_series
+from frappe.desk.doctype.note.note import Note
+from frappe.model.naming import make_autoname, parse_naming_series, revert_series_if_last
+from frappe.utils import cint, now_datetime
+
+
+class CustomTestNote(Note):
+	@property
+	def age(self):
+		return now_datetime() - self.creation
 
 
 class TestDocument(unittest.TestCase):
@@ -256,4 +265,41 @@ class TestDocument(unittest.TestCase):
 	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
+		self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3)
+
+	def test_dynamic_fields(self):
+		"""Read Only Dynamic fields are accessible via API and Form views, whenever .as_dict is invoked
+		"""
+		frappe.db.delete("Custom Field", {"dt": "Note", "fieldname":"age"})
+
+		def patch_note():
+			return patch("frappe.controllers", new={frappe.local.site: {'Note': CustomTestNote}})
+
+		@contextmanager
+		def customize_note():
+			custom_field = frappe.get_doc({
+				"doctype": "Custom Field",
+				"dt": "Note",
+				"fieldname": "age",
+				"fieldtype": "Data",
+				"read_only": True,
+			})
+
+			try:
+				yield custom_field.insert(ignore_if_duplicate=True)
+			finally:
+				custom_field.delete()
+
+		with patch_note():
+			doc = frappe.get_last_doc("Note")
+			self.assertIsInstance(doc, CustomTestNote)
+			self.assertIsInstance(doc.age, timedelta)
+			self.assertIsNone(doc.as_dict().get("age"))
+			self.assertIsNone(doc.get_valid_dict().get("age"))
+
+		with customize_note(), patch_note():
+			doc = frappe.get_last_doc("Note")
+			self.assertIsInstance(doc, CustomTestNote)
+			self.assertIsInstance(doc.age, timedelta)
+			self.assertIsInstance(doc.as_dict().get("age"), timedelta)
+			self.assertIsInstance(doc.get_valid_dict().get("age"), timedelta)

From 4f340f4abaf6e66a30d87f00d7844ee725fec4b3 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 13 Jan 2022 17:03:54 +0530
Subject: [PATCH 17/74] perf: avoid get_doc while fetching title field

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

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index 9800637cb0..1217e07ab0 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -313,6 +313,6 @@ def get_link_title(doctype, docname):
 	meta = frappe.get_meta(doctype)
 
 	if meta.title_field and meta.show_title_field_in_link:
-		return frappe.get_cached_value(doctype, docname, meta.title_field)
+		return frappe.db.get_value(doctype, docname, meta.title_field)
 
 	return docname
\ No newline at end of file

From 7c4221df795518a04d8f75c5e6fce681874d7907 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 13 Jan 2022 17:05:14 +0530
Subject: [PATCH 18/74] feat: show link titles for standard queries

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

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index 1217e07ab0..271aa3eeaf 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -226,7 +226,7 @@ def get_title_field_query(meta):
 def build_for_autosuggest(res, doctype):
 	results = []
 	meta = frappe.get_meta(doctype)
-	if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}):
+	if not (meta.title_field and meta.show_title_field_in_link):
 		for r in res:
 			r = list(r)
 			results.append({

From c589f366356031bbe36104d06a70a03dacb8351d Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 13 Jan 2022 17:08:16 +0530
Subject: [PATCH 19/74] refactor: move link title utils to frappe.utils

---
 frappe/public/js/frappe/form/controls/link.js |  6 ++--
 .../frappe/form/controls/table_multiselect.js |  4 +--
 frappe/public/js/frappe/form/formatters.js    |  2 +-
 frappe/public/js/frappe/form/save.js          |  4 +--
 frappe/public/js/frappe/link_title.js         | 34 -------------------
 frappe/public/js/frappe/utils/utils.js        | 26 ++++++++++++++
 6 files changed, 34 insertions(+), 42 deletions(-)
 delete mode 100644 frappe/public/js/frappe/link_title.js

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 9a20bdb48a..4dc6cc8681 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -75,7 +75,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		super.set_formatted_input();
 		if (!value) return;
 		let doctype = this.get_options();
-		this.set_data_value(frappe.get_link_title(doctype, value) || value, value);
+		this.set_data_value(frappe.utils.get_link_title(doctype, value) || value, value);
 	}
 	set_data_value(link_display, value) {
 		if (!this.$input) {
@@ -89,7 +89,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		if (this.parse) value = this.parse(value, label);
 		if (label) {
 			this.label = label;
-			frappe.add_link_title(this.df.options, value, label);
+			frappe.utils.add_link_title(this.df.options, value, label);
 		}
 
 		return this.validate_and_set_in_model(value, e);
@@ -115,7 +115,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 					if(me.df.change || me.df.onchange) {
 						// onchange event specified in df
-						frappe.set_link_title(me);
+						frappe.utils.set_link_title(me);
 						let set = (me.df.change || me.df.onchange).apply(me, [e]);
 						me.set_invalid && me.set_invalid();
 						return set;
diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js
index 6e26a15249..477679bc92 100644
--- a/frappe/public/js/frappe/form/controls/table_multiselect.js
+++ b/frappe/public/js/frappe/form/controls/table_multiselect.js
@@ -62,7 +62,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 					[link_field.fieldname]: value
 				});
 			}
-			frappe.add_link_title(link_field.options, value, label);
+			frappe.utils.add_link_title(link_field.options, value, label);
 		}
 		this._rows_list = this.rows.map(row => row[link_field.fieldname]);
 		return this.rows;
@@ -129,7 +129,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f
 	get_pill_html(value) {
 		const link_field = this.get_link_field();
 		const encoded_value = encodeURIComponent(value);
-		const pill_name = frappe.get_link_title(link_field.options, value) || value;
+		const pill_name = frappe.utils.get_link_title(link_field.options, value) || value;
 		return `
 			<button class="data-pill btn tb-selected-value" data-value="${encoded_value}">
 				<span class="btn-link-to-form">${__(pill_name)}</span>
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 03cc0f5a63..c39c4046b4 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -110,7 +110,7 @@ frappe.form.formatters = {
 	Link: function(value, docfield, options, doc) {
 		var doctype = docfield._options || docfield.options;
 		var original_value = value;
-		let link_title = frappe.get_link_title(doctype, value);
+		let link_title = frappe.utils.get_link_title(doctype, value);
 
 		if(value && value.match && value.match(/^['"].*['"]$/)) {
 			value.replace(/^.(.*).$/, "$1");
diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js
index 612e449a7e..1a45a28b06 100644
--- a/frappe/public/js/frappe/form/save.js
+++ b/frappe/public/js/frappe/form/save.js
@@ -257,14 +257,14 @@ frappe.ui.form.update_calling_link = (newdoc) => {
 				$.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) {
 					if (field.doc && field.doc.name === frappe._from_link.docname) {
 						if (meta.title_field && meta.show_title_field_in_link) {
-							frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
+							frappe.utils.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
 						}
 						frappe._from_link.set_value(newdoc.name);
 					}
 				});
 			} else {
 				if (meta.title_field && meta.show_title_field_in_link) {
-					frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
+					frappe.utils.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]);
 				}
 				frappe._from_link.set_value(newdoc.name);
 			}
diff --git a/frappe/public/js/frappe/link_title.js b/frappe/public/js/frappe/link_title.js
deleted file mode 100644
index 82bc6c149c..0000000000
--- a/frappe/public/js/frappe/link_title.js
+++ /dev/null
@@ -1,34 +0,0 @@
-// for link titles
-frappe._link_titles = {};
-
-frappe.get_link_title = function(doctype, name) {
-	if (!doctype || !name) {
-		return;
-	}
-
-	return frappe._link_titles[doctype + "::" + name];
-};
-
-frappe.add_link_title = function (doctype, name, value) {
-	if (!doctype || !name) {
-		return;
-	}
-
-	frappe._link_titles[doctype + "::" + name] = value;
-};
-
-frappe.set_link_title =  function(f) {
-	let doctype = f.get_options();
-	let docname = f.get_input_value();
-
-	if ((!in_list(frappe.boot.doctypes_with_show_link_field_title, doctype)) || (!doctype || !docname) ||
-		(frappe.get_link_title(doctype, docname))) {
-		return;
-	}
-
-	frappe.xcall("frappe.desk.search.get_link_title", {"doctype": doctype, "docname": docname}).then((r) => {
-		if (r && docname !== r) {
-			f.set_input_label(r);
-		}
-	});
-};
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index a3a8f96b11..49b9173a2e 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1397,5 +1397,31 @@ Object.assign(frappe.utils, {
 			arr.push(i);
 		}
 		return arr;
+	},
+
+	get_link_title(doctype, name) {
+		if (!doctype || !name) {
+			return;
+		}
+
+		if (!frappe._link_titles) {
+			// for link titles
+			frappe._link_titles = {};
+		}
+	
+		return frappe._link_titles[doctype + "::" + name];
+	},
+
+	add_link_title(doctype, name, value) {
+		if (!doctype || !name) {
+			return;
+		}
+
+		if (!frappe._link_titles) {
+			// for link titles
+			frappe._link_titles = {};
+		}
+	
+		frappe._link_titles[doctype + "::" + name] = value;
 	}
 });

From b4212ad05f1dbe044b19a00a05c742b76597baf1 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 13 Jan 2022 18:34:41 +0530
Subject: [PATCH 20/74] refactor: setting input value for link fields

---
 frappe/boot.py                                |  4 +-
 frappe/public/js/frappe/form/controls/link.js | 74 +++++++------------
 2 files changed, 27 insertions(+), 51 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 0bccda7b8f..ca48f8b42e 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -89,7 +89,7 @@ def get_bootinfo():
 	bootinfo.additional_filters_config = get_additional_filters_from_hooks()
 	bootinfo.desk_settings = get_desk_settings()
 	bootinfo.app_logo_url = get_app_logo()
-	bootinfo.doctypes_with_show_link_field_title = doctypes_with_show_link_field_title()
+	bootinfo.link_title_doctypes = get_link_title_doctypes()
 
 	return bootinfo
 
@@ -328,7 +328,7 @@ def get_desk_settings():
 def get_notification_settings():
 	return frappe.get_cached_doc('Notification Settings', frappe.session.user)
 
-def doctypes_with_show_link_field_title():
+def get_link_title_doctypes():
 	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
 	custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1})
 	return [d.name for d in dts + custom_dts if d]
diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 4dc6cc8681..974bff6f1f 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -74,17 +74,32 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 	set_formatted_input(value) {
 		super.set_formatted_input();
 		if (!value) return;
-		let doctype = this.get_options();
-		this.set_data_value(frappe.utils.get_link_title(doctype, value) || value, value);
-	}
-	set_data_value(link_display, value) {
-		if (!this.$input) {
-			return;
-		}
 
-		this.$input.val(link_display);
+		this.set_link_title(value);
 		this.data_value = value;
 	}
+	set_link_title(value) {
+		let doctype = this.get_options();
+
+		if (!doctype) return;
+		if (!in_list(frappe.boot.link_title_doctypes, doctype)) return;
+
+		let link_title = frappe.utils.get_link_title(doctype, value);
+		if (!link_title) {
+			frappe.xcall("frappe.desk.search.get_link_title", {
+				"doctype": doctype,
+				"docname": value
+			}).then(link_title => {
+				if (link_title && value !== link_title) {
+					this.set_input_value(link_title);
+				} else {
+					this.set_input_value(value);
+				}
+			});
+		} else {
+			this.set_input_value(link_title);
+		}
+	}
 	parse_validate_and_set_in_model(value, label, e) {
 		if (this.parse) value = this.parse(value, label);
 		if (label) {
@@ -94,53 +109,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 		return this.validate_and_set_in_model(value, e);
 	}
-	validate_and_set_in_model(value, e) {
-		var me = this;
-		let force_value_set = (this.doc && this.doc.__run_link_triggers);
-		let is_value_same = (this.get_model_value() === value);
-
-		if (this.inside_change_event || (!force_value_set && is_value_same)) {
-			return Promise.resolve();
-		}
-
-		this.inside_change_event = true;
-		function set(value) {
-			me.inside_change_event = false;
-			return frappe.run_serially([
-				() => me._validated = true,
-				() => me.set_model_value(value),
-				() => delete me._validated,
-				() => {
-					me.set_mandatory && me.set_mandatory(value);
-
-					if(me.df.change || me.df.onchange) {
-						// onchange event specified in df
-						frappe.utils.set_link_title(me);
-						let set = (me.df.change || me.df.onchange).apply(me, [e]);
-						me.set_invalid && me.set_invalid();
-						return set;
-					}
-					me.set_invalid && me.set_invalid();
-				}
-			]);
-		};
-		value = this.validate(value);
-		if (value && value.then) {
-			// got a promise
-			return value.then((value) => set(value));
-		} else {
-			// all clear
-			return set(value);
-		}
-	}
 	get_input_value() {
 		return (this.$input && this.data_value && this.$input.val()) ? this.data_value : "";
 	}
 	get_label_value() {
 		return this.$input ? this.$input.val() : "";
 	}
-	set_input_label(label) {
-		this.$input && this.$input.val(label);
+	set_input_value(value) {
+		this.$input && this.$input.val(value);
 	}
 	reset_value() {
 		if (!this.$input) {

From 6d355957f612434fc2996956b182cccce2ac0c18 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 13 Jan 2022 18:38:43 +0530
Subject: [PATCH 21/74] fix: invalid import

---
 frappe/public/js/controls.bundle.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/controls.bundle.js b/frappe/public/js/controls.bundle.js
index c129058ed4..267e31a878 100644
--- a/frappe/public/js/controls.bundle.js
+++ b/frappe/public/js/controls.bundle.js
@@ -2,4 +2,3 @@ import "air-datepicker/dist/js/datepicker.min.js";
 import "./frappe/form/controls/datepicker_i18n.js";
 import "./frappe/ui/capture.js";
 import "./frappe/form/controls/control.js";
-import "./frappe/link_title.js";

From 1adc2210a96268650c875dcd7fc50f1cc15147ad Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Fri, 14 Jan 2022 15:19:45 +0530
Subject: [PATCH 22/74] perf: reduce search.get_link_title calls

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

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 974bff6f1f..1cc843d08b 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -82,7 +82,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		let doctype = this.get_options();
 
 		if (!doctype) return;
-		if (!in_list(frappe.boot.link_title_doctypes, doctype)) return;
+
+		if (!in_list(frappe.boot.link_title_doctypes, doctype)) {
+			this.set_input_value(value);
+			return;
+		}
 
 		let link_title = frappe.utils.get_link_title(doctype, value);
 		if (!link_title) {

From 73ef4315da5c2a7846a439951c137343d7695ebf Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Mon, 17 Jan 2022 14:57:48 +0530
Subject: [PATCH 23/74] fix: handle failure while fetching link title

---
 frappe/public/js/frappe/form/controls/link.js | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 1cc843d08b..be7fa9cdde 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -90,16 +90,22 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 		let link_title = frappe.utils.get_link_title(doctype, value);
 		if (!link_title) {
-			frappe.xcall("frappe.desk.search.get_link_title", {
-				"doctype": doctype,
-				"docname": value
-			}).then(link_title => {
-				if (link_title && value !== link_title) {
-					this.set_input_value(link_title);
-				} else {
-					this.set_input_value(value);
-				}
-			});
+			try {
+				frappe.xcall("frappe.desk.search.get_link_title", {
+					"doctype": doctype,
+					"docname": value
+				}).then(link_title => {
+					if (link_title && value !== link_title) {
+						this.set_input_value(link_title);
+					} else {
+						this.set_input_value(value);
+					}
+				});
+			} catch (error) {
+				console.log('Error while fetching link title.');
+				console.log(error);
+				this.set_input_value(value);
+			}
 		} else {
 			this.set_input_value(link_title);
 		}

From 8e3e2a4b92b3c8f281dac89609a3b47ea60c0de4 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Mon, 17 Jan 2022 17:40:08 +0530
Subject: [PATCH 24/74] fix: title field not shown for multiselect fields

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

diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js
index 801435866a..5766619d59 100644
--- a/frappe/public/js/frappe/request.js
+++ b/frappe/public/js/frappe/request.js
@@ -262,6 +262,9 @@ frappe.request.call = function(opts) {
 
 				// sync link titles
 				if (data._link_titles) {
+					if (!frappe._link_titles) {
+						frappe._link_titles = {};
+					}
 					$.extend(frappe._link_titles, data._link_titles);
 				}
 

From 9e253ae1be16f641b5a20848da64be92dde5c3c9 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Tue, 18 Jan 2022 09:38:07 +0530
Subject: [PATCH 25/74] feat: frappe.utils.fetch_link_title

---
 frappe/public/js/frappe/form/controls/link.js | 32 ++++++-------------
 frappe/public/js/frappe/utils/utils.js        | 20 ++++++++----
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index be7fa9cdde..a0931357cc 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -83,31 +83,19 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 		if (!doctype) return;
 
-		if (!in_list(frappe.boot.link_title_doctypes, doctype)) {
-			this.set_input_value(value);
-			return;
-		}
-
-		let link_title = frappe.utils.get_link_title(doctype, value);
-		if (!link_title) {
-			try {
-				frappe.xcall("frappe.desk.search.get_link_title", {
-					"doctype": doctype,
-					"docname": value
-				}).then(link_title => {
-					if (link_title && value !== link_title) {
+		if (in_list(frappe.boot.link_title_doctypes, doctype)) {
+			let link_title = frappe.utils.get_link_title(doctype, value);
+			if (!link_title) {
+				link_title = frappe.utils
+					.fetch_link_title(doctype, value)
+					.then(link_title => {
 						this.set_input_value(link_title);
-					} else {
-						this.set_input_value(value);
-					}
-				});
-			} catch (error) {
-				console.log('Error while fetching link title.');
-				console.log(error);
-				this.set_input_value(value);
+					});
+			} else {
+				this.set_input_value(link_title);
 			}
 		} else {
-			this.set_input_value(link_title);
+			this.set_input_value(value);
 		}
 	}
 	parse_validate_and_set_in_model(value, label, e) {
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 49b9173a2e..d0345feb69 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1400,15 +1400,10 @@ Object.assign(frappe.utils, {
 	},
 
 	get_link_title(doctype, name) {
-		if (!doctype || !name) {
+		if (!doctype || !name || !frappe._link_titles) {
 			return;
 		}
 
-		if (!frappe._link_titles) {
-			// for link titles
-			frappe._link_titles = {};
-		}
-	
 		return frappe._link_titles[doctype + "::" + name];
 	},
 
@@ -1423,5 +1418,18 @@ Object.assign(frappe.utils, {
 		}
 	
 		frappe._link_titles[doctype + "::" + name] = value;
+	},
+
+	fetch_link_title(doctype, name) {
+		try {
+			return frappe.xcall("frappe.desk.search.get_link_title", {
+				"doctype": doctype,
+				"docname": name
+			});
+		} catch (error) {
+			console.log('Error while fetching link title.');
+			console.log(error);
+			return Promise.resolve(name);
+		}
 	}
 });

From 9e3e3f804a20b047d8c9f3918cd0004fbc9ad92c Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 27 Jan 2022 22:38:48 +0530
Subject: [PATCH 26/74] feat: Virtual DocField

Add virtual docfield through which you can make callable properties for
the controller
---
 frappe/core/doctype/docfield/docfield.json          |  9 ++++++++-
 .../custom/doctype/customize_form/customize_form.py |  3 ++-
 .../customize_form_field/customize_form_field.json  |  9 ++++++++-
 frappe/model/base_document.py                       | 13 +++++++------
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json
index 26ddce7d35..6eb8cf347f 100644
--- a/frappe/core/doctype/docfield/docfield.json
+++ b/frappe/core/doctype/docfield/docfield.json
@@ -17,6 +17,7 @@
   "hide_days",
   "hide_seconds",
   "reqd",
+  "is_virtual",
   "search_index",
   "column_break_18",
   "options",
@@ -534,13 +535,19 @@
    "fieldname": "show_dashboard",
    "fieldtype": "Check",
    "label": "Show Dashboard"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_virtual",
+   "fieldtype": "Check",
+   "label": "Virtual"
   }
  ],
  "idx": 1,
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-01-03 11:56:19.812863",
+ "modified": "2022-01-27 21:22:20.529072",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 1593ed49a5..83fb529b8b 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -558,7 +558,8 @@ docfield_properties = {
 	'allow_in_quick_entry': 'Check',
 	'hide_border': 'Check',
 	'hide_days': 'Check',
-	'hide_seconds': 'Check'
+	'hide_seconds': 'Check',
+	'is_virtual': 'Check',
 }
 
 doctype_link_properties = {
diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json
index a545cd9fe1..4351e76609 100644
--- a/frappe/custom/doctype/customize_form_field/customize_form_field.json
+++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json
@@ -14,6 +14,7 @@
   "non_negative",
   "reqd",
   "unique",
+  "is_virtual",
   "in_list_view",
   "in_standard_filter",
   "in_global_search",
@@ -115,6 +116,12 @@
    "fieldtype": "Check",
    "label": "Unique"
   },
+  {
+   "default": "0",
+   "fieldname": "is_virtual",
+   "fieldtype": "Check",
+   "label": "Is Virtual"
+  },
   {
    "default": "0",
    "fieldname": "in_list_view",
@@ -436,7 +443,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-01-03 14:50:32.035768",
+ "modified": "2022-01-27 21:45:22.349776",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form Field",
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 56c41f2001..408aa622ca 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -244,7 +244,13 @@ class BaseDocument(object):
 				continue
 
 			df = self.meta.get_field(fieldname)
-			if df:
+
+			if df and df.get("is_virtual"):
+				if d[fieldname] is None:
+					_val = getattr(self, fieldname, None)
+					if _val and not callable(_val):
+						d[fieldname] = _val
+			elif df:
 				if df.fieldtype=="Check":
 					d[fieldname] = 1 if cint(d[fieldname]) else 0
 
@@ -264,11 +270,6 @@ class BaseDocument(object):
 				if isinstance(d[fieldname], list) and df.fieldtype not in table_fields:
 					frappe.throw(_('Value for {0} cannot be a list').format(_(df.label)))
 
-				if d[fieldname] is None:
-					_val = getattr(self, fieldname, None)
-					if _val and not callable(_val):
-						d[fieldname] = _val
-
 			if convert_dates_to_str and isinstance(d[fieldname], (
 				datetime.datetime,
 				datetime.date,

From 17e970d94789fd495c5cf7a5ad5c3b02b4bcc331 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 27 Jan 2022 22:40:41 +0530
Subject: [PATCH 27/74] fix: Add is_virtual to Custom Field

The diff for this commit is too large because the format was changed.
But essentially, only "Is Virtual" field was added. This commit was
meant to be a part of the preceeding one. It was kept separate only
because the diffs too large :')
---
 .../doctype/custom_field/custom_field.json    | 922 +++++++++---------
 1 file changed, 466 insertions(+), 456 deletions(-)

diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json
index 235f11aad8..e51dfda14b 100644
--- a/frappe/custom/doctype/custom_field/custom_field.json
+++ b/frappe/custom/doctype/custom_field/custom_field.json
@@ -1,458 +1,468 @@
 {
-    "actions": [],
-    "allow_import": 1,
-    "creation": "2013-01-10 16:34:01",
-    "description": "Adds a custom field to a DocType",
-    "doctype": "DocType",
-    "document_type": "Setup",
-    "engine": "InnoDB",
-    "field_order": [
-        "dt",
-        "module",
-        "label",
-        "label_help",
-        "fieldname",
-        "insert_after",
-        "length",
-        "column_break_6",
-        "fieldtype",
-        "precision",
-        "hide_seconds",
-        "hide_days",
-        "options",
-        "fetch_from",
-        "fetch_if_empty",
-        "options_help",
-        "section_break_11",
-        "collapsible",
-        "collapsible_depends_on",
-        "default",
-        "depends_on",
-        "mandatory_depends_on",
-        "read_only_depends_on",
-        "properties",
-        "non_negative",
-        "reqd",
-        "unique",
-        "read_only",
-        "ignore_user_permissions",
-        "hidden",
-        "print_hide",
-        "print_hide_if_no_value",
-        "print_width",
-        "no_copy",
-        "allow_on_submit",
-        "in_list_view",
-        "in_standard_filter",
-        "in_global_search",
-        "in_preview",
-        "bold",
-        "report_hide",
-        "search_index",
-        "allow_in_quick_entry",
-        "ignore_xss_filter",
-        "translatable",
-        "hide_border",
-        "description",
-        "permlevel",
-        "width",
-        "columns"
-    ],
-    "fields": [{
-            "bold": 1,
-            "fieldname": "dt",
-            "fieldtype": "Link",
-            "in_filter": 1,
-            "in_list_view": 1,
-            "label": "Document",
-            "oldfieldname": "dt",
-            "oldfieldtype": "Link",
-            "options": "DocType",
-            "reqd": 1,
-            "search_index": 1
-        },
-        {
-            "bold": 1,
-            "fieldname": "label",
-            "fieldtype": "Data",
-            "in_filter": 1,
-            "label": "Label",
-            "no_copy": 1,
-            "oldfieldname": "label",
-            "oldfieldtype": "Data"
-        },
-        {
-            "fieldname": "label_help",
-            "fieldtype": "HTML",
-            "label": "Label Help",
-            "oldfieldtype": "HTML"
-        },
-        {
-            "fieldname": "fieldname",
-            "fieldtype": "Data",
-            "in_list_view": 1,
-            "label": "Fieldname",
-            "no_copy": 1,
-            "oldfieldname": "fieldname",
-            "oldfieldtype": "Data",
-            "read_only": 1
-        },
-        {
-            "description": "Select the label after which you want to insert new field.",
-            "fieldname": "insert_after",
-            "fieldtype": "Select",
-            "label": "Insert After",
-            "no_copy": 1,
-            "oldfieldname": "insert_after",
-            "oldfieldtype": "Select"
-        },
-        {
-            "fieldname": "column_break_6",
-            "fieldtype": "Column Break"
-        },
-        {
-            "bold": 1,
-            "default": "Data",
-            "fieldname": "fieldtype",
-            "fieldtype": "Select",
-            "in_filter": 1,
-            "in_list_view": 1,
-            "label": "Field Type",
-            "oldfieldname": "fieldtype",
-            "oldfieldtype": "Select",
-            "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature\nTab Break",
-            "reqd": 1
-        },
-        {
-            "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-            "description": "Set non-standard precision for a Float or Currency field",
-            "fieldname": "precision",
-            "fieldtype": "Select",
-            "label": "Precision",
-            "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
-        },
-        {
-            "fieldname": "options",
-            "fieldtype": "Small Text",
-            "in_list_view": 1,
-            "label": "Options",
-            "oldfieldname": "options",
-            "oldfieldtype": "Text"
-        },
-        {
-            "fieldname": "fetch_from",
-            "fieldtype": "Small Text",
-            "label": "Fetch From"
-        },
-        {
-            "default": "0",
-            "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-            "fieldname": "fetch_if_empty",
-            "fieldtype": "Check",
-            "label": "Fetch If Empty"
-        },
-        {
-            "fieldname": "options_help",
-            "fieldtype": "HTML",
-            "label": "Options Help",
-            "oldfieldtype": "HTML"
-        },
-        {
-            "fieldname": "section_break_11",
-            "fieldtype": "Section Break"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-            "fieldname": "collapsible",
-            "fieldtype": "Check",
-            "label": "Collapsible"
-        },
-        {
-            "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-            "fieldname": "collapsible_depends_on",
-            "fieldtype": "Code",
-            "label": "Collapsible Depends On"
-        },
-        {
-            "fieldname": "default",
-            "fieldtype": "Text",
-            "label": "Default Value",
-            "oldfieldname": "default",
-            "oldfieldtype": "Text"
-        },
-        {
-            "fieldname": "depends_on",
-            "fieldtype": "Code",
-            "label": "Depends On",
-            "length": 255
-        },
-        {
-            "fieldname": "description",
-            "fieldtype": "Text",
-            "label": "Field Description",
-            "oldfieldname": "description",
-            "oldfieldtype": "Text",
-            "print_width": "300px",
-            "width": "300px"
-        },
-        {
-            "default": "0",
-            "fieldname": "permlevel",
-            "fieldtype": "Int",
-            "label": "Permission Level",
-            "oldfieldname": "permlevel",
-            "oldfieldtype": "Int"
-        },
-        {
-            "fieldname": "width",
-            "fieldtype": "Data",
-            "label": "Width",
-            "oldfieldname": "width",
-            "oldfieldtype": "Data"
-        },
-        {
-            "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
-            "fieldname": "columns",
-            "fieldtype": "Int",
-            "label": "Columns"
-        },
-        {
-            "fieldname": "properties",
-            "fieldtype": "Column Break",
-            "oldfieldtype": "Column Break",
-            "print_width": "50%",
-            "width": "50%"
-        },
-        {
-            "default": "0",
-            "fieldname": "reqd",
-            "fieldtype": "Check",
-            "in_list_view": 1,
-            "label": "Is Mandatory Field",
-            "oldfieldname": "reqd",
-            "oldfieldtype": "Check"
-        },
-        {
-            "default": "0",
-            "fieldname": "unique",
-            "fieldtype": "Check",
-            "label": "Unique"
-        },
-        {
-            "default": "0",
-            "fieldname": "read_only",
-            "fieldtype": "Check",
-            "label": "Read Only"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:doc.fieldtype===\"Link\"",
-            "fieldname": "ignore_user_permissions",
-            "fieldtype": "Check",
-            "label": "Ignore User Permissions"
-        },
-        {
-            "default": "0",
-            "fieldname": "hidden",
-            "fieldtype": "Check",
-            "label": "Hidden"
-        },
-        {
-            "default": "0",
-            "fieldname": "print_hide",
-            "fieldtype": "Check",
-            "label": "Print Hide",
-            "oldfieldname": "print_hide",
-            "oldfieldtype": "Check"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-            "fieldname": "print_hide_if_no_value",
-            "fieldtype": "Check",
-            "label": "Print Hide If No Value"
-        },
-        {
-            "fieldname": "print_width",
-            "fieldtype": "Data",
-            "hidden": 1,
-            "label": "Print Width",
-            "no_copy": 1,
-            "print_hide": 1
-        },
-        {
-            "default": "0",
-            "fieldname": "no_copy",
-            "fieldtype": "Check",
-            "label": "No Copy",
-            "oldfieldname": "no_copy",
-            "oldfieldtype": "Check"
-        },
-        {
-            "default": "0",
-            "fieldname": "allow_on_submit",
-            "fieldtype": "Check",
-            "label": "Allow on Submit",
-            "oldfieldname": "allow_on_submit",
-            "oldfieldtype": "Check"
-        },
-        {
-            "default": "0",
-            "fieldname": "in_list_view",
-            "fieldtype": "Check",
-            "label": "In List View"
-        },
-        {
-            "default": "0",
-            "fieldname": "in_standard_filter",
-            "fieldtype": "Check",
-            "label": "In Standard Filter"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-            "fieldname": "in_global_search",
-            "fieldtype": "Check",
-            "label": "In Global Search"
-        },
-        {
-            "default": "0",
-            "fieldname": "bold",
-            "fieldtype": "Check",
-            "label": "Bold"
-        },
-        {
-            "default": "0",
-            "fieldname": "report_hide",
-            "fieldtype": "Check",
-            "label": "Report Hide",
-            "oldfieldname": "report_hide",
-            "oldfieldtype": "Check"
-        },
-        {
-            "default": "0",
-            "fieldname": "search_index",
-            "fieldtype": "Check",
-            "hidden": 1,
-            "label": "Index",
-            "no_copy": 1,
-            "print_hide": 1
-        },
-        {
-            "default": "0",
-            "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
-            "fieldname": "ignore_xss_filter",
-            "fieldtype": "Check",
-            "label": "Ignore XSS Filter"
-        },
-        {
-            "default": "1",
-            "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-            "fieldname": "translatable",
-            "fieldtype": "Check",
-            "label": "Translatable"
-        },
-        {
-            "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
-            "fieldname": "length",
-            "fieldtype": "Int",
-            "label": "Length"
-        },
-        {
-            "fieldname": "mandatory_depends_on",
-            "fieldtype": "Code",
-            "label": "Mandatory Depends On",
-            "length": 255
-        },
-        {
-            "fieldname": "read_only_depends_on",
-            "fieldtype": "Code",
-            "label": "Read Only Depends On",
-            "length": 255
-        },
-        {
-            "default": "0",
-            "fieldname": "allow_in_quick_entry",
-            "fieldtype": "Check",
-            "label": "Allow in Quick Entry"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);",
-            "fieldname": "in_preview",
-            "fieldtype": "Check",
-            "label": "In Preview"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:doc.fieldtype=='Duration'",
-            "fieldname": "hide_seconds",
-            "fieldtype": "Check",
-            "label": "Hide Seconds"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:doc.fieldtype=='Duration'",
-            "fieldname": "hide_days",
-            "fieldtype": "Check",
-            "label": "Hide Days"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:doc.fieldtype=='Section Break'",
-            "fieldname": "hide_border",
-            "fieldtype": "Check",
-            "label": "Hide Border"
-        },
-        {
-            "default": "0",
-            "depends_on": "eval:in_list([\"Int\", \"Float\", \"Currency\"], doc.fieldtype)",
-            "fieldname": "non_negative",
-            "fieldtype": "Check",
-            "label": "Non Negative"
-        },
-        {
-            "fieldname": "module",
-            "fieldtype": "Link",
-            "label": "Module (for export)",
-            "options": "Module Def"
-        }
-    ],
-    "icon": "fa fa-glass",
-    "idx": 1,
-    "index_web_pages_for_search": 1,
-    "links": [],
-    "modified": "2021-09-04 12:45:23.810120",
-    "modified_by": "Administrator",
-    "module": "Custom",
-    "name": "Custom Field",
-    "owner": "Administrator",
-    "permissions": [{
-            "create": 1,
-            "delete": 1,
-            "email": 1,
-            "print": 1,
-            "read": 1,
-            "report": 1,
-            "role": "Administrator",
-            "share": 1,
-            "write": 1
-        },
-        {
-            "create": 1,
-            "delete": 1,
-            "email": 1,
-            "print": 1,
-            "read": 1,
-            "report": 1,
-            "role": "System Manager",
-            "share": 1,
-            "write": 1
-        }
-    ],
-    "search_fields": "dt,label,fieldtype,options",
-    "sort_field": "modified",
-    "sort_order": "ASC",
-    "track_changes": 1
+ "actions": [],
+ "allow_import": 1,
+ "creation": "2013-01-10 16:34:01",
+ "description": "Adds a custom field to a DocType",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "dt",
+  "module",
+  "label",
+  "label_help",
+  "fieldname",
+  "insert_after",
+  "length",
+  "column_break_6",
+  "fieldtype",
+  "precision",
+  "hide_seconds",
+  "hide_days",
+  "options",
+  "fetch_from",
+  "fetch_if_empty",
+  "options_help",
+  "section_break_11",
+  "collapsible",
+  "collapsible_depends_on",
+  "default",
+  "depends_on",
+  "mandatory_depends_on",
+  "read_only_depends_on",
+  "properties",
+  "non_negative",
+  "reqd",
+  "unique",
+  "is_virtual",
+  "read_only",
+  "ignore_user_permissions",
+  "hidden",
+  "print_hide",
+  "print_hide_if_no_value",
+  "print_width",
+  "no_copy",
+  "allow_on_submit",
+  "in_list_view",
+  "in_standard_filter",
+  "in_global_search",
+  "in_preview",
+  "bold",
+  "report_hide",
+  "search_index",
+  "allow_in_quick_entry",
+  "ignore_xss_filter",
+  "translatable",
+  "hide_border",
+  "description",
+  "permlevel",
+  "width",
+  "columns"
+ ],
+ "fields": [
+  {
+   "bold": 1,
+   "fieldname": "dt",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Document",
+   "oldfieldname": "dt",
+   "oldfieldtype": "Link",
+   "options": "DocType",
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "bold": 1,
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "label": "Label",
+   "no_copy": 1,
+   "oldfieldname": "label",
+   "oldfieldtype": "Data"
+  },
+  {
+   "fieldname": "label_help",
+   "fieldtype": "HTML",
+   "label": "Label Help",
+   "oldfieldtype": "HTML"
+  },
+  {
+   "fieldname": "fieldname",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Fieldname",
+   "no_copy": 1,
+   "oldfieldname": "fieldname",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
+  {
+   "description": "Select the label after which you want to insert new field.",
+   "fieldname": "insert_after",
+   "fieldtype": "Select",
+   "label": "Insert After",
+   "no_copy": 1,
+   "oldfieldname": "insert_after",
+   "oldfieldtype": "Select"
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
+  {
+   "bold": 1,
+   "default": "Data",
+   "fieldname": "fieldtype",
+   "fieldtype": "Select",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Field Type",
+   "oldfieldname": "fieldtype",
+   "oldfieldtype": "Select",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature\nTab Break",
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+   "description": "Set non-standard precision for a Float or Currency field",
+   "fieldname": "precision",
+   "fieldtype": "Select",
+   "label": "Precision",
+   "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
+  },
+  {
+   "fieldname": "options",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Options",
+   "oldfieldname": "options",
+   "oldfieldtype": "Text"
+  },
+  {
+   "fieldname": "fetch_from",
+   "fieldtype": "Small Text",
+   "label": "Fetch From"
+  },
+  {
+   "default": "0",
+   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+   "fieldname": "fetch_if_empty",
+   "fieldtype": "Check",
+   "label": "Fetch If Empty"
+  },
+  {
+   "fieldname": "options_help",
+   "fieldtype": "HTML",
+   "label": "Options Help",
+   "oldfieldtype": "HTML"
+  },
+  {
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fieldname": "collapsible",
+   "fieldtype": "Check",
+   "label": "Collapsible"
+  },
+  {
+   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
+   "fieldname": "collapsible_depends_on",
+   "fieldtype": "Code",
+   "label": "Collapsible Depends On"
+  },
+  {
+   "fieldname": "default",
+   "fieldtype": "Text",
+   "label": "Default Value",
+   "oldfieldname": "default",
+   "oldfieldtype": "Text"
+  },
+  {
+   "fieldname": "depends_on",
+   "fieldtype": "Code",
+   "label": "Depends On",
+   "length": 255
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "label": "Field Description",
+   "oldfieldname": "description",
+   "oldfieldtype": "Text",
+   "print_width": "300px",
+   "width": "300px"
+  },
+  {
+   "default": "0",
+   "fieldname": "permlevel",
+   "fieldtype": "Int",
+   "label": "Permission Level",
+   "oldfieldname": "permlevel",
+   "oldfieldtype": "Int"
+  },
+  {
+   "fieldname": "width",
+   "fieldtype": "Data",
+   "label": "Width",
+   "oldfieldname": "width",
+   "oldfieldtype": "Data"
+  },
+  {
+   "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
+   "fieldname": "columns",
+   "fieldtype": "Int",
+   "label": "Columns"
+  },
+  {
+   "fieldname": "properties",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "print_width": "50%",
+   "width": "50%"
+  },
+  {
+   "default": "0",
+   "fieldname": "reqd",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Is Mandatory Field",
+   "oldfieldname": "reqd",
+   "oldfieldtype": "Check"
+  },
+  {
+   "default": "0",
+   "fieldname": "unique",
+   "fieldtype": "Check",
+   "label": "Unique"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_virtual",
+   "fieldtype": "Check",
+   "label": "Is Virtual"
+  },
+  {
+   "default": "0",
+   "fieldname": "read_only",
+   "fieldtype": "Check",
+   "label": "Read Only"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype===\"Link\"",
+   "fieldname": "ignore_user_permissions",
+   "fieldtype": "Check",
+   "label": "Ignore User Permissions"
+  },
+  {
+   "default": "0",
+   "fieldname": "hidden",
+   "fieldtype": "Check",
+   "label": "Hidden"
+  },
+  {
+   "default": "0",
+   "fieldname": "print_hide",
+   "fieldtype": "Check",
+   "label": "Print Hide",
+   "oldfieldname": "print_hide",
+   "oldfieldtype": "Check"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+   "fieldname": "print_hide_if_no_value",
+   "fieldtype": "Check",
+   "label": "Print Hide If No Value"
+  },
+  {
+   "fieldname": "print_width",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Print Width",
+   "no_copy": 1,
+   "print_hide": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "no_copy",
+   "fieldtype": "Check",
+   "label": "No Copy",
+   "oldfieldname": "no_copy",
+   "oldfieldtype": "Check"
+  },
+  {
+   "default": "0",
+   "fieldname": "allow_on_submit",
+   "fieldtype": "Check",
+   "label": "Allow on Submit",
+   "oldfieldname": "allow_on_submit",
+   "oldfieldtype": "Check"
+  },
+  {
+   "default": "0",
+   "fieldname": "in_list_view",
+   "fieldtype": "Check",
+   "label": "In List View"
+  },
+  {
+   "default": "0",
+   "fieldname": "in_standard_filter",
+   "fieldtype": "Check",
+   "label": "In Standard Filter"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+   "fieldname": "in_global_search",
+   "fieldtype": "Check",
+   "label": "In Global Search"
+  },
+  {
+   "default": "0",
+   "fieldname": "bold",
+   "fieldtype": "Check",
+   "label": "Bold"
+  },
+  {
+   "default": "0",
+   "fieldname": "report_hide",
+   "fieldtype": "Check",
+   "label": "Report Hide",
+   "oldfieldname": "report_hide",
+   "oldfieldtype": "Check"
+  },
+  {
+   "default": "0",
+   "fieldname": "search_index",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Index",
+   "no_copy": 1,
+   "print_hide": 1
+  },
+  {
+   "default": "0",
+   "description": "Don't HTML Encode HTML tags like &lt;script&gt; or just characters like &lt; or &gt;, as they could be intentionally used in this field",
+   "fieldname": "ignore_xss_filter",
+   "fieldtype": "Check",
+   "label": "Ignore XSS Filter"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+   "fieldname": "translatable",
+   "fieldtype": "Check",
+   "label": "Translatable"
+  },
+  {
+   "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
+   "fieldname": "length",
+   "fieldtype": "Int",
+   "label": "Length"
+  },
+  {
+   "fieldname": "mandatory_depends_on",
+   "fieldtype": "Code",
+   "label": "Mandatory Depends On",
+   "length": 255
+  },
+  {
+   "fieldname": "read_only_depends_on",
+   "fieldtype": "Code",
+   "label": "Read Only Depends On",
+   "length": 255
+  },
+  {
+   "default": "0",
+   "fieldname": "allow_in_quick_entry",
+   "fieldtype": "Check",
+   "label": "Allow in Quick Entry"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);",
+   "fieldname": "in_preview",
+   "fieldtype": "Check",
+   "label": "In Preview"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Duration'",
+   "fieldname": "hide_seconds",
+   "fieldtype": "Check",
+   "label": "Hide Seconds"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Duration'",
+   "fieldname": "hide_days",
+   "fieldtype": "Check",
+   "label": "Hide Days"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Section Break'",
+   "fieldname": "hide_border",
+   "fieldtype": "Check",
+   "label": "Hide Border"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:in_list([\"Int\", \"Float\", \"Currency\"], doc.fieldtype)",
+   "fieldname": "non_negative",
+   "fieldtype": "Check",
+   "label": "Non Negative"
+  },
+  {
+   "fieldname": "module",
+   "fieldtype": "Link",
+   "label": "Module (for export)",
+   "options": "Module Def"
+  }
+ ],
+ "icon": "fa fa-glass",
+ "idx": 1,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2022-01-27 21:47:01.065556",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Custom Field",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Administrator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "dt,label,fieldtype,options",
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file

From 9ca768a32c3d69ff5855a72e3176806755346f67 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 28 Jan 2022 12:12:30 +0530
Subject: [PATCH 28/74] fix(test): Update test_virtual_fields

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

diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index 8027bde504..bc00a4677a 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -267,8 +267,8 @@ class TestDocument(unittest.TestCase):
 		# assuming DocType has more that 3 Data fields
 		self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3)
 
-	def test_dynamic_fields(self):
-		"""Read Only Dynamic fields are accessible via API and Form views, whenever .as_dict is invoked
+	def test_virtual_fields(self):
+		"""Virtual fields are accessible via API and Form views, whenever .as_dict is invoked
 		"""
 		frappe.db.delete("Custom Field", {"dt": "Note", "fieldname":"age"})
 
@@ -283,6 +283,7 @@ class TestDocument(unittest.TestCase):
 				"fieldname": "age",
 				"fieldtype": "Data",
 				"read_only": True,
+				"is_virtual": True,
 			})
 
 			try:

From 0a77059a0d463f1799059290dfb86b4253327dc6 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 28 Jan 2022 18:47:29 +0530
Subject: [PATCH 29/74] fix: Skip raising only if virtual docfield while
 checking for conflicts

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

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index e5dc185aef..804796abfb 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -1308,7 +1308,7 @@ def check_fieldname_conflicts(docfield):
 	msg = _("Fieldname {0} conflicting with meta object").format(docfield.fieldname)
 
 	if docfield.fieldname in method_list + property_list:
-		frappe.msgprint(msg, raise_exception=not docfield.read_only)
+		frappe.msgprint(msg, raise_exception=not docfield.is_virtual)
 
 def clear_linked_doctype_cache():
 	frappe.cache().delete_value('linked_doctypes_without_ignore_user_permissions_enabled')

From 111abfc1f4f7117c0c4f63f2d237d8091a753c37 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 26 Jan 2021 06:16:19 +0530
Subject: [PATCH 30/74] refactor!: Remove dead methods from PropertySetter
 controller

---
 .../property_setter/property_setter.py        | 55 ++++---------------
 1 file changed, 11 insertions(+), 44 deletions(-)

diff --git a/frappe/custom/doctype/property_setter/property_setter.py b/frappe/custom/doctype/property_setter/property_setter.py
index 0a65aa6f5d..a86cf5efd6 100644
--- a/frappe/custom/doctype/property_setter/property_setter.py
+++ b/frappe/custom/doctype/property_setter/property_setter.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
 
 import frappe
@@ -18,53 +18,19 @@ 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, self.row_name)
-
-		# clear cache
 		frappe.clear_cache(doctype = self.doc_type)
 
 	def validate_fieldtype_change(self):
-		if self.field_name in not_allowed_fieldtype_change and \
-			self.property == 'fieldtype':
-			frappe.throw(_("Field type cannot be changed for {0}").format(self.field_name))
-
-	def get_property_list(self, dt):
-		return frappe.db.get_all('DocField',
-			fields=['fieldname', 'label', 'fieldtype'],
-			filters={
-				'parent': dt,
-				'fieldtype': ['not in', ('Section Break', 'Column Break', 'Tab Break', 'HTML', 'Read Only', 'Fold') + frappe.model.table_fields],
-				'fieldname': ['!=', '']
-			},
-			order_by='label asc',
-			as_dict=1
-		)
-
-	def get_setup_data(self):
-		return {
-			'doctypes': frappe.get_all("DocType", pluck="name"),
-			'dt_properties': self.get_property_list('DocType'),
-			'df_properties': self.get_property_list('DocField')
-		}
-
-	def get_field_ids(self):
-		return frappe.db.get_values(
-			"DocField",
-			filters={"parent": self.doc_type},
-			fieldname=["name", "fieldtype", "label", "fieldname"],
-			as_dict=True,
-		)
-
-	def get_defaults(self):
-		if not self.field_name:
-			return frappe.get_all("DocType", filters={"name": self.doc_type}, fields="*")[0]
-		else:
-			return frappe.db.get_values(
-				"DocField",
-				filters={"fieldname": self.field_name, "parent": self.doc_type},
-				fieldname="*",
-			)[0]
+		if (
+			self.property == 'fieldtype'
+			and self.field_name in not_allowed_fieldtype_change
+		):
+			frappe.throw(
+				_("Field type cannot be changed for {0}").format(self.field_name)
+			)
 
 	def on_update(self):
 		if frappe.flags.in_patch:
@@ -74,6 +40,7 @@ class PropertySetter(Document):
 			from frappe.core.doctype.doctype.doctype import validate_fields_for_doctype
 			validate_fields_for_doctype(self.doc_type)
 
+
 def make_property_setter(doctype, fieldname, property, value, property_type, for_doctype = False,
 		validate_fields_for_doctype=True):
 	# WARNING: Ignores Permissions
@@ -91,6 +58,7 @@ 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, row_name=None):
 	"""delete other property setters on this, if this is new"""
 	filters = dict(doc_type=doc_type, property=property)
@@ -100,4 +68,3 @@ def delete_property_setter(doc_type, property, field_name=None, row_name=None):
 		filters["row_name"] = row_name
 
 	frappe.db.delete('Property Setter', filters)
-

From 66b09afda6575b6d7a81aec35adba2d4629aa71b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Feb 2022 17:48:02 +0530
Subject: [PATCH 31/74] fix: Don't create DB column for Virtual DocFields

---
 frappe/database/schema.py |  5 ++++-
 frappe/model/meta.py      | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/frappe/database/schema.py b/frappe/database/schema.py
index 9a6dd502dc..96e5c6be47 100644
--- a/frappe/database/schema.py
+++ b/frappe/database/schema.py
@@ -67,7 +67,7 @@ class DBTable:
 		"""
 			get columns from docfields and custom fields
 		"""
-		fields = self.meta.get_fieldnames_with_value(True)
+		fields = self.meta.get_fieldnames_with_value(with_field_meta=True)
 
 		# optional fields like _comments
 		if not self.meta.get('istable'):
@@ -85,6 +85,9 @@ class DBTable:
 				})
 
 		for field in fields:
+			if field.get("is_virtual"):
+				continue
+
 			self.columns[field.get('fieldname')] = DbColumn(
 				self,
 				field.get('fieldname'),
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index a483f3f2d6..b2f7841abe 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -442,9 +442,16 @@ class Meta(Document):
 				self.permissions = [Document(d) for d in custom_perms]
 
 	def get_fieldnames_with_value(self, with_field_meta=False):
-		return [df if with_field_meta else df.fieldname \
-			for df in self.fields if df.fieldtype not in no_value_fields]
+		def is_value_field(docfield):
+			return not (
+				docfield.is_virtual
+				or docfield.fieldtype in no_value_fields
+			)
 
+		if with_field_meta:
+			return [df for df in self.fields if is_value_field(df)]
+
+		return [df.fieldname for df in self.fields if is_value_field(df)]
 
 	def get_fields_to_check_permissions(self, user_permission_doctypes):
 		fields = self.get("fields", {

From b9395a4d714b179030d5dfc623f02717f39ce4d4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 28 Jan 2021 10:16:19 +0530
Subject: [PATCH 32/74] fix: Handle Virtual DocFields in Desk

* Show as "Read Only" in forms/controls/webforms etc
* Exclude from filtering options in views
* Exclude from quick entry
---
 .../js/frappe/form/controls/base_control.js       |  5 ++++-
 frappe/public/js/frappe/form/quick_entry.js       |  2 +-
 frappe/public/js/frappe/form/script_manager.js    | 15 ++++++++++++---
 frappe/public/js/frappe/list/list_view.js         |  3 ++-
 .../public/js/frappe/views/reports/report_view.js |  3 ++-
 frappe/public/js/frappe/views/treeview.js         |  2 +-
 frappe/website/doctype/web_form/web_form.js       |  2 +-
 7 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/base_control.js b/frappe/public/js/frappe/form/controls/base_control.js
index ce871c50cb..4ee52d16b8 100644
--- a/frappe/public/js/frappe/form/controls/base_control.js
+++ b/frappe/public/js/frappe/form/controls/base_control.js
@@ -39,6 +39,9 @@ frappe.ui.form.Control = class BaseControl {
 		if (this.df.get_status) {
 			return this.df.get_status(this);
 		}
+		if (this.df.is_virtual) {
+			return "Read";
+		}
 
 		if ((!this.doctype && !this.docname) || this.df.parenttype === 'Web Form' || this.df.is_web_form) {
 			// like in case of a dialog box
@@ -52,7 +55,7 @@ frappe.ui.form.Control = class BaseControl {
 				if(explain) console.log("By Hidden Dependency: None"); // eslint-disable-line no-console
 				return "None";
 
-			} else if (cint(this.df.read_only)) {
+			} else if (cint(this.df.read_only || this.df.is_virtual)) {
 				// eslint-disable-next-line
 				if (explain) console.log("By Read Only: Read"); // eslint-disable-line no-console
 				return "Read";
diff --git a/frappe/public/js/frappe/form/quick_entry.js b/frappe/public/js/frappe/form/quick_entry.js
index e412b1dec8..86523d7088 100644
--- a/frappe/public/js/frappe/form/quick_entry.js
+++ b/frappe/public/js/frappe/form/quick_entry.js
@@ -55,7 +55,7 @@ frappe.ui.form.QuickEntryForm = class QuickEntryForm {
 
 		// prepare a list of mandatory, bold and allow in quick entry fields
 		this.mandatory = fields.filter(df => {
-			return ((df.reqd || df.bold || df.allow_in_quick_entry) && !df.read_only);
+			return ((df.reqd || df.bold || df.allow_in_quick_entry) && !df.read_only && !df.is_virtual);
 		});
 	}
 
diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index d1732ee702..678a2b552f 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -192,9 +192,18 @@ frappe.ui.form.ScriptManager = class ScriptManager {
 		}
 
 		function setup_add_fetch(df) {
-			if ((['Data', 'Read Only', 'Text', 'Small Text', 'Currency', 'Check',
-				'Text Editor', 'Code', 'Link', 'Float', 'Int', 'Date', 'Select', 'Duration'].includes(df.fieldtype) || df.read_only==1)
-				&& df.fetch_from && df.fetch_from.indexOf(".")!=-1) {
+			let is_read_only_field = (
+				['Data', 'Read Only', 'Text', 'Small Text', 'Currency', 'Check', 'Text Editor',
+				'Code', 'Link', 'Float', 'Int', 'Date', 'Select', 'Duration'].includes(df.fieldtype)
+				|| df.read_only == 1
+				|| df.is_virtual == 1
+			)
+
+			if (
+				is_read_only_field
+				&& df.fetch_from
+				&& df.fetch_from.indexOf(".") != -1
+			) {
 				var parts = df.fetch_from.split(".");
 				me.frm.add_fetch(parts[0], parts[1], df.fieldname, df.parent);
 			}
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 3cde04313f..64960e0b09 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1672,7 +1672,8 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				frappe.model.is_value_type(field_doc) &&
 				field_doc.fieldtype !== "Read Only" &&
 				!field_doc.hidden &&
-				!field_doc.read_only
+				!field_doc.read_only &&
+				!field_doc.is_virtual
 			);
 		};
 
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index f5d9f3e110..a380d5574a 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -644,6 +644,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			// not a cancelled doc
 			&& data.docstatus !== 2
 			&& !df.read_only
+			&& !df.is_virtual
 			&& !df.hidden
 			// not a standard field i.e., owner, modified_by, etc.
 			&& !frappe.model.std_fields_list.includes(df.fieldname))
@@ -1025,7 +1026,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			title += ` (${__(doctype)})`;
 		}
 
-		const editable = frappe.model.is_non_std_field(fieldname) && !docfield.read_only;
+		const editable = frappe.model.is_non_std_field(fieldname) && !docfield.read_only && !docfield.is_virtual;
 
 		const align = (() => {
 			const is_numeric = frappe.model.is_numeric_field(docfield);
diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js
index 7179e4ab56..d5c6fb5e80 100644
--- a/frappe/public/js/frappe/views/treeview.js
+++ b/frappe/public/js/frappe/views/treeview.js
@@ -343,7 +343,7 @@ frappe.views.TreeView = class TreeView {
 		this.ignore_fields = this.opts.ignore_fields || [];
 
 		var mandatory_fields = $.map(me.opts.meta.fields, function(d) {
-			return (d.reqd || d.bold && !d.read_only) ? d : null });
+			return (d.reqd || d.bold && !d.read_only && !!d.is_virtual) ? d : null });
 
 		var opts_field_names = this.fields.map(function(d) {
 			return d.fieldname
diff --git a/frappe/website/doctype/web_form/web_form.js b/frappe/website/doctype/web_form/web_form.js
index d69d21c64d..1f27b350be 100644
--- a/frappe/website/doctype/web_form/web_form.js
+++ b/frappe/website/doctype/web_form/web_form.js
@@ -60,7 +60,7 @@ frappe.ui.form.on("Web Form", {
 							options: field.options,
 							reqd: field.reqd,
 							default: field.default,
-							read_only: field.read_only,
+							read_only: field.read_only || field.is_virtual,
 							depends_on: field.depends_on,
 							mandatory_depends_on: field.mandatory_depends_on,
 							read_only_depends_on: field.read_only_depends_on,

From a0436250a6c8537f733d9cfad8e988f98c5bc0ac Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Feb 2022 18:07:58 +0530
Subject: [PATCH 33/74] fix: Don't validate fieldtype changes for Virtual
 DocFields

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

diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py
index 2d03bfc0c8..cb1ea2c54d 100644
--- a/frappe/custom/doctype/custom_field/custom_field.py
+++ b/frappe/custom/doctype/custom_field/custom_field.py
@@ -54,7 +54,7 @@ class CustomField(Document):
 		old_fieldtype = self.db_get('fieldtype')
 		is_fieldtype_changed = (not self.is_new()) and (old_fieldtype != self.fieldtype)
 
-		if is_fieldtype_changed and not CustomizeForm.allow_fieldtype_change(old_fieldtype, self.fieldtype):
+		if not self.is_virtual and is_fieldtype_changed and not CustomizeForm.allow_fieldtype_change(old_fieldtype, self.fieldtype):
 			frappe.throw(_("Fieldtype cannot be changed from {0} to {1}").format(old_fieldtype, self.fieldtype))
 
 		if not self.fieldname:
diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py
index 83fb529b8b..2ccfa87544 100644
--- a/frappe/custom/doctype/customize_form/customize_form.py
+++ b/frappe/custom/doctype/customize_form/customize_form.py
@@ -418,6 +418,9 @@ class CustomizeForm(Document):
 		return property_value
 
 	def validate_fieldtype_change(self, df, old_value, new_value):
+		if df.is_virtual:
+			return
+
 		allowed = self.allow_fieldtype_change(old_value, new_value)
 		if allowed:
 			old_value_length = cint(frappe.db.type_map.get(old_value)[1])
@@ -430,7 +433,8 @@ class CustomizeForm(Document):
 				self.validate_fieldtype_length()
 			else:
 				self.flags.update_db = True
-		if not allowed:
+
+		else:
 			frappe.throw(_("Fieldtype cannot be changed from {0} to {1} in row {2}").format(old_value, new_value, df.idx))
 
 	def validate_fieldtype_length(self):

From 5c4905dd375910828a3111b5d4cb000c341b9e9d Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Feb 2022 18:08:27 +0530
Subject: [PATCH 34/74] feat(minor): Allow expressions in options for DocFields

This means you don't have to write a custom controller or change backend
code to use Virtual DocFields! Write it in the options column for the
virtual field in Customize Form

Added doc and safe globals (from safe_exec) into the evaluation
namespace
---
 frappe/model/base_document.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 408aa622ca..d0d33b9f5c 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -1,15 +1,14 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
-import frappe
 import datetime
+
+import frappe
 from frappe import _
-from frappe.model import default_fields, table_fields
+from frappe.model import default_fields, display_fieldtypes, table_fields
 from frappe.model.naming import set_new_name
 from frappe.model.utils.link_count import notify_link_count
 from frappe.modules import load_doctype_module
-from frappe.model import display_fieldtypes
-from frappe.utils import (cint, flt, now, cstr, strip_html,
-	sanitize_html, sanitize_email, cast_fieldtype)
+from frappe.utils import cast_fieldtype, cint, cstr, flt, now, sanitize_html, strip_html
 from frappe.utils.html_utils import unescape_html
 
 max_positive_value = {
@@ -246,10 +245,16 @@ class BaseDocument(object):
 			df = self.meta.get_field(fieldname)
 
 			if df and df.get("is_virtual"):
+				from frappe.utils.safe_exec import get_safe_globals
+
 				if d[fieldname] is None:
-					_val = getattr(self, fieldname, None)
-					if _val and not callable(_val):
-						d[fieldname] = _val
+					if df.get("options"):
+						# d[fieldname] = frappe.safe_eval(df.get("options"), {**get_safe_globals, "doc": self})
+						d[fieldname] = frappe.safe_eval(df.get("options"), get_safe_globals(), {"doc": self})
+					else:
+						_val = getattr(self, fieldname, None)
+						if _val and not callable(_val):
+							d[fieldname] = _val
 			elif df:
 				if df.fieldtype=="Check":
 					d[fieldname] = 1 if cint(d[fieldname]) else 0

From 4d00579667d2fee370af78c320554f5b20056f46 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Feb 2022 18:38:31 +0530
Subject: [PATCH 35/74] fix: Skip data field validations for virtual field

---
 frappe/core/doctype/doctype/doctype.py | 3 +++
 frappe/model/base_document.py          | 7 +++++--
 frappe/model/meta.py                   | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 804796abfb..f0bc96b110 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -1050,6 +1050,9 @@ def validate_fields(meta):
 			field.fetch_from = field.fetch_from.strip('\n').strip()
 
 	def validate_data_field_type(docfield):
+		if docfield.get("is_virtual"):
+			return
+
 		if docfield.fieldtype == "Data" and not (docfield.oldfieldtype and docfield.oldfieldtype != "Data"):
 			if docfield.options and (docfield.options not in data_field_options):
 				df_str = frappe.bold(_(docfield.label))
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index d0d33b9f5c..4c85885401 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -249,8 +249,11 @@ class BaseDocument(object):
 
 				if d[fieldname] is None:
 					if df.get("options"):
-						# d[fieldname] = frappe.safe_eval(df.get("options"), {**get_safe_globals, "doc": self})
-						d[fieldname] = frappe.safe_eval(df.get("options"), get_safe_globals(), {"doc": self})
+						d[fieldname] = frappe.safe_eval(
+							code=df.get("options"),
+							eval_globals=get_safe_globals(),
+							eval_locals={"doc": self},
+						)
 					else:
 						_val = getattr(self, fieldname, None)
 						if _val and not callable(_val):
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index b2f7841abe..7156287c59 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -444,7 +444,7 @@ class Meta(Document):
 	def get_fieldnames_with_value(self, with_field_meta=False):
 		def is_value_field(docfield):
 			return not (
-				docfield.is_virtual
+				docfield.get("is_virtual")
 				or docfield.fieldtype in no_value_fields
 			)
 

From 8165cd2802d17475eb8887322ac2628236854fd5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 1 Feb 2022 18:39:44 +0530
Subject: [PATCH 36/74] test: Add test for docfield.options virtual df usage

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

diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index bc00a4677a..a0c44c5c72 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -276,7 +276,8 @@ class TestDocument(unittest.TestCase):
 			return patch("frappe.controllers", new={frappe.local.site: {'Note': CustomTestNote}})
 
 		@contextmanager
-		def customize_note():
+		def customize_note(with_options=False):
+			options = "frappe.utils.now_datetime() - doc.creation" if with_options else ""
 			custom_field = frappe.get_doc({
 				"doctype": "Custom Field",
 				"dt": "Note",
@@ -284,6 +285,7 @@ class TestDocument(unittest.TestCase):
 				"fieldtype": "Data",
 				"read_only": True,
 				"is_virtual": True,
+				"options": options,
 			})
 
 			try:
@@ -304,3 +306,9 @@ class TestDocument(unittest.TestCase):
 			self.assertIsInstance(doc.age, timedelta)
 			self.assertIsInstance(doc.as_dict().get("age"), timedelta)
 			self.assertIsInstance(doc.get_valid_dict().get("age"), timedelta)
+
+		with customize_note(with_options=True):
+			doc = frappe.get_last_doc("Note")
+			self.assertIsInstance(doc, Note)
+			self.assertIsInstance(doc.as_dict().get("age"), timedelta)
+			self.assertIsInstance(doc.get_valid_dict().get("age"), timedelta)

From dce336f660600cae7761d2a263b9d0fc3fb9cacf Mon Sep 17 00:00:00 2001
From: shadrak gurupnor <gurupnor.shadrak@gmail.com>
Date: Wed, 2 Feb 2022 11:21:06 +0530
Subject: [PATCH 37/74] fix: added regex for alerts

---
 frappe/public/js/frappe/utils/common.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index b324cecd39..1f3558b367 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -259,8 +259,16 @@ frappe.utils.xss_sanitise = function (string, options) {
 		'/': '&#x2F;'
 	};
 	const REGEX_SCRIPT = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi; // used in jQuery 1.7.2 src/ajax.js Line 14
+	const REGEX_ALERT = /confirm\(.*\)|alert\(.*\)|prompt\(.*\)/gi; // captures alert, confirm, prompt
 	options = Object.assign({}, DEFAULT_OPTIONS, options); // don't deep copy, immutable beauty.
 
+	// Rule 3 - TODO: Check event handlers?
+	// script and alert should be checked first or else it will be escaped
+	if (options.strategies.includes('js')) {
+		sanitised = sanitised.replace(REGEX_SCRIPT, "");
+		sanitised = sanitised.replace(REGEX_ALERT, "");
+	}
+
 	// Rule 1
 	if (options.strategies.includes('html')) {
 		for (let char in HTML_ESCAPE_MAP) {
@@ -270,11 +278,6 @@ frappe.utils.xss_sanitise = function (string, options) {
 		}
 	}
 
-	// Rule 3 - TODO: Check event handlers?
-	if (options.strategies.includes('js')) {
-		sanitised = sanitised.replace(REGEX_SCRIPT, "");
-	}
-
 	return sanitised;
 }
 

From e2c968e2555ba6e95cbe0baaeef06ce592bc913b Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Wed, 9 Feb 2022 11:54:44 +0530
Subject: [PATCH 38/74] fix: customized doctypes to show_title_field_in_link

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

diff --git a/frappe/boot.py b/frappe/boot.py
index 6dc9975087..f6dfe0bc79 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -327,7 +327,11 @@ def get_notification_settings():
 
 def get_link_title_doctypes():
 	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
-	custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1})
+	custom_dts = frappe.get_all(
+		"Property Setter",
+		{"property": "show_title_field_in_link", "value": 1},
+		["doc_type as name"],
+	)
 	return [d.name for d in dts + custom_dts if d]
 
 def set_time_zone(bootinfo):

From bbbeb342dffa296a0f09cbc5b089e665b0235d8f Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Wed, 9 Feb 2022 11:56:02 +0530
Subject: [PATCH 39/74] fix: test for show title field in link fields

---
 cypress/integration/control_link.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index ea3b076428..c954233bbf 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -98,14 +98,26 @@ context('Control Link', () => {
 	it('show title field in link', () => {
 		get_dialog_with_link().as('dialog');
 
-		cy.server();
 		cy.insert_doc("Property Setter", {
-			property: "show_title_field_in_link",
-			doc_type: "ToDo",
-			value: 1,
-			doctype_or_field: "DocType"
+			"doctype": "Property Setter",
+			"doc_type": "ToDo",
+			"property": "show_title_field_in_link",
+			"property_type": "Check",
+			"doctype_or_field": "DocType",
+			"value": "1"
 		}, true);
-		cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
+
+		cy.window().its('frappe').then(frappe => {
+			if (!frappe.boot) {
+				frappe.boot = {
+					link_title_doctypes: ['ToDo']
+				}
+			} else {
+				frappe.boot.link_title_doctypes = ['ToDo'];
+			}
+		});
+
+		cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
 
 		cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
 		cy.wait('@search_link');

From d3f768fef9b96c91a7a04e2454ca6d94c1236635 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Tue, 8 Feb 2022 10:41:20 +0530
Subject: [PATCH 40/74] feat(db/pg): ability to ignore pk colission

---
 frappe/model/base_document.py | 32 ++++++++++++++++++++++++--------
 frappe/model/document.py      |  6 +-----
 frappe/tests/test_db.py       | 10 ++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 307d95e84b..2f0a9d4943 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -375,12 +375,24 @@ class BaseDocument(object):
 		fieldname = [df.fieldname for df in self.meta.get_table_fields() if df.options==doctype]
 		return fieldname[0] if fieldname else None
 
-	def db_insert(self):
-		"""INSERT the document (with valid columns) in the database."""
+	def db_insert(self, ignore_if_duplicate=False):
+		"""INSERT the document (with valid columns) in the database.
+
+			args:
+				ignore_if_duplicate: ignore primary key collision
+								at database level (postgres)
+								in python (mariadb)
+		"""
 		if not self.name:
 			# name will be set by document class in most cases
 			set_new_name(self)
 
+		conflict_handler = ""
+		# On postgres we can't implcitly ignore PK collision
+		# So instruct pg to ignore `name` field conflicts
+		if ignore_if_duplicate and frappe.db.db_type == "postgres":
+			conflict_handler = "on conflict (name) do nothing"
+
 		if not self.creation:
 			self.creation = self.modified = now()
 			self.created_by = self.modified_by = frappe.session.user
@@ -391,10 +403,11 @@ class BaseDocument(object):
 		columns = list(d)
 		try:
 			frappe.db.sql("""INSERT INTO `tab{doctype}` ({columns})
-					VALUES ({values})""".format(
-					doctype = self.doctype,
-					columns = ", ".join("`"+c+"`" for c in columns),
-					values = ", ".join(["%s"] * len(columns))
+					VALUES ({values}) {conflict_handler}""".format(
+					doctype=self.doctype,
+					columns=", ".join("`"+c+"`" for c in columns),
+					values=", ".join(["%s"] * len(columns)),
+					conflict_handler=conflict_handler
 				), list(d.values()))
 		except Exception as e:
 			if frappe.db.is_primary_key_violation(e):
@@ -407,8 +420,11 @@ class BaseDocument(object):
 					self.db_insert()
 					return
 
-				frappe.msgprint(_("{0} {1} already exists").format(self.doctype, frappe.bold(self.name)), title=_("Duplicate Name"), indicator="red")
-				raise frappe.DuplicateEntryError(self.doctype, self.name, e)
+				if not ignore_if_duplicate:
+					frappe.msgprint(_("{0} {1} already exists")
+							.format(self.doctype, frappe.bold(self.name)),
+							title=_("Duplicate Name"), indicator="red")
+					raise frappe.DuplicateEntryError(self.doctype, self.name, e)
 
 			elif frappe.db.is_unique_key_violation(e):
 				# unique constraint
diff --git a/frappe/model/document.py b/frappe/model/document.py
index f7ba9250fa..85603587cd 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -249,11 +249,7 @@ class Document(BaseDocument):
 		if getattr(self.meta, "issingle", 0):
 			self.update_single(self.get_valid_dict())
 		else:
-			try:
-				self.db_insert()
-			except frappe.DuplicateEntryError as e:
-				if not ignore_if_duplicate:
-					raise e
+			self.db_insert(ignore_if_duplicate=ignore_if_duplicate)
 
 		# children
 		for d in self.get_all_children():
diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py
index 6e96849b35..bbd09590be 100644
--- a/frappe/tests/test_db.py
+++ b/frappe/tests/test_db.py
@@ -291,6 +291,16 @@ class TestDB(unittest.TestCase):
 
 		frappe.db.MAX_WRITES_PER_TRANSACTION = Database.MAX_WRITES_PER_TRANSACTION
 
+	def test_pk_collision_ignoring(self):
+		# note has `name` generated from title
+		for _ in range(3):
+			frappe.get_doc(doctype="Note", title="duplicate name").insert(ignore_if_duplicate=True)
+
+		with savepoint():
+			self.assertRaises(frappe.DuplicateEntryError, frappe.get_doc(doctype="Note", title="duplicate name").insert)
+			# recover transaction to continue other tests
+			raise Exception
+
 
 @run_only_if(db_type_is.MARIADB)
 class TestDDLCommandsMaria(unittest.TestCase):

From 1439e667b2e5f65b974a36dc4eb5debf138deb75 Mon Sep 17 00:00:00 2001
From: Ankush Menat <ankush@frappe.io>
Date: Tue, 8 Feb 2022 11:04:50 +0530
Subject: [PATCH 41/74] chore: add debug status temporarily

---
 frappe/database/database.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 9fa1ff161c..c833bdeed3 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -177,6 +177,8 @@ class Database(object):
 				raise frappe.QueryTimeoutError(e)
 
 			elif frappe.conf.db_type == 'postgres':
+				# TODO: added temporarily
+				print(e)
 				raise
 
 			if ignore_ddl and (self.is_missing_column(e) or self.is_missing_table(e) or self.cant_drop_field_or_key(e)):

From 188373b1ebbeb7505ad684307a3f824ac615e8fe Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 9 Feb 2022 16:56:10 +0530
Subject: [PATCH 42/74] refactor(test): Frappe REST Test Suite

* Use Werkzeug Test Client instead of requests
    This change should start tracking coverage for the `api` module.
    Committing to ensure state maintainence will not be necessary.
* Refactor get_test_client to reset locals on each request
* Separate FrappeAPITestCase to enable formation of a generic API testing engine.
---
 frappe/tests/test_api.py | 147 ++++++++++++++++++++-------------------
 frappe/utils/__init__.py |  10 ++-
 2 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 32a5ebbd72..314961fce5 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -1,32 +1,63 @@
+import sys
 import unittest
+from contextlib import contextmanager
 from random import choice
+from typing import Dict, Optional
 
 import requests
 from semantic_version import Version
 
 import frappe
-from frappe.utils import get_site_url
+from frappe.utils import get_site_url, get_test_client
 
 
-def maintain_state(f):
-	def wrapper(*args, **kwargs):
-		frappe.db.rollback()
-		r = f(*args, **kwargs)
-		frappe.db.commit()
-		return r
-
-	return wrapper
+@contextmanager
+def suppress_stdout():
+	"""Supress stdout for tests which expectedly make noise
+	but that you don't need in tests"""
+	sys.stdout = None
+	try:
+		yield
+	finally:
+		sys.stdout = sys.__stdout__
 
 
-class TestResourceAPI(unittest.TestCase):
-	SITE_URL = get_site_url(frappe.local.site)
+class FrappeAPITestCase(unittest.TestCase):
+	SITE = frappe.local.site
+	SITE_URL = get_site_url(SITE)
 	RESOURCE_URL = f"{SITE_URL}/api/resource"
 	DOCTYPE = "ToDo"
 	GENERATED_DOCUMENTS = []
+	TEST_CLIENT = get_test_client()
 
+	@property
+	def sid(self):
+		if not getattr(self, "_sid", None):
+			frappe.conf.admin_password = "root"
+			r = self.TEST_CLIENT.post("/api/method/login", data={
+				"usr": "Administrator",
+				"pwd": frappe.conf.admin_password or "admin",
+			})
+			self._sid = r.headers[2][1].split(";")[0].lstrip("sid=")
+		return self._sid
+
+	def get(self, path: str, params: Optional[Dict] = None):
+		return self.TEST_CLIENT.get(path, data=params)
+
+	def post(self, path, data):
+		return self.TEST_CLIENT.post(path, data=frappe.as_json(data))
+
+	def put(self, path, data):
+		return self.TEST_CLIENT.put(path, data=frappe.as_json(data))
+
+	def delete(self, path):
+		return self.TEST_CLIENT.delete(path)
+
+
+class TestResourceAPI(FrappeAPITestCase):
 	@classmethod
-	@maintain_state
 	def setUpClass(self):
+		frappe.set_user("Administrator")
 		for _ in range(10):
 			doc = frappe.get_doc(
 				{"doctype": "ToDo", "description": frappe.mock("paragraph")}
@@ -34,45 +65,17 @@ class TestResourceAPI(unittest.TestCase):
 			self.GENERATED_DOCUMENTS.append(doc.name)
 
 	@classmethod
-	@maintain_state
 	def tearDownClass(self):
+		frappe.set_user("Administrator")
 		for name in self.GENERATED_DOCUMENTS:
 			frappe.delete_doc_if_exists(self.DOCTYPE, name)
 
 	def setUp(self):
+		frappe.set_user("Administrator")
 		# commit to ensure consistency in session (postgres CI randomly fails)
 		if frappe.conf.db_type == "postgres":
 			frappe.db.commit()
 
-	@property
-	def sid(self):
-		if not getattr(self, "_sid", None):
-			self._sid = requests.post(
-				f"{self.SITE_URL}/api/method/login",
-				data={
-					"usr": "Administrator",
-					"pwd": frappe.conf.admin_password or "admin",
-				},
-			).cookies.get("sid")
-
-		return self._sid
-
-	def get(self, path, params=""):
-		return requests.get(f"{self.RESOURCE_URL}/{path}?sid={self.sid}{params}")
-
-	def post(self, path, data):
-		return requests.post(
-			f"{self.RESOURCE_URL}/{path}?sid={self.sid}", data=frappe.as_json(data)
-		)
-
-	def put(self, path, data):
-		return requests.put(
-			f"{self.RESOURCE_URL}/{path}?sid={self.sid}", data=frappe.as_json(data)
-		)
-
-	def delete(self, path):
-		return requests.delete(f"{self.RESOURCE_URL}/{path}?sid={self.sid}")
-
 	def test_unauthorized_call(self):
 		# test 1: fetch documents without auth
 		response = requests.get(f"{self.RESOURCE_URL}/{self.DOCTYPE}")
@@ -80,79 +83,81 @@ class TestResourceAPI(unittest.TestCase):
 
 	def test_get_list(self):
 		# test 2: fetch documents without params
-		response = self.get(self.DOCTYPE)
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid})
 		self.assertEqual(response.status_code, 200)
-		self.assertIsInstance(response.json(), dict)
-		self.assertIn("data", response.json())
+		self.assertIsInstance(response.json, dict)
+		self.assertIn("data", response.json)
 
 	def test_get_list_limit(self):
 		# test 3: fetch data with limit
-		response = self.get(self.DOCTYPE, "&limit=2")
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "limit": 2})
 		self.assertEqual(response.status_code, 200)
-		self.assertEqual(len(response.json()["data"]), 2)
+		self.assertEqual(len(response.json["data"]), 2)
 
 	def test_get_list_dict(self):
 		# test 4: fetch response as (not) dict
-		response = self.get(self.DOCTYPE, "&as_dict=True")
-		json = frappe._dict(response.json())
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "as_dict": True})
+		json = frappe._dict(response.json)
 		self.assertEqual(response.status_code, 200)
 		self.assertIsInstance(json.data, list)
 		self.assertIsInstance(json.data[0], dict)
 
-		response = self.get(self.DOCTYPE, "&as_dict=False")
-		json = frappe._dict(response.json())
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "as_dict": False})
+		json = frappe._dict(response.json)
 		self.assertEqual(response.status_code, 200)
 		self.assertIsInstance(json.data, list)
 		self.assertIsInstance(json.data[0], list)
 
 	def test_get_list_debug(self):
 		# test 5: fetch response with debug
-		response = self.get(self.DOCTYPE, "&debug=true")
+		with suppress_stdout():
+			response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "debug": True})
 		self.assertEqual(response.status_code, 200)
-		self.assertIn("exc", response.json())
-		self.assertIsInstance(response.json()["exc"], str)
-		self.assertIsInstance(eval(response.json()["exc"]), list)
+		self.assertIn("exc", response.json)
+		self.assertIsInstance(response.json["exc"], str)
+		self.assertIsInstance(eval(response.json["exc"]), list)
 
 	def test_get_list_fields(self):
 		# test 6: fetch response with fields
-		response = self.get(self.DOCTYPE, r'&fields=["description"]')
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "fields": '["description"]'})
 		self.assertEqual(response.status_code, 200)
-		json = frappe._dict(response.json())
+		json = frappe._dict(response.json)
 		self.assertIn("description", json.data[0])
 
 	def test_create_document(self):
 		# test 7: POST method on /api/resource to create doc
-		data = {"description": frappe.mock("paragraph")}
-		response = self.post(self.DOCTYPE, data)
+		data = {"description": frappe.mock("paragraph"), "sid": self.sid}
+		response = self.post(f"/api/resource/{self.DOCTYPE}", data)
 		self.assertEqual(response.status_code, 200)
-		docname = response.json()["data"]["name"]
+		docname = response.json["data"]["name"]
 		self.assertIsInstance(docname, str)
 		self.GENERATED_DOCUMENTS.append(docname)
 
 	def test_update_document(self):
 		# test 8: PUT method on /api/resource to update doc
 		generated_desc = frappe.mock("paragraph")
-		data = {"description": generated_desc}
+		data = {"description": generated_desc, "sid": self.sid}
 		random_doc = choice(self.GENERATED_DOCUMENTS)
 		desc_before_update = frappe.db.get_value(self.DOCTYPE, random_doc, "description")
 
-		response = self.put(f"{self.DOCTYPE}/{random_doc}", data=data)
+		response = self.put(f"/api/resource/{self.DOCTYPE}/{random_doc}", data=data)
 		self.assertEqual(response.status_code, 200)
-		self.assertNotEqual(response.json()["data"]["description"], desc_before_update)
-		self.assertEqual(response.json()["data"]["description"], generated_desc)
+		self.assertNotEqual(response.json["data"]["description"], desc_before_update)
+		self.assertEqual(response.json["data"]["description"], generated_desc)
 
 	def test_delete_document(self):
 		# test 9: DELETE method on /api/resource
 		doc_to_delete = choice(self.GENERATED_DOCUMENTS)
-		response = self.delete(f"{self.DOCTYPE}/{doc_to_delete}")
+		response = self.delete(f"/api/resource/{self.DOCTYPE}/{doc_to_delete}")
 		self.assertEqual(response.status_code, 202)
-		self.assertDictEqual(response.json(), {"message": "ok"})
+		self.assertDictEqual(response.json, {"message": "ok"})
 		self.GENERATED_DOCUMENTS.remove(doc_to_delete)
 
 		non_existent_doc = frappe.generate_hash(length=12)
-		response = self.delete(f"{self.DOCTYPE}/{non_existent_doc}")
+		with suppress_stdout():
+			response = self.delete(f"/api/resource/{self.DOCTYPE}/{non_existent_doc}")
 		self.assertEqual(response.status_code, 404)
-		self.assertDictEqual(response.json(), {})
+		self.assertDictEqual(response.json, {})
 
 
 class TestMethodAPI(unittest.TestCase):
@@ -161,7 +166,7 @@ class TestMethodAPI(unittest.TestCase):
 	def test_version(self):
 		# test 1: test for /api/method/version
 		response = requests.get(f"{self.METHOD_URL}/version")
-		json = frappe._dict(response.json())
+		json = frappe._dict(response.json)
 
 		self.assertEqual(response.status_code, 200)
 		self.assertIsInstance(json, dict)
@@ -172,5 +177,5 @@ class TestMethodAPI(unittest.TestCase):
 		# test 2: test for /api/method/ping
 		response = requests.get(f"{self.METHOD_URL}/ping")
 		self.assertEqual(response.status_code, 200)
-		self.assertIsInstance(response.json(), dict)
-		self.assertEqual(response.json()['message'], "pong")
+		self.assertIsInstance(response.json, dict)
+		self.assertEqual(response.json['message'], "pong")
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 141adb9ea6..92174ac129 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -440,7 +440,15 @@ def touch_file(path):
 
 def get_test_client():
 	from frappe.app import application
-	return Client(application)
+
+	class TestClient(Client):
+		def open(self, *args, **kwargs):
+			site = frappe.local.site
+			ret = super().open(*args, **kwargs)
+			frappe.connect(site=site)
+			return ret
+
+	return TestClient(application)
 
 def get_hook_method(hook_name, fallback=None):
 	method = frappe.get_hooks().get(hook_name)

From 7b4580d6932971a9691b4cfef9a6eb643362581f Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 9 Feb 2022 17:01:13 +0530
Subject: [PATCH 43/74] test(fix): Use FrappeAPITestCase for Method APIs case

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

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 314961fce5..8d5fc80985 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -33,7 +33,6 @@ class FrappeAPITestCase(unittest.TestCase):
 	@property
 	def sid(self):
 		if not getattr(self, "_sid", None):
-			frappe.conf.admin_password = "root"
 			r = self.TEST_CLIENT.post("/api/method/login", data={
 				"usr": "Administrator",
 				"pwd": frappe.conf.admin_password or "admin",
@@ -160,12 +159,13 @@ class TestResourceAPI(FrappeAPITestCase):
 		self.assertDictEqual(response.json, {})
 
 
-class TestMethodAPI(unittest.TestCase):
-	METHOD_URL = f"{get_site_url(frappe.local.site)}/api/method"
+class TestMethodAPI(FrappeAPITestCase):
+	SITE_URL = get_site_url(frappe.local.site)
+	METHOD_PATH = f"/api/method"
 
 	def test_version(self):
 		# test 1: test for /api/method/version
-		response = requests.get(f"{self.METHOD_URL}/version")
+		response = self.get(f"{self.METHOD_PATH}/version")
 		json = frappe._dict(response.json)
 
 		self.assertEqual(response.status_code, 200)
@@ -175,7 +175,7 @@ class TestMethodAPI(unittest.TestCase):
 
 	def test_ping(self):
 		# test 2: test for /api/method/ping
-		response = requests.get(f"{self.METHOD_URL}/ping")
+		response = self.get(f"{self.METHOD_PATH}/ping")
 		self.assertEqual(response.status_code, 200)
 		self.assertIsInstance(response.json, dict)
 		self.assertEqual(response.json['message'], "pong")

From 08279e30c95f46e60a14f5b25565361c38b49ce0 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 10 Feb 2022 01:31:08 +0530
Subject: [PATCH 44/74] fix: Use cls to specify class attrs and self for
 instance's

---
 frappe/tests/test_api.py           | 18 +++++++++---------
 frappe/tests/test_frappe_client.py |  3 ++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 8d5fc80985..108c757ea6 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -26,8 +26,6 @@ class FrappeAPITestCase(unittest.TestCase):
 	SITE = frappe.local.site
 	SITE_URL = get_site_url(SITE)
 	RESOURCE_URL = f"{SITE_URL}/api/resource"
-	DOCTYPE = "ToDo"
-	GENERATED_DOCUMENTS = []
 	TEST_CLIENT = get_test_client()
 
 	@property
@@ -54,20 +52,23 @@ class FrappeAPITestCase(unittest.TestCase):
 
 
 class TestResourceAPI(FrappeAPITestCase):
+	DOCTYPE = "ToDo"
+	GENERATED_DOCUMENTS = []
+
 	@classmethod
-	def setUpClass(self):
+	def setUpClass(cls):
 		frappe.set_user("Administrator")
 		for _ in range(10):
 			doc = frappe.get_doc(
 				{"doctype": "ToDo", "description": frappe.mock("paragraph")}
 			).insert()
-			self.GENERATED_DOCUMENTS.append(doc.name)
+			cls.GENERATED_DOCUMENTS.append(doc.name)
 
 	@classmethod
-	def tearDownClass(self):
+	def tearDownClass(cls):
 		frappe.set_user("Administrator")
-		for name in self.GENERATED_DOCUMENTS:
-			frappe.delete_doc_if_exists(self.DOCTYPE, name)
+		for name in cls.GENERATED_DOCUMENTS:
+			frappe.delete_doc_if_exists(cls.DOCTYPE, name)
 
 	def setUp(self):
 		frappe.set_user("Administrator")
@@ -160,8 +161,7 @@ class TestResourceAPI(FrappeAPITestCase):
 
 
 class TestMethodAPI(FrappeAPITestCase):
-	SITE_URL = get_site_url(frappe.local.site)
-	METHOD_PATH = f"/api/method"
+	METHOD_PATH = "/api/method"
 
 	def test_version(self):
 		# test 1: test for /api/method/version
diff --git a/frappe/tests/test_frappe_client.py b/frappe/tests/test_frappe_client.py
index e84163eb41..28d33d956a 100644
--- a/frappe/tests/test_frappe_client.py
+++ b/frappe/tests/test_frappe_client.py
@@ -10,7 +10,8 @@ import requests
 import base64
 
 class TestFrappeClient(unittest.TestCase):
-	PASSWORD = "admin"
+	PASSWORD = frappe.conf.admin_password or "admin"
+
 	def test_insert_many(self):
 		server = FrappeClient(get_url(), "Administrator", self.PASSWORD, verify=False)
 		frappe.db.delete("Note", {"title": ("in", ('Sing','a','song','of','sixpence'))})

From b264d67b9f5ebd5d3e147585dc87ee647377a178 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 10 Feb 2022 01:43:51 +0530
Subject: [PATCH 45/74] test(fix): Retain data apart from test_api tests

The tests in the TestResourceAPI Case destroy and re-build locals. This
may cause loss of data and make other tests flaky
---
 frappe/tests/test_api.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 108c757ea6..c7597acb3a 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -63,12 +63,14 @@ class TestResourceAPI(FrappeAPITestCase):
 				{"doctype": "ToDo", "description": frappe.mock("paragraph")}
 			).insert()
 			cls.GENERATED_DOCUMENTS.append(doc.name)
+		frappe.db.commit()
 
 	@classmethod
 	def tearDownClass(cls):
 		frappe.set_user("Administrator")
 		for name in cls.GENERATED_DOCUMENTS:
 			frappe.delete_doc_if_exists(cls.DOCTYPE, name)
+		frappe.db.commit()
 
 	def setUp(self):
 		frappe.set_user("Administrator")

From 0f84fb09b6d28f6e8bf7a146963a51360fdc2b21 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 10 Feb 2022 11:36:00 +0530
Subject: [PATCH 46/74] fix: load more button loads only 20 records at a time

---
 frappe/public/js/frappe/list/base_list.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 8fa512bfc0..ed27bdb29e 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -394,7 +394,6 @@ frappe.views.BaseList = class BaseList {
 				this.page_length = $this.data().value;
 			} else if ($this.is(".btn-more")) {
 				this.start = this.start + this.page_length;
-				this.page_length = 20;
 			}
 			this.refresh();
 		});
@@ -475,7 +474,6 @@ frappe.views.BaseList = class BaseList {
 			this.render();
 			this.after_render();
 			this.freeze(false);
-			this.reset_defaults();
 			if (this.settings.refresh) {
 				this.settings.refresh(this);
 			}
@@ -502,11 +500,6 @@ frappe.views.BaseList = class BaseList {
 		this.data = this.data.uniqBy((d) => d.name);
 	}
 
-	reset_defaults() {
-		this.page_length = this.page_length + this.start;
-		this.start = 0;
-	}
-
 	freeze() {
 		// show a freeze message while data is loading
 	}

From 0a47cc0dcd92d2d36c28b3ea9439e42849e0d3eb Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 11 Feb 2022 00:31:52 +0530
Subject: [PATCH 47/74] fix(test): Make requests to the QSGI app in separate
 threads

Did this to mimic how requests are handled in dev/prod servers - new
thread for new request ;)
---
 frappe/tests/test_api.py | 53 ++++++++++++++++++++++++++++++++--------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index c7597acb3a..0a4e3e0c4f 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -2,14 +2,19 @@ import sys
 import unittest
 from contextlib import contextmanager
 from random import choice
-from typing import Dict, Optional
+from typing import Dict, Optional, Tuple
+from threading import Thread
 
 import requests
 from semantic_version import Version
 
 import frappe
-from frappe.utils import get_site_url, get_test_client
+from frappe.utils import get_site_url
 
+try:
+	_site = frappe.local.site
+except Exception:
+	_site = None
 
 @contextmanager
 def suppress_stdout():
@@ -21,6 +26,36 @@ def suppress_stdout():
 	finally:
 		sys.stdout = sys.__stdout__
 
+class ThreadWithReturnValue(Thread):
+	def __init__(self, group=None, target=None, name=None,
+				args=(), kwargs={}, Verbose=None):
+		Thread.__init__(self, group, target, name, args, kwargs)
+		self._return = None
+
+	def run(self):
+		from unittest.mock import patch
+		if self._target is not None:
+			with patch("frappe.app.get_site_name", return_value=_site):
+				# print(self._args, self._kwargs)
+				self._return = self._target(*self._args, **self._kwargs)
+
+	def join(self, *args):
+		Thread.join(self, *args)
+		return self._return
+
+
+def get_test_client():
+	from frappe.app import application
+	from werkzeug.test import Client
+
+	return Client(application)
+
+
+def make_request(target: str, args: Optional[Tuple] = None, kwargs: Optional[Dict] = None):
+	t = ThreadWithReturnValue(target=target, args=args, kwargs=kwargs)
+	t.start()
+	t.join()
+	return t._return
 
 class FrappeAPITestCase(unittest.TestCase):
 	SITE = frappe.local.site
@@ -31,24 +66,25 @@ class FrappeAPITestCase(unittest.TestCase):
 	@property
 	def sid(self):
 		if not getattr(self, "_sid", None):
-			r = self.TEST_CLIENT.post("/api/method/login", data={
+			r = self.post("/api/method/login", {
 				"usr": "Administrator",
 				"pwd": frappe.conf.admin_password or "admin",
 			})
 			self._sid = r.headers[2][1].split(";")[0].lstrip("sid=")
+
 		return self._sid
 
 	def get(self, path: str, params: Optional[Dict] = None):
-		return self.TEST_CLIENT.get(path, data=params)
+		return make_request(target=self.TEST_CLIENT.get, args=(path, ), kwargs={"data": params})
 
 	def post(self, path, data):
-		return self.TEST_CLIENT.post(path, data=frappe.as_json(data))
+		return make_request(target=self.TEST_CLIENT.post, args=(path, ), kwargs={"data": data})
 
 	def put(self, path, data):
-		return self.TEST_CLIENT.put(path, data=frappe.as_json(data))
+		return make_request(target=self.TEST_CLIENT.put, args=(path, ), kwargs={"data": data})
 
 	def delete(self, path):
-		return self.TEST_CLIENT.delete(path)
+		return make_request(target=self.TEST_CLIENT.delete, args=(path, ))
 
 
 class TestResourceAPI(FrappeAPITestCase):
@@ -57,7 +93,6 @@ class TestResourceAPI(FrappeAPITestCase):
 
 	@classmethod
 	def setUpClass(cls):
-		frappe.set_user("Administrator")
 		for _ in range(10):
 			doc = frappe.get_doc(
 				{"doctype": "ToDo", "description": frappe.mock("paragraph")}
@@ -67,13 +102,11 @@ class TestResourceAPI(FrappeAPITestCase):
 
 	@classmethod
 	def tearDownClass(cls):
-		frappe.set_user("Administrator")
 		for name in cls.GENERATED_DOCUMENTS:
 			frappe.delete_doc_if_exists(cls.DOCTYPE, name)
 		frappe.db.commit()
 
 	def setUp(self):
-		frappe.set_user("Administrator")
 		# commit to ensure consistency in session (postgres CI randomly fails)
 		if frappe.conf.db_type == "postgres":
 			frappe.db.commit()

From ca113a7a09c46cf3083296484a3b0e5cdf96020a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 11 Feb 2022 00:34:18 +0530
Subject: [PATCH 48/74] fix(api): Return form_dict if data not parsable

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

diff --git a/frappe/api.py b/frappe/api.py
index e7f7bf5a04..cbef8c29c0 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -159,7 +159,10 @@ def get_request_form_data():
 	else:
 		data = frappe.local.form_dict.data
 
-	return frappe.parse_json(data)
+	try:
+		return frappe.parse_json(data)
+	except ValueError:
+		return frappe.local.form_dict
 
 
 def validate_auth():

From ced22e30f0bbbeda45e8456ed29b610c20b026dc Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 11 Feb 2022 11:47:31 +0530
Subject: [PATCH 49/74] fix(test_api): Don't suppress debug query

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

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 0a4e3e0c4f..94bc3e7d01 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -145,8 +145,7 @@ class TestResourceAPI(FrappeAPITestCase):
 
 	def test_get_list_debug(self):
 		# test 5: fetch response with debug
-		with suppress_stdout():
-			response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "debug": True})
+		response = self.get(f"/api/resource/{self.DOCTYPE}", {"sid": self.sid, "debug": True})
 		self.assertEqual(response.status_code, 200)
 		self.assertIn("exc", response.json)
 		self.assertIsInstance(response.json["exc"], str)

From 8b01c04a75576158aa5ae6cb893db4ed876e84a9 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 11 Feb 2022 13:18:24 +0530
Subject: [PATCH 50/74] chore: Add type hints

---
 frappe/tests/test_api.py           | 43 +++++++++++++-----------------
 frappe/tests/test_frappe_client.py |  1 -
 frappe/utils/__init__.py           | 13 +++------
 3 files changed, 22 insertions(+), 35 deletions(-)

diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index 94bc3e7d01..d1c9588916 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -2,20 +2,23 @@ import sys
 import unittest
 from contextlib import contextmanager
 from random import choice
-from typing import Dict, Optional, Tuple
 from threading import Thread
+from typing import Dict, Optional, Tuple
+from unittest.mock import patch
 
 import requests
 from semantic_version import Version
+from werkzeug.test import TestResponse
 
 import frappe
-from frappe.utils import get_site_url
+from frappe.utils import get_site_url, get_test_client
 
 try:
 	_site = frappe.local.site
 except Exception:
 	_site = None
 
+
 @contextmanager
 def suppress_stdout():
 	"""Supress stdout for tests which expectedly make noise
@@ -26,17 +29,22 @@ def suppress_stdout():
 	finally:
 		sys.stdout = sys.__stdout__
 
+
+def make_request(target: str, args: Optional[Tuple] = None, kwargs: Optional[Dict] = None) -> TestResponse:
+	t = ThreadWithReturnValue(target=target, args=args, kwargs=kwargs)
+	t.start()
+	t.join()
+	return t._return
+
+
 class ThreadWithReturnValue(Thread):
-	def __init__(self, group=None, target=None, name=None,
-				args=(), kwargs={}, Verbose=None):
+	def __init__(self, group=None, target=None, name=None, args=(), kwargs={}):
 		Thread.__init__(self, group, target, name, args, kwargs)
 		self._return = None
 
 	def run(self):
-		from unittest.mock import patch
 		if self._target is not None:
 			with patch("frappe.app.get_site_name", return_value=_site):
-				# print(self._args, self._kwargs)
 				self._return = self._target(*self._args, **self._kwargs)
 
 	def join(self, *args):
@@ -44,19 +52,6 @@ class ThreadWithReturnValue(Thread):
 		return self._return
 
 
-def get_test_client():
-	from frappe.app import application
-	from werkzeug.test import Client
-
-	return Client(application)
-
-
-def make_request(target: str, args: Optional[Tuple] = None, kwargs: Optional[Dict] = None):
-	t = ThreadWithReturnValue(target=target, args=args, kwargs=kwargs)
-	t.start()
-	t.join()
-	return t._return
-
 class FrappeAPITestCase(unittest.TestCase):
 	SITE = frappe.local.site
 	SITE_URL = get_site_url(SITE)
@@ -64,7 +59,7 @@ class FrappeAPITestCase(unittest.TestCase):
 	TEST_CLIENT = get_test_client()
 
 	@property
-	def sid(self):
+	def sid(self) -> str:
 		if not getattr(self, "_sid", None):
 			r = self.post("/api/method/login", {
 				"usr": "Administrator",
@@ -74,16 +69,16 @@ class FrappeAPITestCase(unittest.TestCase):
 
 		return self._sid
 
-	def get(self, path: str, params: Optional[Dict] = None):
+	def get(self, path: str, params: Optional[Dict] = None) -> TestResponse:
 		return make_request(target=self.TEST_CLIENT.get, args=(path, ), kwargs={"data": params})
 
-	def post(self, path, data):
+	def post(self, path, data) -> TestResponse:
 		return make_request(target=self.TEST_CLIENT.post, args=(path, ), kwargs={"data": data})
 
-	def put(self, path, data):
+	def put(self, path, data) -> TestResponse:
 		return make_request(target=self.TEST_CLIENT.put, args=(path, ), kwargs={"data": data})
 
-	def delete(self, path):
+	def delete(self, path) -> TestResponse:
 		return make_request(target=self.TEST_CLIENT.delete, args=(path, ))
 
 
diff --git a/frappe/tests/test_frappe_client.py b/frappe/tests/test_frappe_client.py
index 28d33d956a..2d815d0731 100644
--- a/frappe/tests/test_frappe_client.py
+++ b/frappe/tests/test_frappe_client.py
@@ -170,7 +170,6 @@ class TestFrappeClient(unittest.TestCase):
 		res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header)
 		self.assertEqual(res.status_code, 403)
 
-
 		# random api key and api secret
 		api_key = "@3djdk3kld"
 		api_secret = "ksk&93nxoe3os"
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 92174ac129..1233bcd30f 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -438,17 +438,10 @@ def touch_file(path):
 		os.utime(path, None)
 	return path
 
-def get_test_client():
+def get_test_client() -> Client:
+	"""Returns an test instance of the Frappe WSGI"""
 	from frappe.app import application
-
-	class TestClient(Client):
-		def open(self, *args, **kwargs):
-			site = frappe.local.site
-			ret = super().open(*args, **kwargs)
-			frappe.connect(site=site)
-			return ret
-
-	return TestClient(application)
+	return Client(application)
 
 def get_hook_method(hook_name, fallback=None):
 	method = frappe.get_hooks().get(hook_name)

From 19504d3908953e09377b253945a8308da20fc7af Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 11 Feb 2022 15:20:32 +0530
Subject: [PATCH 51/74] test: Add tests for auth & run_method

---
 frappe/api.py            |  1 -
 frappe/tests/test_api.py | 56 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/frappe/api.py b/frappe/api.py
index cbef8c29c0..226853c47b 100644
--- a/frappe/api.py
+++ b/frappe/api.py
@@ -211,7 +211,6 @@ def validate_oauth(authorization_header):
 		pass
 
 
-
 def validate_auth_via_api_keys(authorization_header):
 	"""
 	Authenticate request using API keys and set session user
diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py
index d1c9588916..93875f7784 100644
--- a/frappe/tests/test_api.py
+++ b/frappe/tests/test_api.py
@@ -18,6 +18,7 @@ try:
 except Exception:
 	_site = None
 
+authorization_token = None
 
 @contextmanager
 def suppress_stdout():
@@ -37,6 +38,11 @@ def make_request(target: str, args: Optional[Tuple] = None, kwargs: Optional[Dic
 	return t._return
 
 
+def patch_request_header(key, *args, **kwargs):
+	if key == "Authorization":
+		return f"token {authorization_token}"
+
+
 class ThreadWithReturnValue(Thread):
 	def __init__(self, group=None, target=None, name=None, args=(), kwargs={}):
 		Thread.__init__(self, group, target, name, args, kwargs)
@@ -45,7 +51,12 @@ class ThreadWithReturnValue(Thread):
 	def run(self):
 		if self._target is not None:
 			with patch("frappe.app.get_site_name", return_value=_site):
+				header_patch = patch("frappe.get_request_header", new=patch_request_header)
+				if authorization_token:
+					header_patch.start()
 				self._return = self._target(*self._args, **self._kwargs)
+				if authorization_token:
+					header_patch.stop()
 
 	def join(self, *args):
 		Thread.join(self, *args)
@@ -106,6 +117,11 @@ class TestResourceAPI(FrappeAPITestCase):
 		if frappe.conf.db_type == "postgres":
 			frappe.db.commit()
 
+		if self._testMethodName == "test_auth_cycle":
+			from frappe.core.doctype.user.user import generate_keys
+			generate_keys("Administrator")
+			frappe.db.commit()
+
 	def test_unauthorized_call(self):
 		# test 1: fetch documents without auth
 		response = requests.get(f"{self.RESOURCE_URL}/{self.DOCTYPE}")
@@ -188,6 +204,24 @@ class TestResourceAPI(FrappeAPITestCase):
 		self.assertEqual(response.status_code, 404)
 		self.assertDictEqual(response.json, {})
 
+	def test_run_doc_method(self):
+		# test 10: Run whitelisted method on doc via /api/resource
+		# status_code is 403 if no other tests are run before this - it's not logged in
+		self.post("/api/resource/Website Theme/Standard", {"run_method": "get_apps"})
+		response = self.get("/api/resource/Website Theme/Standard", {"run_method": "get_apps"})
+		self.assertIn(response.status_code, (403, 200))
+
+		if response.status_code == 403:
+			self.assertTrue(set(response.json.keys()) == {'exc_type', 'exception', 'exc', '_server_messages'})
+			self.assertEqual(response.json.get('exc_type'), 'PermissionError')
+			self.assertEqual(response.json.get('exception'), 'frappe.exceptions.PermissionError: Not permitted')
+			self.assertIsInstance(response.json.get('exc'), str)
+
+		elif response.status_code == 200:
+			data = response.json.get("data")
+			self.assertIsInstance(data, list)
+			self.assertIsInstance(data[0], dict)
+
 
 class TestMethodAPI(FrappeAPITestCase):
 	METHOD_PATH = "/api/method"
@@ -207,4 +241,24 @@ class TestMethodAPI(FrappeAPITestCase):
 		response = self.get(f"{self.METHOD_PATH}/ping")
 		self.assertEqual(response.status_code, 200)
 		self.assertIsInstance(response.json, dict)
-		self.assertEqual(response.json['message'], "pong")
+		self.assertEqual(response.json["message"], "pong")
+
+	def test_get_user_info(self):
+		# test 3: test for /api/method/frappe.realtime.get_user_info
+		response = self.get(f"{self.METHOD_PATH}/frappe.realtime.get_user_info")
+		self.assertEqual(response.status_code, 200)
+		self.assertIsInstance(response.json, dict)
+		self.assertIn(response.json.get("message").get("user"), ("Administrator", "Guest"))
+
+	def test_auth_cycle(self):
+		# test 4: Pass authorization token in request
+		global authorization_token
+		user = frappe.get_doc("User", "Administrator")
+		api_key, api_secret = user.api_key, user.get_password("api_secret")
+		authorization_token = f"{api_key}:{api_secret}"
+		response = self.get("/api/method/frappe.auth.get_logged_user")
+
+		self.assertEqual(response.status_code, 200)
+		self.assertEqual(response.json["message"], "Administrator")
+
+		authorization_token = None

From e6d1a7a476164242fdf2d64c2769eedb559d2322 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Thu, 10 Feb 2022 12:55:46 +0530
Subject: [PATCH 52/74] fix: get_input_value for link control

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

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 29a2140085..16f20cf925 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -108,7 +108,10 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		return this.validate_and_set_in_model(value, e);
 	}
 	get_input_value() {
-		return (this.$input && this.data_value && this.$input.val()) ? this.data_value : "";
+		if (this.$input) {
+			return this.data_value ? this.data_value : this.$input.val();
+		}
+		return null;
 	}
 	get_label_value() {
 		return this.$input ? this.$input.val() : "";

From de76ef6518ea9e12f3bb82ebaa355d4e7ec16394 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Sat, 12 Feb 2022 13:01:06 +0530
Subject: [PATCH 53/74] test: doctypes are added to link_title_map in boot_info

---
 frappe/tests/test_utils.py | 47 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/frappe/tests/test_utils.py b/frappe/tests/test_utils.py
index 27d1f7651d..daf41a5d24 100644
--- a/frappe/tests/test_utils.py
+++ b/frappe/tests/test_utils.py
@@ -419,3 +419,50 @@ class TestXlsxUtils(unittest.TestCase):
 		val = handle_html("<p>html data &gt;</p>")
 		self.assertIn("html data >", val)
 		self.assertEqual("abc", handle_html("abc"))
+
+
+class TestLinkTitle(unittest.TestCase):
+	def test_link_title_doctypes_in_boot_info(self):
+		"""
+		Test that doctypes are added to link_title_map in boot_info
+		"""
+		custom_doctype = frappe.get_doc(
+			{
+				"doctype": "DocType",
+				"module": "Core",
+				"custom": 1,
+				"fields": [
+					{
+						"label": "Test Field",
+						"fieldname": "test_title_field",
+						"fieldtype": "Data",
+					}
+				],
+				"show_title_field_in_link": 1,
+				"title_field": "test_title_field",
+				"permissions": [{"role": "System Manager", "read": 1}],
+				"name": "Test Custom Doctype for Link Title",
+			}
+		)
+		custom_doctype.insert()
+
+		prop_setter = frappe.get_doc(
+			{
+				"doctype": "Property Setter",
+				"doc_type": "User",
+				"property": "show_title_field_in_link",
+				"property_type": "Check",
+				"doctype_or_field": "DocType",
+				"value": "1",
+			}
+		).insert()
+
+		from frappe.boot import get_link_title_doctypes
+
+		link_title_doctypes = get_link_title_doctypes()
+		self.assertTrue("User" in link_title_doctypes)
+		self.assertTrue("Test Custom Doctype for Link Title" in link_title_doctypes)
+
+		prop_setter.delete()
+		custom_doctype.delete()
+

From 92aee42cf7999698ab57f60b8fcf821c75a7fc57 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Sat, 12 Feb 2022 13:01:35 +0530
Subject: [PATCH 54/74] test: link titles are added to the doctype on getdoc

---
 frappe/tests/test_utils.py | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/frappe/tests/test_utils.py b/frappe/tests/test_utils.py
index daf41a5d24..15029e961a 100644
--- a/frappe/tests/test_utils.py
+++ b/frappe/tests/test_utils.py
@@ -466,3 +466,49 @@ class TestLinkTitle(unittest.TestCase):
 		prop_setter.delete()
 		custom_doctype.delete()
 
+	def test_link_titles_on_getdoc(self):
+		"""
+		Test that link titles are added to the doctype on getdoc
+		"""
+		prop_setter = frappe.get_doc(
+			{
+				"doctype": "Property Setter",
+				"doc_type": "User",
+				"property": "show_title_field_in_link",
+				"property_type": "Check",
+				"doctype_or_field": "DocType",
+				"value": "1",
+			}
+		).insert()
+
+		user = frappe.get_doc(
+			{
+				"doctype": "User",
+				"user_type": "Website User",
+				"email": "test_user_for_link_title@example.com",
+				"send_welcome_email": 0,
+				"first_name": "Test User for Link Title",
+			}
+		).insert(ignore_permissions=True)
+
+		todo = frappe.get_doc(
+			{
+				"doctype": "ToDo",
+				"description": "test-link-title-on-getdoc",
+				"allocated_to": user.name,
+			}
+		).insert()
+
+		from frappe.desk.form.load import getdoc
+
+		getdoc("ToDo", todo.name)
+		link_titles = frappe.local.response["_link_titles"]
+
+		self.assertTrue(f"{user.doctype}::{user.name}" in link_titles)
+		self.assertEqual(link_titles[f"{user.doctype}::{user.name}"], user.full_name)
+
+		todo.delete()
+		user.delete()
+		prop_setter.delete()
+
+

From 024a7605a6e90cdab980f805a8d800266c12b782 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Sat, 12 Feb 2022 13:08:08 +0530
Subject: [PATCH 55/74] perf: cache link title after fetching

---
 frappe/public/js/frappe/utils/utils.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 715a93daee..3495a69cb5 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1444,6 +1444,9 @@ Object.assign(frappe.utils, {
 			return frappe.xcall("frappe.desk.search.get_link_title", {
 				"doctype": doctype,
 				"docname": name
+			}).then(title => {
+				frappe.utils.add_link_title(doctype, name, title);
+				return title;
 			});
 		} catch (error) {
 			console.log('Error while fetching link title.');

From cd3a6261fba662211e844f99262705a6fe7794cd Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Sat, 12 Feb 2022 13:42:44 +0530
Subject: [PATCH 56/74] chore: remove property setter after test

---
 cypress/integration/control_link.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index c954233bbf..964e5306aa 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -134,6 +134,8 @@ context('Control Link', () => {
 
 				expect(value).to.eq(todos[0]);
 				expect(label).to.eq('this is a test todo for link');
+
+				cy.remove_doc("Property Setter", "ToDo-main-show_title_field_in_link");
 			});
 		});
 	});

From 8e8470b3c5534da8bc61ce5717de34087fcb723e Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Sat, 12 Feb 2022 16:19:58 +0530
Subject: [PATCH 57/74] fix: fetch_from fields doesn't reset on link value
 change

---
 frappe/public/js/frappe/form/controls/link.js | 40 +++++--------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 16f20cf925..2295cad41a 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -35,8 +35,6 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 				}
 
 				if(!me.$input.val()) {
-					me.reset_value();
-					me.reset_fetch_values(me.df, me.docname);
 					me.$input.val("").trigger("input");
 				}
 			}, 500);
@@ -75,8 +73,10 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 		super.set_formatted_input();
 		if (!value) return;
 
+		if (!this.title_value_map) {
+			this.title_value_map = {};
+		}
 		this.set_link_title(value);
-		this.data_value = value;
 	}
 	set_link_title(value) {
 		let doctype = this.get_options();
@@ -90,15 +90,17 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 					.fetch_link_title(doctype, value)
 					.then(link_title => {
 						this.set_input_value(link_title);
+						this.title_value_map[link_title] = value;
 					});
 			} else {
 				this.set_input_value(link_title);
+				this.title_value_map[link_title] = value;
 			}
 		} else {
 			this.set_input_value(value);
 		}
 	}
-	parse_validate_and_set_in_model(value, label, e) {
+	parse_validate_and_set_in_model(value, e, label) {
 		if (this.parse) value = this.parse(value, label);
 		if (label) {
 			this.label = label;
@@ -109,7 +111,8 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 	}
 	get_input_value() {
 		if (this.$input) {
-			return this.data_value ? this.data_value : this.$input.val();
+			const input_value = this.$input.val();
+			return this.title_value_map?.[input_value] || input_value;
 		}
 		return null;
 	}
@@ -119,13 +122,6 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 	set_input_value(value) {
 		this.$input && this.$input.val(value);
 	}
-	reset_value() {
-		if (!this.$input) {
-			return;
-		}
-		this.$input.val("");
-		this.data_value = null;
-	}
 	open_advanced_search() {
 		var doctype = this.get_options();
 		if(!doctype) return;
@@ -302,7 +298,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 			let label = me.get_label_value();
 
 			if (value !== me.last_value || me.label !== label) {
-				me.parse_validate_and_set_in_model(value, label);
+				me.parse_validate_and_set_in_model(value, null, label);
 			}
 		});
 
@@ -342,14 +338,13 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 				frappe.boot.user.last_selected_values[me.df.options] = item.value;
 			}
 
-			me.parse_validate_and_set_in_model(item.value, item.label);
+			me.parse_validate_and_set_in_model(item.value, null, item.label);
 		});
 
 		this.$input.on("awesomplete-selectcomplete", function(e) {
 			let o = e.originalEvent;
 			if (o.text.value.indexOf("__link_option") !== -1) {
-				me.reset_value();
-				me.reset_fetch_values(me.df, me.docname);
+				me.$input.val("");
 			}
 		});
 	}
@@ -536,12 +531,6 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 	validate_link_and_fetch(df, options, docname, value) {
 		if (!options) return;
 
-		if (!value) {
-			this.reset_value();
-			this.reset_fetch_values(df, docname);
-			return;
-		};
-
 		const fetch_map = this.fetch_map;
 		const columns_to_fetch = Object.values(fetch_map);
 
@@ -593,13 +582,6 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat
 
 		return fetch_map;
 	}
-	reset_fetch_values(df, docname) {
-		let fields = this.frm && this.frm.fetch_dict && this.frm.fetch_dict[df.fieldname] ? this.frm.fetch_dict[df.fieldname].fields : [];
-
-		fields.forEach(field => {
-			frappe.model.set_value(df.parent, docname, field, null, df.fieldtype);
-		});
-	}
 };
 
 if (Awesomplete) {

From 882c68671d89352e131f0938dc47b411cc473b83 Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Mon, 14 Feb 2022 12:22:40 +0530
Subject: [PATCH 58/74] fix: ignore `doctype` in setter

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

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 8380161050..f6b7d05079 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -74,8 +74,12 @@ def get_controller(doctype):
 
 class BaseDocument(object):
 	ignore_in_getter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns")
+	ignore_in_setter = ("doctype",)
 
 	def __init__(self, d):
+		if d.get("doctype"):
+			self.doctype = d["doctype"]
+
 		self.update(d)
 		self.dont_update_if_missing = []
 
@@ -157,6 +161,9 @@ class BaseDocument(object):
 		return self.get(key, filters=filters, limit=1)[0]
 
 	def set(self, key, value, as_value=False):
+		if key in self.ignore_in_setter:
+			return
+
 		if isinstance(value, list) and not as_value:
 			self.__dict__[key] = []
 			self.extend(key, value)

From eb6189824651f3b8f6b6c250eaabd086f7f5b5fb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 14 Feb 2022 13:24:32 +0530
Subject: [PATCH 59/74] style: added css for list count selection buttons

---
 frappe/public/scss/common/css_variables.scss |  2 ++
 frappe/public/scss/desk/list.scss            | 26 +++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss
index b8b7f869fa..5871ac3626 100644
--- a/frappe/public/scss/common/css_variables.scss
+++ b/frappe/public/scss/common/css_variables.scss
@@ -136,6 +136,8 @@
 	--shadow-md:  0px 8px 14px rgba(25, 39, 52, 0.08), 0px 2px 6px rgba(25, 39, 52, 0.04);
 	--shadow-lg: 0px 18px 22px rgba(25, 39, 52, 0.1), 0px 1px 10px rgba(0, 0, 0, 0.06), 0px 0.5px 5px rgba(25, 39, 52, 0.04);
 
+	--drop-shadow: 0px 0.5px 0px rgba(0, 0, 0, 0.05), 0px 0px 0px rgba(0, 0, 0, 0), 0px 2px 4px rgba(0, 0, 0, 0.05);
+
 	--modal-shadow: var(--shadow-md);
 	--card-shadow: var(--shadow-sm);
 	--btn-shadow: var(--shadow-xs);
diff --git a/frappe/public/scss/desk/list.scss b/frappe/public/scss/desk/list.scss
index a49b5a463e..b6cf6d7711 100644
--- a/frappe/public/scss/desk/list.scss
+++ b/frappe/public/scss/desk/list.scss
@@ -187,7 +187,31 @@ $level-margin-right: 8px;
 }
 
 .list-paging-area, .footnote-area {
-	border-top: 1px sol var(--border-color);
+	border-top: 1px solid var(--border-color);
+
+	.btn-group {
+		box-shadow: var(--drop-shadow);
+		border-radius: var(--border-radius-md);
+
+		&> .btn:nth-child(2) {
+			border-left: none;
+			border-right: none;
+		}
+
+		.btn-paging {
+			box-shadow: none;
+			margin-left: 0px !important;
+			border: 1px solid var(--dark-border-color);
+	
+			&.btn-info {
+				background-color: var(--gray-400);
+				border-color: var(--gray-400);
+				color: var(--white);
+				font-weight: var(--text-bold);
+			}
+		}
+	}
+
 }
 
 .frappe-card {

From 8a882cf09abd2aeb8c168f0489dfaeca334e27a1 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Mon, 14 Feb 2022 15:11:09 +0530
Subject: [PATCH 60/74] chore: add missing semicolon

---
 cypress/integration/control_link.js    | 2 +-
 frappe/public/js/frappe/utils/utils.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index 964e5306aa..7a7e94d2f5 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -111,7 +111,7 @@ context('Control Link', () => {
 			if (!frappe.boot) {
 				frappe.boot = {
 					link_title_doctypes: ['ToDo']
-				}
+				};
 			} else {
 				frappe.boot.link_title_doctypes = ['ToDo'];
 			}
diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
index 3495a69cb5..dc75239ed5 100644
--- a/frappe/public/js/frappe/utils/utils.js
+++ b/frappe/public/js/frappe/utils/utils.js
@@ -1449,8 +1449,8 @@ Object.assign(frappe.utils, {
 				return title;
 			});
 		} catch (error) {
-			console.log('Error while fetching link title.');
-			console.log(error);
+			console.log('Error while fetching link title.'); // eslint-disable-line
+			console.log(error); // eslint-disable-line
 			return Promise.resolve(name);
 		}
 	}

From f63b02191d48c7f30c8ae20e523c6af71f1403a9 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Mon, 14 Feb 2022 15:11:14 +0530
Subject: [PATCH 61/74] perf: cache db.get_value

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

diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py
index e8d35bea69..4d35ebf5e8 100644
--- a/frappe/desk/form/load.py
+++ b/frappe/desk/form/load.py
@@ -391,7 +391,9 @@ def get_title_values_for_link_and_dynamic_link_fields(doc, link_fields=None):
 		if not meta or not (meta.title_field and meta.show_title_field_in_link):
 			continue
 
-		link_title = frappe.db.get_value(doctype, doc.get(field.fieldname), meta.title_field)
+		link_title = frappe.db.get_value(
+			doctype, doc.get(field.fieldname), meta.title_field, cache=True
+		)
 		link_titles.update({doctype + "::" + doc.get(field.fieldname): link_title})
 
 	return link_titles

From 954b932c10f5448810a33b447468522777ad3084 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Date: Mon, 14 Feb 2022 11:48:17 +0100
Subject: [PATCH 62/74] added menu translations (#15879)

added menu translations when navigating over avater
---
 frappe/translations/de.csv | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv
index f682a51e17..4a856131ab 100644
--- a/frappe/translations/de.csv
+++ b/frappe/translations/de.csv
@@ -148,6 +148,8 @@ More Information,Mehr Informationen,
 More...,Mehr...,
 Move,Bewegen,
 My Account,Mein Konto,
+My Profile,Mein Profil,
+My Settings,Meine Einstellungen,
 New Address,Neue Adresse,
 New Contact,Neuer Kontakt,
 Next,Weiter,

From 16ef2d3b135718a30f1bc9df2116f71cc0e0b279 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 14 Feb 2022 17:48:20 +0530
Subject: [PATCH 63/74] ci(Mergify): Configuration update (#15968)

---
 .mergify.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 0bd9641d5b..63fe1a0086 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -48,3 +48,7 @@ pull_request_rules:
     actions:
       merge:
         method: squash
+        commit_message_template: |
+            {{ title }} (#{{ number }})
+
+            {{ body }}

From 8995bbb8339561b4663734eba3970c7195aac701 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Date: Mon, 14 Feb 2022 13:25:27 +0100
Subject: [PATCH 64/74] fix: Update translations (#15886)

For better understanding on what this does. For "Submit" the german word "Buchen" or "gebucht" ist used mostly in the system.

![grafik](https://user-images.githubusercontent.com/22279621/152641036-ee89f81d-4a10-4686-8f67-646af6a8087f.png)
---
 frappe/translations/de.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv
index 4a856131ab..17151a14eb 100644
--- a/frappe/translations/de.csv
+++ b/frappe/translations/de.csv
@@ -408,7 +408,7 @@ Allow Self Approval,Erlaube Selbstgenehmigung,
 Allow approval for creator of the document,Genehmigung für den Ersteller des Dokuments zulassen,
 Allow events in timeline,Ereignisse in der Zeitleiste zulassen,
 Allow in Quick Entry,In Schnelleingabe zulassen,
-Allow on Submit,Beim Übertragen zulassen,
+Allow on Submit,Änderungen zulassen wenn gebucht,
 Allow only one session per user,Nur eine Sitzung pro Benutzer zulassen,
 Allow page break inside tables,Seitenumbruch innerhalb von Tabellen erlauben,
 Allow saving if mandatory fields are not filled,Speichern trotz leerer Pflichtfelder zulassen,

From b5f17888a8b6d5325c09274adc9f100df8dcf764 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 14 Feb 2022 18:21:12 +0530
Subject: [PATCH 65/74] fix: Image action not in center of image in mobile view

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

diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
index 82bd1cdf13..0bb6ba5f40 100644
--- a/frappe/public/scss/desk/sidebar.scss
+++ b/frappe/public/scss/desk/sidebar.scss
@@ -104,10 +104,10 @@ body[data-route^="Module"] .main-menu {
 	}
 
 	.sidebar-image-section {
+		width: min(100%, 170px);
 		cursor: pointer;
 
 		.sidebar-image {
-			width: min(100%, 170px);
 			height: auto;
 			max-height: 170px;
 			object-fit: cover;

From e20c1ef013c4b687a10e03671cd4aa1ce70f30cb Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 14 Feb 2022 20:25:44 +0530
Subject: [PATCH 66/74] fix(patch): ReSync Custom FIeld schema

---
 frappe/patches.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index db9610a767..0d2a6162c2 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -184,6 +184,7 @@ frappe.patches.v13_0.queryreport_columns
 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
+execute:frappe.reload_doc('custom', 'doctype', 'custom_field')
 frappe.patches.v14_0.update_workspace2 # 20.09.2021
 frappe.patches.v14_0.save_ratings_in_fraction #23-12-2021
 frappe.patches.v14_0.transform_todo_schema

From 57c7f63d44859e716e330c7c53cdb7b6f9a9c297 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 14 Feb 2022 20:26:56 +0530
Subject: [PATCH 67/74] fix: Add ignore_virtual option to get_valid_dict

Allows to create new Documents with virtual docfields
---
 frappe/model/base_document.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index ea4264212b..18b9212e1d 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -242,7 +242,7 @@ class BaseDocument(object):
 
 		return value
 
-	def get_valid_dict(self, sanitize=True, convert_dates_to_str=False, ignore_nulls = False):
+	def get_valid_dict(self, sanitize=True, convert_dates_to_str=False, ignore_nulls=False, ignore_virtual=False):
 		d = frappe._dict()
 		for fieldname in self.meta.get_valid_columns():
 			d[fieldname] = self.get(fieldname)
@@ -254,6 +254,10 @@ class BaseDocument(object):
 			df = self.meta.get_field(fieldname)
 
 			if df and df.get("is_virtual"):
+				if ignore_virtual:
+					del d[fieldname]
+					continue
+
 				from frappe.utils.safe_exec import get_safe_globals
 
 				if d[fieldname] is None:
@@ -412,7 +416,11 @@ class BaseDocument(object):
 			self.created_by = self.modified_by = frappe.session.user
 
 		# if doctype is "DocType", don't insert null values as we don't know who is valid yet
-		d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in DOCTYPES_FOR_DOCTYPE)
+		d = self.get_valid_dict(
+			convert_dates_to_str=True,
+			ignore_nulls=self.doctype in DOCTYPES_FOR_DOCTYPE,
+			ignore_virtual=True,
+		)
 
 		columns = list(d)
 		try:
@@ -766,7 +774,7 @@ class BaseDocument(object):
 
 		type_map = frappe.db.type_map
 
-		for fieldname, value in self.get_valid_dict().items():
+		for fieldname, value in self.get_valid_dict(ignore_virtual=True).items():
 			df = self.meta.get_field(fieldname)
 
 			if not df or df.fieldtype == 'Check':
@@ -844,7 +852,7 @@ class BaseDocument(object):
 		if frappe.flags.in_install:
 			return
 
-		for fieldname, value in self.get_valid_dict().items():
+		for fieldname, value in self.get_valid_dict(ignore_virtual=True).items():
 			if not value or not isinstance(value, str):
 				continue
 

From 5e57a9004d68a18c4c19fc89753152e0824a5216 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 15 Feb 2022 10:21:40 +0530
Subject: [PATCH 68/74] fix: Set value as string for property setter

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

diff --git a/frappe/boot.py b/frappe/boot.py
index f6dfe0bc79..524913059c 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -329,7 +329,7 @@ def get_link_title_doctypes():
 	dts = frappe.get_all("DocType", {"show_title_field_in_link": 1})
 	custom_dts = frappe.get_all(
 		"Property Setter",
-		{"property": "show_title_field_in_link", "value": 1},
+		{"property": "show_title_field_in_link", "value": "1"},
 		["doc_type as name"],
 	)
 	return [d.name for d in dts + custom_dts if d]

From a403934265d05b5c1ff068a2fa13f170252e6d8d Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 15 Feb 2022 12:03:26 +0530
Subject: [PATCH 69/74] test(fix): Generate Note to ensure at least one exists

ref: Failing Postgres CI on https://github.com/frappe/frappe/runs/5186523978?check_suite_focus=true
---
 frappe/tests/test_document.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index a0c44c5c72..4d399a9c94 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -271,6 +271,10 @@ class TestDocument(unittest.TestCase):
 		"""Virtual fields are accessible via API and Form views, whenever .as_dict is invoked
 		"""
 		frappe.db.delete("Custom Field", {"dt": "Note", "fieldname":"age"})
+		note = frappe.new_doc("Note")
+		note.content = "some content"
+		note.title = frappe.generate_hash(length=20)
+		note.insert()
 
 		def patch_note():
 			return patch("frappe.controllers", new={frappe.local.site: {'Note': CustomTestNote}})

From e258a06d5aa67e0f00b11c658d65cda2df919184 Mon Sep 17 00:00:00 2001
From: Saqib Ansari <nextchamp.saqib@gmail.com>
Date: Tue, 15 Feb 2022 12:00:25 +0530
Subject: [PATCH 70/74] feat: show label in MultiSelectPills

---
 .../public/js/frappe/form/controls/multiselect_pills.js   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_pills.js b/frappe/public/js/frappe/form/controls/multiselect_pills.js
index b4a1ecf30d..bf93ac0dd8 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_pills.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_pills.js
@@ -83,15 +83,21 @@ frappe.ui.form.ControlMultiSelectPills = class ControlMultiSelectPills extends f
 	}
 
 	get_pill_html(value) {
+		const label = this.get_label(value);
 		const encoded_value = encodeURIComponent(value);
 		return `
 			<button class="data-pill btn tb-selected-value" data-value="${encoded_value}">
-				<span class="btn-link-to-form">${__(value)}</span>
+				<span class="btn-link-to-form">${__(label || value)}</span>
 				<span class="btn-remove">${frappe.utils.icon('close')}</span>
 			</button>
 		`;
 	}
 
+	get_label(value) {
+		const item = this._data?.find(d => d.value === value);
+		return item ? item.label || item.value : null;
+	}
+
 	get_awesomplete_settings() {
 		const settings = super.get_awesomplete_settings();
 

From 8a264d05cacf8501dab393f009aa899190e5f7d2 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Tue, 15 Feb 2022 13:02:20 +0530
Subject: [PATCH 71/74] fix: remove `ignore_in_getter`; cleaner implementation

---
 frappe/model/base_document.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index f6b7d05079..d55ed6cbd2 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -73,8 +73,7 @@ def get_controller(doctype):
 	return site_controllers[doctype]
 
 class BaseDocument(object):
-	ignore_in_getter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns")
-	ignore_in_setter = ("doctype",)
+	ignore_in_setter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns")
 
 	def __init__(self, d):
 		if d.get("doctype"):
@@ -148,10 +147,11 @@ class BaseDocument(object):
 			else:
 				value = self.__dict__.get(key, default)
 
-			if value is None and key not in self.ignore_in_getter \
-				and key in (d.fieldname for d in self.meta.get_table_fields()):
-				self.set(key, [])
-				value = self.__dict__.get(key)
+			if value is None and key in (
+				d.fieldname for d in self.meta.get_table_fields()
+			):
+				value = []
+				self.set(key, value)
 
 			return value
 		else:

From 7ce9f1eaa1acd8c9d7ef618c06dc91182e8e5d93 Mon Sep 17 00:00:00 2001
From: Pruthvi Patel <pruthvipatel145@gmail.com>
Date: Tue, 15 Feb 2022 13:06:55 +0530
Subject: [PATCH 72/74] fix: limit without filter

---
 frappe/model/base_document.py | 3 +++
 frappe/tests/test_document.py | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index ea4264212b..a386313dc2 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -149,6 +149,9 @@ class BaseDocument(object):
 				self.set(key, [])
 				value = self.__dict__.get(key)
 
+			if limit and isinstance(value, (list, tuple)) and len(value) > limit:
+				value = value[:limit]
+
 			return value
 		else:
 			return self.__dict__
diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py
index a0c44c5c72..71af7e996f 100644
--- a/frappe/tests/test_document.py
+++ b/frappe/tests/test_document.py
@@ -264,7 +264,10 @@ class TestDocument(unittest.TestCase):
 
 	def test_limit_for_get(self):
 		doc = frappe.get_doc("DocType", "DocType")
-		# assuming DocType has more that 3 Data fields
+		# assuming DocType has more than 3 Data fields
+		self.assertEquals(len(doc.get("fields", limit=3)), 3)
+
+		# limit with filters
 		self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3)
 
 	def test_virtual_fields(self):

From 81f4e2b00910ee47e8abb6e7b7534e51d2064baa Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 15 Feb 2022 13:47:20 +0530
Subject: [PATCH 73/74] test: UI test for list/report view paging

---
 cypress/integration/report_view.js | 56 +++++++++++++++++++++++-------
 frappe/tests/ui_test_helpers.py    |  6 ++++
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js
index 0253e8fd43..5a0b13a3a0 100644
--- a/cypress/integration/report_view.js
+++ b/cypress/integration/report_view.js
@@ -11,30 +11,60 @@ context('Report View', () => {
 			'title': 'Doc 1',
 			'description': 'Random Text',
 			'enabled': 0,
-			// submit document
-			'docstatus': 1
-		}, true).as('doc');
+			'docstatus': 1 // submit document
+		}, true);
+		return cy.window().its('frappe').then(frappe => {
+			return frappe.call("frappe.tests.ui_test_helpers.create_multiple_contact_records");
+		});
 	});
+
 	it('Field with enabled allow_on_submit should be editable.', () => {
 		cy.intercept('POST', 'api/method/frappe.client.set_value').as('value-update');
 		cy.visit(`/app/List/${doctype_name}/Report`);
+
 		// check status column added from docstatus
 		cy.get('.dt-row-0 > .dt-cell--col-3').should('contain', 'Submitted');
 		let cell = cy.get('.dt-row-0 > .dt-cell--col-4');
+
 		// select the cell
 		cell.dblclick();
 		cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true });
+
 		cy.wait('@value-update');
-		cy.get('@doc').then(doc => {
-			cy.call('frappe.client.get_value', {
-				doctype: doc.doctype,
-				filters: {
-					name: doc.name,
-				},
-				fieldname: 'enabled'
-			}).then(r => {
-				expect(r.message.enabled).to.equals(1);
-			});
+
+		cy.call('frappe.client.get_value', {
+			doctype: doctype_name,
+			filters: {
+				title: 'Doc 1',
+			},
+			fieldname: 'enabled'
+		}).then(r => {
+			expect(r.message.enabled).to.equals(1);
 		});
 	});
+
+	it('test load more with count selection buttons', () => {
+		cy.visit('/app/contact/view/report');
+
+		cy.clear_filters();
+		cy.get('.list-paging-area .list-count').should('contain.text', '20 of');
+		cy.get('.list-paging-area .btn-more').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '40 of');
+		cy.get('.list-paging-area .btn-more').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '60 of');
+
+		cy.get('.list-paging-area .btn-group .btn-paging[data-value="100"]').click();
+
+		cy.get('.list-paging-area .list-count').should('contain.text', '100 of');
+		cy.get('.list-paging-area .btn-more').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '200 of');
+		cy.get('.list-paging-area .btn-more').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '300 of');
+
+		cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click();
+
+		cy.get('.list-paging-area .list-count').should('contain.text', '500 of');
+		cy.get('.list-paging-area .btn-more').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '1000 of');
+	});
 });
\ No newline at end of file
diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py
index b299df522c..079dcc64ef 100644
--- a/frappe/tests/ui_test_helpers.py
+++ b/frappe/tests/ui_test_helpers.py
@@ -134,6 +134,12 @@ def create_contact_records():
 	insert_contact('Test Form Contact 2', '54321')
 	insert_contact('Test Form Contact 3', '12345')
 
+@frappe.whitelist()
+def create_multiple_contact_records():
+	if frappe.db.get_all('Contact', {'first_name': 'Multiple Contact 1'}):
+		return
+	for index in range(1001):
+		insert_contact('Multiple Contact {}'.format(index+1), '12345{}'.format(index+1))
 
 def insert_contact(first_name, phone_number):
 	doc = frappe.get_doc({

From 8ba50a8b142dcc036ef2f86aa3d641df656e2c21 Mon Sep 17 00:00:00 2001
From: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com>
Date: Tue, 15 Feb 2022 19:30:08 +0530
Subject: [PATCH 74/74] feat: add button in dashboard list redirecting to
 dashboard view. (#15695)

Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local>
Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
---
 frappe/desk/doctype/dashboard/dashboard_list.js | 16 ++++++++++++++++
 frappe/public/icons/timeless/symbol-defs.svg    |  7 +++++++
 2 files changed, 23 insertions(+)
 create mode 100644 frappe/desk/doctype/dashboard/dashboard_list.js

diff --git a/frappe/desk/doctype/dashboard/dashboard_list.js b/frappe/desk/doctype/dashboard/dashboard_list.js
new file mode 100644
index 0000000000..d60a324048
--- /dev/null
+++ b/frappe/desk/doctype/dashboard/dashboard_list.js
@@ -0,0 +1,16 @@
+frappe.listview_settings['Dashboard'] = {
+	button: {
+		show(doc) {
+			return doc.name;
+		},
+		get_label() {
+			return frappe.utils.icon("dashboard-list", "sm");
+		},
+		get_description(doc) {
+			return __('View {0}', [`${doc.name}`]);
+		},
+		action(doc) {
+			frappe.set_route('dashboard-view', doc.name);
+		}
+	},
+};
\ No newline at end of file
diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg
index f2977e3016..bf4e02a7af 100644
--- a/frappe/public/icons/timeless/symbol-defs.svg
+++ b/frappe/public/icons/timeless/symbol-defs.svg
@@ -814,6 +814,13 @@
 		<path d="M16.814 13.3304L17.9274 12.6875" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
 	</symbol>
 
+	<symbol viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-dashboard-list">
+		<path d="M7.5 2.5H4.5C3.94772 2.5 3.5 2.94772 3.5 3.5V9.5C3.5 10.0523 3.94772 10.5 4.5 10.5H7.5C8.05228 10.5 8.5 10.0523 8.5 9.5V3.5C8.5 2.94772 8.05228 2.5 7.5 2.5Z" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
+		<path d="M7.5 13.5H4.5C3.94772 13.5 3.5 13.9477 3.5 14.5V16.5C3.5 17.0523 3.94772 17.5 4.5 17.5H7.5C8.05228 17.5 8.5 17.0523 8.5 16.5V14.5C8.5 13.9477 8.05228 13.5 7.5 13.5Z" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
+		<path d="M15.5 2.5H12.5C11.9477 2.5 11.5 2.94772 11.5 3.5V6.5C11.5 7.05228 11.9477 7.5 12.5 7.5H15.5C16.0523 7.5 16.5 7.05228 16.5 6.5V3.5C16.5 2.94772 16.0523 2.5 15.5 2.5Z" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
+		<path d="M15.5 10.5H12.5C11.9477 10.5 11.5 10.9477 11.5 11.5V16.5C11.5 17.0523 11.9477 17.5 12.5 17.5H15.5C16.0523 17.5 16.5 17.0523 16.5 16.5V11.5C16.5 10.9477 16.0523 10.5 15.5 10.5Z" stroke="var(--icon-stroke)" stroke-linecap="round" stroke-linejoin="round"/>
+	</symbol>
+
 	<symbol viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" id="icon-text">
 		<path d="M5 4V6.4H9V16H11.4V6.4H15.4V4H5Z" fill="var(--icon-stroke)" stroke="none"/>
 	</symbol>