Merge branch 'develop' into fix-format-date-dashboard-charts

frappe/client.py

@@ -100,7 +100,7 @@ def get_value(doctype, fieldname, filters=None, as_dict=True, debug=False, paren
 	if frappe.is_table(doctype):
 		check_parent_permission(parent, doctype)
 
-	if not frappe.has_permission(doctype):
+	if not frappe.has_permission(doctype, parent_doctype=parent):
 		frappe.throw(_("No permission for {0}").format(doctype), frappe.PermissionError)
 
 	filters = get_safe_filters(filters)

frappe/core/doctype/logs_to_clear/logs_to_clear.json

@@ -1,6 +1,6 @@
 {
  "actions": [],
- "autoname": "autoincrement",
+ "autoname": "hash",
  "creation": "2022-06-11 02:02:39.472511",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -35,10 +35,9 @@
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Logs To Clear",
- "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

frappe/public/js/frappe/form/sidebar/user_image.js

@@ -65,15 +65,17 @@ frappe.ui.form.setup_user_image_event = function(frm) {
 		});
 	}
 
-	frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
-		let $target = $(e.currentTarget);
-		if ($target.is('a.dropdown-toggle, .dropdown')) {
-			return;
-		}
-		let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
-		dropdown.toggleClass('open');
-		e.stopPropagation();
-	});
+	if (frm.meta.image_field && !frm.fields_dict[frm.meta.image_field].df.read_only) {
+		frm.sidebar.image_wrapper.on('click', ':not(.sidebar-image-actions)', (e) => {
+			let $target = $(e.currentTarget);
+			if ($target.is('a.dropdown-toggle, .dropdown')) {
+				return;
+			}
+			let dropdown = frm.sidebar.image_wrapper.find('.sidebar-image-actions .dropdown');
+			dropdown.toggleClass('open');
+			e.stopPropagation();
+		});
+	}
 
 	// bind click on image_wrapper
 	frm.sidebar.image_wrapper.on('click', '.sidebar-image-change, .sidebar-image-remove', function(e) {

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

@@ -78,7 +78,7 @@ export default class Tab {
 
 	set_active() {
 		this.parent.find('.nav-link').tab('show');
-		this.wrapper.addClass('show');
+		this.wrapper.addClass('active');
 		this.frm.active_tab = this;
 	}
 

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

@@ -191,7 +191,7 @@ $.extend(frappe.datetime, {
 	global_date_format: function(d) {
 		var m = moment(d);
 		if(m._f && m._f.indexOf("HH")!== -1) {
-			return m.format("Do MMMM YYYY, h:mma")
+			return m.format("Do MMMM YYYY, hh:mm A");
 		} else {
 			return m.format('Do MMMM YYYY');
 		}