nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consider refund_amount in pending principal amount

Browse Source 
(cherry picked from commit 35f2717ad2)
This commit is contained in:
Labeeb Mattra
2022-07-08 17:53:29 +05:30
committed by Mergify
parent 61b2a1c3cb
commit 0713a240a7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@@ -404,7 +404,7 @@ class LoanRepayment(AccountsController):
remarks = _("Repayment against Loan: ") + self.against_loan remarks = _("Repayment against Loan: ") + self.against_loan
======= =======
remarks = "Repayment against loan " + self.against_loan remarks = "Repayment against loan " + self.against_loan
if self.reference_number: if self.reference_number:
remarks += "with reference no. {}".format(self.reference_number) remarks += "with reference no. {}".format(self.reference_number)
>>>>>>> 74dbf8c5d9 (Add reference number to repayment remarks) >>>>>>> 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_principal_paid)
- flt(loan.total_interest_payable) - flt(loan.total_interest_payable)
- flt(loan.written_off_amount) - flt(loan.written_off_amount)
+ flt(loan.refund_amount)
) )
else: else:
pending_principal_amount = ( pending_principal_amount = (
@@ -650,6 +651,7 @@ def get_pending_principal_amount(loan):
- flt(loan.total_principal_paid) - flt(loan.total_principal_paid)
- flt(loan.total_interest_payable) - flt(loan.total_interest_payable)
- flt(loan.written_off_amount) - flt(loan.written_off_amount)
+ flt(loan.refund_amount)
) )
return pending_principal_amount return pending_principal_amount