Skip to content

fix: exclude maturity-date transactions from rd calculation #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamtalib13 merged 1 commit into from
Apr 28, 2026
Merged

fix: exclude maturity-date transactions from rd calculation #167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions custom_report/api/calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,16 @@ def get_account_details(foracid=None, settlement_date=None):
SELECT value_date, tran_amt, part_tran_type, tran_particular
FROM tbaadm.htd
WHERE acid = %s AND del_flg = 'N'
AND pstd_user_id NOT IN ('SYSTEM', 'BATCH')
ORDER BY value_date ASC
""", (acid,))
raw_trans = cursor.fetchall()
raw_trans.sort(key=lambda x: x[0])
raw_trans = [
row for row in raw_trans
if row[0]
and (not mat_dt or row[0] < mat_dt)
and row[0] <= sett_dt
]

# Account closure handling:
# first debit/negative amount indicates closure, so exclude that row and
Expand All @@ -207,9 +212,6 @@ def get_account_details(foracid=None, settlement_date=None):
raw_credits_by_month = {}
max_credit_month = 0
for val_date, amt, p_type, particular in raw_trans:
if mat_dt and val_date and val_date >= mat_dt: continue
if val_date > sett_dt: continue

m_v = get_cycle_offset(opn_dt, val_date)

if p_type == 'C':
Expand Down Expand Up @@ -306,8 +308,6 @@ def get_account_details(foracid=None, settlement_date=None):

monthly_interest_assigned = set()
for val_date, amt, p_type, particular in raw_trans:
if mat_dt and val_date and val_date >= mat_dt: continue

amt = float(amt or 0)
row_int = 0.0
row_scheme_int = 0.0
Expand Down
Loading