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

chore: release v15

Author: ruchamahabal

.github/helper/install.sh

@@ -42,11 +42,13 @@ sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
 bench get-app payments --branch ${BRANCH_TO_CLONE%"-hotfix"}
 bench get-app https://github.com/frappe/erpnext --branch "$BRANCH_TO_CLONE" --resolve-deps
+bench get-app https://github.com/frappe/lending --branch ${BRANCH_TO_CLONE%"-hotfix"}
 bench get-app hrms "${GITHUB_WORKSPACE}"
 bench setup requirements --dev
 
 bench start &>> ~/frappe-bench/bench_start.log &
 CI=Yes bench build --app frappe &
 bench --site test_site reinstall --yes
 
-bench --verbose --site test_site install-app hrms
+bench --verbose --site test_site install-app lending
+bench --verbose --site test_site install-app hrms

hrms/hr/doctype/leave_application/leave_application.py

@@ -497,7 +497,13 @@ def _get_first_from_date(reference_date):
 			prev_date = add_days(reference_date, -1)
 			application = frappe.db.get_value(
 				"Leave Application",
-				{"employee": self.employee, "leave_type": self.leave_type, "to_date": prev_date},
+				{
+					"employee": self.employee,
+					"leave_type": self.leave_type,
+					"to_date": prev_date,
+					"docstatus": ["!=", 2],
+					"status": ["in", ["Open", "Approved"]],
+				},
 				["name", "from_date"],
 				as_dict=True,
 			)
@@ -511,7 +517,13 @@ def _get_last_to_date(reference_date):
 			next_date = add_days(reference_date, 1)
 			application = frappe.db.get_value(
 				"Leave Application",
-				{"employee": self.employee, "leave_type": self.leave_type, "from_date": next_date},
+				{
+					"employee": self.employee,
+					"leave_type": self.leave_type,
+					"from_date": next_date,
+					"docstatus": ["!=", 2],
+					"status": ["in", ["Open", "Approved"]],
+				},
 				["name", "to_date"],
 				as_dict=True,
 			)
@@ -588,7 +600,7 @@ def notify_employee(self):
 			frappe.msgprint(_("Please set default template for Leave Status Notification in HR Settings."))
 			return
 		email_template = frappe.get_doc("Email Template", template)
