From 7bf6de18834b2749187979911115c4eeae957612 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 2 Apr 2022 20:33:46 +0530 Subject: [PATCH] fix: Resolve conflicts --- .../doctype/loan_repayment/loan_repayment.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index 8468b236dba..6159275c5d1 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -743,25 +743,12 @@ 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'] -<<<<<<< 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) + amounts["payable_amount"] = ( + amounts["payable_principal_amount"] + amounts["interest_amount"] + amounts["penalty_amount"] + ) return amounts