Fix: merge conflict

frappe/cache_manager.py

@@ -49,6 +49,10 @@ def clear_defaults_cache(user=None):
 	elif frappe.flags.in_install!="frappe":
 		frappe.cache().delete_key("defaults")
 
+def clear_document_cache():
+	frappe.local.document_cache = {}
+	frappe.cache().delete_key("document_cache")
+
 def clear_doctype_cache(doctype=None):
 	cache = frappe.cache()
 
@@ -82,3 +86,6 @@ def clear_doctype_cache(doctype=None):
 		for name in groups:
 			cache.delete_value(name)
 
+	# Clear all document's cache. To clear documents of a specific DocType document_cache should be restructured
+	clear_document_cache()
+

frappe/core/doctype/activity_log/feed.py

@@ -75,8 +75,8 @@ def get_feed_match_conditions(user=None, force=True):
 		if user_permissions:
 			can_read_docs = []
 			for doctype, obj in user_permissions.items():
-				for n in obj.get("docs", []):
-					can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n)))
+				for n in obj:
+					can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n.get('doc', ''))))
 
 			if can_read_docs:
 				conditions.append("concat_ws('|', `tabCommunication`.reference_doctype, `tabCommunication`.reference_name) in ({})".format(

frappe/desk/query_report.py

@@ -57,7 +57,7 @@ def generate_report_result(report, filters=None, user=None):
 		module = report.module or frappe.db.get_value("DocType", report.ref_doctype, "module")
 		if report.is_standard == "Yes":
 			method_name = get_report_module_dotted_path(module, report.name) + ".execute"
-			threshold = 10
+			threshold = 60
 			res = []
 
 			start_time = datetime.datetime.now()

frappe/public/js/frappe/form/footer/assign_to.js

@@ -103,6 +103,7 @@ frappe.ui.form.AssignTo = Class.extend({
 		}
 
 		me.assign_to.dialog.show();
+		me.assign_to = null;
 	},
 	remove: function(owner) {
 		var me = this;

frappe/public/js/frappe/form/footer/timeline_item.html

@@ -2,7 +2,7 @@
 	{% if (data.user_content) { %}
 	<span class="pull-left avatar avatar-medium hidden-xs" style="margin-top: 1px">
 		{% if(data.user_info.image) { %}
-		<div class="avatar-frame" style="background-image: url({%= data.user_info.image %})"></div>
+		<div class="avatar-frame" style="background-image: url(\'{%= data.user_info.image %}\')"></div>
 		{% } else { %}
 		<div class="standard-image" style="background-color: {{ data.user_info.color }}">
 			{{ data.user_info.abbr }}</div>
@@ -35,7 +35,7 @@
 			<div class="comment-header clearfix small {% if (data.edit || data.delete) { %} links-active {% } %}">
 				<span class="pull-left avatar avatar-small visible-xs">
 					{% if(data.user_info.image) { %}
-					<div class="avatar-frame" style="background-image: url({%= data.user_info.image %})"></div>
+					<div class="avatar-frame" style="background-image: url(\'{%= data.user_info.image %}\')"></div>
 					{% } else { %}
 					<div class="standard-image" style="background-color: {{ data.user_info.color }}">
 						{{ data.user_info.abbr }}</div>

frappe/public/js/frappe/views/reports/query_report.js

@@ -616,11 +616,24 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					{for_print: false, always_show_decimals: true}, data);
 			};
 
+			let compareFn = null;
+			if (column.fieldtype === 'Date') {
+				compareFn = (cell, keyword) => {
+					if (!cell.content) return null;
+					if (keyword.length !== 'YYYY-MM-DD'.length) return null;
+
+					const keywordValue = frappe.datetime.user_to_obj(keyword);
+					const cellValue = frappe.datetime.str_to_obj(cell.content);
+					return [+cellValue, +keywordValue];
+				};
+			}
+
 			return Object.assign(column, {
 				id: column.fieldname,
 				name: column.label,
 				width: parseInt(column.width) || null,
 				editable: false,
+				compareValue: compareFn,
 				format: (value, row, column, data) => {
 					if (this.report_settings.formatter) {
 						return this.report_settings.formatter(value, row, column, data, format_cell);

frappe/public/js/frappe/views/reports/report_view.js

@@ -823,6 +823,19 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		// child table column
 		const id = doctype !== this.doctype ? `${doctype}:${fieldname}` : fieldname;
 
+		let compareFn = null;
+		if (docfield.fieldtype === 'Date') {
+			compareFn = (cell, keyword) => {
+				if (!cell.content) return null;
+				if (keyword.length !== 'YYYY-MM-DD'.length) return null;
+
+				const keywordValue = frappe.datetime.user_to_obj(keyword);
+				const cellValue = frappe.datetime.str_to_obj(cell.content);
+				return [+cellValue, +keywordValue];
+			}
+		}
+
+
 		return {
 			id: id,
 			field: fieldname,
@@ -832,6 +845,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			width,
 			editable,
 			align,
+			compareValue: compareFn,
 			format: (value, row, column, data) => {
 				const d = row.reduce((acc, curr) => {
 					if (!curr.column.docfield) return acc;

package.json

@@ -22,7 +22,7 @@
     "awesomplete": "^1.1.2",
     "cookie": "^0.3.1",
     "express": "^4.16.2",
-    "frappe-datatable": "^1.7.3",
+    "frappe-datatable": "^1.8.0",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",

yarn.lock

@@ -1517,10 +1517,10 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
-frappe-datatable@^1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.7.3.tgz#dadddf01867723bf0862918dd62cfea4652416a3"
-  integrity sha512-72LUx0ZRRjFPLFQUzgB7Uywpxgk1rFLjyzOq5yQ5Mr2G8u0t3AoUJLRG2lAqFD49JOxezVb6Oa03Qmon1DCExA==
+frappe-datatable@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.8.0.tgz#7f789ed77bdf9800143fffb1bb28a24d5dbdc27c"
+  integrity sha512-j3DdmYtTjhcVXCVkYjKHdZOc8tSwZapanlujdx1xzXcL7Ueo+BFiPR5WptWRfH43K3nboh3m7clcAIX7LdQR4g==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"