mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 16:34:46 +00:00
Merge pull request #31826 from frappe/mergify/bp/version-13-hotfix/pr-31799
fix: process loan interest accrual (backport #31799)
This commit is contained in:
@@ -135,7 +135,11 @@ def calculate_accrual_amount_for_demand_loans(
|
|||||||
def make_accrual_interest_entry_for_demand_loans(
|
def make_accrual_interest_entry_for_demand_loans(
|
||||||
posting_date, process_loan_interest, open_loans=None, loan_type=None, accrual_type="Regular"
|
posting_date, process_loan_interest, open_loans=None, loan_type=None, accrual_type="Regular"
|
||||||
):
|
):
|
||||||
query_filters = {"status": ("in", ["Disbursed", "Partially Disbursed"]), "docstatus": 1}
|
query_filters = {
|
||||||
|
"status": ("in", ["Disbursed", "Partially Disbursed"]),
|
||||||
|
"docstatus": 1,
|
||||||
|
"is_term_loan": 0,
|
||||||
|
}
|
||||||
|
|
||||||
if loan_type:
|
if loan_type:
|
||||||
query_filters.update({"loan_type": loan_type})
|
query_filters.update({"loan_type": loan_type})
|
||||||
@@ -232,6 +236,7 @@ def get_term_loans(date, term_loan=None, loan_type=None):
|
|||||||
AND l.is_term_loan =1
|
AND l.is_term_loan =1
|
||||||
AND rs.payment_date <= %s
|
AND rs.payment_date <= %s
|
||||||
AND rs.is_accrued=0 {0}
|
AND rs.is_accrued=0 {0}
|
||||||
|
AND rs.interest_amount > 0
|
||||||
AND l.status = 'Disbursed'
|
AND l.status = 'Disbursed'
|
||||||
ORDER BY rs.payment_date""".format(
|
ORDER BY rs.payment_date""".format(
|
||||||
condition
|
condition
|
||||||
|
|||||||
Reference in New Issue
Block a user