From ac41e46ed6feeb21e6533a878a16c8860cfb1dc0 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Sun, 13 Oct 2019 20:48:54 +0530
Subject: [PATCH 001/153] fix(Email): poplib.error_proto exception

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

diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index ee7075b570..b8fde57a43 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -298,7 +298,7 @@ class EmailServer:
 			"Connection timed out",
 		)
 		for message in messages:
-			if message in strip(cstr(e.message)) or message in strip(cstr(getattr(e, 'strerror', ''))):
+			if message in strip(cstr(e)) or message in strip(cstr(getattr(e, 'strerror', ''))):
 				return True
 		return False
 

From 369e4ff5782ef30d8e01506d4b3c58a1ec71d18f Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Tue, 29 Oct 2019 15:22:38 +0530
Subject: [PATCH 002/153] Patch(Tags): Check if column exists (#8682)

* fix: tags patch

* fix: auto_commit_on_many_writes

* fix: check if tag exists

* fix: check if tag or tag link exists

* fix: check if column exists

* fix: set autocommit false

* fix: use ignore in insert query for bulk insert

* fix: add option to ignore duplicates
---
 frappe/database/database.py        |  5 +++--
 frappe/patches.txt                 |  1 +
 frappe/patches/v12_0/setup_tags.py | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 95096ed2d9..1e6a85236e 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -968,7 +968,7 @@ class Database(object):
 				frappe.flags.touched_tables = set()
 			frappe.flags.touched_tables.update(tables)
 
-	def bulk_insert(self, doctype, fields, values):
+	def bulk_insert(self, doctype, fields, values, ignore_duplicates=False):
 		"""
 			Insert multiple records at a time
 
@@ -982,7 +982,8 @@ class Database(object):
 		for idx, value in enumerate(values):
 			insert_list.append(tuple(value))
 			if idx and (idx%10000 == 0 or idx < len(values)-1):
-				self.sql("""INSERT INTO `tab{doctype}` ({fields}) VALUES {values}""".format(
+				self.sql("""INSERT {ignore_duplicates} INTO `tab{doctype}` ({fields}) VALUES {values}""".format(
+						ignore_duplicates="IGNORE" if ignore_duplicates else "",
 						doctype=doctype,
 						fields=fields,
 						values=", ".join(['%s'] * len(insert_list))
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 8321debf3a..621a2107df 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -254,3 +254,4 @@ frappe.patches.v12_0.delete_duplicate_indexes
 frappe.patches.v12_0.set_default_incoming_email_port
 frappe.patches.v12_0.update_global_search
 execute:frappe.reload_doc('desk', 'doctype', 'notification_settings')
+frappe.patches.v12_0.setup_tags
diff --git a/frappe/patches/v12_0/setup_tags.py b/frappe/patches/v12_0/setup_tags.py
index cd50b0d505..d663cb2e0e 100644
--- a/frappe/patches/v12_0/setup_tags.py
+++ b/frappe/patches/v12_0/setup_tags.py
@@ -12,19 +12,22 @@ def execute():
 	time = frappe.utils.get_datetime()
 
 	for doctype in frappe.get_list("DocType", filters={"istable": 0, "issingle": 0}):
-		for dt_tags in frappe.db.sql("select `name`, `_user_tags` from `tab{0}`".format(doctype.name), as_dict=True):
-			tags = dt_tags.get("_user_tags").split(",") if dt_tags.get("_user_tags") else None
-			if not tags:
+		if not frappe.db.count(doctype.name) or not frappe.db.has_column(doctype.name, "_user_tags"):
+			continue
+
+		for _user_tags in frappe.db.sql("select `name`, `_user_tags` from `tab{0}`".format(doctype.name), as_dict=True):
+			if not _user_tags.get("_user_tags"):
 				continue
 
-			for tag in tags:
+			for tag in _user_tags.get("_user_tags").split(",") if _user_tags.get("_user_tags") else []:
 				if not tag:
 					continue
 
 				tag_list.append((tag.strip(), time, time, 'Administrator'))
 
-				tag_link_name = frappe.generate_hash(dt_tags.name + tag.strip() + doctype.name, 10),
-				tag_links.append((tag_link_name, doctype.name, dt_tags.name, tag.strip(), time, time, 'Administrator'))
+				tag_link_name = frappe.generate_hash(_user_tags.name + tag.strip() + doctype.name, 10)
+				tag_links.append((tag_link_name, doctype.name, _user_tags.name, tag.strip(), time, time, 'Administrator'))
 
-	frappe.db.bulk_insert("Tag", fields=["name", "creation", "modified", "modified_by"], values=set(tag_list))
-	frappe.db.bulk_insert("Tag Link", fields=["name", "document_type", "document_name", "tag", "creation", "modified", "modified_by"], values=set(tag_links))
\ No newline at end of file
+
+	frappe.db.bulk_insert("Tag", fields=["name", "creation", "modified", "modified_by"], values=set(tag_list), ignore_duplicates=True)
+	frappe.db.bulk_insert("Tag Link", fields=["name", "document_type", "document_name", "tag", "creation", "modified", "modified_by"], values=set(tag_links), ignore_duplicates=True)

From f185ed979088bf4e0906f721bc033f06c30dd7b9 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Wed, 30 Oct 2019 13:09:26 +0550
Subject: [PATCH 003/153] bumped to version 12.0.18

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 6424dcd9b5..77207e017f 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.17'
+__version__ = '12.0.18'
 __title__ = "Frappe Framework"
 
 local = Local()

From 1b4c752959ca0e4f61bec24f6bc6c5566313c96f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 6 Nov 2019 15:10:48 +0530
Subject: [PATCH 004/153] fix: Barcode Control

- Fix render caching in forms
- Handle raw and svg value
---
 .../public/js/frappe/form/controls/barcode.js | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js
index 1cd1411b49..8245962d7e 100644
--- a/frappe/public/js/frappe/form/controls/barcode.js
+++ b/frappe/public/js/frappe/form/controls/barcode.js
@@ -1,18 +1,27 @@
-import JsBarcode from "jsbarcode";
+import JsBarcode from 'jsbarcode';
 
 frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 	make_wrapper() {
 		// Create the elements for barcode area
 		this._super();
 
+		this.default_svg = '<svg height=80></svg>';
 		let $input_wrapper = this.$wrapper.find('.control-input-wrapper');
-		this.barcode_area = $(`<div class="barcode-wrapper border"><svg height=80></svg></div>`);
+		this.barcode_area = $(
+			`<div class="barcode-wrapper border">${this.default_svg}</div>`
+		);
 		this.barcode_area.appendTo($input_wrapper);
 	},
 
 	parse(value) {
 		// Parse raw value
-		return value ? this.get_barcode_html(value) : "";
+		if (value) {
+			if (value.startsWith('<svg')) {
+				return value;
+			}
+			return this.get_barcode_html(value);
+		}
+		return '';
 	},
 
 	set_formatted_input(value) {
@@ -20,47 +29,39 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 		let svg = value;
 		const barcode_value = $(svg).attr('data-barcode-value');
 
-		if(!barcode_value) {
+		if (!barcode_value) {
 			svg = this.get_barcode_html(value);
 			this.doc[this.df.fieldname] = svg;
 		}
 
 		this.$input.val(barcode_value || value);
-		this.barcode_area.html(svg);
+		this.barcode_area.html(svg || this.default_svg);
 	},
 
 	get_barcode_html(value) {
-		// Get svg
-		const svg = this.barcode_area.find('svg')[0];
-		JsBarcode(svg, value, this.get_options(value));
-		$(svg).attr('data-barcode-value', value);
-		return this.barcode_area.html();
+		if (value) {
+			// Get svg
+			const svg = this.barcode_area.find('svg')[0];
+			JsBarcode(svg, value, this.get_options(value));
+			$(svg).attr('data-barcode-value', value);
+			return this.barcode_area.html();
+		}
 	},
 
 	get_options(value) {
 		// get JsBarcode options
 		let options = JSON.parse('{ "height" : 40 }');
-		if (this.isValidJson(this.df.options)) {
+		if (frappe.utils.is_json(this.df.options)) {
 			options = JSON.parse(this.df.options);
-			if (options.format && options.format === "EAN") {
-				options.format = value.length == 8 ? "EAN8" : "EAN13";
+			if (options.format && options.format === 'EAN') {
+				options.format = value.length == 8 ? 'EAN8' : 'EAN13';
 			}
 
 			if (options.valueField) {
 				// Set companion field value
-				this.frm.set_value(options.valueField, value);
+				this.frm && this.frm.set_value(options.valueField, value);
 			}
 		}
 		return options;
-	},
-
-	isValidJson(jsonData) {
-		try {
-			JSON.parse(jsonData);
-			return true;
-		} catch (e) {
-			return false;
-		}
 	}
-
 });

From 05d255f976ca297b0a629b520b63b9017f54d9ea Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 6 Nov 2019 16:27:07 +0530
Subject: [PATCH 005/153] fix: add iframe tag to acceptable elements

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

diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py
index 5f3a6b4338..e5513364b6 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -117,7 +117,7 @@ acceptable_elements = [
 	'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
 	'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
 	'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
-	'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video'
+	'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video', 'iframe'
 ]
 
 mathml_elements = [

From 63ab2ca2f031e81b864c2a821dc6e1f9ac9e0085 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 6 Nov 2019 16:32:12 +0530
Subject: [PATCH 006/153] fix: strip_html_tags from blog post content
 description

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

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index a6758b6b64..1b2fdf9a8c 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -61,7 +61,7 @@ class BlogPost(WebsiteGenerator):
 
 
 		context.content = get_html_content_based_on_type(self, 'content', self.content_type)
-		context.description = self.blog_intro or context.content[:140]
+		context.description = self.blog_intro or strip_html_tags(context.content[:140])
 
 		context.metatags = {
 			"name": self.title,

From d3c73e3a89c7302152d3bee978d8c8d715e99768 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 8 Nov 2019 12:34:18 +0530
Subject: [PATCH 007/153] fix: hide indicator on click even on page refresh

---
 .../notification_log/notification_log.json    | 14 +++-
 .../notification_log/notification_log.py      | 13 +++-
 .../frappe/ui/notifications/notifications.js  | 75 +++++++++++++------
 frappe/public/less/notifications.less         | 13 +++-
 4 files changed, 86 insertions(+), 29 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.json b/frappe/desk/doctype/notification_log/notification_log.json
index 32b66ef1ea..c49a6bd428 100644
--- a/frappe/desk/doctype/notification_log/notification_log.json
+++ b/frappe/desk/doctype/notification_log/notification_log.json
@@ -10,6 +10,7 @@
   "email_content",
   "column_break_4",
   "document_type",
+  "read",
   "seen",
   "document_name",
   "from_user"
@@ -62,7 +63,6 @@
    "fieldname": "seen",
    "fieldtype": "Check",
    "hidden": 1,
-   "ignore_user_permissions": 1,
    "label": "Seen"
   },
   {
@@ -79,11 +79,19 @@
    "options": "User",
    "read_only": 1,
    "search_index": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "read",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "ignore_user_permissions": 1,
+   "label": "Read"
   }
  ],
  "in_create": 1,
- "modified": "2019-10-23 12:48:01.119356",
- "modified_by": "Administrator",
+ "modified": "2019-11-07 20:42:07.548645",
+ "modified_by": "umair@erpnext.com",
  "module": "Desk",
  "name": "Notification Log",
  "owner": "Administrator",
diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 4efcaa558b..55d0f0f77a 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -112,9 +112,18 @@ def get_title_html(title):
 	return '<b class="subject-title">{0}</b>'.format(title)
 
 @frappe.whitelist()
-def mark_as_seen(docname):
+def set_all_values_for_field(docnames, fieldname):
+	docnames = frappe.parse_json(docnames)
+	event_name = 'all_' + fieldname 
+	if docnames:	
+		filters = {'name': ['in', docnames]}
+		frappe.db.set_value('Notification Log', filters, fieldname, 1, update_modified=False)
+		frappe.publish_realtime(event_name, after_commit=True, user=frappe.session.user)
+
+@frappe.whitelist()
+def mark_as_read(docname):
 	if docname:
-		frappe.db.set_value('Notification Log', docname, 'seen', 1, update_modified=False)
+		frappe.db.set_value('Notification Log', docname, 'read', 1, update_modified=False)
 
 
 @frappe.whitelist()
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index 36d2891928..bce8e58fdf 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -212,26 +212,57 @@ frappe.ui.Notifications = class Notifications {
 		}
 	}
 
-	set_field_as_seen(docname, $el) {
+	set_field_as_read(docname, $el) {
 		frappe.call(
-			'frappe.desk.doctype.notification_log.notification_log.mark_as_seen',
+			'frappe.desk.doctype.notification_log.notification_log.mark_as_read',
 			{ docname: docname }
 		).then(()=> {
-			$el.removeClass('unseen');
+			$el.removeClass('unread');
 		});
 	}
 
-	explicitly_mark_as_seen(e, $target) {
+	explicitly_mark_as_read(e, $target) {
 		e.preventDefault();
 		e.stopImmediatePropagation();
-		let docname = $target.parents('.unseen').attr('data-name');
-		this.set_field_as_seen(docname, $target.parents('.unseen'));
+		let docname = $target.parents('.unread').attr('data-name');
+		this.set_field_as_read(docname, $target.parents('.unread'));
 	}
 
-	mark_as_seen(e, $target) {
+	mark_as_read(e, $target) {
 		let docname = $target.attr('data-name');
 		let df = this.dropdown_items.filter(f => docname.includes(f.name))[0];
-		this.set_field_as_seen(df.name, $target);
+		this.set_field_as_read(df.name, $target);
+	}
+
+	mark_all_as_read(e) {
+		e.stopImmediatePropagation();
+		this.$dropdown_list.find('.unread').removeClass('unread');
+		let unread_docnames = this.dropdown_items
+			.filter(item => item.read === 0)
+			.map(d => d.name);
+		if (!unread_docnames.length) return;
+		frappe.call(
+			'frappe.desk.doctype.notification_log.notification_log.set_all_values_for_field',
+			{
+				docnames: unread_docnames,
+				fieldname: 'read'
+			}
+		);
+	}
+	
+	mark_all_as_seen() {
+		this.$dropdown_list.find('.unseen').removeClass('unseen');
+		let unseen_docnames = this.dropdown_items
+			.filter(item => item.seen === 0)
+			.map(d => d.name);
+		if (!unseen_docnames.length) return;
+		frappe.call(
+			'frappe.desk.doctype.notification_log.notification_log.set_all_values_for_field',
+			{
+				docnames: unseen_docnames,
+				fieldname: 'seen'
+			}
+		);
 	}
 
 	get_notifications_list(limit) {
@@ -279,8 +310,9 @@ frappe.ui.Notifications = class Notifications {
 			field.document_type,
 			field.document_name
 		);
+		let read_class = field.read ? '' : 'unread';
 		let seen_class = field.seen ? '' : 'unseen';
-		let mark_seen_action = field.seen ? '': 'data-action="mark_as_seen"';
+		let mark_read_action = field.read ? '': 'data-action="mark_as_read"';
 		let message = field.subject;
 		let title = message.match(/<b class="subject-title">(.*?)<\/b>/);
 		message = title ? message.replace(title[1], frappe.ellipsis(title[1], 100)): message;
@@ -289,17 +321,17 @@ frappe.ui.Notifications = class Notifications {
 		let user_avatar = frappe.avatar(user, 'avatar-small user-avatar');
 		let timestamp = frappe.datetime.comment_when(field.creation, true);
 		let item_html = 
-			`<a class="recent-item ${seen_class}" 
+			`<a class="recent-item ${read_class} ${seen_class}"
 				href="${doc_link}"
 				data-name="${field.name}"
-				${mark_seen_action}
+				${mark_read_action}
 			>
 				${user_avatar}
 				${message_html}
 				<div class="notification-timestamp text-muted">
 					${timestamp}
 				</div>
-				<span class="mark-read text-muted hidden-xs" data-action="explicitly_mark_as_seen">
+				<span class="mark-read text-muted hidden-xs" data-action="explicitly_mark_as_read">
 					${__('Mark as Read')}
 				</span>
 			</a>`;
@@ -333,6 +365,12 @@ frappe.ui.Notifications = class Notifications {
 						${__('Settings')}
 					</span>`
 					: '';
+			let mark_all_read_html =
+				category.value === 'Notifications'
+				? `<span class="mark-all-read pull-right" data-action="mark_all_as_read">
+					${__('Mark All as Read')}
+				</span>`
+				: '';
 			let html = `<li class="notifications-category">
 					<li class="text-muted header"
 						data-action="${category.action}"
@@ -341,6 +379,7 @@ frappe.ui.Notifications = class Notifications {
 						${category.label}
 						<span class="octicon octicon-chevron-down collapse-indicator"></span>
 						${settings_html}
+						${mark_all_read_html}
 					</li>
 					<div id="${category_id}" class="collapse category-list" data-category="${category.value}">
 						<div class="text-center text-muted notifications-loading">
@@ -418,22 +457,14 @@ frappe.ui.Notifications = class Notifications {
 			});
 		this.$dropdown.on('hide.bs.dropdown', e => {
 			let hide = $(e.currentTarget).data('closable');
-			if (hide) {
-				this.$dropdown_list
-					.find('[data-category="Notifications"]')
-					.collapse('show');
-				this.$dropdown_list
-					.find(
-						'[data-category="Todays Events"], [data-category="Open Documents"]'
-					)
-					.collapse('hide');
-			}
 			$(e.currentTarget).data('closable', true);
 			return hide;
 		});
 
 		this.$dropdown.on('show.bs.dropdown', () => {
+			this.mark_all_as_seen();
 			if (this.$notification_indicator.is(':visible')) {
+				this.$notification_indicator.hide();
 				frappe.call(
 					'frappe.desk.doctype.notification_log.notification_log.trigger_indicator_hide'
 				);
diff --git a/frappe/public/less/notifications.less b/frappe/public/less/notifications.less
index 9c40a90a71..7a49709d16 100644
--- a/frappe/public/less/notifications.less
+++ b/frappe/public/less/notifications.less
@@ -7,6 +7,11 @@
 	cursor: pointer;
 }
 
+.mark-all-read {
+	margin-top: 2px;
+	margin-right: 15px;
+}
+
 .notification-settings {
 	margin-top: 2px;
 }
@@ -35,6 +40,10 @@
 	margin-left: 150px;
 }
 
+.navbar .dropdown-notifications .notifications-icon {
+	padding-top: 9px;
+}
+
 .notifications-indicator {
 	font-size: 7px;
 	position: absolute;
@@ -64,7 +73,7 @@ a.recent-item:hover {
 	background-color: #f0f4f7; 
 }
 
-a.unseen:hover .mark-read {
+a.unread:hover .mark-read {
 	display: inline-block;
 }
 
@@ -89,7 +98,7 @@ a.unseen:hover .mark-read {
 	font-weight: 500;
 }
 
-.unseen {
+.unread {
 	background: @light-yellow;
 }
 

From ab8d00a5b756aa290acf104e1f52c597dac011cf Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 8 Nov 2019 14:19:06 +0530
Subject: [PATCH 008/153] fix: make notification settings searchable

---
 .../notification_settings.json                |  6 +--
 .../frappe/ui/notifications/notifications.js  | 37 +++++++++++++------
 .../js/frappe/ui/toolbar/search_utils.js      |  7 ++--
 3 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/frappe/desk/doctype/notification_settings/notification_settings.json b/frappe/desk/doctype/notification_settings/notification_settings.json
index 68eec92125..c2f3633d63 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.json
+++ b/frappe/desk/doctype/notification_settings/notification_settings.json
@@ -72,15 +72,14 @@
    "fieldname": "user",
    "fieldtype": "Link",
    "hidden": 1,
-   "in_list_view": 1,
    "label": "User",
    "options": "User",
    "read_only": 1
   }
  ],
  "in_create": 1,
- "modified": "2019-10-23 12:42:56.175928",
- "modified_by": "Administrator",
+ "modified": "2019-11-08 14:11:35.619306",
+ "modified_by": "frappetestuser2@gmail.com",
  "module": "Desk",
  "name": "Notification Settings",
  "owner": "Administrator",
@@ -97,7 +96,6 @@
    "write": 1
   }
  ],
- "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index bce8e58fdf..3ccbc3318c 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -1,3 +1,5 @@
+frappe.provide('frappe.search');
+
 frappe.ui.Notifications = class Notifications {
 	constructor() {
 		frappe.model
@@ -29,10 +31,30 @@ frappe.ui.Notifications = class Notifications {
 		);
 
 		frappe.utils.bind_actions_with_object(this.$dropdown_list, this);
+		let me = this;
+		frappe.search.utils.make_function_searchable(
+			me.route_to_settings,
+			__('Notification Settings'),
+			[this.notifications_settings],
+		)
+
 		this.setup_notifications();
 		this.bind_events();
 	}
 
+	route_to_settings(settings_doc) {
+		let method =
+			'frappe.desk.doctype.notification_settings.notification_settings.create_notification_settings';
+
+		return Promise.resolve()
+		.then(() => {
+			if (!settings_doc) return frappe.call(method);
+		})
+		.then(() => {
+			frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
+		});
+	}
+
 	setup_notifications() {
 		this.get_notifications_list(this.max_length).then(list => {
 			this.dropdown_items = list;
@@ -249,7 +271,7 @@ frappe.ui.Notifications = class Notifications {
 			}
 		);
 	}
-	
+
 	mark_all_as_seen() {
 		this.$dropdown_list.find('.unseen').removeClass('unseen');
 		let unseen_docnames = this.dropdown_items
@@ -368,7 +390,7 @@ frappe.ui.Notifications = class Notifications {
 			let mark_all_read_html =
 				category.value === 'Notifications'
 				? `<span class="mark-all-read pull-right" data-action="mark_all_as_read">
-					${__('Mark All as Read')}
+					${__('Mark all as Read')}
 				</span>`
 				: '';
 			let html = `<li class="notifications-category">
@@ -407,16 +429,7 @@ frappe.ui.Notifications = class Notifications {
 		e.stopImmediatePropagation();
 		this.$dropdown.removeClass('open');
 		this.$dropdown.trigger('hide.bs.dropdown');
-		let method =
-			'frappe.desk.doctype.notification_settings.notification_settings.create_notification_settings';
-
-		return Promise.resolve()
-			.then(() => {
-				if (!this.notifications_settings) return frappe.call(method);
-			})
-			.then(() => {
-				frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
-			});
+		this.route_to_settings(this.notifications_settings);
 	}
 
 	bind_events() {
diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js
index c67c4b0b13..153a4dfa67 100644
--- a/frappe/public/js/frappe/ui/toolbar/search_utils.js
+++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js
@@ -622,20 +622,21 @@ frappe.search.utils = {
 					value:  this.bolden_match_part(__(item.label), txt),
 					index: this.fuzzy_search(txt, target),
 					match: item.label,
-					onclick: item.action,
+					onclick: () => item.action.apply(this, item.args)
 				});
 			}
 		});
 		return results;
 	},
-	make_function_searchable(_function, label=null) {
+	make_function_searchable(_function, label=null, args=null) {
 		if (typeof _function !== 'function') {
 			throw new Error('First argument should be a function');
 		}
 
 		this.searchable_functions.push({
 			'label': label || _function.name,
-			'action': _function
+			'action': _function,
+			'args': args,
 		});
 	},
 	searchable_functions: [],

From bb46bb0fa72a687258f91658f7b57a1a6f55ac00 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 8 Nov 2019 22:25:41 +0530
Subject: [PATCH 009/153] fix: codacy

---
 .../notification_log/notification_log.py      | 18 +++++++--------
 .../frappe/ui/notifications/notifications.js  | 22 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 55d0f0f77a..96f1d5080a 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -54,13 +54,13 @@ def make_notification_logs(doc, users):
 			if is_notifications_enabled(user):
 				if doc.type == 'Energy Point' and not is_energy_point_enabled():
 					return
-				else:
-					_doc = frappe.new_doc('Notification Log')
-					_doc.update(doc)
-					_doc.for_user = user
-					_doc.subject = _doc.subject.replace('<div>', '').replace('</div>', '')
-					if _doc.for_user != _doc.from_user or doc.type == 'Energy Point':
-						_doc.insert(ignore_permissions=True)
+
+				_doc = frappe.new_doc('Notification Log')
+				_doc.update(doc)
+				_doc.for_user = user
+				_doc.subject = _doc.subject.replace('<div>', '').replace('</div>', '')
+				if _doc.for_user != _doc.from_user or doc.type == 'Energy Point':
+					_doc.insert(ignore_permissions=True)
 
 def send_notification_email(doc):
 	is_type_enabled = is_email_notifications_enabled_for_type(doc.for_user, doc.type)
@@ -114,8 +114,8 @@ def get_title_html(title):
 @frappe.whitelist()
 def set_all_values_for_field(docnames, fieldname):
 	docnames = frappe.parse_json(docnames)
-	event_name = 'all_' + fieldname 
-	if docnames:	
+	event_name = 'all_' + fieldname
+	if docnames:
 		filters = {'name': ['in', docnames]}
 		frappe.db.set_value('Notification Log', filters, fieldname, 1, update_modified=False)
 		frappe.publish_realtime(event_name, after_commit=True, user=frappe.session.user)
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index 3ccbc3318c..0c41f19300 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -36,7 +36,7 @@ frappe.ui.Notifications = class Notifications {
 			me.route_to_settings,
 			__('Notification Settings'),
 			[this.notifications_settings],
-		)
+		);
 
 		this.setup_notifications();
 		this.bind_events();
@@ -47,12 +47,12 @@ frappe.ui.Notifications = class Notifications {
 			'frappe.desk.doctype.notification_settings.notification_settings.create_notification_settings';
 
 		return Promise.resolve()
-		.then(() => {
-			if (!settings_doc) return frappe.call(method);
-		})
-		.then(() => {
-			frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
-		});
+			.then(() => {
+				if (!settings_doc) return frappe.call(method);
+			})
+			.then(() => {
+				frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
+			});
 	}
 
 	setup_notifications() {
@@ -389,10 +389,10 @@ frappe.ui.Notifications = class Notifications {
 					: '';
 			let mark_all_read_html =
 				category.value === 'Notifications'
-				? `<span class="mark-all-read pull-right" data-action="mark_all_as_read">
-					${__('Mark all as Read')}
-				</span>`
-				: '';
+					? `<span class="mark-all-read pull-right" data-action="mark_all_as_read">
+						${__('Mark all as Read')}
+					</span>`
+					: '';
 			let html = `<li class="notifications-category">
 					<li class="text-muted header"
 						data-action="${category.action}"

From 9a23312ad7ca3de2d4db78c5bccd67cd1a7bef1c Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 12 Nov 2019 13:37:51 +0530
Subject: [PATCH 010/153] fix(Report): validate 'Script Manager' role only for
 report type 'Script Report'

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

diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index f71179d388..e88a2d3335 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -30,7 +30,7 @@ class Report(Document):
 
 		if self.is_standard == "No":
 			# allow only script manager to edit scripts
-			if frappe.session.user!="Administrator":
+			if self.report_type == 'Script Report' and frappe.conf.server_script_enabled and frappe.session.user != "Administrator":
 				frappe.only_for('Script Manager', True)
 
 			if frappe.db.get_value("Report", self.name, "is_standard") == "Yes":

From 643f185edcb6d30edd3e6615852eaa0a4abb418e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 12 Nov 2019 15:28:28 +0530
Subject: [PATCH 011/153] fix: track seen in notification settings

---
 .../notification_log/notification_log.json    | 10 +-----
 .../notification_log/notification_log.py      |  6 ++--
 .../notification_settings.json                | 14 ++++++--
 .../notification_settings.py                  |  4 +++
 .../frappe/ui/notifications/notifications.js  | 32 ++++++++-----------
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.json b/frappe/desk/doctype/notification_log/notification_log.json
index c49a6bd428..ecb746df64 100644
--- a/frappe/desk/doctype/notification_log/notification_log.json
+++ b/frappe/desk/doctype/notification_log/notification_log.json
@@ -11,7 +11,6 @@
   "column_break_4",
   "document_type",
   "read",
-  "seen",
   "document_name",
   "from_user"
  ],
@@ -58,13 +57,6 @@
    "read_only": 1,
    "search_index": 1
   },
-  {
-   "default": "0",
-   "fieldname": "seen",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Seen"
-  },
   {
    "fieldname": "document_name",
    "fieldtype": "Data",
@@ -90,7 +82,7 @@
   }
  ],
  "in_create": 1,
- "modified": "2019-11-07 20:42:07.548645",
+ "modified": "2019-11-12 15:22:35.283678",
  "modified_by": "umair@erpnext.com",
  "module": "Desk",
  "name": "Notification Log",
diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 96f1d5080a..6f27fa4f44 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -112,13 +112,11 @@ def get_title_html(title):
 	return '<b class="subject-title">{0}</b>'.format(title)
 
 @frappe.whitelist()
-def set_all_values_for_field(docnames, fieldname):
+def mark_all_as_read(docnames):
 	docnames = frappe.parse_json(docnames)
-	event_name = 'all_' + fieldname
 	if docnames:
 		filters = {'name': ['in', docnames]}
-		frappe.db.set_value('Notification Log', filters, fieldname, 1, update_modified=False)
-		frappe.publish_realtime(event_name, after_commit=True, user=frappe.session.user)
+		frappe.db.set_value('Notification Log', filters, 'read', 1, update_modified=False)
 
 @frappe.whitelist()
 def mark_as_read(docname):
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.json b/frappe/desk/doctype/notification_settings/notification_settings.json
index c2f3633d63..a162105299 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.json
+++ b/frappe/desk/doctype/notification_settings/notification_settings.json
@@ -13,7 +13,8 @@
   "enable_email_assignment",
   "enable_email_energy_point",
   "enable_email_share",
-  "user"
+  "user",
+  "seen"
  ],
  "fields": [
   {
@@ -75,11 +76,18 @@
    "label": "User",
    "options": "User",
    "read_only": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "seen",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Seen"
   }
  ],
  "in_create": 1,
- "modified": "2019-11-08 14:11:35.619306",
- "modified_by": "frappetestuser2@gmail.com",
+ "modified": "2019-11-12 14:50:16.822761",
+ "modified_by": "Administrator",
  "module": "Desk",
  "name": "Notification Settings",
  "owner": "Administrator",
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index 3bb3cf9320..1ac4e2b1dd 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -60,3 +60,7 @@ def get_permission_query_conditions(user):
 	if not user: user = frappe.session.user
 
 	return '''(`tabNotification Settings`.user = '{user}')'''.format(user=user)
+
+@frappe.whitelist()
+def set_seen_value(value):
+	frappe.db.set_value('Notification Settings', frappe.session.user, 'seen', value, update_modified=False)
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index 0c41f19300..c2e6ccaa81 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -59,8 +59,7 @@ frappe.ui.Notifications = class Notifications {
 		this.get_notifications_list(this.max_length).then(list => {
 			this.dropdown_items = list;
 			this.render_notifications_dropdown();
-
-			if (this.$notifications.find('.unseen').length) {
+			if (this.notifications_settings.seen == 0) {
 				this.$notification_indicator.show();
 			}
 		});
@@ -264,26 +263,17 @@ frappe.ui.Notifications = class Notifications {
 			.map(d => d.name);
 		if (!unread_docnames.length) return;
 		frappe.call(
-			'frappe.desk.doctype.notification_log.notification_log.set_all_values_for_field',
+			'frappe.desk.doctype.notification_log.notification_log.mark_all_as_read',
 			{
 				docnames: unread_docnames,
-				fieldname: 'read'
 			}
 		);
 	}
 
-	mark_all_as_seen() {
-		this.$dropdown_list.find('.unseen').removeClass('unseen');
-		let unseen_docnames = this.dropdown_items
-			.filter(item => item.seen === 0)
-			.map(d => d.name);
-		if (!unseen_docnames.length) return;
+	mark_as_seen() {
 		frappe.call(
-			'frappe.desk.doctype.notification_log.notification_log.set_all_values_for_field',
-			{
-				docnames: unseen_docnames,
-				fieldname: 'seen'
-			}
+			'frappe.desk.doctype.notification_settings.notification_settings.set_seen_value',
+			{ value: 1 }
 		);
 	}
 
@@ -333,7 +323,6 @@ frappe.ui.Notifications = class Notifications {
 			field.document_name
 		);
 		let read_class = field.read ? '' : 'unread';
-		let seen_class = field.seen ? '' : 'unseen';
 		let mark_read_action = field.read ? '': 'data-action="mark_as_read"';
 		let message = field.subject;
 		let title = message.match(/<b class="subject-title">(.*?)<\/b>/);
@@ -343,7 +332,7 @@ frappe.ui.Notifications = class Notifications {
 		let user_avatar = frappe.avatar(user, 'avatar-small user-avatar');
 		let timestamp = frappe.datetime.comment_when(field.creation, true);
 		let item_html = 
-			`<a class="recent-item ${read_class} ${seen_class}"
+			`<a class="recent-item ${read_class}"
 				href="${doc_link}"
 				data-name="${field.name}"
 				${mark_read_action}
@@ -451,6 +440,13 @@ frappe.ui.Notifications = class Notifications {
 
 	setup_notification_listeners() {
 		frappe.realtime.on('notification', () => {
+			if (this.notifications_settings.seen == 1) {
+				this.notifications_settings.seen = 0;
+				frappe.call(
+					'frappe.desk.doctype.notification_settings.notification_settings.set_seen_value',
+					{ value: 0 }
+				);
+			} 
 			this.$dropdown.find('.notifications-indicator').show();
 			this.update_dropdown();
 		});
@@ -475,7 +471,7 @@ frappe.ui.Notifications = class Notifications {
 		});
 
 		this.$dropdown.on('show.bs.dropdown', () => {
-			this.mark_all_as_seen();
+			this.mark_as_seen();
 			if (this.$notification_indicator.is(':visible')) {
 				this.$notification_indicator.hide();
 				frappe.call(

From 6d85f1215fb175231258f63156fef0482fb1a3f6 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 Nov 2019 17:36:59 +0530
Subject: [PATCH 012/153] fix: formatting for chart tooltip

---
 .../doctype/razorpay_settings/razorpay_settings.py       | 1 -
 frappe/public/js/frappe/views/reports/report_view.js     | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 26e0de35b5..c6ef12ff08 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -242,7 +242,6 @@ class RazorpaySettings(Document):
 
 		redirect_to = data.get('redirect_to') or None
 		redirect_message = data.get('redirect_message') or None
-
 		if self.flags.status_changed_to in ("Authorized", "Verified", "Completed"):
 			if self.data.reference_doctype and self.data.reference_docname:
 				custom_redirect_to = None
diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 6503f1c7ac..b65402e6fe 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -500,10 +500,11 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			axisOptions: {
 				shortenYAxisNumbers: 1
 			},
-
-			format_tooltip_x: value => value.doc.name,
-			format_tooltip_y:
-				value => frappe.format(value, get_df(value.field), { always_show_decimals: true, inline: true }, get_doc(value.doc))
+			tooltipOptions: {
+				formatTooltipY: value => {
+					return frappe.format(value, get_df(this.chart_args.y_axes[0]), { always_show_decimals: true, inline: true }, get_doc(value.doc))
+				}
+			}
 		});
 	}
 

From 4835c87c3fe9a28647fcc011c978dc2d02430684 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 Nov 2019 17:53:26 +0530
Subject: [PATCH 013/153] refactor: code styling

---
 frappe/public/js/frappe/views/reports/report_view.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index b65402e6fe..7f6e24595a 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -501,9 +501,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 				shortenYAxisNumbers: 1
 			},
 			tooltipOptions: {
-				formatTooltipY: value => {
-					return frappe.format(value, get_df(this.chart_args.y_axes[0]), { always_show_decimals: true, inline: true }, get_doc(value.doc))
-				}
+				formatTooltipY: value => frappe.format(value, get_df(this.chart_args.y_axes[0]), { always_show_decimals: true, inline: true }, get_doc(value.doc))
 			}
 		});
 	}

From e36ad8d8defb4d8cd47a29ef9781e79cd210a6f8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 12 Nov 2019 18:54:13 +0530
Subject: [PATCH 014/153] fix: filtering for blog category

---
 frappe/website/doctype/blog_post/blog_post.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index a6758b6b64..5d0b47d338 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -145,11 +145,12 @@ def get_blog_category(route):
 
 def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by=None):
 	conditions = []
+	category = filters.blog_category or sanitize_html(frappe.local.form_dict.blog_category or frappe.local.form_dict.category)
 	if filters:
 		if filters.blogger:
 			conditions.append('t1.blogger=%s' % frappe.db.escape(filters.blogger))
-		if filters.blog_category:
-			conditions.append('t1.blog_category=%s' % frappe.db.escape(filters.blog_category))
+	if category:
+		conditions.append('t1.blog_category=%s' % frappe.db.escape(category))
 
 	if txt:
 		conditions.append('(t1.content like {0} or t1.title like {0}")'.format(frappe.db.escape('%' + txt + '%')))

From eae67eb0ddb74ab97e9e9ebee2026a5737daa573 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 12 Nov 2019 19:06:43 +0530
Subject: [PATCH 015/153] fix: set first option as value for 'is' condition if
 no value selected

---
 frappe/public/js/frappe/ui/filters/filter.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 7923d57ad4..e163feb791 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -372,6 +372,10 @@ frappe.ui.filter_utils = {
 			val = strip(val);
 		}
 
+		if(condition == 'is' && !val) {
+			val = field.df.options[0].value;
+		}
+
 		if(field.df.original_type == 'Check') {
 			val = (val=='Yes' ? 1 :0);
 		}

From b80b4a64dfbdf5f159a3ed85ab7319fc0694f912 Mon Sep 17 00:00:00 2001
From: Nickesh <nick9822@gmail.com>
Date: Tue, 12 Nov 2019 19:08:16 +0530
Subject: [PATCH 016/153] Web form allow edit and new fix

---
 frappe/public/js/frappe/web_form/webform_script.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index faae88fce6..d3b4021360 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -52,9 +52,10 @@ frappe.ready(function() {
 			const data = setup_fields(r.message);
 			let web_form_doc = data.web_form;
 
-			if (web_form_doc.doc_name && web_form_doc.allow_edit === 0) {
-				window.location.replace(window.location.pathname + "?new=1");
-				return;
+			if (web_form_doc.name && web_form_doc.allow_edit === 0) {
+				if(!window.location.href.includes("?new=1")){
+					window.location.replace(window.location.pathname + "?new=1");
+				}
 			}
 			let doc = r.message.doc || build_doc(r.message);
 			web_form.prepare(web_form_doc, doc);

From f6b4fdef0caca5cc777085841b0d24bba8af1fe2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 12 Nov 2019 21:21:12 +0530
Subject: [PATCH 017/153] fix: codacy

---
 frappe/public/js/frappe/ui/filters/filter.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index e163feb791..212547a549 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -368,28 +368,28 @@ frappe.ui.filter_utils = {
 	get_selected_value(field, condition) {
 		let val = field.get_value();
 
-		if(typeof val==='string') {
+		if (typeof val === 'string') {
 			val = strip(val);
 		}
 
-		if(condition == 'is' && !val) {
+		if (condition == 'is' && !val) {
 			val = field.df.options[0].value;
 		}
 
-		if(field.df.original_type == 'Check') {
+		if (field.df.original_type == 'Check') {
 			val = (val=='Yes' ? 1 :0);
 		}
 
-		if(condition.indexOf('like', 'not like')!==-1) {
+		if (condition.indexOf('like', 'not like') !== -1) {
 			// automatically append wildcards
-			if(val && !(val.startsWith('%') || val.endsWith('%'))) {
+			if (val && !(val.startsWith('%') || val.endsWith('%'))) {
 				val = '%' + val + '%';
 			}
-		} else if(in_list(["in", "not in"], condition)) {
-			if(val) {
+		} else if (in_list(["in", "not in"], condition)) {
+			if (val) {
 				val = val.split(',').map(v => strip(v));
 			}
-		} if(val === '%') {
+		} if (val === '%') {
 			val = "";
 		}
 

From a7fb0dba577fbd5b7c11fc6c75ffef327ea32930 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 13 Nov 2019 11:48:20 +0530
Subject: [PATCH 018/153] fix(List): save checked rows on auto refresh

---
 frappe/public/js/frappe/list/list_view.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 6912065e1c..a1fe886484 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1077,10 +1077,20 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 					});
 					this.toggle_result_area();
 					this.render_list();
+					if (this.$checks.length) {
+						this.set_rows_as_checked();
+					}
 				});
 		});
 	}
 
+	set_rows_as_checked() {
+		$.each(this.$checks, (i, el) => {
+			let docname = $(el).attr('data-name');
+			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click();
+		});
+	}
+
 	on_row_checked() {
 		this.$list_head_subject = this.$list_head_subject || this.$result.find('header .list-header-subject');
 		this.$checkbox_actions = this.$checkbox_actions || this.$result.find('header .checkbox-actions');

From e35af962571bd27b5270d1b664d188f36a44bf6f Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Wed, 13 Nov 2019 12:01:31 +0530
Subject: [PATCH 019/153] fix(scheduler): Activate scheduler if found inactive

---
 frappe/public/js/frappe/desk.js | 6 +-----
 frappe/utils/scheduler.py       | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 3deeb02ae4..4fbea6684f 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -136,11 +136,7 @@ frappe.Application = Class.extend({
 					method: 'frappe.core.page.background_jobs.background_jobs.get_scheduler_status',
 					callback: function(r) {
 						if (r.message[0] == __("Inactive")) {
-							frappe.msgprint({
-								title: __("Scheduler Inactive"),
-								indicator: "red",
-								message: __("Background jobs are not running. Please contact Administrator")
-							});
+							frappe.call('frappe.utils.scheduler.activate_scheduler');
 						}
 					}
 				});
diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py
index 68c3bc58a8..b46036d996 100755
--- a/frappe/utils/scheduler.py
+++ b/frappe/utils/scheduler.py
@@ -337,3 +337,10 @@ def get_last_active():
 		WHERE `user_type` = 'System User' AND `name` NOT IN ({standard_users})"""
 		.format(standard_users=", ".join(["%s"]*len(STANDARD_USERS))),
 		STANDARD_USERS)[0][0]
