From 1d9a6efb1baf74fb3f8f01a69bbd15a13692a3a5 Mon Sep 17 00:00:00 2001 From: Abhinav Raut Date: Fri, 11 Mar 2022 16:46:30 +0530 Subject: [PATCH] fix: incorrect payable amount for loan closure (cherry picked from commit 8c76a76154d8976760d19d95f421dd2b0ee238bf) # Conflicts: # erpnext/loan_management/doctype/loan_repayment/loan_repayment.py --- .../loan_management/doctype/loan_repayment/loan_repayment.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index 2362d80223b..d0559a51847 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -753,7 +753,11 @@ def calculate_amounts(against_loan, posting_date, payment_type=""): amounts['payable_principal_amount'] = amounts['pending_principal_amount'] amounts['interest_amount'] += amounts['unaccrued_interest'] amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount'] +<<<<<<< HEAD amounts['payable_amount'] = amounts['penalty_amount'] >>>>>>> 4e92926a52 (fix: incorrect payable amount for loan closure) +======= + amounts['payable_amount'] += amounts['penalty_amount'] +>>>>>>> 8c76a76154 (fix: incorrect payable amount for loan closure) return amounts