diff --git a/frappe/__init__.py b/frappe/__init__.py index 2147eb69c7..efacd487f2 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.47' +__version__ = '10.1.48' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 3efbab2470..1548468245 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -464,6 +464,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 diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index 0bf62525e4..05899119ab 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -113,6 +113,7 @@ $.extend(frappe.perm, { var permlevel = cint(p.permlevel); if(!perm[permlevel]) { perm[permlevel] = {}; + perm[permlevel]["permlevel"] = permlevel } $.each(frappe.perm.rights, function(i, key) {