update branch

frappe/core/doctype/activity_log/feed.py

@@ -67,7 +67,7 @@ def get_feed_match_conditions(user=None, doctype='Comment'):
 	user_permissions = frappe.permissions.get_user_permissions(user)
 	can_read = frappe.get_user().get_can_read()
 
-	can_read_doctypes = ["'{}'".format(doctype) for doctype in
+	can_read_doctypes = ["'{}'".format(dt) for dt in
 		list(set(can_read) - set(list(user_permissions)))]
 
 	if can_read_doctypes:

frappe/desk/query_report.py

@@ -255,8 +255,11 @@ def get_prepared_report_result(report, filters, dn="", user=None):
 			uncompressed_content = gzip_decompress(compressed_content)
 			data = json.loads(uncompressed_content)
 			if data:
+				columns = json.loads(doc.columns) if doc.columns else data[0]
+				for column in columns:
+					column["label"] = _(column["label"])
 				latest_report_data = {
-					"columns": json.loads(doc.columns) if doc.columns else data[0],
+					"columns": columns,
 					"result": data
 				}
 		except Exception:

frappe/public/js/frappe/form/controls/link.js

@@ -167,6 +167,28 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 						return;
 					}
 
+					if (args.filters) {
+						let filter_string = [];
+						for (let [key, value] of Object.entries(args.filters)) {
+
+							if (Array.isArray(value)){
+								filter_string.push(frappe.model.unscrub(key) + " "+value[0]+" "+value[1]);
+							} else {
+								filter_string.push(frappe.model.unscrub(key) + " as " + value);
+							}
+						}
+
+						filter_string = "Filters applied for " + filter_string.join(", ");
+
+						r.results.push({
+							label: "<span class='text-muted disable-select' style='line-height: 15px;'>"
+								+ __("{0}", [filter_string])
+								+ "</span>",
+							value: "",
+							action: undefined
+						});
+					}
+
 					if(!me.df.only_select) {
 						if(frappe.model.can_create(doctype)) {
 							// new item
@@ -213,6 +235,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 		this.$input.on("awesomplete-open", function() {
 			me.$wrapper.css({"z-index": 100});
 			me.$wrapper.find('ul').css({"z-index": 100});
+			me.$wrapper.find('.disable-select').parents('li').css({"pointer-events": "none"});
 			me.autocomplete_open = true;
 		});
 

frappe/public/js/frappe/form/form.js

@@ -1186,8 +1186,8 @@ frappe.ui.form.Form = class FrappeForm {
 		this.perm = perm;
 	}
 
-	trigger(event) {
-		return this.script_manager.trigger(event);
+	trigger(event, doctype, docname) {
+		return this.script_manager.trigger(event, doctype, docname);
 	}
 
 	get_formatted(fieldname) {

frappe/public/js/frappe/form/sidebar/form_sidebar.js

@@ -178,8 +178,8 @@ frappe.ui.form.Sidebar = Class.extend({
 		frappe.call({
 			method: "frappe.desk.form.load.get_docinfo",
 			args: {
-				doctype: this.doctype,
-				name: this.doc.name
+				doctype: this.frm.doctype,
+				name: this.frm.docname
 			},
 			callback: (r) => {
 				// docinfo will be synced

frappe/public/js/frappe/ui/dialog.js

@@ -62,6 +62,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
 		}
 
 		if (this.minimizable) {
+			this.header.find('.modal-title').click(() => this.toggle_minimize());
 			this.get_minimize_btn().removeClass('hide').on('click', () => this.toggle_minimize());
 		}
 
@@ -193,6 +194,7 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
 		this.get_minimize_btn().find('i').toggleClass('octicon-chevron-down').toggleClass('octicon-chevron-up');
 		this.is_minimized = !this.is_minimized;
 		this.on_minimize_toggle && this.on_minimize_toggle(this.is_minimized);
+		this.header.find('.modal-title').toggleClass('cursor-pointer');
 	}
 };
 

frappe/public/js/frappe/utils/utils.js

@@ -639,10 +639,10 @@ Object.assign(frappe.utils, {
 			if (callNow) func.apply(context, args);
 		};
 	},
-	get_form_link: function(doctype, name, html = false) {
+	get_form_link: function(doctype, name, html = false, display_text = null) {
 		const route = ['#Form', doctype, name].join('/');
 		if (html) {
-			return `<a href="${route}">${name}</a>`;
+			return `<a href="${route}">${display_text || name}</a>`;
 		}
 		return route;
 	},

frappe/public/js/frappe/views/kanban/kanban_view.js

@@ -58,7 +58,7 @@ frappe.views.KanbanView = class KanbanView extends frappe.views.ListView {
 	}
 
 	setup_view() {
-
+		this.setup_realtime_updates();
 	}
 
 	set_fields() {

frappe/social/doctype/energy_point_log/energy_point_log.py

@@ -241,10 +241,9 @@ def send_summary(timespan):
 
 	if not is_energy_point_enabled():
 		return
-
-	from_date = frappe.utils.add_days(None, -7)
+	from_date = frappe.utils.add_to_date(None, weeks=-1)
 	if timespan == 'Monthly':
-		from_date = frappe.utils.add_days(None, -30)
+		from_date = frappe.utils.add_to_date(None, months=-1)
 
 	user_points = get_user_energy_and_review_points(from_date=from_date, as_dict=False)
 

frappe/utils/data.py

@@ -182,6 +182,9 @@ def get_first_day(dt, d_years=0, d_months=0):
 
 	return datetime.date(year, month + 1, 1)
 
+def get_first_day_of_week(dt):
+	return dt - datetime.timedelta(days=dt.weekday())
+
 def get_last_day(dt):
 	"""
 	 Returns last day of the month using:

package.json

@@ -25,7 +25,7 @@
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
     "frappe-charts": "^1.2.0",
-    "frappe-datatable": "^1.13.2",
+    "frappe-datatable": "^1.13.3",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
     "highlight.js": "^9.12.0",

yarn.lock

@@ -1758,10 +1758,10 @@ frappe-charts@^1.2.0:
   resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.0.tgz#05616e656825e6736b5f617a16c6e1a8ce76d0c2"
   integrity sha512-yj47OIDaU9BCpV3gpcLE1rG5r0gCPPr3DUzwxG2DQj9vGLcLRHmNixmsF9pXZOOiOy1M/UeBrCL7l9I0JoGzMQ==
 
-frappe-datatable@^1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.2.tgz#8b36c7cfc0ea660fc72eea8b1ae3c5dcc2a7d67d"
-  integrity sha512-4PyPDX22K4e4S3WGlLQx3oyxIW+ENsbGiN9L6aUpmjU+fOCC7J/FfSwGKdua2f+4yD+2ObpkyJYazBl3inAeCA==
+frappe-datatable@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.13.3.tgz#14036f3eb40ddec9a1cd303747e7d6378b3a596d"
+  integrity sha512-9uSk35ELiwRPrR1OZeSR+MdN82Vz32vssw8z/YYPYAbJTjqpraMVsjztBbqfIyDYTmxnG0MHSWp8HOgxeTphqA==
   dependencies:
     hyperlist "^1.0.0-beta"
     lodash "^4.17.5"