-		message = frappe.render_template(email_template.response, args)
+		message = frappe.render_template(email_template.response_, args)
 
 		self.notify(
 			{
@@ -613,7 +625,7 @@ def notify_leave_approver(self):
 				)
 				return
 			email_template = frappe.get_doc("Email Template", template)
-			message = frappe.render_template(email_template.response, args)
+			message = frappe.render_template(email_template.response_, args)
 
 			self.notify(
 				{

hrms/hr/employee_property_update.js

@@ -57,7 +57,7 @@ frappe.ui.form.on(cur_frm.doctype, {
 			frappe.model.with_doctype("Employee", () => {
 				const field_label_map = {};
 				frappe.get_meta("Employee").fields.forEach(d => {
-					field_label_map[d.fieldname] = __(d.label) + ` (${d.fieldname})`;
+					field_label_map[d.fieldname] = __(d.label, null, d.parent) + ` (${d.fieldname})`;
 					if (
 						!in_list(exclude_field_types, d.fieldtype)
 						&& !in_list(exclude_fields, d.fieldname)

hrms/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py

@@ -512,7 +512,7 @@ def get_attendance_status_for_detailed_view(
 				status = get_holiday_status(day, holidays)
 
 			abbr = status_map.get(status, "")
-			row[day] = abbr
+			row[cstr(day)] = abbr
 
 		attendance_values.append(row)
 

hrms/hr/report/monthly_attendance_sheet/test_monthly_attendance_sheet.py

@@ -89,14 +89,14 @@ def test_detailed_view(self):
 		row_without_shift = report[1][1]
 
 		self.assertEqual(day_shift_row["shift"], "Day Shift")
-		self.assertEqual(day_shift_row[1], "A")  # absent on the 1st day of the month
-		self.assertEqual(day_shift_row[2], "P")  # present on the 2nd day
+		self.assertEqual(day_shift_row["1"], "A")  # absent on the 1st day of the month
+		self.assertEqual(day_shift_row["2"], "P")  # present on the 2nd day
 
 		self.assertEqual(row_without_shift["shift"], "")
-		self.assertEqual(row_without_shift[4], "P")  # present on the 4th day
+		self.assertEqual(row_without_shift["4"], "P")  # present on the 4th day
 
 		# leave should be shown against every shift
-		self.assertTrue(day_shift_row[3] == row_without_shift[3] == "L")
+		self.assertTrue(day_shift_row["3"] == row_without_shift["3"] == "L")
 
 	@set_holiday_list("Salary Slip Test Holiday List", "_Test Company")
 	def test_single_shift_with_leaves_in_detailed_view(self):
@@ -125,9 +125,9 @@ def test_single_shift_with_leaves_in_detailed_view(self):
 		day_shift_row = report[1][0]
 
 		self.assertEqual(day_shift_row["shift"], "Day Shift")
-		self.assertEqual(day_shift_row[1], "A")  # absent on the 1st day of the month
-		self.assertEqual(day_shift_row[2], "P")  # present on the 2nd day
-		self.assertEqual(day_shift_row[3], "L")  # leave on the 3rd day
+		self.assertEqual(day_shift_row["1"], "A")  # absent on the 1st day of the month
+		self.assertEqual(day_shift_row["2"], "P")  # present on the 2nd day
+		self.assertEqual(day_shift_row["3"], "L")  # leave on the 3rd day
 
 	@set_holiday_list("Salary Slip Test Holiday List", "_Test Company")
 	def test_single_leave_record(self):
@@ -150,7 +150,7 @@ def test_single_leave_record(self):
 		row = report[1][0]
 
 		self.assertIsNone(row["shift"])
-		self.assertEqual(row[1], "L")
+		self.assertEqual(row["1"], "L")
 
 	@set_holiday_list("Salary Slip Test Holiday List", "_Test Company")
 	def test_summarized_view(self):
@@ -233,12 +233,12 @@ def test_attendance_with_group_by_filter(self):
 		row_without_shift = report[1][2]
 
 		self.assertEqual(day_shift_row["shift"], "Day Shift")
-		self.assertEqual(day_shift_row[1], "A")  # absent on the 1st day of the month
-		self.assertEqual(day_shift_row[2], "P")  # present on the 2nd day
+		self.assertEqual(day_shift_row["1"], "A")  # absent on the 1st day of the month
+		self.assertEqual(day_shift_row["2"], "P")  # present on the 2nd day
 
 		self.assertEqual(row_without_shift["shift"], "")
-		self.assertEqual(row_without_shift[3], "L")  # on leave on the 3rd day
-		self.assertEqual(row_without_shift[4], "P")  # present on the 4th day
+		self.assertEqual(row_without_shift["3"], "L")  # on leave on the 3rd day
+		self.assertEqual(row_without_shift["4"], "P")  # present on the 4th day
 
 	def test_attendance_with_employee_filter(self):
 		previous_month_first = get_first_day_for_prev_month()

hrms/payroll/doctype/payroll_entry/test_payroll_entry.py

@@ -770,6 +770,7 @@ def setup_lending():
 	from lending.loan_management.doctype.loan.test_loan import (
 		create_loan_accounts,
 		create_loan_product,
+		set_loan_settings_in_company,
 	)
 
 	company = "_Test Company"
@@ -778,6 +779,7 @@ def setup_lending():
 	if not frappe.db.exists("Branch", branch):
 		frappe.get_doc({"doctype": "Branch", "branch": branch}).insert()
 
+	set_loan_settings_in_company(company)
 	applicant = make_employee("[email protected]", company="_Test Company", branch=branch)
 	company_doc = frappe.get_doc("Company", company)
 
@@ -797,7 +799,6 @@ def setup_lending():
 			500000,
 			8.4,
 			is_term_loan=1,
-			mode_of_payment="Cash",
 			disbursement_account="Disbursement Account - _TC",
 			payment_account="Payment Account - _TC",
 			loan_account="Loan Account - _TC",

hrms/payroll/doctype/salary_slip/test_salary_slip.py

@@ -674,13 +674,15 @@ def test_loan_repayment_salary_slip(self):
 			create_loan_accounts,
 			create_loan_product,
 			make_loan_disbursement_entry,
+			set_loan_settings_in_company,
 		)
 		from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
 			process_loan_interest_accrual_for_term_loans,
 		)
 
 		from hrms.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
 
+		set_loan_settings_in_company("_Test Company")
 		applicant = make_employee("[email protected]", company="_Test Company")
 
 		create_loan_accounts()
@@ -691,7 +693,6 @@ def test_loan_repayment_salary_slip(self):
 			500000,
 			8.4,
 			is_term_loan=1,
-			mode_of_payment="Cash",
 			disbursement_account="Disbursement Account - _TC",
 			payment_account="Payment Account - _TC",
 			loan_account="Loan Account - _TC",
@@ -708,6 +709,7 @@ def test_loan_repayment_salary_slip(self):
 			employee=applicant,
 			currency="INR",
 			payroll_period=payroll_period,
+			company="_Test Company",
 		)
 
 		frappe.db.sql(
@@ -770,9 +772,10 @@ def test_loan_write_off_salary_slip(self):
 		from lending.loan_management.doctype.loan.test_loan import (
 			create_loan,
 			create_loan_accounts,
-			create_loan_type,
+			create_loan_product,
 			create_repayment_entry,
 			make_loan_disbursement_entry,
+			set_loan_settings_in_company,
 		)
 		from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
 			process_loan_interest_accrual_for_term_loans,
@@ -781,15 +784,18 @@ def test_loan_write_off_salary_slip(self):
 		from hrms.payroll.doctype.salary_structure.test_salary_structure import make_salary_structure
 
 		applicant = make_employee("[email protected]", company="_Test Company")
+		frappe.db.delete("Loan", {"applicant": applicant})
+		frappe.db.delete("Loan Application", {"applicant": applicant})
+		set_loan_settings_in_company("_Test Company")
 
 		create_loan_accounts()
 
-		create_loan_type(
+		create_loan_product(
+			"Personal Loan",
 			"Personal Loan",
 			12000,
 			0,
 			is_term_loan=1,
-			mode_of_payment="Cash",
 			disbursement_account="Disbursement Account - _TC",
 			payment_account="Payment Account - _TC",
 			loan_account="Loan Account - _TC",
@@ -807,18 +813,17 @@ def test_loan_write_off_salary_slip(self):
 			company="_Test Company",
 			currency="INR",
 			payroll_period=payroll_period,
+			from_date=payroll_period.start_date,
 		)
 
-		frappe.db.sql(
-			"delete from tabLoan where applicant = '[email protected]'"
-		)
 		loan = create_loan(
 			applicant,
 			"Personal Loan",
 			12000,
 			"Repay Over Number of Periods",
 			12,
 			posting_date=payroll_period.start_date,
+			repayment_start_date=payroll_period.start_date,
 		)
 		loan.repay_from_salary = 1
 		loan.submit()
@@ -1650,10 +1655,13 @@ def make_employee_salary_slip(emp_id, payroll_frequency, salary_structure=None,
 	salary_slip_name = frappe.db.get_value("Salary Slip", {"employee": emp_id})
 
 	if not salary_slip_name:
-		salary_slip = make_salary_slip(salary_structure_doc.name, employee=employee.name)
+		date = posting_date or nowdate()
+		salary_slip = make_salary_slip(
+			salary_structure_doc.name, employee=employee.name, posting_date=date
+		)
 		salary_slip.employee_name = employee.employee_name
 		salary_slip.payroll_frequency = payroll_frequency
-		salary_slip.posting_date = posting_date or nowdate()
+		salary_slip.posting_date = date
 		salary_slip.insert()
 	else:
 		salary_slip = frappe.get_doc("Salary Slip", salary_slip_name)