+
+@frappe.whitelist()
+def activate_scheduler():
+	if is_scheduler_disabled():
+		enable_scheduler()
+	if frappe.conf.pause_scheduler:
+		update_site_config('pause_scheduler', 0)

From e86aff147ac0cf4accb74216cc5d6f422cbb2a0a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2019 06:46:56 +0000
Subject: [PATCH 020/153] chore(deps): [security] bump tar from 2.2.1 to 2.2.2

Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes a security fix.**
- [Release notes](https://github.com/npm/node-tar/releases)
- [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 255 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 136 insertions(+), 119 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0838f3f255..7a59102a1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -255,12 +255,17 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
+ansi-regex@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -628,10 +633,10 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+camelcase@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -738,14 +743,14 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-cliui@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
-  integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
   dependencies:
-    string-width "^2.1.1"
-    strip-ansi "^4.0.0"
-    wrap-ansi "^2.0.0"
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
 
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
@@ -953,15 +958,6 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -1253,7 +1249,7 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -1373,6 +1369,11 @@ elegant-spinner@^1.0.1:
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
   integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -1516,19 +1517,6 @@ execa@0.10.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
-  integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=
-  dependencies:
-    cross-spawn "^5.0.1"
-    get-stream "^3.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 executable@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
@@ -1722,12 +1710,12 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
   dependencies:
-    locate-path "^2.0.0"
+    locate-path "^3.0.0"
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -1803,7 +1791,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fstream@^1.0.0, fstream@^1.0.2:
+fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
   integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
@@ -1856,6 +1844,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-pixels@^3.2.3:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03"
@@ -1942,9 +1935,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1:
     path-is-absolute "^1.0.0"
 
 glob@^7.1.3:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -1989,7 +1982,12 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.2:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
+graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -2249,7 +2247,12 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -2766,12 +2769,12 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
   dependencies:
-    p-locate "^2.0.0"
+    p-locate "^3.0.0"
     path-exists "^3.0.0"
 
 lodash.camelcase@^4.3.0:
@@ -2900,13 +2903,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
-  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
@@ -3000,11 +2996,6 @@ mime@^1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mimic-fn@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
-  integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-
 minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -3347,15 +3338,6 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
-  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
-  dependencies:
-    execa "^0.7.0"
-    lcid "^1.0.0"
-    mem "^1.1.0"
-
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -3374,19 +3356,19 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
+p-limit@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
   dependencies:
-    p-try "^1.0.0"
+    p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
   dependencies:
-    p-limit "^1.1.0"
+    p-limit "^2.0.0"
 
 p-map@^1.1.1:
   version "1.2.0"
@@ -3398,10 +3380,10 @@ p-queue@^2.4.2:
   resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34"
   integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng==
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parchment@quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb:
   version "2.0.0-dev"
@@ -4283,6 +4265,11 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 reserved-words@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1"
@@ -4337,9 +4324,9 @@ rgba-regex@^1.0.0:
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
 rimraf@2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
@@ -4572,12 +4559,12 @@ shebang-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
-showdown@^1.8.6:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.0.tgz#d49d2a0b6db21b7c2e96ef855f7b3b2a28ef46f4"
-  integrity sha512-x7xDCRIaOlicbC57nMhGfKamu+ghwsdVkHMttyn+DelwzuHOx4OHCVL/UW/2QOLH7BxfCcCCVVUix3boKXJKXQ==
+showdown@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef"
+  integrity sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA==
   dependencies:
-    yargs "^10.0.3"
+    yargs "^14.2"
 
 signal-exit@^3.0.0:
   version "3.0.2"
@@ -4825,7 +4812,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -4833,6 +4820,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0, string-width@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -4854,6 +4850,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  dependencies:
+    ansi-regex "^4.1.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -4962,12 +4965,12 @@ symbol-observable@1.0.1:
   integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
 tar@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
-  integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
   dependencies:
     block-stream "*"
-    fstream "^1.0.2"
+    fstream "^1.0.12"
     inherits "2"
 
 terser@^3.14.1:
@@ -5296,6 +5299,15 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -5318,11 +5330,24 @@ y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
   integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
 
+y18n@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
+yargs-parser@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
+  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -5330,30 +5355,22 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs-parser@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
-  integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==
+yargs@^14.2:
+  version "14.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
+  integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==
   dependencies:
-    camelcase "^4.1.0"
-
-yargs@^10.0.3:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
-  integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==
-  dependencies:
-    cliui "^4.0.0"
-    decamelize "^1.1.1"
-    find-up "^2.1.0"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
+    cliui "^5.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
+    require-main-filename "^2.0.0"
     set-blocking "^2.0.0"
-    string-width "^2.0.0"
+    string-width "^3.0.0"
     which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^8.1.0"
+    y18n "^4.0.0"
+    yargs-parser "^15.0.0"
 
 yargs@^7.0.0:
   version "7.1.0"

From 08bf0d8379284c9dc8725a6a40282e4000c1b99b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 Nov 2019 15:42:33 +0530
Subject: [PATCH 021/153] feat: added orders API

---
 .../razorpay_settings/razorpay_settings.py      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 26e0de35b5..ca825a4ad7 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -180,6 +180,23 @@ class RazorpaySettings(Document):
 		integration_request = create_request_log(kwargs, "Host", "Razorpay")
 		return get_url("./integrations/razorpay_checkout?token={0}".format(integration_request.name))
 
+	def create_order(self, **kwargs):
+		# Creating Orders https://razorpay.com/docs/api/orders/
+		# 
+		# kwargs = {
+		# 	"amount": 3000,
+		# 	"currency": "INR",
+		# 	"receipt": "rcptid_11234",
+		# 	"payment_capture": 1
+		# }
+		integration_request = create_request_log(kwargs, "Host", "Razorpay")
+		if self.api_key and self.api_secret:
+			try:
+				return make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=kwargs)
+			except Exception:
+				frappe.log(frappe.get_traceback())
+				frappe.throw(_("Could not create razorpay order"))
+
 	def create_request(self, data):
 		self.data = frappe._dict(data)
 

From 46ef9411161726c76e6d4b5b39f9a98eb224a7ec Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 Nov 2019 17:37:02 +0530
Subject: [PATCH 022/153] fix: fixed post request

---
 .../doctype/razorpay_settings/razorpay_settings.py        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index ca825a4ad7..16fe763722 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -190,9 +190,15 @@ class RazorpaySettings(Document):
 		# 	"payment_capture": 1
 		# }
 		integration_request = create_request_log(kwargs, "Host", "Razorpay")
+		payment_options = {
+			"amount": kwargs.get('amount'),
+			"currency": kwargs.get('currency', 'INR'),
+			"receipt": kwargs.get('receipt'),
+			"payment_capture": kwargs.get('payment_capture')
+		}
 		if self.api_key and self.api_secret:
 			try:
-				return make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=kwargs)
+				return make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options)
 			except Exception:
 				frappe.log(frappe.get_traceback())
 				frappe.throw(_("Could not create razorpay order"))

From b8a4821a83d0f6da6a00f7f1af9bc60aa7a1acae Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 Nov 2019 19:31:11 +0530
Subject: [PATCH 023/153] feat: updated client API

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

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 16fe763722..2a0f14f4b9 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -198,7 +198,9 @@ class RazorpaySettings(Document):
 		}
 		if self.api_key and self.api_secret:
 			try:
-				return make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options)
+				order = make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options)
+				order['integration_request'] = integration_request
+				return order
 			except Exception:
 				frappe.log(frappe.get_traceback())
 				frappe.throw(_("Could not create razorpay order"))
@@ -353,6 +355,22 @@ def capture_payment(is_sandbox=False, sanbox_response=None):
 			doc.error = frappe.get_traceback()
 			frappe.log_error(doc.error, '{0} Failed'.format(doc.name))
 
+@frappe.whitelist(allow_guest=True)
+def get_order(doctype, docname):
+	return frappe.get_doc(doctype, docname).run_method("get_razorpay_order")
+
+@frappe.whitelist(allow_guest=True)
+def order_payment_success(self, integration_request, params):
+	print("SUCCESSSSSSS ------------------")
+	integration = frappe.get_doc("Integration Request", integration_request)
+	integration.update_status(update_dict)
+
+@frappe.whitelist(allow_guest=True)
+def order_payment_failure(self, integration_request, params):
+	print("FAILLLLLL ------------------")
+	integration = frappe.get_doc("Integration Request", integration_request)
+	integration.update_status(update_dict)
+
 def convert_rupee_to_paisa(**kwargs):
 	for addon in kwargs.get('addons'):
 		addon['item']['amount'] *= 100

From afb8829514a41fcc86b5057be55f66a63268e194 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 Nov 2019 19:31:23 +0530
Subject: [PATCH 024/153] feat: created client API for razorpay

---
 frappe/public/build.json                  |   3 +
 frappe/public/js/integrations/razorpay.js | 170 +++++++++++++++++++---
 2 files changed, 150 insertions(+), 23 deletions(-)

diff --git a/frappe/public/build.json b/frappe/public/build.json
index 6c67c17374..e8cb32fa4d 100755
--- a/frappe/public/build.json
+++ b/frappe/public/build.json
@@ -13,6 +13,9 @@
 	"js/frappe-recorder.min.js": [
 		"public/js/frappe/recorder/recorder.js"
 	],
+	"js/checkout.min.js": [
+		"public/js/integrations/razorpay.js"
+	],
 	"js/frappe-web.min.js": [
 		"public/js/frappe/class.js",
 		"public/js/frappe/polyfill.js",
diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index 0885826e5c..57dbdd8f61 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -1,26 +1,150 @@
-frappe.provide("frappe.integration_service")
+// frappe.provide("frappe.integration_service")
 
-frappe.integration_service.razorpay = {
-	load: function(frm) {
-		new frappe.integration_service.Razorpay(frm)
-	},
-	scheduler_job_helper: function(){
-		return  {
-			"Every few minutes": "Check and capture new payments"
+// frappe.integration_service.razorpay = {
+// 	load: function(frm) {
+// 		new frappe.integration_service.Razorpay(frm)
+// 	},
+// 	scheduler_job_helper: function(){
+// 		return  {
+// 			"Every few minutes": "Check and capture new payments"
+// 		}
+// 	}
+// }
+
+// frappe.integration_service.Razorpay =  Class.extend({
+// 	init:function(frm){
+// 		this.frm = frm;
+// 		this.frm.toggle_display("use_test_account", false);
+// 		this.show_logs();
+// 	},
+// 	show_logs: function(){
+// 		this.frm.add_custom_button(__("Show Log"), function(frm){
+// 			frappe.route_options = {"integration_request_service": "Razorpay"};
+// 			frappe.set_route("List", "Integration Request");
+// 		});
+// 	}
+// })
+// 
+
+// function make_payment(order, ticket) {
+// 		var options = {
+// 			"key":  "rzp_test_lExD7NVL1JoKJJ", // Enter the Key ID generated from the Dashboard
+// 			"amount": order.amount_due, // Amount is in currency subunits. Default currency is INR. Hence, 50000 refers to 50000 paise or INR 500.
+// 			"currency": order.currency,
+// 			"name": "IndiaOS",
+// 			"description": "Conference Ticket",
+// 			"image": "http://indiaos.in/assets/indiaos/img/icons/favicon.ico",
+// 			"order_id": order.id,
+// 			"prefill": {
+// 				"name": ticket.full_name,
+// 				"email": ticket.email,
+// 				"contact": '7506056962'
+// 			},
+// 			"theme": {
+// 				"color": "#F6E05E"
+// 			}
+// 		};
+
+// 		options.handler = function (response){
+// 			if (response.error) {
+// 				openModal();
+// 				fail('payment-failed');
+// 			}
+
+// 			if (response.razorpay_payment_id) {
+// 				openModal();
+// 				success();
+				
+// 			}
+// 		}
+
+// 		var razorpay = new Razorpay(options);
+// 		razorpay.once('ready', function(response) {
+//   			modalClose();
+// 		})
+
+//		razorpay.open();
+
+frappe.provide("frappe.checkout")
+
+frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
+	frappe.checkout.razorpay = class RazorpayCheckout {
+		constructor(opts) {
+			Object.assign(this, opts);
+		}
+
+		init() {
+			frappe.run_serially([
+				() => this.makeOrder(),
+				() => this.prepareOptions(),
+				() => this.setupHandler(),
+				() => this.show()
+			])
+		}
+
+		show(callback=null) {
+			let razorpay = new Razorpay(this.options);
+			razorpay.once('ready', function(response) {
+  				this.onOpen && this.onOpen(response);
+			})
+    		razorpay.open();
+		}
+
+		makeOrder() {
+			return new Promise(resolve => {
+				frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_order", {
+					doctype: this.doctype,
+					docname: this.docname
+				}).then(res => {
+					this.order = res.message
+					resolve(true);
+				})
+			});
+		}
+
+		orderSuccess(response) {
+			frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_success", {
+				integration_request: this.order.integration_request,
+				params: {
+					razorpay_payment_id: response.razorpay_payment_id,
+					razorpay_order_id: response.razorpay_order_id,
+					razorpay_signature: response.razorpay_signature
+				}
+			})
+		}
+
+		orderFail() {
+			frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_failure", {
+				integration_request: this.order.integration_request,
+				params: response
+			})
+		}
+
+		prepareOptions() {
+			this.options = {
+				"key": this.key,
+				"amount": this.order.amount_due, 
+				"currency": this.order.currency,
+				"name": this.name,
+				"description": this.description,
+				"image": this.image,
+				"order_id": this.order.id,
+				"prefill": this.prefill,
+				"theme": this.theme
+			};
+		}
+
+		setupHandler() {
+			this.options.handler = (response) => {
+				if (response.error) {
+					this.orderFail(response);
+					this.onFail && this.onFail(response);
+				}
+				if (response.razorpay_payment_id) {
+					this.orderSuccess(response);	
+					this.onSuccess && this.onSuccess(response);
+				}
+			}
 		}
 	}
-}
-
-frappe.integration_service.Razorpay =  Class.extend({
-	init:function(frm){
-		this.frm = frm;
-		this.frm.toggle_display("use_test_account", false);
-		this.show_logs();
-	},
-	show_logs: function(){
-		this.frm.add_custom_button(__("Show Log"), function(frm){
-			frappe.route_options = {"integration_request_service": "Razorpay"};
-			frappe.set_route("List", "Integration Request");
-		});
-	}
-})
+})
\ No newline at end of file

From e67b635673ef31f81189b411a6de74d13e869d6c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 13 Nov 2019 19:35:55 +0530
Subject: [PATCH 025/153] style: removed commented code

