fix: incorrect payable amount for loan closure
- Add penalty amount to payable amount for loan closure
(cherry picked from commit 4e92926a52)
# Conflicts:
# erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
This commit is contained in:
committed by
mergify-bot
parent
c5fd77ebf7
commit
c44a4e559b
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user