From 0713a240a717cc0b6dc8f5121e4f7e4c6476d6f3 Mon Sep 17 00:00:00 2001 From: Labeeb Mattra Date: Fri, 8 Jul 2022 17:53:29 +0530 Subject: [PATCH] Consider refund_amount in pending principal amount (cherry picked from commit 35f2717ad2d1e5c8b40455d3c58636fd6f51c5e0) --- .../loan_management/doctype/loan_repayment/loan_repayment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index 88baa260e55..0cd94154e59 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -404,7 +404,7 @@ class LoanRepayment(AccountsController): remarks = _("Repayment against Loan: ") + self.against_loan ======= remarks = "Repayment against loan " + self.against_loan - + if self.reference_number: remarks += "with reference no. {}".format(self.reference_number) >>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks) @@ -641,6 +641,7 @@ def get_pending_principal_amount(loan): - flt(loan.total_principal_paid) - flt(loan.total_interest_payable) - flt(loan.written_off_amount) + + flt(loan.refund_amount) ) else: pending_principal_amount = ( @@ -650,6 +651,7 @@ def get_pending_principal_amount(loan): - flt(loan.total_principal_paid) - flt(loan.total_interest_payable) - flt(loan.written_off_amount) + + flt(loan.refund_amount) ) return pending_principal_amount