---
 frappe/public/js/integrations/razorpay.js | 67 -----------------------
 1 file changed, 67 deletions(-)

diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index 57dbdd8f61..3bc841d1be 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -1,70 +1,3 @@
-// frappe.provide("frappe.integration_service")
-
-// frappe.integration_service.razorpay = {
-// 	load: function(frm) {
-// 		new frappe.integration_service.Razorpay(frm)
-// 	},
-// 	scheduler_job_helper: function(){
-// 		return  {
-// 			"Every few minutes": "Check and capture new payments"
-// 		}
-// 	}
-// }
-
-// frappe.integration_service.Razorpay =  Class.extend({
-// 	init:function(frm){
-// 		this.frm = frm;
-// 		this.frm.toggle_display("use_test_account", false);
-// 		this.show_logs();
-// 	},
-// 	show_logs: function(){
-// 		this.frm.add_custom_button(__("Show Log"), function(frm){
-// 			frappe.route_options = {"integration_request_service": "Razorpay"};
-// 			frappe.set_route("List", "Integration Request");
-// 		});
-// 	}
-// })
-// 
-
-// function make_payment(order, ticket) {
-// 		var options = {
-// 			"key":  "rzp_test_lExD7NVL1JoKJJ", // Enter the Key ID generated from the Dashboard
-// 			"amount": order.amount_due, // Amount is in currency subunits. Default currency is INR. Hence, 50000 refers to 50000 paise or INR 500.
-// 			"currency": order.currency,
-// 			"name": "IndiaOS",
-// 			"description": "Conference Ticket",
-// 			"image": "http://indiaos.in/assets/indiaos/img/icons/favicon.ico",
-// 			"order_id": order.id,
-// 			"prefill": {
-// 				"name": ticket.full_name,
-// 				"email": ticket.email,
-// 				"contact": '7506056962'
-// 			},
-// 			"theme": {
-// 				"color": "#F6E05E"
-// 			}
-// 		};
-
-// 		options.handler = function (response){
-// 			if (response.error) {
-// 				openModal();
-// 				fail('payment-failed');
-// 			}
-
-// 			if (response.razorpay_payment_id) {
-// 				openModal();
-// 				success();
-				
-// 			}
-// 		}
-
-// 		var razorpay = new Razorpay(options);
-// 		razorpay.once('ready', function(response) {
-//   			modalClose();
-// 		})
-
-//		razorpay.open();
-
 frappe.provide("frappe.checkout")
 
 frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {

From c7edd0ac466e1edb92b7a0b25bc7f9574063ae38 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2019 23:23:15 +0000
Subject: [PATCH 026/153] chore(deps): [security] bump markdown2 from 2.3.5 to
 2.3.6

Bumps [markdown2](https://github.com/trentm/python-markdown2) from 2.3.5 to 2.3.6. **This update includes a security fix.**
- [Release notes](https://github.com/trentm/python-markdown2/releases)
- [Changelog](https://github.com/trentm/python-markdown2/blob/master/CHANGES.md)
- [Commits](https://github.com/trentm/python-markdown2/compare/2.3.5...2.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 84788c863e..2db499d53f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ chardet
 dropbox==9.1.0
 gunicorn
 jinja2
-markdown2==2.3.5
+markdown2==2.3.6
 PyMySQL
 maxminddb-geolite2
 python-dateutil

From baa8f8be50a53470e481921a381c9b9dabb925bb Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 11:44:04 +0530
Subject: [PATCH 027/153] style: added comments and cleaned up API

---
 .../razorpay_settings/razorpay_settings.py    | 80 +++++++++++++------
 frappe/public/js/integrations/razorpay.js     | 55 +++++++++++++
 2 files changed, 111 insertions(+), 24 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 2a0f14f4b9..03153f4049 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -182,14 +182,14 @@ class RazorpaySettings(Document):
 
 	def create_order(self, **kwargs):
 		# Creating Orders https://razorpay.com/docs/api/orders/
-		# 
-		# kwargs = {
-		# 	"amount": 3000,
-		# 	"currency": "INR",
-		# 	"receipt": "rcptid_11234",
-		# 	"payment_capture": 1
-		# }
+
+		# convert ruppes to paisa
+		kwargs['amount'] *= 100
+		
+		# Create integration log
 		integration_request = create_request_log(kwargs, "Host", "Razorpay")
+		
+		# Setup payment otptions
 		payment_options = {
 			"amount": kwargs.get('amount'),
 			"currency": kwargs.get('currency', 'INR'),
@@ -199,8 +199,8 @@ class RazorpaySettings(Document):
 		if self.api_key and self.api_secret:
 			try:
 				order = make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options)
-				order['integration_request'] = integration_request
-				return order
+				order['integration_request'] = integration_request.name
+				return order # Order returned to be consumed by razorpay.js
 			except Exception:
 				frappe.log(frappe.get_traceback())
 				frappe.throw(_("Could not create razorpay order"))
@@ -238,6 +238,10 @@ class RazorpaySettings(Document):
 				self.integration_request.update_status(data, 'Authorized')
 				self.flags.status_changed_to = "Authorized"
 
+			if resp.get("status") == "captured":
+				self.integration_request.update_status(data, 'Completed')
+				self.flags.status_changed_to = "Completed"
+
 			elif data.get('subscription_id'):
 				if resp.get("status") == "refunded":
 					# if subscription start date is in future then
@@ -247,14 +251,6 @@ class RazorpaySettings(Document):
 					self.integration_request.update_status(data, 'Completed')
 					self.flags.status_changed_to = "Verified"
 
-				if resp.get("status") == "captured":
-					# if subscription starts immediately then
-					# razorpay charge the actual amount
-					# thus changing status to Completed
-
-					self.integration_request.update_status(data, 'Completed')
-					self.flags.status_changed_to = "Completed"
-
 			else:
 				frappe.log_error(str(resp), 'Razorpay Payment not authorized')
 
@@ -357,19 +353,55 @@ def capture_payment(is_sandbox=False, sanbox_response=None):
 
 @frappe.whitelist(allow_guest=True)
 def get_order(doctype, docname):
-	return frappe.get_doc(doctype, docname).run_method("get_razorpay_order")
+	# Order returned to be consumed by razorpay.js
+	doc = frappe.get_doc(doctype, docname)
+	try:
+		# Do not use run_method here as it fails silently
+		return doc.get_razorpay_order()
+	except AttributeError:
+		error_log = frappe.log_error(frappe.get_traceback(), _("Controller method get_razorpay_order missing"))
+		frappe.throw(_("Could not create Razorpay order. Please contact Administrator"))
 
 @frappe.whitelist(allow_guest=True)
-def order_payment_success(self, integration_request, params):
-	print("SUCCESSSSSSS ------------------")
+def order_payment_success(integration_request, params):
+	"""Called by razorpay.js on order payment success, the params
+	contains razorpay_payment_id, razorpay_order_id, razorpay_signature
+	that is updated in the data field of integration request
+	
+	Args:
+	    integration_request (string): Name for integration request doc
+	    params (string): Params to be updated for integration request.
+	"""
+	params = json.loads(params)
 	integration = frappe.get_doc("Integration Request", integration_request)
-	integration.update_status(update_dict)
+	
+	# Update integration request
+	integration.update_status(params, integration.status)
+	integration.reload()
+
+	data = json.loads(integration.data)
+	controller = frappe.get_doc("Razorpay Settings")
+	
+	# Update payment and integration data for payment controller object
+	controller.integration_request = integration
+	controller.data = frappe._dict(data)
+	
+	# Authorize payment
+	controller.authorize_payment()
 
 @frappe.whitelist(allow_guest=True)
-def order_payment_failure(self, integration_request, params):
-	print("FAILLLLLL ------------------")
+def order_payment_failure(integration_request, params):
+	"""Called by razorpay.js on failure
+	
+	Args:
+	    integration_request (TYPE): Description
+	    params (TYPE): error data to be updated
+	"""
+	frappe.log_error(params, 'Razorpay Payment Failure')
+	
+	params = json.loads(params)
 	integration = frappe.get_doc("Integration Request", integration_request)
-	integration.update_status(update_dict)
+	integration.update_status(params, integration.status)
 
 def convert_rupee_to_paisa(**kwargs):
 	for addon in kwargs.get('addons'):
diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index 3bc841d1be..c21fd28b0e 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -1,3 +1,58 @@
+/* HOW-TO
+
+Razorpay Payment 
+
+1. 	Include checkout script in your code 
+	<script type="text/javascript" src="/assets/js/checkout.min.js"></script>
+
+2.	Create the Order controller in your backend 
+	def get_razorpay_order(self):
+		controller = get_payment_gateway_controller("Razorpay")
+		
+		payment_details = {
+			"amount": 300,
+			...
+			"reference_doctype": "Conference Participant",
+			"reference_docname": self.name,
+			...
+			"receipt": self.name
+		}
+
+		return controller.create_order(**payment_details)
+
+3. 	Inititate the payment in client using checkout API
+	function make_payment(ticket) {
+		var options = {
+			"key":  "<YOUR API KEY>",
+			"name": "<CHECKOUT MODAL TITLE>",
+			"description": "<CHECKOUT MODAL DESCRIPTION>",
+			"image": "<CHECKOUT MODAL LOGO>",
+		    "prefill": {
+				"name": "<CUSTOMER NAME>",
+				"email": "<CUSTOMER EMAIL>",
+				"contact": "<CUSTOMER PHONE>"
+		    },
+		    "theme": {
+				"color": "<MODAL COLOR>"
+		    },
+		    "doctype": "<REFERENCE DOCTYPE>",
+		    "docname": "<REFERENCE DOCNAME"
+		};
+
+		razorpay = new frappe.checkout.razorpay(options)
+		razorpay.onOpen = () => {
+			<SCRIPT TO RUN WHEN MODAL OPENS>
+		}
+		razorpay.onSuccess = () => {
+			<SCRIPT TO RUN ON PAYMENT SUCCESS>
+		}
+		razorpay.onFail = () => {
+			<SCRIPT TO RUN ON PAYMENT FAILURE>
+		}
+		razorpay.init() // Creates the order and opens the modal
+	}
+*/
+
 frappe.provide("frappe.checkout")
 
 frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {

From 719119803fedab56f486a64fd10e331506f3e5aa Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 11:46:57 +0530
Subject: [PATCH 028/153] style: use tabs

---
 .../doctype/razorpay_settings/razorpay_settings.py        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 03153f4049..44f999939a 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -369,8 +369,8 @@ def order_payment_success(integration_request, params):
 	that is updated in the data field of integration request
 	
 	Args:
-	    integration_request (string): Name for integration request doc
-	    params (string): Params to be updated for integration request.
+		integration_request (string): Name for integration request doc
+		params (string): Params to be updated for integration request.
 	"""
 	params = json.loads(params)
 	integration = frappe.get_doc("Integration Request", integration_request)
@@ -394,8 +394,8 @@ def order_payment_failure(integration_request, params):
 	"""Called by razorpay.js on failure
 	
 	Args:
-	    integration_request (TYPE): Description
-	    params (TYPE): error data to be updated
+		integration_request (TYPE): Description
+		params (TYPE): error data to be updated
 	"""
 	frappe.log_error(params, 'Razorpay Payment Failure')
 	

From ce2dc683084b46c63bdf6ddf619c98ab4c449eb0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 11:59:14 +0530
Subject: [PATCH 029/153] refactor: auto fetch API key

---
 .../doctype/razorpay_settings/razorpay_settings.py |  6 ++++++
 frappe/public/js/integrations/razorpay.js          | 14 ++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 44f999939a..f635cdd154 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -351,6 +351,12 @@ def capture_payment(is_sandbox=False, sanbox_response=None):
 			doc.error = frappe.get_traceback()
 			frappe.log_error(doc.error, '{0} Failed'.format(doc.name))
 
+
+@frappe.whitelist(allow_guest=True)
+def get_api_key():
+	controller = frappe.get_doc("Razorpay Settings")
+	return controller.api_key
+
 @frappe.whitelist(allow_guest=True)
 def get_order(doctype, docname):
 	# Order returned to be consumed by razorpay.js
diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index c21fd28b0e..1a49b07c8e 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -63,6 +63,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 
 		init() {
 			frappe.run_serially([
+				() => this.getKey(),
 				() => this.makeOrder(),
 				() => this.prepareOptions(),
 				() => this.setupHandler(),
@@ -78,9 +79,18 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
     		razorpay.open();
 		}
 
+		getKey() {
+			return new Promise(resolve => {
+				frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => {
+					this.key = res.message
+					resolve(true);
+				})
+			});
+		}
+
 		makeOrder() {
 			return new Promise(resolve => {
-				frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_order", {
+				frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_order", {
 					doctype: this.doctype,
 					docname: this.docname
 				}).then(res => {
@@ -91,7 +101,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 		}
 
 		orderSuccess(response) {
-			frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_success", {
+			frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_success", {
 				integration_request: this.order.integration_request,
 				params: {
 					razorpay_payment_id: response.razorpay_payment_id,

From 4a06c063f75f23c5475cc04f95a85528e4ff16f3 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 12:00:01 +0530
Subject: [PATCH 030/153] chore: update comment

---
 frappe/public/js/integrations/razorpay.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index 1a49b07c8e..ad691bcd99 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -23,7 +23,6 @@ Razorpay Payment
 3. 	Inititate the payment in client using checkout API
 	function make_payment(ticket) {
 		var options = {
-			"key":  "<YOUR API KEY>",
 			"name": "<CHECKOUT MODAL TITLE>",
 			"description": "<CHECKOUT MODAL DESCRIPTION>",
 			"image": "<CHECKOUT MODAL LOGO>",

From 66367b1605c587ba46b66729d55fd3dba0ef6fd5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 14 Nov 2019 12:00:32 +0530
Subject: [PATCH 031/153] fix: Hide Notification Settings List from search

---
 .../doctype/notification_settings/notification_settings.json   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/notification_settings/notification_settings.json b/frappe/desk/doctype/notification_settings/notification_settings.json
index a162105299..c8bda705d9 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.json
+++ b/frappe/desk/doctype/notification_settings/notification_settings.json
@@ -86,7 +86,7 @@
   }
  ],
  "in_create": 1,
- "modified": "2019-11-12 14:50:16.822761",
+ "modified": "2019-11-14 11:55:09.198036",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Notification Settings",
@@ -104,6 +104,7 @@
    "write": 1
   }
  ],
+ "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1

From e7e81284102e0ea60969e89a12281bed2d64f761 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 14 Nov 2019 12:00:47 +0530
Subject: [PATCH 032/153] fix: Common method to toggle seen

---
 .../frappe/ui/notifications/notifications.js  | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index c2e6ccaa81..88328c7b09 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -225,7 +225,7 @@ frappe.ui.Notifications = class Notifications {
 	change_activity_status() {
 		if (this.$dropdown_list.find('.activity-status')) {
 			this.$dropdown_list.find('.activity-status').replaceWith(
-				`<a class="recent-item text-center text-muted" 
+				`<a class="recent-item text-center text-muted"
 					href="#List/Notification Log">
 					<div class="full-log-btn">${__('View Full Log')}</div>
 				</a>`
@@ -270,10 +270,10 @@ frappe.ui.Notifications = class Notifications {
 		);
 	}
 
-	mark_as_seen() {
+	toggle_seen(flag) {
 		frappe.call(
 			'frappe.desk.doctype.notification_settings.notification_settings.set_seen_value',
-			{ value: 1 }
+			{ value: cint(flag) }
 		);
 	}
 
@@ -331,7 +331,7 @@ frappe.ui.Notifications = class Notifications {
 		let user = field.from_user;
 		let user_avatar = frappe.avatar(user, 'avatar-small user-avatar');
 		let timestamp = frappe.datetime.comment_when(field.creation, true);
-		let item_html = 
+		let item_html =
 			`<a class="recent-item ${read_class}"
 				href="${doc_link}"
 				data-name="${field.name}"
@@ -385,7 +385,7 @@ frappe.ui.Notifications = class Notifications {
 			let html = `<li class="notifications-category">
 					<li class="text-muted header"
 						data-action="${category.action}"
-						href="#${category_id}" 
+						href="#${category_id}"
 						data-toggle="collapse">
 						${category.label}
 						<span class="octicon octicon-chevron-down collapse-indicator"></span>
@@ -442,11 +442,8 @@ frappe.ui.Notifications = class Notifications {
 		frappe.realtime.on('notification', () => {
 			if (this.notifications_settings.seen == 1) {
 				this.notifications_settings.seen = 0;
-				frappe.call(
-					'frappe.desk.doctype.notification_settings.notification_settings.set_seen_value',
-					{ value: 0 }
-				);
-			} 
+				this.toggle_seen(false);
+			}
 			this.$dropdown.find('.notifications-indicator').show();
 			this.update_dropdown();
 		});
@@ -471,7 +468,7 @@ frappe.ui.Notifications = class Notifications {
 		});
 
 		this.$dropdown.on('show.bs.dropdown', () => {
-			this.mark_as_seen();
+			this.toggle_seen(true);
 			if (this.$notification_indicator.is(':visible')) {
 				this.$notification_indicator.hide();
 				frappe.call(
@@ -530,4 +527,4 @@ frappe.ui.notifications = {
 		}
 		frappe.set_route('List', doctype);
 	}
-};
\ No newline at end of file
+};

From ac9fe0215c223036dfcc535e64d89784c1e4ed12 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 14 Nov 2019 12:29:52 +0530
Subject: [PATCH 033/153] fix(fileuploader): Handle 403 status code

---
 frappe/public/js/frappe/file_uploader/FileUploader.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue
index dbbde40f2a..845fbf92b4 100644
--- a/frappe/public/js/frappe/file_uploader/FileUploader.vue
+++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue
@@ -367,6 +367,13 @@ export default {
 							if (this.on_success) {
 								this.on_success(file_doc, r);
 							}
+						} else if (xhr.status === 403) {
+							let response = JSON.parse(xhr.responseText);
+							frappe.msgprint({
+								title: __('Not permitted'),
+								indicator: 'red',
+								message: response._error_message
+							});
 						} else {
 							file.failed = true;
 							let error = null;

From 9dad73c3004939f52077c391ae952889472e080e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 14 Nov 2019 12:44:05 +0530
Subject: [PATCH 034/153] test: More robust control link test

---
 cypress/integration/control_link.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js
index a934132c89..63c99c4d1b 100644
--- a/cypress/integration/control_link.js
+++ b/cypress/integration/control_link.js
@@ -61,12 +61,18 @@ context('Control Link', () => {
 
 		cy.server();
 		cy.route('GET', '/api/method/frappe.desk.form.utils.validate_link*').as('validate_link');
+		cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link');
 
 		cy.get('@todos').then(todos => {
-			cy.get('.frappe-control[data-fieldname=link] input').type(todos[0]).blur();
+			cy.get('.frappe-control[data-fieldname=link] input').as('input');
+			cy.get('@input').focus();
+			cy.wait('@search_link');
+			cy.get('@input').type(todos[0]).blur();
 			cy.wait('@validate_link');
-			cy.get('.frappe-control[data-fieldname=link] input').focus();
-			cy.get('.frappe-control[data-fieldname=link] .link-btn').click();
+			cy.get('@input').focus();
+			cy.get('.frappe-control[data-fieldname=link] .link-btn')
+				.should('be.visible')
+				.click();
 			cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`);
 		});
 	});

From 049873edc50f2603d702c17c8f89d6202b1b5734 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 12:56:31 +0530
Subject: [PATCH 035/153] feat: enabled modal api in checkout

---
 frappe/public/js/integrations/razorpay.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index ad691bcd99..6b0dd0fce4 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -71,11 +71,11 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 		}
 
 		show(callback=null) {
-			let razorpay = new Razorpay(this.options);
-			razorpay.once('ready', function(response) {
+			this.razorpay = new Razorpay(this.options);
+			this.razorpay.once('ready', (response) => {
   				this.onOpen && this.onOpen(response);
 			})
-    		razorpay.open();
+    		this.razorpay.open();
 		}
 
 		getKey() {
@@ -127,7 +127,8 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 				"image": this.image,
 				"order_id": this.order.id,
 				"prefill": this.prefill,
-				"theme": this.theme
+				"theme": this.theme,
+				"modal": this.modal
 			};
 		}
 
@@ -137,7 +138,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 					this.orderFail(response);
 					this.onFail && this.onFail(response);
 				}
-				if (response.razorpay_payment_id) {
+				else if (response.razorpay_payment_id) {
 					this.orderSuccess(response);	
 					this.onSuccess && this.onSuccess(response);
 				}

From 081afb1492e45741591db7af1fe13983d8a8b07e Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 14 Nov 2019 13:43:54 +0530
Subject: [PATCH 036/153] fix: deadlock issue on load of company

---
 frappe/utils/goal.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/utils/goal.py b/frappe/utils/goal.py
index 6385f7cef5..e7cffc3ddf 100644
--- a/frappe/utils/goal.py
+++ b/frappe/utils/goal.py
@@ -80,7 +80,6 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
 		if filter_str:
 			doc_filter += ' and ' + filter_str if doc_filter else filter_str
 		month_to_value_dict = get_monthly_results(goal_doctype, goal_field, date_field, doc_filter, aggregation)
-		frappe.db.set_value(doctype, docname, goal_history_field, json.dumps(month_to_value_dict))
 
 	month_to_value_dict[current_month_year] = current_month_value
 

From 4bc4749d371d04f1183eab03898a36e2a902b552 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 14 Nov 2019 14:34:38 +0530
Subject: [PATCH 037/153] fix: set notifications as unseen from the server side

---
 frappe/desk/doctype/notification_log/notification_log.py | 9 +++++++--
 .../notification_settings/notification_settings.py       | 4 ++--
 .../public/js/frappe/ui/notifications/notifications.js   | 9 ++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 6f27fa4f44..15a0e66bc4 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -7,11 +7,12 @@ import frappe
 from frappe import _
 from frappe.model.document import Document
 from frappe.desk.doctype.notification_settings.notification_settings import (is_notifications_enabled,
-	is_email_notifications_enabled, is_email_notifications_enabled_for_type)
+	is_email_notifications_enabled, is_email_notifications_enabled_for_type, set_seen_value)
 
 class NotificationLog(Document):
 	def after_insert(self):
 		frappe.publish_realtime('notification', after_commit=True, user=self.for_user)
+		set_notifications_as_unseen(self.for_user)
 		if is_email_notifications_enabled(self.for_user):
 			send_notification_email(self)
 
@@ -123,7 +124,11 @@ def mark_as_read(docname):
 	if docname:
 		frappe.db.set_value('Notification Log', docname, 'read', 1, update_modified=False)
 
-
 @frappe.whitelist()
 def trigger_indicator_hide():
 	frappe.publish_realtime('indicator_hide', user=frappe.session.user)
+
+def set_notifications_as_unseen(user):
+	notification_settings_doc = frappe.get_doc('Notification Settings', user)
+	if notification_settings_doc.seen == 1:
+		set_seen_value(value = 0, user = user)
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index 1ac4e2b1dd..667e13c1fd 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -62,5 +62,5 @@ def get_permission_query_conditions(user):
 	return '''(`tabNotification Settings`.user = '{user}')'''.format(user=user)
 
 @frappe.whitelist()
-def set_seen_value(value):
-	frappe.db.set_value('Notification Settings', frappe.session.user, 'seen', value, update_modified=False)
\ No newline at end of file
+def set_seen_value(value, user):
+	frappe.db.set_value('Notification Settings', user, 'seen', value, update_modified=False)
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index 88328c7b09..d50aa02391 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -273,7 +273,10 @@ frappe.ui.Notifications = class Notifications {
 	toggle_seen(flag) {
 		frappe.call(
 			'frappe.desk.doctype.notification_settings.notification_settings.set_seen_value',
-			{ value: cint(flag) }
+			{
+				value: cint(flag),
+				user: frappe.session.user
+			}
 		);
 	}
 
@@ -440,10 +443,6 @@ frappe.ui.Notifications = class Notifications {
 
 	setup_notification_listeners() {
 		frappe.realtime.on('notification', () => {
-			if (this.notifications_settings.seen == 1) {
-				this.notifications_settings.seen = 0;
-				this.toggle_seen(false);
-			}
 			this.$dropdown.find('.notifications-indicator').show();
 			this.update_dropdown();
 		});

From 1b4759358870e72554292b4e78f99f926ca0a073 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 15:57:04 +0530
Subject: [PATCH 038/153] style: liting fixes

---
 .../razorpay_settings/razorpay_settings.py     |  7 ++++---
 frappe/public/js/integrations/razorpay.js      | 18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index f635cdd154..d3eb68441e 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -198,7 +198,9 @@ class RazorpaySettings(Document):
 		}
 		if self.api_key and self.api_secret:
 			try:
-				order = make_post_request("https://api.razorpay.com/v1/orders", auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), data=payment_options)
+				order = make_post_request("https://api.razorpay.com/v1/orders", 
+					auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), 
+					data=payment_options)
 				order['integration_request'] = integration_request.name
 				return order # Order returned to be consumed by razorpay.js
 			except Exception:
@@ -365,7 +367,7 @@ def get_order(doctype, docname):
 		# Do not use run_method here as it fails silently
 		return doc.get_razorpay_order()
 	except AttributeError:
-		error_log = frappe.log_error(frappe.get_traceback(), _("Controller method get_razorpay_order missing"))
+		frappe.log_error(frappe.get_traceback(), _("Controller method get_razorpay_order missing"))
 		frappe.throw(_("Could not create Razorpay order. Please contact Administrator"))
 
 @frappe.whitelist(allow_guest=True)
@@ -404,7 +406,6 @@ def order_payment_failure(integration_request, params):
 		params (TYPE): error data to be updated
 	"""
 	frappe.log_error(params, 'Razorpay Payment Failure')
-	
 	params = json.loads(params)
 	integration = frappe.get_doc("Integration Request", integration_request)
 	integration.update_status(params, integration.status)
diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index 6b0dd0fce4..a950a3c915 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -52,7 +52,7 @@ Razorpay Payment
 	}
 */
 
-frappe.provide("frappe.checkout")
+frappe.provide("frappe.checkout");
 
 frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 	frappe.checkout.razorpay = class RazorpayCheckout {
@@ -67,21 +67,21 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 				() => this.prepareOptions(),
 				() => this.setupHandler(),
 				() => this.show()
-			])
+			]);
 		}
 
-		show(callback=null) {
+		show() {
 			this.razorpay = new Razorpay(this.options);
 			this.razorpay.once('ready', (response) => {
-  				this.onOpen && this.onOpen(response);
+				this.onOpen && this.onOpen(response);
 			})
-    		this.razorpay.open();
+			this.razorpay.open();
 		}
 
 		getKey() {
 			return new Promise(resolve => {
 				frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => {
-					this.key = res.message
+					this.key = res.message;
 					resolve(true);
 				})
 			});
@@ -93,7 +93,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 					doctype: this.doctype,
 					docname: this.docname
 				}).then(res => {
-					this.order = res.message
+					this.order = res.message;
 					resolve(true);
 				})
 			});
@@ -110,7 +110,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			})
 		}
 
-		orderFail() {
+		orderFail(response) {
 			frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_failure", {
 				integration_request: this.order.integration_request,
 				params: response
@@ -145,4 +145,4 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			}
 		}
 	}
-})
\ No newline at end of file
+});
\ No newline at end of file

From 949d2f483eb1685459a59a33289f8d94678a5e0c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 16:07:15 +0530
Subject: [PATCH 039/153] style: whitespace fixes

---
 .../doctype/razorpay_settings/razorpay_settings.py          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index d3eb68441e..7f46ffe513 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -198,8 +198,8 @@ class RazorpaySettings(Document):
 		}
 		if self.api_key and self.api_secret:
 			try:
-				order = make_post_request("https://api.razorpay.com/v1/orders", 
-					auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)), 
+				order = make_post_request("https://api.razorpay.com/v1/orders",
+					auth=(self.api_key, self.get_password(fieldname="api_secret", raise_exception=False)),
 					data=payment_options)
 				order['integration_request'] = integration_request.name
 				return order # Order returned to be consumed by razorpay.js
