CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-04 20:53:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Reload loan Table in Salary Slip when change Employee (#31525)

Browse Source 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: bahaaabed <bahaa.9999.sh@gmail.com>
Co-authored-by: newhr1 <104132586+newhr1@users.noreply.github.com>
This commit is contained in:
Alaa Alsalehi
2022-07-28 10:52:07 +03:00
committed by GitHub
parent 0602848caa
commit a95c011a93
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@@ -1363,23 +1363,22 @@ class SalarySlip(TransactionBase):
self.total_interest_amount = 0 self.total_interest_amount = 0
self.total_principal_amount = 0 self.total_principal_amount = 0
if not self.get("loans"): self.set("loans", [])
for loan in self.get_loan_details(): 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(
if amounts["interest_amount"] or amounts["payable_principal_amount"]: "loans",
self.append( {
"loans", "loan": loan.name,
{ "total_payment": amounts["interest_amount"] + amounts["payable_principal_amount"],
"loan": loan.name, "interest_amount": amounts["interest_amount"],
"total_payment": amounts["interest_amount"] + amounts["payable_principal_amount"], "principal_amount": amounts["payable_principal_amount"],
"interest_amount": amounts["interest_amount"], "loan_account": loan.loan_account,
"principal_amount": amounts["payable_principal_amount"], "interest_income_account": loan.interest_income_account,
"loan_account": loan.loan_account, },
"interest_income_account": loan.interest_income_account, )
},
)
for payment in self.get("loans"): for payment in self.get("loans"):
amounts = calculate_amounts(payment.loan, self.posting_date, "Regular Payment") amounts = calculate_amounts(payment.loan, self.posting_date, "Regular Payment")