fix: correct bank entry calculation and update the testcase

(cherry picked from commit 44cdcc7)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/test_payroll_entry.py

hrms/payroll/doctype/payroll_entry/payroll_entry.py

@@ -923,10 +923,8 @@ def make_bank_entry(self, for_withheld_salaries=False):
 
 					salary_slip_total -= salary_detail.amount
 
-		total_loan_repayment = sum(
-			flt(slip.get("total_loan_repayment", 0))
-			for slip in {slip["name"]: slip for slip in salary_slips}.values()
-		)
+		unique_salary_slips = {slip["name"]: slip for slip in salary_slips}.values()
+		total_loan_repayment = sum(flt(slip.get("total_loan_repayment", 0)) for slip in unique_salary_slips)
 		salary_slip_total -= total_loan_repayment
 
 		bank_entry = None

hrms/payroll/doctype/payroll_entry/test_payroll_entry.py

@@ -4,8 +4,13 @@
 from dateutil.relativedelta import relativedelta
 
 import frappe
+<<<<<<< HEAD
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, add_months, cstr
+=======
+from frappe.tests import IntegrationTestCase, change_settings
+from frappe.utils import add_days, add_months, cstr, flt
+>>>>>>> 44cdcc7df (fix: correct bank entry calculation and update the testcase)
 
 import erpnext
 from erpnext.accounts.utils import get_fiscal_year, getdate, nowdate
@@ -749,9 +754,20 @@ def test_loan_repayment_from_salary(self):
 			total_loan_repayment=loan.monthly_repayment_amount,
 		)
 
+		salary_slip_name = frappe.db.get_value("Salary Slip", {"payroll_entry": payroll_entry.name}, "name")
+		salary_slip = frappe.get_doc("Salary Slip", salary_slip_name)
+		payroll_entry.reload()
+
+		initial_gross_pay = flt(salary_slip.gross_pay) - flt(salary_slip.total_deduction)
+		loan_repayment_amount = flt(salary_slip.total_loan_repayment)
+		expected_net_pay = initial_gross_pay - loan_repayment_amount
+
 		payroll_entry.make_bank_entry()
 		submit_bank_entry(payroll_entry.name)
 
+		salary_slip.reload()
+		self.assertEqual(salary_slip.net_pay, expected_net_pay)
+
 
 def get_payroll_entry(**args):
 	args = frappe._dict(args)