@@ -400,7 +400,7 @@ def order_payment_success(integration_request, params):
 @frappe.whitelist(allow_guest=True)
 def order_payment_failure(integration_request, params):
 	"""Called by razorpay.js on failure
-	
+
 	Args:
 		integration_request (TYPE): Description
 		params (TYPE): error data to be updated

From 9d5baca7de690239b893edc044bc4d83dbf65faa Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Thu, 14 Nov 2019 14:54:59 +0530
Subject: [PATCH 040/153] fix: change tags on filter change

---
 frappe/public/js/frappe/list/base_list.js    | 2 +-
 frappe/public/js/frappe/list/list_sidebar.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 648a3d6d55..6650c952b0 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -402,7 +402,7 @@ frappe.views.BaseList = class BaseList {
 	}
 
 	after_render() {
-
+		this.list_sidebar.reload_stats();
 	}
 
 	render() {
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 0000a3dc73..628f4d2edc 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -285,7 +285,8 @@ frappe.views.ListSidebar = class ListSidebar {
 			args: {
 				stats: me.stats,
 				doctype: me.doctype,
-				filters: me.default_filters || []
+				// wait for list filter area to be generated before getting filters, or fallback to default filters
+				filters: (me.list_view.filter_area ? me.list_filter.get_current_filters() : me.default_filters) || []
 			},
 			callback: function(r) {
 				me.render_stat("_user_tags", (r.message.stats || {})["_user_tags"]);
@@ -386,6 +387,7 @@ frappe.views.ListSidebar = class ListSidebar {
 
 	reload_stats() {
 		this.sidebar.find(".sidebar-stat").remove();
+		this.sidebar.find(".list-tag-preview").remove();
 		this.get_stats();
 	}
 

From f1005d9dae9d941df23e6f1aae6c69f28d5357a0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 14 Nov 2019 16:54:21 +0530
Subject: [PATCH 041/153] style: whitespace fixes

---
 .../doctype/razorpay_settings/razorpay_settings.py   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 7f46ffe513..903bb7fbe8 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -185,10 +185,10 @@ class RazorpaySettings(Document):
 
 		# convert ruppes to paisa
 		kwargs['amount'] *= 100
-		
+
 		# Create integration log
 		integration_request = create_request_log(kwargs, "Host", "Razorpay")
-		
+
 		# Setup payment otptions
 		payment_options = {
 			"amount": kwargs.get('amount'),
@@ -375,25 +375,25 @@ def order_payment_success(integration_request, params):
 	"""Called by razorpay.js on order payment success, the params
 	contains razorpay_payment_id, razorpay_order_id, razorpay_signature
 	that is updated in the data field of integration request
-	
+
 	Args:
 		integration_request (string): Name for integration request doc
 		params (string): Params to be updated for integration request.
 	"""
 	params = json.loads(params)
 	integration = frappe.get_doc("Integration Request", integration_request)
-	
+
 	# Update integration request
 	integration.update_status(params, integration.status)
 	integration.reload()
 
 	data = json.loads(integration.data)
 	controller = frappe.get_doc("Razorpay Settings")
-	
+
 	# Update payment and integration data for payment controller object
 	controller.integration_request = integration
 	controller.data = frappe._dict(data)
-	
+
 	# Authorize payment
 	controller.authorize_payment()
 

From 2693b357aa1c8c13bf222a79a9b383472271c8ba Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Wed, 30 Oct 2019 13:09:26 +0550
Subject: [PATCH 042/153] bumped to version 12.0.18

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 6424dcd9b5..77207e017f 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.17'
+__version__ = '12.0.18'
 __title__ = "Frappe Framework"
 
 local = Local()

From a685b10f8e8dce03b75cf2f74524d1d7b3c683de Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 14 Nov 2019 20:11:21 +0530
Subject: [PATCH 043/153] fix: Show total row in print only if add total row is
 checked

---
 .../public/js/frappe/views/reports/query_report.js  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 4b72a6b7b5..560cb3d17b 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -975,12 +975,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				return this.data[index];
 			}
 		}).filter(Boolean);
-		let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => {
-			row[cell.column.id] = cell.content;
-			return row;
-		}, {});
 
-		rows.push(totalRow);
+		if (this.raw_data.add_total_row) {
+			let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => {
+				row[cell.column.id] = cell.content;
+				return row;
+			}, {});
+
+			rows.push(totalRow);
+		}
 		return rows;
 	}
 

From b51ff98f7397bde07f3560307a5c5004bd799506 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:37:41 +0530
Subject: [PATCH 044/153] fix: Allow creation of new point log if old logs were
 reverted

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

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 33a6717cb9..cd3d641d53 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -149,7 +149,8 @@ def check_if_log_exists(ref_doctype, ref_name, rule, user=None):
 	filters = frappe._dict({
 		'rule': rule,
 		'reference_doctype': ref_doctype,
-		'reference_name': ref_name
+		'reference_name': ref_name,
+		'reverted': 0
 	})
 
 	if user:

From 3b017123418555149a1f458f221217d78c3030a3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:50:40 +0530
Subject: [PATCH 045/153] test: Check allowance of new log over reverted log

---
 .../energy_point_log/test_energy_point_log.py | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index a1d67789aa..9e4d0e6425 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -249,6 +249,27 @@ class TestEnergyPointLog(unittest.TestCase):
 		# point should not be awarded more than once for same doc (irrespective of user)
 		self.assertEqual(second_user_points_after_closing_todo, second_user_points)
 
+	def test_allow_creation_of_new_log_if_the_previous_log_was_reverted(self):
+		frappe.set_user('test@example.com')
+		todo_point_rule = create_energy_point_rule_for_todo()
+		energy_point_of_user = get_points('test@example.com')
+
+		created_todo = create_a_todo()
+
+		created_todo.status = 'Closed'
+		created_todo.save()
+		points_after_closing_todo = get_points('test@example.com')
+
+		log_name = frappe.db.exists('Energy Point Log', {'reference_name': created_todo.name})
+		frappe.get_doc('Energy Point Log', log_name).revert('Just for test')
+		points_after_reverting_todo = get_points('test@example.com')
+		created_todo.save()
+		points_after_saving_todo_again = get_points('test@example.com')
+
+		rule_points = todo_point_rule.points
+		self.assertEqual(points_after_closing_todo, energy_point_of_user + rule_points)
+		self.assertEqual(points_after_reverting_todo, points_after_closing_todo - rule_points)
+		self.assertEqual(points_after_saving_todo_again, points_after_reverting_todo + rule_points)
 
 def create_energy_point_rule_for_todo(multiplier_field=None, for_doc_event='Custom', max_points=None,
 	for_assigned_users=0, field_to_check=None, apply_once=False, user_field='owner'):

From 4bfbeb2c1b11d532134e86cfcafe5224b18b37ea Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:50:52 +0530
Subject: [PATCH 046/153] refactor: Move revert functionality to controller

---
 .../energy_point_log/energy_point_log.js      |  9 +--
 .../energy_point_log/energy_point_log.py      | 57 ++++++++++---------
 .../energy_point_rule/energy_point_rule.py    |  4 +-
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index 3090f3659d..9822998a30 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -21,14 +21,15 @@ frappe.ui.form.on('Energy Point Log', {
 				reqd: 1
 			}],
 			primary_action: (values) => {
-				return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', {
-					'name': frm.doc.name,
+				return frm.call('revert', {
 					'reason': values.reason
-				}).then(revert_log => {
+				}).then(res => {
+					let revert_log = res.message;
 					revert_dialog.hide();
 					revert_dialog.clear();
 					frappe.model.docinfo[frm.doc.reference_doctype][frm.doc.reference_name].energy_point_logs.unshift(revert_log);
-				}).catch(() => {});
+					frm.refresh();
+				});
 			},
 			primary_action_label: __('Submit')
 		});
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index cd3d641d53..cfba5884cf 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -44,6 +44,35 @@ class EnergyPointLog(Document):
 
 			enqueue_create_notification(self.user, notification_doc)
 
+	def on_trash(self):
+		if self.type == 'Revert':
+			reference_log = frappe.get_doc('Energy Point Log', self.revert_of)
+			reference_log.reverted = 0
+			reference_log.save()
+
+	def revert(self, reason):
+		frappe.only_for('System Manager')
+		if self.type != 'Auto':
+			frappe.throw(_('This document cannot be reverted'))
+
+		if self.reverted: return
+
+		self.reverted = 1
+		self.save(ignore_permissions=True)
+
+		revert_log = frappe.get_doc({
+			'doctype': 'Energy Point Log',
+			'points': -(self.points),
+			'type': 'Revert',
+			'user': self.user,
+			'reason': reason,
+			'reference_doctype': self.reference_doctype,
+			'reference_name': self.reference_name,
+			'revert_of': self.name
+		}).insert(ignore_permissions=True)
+
+		return revert_log
+
 def get_notification_message(doc):
 	owner_name = get_fullname(doc.owner)
 	points = doc.points
@@ -258,32 +287,6 @@ def get_reviews(doctype, docname):
 		'type': ['in', ('Appreciation', 'Criticism')],
 	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
 
-@frappe.whitelist()
-def revert(name, reason):
-	frappe.only_for('System Manager')
-	doc_to_revert = frappe.get_doc('Energy Point Log', name)
-
-	if doc_to_revert.type != 'Auto':
-		frappe.throw(_('This document cannot be reverted'))
-
-	if doc_to_revert.reverted: return
-
-	doc_to_revert.reverted = 1
-	doc_to_revert.save(ignore_permissions=True)
-
-	revert_log = frappe.get_doc({
-		'doctype': 'Energy Point Log',
-		'points': -(doc_to_revert.points),
-		'type': 'Revert',
-		'user': doc_to_revert.user,
-		'reason': reason,
-		'reference_doctype': doc_to_revert.reference_doctype,
-		'reference_name': doc_to_revert.reference_name,
-		'revert_of': doc_to_revert.name
-	}).insert(ignore_permissions=True)
-
-	return revert_log
-
 def send_weekly_summary():
 	send_summary('Weekly')
 
@@ -326,5 +329,3 @@ def get_footer_message(timespan):
 		return _("Stats based on last month's performance (from {0} to {1})")
 	else:
 		return _("Stats based on last week's performance (from {0} to {1})")
-
-
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 38995887f0..0d66691a1b 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -8,7 +8,7 @@ from frappe import _
 import frappe.cache_manager
 from frappe.model.document import Document
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log, revert
+from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
 
 class EnergyPointRule(Document):
 	def on_update(self):
@@ -106,7 +106,7 @@ def revert_points_for_cancelled_doc(doc):
 		'type': 'Auto'
 	})
 	for log in energy_point_logs:
-		revert(log.name, _('Reference document has been cancelled'))
+		frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled'))
 
 
 def get_energy_point_doctypes():

From 96715b10f460812229eb8b86c6a1bdad506a1b47 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 11:00:05 +0530
Subject: [PATCH 047/153] style: Fix codacy

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

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index cfba5884cf..eb8bccf96a 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -55,7 +55,7 @@ class EnergyPointLog(Document):
 		if self.type != 'Auto':
 			frappe.throw(_('This document cannot be reverted'))
 
-		if self.reverted: return
+		if self.get('reverted'): return
 
 		self.reverted = 1
 		self.save(ignore_permissions=True)

From f4fb04c4b28a9602afb7748dc4a3ed34cfe03fd9 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 11:15:53 +0530
Subject: [PATCH 048/153] style: Fix deepsource

---
 frappe/social/doctype/energy_point_log/energy_point_log.py  | 3 ++-
 .../social/doctype/energy_point_rule/energy_point_rule.py   | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index eb8bccf96a..8353c3aa5f 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -55,7 +55,8 @@ class EnergyPointLog(Document):
 		if self.type != 'Auto':
 			frappe.throw(_('This document cannot be reverted'))
 
-		if self.get('reverted'): return
+		if self.get('reverted'):
+			return
 
 		self.reverted = 1
 		self.save(ignore_permissions=True)
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 0d66691a1b..5986e90bfb 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -8,7 +8,8 @@ from frappe import _
 import frappe.cache_manager
 from frappe.model.document import Document
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
+from frappe.social.doctype.energy_point_log.energy_point_log import \
+	create_energy_points_log
 
 class EnergyPointRule(Document):
 	def on_update(self):
@@ -106,7 +107,8 @@ def revert_points_for_cancelled_doc(doc):
 		'type': 'Auto'
 	})
 	for log in energy_point_logs:
-		frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled'))
+		reference_log = frappe.get_doc('Energy Point Log', log.name)
+		reference_log.revert(_('Reference document has been cancelled'))
 
 
 def get_energy_point_doctypes():

From 1c6881ba3c18f3f2e75070e32165cfa5deb5ecdc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 15 Nov 2019 13:47:32 +0530
Subject: [PATCH 049/153] fix: Make code explicit

.click() could have unchecked already checked row (this case may never occur but it's better to explicitly set it as checked)
---
 frappe/public/js/frappe/list/list_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index a1fe886484..b52b1db542 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1087,7 +1087,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	set_rows_as_checked() {
 		$.each(this.$checks, (i, el) => {
 			let docname = $(el).attr('data-name');
-			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click();
+			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true);
 		});
 	}
 

From 5ae026295d41b788d888ffbe16576185ec11ba32 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 15 Nov 2019 13:53:47 +0530
Subject: [PATCH 050/153] fix: Trigger on_row_checked after checking rows

---
 frappe/public/js/frappe/list/list_view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b52b1db542..b980ae7684 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1089,6 +1089,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			let docname = $(el).attr('data-name');
 			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true);
 		});
+		this.on_row_checked();
 	}
 
 	on_row_checked() {

From f8da1dffc3840ffbff0b76274f6c0a2c7e38500e Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Fri, 15 Nov 2019 14:22:08 +0530
Subject: [PATCH 051/153] fix(notification_log): skip
 enqueue_create_notification during new site creation

---
 frappe/desk/doctype/notification_log/notification_log.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 8f43cdc2b9..9425e105e4 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -26,6 +26,15 @@ def get_permission_query_conditions(for_user):
 	return '''(`tabNotification Log`.for_user = '{user}')'''.format(user=for_user)
 
 def enqueue_create_notification(users, doc):
+	'''
+	During installation of new site, enqueue_create_notification tries to connect to Redis.
+	This breaks new site creation if Redis server is not running.
+	We do not need any notifications in fresh installation
+	'''
+
+	if frappe.flags.in_install:
+		return
+
 	doc = frappe._dict(doc)
 
 	if isinstance(users, frappe.string_types):

From ab455b46cd454043b0bc37d3f57d942eed97eaf5 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 15 Nov 2019 15:44:39 +0530
Subject: [PATCH 052/153] fix(pdf): Remove unnecessary argument

https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
https://docs.python.org/2/library/urllib.html#urllib.quote
---
 frappe/utils/response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 886baf2c37..8169986e44 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -90,7 +90,7 @@ def as_json():
 def as_pdf():
 	response = Response()
 	response.mimetype = "application/pdf"
-	encoded_filename = quote(frappe.response['filename'].replace(' ', '_'), encoding='utf-8')
+	encoded_filename = quote(frappe.response['filename'].replace(' ', '_'))
 	response.headers["Content-Disposition"] = ("filename=\"%s\"" % frappe.response['filename'].replace(' ', '_') + ";filename*=utf-8''%s" % encoded_filename).encode("utf-8")
 	response.data = frappe.response['filecontent']
 	return response

From 642d69b5928f20fb21e915395f24bcf4259d3412 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 17:08:46 +0530
Subject: [PATCH 053/153] fix: Cache can_import list for all users and not just
 System Managers

---
 frappe/core/doctype/data_import/data_import.js | 7 ++++---
 frappe/core/doctype/data_import/data_import.py | 5 ++---
 frappe/utils/user.py                           | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index c5bd4e99c9..9391b262d7 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -3,19 +3,20 @@
 
 frappe.ui.form.on('Data Import', {
 	onload: function(frm) {
-		if(frm.doc.__islocal) {
+		if (frm.doc.__islocal) {
 			frm.set_value("action", "");
 		}
 
 		frappe.call({
-			method: "frappe.core.doctype.data_import.data_import.get_importable_doc",
+			method: "frappe.core.doctype.data_import.data_import.get_importable_doctypes",
 			callback: function (r) {
+				let importable_doctypes = r.message;
 				frm.set_query("reference_doctype", function () {
 					return {
 						"filters": {
 							"issingle": 0,
 							"istable": 0,
-							"name": ['in', r.message]
+							"name": ['in', importable_doctypes]
 						}
 					};
 				});
diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py
index 80f8553121..ecf34d24b0 100644
--- a/frappe/core/doctype/data_import/data_import.py
+++ b/frappe/core/doctype/data_import/data_import.py
@@ -30,9 +30,8 @@ class DataImport(Document):
 
 
 @frappe.whitelist()
-def get_importable_doc():
-	import_lst = frappe.cache().hget("can_import", frappe.session.user)
-	return import_lst
+def get_importable_doctypes():
+	return frappe.cache().hget("can_import", frappe.session.user)
 
 @frappe.whitelist()
 def import_data(data_import):
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index e0c943d7c5..fa114d0e3c 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -161,7 +161,8 @@ class UserPermissions:
 			for docname in docs:
 				if frappe.get_meta(docname, cached=True).allow_import == 1:
 					self.can_import.append(docname)
-			frappe.cache().hset("can_import", frappe.session.user, self.can_import)
+
+		frappe.cache().hset("can_import", frappe.session.user, self.can_import)
 
 	def get_defaults(self):
 		import frappe.defaults

From f31e93255ecb672b2df883cf2fc3dfb33d09cc83 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 16 Nov 2019 18:59:36 +0530
Subject: [PATCH 054/153] fix: Fallback for label in Table

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

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 90e0f90be7..3de62daf64 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -52,7 +52,7 @@ export default class Grid {
 
 		let template = `<div class="form-group">
 			<div class="clearfix">
-				<label class="control-label" style="padding-right: 0px;">${__(this.df.label)}</label>
+				<label class="control-label" style="padding-right: 0px;">${__(this.df.label || '')}</label>
 			</div>
 			<div class="form-grid">
 				<div class="grid-heading-row"></div>

From 4b462bfd8a34e96a2ac281125d4a011f5a4fdd22 Mon Sep 17 00:00:00 2001
From: Nickesh <nick9822@gmail.com>
Date: Sun, 17 Nov 2019 12:01:58 +0530
Subject: [PATCH 055/153] Codacy suggested fixes

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

diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index d3b4021360..5513e81945 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -53,7 +53,7 @@ frappe.ready(function() {
 			let web_form_doc = data.web_form;
 
 			if (web_form_doc.name && web_form_doc.allow_edit === 0) {
-				if(!window.location.href.includes("?new=1")){
+				if (!window.location.href.includes("?new=1")) {
 					window.location.replace(window.location.pathname + "?new=1");
 				}
 			}

From 2ba74395203953671a706ae0697fdea8b31d3c55 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 17 Nov 2019 13:05:58 +0530
Subject: [PATCH 056/153] fix: Handle overflow in version info

---
 frappe/core/doctype/version/version.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/version/version.css b/frappe/core/doctype/version/version.css
index 987204ed9b..769b352585 100644
--- a/frappe/core/doctype/version/version.css
+++ b/frappe/core/doctype/version/version.css
@@ -1,3 +1,7 @@
+.version-info {
+	overflow: auto;
+}
+
 .version-info pre {
 	border: 0px;
 	margin: 0px;
@@ -14,4 +18,4 @@
 
 .version-info .danger {
 	background-color: #f2dede !important;
-}
\ No newline at end of file
+}

From 45ec5d47a30e2d612593d520519e4c4aaa0a49cf Mon Sep 17 00:00:00 2001
From: Nickesh <nick9822@gmail.com>
Date: Sun, 17 Nov 2019 14:42:55 +0530
Subject: [PATCH 057/153] Check allow_edit before preparing web form

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

diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js
index 5513e81945..7bf7162101 100644
--- a/frappe/public/js/frappe/web_form/webform_script.js
+++ b/frappe/public/js/frappe/web_form/webform_script.js
@@ -58,7 +58,7 @@ frappe.ready(function() {
 				}
 			}
 			let doc = r.message.doc || build_doc(r.message);
-			web_form.prepare(web_form_doc, doc);
+			web_form.prepare(web_form_doc, r.message.doc && web_form_doc.allow_edit === 1 ? r.message.doc : {});
 			web_form.make();
 			web_form.set_default_values();
 		})

From f7e0d09e888c28c36e5415d9171c6203508ed8e4 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Sun, 17 Nov 2019 18:19:41 +0530
Subject: [PATCH 058/153] fix: Default check field value in treeview

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

diff --git a/frappe/public/js/frappe/form/controls/check.js b/frappe/public/js/frappe/form/controls/check.js
index a9d2e78264..b83fd243a3 100644
--- a/frappe/public/js/frappe/form/controls/check.js
+++ b/frappe/public/js/frappe/form/controls/check.js
@@ -28,6 +28,7 @@ frappe.ui.form.ControlCheck = frappe.ui.form.ControlData.extend({
 		return cint(value);
 	},
 	set_input: function(value) {
+		value = cint(value);
 		if(this.input) {
 			this.input.checked = (value ? 1 : 0);
 		}

From 5d02a080b9d5a1cb44e8a44f930ac2cf28ff21f3 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 18 Nov 2019 11:20:34 +0530
Subject: [PATCH 059/153] fix(Blog Post): enabled ignore XSS filter for
 Content(HTML) field

---
 frappe/utils/html_utils.py                    |   2 +-
 .../website/doctype/blog_post/blog_post.json  | 440 ++----------------
 2 files changed, 36 insertions(+), 406 deletions(-)

diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py
index e5513364b6..5f3a6b4338 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -117,7 +117,7 @@ acceptable_elements = [
 	'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
 	'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
 	'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
-	'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video', 'iframe'
+	'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video'
 ]
 
 mathml_elements = [
diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json
index d7839d8026..b1ee667540 100644
--- a/frappe/website/doctype/blog_post/blog_post.json
+++ b/frappe/website/doctype/blog_post/blog_post.json
@@ -1,528 +1,158 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
  "allow_guest_to_view": 1,
  "allow_import": 1,
- "allow_rename": 0,
- "beta": 0,
  "creation": "2013-03-28 10:35:30",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Setup",
- "editable_grid": 0,
  "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "published_on",
+  "published",
+  "column_break_3",
+  "blog_category",
+  "blogger",
+  "route",
+  "section_break_5",
+  "blog_intro",
+  "content_type",
+  "content",
+  "content_md",
+  "content_html",
+  "email_sent"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "title",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Title",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "published_on",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Published On",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Published On"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "published",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Published",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Published"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "blog_category",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Blog Category",
-   "length": 0,
-   "no_copy": 0,
    "options": "Blog Category",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "blogger",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Blogger",
-   "length": 0,
-   "no_copy": 0,
    "options": "Blogger",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "route",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Route",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "section_break_5",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Section Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "description": "Description for listing page, in plain text, only a couple of lines. (max 140 characters)",
    "fieldname": "blog_intro",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Blog Intro",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Blog Intro"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Rich Text",
    "fieldname": "content_type",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Content Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "Rich Text\nMarkdown\nHTML",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.content_type === 'Rich Text'",
    "fieldname": "content",
    "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
    "ignore_xss_filter": 1,
-   "in_filter": 0,
    "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Content",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Content"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.content_type === 'Markdown'",
    "fieldname": "content_md",
    "fieldtype": "Markdown Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Content (Markdown)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Content (Markdown)"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:doc.content_type === 'HTML'",
    "fieldname": "content_html",
    "fieldtype": "HTML Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Content (HTML)",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "ignore_xss_filter": 1,
+   "label": "Content (HTML)"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "email_sent",
    "fieldtype": "Check",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Email Sent",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Email Sent"
   }
  ],
  "has_web_view": 1,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-quote-left",
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
  "is_published_field": "published",
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
  "max_attachments": 5,
- "modified": "2019-02-09 11:27:05.619819",
+ "modified": "2019-11-18 11:14:56.402471",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Blog Post",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Website Manager",
    "set_user_permissions": 1,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
-   "delete": 0,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Blogger",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
  "route": "/blog",
- "show_name_in_global_search": 0,
+ "sort_field": "modified",
  "sort_order": "ASC",
  "title_field": "title",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file

From 49c0058f8906c583880998ff0d0207cab0ab94d5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 Nov 2019 13:10:01 +0530
Subject: [PATCH 060/153] fix: spacing for modal

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

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index bef504d70e..a297054ee2 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -101,6 +101,10 @@ h4.modal-title {
   font-size: 1em;
 }
 
+h5.modal-title {
+  margin: 0px !important;
+}
+
 .col-xs-1 { @extend .col-1; }
 .col-xs-2 { @extend .col-2; }
 .col-xs-3 { @extend .col-3; }

From 93e0d33172941baa6d44177e5f271b488a705dbe Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 Nov 2019 13:10:16 +0530
Subject: [PATCH 061/153] fix: allow setting message title from server

---
 frappe/website/js/website.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index 384167715c..01b845f785 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -132,12 +132,12 @@ $.extend(frappe, {
 
 		if (data._server_messages) {
 			var server_messages = JSON.parse(data._server_messages || '[]');
-			server_messages = $.map(server_messages, function(v) {
+			server_messages.map((msg) => {
 				// temp fix for messages sent as dict
 				try {
-					return JSON.parse(v).message;
+					return JSON.parse(msg);
 				} catch (e) {
-					return v;
+					return msg;
 				}
 			}).join('<br>');
 

From d468a25caf56c34fba35f7d6fe2519c3d2479507 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Mon, 18 Nov 2019 15:05:44 +0530
Subject: [PATCH 062/153] feat: Handle server and client side primary action in
 msgprint

- Added provision to pass primary action from server side msgprint
- msgprint on client side handles server side and client side methods as primary actions
---
 frappe/__init__.py                     |  6 +++++-
 frappe/public/js/frappe/ui/messages.js | 30 +++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index d3f40d8375..e47a6a624b 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -290,7 +290,7 @@ def log(msg):
 
 	debug_log.append(as_unicode(msg))
 
-def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False):
+def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False, primary_action=None):
 	"""Print a message to the user (via HTTP response).
 	Messages are sent in the `__server_messages` property in the
 	response JSON and shown in a pop-up / modal.
@@ -299,6 +299,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	:param title: [optional] Message title.
 	:param raise_exception: [optional] Raise given exception and show message.
 	:param as_table: [optional] If `msg` is a list of lists, render as HTML table.
