changed user_roles to roles
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 400b076..8b93211 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -171,7 +171,7 @@
return ss
-def setup_user_roles():
+def setup_roles():
user = frappe.get_doc('User', 'demo@erpnext.com')
user.add_roles('HR User', 'HR Manager', 'Accounts User', 'Accounts Manager',
'Stock User', 'Stock Manager', 'Sales User', 'Sales Manager', 'Purchase User',
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index afa21e0..13aa524 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -66,7 +66,7 @@
user = frappe.get_doc("User", self.user_id)
user.flags.ignore_permissions = True
- if "Employee" not in user.get("user_roles"):
+ if "Employee" not in user.get("roles"):
user.add_roles("Employee")
# copy details like Fullname, DOB and Image to User
@@ -186,14 +186,14 @@
def validate_employee_role(doc, method):
# called via User hook
- if "Employee" in [d.role for d in doc.get("user_roles")]:
+ if "Employee" in [d.role for d in doc.get("roles")]:
if not frappe.db.get_value("Employee", {"user_id": doc.name}):
frappe.msgprint(_("Please set User ID field in an Employee record to set Employee Role"))
- doc.get("user_roles").remove(doc.get("user_roles", {"role": "Employee"})[0])
+ doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
def update_user_permissions(doc, method):
# called via User hook
- if "Employee" in [d.role for d in doc.get("user_roles")]:
+ if "Employee" in [d.role for d in doc.get("roles")]:
employee = frappe.get_doc("Employee", {"user_id": doc.name})
employee.update_user_permissions()
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 7d19051..4961208 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -107,7 +107,7 @@
cur_frm.cscript.set_help = function(doc) {
cur_frm.set_intro("");
- if(doc.__islocal && !in_list(user_roles, "HR User")) {
+ if(doc.__islocal && !in_list(roles, "HR User")) {
cur_frm.set_intro(__("Fill the form and save it"))
} else {
if(doc.docstatus==0 && doc.approval_status=="Draft") {
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index ce20396..f2d1ec9 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -176,7 +176,7 @@
"email": user,
"first_name": user,
"new_password": "password",
- "user_roles": [{"doctype": "UserRole", "role": "Employee"}]
+ "roles": [{"doctype": "UserRole", "role": "Employee"}]
}).insert()
if not frappe.db.get_value("Employee", {"user_id": user}):
diff --git a/erpnext/hr/doctype/salary_structure/test_salary_structure.py b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
index 7270ab7..266165b 100644
--- a/erpnext/hr/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
@@ -52,7 +52,7 @@
"email": user,
"first_name": user,
"new_password": "password",
- "user_roles": [{"doctype": "UserRole", "role": "Employee"}]
+ "roles": [{"doctype": "UserRole", "role": "Employee"}]
}).insert()
diff --git a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py b/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
index bed8e2b..29a6e61 100644
--- a/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
+++ b/erpnext/patches/v4_0/remove_employee_role_if_no_employee.py
@@ -11,8 +11,8 @@
if not frappe.db.get_value("Employee", {"user_id": user}):
try:
user = frappe.get_doc("User", user)
- for role in user.get("user_roles", {"role": "Employee"}):
- user.get("user_roles").remove(role)
+ for role in user.get("roles", {"role": "Employee"}):
+ user.get("roles").remove(role)
user.save()
except frappe.DoesNotExistError:
pass
diff --git a/erpnext/patches/v5_0/newsletter.py b/erpnext/patches/v5_0/newsletter.py
index c03664b..b5e4de0 100644
--- a/erpnext/patches/v5_0/newsletter.py
+++ b/erpnext/patches/v5_0/newsletter.py
@@ -22,7 +22,7 @@
for userrole in frappe.get_all("UserRole", "parent", {"role": "Sales Manager"}):
if frappe.db.exists("User", userrole.parent):
user = frappe.get_doc("User", userrole.parent)
- user.append("user_roles", {
+ user.append("roles", {
"doctype": "UserRole",
"role": "Newsletter Manager"
})