Merge pull request #4175 from frappe/version-15-hotfix

Author: asmitahase

hrms/api/__init__.py

@@ -705,9 +705,11 @@ def get_doctype_states(doctype: str) -> dict:
 # File
 @frappe.whitelist()
 def get_attachments(dt: str, dn: str):
-	from frappe.desk.form.load import get_attachments
-
-	return get_attachments(dt, dn)
+	return frappe.get_list(
+		"File",
+		fields=["name", "file_name", "file_url", "is_private"],
+		filters={"attached_to_name": str(dn), "attached_to_doctype": dt},
+	)
 
 
 @frappe.whitelist()

hrms/patches/v15_0/add_leave_type_permission_for_ess.py

@@ -2,6 +2,10 @@
 
 
 def execute():
+	usertype = frappe.get_all("User Type", filters={"name": "Employee Self Service"})
+	if not usertype:
+		return
+
 	doc = frappe.get_doc("User Type", "Employee Self Service")
 
 	existing = {d.document_type for d in doc.user_doctypes}

hrms/payroll/doctype/bulk_salary_structure_assignment/test_bulk_salary_structure_assignment.py

@@ -17,19 +17,19 @@
 class TestBulkSalaryStructureAssignment(FrappeTestCase):
 	def setUp(self):
 		create_company()
-		create_department("Accounts")
+		self.department = create_department("Accounts")
 		self.grade = create_employee_grade("Test Grade")
 
 		# employee grade with default base pay 50000
 		self.emp1 = make_employee(
-			"employee1@bssa.com", company="_Test Company", department="Accounts", grade="Test Grade"
+			"employee1@bssa.com", company="_Test Company", department=self.department, grade=self.grade.name
 		)
-		self.emp2 = make_employee("employee2@bssa.com", company="_Test Company", department="Accounts")
-		self.emp3 = make_employee("employee3@bssa.com", company="_Test Company", department="Accounts")
+		self.emp2 = make_employee("employee2@bssa.com", company="_Test Company", department=self.department)
+		self.emp3 = make_employee("employee3@bssa.com", company="_Test Company", department=self.department)
 		# no department
 		self.emp4 = make_employee("employee4@bssa.com", company="_Test Company")
 		# different domain in employee_name
-		self.emp5 = make_employee("employee5@test.com", company="_Test Company", department="Accounts")
+		self.emp5 = make_employee("employee5@test.com", company="_Test Company", department=self.department)
 
 	def tearDown(self):
 		frappe.db.rollback()
@@ -43,7 +43,7 @@ def test_get_employees(self):
 		args = {
 			"doctype": "Bulk Salary Structure Assignment",
 			"from_date": today,
-			"department": "Accounts",
+			"department": self.department,
 		}
 		bulk_assignment = BulkSalaryStructureAssignment(args)