From 96f88cf46bc373d5a91999619d916df8e962faee Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 31 Oct 2018 16:49:03 +0530
Subject: [PATCH 01/64] fix(filters): dont validate email in filters

---
 frappe/public/js/frappe/form/controls/data.js | 3 +++
 frappe/public/js/frappe/ui/filters/filter.js  | 4 +++-
 frappe/templates/includes/list/filters.js     | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js
index aa78f2df8e..2e83e3b612 100644
--- a/frappe/public/js/frappe/form/controls/data.js
+++ b/frappe/public/js/frappe/form/controls/data.js
@@ -85,6 +85,9 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({
 		return val==null ? "" : val;
 	},
 	validate: function(v) {
+		if(this.df.is_filter) {
+			return v;
+		}
 		if(this.df.options == 'Phone') {
 			if(v+''=='') {
 				return '';
diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 21fc8de216..1cbbc5fc2d 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -162,7 +162,9 @@ frappe.ui.Filter = class {
 		let df = copy_dict(original_docfield);
 
 		// filter field shouldn't be read only or hidden
-		df.read_only = 0; df.hidden = 0;
+		df.read_only = 0;
+		df.hidden = 0;
+		df.is_filter = true;
 
 		let c = condition ? condition : this.utils.get_default_condition(df);
 		this.set_condition(c);
diff --git a/frappe/templates/includes/list/filters.js b/frappe/templates/includes/list/filters.js
index c5a1109ab1..755077dd32 100644
--- a/frappe/templates/includes/list/filters.js
+++ b/frappe/templates/includes/list/filters.js
@@ -20,6 +20,7 @@ function setup_list_filters() {
 					fieldtype: df.fieldtype,
 					label: df.label,
 					options: df.options,
+					is_filter: true,
 					change: (e) => {
 						const query_params = Object.assign(frappe.utils.get_query_params(), {
 							[df.fieldname]: f.get_value()

From e0cf3f367b9334951f32744698768d5c51a5dcd0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 1 Nov 2018 19:06:30 +0530
Subject: [PATCH 02/64] fix(Quill): Add data-row attr to whitelist

- data-row attribute is added by Quill for retaining table structure
---
 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 f788004be4..fe06ec7c43 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -158,7 +158,7 @@ acceptable_attributes = [
 	'step', 'style', 'summary', 'suppress', 'tabindex', 'target',
 	'template', 'title', 'toppadding', 'type', 'unselectable', 'usemap',
 	'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
-	'width', 'wrap', 'xml:lang'
+	'width', 'wrap', 'xml:lang', 'data-row'
 ]
 
 mathml_attributes = [

From 10c2e8f262eafb8caa260f70d783910a9bf46f25 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 1 Nov 2018 19:38:07 +0530
Subject: [PATCH 03/64] fix: Only allow images in Attach Image

---
 .../web_form/edit_profile/edit_profile.json   | 41 ++++++++++++++-----
 .../js/frappe/form/controls/attach_image.js   |  4 ++
 frappe/public/js/frappe/upload.js             |  5 +++
 .../web_form_field/web_form_field.json        |  8 ++--
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/frappe/core/web_form/edit_profile/edit_profile.json b/frappe/core/web_form/edit_profile/edit_profile.json
index 02b0e0363f..1752284845 100644
--- a/frappe/core/web_form/edit_profile/edit_profile.json
+++ b/frappe/core/web_form/edit_profile/edit_profile.json
@@ -18,13 +18,14 @@
  "is_standard": 1, 
  "login_required": 1, 
  "max_attachment_size": 0, 
- "modified": "2018-06-12 22:24:21.913166", 
+ "modified": "2018-11-01 19:35:43.552429", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "edit-profile", 
  "owner": "Administrator", 
  "published": 1, 
  "route": "update-profile", 
+ "show_in_grid": 0, 
  "show_sidebar": 1, 
  "sidebar_items": [], 
  "success_message": "Profile updated successfully.", 
@@ -32,6 +33,7 @@
  "title": "Update Profile", 
  "web_form_fields": [
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "first_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -39,9 +41,11 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 1
+   "reqd": 1, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "middle_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -49,9 +53,11 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "last_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -59,29 +65,35 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "description": "", 
    "fieldname": "user_image", 
-   "fieldtype": "Attach", 
+   "fieldtype": "Attach Image", 
    "hidden": 0, 
    "label": "User Image", 
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "label": "More Information", 
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "phone", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -89,9 +101,11 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "mobile_no", 
    "fieldtype": "Data", 
    "hidden": 0, 
@@ -99,9 +113,11 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "description": "", 
    "fieldname": "language", 
    "fieldtype": "Link", 
@@ -111,9 +127,11 @@
    "max_value": 0, 
    "options": "Language", 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }, 
   {
+   "allow_read_on_all_link_options": 0, 
    "fieldname": "roles", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -122,7 +140,8 @@
    "max_value": 0, 
    "options": "Has Role", 
    "read_only": 0, 
-   "reqd": 0
+   "reqd": 0, 
+   "show_in_filter": 0
   }
  ]
 }
\ No newline at end of file
diff --git a/frappe/public/js/frappe/form/controls/attach_image.js b/frappe/public/js/frappe/form/controls/attach_image.js
index cf332d3d2a..4691064d8f 100644
--- a/frappe/public/js/frappe/form/controls/attach_image.js
+++ b/frappe/public/js/frappe/form/controls/attach_image.js
@@ -62,5 +62,9 @@ frappe.ui.form.ControlAttachImage = frappe.ui.form.ControlAttach.extend({
 			this.img_container.toggle(false);
 			this.remove_image_link.toggle(false);
 		}
+	},
+	set_upload_options() {
+		this._super();
+		this.upload_options.restrict_to_images = true;
 	}
 });
diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index bdc8b41316..ec4394c718 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -41,6 +41,11 @@ frappe.upload = {
 		$upload.find(".btn-browse").on("click",
 			function() { $file_input.click(); });
 
+		// restrict to images
+		if (opts.restrict_to_images) {
+			$file_input.prop('accept', 'image/*');
+		}
+
 		// dropzone upload
 		const $dropzone = $('<div style="padding: 20px 10px 0px 10px;"/>');
 		new frappe.ui.DropZone($dropzone, {
diff --git a/frappe/website/doctype/web_form_field/web_form_field.json b/frappe/website/doctype/web_form_field/web_form_field.json
index 00a0afda33..6f4dd2f03c 100644
--- a/frappe/website/doctype/web_form_field/web_form_field.json
+++ b/frappe/website/doctype/web_form_field/web_form_field.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
@@ -61,7 +62,7 @@
    "label": "Fieldtype", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Attach\nCheck\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break", 
+   "options": "Attach\nAttach Image\nCheck\nData\nDate\nDatetime\nFloat\nHTML\nInt\nLink\nSelect\nSmall Text\nText\nText Editor\nTable\nSection Break\nColumn Break\nPage Break", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -554,7 +555,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-09-20 10:01:13.346598", 
+ "modified": "2018-11-01 19:35:17.742547", 
  "modified_by": "Administrator", 
  "module": "Website", 
  "name": "Web Form Field", 
@@ -568,5 +569,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file

From 0aee7afb876d2d79ed04154536ff1da58e6cf5fc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 2 Nov 2018 12:19:25 +0530
Subject: [PATCH 04/64] Fix permission error while import (#6385)

Custom permission should apply while import
or else import of doctype with custom roles fails
---
 frappe/model/meta.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index 6b9654c1f4..b502c5665f 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -320,7 +320,7 @@ class Meta(Document):
 
 	def set_custom_permissions(self):
 		'''Reset `permissions` with Custom DocPerm if exists'''
-		if frappe.flags.in_patch or frappe.flags.in_import or frappe.flags.in_install:
+		if frappe.flags.in_patch or frappe.flags.in_install:
 			return
 
 		if not self.istable and self.name not in ('DocType', 'DocField', 'DocPerm',

From 731d12238eec11209c2d82f8497ecd9631c366f9 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 2 Nov 2018 15:18:47 +0530
Subject: [PATCH 05/64] Bredcrumb issue in the file

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

diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index d5e76fca01..86530e166d 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -38,9 +38,10 @@ class File(NestedSet):
 		self.set_folder_name()
 
 	def get_name_based_on_parent_folder(self):
-		path = get_breadcrumbs(self.folder)
-		folder_name = frappe.get_value("File", self.folder, "file_name")
-		return "/".join([d.file_name for d in path] + [folder_name, self.file_name])
+		if self.folder:
+			path = get_breadcrumbs(self.folder)
+			folder_name = frappe.get_value("File", self.folder, "file_name")
+			return "/".join([d.file_name for d in path] + [folder_name, self.file_name])
 
 	def autoname(self):
 		"""Set name for folder"""

From 6bbb84f9c3fa7f6bb3c8de1cbf2242e82e637e8c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Sat, 3 Nov 2018 11:52:09 +0530
Subject: [PATCH 06/64] XSS fixes (#6386)

* fix(XSS): Sanitise page name before routing

* fix(XSS): Sanitise tag value before saving it
---
 frappe/public/js/frappe/router.js  | 3 ++-
 frappe/public/js/frappe/ui/tags.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js
index dbf48ee2e3..4f6b47fb32 100644
--- a/frappe/public/js/frappe/router.js
+++ b/frappe/public/js/frappe/router.js
@@ -48,7 +48,8 @@ frappe.route = function() {
 		frappe.view_factory[route[0]].show();
 	} else {
 		// show page
-		frappe.views.pageview.show(route[0]);
+		const route_name = frappe.utils.xss_sanitise(route[0]);
+		frappe.views.pageview.show(route_name);
 	}
 
 
diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js
index b3ae539809..c68f33a869 100644
--- a/frappe/public/js/frappe/ui/tags.js
+++ b/frappe/public/js/frappe/ui/tags.js
@@ -36,7 +36,8 @@ frappe.ui.Tags = class {
 	bind() {
 		this.$input.keypress((e) => {
 			if(e.which == 13 || e.keyCode == 13) {
-				this.addTag(this.$input.val());
+				const tagValue = frappe.utils.xss_sanitise(this.$input.val());
+				this.addTag(tagValue);
 				this.$input.val('');
 			}
 		});

From 15d3f4660ebf91e54aff15cbf7611ab0e603ebc0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 5 Nov 2018 10:07:16 +0530
Subject: [PATCH 07/64] fix(security): pop ignore_permissions arg from
 whitelisted method

---
 frappe/model/db_query.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 1d241db443..f2da6e0b31 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -619,6 +619,7 @@ def get_order_by(doctype, meta):
 def get_list(doctype, *args, **kwargs):
 	'''wrapper for DatabaseQuery'''
 	kwargs.pop('cmd', None)
+	kwargs.pop('ignore_permissions', None)
 	return DatabaseQuery(doctype).execute(None, *args, **kwargs)
 
 def is_parent_only_filter(doctype, filters):

From 2ead22209004bb1882bd0cd3f67993dcea7192ca Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 5 Nov 2018 10:49:18 +0530
Subject: [PATCH 08/64] fix(email): Email status changes to Read (#6396)

The email recieved template was in unsubscribe email. Hence it
didn't used to function in case the emails were sent from DocTypes
like Issue, wherein the unsubscribe email template is not used.
Moved it to email_footer template.

Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
---
 frappe/email/queue.py                                  | 5 +----
 frappe/public/js/frappe/form/footer/timeline_item.html | 2 +-
 frappe/templates/emails/email_footer.html              | 6 +++++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/email/queue.py b/frappe/email/queue.py
index 9fbf01eb60..c06a7fb79b 100755
--- a/frappe/email/queue.py
+++ b/frappe/email/queue.py
@@ -276,10 +276,7 @@ def get_unsubscribe_message(unsubscribe_message, expose_recipients):
 			target="_blank">{0}</a>'''.format(_('Unsubscribe'))
 		unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link)
 
-	html = """<div class="email-pixel">
-			<!--email open check-->
-		</div>
-		<div class="email-unsubscribe">
+	html = """<div class="email-unsubscribe">
 			<!--cc message-->
 			<div>
 				{0}
diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html
index c25fb696b4..92f039b4e4 100755
--- a/frappe/public/js/frappe/form/footer/timeline_item.html
+++ b/frappe/public/js/frappe/form/footer/timeline_item.html
@@ -67,7 +67,7 @@
 									var indicator_class = "green";
 								} else if (data.delivery_status === "Sending") {
 									var indicator_class = "orange";
-								} else if (in_list("Opened", "Read", data.delivery_status)) {
+								} else if (in_list(["Opened", "Read"], data.delivery_status)) {
 									var indicator_class = "blue";
 								} else {
 									var indicator_class = "red";
diff --git a/frappe/templates/emails/email_footer.html b/frappe/templates/emails/email_footer.html
index 5352d817d5..4ad6cb23b5 100644
--- a/frappe/templates/emails/email_footer.html
+++ b/frappe/templates/emails/email_footer.html
@@ -17,6 +17,10 @@
 
 	<!--unsubscribe link here-->
 
+	<div class="email-pixel">
+		<!--email open check-->
+	</div>
+
 	<!-- default_mail_footer -->
 	{% if default_mail_footer %}
 	<div class="default-mail-footer">
@@ -26,4 +30,4 @@
 	</div>
 	{% endif %}
 
-</div>
\ No newline at end of file
+</div>

From 856a721073122a8e487a13ba50b97a8b90916e12 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 5 Nov 2018 10:51:57 +0530
Subject: [PATCH 09/64] [fix] sql injection fix (#6390)

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

diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index f2da6e0b31..d561517558 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -192,8 +192,7 @@ class DatabaseQuery(object):
 		'''
 
 		sub_query_regex = re.compile("^.*[,();].*")
-		blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case',
-			'from', 'group', 'order', 'by']
+		blacklisted_keywords = ['select', 'create', 'insert', 'delete', 'drop', 'update', 'case']
 		blacklisted_functions = ['concat', 'concat_ws', 'if', 'ifnull', 'nullif', 'coalesce',
 			'connection_id', 'current_user', 'database', 'last_insert_id', 'session_user',
 			'system_user', 'user', 'version']

From 8d8154b0d7057e794b81a587507eaee4537da6c6 Mon Sep 17 00:00:00 2001
From: Saif <saifi0102@gmail.com>
Date: Mon, 5 Nov 2018 10:30:55 +0500
Subject: [PATCH 10/64] Allow selecting page orientation for print view of
 report (#6393)

---
 frappe/public/js/frappe/form/print.js            | 16 ++++++----------
 .../js/frappe/views/reports/query_report.js      |  2 ++
 frappe/public/js/lib/microtemplate.js            | 10 ++++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 5435b724b8..3847801cd0 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -299,18 +299,14 @@ frappe.ui.get_print_settings = function (pdf, callback, letter_head) {
 		depends_on: "with_letter_head",
 		options: $.map(frappe.boot.letter_heads, function (i, d) { return d }),
 		default: letter_head || default_letter_head
+	}, {
+		fieldtype: "Select",
+		fieldname: "orientation",
+		label: __("Orientation"),
+		options: "Landscape\nPortrait",
+		default: "Landscape"
 	}];
 
-	if (pdf) {
-		columns.push({
-			fieldtype: "Select",
-			fieldname: "orientation",
-			label: __("Orientation"),
-			options: "Landscape\nPortrait",
-			default: "Landscape"
-		})
-	}
-
 	frappe.prompt(columns, function (data) {
 		var data = $.extend(print_settings, data);
 		if (!data.with_letter_head) {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 1e0acd132e..e0ab3d8ddb 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -664,12 +664,14 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 	print_report(print_settings) {
 		const custom_format = this.report_settings.html_format || null;
 		const filters_html = this.get_filters_html_for_print();
+		const landscape = print_settings.orientation == 'Landscape';
 
 		frappe.render_grid({
 			template: custom_format,
 			title: __(this.report_name),
 			subtitle: filters_html,
 			print_settings: print_settings,
+			landscape: landscape,
 			filters: this.get_filter_values(),
 			data: custom_format ? this.data : this.get_data_for_print(),
 			columns: custom_format ? this.columns : this.get_columns_for_print(),
diff --git a/frappe/public/js/lib/microtemplate.js b/frappe/public/js/lib/microtemplate.js
index bfdf103f78..d352836018 100644
--- a/frappe/public/js/lib/microtemplate.js
+++ b/frappe/public/js/lib/microtemplate.js
@@ -96,10 +96,12 @@ frappe.render_grid = function(opts) {
 	}
 
 	// show landscape view if columns more than 10
-	if (opts.columns && opts.columns.length > 10) {
-		opts.landscape = true;
-	} else {
-		opts.landscape = false;
+	if (opts.landscape == null) {
+		if(opts.columns && opts.columns.length > 10) {
+			opts.landscape = true;
+		} else {
+			opts.landscape = false;
+		}
 	}
 
 	// render content

From 2521e306a4d2013d4a4c55cef6047bf8ac0416ac Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 5 Nov 2018 11:01:24 +0530
Subject: [PATCH 11/64] [Fix] Not able to export sales analytics report (#6369)

---
 frappe/public/js/frappe/misc/tools.js                | 4 ++--
 frappe/public/js/frappe/views/reports/grid_report.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/misc/tools.js b/frappe/public/js/frappe/misc/tools.js
index df07b4d7f3..27436facd2 100644
--- a/frappe/public/js/frappe/misc/tools.js
+++ b/frappe/public/js/frappe/misc/tools.js
@@ -97,8 +97,8 @@ frappe.slickgrid_tools = {
 		var res = [];
 		var col_map = $.map(columns, function(v) { return v.field; });
 
-		for (var i=0, len=dataView.getLength(); i<len; i++) {
-			var d = dataView.getItem(i);
+		for (var i=0, len=dataView.length; i<len; i++) {
+			var d = dataView[i];
 			var row = [];
 			$.each(col_map, function(i, col) {
 				var val = d[col];
diff --git a/frappe/public/js/frappe/views/reports/grid_report.js b/frappe/public/js/frappe/views/reports/grid_report.js
index b556288be8..f5142c117e 100644
--- a/frappe/public/js/frappe/views/reports/grid_report.js
+++ b/frappe/public/js/frappe/views/reports/grid_report.js
@@ -830,7 +830,7 @@ frappe.views.TreeGridReport = frappe.views.GridReportWithPlot.extend({
 			var with_groups = $(msgbox.body).find("[name='with_groups']").prop("checked");
 			var with_ledgers = $(msgbox.body).find("[name='with_ledgers']").prop("checked");
 
-			var data = frappe.slickgrid_tools.get_view_data(me.columns, me.dataView,
+			var data = frappe.slickgrid_tools.get_view_data(me.columns, me.data,
 				function(row, item) {
 					if(with_groups) {
 						// add row

From e6b070e6119cbf9703affa9c2d214d07fc90cfd3 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 5 Nov 2018 11:01:59 +0530
Subject: [PATCH 12/64] refactor: Deduplication (#6347)

* refactor: Deduplicate setup_perms_for

`setup_perms_for` has two identical definitions in

frappe/utils/reset_doc.py and
frappe/patches/v7_2/setup_custom_perms.py

Remove definition from setup_custom_perms.py, use import instead

* refactor: Deduplicate get_parent_doc and set_timeline_doc

`get_parent_doc` and `set_timeline_doc` are accidentally defined twice in

frappe/core/utils.py and
frappe/core/doctype/communication/communication.py

Remove definition from communication.py, use import instead

* fix(python3): Replace urlopen import with six.moves.urllib.request.urlopen
---
 .../doctype/communication/communication.py    | 29 +------------------
 frappe/patches/v7_2/setup_custom_perms.py     | 28 +-----------------
 frappe/utils/reset_doc.py                     |  5 ++--
 3 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/frappe/core/doctype/communication/communication.py b/frappe/core/doctype/communication/communication.py
index ceb6e3557d..2585af3479 100644
--- a/frappe/core/doctype/communication/communication.py
+++ b/frappe/core/doctype/communication/communication.py
@@ -10,6 +10,7 @@ from frappe.core.doctype.communication.comment import (notify_mentions,
 	update_comment_in_doc, on_trash)
 from frappe.core.doctype.communication.email import (validate_email,
 	notify, _notify, update_parent_mins_to_first_response)
+from frappe.core.utils import get_parent_doc, set_timeline_doc
 from frappe.utils.bot import BotReply
 from frappe.utils import parse_addr
 
@@ -241,34 +242,6 @@ class Communication(Document):
 			if commit:
 				frappe.db.commit()
 
-def get_parent_doc(doc):
-	"""Returns document of `reference_doctype`, `reference_doctype`"""
-	if not hasattr(doc, "parent_doc"):
-		if doc.reference_doctype and doc.reference_name:
-			doc.parent_doc = frappe.get_doc(doc.reference_doctype, doc.reference_name)
-		else:
-			doc.parent_doc = None
-	return doc.parent_doc
-
-def set_timeline_doc(doc):
-	"""Set timeline_doctype and timeline_name"""
-	parent_doc = get_parent_doc(doc)
-	if (doc.timeline_doctype and doc.timeline_name) or not parent_doc:
-		return
-
-	timeline_field = parent_doc.meta.timeline_field
-	if not timeline_field:
-		return
-
-	doctype = parent_doc.meta.get_link_doctype(timeline_field)
-	name = parent_doc.get(timeline_field)
-
-	if doctype and name:
-		doc.timeline_doctype = doctype
-		doc.timeline_name = name
-
-	else:
-		return
 
 def on_doctype_update():
 	"""Add indexes in `tabCommunication`"""
diff --git a/frappe/patches/v7_2/setup_custom_perms.py b/frappe/patches/v7_2/setup_custom_perms.py
index a2e32379ce..f057e7aa0d 100644
--- a/frappe/patches/v7_2/setup_custom_perms.py
+++ b/frappe/patches/v7_2/setup_custom_perms.py
@@ -1,6 +1,7 @@
 import frappe
 from frappe.permissions import setup_custom_perms
 from frappe.core.page.permission_manager.permission_manager import get_standard_permissions
+from frappe.utils.reset_doc import setup_perms_for
 
 '''
 Copy DocPerm to Custom DocPerm where permissions are set differently
@@ -9,30 +10,3 @@ Copy DocPerm to Custom DocPerm where permissions are set differently
 def execute():
 	for d in frappe.db.get_all('DocType', dict(istable=0, issingle=0, custom=0)):
 		setup_perms_for(d.name)
-
-def setup_perms_for(doctype):
-	perms = frappe.get_all('DocPerm', fields='*', filters=dict(parent=doctype), order_by='idx asc')
-	# get default perms
-	try:
-		standard_perms = get_standard_permissions(doctype)
-	except (IOError, KeyError):
-		# no json file, doctype no longer exists!
-		return
-
-	same = True
-	if len(standard_perms) != len(perms):
-		same = False
-
-	else:
-		for i, p in enumerate(perms):
-			standard = standard_perms[i]
-			for fieldname in frappe.get_meta('DocPerm').get_fieldnames_with_value():
-				if p.get(fieldname) != standard.get(fieldname):
-					same = False
-					break
-
-			if not same:
-				break
-
-	if not same:
-		setup_custom_perms(doctype)
diff --git a/frappe/utils/reset_doc.py b/frappe/utils/reset_doc.py
index cec29a1cfa..ef20b0157b 100755
--- a/frappe/utils/reset_doc.py
+++ b/frappe/utils/reset_doc.py
@@ -1,5 +1,5 @@
 import frappe
-import json, urllib2, os
+import json, os
 from frappe.modules import scrub, get_module_path, load_doctype_module, utils
 from frappe.custom.doctype.customize_form.customize_form import doctype_properties, docfield_properties
 from frappe.custom.doctype.property_setter.property_setter import make_property_setter
@@ -7,6 +7,7 @@ from frappe.custom.doctype.custom_field.custom_field import create_custom_field
 from frappe.modules.import_file import get_file_path, read_doc_from_file
 from frappe.core.page.permission_manager.permission_manager import get_standard_permissions
 from frappe.permissions import setup_custom_perms
+from six.moves.urllib.request import urlopen
 
 branch = 'develop'
 
@@ -28,7 +29,7 @@ def reset_doc(doctype):
 	try:
 		git_link = '/'.join(['https://raw.githubusercontent.com/frappe',\
 			app, branch, doc_path.split('apps/'+app)[1]])
-		original_file = urllib2.urlopen(git_link).read()
+		original_file = urlopen(git_link).read()
 	except:
 		print('Did not find {0} in {1}'.format(doctype, app))
 		return

From 54baae96f95971e97fa11a2f61a1523a2fd4c027 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 5 Nov 2018 06:37:45 +0000
Subject: [PATCH 13/64] bumped to version 10.1.59

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 181f236692..2c6cf49f86 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.58'
+__version__ = '10.1.59'
 __title__ = "Frappe Framework"
 
 local = Local()

From 2009918efa670ffa64a7844fa73cc862c75e432c Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 5 Nov 2018 06:46:35 +0000
Subject: [PATCH 14/64] bumped to version 11.0.3-beta.20

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index b817f0ec82..f38f8b1ad8 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '11.x.x-develop'
-staging_version = '11.0.3-beta.19'
+staging_version = '11.0.3-beta.20'
 
 app_email = "info@frappe.io"
 

From a34eab214094d25db787f2076b6a2afc1bad89c4 Mon Sep 17 00:00:00 2001
From: Ranjith Kurungadam <rkurungadam@gmail.com>
Date: Mon, 5 Nov 2018 12:27:21 +0530
Subject: [PATCH 15/64] Add Bcc in Notification (#6392)

* Notification - add Bcc

* remove Bcc from email header

* feat: Bcc in Notification
---
 .../doctype/notification/notification.json    |  2 +-
 .../doctype/notification/notification.py      | 31 ++++++++++------
 .../notification_recipient.json               | 37 ++++++++++++++++++-
 frappe/email/email_body.py                    |  1 -
 4 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/frappe/email/doctype/notification/notification.json b/frappe/email/doctype/notification/notification.json
index 845af2b8f1..692feb08de 100644
--- a/frappe/email/doctype/notification/notification.json
+++ b/frappe/email/doctype/notification/notification.json
@@ -1124,7 +1124,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2018-08-29 14:32:02.179599", 
+ "modified": "2018-10-05 14:32:02.179599", 
  "modified_by": "Administrator", 
  "module": "Email", 
  "name": "Notification", 
diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py
index 4fb40b2694..a3f43f716d 100644
--- a/frappe/email/doctype/notification/notification.py
+++ b/frappe/email/doctype/notification/notification.py
@@ -133,14 +133,16 @@ def get_context(context):
 			subject = frappe.render_template(self.subject, context)
 
 		attachments = self.get_attachment(doc)
-		recipients = self.get_list_of_recipients(doc, context)
+		recipients, cc, bcc = self.get_list_of_recipients(doc, context)
 		sender = None
 		if self.sender and self.sender_email:
 			sender = formataddr((self.sender, self.sender_email))
-
-		frappe.sendmail(recipients=recipients, subject=subject,
-			sender=sender,
-			message= frappe.render_template(self.message, context),
+		frappe.sendmail(recipients = recipients,
+			subject = subject,
+			sender = sender,
+			cc = cc,
+			bcc = bcc,
+			message = frappe.render_template(self.message, context),
 			reference_doctype = doc.doctype,
 			reference_name = doc.name,
 			attachments = attachments,
@@ -156,6 +158,8 @@ def get_context(context):
 
 	def get_list_of_recipients(self, doc, context):
 		recipients = []
+		cc = []
+		bcc = []
 		for recipient in self.recipients:
 			if recipient.condition:
 				if not frappe.safe_eval(recipient.condition, None, context):
@@ -173,7 +177,14 @@ def get_context(context):
 
 			if recipient.cc:
 				recipient.cc = recipient.cc.replace(",", "\n")
-				recipients = recipients + recipient.cc.split("\n")
+				cc = cc + recipient.cc.split("\n")
+
+			if recipient.bcc and "{" in recipient.bcc:
+				recipient.bcc = frappe.render_template(recipient.bcc, context)
+
+			if recipient.bcc:
+				recipient.bcc = recipient.bcc.replace(",", "\n")
+				bcc = bcc + recipient.bcc.split("\n")
 
 			#For sending emails to specified role
 			if recipient.email_by_role:
@@ -182,10 +193,9 @@ def get_context(context):
 				for email in emails:
 					recipients = recipients + email.split("\n")
 
-		if not recipients:
-			return
-
-		return list(set(recipients))
+		if not recipients and not cc and not bcc:
+			return None, None, None
+		return list(set(recipients)), list(set(cc)), list(set(bcc))
 
 	def get_attachment(self, doc):
 		""" check print settings are attach the pdf """
@@ -285,7 +295,6 @@ def evaluate_alert(doc, alert, event):
 			# reload the doc for the latest values & comments,
 			# except for validate type event.
 			doc = frappe.get_doc(doc.doctype, doc.name)
-
 		alert.send(doc)
 	except TemplateError:
 		frappe.throw(_("Error while evaluating Notification {0}. Please fix your template.").format(alert))
diff --git a/frappe/email/doctype/notification_recipient/notification_recipient.json b/frappe/email/doctype/notification_recipient/notification_recipient.json
index e79af0cc99..ec35dccc63 100644
--- a/frappe/email/doctype/notification_recipient/notification_recipient.json
+++ b/frappe/email/doctype/notification_recipient/notification_recipient.json
@@ -110,6 +110,38 @@
    "translatable": 0, 
    "unique": 0
   }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "bcc", 
+   "fieldtype": "Code", 
+   "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": "BCC", 
+   "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
+  }, 
   {
    "allow_bulk_edit": 0, 
    "allow_in_quick_entry": 0, 
@@ -153,7 +185,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2018-05-31 15:44:44.161293", 
+ "modified": "2018-09-03 18:37:57.043251", 
  "modified_by": "Administrator", 
  "module": "Email", 
  "name": "Notification Recipient", 
@@ -167,5 +199,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_changes": 0, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 8ab7ae5c85..f41e6d76c9 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -209,7 +209,6 @@ class EMail:
 			"To":             ', '.join(self.recipients) if self.expose_recipients=="header" else "<!--recipient-->",
 			"Date":           email.utils.formatdate(),
 			"Reply-To":       self.reply_to if self.reply_to else None,
-			"Bcc":            ', '.join(self.bcc) if self.bcc else None,
 			"CC":             ', '.join(self.cc) if self.cc and self.expose_recipients=="header" else None,
 			'X-Frappe-Site':  get_url(),
 		}

From c164aac93302b1ffa9d8459fbdbaff0b24d08482 Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Mon, 5 Nov 2018 12:53:34 +0530
Subject: [PATCH 16/64] Datatable Upgrade

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

diff --git a/package.json b/package.json
index 984b382c6f..2516080f38 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "awesomplete": "^1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^1.5.0",
+    "frappe-datatable": "^1.5.3",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",
diff --git a/yarn.lock b/yarn.lock
index cff0ffc035..9ac6f4e30d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1219,10 +1219,10 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
-frappe-datatable@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.0.tgz#eea78a87e799876b71e58dbdc128fd9badb5e2c6"
-  integrity sha512-h9yP33UqRcEfcs5FVSFFUigya/KT5qFrB1vOqayhxqPoxdVH2pGKi+Qh/BO5KRNd6uVk8rVwXMhA8A9TU+2uEg==
+frappe-datatable@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.3.tgz#f60e619a92b77b60cdbb8376e521398a2933995a"
+  integrity sha512-1sEcnOUxN+vI5BgrPJPNJNc72kAX4RQRNBJjR2RWVotczIE+YJZ4e8M1k6d4xXFWOj687qD9wha7uveSKy2jkQ==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"

From fe334d2c926332ad0457aab15370fdf9ad7c1094 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 5 Nov 2018 17:07:21 +0530
Subject: [PATCH 17/64] fix(Quill): Add all quill attributes that are required
 to render it

---
 frappe/utils/html_utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py
index fe06ec7c43..0336bfe54a 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -158,7 +158,9 @@ acceptable_attributes = [
 	'step', 'style', 'summary', 'suppress', 'tabindex', 'target',
 	'template', 'title', 'toppadding', 'type', 'unselectable', 'usemap',
 	'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
-	'width', 'wrap', 'xml:lang', 'data-row'
+	'width', 'wrap', 'xml:lang', 'data-row', 'data-list', 'data-language',
+	'data-value', 'role', 'frameborder', 'allowfullscreen', 'spellcheck',
+	'data-mode', 'data-gramm', 'data-placeholder'
 ]
 
 mathml_attributes = [

From 889f0a27443a135fbee24f847f30cbefcfd09701 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 5 Nov 2018 11:43:04 +0000
Subject: [PATCH 18/64] bumped to version 11.0.3-beta.21

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index f38f8b1ad8..9247f337e2 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '11.x.x-develop'
-staging_version = '11.0.3-beta.20'
+staging_version = '11.0.3-beta.21'
 
 app_email = "info@frappe.io"
 

From 5aa9dbf6ee4e44253225e211861302ab44bca93a Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 5 Nov 2018 18:35:29 +0530
Subject: [PATCH 19/64] fix: Dynamic Link filter in listview (#6405)

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

diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js
index f62f1432fe..02e970091e 100644
--- a/frappe/public/js/frappe/form/controls/dynamic_link.js
+++ b/frappe/public/js/frappe/form/controls/dynamic_link.js
@@ -13,7 +13,7 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
 			let input = null;
 			if (cur_list) {
 				// for list page
-				input = cur_list.wrapper.find(selector);
+				input = cur_list.filter_area.standard_filters_wrapper.find(selector);
 			}
 			if (cur_page) {
 				input = $(cur_page.page).find(selector);

From fc7a4a78357dec629d565423c786385b56246b0e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Mon, 5 Nov 2018 18:35:44 +0530
Subject: [PATCH 20/64] fix(listview): Smart parsing of route options (#6404)

- Fieldname should also be searched in child tables
---
 frappe/public/js/frappe/list/list_view.js | 30 +++++++++--------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 11c60e45b1..a5b214ef0b 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -50,18 +50,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 
 		if (frappe.route_options) {
 			// Priority 1: route filters
-			let filters = [];
-			for (let key in frappe.route_options) {
-				let value = frappe.route_options[key];
-				if (value.startsWith('[') && value.endsWith(']')) {
-					value = JSON.parse(value);
-				} else {
-					value = ['=', value];
-				}
-				filters.push([this.doctype, key, ...value])
-			}
-			this.filters = filters;
-			frappe.route_options = null;
+			this.filters = this.parse_filters_from_route_options();
 		} else if (this.view_user_settings.filters) {
 			// Priority 2: saved filters
 			const saved_filters = this.view_user_settings.filters;
@@ -1126,11 +1115,17 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		return actions_menu_items;
 	}
 
-	set_filters_from_route_options() {
+	parse_filters_from_route_options() {
 		const filters = [];
+
 		for (let field in frappe.route_options) {
-			var value = frappe.route_options[field];
-			var doctype = null;
+
+			let doctype = null;
+			let value = frappe.route_options[field];
+
+			if (value.startsWith('[') && value.endsWith(']')) {
+				value = JSON.parse(value);
+			}
 
 			// if `Child DocType.fieldname`
 			if (field.includes('.')) {
@@ -1157,10 +1152,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		}
 		frappe.route_options = null;
 
-		this.filter_area.clear(false)
-			.then(() => {
-				this.filter_area.add(filters);
-			});
+		return filters;
 	}
 
 	static trigger_list_update(data) {

From 6381c84ffd416e39db9d89c3c7912fd7aa672447 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Tue, 6 Nov 2018 12:44:25 +0530
Subject: [PATCH 21/64] [Fix] User listview is not working becaause full name
 field is hidden

---
 frappe/core/doctype/user/user.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json
index 4eb5e943ab..0ddcd17577 100644
--- a/frappe/core/doctype/user/user.json
+++ b/frappe/core/doctype/user/user.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
@@ -252,7 +253,7 @@
    "columns": 0, 
    "fieldname": "full_name", 
    "fieldtype": "Data", 
-   "hidden": 1, 
+   "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
@@ -266,7 +267,7 @@
    "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
-   "read_only": 0, 
+   "read_only": 1, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
@@ -2206,7 +2207,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2018-09-28 16:34:06.215199", 
+ "modified": "2018-11-06 12:41:33.864058", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "User", 
@@ -2259,5 +2260,6 @@
  "sort_order": "DESC", 
  "title_field": "full_name", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file

From aa26e39da02a00b1cf37b80171a518b87d4fac15 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Tue, 6 Nov 2018 11:05:32 +0000
Subject: [PATCH 22/64] bumped to version 11.0.3-beta.22

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 9247f337e2..a78ce3f7eb 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '11.x.x-develop'
-staging_version = '11.0.3-beta.21'
+staging_version = '11.0.3-beta.22'
 
 app_email = "info@frappe.io"
 

From 338c4c8794ec8f2473f9caa6edf4cd2d360a05a5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 7 Nov 2018 13:06:22 +0530
Subject: [PATCH 23/64] fix: Email Reply Chain

Previous email is appended to the next reply, but was not rendered by
splitting it with a hardcoded comment string. Since Quill does not
support comments, created a new HiddenBlock for it.
---
 .../js/frappe/form/controls/text_editor.js     | 18 ++++++++++++++++++
 .../public/js/frappe/form/footer/timeline.js   |  2 +-
 frappe/public/js/frappe/views/communication.js |  2 +-
 frappe/utils/html_utils.py                     |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 8222732849..bef939dc55 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -16,6 +16,24 @@ Table.create = (value) => {
 }
 Quill.register(Table, true);
 
+// hidden blot
+const Block = Quill.import('blots/block');
+class HiddenBlock extends Block {
+	static create(value) {
+		const node = super.create(value);
+		node.setAttribute('data-comment', value);
+		node.classList.add('hidden');
+		return node;
+	}
+
+	static formats(node) {
+		return node.getAttribute('data-comment');
+	}
+}
+HiddenBlock.blotName = 'hiddenblot';
+HiddenBlock.tagName = 'DIV';
+Quill.register(HiddenBlock, true);
+
 // image uploader
 const Uploader = Quill.import('modules/uploader');
 Uploader.DEFAULTS.mimetypes.push('image/gif');
diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 47dcdf724d..83b0f386c3 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -336,7 +336,7 @@ frappe.ui.form.Timeline = class Timeline {
 			});
 		} else {
 			if(c.communication_type=="Communication" && c.communication_medium=="Email") {
-				c.content = c.content.split("<!-- original-reply -->")[0];
+				c.content = c.content.split('<div data-comment="original-reply">')[0];
 				c.content = frappe.utils.strip_original_content(c.content);
 
 				c.original_content = c.content;
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index fe503ad268..29a280e5e7 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -657,7 +657,7 @@ frappe.views.CommunicationComposer = Class.extend({
 			var communication_date = last_email.communication_date || last_email.creation;
 			content = '<div><br></div>'
 				+ reply
-				+ "<br><!-- original-reply --><br>"
+				+ "<div data-comment='original-reply'></div>"
 				+ '<blockquote>' +
 					'<p>' + __("On {0}, {1} wrote:",
 					[frappe.datetime.global_date_format(communication_date) , last_email.sender]) + '</p>' +
diff --git a/frappe/utils/html_utils.py b/frappe/utils/html_utils.py
index 0336bfe54a..c524cc79c5 100644
--- a/frappe/utils/html_utils.py
+++ b/frappe/utils/html_utils.py
@@ -160,7 +160,7 @@ acceptable_attributes = [
 	'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
 	'width', 'wrap', 'xml:lang', 'data-row', 'data-list', 'data-language',
 	'data-value', 'role', 'frameborder', 'allowfullscreen', 'spellcheck',
-	'data-mode', 'data-gramm', 'data-placeholder'
+	'data-mode', 'data-gramm', 'data-placeholder', 'data-comment'
 ]
 
 mathml_attributes = [

From 65e0fe19ccef8cc85bfd85dfe96d6ff4cf5c069a Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 7 Nov 2018 16:35:41 +0530
Subject: [PATCH 24/64] fix: Override primary_action from list_settings

Show Email Composer as primary action in Communication List
---
 .../communication/communication_list.js       | 13 ++---------
 frappe/public/js/frappe/list/list_view.js     |  6 ++++-
 .../public/js/frappe/views/communication.js   | 22 +++++++++----------
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/frappe/core/doctype/communication/communication_list.js b/frappe/core/doctype/communication/communication_list.js
index a7e9f0569c..fae003be4b 100644
--- a/frappe/core/doctype/communication/communication_list.js
+++ b/frappe/core/doctype/communication/communication_list.js
@@ -19,16 +19,7 @@ frappe.listview_settings['Communication'] = {
 		});
 	},
 
-	set_primary_action: function(list_view) {
-		var me = this;
-		if (list_view.new_doctype) {
-			list_view.page.set_primary_action(
-				__("New"),
-				function() { new frappe.views.CommunicationComposer({ doc: {} }) },
-				"octicon octicon-plus"
-			);
-		} else {
-			list_view.page.clear_primary_action();
-		}
+	primary_action: function() {
+		new frappe.views.CommunicationComposer({ doc: {} })
 	}
 };
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index a5b214ef0b..a2ed9dd09a 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -168,7 +168,11 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	set_primary_action() {
 		if (this.can_create) {
 			this.page.set_primary_action(__('New'), () => {
-				this.make_new_doc();
+				if (this.settings.primary_action) {
+					this.settings.primary_action();
+				} else {
+					this.make_new_doc();
+				}
 			}, 'octicon octicon-plus');
 		} else {
 			this.page.clear_primary_action();
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index fe503ad268..f38691eb55 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -509,7 +509,12 @@ frappe.views.CommunicationComposer = Class.extend({
 
 	delete_saved_draft() {
 		if (this.dialog) {
-			localStorage.removeItem(this.frm.doctype + this.frm.docname);
+			try {
+				localStorage.removeItem(this.frm.doctype + this.frm.docname);
+			} catch (e) {
+				console.log(e);
+				console.warn('[Communication] Cannot delete localStorage item');
+			}
 		}
 	},
 
@@ -574,16 +579,6 @@ frappe.views.CommunicationComposer = Class.extend({
 						cur_frm.reload_doc();
 					}
 
-					if (localStorage.getItem(this.frm.doctype + this.frm.docname)) {
-						try {
-							localStorage.removeItem(this.frm.doctype + this.frm.docname);
-						} catch (e) {
-							// silently fail
-							console.log(e);
-							console.warn('[Communication] Failed to delete draft.');
-						}
-					}
-
 					// try the success callback if it exists
 					if (me.success) {
 						try {
@@ -635,7 +630,10 @@ frappe.views.CommunicationComposer = Class.extend({
 			this.message = this.txt + (this.message ? ("<br><br>" + this.message) : "");
 		} else {
 			// saved draft in localStorage
-			this.message = localStorage.getItem(this.frm.doctype + this.frm.docname) || '';
+			const { doctype, docname } = this.frm || {};
+			if (doctype && docname) {
+				this.message = localStorage.getItem(doctype + docname) || '';
+			}
 		}
 
 		if(this.real_name) {

From 184a3f57bc1db7eb09e2a53e55e9291ea3167dca Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:32:29 +0530
Subject: [PATCH 25/64] style: Missing semicolon

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

diff --git a/frappe/core/doctype/communication/communication_list.js b/frappe/core/doctype/communication/communication_list.js
index fae003be4b..67d4855c1f 100644
--- a/frappe/core/doctype/communication/communication_list.js
+++ b/frappe/core/doctype/communication/communication_list.js
@@ -20,6 +20,6 @@ frappe.listview_settings['Communication'] = {
 	},
 
 	primary_action: function() {
-		new frappe.views.CommunicationComposer({ doc: {} })
+		new frappe.views.CommunicationComposer({ doc: {} });
 	}
 };

From 12b39a611813af971d6d8443719a2ce0e825db5e Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Wed, 7 Nov 2018 18:33:41 +0530
Subject: [PATCH 26/64] style: Ignore console statement

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

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index f38691eb55..dddc1b7934 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -513,7 +513,7 @@ frappe.views.CommunicationComposer = Class.extend({
 				localStorage.removeItem(this.frm.doctype + this.frm.docname);
 			} catch (e) {
 				console.log(e);
-				console.warn('[Communication] Cannot delete localStorage item');
+				console.warn('[Communication] Cannot delete localStorage item'); // eslint-disable-line
 			}
 		}
 	},
@@ -666,4 +666,4 @@ frappe.views.CommunicationComposer = Class.extend({
 		}
 		fields.content.set_value(content);
 	}
-});
\ No newline at end of file
+});

From 5ada7746dbc4f062d6bd38916bdbc2fc5be13aec Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Thu, 8 Nov 2018 12:44:40 +0530
Subject: [PATCH 27/64] fix: develop version should be 12 (#6414)

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index a78ce3f7eb..266cd4ba93 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -11,7 +11,7 @@ app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
-develop_version = '11.x.x-develop'
+develop_version = '12.x.x-develop'
 staging_version = '11.0.3-beta.22'
 
 app_email = "info@frappe.io"

From cc8743aab9d47700f7937a4eb1dea8acf2320b83 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Thu, 8 Nov 2018 12:45:29 +0530
Subject: [PATCH 28/64] fix(security): Sanitize file names in upload dialog
 (#6419)

---
 frappe/public/js/frappe/upload.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/upload.js b/frappe/public/js/frappe/upload.js
index ec4394c718..da1aaa7d5f 100644
--- a/frappe/public/js/frappe/upload.js
+++ b/frappe/public/js/frappe/upload.js
@@ -184,11 +184,12 @@ frappe.upload = {
 		});
 	},
 	make_file_row: function(file, { show_private } = {}) {
+		const safe_file_name = frappe.utils.xss_sanitise(file.name);
 		var template = `
-			<div class="list-item-container" data-filename="${file.name}">
+			<div class="list-item-container" data-filename="${safe_file_name}">
 				<div class="list-item">
 					<div class="list-item__content list-item__content--flex-2 ellipsis">
-						<span>${file.name}</span>
+						<span>${safe_file_name}</span>
 						<span style="margin-top: 1px; margin-left: 5px;"
 							class="fa fa-fw text-warning ${file.is_private ? 'fa-lock': 'fa-unlock-alt'}">
 						</span>

From a8b5fdd5cab49197a82b58ac4e2737510aa42831 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 8 Nov 2018 13:31:03 +0530
Subject: [PATCH 29/64] fix(Query Report): Enable refresh button after report
 is errored

---
 frappe/public/js/frappe/views/reports/query_report.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index e0ab3d8ddb..0ebbd9dfc3 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -258,7 +258,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					report_name: this.report_name,
 					filters: filters,
 				},
-				callback: resolve
+				callback: resolve,
+				always: () => this.page.btn_secondary.prop('disabled', false)
 			})
 		}).then(r => {
 			let data = r.message;

From c0a0c7e94cedd52745050761a224f2f008e9e503 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 8 Nov 2018 13:31:16 +0530
Subject: [PATCH 30/64] fix: Remove duplicate declaration

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

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index bef939dc55..b69b95de20 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -17,7 +17,6 @@ Table.create = (value) => {
 Quill.register(Table, true);
 
 // hidden blot
-const Block = Quill.import('blots/block');
 class HiddenBlock extends Block {
 	static create(value) {
 		const node = super.create(value);

From 36c6552fe9721f7aaad2179119720c9173d3bcdd Mon Sep 17 00:00:00 2001
From: Navdeep Ghai <30634335+navdeepghai1@users.noreply.github.com>
Date: Fri, 9 Nov 2018 09:21:09 +0400
Subject: [PATCH 31/64] remove meta dependency when Link field options is
 [Select] (#6418)

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

diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index f0c47316f0..abbd7bd4ba 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -58,9 +58,7 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 	page_length=10, filters=None, filter_fields=None, as_dict=False):
 	if isinstance(filters, string_types):
 		filters = json.loads(filters)
-
-	meta = frappe.get_meta(doctype)
-
+	
 	if searchfield:
 		sanitize_searchfield(searchfield)
 
@@ -78,6 +76,8 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0,
 		search_widget(doctype, txt, standard_queries[doctype][0],
 			searchfield, start, page_length, filters)
 	else:
+		meta = frappe.get_meta(doctype)
+
 		if query:
 			frappe.throw(_("This query style is discontinued"))
 			# custom query

From a2642868a5203117715b1f1e5ed48f2e7045bab3 Mon Sep 17 00:00:00 2001
From: gshmu <mhohai@aim.com>
Date: Fri, 9 Nov 2018 13:23:03 +0800
Subject: [PATCH 32/64] fix read_xlsx_file_from_attached_file when xlsx contain
 functions (#6400)

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

diff --git a/frappe/utils/xlsxutils.py b/frappe/utils/xlsxutils.py
index 3b17378126..9a08fdbd9d 100644
--- a/frappe/utils/xlsxutils.py
+++ b/frappe/utils/xlsxutils.py
@@ -77,7 +77,7 @@ def read_xlsx_file_from_attached_file(file_id=None, fcontent=None):
 		return
 
 	rows = []
-	wb1 = load_workbook(filename=filename, read_only=True)
+	wb1 = load_workbook(filename=filename, read_only=True, data_only=True)
 	ws1 = wb1.active
 	for row in ws1.iter_rows():
 		tmp_list = []

From ac915c42570ff9bb51a74cb6cc960edbdfc04bf0 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Fri, 9 Nov 2018 12:59:09 +0530
Subject: [PATCH 33/64] Revert feature, listView filter shows hidden field

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

diff --git a/frappe/public/js/frappe/ui/filters/field_select.js b/frappe/public/js/frappe/ui/filters/field_select.js
index 87f6a6545c..1efee0c1d3 100644
--- a/frappe/public/js/frappe/ui/filters/field_select.js
+++ b/frappe/public/js/frappe/ui/filters/field_select.js
@@ -118,7 +118,7 @@ frappe.ui.FieldSelect = Class.extend({
 
 		// child tables
 		$.each(me.table_fields, function(i, table_df) {
-			if(table_df.options && !table_df.hidden) {
+			if(table_df.options) {
 				var child_table_fields = [].concat(frappe.meta.docfield_list[table_df.options]);
 				$.each(frappe.utils.sort(child_table_fields, "label", "string"), function(i, df) {
 					// show fields where user has read access and if report hide flag is not set
@@ -145,7 +145,7 @@ frappe.ui.FieldSelect = Class.extend({
 		}
 
 		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
-			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname]) && !df.hidden) {
+			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
 			this.options.push({
 				label: label,
 				value: table + "." + df.fieldname,

From afb6a7166cd77d78a7dff96baddd55de62065c64 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Fri, 9 Nov 2018 07:35:25 +0000
Subject: [PATCH 34/64] fix(Email Queue): change fieldtype of shown_as_cc

This is done to allow more number of recipients to be CCed in
the email. The existing fieldtype was Data, which had a
restriction of 140 characters, thereby allowing only a few email
addresses to be CCed. It has now been changed to Small Text, to
incorporate more email addresses.

Co-authored-by: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Signed-off-by: Ameya Shenoy <shenoy.ameya@gmail.com>
---
 .../doctype/email_queue/email_queue.json      | 1099 +++++++++--------
 .../doctype/email_queue/test_email_queue.js   |   23 +
 2 files changed, 590 insertions(+), 532 deletions(-)
 create mode 100644 frappe/email/doctype/email_queue/test_email_queue.js

diff --git a/frappe/email/doctype/email_queue/email_queue.json b/frappe/email/doctype/email_queue/email_queue.json
index e4ebc153b5..15e87c65c9 100644
--- a/frappe/email/doctype/email_queue/email_queue.json
+++ b/frappe/email/doctype/email_queue/email_queue.json
@@ -1,574 +1,609 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2012-08-02 15:17:28", 
- "custom": 0, 
- "description": "Email Queue records.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "System", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "hash",
+ "beta": 0,
+ "creation": "2012-08-02 15:17:28",
+ "custom": 0,
+ "description": "Email Queue records.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "System",
+ "editable_grid": 0,
+ "engine": "InnoDB",
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sender", 
-   "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": "Sender", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "sender",
+   "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": "Sender",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Email",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "recipients", 
-   "fieldtype": "Table", 
-   "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": "Recipient", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email Queue Recipient", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "recipients",
+   "fieldtype": "Table",
+   "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": "Recipient",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Email Queue Recipient",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "show_as_cc", 
-   "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": "Show as cc", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "show_as_cc",
+   "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": "Show as cc",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "message", 
-   "fieldtype": "Code", 
-   "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": "Message", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "message",
+   "fieldtype": "Code",
+   "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": "Message",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Not Sent", 
-   "fieldname": "status", 
-   "fieldtype": "Select", 
-   "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": "Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nNot Sent\nSending\nSent\nError\nExpired", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "Not Sent",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "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": "Status",
+   "length": 0,
+   "no_copy": 0,
+   "options": "\nNot Sent\nSending\nSent\nError\nExpired",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "error", 
-   "fieldtype": "Code", 
-   "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": "Error", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "error",
+   "fieldtype": "Code",
+   "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": "Error",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "message_id", 
-   "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": "Message ID", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "message_id",
+   "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": "Message ID",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 1,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Reference DocType",
+   "length": 0,
+   "no_copy": 0,
+   "options": "DocType",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_name", 
-   "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": "Reference DocName", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "reference_name",
+   "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": "Reference DocName",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "communication", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Communication", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Communication", 
-   "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": 1, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "communication",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Communication",
+   "length": 0,
+   "no_copy": 0,
+   "options": "Communication",
+   "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": 1,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "send_after", 
-   "fieldtype": "Datetime", 
-   "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": "Send After", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "send_after",
+   "fieldtype": "Datetime",
+   "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": "Send After",
+   "length": 0,
+   "no_copy": 1,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "priority", 
-   "fieldtype": "Int", 
-   "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": "Priority", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fieldname": "priority",
+   "fieldtype": "Int",
+   "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": "Priority",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "add_unsubscribe_link", 
-   "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": "Add Unsubscribe Link", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fieldname": "add_unsubscribe_link",
+   "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": "Add Unsubscribe Link",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "unsubscribe_param", 
-   "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": "Unsubscribe Param", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "unsubscribe_param",
+   "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": "Unsubscribe Param",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "unsubscribe_method", 
-   "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": "Unsubscribe Method", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "unsubscribe_method",
+   "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": "Unsubscribe Method",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "expose_recipients", 
-   "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": "Expose Recipients", 
-   "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, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "expose_recipients",
+   "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": "Expose Recipients",
+   "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
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "attachments", 
-   "fieldtype": "Code", 
-   "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": "Attachments", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "attachments",
+   "fieldtype": "Code",
+   "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": "Attachments",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 1,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-envelope", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 1, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-09-25 15:39:21.781324", 
- "modified_by": "Administrator", 
- "module": "Email", 
- "name": "Email Queue", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-envelope",
+ "idx": 1,
+ "image_view": 0,
+ "in_create": 1,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2018-11-09 15:34:07.229657",
+ "modified_by": "Administrator",
+ "module": "Email",
+ "name": "Email Queue",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 1,
+   "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
    "write": 0
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
+ "sort_order": "DESC",
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/email/doctype/email_queue/test_email_queue.js b/frappe/email/doctype/email_queue/test_email_queue.js
new file mode 100644
index 0000000000..91a33b3ee5
--- /dev/null
+++ b/frappe/email/doctype/email_queue/test_email_queue.js
@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Email Queue", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Email Queue
+		() => frappe.tests.make('Email Queue', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

From 1800f9f70a22446fff2e397e28fc60a91608be9b Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 9 Nov 2018 10:08:19 +0000
Subject: [PATCH 35/64] bumped to version 10.1.60

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 2c6cf49f86..c149fb3b8b 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.59'
+__version__ = '10.1.60'
 __title__ = "Frappe Framework"
 
 local = Local()

From 1a1be3852de8ce3bf32b8e6aad2bd8468b9aa8eb Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 9 Nov 2018 10:13:51 +0000
Subject: [PATCH 36/64] bumped to version 11.0.3-beta.23

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 266cd4ba93..359aa21d20 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.22'
+staging_version = '11.0.3-beta.23'
 
 app_email = "info@frappe.io"
 

From bbd929212baadcd6ac96a92e443e209a702ba298 Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 9 Nov 2018 10:38:07 +0000
Subject: [PATCH 37/64] dummy commit

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 11ff22471d..bdb082ccdc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-
 <div align="center">
     <img src=".github/frappe-bird.png" height="150">
     <h1>

From 6953924ca75827c7860f684f209df73464358f1b Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 9 Nov 2018 10:41:19 +0000
Subject: [PATCH 38/64] bumped to version 11.0.3-beta.24

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index 359aa21d20..c81c1cbb67 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.23'
+staging_version = '11.0.3-beta.24'
 
 app_email = "info@frappe.io"
 

From aa530dab24252328c49a7139c8fe59e66e9d9307 Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 9 Nov 2018 11:33:29 +0000
Subject: [PATCH 39/64] bumped to version 11.0.3-beta.25

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index c81c1cbb67..e7e9331852 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.24'
+staging_version = '11.0.3-beta.25'
 
 app_email = "info@frappe.io"
 

From 4dd03618d6c016fd0c4730d6fab91dd17fd89684 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Sat, 10 Nov 2018 17:03:24 +0530
Subject: [PATCH 40/64] Revert feature, listView filter shows hidden field

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

diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
index b283b0133e..df161892f7 100644
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ b/frappe/public/js/frappe/ui/filters/filters.js
@@ -642,7 +642,7 @@ frappe.ui.FieldSelect = Class.extend({
 
 		// child tables
 		$.each(me.table_fields, function(i, table_df) {
-			if(table_df.options && !table_df.hidden) {
+			if(table_df.options) {
 				var child_table_fields = [].concat(frappe.meta.docfield_list[table_df.options]);
 				$.each(frappe.utils.sort(child_table_fields, "label", "string"), function(i, df) {
 					// show fields where user has read access and if report hide flag is not set
@@ -664,7 +664,7 @@ frappe.ui.FieldSelect = Class.extend({
 			var table = df.parent;
 		}
 		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
-			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname]) && !df.hidden) {
+			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
 			this.options.push({
 				label: label,
 				value: table + "." + df.fieldname,

From a5645fec64e84a18fa7c5405f4a5991cf88724fd Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Sun, 11 Nov 2018 17:53:11 +0530
Subject: [PATCH 41/64] [Fix] Date format not shwoing properly in the prepared
 report

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

diff --git a/frappe/core/doctype/prepared_report/prepared_report.py b/frappe/core/doctype/prepared_report/prepared_report.py
index 1644cca069..a877e5f871 100644
--- a/frappe/core/doctype/prepared_report/prepared_report.py
+++ b/frappe/core/doctype/prepared_report/prepared_report.py
@@ -74,7 +74,7 @@ def create_csv_file(columns, data, dt, dn):
 				new_row = []
 				for col in columns:
 					key = col.get('fieldname') or col.get('label')
-					new_row.append(frappe.format(row.get(key, ''), col))
+					new_row.append(row.get(key, ''))
 				rows.append(new_row)
 
 			rows = [tuple(columns_without_meta)] + rows

From bb9df9b1287ec49a049172fdafd45db935a96075 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Mon, 12 Nov 2018 10:32:52 +0530
Subject: [PATCH 42/64] fix(Quill Editor): Set HTML using Quill's API (#6433)

To avoid doc changes when form is loaded
---
 frappe/public/js/frappe/form/controls/text_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index b69b95de20..6e82f14536 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -171,7 +171,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 			return;
 		}
 
-		this.quill.root.innerHTML = value;
+		this.quill.clipboard.dangerouslyPasteHTML(value);
 	},
 
 	get_input_value() {

From 57c11adc6451f1cf5bfc10b1cd68f7ac7215bd32 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 12 Nov 2018 11:06:39 +0530
Subject: [PATCH 43/64] With group indentation checkbox while exporting reports
 in csv format (#6417)

---
 .../js/frappe/views/reports/query_report.js   | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 0ebbd9dfc3..984699f3ad 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -732,17 +732,29 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			return;
 		}
 
-		this.export_dialog = frappe.prompt({
-			label: __('Select File Format'),
-			fieldname: 'file_format',
-			fieldtype: 'Select',
-			options: ['Excel', 'CSV'],
-			default: 'Excel',
-			reqd: 1
-		}, ({ file_format }) => {
+		this.export_dialog = frappe.prompt([
+			{
+				label: __('Select File Format'),
+				fieldname: 'file_format',
+				fieldtype: 'Select',
+				options: ['Excel', 'CSV'],
+				default: 'Excel',
+				reqd: 1,
+				onchange: () => {
+					this.export_dialog.set_df_property('with_indentation',
+						'hidden', this.export_dialog.get_value('file_format') !== 'CSV');
+				}
+			},
+			{
+				label: __('With Group Indentation'),
+				fieldname: 'with_indentation',
+				fieldtype: 'Check',
+				hidden: 1
+			}
+		], ({ file_format, with_indentation }) => {
 			if (file_format === 'CSV') {
 				const column_row = this.columns.map(col => col.label);
-				const data = this.get_data_for_csv();
+				const data = this.get_data_for_csv(with_indentation);
 				const out = [column_row].concat(data);
 
 				frappe.tools.downloadify(out, null, this.report_name);
@@ -765,10 +777,21 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}, __('Export Report: '+ this.report_name), __('Download'));
 	}
 
-	get_data_for_csv() {
+	get_data_for_csv(with_indentation = false) {
+
 		const indices = this.datatable.datamanager.getFilteredRowIndices();
-		const out = indices.map(i => this.datatable.datamanager.getRow(i).map(c => c.content));
-		return out.map(row => row.slice(1));
+		const rows = indices.map(i => this.datatable.datamanager.getRow(i));
+		return rows.map(row => {
+			const standard_column_count = this.datatable.datamanager.getStandardColumnCount();
+			return row
+				.slice(standard_column_count)
+				.map((cell, i) => {
+				if (with_indentation && i === 0) {
+					return '   '.repeat(row.meta.indent) + cell.content;
+				}
+				return cell.content;
+			});
+		});
 	}
 
 	get_data_for_print() {

From 30ee228b4a1475b3847c6b74ee76bfaaec8c9eb2 Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Mon, 12 Nov 2018 11:08:18 +0530
Subject: [PATCH 44/64] Code cleanup and fixed print permission error (#6377)

---
 .../doctype/print_settings/print_settings.py  |  9 ++++
 frappe/public/js/frappe/form/print.js         | 42 +++++++------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/frappe/printing/doctype/print_settings/print_settings.py b/frappe/printing/doctype/print_settings/print_settings.py
index cf845eb42e..8043130358 100644
--- a/frappe/printing/doctype/print_settings/print_settings.py
+++ b/frappe/printing/doctype/print_settings/print_settings.py
@@ -5,6 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils import cint
 
 from frappe.model.document import Document
 
@@ -31,3 +32,11 @@ class PrintSettings(Document):
 		except ValidationError:
 			frappe.throw(_("Failed to connect to server"))
 		return printer_list
+
+@frappe.whitelist()
+def is_print_server_enabled():
+	if not hasattr(frappe.local, 'enable_print_server'):
+		frappe.local.enable_print_server = cint(frappe.db.get_single_value('Print Settings',
+			'enable_print_server'))
+
+	return frappe.local.enable_print_server
diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js
index 3847801cd0..aa6be540ab 100644
--- a/frappe/public/js/frappe/form/print.js
+++ b/frappe/public/js/frappe/form/print.js
@@ -158,35 +158,25 @@ frappe.ui.form.PrintPreview = Class.extend({
 		let print_server ;
 		var me = this;
 		frappe.call({
-			async: false,
-			"method": "frappe.client.get",
-			args: {
-				doctype: "Print Settings",
-				name: "enable_print_server"
-			},
+			method: "frappe.printing.doctype.print_settings.print_settings.is_print_server_enabled",
 			callback: function (data) {
-				print_server = data.message.enable_print_server;
+				if (data.message) {
+					frappe.call({
+						"method": "frappe.utils.print_format.print_by_server",
+						args: {
+							doctype: me.frm.doc.doctype,
+							name: me.frm.doc.name,
+							print_format:  me.selected_format(),
+							no_letterhead: me.with_letterhead()
+						},
+						callback: function (data) {
+						}
+					});
+				} else {
+					me.new_page_preview(true);
+				}
 			}
 		});
-
-		if(print_server){
-			frappe.call({
-				async: false,
-				"method": "frappe.utils.print_format.print_by_server",
-				args: {
-					doctype: me.frm.doc.doctype,
-					name: me.frm.doc.name,
-					print_format:  me.selected_format(),
-					no_letterhead: me.with_letterhead()
-				},
-				callback: function (data) {
-				}
-			});
-
-		}else{
-		this.new_page_preview(true);
-		}
-
 	},
 	new_page_preview: function (printit) {
 		var me = this;

From 7dd2ccd066a0fe26ac03725160f2905e87022109 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Mon, 12 Nov 2018 12:59:06 +0000
Subject: [PATCH 45/64] fix: set is_patch flag before running patch

set frappe.flags.in_patch to True before running the
sync_user_permission_doctype_before_migrate patch via hooks
---
 .../v11_0/sync_user_permission_doctype_before_migrate.py       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py
index 549f99924d..612d83bf97 100644
--- a/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py
+++ b/frappe/patches/v11_0/sync_user_permission_doctype_before_migrate.py
@@ -1,5 +1,6 @@
 import frappe
 
 def execute():
+	frappe.flags.in_patch = True
 	frappe.reload_doc('core', 'doctype', 'user_permission')
-	frappe.db.commit()
\ No newline at end of file
+	frappe.db.commit()

From 4f0081743b21fb5e52361481bd838909de38e50d Mon Sep 17 00:00:00 2001
From: Zarrar <zarrar65@gmail.com>
Date: Tue, 13 Nov 2018 10:33:11 +0530
Subject: [PATCH 46/64] minor fix (#6443)

---
 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 a2ed9dd09a..8a633ac7d3 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1127,7 +1127,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			let doctype = null;
 			let value = frappe.route_options[field];
 
-			if (value.startsWith('[') && value.endsWith(']')) {
+			if (typeof value === 'string' && value.startsWith('[') && value.endsWith(']')) {
 				value = JSON.parse(value);
 			}
 

From 2858118f917f0ca50c8f8ba7b931c9bdd7da84e9 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 13 Nov 2018 12:47:49 +0530
Subject: [PATCH 47/64] fix(chat): Setup and render chat on website pages as
 well

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

diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index 5744ebd977..7fa29991d0 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -421,7 +421,9 @@ frappe.ready(function() {
 		callback: (r) => {
 			if (r.message) {
 				frappe.require('/assets/js/moment-bundle.min.js', () => {
-					frappe.require('/assets/js/chat.js');
+					frappe.require('/assets/js/chat.js', () => {
+						frappe.chat.setup();
+					});
 				});
 			}
 		}

From 265d4501c6c7f0739d0dc274e2cc594f8b8be7bb Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Mon, 12 Nov 2018 22:41:11 +0530
Subject: [PATCH 48/64] fix(chat): Do not remove Chat Operators from Website
 Settings

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

diff --git a/frappe/chat/doctype/chat_room/chat_room.py b/frappe/chat/doctype/chat_room/chat_room.py
index b6a9ee6e5c..4de234f89b 100644
--- a/frappe/chat/doctype/chat_room/chat_room.py
+++ b/frappe/chat/doctype/chat_room/chat_room.py
@@ -195,7 +195,10 @@ def create(kind, owner, users = None, name = None):
 
 		for user in dsettings.chat_operators:
 			if user.user not in users:
-				room.append('users', user)
+				# appending user to room.users will remove the user from chat_operators
+				# this is undesirable, create a new Chat Room User instead
+				chat_room_user = {"doctype": "Chat Room User", "user": user.user}
+				room.append('users', chat_room_user)
 
 	room.save(ignore_permissions = True)
 

From c0cb56763dc9885dcaec7c5341a58c4bcace48dc Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 13 Nov 2018 15:24:17 +0530
Subject: [PATCH 49/64] fix(Quill): Set HTML without triggering a focus (#6456)

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

diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index 6e82f14536..41de01e6f7 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -171,7 +171,9 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 			return;
 		}
 
-		this.quill.clipboard.dangerouslyPasteHTML(value);
+		// set html without triggering a focus
+		const delta = this.quill.clipboard.convert({ html: value, text: '' });
+		this.quill.setContents(delta);
 	},
 
 	get_input_value() {

From 48b6ed29933fe3c3fa38f1d616ee7aa5f5416ae8 Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Tue, 13 Nov 2018 10:52:59 +0000
Subject: [PATCH 50/64] bumped to version 10.1.61

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c149fb3b8b..2cbdfea0f2 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.60'
+__version__ = '10.1.61'
 __title__ = "Frappe Framework"
 
 local = Local()

From 9f7346f32350eba155c7175616c225baf2fb38ac Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Tue, 13 Nov 2018 11:02:24 +0000
Subject: [PATCH 51/64] bumped to version 11.0.3-beta.26

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index e7e9331852..b6129c7465 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.25'
+staging_version = '11.0.3-beta.26'
 
 app_email = "info@frappe.io"
 

From dbb3dd178b68bfd48d9650e37fad0e4efe7437e0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 14 Nov 2018 14:06:25 +0530
Subject: [PATCH 52/64] fix(filters): via Awesome bar and dashboard

---
 frappe/public/js/frappe/list/base_list.js | 11 +++++-
 frappe/public/js/frappe/list/list_view.js | 47 +++++++++++++----------
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index c725b774de..18d4257876 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -6,7 +6,11 @@ frappe.views.BaseList = class BaseList {
 	}
 
 	show() {
-		this.init().then(() => this.refresh());
+		frappe.run_serially([
+			() => this.init(),
+			() => this.before_refresh(),
+			() => this.refresh()
+		]);
 	}
 
 	init() {
@@ -344,6 +348,11 @@ frappe.views.BaseList = class BaseList {
 		};
 	}
 
+	before_refresh() {
+		// modify args here just before making the request
+		// see list_view.js
+	}
+
 	refresh() {
 		this.freeze(true);
 		// fetch data from server
diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 8a633ac7d3..433dd286a3 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -34,7 +34,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			return;
 		}
 
-		this.init().then(() => this.refresh());
+		super.show();
 	}
 
 	get view_name() {
@@ -48,25 +48,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 	setup_defaults() {
 		super.setup_defaults();
 
-		if (frappe.route_options) {
-			// Priority 1: route filters
-			this.filters = this.parse_filters_from_route_options();
-		} else if (this.view_user_settings.filters) {
-			// Priority 2: saved filters
-			const saved_filters = this.view_user_settings.filters;
-			this.filters = this.validate_filters(saved_filters);
-		} else {
-			// Priority 3: filters in listview_settings
-			const filters = (this.settings.filters || []).map(f => {
-				if (f.length === 3) {
-					f = [this.doctype, f[0], f[1], f[2]];
-				}
-				return f;
-			});
-
-			this.filters = filters;
-		}
-
 		// initialize with saved order by
 		this.sort_by = this.view_user_settings.sort_by || 'modified';
 		this.sort_order = this.view_user_settings.sort_order || 'desc';
@@ -283,6 +264,32 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		});
 	}
 
+	before_refresh() {
+		if (frappe.route_options) {
+			// Priority 1: route filters
+			this.filters = this.parse_filters_from_route_options();
+		} else if (this.view_user_settings.filters) {
+			// Priority 2: saved filters
+			const saved_filters = this.view_user_settings.filters;
+			this.filters = this.validate_filters(saved_filters);
+		} else {
+			// Priority 3: filters in listview_settings
+			this.filters = (this.settings.filters || []).map(f => {
+				if (f.length === 3) {
+					f = [this.doctype, f[0], f[1], f[2]];
+				}
+				return f;
+			});
+		}
+
+		if (this.filters.length) {
+			return this.filter_area.clear(false)
+				.then(() => this.filter_area.set(this.filters));
+		}
+
+		return Promise.resolve();
+	}
+
 	toggle_result_area() {
 		super.toggle_result_area();
 		this.toggle_actions_menu_button(

From 81304a72fc264df67fa42d2ed891ec19bdaa442b Mon Sep 17 00:00:00 2001
From: deepeshgarg007 <deepeshgarg6@gmail.com>
Date: Wed, 14 Nov 2018 17:44:50 +0530
Subject: [PATCH 53/64] Sales Invoice dashboard add button fix

---
 frappe/public/js/legacy/form.js | 42 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 2193e25610..f2c26566dd 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -496,29 +496,25 @@ _f.Frm.prototype.render_form = function(is_a_different_doc) {
 		// clear layout message
 		this.layout.show_message();
 
-		// header must be refreshed before client methods
-		// because add_custom_button
-		this.refresh_header(is_a_different_doc);
-
-		// call trigger
-		this.script_manager.trigger("refresh");
-
-		// trigger global trigger
-		// to use this
-		$(document).trigger('form-refresh', [this]);
-
-		// fields
-		this.refresh_fields();
-
-
-		// call onload post render for callbacks to be fired
-		if(this.cscript.is_onload) {
-			this.script_manager.trigger("onload_post_render");
-		}
-
-		// update dashboard after refresh
-		frappe.timeout(0.1).then(() => this.dashboard.after_refresh());
-
+		frappe.run_serially([
+			// header must be refreshed before client methods
+			// because add_custom_button
+			() => this.refresh_header(is_a_different_doc),
+			// call trigger
+			() => this.script_manager.trigger("refresh"),
+			// trigger global trigger
+			// to use this
+			() => $(document).trigger('form-refresh', [this]),
+			// fields
+			() => this.refresh_fields(),
+			// call onload post render for callbacks to be fired
+			() => {
+				if(this.cscript.is_onload) {
+					return this.script_manager.trigger("onload_post_render");
+				}
+			},
+			() => this.dashboard.after_refresh()
+		]);
 		// focus on first input
 
 		if(this.is_new()) {

From a7613c174ed5d5d1bb34be062c913ec71fa4cc43 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 14 Nov 2018 20:30:54 +0530
Subject: [PATCH 54/64] fix: Fail bench build in CI environment

---
 rollup/build.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rollup/build.js b/rollup/build.js
index 8f1169838d..46c0630b0e 100644
--- a/rollup/build.js
+++ b/rollup/build.js
@@ -63,7 +63,13 @@ function build_assets(app) {
 function build(inputOptions, outputOptions) {
 	return rollup.rollup(inputOptions)
 		.then(bundle => bundle.write(outputOptions))
-		.catch(err => log(chalk.red(err)));
+		.catch(err => {
+			log(chalk.red(err));
+			// Kill process to fail in a CI environment
+			if (process.env.CI) {
+				process.kill(process.pid)
+			}
+		});
 }
 
 function concatenate_files() {

From 224603148dbff36b87fe50d1d7d1fadf9140e70e Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Thu, 15 Nov 2018 09:16:23 +0000
Subject: [PATCH 55/64] bumped to version 11.0.3-beta.27

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index b6129c7465..edd2a4f410 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.26'
+staging_version = '11.0.3-beta.27'
 
 app_email = "info@frappe.io"
 

From e900deb0467d4e487dd0b25cd874793733dc2662 Mon Sep 17 00:00:00 2001
From: Alchez <Alchez@users.noreply.github.com>
Date: Thu, 15 Nov 2018 15:56:02 +0530
Subject: [PATCH 56/64] Allow email reports to be sent only on weekdays (#6457)

* feat(auto_email_report): Allow email reports to be sent only on weekdays

* feat(auto_email_report): Fix indent

* fix: Remove boilerplate file
---
 .../auto_email_report/auto_email_report.json  | 75 ++++++++++++-------
 .../auto_email_report/auto_email_report.py    | 42 ++++++-----
 2 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.json b/frappe/email/doctype/auto_email_report/auto_email_report.json
index a376497e5d..f04f34cdba 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.json
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 1, 
@@ -15,6 +16,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,11 +44,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -75,11 +78,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -107,11 +111,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -137,16 +142,17 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "report.report_type",
+   "fetch_from": "report.report_type", 
    "fieldname": "report_type", 
    "fieldtype": "Read Only", 
    "hidden": 0, 
@@ -170,11 +176,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -201,11 +208,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -233,11 +241,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -267,11 +276,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -300,14 +310,15 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
-   "collapsible": 0, 
+   "collapsible": 1, 
    "columns": 0, 
    "depends_on": "eval:doc.report_type !== 'Report Builder'", 
    "fieldname": "report_filters", 
@@ -332,11 +343,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -363,11 +375,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -394,11 +407,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -425,11 +439,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -456,11 +471,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -487,11 +503,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -521,11 +538,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -551,11 +569,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -572,7 +591,7 @@
    "label": "Frequency", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Daily\nWeekly\nMonthly", 
+   "options": "Daily\nWeekdays\nWeekly\nMonthly", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -583,11 +602,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -615,11 +635,12 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -646,11 +667,12 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
+   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -677,7 +699,7 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0,
+   "translatable": 0, 
    "unique": 0
   }
  ], 
@@ -691,7 +713,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-05-16 22:42:57.093530",
+ "modified": "2018-11-13 01:59:17.816718", 
  "modified_by": "Administrator", 
  "module": "Email", 
  "name": "Auto Email Report", 
@@ -744,5 +766,6 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "track_changes": 1, 
- "track_seen": 0
+ "track_seen": 0, 
+ "track_views": 0
 }
\ No newline at end of file
diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py
index f896f441f5..840ae95322 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.py
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.py
@@ -3,17 +3,22 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-import frappe, json
+
+import calendar
+import json
+from datetime import timedelta
+
+import frappe
 from frappe import _
 from frappe.model.document import Document
-from datetime import timedelta
-import frappe.utils
-from frappe.utils import now, global_date_format, format_time
-from frappe.utils.xlsxutils import make_xlsx
+from frappe.utils import (format_time, get_link_to_form, get_url_to_report,
+	global_date_format, now, now_datetime, validate_email_add)
 from frappe.utils.csvutils import to_csv
+from frappe.utils.xlsxutils import make_xlsx
 
 max_reports_per_user = frappe.local.conf.max_reports_per_user or 3
 
+
 class AutoEmailReport(Document):
 	def autoname(self):
 		self.name = _(self.report)
@@ -31,7 +36,7 @@ class AutoEmailReport(Document):
 		valid = []
 		for email in self.email_to.split():
 			if email:
-				frappe.utils.validate_email_add(email, True)
+				validate_email_add(email, True)
 				valid.append(email)
 
 		self.email_to = '\n'.join(valid)
@@ -55,7 +60,7 @@ class AutoEmailReport(Document):
 
 		if self.report_type=='Report Builder' and self.data_modified_till:
 			self.filters = json.loads(self.filters) if self.filters else {}
-			self.filters['modified'] = ('>', frappe.utils.now_datetime() - timedelta(hours=self.data_modified_till))
+			self.filters['modified'] = ('>', now_datetime() - timedelta(hours=self.data_modified_till))
 
 		columns, data = report.get_data(limit=self.no_of_rows or 100, user = self.user,
 			filters = self.filters, as_dict=True)
@@ -94,11 +99,9 @@ class AutoEmailReport(Document):
 			'date_time': date_time,
 			'columns': columns,
 			'data': data,
-			'report_url': frappe.utils.get_url_to_report(self.report,
-				self.report_type, report_doctype),
+			'report_url': get_url_to_report(self.report, self.report_type, report_doctype),
 			'report_name': self.report,
-			'edit_report_settings': frappe.utils.get_link_to_form('Auto Email Report',
-				self.name)
+			'edit_report_settings': get_link_to_form('Auto Email Report', self.name)
 		})
 
 	@staticmethod
@@ -169,15 +172,20 @@ def send_now(name):
 
 def send_daily():
 	'''Check reports to be sent daily'''
-	now = frappe.utils.now_datetime()
-	for report in frappe.get_all('Auto Email Report',
-		{'enabled': 1, 'frequency': ('in', ('Daily', 'Weekly'))}):
+
+	current_day = calendar.day_name[now_datetime().weekday()]
+	enabled_reports = frappe.get_all('Auto Email Report',
+		filters={'enabled': 1, 'frequency': ('in', ('Daily', 'Weekdays', 'Weekly'))})
+
+	for report in enabled_reports:
 		auto_email_report = frappe.get_doc('Auto Email Report', report.name)
 
 		# if not correct weekday, skip
-		if auto_email_report.frequency=='Weekly':
-			if now.weekday()!={'Monday':0,'Tuesday':1,'Wednesday':2,
-				'Thursday':3,'Friday':4,'Saturday':5,'Sunday':6}[auto_email_report.day_of_week]:
+		if auto_email_report.frequency == "Weekdays":
+			if current_day in ("Saturday", "Sunday"):
+				continue
+		elif auto_email_report.frequency == 'Weekly':
+			if auto_email_report.day_of_week != current_day:
 				continue
 
 		auto_email_report.send()

From ca59cdc3732f7f9529c28382debbff4baf26ba92 Mon Sep 17 00:00:00 2001
From: Chinmay Pai <chinmaydpai@gmail.com>
Date: Thu, 15 Nov 2018 16:39:42 +0530
Subject: [PATCH 57/64] redis: freeze requirement to 2.10.6

the new redis 3.0.0 update has breaking changes, so we freeze the version to 2.10.6 for now.
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ea4de43fdc..6e7fe2eb16 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@ werkzeug
 semantic_version
 rauth>=0.6.2
 requests
-redis
+redis==2.10.6
 selenium
 babel
 ipython

From f3d01d787001af63f57ef23f3fa5939ff1c7674c Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Thu, 15 Nov 2018 11:17:59 +0000
Subject: [PATCH 58/64] bumped to version 10.1.62

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 2cbdfea0f2..ace5746720 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.61'
+__version__ = '10.1.62'
 __title__ = "Frappe Framework"
 
 local = Local()

From 564d459dbc946b87b3aeefc149b56a5dbeb3ae42 Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Fri, 16 Nov 2018 06:11:02 +0530
Subject: [PATCH 59/64] fix(requirements): lockdown python requirements (#6481)

---
 requirements.txt | 88 ++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f5b80fb1a1..91e57e2f19 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,53 +1,53 @@
-boto3
-chardet
-cssmin
+boto3==1.9.45
+chardet==3.0.4
+cssmin==0.2.0
 dropbox==7.3.1
-gunicorn
-httplib2
-jinja2
-markdown2
-markupsafe
-PyMySQL
-python-geoip
-python-geoip-geolite2
-python-dateutil
-pytz
-six
-termcolor
-werkzeug
-semantic_version
+gunicorn==19.9.0
+httplib2==0.12.0
+jinja2==2.10
+markdown2==2.3.6
+markupsafe==1.1.0
+PyMySQL==0.9.2
+python-geoip==1.2
+python-geoip-geolite2==2015.303
+python-dateutil==2.7.5
+pytz==2018.7
+six==1.11.0
+termcolor==1.1.0
+werkzeug==0.14.1
+semantic_version==2.6.0
 rauth>=0.6.2
-requests
+requests==2.20.1
 redis==2.10.6
-selenium
-babel
-ipython
+selenium==3.141.0
+babel==2.6.0
+ipython==5.8.0
 html2text==2016.9.19
-email_reply_parser
-click
+email_reply_parser==0.5.9
+click==7.0
 num2words==0.5.5
 watchdog==0.8.0
 bleach==2.1.4
-bleach-whitelist
-Pillow
-beautifulsoup4
-rq
-schedule
-cryptography
-pyopenssl
-ndg-httpsclient
-pyasn1
-zxcvbn-python
-unittest-xml-reporting
-oauthlib
-PyJWT
-PyPDF2
-openpyxl
-pyotp
-pyqrcode
-pypng
-premailer
-croniter
-googlemaps
+bleach-whitelist==0.0.9
+Pillow==5.3.0
+beautifulsoup4==4.6.3
+rq==0.12.0
+schedule==0.5.0
+cryptography==2.4.1
+pyopenssl==18.0.0
+ndg-httpsclient==0.5.1
+pyasn1==0.4.4
+zxcvbn-python==4.4.24
+unittest-xml-reporting==2.2.0
+oauthlib==2.1.0
+PyJWT==1.6.4
+PyPDF2==1.26.0
+openpyxl==2.5.10
+pyotp==2.2.7
+pyqrcode==1.2.1
+pypng==0.0.18
+premailer==3.2.0
+croniter==0.3.26
+googlemaps==3.0.2
 urllib3==1.23
 GitPython==2.1.11

From 74c8015b00d1ee5aa626e146967b1371caf2098f Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 16 Nov 2018 08:22:03 +0000
Subject: [PATCH 60/64] bumped to version 10.1.63

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

diff --git a/frappe/__init__.py b/frappe/__init__.py
index ace5746720..df81841011 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.62'
+__version__ = '10.1.63'
 __title__ = "Frappe Framework"
 
 local = Local()

From 543ccc3df7fb35b15114ed46ec2d060bccc39786 Mon Sep 17 00:00:00 2001
From: Frappe Bot <developers@frappe.io>
Date: Fri, 16 Nov 2018 08:32:18 +0000
Subject: [PATCH 61/64] bumped to version 11.0.3-beta.28

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index edd2a4f410..d8610c8b87 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.27'
+staging_version = '11.0.3-beta.28'
 
 app_email = "info@frappe.io"
 

From 47097bb15bd4ac5b3503079c52f90804c3bb7b5d Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Fri, 16 Nov 2018 15:15:31 +0530
Subject: [PATCH 62/64] fix: requirements

---
 requirements.txt | 94 +++++++++++++++++++++++++-----------------------
 1 file changed, 50 insertions(+), 44 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 91e57e2f19..2638812e30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,53 +1,59 @@
-boto3==1.9.45
-chardet==3.0.4
-cssmin==0.2.0
-dropbox==7.3.1
-gunicorn==19.9.0
-httplib2==0.12.0
-jinja2==2.10
-markdown2==2.3.6
-markupsafe==1.1.0
-PyMySQL==0.9.2
-python-geoip==1.2
-python-geoip-geolite2==2015.303
-python-dateutil==2.7.5
-pytz==2018.7
-six==1.11.0
-termcolor==1.1.0
-werkzeug==0.14.1
-semantic_version==2.6.0
+boto3
+chardet
+dropbox==9.1.0
+gunicorn
+jinja2
+markdown2==2.3.5
+PyMySQL
+maxminddb-geolite2
+python-dateutil
+pytz
+six
+werkzeug
+semantic_version
 rauth>=0.6.2
-requests==2.20.1
+requests
 redis==2.10.6
-selenium==3.141.0
-babel==2.6.0
-ipython==5.8.0
+selenium
+babel
+ipython
 html2text==2016.9.19
-email_reply_parser==0.5.9
-click==7.0
+email_reply_parser
+click
 num2words==0.5.5
 watchdog==0.8.0
 bleach==2.1.4
-bleach-whitelist==0.0.9
-Pillow==5.3.0
-beautifulsoup4==4.6.3
+bleach-whitelist
+Pillow
+beautifulsoup4
 rq==0.12.0
-schedule==0.5.0
-cryptography==2.4.1
-pyopenssl==18.0.0
-ndg-httpsclient==0.5.1
-pyasn1==0.4.4
-zxcvbn-python==4.4.24
-unittest-xml-reporting==2.2.0
-oauthlib==2.1.0
-PyJWT==1.6.4
-PyPDF2==1.26.0
-openpyxl==2.5.10
-pyotp==2.2.7
-pyqrcode==1.2.1
-pypng==0.0.18
-premailer==3.2.0
-croniter==0.3.26
-googlemaps==3.0.2
+schedule
+cryptography
+pyopenssl
+ndg-httpsclient
+pyasn1
+zxcvbn-python
+unittest-xml-reporting
+oauthlib
+pdfkit
+PyJWT
+PyPDF2
+openpyxl
+pyotp
+pyqrcode
+pypng
+premailer
+croniter
+googlemaps
+braintree
+future
+passlib
+google-api-python-client
+google-auth
+google-auth-httplib2
+google-auth-oauthlib
+faker
+stripe
+coverage
 urllib3==1.23
 GitPython==2.1.11

From 5c54c5843e6c616f8b0053f2dc10531dd8c6d0ee Mon Sep 17 00:00:00 2001
From: Ameya Shenoy <shenoy.ameya@gmail.com>
Date: Fri, 16 Nov 2018 09:49:41 +0000
Subject: [PATCH 63/64] bumped to version 11.0.3-beta.29

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

diff --git a/frappe/hooks.py b/frappe/hooks.py
index d8610c8b87..ab03106828 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 
 develop_version = '12.x.x-develop'
-staging_version = '11.0.3-beta.28'
+staging_version = '11.0.3-beta.29'
 
 app_email = "info@frappe.io"
 

From d74da75a8d811cf9fa37455fddecad6dff5ecedf Mon Sep 17 00:00:00 2001
From: Shreya Shah <shreyashah115@gmail.com>
Date: Tue, 20 Nov 2018 15:57:21 +0530
Subject: [PATCH 64/64] fix: Add download with data checkbox (#6494)

---
 frappe/core/doctype/data_import/data_import.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 36c2488aab..6177aaf86f 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -200,6 +200,13 @@ frappe.data_import.download_dialog = function(frm) {
 			"options": "Excel\nCSV",
 			"default": "Excel"
 		},
+		{
+			"label": __("Download with Data"),
+			"fieldname": "with_data",
+			"fieldtype": "Check",
+			"hidden": !frm.doc.overwrite,
+			"default": 1
+		},
 		{
 			"label": __("Select All"),
 			"fieldname": "select_all",
@@ -270,7 +277,7 @@ frappe.data_import.download_dialog = function(frm) {
 						doctype: frm.doc.reference_doctype,
 						parent_doctype: frm.doc.reference_doctype,
 						select_columns: JSON.stringify(columns),
-						with_data: frm.doc.overwrite,
+						with_data: frm.doc.overwrite && data.with_data,
 						all_doctypes: true,
 						file_type: data.file_type,
 						template: true