From c44a4e559bc05c2d21614c9ce856c0472081e040 Mon Sep 17 00:00:00 2001 From: Abhinav Raut Date: Fri, 11 Mar 2022 16:44:21 +0530 Subject: [PATCH] fix: incorrect payable amount for loan closure - Add penalty amount to payable amount for loan closure (cherry picked from commit 4e92926a525b396173dbc4d6dd476b2ab4874f9b) # Conflicts: # erpnext/loan_management/doctype/loan_repayment/loan_repayment.py --- .../doctype/loan_repayment/loan_repayment.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index ce50dd3b38d..2362d80223b 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -743,9 +743,17 @@ def calculate_amounts(against_loan, posting_date, payment_type=""): amounts = get_amounts(amounts, against_loan, posting_date) # update values for closure +<<<<<<< HEAD if payment_type == "Loan Closure": amounts["payable_principal_amount"] = amounts["pending_principal_amount"] amounts["interest_amount"] += amounts["unaccrued_interest"] amounts["payable_amount"] = amounts["payable_principal_amount"] + amounts["interest_amount"] +======= + if payment_type == 'Loan Closure': + amounts['payable_principal_amount'] = amounts['pending_principal_amount'] + amounts['interest_amount'] += amounts['unaccrued_interest'] + amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount'] + amounts['payable_amount'] = amounts['penalty_amount'] +>>>>>>> 4e92926a52 (fix: incorrect payable amount for loan closure) return amounts