changed user_roles to roles

erpnext/demo/setup/setup_data.py

@@ -171,7 +171,7 @@ def setup_salary_structure(employees, salary_slip_based_on_timesheet=0):
 
 	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',

erpnext/hr/doctype/employee/employee.py

@@ -66,7 +66,7 @@ class Employee(Document):
 		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 get_retirement_date(date_of_birth=None):
 
 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()
 

erpnext/hr/doctype/expense_claim/expense_claim.js

@@ -107,7 +107,7 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
 
 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") {

erpnext/hr/doctype/salary_slip/test_salary_slip.py

@@ -176,7 +176,7 @@ class TestSalarySlip(unittest.TestCase):
 				"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}):

erpnext/hr/doctype/salary_structure/test_salary_structure.py

@@ -52,7 +52,7 @@ def make_employee(user):
 			"email": user,
 			"first_name": user,
 			"new_password": "password",
-			"user_roles": [{"doctype": "UserRole", "role": "Employee"}]
+			"roles": [{"doctype": "UserRole", "role": "Employee"}]
 		}).insert()
 		
 

erpnext/patches/v4_0/remove_employee_role_if_no_employee.py

@@ -11,8 +11,8 @@ def execute():
 		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"}):
+				for role in user.get("roles", {"role": "Employee"}):
-					user.get("user_roles").remove(role)
+					user.get("roles").remove(role)
 				user.save()
 			except frappe.DoesNotExistError:
 				pass

erpnext/patches/v5_0/newsletter.py

@@ -22,7 +22,7 @@ def execute():
 	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"
 			})