From a95c011a9355aa19ad751b7921f3b3c7de41c8d5 Mon Sep 17 00:00:00 2001 From: Alaa Alsalehi Date: Thu, 28 Jul 2022 10:52:07 +0300 Subject: [PATCH] fix: Reload loan Table in Salary Slip when change Employee (#31525) Co-authored-by: Rucha Mahabal Co-authored-by: bahaaabed Co-authored-by: newhr1 <104132586+newhr1@users.noreply.github.com> --- .../doctype/salary_slip/salary_slip.py | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index 8034f01bc63..4db0d2c366a 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -1363,23 +1363,22 @@ class SalarySlip(TransactionBase): self.total_interest_amount = 0 self.total_principal_amount = 0 - if not self.get("loans"): - for loan in self.get_loan_details(): + self.set("loans", []) + for loan in self.get_loan_details(): + amounts = calculate_amounts(loan.name, self.posting_date, "Regular Payment") - amounts = calculate_amounts(loan.name, self.posting_date, "Regular Payment") - - if amounts["interest_amount"] or amounts["payable_principal_amount"]: - self.append( - "loans", - { - "loan": loan.name, - "total_payment": amounts["interest_amount"] + amounts["payable_principal_amount"], - "interest_amount": amounts["interest_amount"], - "principal_amount": amounts["payable_principal_amount"], - "loan_account": loan.loan_account, - "interest_income_account": loan.interest_income_account, - }, - ) + if amounts["interest_amount"] or amounts["payable_principal_amount"]: + self.append( + "loans", + { + "loan": loan.name, + "total_payment": amounts["interest_amount"] + amounts["payable_principal_amount"], + "interest_amount": amounts["interest_amount"], + "principal_amount": amounts["payable_principal_amount"], + "loan_account": loan.loan_account, + "interest_income_account": loan.interest_income_account, + }, + ) for payment in self.get("loans"): amounts = calculate_amounts(payment.loan, self.posting_date, "Regular Payment")