+	:param primary_action: [optional] Bind a primary server/client side action.
 	"""
 	from frappe.utils import encode
 
@@ -338,6 +339,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	if alert:
 		out.alert = 1
 
+	if primary_action:
+		out.primary_action = primary_action
+
 	message_log.append(json.dumps(out))
 
 	if raise_exception and hasattr(raise_exception, '__name__'):
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index f804648834..47dc3095ee 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -122,8 +122,36 @@ frappe.msgprint = function(msg, title) {
 
 		// setup and bind an action to the primary button
 		if (data.primary_action) {
-			frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
+			if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
+				frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
+					() => {
+						frappe.call({
+							method: data.primary_action.server_action,
+							args: {
+								args: data.primary_action.args
+							}
+						});
+					});
+			}
+
+			if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
+				let parts = data.primary_action.client_action.split('.');
+				let obj = window;
+				for (let part of parts) {
+					obj = obj[part];
+				}
+				frappe.msg_dialog.set_primary_action(
+					__(data.primary_action.label || "Done"),
+					() => {
+						if (typeof obj === 'function') {
+							obj(data.primary_action.args);
+						}
+					}
+				);
+			} else {
+				frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
 				data.primary_action.action);
+			}
 		}
 
 		// class "msgprint" is used in tests

From dc89aa91934731015c7ab91c44462545c016e869 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 18 Nov 2019 15:52:23 +0530
Subject: [PATCH 063/153] fix: permission issue for activity

---
 frappe/core/doctype/activity_log/feed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py
index 22a7a3ee14..f51692fe9f 100644
--- a/frappe/core/doctype/activity_log/feed.py
+++ b/frappe/core/doctype/activity_log/feed.py
@@ -81,9 +81,9 @@ def get_feed_match_conditions(user=None, doctype='Comment'):
 
 		if user_permissions:
 			can_read_docs = []
-			for doctype, obj in user_permissions.items():
+			for dt, obj in user_permissions.items():
 				for n in obj:
-					can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n.get('doc', ''))))
+					can_read_docs.append('{}|{}'.format(frappe.db.escape(dt), frappe.db.escape(n.get('doc', ''))))
 
 			if can_read_docs:
 				conditions.append("concat_ws('|', `tab{doctype}`.reference_doctype, `tab{doctype}`.reference_name) in ({values})".format(

From 3427509b56394c86ea97c0b9c8a8a2d55b7b688c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 18 Nov 2019 16:21:01 +0530
Subject: [PATCH 064/153] test: UI test for Barcode Control

---
 cypress/integration/control_barcode.js        | 55 +++++++++++++++++++
 .../public/js/frappe/form/controls/barcode.js |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 cypress/integration/control_barcode.js

diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js
new file mode 100644
index 0000000000..8d720f6b6c
--- /dev/null
+++ b/cypress/integration/control_barcode.js
@@ -0,0 +1,55 @@
+context('Control Barcide', () => {
+	beforeEach(() => {
+		cy.login();
+		cy.visit('/desk');
+	});
+
+	function get_dialog_with_barcode() {
+		return cy.dialog({
+			title: 'Barcode',
+			fields: [
+				{
+					label: 'Barcode',
+					fieldname: 'barcode',
+					fieldtype: 'Barcode'
+				}
+			]
+		});
+	}
+
+	it('should generate barcode on setting a value', () => {
+		get_dialog_with_barcode().as('dialog');
+
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.focus()
+			.type('123456789')
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]')
+			.should('exist');
+
+		cy.get('@dialog').then(dialog => {
+			let value = dialog.get_value('barcode');
+			expect(value).to.contain('<svg');
+			expect(value).to.contain('data-barcode-value="123456789"');
+		});
+	});
+
+	it('should reset when input is cleared', () => {
+		get_dialog_with_barcode().as('dialog');
+
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.focus()
+			.type('123456789')
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.clear()
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]')
+			.should('not.exist');
+
+		cy.get('@dialog').then(dialog => {
+			let value = dialog.get_value('barcode');
+			expect(value).to.equal('');
+		});
+	});
+});
diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js
index 8245962d7e..08bb7b763f 100644
--- a/frappe/public/js/frappe/form/controls/barcode.js
+++ b/frappe/public/js/frappe/form/controls/barcode.js
@@ -29,7 +29,7 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 		let svg = value;
 		const barcode_value = $(svg).attr('data-barcode-value');
 
-		if (!barcode_value) {
+		if (!barcode_value && this.doc) {
 			svg = this.get_barcode_html(value);
 			this.doc[this.df.fieldname] = svg;
 		}

From 3a976d82e7b38b9761ca0dda29b205de4cd68bc6 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 18 Nov 2019 19:00:33 +0530
Subject: [PATCH 065/153] fix: pass doc to frappe.format so doc currency is set
 for the row, not system default currency

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

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 7f6e24595a..94c8e122c8 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -996,7 +996,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					content: d[cdt_field(col.field)],
 					editable: Boolean(name && this.is_editable(col.docfield, d)),
 					format: value => {
-						return frappe.format(value, col.docfield, { always_show_decimals: true });
+						return frappe.format(value, col.docfield, { always_show_decimals: true }, d);
 					}
 				};
 			}

From cc6325c28d43fd20ad00d37cfa19313912778a72 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 18 Nov 2019 20:20:25 +0530
Subject: [PATCH 066/153] fix(Communication): Set content as read only

---
 frappe/core/doctype/communication/communication.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/core/doctype/communication/communication.js b/frappe/core/doctype/communication/communication.js
index 924c29bee2..1c51319790 100644
--- a/frappe/core/doctype/communication/communication.js
+++ b/frappe/core/doctype/communication/communication.js
@@ -18,6 +18,10 @@ frappe.ui.form.on("Communication", {
 		frm.convert_to_click && frm.set_convert_button();
 		frm.subject_field = "subject";
 
+		// content field contains weird table html that does not render well in Quill
+		// this field is not to be edited directly anyway, so setting it as read only
+		frm.set_df_property('content', 'read_only', 1);
+
 		if(frm.doc.reference_doctype && frm.doc.reference_name) {
 			frm.add_custom_button(__(frm.doc.reference_name), function() {
 				frappe.set_route("Form", frm.doc.reference_doctype, frm.doc.reference_name);

From 5db319eec887158305d3c3ec7e99cdf9c6e50db4 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 19 Nov 2019 10:06:15 +0530
Subject: [PATCH 067/153] fix: revert "unique" fields in chat_*.json

---
 frappe/chat/doctype/chat_profile/chat_profile.json | 3 +--
 frappe/chat/doctype/chat_token/chat_token.json     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/chat/doctype/chat_profile/chat_profile.json b/frappe/chat/doctype/chat_profile/chat_profile.json
index f585924930..eb36f803fe 100644
--- a/frappe/chat/doctype/chat_profile/chat_profile.json
+++ b/frappe/chat/doctype/chat_profile/chat_profile.json
@@ -22,8 +22,7 @@
    "fieldtype": "Link",
    "label": "User",
    "options": "User",
-   "reqd": 1,
-   "unique": 1
+   "reqd": 1
   },
   {
    "default": "Online",
diff --git a/frappe/chat/doctype/chat_token/chat_token.json b/frappe/chat/doctype/chat_token/chat_token.json
index 40b85c5c6e..b73505ac2c 100644
--- a/frappe/chat/doctype/chat_token/chat_token.json
+++ b/frappe/chat/doctype/chat_token/chat_token.json
@@ -16,8 +16,7 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Token",
-   "reqd": 1,
-   "unique": 1
+   "reqd": 1
   },
   {
    "fieldname": "ip_address",

From eaa2cfda594782de96f130f2f16fd909f4f02918 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 19 Nov 2019 10:06:15 +0530
Subject: [PATCH 068/153] fix: revert "unique" fields in chat_*.json

---
 frappe/chat/doctype/chat_profile/chat_profile.json | 3 +--
 frappe/chat/doctype/chat_token/chat_token.json     | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frappe/chat/doctype/chat_profile/chat_profile.json b/frappe/chat/doctype/chat_profile/chat_profile.json
index f585924930..eb36f803fe 100644
--- a/frappe/chat/doctype/chat_profile/chat_profile.json
+++ b/frappe/chat/doctype/chat_profile/chat_profile.json
@@ -22,8 +22,7 @@
    "fieldtype": "Link",
    "label": "User",
    "options": "User",
-   "reqd": 1,
-   "unique": 1
+   "reqd": 1
   },
   {
    "default": "Online",
diff --git a/frappe/chat/doctype/chat_token/chat_token.json b/frappe/chat/doctype/chat_token/chat_token.json
index 40b85c5c6e..b73505ac2c 100644
--- a/frappe/chat/doctype/chat_token/chat_token.json
+++ b/frappe/chat/doctype/chat_token/chat_token.json
@@ -16,8 +16,7 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Token",
-   "reqd": 1,
-   "unique": 1
+   "reqd": 1
   },
   {
    "fieldname": "ip_address",

From f3278c470323c23530c8eaaeb677609a0f87340c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 19 Nov 2019 11:37:43 +0530
Subject: [PATCH 069/153] fix: typo

Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 cypress/integration/control_barcode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js
index 8d720f6b6c..ac2a687bae 100644
--- a/cypress/integration/control_barcode.js
+++ b/cypress/integration/control_barcode.js
@@ -1,4 +1,4 @@
-context('Control Barcide', () => {
+context('Control Barcode', () => {
 	beforeEach(() => {
 		cy.login();
 		cy.visit('/desk');

From 29060d8db67e1432ba59107ef8fc444bbd8e65fe Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 19 Nov 2019 12:05:13 +0530
Subject: [PATCH 070/153] Update
 frappe/integrations/doctype/razorpay_settings/razorpay_settings.py

Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 .../doctype/razorpay_settings/razorpay_settings.py            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 903bb7fbe8..9db84046a9 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -183,7 +183,7 @@ class RazorpaySettings(Document):
 	def create_order(self, **kwargs):
 		# Creating Orders https://razorpay.com/docs/api/orders/
 
-		# convert ruppes to paisa
+		# convert rupees to paisa
 		kwargs['amount'] *= 100
 
 		# Create integration log
@@ -463,4 +463,4 @@ def validate_payment_callback(data):
 		_throw()
 
 def handle_subscription_notification(doctype, docname):
-	call_hook_method("handle_subscription_notification", doctype=doctype, docname=docname)
\ No newline at end of file
+	call_hook_method("handle_subscription_notification", doctype=doctype, docname=docname)

From 01c926daec252347861d6580309935317725a3d2 Mon Sep 17 00:00:00 2001
From: Rohan Bansal <rohan@digithinkit.com>
Date: Tue, 19 Nov 2019 12:22:09 +0530
Subject: [PATCH 071/153] fix: move stat reload to subclass

---
 frappe/public/js/frappe/list/base_list.js | 2 +-
 frappe/public/js/frappe/list/list_view.js | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 6650c952b0..648a3d6d55 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -402,7 +402,7 @@ frappe.views.BaseList = class BaseList {
 	}
 
 	after_render() {
-		this.list_sidebar.reload_stats();
+
 	}
 
 	render() {
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 6912065e1c..3fdf84183f 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -390,6 +390,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		});
 	}
 
+	after_render() {
+		this.list_sidebar.reload_stats();
+	}
+
 	render() {
 		this.render_list();
 		this.on_row_checked();

From 7608c03eb36ac19a1dbe594e6d9c26a071e4924f Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 19 Nov 2019 12:54:47 +0530
Subject: [PATCH 072/153] Update
 frappe/integrations/doctype/razorpay_settings/razorpay_settings.py

Co-Authored-By: Faris Ansari <netchampfaris@users.noreply.github.com>
---
 .../integrations/doctype/razorpay_settings/razorpay_settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
index 9db84046a9..ae7e10e2a0 100644
--- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
+++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py
@@ -189,7 +189,7 @@ class RazorpaySettings(Document):
 		# Create integration log
 		integration_request = create_request_log(kwargs, "Host", "Razorpay")
 
-		# Setup payment otptions
+		# Setup payment options
 		payment_options = {
 			"amount": kwargs.get('amount'),
 			"currency": kwargs.get('currency', 'INR'),

From 2aacbf46db7419ceccad22b8d94e8a5e30e5b07d Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 13:01:04 +0530
Subject: [PATCH 073/153] style: use snake case

---
 frappe/public/js/integrations/razorpay.js | 46 +++++++++++------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/frappe/public/js/integrations/razorpay.js b/frappe/public/js/integrations/razorpay.js
index a950a3c915..e1186427d8 100644
--- a/frappe/public/js/integrations/razorpay.js
+++ b/frappe/public/js/integrations/razorpay.js
@@ -1,14 +1,14 @@
 /* HOW-TO
 
-Razorpay Payment 
+Razorpay Payment
 
-1. 	Include checkout script in your code 
+1. 	Include checkout script in your code
 	<script type="text/javascript" src="/assets/js/checkout.min.js"></script>
 
-2.	Create the Order controller in your backend 
+2.	Create the Order controller in your backend
 	def get_razorpay_order(self):
 		controller = get_payment_gateway_controller("Razorpay")
-		
+
 		payment_details = {
 			"amount": 300,
 			...
@@ -39,13 +39,13 @@ Razorpay Payment
 		};
 
 		razorpay = new frappe.checkout.razorpay(options)
-		razorpay.onOpen = () => {
+		razorpay.on_open = () => {
 			<SCRIPT TO RUN WHEN MODAL OPENS>
 		}
-		razorpay.onSuccess = () => {
+		razorpay.on_success = () => {
 			<SCRIPT TO RUN ON PAYMENT SUCCESS>
 		}
-		razorpay.onFail = () => {
+		razorpay.on_fail = () => {
 			<SCRIPT TO RUN ON PAYMENT FAILURE>
 		}
 		razorpay.init() // Creates the order and opens the modal
@@ -62,10 +62,10 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 
 		init() {
 			frappe.run_serially([
-				() => this.getKey(),
-				() => this.makeOrder(),
-				() => this.prepareOptions(),
-				() => this.setupHandler(),
+				() => this.get_key(),
+				() => this.make_order(),
+				() => this.prepare_options(),
+				() => this.setup_handler(),
 				() => this.show()
 			]);
 		}
@@ -73,12 +73,12 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 		show() {
 			this.razorpay = new Razorpay(this.options);
 			this.razorpay.once('ready', (response) => {
-				this.onOpen && this.onOpen(response);
+				this.on_open && this.on_open(response);
 			})
 			this.razorpay.open();
 		}
 
-		getKey() {
+		get_key() {
 			return new Promise(resolve => {
 				frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_api_key").then(res => {
 					this.key = res.message;
@@ -87,7 +87,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			});
 		}
 
-		makeOrder() {
+		make_order() {
 			return new Promise(resolve => {
 				frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.get_order", {
 					doctype: this.doctype,
@@ -99,7 +99,7 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			});
 		}
 
-		orderSuccess(response) {
+		order_success(response) {
 			frappe.call("frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_success", {
 				integration_request: this.order.integration_request,
 				params: {
@@ -110,17 +110,17 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			})
 		}
 
-		orderFail(response) {
+		order_fail(response) {
 			frappe.call( "frappe.integrations.doctype.razorpay_settings.razorpay_settings.order_payment_failure", {
 				integration_request: this.order.integration_request,
 				params: response
 			})
 		}
 
-		prepareOptions() {
+		prepare_options() {
 			this.options = {
 				"key": this.key,
-				"amount": this.order.amount_due, 
+				"amount": this.order.amount_due,
 				"currency": this.order.currency,
 				"name": this.name,
 				"description": this.description,
@@ -132,15 +132,15 @@ frappe.require('https://checkout.razorpay.com/v1/checkout.js').then(() => {
 			};
 		}
 
-		setupHandler() {
+		setup_handler() {
 			this.options.handler = (response) => {
 				if (response.error) {
-					this.orderFail(response);
-					this.onFail && this.onFail(response);
+					this.order_fail(response);
+					this.on_fail && this.on_fail(response);
 				}
 				else if (response.razorpay_payment_id) {
-					this.orderSuccess(response);	
-					this.onSuccess && this.onSuccess(response);
+					this.order_success(response);
+					this.on_success && this.on_success(response);
 				}
 			}
 		}

From d14ea2333147cd29aceb6c6464cdb279f12cb7a5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 13:26:27 +0530
Subject: [PATCH 074/153] fix(patch): create notification settings for all
 users

---
 .../notification_settings.json                |  2 +-
 .../notification_settings.py                  |  4 ++--
 frappe/patches.txt                            |  2 +-
 .../create_notification_settings_for_user.py  | 13 ++++++++++++
 .../frappe/ui/notifications/notifications.js  | 20 +++++--------------
 5 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 frappe/patches/v12_0/create_notification_settings_for_user.py

diff --git a/frappe/desk/doctype/notification_settings/notification_settings.json b/frappe/desk/doctype/notification_settings/notification_settings.json
index c8bda705d9..6af325507b 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.json
+++ b/frappe/desk/doctype/notification_settings/notification_settings.json
@@ -86,7 +86,7 @@
   }
  ],
  "in_create": 1,
- "modified": "2019-11-14 11:55:09.198036",
+ "modified": "2019-11-19 12:57:59.356786",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Notification Settings",
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index 667e13c1fd..ec969e485c 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -32,9 +32,9 @@ def is_email_notifications_enabled_for_type(user, notification_type):
 	return enabled
 
 @frappe.whitelist()
-def create_notification_settings():
+def create_notification_settings(user):
 	_doc = frappe.new_doc('Notification Settings')
-	_doc.name = frappe.session.user
+	_doc.name = user
 	_doc.insert(ignore_permissions=True)
 	frappe.db.commit()
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index d4aaec5bfc..9473323059 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -253,7 +253,7 @@ frappe.patches.v12_0.move_email_and_phone_to_child_table
 frappe.patches.v12_0.delete_duplicate_indexes
 frappe.patches.v12_0.set_default_incoming_email_port
 frappe.patches.v12_0.update_global_search
-execute:frappe.reload_doc('desk', 'doctype', 'notification_settings')
 frappe.patches.v12_0.setup_tags
 frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable
 frappe.patches.v12_0.copy_to_parent_for_tags
+frappe.patches.v12_0.create_notification_settings_for_user
diff --git a/frappe/patches/v12_0/create_notification_settings_for_user.py b/frappe/patches/v12_0/create_notification_settings_for_user.py
new file mode 100644
index 0000000000..ad12390c4f
--- /dev/null
+++ b/frappe/patches/v12_0/create_notification_settings_for_user.py
@@ -0,0 +1,13 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.desk.doctype.notification_settings.notification_settings import create_notification_settings
+
+def execute():
+	frappe.reload_doc('desk', 'doctype', 'notification_settings')
+
+	users = frappe.db.get_all('User', fields=['name'])
+	for user in users:
+		if frappe.db.exists("Notification Settings", user.name):
+			continue
+
+		create_notification_settings(user.name)
\ No newline at end of file
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index d50aa02391..a77053f9eb 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -35,24 +35,14 @@ frappe.ui.Notifications = class Notifications {
 		frappe.search.utils.make_function_searchable(
 			me.route_to_settings,
 			__('Notification Settings'),
-			[this.notifications_settings],
 		);
 
 		this.setup_notifications();
 		this.bind_events();
 	}
 
-	route_to_settings(settings_doc) {
-		let method =
-			'frappe.desk.doctype.notification_settings.notification_settings.create_notification_settings';
-
-		return Promise.resolve()
-			.then(() => {
-				if (!settings_doc) return frappe.call(method);
-			})
-			.then(() => {
-				frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
-			});
+	route_to_settings() {
+		frappe.set_route(`#Form/Notification Settings/${frappe.session.user}`);
 	}
 
 	setup_notifications() {
@@ -375,7 +365,7 @@ frappe.ui.Notifications = class Notifications {
 			let category_id = frappe.dom.get_unique_id();
 			let settings_html =
 				category.value === 'Notifications'
-					? `<span class="notification-settings pull-right" data-action="make_and_route_to_settings">
+					? `<span class="notification-settings pull-right" data-action="go_to_settings">
 						${__('Settings')}
 					</span>`
 					: '';
@@ -417,11 +407,11 @@ frappe.ui.Notifications = class Notifications {
 		);
 	}
 
-	make_and_route_to_settings(e) {
+	go_to_settings(e) {
 		e.stopImmediatePropagation();
 		this.$dropdown.removeClass('open');
 		this.$dropdown.trigger('hide.bs.dropdown');
-		this.route_to_settings(this.notifications_settings);
+		this.route_to_settings();
 	}
 
 	bind_events() {

From 24230d52927a1ef8a07b0ca42038c0bf780c6c91 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Nov 2019 13:39:01 +0530
Subject: [PATCH 075/153] fix: Only execute enabled server scripts

---
 frappe/core/doctype/server_script/server_script_utils.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py
index 0399dea106..878810f459 100644
--- a/frappe/core/doctype/server_script/server_script_utils.py
+++ b/frappe/core/doctype/server_script/server_script_utils.py
@@ -56,8 +56,10 @@ def get_server_script_map():
 	script_map = frappe.cache().get_value('server_script_map')
 	if script_map is None:
 		script_map = {}
-		for script in frappe.get_all('Server Script', ('name', 'reference_doctype', 'doctype_event',
-			'api_method', 'script_type')):
+		enabled_server_scripts = frappe.get_all('Server Script',
+			fields=('name', 'reference_doctype', 'doctype_event','api_method', 'script_type'),
+			filters={'disabled': 0})
+		for script in enabled_server_scripts:
 			if script.script_type == 'DocType Event':
 				script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name)
 			else:

From 835aa6d10a0278780364c5e9705525297f0d55fa Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 13:51:01 +0530
Subject: [PATCH 076/153] fix: tests

---
 frappe/desk/doctype/notification_log/notification_log.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 15a0e66bc4..a8c38d96a3 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -129,6 +129,9 @@ def trigger_indicator_hide():
 	frappe.publish_realtime('indicator_hide', user=frappe.session.user)
 
 def set_notifications_as_unseen(user):
-	notification_settings_doc = frappe.get_doc('Notification Settings', user)
-	if notification_settings_doc.seen == 1:
-		set_seen_value(value = 0, user = user)
+	try:
+		notification_settings_doc = frappe.get_doc('Notification Settings', user)
+		if notification_settings_doc.seen == 1:
+			set_seen_value(value = 0, user = user)
+	except frappe.DoesNotExistError:
+		return

From 287c872df60d981eef72610822c94eb146d02d19 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 14:38:24 +0530
Subject: [PATCH 077/153] fix: standard filters with default value are saved
 when changed

---
 frappe/public/js/frappe/list/base_list.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 648a3d6d55..387b2f3b61 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -625,17 +625,13 @@ class FilterArea {
 					options = options.join("\n");
 				}
 			}
-			let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null;
-			if (['__default', '__global'].includes(default_value)) {
-				default_value = null;
-			}
+
 			return {
 				fieldtype: fieldtype,
 				label: __(df.label),
 				options: options,
 				fieldname: df.fieldname,
 				condition: condition,
-				default: default_value,
 				onchange: () => this.refresh_list_view(),
 				ignore_link_validation: fieldtype === 'Dynamic Link'
 			};
@@ -650,6 +646,10 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
+			let default_value = (field.df.fieldtype === 'Link')
+				? frappe.defaults.get_user_default(field.df.options)
+				: null;
+
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {
 					value = '%' + value + '%';
@@ -660,6 +660,13 @@ class FilterArea {
 					field.df.condition || '=',
 					value
 				]);
+			} else if (default_value) {
+				filters.push([
+					this.list_view.doctype,
+					field.df.fieldname,
+					field.df.condition,
+					default_value
+				]);
 			}
 		}
 

From 3526f773f94b32d0408d7d961f2b41e8246f9d4b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 15:08:22 +0530
Subject: [PATCH 078/153] feat (ux): added noscript for login page

---
 frappe/www/login.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index 53e16d14c3..bb5ed1a66f 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -9,6 +9,12 @@
 {% block page_content %}
 <!-- {{ for_test }} -->
 <div style='min-height: 360px'>
+	<noscript>
+		<div class="text-center my-5">
+			<h4>Javascript is disabled on your browser</h4>
+			<p class="text-muted">You need to enable JavaScript for your app to work. <br>To enable it follow the instructions in the following link: <a href="https://enable-javascript.com/">enable-javascript.com</a></p>
+		</div>
+	</noscript>
 <section class='for-login'>
 	<div class="login-content page-card" style="margin-top: 30px;">
 		<form class="form-signin form-login" role="form">

From 23da5fa0e0923d2975ec6bce1b9f6ee39dd86077 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 15:39:28 +0530
Subject: [PATCH 079/153] refactor: enable translations

---
 frappe/www/login.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/www/login.html b/frappe/www/login.html
index bb5ed1a66f..65e85db296 100644
--- a/frappe/www/login.html
+++ b/frappe/www/login.html
@@ -11,8 +11,8 @@
 <div style='min-height: 360px'>
 	<noscript>
 		<div class="text-center my-5">
-			<h4>Javascript is disabled on your browser</h4>
-			<p class="text-muted">You need to enable JavaScript for your app to work. <br>To enable it follow the instructions in the following link: <a href="https://enable-javascript.com/">enable-javascript.com</a></p>
+			<h4>{{ _("Javascript is disabled on your browser") }}</h4>
+			<p class="text-muted">{{ _("You need to enable JavaScript for your app to work.") }}<br>{{ _("To enable it follow the instructions in the following link: {0}").format("<a href='https://enable-javascript.com/'>enable-javascript.com</a></p>") }}
 		</div>
 	</noscript>
 <section class='for-login'>

From 61b6311a7927ba57b47fb5a3f6974a582f8c7597 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 15:40:16 +0530
Subject: [PATCH 080/153] fix: change code type to data in standard filter

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

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 648a3d6d55..2c5e1df1df 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -614,7 +614,7 @@ class FilterArea {
 			let options = df.options;
 			let condition = '=';
 			let fieldtype = df.fieldtype;
-			if (['Text', 'Small Text', 'Text Editor', 'Data'].includes(fieldtype)) {
+			if (['Text', 'Small Text', 'Text Editor', 'Data', 'Code'].includes(fieldtype)) {
 				fieldtype = 'Data';
 				condition = 'like';
 			}

From 338bbd4a84c6e951ca3a247701c10c82e3949aa5 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 15:53:54 +0530
Subject: [PATCH 081/153] fix: create notification settings for new user

---
 frappe/core/doctype/user/user.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 0bd7437ae4..0fddd8252b 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -8,6 +8,7 @@ from frappe.utils import cint, has_gravatar, format_datetime, now_datetime, get_
 from frappe import throw, msgprint, _
 from frappe.utils.password import update_password as _update_password
 from frappe.desk.notifications import clear_notifications
+from frappe.desk.doctype.notification_settings.notification_settings import create_notification_settings
 from frappe.utils.user import get_system_managers
 from bs4 import BeautifulSoup
 import frappe.permissions
@@ -46,6 +47,9 @@ class User(Document):
 		self.flags.in_insert = True
 		throttle_user_creation()
 
+	def after_insert(self):
+		create_notification_settings(self.name)
+
 	def validate(self):
 		self.check_demo()
 
@@ -364,6 +368,8 @@ class User(Document):
 		if frappe.db.exists("Chat Profile", old_name):
 			frappe.rename_doc("Chat Profile", old_name, new_name, force=True)
 
+		if frappe.db.exists("Notification Settings", old_name):
+			frappe.rename_doc("Notification Settings", old_name, new_name, force=True)
 		# set email
 		frappe.db.sql("""UPDATE `tabUser`
 			SET email = %s

From f8da091b930fea742a1ac16ce13fc6b5edcec9e6 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 16:38:57 +0530
Subject: [PATCH 082/153] fix: set seen value to 0 without check

---
 frappe/desk/doctype/notification_log/notification_log.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index a8c38d96a3..fd98a994e1 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -130,8 +130,6 @@ def trigger_indicator_hide():
 
 def set_notifications_as_unseen(user):
 	try:
-		notification_settings_doc = frappe.get_doc('Notification Settings', user)
-		if notification_settings_doc.seen == 1:
-			set_seen_value(value = 0, user = user)
+		frappe.db.set_value('Notification Settings', user, 'seen', 0)
 	except frappe.DoesNotExistError:
 		return

From f03bb82a3a9a75d4fccdaa8ebf7b2f59766419fa Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 16:39:31 +0530
Subject: [PATCH 083/153] fix: remove whitelist

---
 .../desk/doctype/notification_settings/notification_settings.py  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index ec969e485c..8cd7d93391 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -31,7 +31,6 @@ def is_email_notifications_enabled_for_type(user, notification_type):
 		return True
 	return enabled
 
-@frappe.whitelist()
 def create_notification_settings(user):
 	_doc = frappe.new_doc('Notification Settings')
 	_doc.name = user

From b6ed303522c0e2b6367f8ac192746933c667a83b Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 17:11:22 +0530
Subject: [PATCH 084/153] fix: value not being set in webform

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

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index ca44dd65d0..a4cefd1d02 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -40,7 +40,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 	}
 
 	set_field_values() {
-		if (this.doc_name) this.set_values(this.doc);
+		if (this.doc.name) this.set_values(this.doc);
 		else return;
 	}
 

From e67652261ee949a056838349c113a26ed3387d16 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 Nov 2019 17:32:35 +0530
Subject: [PATCH 085/153] fix: Parse file extension correctly

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

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index 6fccbc89ef..6cae7826cc 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -54,8 +54,9 @@ class Importer:
 		extension = None
 		if self.data_import and self.data_import.import_file:
 			file_doc = frappe.get_doc("File", {"file_url": self.data_import.import_file})
+			filename, extension = file_doc.get_extension()
 			content = file_doc.get_content()
-			extension = file_doc.file_name.split(".")[1]
+			extension = extension.lstrip(".")
 
 		if file_path:
 			content, extension = self.read_file(file_path)

From af4f9b2e3edd109d56bb173ff7ef0f3bfcc6db56 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 Nov 2019 17:33:28 +0530
Subject: [PATCH 086/153] fix: Show Error for invalid template

- For template with invalid extension or not enough rows
---
 frappe/core/doctype/data_import/importer_new.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index 6cae7826cc..b197e99dcf 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -80,6 +80,12 @@ class Importer:
 		return file_content, extn
 
 	def read_content(self, content, extension):
+		error_title = _("Template Error")
+		if extension not in ("csv", "xlsx", "xls"):
+			frappe.throw(
+				_("Import template should be of type .csv, .xlsx or .xls"), title=error_title
+			)
+
 		if extension == "csv":
 			data = read_csv_content(content)
 		elif extension == "xlsx":
@@ -87,6 +93,11 @@ class Importer:
 		elif extension == "xls":
 			data = read_xls_file_from_attached_file(content)
 
