diff --git a/frappe/defaults.py b/frappe/defaults.py index 796965e597..3672bed511 100644 --- a/frappe/defaults.py +++ b/frappe/defaults.py @@ -190,7 +190,7 @@ def get_defaults_for(parent="__default"): # sort descending because first default must get precedence table = frappe.qb.DocType("DefaultValue") res = frappe.qb.from_(table).where(table.parent == parent) \ - .select(table.defkey, table.defvalue).orderby("creation").run(as_dict=True) + .select(table.defkey, table.defvalue).orderby("creation").run(as_dict=True) defaults = frappe._dict({}) for d in res: diff --git a/frappe/permissions.py b/frappe/permissions.py index 34fcbee1a8..494a0f1d14 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -354,7 +354,7 @@ def get_roles(user=None, with_standard=True): return [r[0] for r in frappe.qb.from_("Role").select("name").run()] # return all available roles else: table = frappe.qb.DocType("Has Role") - result = frappe.qb.form_(table).where(table.parent == user) \ + result = frappe.qb.from_(table).where(table.parent == user) \ .where(table.role.notin(["All", "Guest"])).select(table.role).run() return [r[0] for r in result] + ['All', 'Guest']