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

fix: Code cleanup

Browse Source 
(cherry picked from commit 1b2c6a5b78)

# Conflicts:
#	erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
This commit is contained in:
Deepesh Garg
2022-03-21 17:06:23 +05:30
committed by mergify-bot
parent 1d9a6efb1b
commit 3fc43cb259
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

@@ -752,6 +752,7 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
if payment_type == 'Loan Closure':
amounts['payable_principal_amount'] = amounts['pending_principal_amount']
amounts['interest_amount'] += amounts['unaccrued_interest']
<<<<<<< HEAD
amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount']
<<<<<<< HEAD
amounts['payable_amount'] = amounts['penalty_amount']
@@ -759,5 +760,8 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
=======
amounts['payable_amount'] += amounts['penalty_amount']
>>>>>>> 8c76a76154 (fix: incorrect payable amount for loan closure)
=======
amounts['payable_amount'] = amounts['payable_principal_amount'] + amounts['interest_amount'] + amounts['penalty_amount']
>>>>>>> 1b2c6a5b78 (fix: Code cleanup)
return amounts