+		if len(data) <= 1:
+			frappe.throw(
+				_("Import template should contain a Header and atleast one row."), title=error_title
+			)
+
 		self.header_row = data[0]
 		self.data = data[1:]
 

From 42cb0f3eb389e876e985ad9d9165d76a52d0814a Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 Nov 2019 17:33:44 +0530
Subject: [PATCH 087/153] style: Formatting

---
 frappe/core/doctype/data_import/importer_new.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index b197e99dcf..c503f1326f 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -874,15 +874,15 @@ class Importer:
 
 		if failed_records:
 			print("Failed to import {0} records".format(len(failed_records)))
-			file_name = '{0}_import_on_{1}.txt'.format(self.doctype, frappe.utils.now())
-			print('Check {0} for errors'.format(os.path.join('sites', file_name)))
+			file_name = "{0}_import_on_{1}.txt".format(self.doctype, frappe.utils.now())
+			print("Check {0} for errors".format(os.path.join("sites", file_name)))
 			text = ""
 			for w in failed_records:
-				text += "Row Indexes: {0}\n".format(str(w.get('row_indexes', [])))
-				text += "Messages:\n{0}\n".format('\n'.join(w.get('messages', [])))
-				text += "Traceback:\n{0}\n\n".format(w.get('exception'))
+				text += "Row Indexes: {0}\n".format(str(w.get("row_indexes", [])))
+				text += "Messages:\n{0}\n".format("\n".join(w.get("messages", [])))
+				text += "Traceback:\n{0}\n\n".format(w.get("exception"))
 
-			with open(file_name, 'w') as f:
+			with open(file_name, "w") as f:
 				f.write(text)
 
 

From db225c7c69f11ff0e7a03e04fae56970ae513a1d Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 19 Nov 2019 17:34:01 +0530
Subject: [PATCH 088/153] fix: Dont apply energy points during import

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

diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 5986e90bfb..6615c2ab1d 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -83,7 +83,8 @@ class EnergyPointRule(Document):
 def process_energy_points(doc, state):
 	if (frappe.flags.in_patch
 		or frappe.flags.in_install
-		or frappe.flags.in_migrate):
+		or frappe.flags.in_migrate
+		or frappe.flags.in_import):
 		return
 
 	if not is_energy_point_enabled():

From 72038b586e7662a5ca31bad5b1b950586345a46a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 17:49:16 +0530
Subject: [PATCH 089/153] fix: mark all as read, not only dropdown items

---
 frappe/desk/doctype/notification_log/notification_log.py | 9 +++++----
 .../public/js/frappe/ui/notifications/notifications.js   | 7 -------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index fd98a994e1..17c4d3ba4b 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -113,10 +113,11 @@ def get_title_html(title):
 	return '<b class="subject-title">{0}</b>'.format(title)
 
 @frappe.whitelist()
-def mark_all_as_read(docnames):
-	docnames = frappe.parse_json(docnames)
-	if docnames:
-		filters = {'name': ['in', docnames]}
+def mark_all_as_read():
+	unread_docs_list = frappe.db.get_all('Notification Log', filters = {'read': 0, 'for_user': frappe.session.user})
+	unread_docnames = [doc.name for doc in unread_docs_list]
+	if unread_docnames:
+		filters = {'name': ['in', unread_docnames]}
 		frappe.db.set_value('Notification Log', filters, 'read', 1, update_modified=False)
 
 @frappe.whitelist()
diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js
index a77053f9eb..2420d6772e 100644
--- a/frappe/public/js/frappe/ui/notifications/notifications.js
+++ b/frappe/public/js/frappe/ui/notifications/notifications.js
@@ -248,15 +248,8 @@ frappe.ui.Notifications = class Notifications {
 	mark_all_as_read(e) {
 		e.stopImmediatePropagation();
 		this.$dropdown_list.find('.unread').removeClass('unread');
-		let unread_docnames = this.dropdown_items
-			.filter(item => item.read === 0)
-			.map(d => d.name);
-		if (!unread_docnames.length) return;
 		frappe.call(
 			'frappe.desk.doctype.notification_log.notification_log.mark_all_as_read',
-			{
-				docnames: unread_docnames,
-			}
 		);
 	}
 

From 6f00c83e7474f50ac11cdc236a63ab46320b570e Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 19:04:00 +0530
Subject: [PATCH 090/153] fix: check if settings exist before ccreating

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

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 0fddd8252b..ba269a61be 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -48,7 +48,8 @@ class User(Document):
 		throttle_user_creation()
 
 	def after_insert(self):
-		create_notification_settings(self.name)
+		if not frappe.db.exists("Notification Settings", self.name):
+			create_notification_settings(self.name)
 
 	def validate(self):
 		self.check_demo()

From d7d602b134a1da3e8edbc44f199fa27d85d11660 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Tue, 19 Nov 2019 19:54:39 +0530
Subject: [PATCH 091/153] chore: Code cleanup

---
 frappe/public/js/frappe/ui/messages.js | 36 ++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 47dc3095ee..5c292a76c4 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -123,15 +123,14 @@ frappe.msgprint = function(msg, title) {
 		// setup and bind an action to the primary button
 		if (data.primary_action) {
 			if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
-				frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
-					() => {
-						frappe.call({
-							method: data.primary_action.server_action,
-							args: {
-								args: data.primary_action.args
-							}
-						});
+				data.primary_action.action = () => {
+					frappe.call({
+						method: data.primary_action.server_action,
+						args: {
+							args: data.primary_action.args
+						}
 					});
+				}
 			}
 
 			if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
@@ -140,19 +139,18 @@ frappe.msgprint = function(msg, title) {
 				for (let part of parts) {
 					obj = obj[part];
 				}
-				frappe.msg_dialog.set_primary_action(
-					__(data.primary_action.label || "Done"),
-					() => {
-						if (typeof obj === 'function') {
-							obj(data.primary_action.args);
-						}
+				data.primary_action.action = () => {
+					if (typeof obj === 'function') {
+						obj(data.primary_action.args);
 					}
-				);
-			} else {
-				frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
-				data.primary_action.action);
+				}
 			}
-		}
+
+			frappe.msg_dialog.set_primary_action(
+				__(data.primary_action.label || "Done"),
+				data.primary_action.action
+			);
+	}
 
 		// class "msgprint" is used in tests
 		frappe.msg_dialog.msg_area = $('<div class="msgprint">')

From dee08b38a206c402454636be57c55729af1501fc Mon Sep 17 00:00:00 2001
From: makeen <raul.viveros@gmail.com>
Date: Tue, 19 Nov 2019 23:25:20 +0100
Subject: [PATCH 092/153] feat: use "title_field" in delete confirmation
 message

use "title_field" if autoname is "hash" in delete confirmation message
Example:
      for translations, when delete one, it asks "Permanently delete f1f99806c0?"
      now it asks: "Permanently delete text_to_translate (f1f99806c0)?"
---
 frappe/public/js/frappe/model/model.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/model/model.js b/frappe/public/js/frappe/model/model.js
index 0c6388c681..48d0d14037 100644
--- a/frappe/public/js/frappe/model/model.js
+++ b/frappe/public/js/frappe/model/model.js
@@ -525,7 +525,13 @@ $.extend(frappe.model, {
 	},
 
 	delete_doc: function(doctype, docname, callback) {
-		frappe.confirm(__("Permanently delete {0}?", [docname]), function() {
+		var title = docname;
+		var title_field = frappe.get_meta(doctype).title_field;
+		if (frappe.get_meta(doctype).autoname == "hash" && title_field) {
+			var title = frappe.model.get_value(doctype, docname, title_field);
+			title += " (" + docname + ")";
+		}
+		frappe.confirm(__("Permanently delete {0}?", [title]), function() {
 			return frappe.call({
 				method: 'frappe.client.delete',
 				args: {

From 65f20a3ad977502fc12ceb403554a02cec1f444e Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Wed, 20 Nov 2019 09:54:26 +0530
Subject: [PATCH 093/153] fix: Codacy

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

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 5c292a76c4..26bee50f18 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -150,7 +150,7 @@ frappe.msgprint = function(msg, title) {
 				__(data.primary_action.label || "Done"),
 				data.primary_action.action
 			);
-	}
+		}
 
 		// class "msgprint" is used in tests
 		frappe.msg_dialog.msg_area = $('<div class="msgprint">')

From 57654d94aaee6cc81c4c0c0f0c1f39adfcc22409 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 Nov 2019 12:53:52 +0530
Subject: [PATCH 094/153] fix(web-forms): view addresses only by session user

---
 frappe/contacts/doctype/address/address.py | 28 ++++------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 6795011745..21ed88addb 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -145,30 +145,10 @@ def get_list_context(context=None):
 def get_address_list(doctype, txt, filters, limit_start, limit_page_length = 20, order_by = None):
 	from frappe.www.list import get_list
 	user = frappe.session.user
-	ignore_permissions = False
-	if is_website_user():
-		if not filters: filters = []
-		add_name = []
-		contact = frappe.db.sql("""
-			select
-				address.name
-			from
-				`tabDynamic Link` as link
-			join
-				`tabAddress` as address on link.parent = address.name
-			where
-				link.parenttype = 'Address' and
-				link_name in(
-				   select
-					   link.link_name from `tabContact` as contact
-				   join
-					   `tabDynamic Link` as link on contact.name = link.parent
-				   where
-					   contact.user = %s)""",(user))
-		for c in contact:
-			add_name.append(c[0])
-		filters.append(("Address", "name", "in", add_name))
-		ignore_permissions = True
+	ignore_permissions = True
+
+	if not filters: filters = []
+	filters.append(("Address", "owner", "=", user))
 
 	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=ignore_permissions)
 

From 7bf1e09327cc351acdea166c457eedfb7282f46f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 20 Nov 2019 11:01:46 +0530
Subject: [PATCH 095/153] fix: code cleanup

---
 frappe/core/doctype/user/user.py                         | 4 ++--
 frappe/desk/doctype/notification_log/notification_log.py | 1 +
 .../notification_settings/notification_settings.py       | 9 +++++----
 .../v12_0/create_notification_settings_for_user.py       | 3 ---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index ba269a61be..7de2bb20e5 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -48,8 +48,7 @@ class User(Document):
 		throttle_user_creation()
 
 	def after_insert(self):
-		if not frappe.db.exists("Notification Settings", self.name):
-			create_notification_settings(self.name)
+		create_notification_settings(self.name)
 
 	def validate(self):
 		self.check_demo()
@@ -371,6 +370,7 @@ class User(Document):
 
 		if frappe.db.exists("Notification Settings", old_name):
 			frappe.rename_doc("Notification Settings", old_name, new_name, force=True)
+
 		# set email
 		frappe.db.sql("""UPDATE `tabUser`
 			SET email = %s
diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py
index 17c4d3ba4b..c6d4218773 100644
--- a/frappe/desk/doctype/notification_log/notification_log.py
+++ b/frappe/desk/doctype/notification_log/notification_log.py
@@ -120,6 +120,7 @@ def mark_all_as_read():
 		filters = {'name': ['in', unread_docnames]}
 		frappe.db.set_value('Notification Log', filters, 'read', 1, update_modified=False)
 
+
 @frappe.whitelist()
 def mark_as_read(docname):
 	if docname:
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.py b/frappe/desk/doctype/notification_settings/notification_settings.py
index 8cd7d93391..295b4c8afd 100644
--- a/frappe/desk/doctype/notification_settings/notification_settings.py
+++ b/frappe/desk/doctype/notification_settings/notification_settings.py
@@ -32,10 +32,11 @@ def is_email_notifications_enabled_for_type(user, notification_type):
 	return enabled
 
 def create_notification_settings(user):
-	_doc = frappe.new_doc('Notification Settings')
-	_doc.name = user
-	_doc.insert(ignore_permissions=True)
-	frappe.db.commit()
+	if not frappe.db.exists("Notification Settings", user):
+		_doc = frappe.new_doc('Notification Settings')
+		_doc.name = user
+		_doc.insert(ignore_permissions=True)
+		frappe.db.commit()
 
 
 @frappe.whitelist()
diff --git a/frappe/patches/v12_0/create_notification_settings_for_user.py b/frappe/patches/v12_0/create_notification_settings_for_user.py
index ad12390c4f..170931bdf3 100644
--- a/frappe/patches/v12_0/create_notification_settings_for_user.py
+++ b/frappe/patches/v12_0/create_notification_settings_for_user.py
@@ -7,7 +7,4 @@ def execute():
 
 	users = frappe.db.get_all('User', fields=['name'])
 	for user in users:
-		if frappe.db.exists("Notification Settings", user.name):
-			continue
-
 		create_notification_settings(user.name)
\ No newline at end of file

From f0663b63a08476cb4464f48b2b05b8f239f79fa7 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 20 Nov 2019 14:15:50 +0530
Subject: [PATCH 096/153] style: Unused variable

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

diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py
index c503f1326f..f14f38c56d 100644
--- a/frappe/core/doctype/data_import/importer_new.py
+++ b/frappe/core/doctype/data_import/importer_new.py
@@ -54,7 +54,8 @@ class Importer:
 		extension = None
 		if self.data_import and self.data_import.import_file:
 			file_doc = frappe.get_doc("File", {"file_url": self.data_import.import_file})
-			filename, extension = file_doc.get_extension()
+			parts = file_doc.get_extension()
+			extension = parts[1]
 			content = file_doc.get_content()
 			extension = extension.lstrip(".")
 

From a1b94fca7161bd797df1ac47b6fefdd1d88f74d5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 19 Nov 2019 15:40:16 +0530
Subject: [PATCH 097/153] fix: change code type to data in standard filter

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

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 648a3d6d55..2c5e1df1df 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -614,7 +614,7 @@ class FilterArea {
 			let options = df.options;
 			let condition = '=';
 			let fieldtype = df.fieldtype;
-			if (['Text', 'Small Text', 'Text Editor', 'Data'].includes(fieldtype)) {
+			if (['Text', 'Small Text', 'Text Editor', 'Data', 'Code'].includes(fieldtype)) {
 				fieldtype = 'Data';
 				condition = 'like';
 			}

From caabe9b87f0f1e7b2b9f872bc74bbc6d0b21fae1 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 20 Nov 2019 15:31:13 +0530
Subject: [PATCH 098/153] fix: MultiSelect backspace on input

- Dont clear values if backspace is pressed on input
---
 frappe/public/js/frappe/form/controls/multiselect_list.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js
index c9ea23e9da..0313ee70d7 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_list.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_list.js
@@ -61,6 +61,9 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({
 		});
 
 		this.$list_wrapper.on('keydown', e => {
+			if ($(e.target).is('input')) {
+				return;
+			}
 			if (e.key === 'Backspace') {
 				this.set_value([]);
 			}

From f629d7fd01af09de3e547b769b41c8024e04ad4d Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 20 Nov 2019 15:31:13 +0530
Subject: [PATCH 099/153] fix: MultiSelect backspace on input

- Dont clear values if backspace is pressed on input
---
 frappe/public/js/frappe/form/controls/multiselect_list.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js
index c9ea23e9da..0313ee70d7 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_list.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_list.js
@@ -61,6 +61,9 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({
 		});
 
 		this.$list_wrapper.on('keydown', e => {
+			if ($(e.target).is('input')) {
+				return;
+			}
 			if (e.key === 'Backspace') {
 				this.set_value([]);
 			}

From 175b974910faf36fffea1cc064f4964584adca62 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Fri, 15 Nov 2019 15:44:39 +0530
Subject: [PATCH 100/153] fix(pdf): Remove unnecessary argument

https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote
https://docs.python.org/2/library/urllib.html#urllib.quote
---
 frappe/utils/response.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 886baf2c37..8169986e44 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -90,7 +90,7 @@ def as_json():
 def as_pdf():
 	response = Response()
 	response.mimetype = "application/pdf"
-	encoded_filename = quote(frappe.response['filename'].replace(' ', '_'), encoding='utf-8')
+	encoded_filename = quote(frappe.response['filename'].replace(' ', '_'))
 	response.headers["Content-Disposition"] = ("filename=\"%s\"" % frappe.response['filename'].replace(' ', '_') + ";filename*=utf-8''%s" % encoded_filename).encode("utf-8")
 	response.data = frappe.response['filecontent']
 	return response

From c3f68142db54684c0e0beeb08b5fa7b0a6ff19b7 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 20 Nov 2019 16:09:01 +0530
Subject: [PATCH 101/153] fix: tags should consider list filters

---
 frappe/desk/reportview.py                    | 25 +++++++++++++-------
 frappe/public/js/frappe/list/list_sidebar.js |  4 ++--
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index d5b43807a8..937285206e 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -261,17 +261,24 @@ def delete_bulk(doctype, items):
 @frappe.whitelist()
 @frappe.read_only()
 def get_sidebar_stats(stats, doctype, filters=[]):
+	_user_tags = []
+	data = frappe._dict(frappe.local.form_dict)
+	filters = json.loads(data["filters"])
 
-	if not frappe.cache().hget("tags_count", doctype):
-		tags = [tag.name for tag in frappe.get_list("Tag")]
-		_user_tags = []
-		for tag in tags:
-			count = frappe.db.count("Tag Link", filters={"document_type": doctype, "tag": tag})
-			if count > 0:
-				_user_tags.append([tag, count])
-		frappe.cache().hset("tags_count", doctype, _user_tags)
+	if not frappe.cache().hget("Tags", doctype):
+		tags = set([tag.tag for tag in frappe.get_list("Tag Link", filters={"document_type": doctype}, fields=["tag"])])
+		frappe.cache().hset("Tags", doctype, tags)
 
-	return {"stats": {"_user_tags": frappe.cache().hget("tags_count", doctype)}}
+	for tag in list(frappe.cache().hget("Tags", doctype)):
+		tag_filters = []
+		tag_filters.extend(filters)
+		tag_filters.extend([['Tag Link', 'tag', '=', tag]])
+
+		count = frappe.get_all(doctype, filters=tag_filters, fields=["count(*)"])
+		if count[0].get("count(*)") > 0:
+			_user_tags.append([tag, count[0].get("count(*)")])
+
+	return {"stats": {"_user_tags": _user_tags}}
 
 @frappe.whitelist()
 @frappe.read_only()
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index 628f4d2edc..4767e02f43 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -386,8 +386,8 @@ frappe.views.ListSidebar = class ListSidebar {
 	}
 
 	reload_stats() {
-		this.sidebar.find(".sidebar-stat").remove();
-		this.sidebar.find(".list-tag-preview").remove();
+		this.sidebar.find(".stat-link").remove();
+		this.sidebar.find(".stat-no-records").remove();
 		this.get_stats();
 	}
 

From 7089be4db253e1a8fec0bb7fd4750af67f7f13a4 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Wed, 20 Nov 2019 16:16:39 +0530
Subject: [PATCH 102/153] fix: z-index for dropdown less than page-head

---
 frappe/public/less/sidebar.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 246cd721ac..985a2b1edb 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -400,7 +400,9 @@ body[data-route^="Module"] .main-menu {
 		max-height: 300px;
 		overflow-y: auto;
 		max-width: 250px;
+		z-index: 100;
 	}
+
 	.dropdown-search {
 		padding: 8px;
 	}

From 1e26a73b8e44db5a3c24d41295e1553776474ed6 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 16 Nov 2019 18:59:36 +0530
Subject: [PATCH 103/153] fix: Fallback for label in Table

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

diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js
index 90e0f90be7..3de62daf64 100644
--- a/frappe/public/js/frappe/form/grid.js
+++ b/frappe/public/js/frappe/form/grid.js
@@ -52,7 +52,7 @@ export default class Grid {
 
 		let template = `<div class="form-group">
 			<div class="clearfix">
-				<label class="control-label" style="padding-right: 0px;">${__(this.df.label)}</label>
+				<label class="control-label" style="padding-right: 0px;">${__(this.df.label || '')}</label>
 			</div>
 			<div class="form-grid">
 				<div class="grid-heading-row"></div>

From 2e95a1be140875c6cdc992965063aa657cbb8786 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 19 Nov 2019 13:39:01 +0530
Subject: [PATCH 104/153] fix: Only execute enabled server scripts

---
 frappe/core/doctype/server_script/server_script_utils.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py
index 0399dea106..878810f459 100644
--- a/frappe/core/doctype/server_script/server_script_utils.py
+++ b/frappe/core/doctype/server_script/server_script_utils.py
@@ -56,8 +56,10 @@ def get_server_script_map():
 	script_map = frappe.cache().get_value('server_script_map')
 	if script_map is None:
 		script_map = {}
-		for script in frappe.get_all('Server Script', ('name', 'reference_doctype', 'doctype_event',
-			'api_method', 'script_type')):
+		enabled_server_scripts = frappe.get_all('Server Script',
+			fields=('name', 'reference_doctype', 'doctype_event','api_method', 'script_type'),
+			filters={'disabled': 0})
+		for script in enabled_server_scripts:
 			if script.script_type == 'DocType Event':
 				script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name)
 			else:

From 1e68dde420b41903c26905ed3747f569c2c9e7ca Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 18 Nov 2019 15:52:23 +0530
Subject: [PATCH 105/153] fix: permission issue for activity

---
 frappe/core/doctype/activity_log/feed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py
index 22a7a3ee14..f51692fe9f 100644
--- a/frappe/core/doctype/activity_log/feed.py
+++ b/frappe/core/doctype/activity_log/feed.py
@@ -81,9 +81,9 @@ def get_feed_match_conditions(user=None, doctype='Comment'):
 
 		if user_permissions:
 			can_read_docs = []
-			for doctype, obj in user_permissions.items():
+			for dt, obj in user_permissions.items():
 				for n in obj:
-					can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n.get('doc', ''))))
+					can_read_docs.append('{}|{}'.format(frappe.db.escape(dt), frappe.db.escape(n.get('doc', ''))))
 
 			if can_read_docs:
 				conditions.append("concat_ws('|', `tab{doctype}`.reference_doctype, `tab{doctype}`.reference_name) in ({values})".format(

From e61f973788006da5dc422efb7b0fff69a9b356ea Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 17:08:46 +0530
Subject: [PATCH 106/153] fix: Cache can_import list for all users and not just
 System Managers

---
 frappe/core/doctype/data_import/data_import.js | 7 ++++---
 frappe/core/doctype/data_import/data_import.py | 5 ++---
 frappe/utils/user.py                           | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index c5bd4e99c9..9391b262d7 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -3,19 +3,20 @@
 
 frappe.ui.form.on('Data Import', {
 	onload: function(frm) {
-		if(frm.doc.__islocal) {
+		if (frm.doc.__islocal) {
 			frm.set_value("action", "");
 		}
 
 		frappe.call({
-			method: "frappe.core.doctype.data_import.data_import.get_importable_doc",
+			method: "frappe.core.doctype.data_import.data_import.get_importable_doctypes",
 			callback: function (r) {
+				let importable_doctypes = r.message;
 				frm.set_query("reference_doctype", function () {
 					return {
 						"filters": {
 							"issingle": 0,
 							"istable": 0,
-							"name": ['in', r.message]
+							"name": ['in', importable_doctypes]
 						}
 					};
 				});
diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py
index 80f8553121..ecf34d24b0 100644
--- a/frappe/core/doctype/data_import/data_import.py
+++ b/frappe/core/doctype/data_import/data_import.py
@@ -30,9 +30,8 @@ class DataImport(Document):
 
 
 @frappe.whitelist()
-def get_importable_doc():
-	import_lst = frappe.cache().hget("can_import", frappe.session.user)
-	return import_lst
+def get_importable_doctypes():
+	return frappe.cache().hget("can_import", frappe.session.user)
 
 @frappe.whitelist()
 def import_data(data_import):
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index e0c943d7c5..fa114d0e3c 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -161,7 +161,8 @@ class UserPermissions:
 			for docname in docs:
 				if frappe.get_meta(docname, cached=True).allow_import == 1:
 					self.can_import.append(docname)
-			frappe.cache().hset("can_import", frappe.session.user, self.can_import)
+
+		frappe.cache().hset("can_import", frappe.session.user, self.can_import)
 
 	def get_defaults(self):
 		import frappe.defaults

From 327d27b83d998b0b52bfd453fd63e8e7cea2a500 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 13 Nov 2019 11:48:20 +0530
Subject: [PATCH 107/153] fix(List): save checked rows on auto refresh

---
 frappe/public/js/frappe/list/list_view.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 6912065e1c..a1fe886484 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1077,10 +1077,20 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 					});
 					this.toggle_result_area();
 					this.render_list();
+					if (this.$checks.length) {
+						this.set_rows_as_checked();
+					}
 				});
 		});
 	}
 
+	set_rows_as_checked() {
+		$.each(this.$checks, (i, el) => {
+			let docname = $(el).attr('data-name');
+			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click();
+		});
+	}
+
 	on_row_checked() {
 		this.$list_head_subject = this.$list_head_subject || this.$result.find('header .list-header-subject');
 		this.$checkbox_actions = this.$checkbox_actions || this.$result.find('header .checkbox-actions');

From 63c703389d74160c4571fed156b3a938bf80afb2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 15 Nov 2019 13:47:32 +0530
Subject: [PATCH 108/153] fix: Make code explicit

.click() could have unchecked already checked row (this case may never occur but it's better to explicitly set it as checked)
---
 frappe/public/js/frappe/list/list_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index a1fe886484..b52b1db542 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1087,7 +1087,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	set_rows_as_checked() {
 		$.each(this.$checks, (i, el) => {
 			let docname = $(el).attr('data-name');
-			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click();
+			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true);
 		});
 	}
 

From de9452387be40d619bdb1079cbbf940442a615c6 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Fri, 15 Nov 2019 13:53:47 +0530
Subject: [PATCH 109/153] fix: Trigger on_row_checked after checking rows

---
 frappe/public/js/frappe/list/list_view.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b52b1db542..b980ae7684 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1089,6 +1089,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			let docname = $(el).attr('data-name');
 			this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true);
 		});
+		this.on_row_checked();
 	}
 
 	on_row_checked() {

From 5af3dd8dcbba043737aee460d40e300177b4b050 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Thu, 14 Nov 2019 20:11:21 +0530
Subject: [PATCH 110/153] fix: Show total row in print only if add total row is
 checked

---
 .../public/js/frappe/views/reports/query_report.js  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 4b72a6b7b5..560cb3d17b 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -975,12 +975,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				return this.data[index];
 			}
 		}).filter(Boolean);
-		let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => {
-			row[cell.column.id] = cell.content;
-			return row;
-		}, {});
 
-		rows.push(totalRow);
+		if (this.raw_data.add_total_row) {
+			let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => {
+				row[cell.column.id] = cell.content;
+				return row;
+			}, {});
+
+			rows.push(totalRow);
+		}
 		return rows;
 	}
 

From 9cb1869c9a116f4a40c2b02cecf4924b55bc80b9 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 18 Nov 2019 19:00:33 +0530
Subject: [PATCH 111/153] fix: pass doc to frappe.format so doc currency is set
 for the row, not system default currency

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

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 7f6e24595a..94c8e122c8 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -996,7 +996,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 					content: d[cdt_field(col.field)],
 					editable: Boolean(name && this.is_editable(col.docfield, d)),
 					format: value => {
-						return frappe.format(value, col.docfield, { always_show_decimals: true });
+						return frappe.format(value, col.docfield, { always_show_decimals: true }, d);
 					}
 				};
 			}

From 499d0a94711ffc41b9050f7a4c1f2799f8bb1cc5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 Nov 2019 13:10:01 +0530
Subject: [PATCH 112/153] fix: spacing for modal

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

diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index bef504d70e..a297054ee2 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -101,6 +101,10 @@ h4.modal-title {
   font-size: 1em;
 }
 
+h5.modal-title {
+  margin: 0px !important;
+}
+
 .col-xs-1 { @extend .col-1; }
 .col-xs-2 { @extend .col-2; }
 .col-xs-3 { @extend .col-3; }

From bee23f07251e7ced80b2099bcd97eba0d25755b6 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 18 Nov 2019 13:10:16 +0530
Subject: [PATCH 113/153] fix: allow setting message title from server

---
 frappe/website/js/website.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index f9766bae1d..98959e114f 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -132,12 +132,12 @@ $.extend(frappe, {
 
 		if (data._server_messages) {
 			var server_messages = JSON.parse(data._server_messages || '[]');
-			server_messages = $.map(server_messages, function(v) {
+			server_messages.map((msg) => {
 				// temp fix for messages sent as dict
 				try {
-					return JSON.parse(v).message;
+					return JSON.parse(msg);
 				} catch (e) {
-					return v;
+					return msg;
 				}
 			}).join('<br>');
 

From 31bc8b3aa4112ae0ef10796a220ab0f485dcba03 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:37:41 +0530
Subject: [PATCH 114/153] fix: Allow creation of new point log if old logs were
 reverted

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

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index 33a6717cb9..cd3d641d53 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -149,7 +149,8 @@ def check_if_log_exists(ref_doctype, ref_name, rule, user=None):
 	filters = frappe._dict({
 		'rule': rule,
 		'reference_doctype': ref_doctype,
-		'reference_name': ref_name
+		'reference_name': ref_name,
+		'reverted': 0
 	})
 
 	if user:

From e19b8dbff283379e6700b9543d4d326dc371d099 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:50:40 +0530
Subject: [PATCH 115/153] test: Check allowance of new log over reverted log

---
 .../energy_point_log/test_energy_point_log.py | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
index a1d67789aa..9e4d0e6425 100644
--- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py
@@ -249,6 +249,27 @@ class TestEnergyPointLog(unittest.TestCase):
 		# point should not be awarded more than once for same doc (irrespective of user)
 		self.assertEqual(second_user_points_after_closing_todo, second_user_points)
 
+	def test_allow_creation_of_new_log_if_the_previous_log_was_reverted(self):
+		frappe.set_user('test@example.com')
+		todo_point_rule = create_energy_point_rule_for_todo()
+		energy_point_of_user = get_points('test@example.com')
+
+		created_todo = create_a_todo()
+
+		created_todo.status = 'Closed'
+		created_todo.save()
+		points_after_closing_todo = get_points('test@example.com')
+
+		log_name = frappe.db.exists('Energy Point Log', {'reference_name': created_todo.name})
+		frappe.get_doc('Energy Point Log', log_name).revert('Just for test')
+		points_after_reverting_todo = get_points('test@example.com')
+		created_todo.save()
+		points_after_saving_todo_again = get_points('test@example.com')
+
+		rule_points = todo_point_rule.points
+		self.assertEqual(points_after_closing_todo, energy_point_of_user + rule_points)
+		self.assertEqual(points_after_reverting_todo, points_after_closing_todo - rule_points)
+		self.assertEqual(points_after_saving_todo_again, points_after_reverting_todo + rule_points)
 
 def create_energy_point_rule_for_todo(multiplier_field=None, for_doc_event='Custom', max_points=None,
 	for_assigned_users=0, field_to_check=None, apply_once=False, user_field='owner'):

From d9dae005c36a38902ae8311749abf147ffa09ef2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 10:50:52 +0530
Subject: [PATCH 116/153] refactor: Move revert functionality to controller

---
 .../energy_point_log/energy_point_log.js      |  9 +--
 .../energy_point_log/energy_point_log.py      | 57 ++++++++++---------
 .../energy_point_rule/energy_point_rule.py    |  4 +-
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js
index 3090f3659d..9822998a30 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.js
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.js
@@ -21,14 +21,15 @@ frappe.ui.form.on('Energy Point Log', {
 				reqd: 1
 			}],
 			primary_action: (values) => {
-				return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', {
-					'name': frm.doc.name,
+				return frm.call('revert', {
 					'reason': values.reason
-				}).then(revert_log => {
+				}).then(res => {
+					let revert_log = res.message;
 					revert_dialog.hide();
 					revert_dialog.clear();
 					frappe.model.docinfo[frm.doc.reference_doctype][frm.doc.reference_name].energy_point_logs.unshift(revert_log);
-				}).catch(() => {});
+					frm.refresh();
+				});
 			},
 			primary_action_label: __('Submit')
 		});
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index cd3d641d53..cfba5884cf 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -44,6 +44,35 @@ class EnergyPointLog(Document):
 
 			enqueue_create_notification(self.user, notification_doc)
 
+	def on_trash(self):
+		if self.type == 'Revert':
+			reference_log = frappe.get_doc('Energy Point Log', self.revert_of)
+			reference_log.reverted = 0
+			reference_log.save()
+
+	def revert(self, reason):
+		frappe.only_for('System Manager')
+		if self.type != 'Auto':
+			frappe.throw(_('This document cannot be reverted'))
+
+		if self.reverted: return
+
+		self.reverted = 1
+		self.save(ignore_permissions=True)
+
+		revert_log = frappe.get_doc({
+			'doctype': 'Energy Point Log',
+			'points': -(self.points),
+			'type': 'Revert',
+			'user': self.user,
+			'reason': reason,
+			'reference_doctype': self.reference_doctype,
+			'reference_name': self.reference_name,
+			'revert_of': self.name
+		}).insert(ignore_permissions=True)
+
+		return revert_log
+
 def get_notification_message(doc):
 	owner_name = get_fullname(doc.owner)
 	points = doc.points
@@ -258,32 +287,6 @@ def get_reviews(doctype, docname):
 		'type': ['in', ('Appreciation', 'Criticism')],
 	}, fields=['points', 'owner', 'type', 'user', 'reason', 'creation'])
 
-@frappe.whitelist()
-def revert(name, reason):
-	frappe.only_for('System Manager')
-	doc_to_revert = frappe.get_doc('Energy Point Log', name)
-
-	if doc_to_revert.type != 'Auto':
-		frappe.throw(_('This document cannot be reverted'))
-
-	if doc_to_revert.reverted: return
-
-	doc_to_revert.reverted = 1
-	doc_to_revert.save(ignore_permissions=True)
-
-	revert_log = frappe.get_doc({
-		'doctype': 'Energy Point Log',
-		'points': -(doc_to_revert.points),
-		'type': 'Revert',
-		'user': doc_to_revert.user,
-		'reason': reason,
-		'reference_doctype': doc_to_revert.reference_doctype,
-		'reference_name': doc_to_revert.reference_name,
-		'revert_of': doc_to_revert.name
-	}).insert(ignore_permissions=True)
-
-	return revert_log
-
 def send_weekly_summary():
 	send_summary('Weekly')
 
@@ -326,5 +329,3 @@ def get_footer_message(timespan):
 		return _("Stats based on last month's performance (from {0} to {1})")
 	else:
 		return _("Stats based on last week's performance (from {0} to {1})")
-
-
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 38995887f0..0d66691a1b 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -8,7 +8,7 @@ from frappe import _
 import frappe.cache_manager
 from frappe.model.document import Document
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log, revert
+from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
 
 class EnergyPointRule(Document):
 	def on_update(self):
@@ -106,7 +106,7 @@ def revert_points_for_cancelled_doc(doc):
 		'type': 'Auto'
 	})
 	for log in energy_point_logs:
-		revert(log.name, _('Reference document has been cancelled'))
+		frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled'))
 
 
 def get_energy_point_doctypes():

From afb0a501892a4dab9123253c77b063ab2260ede3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 11:00:05 +0530
Subject: [PATCH 117/153] style: Fix codacy

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

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index cfba5884cf..eb8bccf96a 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -55,7 +55,7 @@ class EnergyPointLog(Document):
 		if self.type != 'Auto':
 			frappe.throw(_('This document cannot be reverted'))
 
-		if self.reverted: return
+		if self.get('reverted'): return
 
 		self.reverted = 1
 		self.save(ignore_permissions=True)

From 95c116e71a43e2d69430ed7ec9df1cdb9af4b749 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 15 Nov 2019 11:15:53 +0530
Subject: [PATCH 118/153] style: Fix deepsource

---
 frappe/social/doctype/energy_point_log/energy_point_log.py  | 3 ++-
 .../social/doctype/energy_point_rule/energy_point_rule.py   | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py
index eb8bccf96a..8353c3aa5f 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.py
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.py
@@ -55,7 +55,8 @@ class EnergyPointLog(Document):
 		if self.type != 'Auto':
 			frappe.throw(_('This document cannot be reverted'))
 
-		if self.get('reverted'): return
+		if self.get('reverted'):
+			return
 
 		self.reverted = 1
 		self.save(ignore_permissions=True)
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 0d66691a1b..5986e90bfb 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -8,7 +8,8 @@ from frappe import _
 import frappe.cache_manager
 from frappe.model.document import Document
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
-from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log
+from frappe.social.doctype.energy_point_log.energy_point_log import \
+	create_energy_points_log
 
 class EnergyPointRule(Document):
 	def on_update(self):
@@ -106,7 +107,8 @@ def revert_points_for_cancelled_doc(doc):
 		'type': 'Auto'
 	})
 	for log in energy_point_logs:
-		frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled'))
+		reference_log = frappe.get_doc('Energy Point Log', log.name)
+		reference_log.revert(_('Reference document has been cancelled'))
 
 
 def get_energy_point_doctypes():

From 7b55f1657b840d11204c4c76f06e681b2c0eb6a7 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 6 Nov 2019 15:10:48 +0530
Subject: [PATCH 119/153] fix: Barcode Control

- Fix render caching in forms
- Handle raw and svg value
---
 .../public/js/frappe/form/controls/barcode.js | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js
index 1cd1411b49..8245962d7e 100644
--- a/frappe/public/js/frappe/form/controls/barcode.js
+++ b/frappe/public/js/frappe/form/controls/barcode.js
@@ -1,18 +1,27 @@
-import JsBarcode from "jsbarcode";
+import JsBarcode from 'jsbarcode';
 
 frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 	make_wrapper() {
 		// Create the elements for barcode area
 		this._super();
 
+		this.default_svg = '<svg height=80></svg>';
 		let $input_wrapper = this.$wrapper.find('.control-input-wrapper');
-		this.barcode_area = $(`<div class="barcode-wrapper border"><svg height=80></svg></div>`);
+		this.barcode_area = $(
+			`<div class="barcode-wrapper border">${this.default_svg}</div>`
+		);
 		this.barcode_area.appendTo($input_wrapper);
 	},
 
 	parse(value) {
 		// Parse raw value
-		return value ? this.get_barcode_html(value) : "";
+		if (value) {
+			if (value.startsWith('<svg')) {
+				return value;
+			}
+			return this.get_barcode_html(value);
+		}
+		return '';
 	},
 
 	set_formatted_input(value) {
@@ -20,47 +29,39 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 		let svg = value;
 		const barcode_value = $(svg).attr('data-barcode-value');
 
-		if(!barcode_value) {
+		if (!barcode_value) {
 			svg = this.get_barcode_html(value);
 			this.doc[this.df.fieldname] = svg;
 		}
 
 		this.$input.val(barcode_value || value);
-		this.barcode_area.html(svg);
+		this.barcode_area.html(svg || this.default_svg);
 	},
 
 	get_barcode_html(value) {
-		// Get svg
-		const svg = this.barcode_area.find('svg')[0];
-		JsBarcode(svg, value, this.get_options(value));
-		$(svg).attr('data-barcode-value', value);
-		return this.barcode_area.html();
+		if (value) {
+			// Get svg
+			const svg = this.barcode_area.find('svg')[0];
+			JsBarcode(svg, value, this.get_options(value));
+			$(svg).attr('data-barcode-value', value);
+			return this.barcode_area.html();
+		}
 	},
 
 	get_options(value) {
 		// get JsBarcode options
 		let options = JSON.parse('{ "height" : 40 }');
-		if (this.isValidJson(this.df.options)) {
+		if (frappe.utils.is_json(this.df.options)) {
 			options = JSON.parse(this.df.options);
-			if (options.format && options.format === "EAN") {
-				options.format = value.length == 8 ? "EAN8" : "EAN13";
+			if (options.format && options.format === 'EAN') {
+				options.format = value.length == 8 ? 'EAN8' : 'EAN13';
 			}
 
 			if (options.valueField) {
 				// Set companion field value
-				this.frm.set_value(options.valueField, value);
+				this.frm && this.frm.set_value(options.valueField, value);
 			}
 		}
 		return options;
-	},
-
-	isValidJson(jsonData) {
-		try {
-			JSON.parse(jsonData);
-			return true;
-		} catch (e) {
-			return false;
-		}
 	}
-
 });

From 0264b6fb29f8897269da69bbdd9e0399a5370531 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 18 Nov 2019 16:21:01 +0530
Subject: [PATCH 120/153] test: UI test for Barcode Control

---
 cypress/integration/control_barcode.js        | 55 +++++++++++++++++++
 .../public/js/frappe/form/controls/barcode.js |  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 cypress/integration/control_barcode.js

diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js
new file mode 100644
index 0000000000..8d720f6b6c
--- /dev/null
+++ b/cypress/integration/control_barcode.js
@@ -0,0 +1,55 @@
+context('Control Barcide', () => {
+	beforeEach(() => {
+		cy.login();
+		cy.visit('/desk');
+	});
+
+	function get_dialog_with_barcode() {
+		return cy.dialog({
+			title: 'Barcode',
+			fields: [
+				{
+					label: 'Barcode',
+					fieldname: 'barcode',
+					fieldtype: 'Barcode'
+				}
+			]
+		});
+	}
+
+	it('should generate barcode on setting a value', () => {
+		get_dialog_with_barcode().as('dialog');
+
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.focus()
+			.type('123456789')
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]')
+			.should('exist');
+
+		cy.get('@dialog').then(dialog => {
+			let value = dialog.get_value('barcode');
+			expect(value).to.contain('<svg');
+			expect(value).to.contain('data-barcode-value="123456789"');
+		});
+	});
+
+	it('should reset when input is cleared', () => {
+		get_dialog_with_barcode().as('dialog');
+
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.focus()
+			.type('123456789')
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] input')
+			.clear()
+			.blur();
+		cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]')
+			.should('not.exist');
+
+		cy.get('@dialog').then(dialog => {
+			let value = dialog.get_value('barcode');
+			expect(value).to.equal('');
+		});
+	});
+});
diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js
index 8245962d7e..08bb7b763f 100644
--- a/frappe/public/js/frappe/form/controls/barcode.js
+++ b/frappe/public/js/frappe/form/controls/barcode.js
@@ -29,7 +29,7 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({
 		let svg = value;
 		const barcode_value = $(svg).attr('data-barcode-value');
 
-		if (!barcode_value) {
+		if (!barcode_value && this.doc) {
 			svg = this.get_barcode_html(value);
 			this.doc[this.df.fieldname] = svg;
 		}

From 30e3e1a5b8690181f471f024c8829b0dfa04a699 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 19 Nov 2019 11:37:43 +0530
Subject: [PATCH 121/153] fix: typo

Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 cypress/integration/control_barcode.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js
index 8d720f6b6c..ac2a687bae 100644
--- a/cypress/integration/control_barcode.js
+++ b/cypress/integration/control_barcode.js
@@ -1,4 +1,4 @@
-context('Control Barcide', () => {
+context('Control Barcode', () => {
 	beforeEach(() => {
 		cy.login();
 		cy.visit('/desk');

From 6797aec45b03cc8c98510b884291505f8cc61e55 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Wed, 20 Nov 2019 19:52:08 +0530
Subject: [PATCH 122/153] fix: do not validate Script Manager role for Report
 Builder type

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

diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index e88a2d3335..ff2620a087 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -30,7 +30,7 @@ class Report(Document):
 
 		if self.is_standard == "No":
 			# allow only script manager to edit scripts
-			if self.report_type == 'Script Report' and frappe.conf.server_script_enabled and frappe.session.user != "Administrator":
+			if self.report_type != 'Report Builder' and frappe.session.user != "Administrator":
 				frappe.only_for('Script Manager', True)
 
 			if frappe.db.get_value("Report", self.name, "is_standard") == "Yes":

From 22aa7cef78c15e43885f310d74f2af3ed6ab3f50 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 20 Nov 2019 12:53:52 +0530
Subject: [PATCH 123/153] fix(web-forms): view addresses only by session user

---
 frappe/contacts/doctype/address/address.py | 28 ++++------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 6795011745..21ed88addb 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -145,30 +145,10 @@ def get_list_context(context=None):
 def get_address_list(doctype, txt, filters, limit_start, limit_page_length = 20, order_by = None):
 	from frappe.www.list import get_list
 	user = frappe.session.user
-	ignore_permissions = False
-	if is_website_user():
-		if not filters: filters = []
-		add_name = []
-		contact = frappe.db.sql("""
-			select
-				address.name
-			from
-				`tabDynamic Link` as link
-			join
-				`tabAddress` as address on link.parent = address.name
-			where
-				link.parenttype = 'Address' and
-				link_name in(
-				   select
-					   link.link_name from `tabContact` as contact
-				   join
-					   `tabDynamic Link` as link on contact.name = link.parent
-				   where
-					   contact.user = %s)""",(user))
-		for c in contact:
-			add_name.append(c[0])
-		filters.append(("Address", "name", "in", add_name))
-		ignore_permissions = True
+	ignore_permissions = True
+
+	if not filters: filters = []
+	filters.append(("Address", "owner", "=", user))
 
 	return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=ignore_permissions)
 

From 5ac4968e53ddca4b9bffdb063f0c7f6e86d3be3c Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 21 Nov 2019 00:33:32 +0530
Subject: [PATCH 124/153] fix: check for __default, __global default values

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

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 387b2f3b61..402df3239a 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -649,6 +649,9 @@ class FilterArea {
 			let default_value = (field.df.fieldtype === 'Link')
 				? frappe.defaults.get_user_default(field.df.options)
 				: null;
+			if (['__default', '__global'].includes(default_value)) {	
+				default_value = null;	
+			}
 
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {

From 0bf40721fa8c08c173dcd93d1cb786ee8f9934b1 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Nov 2019 08:49:30 +0530
Subject: [PATCH 125/153] style: Remove trailing tabs

---
 frappe/public/js/frappe/list/base_list.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 402df3239a..835540fc6a 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -646,11 +646,11 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
-			let default_value = (field.df.fieldtype === 'Link')
-				? frappe.defaults.get_user_default(field.df.options)
-				: null;
-			if (['__default', '__global'].includes(default_value)) {	
-				default_value = null;	
+			let default_value = (field.df.fieldtype === 'Link') ?
+				frappe.defaults.get_user_default(field.df.options) : null;
+
+			if (['__default', '__global'].includes(default_value)) {
+				default_value = null;
 			}
 
 			if (value) {

From 6a489f1e395aadf00077a16c9a32713a4a183f00 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Thu, 21 Nov 2019 14:43:53 +0530
Subject: [PATCH 126/153] fix: remove explicit check for session user as
 Administrator

Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/core/doctype/report/report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/report/report.py b/frappe/core/doctype/report/report.py
index ff2620a087..099c279dab 100644
--- a/frappe/core/doctype/report/report.py
+++ b/frappe/core/doctype/report/report.py
@@ -30,7 +30,7 @@ class Report(Document):
 
 		if self.is_standard == "No":
 			# allow only script manager to edit scripts
-			if self.report_type != 'Report Builder' and frappe.session.user != "Administrator":
+			if self.report_type != 'Report Builder':
 				frappe.only_for('Script Manager', True)
 
 			if frappe.db.get_value("Report", self.name, "is_standard") == "Yes":

From a7315a783265eadcf50faa2848a82c016640ffcc Mon Sep 17 00:00:00 2001
From: Jack <jjbayliss@icloud.com>
Date: Thu, 21 Nov 2019 11:18:01 +0000
Subject: [PATCH 127/153] fix: Typo in email account doctype (#8864)

---
 frappe/email/doctype/email_account/email_account.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 7a175e7192..71f9cccb0d 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -184,7 +184,7 @@ frappe.ui.form.on("Email Account", {
 				read as well as unread message from server. This may also cause the duplication\
 				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "UNSEEN");
+				frm.set_value("email_sync_option", "ALL");
 			});
 		}
 	}

From cbde4643199bf8c642ec97fba51ac06d41341cd3 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Nov 2019 17:01:33 +0530
Subject: [PATCH 128/153] fix: Add Notification Settings

---
 frappe/config/settings.py                            |  9 ++++++++-
 .../notification_settings/notification_settings.js   | 12 ++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 frappe/desk/doctype/notification_settings/notification_settings.js

diff --git a/frappe/config/settings.py b/frappe/config/settings.py
index 2422f2fae2..a0a7dcd65f 100644
--- a/frappe/config/settings.py
+++ b/frappe/config/settings.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+import frappe
 from frappe import _
 from frappe.desk.moduleview import add_setup_section
 
@@ -88,7 +89,7 @@ def get_data():
 			]
 		},
 		{
-			"label": _("Email"),
+			"label": _("Email / Notifications"),
 			"icon": "fa fa-envelope",
 			"items": [
 				{
@@ -120,6 +121,12 @@ def get_data():
 					"type": "doctype",
 					"name": "Newsletter",
 					"description": _("Create and manage newsletter")
+				},
+				{
+					"type": "doctype",
+					"route": "Form/Notification Settings/{}".format(frappe.session.user),
+					"name": "Notification Settings",
+					"description": _("Configure notifications for mentions, assignments, energy points and more.")
 				}
 			]
 		},
diff --git a/frappe/desk/doctype/notification_settings/notification_settings.js b/frappe/desk/doctype/notification_settings/notification_settings.js
new file mode 100644
index 0000000000..d4e3b08def
--- /dev/null
+++ b/frappe/desk/doctype/notification_settings/notification_settings.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2019, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Notification Settings', {
+	onload: () => {
+		frappe.breadcrumbs.add({
+			label: __('Settings'),
+			route: '#modules/Settings',
+			type: 'Custom'
+		});
+	}
+});

From 3505e680819632ac7cbf6619694860f6a08a714a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 19 Nov 2019 14:38:24 +0530
Subject: [PATCH 129/153] fix: standard filters with default value are saved
 when changed

---
 frappe/public/js/frappe/list/base_list.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 2c5e1df1df..d713ae6c3e 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -625,17 +625,13 @@ class FilterArea {
 					options = options.join("\n");
 				}
 			}
-			let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null;
-			if (['__default', '__global'].includes(default_value)) {
-				default_value = null;
-			}
+
 			return {
 				fieldtype: fieldtype,
 				label: __(df.label),
 				options: options,
 				fieldname: df.fieldname,
 				condition: condition,
-				default: default_value,
 				onchange: () => this.refresh_list_view(),
 				ignore_link_validation: fieldtype === 'Dynamic Link'
 			};
@@ -650,6 +646,10 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
+			let default_value = (field.df.fieldtype === 'Link')
+				? frappe.defaults.get_user_default(field.df.options)
+				: null;
+
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {
 					value = '%' + value + '%';
@@ -660,6 +660,13 @@ class FilterArea {
 					field.df.condition || '=',
 					value
 				]);
+			} else if (default_value) {
+				filters.push([
+					this.list_view.doctype,
+					field.df.fieldname,
+					field.df.condition,
+					default_value
+				]);
 			}
 		}
 

From fdf37115aaf6e750c0cb9b1048344959e1aacd95 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 21 Nov 2019 00:33:32 +0530
Subject: [PATCH 130/153] fix: check for __default, __global default values

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

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index d713ae6c3e..c0eaf5845c 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -649,6 +649,9 @@ class FilterArea {
 			let default_value = (field.df.fieldtype === 'Link')
 				? frappe.defaults.get_user_default(field.df.options)
 				: null;
+			if (['__default', '__global'].includes(default_value)) {	
+				default_value = null;	
+			}
 
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {

From 3d15be73fab267375cf6cf46bb99d41e24f6b922 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 21 Nov 2019 08:49:30 +0530
Subject: [PATCH 131/153] style: Remove trailing tabs

---
 frappe/public/js/frappe/list/base_list.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index c0eaf5845c..0ea9a801fb 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -646,11 +646,11 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
-			let default_value = (field.df.fieldtype === 'Link')
-				? frappe.defaults.get_user_default(field.df.options)
-				: null;
-			if (['__default', '__global'].includes(default_value)) {	
-				default_value = null;	
+			let default_value = (field.df.fieldtype === 'Link') ?
+				frappe.defaults.get_user_default(field.df.options) : null;
+
+			if (['__default', '__global'].includes(default_value)) {
+				default_value = null;
 			}
 
 			if (value) {

From 7e6f5ea07ebfc7bd78b1d6ac7f7743292cd8772e Mon Sep 17 00:00:00 2001
From: Jack <jjbayliss@icloud.com>
Date: Thu, 21 Nov 2019 10:59:06 +0000
Subject: [PATCH 132/153] Misspelt, when selecting ALL emails it was being set
 to UNSEEN. This rectifies the issue.

---
 frappe/email/doctype/email_account/email_account.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 7a175e7192..71f9cccb0d 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -184,7 +184,7 @@ frappe.ui.form.on("Email Account", {
 				read as well as unread message from server. This may also cause the duplication\
 				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "UNSEEN");
+				frm.set_value("email_sync_option", "ALL");
 			});
 		}
 	}

From c3fcbce168458998fa875f61a473d04a648c80ad Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Thu, 21 Nov 2019 19:36:04 +0530
Subject: [PATCH 133/153] fix: patch

---
 frappe/patches/v12_0/create_notification_settings_for_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches/v12_0/create_notification_settings_for_user.py b/frappe/patches/v12_0/create_notification_settings_for_user.py
index 170931bdf3..63eeccc07a 100644
--- a/frappe/patches/v12_0/create_notification_settings_for_user.py
+++ b/frappe/patches/v12_0/create_notification_settings_for_user.py
@@ -4,6 +4,7 @@ from frappe.desk.doctype.notification_settings.notification_settings import crea
 
 def execute():
 	frappe.reload_doc('desk', 'doctype', 'notification_settings')
+	frappe.reload_doc('desk', 'doctype', 'notification_subscribed_document')
 
 	users = frappe.db.get_all('User', fields=['name'])
 	for user in users:

From 2759689ea972645c15de658f99fb155746fcbe21 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 22 Nov 2019 11:34:20 +0530
Subject: [PATCH 134/153] fix: reload notification subscribed document (#8868)

---
 frappe/patches/v12_0/create_notification_settings_for_user.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/patches/v12_0/create_notification_settings_for_user.py b/frappe/patches/v12_0/create_notification_settings_for_user.py
index 170931bdf3..63eeccc07a 100644
--- a/frappe/patches/v12_0/create_notification_settings_for_user.py
+++ b/frappe/patches/v12_0/create_notification_settings_for_user.py
@@ -4,6 +4,7 @@ from frappe.desk.doctype.notification_settings.notification_settings import crea
 
 def execute():
 	frappe.reload_doc('desk', 'doctype', 'notification_settings')
+	frappe.reload_doc('desk', 'doctype', 'notification_subscribed_document')
 
 	users = frappe.db.get_all('User', fields=['name'])
 	for user in users:

From 3a73cf6e7d2ea8997a839b36c0c6d20ed110c741 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 22 Nov 2019 15:13:19 +0530
Subject: [PATCH 135/153] feat: Handle server and client side primary action in
 msgprint (#8870)

* feat: Handle server and client side primary action in msgprint

- Added provision to pass primary action from server side msgprint
- msgprint on client side handles server side and client side methods as primary actions

* chore: Code cleanup

* fix: Codacy

* fix: patch
---
 frappe/__init__.py                     |  6 +++++-
 frappe/public/js/frappe/ui/messages.js | 30 ++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 77207e017f..c937cc8548 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -290,7 +290,7 @@ def log(msg):
 
 	debug_log.append(as_unicode(msg))
 
-def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False):
+def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False, primary_action=None):
 	"""Print a message to the user (via HTTP response).
 	Messages are sent in the `__server_messages` property in the
 	response JSON and shown in a pop-up / modal.
@@ -299,6 +299,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	:param title: [optional] Message title.
 	:param raise_exception: [optional] Raise given exception and show message.
 	:param as_table: [optional] If `msg` is a list of lists, render as HTML table.
+	:param primary_action: [optional] Bind a primary server/client side action.
 	"""
 	from frappe.utils import encode
 
@@ -338,6 +339,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	if alert:
 		out.alert = 1
 
+	if primary_action:
+		out.primary_action = primary_action
+
 	message_log.append(json.dumps(out))
 
 	if raise_exception and hasattr(raise_exception, '__name__'):
diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index f804648834..26bee50f18 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -122,8 +122,34 @@ frappe.msgprint = function(msg, title) {
 
 		// setup and bind an action to the primary button
 		if (data.primary_action) {
-			frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"),
-				data.primary_action.action);
+			if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
+				data.primary_action.action = () => {
+					frappe.call({
+						method: data.primary_action.server_action,
+						args: {
+							args: data.primary_action.args
+						}
+					});
+				}
+			}
+
+			if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
+				let parts = data.primary_action.client_action.split('.');
+				let obj = window;
+				for (let part of parts) {
+					obj = obj[part];
+				}
+				data.primary_action.action = () => {
+					if (typeof obj === 'function') {
+						obj(data.primary_action.args);
+					}
+				}
+			}
+
+			frappe.msg_dialog.set_primary_action(
+				__(data.primary_action.label || "Done"),
+				data.primary_action.action
+			);
 		}
 
 		// class "msgprint" is used in tests

From d9a1bfadc87e45bd326017d857cbcb1162446783 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 25 Nov 2019 13:02:34 +0530
Subject: [PATCH 136/153] fix: Actions in msgprint (#8878)

---
 frappe/public/js/frappe/ui/messages.js | 69 ++++++++++++++------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 26bee50f18..08711a8237 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -120,38 +120,6 @@ frappe.msgprint = function(msg, title) {
 			}
 		});
 
-		// setup and bind an action to the primary button
-		if (data.primary_action) {
-			if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
-				data.primary_action.action = () => {
-					frappe.call({
-						method: data.primary_action.server_action,
-						args: {
-							args: data.primary_action.args
-						}
-					});
-				}
-			}
-
-			if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
-				let parts = data.primary_action.client_action.split('.');
-				let obj = window;
-				for (let part of parts) {
-					obj = obj[part];
-				}
-				data.primary_action.action = () => {
-					if (typeof obj === 'function') {
-						obj(data.primary_action.args);
-					}
-				}
-			}
-
-			frappe.msg_dialog.set_primary_action(
-				__(data.primary_action.label || "Done"),
-				data.primary_action.action
-			);
-		}
-
 		// class "msgprint" is used in tests
 		frappe.msg_dialog.msg_area = $('<div class="msgprint">')
 			.appendTo(frappe.msg_dialog.body);
@@ -163,6 +131,43 @@ frappe.msgprint = function(msg, title) {
 		frappe.msg_dialog.indicator = frappe.msg_dialog.header.find('.indicator');
 	}
 
+	// setup and bind an action to the primary button
+	if (data.primary_action) {
+		if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
+			data.primary_action.action = () => {
+				frappe.call({
+					method: data.primary_action.server_action,
+					args: {
+						args: data.primary_action.args
+					}
+				});
+			}
+		}
+
+		if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
+			let parts = data.primary_action.client_action.split('.');
+			let obj = window;
+			for (let part of parts) {
+				obj = obj[part];
+			}
+			data.primary_action.action = () => {
+				if (typeof obj === 'function') {
+					obj(data.primary_action.args);
+				}
+			}
+		}
+
+		frappe.msg_dialog.set_primary_action(
+			__(data.primary_action.label || "Done"),
+			data.primary_action.action
+		);
+	} else {
+		if (frappe.msg_dialog.has_primary_action) {
+			frappe.msg_dialog.get_primary_btn().addClass('hide');
+			frappe.msg_dialog.has_primary_action = false;
+		}
+	}
+
 	if(data.message==null) {
 		data.message = '';
 	}

From 95577018151c949ff616a53c63a281f540889d56 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 25 Nov 2019 13:31:06 +0530
Subject: [PATCH 137/153] fix: Actions in msgprint (#8877)

---
 frappe/public/js/frappe/ui/messages.js | 69 ++++++++++++++------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js
index 26bee50f18..08711a8237 100644
--- a/frappe/public/js/frappe/ui/messages.js
+++ b/frappe/public/js/frappe/ui/messages.js
@@ -120,38 +120,6 @@ frappe.msgprint = function(msg, title) {
 			}
 		});
 
-		// setup and bind an action to the primary button
-		if (data.primary_action) {
-			if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
-				data.primary_action.action = () => {
-					frappe.call({
-						method: data.primary_action.server_action,
-						args: {
-							args: data.primary_action.args
-						}
-					});
-				}
-			}
-
-			if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
-				let parts = data.primary_action.client_action.split('.');
-				let obj = window;
-				for (let part of parts) {
-					obj = obj[part];
-				}
-				data.primary_action.action = () => {
-					if (typeof obj === 'function') {
-						obj(data.primary_action.args);
-					}
-				}
-			}
-
-			frappe.msg_dialog.set_primary_action(
-				__(data.primary_action.label || "Done"),
-				data.primary_action.action
-			);
-		}
-
 		// class "msgprint" is used in tests
 		frappe.msg_dialog.msg_area = $('<div class="msgprint">')
 			.appendTo(frappe.msg_dialog.body);
@@ -163,6 +131,43 @@ frappe.msgprint = function(msg, title) {
 		frappe.msg_dialog.indicator = frappe.msg_dialog.header.find('.indicator');
 	}
 
+	// setup and bind an action to the primary button
+	if (data.primary_action) {
+		if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') {
+			data.primary_action.action = () => {
+				frappe.call({
+					method: data.primary_action.server_action,
+					args: {
+						args: data.primary_action.args
+					}
+				});
+			}
+		}
+
+		if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') {
+			let parts = data.primary_action.client_action.split('.');
+			let obj = window;
+			for (let part of parts) {
+				obj = obj[part];
+			}
+			data.primary_action.action = () => {
+				if (typeof obj === 'function') {
+					obj(data.primary_action.args);
+				}
+			}
+		}
+
+		frappe.msg_dialog.set_primary_action(
+			__(data.primary_action.label || "Done"),
+			data.primary_action.action
+		);
+	} else {
+		if (frappe.msg_dialog.has_primary_action) {
+			frappe.msg_dialog.get_primary_btn().addClass('hide');
+			frappe.msg_dialog.has_primary_action = false;
+		}
+	}
+
 	if(data.message==null) {
 		data.message = '';
 	}

From 0a49a54e172a8d0d4484ff3435c8c437ad2d5966 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Nov 2019 14:49:05 +0530
Subject: [PATCH 138/153] fix: Suppress unwanted quill warnings

---
 frappe/public/js/frappe/form/controls/comment.js                | 2 +-
 .../js/frappe/form/controls/quill-mention/blots/mention.js      | 2 +-
 .../js/frappe/form/controls/quill-mention/quill.mention.js      | 2 +-
 frappe/public/js/frappe/form/controls/text_editor.js            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js
index eba82fd7b2..a64df56bca 100644
--- a/frappe/public/js/frappe/form/controls/comment.js
+++ b/frappe/public/js/frappe/form/controls/comment.js
@@ -1,7 +1,7 @@
 import Quill from 'quill';
 import Mention from './quill-mention/quill.mention';
 
-Quill.register('modules/mention', Mention);
+Quill.register('modules/mention', Mention, true);
 
 frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
 	make_wrapper() {
diff --git a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
index 26485adcc0..1c5787f854 100644
--- a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
+++ b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
@@ -35,4 +35,4 @@ MentionBlot.blotName = 'mention';
 MentionBlot.tagName = 'span';
 MentionBlot.className = 'mention';
 
-Quill.register(MentionBlot);
+Quill.register(MentionBlot, true);
diff --git a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
index 0b50ffd758..80ee5a6c6d 100644
--- a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
+++ b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
@@ -361,6 +361,6 @@ class Mention {
   }
 }
 
-Quill.register('modules/mention', Mention);
+Quill.register('modules/mention', Mention, true);
 
 export default Mention;
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 1b9078ae03..b35c92c1ae 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -36,7 +36,7 @@ class MyLink extends Link {
 	}
 }
 
-Quill.register(MyLink);
+Quill.register(MyLink, true);
 
 // image uploader
 const Uploader = Quill.import('modules/uploader');

From fd39f2ac708d11dcded08ba3e4ede9b4a7ba2ef2 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 25 Nov 2019 15:18:22 +0550
Subject: [PATCH 139/153] bumped to version 12.0.19

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c937cc8548..74a60794d8 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.18'
+__version__ = '12.0.19'
 __title__ = "Frappe Framework"
 
 local = Local()

From 17161976c681c2deadb7a1b84c221ac686c59ee6 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 25 Nov 2019 19:29:14 +0530
Subject: [PATCH 140/153] fix(security): Make all Prepared Report file
 attachments private

---
 frappe/core/doctype/prepared_report/prepared_report.py |  3 ++-
 frappe/patches.txt                                     |  1 +
 .../make_all_prepared_report_attachments_private.py    | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v11_0/make_all_prepared_report_attachments_private.py

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 071bb4afc0..c61e374744 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -85,7 +85,8 @@ def create_json_gz_file(data, dt, dn):
 		"file_name": json_filename,
 		"attached_to_doctype": dt,
 		"attached_to_name": dn,
-		"content": compressed_content
+		"content": compressed_content,
+		"is_private": 1
 	})
 	_file.save(ignore_permissions=True)
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 9473323059..1aa1d34e97 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -257,3 +257,4 @@ frappe.patches.v12_0.setup_tags
 frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable
 frappe.patches.v12_0.copy_to_parent_for_tags
 frappe.patches.v12_0.create_notification_settings_for_user
+frappe.patches.v11_0.make_all_prepared_report_attachments_private
diff --git a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
new file mode 100644
index 0000000000..2338d6f2e7
--- /dev/null
+++ b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	files = frappe.get_all("File", filters={"attached_to_doctype": "Prepared Report", "is_private": 0})
+	for file_name in files:
+		file_doc = frappe.get_doc("File", file_name)
+		file_doc.is_private = 1
+		file_doc.save()

From 2c16a86e866b01b2af787d67a5d5e41bee6c6009 Mon Sep 17 00:00:00 2001
From: Ben Knowles <benknowles@users.noreply.github.com>
Date: Mon, 25 Nov 2019 16:20:33 -0600
Subject: [PATCH 141/153] fix: parameterize link name when clearing timeline
 references

link_name could potentially include an apostrophe and cause:

`"mysql.err.ProgrammingError: (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax"`

Adjusted the query to parameterize it
---
 frappe/model/delete_doc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index af67350ab6..b518db0a28 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -333,7 +333,7 @@ def clear_references(doctype, reference_doctype, reference_name,
 
 def clear_timeline_references(link_doctype, link_name):
 	frappe.db.sql("""delete from `tabCommunication Link`
-		where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name='{1}'""".format(link_doctype, link_name)) # nosec
+		where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name=%s""".format(link_doctype), (link_name)) # nosec
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From 8552019be939ccbfb1f7608d0c719d7e0a31e54f Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Nov 2019 09:09:08 +0530
Subject: [PATCH 142/153] fix: Escape HTML for the value of field with
 fieldtype HTML Editor

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

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b980ae7684..9fd7aa3f36 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -577,7 +577,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 					data-filter="${fieldname},=,${value}">
 					${_value}
 				</a>`;
-			} else if (['Text Editor', 'Text', 'Small Text'].includes(df.fieldtype)) {
+			} else if (['Text Editor', 'Text', 'Small Text', 'HTML Editor'].includes(df.fieldtype)) {
 				html = `<span class="text-muted ellipsis">
 					${_value}
 				</span>`;
@@ -589,7 +589,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			}
 
 			return `<span class="ellipsis"
-				title="${__(label) + ': ' + _value}">
+				title="${__(label)}: ${escape(_value)}">
 				${html}
 			</span>`;
 		};

From 046c43e0b58d1d99bedbb703473ae86337466b93 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 26 Nov 2019 11:29:30 +0530
Subject: [PATCH 143/153] fix: Parameterize link_doctype

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

diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py
index b518db0a28..8ea12f2cec 100644
--- a/frappe/model/delete_doc.py
+++ b/frappe/model/delete_doc.py
@@ -332,8 +332,8 @@ def clear_references(doctype, reference_doctype, reference_name,
 		(reference_doctype, reference_name))
 
 def clear_timeline_references(link_doctype, link_name):
-	frappe.db.sql("""delete from `tabCommunication Link`
-		where `tabCommunication Link`.link_doctype='{0}' and `tabCommunication Link`.link_name=%s""".format(link_doctype), (link_name)) # nosec
+	frappe.db.sql("""DELETE FROM `tabCommunication Link`
+		WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name))
 
 def insert_feed(doc):
 	from frappe.utils import get_fullname

From 1e9de534837741b1ec09b12ec5c87e164ce28b48 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 26 Nov 2019 12:00:04 +0530
Subject: [PATCH 144/153] fix: don't save if not validated

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

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index a4cefd1d02..5f4f13f8f0 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -101,7 +101,9 @@ export default class WebForm extends frappe.ui.FieldGroup {
 		this.validate && this.validate();
 
 		// validation hack: get_values will check for missing data
-		super.get_values(this.allow_incomplete);
+		let isvalid = super.get_values(this.allow_incomplete);
+
+		if(!isvalid) return
 
 		if (window.saving) return;
 		let for_payment = Boolean(this.accept_payment && !this.doc.paid);

From 1c1b5aa4e7e89313ce51a48b93b9b5be0fd3fcf0 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 26 Nov 2019 12:00:37 +0530
Subject: [PATCH 145/153] style: linting fix

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

diff --git a/frappe/public/js/frappe/web_form/web_form.js b/frappe/public/js/frappe/web_form/web_form.js
index 5f4f13f8f0..f1d1d5076e 100644
--- a/frappe/public/js/frappe/web_form/web_form.js
+++ b/frappe/public/js/frappe/web_form/web_form.js
@@ -103,7 +103,7 @@ export default class WebForm extends frappe.ui.FieldGroup {
 		// validation hack: get_values will check for missing data
 		let isvalid = super.get_values(this.allow_incomplete);
 
-		if(!isvalid) return
+		if (!isvalid) return;
 
 		if (window.saving) return;
 		let for_payment = Boolean(this.accept_payment && !this.doc.paid);

From 121656d57921ff7e3dbcc8fe49888a272560ad10 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 26 Nov 2019 12:07:45 +0530
Subject: [PATCH 146/153] fix: Module view page issue (#8879)

-  Filter link based on the name of the link config,
because label can be different if user switches the language.
- Return the value instead of label while updating links for module
- Show Customize option in DeskModuleBox
 even if there are no links selected by the user.
---
 frappe/desk/moduleview.py                     | 13 ++++++----
 .../frappe/views/components/DeskModuleBox.vue |  2 +-
 .../frappe/views/components/DeskSection.vue   | 24 +++++++++++++------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/frappe/desk/moduleview.py b/frappe/desk/moduleview.py
index c5e5ea7c2b..0bad171b04 100644
--- a/frappe/desk/moduleview.py
+++ b/frappe/desk/moduleview.py
@@ -234,8 +234,11 @@ def get_config(app, module):
 		for item in section["items"]:
 			if item["type"]=="report" and item["name"] in disabled_reports:
 				continue
+			# some module links might not have name
+			if not item.get("name"):
+				item["name"] = item.get("label")
 			if not item.get("label"):
-				item["label"] = _(item["name"])
+				item["label"] = _(item.get("name"))
 			items.append(item)
 		section['items'] = items
 
@@ -297,7 +300,7 @@ def get_onboard_items(app, module):
 
 @frappe.whitelist()
 def get_links_for_module(app, module):
-	return [l.get('label') for l in get_links(app, module)]
+	return [{'value': l.get('name'), 'label': l.get('label')} for l in get_links(app, module)]
 
 def get_links(app, module):
 	try:
@@ -330,13 +333,13 @@ def get_desktop_settings():
 	def apply_user_saved_links(module):
 		module = frappe._dict(module)
 		all_links = get_links(module.app, module.module_name)
-		module_links_by_label = {}
+		module_links_by_name = {}
 		for link in all_links:
-			module_links_by_label[link['label']] = link
+			module_links_by_name[link['name']] = link
 
 		if module.module_name in user_saved_links_by_module:
 			user_links = frappe.parse_json(user_saved_links_by_module[module.module_name])
-			module.links = [module_links_by_label[l] for l in user_links if l in module_links_by_label]
+			module.links = [module_links_by_name[l] for l in user_links if l in module_links_by_name]
 
 		return module
 
diff --git a/frappe/public/js/frappe/views/components/DeskModuleBox.vue b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
index 355a447475..0d809508ee 100644
--- a/frappe/public/js/frappe/views/components/DeskModuleBox.vue
+++ b/frappe/public/js/frappe/views/components/DeskModuleBox.vue
@@ -63,7 +63,7 @@ export default {
       }
 	},
 	dropdown_links() {
-		return this.links.length > 0 ? this.links
+		return this.type === 'module' ? this.links
 			.filter(link => !link.hidden)
 			.concat([
 				{ label: __('Customize'), action: () => this.$emit('customize'), class: 'border-top' }
diff --git a/frappe/public/js/frappe/views/components/DeskSection.vue b/frappe/public/js/frappe/views/components/DeskSection.vue
index 9b24f75294..83670a3e82 100644
--- a/frappe/public/js/frappe/views/components/DeskSection.vue
+++ b/frappe/public/js/frappe/views/components/DeskSection.vue
@@ -26,7 +26,8 @@ export default {
 	},
 	data() {
 		return {
-			dragging: false
+			dragging: false,
+			fetched_module_links: {}
 		}
 	},
 	mounted() {
@@ -53,6 +54,7 @@ export default {
 			})
 		},
 		show_module_card_customize_dialog(module) {
+			const me = this;
 			const d = new frappe.ui.Dialog({
 				title: __('Customize Shortcuts'),
 				fields: [
@@ -60,11 +62,19 @@ export default {
 						label: __('Shortcuts'),
 						fieldname: 'links',
 						fieldtype: 'MultiSelectPills',
-						get_data() {
-							return frappe.call('frappe.desk.moduleview.get_links_for_module', {
-								app: module.app,
-								module: module.module_name,
-							}).then(r => r.message);
+						get_data: () => {
+							const module_links = me.fetched_module_links[module.module_name];
+							if (!module_links) {
+								return frappe.xcall('frappe.desk.moduleview.get_links_for_module', {
+									app: module.app,
+									module: module.module_name,
+								}).then(links => {
+									me.fetched_module_links[module.module_name] = links;
+									return links;
+								});
+							} else {
+								return module_links;
+							}
 						},
 						default: module.links.filter(l => !l.hidden).map(l => l.name)
 					}
@@ -73,7 +83,7 @@ export default {
 				primary_action: ({ links }) => {
 					frappe.call('frappe.desk.moduleview.update_links_for_module', {
 						module_name: module.module_name,
-						links
+						links: links || []
 					}).then(r => {
 						this.$emit('update-desktop-settings', r.message);
 					});

From 88fbf226194b9a0538090f5ffbbb0922940d7484 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 26 Nov 2019 14:05:07 +0530
Subject: [PATCH 147/153] Revert "fix(List): standard filters with default
 value are saved when changed"

---
 frappe/public/js/frappe/list/base_list.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 0ea9a801fb..2c5e1df1df 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -625,13 +625,17 @@ class FilterArea {
 					options = options.join("\n");
 				}
 			}
-
+			let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null;
+			if (['__default', '__global'].includes(default_value)) {
+				default_value = null;
+			}
 			return {
 				fieldtype: fieldtype,
 				label: __(df.label),
 				options: options,
 				fieldname: df.fieldname,
 				condition: condition,
+				default: default_value,
 				onchange: () => this.refresh_list_view(),
 				ignore_link_validation: fieldtype === 'Dynamic Link'
 			};
@@ -646,13 +650,6 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
-			let default_value = (field.df.fieldtype === 'Link') ?
-				frappe.defaults.get_user_default(field.df.options) : null;
-
-			if (['__default', '__global'].includes(default_value)) {
-				default_value = null;
-			}
-
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {
 					value = '%' + value + '%';
@@ -663,13 +660,6 @@ class FilterArea {
 					field.df.condition || '=',
 					value
 				]);
-			} else if (default_value) {
-				filters.push([
-					this.list_view.doctype,
-					field.df.fieldname,
-					field.df.condition,
-					default_value
-				]);
 			}
 		}
 

From 54f2da5a528af0f0f2f38d14752b0225a4221636 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 25 Nov 2019 19:29:14 +0530
Subject: [PATCH 148/153] fix(security): Make all Prepared Report file
 attachments private

---
 frappe/core/doctype/prepared_report/prepared_report.py |  3 ++-
 frappe/patches.txt                                     |  1 +
 .../make_all_prepared_report_attachments_private.py    | 10 ++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 frappe/patches/v11_0/make_all_prepared_report_attachments_private.py

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 071bb4afc0..c61e374744 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -85,7 +85,8 @@ def create_json_gz_file(data, dt, dn):
 		"file_name": json_filename,
 		"attached_to_doctype": dt,
 		"attached_to_name": dn,
-		"content": compressed_content
+		"content": compressed_content,
+		"is_private": 1
 	})
 	_file.save(ignore_permissions=True)
 
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 9473323059..1aa1d34e97 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -257,3 +257,4 @@ frappe.patches.v12_0.setup_tags
 frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable
 frappe.patches.v12_0.copy_to_parent_for_tags
 frappe.patches.v12_0.create_notification_settings_for_user
+frappe.patches.v11_0.make_all_prepared_report_attachments_private
diff --git a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
new file mode 100644
index 0000000000..2338d6f2e7
--- /dev/null
+++ b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
@@ -0,0 +1,10 @@
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	files = frappe.get_all("File", filters={"attached_to_doctype": "Prepared Report", "is_private": 0})
+	for file_name in files:
+		file_doc = frappe.get_doc("File", file_name)
+		file_doc.is_private = 1
+		file_doc.save()

From 2cb9f22e53c61ee30e76d518b5d435c74959fb92 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 26 Nov 2019 14:05:07 +0530
Subject: [PATCH 149/153] Revert "fix(List): standard filters with default
 value are saved when changed"

---
 frappe/public/js/frappe/list/base_list.js | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index 0ea9a801fb..2c5e1df1df 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -625,13 +625,17 @@ class FilterArea {
 					options = options.join("\n");
 				}
 			}
-
+			let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null;
+			if (['__default', '__global'].includes(default_value)) {
+				default_value = null;
+			}
 			return {
 				fieldtype: fieldtype,
 				label: __(df.label),
 				options: options,
 				fieldname: df.fieldname,
 				condition: condition,
+				default: default_value,
 				onchange: () => this.refresh_list_view(),
 				ignore_link_validation: fieldtype === 'Dynamic Link'
 			};
@@ -646,13 +650,6 @@ class FilterArea {
 		for (let key in fields_dict) {
 			let field = fields_dict[key];
 			let value = field.get_value();
-			let default_value = (field.df.fieldtype === 'Link') ?
-				frappe.defaults.get_user_default(field.df.options) : null;
-
-			if (['__default', '__global'].includes(default_value)) {
-				default_value = null;
-			}
-
 			if (value) {
 				if (field.df.condition === 'like' && !value.includes('%')) {
 					value = '%' + value + '%';
@@ -663,13 +660,6 @@ class FilterArea {
 					field.df.condition || '=',
 					value
 				]);
-			} else if (default_value) {
-				filters.push([
-					this.list_view.doctype,
-					field.df.fieldname,
-					field.df.condition,
-					default_value
-				]);
 			}
 		}
 

From 83124d8eee307f16a2dfa231d312f0dd4862a852 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Nov 2019 14:49:05 +0530
Subject: [PATCH 150/153] fix: Suppress unwanted quill warnings

---
 frappe/public/js/frappe/form/controls/comment.js                | 2 +-
 .../js/frappe/form/controls/quill-mention/blots/mention.js      | 2 +-
 .../js/frappe/form/controls/quill-mention/quill.mention.js      | 2 +-
 frappe/public/js/frappe/form/controls/text_editor.js            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js
index eba82fd7b2..a64df56bca 100644
--- a/frappe/public/js/frappe/form/controls/comment.js
+++ b/frappe/public/js/frappe/form/controls/comment.js
@@ -1,7 +1,7 @@
 import Quill from 'quill';
 import Mention from './quill-mention/quill.mention';
 
-Quill.register('modules/mention', Mention);
+Quill.register('modules/mention', Mention, true);
 
 frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
 	make_wrapper() {
diff --git a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
index 26485adcc0..1c5787f854 100644
--- a/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
+++ b/frappe/public/js/frappe/form/controls/quill-mention/blots/mention.js
@@ -35,4 +35,4 @@ MentionBlot.blotName = 'mention';
 MentionBlot.tagName = 'span';
 MentionBlot.className = 'mention';
 
-Quill.register(MentionBlot);
+Quill.register(MentionBlot, true);
diff --git a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
index 0b50ffd758..80ee5a6c6d 100644
--- a/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
+++ b/frappe/public/js/frappe/form/controls/quill-mention/quill.mention.js
@@ -361,6 +361,6 @@ class Mention {
   }
 }
 
-Quill.register('modules/mention', Mention);
+Quill.register('modules/mention', Mention, true);
 
 export default Mention;
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 1b9078ae03..b35c92c1ae 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -36,7 +36,7 @@ class MyLink extends Link {
 	}
 }
 
-Quill.register(MyLink);
+Quill.register(MyLink, true);
 
 // image uploader
 const Uploader = Quill.import('modules/uploader');

From 130b0f6cfd9b79781f59a37fe7cb777e05fe4f4d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 25 Nov 2019 09:09:08 +0530
Subject: [PATCH 151/153] fix: Escape HTML for the value of field with
 fieldtype HTML Editor

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

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b980ae7684..9fd7aa3f36 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -577,7 +577,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 					data-filter="${fieldname},=,${value}">
 					${_value}
 				</a>`;
-			} else if (['Text Editor', 'Text', 'Small Text'].includes(df.fieldtype)) {
+			} else if (['Text Editor', 'Text', 'Small Text', 'HTML Editor'].includes(df.fieldtype)) {
 				html = `<span class="text-muted ellipsis">
 					${_value}
 				</span>`;
@@ -589,7 +589,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			}
 
 			return `<span class="ellipsis"
-				title="${__(label) + ': ' + _value}">
+				title="${__(label)}: ${escape(_value)}">
 				${html}
 			</span>`;
 		};

From 747fab000396414ee0ed1523b8e1a587bde2a87d Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 26 Nov 2019 15:43:01 +0550
Subject: [PATCH 152/153] bumped to version 12.0.20

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 74a60794d8..18ec5c0ee7 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -23,7 +23,7 @@ if sys.version[0] == '2':
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.19'
+__version__ = '12.0.20'
 __title__ = "Frappe Framework"
 
 local = Local()

From 333ea79d2d1043205fd794d6d648c9b79adda269 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 26 Nov 2019 18:32:36 +0530
Subject: [PATCH 153/153] fix(patch): Handle failures in while making Prepared
 Report attachments private

---
 .../prepared_report/prepared_report.py        |  2 +-
 frappe/patches.txt                            |  2 +-
 ...all_prepared_report_attachments_private.py | 19 ++++++++++++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index c61e374744..bc9a1fcdcd 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -25,7 +25,7 @@ class PreparedReport(Document):
 		enqueue(run_background, prepared_report=self.name, timeout=6000)
 
 	def on_trash(self):
-		remove_all("PreparedReport", self.name, from_delete=True)
+		remove_all("Prepared Report", self.name)
 
 
 def run_background(prepared_report):
diff --git a/frappe/patches.txt b/frappe/patches.txt
index 1aa1d34e97..5dbde7ed40 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -257,4 +257,4 @@ frappe.patches.v12_0.setup_tags
 frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable
 frappe.patches.v12_0.copy_to_parent_for_tags
 frappe.patches.v12_0.create_notification_settings_for_user
-frappe.patches.v11_0.make_all_prepared_report_attachments_private
+frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26
diff --git a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
index 2338d6f2e7..dd212d157e 100644
--- a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
+++ b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py
@@ -3,8 +3,17 @@ import frappe
 
 
 def execute():
-	files = frappe.get_all("File", filters={"attached_to_doctype": "Prepared Report", "is_private": 0})
-	for file_name in files:
-		file_doc = frappe.get_doc("File", file_name)
-		file_doc.is_private = 1
-		file_doc.save()
+	files = frappe.get_all("File", fields=["name", "attached_to_name"], filters={"attached_to_doctype": "Prepared Report", "is_private": 0})
+	for file_dict in files:
+		# For some reason Prepared Report doc might not exist, check if it exists first
+		if frappe.db.exists("Prepared Report", file_dict.attached_to_name):
+			try:
+				file_doc = frappe.get_doc("File", file_dict.name)
+				file_doc.is_private = 1
+				file_doc.save()
+			except Exception:
+				# File might not exist on the file system in that case delete both Prepared Report and File doc
+				frappe.delete_doc("Prepared Report", file_dict.attached_to_name)
+		else:
+			# If Prepared Report doc doesn't exist then the file doc is useless. Delete it.
+			frappe.delete_doc("File", file_dict.name)