nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-04-02 20:33:46 +05:30
parent 3fc43cb259
commit 7bf6de1883
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@@ -743,25 +743,12 @@ def calculate_amounts(against_loan, posting_date, payment_type=""):
amounts = get_amounts(amounts, against_loan, posting_date) amounts = get_amounts(amounts, against_loan, posting_date)
# update values for closure # update values for closure
<<<<<<< HEAD
if payment_type == "Loan Closure": if payment_type == "Loan Closure":
amounts["payable_principal_amount"] = amounts["pending_principal_amount"] amounts["payable_principal_amount"] = amounts["pending_principal_amount"]
amounts["interest_amount"] += amounts["unaccrued_interest"] amounts["interest_amount"] += amounts["unaccrued_interest"]
amounts["payable_amount"] = amounts["payable_principal_amount"] + amounts["interest_amount"] amounts["payable_amount"] = amounts["payable_principal_amount"] + amounts["interest_amount"]
======= amounts["payable_amount"] = (
if payment_type == 'Loan Closure': amounts["payable_principal_amount"] + amounts["interest_amount"] + amounts["penalty_amount"]
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']
>>>>>>> 4e92926a52 (fix: incorrect payable amount for loan closure)
=======
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 return amounts