Merge branch 'master' into staging-fixes

frappe/__init__.py

@@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
 
-__version__ = '10.1.47'
+__version__ = '10.1.48'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/doctype/doctype.py

@@ -514,6 +514,9 @@ def validate_fields(meta):
 				options = frappe.db.get_value("DocType", d.options, "name")
 				if not options:
 					frappe.throw(_("Options must be a valid DocType for field {0} in row {1}").format(d.label, d.idx))
+				elif not (options == d.options):
+					frappe.throw(_("Options {0} must be the same as doctype name {1} for the field {2}")
+						.format(d.options, options, d.label))
 				else:
 					# fix case
 					d.options = options

frappe/public/js/frappe/model/perm.js

@@ -115,6 +115,7 @@ $.extend(frappe.perm, {
 				let permlevel = cint(p.permlevel);
 				if (!perm[permlevel]) {
 					perm[permlevel] = {};
+					perm[permlevel]["permlevel"] = permlevel
 				}
 
 				$.each(frappe.perm.rights, (i, key) => {