nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 11:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: incorrect payable amount for loan closure

Browse Source 
(cherry picked from commit 8c76a76154)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
This commit is contained in:
Abhinav Raut
2022-03-11 16:46:30 +05:30
committed by mergify-bot
parent c44a4e559b
commit 1d9a6efb1b
1 changed files with 4 additions and 0 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

@@ -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