From c44a4e559bc05c2d21614c9ce856c0472081e040 Mon Sep 17 00:00:00 2001 From: Abhinav Raut Date: Fri, 11 Mar 2022 16:44:21 +0530 Subject: [PATCH 1/4] fix: incorrect payable amount for loan closure - Add penalty amount to payable amount for loan closure (cherry picked from commit 4e92926a525b396173dbc4d6dd476b2ab4874f9b) # Conflicts: # erpnext/loan_management/doctype/loan_repayment/loan_repayment.py --- .../doctype/loan_repayment/loan_repayment.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index ce50dd3b38d..2362d80223b 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -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 From 1d9a6efb1baf74fb3f8f01a69bbd15a13692a3a5 Mon Sep 17 00:00:00 2001 From: Abhinav Raut Date: Fri, 11 Mar 2022 16:46:30 +0530 Subject: [PATCH 2/4] fix: incorrect payable amount for loan closure (cherry picked from commit 8c76a76154d8976760d19d95f421dd2b0ee238bf) # Conflicts: # erpnext/loan_management/doctype/loan_repayment/loan_repayment.py --- .../loan_management/doctype/loan_repayment/loan_repayment.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index 2362d80223b..d0559a51847 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -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 From 3fc43cb259b912743c7e35df9e24e7861e07845d Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Mon, 21 Mar 2022 17:06:23 +0530 Subject: [PATCH 3/4] fix: Code cleanup (cherry picked from commit 1b2c6a5b78d4ee2e31817eb78bb1f614b672eda4) # Conflicts: # erpnext/loan_management/doctype/loan_repayment/loan_repayment.py --- .../loan_management/doctype/loan_repayment/loan_repayment.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py index d0559a51847..8468b236dba 100644 --- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py +++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py @@ -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 From 7bf6de18834b2749187979911115c4eeae957612 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sat, 2 Apr 2022 20:33:46 +0530 Subject: [PATCH 4/4] 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