KYC management: stage-wise notices, pagination, RD base chart

feat(fixed-deposits): FD quote from the account engine, FD Special payout schedule popup, Special terms locked
- Rate chart step (account opening): the rate, maturity date, maturity amount and interest now come from POST fixeddepositaccounts/account-preview for every FD type, so the quote matches the account once created (the old calculate-fd-interest call counted quarters from the deposit date and was off, e.g. FD DOUBLE by 36,979.23). The client-side formula fallback is removed: on an error the message is shown, nothing is estimated. - Dates are sent as the local calendar day (toISOString() turned 21 Oct at local midnight into 20 Oct). - FD Special: total interest paid out monthly, monthly payout, principal at maturity, maturity date, number of payouts, and "View payout schedule", which opens the existing Monthly Interest Payout Schedule dialog in a new preview mode (Days column, no paid / pending status). - Preview step: FD Special labels (total interest paid out monthly, principal at maturity). - FD product terms: choosing FD Special locks Interest Calculation Type to Simple, as Compounding and Posting are locked to Monthly (the backend refuses anything else). - Preview step: three existing `!= null` template checks rewritten for the eqeqeq lint rule, same meaning. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-20 17:23:42 +05:30 · 2026-10-20 16:44:47 +05:30 · 2026-10-20 11:09:08 +05:30 · 2026-10-20 10:48:37 +05:30 · 2026-10-20 10:48:23 +05:30 · 2026-10-16 12:31:24 +05:30
162 changed files with 20657 additions and 5945 deletions
@@ -10,7 +10,8 @@
 /** Angular Imports */
 import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
 import { SILENT_HTTP_ERROR } from 'app/core/http/silent-error.token';
 /** rxjs Imports */
 import { Observable } from 'rxjs';
@@ -198,6 +199,16 @@ export class AccountingService {
    return this.http.get('/journalentries/ledger', { params: httpParams });
  }
  /**
   * The whole transfer a ledger transaction belongs to, when it is one branch's part of a transfer between branches.
   * An extra, informational lookup: if it fails the screen simply shows no banner, so a failure raises no error popup.
   */
  getInterBranchTransfer(transactionId: string): Observable<any> {
    return this.http.get(`/accounting/interbranchtransfers/${transactionId}`, {
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /**
   * @param {string} transactionId Transaction ID to be reverted.
   * @param {string} comments Any comments.
@@ -142,6 +142,22 @@ export class AmlService {
    return this.http.get<any[]>('/aml/ctr-reports/lines', { params });
  }
  /**
   * Cash transactions of the threshold or more that no generated report contains yet, shaped like the lines above.
   * They show on the FIU screen as soon as they are posted; generating the month is what files them.
   */
  getCtrPendingLines(): Observable<any[]> {
    return this.http.get<any[]>('/aml/ctr-reports/pending-lines');
  }
  /**
   * How much came into and went out of each current / Cash Credit account over the last `days` days, with the
   * customer's declared turnover and the sanctioned limit alongside.
   */
  getCcTracking(days = 30): Observable<any> {
    return this.http.get<any>('/aml/cc-tracking', { params: new HttpParams().set('days', String(days)) });
  }
  /** month format: yyyy-MM */
  generateCtrReport(month: string): Observable<any> {
    return this.http.post('/aml/ctr-reports/generate', { month });
@@ -386,23 +386,6 @@
          </div>
        </div>
      }
      <!-- Investment interest vouchers that are due but not posted. A reminder only: unlike the interest
           above it never stops the close (Jitendra Sir); the voucher can still be posted afterwards. -->
      @if (preview?.investmentInterestPending?.length) {
        <div class="bd-warn">
          <mat-icon>notifications_active</mat-icon>
          <div>
            <strong>Reminder: investment interest vouchers are pending.</strong>
            @for (t of preview.investmentInterestPending; track t.purchaseId) {
              <div>
                {{ t.lineType === 'COUPON' ? 'Coupon' : 'Provision' }} · {{ t.scriptDesc }} · deal {{ t.dealNo }} ·
                {{ t.intDate }} · ₹{{ (t.lineType === 'COUPON' ? t.grossInterest : t.amount) | number: '1.2-2' }}
              </div>
            }
            Post them under Investment → Govt Security / Bond → 03 Interest Entry. You can still close the day.
          </div>
        </div>
      }
      @if (preview?.savingsInterestPending?.length) {
        <div class="bd-warn">
          <mat-icon>warning</mat-icon>
@@ -0,0 +1,229 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <div class="cv-tab-content cta-tab">
  <!-- ── TITLE BAR ── -->
  <div class="cta-action-bar">
    <div class="cta-action-bar__left">
      <mat-icon class="cta-action-bar__icon">swap_horiz</mat-icon>
      <div>
        <div class="cta-action-bar__title">Cash Transfers</div>
        <div class="cta-action-bar__sub">
          Approve or reject an allocation of cash from the vault to a cashier. The cash leaves the vault only when it is
          approved.
        </div>
      </div>
    </div>
    <div class="cta-counts">
      <span class="cta-count"
        ><strong>{{ all.length }}</strong> waiting</span
      >
    </div>
  </div>
  <!-- ── FILTER BAR ── -->
  <div class="cta-filter-bar">
    <div class="cta-search-box">
      <mat-icon>search</mat-icon>
      <input type="text" placeholder="Search by cashier, vault, user or note" [(ngModel)]="searchTerm" />
      @if (searchTerm) {
        <button type="button" class="cta-search-box__clear" (click)="searchTerm = ''">
          <mat-icon>close</mat-icon>
        </button>
      }
    </div>
    <button type="button" class="cta-btn cta-btn--refresh" (click)="load()" [disabled]="loading">
      <mat-icon>refresh</mat-icon>
    </button>
  </div>
  <!-- ── TABLE ── -->
  @if (loading && !loaded) {
    <div class="cta-empty"><p class="cta-empty__title">Loading…</p></div>
  } @else if (rows.length === 0) {
    <div class="cta-empty">
      <mat-icon class="cta-empty__icon">inbox</mat-icon>
      <p class="cta-empty__title">No cash transfer waiting</p>
      <p class="cta-empty__text">There is no cash allocation waiting for approval.</p>
    </div>
  } @else {
    <div class="cta-table-wrap">
      <table class="cta-table">
        <thead>
          <tr>
            <th>Date</th>
            <th>From</th>
            <th>To (Cashier)</th>
            <th class="num">Amount</th>
            <th>Note</th>
            <th>Raised By</th>
            <th>Raised At</th>
            <th class="cta-th-action">Action</th>
          </tr>
        </thead>
        <tbody>
          @for (r of rows; track r.id) {
            <tr class="cta-row">
              <td class="cta-dt">{{ r.transfer_date || '—' }}</td>
              <td>{{ r.from_party || '—' }}</td>
              <td class="cta-strong">{{ r.to_party || '—' }}</td>
              <td class="num cta-amount">₹{{ r.total_amount | number: '1.2-2' }}</td>
              <td class="cta-reason" [title]="r.note || ''">{{ r.note || '—' }}</td>
              <td>{{ r.maker_name || '—' }}</td>
              <td class="cta-dt">{{ formatDateTime(r.maker_at) }}</td>
              <td class="cta-action-cell">
                <button type="button" class="cta-btn cta-btn--approve" (click)="review(r)">
                  <mat-icon>rate_review</mat-icon> Review
                </button>
              </td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
 </div>
 <!-- ─── Popup: review a request, every note and coin it asks for ───────────── -->
 <ng-template #reviewDialog>
  @if (reviewing) {
    <div class="cta-dlg">
      <header class="cta-dlg__head">
        <mat-icon class="cta-dlg__ico cta-dlg__ico--ok">swap_horiz</mat-icon>
        <div class="cta-dlg__titles">
          <div class="cta-dlg__title">Review cash transfer</div>
          <div class="cta-dlg__sub">
            Raised by {{ reviewing.maker_name || '—' }} · {{ formatDateTime(reviewing.maker_at) }}
          </div>
        </div>
        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="closeReview()">
          <mat-icon>close</mat-icon>
        </button>
      </header>
      <div class="cta-dlg__body">
        <div class="cta-total">
          <span>Amount to release</span>
          <strong>₹{{ reviewing.total_amount | number: '1.2-2' }}</strong>
        </div>
        <div class="cta-grid">
          <div class="cta-cell">
            <div class="cta-label">Transfer date</div>
            <div class="cta-value">{{ reviewing.transfer_date || '—' }}</div>
          </div>
          <div class="cta-cell">
            <div class="cta-label">From</div>
            <div class="cta-value">{{ reviewing.from_party || '—' }}</div>
          </div>
          <div class="cta-cell">
            <div class="cta-label">To (cashier)</div>
            <div class="cta-value">{{ reviewing.to_party || '—' }}</div>
          </div>
          <div class="cta-cell">
            <div class="cta-label">Notes and coins</div>
            <div class="cta-value">
              {{ piecesOf(reviewing) }} pieces · {{ linesOf(reviewing).length }} denominations
            </div>
          </div>
          @if (reviewing.note) {
            <div class="cta-cell cta-cell--wide">
              <div class="cta-label">Note</div>
              <div class="cta-value">{{ reviewing.note }}</div>
            </div>
          }
        </div>
        <div class="cta-label">Denomination breakdown</div>
        <table class="cta-mini">
          <thead>
            <tr>
              <th>Denomination</th>
              <th class="num">Count</th>
              <th class="num">Amount</th>
            </tr>
          </thead>
          <tbody>
            @for (l of linesOf(reviewing); track l.value) {
              <tr>
                <td>₹{{ l.value }}</td>
                <td class="num">{{ l.count }}</td>
                <td class="num">₹{{ l.amount | number: '1.2-2' }}</td>
              </tr>
            }
          </tbody>
          <tfoot>
            <tr>
              <td>Total</td>
              <td class="num">{{ piecesOf(reviewing) }}</td>
              <td class="num">₹{{ reviewing.total_amount | number: '1.2-2' }}</td>
            </tr>
          </tfoot>
        </table>
      </div>
      <footer class="cta-dlg__foot">
        <button type="button" class="cta-btn cta-btn--ghost" (click)="closeReview()">Close</button>
        <button
          type="button"
          class="cta-btn cta-btn--reject"
          [disabled]="busyId === reviewing.id"
          (click)="rejectFromReview(reviewing)"
        >
          <mat-icon>close</mat-icon> Reject
        </button>
        <button
          type="button"
          class="cta-btn cta-btn--approve"
          [disabled]="busyId === reviewing.id"
          (click)="approve(reviewing)"
        >
          <mat-icon>check</mat-icon> Approve
        </button>
      </footer>
    </div>
  }
 </ng-template>
 <!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
 <ng-template #rejectDialog>
  @if (rejecting) {
    <div class="cta-dlg">
      <header class="cta-dlg__head">
        <mat-icon class="cta-dlg__ico">block</mat-icon>
        <div class="cta-dlg__titles">
          <div class="cta-dlg__title">Reject cash transfer</div>
          <div class="cta-dlg__sub">₹{{ rejecting.total_amount | number: '1.2-2' }} to {{ rejecting.to_party }}</div>
        </div>
        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="cancelReject()">
          <mat-icon>close</mat-icon>
        </button>
      </header>
      <div class="cta-dlg__body">
        <label class="cta-label" for="cta-reason">Reason (required)</label>
        <textarea
          id="cta-reason"
          rows="3"
          placeholder="Why is this being rejected?"
          [(ngModel)]="rejectReason"
        ></textarea>
      </div>
      <footer class="cta-dlg__foot">
        <button type="button" class="cta-btn cta-btn--ghost" (click)="cancelReject()">Cancel</button>
        <button
          type="button"
          class="cta-btn cta-btn--reject-solid"
          [disabled]="!rejectReason.trim() || busyId === rejecting.id"
          (click)="confirmReject()"
        >
          Confirm reject
        </button>
      </footer>
    </div>
  }
 </ng-template>
@@ -0,0 +1,573 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 // Laid out like the other approval tabs (Withdrawal Requests): title bar, filter bar, one table.
 :host {
  display: block;
 }
 .cta-tab {
  padding: 0;
 }
 .cta-action-bar {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 16px;
  padding: 10px 16px;
  background: #fff;
  border-bottom: 1px solid #e2e8f0;
  &__left {
    display: flex;
    align-items: center;
    gap: 12px;
  }
  &__icon {
    font-size: 22px;
    width: 22px;
    height: 22px;
    color: #0f4f3c;
  }
  &__title {
    font-size: 13px;
    font-weight: 700;
    color: #0d1b2a;
  }
  &__sub {
    max-width: 640px;
    margin-top: 1px;
    font-size: 11px;
    color: #64748b;
  }
 }
 .cta-counts {
  display: flex;
  gap: 8px;
 }
 .cta-count {
  padding: 2px 10px;
  border-radius: 999px;
  background: #f1f5f9;
  font-size: 11px;
  color: #475569;
  strong {
    color: #0f4f3c;
  }
 }
 .cta-filter-bar {
  display: flex;
  align-items: center;
  gap: 6px;
  flex-wrap: wrap;
  padding: 6px 16px;
  background: #f8fafc;
  border-bottom: 1px solid #e2e8f0;
 }
 .cta-fb-sep {
  flex-shrink: 0;
  width: 1px;
  height: 22px;
  margin: 0 4px;
  background: #e2e8f0;
 }
 .cta-search-box {
  display: inline-flex;
  align-items: center;
  gap: 6px;
  height: 30px;
  min-width: 240px;
  padding: 0 10px;
  border: 1px solid #e2e8f0;
  border-radius: 8px;
  background: #fff;
  mat-icon {
    flex-shrink: 0;
    font-size: 17px;
    width: 17px;
    height: 17px;
    color: #94a3b8;
  }
  &:hover {
    border-color: #cbd5e1;
  }
  &:focus-within {
    border-color: #0f4f3c;
    box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
  }
  input {
    flex: 1;
    border: none;
    outline: none;
    background: transparent;
    font-family: inherit;
    font-size: 12px;
    color: #0d1b2a;
    &::placeholder {
      color: #94a3b8;
    }
  }
  &__clear {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    flex-shrink: 0;
    width: 20px;
    height: 20px;
    padding: 0;
    border: none;
    border-radius: 50%;
    background: none;
    color: #94a3b8;
    cursor: pointer;
    mat-icon {
      font-size: 15px;
      width: 15px;
      height: 15px;
      color: inherit;
    }
    &:hover {
      color: #dc2626;
      background: #fef2f2;
    }
  }
 }
 .cta-filter-select {
  height: 30px;
  min-width: 140px;
  padding: 0 10px;
  border: 1px solid #e2e8f0;
  border-radius: 7px;
  background: #fff;
  font-family: inherit;
  font-size: 12px;
  color: #0d1b2a;
  cursor: pointer;
  &:focus {
    outline: none;
    border-color: #0f4f3c;
  }
 }
 // ── Buttons ─────────────────────────────────────────────────────────────────
 .cta-btn {
  display: inline-flex;
  align-items: center;
  gap: 4px;
  height: 26px;
  padding: 0 10px;
  border: 1px solid transparent;
  border-radius: 7px;
  font-family: inherit;
  font-size: 11px;
  font-weight: 600;
  white-space: nowrap;
  cursor: pointer;
  mat-icon {
    font-size: 14px;
    width: 14px;
    height: 14px;
  }
  &:disabled {
    opacity: 0.45;
    cursor: not-allowed;
  }
  &--refresh {
    height: 30px;
    width: 30px;
    justify-content: center;
    padding: 0;
    margin-left: auto;
    border-color: #e2e8f0;
    background: #fff;
    color: #475569;
  }
  &--approve {
    background: #0f4f3c;
    color: #fff;
    &:hover:not(:disabled) {
      background: #0a3d2e;
    }
  }
  &--reject {
    border-color: #fecaca;
    background: #fff;
    color: #dc2626;
    &:hover:not(:disabled) {
      background: #fef2f2;
    }
  }
  &--reject-solid {
    background: #dc2626;
    color: #fff;
  }
  &--ghost {
    border-color: #e2e8f0;
    background: #fff;
    color: #475569;
  }
 }
 // ── Table ───────────────────────────────────────────────────────────────────
 .cta-table-wrap {
  overflow-x: auto;
  background: #fff;
 }
 .cta-table {
  width: 100%;
  border-collapse: collapse;
  font-size: 11px;
  th {
    padding: 7px 10px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
    font-size: 9.5px;
    font-weight: 800;
    letter-spacing: 0.06em;
    text-align: left;
    text-transform: uppercase;
    color: #94a3b8;
    white-space: nowrap;
  }
  td {
    padding: 5px 10px;
    border-bottom: 1px solid #eef2f7;
    vertical-align: middle;
    color: #0d1b2a;
  }
  .num {
    text-align: right;
    font-variant-numeric: tabular-nums;
  }
  .cta-th-action {
    text-align: right;
  }
 }
 .cta-row:hover td {
  background: #f8fafc;
 }
 .cta-mono {
  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
  letter-spacing: 0.02em;
 }
 .cta-voucher {
  font-weight: 700;
  color: #0f4f3c;
 }
 .cta-strong {
  font-weight: 700;
 }
 .cta-sub {
  margin-top: 1px;
  font-size: 11px;
  color: #64748b;
 }
 .cta-none {
  color: #cbd5e1;
 }
 .cta-amount {
  font-weight: 700;
 }
 .cta-reason {
  max-width: 220px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .cta-dt {
  white-space: nowrap;
  color: #475569;
 }
 .cta-kind {
  display: inline-block;
  padding: 2px 10px;
  border-radius: 999px;
  font-size: 11px;
  font-weight: 700;
  &--unpass {
    background: #fef3c7;
    color: #92400e;
  }
  &--correction {
    background: #dbeafe;
    color: #1e40af;
  }
 }
 .cta-action-cell {
  display: flex;
  justify-content: flex-end;
  gap: 6px;
  white-space: nowrap;
 }
 // ── Empty ───────────────────────────────────────────────────────────────────
 .cta-empty {
  padding: 28px 16px;
  text-align: center;
  color: #94a3b8;
  &__icon {
    display: block;
    margin: 0 auto 6px;
    font-size: 30px;
    width: 30px;
    height: 30px;
    opacity: 0.6;
  }
  &__title {
    margin: 0;
    font-size: 12px;
    font-weight: 700;
    color: #64748b;
  }
  &__text {
    margin: 3px 0 0;
    font-size: 11px;
  }
 }
 // ── Reject popup ────────────────────────────────────────────────────────────
 .cta-dlg {
  font-size: 12px;
  &__head {
    display: flex;
    align-items: center;
    gap: 10px;
    padding: 10px 14px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
  }
  &__ico {
    flex: 0 0 32px;
    height: 32px;
    width: 32px;
    border-radius: 9px;
    background: #fef2f2;
    color: #dc2626;
    font-size: 18px;
    line-height: 32px;
    text-align: center;
  }
  &__titles {
    flex: 1;
    min-width: 0;
  }
  &__title {
    font-size: 14px;
    font-weight: 700;
    color: #0f172a;
  }
  &__sub {
    font-size: 11px;
    color: #64748b;
  }
  &__x {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    height: 28px;
    width: 28px;
    border: 0;
    border-radius: 50%;
    background: transparent;
    color: #64748b;
    cursor: pointer;
    &:hover {
      background: #e2e8f0;
    }
    mat-icon {
      font-size: 18px;
      height: 18px;
      width: 18px;
    }
  }
  &__body {
    padding: 12px 14px;
    max-height: 64vh;
    overflow-y: auto;
    textarea {
      width: 100%;
      padding: 7px 10px;
      border: 1px solid #cbd5e1;
      border-radius: 8px;
      font: inherit;
      font-size: 12px;
      resize: vertical;
      &:focus {
        outline: 0;
        border-color: #0f4f3c;
        box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
      }
    }
  }
  &__foot {
    display: flex;
    justify-content: flex-end;
    gap: 8px;
    padding: 10px 14px;
    border-top: 1px solid #e2e8f0;
    background: #f8fafc;
  }
 }
 .cta-label {
  display: block;
  margin-bottom: 4px;
  font-size: 10px;
  font-weight: 700;
  letter-spacing: 0.05em;
  text-transform: uppercase;
  color: #94a3b8;
 }
 .cta-dlg__ico--ok {
  background: #f0fdf4;
  color: #1f7a4d;
 }
 .cta-total {
  display: flex;
  align-items: baseline;
  justify-content: space-between;
  margin-bottom: 10px;
  padding: 8px 12px;
  border-radius: 10px;
  background: #ecfdf5;
  border: 1px solid #a7f3d0;
  color: #065f46;
  font-size: 12px;
  font-weight: 600;
  strong {
    font-size: 18px;
    font-weight: 800;
    font-variant-numeric: tabular-nums;
  }
 }
 .cta-grid {
  display: grid;
  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
  gap: 6px;
  margin-bottom: 12px;
 }
 .cta-cell {
  padding: 6px 10px;
  border-radius: 8px;
  background: #f8fafc;
  border: 1px solid #eef2f7;
  &--wide {
    grid-column: 1 / -1;
  }
 }
 .cta-value {
  font-size: 12px;
  font-weight: 600;
  color: #0f172a;
  word-break: break-word;
 }
 .cta-mini {
  width: 100%;
  margin-top: 4px;
  border-collapse: collapse;
  font-size: 12px;
  th {
    padding: 6px 10px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
    font-size: 10px;
    font-weight: 800;
    letter-spacing: 0.05em;
    text-align: left;
    text-transform: uppercase;
    color: #94a3b8;
  }
  td {
    padding: 5px 10px;
    border-bottom: 1px solid #eef2f7;
  }
  .num {
    text-align: right;
    font-variant-numeric: tabular-nums;
  }
  tfoot td {
    border-top: 2px solid #e2e8f0;
    border-bottom: 0;
    font-weight: 800;
    background: #f8fafc;
  }
 }
@@ -0,0 +1,190 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
 /** A cash transfer request waiting for a checker, as the server keeps it (snake_case columns). */
 interface CashTransferRequest {
  id: number;
  transfer_date: string | null;
  from_party: string | null;
  to_party: string | null;
  note: string | null;
  total_amount: number;
  maker_name: string | null;
  maker_at: string | null;
  denominations: { denominationValue: number; count: number }[];
 }
 /**
 * Checker side of Cash Transfer: approves or rejects an allocation of cash from the vault to a cashier. The cash
 * leaves the vault only when it is approved, by someone other than the person who raised it.
 */
@Component({
  selector: 'mifosx-cash-transfer-approvals',
  templateUrl: './cash-transfer-approvals.component.html',
  styleUrls: ['./cash-transfer-approvals.component.scss'],
  standalone: true,
  imports: [
    CommonModule,
    FormsModule,
    MatDialogModule,
    MatIconModule,
    MatSnackBarModule
  ]
 })
 export class CashTransferApprovalsComponent implements OnInit {
  private service = inject(CashierService);
  private snackBar = inject(MatSnackBar);
  private dialog = inject(MatDialog);
  @ViewChild('rejectDialog') rejectDialog!: TemplateRef<unknown>;
  @ViewChild('reviewDialog') reviewDialog!: TemplateRef<unknown>;
  private dialogRef: MatDialogRef<unknown> | null = null;
  private reviewRef: MatDialogRef<unknown> | null = null;
  /** The request open in the review popup, with every note and coin it asks for. */
  reviewing: CashTransferRequest | null = null;
  all: CashTransferRequest[] = [];
  loading = false;
  loaded = false;
  busyId: number | null = null;
  searchTerm = '';
  rejecting: CashTransferRequest | null = null;
  rejectReason = '';
  ngOnInit(): void {
    this.load();
  }
  load(): void {
    this.loading = true;
    this.service
      .getCashTransferRequests('PENDING')
      .pipe(catchError(() => of([] as CashTransferRequest[])))
      .subscribe((rows) => {
        this.all = rows as CashTransferRequest[];
        this.loading = false;
        this.loaded = true;
      });
  }
  get rows(): CashTransferRequest[] {
    const term = this.searchTerm.trim().toLowerCase();
    if (!term) return this.all;
    return this.all.filter((r) => [
        r.from_party,
        r.to_party,
        r.maker_name,
        r.note
      ].some((v) => (v ?? '').toLowerCase().includes(term)));
  }
  /** One line per denomination asked for, largest first, with what each line adds up to. */
  linesOf(r: CashTransferRequest): { value: number; count: number; amount: number }[] {
    return [...(r.denominations ?? [])]
      .filter((d) => d.count > 0)
      .sort((a, b) => b.denominationValue - a.denominationValue)
      .map((d) => ({ value: d.denominationValue, count: d.count, amount: d.denominationValue * d.count }));
  }
  /** How many notes and coins the request asks for in all. */
  piecesOf(r: CashTransferRequest): number {
    return this.linesOf(r).reduce((sum, l) => sum + l.count, 0);
  }
  review(r: CashTransferRequest): void {
    this.reviewing = r;
    this.reviewRef?.close();
    this.reviewRef = this.dialog.open(this.reviewDialog, { width: '560px', maxWidth: '95vw', autoFocus: false });
    this.reviewRef.afterClosed().subscribe(() => (this.reviewing = null));
  }
  closeReview(): void {
    this.reviewRef?.close();
  }
  /** Rejecting from the review popup: the review closes, the reason popup opens for the same request. */
  rejectFromReview(r: CashTransferRequest): void {
    this.reviewRef?.close();
    this.startReject(r);
  }
  formatDateTime(value: string | null): string {
    if (!value) return '—';
    const d = new Date(value);
    return isNaN(d.getTime())
      ? value
      : d.toLocaleString('en-IN', { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit' });
  }
  approve(r: CashTransferRequest): void {
    if (this.busyId) return;
    this.busyId = r.id;
    this.service.approveCashTransferRequest(r.id).subscribe({
      next: (res: any) => {
        this.busyId = null;
        this.reviewRef?.close();
        this.snackBar.open(
          res?.glWarning ? `Approved (GL warning: ${res.glWarning})` : 'Approved — cash allocated to the cashier',
          'Close',
          { duration: 6000 }
        );
        this.load();
      },
      error: (err) => {
        this.busyId = null;
        this.fail(err, 'Could not approve');
      }
    });
  }
  startReject(r: CashTransferRequest): void {
    this.rejecting = r;
    this.rejectReason = '';
    this.dialogRef = this.dialog.open(this.rejectDialog, { width: '440px', maxWidth: '95vw', autoFocus: false });
    this.dialogRef.afterClosed().subscribe(() => (this.rejecting = null));
  }
  cancelReject(): void {
    this.dialogRef?.close();
  }
  confirmReject(): void {
    if (!this.rejecting || !this.rejectReason.trim() || this.busyId) return;
    const id = this.rejecting.id;
    this.busyId = id;
    this.service.rejectCashTransferRequest(id, this.rejectReason.trim()).subscribe({
      next: () => {
        this.busyId = null;
        this.dialogRef?.close();
        this.snackBar.open('Rejected', 'Close', { duration: 4000 });
        this.load();
      },
      error: (err) => {
        this.busyId = null;
        this.fail(err, 'Could not reject');
      }
    });
  }
  private fail(err: any, fallback: string): void {
    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
    this.snackBar.open(msg, 'Close', { duration: 8000 });
  }
 }
@@ -13,7 +13,15 @@
      <h1 class="pg-title">Cash Transfer</h1>
      <p class="pg-sub">Move cash denomination-wise from one party to another (e.g. Vault → Cashier for opening).</p>
    </div>
-    <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
+    <div class="ct-head-actions">
      <button type="button" class="pg-btn pg-btn--ghost" (click)="openRequests()">
        <mat-icon>pending_actions</mat-icon> My Requests
        @if (pendingCount) {
          <span class="ct-badge">{{ pendingCount }}</span>
        }
      </button>
      <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
    </div>
  </header>
  <div class="pg-toolbar pg-toolbar--mat">
@@ -155,7 +163,56 @@
  <div class="pg-total-bar">
    Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
    <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">
-      <mat-icon>swap_horiz</mat-icon> Record Transfer
+      <mat-icon>send</mat-icon> Send for approval
    </button>
  </div>
 </div>
 <!-- Popup: this person's own cash transfer requests, and where each stands. The cash moves only once a manager approves. -->
 <ng-template #requestsDialog>
  <div class="ct-dlg">
    <header class="ct-dlg__head">
      <mat-icon class="ct-dlg__ico">pending_actions</mat-icon>
      <div class="ct-dlg__titles">
        <div class="ct-dlg__title">My transfer requests</div>
        <div class="ct-dlg__sub">Cash leaves the vault only after a manager approves</div>
      </div>
      <button type="button" class="ct-dlg__x" aria-label="Close" (click)="closeRequests()">
        <mat-icon>close</mat-icon>
      </button>
    </header>
    <div class="ct-dlg__body">
      @if (myRequests.length) {
        <table class="pg-table">
          <thead>
            <tr>
              <th>Date</th>
              <th>To</th>
              <th class="num">Amount</th>
              <th>Status</th>
              <th>Approved by</th>
            </tr>
          </thead>
          <tbody>
            @for (r of myRequests; track r.id) {
              <tr>
                <td>{{ r.transfer_date || '—' }}</td>
                <td>{{ r.to_party || '—' }}</td>
                <td class="num">₹{{ r.total_amount | number: '1.2-2' }}</td>
                <td>
                  <span class="ct-status" [class]="'ct-status ct-status--' + r.status">{{ r.status }}</span>
                  @if (r.rejection_reason) {
                    <div class="ct-requests__note">{{ r.rejection_reason }}</div>
                  }
                </td>
                <td>{{ r.checker_name || '—' }}</td>
              </tr>
            }
          </tbody>
        </table>
      } @else {
        <div class="pg-empty">You have not raised any cash transfer request yet.</div>
      }
    </div>
  </div>
 </ng-template>
@@ -49,3 +49,131 @@
  font-size: 12px;
  color: #991b1b;
 }
 .ct-requests {
  padding: 0;
  &__title {
    padding: 10px 14px;
    border-bottom: 1px solid #e2e8f0;
    font-size: 13px;
    font-weight: 700;
    color: #0d1b2a;
  }
  &__note {
    margin-top: 2px;
    font-size: 11px;
    color: #64748b;
  }
 }
 .ct-status {
  display: inline-block;
  padding: 2px 10px;
  border-radius: 999px;
  background: #e2e8f0;
  font-size: 11px;
  font-weight: 700;
  &--PENDING {
    background: #fef3c7;
    color: #92400e;
  }
  &--APPROVED {
    background: #d1fae5;
    color: #065f46;
  }
  &--REJECTED {
    background: #fee2e2;
    color: #991b1b;
  }
 }
 .ct-head-actions {
  display: flex;
  gap: 8px;
  flex-wrap: wrap;
 }
 .ct-badge {
  min-width: 18px;
  padding: 0 6px;
  border-radius: 999px;
  background: #f59e0b;
  color: #fff;
  font-size: 11px;
  font-weight: 700;
  text-align: center;
 }
 .ct-dlg {
  font-size: 12px;
  &__head {
    display: flex;
    align-items: center;
    gap: 10px;
    padding: 10px 14px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
  }
  &__ico {
    flex: 0 0 32px;
    height: 32px;
    width: 32px;
    border-radius: 9px;
    background: #f0fdf4;
    color: #1f7a4d;
    font-size: 18px;
    line-height: 32px;
    text-align: center;
  }
  &__titles {
    flex: 1;
    min-width: 0;
  }
  &__title {
    font-size: 14px;
    font-weight: 700;
    color: #0f172a;
  }
  &__sub {
    font-size: 11px;
    color: #64748b;
  }
  &__x {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    height: 28px;
    width: 28px;
    border: 0;
    border-radius: 50%;
    background: transparent;
    color: #64748b;
    cursor: pointer;
    &:hover {
      background: #e2e8f0;
    }
    mat-icon {
      font-size: 18px;
      height: 18px;
      width: 18px;
    }
  }
  &__body {
    max-height: 60vh;
    overflow-y: auto;
  }
 }
@@ -6,9 +6,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -18,6 +19,7 @@ import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
 import { businessToday } from 'app/core/utils/business-today';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
 interface Denom {
  id: number;
@@ -39,6 +41,7 @@ interface Denom {
    CommonModule,
    FormsModule,
    MatIconModule,
    MatDialogModule,
    MatSnackBarModule,
    MatFormFieldModule,
    MatSelectModule,
@@ -48,6 +51,11 @@ interface Denom {
 export class CashTransferComponent implements OnInit {
  private service = inject(CashierService);
  private snackBar = inject(MatSnackBar);
  private dialog = inject(MatDialog);
  @ViewChild('requestsDialog') requestsDialog!: TemplateRef<unknown>;
  private requestsRef: MatDialogRef<unknown> | null = null;
  private authenticationService = inject(AuthenticationService);
  notes: Denom[] = [];
  coins: Denom[] = [];
@@ -82,7 +90,34 @@ export class CashTransferComponent implements OnInit {
  vaultHasBreakdown = true;
  loadingVault = false;
  /** The caller's own transfer requests, newest first, so a request can be followed to its approval. */
  myRequests: any[] = [];
  loadMyRequests(): void {
    this.service
      .getCashTransferRequests(undefined, true)
      .pipe(catchError(() => of([] as any[])))
      .subscribe((rows) => (this.myRequests = rows.slice(0, 20)));
  }
  /** How many of this person's requests are still waiting for a manager. */
  get pendingCount(): number {
    return this.myRequests.filter((r) => r.status === 'PENDING').length;
  }
  /** Opens the list of this person's requests, freshly read, so a request can be followed to its approval. */
  openRequests(): void {
    this.loadMyRequests();
    this.requestsRef?.close();
    this.requestsRef = this.dialog.open(this.requestsDialog, { width: '720px', maxWidth: '95vw', autoFocus: false });
  }
  closeRequests(): void {
    this.requestsRef?.close();
  }
  ngOnInit(): void {
    this.loadMyRequests();
    const d = businessToday();
    this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
    this.service.getActiveDenominations().subscribe({
@@ -106,7 +141,14 @@ export class CashTransferComponent implements OnInit {
      .getTellers()
      .pipe(catchError(() => of([] as any[])))
      .subscribe((list) => {
-        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
+        // The vault and its cash are physical, so a branch moves cash only from its own tellers. The
        // backend lists every teller below the user's office (Head Office sees all branches), which is
        // right for reports but wrong here.
        const myOfficeId = this.authenticationService.getCredentials()?.officeId;
        const own = (list || []).filter(
          (t: any) => !myOfficeId || t.officeId == null || Number(t.officeId) === Number(myOfficeId)
        );
        this.tellers = own.map((t: any) => ({ id: t.id, name: t.name }));
        if (this.tellers.length === 1) {
          this.onTellerSelect(this.tellers[0].id);
        }
@@ -245,16 +287,11 @@ export class CashTransferComponent implements OnInit {
        .filter((d) => this.countFor(d) > 0)
        .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(d) }))
    };
-    this.service.createCashTransfer(payload).subscribe({
+    this.service.createCashTransferRequest(payload).subscribe({
-      next: (res: any) => {
+      next: () => {
-        if (res?.glWarning) {
+        // Nothing has moved yet: a manager approves the allocation first, and only then does the cash leave the vault.
-          this.snackBar.open(`Transfer saved (GL warning: ${res.glWarning})`, 'Close', {
+        this.snackBar.open('Cash transfer sent for manager approval', 'Close', { duration: 5000 });
-            duration: 8000,
+        this.loadMyRequests();
            panelClass: ['snack-warn']
          });
        } else {
          this.snackBar.open('Cash transfer recorded', 'Close', { duration: 3000 });
        }
        this.clear();
        this.note = '';
        this.fromParty = '';
@@ -83,6 +83,13 @@ const routes: Routes = [
            ),
          data: { title: 'My Share Requests', breadcrumb: 'My Share Requests' }
        },
        {
          // The same page as the cashier's, reached from the clerk dashboard: a clerk unpasses vouchers here.
          path: 'voucher-correction',
          loadComponent: () =>
            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
        },
        {
          path: 'closure-requests',
          loadComponent: () =>
@@ -291,6 +298,12 @@ const routes: Routes = [
          component: ReconciliationComponent,
          data: { title: 'Reconciliation', breadcrumb: 'Reconciliation' }
        },
        {
          path: 'voucher-correction',
          loadComponent: () =>
            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
        },
        {
          path: 'cash-history',
          component: CashHistoryComponent,
@@ -47,8 +47,21 @@ export class CashierService {
  }
  // ── Cash Transfer ──
-  createCashTransfer(data: any): Observable<any> {
+  /** Cash leaves the vault only when a different person approves, so the screen raises a request, not a transfer. */
-    return this.http.post('/cashtransfer', data);
+  createCashTransferRequest(data: any): Observable<any> {
    return this.http.post('/cashtransfer/requests', data);
  }
  /** Requests by status (comma separated); mine narrows them to the ones the caller raised. */
  getCashTransferRequests(status?: string, mine = false): Observable<any[]> {
    let params = new HttpParams().set('mine', String(mine));
    if (status) params = params.set('status', status);
    return this.http.get<any[]>('/cashtransfer/requests', { params });
  }
  approveCashTransferRequest(id: number): Observable<any> {
    return this.http.post(`/cashtransfer/requests/${id}/approve`, {});
  }
  rejectCashTransferRequest(id: number, reason: string): Observable<any> {
    return this.http.post(`/cashtransfer/requests/${id}/reject`, { reason });
  }
  getCashTransfers(offset = 0, limit = 20): Observable<any> {
    const params = new HttpParams().set('offset', offset).set('limit', limit);
@@ -202,6 +202,7 @@
              <th class="num">Amount</th>
              <th>Payment</th>
              <th>Status</th>
              <th>Correction</th>
              <th>By</th>
              <th>Approved By</th>
              <th>Time</th>
@@ -231,6 +232,18 @@
                <td>
                  <span [class]="statusClass(r.status)">{{ r.status }}</span>
                </td>
                <td>
                  <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
                  <mifosx-voucher-status
                    [status]="r.voucherStatus"
                    [revokedBy]="r.revokedByVoucherNo"
                    [replaces]="r.replacesVoucherNo"
                    [note]="r.correctionNote"
                  ></mifosx-voucher-status>
                  @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
                    <span class="db-muted">—</span>
                  }
                </td>
                <td>{{ r.handledBy ?? '—' }}</td>
                <td>
                  {{ r.approvedBy ?? '—' }}
@@ -256,7 +269,7 @@
                  —
                }
              </td>
-              <td colspan="5"></td>
+              <td colspan="6"></td>
            </tr>
          </tfoot>
        </table>
@@ -14,6 +14,7 @@ import { Router } from '@angular/router';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { businessToday } from 'app/core/utils/business-today';
 import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 /**
 * Which part of the day's work a row came from. Set by the server, one per source register.
@@ -26,6 +27,11 @@ type DayBookSection = 'CASHIER' | 'CLERK' | 'SYSTEM';
 interface DayBookRow {
  voucherNo: string | null;
  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
  voucherStatus?: VoucherStatus;
  revokedByVoucherNo?: string | null;
  replacesVoucherNo?: string | null;
  correctionNote?: string | null;
  section: DayBookSection;
  side: 'CR' | 'DR';
  kind: string;
@@ -58,7 +64,8 @@ interface DayBookRow {
  imports: [
    CommonModule,
    FormsModule,
-    MatIconModule
+    MatIconModule,
    VoucherStatusComponent
  ]
 })
 export class DayBookComponent implements OnInit {
@@ -146,6 +146,7 @@
                  <th class="num">Amount</th>
                  <th>My part</th>
                  <th>Status</th>
                  <th>Correction</th>
                  <th>Time</th>
                </tr>
              </thead>
@@ -203,6 +204,18 @@
                        {{ statusLabel(r.verificationStatus) }}
                      </span>
                    </td>
                    <td>
                      <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
                      <mifosx-voucher-status
                        [status]="r.voucherStatus"
                        [revokedBy]="r.revokedByVoucherNo"
                        [replaces]="r.replacesVoucherNo"
                        [note]="r.correctionNote"
                      ></mifosx-voucher-status>
                      @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
                        <span class="mw-acct">—</span>
                      }
                    </td>
                    <td class="mw-time">{{ r.createdAt | date: 'HH:mm' }}</td>
                  </tr>
                }
@@ -15,6 +15,7 @@ import { catchError, finalize, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
 import { businessToday } from 'app/core/utils/business-today';
 import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -24,6 +25,11 @@ export type VoucherSide = 'CR' | 'DR' | 'JV';
 interface MyWorkRow {
  voucherNo: string;
  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
  voucherStatus?: VoucherStatus;
  revokedByVoucherNo?: string | null;
  replacesVoucherNo?: string | null;
  correctionNote?: string | null;
  side: VoucherSide | null;
  voucherType: string | null;
  amount: number | null;
@@ -76,7 +82,8 @@ interface MyWorkReport {
    CommonModule,
    FormsModule,
    MatIconModule,
-    MatDialogModule
+    MatDialogModule,
    VoucherStatusComponent
  ]
 })
 export class MyWorkComponent implements OnInit {
@@ -11,6 +11,7 @@ import { CommonModule } from '@angular/common';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 export interface VoucherDetailDialogData {
  /** Already-loaded detail from CashierService.voucherDetail() — the caller fetches, this dialog
@@ -18,6 +19,10 @@ export interface VoucherDetailDialogData {
   *  duplicated inside every dialog that could ever show a voucher. */
  detail: {
    voucherNo: string;
    voucherStatus?: VoucherStatus;
    revokedByVoucherNo?: string | null;
    replacesVoucherNo?: string | null;
    correctionNote?: string | null;
    voucherType: string | null;
    amount: number | null;
    branchName: string | null;
@@ -58,7 +63,8 @@ export interface VoucherDetailDialogData {
    CommonModule,
    MatDialogModule,
    MatButtonModule,
-    MatIconModule
+    MatIconModule,
    VoucherStatusComponent
  ],
  template: `
    <div class="vd-shell">
@@ -66,7 +72,15 @@ export interface VoucherDetailDialogData {
        <div class="vd-header__title">
          <mat-icon class="vd-icon">receipt_long</mat-icon>
          <div>
-            <h2>{{ detail.voucherNo }}</h2>
+            <h2>
              {{ detail.voucherNo }}
              <mifosx-voucher-status
                [status]="detail.voucherStatus"
                [revokedBy]="detail.revokedByVoucherNo"
                [replaces]="detail.replacesVoucherNo"
                [note]="detail.correctionNote"
              ></mifosx-voucher-status>
            </h2>
            <p>{{ detail.voucherType || 'Voucher' }} &middot; {{ detail.branchName || 'Head Office' }}</p>
          </div>
        </div>
@@ -117,6 +117,8 @@
                      <select
                        class="ws-f__ctl"
                        [(ngModel)]="row.typ"
                        [disabled]="isTypLocked(row)"
                        [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                        (click)="$event.stopPropagation()"
                        (change)="onTypChange(row)"
                      >
@@ -127,11 +129,16 @@
                    </div>
                    <div class="ws-f ws-f--branch">
                      <label class="ws-f__lbl" title="Branch">BRANCH</label>
-                      <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
+                      <select
-                        <option [ngValue]="1">001 · Main</option>
+                        class="ws-f__ctl"
-                        <option [ngValue]="2">002 · M.G. Road</option>
+                        [(ngModel)]="row.br"
-                        <option [ngValue]="14">014 · Station Rd</option>
+                        [disabled]="branchSelectOptions.length <= 1"
-                        <option [ngValue]="27">027 · Industrial</option>
+                        [title]="branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
                        (click)="$event.stopPropagation()"
                      >
                        @for (b of branchSelectOptions; track b.id) {
                          <option [ngValue]="b.id">{{ b.name }}</option>
                        }
                      </select>
                    </div>
                    @if (row.typ === 'DD') {
@@ -177,13 +184,7 @@
                          class="ws-f__ctl"
                          [(ngModel)]="row.acTyp"
                          (click)="$event.stopPropagation()"
-                          (change)="
+                          (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                            row.acTyp === 'GL' &&
                              row.typ !== 'Disbursement' &&
                              row.typ !== 'Fund Transfer' &&
                              row.typ !== 'Enter Bank Transfer' &&
                              (row.dbCr = 'Cr')
                          "
                        >
                          @for (a of acTypOptionsFor(row); track a) {
                            <option [value]="a">{{ a }}</option>
@@ -266,12 +267,7 @@
                          type="button"
                          class="ws-seg__btn ws-seg__btn--dr"
                          [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                          [disabled]="
+                          [disabled]="isCreditOnly(row)"
                            row.acTyp === 'GL' &&
                            row.typ !== 'Disbursement' &&
                            row.typ !== 'Fund Transfer' &&
                            row.typ !== 'Enter Bank Transfer'
                          "
                          (click)="row.dbCr = 'Dr'"
                        >
                          DR
@@ -280,6 +276,7 @@
                          type="button"
                          class="ws-seg__btn ws-seg__btn--cr"
                          [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
                          [disabled]="row.typ === 'Withdrawal Slip'"
                          (click)="row.dbCr = 'Cr'"
                        >
                          CR
@@ -711,70 +708,98 @@
                <circle cx="12" cy="8" r="4" />
                <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" />
              </svg>
-              Personal Information
+              {{ isGlAccount ? 'GL Account Information' : 'Personal Information' }}
            </div>
-            <div class="te-panel__body">
+            @if (isGlAccount) {
-              <div class="te-field">
+              <div class="te-panel__body">
-                <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</span>
+                @for (f of glInfo; track f.label) {
                  <div class="te-field">
                    <span class="te-label">{{ f.label }}</span
                    ><span class="te-value te-value-wrap" [class.te-mono]="f.mono">{{ f.value }}</span>
                  </div>
                }
              </div>
-              <div class="te-field">
+            } @else {
-                <span class="te-label">A/c No.</span
+              <div class="te-panel__body">
                ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
              </div>
              <div class="te-field-row">
                <div class="te-field">
-                  <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
+                  <span class="te-label">Branch</span
                  ><span class="te-value">
                    @if (isOwnBranchAccount !== null) {
                      <span
                        class="te-branch-chip"
                        [class.te-branch-chip--mine]="isOwnBranchAccount"
                        [class.te-branch-chip--other]="!isOwnBranchAccount"
                        [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
                      >
                        <i class="fas fa-map-marker-alt"></i>{{ officeName }}
                        @if (!isOwnBranchAccount) {
                          <span class="te-branch-chip__tag">Other branch</span>
                        }
                      </span>
                    } @else {
                      {{ officeName }}
                    }
                  </span>
                </div>
                <div class="te-field">
-                  <span class="te-label">Type</span
+                  <span class="te-label">A/c No.</span
-                  ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
+                  ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
                </div>
                <div class="te-field-row">
                  <div class="te-field">
                    <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Type</span
                    ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
                  </div>
                </div>
                <div class="te-field-row">
                  <div class="te-field">
                    <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Status</span
                    ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
                  </div>
                </div>
                <div class="te-field">
                  <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
                </div>
                @if (isNonIndividual) {
                  <div class="te-field">
                    <span class="te-label">Constitution</span>
                    <span class="te-value">{{
                      nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
                    }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Incorp. No.</span>
                    <span class="te-value te-mono">{{
                      nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
                    }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Main Business</span>
                    <span class="te-value">{{
                      nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
                    }}</span>
                  </div>
                }
              </div>
-              <div class="te-field-row">
+            }
                <div class="te-field">
                  <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Status</span
                  ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
                </div>
              </div>
              <div class="te-field">
                <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
              </div>
              @if (isNonIndividual) {
                <div class="te-field">
                  <span class="te-label">Constitution</span>
                  <span class="te-value">{{
                    nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
                  }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Incorp. No.</span>
                  <span class="te-value te-mono">{{
                    nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
                  }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Main Business</span>
                  <span class="te-value">{{
                    nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
                  }}</span>
                </div>
              }
            </div>
          </div>
          <!-- Joint Holders + Nominees -->
@@ -929,76 +954,78 @@
          <!-- Other Info + KYC + Account Balances -->
          <div class="te-panel">
-            <div class="te-panel__header">
+            @if (!isGlAccount) {
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <div class="te-panel__header">
-                <rect x="3" y="4" width="18" height="18" rx="2" />
+                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <line x1="16" y1="2" x2="16" y2="6" />
+                  <rect x="3" y="4" width="18" height="18" rx="2" />
-                <line x1="8" y1="2" x2="8" y2="6" />
+                  <line x1="16" y1="2" x2="16" y2="6" />
-                <line x1="3" y1="10" x2="21" y2="10" />
+                  <line x1="8" y1="2" x2="8" y2="6" />
-              </svg>
+                  <line x1="3" y1="10" x2="21" y2="10" />
-              Other Information
+                </svg>
-            </div>
+                Other Information
            <div class="te-panel__body">
              <div class="te-field">
                <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
              </div>
-              <div class="te-field">
+              <div class="te-panel__body">
                <span class="te-label">Client ID</span
                ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">KYC Status</span>
                <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
                  kycStatus
                }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
              </div>
              <div class="te-field">
                <span class="te-label">Product</span>
                <span class="te-value">{{
                  accountDetails.savingsProductName ||
                    accountDetails.depositProductName ||
                    accountDetails.productName ||
                    '—'
                }}</span>
              </div>
              @if (selectedRow?.acTyp === 'SHR') {
                <div class="te-field">
-                  <span class="te-label">No. of Shares Held</span
+                  <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
                  ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
                </div>
                <div class="te-field">
-                  <span class="te-label">Market Price / Share</span
+                  <span class="te-label">Client ID</span
-                  ><span class="te-value te-mono"
+                  ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
                    >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
                  >
                </div>
                <div class="te-field">
-                  <span class="te-label">Resolution No.</span
+                  <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
                  ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
                </div>
                <div class="te-field">
-                  <span class="te-label">Linked Savings A/C No.</span
+                  <span class="te-label">KYC Status</span>
-                  ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
+                  <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
                    kycStatus
                  }}</span>
                </div>
-                @if (accountDetails.linkedLoanAccountNo) {
+                <div class="te-field">
                  <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
                </div>
                <div class="te-field">
                  <span class="te-label">Product</span>
                  <span class="te-value">{{
                    accountDetails.savingsProductName ||
                      accountDetails.depositProductName ||
                      accountDetails.productName ||
                      '—'
                  }}</span>
                </div>
                @if (selectedRow?.acTyp === 'SHR') {
                  <div class="te-field">
-                    <span class="te-label">Linked Loan A/C No.</span
+                    <span class="te-label">No. of Shares Held</span
-                    ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
+                    ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Market Price / Share</span
                    ><span class="te-value te-mono"
                      >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
                    >
                  </div>
                  <div class="te-field">
                    <span class="te-label">Resolution No.</span
                    ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
                  </div>
                  <div class="te-field">
                    <span class="te-label">Linked Savings A/C No.</span
                    ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
                  </div>
                  @if (accountDetails.linkedLoanAccountNo) {
                    <div class="te-field">
                      <span class="te-label">Linked Loan A/C No.</span
                      ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
                    </div>
                  }
                }
-              }
+              </div>
-            </div>
+            }
-            <div class="te-panel__header te-panel__header--mt">
+            <div class="te-panel__header" [class.te-panel__header--mt]="!isGlAccount">
              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                <line x1="12" y1="1" x2="12" y2="23" />
                <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
@@ -1191,7 +1218,24 @@
                                  : '—')
              }}</span
            >
-            <span class="te-acs-kv"><b>Branch</b> {{ officeName ?? '—' }}</span>
+            <span class="te-acs-kv"
              ><b>Branch</b>
              @if (isOwnBranchAccount !== null) {
                <span
                  class="te-branch-chip"
                  [class.te-branch-chip--mine]="isOwnBranchAccount"
                  [class.te-branch-chip--other]="!isOwnBranchAccount"
                  [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
                >
                  <i class="fas fa-map-marker-alt"></i>{{ officeName }}
                  @if (!isOwnBranchAccount) {
                    <span class="te-branch-chip__tag">Other branch</span>
                  }
                </span>
              } @else {
                {{ officeName }}
              }
            </span>
            <span class="te-acs-kv"
              ><b>Product</b>
              {{
@@ -1567,6 +1611,8 @@
                          <select
                            class="ws-f__ctl"
                            [(ngModel)]="row.typ"
                            [disabled]="isTypLocked(row)"
                            [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                            (click)="$event.stopPropagation()"
                            (change)="onTypChange(row)"
                          >
@@ -1577,11 +1623,16 @@
                        </div>
                        <div class="ws-f ws-f--branch">
                          <label class="ws-f__lbl">BRANCH</label>
-                          <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
+                          <select
-                            <option [ngValue]="1">001 · Main</option>
+                            class="ws-f__ctl"
-                            <option [ngValue]="2">002 · M.G. Road</option>
+                            [(ngModel)]="row.br"
-                            <option [ngValue]="14">014 · Station Rd</option>
+                            [disabled]="branchSelectOptions.length <= 1"
-                            <option [ngValue]="27">027 · Industrial</option>
+                            [title]="branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
                            (click)="$event.stopPropagation()"
                          >
                            @for (b of branchSelectOptions; track b.id) {
                              <option [ngValue]="b.id">{{ b.name }}</option>
                            }
                          </select>
                        </div>
                        @if (row.typ === 'DD') {
@@ -1627,13 +1678,7 @@
                              class="ws-f__ctl"
                              [(ngModel)]="row.acTyp"
                              (click)="$event.stopPropagation()"
-                              (change)="
+                              (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                                row.acTyp === 'GL' &&
                                  row.typ !== 'Disbursement' &&
                                  row.typ !== 'Fund Transfer' &&
                                  row.typ !== 'Enter Bank Transfer' &&
                                  (row.dbCr = 'Cr')
                              "
                            >
                              @for (a of acTypOptionsFor(row); track a) {
                                <option [value]="a">{{ a }}</option>
@@ -1704,12 +1749,7 @@
                              type="button"
                              class="ws-seg__btn ws-seg__btn--dr"
                              [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                              [disabled]="
+                              [disabled]="isCreditOnly(row)"
                                row.acTyp === 'GL' &&
                                row.typ !== 'Disbursement' &&
                                row.typ !== 'Fund Transfer' &&
                                row.typ !== 'Enter Bank Transfer'
                              "
                              (click)="$event.stopPropagation(); row.dbCr = 'Dr'"
                            >
                              DR
@@ -1718,6 +1758,7 @@
                              type="button"
                              class="ws-seg__btn ws-seg__btn--cr"
                              [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
                              [disabled]="row.typ === 'Withdrawal Slip'"
                              (click)="$event.stopPropagation(); row.dbCr = 'Cr'"
                            >
                              CR
@@ -2043,7 +2084,13 @@
              <button class="ws-btn ws-btn--ghost" type="button" (click)="onSearch()">Search</button>
              <button class="ws-btn ws-btn--mode" type="button">Change Tr.Mode</button>
              @if (isClerk) {
-                <button class="ws-btn ws-btn--add" type="button" (click)="addRow()" title="Add another transaction row">
+                <button
                  class="ws-btn ws-btn--add"
                  type="button"
                  [disabled]="selectedRow?.typ === 'Withdrawal Slip'"
                  (click)="addRow()"
                  title="Add another transaction row"
                >
                  <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
                    <line x1="12" y1="5" x2="12" y2="19" />
                    <line x1="5" y1="12" x2="19" y2="12" />
@@ -3462,3 +3462,39 @@ select.te-cell {
    box-shadow: none;
  }
 }
 /* The branch an account is held at, coloured by where the signed-in user works: green for their own branch, red for any other. */
 .te-branch-chip {
  display: inline-flex;
  align-items: center;
  gap: 6px;
  padding: 2px 10px;
  border: 1px solid transparent;
  border-radius: 999px;
  font-size: 12px;
  font-weight: 700;
  white-space: nowrap;
  &--mine {
    background: #dcfce7;
    border-color: #4ade80;
    color: #166534;
  }
  &--other {
    background: #fca5a5;
    border-color: #f87171;
    color: #7f1d1d;
  }
 }
 .te-branch-chip__tag {
  padding: 0 6px;
  border-radius: 8px;
  background: rgb(255 255 255 / 80%);
  color: #7f1d1d;
  font-size: 10px;
  font-weight: 800;
  letter-spacing: 0.04em;
  text-transform: uppercase;
 }
@@ -10,7 +10,8 @@ import { Component, OnInit, OnDestroy, inject, Input, ElementRef, ViewChild } fr
 import { CommonModule } from '@angular/common';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
 import { SILENT_HTTP_ERROR } from 'app/core/http/silent-error.token';
 import { catchError, debounceTime, distinctUntilChanged, map, timeout } from 'rxjs/operators';
 import { forkJoin, of, Subject } from 'rxjs';
 import { MatDialog, MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
@@ -1658,6 +1659,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  // Full account + client data
  accountDetails: any = null;
  /** Parent (header) GL of the selected GL account, shown in the GL Account Information panel. */
  glParent: { glCode?: string; name?: string } | null = null;
  clientDetails: any = null;
  kycDetails: any = null;
  nominees: any[] = [];
@@ -1685,10 +1688,12 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  private searchToken = 0;
  private lastLoadedAcNo = '';
  private acNoInput$ = new Subject<{ row: TxnRow; index: number; value: string }>();
  /** How many characters of the A/C NO. start the automatic account search. */
  private static readonly AC_NO_AUTO_SEARCH_MIN_LENGTH = 6;
  cashVaultGlId: number | null = null;
  /** The Cash Vault GL account's own code and name — the denomination breakdown for a manual GL
   *  entry has to be filed against THIS account, not whichever account the teller typed in, since
-   *  that account is never the one physical notes actually moved through (see submitGlJournalEntry).
+   *  that account is never the one physical notes actually moved through.
   *  Both resolved dynamically off whatever this tenant's own financial-activity mapping names as
   *  its cash/vault account (see loadCashVaultGl) — never a literal account name or code. */
  cashVaultGlCode: string | null = null;
@@ -1873,6 +1878,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  ngOnInit(): void {
    const d = businessToday();
    this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
    this.loadBranches();
    this.addRow();
    this.loadDenominations();
    this.loadOpeningPosition();
@@ -1903,7 +1909,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        distinctUntilChanged((a, b) => a.value === b.value && a.row === b.row)
      )
      .subscribe(({ row, index, value }) => {
-        if (value.trim().length >= 4) {
+        // Searches on its own once six characters are typed, for clerk and cashier alike.
        if (value.trim().length >= TransactionEntryComponent.AC_NO_AUTO_SEARCH_MIN_LENGTH) {
          this.selectedRow = row;
          this.loadAccountDetails(value.trim(), row.acTyp);
        }
@@ -2304,7 +2311,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    // anyway, just without the extra click to get there.
    const row: TxnRow = {
      typ: this.isClerk ? 'Withdrawal Slip' : 'Receipt',
-      br: 1,
+      br: this.defaultBranchId,
      trTp: '',
      acTyp: 'SD',
      acNo: '',
@@ -2323,8 +2330,54 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    this.rows.push(row);
  }
  /**
   * A GL row is credit-only (money received into the account) except on the transfer types, which pick
   * either side, and on a Withdrawal Slip, which is always a debit: the GL is debited and the cash
   * vault credited when cash is paid out against it (a clerk's request, approved, then paid by the cashier).
   */
  isGlCreditOnly(row: TxnRow): boolean {
    return (
      row.acTyp === 'GL' &&
      row.typ !== 'Disbursement' &&
      row.typ !== 'Fund Transfer' &&
      row.typ !== 'Enter Bank Transfer' &&
      row.typ !== 'Withdrawal Slip'
    );
  }
  /**
   * A Fixed Deposit row is credit-only on both the clerk and the cashier screens: an FD is funded once, with
   * exactly its principal, and money leaves it only through its maturity or premature closure. The one
   * exception is the clerk's own "Close this account" flow, which raises a closure request.
   */
  isFdCreditOnly(row: TxnRow): boolean {
    return row.acTyp === 'FD' && !this.pendingClosure;
  }
  /** DR is not offered for this row (see isGlCreditOnly and isFdCreditOnly). */
  isCreditOnly(row: TxnRow): boolean {
    return this.isGlCreditOnly(row) || this.isFdCreditOnly(row);
  }
  /** Called when the TYPE dropdown changes — sets sensible defaults for TXN TP and DR/CR */
  /**
   * A cashier row that was filled from an approved token (withdrawal / account-closure) is cash
   * leaving the branch to the member, so its TYPE is fixed to Payment and cannot be changed.
   * Never true for the clerk screen or for rows keyed in by hand.
   */
  isTypLocked(row: TxnRow): boolean {
    return (
      !this.isClerk &&
      !!row.tokNo?.trim() &&
      !!(this.activeWithdrawalRequest || this.activeDividendClaimRequest || this.activeClosureRequest)
    );
  }
  onTypChange(row: TxnRow): void {
    if (this.isTypLocked(row)) {
      row.typ = 'Payment';
      return;
    }
    switch (row.typ) {
      case 'Withdrawal Slip':
        row.dbCr = 'Dr';
@@ -2440,7 +2493,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   * such ambiguity — the account itself says what it's for.
   */
  showsEntryType(row: TxnRow): boolean {
-    return row.acTyp === 'GL' && row.dbCr === 'Cr';
+    return row.acTyp === 'GL';
  }
  /**
@@ -2618,14 +2671,51 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return !!this.selectedRow && Math.abs(this.denominationTotal - this.ddTargetTotal) < 0.005;
  }
  /**
   * The branches an entry can be posted against: the real offices of this installation. Read from the offices
   * themselves rather than from a fixed list, so a branch that is added or renamed shows up here without a code change.
   */
  branches: { id: number; label: string }[] = [];
  private loadBranches(): void {
    const own = this.authService.getCredentials();
    const ownBranch = own?.officeId
      ? [{ id: own.officeId, label: this.branchLabel(own.officeId, own.officeName) }]
      : [];
    // The office list is only asked for by a login allowed to read it. A cashier or clerk is not, and asking anyway
    // makes the server refuse and the screen raise an "Unauthorized Request" popup; such a login works in its own
    // office, which is the one branch it is offered.
    const permissions = own?.permissions ?? [];
    const mayReadOffices = permissions.includes('ALL_FUNCTIONS') || permissions.includes('READ_OFFICE');
    if (!mayReadOffices) {
      this.branches = ownBranch;
      return;
    }
    this.http
      .get('/offices')
      .pipe(catchError(() => of([])))
      .subscribe((list: any) => {
        const offices: any[] = Array.isArray(list) ? list : [];
        this.branches =
          offices.length > 0 ? offices.map((o) => ({ id: o.id, label: this.branchLabel(o.id, o.name) })) : ownBranch;
      });
  }
  private branchLabel(id: number, name: string | null | undefined): string {
    return `${String(id).padStart(3, '0')} · ${name ?? 'Branch ' + id}`;
  }
  /** The office the signed-in user works in, which a new entry is posted against unless they pick another. */
  get defaultBranchId(): number {
    return this.authService.getCredentials()?.officeId ?? 1;
  }
  branchNameFor(branchId: number): string {
-    const map: Record<number, string> = {
+    return (
-      1: '001 · Main',
+      this.seenBranches.find((b) => b.id === branchId)?.name ??
-      2: '002 · M.G. Road',
+      this.branches.find((b) => b.id === branchId)?.label ??
-      14: '014 · Station Rd',
+      `Branch ${branchId}`
-      27: '027 · Industrial'
+    );
    };
    return map[branchId] || `Branch ${branchId}`;
  }
  /**
@@ -3918,7 +4008,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    SAVINGS: 'SD',
    CURRENT: 'CA',
    FIXED_DEPOSIT: 'FD',
-    RECURRING_DEPOSIT: 'RD'
+    RECURRING_DEPOSIT: 'RD',
    GL: 'GL'
  };
  openCustomerSearch(): void {
@@ -3974,8 +4065,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      .pipe(catchError(() => of(null)))
      .subscribe((res: any) => {
        if (token !== this.searchToken) return; // stale result — newer search started
-        const allItems: any[] = res?.pageItems ?? (Array.isArray(res) ? res : []);
+        const found: any[] = res?.pageItems ?? (Array.isArray(res) ? res : []);
        const f = cfg.matchField;
        // SD, FD and RD share one list that returns any kind of deposit account: keep only the kind chosen in A/C TP.
        const allItems =
          cfg.depositTypeId != null ? found.filter((x: any) => x?.depositType?.id === cfg.depositTypeId) : found;
        // Exact match first, then suffix/partial match. Some account types (e.g. Share — its
        // list endpoint only accepts offset/limit, no accountNo filter at all) always return the
        const exactMatch = allItems.find((x: any) => String(x[f] ?? '').trim() === String(acNo).trim());
@@ -4005,7 +4099,18 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
          return;
        }
        this.loadingAccount = false;
-        this.accountError = 'Account not found for: ' + acNo;
+        // The number may exist as another kind of account (an FD typed under SD, say): say so, so the clerk can fix A/C TP.
        const otherKind =
          cfg.depositTypeId != null
            ? found.find(
                (x: any) =>
                  x?.depositType?.id !== cfg.depositTypeId &&
                  (String(x[f] ?? '').trim() === String(acNo).trim() || String(x[f] ?? '').endsWith(acNo))
              )
            : null;
        this.accountError = otherKind
          ? `${acTyp} account not found for: ${acNo} (this number is a ${otherKind.depositType?.value ?? 'different kind of'} account - change A/C TP)`
          : `${acTyp} account not found for: ${acNo}`;
      });
  }
@@ -4069,6 +4174,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     *  account type — used to keep Header GL accounts out of the results a clerk/cashier can pick
     *  for a transaction; a Header can never receive a posting, so it should never be offered. */
    extraListQueryParams?: string;
    /** SD, FD and RD are all served by the one /savingsaccounts list, which answers with a deposit
     *  account of any kind for a number. This is the depositType.id the chosen A/C type accepts
     *  (100 savings, 200 fixed, 300 recurring), so a number of another kind is "not found" here. */
    depositTypeId?: number;
  } {
    const t = acTyp?.toUpperCase();
    if (t === 'LA') {
@@ -4149,6 +4258,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      return {
        list: '/savingsaccounts',
        detail: '/fixeddepositaccounts',
        depositTypeId: 200,
        nominee: 'FD',
        search: 'fixeddeposit',
        siAccountType: 2,
@@ -4166,6 +4276,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      return {
        list: '/savingsaccounts',
        detail: '/recurringdepositaccounts',
        depositTypeId: 300,
        nominee: 'RD',
        search: 'recurringdeposit',
        siAccountType: 2,
@@ -4183,6 +4294,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return {
      list: '/savingsaccounts',
      detail: '/savingsaccounts',
      depositTypeId: 100,
      nominee: 'SB',
      search: 'saving',
      siAccountType: 2,
@@ -4242,7 +4354,19 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        return false;
      }
      this.accountDetails = acc;
      this.resolveAccountBranch(acc, acTyp, token, this.selectedRow);
      this.jointHolders = acc.jointHolders ?? [];
      // GL only: look up the parent (header) GL's name. Never runs for any other account type.
      this.glParent = null;
      if (acTyp?.toUpperCase() === 'GL' && acc.parentId) {
        this.http
          .get<any>(`/glaccounts/${acc.parentId}`)
          .pipe(catchError(() => of(null)))
          .subscribe((p: any) => {
            if (token !== this.searchToken) return;
            this.glParent = p ? { glCode: p.glCode, name: p.name } : null;
          });
      }
      // Cash Hold / Clearing Hold breakdown only exists for plain savings accounts (m_savings_account)
      // — FD/RD/Current/Share/GL have no such row, so there's nothing to ask for.
      if (acTyp?.toUpperCase() === 'SD' && acc.id) {
@@ -4813,6 +4937,109 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return this.accountDetails?.officeName ?? this.clientDetails?.officeName ?? '—';
  }
  /** True when the loaded account is a General Ledger account (/glaccounts), which has no client behind it. */
  get isGlAccount(): boolean {
    return !!this.accountDetails?.glCode && this.selectedRow?.acTyp === 'GL';
  }
  /** The GL account's own details, shown in place of the client panels. */
  get glInfo(): { label: string; value: string; mono?: boolean }[] {
    const gl = this.accountDetails;
    if (!gl) return [];
    const type = gl.type?.value ?? '—';
    const nature = [
      'ASSET',
      'EXPENSE'
    ].includes(String(type).toUpperCase()) ? 'Debit' : 'Credit';
    return [
      { label: 'GL Code', value: gl.glCode ?? '—', mono: true },
      { label: 'GL Name', value: gl.name ?? '—' },
      { label: 'Account Type', value: type },
      { label: 'Usage', value: gl.usage?.value ?? '—' },
      { label: 'Normal Balance', value: nature },
      {
        label: 'Parent GL',
        value: this.glParent?.name
          ? `${this.glParent.glCode ? this.glParent.glCode.trim() + ' - ' : ''}${this.glParent.name.trim()}`
          : gl.parentId != null
            ? `ID ${gl.parentId}`
            : '—'
      },
      { label: 'Manual Entries', value: gl.manualEntriesAllowed ? 'Allowed' : 'Not allowed' },
      { label: 'Status', value: gl.disabled ? 'Disabled' : 'Enabled' },
      { label: 'Description', value: gl.description || '—' }
    ];
  }
  /**
   * Whether the account on screen is held at the branch the signed-in user works at: true for their own branch, false for
   * another branch's, null while either branch is not known (the branch is then shown plain, uncoloured).
   */
  get isOwnBranchAccount(): boolean | null {
    const mine = this.authService.getCredentials()?.officeId;
    const accountOffice = this.accountDetails?.officeId ?? this.clientDetails?.officeId;
    if (mine == null || accountOffice == null) return null;
    return Number(mine) === Number(accountOffice);
  }
  /** What the BRANCH selector offers: the offices this login may use, plus the branches of the accounts picked here. */
  get branchSelectOptions(): { id: number; name: string }[] {
    const merged = this.branches.map(
      (branch) => this.seenBranches.find((seen) => seen.id === branch.id) ?? { id: branch.id, name: branch.label }
    );
    for (const seen of this.seenBranches) {
      if (!merged.some((branch) => branch.id === seen.id)) merged.push(seen);
    }
    return merged;
  }
  /** Branches learned from the accounts picked on this screen; their names are real, whatever the office list says. */
  private seenBranches: { id: number; name: string }[] = [];
  /**
   * The branch an account is held at. The savings, FD and RD detail responses carry no office, so the screen fell back
   * to the client's own branch and an account opened at another branch read as the client's. The client's account list
   * names each account's branch, so it is read from there. A current account's own response already carries it.
   */
  private resolveAccountBranch(acc: any, acTyp: string, token: number, row: TxnRow | null | undefined): void {
    if (acc?.officeId != null && acc?.officeName) {
      this.adoptAccountBranch({ id: Number(acc.officeId), name: String(acc.officeName) }, row);
      return;
    }
    const type = (acTyp ?? '').toUpperCase();
    if (!acc?.id || !acc?.clientId || ![
        'SD',
        'FD',
        'RD',
        'CA'
      ].includes(type)) return;
    this.http
      .get<any>(`/clients/${acc.clientId}/accounts`, { context: new HttpContext().set(SILENT_HTTP_ERROR, true) })
      .pipe(catchError(() => of(null)))
      .subscribe((res) => {
        // stale: another account was picked while this was loading
        if (token !== this.searchToken || this.accountDetails?.id !== acc.id) return;
        const list: any[] = (type === 'CA' ? res?.currentAccounts : res?.savingsAccounts) ?? [];
        const match = list.find((a: any) => a.id === acc.id);
        if (match?.officeId != null && match?.officeName) {
          this.adoptAccountBranch({ id: Number(match.officeId), name: String(match.officeName) }, row);
        }
      });
  }
  private adoptAccountBranch(branch: { id: number; name: string }, row: TxnRow | null | undefined): void {
    this.accountDetails = { ...this.accountDetails, officeId: branch.id, officeName: branch.name };
    // /offices lists only the signed-in user's own branches, or nothing for a user who may not read offices; the account's
    // branch must still be selectable, under its real name
    if (!this.seenBranches.some((b) => b.id === branch.id)) {
      this.seenBranches = [
        ...this.seenBranches,
        branch
      ];
    }
    if (row) row.br = branch.id;
  }
  get openingDate(): string {
    const raw =
      this.accountDetails?.timeline?.submittedOnDate ??
@@ -5155,6 +5382,20 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  }
  onSave(): void {
    // Money never leaves a Fixed Deposit from this screen, clerk or cashier: no withdrawal slip, payment,
    // collection or transfer debits an FD. It is paid out only through its maturity or premature closure
    // (the clerk's "Close this account" flow). The DR button is already disabled for FD rows (isFdCreditOnly);
    // this also catches a row set to DR by its TYPE, such as a Withdrawal Slip.
    const fdDebitRows = this.rows.filter((r) => this.isFdCreditOnly(r) && r.dbCr === 'Dr');
    if (fdDebitRows.length > 0) {
      this.showAlert('error', 'Fixed Deposit Cannot Be Debited', [
        `FD account(s) ${fdDebitRows.map((r) => r.acNo).join(', ')} cannot be debited or withdrawn from.`,
        'Money leaves a Fixed Deposit only through its maturity or premature closure.',
        'An FD can only be credited — once, with exactly its principal.'
      ]);
      return;
    }
    // Demand drafts commit here like everything else on the worksheet. Checked first because a DD
    // row shares its shape with the ordinary entries below — without this it would fall through and
    // post as a plain transaction, with the draft never raised and the charges silently dropped.
@@ -5232,7 +5473,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        return;
      }
-      // Bank transfer: only savings (SD) or current (CA/CB) accounts allowed
+      // Bank transfer: savings (SD) or current (CA/CB) accounts on either side, plus a Fixed Deposit (FD) on
      // the CR side only -- funding it from the customer's own account. The server checks the funding rules
      // (first and only funding, exactly the principal, the source account's owner and available balance).
      const allowedTypes = new Set([
        'SD',
        'CA',
@@ -5240,13 +5483,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      ]);
      const invalidAccounts = [
        ...drRows,
-        ...crRows
+        ...crRows.filter((r) => r.acTyp !== 'FD')
      ].filter((r) => !allowedTypes.has(r.acTyp));
      if (invalidAccounts.length > 0) {
        this.showAlert('error', 'Invalid Account Type', [
          `Account type(s) not allowed in Bank Transfer: ${invalidAccounts.map((r) => r.acTyp + ' (' + r.acNo + ')').join(', ')}`,
-          'Only Savings (SD) and Current (CA) accounts are permitted.',
+          'Debit side: only Savings (SD) and Current (CA) accounts. Credit side: SD, CA or a Fixed Deposit (FD).',
-          'GL, FD and SHR accounts are not allowed — use Disbursement/Collection instead.',
+          'GL and SHR accounts are not allowed — use Disbursement/Collection instead.',
          'RD installments are paid through a cashier Receipt or Auto Debit.'
        ]);
        return;
@@ -5847,10 +6090,14 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      return;
    }
-    // GL withdrawal → direct journal entry (no maker-checker)
+    // A GL withdrawal slip is raised by the clerk and paid by the cashier against its token, exactly like a
-    // GL deposit → falls through to maker-checker block below
+    // savings withdrawal (the clerk branch and the token branch below). Nothing posts from this screen directly:
-    if (row.acTyp === 'GL' && !isDeposit) {
+    // manual journal entries are switched off on the server.
-      this.submitGlJournalEntry(row, amount, isDeposit);
+    if (row.acTyp === 'GL' && !isDeposit && !this.clerkMode && !this.activeWithdrawalRequest) {
      this.showAlert('error', 'GL Withdrawal', [
        'A GL withdrawal is raised by a clerk and paid by the cashier against its token.',
        'Enter the token number of the approved request to pay it.'
      ]);
      return;
    }
@@ -6223,17 +6470,34 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
    const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
    const isGl = row.acTyp === 'GL';
    // The Entry Type picked for a GL slip has no column of its own on the request, so it rides on the narration.
    const entryTypeName = isGl ? this.entryTypeOptions.find((e) => e.id === row.entryTypeCvId)?.name : undefined;
    const description = [
      row.description,
      entryTypeName ? `[Entry Type: ${entryTypeName}]` : ''
    ]
      .filter(Boolean)
      .join(' ');
    return {
-      accountNo: this.accountDetails.accountNo,
+      accountNo: isGl ? (this.accountDetails.glCode ?? this.accountDetails.name) : this.accountDetails.accountNo,
      accountType: this.creditEntryAccountType(row.acTyp),
-      savingsAccountId: this.accountDetails.id,
+      savingsAccountId: isGl ? null : this.accountDetails.id,
-      clientId: this.accountDetails.clientId ?? this.clientDetails?.id ?? null,
+      // GL-specific fields: the GL being paid out of and the cash GL it is paid from (null for other types)
-      clientName: this.clientDetails?.displayName ?? this.accountDetails?.clientName ?? null,
+      glAccountId: isGl ? this.accountDetails.id : null,
      contraGlId: isGl ? this.cashVaultGlId : null,
      officeId: isGl ? row.br || 1 : null,
      currencyCode: isGl ? (this.accountDetails?.currency?.code ?? 'INR') : null,
      clientId: isGl ? null : (this.accountDetails.clientId ?? this.clientDetails?.id ?? null),
      clientName: isGl
        ? (this.accountDetails?.name ?? null)
        : (this.clientDetails?.displayName ?? this.accountDetails?.clientName ?? null),
      amount,
      txnDate: txnDateIso,
      paymentTypeId: row.paymentTypeId || null,
      paymentTypeName: selectedPt?.name ?? 'Cash',
-      description: row.description || null,
+      description: description || null,
      chequeNo: row.chequeNo || null,
      bankName: row.bankName || null,
      tokNo: row.tokNo?.trim() || null,
@@ -6425,106 +6689,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    this.addRow();
  }
  private submitGlJournalEntry(row: TxnRow, amount: number, isDeposit: boolean): void {
    if (!this.cashVaultGlId) {
      this.showAlert('error', 'Cash Vault GL Not Configured', [
        'Financial Activity Account (CASH_AT_TELLER) is not configured.',
        'Please configure it in System → Financial Activity Accounts.'
      ]);
      this.saving = false;
      return;
    }
    const today = businessToday();
    const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
    const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
    const selectedGlId = this.accountDetails.id;
    const contraGlId = this.cashVaultGlId;
    // isDeposit (CR button) = cashier receives cash → credit selected GL, debit contra (cash vault)
    // isWithdrawal (DR button) = cashier pays out cash → debit selected GL, credit contra (cash vault)
    const credits = isDeposit ? [{ glAccountId: selectedGlId, amount }] : [{ glAccountId: contraGlId, amount }];
    const debits = isDeposit ? [{ glAccountId: contraGlId, amount }] : [{ glAccountId: selectedGlId, amount }];
    const payload: any = {
      officeId: row.br || 1,
      transactionDate: txnDate,
      dateFormat: 'dd/MM/yyyy',
      locale: 'en',
      currencyCode: this.accountDetails?.currency?.code ?? 'INR',
      comments: row.description || null,
      credits,
      debits,
      paymentTypeId: row.paymentTypeId
    };
    // Check if cash payment so we can record denomination after journal entry
    const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
    const isCashPayment = !!selectedPt?.isCashPayment;
    this.saving = true;
    this.http
      .post('/journalentries', payload)
      .pipe(
        catchError((err: any) => {
          const msg =
            err?.error?.errors?.[0]?.defaultUserMessage ??
            err?.error?.developerMessage ??
            'Journal entry failed. Please try again.';
          this.showAlert('error', 'Transaction Failed', [msg]);
          this.saving = false;
          return of(null);
        })
      )
      .subscribe((res: any) => {
        this.saving = false;
        if (res) {
          // Record denomination so cashier position stays accurate
          // Same condition as savings: cash + denom entered + denom matches posted amount
          if (isCashPayment && this.denominationTotal > 0 && this.denominationTotal === amount) {
            const denomBreakdown = [
              ...this.notes,
              ...this.coins
            ]
              .filter((d) => this.countFor(d) > 0)
              .map((d) => ({
                denominationId: d.id,
                denominationValue: d.value,
                kind: d.kind,
                count: this.countFor(d),
                subtotal: this.subtotalFor(d)
              }));
            // Filed against the Cash Vault GL, not the account the teller selected on screen: that
            // selected account (e.g. Sundry Creditors) is the other leg of the journal entry, and
            // never the one whose physical notes actually changed hands. Tagging the breakdown to it
            // instead of the vault is why this cash never reached the cashier/vault position.
            this.http
              .post('/cashier/gl-denomination', {
                txnId: res.transactionId ?? res.resourceId,
                accountNo: this.cashVaultGlCode ?? row.acNo,
                accountName: this.cashVaultGlName ?? 'Cash at Vault',
                txnType: isDeposit ? 'DEPOSIT' : 'WITHDRAWAL',
                txnDate: txnDateIso,
                paymentTypeName: selectedPt?.name ?? 'Cash',
                denominationBreakdown: denomBreakdown
              })
              .pipe(catchError(() => of(null)))
              .subscribe();
          }
          const ref = res.transactionId ?? res.resourceId ?? 'N/A';
          this.showAlert('success', 'GL Transaction Posted', [
            `Journal entry of ₹${amount.toLocaleString('en-IN', { minimumFractionDigits: 2 })} posted successfully.`,
            `Transaction ID: ${ref}`
          ]);
          this.clearDenominations();
          this.loadOpeningPosition();
          this.loadAccountDetails(row.acNo.trim(), row.acTyp);
        }
      });
  }
  onSearch(): void {
    if (this.selectedRow?.acNo.trim()) {
      this.loadAccountDetails(this.selectedRow.acNo.trim(), this.selectedRow.acTyp);
@@ -0,0 +1,170 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <div class="cv-tab-content vca-tab">
  <!-- ── TITLE BAR ── -->
  <div class="vca-action-bar">
    <div class="vca-action-bar__left">
      <mat-icon class="vca-action-bar__icon">undo</mat-icon>
      <div>
        <div class="vca-action-bar__title">Voucher Corrections</div>
        <div class="vca-action-bar__sub">
          Approve or reject a voucher unpass, and the correction entry that follows it. Only the correction approval
          moves money.
        </div>
      </div>
    </div>
    <div class="vca-counts">
      <span class="vca-count"
        ><strong>{{ unpassCount }}</strong> unpass</span
      >
      <span class="vca-count"
        ><strong>{{ correctionCount }}</strong> correction</span
      >
    </div>
  </div>
  <!-- ── FILTER BAR ── -->
  <div class="vca-filter-bar">
    <div class="vca-search-box">
      <mat-icon>search</mat-icon>
      <input type="text" placeholder="Search by voucher, account, customer or user" [(ngModel)]="searchTerm" />
      @if (searchTerm) {
        <button type="button" class="vca-search-box__clear" (click)="searchTerm = ''">
          <mat-icon>close</mat-icon>
        </button>
      }
    </div>
    <span class="vca-fb-sep"></span>
    <select class="vca-filter-select" [(ngModel)]="kindFilter">
      @for (opt of kindOptions; track opt.value) {
        <option [value]="opt.value">{{ opt.label }}</option>
      }
    </select>
    <button type="button" class="vca-btn vca-btn--refresh" (click)="load()" [disabled]="loading">
      <mat-icon>refresh</mat-icon>
    </button>
  </div>
  <!-- ── TABLE ── -->
  @if (loading && !loaded) {
    <div class="vca-empty"><p class="vca-empty__title">Loading…</p></div>
  } @else if (rows.length === 0) {
    <div class="vca-empty">
      <mat-icon class="vca-empty__icon">inbox</mat-icon>
      <p class="vca-empty__title">No voucher correction waiting</p>
      <p class="vca-empty__text">There is no unpass request or correction entry waiting for review.</p>
    </div>
  } @else {
    <div class="vca-table-wrap">
      <table class="vca-table">
        <thead>
          <tr>
            <th>Voucher No</th>
            <th>Request</th>
            <th>Posted To (Wrong)</th>
            <th>Correct Account</th>
            <th class="num">Amount</th>
            <th>Reason</th>
            <th>Raised By</th>
            <th>Raised At</th>
            <th class="vca-th-action">Action</th>
          </tr>
        </thead>
        <tbody>
          @for (r of rows; track r.request.id) {
            <tr class="vca-row">
              <td class="vca-mono vca-voucher">{{ r.request.original_voucher_no }}</td>
              <td>
                <span class="vca-kind" [class]="'vca-kind vca-kind--' + r.kind">{{ kindLabel(r.kind) }}</span>
              </td>
              <td>
                <div class="vca-mono">{{ r.request.wrong_account_no }}</div>
                <div class="vca-sub">{{ r.request.wrong_client_name || '—' }}</div>
              </td>
              <td>
                @if (r.kind === 'correction') {
                  <div class="vca-mono vca-strong">{{ r.request.correct_account_no }}</div>
                  <div class="vca-sub">{{ r.request.correct_client_name || '—' }}</div>
                } @else {
                  <span class="vca-none">—</span>
                }
              </td>
              <td class="num vca-amount">₹{{ r.request.amount | number: '1.2-2' }}</td>
              <td class="vca-reason" [title]="r.request.reason || ''">{{ r.request.reason || '—' }}</td>
              <td>{{ r.raisedBy || '—' }}</td>
              <td class="vca-dt">{{ formatDateTime(r.raisedAt) }}</td>
              <td class="vca-action-cell">
                <button
                  type="button"
                  class="vca-btn vca-btn--reject"
                  [disabled]="busyId === r.request.id"
                  (click)="startReject(r)"
                >
                  <mat-icon>close</mat-icon> Reject
                </button>
                <button
                  type="button"
                  class="vca-btn vca-btn--approve"
                  [disabled]="busyId === r.request.id"
                  (click)="approve(r)"
                >
                  <mat-icon>check</mat-icon>
                  {{ r.kind === 'unpass' ? 'Approve unpass' : 'Approve correction' }}
                </button>
              </td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
 </div>
 <!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
 <ng-template #rejectDialog>
  @if (rejecting) {
    <div class="vca-dlg">
      <header class="vca-dlg__head">
        <mat-icon class="vca-dlg__ico">block</mat-icon>
        <div class="vca-dlg__titles">
          <div class="vca-dlg__title">
            Reject {{ rejecting.kind === 'unpass' ? 'unpass request' : 'correction entry' }}
          </div>
          <div class="vca-dlg__sub vca-mono">{{ rejecting.request.original_voucher_no }}</div>
        </div>
        <button type="button" class="vca-dlg__x" aria-label="Close" (click)="cancelReject()">
          <mat-icon>close</mat-icon>
        </button>
      </header>
      <div class="vca-dlg__body">
        <label class="vca-label" for="vca-reason">Reason (required)</label>
        <textarea
          id="vca-reason"
          rows="3"
          placeholder="Why is this being rejected?"
          [(ngModel)]="rejectReason"
        ></textarea>
      </div>
      <footer class="vca-dlg__foot">
        <button type="button" class="vca-btn vca-btn--ghost" (click)="cancelReject()">Cancel</button>
        <button
          type="button"
          class="vca-btn vca-btn--reject-solid"
          [disabled]="!rejectReason.trim() || busyId === rejecting.request.id"
          (click)="confirmReject()"
        >
          Confirm reject
        </button>
      </footer>
    </div>
  }
 </ng-template>
@@ -0,0 +1,485 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 // Laid out like the other approval tabs (Withdrawal Requests): title bar, filter bar, one table.
 :host {
  display: block;
 }
 .vca-tab {
  padding: 0;
 }
 .vca-action-bar {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 16px;
  padding: 10px 16px;
  background: #fff;
  border-bottom: 1px solid #e2e8f0;
  &__left {
    display: flex;
    align-items: center;
    gap: 12px;
  }
  &__icon {
    font-size: 22px;
    width: 22px;
    height: 22px;
    color: #0f4f3c;
  }
  &__title {
    font-size: 13px;
    font-weight: 700;
    color: #0d1b2a;
  }
  &__sub {
    max-width: 640px;
    margin-top: 1px;
    font-size: 11px;
    color: #64748b;
  }
 }
 .vca-counts {
  display: flex;
  gap: 8px;
 }
 .vca-count {
  padding: 2px 10px;
  border-radius: 999px;
  background: #f1f5f9;
  font-size: 11px;
  color: #475569;
  strong {
    color: #0f4f3c;
  }
 }
 .vca-filter-bar {
  display: flex;
  align-items: center;
  gap: 6px;
  flex-wrap: wrap;
  padding: 6px 16px;
  background: #f8fafc;
  border-bottom: 1px solid #e2e8f0;
 }
 .vca-fb-sep {
  flex-shrink: 0;
  width: 1px;
  height: 22px;
  margin: 0 4px;
  background: #e2e8f0;
 }
 .vca-search-box {
  display: inline-flex;
  align-items: center;
  gap: 6px;
  height: 30px;
  min-width: 240px;
  padding: 0 10px;
  border: 1px solid #e2e8f0;
  border-radius: 8px;
  background: #fff;
  mat-icon {
    flex-shrink: 0;
    font-size: 17px;
    width: 17px;
    height: 17px;
    color: #94a3b8;
  }
  &:hover {
    border-color: #cbd5e1;
  }
  &:focus-within {
    border-color: #0f4f3c;
    box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
  }
  input {
    flex: 1;
    border: none;
    outline: none;
    background: transparent;
    font-family: inherit;
    font-size: 12px;
    color: #0d1b2a;
    &::placeholder {
      color: #94a3b8;
    }
  }
  &__clear {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    flex-shrink: 0;
    width: 20px;
    height: 20px;
    padding: 0;
    border: none;
    border-radius: 50%;
    background: none;
    color: #94a3b8;
    cursor: pointer;
    mat-icon {
      font-size: 15px;
      width: 15px;
      height: 15px;
      color: inherit;
    }
    &:hover {
      color: #dc2626;
      background: #fef2f2;
    }
  }
 }
 .vca-filter-select {
  height: 30px;
  min-width: 140px;
  padding: 0 10px;
  border: 1px solid #e2e8f0;
  border-radius: 7px;
  background: #fff;
  font-family: inherit;
  font-size: 12px;
  color: #0d1b2a;
  cursor: pointer;
  &:focus {
    outline: none;
    border-color: #0f4f3c;
  }
 }
 // ── Buttons ─────────────────────────────────────────────────────────────────
 .vca-btn {
  display: inline-flex;
  align-items: center;
  gap: 4px;
  height: 26px;
  padding: 0 10px;
  border: 1px solid transparent;
  border-radius: 7px;
  font-family: inherit;
  font-size: 11px;
  font-weight: 600;
  white-space: nowrap;
  cursor: pointer;
  mat-icon {
    font-size: 14px;
    width: 14px;
    height: 14px;
  }
  &:disabled {
    opacity: 0.45;
    cursor: not-allowed;
  }
  &--refresh {
    height: 30px;
    width: 30px;
    justify-content: center;
    padding: 0;
    margin-left: auto;
    border-color: #e2e8f0;
    background: #fff;
    color: #475569;
  }
  &--approve {
    background: #0f4f3c;
    color: #fff;
    &:hover:not(:disabled) {
      background: #0a3d2e;
    }
  }
  &--reject {
    border-color: #fecaca;
    background: #fff;
    color: #dc2626;
    &:hover:not(:disabled) {
      background: #fef2f2;
    }
  }
  &--reject-solid {
    background: #dc2626;
    color: #fff;
  }
  &--ghost {
    border-color: #e2e8f0;
    background: #fff;
    color: #475569;
  }
 }
 // ── Table ───────────────────────────────────────────────────────────────────
 .vca-table-wrap {
  overflow-x: auto;
  background: #fff;
 }
 .vca-table {
  width: 100%;
  border-collapse: collapse;
  font-size: 11px;
  th {
    padding: 7px 10px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
    font-size: 9.5px;
    font-weight: 800;
    letter-spacing: 0.06em;
    text-align: left;
    text-transform: uppercase;
    color: #94a3b8;
    white-space: nowrap;
  }
  td {
    padding: 5px 10px;
    border-bottom: 1px solid #eef2f7;
    vertical-align: middle;
    color: #0d1b2a;
  }
  .num {
    text-align: right;
    font-variant-numeric: tabular-nums;
  }
  .vca-th-action {
    text-align: right;
  }
 }
 .vca-row:hover td {
  background: #f8fafc;
 }
 .vca-mono {
  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
  letter-spacing: 0.02em;
 }
 .vca-voucher {
  font-weight: 700;
  color: #0f4f3c;
 }
 .vca-strong {
  font-weight: 700;
 }
 .vca-sub {
  margin-top: 1px;
  font-size: 11px;
  color: #64748b;
 }
 .vca-none {
  color: #cbd5e1;
 }
 .vca-amount {
  font-weight: 700;
 }
 .vca-reason {
  max-width: 220px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .vca-dt {
  white-space: nowrap;
  color: #475569;
 }
 .vca-kind {
  display: inline-block;
  padding: 2px 10px;
  border-radius: 999px;
  font-size: 11px;
  font-weight: 700;
  &--unpass {
    background: #fef3c7;
    color: #92400e;
  }
  &--correction {
    background: #dbeafe;
    color: #1e40af;
  }
 }
 .vca-action-cell {
  display: flex;
  justify-content: flex-end;
  gap: 6px;
  white-space: nowrap;
 }
 // ── Empty ───────────────────────────────────────────────────────────────────
 .vca-empty {
  padding: 28px 16px;
  text-align: center;
  color: #94a3b8;
  &__icon {
    display: block;
    margin: 0 auto 6px;
    font-size: 30px;
    width: 30px;
    height: 30px;
    opacity: 0.6;
  }
  &__title {
    margin: 0;
    font-size: 12px;
    font-weight: 700;
    color: #64748b;
  }
  &__text {
    margin: 3px 0 0;
    font-size: 11px;
  }
 }
 // ── Reject popup ────────────────────────────────────────────────────────────
 .vca-dlg {
  font-size: 12px;
  &__head {
    display: flex;
    align-items: center;
    gap: 10px;
    padding: 10px 14px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
  }
  &__ico {
    flex: 0 0 32px;
    height: 32px;
    width: 32px;
    border-radius: 9px;
    background: #fef2f2;
    color: #dc2626;
    font-size: 18px;
    line-height: 32px;
    text-align: center;
  }
  &__titles {
    flex: 1;
    min-width: 0;
  }
  &__title {
    font-size: 14px;
    font-weight: 700;
    color: #0f172a;
  }
  &__sub {
    font-size: 11px;
    color: #64748b;
  }
  &__x {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    height: 28px;
    width: 28px;
    border: 0;
    border-radius: 50%;
    background: transparent;
    color: #64748b;
    cursor: pointer;
    &:hover {
      background: #e2e8f0;
    }
    mat-icon {
      font-size: 18px;
      height: 18px;
      width: 18px;
    }
  }
  &__body {
    padding: 12px 14px;
    textarea {
      width: 100%;
      padding: 7px 10px;
      border: 1px solid #cbd5e1;
      border-radius: 8px;
      font: inherit;
      font-size: 12px;
      resize: vertical;
      &:focus {
        outline: 0;
        border-color: #0f4f3c;
        box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
      }
    }
  }
  &__foot {
    display: flex;
    justify-content: flex-end;
    gap: 8px;
    padding: 10px 14px;
    border-top: 1px solid #e2e8f0;
    background: #f8fafc;
  }
 }
 .vca-label {
  display: block;
  margin-bottom: 4px;
  font-size: 10px;
  font-weight: 700;
  letter-spacing: 0.05em;
  text-transform: uppercase;
  color: #94a3b8;
 }
@@ -0,0 +1,192 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { VoucherCorrection, VoucherCorrectionService } from '../voucher-correction.service';
 type Kind = 'unpass' | 'correction';
 type KindFilter = 'ALL' | Kind;
 /** One row of the approvals table: a request, and which of the two steps it is waiting at. */
 interface ApprovalRow {
  kind: Kind;
  request: VoucherCorrection;
  raisedBy: string | null;
  raisedAt: string | null;
 }
 /**
 * Manager side of the voucher correction, laid out like the other approval tabs: approves or rejects the unpass of a
 * voucher, and later the correction entry the cashier made. Only the second approval moves money.
 */
@Component({
  selector: 'mifosx-voucher-correction-approvals',
  templateUrl: './voucher-correction-approvals.component.html',
  styleUrls: ['./voucher-correction-approvals.component.scss'],
  standalone: true,
  imports: [
    CommonModule,
    FormsModule,
    MatDialogModule,
    MatIconModule,
    MatSnackBarModule
  ]
 })
 export class VoucherCorrectionApprovalsComponent implements OnInit {
  private service = inject(VoucherCorrectionService);
  private snackBar = inject(MatSnackBar);
  private dialog = inject(MatDialog);
  @ViewChild('rejectDialog') rejectDialog!: TemplateRef<unknown>;
  private dialogRef: MatDialogRef<unknown> | null = null;
  all: ApprovalRow[] = [];
  loading = false;
  loaded = false;
  busyId: number | null = null;
  kindFilter: KindFilter = 'ALL';
  searchTerm = '';
  /** The row being rejected, and the reason typed for it. */
  rejecting: ApprovalRow | null = null;
  rejectReason = '';
  readonly kindOptions: { value: KindFilter; label: string }[] = [
    { value: 'ALL', label: 'All requests' },
    { value: 'unpass', label: 'Unpass requests' },
    { value: 'correction', label: 'Correction entries' }
  ];
  ngOnInit(): void {
    this.load();
  }
  load(): void {
    this.loading = true;
    this.service
      .list('UNPASS_PENDING,CORRECTION_PENDING')
      .pipe(catchError(() => of([] as VoucherCorrection[])))
      .subscribe((rows) => {
        this.all = rows.map((r) =>
          r.status === 'UNPASS_PENDING'
            ? { kind: 'unpass', request: r, raisedBy: r.unpass_by_name, raisedAt: r.unpass_at }
            : { kind: 'correction', request: r, raisedBy: r.correction_by_name, raisedAt: r.correction_at }
        );
        this.loading = false;
        this.loaded = true;
      });
  }
  /** The table: the kind picked, narrowed by whatever is typed in the search box. */
  get rows(): ApprovalRow[] {
    const term = this.searchTerm.trim().toLowerCase();
    return this.all.filter((r) => {
      if (this.kindFilter !== 'ALL' && r.kind !== this.kindFilter) return false;
      if (!term) return true;
      const q = r.request;
      return [
        q.original_voucher_no,
        q.wrong_account_no,
        q.wrong_client_name,
        q.correct_account_no,
        q.correct_client_name,
        r.raisedBy
      ].some((v) => (v ?? '').toLowerCase().includes(term));
    });
  }
  get unpassCount(): number {
    return this.all.filter((r) => r.kind === 'unpass').length;
  }
  get correctionCount(): number {
    return this.all.filter((r) => r.kind === 'correction').length;
  }
  kindLabel(kind: Kind): string {
    return kind === 'unpass' ? 'Unpass' : 'Correction';
  }
  formatDateTime(value: string | null): string {
    if (!value) return '—';
    const d = new Date(value);
    return isNaN(d.getTime())
      ? value
      : d.toLocaleString('en-IN', { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit' });
  }
  approve(row: ApprovalRow): void {
    if (this.busyId) return;
    const id = row.request.id;
    this.busyId = id;
    const call = row.kind === 'unpass' ? this.service.approveUnpass(id) : this.service.approveCorrection(id);
    call.subscribe({
      next: (res: any) => {
        this.busyId = null;
        this.snackBar.open(
          row.kind === 'unpass'
            ? `Voucher ${row.request.original_voucher_no} unpassed — the cashier can now enter the correct account`
            : `Corrected. New voucher ${res?.newVoucherNo ?? ''}`,
          'Close',
          { duration: 6000 }
        );
        this.load();
      },
      error: (err) => {
        this.busyId = null;
        this.fail(err, 'Could not approve');
      }
    });
  }
  startReject(row: ApprovalRow): void {
    this.rejecting = row;
    this.rejectReason = '';
    this.dialogRef = this.dialog.open(this.rejectDialog, { width: '440px', maxWidth: '95vw', autoFocus: false });
    this.dialogRef.afterClosed().subscribe(() => (this.rejecting = null));
  }
  cancelReject(): void {
    this.dialogRef?.close();
  }
  confirmReject(): void {
    if (!this.rejecting || !this.rejectReason.trim() || this.busyId) return;
    const row = this.rejecting;
    const id = row.request.id;
    this.busyId = id;
    const reason = this.rejectReason.trim();
    const call =
      row.kind === 'unpass' ? this.service.rejectUnpass(id, reason) : this.service.rejectCorrection(id, reason);
    call.subscribe({
      next: () => {
        this.busyId = null;
        this.dialogRef?.close();
        this.snackBar.open('Rejected', 'Close', { duration: 4000 });
        this.load();
      },
      error: (err) => {
        this.busyId = null;
        this.fail(err, 'Could not reject');
      }
    });
  }
  private fail(err: any, fallback: string): void {
    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
    this.snackBar.open(msg, 'Close', { duration: 8000 });
  }
 }
@@ -0,0 +1,120 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 /** One row of a voucher correction, as the server keeps it (snake_case columns). */
 export interface VoucherCorrection {
  id: number;
  original_voucher_no: string;
  original_txn_id: number;
  wrong_savings_account_id: number;
  wrong_account_no: string;
  wrong_client_name: string | null;
  amount: number;
  txn_date: string | null;
  status: 'UNPASS_PENDING' | 'UNPASSED' | 'UNPASS_REJECTED' | 'CORRECTION_PENDING' | 'COMPLETED' | 'CLOSED';
  reason: string | null;
  rejection_reason: string | null;
  unpass_by_name: string | null;
  unpass_at: string | null;
  unpass_approved_by_name: string | null;
  correct_account_no: string | null;
  correct_client_name: string | null;
  correction_by_name: string | null;
  correction_at: string | null;
  correction_approved_by_name: string | null;
  new_voucher_no: string | null;
 }
 /** A cash deposit voucher of today that can still be unpassed. */
 export interface EligibleVoucher {
  voucherNo: string;
  amount: number;
  createdAt: string;
  cashier: string;
  txnId: number;
  savingsAccountId: number;
  accountNo: string;
  clientName: string | null;
  paymentType: string;
 }
 /** What the server knows about a savings account typed in as the correct one. */
 export interface AccountLookup {
  id: number;
  accountNo: string;
  clientId: number | null;
  clientName: string | null;
  balance: number;
  currencyCode: string;
  canReceive: boolean;
 }
 /** HTTP service for the voucher correction workflow: unpass, approve, re-enter, approve. */
@Injectable({ providedIn: 'root' })
 export class VoucherCorrectionService {
  private http = inject(HttpClient);
  private readonly base = '/vouchers/corrections';
  eligible(search?: string): Observable<EligibleVoucher[]> {
    let params = new HttpParams();
    if (search) params = params.set('search', search);
    return this.http.get<EligibleVoucher[]>(`${this.base}/eligible`, { params });
  }
  unpass(voucherNo: string, reason: string): Observable<any> {
    return this.http.post(`${this.base}/unpass`, { voucherNo, reason });
  }
  list(status?: string, mine = false): Observable<VoucherCorrection[]> {
    let params = new HttpParams().set('mine', String(mine));
    if (status) params = params.set('status', status);
    return this.http.get<VoucherCorrection[]>(this.base, { params });
  }
  get(id: number): Observable<VoucherCorrection> {
    return this.http.get<VoucherCorrection>(`${this.base}/${id}`);
  }
  accountLookup(accountNo: string): Observable<AccountLookup> {
    return this.http.get<AccountLookup>(`${this.base}/account-lookup`, { params: { accountNo } });
  }
  submitCorrection(id: number, correctAccountNo: string): Observable<any> {
    return this.http.post(`${this.base}/${id}/correction`, { correctAccountNo });
  }
  /** The cashier gives up the correction, e.g. when the wrong account no longer holds the money. */
  close(id: number, reason: string): Observable<any> {
    return this.http.post(`${this.base}/${id}/close`, { reason });
  }
  approveUnpass(id: number): Observable<any> {
    return this.http.post(`${this.base}/${id}/unpass/approve`, {});
  }
  rejectUnpass(id: number, reason: string): Observable<any> {
    return this.http.post(`${this.base}/${id}/unpass/reject`, { reason });
  }
  approveCorrection(id: number): Observable<any> {
    return this.http.post(`${this.base}/${id}/correction/approve`, {});
  }
  rejectCorrection(id: number, reason: string): Observable<any> {
    return this.http.post(`${this.base}/${id}/correction/reject`, { reason });
  }
  /** Ids of the transactions of this account that a completed correction removed. */
  voidedTransactions(savingsAccountId: number): Observable<number[]> {
    return this.http.get<number[]>(`${this.base}/voided-transactions`, { params: { savingsAccountId } });
  }
 }
@@ -0,0 +1,446 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <div class="pg">
  <header class="pg-head">
    <div>
      <div class="pg-eyebrow">CASHIER · VOUCHER CORRECTION</div>
      <h1 class="pg-title">Voucher Correction</h1>
      <p class="pg-sub">
        Move a cash deposit that was posted to the wrong account. Nothing changes on any account until the final
        approval.
      </p>
    </div>
  </header>
  <!-- The four steps, so it is always clear where a voucher is. -->
  <ol class="vc-steps">
    <li class="vc-step" [class.vc-step--on]="tab === 'today'">
      <span class="vc-step__no">1</span>
      <span class="vc-step__txt"><strong>Unpass</strong> the voucher</span>
    </li>
    <li class="vc-step">
      <span class="vc-step__no">2</span>
      <span class="vc-step__txt"><strong>Manager</strong> approves</span>
    </li>
    <li class="vc-step" [class.vc-step--on]="tab === 'unpassed'">
      <span class="vc-step__no">3</span>
      <span class="vc-step__txt">Enter the <strong>correct account</strong></span>
    </li>
    <li class="vc-step">
      <span class="vc-step__no">4</span>
      <span class="vc-step__txt"><strong>Manager</strong> approves, deposit moves</span>
    </li>
  </ol>
  <nav class="vc-tabs">
    @if (mayUnpass) {
      <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'today'" (click)="setTab('today')">
        <mat-icon>receipt_long</mat-icon> Today's Vouchers
      </button>
    }
    @if (mayCorrect) {
      <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'unpassed'" (click)="setTab('unpassed')">
        <mat-icon>edit_note</mat-icon> Unpassed — Correct Entry
        @if (unpassed.length) {
          <span class="vc-count">{{ unpassed.length }}</span>
        }
      </button>
    }
    <button type="button" class="vc-tab" [class.vc-tab--on]="tab === 'mine'" (click)="setTab('mine')">
      <mat-icon>history</mat-icon> My Requests
    </button>
  </nav>
  <!-- ─── Today's vouchers ─────────────────────────────────────────────── -->
  @if (tab === 'today') {
    <div class="vc-toolbar">
      <div class="vc-search">
        <mat-icon>search</mat-icon>
        <input
          type="text"
          placeholder="Search by voucher, account or customer name"
          [(ngModel)]="search"
          (keyup.enter)="loadVouchers()"
        />
      </div>
      <button type="button" class="pg-btn pg-btn--primary" (click)="loadVouchers()">
        <mat-icon>search</mat-icon> Search
      </button>
      <button type="button" class="pg-btn pg-btn--ghost" (click)="search = ''; loadVouchers()">
        <mat-icon>refresh</mat-icon> Refresh
      </button>
    </div>
    <div class="pg-card">
      <table class="pg-table vc-table">
        <thead>
          <tr>
            <th>Voucher</th>
            <th>Account</th>
            <th>Customer</th>
            <th>Mode</th>
            <th>Cashier</th>
            <th class="num">Amount</th>
            <th class="vc-col-action"></th>
          </tr>
        </thead>
        <tbody>
          @for (v of vouchers; track v.voucherNo) {
            <tr [class.vc-row--on]="selectedVoucher?.voucherNo === v.voucherNo" (click)="pick(v)">
              <td>
                <span class="pg-chip">{{ v.voucherNo }}</span>
              </td>
              <td class="vc-mono">{{ v.accountNo }}</td>
              <td>{{ v.clientName || '—' }}</td>
              <td>{{ v.paymentType }}</td>
              <td>{{ v.cashier }}</td>
              <td class="num">₹{{ v.amount | number: '1.2-2' }}</td>
              <td class="vc-col-action">
                <button
                  type="button"
                  class="pg-btn pg-btn--ghost vc-btn-sm"
                  (click)="pick(v); $event.stopPropagation()"
                >
                  <mat-icon>undo</mat-icon> Unpass
                </button>
              </td>
            </tr>
          }
          @if (!vouchers.length) {
            <tr>
              <td colspan="7" class="vc-empty">
                <mat-icon>{{ loadingVouchers ? 'hourglass_empty' : 'inbox' }}</mat-icon>
                <div>{{ loadingVouchers ? 'Loading…' : 'No cash deposit voucher of today can be unpassed.' }}</div>
              </td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
  <!-- ─── Unpassed: enter the correct account ──────────────────────────── -->
  @if (tab === 'unpassed') {
    <div class="pg-card">
      <table class="pg-table vc-table">
        <thead>
          <tr>
            <th>Voucher</th>
            <th>Posted to</th>
            <th>Customer</th>
            <th>Reason</th>
            <th class="num">Amount</th>
            <th class="vc-col-action"></th>
          </tr>
        </thead>
        <tbody>
          @for (u of unpassed; track u.id) {
            <tr [class.vc-row--on]="active?.id === u.id" (click)="open(u)">
              <td>
                <span class="pg-chip">{{ u.original_voucher_no }}</span>
              </td>
              <td class="vc-mono">{{ u.wrong_account_no }}</td>
              <td>{{ u.wrong_client_name || '—' }}</td>
              <td class="vc-clip">{{ u.reason }}</td>
              <td class="num">₹{{ u.amount | number: '1.2-2' }}</td>
              <td class="vc-col-action">
                <button
                  type="button"
                  class="pg-btn pg-btn--primary vc-btn-sm"
                  (click)="open(u); $event.stopPropagation()"
                >
                  <mat-icon>edit</mat-icon> Correct
                </button>
              </td>
            </tr>
          }
          @if (!unpassed.length) {
            <tr>
              <td colspan="6" class="vc-empty">
                <mat-icon>{{ loadingUnpassed ? 'hourglass_empty' : 'task_alt' }}</mat-icon>
                <div>
                  {{ loadingUnpassed ? 'Loading…' : 'No unpassed voucher is waiting for its correct account.' }}
                </div>
              </td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
  <!-- ─── My requests ──────────────────────────────────────────────────── -->
  @if (tab === 'mine') {
    <div class="pg-card">
      <table class="pg-table vc-table">
        <thead>
          <tr>
            <th>Voucher</th>
            <th>Posted to</th>
            <th>Corrected to</th>
            <th class="num">Amount</th>
            <th>Status</th>
            <th>New voucher</th>
          </tr>
        </thead>
        <tbody>
          @for (m of mine; track m.id) {
            <tr>
              <td>
                <span class="pg-chip">{{ m.original_voucher_no }}</span>
              </td>
              <td class="vc-mono">{{ m.wrong_account_no }}</td>
              <td class="vc-mono">{{ m.correct_account_no || '—' }}</td>
              <td class="num">₹{{ m.amount | number: '1.2-2' }}</td>
              <td>
                <span class="vc-status vc-status--{{ m.status }}">{{ statusLabel[m.status] }}</span>
                @if (m.rejection_reason) {
                  <div class="vc-note">{{ m.rejection_reason }}</div>
                }
              </td>
              <td>{{ m.new_voucher_no || '—' }}</td>
            </tr>
          }
          @if (!mine.length) {
            <tr>
              <td colspan="6" class="vc-empty">
                <mat-icon>{{ loadingMine ? 'hourglass_empty' : 'history' }}</mat-icon>
                <div>{{ loadingMine ? 'Loading…' : 'You have no voucher corrections yet.' }}</div>
              </td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
 </div>
 <!-- ─── Popup: unpass a voucher ──────────────────────────────────────────── -->
 <ng-template #unpassDialog>
  @if (selectedVoucher) {
    <div class="vc-dlg">
      <header class="vc-dlg__head">
        <mat-icon class="vc-dlg__ico">undo</mat-icon>
        <div class="vc-dlg__titles">
          <div class="vc-dlg__title">Unpass voucher</div>
          <div class="vc-dlg__sub vc-mono">{{ selectedVoucher.voucherNo }}</div>
        </div>
        <button type="button" class="vc-dlg__x" aria-label="Close" (click)="closeUnpass()">
          <mat-icon>close</mat-icon>
        </button>
      </header>
      <div class="vc-dlg__body">
        <div class="vc-dlg__amount">
          <span>Deposit amount</span>
          <strong>₹{{ selectedVoucher.amount | number: '1.2-2' }}</strong>
        </div>
        <div class="vc-grid">
          <div class="vc-cell">
            <div class="vc-label">Voucher</div>
            <div class="vc-value vc-mono">{{ selectedVoucher.voucherNo }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Created</div>
            <div class="vc-value">{{ selectedVoucher.createdAt | date: 'dd MMM yyyy, hh:mm a' }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Cashier</div>
            <div class="vc-value">{{ selectedVoucher.cashier }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Mode</div>
            <div class="vc-value">{{ selectedVoucher.paymentType }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Account</div>
            <div class="vc-value vc-mono">{{ selectedVoucher.accountNo }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Customer</div>
            <div class="vc-value">{{ selectedVoucher.clientName || '—' }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Account balance now</div>
            <div class="vc-value">
              @if (voucherAccount) {
                ₹{{ voucherAccount.balance | number: '1.2-2' }}
              } @else {
                —
              }
            </div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Account status</div>
            <div class="vc-value">
              @if (voucherAccount) {
                {{ voucherAccount.canReceive ? 'Active' : 'Not active' }} · {{ voucherAccount.currencyCode }}
              } @else {
                —
              }
            </div>
          </div>
        </div>
        <label class="vc-label" for="vc-reason">Reason for unpassing</label>
        <textarea
          id="vc-reason"
          class="vc-reason"
          rows="2"
          placeholder="Why is this voucher wrong? e.g. deposited in the wrong account (required)"
          [(ngModel)]="unpassReason"
        ></textarea>
        <div class="vc-info">
          <mat-icon>info</mat-icon>
          A manager approves the unpass first. Nothing changes on any account until the corrected entry is approved: the
          deposit stays on {{ selectedVoucher.accountNo }} till then.
        </div>
      </div>
      <footer class="vc-dlg__foot">
        <button type="button" class="pg-btn pg-btn--ghost" (click)="closeUnpass()">Cancel</button>
        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!canUnpass" (click)="unpass()">
          <mat-icon>send</mat-icon> Send for approval
        </button>
      </footer>
    </div>
  }
 </ng-template>
 <!-- ─── Popup: enter the correct account ─────────────────────────────────── -->
 <ng-template #correctionDialog>
  @if (active) {
    <div class="vc-dlg">
      <header class="vc-dlg__head">
        <mat-icon class="vc-dlg__ico">edit_note</mat-icon>
        <div class="vc-dlg__titles">
          <div class="vc-dlg__title">Correction entry</div>
          <div class="vc-dlg__sub vc-mono">{{ active.original_voucher_no }}</div>
        </div>
        <button type="button" class="vc-dlg__x" aria-label="Close" (click)="closeActive()">
          <mat-icon>close</mat-icon>
        </button>
      </header>
      <div class="vc-dlg__body">
        <div class="vc-dlg__amount">
          <span>Amount to move</span>
          <strong>₹{{ active.amount | number: '1.2-2' }}</strong>
        </div>
        <!-- Everything but the account number is fixed. -->
        <div class="vc-grid">
          <div class="vc-cell">
            <div class="vc-label">Transaction date</div>
            <div class="vc-value">{{ active.txn_date || '—' }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Mode</div>
            <div class="vc-value">Cash</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Unpassed by</div>
            <div class="vc-value">{{ active.unpass_by_name || '—' }}</div>
          </div>
          <div class="vc-cell">
            <div class="vc-label">Approved by</div>
            <div class="vc-value">{{ active.unpass_approved_by_name || '—' }}</div>
          </div>
          <div class="vc-cell vc-cell--wide">
            <div class="vc-label">Reason</div>
            <div class="vc-value">{{ active.reason }}</div>
          </div>
        </div>
        <div class="vc-compare">
          <!-- The account the deposit went to -->
          <div class="vc-acct vc-acct--wrong">
            <div class="vc-acct__tag">Posted to (wrong)</div>
            <div class="vc-acct__no vc-mono">{{ active.wrong_account_no }}</div>
            <div class="vc-acct__name">{{ active.wrong_client_name || '—' }}</div>
            <div class="vc-acct__bal">
              Balance:
              @if (wrongAccount) {
                <strong>₹{{ wrongAccount.balance | number: '1.2-2' }}</strong>
                @if (wrongHasBalance) {
                  <span class="vc-ok"><mat-icon>check_circle</mat-icon> covers the deposit</span>
                } @else {
                  <span class="vc-bad"
                    ><mat-icon>cancel</mat-icon> does not cover ₹{{ active.amount | number: '1.2-2' }}</span
                  >
                }
              } @else {
                —
              }
            </div>
          </div>
          <mat-icon class="vc-arrow">arrow_forward</mat-icon>
          <!-- The account it should have gone to -->
          <div class="vc-acct" [class.vc-acct--ok]="correctOk" [class.vc-acct--wrong]="!!lookupError">
            <div class="vc-acct__tag">Correct account</div>
            <input
              id="vc-correct"
              class="vc-acct__input vc-mono"
              type="text"
              placeholder="Type the account number"
              [ngModel]="correctAccountNo"
              (ngModelChange)="onAccountInput($event)"
              (blur)="lookup()"
            />
            @if (lookingUp) {
              <div class="vc-acct__bal">Looking up…</div>
            }
            @if (correctAccount) {
              <div class="vc-acct__name">{{ correctAccount.clientName || '—' }}</div>
              <div class="vc-acct__bal">
                Balance: <strong>₹{{ correctAccount.balance | number: '1.2-2' }}</strong>
                @if (correctOk) {
                  <span class="vc-ok"><mat-icon>check_circle</mat-icon> active, can receive</span>
                }
              </div>
            }
            @if (lookupError) {
              <div class="vc-bad vc-acct__err"><mat-icon>error</mat-icon> {{ lookupError }}</div>
            }
          </div>
        </div>
        @if (wrongAccount && !wrongHasBalance) {
          <div class="vc-warn">
            <mat-icon>warning</mat-icon>
            <div>
              <strong>The customer has already used this money,</strong> so it cannot be taken back from
              {{ active.wrong_account_no }}. Deposit ₹{{ active.amount | number: '1.2-2' }} into the correct account
              from your own pocket as a fresh deposit (Transaction Entry), then press <strong>Close request</strong>.
            </div>
          </div>
        }
      </div>
      <footer class="vc-dlg__foot">
        <button
          type="button"
          class="pg-btn pg-btn--ghost vc-dlg__close-req"
          [disabled]="sending"
          (click)="closeRequest()"
        >
          <mat-icon>block</mat-icon> Close request
        </button>
        <button type="button" class="pg-btn pg-btn--ghost" (click)="closeActive()">Cancel</button>
        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!canSave" (click)="save()">
          <mat-icon>check</mat-icon> Save &amp; send for approval
        </button>
      </footer>
    </div>
  }
 </ng-template>
@@ -0,0 +1,599 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 // Compact sizing: the page has to fit a 100% browser window without scrolling for the common case.
 .pg {
  padding: 14px 20px;
  gap: 12px;
 }
 .pg-title {
  font-size: 20px;
  margin: 2px 0;
 }
 .pg-sub {
  font-size: 12px;
 }
 .pg-btn {
  height: 30px;
  padding: 0 12px;
  font-size: 12px;
  mat-icon {
    font-size: 16px;
    height: 16px;
    width: 16px;
  }
  &:disabled {
    opacity: 0.45;
    cursor: not-allowed;
  }
 }
 .pg-table {
  font-size: 12px;
  th {
    padding: 8px 12px;
    font-size: 10px;
  }
  td {
    padding: 7px 12px;
  }
 }
 // ── Steps ───────────────────────────────────────────────────────────────────
 .vc-steps {
  display: grid;
  grid-template-columns: repeat(auto-fit, minmax(170px, 1fr));
  gap: 8px;
  margin: 0;
  padding: 0;
  list-style: none;
 }
 .vc-step {
  display: flex;
  align-items: center;
  gap: 8px;
  padding: 6px 10px;
  border: 1px solid #e2e8f0;
  border-radius: 10px;
  background: #fff;
  font-size: 12px;
  color: #64748b;
  &__no {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    flex: 0 0 20px;
    height: 20px;
    border-radius: 50%;
    background: #e2e8f0;
    font-size: 11px;
    font-weight: 700;
    color: #475569;
  }
  &--on {
    border-color: #1f7a4d;
    background: #f0fdf4;
    color: #0f4f3c;
    .vc-step__no {
      background: #1f7a4d;
      color: #fff;
    }
  }
 }
 // ── Tabs ────────────────────────────────────────────────────────────────────
 .vc-tabs {
  display: flex;
  gap: 2px;
  border-bottom: 1px solid #e2e8f0;
  flex-wrap: wrap;
 }
 .vc-tab {
  display: inline-flex;
  align-items: center;
  gap: 5px;
  padding: 7px 12px;
  margin-bottom: -1px;
  border: 0;
  border-bottom: 2px solid transparent;
  background: transparent;
  font: inherit;
  font-size: 12px;
  font-weight: 600;
  color: #64748b;
  cursor: pointer;
  mat-icon {
    font-size: 16px;
    height: 16px;
    width: 16px;
  }
  &:hover {
    color: #0f4f3c;
  }
  &--on {
    color: #0f4f3c;
    border-bottom-color: #1f7a4d;
  }
 }
 .vc-count {
  padding: 0 7px;
  border-radius: 999px;
  background: #f59e0b;
  color: #fff;
  font-size: 10px;
  font-weight: 700;
 }
 // ── Search ──────────────────────────────────────────────────────────────────
 .vc-toolbar {
  display: flex;
  align-items: center;
  gap: 8px;
  flex-wrap: wrap;
 }
 .vc-search {
  display: flex;
  align-items: center;
  gap: 6px;
  flex: 1 1 280px;
  max-width: 420px;
  height: 30px;
  padding: 0 10px;
  border: 1px solid #cbd5e1;
  border-radius: 999px;
  background: #fff;
  &:focus-within {
    border-color: #1f7a4d;
    box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
  }
  mat-icon {
    font-size: 16px;
    height: 16px;
    width: 16px;
    color: #94a3b8;
  }
  input {
    flex: 1;
    min-width: 0;
    border: 0;
    outline: 0;
    background: transparent;
    font: inherit;
    font-size: 12px;
  }
 }
 // ── Table ───────────────────────────────────────────────────────────────────
 .vc-table {
  tbody tr {
    cursor: pointer;
  }
  tr.vc-row--on td {
    background: #f0fdf4;
    &:first-child {
      box-shadow: inset 3px 0 0 #1f7a4d;
    }
  }
  .vc-col-action {
    width: 1%;
    text-align: right;
    white-space: nowrap;
  }
  .vc-clip {
    max-width: 240px;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
  }
  .pg-chip {
    font-size: 11px;
    padding: 2px 8px;
  }
 }
 .vc-btn-sm {
  height: 26px;
  padding: 0 10px;
  font-size: 11px;
 }
 .vc-mono {
  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
  letter-spacing: 0.02em;
 }
 .vc-empty {
  padding: 24px 12px;
  text-align: center;
  color: #94a3b8;
  font-size: 12px;
  mat-icon {
    display: block;
    margin: 0 auto 4px;
    font-size: 28px;
    height: 28px;
    width: 28px;
    opacity: 0.6;
  }
 }
 // ── Popups ──────────────────────────────────────────────────────────────────
 .vc-dlg {
  display: flex;
  flex-direction: column;
  max-height: 86vh;
  font-size: 12px;
  &__head {
    display: flex;
    align-items: center;
    gap: 10px;
    padding: 10px 14px;
    border-bottom: 1px solid #e2e8f0;
    background: #f8fafc;
  }
  &__ico {
    flex: 0 0 32px;
    height: 32px;
    width: 32px;
    border-radius: 9px;
    background: #f0fdf4;
    color: #1f7a4d;
    font-size: 18px;
    line-height: 32px;
    text-align: center;
  }
  &__titles {
    flex: 1;
    min-width: 0;
  }
  &__title {
    font-size: 14px;
    font-weight: 700;
    color: #0f172a;
  }
  &__sub {
    font-size: 11px;
    color: #64748b;
  }
  &__x {
    display: inline-flex;
    align-items: center;
    justify-content: center;
    height: 28px;
    width: 28px;
    border: 0;
    border-radius: 50%;
    background: transparent;
    color: #64748b;
    cursor: pointer;
    mat-icon {
      font-size: 18px;
      height: 18px;
      width: 18px;
    }
    &:hover {
      background: #e2e8f0;
    }
  }
  &__body {
    padding: 12px 14px;
    overflow-y: auto;
  }
  &__amount {
    display: flex;
    align-items: baseline;
    justify-content: space-between;
    margin-bottom: 10px;
    padding: 8px 12px;
    border-radius: 10px;
    background: #ecfdf5;
    border: 1px solid #a7f3d0;
    color: #065f46;
    font-size: 12px;
    font-weight: 600;
    strong {
      font-size: 18px;
      font-weight: 800;
      font-variant-numeric: tabular-nums;
    }
  }
  &__foot {
    display: flex;
    justify-content: flex-end;
    gap: 8px;
    padding: 10px 14px;
    border-top: 1px solid #e2e8f0;
    background: #f8fafc;
  }
 }
 .vc-warn {
  display: flex;
  align-items: flex-start;
  gap: 8px;
  margin-top: 10px;
  padding: 8px 12px;
  border-radius: 8px;
  background: #fffbeb;
  border: 1px solid #fde68a;
  color: #92400e;
  font-size: 11px;
  mat-icon {
    flex: 0 0 18px;
    height: 18px;
    width: 18px;
    font-size: 18px;
  }
 }
 .vc-dlg__close-req {
  margin-right: auto;
  color: #b45309;
 }
 .vc-label {
  display: block;
  margin-bottom: 3px;
  font-size: 10px;
  font-weight: 700;
  letter-spacing: 0.05em;
  text-transform: uppercase;
  color: #94a3b8;
 }
 .vc-reason {
  width: 100%;
  padding: 7px 10px;
  border: 1px solid #cbd5e1;
  border-radius: 8px;
  font: inherit;
  font-size: 12px;
  resize: vertical;
  &:focus {
    outline: 0;
    border-color: #1f7a4d;
    box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
  }
 }
 .vc-info {
  display: flex;
  align-items: flex-start;
  gap: 6px;
  margin-top: 8px;
  padding: 7px 10px;
  border-radius: 8px;
  background: #eff6ff;
  color: #1e40af;
  font-size: 11px;
  mat-icon {
    flex: 0 0 16px;
    height: 16px;
    width: 16px;
    font-size: 16px;
  }
 }
 .vc-grid {
  display: grid;
  grid-template-columns: repeat(auto-fit, minmax(130px, 1fr));
  gap: 6px;
  margin-bottom: 10px;
 }
 .vc-cell {
  padding: 6px 10px;
  border-radius: 8px;
  background: #f8fafc;
  border: 1px solid #eef2f7;
 }
 .vc-cell--wide {
  grid-column: 1 / -1;
 }
 .vc-value {
  font-size: 12px;
  font-weight: 600;
  color: #0f172a;
  word-break: break-word;
 }
 // ── Wrong → Correct ─────────────────────────────────────────────────────────
 .vc-compare {
  display: grid;
  grid-template-columns: 1fr auto 1fr;
  align-items: stretch;
  gap: 8px;
  @media (width <= 640px) {
    grid-template-columns: 1fr;
  }
 }
 .vc-arrow {
  align-self: center;
  color: #94a3b8;
  @media (width <= 640px) {
    transform: rotate(90deg);
    justify-self: center;
  }
 }
 .vc-acct {
  padding: 10px 12px;
  border: 1px solid #e2e8f0;
  border-radius: 10px;
  background: #fff;
  &--wrong {
    border-color: #fecaca;
    background: #fef2f2;
  }
  &--ok {
    border-color: #a7f3d0;
    background: #ecfdf5;
  }
  &__tag {
    margin-bottom: 4px;
    font-size: 10px;
    font-weight: 700;
    letter-spacing: 0.05em;
    text-transform: uppercase;
    color: #64748b;
  }
  &__no {
    font-size: 14px;
    font-weight: 700;
    color: #0f172a;
  }
  &__input {
    width: 100%;
    height: 32px;
    padding: 0 10px;
    border: 1px solid #cbd5e1;
    border-radius: 8px;
    background: #fff;
    font-size: 13px;
    font-weight: 600;
    &:focus {
      outline: 0;
      border-color: #1f7a4d;
      box-shadow: 0 0 0 3px rgb(31 122 77 / 12%);
    }
  }
  &__name {
    margin-top: 4px;
    font-size: 12px;
    font-weight: 600;
    color: #1e293b;
  }
  &__bal {
    margin-top: 3px;
    font-size: 11px;
    color: #475569;
  }
  &__err {
    margin-top: 6px;
  }
 }
 .vc-ok,
 .vc-bad {
  display: inline-flex;
  align-items: center;
  gap: 3px;
  margin-left: 6px;
  font-weight: 700;
  mat-icon {
    font-size: 14px;
    height: 14px;
    width: 14px;
  }
 }
 .vc-ok {
  color: #059669;
 }
 .vc-bad {
  color: #dc2626;
 }
 .vc-note {
  margin-top: 3px;
  font-size: 11px;
  color: #64748b;
 }
 // ── Status ──────────────────────────────────────────────────────────────────
 .vc-status {
  display: inline-block;
  padding: 2px 8px;
  border-radius: 999px;
  background: #e2e8f0;
  font-size: 11px;
  font-weight: 700;
  &--UNPASS_PENDING,
  &--CORRECTION_PENDING {
    background: #fef3c7;
    color: #92400e;
  }
  &--UNPASSED {
    background: #dbeafe;
    color: #1e40af;
  }
  &--COMPLETED {
    background: #d1fae5;
    color: #065f46;
  }
  &--CLOSED {
    background: #f1f5f9;
    color: #475569;
  }
  &--UNPASS_REJECTED {
    background: #fee2e2;
    color: #991b1b;
  }
 }
@@ -0,0 +1,307 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
 import {
  AccountLookup,
  EligibleVoucher,
  VoucherCorrection,
  VoucherCorrectionService
 } from '../voucher-correction.service';
 type Tab = 'today' | 'unpassed' | 'mine';
 /**
 * Cashier side of correcting a cash deposit that went to the wrong account.
 *
 * Today vouchers: pick the voucher and unpass it (needs a manager approval; nothing moves).
 * Unpassed: open the approved voucher, whose details are fixed, change only the account number and save
 * (needs a manager approval again; only then do the accounts change).
 */
@Component({
  selector: 'mifosx-voucher-correction',
  templateUrl: './voucher-correction.component.html',
  styleUrls: [
    '../cashier-shared.scss',
    './voucher-correction.component.scss'
  ],
  standalone: true,
  imports: [
    CommonModule,
    FormsModule,
    MatIconModule,
    MatDialogModule,
    MatSnackBarModule
  ]
 })
 export class VoucherCorrectionComponent implements OnInit {
  private service = inject(VoucherCorrectionService);
  private snackBar = inject(MatSnackBar);
  private dialog = inject(MatDialog);
  private auth = inject(AuthenticationService);
  /** Unpassing is for the back office (an administrator or a clerk); re-entering the account is the cashier only. */
  readonly mayUnpass = this.auth.isClerkUser() || !!this.auth.getCredentials()?.permissions?.includes('ALL_FUNCTIONS');
  readonly mayCorrect = this.auth.isCashierUser();
  @ViewChild('unpassDialog') unpassDialog!: TemplateRef<unknown>;
  @ViewChild('correctionDialog') correctionDialog!: TemplateRef<unknown>;
  private dialogRef: MatDialogRef<unknown> | null = null;
  tab: Tab = this.mayUnpass ? 'today' : this.mayCorrect ? 'unpassed' : 'mine';
  // Today vouchers
  search = '';
  vouchers: EligibleVoucher[] = [];
  loadingVouchers = false;
  selectedVoucher: EligibleVoucher | null = null;
  /** The account the voucher was posted to, for the balance and status shown in the popup. */
  voucherAccount: AccountLookup | null = null;
  unpassReason = '';
  sending = false;
  // Unpassed vouchers waiting for the correct account
  unpassed: VoucherCorrection[] = [];
  loadingUnpassed = false;
  active: VoucherCorrection | null = null;
  wrongAccount: AccountLookup | null = null;
  correctAccountNo = '';
  correctAccount: AccountLookup | null = null;
  lookupError = '';
  lookingUp = false;
  // The cashier own requests
  mine: VoucherCorrection[] = [];
  loadingMine = false;
  readonly statusLabel: Record<string, string> = {
    UNPASS_PENDING: 'Unpass awaiting approval',
    UNPASSED: 'Unpassed — enter correct account',
    UNPASS_REJECTED: 'Unpass rejected',
    CORRECTION_PENDING: 'Correction awaiting approval',
    COMPLETED: 'Corrected',
    CLOSED: 'Closed — cashier deposits separately'
  };
  ngOnInit(): void {
    if (this.mayUnpass) this.loadVouchers();
    if (this.mayCorrect) this.loadUnpassed();
    if (this.tab === 'mine') this.loadMine();
  }
  setTab(tab: Tab): void {
    this.tab = tab;
    if (tab === 'today') this.loadVouchers();
    if (tab === 'unpassed') this.loadUnpassed();
    if (tab === 'mine') this.loadMine();
  }
  // ── Today vouchers ─────────────────────────────────────────────────────────
  loadVouchers(): void {
    this.loadingVouchers = true;
    this.service
      .eligible(this.search.trim())
      .pipe(catchError(() => of([] as EligibleVoucher[])))
      .subscribe((rows) => {
        this.vouchers = rows;
        this.loadingVouchers = false;
        if (this.selectedVoucher && !rows.some((r) => r.voucherNo === this.selectedVoucher?.voucherNo)) {
          this.selectedVoucher = null;
        }
      });
  }
  pick(v: EligibleVoucher): void {
    this.selectedVoucher = v;
    this.unpassReason = '';
    this.voucherAccount = null;
    this.service
      .accountLookup(v.accountNo)
      .pipe(catchError(() => of(null)))
      .subscribe((a) => (this.voucherAccount = a));
    this.showDialog(this.unpassDialog, () => (this.selectedVoucher = null));
  }
  closeUnpass(): void {
    this.dialogRef?.close();
  }
  get canUnpass(): boolean {
    return !!this.selectedVoucher && this.unpassReason.trim().length > 0 && !this.sending;
  }
  unpass(): void {
    if (!this.selectedVoucher || !this.canUnpass) return;
    this.sending = true;
    this.service.unpass(this.selectedVoucher.voucherNo, this.unpassReason.trim()).subscribe({
      next: () => {
        this.sending = false;
        this.snackBar.open(`Voucher ${this.selectedVoucher?.voucherNo} sent for unpass approval`, 'Close', {
          duration: 4000
        });
        this.dialogRef?.close();
        this.unpassReason = '';
        this.loadVouchers();
      },
      error: (err) => {
        this.sending = false;
        this.fail(err, 'Could not unpass the voucher');
      }
    });
  }
  // ── Unpassed vouchers: enter the correct account ───────────────────────────
  loadUnpassed(): void {
    this.loadingUnpassed = true;
    this.service
      .list('UNPASSED')
      .pipe(catchError(() => of([] as VoucherCorrection[])))
      .subscribe((rows) => {
        this.unpassed = rows;
        this.loadingUnpassed = false;
      });
  }
  open(row: VoucherCorrection): void {
    this.active = row;
    this.correctAccountNo = '';
    this.correctAccount = null;
    this.lookupError = '';
    this.wrongAccount = null;
    // The account the deposit went to: its balance is what the "can this be taken back" check reads.
    this.service
      .accountLookup(row.wrong_account_no)
      .pipe(catchError(() => of(null)))
      .subscribe((a) => (this.wrongAccount = a));
    this.showDialog(this.correctionDialog, () => (this.active = null));
  }
  closeActive(): void {
    this.dialogRef?.close();
  }
  onAccountInput(value: string): void {
    this.correctAccountNo = value;
    this.correctAccount = null;
    this.lookupError = '';
    // Same rule as the Transaction Entry screen: searches on its own once six characters are typed.
    if (value.trim().length >= 6) this.lookup();
  }
  lookup(): void {
    const accountNo = this.correctAccountNo.trim();
    if (!accountNo || this.lookingUp) return;
    this.lookingUp = true;
    this.service.accountLookup(accountNo).subscribe({
      next: (a) => {
        this.lookingUp = false;
        // A late answer for a number no longer typed is dropped.
        if (accountNo !== this.correctAccountNo.trim()) return;
        this.correctAccount = a;
        if (this.active && a.id === this.active.wrong_savings_account_id) {
          this.lookupError = 'This is the account the deposit was already posted to.';
        } else if (!a.canReceive) {
          this.lookupError = 'This account is not active, so it cannot receive the deposit.';
        }
      },
      error: (err) => {
        this.lookingUp = false;
        this.lookupError = err?.error?.errors?.[0]?.defaultUserMessage ?? 'Account not found.';
      }
    });
  }
  /** The wrong account still holds the deposit, so it can be taken back without overdrawing it. */
  get wrongHasBalance(): boolean {
    return !!this.wrongAccount && !!this.active && this.wrongAccount.balance >= this.active.amount;
  }
  get correctOk(): boolean {
    return !!this.correctAccount && this.correctAccount.canReceive && !this.lookupError;
  }
  get canSave(): boolean {
    return !!this.active && this.correctOk && this.wrongHasBalance && !this.sending;
  }
  save(): void {
    if (!this.active || !this.canSave) return;
    this.sending = true;
    this.service.submitCorrection(this.active.id, this.correctAccountNo.trim()).subscribe({
      next: () => {
        this.sending = false;
        this.snackBar.open('Correction sent for approval', 'Close', { duration: 4000 });
        this.dialogRef?.close();
        this.loadUnpassed();
      },
      error: (err) => {
        this.sending = false;
        this.fail(err, 'Could not save the correction');
      }
    });
  }
  /**
   * Gives up this correction. The usual reason is that the wrong account no longer holds the money, so the cashier
   * puts the amount into the right account from their own pocket as a fresh deposit instead.
   */
  closeRequest(): void {
    if (!this.active || this.sending) return;
    const reason = this.wrongHasBalance
      ? 'Closed by the cashier'
      : 'Wrong account no longer holds the amount; cashier deposits it into the correct account separately';
    this.sending = true;
    this.service.close(this.active.id, reason).subscribe({
      next: () => {
        this.sending = false;
        this.snackBar.open('Request closed', 'Close', { duration: 4000 });
        this.dialogRef?.close();
        this.loadUnpassed();
      },
      error: (err) => {
        this.sending = false;
        this.fail(err, 'Could not close the request');
      }
    });
  }
  // ── My requests ────────────────────────────────────────────────────────────
  loadMine(): void {
    this.loadingMine = true;
    this.service
      .list(undefined, true)
      .pipe(catchError(() => of([] as VoucherCorrection[])))
      .subscribe((rows) => {
        this.mine = rows;
        this.loadingMine = false;
      });
  }
  /** Opens one of the two popups; onClose runs however it is dismissed (button, backdrop or Esc). */
  private showDialog(template: TemplateRef<unknown>, onClose: () => void): void {
    this.dialogRef?.close();
    this.dialogRef = this.dialog.open(template, { width: '600px', maxWidth: '95vw', autoFocus: false });
    this.dialogRef.afterClosed().subscribe(onClose);
  }
  private fail(err: any, fallback: string): void {
    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
    this.snackBar.open(msg, 'Close', { duration: 6000 });
  }
 }
@@ -169,6 +169,7 @@
              <th>Debit</th>
              <th>Credit</th>
              <th class="num">Amount</th>
              <th>Correction</th>
              <th>User</th>
              <!-- Two dates, not one, on the system register.
                   A voucher's timestamp is the minute it was written; the posting behind it carries
@@ -217,6 +218,18 @@
                  </td>
                }
                <td class="num">{{ row.amount | number: '1.2-2' }}</td>
                <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
                <td>
                  <mifosx-voucher-status
                    [status]="row.voucherStatus"
                    [revokedBy]="row.revokedByVoucherNo"
                    [replaces]="row.replacesVoucherNo"
                    [note]="row.correctionNote"
                  ></mifosx-voucher-status>
                  @if (!row.voucherStatus || row.voucherStatus === 'ACTIVE') {
                    <span class="vr-active">—</span>
                  }
                </td>
                <td>{{ row.username || '—' }}</td>
                @if (systemOnly) {
                  <td class="vr-ledgerdate" [class.vr-ledgerdate--prior]="row.postedAfterClose">
@@ -92,3 +92,8 @@
  text-transform: uppercase;
  color: #7c3aed;
 }
 .vr-active {
  font-size: 11px;
  color: #94a3b8;
 }
@@ -14,6 +14,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { businessToday } from 'app/core/utils/business-today';
 import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 /**
 * Which side of the register a screen shows.
@@ -26,6 +27,11 @@ export type VoucherSide = 'CR' | 'DR' | 'ALL';
 /** One voucher as the register shows it: the number, the two sides, and who raised it. */
 interface VoucherRow {
  voucherNo: string;
  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
  voucherStatus?: VoucherStatus;
  revokedByVoucherNo?: string | null;
  replacesVoucherNo?: string | null;
  correctionNote?: string | null;
  voucherType: string | null;
  amount: number | null;
  createdAt: string | null;
@@ -82,7 +88,8 @@ interface VoucherReport {
  imports: [
    CommonModule,
    FormsModule,
-    MatIconModule
+    MatIconModule,
    VoucherStatusComponent
  ]
 })
 export class VoucherReportComponent implements OnInit {
@@ -0,0 +1,137 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, Input } from '@angular/core';
 import { CommonModule } from '@angular/common';
 /** Where a voucher stands after a voucher correction. */
 export type VoucherStatus =
  | 'ACTIVE'
  | 'REVOKED'
  | 'UNPASS_PENDING'
  | 'UNPASSED'
  | 'CORRECTION_PENDING'
  | 'CORRECTED'
  | 'CLOSED'
  | null
  | undefined;
 /**
 * A small badge saying whether a voucher was revoked, is under correction, or replaced another one.
 * Nothing is shown for an ordinary (active) voucher, so the registers read as before.
 */
@Component({
  selector: 'mifosx-voucher-status',
  standalone: true,
  imports: [CommonModule],
  template: `
    @if (label) {
      <span class="vs" [class]="'vs vs--' + status" [title]="hint">{{ label }}</span>
      @if (note) {
        <div class="vs-note">{{ note }}</div>
      }
    }
  `,
  styles: [
    `
      .vs {
        display: inline-block;
        margin-left: 6px;
        padding: 1px 8px;
        border-radius: 999px;
        background: #e2e8f0;
        color: #334155;
        font-size: 10px;
        font-weight: 700;
        white-space: nowrap;
        vertical-align: middle;
      }
      .vs-note {
        margin-top: 2px;
        max-width: 280px;
        font-size: 11px;
        line-height: 1.3;
        color: #64748b;
      }
      .vs--REVOKED {
        background: #fee2e2;
        color: #991b1b;
      }
      .vs--UNPASS_PENDING,
      .vs--CORRECTION_PENDING {
        background: #fef3c7;
        color: #92400e;
      }
      .vs--UNPASSED {
        background: #dbeafe;
        color: #1e40af;
      }
      .vs--CLOSED {
        background: #f1f5f9;
        color: #475569;
      }
      .vs--CORRECTED {
        background: #d1fae5;
        color: #065f46;
      }
    `
  ]
 })
 export class VoucherStatusComponent {
  @Input() status: VoucherStatus;
  /** The voucher that replaced this one, when it is revoked. */
  @Input() revokedBy: string | null | undefined;
  /** The voucher this one replaced, when it is the corrected one. */
  @Input() replaces: string | null | undefined;
  /** Why: the reason the voucher was unpassed, or why the correction was closed. */
  @Input() note: string | null | undefined;
  get label(): string {
    switch (this.status) {
      case 'REVOKED':
        return this.revokedBy ? `Revoked → ${this.revokedBy}` : 'Revoked';
      case 'UNPASS_PENDING':
        return 'Unpass pending';
      case 'UNPASSED':
        return 'Unpassed';
      case 'CORRECTION_PENDING':
        return 'Correction pending';
      case 'CLOSED':
        return 'Closed — cashier deposits separately';
      case 'CORRECTED':
        return this.replaces ? `Corrected (replaces ${this.replaces})` : 'Corrected';
      default:
        return '';
    }
  }
  get hint(): string {
    switch (this.status) {
      case 'REVOKED':
        return 'This voucher was revoked: its deposit was moved to another account and a new voucher replaced it.';
      case 'UNPASS_PENDING':
        return 'A manager has not yet approved unpassing this voucher.';
      case 'UNPASSED':
        return 'Unpassed: waiting for the cashier to enter the correct account.';
      case 'CORRECTION_PENDING':
        return 'The correct account is entered; waiting for a manager to approve.';
      case 'CLOSED':
        return 'The correction was closed by the cashier; the voucher stays as it was.';
      case 'CORRECTED':
        return 'This voucher was raised by a correction and replaces the earlier one.';
      default:
        return '';
    }
  }
 }
@@ -102,6 +102,27 @@
        </div>
      }
      <!-- Money moving between branches: the approver must see it before approving -->
      @if (isInterBranch) {
        <div class="dri-interbranch">
          <mat-icon>alt_route</mat-icon>
          <div>
            <div class="dri-interbranch__title">Inter-branch transfer</div>
            <div class="dri-interbranch__text">
              @if (branchNames(drEntries) && branchNames(crEntries)) {
                Money moves from <strong>{{ branchNames(drEntries) }}</strong> to
                <strong>{{ branchNames(crEntries) }}</strong
                >.
              } @else {
                These accounts are held at different branches: <strong>{{ branchNames(creditEntries) }}</strong
                >.
              }
              Each account is posted in its own branch's books. Check the accounts before approving.
            </div>
          </div>
        </div>
      }
      <!-- Bank Transfer summary card (replaces GL card) -->
      @if (isBankTransferMode) {
        <div class="dri-card">
@@ -154,6 +175,7 @@
                <th>Account No</th>
                <th>Account Name</th>
                <th>Type</th>
                <th>Branch</th>
                <th class="num">{{ isCollectionMode ? 'Amount (DR)' : 'Amount (CR)' }}</th>
              </tr>
            </thead>
@@ -166,11 +188,16 @@
                  <td>
                    <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                  </td>
                  <td>
                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
                      entry.officeName || '—'
                    }}</span>
                  </td>
                  <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                </tr>
              }
              <tr class="dri-cr-total-row">
-                <td colspan="4" class="dri-cr-total-label">{{ isCollectionMode ? 'Total Debit' : 'Total Credit' }}</td>
+                <td colspan="5" class="dri-cr-total-label">{{ isCollectionMode ? 'Total Debit' : 'Total Credit' }}</td>
                <td class="num dri-cr-total-amount">₹{{ totalCreditAmount() | number: '1.2-2' }}</td>
              </tr>
            </tbody>
@@ -192,6 +219,7 @@
                <th>Account No</th>
                <th>Account Name</th>
                <th>Type</th>
                <th>Branch</th>
                <th class="num">Amount (DR)</th>
              </tr>
            </thead>
@@ -204,11 +232,16 @@
                  <td>
                    <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                  </td>
                  <td>
                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
                      entry.officeName || '—'
                    }}</span>
                  </td>
                  <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                </tr>
              }
              <tr class="dri-cr-total-row">
-                <td colspan="4" class="dri-cr-total-label">Total Debit</td>
+                <td colspan="5" class="dri-cr-total-label">Total Debit</td>
                <td class="num dri-cr-total-amount">₹{{ totalDebitAmount() | number: '1.2-2' }}</td>
              </tr>
            </tbody>
@@ -228,6 +261,7 @@
                <th>Account No</th>
                <th>Account Name</th>
                <th>Type</th>
                <th>Branch</th>
                <th class="num">Amount (CR)</th>
              </tr>
            </thead>
@@ -240,11 +274,16 @@
                  <td>
                    <span class="dri-type-badge">{{ accountTypeLabel(entry.accountType) }}</span>
                  </td>
                  <td>
                    <span class="dri-branch-badge" [class.dri-branch-badge--cross]="isInterBranch">{{
                      entry.officeName || '—'
                    }}</span>
                  </td>
                  <td class="num dri-cr-amount">₹{{ entry.amount | number: '1.2-2' }}</td>
                </tr>
              }
              <tr class="dri-cr-total-row">
-                <td colspan="4" class="dri-cr-total-label">Total Credit</td>
+                <td colspan="5" class="dri-cr-total-label">Total Credit</td>
                <td class="num dri-cr-total-amount">₹{{ totalCreditAmount() | number: '1.2-2' }}</td>
              </tr>
            </tbody>
@@ -534,3 +534,54 @@ $shadow-md: 0 4px 16px rgb(0 0 0 / 9%);
  font-family: 'Courier New', monospace;
  letter-spacing: 0.02em;
 }
 /* A leg's branch. Amber on every leg when the request moves money between branches, neutral otherwise. */
 .dri-branch-badge {
  display: inline-flex;
  align-items: center;
  padding: 3px 10px;
  border-radius: 20px;
  background: #f1f5f9;
  border: 1px solid #cbd5e1;
  font-size: 11px;
  font-weight: 700;
  color: #475569;
  &--cross {
    background: #fffbeb;
    border-color: #fcd34d;
    color: #92400e;
  }
 }
 /* Shown above the summary when the accounts are at different branches. */
 .dri-interbranch {
  display: flex;
  align-items: flex-start;
  gap: 12px;
  margin: 0 0 12px;
  padding: 12px 16px;
  border: 1px solid #fcd34d;
  border-left: 4px solid #f59e0b;
  border-radius: 8px;
  background: #fffbeb;
  color: #78350f;
  mat-icon {
    flex-shrink: 0;
    color: #d97706;
  }
  &__title {
    font-size: 13px;
    font-weight: 800;
    letter-spacing: 0.02em;
    text-transform: uppercase;
  }
  &__text {
    margin-top: 2px;
    font-size: 13px;
    line-height: 1.5;
  }
 }
@@ -25,6 +25,9 @@ interface CreditEntry {
  accountType: string;
  amount: number;
  dbCr?: string;
  /** The branch the account is held at; absent for a GL leg or when the server could not resolve it. */
  officeId?: number | null;
  officeName?: string | null;
 }
@Component({
@@ -167,6 +170,19 @@ export class DisbursementReviewComponent implements OnInit {
    return this.creditEntries.filter((e) => e.dbCr !== 'Dr');
  }
  /**
   * True when the accounts in this request are held at more than one branch, so money moves between branches. The
   * approver has to see that before approving: it is booked in each branch's own books.
   */
  get isInterBranch(): boolean {
    return new Set(this.creditEntries.filter((e) => e.officeId != null).map((e) => e.officeId)).size > 1;
  }
  /** Distinct branch names among the given legs, in order, e.g. for "Head Office" or "Head Office, bhopal". */
  branchNames(entries: CreditEntry[]): string {
    return [...new Set(entries.map((e) => e.officeName).filter((name): name is string => !!name))].join(', ');
  }
  totalCreditAmount(): number {
    const entries = this.isCollectionMode ? this.drEntries : this.crEntries;
    return entries.reduce((sum, e) => sum + (e.amount ?? 0), 0);
@@ -930,6 +930,10 @@
          createClientForm.get('mobileNo')?.hasError('pattern') && createClientForm.get('mobileNo')?.touched
        ) {
          <mat-error>Enter valid 10-digit number (starts with 6-9)</mat-error>
        } @else if (createClientForm.get('mobileNo')?.hasError('contactTaken')) {
          <mat-error
            >This mobile number already belongs to another customer. Please enter a different number.</mat-error
          >
        }
      </mat-form-field>
@@ -940,7 +944,11 @@
            color="primary"
            type="button"
            class="verify-btn"
-            [disabled]="readOnly || createClientForm.get('mobileNo')?.value?.length !== 10"
+            [disabled]="
              readOnly ||
              createClientForm.get('mobileNo')?.value?.length !== 10 ||
              createClientForm.get('mobileNo')?.hasError('contactTaken')
            "
            (click)="verifyWithDIP()"
          >
            <fa-icon icon="shield-alt" class="m-r-10"></fa-icon>
@@ -1008,6 +1016,8 @@
          createClientForm.get('emailAddress')?.hasError('required') && createClientForm.get('emailAddress')?.touched
        ) {
          <mat-error>Email is <strong>required</strong></mat-error>
        } @else if (createClientForm.get('emailAddress')?.hasError('contactTaken')) {
          <mat-error>This email already belongs to another customer. Please enter a different email.</mat-error>
        } @else if (createClientForm.get('emailAddress')?.invalid && createClientForm.get('emailAddress')?.touched) {
          <mat-error>Enter a valid email (e.g. name&#64;example.com)</mat-error>
        }
@@ -27,15 +27,16 @@ import {
  UntypedFormControl,
  ReactiveFormsModule,
  ValidatorFn,
  AsyncValidatorFn,
  AbstractControl,
  ValidationErrors
 } from '@angular/forms';
-import { Subject, Subscription, merge } from 'rxjs';
+import { Subject, Subscription, merge, of, timer } from 'rxjs';
-import { filter, switchMap, takeUntil } from 'rxjs/operators';
+import { catchError, filter, map, switchMap, takeUntil } from 'rxjs/operators';
 import { ClientsService } from 'app/clients/clients.service';
 import { Dates } from 'app/core/utils/dates';
 import { LegalFormId } from 'app/clients/models/legal-form.enum';
-import { toProperNameCase } from 'app/clients/utils/name-case.util';
+import { toPersonNameCase, toProperNameCase } from 'app/clients/utils/name-case.util';
 import { ExternalNationalIdService } from 'app/clients/services/external-national-id.service';
 /** Custom Services */
@@ -936,6 +937,29 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    };
  }
  /**
   * A mobile number or email that already belongs to another customer. This is a different person using a contact
   * that is taken (a PAN or Aadhaar match is what means the same customer), so the answer is to enter another one.
   * Runs only once the format validators pass, and a new keystroke cancels the previous call, which is what
   * debounces it. The client being edited is excluded so its own number is not flagged.
   */
  private contactTakenValidator(field: 'mobileNo' | 'emailAddress'): AsyncValidatorFn {
    return (control: AbstractControl) => {
      const value = (control.value ?? '').toString().trim();
      if (!value) {
        return of(null);
      }
      return timer(400).pipe(
        switchMap(() =>
          this.clientService.lookupClientIdentity({ [field]: value, excludeClientId: this.clientData?.id ?? null })
        ),
        map((result) => (result?.contactConflicts?.[field] ? { contactTaken: true } : null)),
        // A failed lookup must not block the form: the server still refuses a duplicate when the client is saved.
        catchError(() => of(null))
      );
    };
  }
  /**
   * Creates the client form.
   */
@@ -969,7 +993,8 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
          Validators.required,
          Validators.pattern(/^[6-9]\d{9}$/),
          Validators.maxLength(10)
-        ]
+        ],
        this.contactTakenValidator('mobileNo')
      ],
      alternateMobileNo: [
        '',
@@ -986,7 +1011,8 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
          Validators.email,
          Validators.pattern(/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/),
          Validators.maxLength(100)
-        ]
+        ],
        this.contactTakenValidator('emailAddress')
      ],
      dateOfBirth: [
        '',
@@ -1456,7 +1482,10 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    const control = this.createClientForm.get(controlName);
    if (control && control.value) {
      const originalValue = control.value;
-      const capitalized = toProperNameCase(originalValue);
+      // An entity's full name keeps its typed spelling (matched against the PAN name); a person's
      // name parts are title-cased, the same as the Full Name line shows them.
      const capitalized =
        controlName === 'fullname' ? toProperNameCase(originalValue) : toPersonNameCase(originalValue);
      if (originalValue !== capitalized) {
        control.setValue(capitalized);
      }
@@ -1925,12 +1954,11 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
  /** Returns capitalized full name preview from first + middle + last */
  get fullNamePreview(): string {
    const capitalize = (s: string) => (s ? s.charAt(0).toUpperCase() + s.slice(1).toLowerCase() : '');
    const salutationId = this.createClientForm?.get('salutationId')?.value;
    const salutation = this.salutationOptions?.find((s: any) => s.id === salutationId)?.name || '';
-    const first = capitalize(this.createClientForm?.get('firstname')?.value || '');
+    const first = toPersonNameCase(this.createClientForm?.get('firstname')?.value);
-    const middle = capitalize(this.createClientForm?.get('middlename')?.value || '');
+    const middle = toPersonNameCase(this.createClientForm?.get('middlename')?.value);
-    const last = capitalize(this.createClientForm?.get('lastname')?.value || '');
+    const last = toPersonNameCase(this.createClientForm?.get('lastname')?.value);
    const full = [
      first,
      middle,
@@ -2360,6 +2388,15 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    if (generalDetails.fullname) {
      generalDetails.fullname = toProperNameCase(generalDetails.fullname);
    }
    for (const part of [
      'firstname',
      'middlename',
      'lastname'
    ]) {
      if (generalDetails[part]) {
        generalDetails[part] = toPersonNameCase(generalDetails[part]);
      }
    }
    if (generalDetails.submittedOnDate instanceof Date) {
      generalDetails.submittedOnDate = this.dateUtils.formatDate(generalDetails.submittedOnDate, dateFormat);
@@ -0,0 +1,211 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <section class="identity-check" [class.identity-check--blocking]="status === 'matched' || status === 'conflict'">
  <header class="identity-check__header">
    <mat-icon class="identity-check__icon">fingerprint</mat-icon>
    <div>
      <h3 class="identity-check__title">Existing customer check</h3>
      <p class="identity-check__hint">
        @if (isEntity) {
          Enter the company's GSTIN or PAN. If either is already on file in any branch, it is the same customer and a
          new one is not created.
        } @else {
          Enter PAN or Aadhaar. If either is already on file in any branch, it is the same customer and a new one is not
          created. Nothing found? What you enter here is filled into the KYC step for you.
        }
      </p>
    </div>
  </header>
  @if (form) {
    <form [formGroup]="form" class="identity-check__fields">
      @if (isEntity) {
        <mat-form-field appearance="outline" class="identity-check__field">
          <mat-label>GSTIN</mat-label>
          <input
            matInput
            formControlName="gstin"
            class="identity-check__upper"
            maxlength="15"
            mifosxRestrictInput="gstin"
            [errorStateMatcher]="errorMatcher"
            placeholder="e.g. 22AAAAA0000A1Z5"
            (input)="capitalise('gstin', $event)"
          />
          @if (form.get('gstin')?.hasError('pattern')) {
            <mat-error>Invalid GSTIN. It has 15 characters, like 22AAAAA0000A1Z5</mat-error>
          }
        </mat-form-field>
      }
      <mat-form-field appearance="outline" class="identity-check__field">
        <mat-label>{{ isEntity ? 'Company PAN' : 'PAN' }}</mat-label>
        <input
          matInput
          formControlName="pan"
          class="identity-check__upper"
          maxlength="10"
          mifosxRestrictInput="pan"
          [errorStateMatcher]="errorMatcher"
          placeholder="e.g. ABCDE1234F"
          (input)="capitalise('pan', $event)"
        />
        @if (form.get('pan')?.hasError('pattern')) {
          <mat-error>Invalid PAN. Use 5 letters, 4 digits, 1 letter, like ABCDE1234F</mat-error>
        }
      </mat-form-field>
      @if (!isEntity) {
        <mat-form-field appearance="outline" class="identity-check__field">
          <mat-label>Aadhaar</mat-label>
          <input
            matInput
            formControlName="aadhaar"
            maxlength="12"
            inputmode="numeric"
            mifosxRestrictInput="digits"
            [errorStateMatcher]="errorMatcher"
            placeholder="12 digits"
          />
          @if (form.get('aadhaar')?.hasError('pattern')) {
            <mat-error>Invalid Aadhaar. It must be exactly 12 digits</mat-error>
          } @else {
            <mat-hint>Only a fingerprint of this number is sent, never the number</mat-hint>
          }
        </mat-form-field>
      }
    </form>
  }
  @switch (status) {
    @case ('checking') {
      <div class="identity-check__status identity-check__status--info">
        <mat-progress-spinner mode="indeterminate" diameter="18"></mat-progress-spinner>
        Checking all branches…
      </div>
    }
    @case ('not-found') {
      <div class="identity-check__status identity-check__status--ok">
        <mat-icon>check_circle</mat-icon>
        <span>
          No existing customer found. You can continue; these details will be filled into the KYC step so you do not
          type them again.
        </span>
      </div>
    }
    @case ('error') {
      <div class="identity-check__status identity-check__status--warn">
        <mat-icon>warning</mat-icon>
        <span>
          Could not check right now. You can continue; the PAN, Aadhaar and GSTIN are checked again when the KYC is
          saved.
        </span>
        <button mat-button type="button" (click)="recheck()">Check again</button>
      </div>
    }
    @case ('conflict') {
      <div class="identity-check__status identity-check__status--error">
        <mat-icon>report</mat-icon>
        <span>
          These details belong to <strong>different customers</strong>. Check what was typed. If they are correct, ask a
          manager to review before continuing.
        </span>
      </div>
      @for (m of matches; track m.clientId) {
        <div class="identity-check__card">
          <strong>{{ m.displayName }}</strong>
          <span class="identity-check__meta">CIF {{ m.cifNumber }} · {{ m.officeName }}</span>
          <span class="identity-check__chips">
            @for (by of m.matchedBy; track by) {
              <span class="identity-check__chip">{{ matchedByLabel(by) }} matches</span>
            }
          </span>
        </div>
      }
    }
    @case ('matched') {
      @if (match; as m) {
        <div class="identity-check__status identity-check__status--error">
          <mat-icon>person_search</mat-icon>
          <span> This is an <strong>existing customer</strong>. A new client is not created for the same person. </span>
        </div>
        <div class="identity-check__card">
          <div class="identity-check__card-head">
            <strong>{{ m.displayName }}</strong>
            <span class="identity-check__chips">
              @for (by of m.matchedBy; track by) {
                <span class="identity-check__chip">{{ matchedByLabel(by) }} matches</span>
              }
            </span>
          </div>
          <dl class="identity-check__facts">
            <div>
              <dt>CIF</dt>
              <dd>{{ m.cifNumber }}</dd>
            </div>
            <div>
              <dt>Home branch</dt>
              <dd>{{ m.officeName }}</dd>
            </div>
            <div>
              <dt>Type</dt>
              <dd>{{ legalFormLabel(m) }}</dd>
            </div>
            @if (m.panMasked) {
              <div>
                <dt>PAN</dt>
                <dd>{{ m.panMasked }}</dd>
              </div>
            }
            @if (m.aadhaarMasked) {
              <div>
                <dt>Aadhaar</dt>
                <dd>{{ m.aadhaarMasked }}</dd>
              </div>
            }
            @if (m.gstinMasked) {
              <div>
                <dt>GSTIN</dt>
                <dd>{{ m.gstinMasked }}</dd>
              </div>
            }
          </dl>
          @if (m.visibleToCaller) {
            <button
              mat-flat-button
              color="primary"
              type="button"
              class="identity-check__action"
              [routerLink]="['/clients', m.clientId, 'general']"
            >
              Open this customer
            </button>
          } @else {
            <p class="identity-check__note">
              This customer is registered at <strong>{{ m.officeName }}</strong
              >. They stay a single customer (one CIF). Open their page, then choose which account to open for them at
              this branch. They are listed under this branch once an account is opened here.
            </p>
            <button
              mat-flat-button
              color="primary"
              type="button"
              class="identity-check__action"
              [disabled]="linking"
              (click)="openAccountHere(m)"
            >
              {{ linking ? 'Please wait…' : 'Open account for this customer' }}
            </button>
          }
        </div>
      }
    }
  }
 </section>
@@ -0,0 +1,157 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 :host {
  display: block;
 }
 .identity-check {
  margin-bottom: 16px;
  padding: 16px 20px;
  background: #f9fafb;
  border: 1px solid #e5e7eb;
  border-radius: 12px;
  &--blocking {
    border-color: #fecaca;
    background: #fffafa;
  }
  &__header {
    display: flex;
    gap: 12px;
    align-items: flex-start;
    margin-bottom: 12px;
  }
  &__icon {
    flex: none;
    color: var(--md-sys-color-primary, #1074b9);
  }
  &__title {
    margin: 0;
    font-size: 15px;
    font-weight: 600;
  }
  &__hint {
    margin: 2px 0 0;
    font-size: 13px;
    color: #6b7280;
  }
  // PAN and GSTIN read in capitals even before the value is rewritten.
  &__upper {
    text-transform: uppercase;
  }
  &__fields {
    display: flex;
    flex-wrap: wrap;
    gap: 0 16px;
  }
  &__field {
    flex: 1 1 220px;
    min-width: 200px;
  }
  &__status {
    display: flex;
    gap: 10px;
    align-items: center;
    padding: 10px 12px;
    font-size: 13px;
    border-radius: 8px;
    &--info {
      background: #eff6ff;
      color: #1e40af;
    }
    &--ok {
      background: #ecfdf5;
      color: #047857;
    }
    &--warn {
      background: #fffbeb;
      color: #92400e;
    }
    &--error {
      background: #fef2f2;
      color: #991b1b;
    }
  }
  &__card {
    margin-top: 10px;
    padding: 12px 14px;
    background: #fff;
    border: 1px solid #fecaca;
    border-radius: 10px;
  }
  &__card-head {
    display: flex;
    flex-wrap: wrap;
    gap: 8px 12px;
    align-items: center;
    justify-content: space-between;
  }
  &__meta {
    margin-left: 8px;
    font-size: 13px;
    color: #6b7280;
  }
  &__chips {
    display: inline-flex;
    flex-wrap: wrap;
    gap: 6px;
  }
  &__chip {
    padding: 2px 8px;
    font-size: 12px;
    color: #991b1b;
    background: #fee2e2;
    border-radius: 999px;
  }
  &__facts {
    display: grid;
    grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
    gap: 8px 16px;
    margin: 10px 0 0;
    dt {
      font-size: 12px;
      color: #6b7280;
    }
    dd {
      margin: 0;
      font-size: 14px;
      font-weight: 500;
    }
  }
  &__action {
    margin-top: 12px;
  }
  &__note {
    margin: 12px 0 0;
    font-size: 13px;
    color: #374151;
  }
 }
@@ -0,0 +1,308 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import {
  Component,
  EventEmitter,
  Input,
  OnChanges,
  OnDestroy,
  OnInit,
  Output,
  SimpleChanges,
  inject
 } from '@angular/core';
 import {
  AbstractControl,
  FormGroupDirective,
  NgForm,
  UntypedFormBuilder,
  UntypedFormGroup,
  Validators
 } from '@angular/forms';
 import { ErrorStateMatcher } from '@angular/material/core';
 import { Router } from '@angular/router';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { Observable, Subject, merge, of } from 'rxjs';
 import { catchError, debounceTime, map, switchMap, takeUntil, tap } from 'rxjs/operators';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { AuthenticationService } from 'app/core/authentication/authentication.service';
 import { RestrictInputDirective } from '../../../directives/restrict-input.directive';
 import { ClientsService } from '../../clients.service';
 import { ClientIdentityLookupResult, ClientIdentityMatch } from '../../models/client-identity.model';
 import { aadhaarHash } from '../../utils/aadhaar-hash.util';
 export type ClientIdentityStatus = 'idle' | 'checking' | 'not-found' | 'matched' | 'conflict' | 'error';
 /**
 * What the parent needs from the identity check: whether creation must stop, and the identifiers the officer entered
 * so the KYC step can be filled in without typing them again.
 */
 export interface ClientIdentityState {
  status: ClientIdentityStatus;
  /** Individual: the person's PAN. Entity: the company's PAN. */
  pan: string | null;
  /** The 12 digits, held in memory only to pre-fill the KYC step. Never sent: only its hash is. */
  aadhaar: string | null;
  gstin: string | null;
  /** True when the customer already exists (or the identifiers disagree), so a new client must not be created. */
  blocking: boolean;
 }
 /**
 * Shows a field's error as soon as something has been typed in it, not only after the field is left: a PAN that is
 * wrong should say so while it is being typed, and the form should not look fine in the meantime.
 */
 class ShowErrorWhenDirty implements ErrorStateMatcher {
  isErrorState(control: AbstractControl | null, _form: FormGroupDirective | NgForm | null): boolean {
    return !!control && control.invalid && (control.dirty || control.touched);
  }
 }
 const PAN_PATTERN = /^[A-Za-z]{5}\d{4}[A-Za-z]$/;
 const AADHAAR_PATTERN = /^\d{12}$/;
 const GSTIN_PATTERN = /^\d{2}[A-Za-z]{5}\d{4}[A-Za-z][1-9A-Za-z]Z[0-9A-Za-z]$/;
 /**
 * "Is this person already a customer of the bank?" — asked at the top of the General step, before anything is saved.
 *
 * Any ONE of PAN / Aadhaar (individual) or PAN / GSTIN (entity) matching an existing customer, in any branch, means
 * the same customer, so a second client must not be created. When nothing matches, what was entered is carried to the
 * KYC step so it does not have to be typed again.
 */
@Component({
  selector: 'mifosx-client-identity-check',
  templateUrl: './client-identity-check.component.html',
  styleUrls: ['./client-identity-check.component.scss'],
  imports: [
    ...STANDALONE_SHARED_IMPORTS,
    MatIcon,
    MatProgressSpinner,
    RestrictInputDirective
  ]
 })
 export class ClientIdentityCheckComponent implements OnInit, OnChanges, OnDestroy {
  private formBuilder = inject(UntypedFormBuilder);
  private clientsService = inject(ClientsService);
  private router = inject(Router);
  private authenticationService = inject(AuthenticationService);
  /** 1 = individual, 2 = entity (non-individual). */
  @Input() legalFormType = 1;
  @Output() identityChange = new EventEmitter<ClientIdentityState>();
  form: UntypedFormGroup;
  readonly errorMatcher = new ShowErrorWhenDirty();
  status: ClientIdentityStatus = 'idle';
  matches: ClientIdentityMatch[] = [];
  /** True while the customer is being introduced to this branch. */
  linking = false;
  private destroy$ = new Subject<void>();
  private recheck$ = new Subject<void>();
  get isEntity(): boolean {
    return this.legalFormType === 2;
  }
  /** The first (and normally only) existing customer found. */
  get match(): ClientIdentityMatch | null {
    return this.matches[0] ?? null;
  }
  /**
   * True while a field holds something that is not a valid PAN / Aadhaar / GSTIN. Such a value is never looked up or
   * carried to the KYC step, so the parent must not let the officer carry on past it as if the check had passed.
   */
  get hasInvalidInput(): boolean {
    return !!this.form?.invalid;
  }
  markAllAsTouched(): void {
    this.form?.markAllAsTouched();
  }
  get state(): ClientIdentityState {
    const v = this.normalized();
    return {
      status: this.status,
      pan: v.pan,
      aadhaar: v.aadhaar,
      gstin: v.gstin,
      blocking: this.status === 'matched' || this.status === 'conflict'
    };
  }
  ngOnInit(): void {
    this.form = this.formBuilder.group({
      pan: [
        '',
        Validators.pattern(PAN_PATTERN)
      ],
      aadhaar: [
        '',
        Validators.pattern(AADHAAR_PATTERN)
      ],
      gstin: [
        '',
        Validators.pattern(GSTIN_PATTERN)
      ]
    });
    // A pause in typing (or a manual re-check) runs one lookup; typing again cancels the one in flight.
    merge(this.form.valueChanges, this.recheck$)
      .pipe(
        debounceTime(400),
        tap(() => this.startChecking()),
        switchMap(() => this.lookup()),
        takeUntil(this.destroy$)
      )
      .subscribe((result) => this.applyResult(result));
  }
  ngOnChanges(changes: SimpleChanges): void {
    // Switching individual <-> entity swaps which identifiers apply; what was typed for the other kind is stale.
    if (changes['legalFormType'] && !changes['legalFormType'].firstChange) {
      this.reset();
    }
  }
  ngOnDestroy(): void {
    this.destroy$.next();
    this.destroy$.complete();
  }
  /** Clears the fields and the result, e.g. when a new client creation session starts. */
  reset(): void {
    this.form?.reset({ pan: '', aadhaar: '', gstin: '' }, { emitEvent: false });
    this.status = 'idle';
    this.matches = [];
    this.identityChange.emit(this.state);
  }
  recheck(): void {
    this.recheck$.next();
  }
  /**
   * PAN and GSTIN are always written in capitals, so what is typed is capitalised as it is typed. The caret is put
   * back where it was, otherwise editing the middle of a PAN would throw it to the end. The shared restrict-input
   * directive only capitalises when the field is left, which let lower-case show while typing.
   */
  capitalise(controlName: 'pan' | 'gstin', event: Event): void {
    const input = event.target as HTMLInputElement;
    const upper = input.value.toUpperCase();
    if (upper !== input.value) {
      const { selectionStart, selectionEnd } = input;
      input.value = upper;
      input.setSelectionRange(selectionStart, selectionEnd);
    }
    this.form.get(controlName)?.setValue(upper, { emitEvent: false });
  }
  /** Identifiers that are complete and well formed; anything half-typed is ignored rather than looked up. */
  private normalized(): { pan: string | null; aadhaar: string | null; gstin: string | null } {
    const raw = this.form?.getRawValue() ?? { pan: '', aadhaar: '', gstin: '' };
    const pan = String(raw.pan ?? '')
      .replace(/\s+/g, '')
      .toUpperCase();
    const aadhaar = String(raw.aadhaar ?? '').replace(/[\s-]/g, '');
    const gstin = String(raw.gstin ?? '')
      .replace(/\s+/g, '')
      .toUpperCase();
    return {
      pan: PAN_PATTERN.test(pan) ? pan : null,
      aadhaar: !this.isEntity && AADHAAR_PATTERN.test(aadhaar) ? aadhaar : null,
      gstin: this.isEntity && GSTIN_PATTERN.test(gstin) ? gstin : null
    };
  }
  private startChecking(): void {
    const v = this.normalized();
    if (!v.pan && !v.aadhaar && !v.gstin) {
      this.status = 'idle';
      this.matches = [];
      this.identityChange.emit(this.state);
      return;
    }
    this.status = 'checking';
    this.matches = [];
    this.identityChange.emit(this.state);
  }
  private lookup(): Observable<ClientIdentityLookupResult | 'error' | null> {
    const v = this.normalized();
    if (!v.pan && !v.aadhaar && !v.gstin) {
      return of(null);
    }
    return this.clientsService
      .lookupClientIdentity({ panNumber: v.pan, aadhaarHash: aadhaarHash(v.aadhaar), gstinNumber: v.gstin })
      .pipe(
        map((result): ClientIdentityLookupResult | 'error' => result),
        catchError(() => of('error' as const))
      );
  }
  private applyResult(result: ClientIdentityLookupResult | 'error' | null): void {
    if (result === null) {
      // Nothing complete to look up; startChecking() already reset to idle.
      return;
    }
    if (result === 'error') {
      // Not blocking: the server checks again when the KYC is saved, so a failed lookup must not stop onboarding.
      this.status = 'error';
      this.matches = [];
    } else if (result.conflict) {
      this.status = 'conflict';
      this.matches = result.matches;
    } else if (result.matched) {
      this.status = 'matched';
      this.matches = result.matches;
    } else {
      this.status = 'not-found';
      this.matches = [];
    }
    this.identityChange.emit(this.state);
  }
  /**
   * Starts opening an account at THIS branch for a customer registered at another one. The customer stays at the home
   * branch (one CIF). This branch is introduced to them, which only lets it open their page; they are listed under
   * this branch once an account is actually opened here. An account opened for a customer of another branch is held
   * at the branch that opens it.
   */
  openAccountHere(match: ClientIdentityMatch): void {
    const officeId = this.authenticationService.getCredentials()?.officeId;
    if (this.linking || officeId == null) {
      return;
    }
    this.linking = true;
    this.clientsService.linkClientToMyBranch(match.clientId).subscribe({
      next: () => {
        this.linking = false;
        this.router.navigate([
          '/clients',
          match.clientId,
          'general'
        ]);
      },
      // The failure is shown by the global error handler.
      error: () => (this.linking = false)
    });
  }
  /** Legal form of the existing customer, for the card. */
  legalFormLabel(match: ClientIdentityMatch): string {
    return match.legalFormEnum === 2 ? 'Non-Individual' : 'Individual';
  }
  matchedByLabel(by: string): string {
    return by === 'AADHAAR' ? 'Aadhaar' : by;
  }
 }
@@ -43,6 +43,8 @@ import { KycUploadHelperService } from '../../shared/kyc-upload-helper.service';
 import { CaptureImageDialogComponent } from '../../clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component';
 import { DrawSignatureDialogComponent } from '../../clients-view/custom-dialogs/draw-signature-dialog/draw-signature-dialog.component';
 import { dataUrlToFile } from 'app/shared/utils/data-url.util';
 import { aadhaarHash } from '../../utils/aadhaar-hash.util';
 import { ClientIdentityState } from '../client-identity-check/client-identity-check.component';
 import { DocumentPreviewDialogComponent } from '../../shared/document-preview-dialog/document-preview-dialog.component';
 import {
  PanDeclarationDialogComponent,
@@ -108,6 +110,32 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
  @Input() verificationDateOfBirth: Date | null = null;
  /** Read-only mode — disables form editing until user clicks edit icon */
  @Input() readOnly = false;
  /**
   * The identifiers the officer already typed into the existing-customer check on the General step. They are filled
   * in here so they are not typed twice, but only into fields that are still empty: whatever was entered on this
   * step wins. Ignored while the check says the customer already exists, since no client is created then.
   */
  @Input() set identityPrefill(identity: ClientIdentityState | null) {
    if (!identity || identity.blocking) {
      return;
    }
    const isEmpty = (name: string) => !String(this.kycForm?.get(name)?.value ?? '').trim();
    const patch: Record<string, unknown> = {};
    if (this.isNonIndividual) {
      if (identity.gstin && isEmpty('gstinNumber')) patch['gstinNumber'] = identity.gstin;
      if (identity.pan && isEmpty('enterprisePan')) patch['enterprisePan'] = identity.pan;
    } else {
      if (identity.pan && isEmpty('panNumber')) {
        patch['panNumber'] = identity.pan;
        patch['hasPan'] = true;
      }
      if (identity.aadhaar && isEmpty('aadhaarNumber')) patch['aadhaarNumber'] = identity.aadhaar;
    }
    if (Object.keys(patch).length) {
      this.kycForm.patchValue(patch);
    }
  }
  @Input() calculatedRisk: {
    category: number;
    reason: string;
@@ -1756,7 +1784,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      kycType: this.kycTypeValue,
      riskCategory: this.currentRiskCategory,
      panNumber: pan,
-      aadhaarNumberMasked: aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : 'XXXXXXXX0000'
+      aadhaarNumberMasked: aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : 'XXXXXXXX0000',
      ...this.aadhaarHashField(aadhaarRaw)
    };
    // A proprietorship reaches this method (it verifies the proprietor's individual PAN) but is
@@ -2358,7 +2387,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      locale: 'en',
      kycType: this.kycTypeValue,
      riskCategory: this.currentRiskCategory,
-      aadhaarNumberMasked: aadhaarMasked
+      aadhaarNumberMasked: aadhaarMasked,
      ...this.aadhaarHashField(aadhaar)
    };
    const panVal = this.kycForm.value.panNumber;
    if (panVal) {
@@ -2679,6 +2709,15 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
    }
  }
  /**
   * `{ aadhaarHash }` for a full 12-digit Aadhaar, `{}` otherwise. The number itself is never sent: KYC calls are
   * recorded server-side, so only its SHA-256 goes.
   */
  private aadhaarHashField(aadhaar: string | null | undefined): { aadhaarHash?: string } {
    const hash = aadhaarHash(aadhaar);
    return hash ? { aadhaarHash: hash } : {};
  }
  get kycData(): any {
    const formVal = this.kycForm.getRawValue();
    const aadhaarRaw = formVal.aadhaarNumber || '';
@@ -2707,6 +2746,9 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      // For non-individual: Company PAN is used as panNumber for verification
      panNumber: this.isNonIndividual ? enterprisePanNorm : v.hasPan ? panNorm : null,
      aadhaarNumberMasked: this.isNonIndividual ? 'XXXXXXXX0000' : aadhaarMasked,
      // The fingerprint of the full number, so the server can tell two Aadhaar numbers apart (the masked form keeps
      // only the last four digits). Absent when the field holds a masked value reloaded from the server.
      ...(this.isNonIndividual ? {} : this.aadhaarHashField(aadhaarRaw)),
      // Only ever sent when this screen actually holds a value. The seeding status is derived by
      // the provider during PAN verification and written straight to the record, so sending an
      // empty one back would blank a field the server filled in — which reads as an officer
@@ -90,6 +90,21 @@
              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
            </td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Last Active">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -203,6 +218,21 @@
              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
            </td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Closed Date">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
@@ -262,6 +292,21 @@
              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
            </td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Last Active">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -452,6 +497,21 @@
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Fixed Deposit Product' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.productName }}</td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Last Active">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -551,6 +611,21 @@
              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
            </td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Closed Date">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
            <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
@@ -611,10 +686,27 @@
              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
            </td>
          </ng-container>
          <ng-container matColumnDef="Branch">
            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Branch' | translate }}</th>
            <td mat-cell *matCellDef="let element">
              @if (element.officeName) {
                <span [class]="branchChipClass(element)" [title]="branchChipTitle(element)">
                  <i class="fa fa-map-marker"></i>{{ element.officeName }}
                  @if (isHomeBranch(element)) {
                    <span class="branch-chip__home">Home</span>
                  }
                </span>
              } @else {
                —
              }
            </td>
          </ng-container>
          <ng-container matColumnDef="Status">
            <th mat-header-cell *matHeaderCellDef>Status</th>
            <td mat-cell *matCellDef="let element">
-              <span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{ rdStatusLabel(element) }}</span>
+              <span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{
                rdStatusLabel(element)
              }}</span>
              @if (element.timeline?.closedOnDate) {
                <div class="rd-status__date">on {{ element.timeline.closedOnDate | dateFormat }}</div>
              }
@@ -440,3 +440,66 @@ table[mat-table] {
  font-size: 11px;
  color: #64748b;
 }
 /*
 * Branch an account is held at, as a pill coloured by where the signed-in user works: green for their own branch, red for
 * any other. When the customer banks at several other branches the reds run from light to dark, one shade per branch.
 */
 .branch-chip {
  display: inline-flex;
  align-items: center;
  gap: 6px;
  padding: 3px 10px;
  border-radius: 999px;
  border: 1px solid transparent;
  font-size: 12px;
  font-weight: 600;
  white-space: nowrap;
  .fa {
    font-size: 12px;
  }
  &--mine {
    background: #dcfce7;
    color: #166534;
    border-color: #4ade80;
  }
  &--other-0 {
    background: #fee2e2;
    color: #991b1b;
    border-color: #fca5a5;
  }
  &--other-1 {
    background: #fca5a5;
    color: #7f1d1d;
    border-color: #f87171;
  }
  &--other-2 {
    background: #dc2626;
    color: #fff;
    border-color: #b91c1c;
  }
  &--other-3 {
    background: #991b1b;
    color: #fff;
    border-color: #7f1d1d;
  }
 }
 .branch-chip__home {
  padding: 0 6px;
  border-radius: 8px;
  /* fixed colours: the chip text turns white on the dark reds, which would vanish against this light tag */
  background: rgb(255 255 255 / 85%);
  color: #1f2937;
  font-size: 10px;
  font-weight: 700;
  letter-spacing: 0.04em;
  text-transform: uppercase;
 }
@@ -39,6 +39,7 @@ import { DateFormatPipe } from '../../../pipes/date-format.pipe';
 import { FormatNumberPipe } from '../../../pipes/format-number.pipe';
 import { CurrencyPipe } from '@angular/common';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { AuthenticationService } from '../../../core/authentication/authentication.service';
 import { ReportsService } from 'app/reports/reports.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Subject } from 'rxjs';
@@ -151,6 +152,7 @@ export class GeneralTabComponent implements OnDestroy {
  private router = inject(Router);
  private reportsService = inject(ReportsService);
  private settingsService = inject(SettingsService);
  private authenticationService = inject(AuthenticationService);
  /** Open Loan Accounts Columns */
  openLoansColumns: string[] = [
@@ -177,6 +179,7 @@ export class GeneralTabComponent implements OnDestroy {
  openSavingsColumns: string[] = [
    'Account No',
    'Saving Account',
    'Branch',
    'Last Active',
    'Balance',
    'Actions'
@@ -185,12 +188,14 @@ export class GeneralTabComponent implements OnDestroy {
  closedSavingsColumns: string[] = [
    'Account No',
    'Saving Account',
    'Branch',
    'Closed Date'
  ];
  /** Closed Recurring Deposit Accounts Columns - with how each one ended, for tracking. */
  recurringColumns: string[] = [
    'Account No',
    'Saving Account',
    'Branch',
    'Status',
    'Last Active',
    'Balance',
@@ -336,12 +341,76 @@ export class GeneralTabComponent implements OnDestroy {
  /** Client Id */
  clientid: any;
  /** The customer's own (home) branch, to tell it from branches the customer banks at elsewhere. */
  clientOfficeId: number | null = null;
  /** How many red shades the branch chips have (general-tab.component.scss, .branch-chip--other-0 ... -3), light to dark. */
  private static readonly OTHER_BRANCH_SHADES = 4;
  /** The branch the signed-in user works at: accounts held here read green, every other branch red. */
  private get myOfficeId(): number | null {
    const officeId = this.authenticationService.getCredentials()?.officeId;
    return officeId == null ? null : Number(officeId);
  }
  /**
   * The other branches this customer banks at, lightest to darkest. Ordered by branch id so the shades stay put between
   * visits; computed over every deposit account on the page so one branch has the same shade in every table.
   */
  private otherBranchIds(): number[] {
    const mine = this.myOfficeId;
    const ids = new Set<number>();
    for (const account of [
      ...this.savingAccounts,
      ...this.currentAccounts
    ]) {
      const officeId = Number(account?.officeId);
      if (Number.isFinite(officeId) && officeId !== mine) {
        ids.add(officeId);
      }
    }
    return [...ids].sort((a, b) => a - b);
  }
  /** Green for an account at the signed-in user's branch; red for any other branch, a different shade for each. */
  branchChipClass(account: any): string {
    const officeId = Number(account?.officeId);
    if (officeId === this.myOfficeId) {
      return 'branch-chip branch-chip--mine';
    }
    const others = this.otherBranchIds();
    const rank = Math.max(others.indexOf(officeId), 0);
    const last = GeneralTabComponent.OTHER_BRANCH_SHADES - 1;
    // one other branch gets a mid red, several are spread from the lightest to the darkest
    const shade = others.length <= 1 ? 1 : Math.round((rank * last) / (others.length - 1));
    return `branch-chip branch-chip--other-${shade}`;
  }
  branchChipTitle(account: any): string {
    const parts = [account?.officeName];
    if (Number(account?.officeId) === this.myOfficeId) {
      parts.push('your branch');
    }
    if (this.isHomeBranch(account)) {
      parts.push('customer home branch');
    }
    return parts.join(' - ');
  }
  isHomeBranch(account: any): boolean {
    return this.clientOfficeId != null && Number(account?.officeId) === this.clientOfficeId;
  }
  /**
   * @param {ActivatedRoute} route Activated Route
   * @param {ClientsService} clientService Clients Service
   * @param {Router} router Router
   */
  constructor() {
    // The customer's record is resolved on the parent route, not on this tab's own route data.
    this.route.parent?.data.subscribe((data: any) => {
      this.clientOfficeId = data?.clientViewData?.officeId ?? null;
    });
    this.route.data.subscribe(
      (data: { clientAccountsData: any; clientChargesData: any; clientSummary: any; clientCollateralData: any }) => {
        this.clientAccountData = data.clientAccountsData;
@@ -50,6 +50,17 @@
        />
      </mat-form-field>
      @if (isHeadOffice) {
        <mat-form-field class="table-filter" appearance="outline">
          <mat-select [(value)]="officeFilter" (selectionChange)="officeChanged()" placeholder="Branch">
            <mat-option [value]="null">All Branches</mat-option>
            @for (office of offices; track office.id) {
              <mat-option [value]="office.id">{{ office.name }}</mat-option>
            }
          </mat-select>
        </mat-form-field>
      }
      <mat-form-field class="table-filter" appearance="outline">
        <mat-select [(value)]="statusFilter" (selectionChange)="applyClientFilters()" placeholder="Status">
          <mat-option value="">All Status</mat-option>
@@ -92,6 +103,11 @@
            row.legalForm?.id === 2 ? 'business' : 'person'
          }}</mat-icon>
          {{ hideClientData ? maskName(row.displayName) : row.displayName }}
          @if (!isHeadOffice && row.officeId && myOfficeId !== null && row.officeId !== myOfficeId) {
            <span class="row-home-chip" matTooltip="Registered at another branch; linked to this branch">
              Home: {{ row.officeName }}
            </span>
          }
          @if (row._ckycDone) {
            <mat-icon class="row-ckyc-icon" matTooltip="CKYC Done">verified</mat-icon>
          }
@@ -114,6 +130,12 @@
        </td>
      </ng-container>
      <!-- Branch Column (Head Office only) -->
      <ng-container matColumnDef="officeName">
        <th mat-header-cell *matHeaderCellDef>Branch</th>
        <td mat-cell *matCellDef="let row">{{ row.officeName }}</td>
      </ng-container>
      <!-- Status Column -->
      <ng-container matColumnDef="status">
        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Status' | translate }}</th>
@@ -7,3 +7,15 @@
 */
@use '../shared/styles/list-layout' as *;
 // A customer registered at another branch that has been linked to this one.
 .row-home-chip {
  margin-left: 8px;
  padding: 1px 8px;
  font-size: 11px;
  font-weight: 500;
  color: #92400e;
  background: #fef3c7;
  border-radius: 999px;
  white-space: nowrap;
 }
@@ -38,6 +38,8 @@ import { MatIconButton, MatButton } from '@angular/material/button';
 import { MatIcon } from '@angular/material/icon';
 import { MatTooltip } from '@angular/material/tooltip';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { AuthenticationService } from '../core/authentication/authentication.service';
 import { OrganizationService } from '../organization/organization.service';
@Component({
  selector: 'mifosx-clients',
@@ -71,6 +73,15 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 })
 export class ClientsComponent implements OnInit {
  private clientService = inject(ClientsService);
  private authenticationService = inject(AuthenticationService);
  private organizationService = inject(OrganizationService);
  /** Head Office sees every branch's clients, so it gets a Branch filter. A branch user only ever sees its own. */
  isHeadOffice = this.authenticationService.isHeadOfficeUser();
  offices: { id: number; name: string }[] = [];
  officeFilter: number | null = null;
  /** The caller's own branch, to tell a customer of another branch (linked here) from this branch's own. */
  myOfficeId = this.authenticationService.getCredentials()?.officeId ?? null;
  /** Returns true if client data masking is enabled */
  get hideClientData(): boolean {
@@ -90,6 +101,7 @@ export class ClientsComponent implements OnInit {
    'displayName',
    'cifNumber',
    'legalForm',
    'officeName',
    'status',
    'profileCompletion',
    'actions'
@@ -119,6 +131,13 @@ export class ClientsComponent implements OnInit {
  @ViewChild(MatSort) sort: MatSort;
  ngOnInit() {
    if (!this.isHeadOffice) {
      this.displayedColumns = this.displayedColumns.filter((c) => c !== 'officeName');
    } else {
      this.organizationService.getOffices().subscribe((offices: any[]) => {
        this.offices = (offices || []).map((o) => ({ id: o.id, name: o.name }));
      });
    }
    if (environment.preloadClients) {
      this.getClients();
    }
@@ -144,7 +163,8 @@ export class ClientsComponent implements OnInit {
        this.sortDirection,
        false,
        '',
-        true
+        true,
        this.isHeadOffice ? this.officeFilter : null
      )
      .subscribe(
        (data: any) => {
@@ -233,6 +253,12 @@ export class ClientsComponent implements OnInit {
    this.dataSource.data = filtered;
  }
  /** Branch filter is applied by the server so paging and the record count stay correct. */
  officeChanged() {
    this.resetPaginator();
    this.getClients();
  }
  pageChanged(event: PageEvent) {
    this.pageSize = event.pageSize;
    this.currentPage = event.pageIndex;
@@ -18,6 +18,7 @@ import { map, catchError } from 'rxjs/operators';
 import { environment } from '../../environments/environment';
 import { dataUrlToFile } from 'app/shared/utils/data-url.util';
 import { ClientIdentityLookupResult } from './models/client-identity.model';
 /**
 * Clients service.
@@ -742,9 +743,14 @@ export class ClientsService {
    sortDirection: string = '',
    activeOnly: boolean = false,
    legalFormType: string = '',
-    silent: boolean = false
+    silent: boolean = false,
    officeId: number | null = null
  ) {
    const innerRequest: any = { text };
    // Branch filter (Head Office list). The server still limits results to the caller's office hierarchy.
    if (officeId != null) {
      innerRequest.officeId = officeId;
    }
    if (activeOnly) {
      innerRequest.activeOnly = true;
    }
@@ -868,6 +874,39 @@ export class ClientsService {
    return this.http.post(`/clients/${clientId}/kyc`, kycData);
  }
  /**
   * "Is this person already a customer of the bank?" — across every branch, by PAN, Aadhaar fingerprint or GSTIN.
   * Any ONE of them matching means the same customer. `contactConflicts` reports a phone/email already used by another
   * client, which is never the same customer. Only the Aadhaar's SHA-256 is sent, never the number.
   */
  /**
   * Introduces a customer of another branch to the caller's branch, so the branch can see them and open an account
   * for them there. The customer stays at the home branch. Safe to repeat.
   */
  linkClientToMyBranch(
    clientId: number
  ): Observable<{ clientId: number; linked: boolean; officeId: number; officeName: string }> {
    return this.http.post<{ clientId: number; linked: boolean; officeId: number; officeName: string }>(
      '/clientidentity/link',
      {
        clientId
      }
    );
  }
  lookupClientIdentity(identity: {
    panNumber?: string | null;
    aadhaarHash?: string | null;
    gstinNumber?: string | null;
    mobileNo?: string | null;
    emailAddress?: string | null;
    excludeClientId?: number | null;
  }): Observable<ClientIdentityLookupResult> {
    return this.http.post<ClientIdentityLookupResult>('/clientidentity/lookup', identity, {
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /**
   * Screen a client name against the UN Security Council consolidated sanctions list.
   * @param name The name to screen
@@ -1073,9 +1112,146 @@ export class ClientsService {
   */
  saveKycContactLog(
    clientId: string | number,
-    data: { channel: string; notes: string; officerName?: string }
+    data: { channel: string; notes: string; officerName?: string; noticeType?: string },
    silent = false
  ): Observable<any> {
-    return this.http.post(`/kyc/exceptions/${clientId}/contact-log`, data);
+    return this.http.post(
      `/kyc/exceptions/${clientId}/contact-log`,
      data,
      silent ? { context: new HttpContext().set(SILENT_HTTP_ERROR, true) } : {}
    );
  }
  /**
   * The subject and text a customer would receive for the stage they are at today.
   * `type` is KYC or DORMANCY; the body comes back empty when they are at no such stage.
   */
  previewKycNotice(clientId: string | number, type: string): Observable<{ subject?: string; body?: string }> {
    return this.http.get<{ subject?: string; body?: string }>(
      `/kyc/exceptions/${clientId}/contact-log/preview?type=${type}`,
      {
        context: new HttpContext().set(SILENT_HTTP_ERROR, true)
      }
    );
  }
  /** Queues notices to be sent in the background by the queue job. */
  enqueueKycNotices(body: {
    items: { clientId: number; noticeType: string; channel: string; accountNo?: string; stageLabel?: string }[];
    notes?: string;
    officerName?: string;
    sendAt?: string;
  }): Observable<{ queued: number; skipped: number; unreachable: number }> {
    return this.http.post<{ queued: number; skipped: number; unreachable: number }>('/kyc/notice-queue', body);
  }
  /** Queued notices, newest first; status narrows to PENDING, SENT, FAILED or CANCELLED. */
  getKycNoticeQueue(status = ''): Observable<any[]> {
    return this.http.get<any[]>(`/kyc/notice-queue${status ? `?status=${status}` : ''}`, {
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  actOnKycNotice(id: number, command: 'cancel' | 'retry'): Observable<any> {
    return this.http.post(`/kyc/notice-queue/${id}?command=${command}`, {});
  }
  /** What each of these customers has been sent so far: the latest notice, how many, and which channels are done. */
  getKycContactSummary(clientIds: number[]): Observable<
    {
      clientId: number;
      count: number;
      lastAt: string;
      lastChannel: string;
      lastStatus: string;
      doneChannels: string[];
      balance?: number;
      hasMobile?: boolean;
      hasEmail?: boolean;
      mobileMasked?: string | null;
      emailMasked?: string | null;
    }[]
  > {
    return this.http.get<
      {
        clientId: number;
        count: number;
        lastAt: string;
        lastChannel: string;
        lastStatus: string;
        doneChannels: string[];
        hasMobile?: boolean;
        hasEmail?: boolean;
        mobileMasked?: string | null;
        emailMasked?: string | null;
      }[]
    >('/kyc/contact-audit/clients', {
      params: new HttpParams().set('ids', clientIds.join(',')),
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /** Notices per customer (counts, outcomes, the latest), most recently contacted first, a page at a time. */
  getKycContactAuditCustomers(
    filter: {
      from?: string;
      to?: string;
      channel?: string;
      status?: string;
      search?: string;
      real?: boolean;
      offset?: number;
      limit?: number;
    } = {}
  ): Observable<{ total: number; rows: any[] }> {
    return this.http.get<{ total: number; rows: any[] }>('/kyc/contact-audit/customers', {
      params: this.auditParams(filter),
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /** Notices per day (customers, notices, outcomes), newest day first. */
  getKycContactAuditDays(
    filter: { from?: string; to?: string; channel?: string; status?: string; search?: string; real?: boolean } = {}
  ): Observable<any[]> {
    return this.http.get<any[]>('/kyc/contact-audit/days', {
      params: this.auditParams(filter),
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /** Customer notices on record, newest first, a page at a time. */
  getKycContactAudit(
    filter: {
      from?: string;
      to?: string;
      channel?: string;
      status?: string;
      search?: string;
      real?: boolean;
      offset?: number;
      limit?: number;
    } = {}
  ): Observable<{ total: number; rows: any[] }> {
    return this.http.get<{ total: number; rows: any[] }>('/kyc/contact-audit', {
      params: this.auditParams(filter),
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  private auditParams(filter: Record<string, string | number | boolean | undefined>): HttpParams {
    let params = new HttpParams();
    Object.entries(filter).forEach(
      ([
        k,
        v
      ]) => {
        if (v !== undefined && v !== null && v !== '') {
          params = params.set(k, String(v));
        }
      }
    );
    return params;
  }
  getKycContactLog(clientId: string | number): Observable<any[]> {
@@ -1092,6 +1268,14 @@ export class ClientsService {
    return this.http.get<any[]>('/kyc/exceptions/lapsed');
  }
  /** Clients whose re-KYC falls due within the next `days` days (default 30), soonest first. */
  getExpiringKyc(days = 30): Observable<any[]> {
    // The caller reports a failure in its own banner, so the global popup is suppressed.
    return this.http.get<any[]>(`/kyc/exceptions/expiring?days=${days}`, {
      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
    });
  }
  /**
   * Savings accounts the dormancy job has marked.
   *
@@ -38,6 +38,12 @@
            }
          </div>
        }
        @if (!createdClientId) {
          <mifosx-client-identity-check
            [legalFormType]="legalFormType"
            (identityChange)="onIdentityChange($event)"
          ></mifosx-client-identity-check>
        }
        <mifosx-client-general-step
          [clientTemplate]="clientTemplate"
          [prefillData]="prefillData"
@@ -79,6 +85,7 @@
            [verificationDateOfBirth]="clientGeneralStep?.verificationDateOfBirth || null"
            [readOnly]="isTabReadOnly(1)"
            [calculatedRisk]="clientGeneralStep?.calculatedRisk"
            [identityPrefill]="identity"
          ></mifosx-client-kyc-step>
        </div>
@@ -23,6 +23,10 @@ import { ClientIndiaAddressStepComponent } from '../client-stepper/client-india-
 import { ClientEntityKycStepComponent } from '../client-stepper/client-entity-kyc-step/client-entity-kyc-step.component';
 import { ClientDatatableStepComponent } from '../client-stepper/client-datatable-step/client-datatable-step.component';
 import { ClientKycStepComponent } from '../client-stepper/client-kyc-step/client-kyc-step.component';
 import {
  ClientIdentityCheckComponent,
  ClientIdentityState
 } from '../client-stepper/client-identity-check/client-identity-check.component';
 import { ClientPreviewStepComponent } from '../client-stepper/client-preview-step/client-preview-step.component';
 import { ClientFamilyMembersStepComponent } from '../client-stepper/client-family-members-step/client-family-members-step.component';
@@ -60,6 +64,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
    ClientEntityKycStepComponent,
    ClientDatatableStepComponent,
    ClientKycStepComponent,
    ClientIdentityCheckComponent,
    ClientPreviewStepComponent,
    ClientFamilyMembersStepComponent,
    MatProgressBarModule,
@@ -79,6 +84,7 @@ export class CreateClientComponent {
  @ViewChild('clientIndiaAddress') clientIndiaAddressStep: ClientIndiaAddressStepComponent;
  @ViewChild(ClientEntityKycStepComponent) clientEntityKycStep: ClientEntityKycStepComponent;
  @ViewChild('clientKyc') clientKycStep: ClientKycStepComponent;
  @ViewChild(ClientIdentityCheckComponent) identityCheck: ClientIdentityCheckComponent;
  @ViewChild(ClientFamilyMembersStepComponent) clientFamilyMembersStep: ClientFamilyMembersStepComponent;
  @ViewChildren('dtclient') clientDatatables: QueryList<ClientDatatableStepComponent>;
@@ -87,6 +93,17 @@ export class CreateClientComponent {
  selectedTabIndex = 0;
  createdClientId = '';
  savingClient = false;
  /**
   * Result of the existing-customer check at the top of the General step. While it says the customer already exists
   * (or the identifiers disagree) a new client must not be created; otherwise the identifiers typed there are filled
   * into the KYC step.
   */
  identity: ClientIdentityState | null = null;
  onIdentityChange(state: ClientIdentityState): void {
    this.identity = state;
  }
  /** Pre-fill data passed from "Create as Client" on a manual family member */
  prefillData: any = null;
@@ -138,6 +155,8 @@ export class CreateClientComponent {
    this.highestTabReached = 0;
    this.validationError = '';
    this.prefillData = null;
    this.identity = null;
    this.identityCheck?.reset();
    this.clientGeneralStep?.resetForNewClient();
    this.clientKycStep?.resetForNewClient();
    this.clientIndiaAddressStep?.resetForNewClient();
@@ -212,6 +231,10 @@ export class CreateClientComponent {
    const idx = this.selectedTabIndex;
    if (idx === 0) {
      // The customer is already on the books (any branch), or the identifiers belong to different customers.
      if (!this.createdClientId && (this.identity?.blocking || this.identity?.status === 'checking')) return false;
      // A PAN / Aadhaar / GSTIN typed in the wrong format is neither looked up nor carried on, so it must be fixed or cleared.
      if (!this.createdClientId && this.identityCheck?.hasInvalidInput) return false;
      if (!this.clientGeneralStep || !this.clientGeneralForm) return false;
      if (this.clientGeneralStep.sanctionsBlocked) return false;
      // A number the officer rejected on the DIP result must be replaced, not carried forward.
@@ -274,6 +297,17 @@ export class CreateClientComponent {
    if (this.savingClient) return 'Saving — please wait…';
    if (this.currentStepValid) return '';
    const idx = this.selectedTabIndex;
    if (idx === 0 && !this.createdClientId && this.identityCheck?.hasInvalidInput) {
      return 'Correct the PAN / Aadhaar / GSTIN format in the Existing customer check, or clear the field.';
    }
    if (idx === 0 && !this.createdClientId && this.identity?.status === 'checking') {
      return 'Checking whether this customer already exists…';
    }
    if (idx === 0 && !this.createdClientId && this.identity?.blocking) {
      return this.identity.status === 'conflict'
        ? 'The PAN / Aadhaar / GSTIN entered belong to different customers — correct them or ask a manager.'
        : 'This customer already exists — a new client is not created for the same person. Open the existing customer instead.';
    }
    if (idx === 0 && this.clientGeneralStep?.sanctionsBlocked) {
      const disposition = this.clientGeneralStep.sanctionsDisposition;
      if (disposition === 'FALSE_POSITIVE') {
@@ -358,6 +392,19 @@ export class CreateClientComponent {
  onNext() {
    // If on General tab and client not yet created — save first
    if (this.selectedTabIndex === 0 && !this.createdClientId) {
      // Defensive re-check: the button is disabled while this holds, but a second client for the same person is the
      // one mistake this screen exists to prevent.
      if (this.identityCheck?.hasInvalidInput) {
        this.identityCheck.markAllAsTouched();
        this.snackBar.open(this.currentStepBlockerMessage, 'Close', { duration: 6000 });
        return;
      }
      if (this.identity?.blocking) {
        this.snackBar.open(this.currentStepBlockerMessage || 'This customer already exists.', 'Close', {
          duration: 6000
        });
        return;
      }
      if (!this.clientGeneralForm?.valid) {
        this.clientGeneralForm?.markAllAsTouched();
        setTimeout(() => {
@@ -0,0 +1,34 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 /** An existing customer found by PAN / Aadhaar fingerprint / GSTIN. Identifiers are masked by the server. */
 export interface ClientIdentityMatch {
  clientId: number;
  displayName: string;
  cifNumber: string;
  officeId: number;
  officeName: string;
  legalFormEnum: number | null;
  kycStatus: number;
  /** True when the caller's branch can open this client; false when it sits in another branch. */
  visibleToCaller: boolean;
  panMasked: string | null;
  aadhaarMasked: string | null;
  gstinMasked: string | null;
  matchedBy: Array<'PAN' | 'AADHAAR' | 'GSTIN'>;
 }
 export interface ClientIdentityLookupResult {
  /** Any ONE of PAN / Aadhaar / GSTIN matched an existing customer: the same person or entity. */
  matched: boolean;
  /** The identifiers point at different customers: bad data or fraud, not a customer to reuse. */
  conflict: boolean;
  matches: ClientIdentityMatch[];
  /** A phone or email already used by another client. Never means "the same customer". */
  contactConflicts: { mobileNo: boolean; emailAddress: boolean };
 }
@@ -0,0 +1,52 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { createHash } from 'crypto';
 import { aadhaarHash, sha256Hex } from './aadhaar-hash.util';
 describe('sha256Hex', () => {
  it('matches the published SHA-256 test vectors', () => {
    expect(sha256Hex('')).toBe('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855');
    expect(sha256Hex('abc')).toBe('ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad');
    expect(sha256Hex('abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq')).toBe(
      '248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1'
    );
  });
  it('agrees with Node on 12-digit inputs, including ones that need a second block boundary', () => {
    for (const value of [
      '000000000000',
      '123456789012',
      '999999999999',
      '0'.repeat(55),
      '0'.repeat(56),
      '0'.repeat(64)
    ]) {
      expect(sha256Hex(value)).toBe(createHash('sha256').update(value).digest('hex'));
    }
  });
 });
 describe('aadhaarHash', () => {
  it('hashes a 12-digit number', () => {
    expect(aadhaarHash('123456789012')).toBe(createHash('sha256').update('123456789012').digest('hex'));
  });
  it('ignores the spaces and hyphens people type between the groups', () => {
    expect(aadhaarHash('1234 5678 9012')).toBe(aadhaarHash('123456789012'));
    expect(aadhaarHash('1234-5678-9012')).toBe(aadhaarHash('123456789012'));
  });
  it('returns null for anything that is not a full number', () => {
    expect(aadhaarHash('')).toBeNull();
    expect(aadhaarHash(null)).toBeNull();
    expect(aadhaarHash('XXXXXXXX1234')).toBeNull();
    expect(aadhaarHash('XXXXXXXX0000')).toBeNull();
    expect(aadhaarHash('12345678901')).toBeNull();
  });
 });
@@ -0,0 +1,185 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 /**
 * The comparable fingerprint of an Aadhaar number: SHA-256 of the 12 digits, as 64 lowercase hex characters.
 *
 * Only this fingerprint is sent to the server. The KYC create/update calls are recorded in an audit table and a log
 * on the server, so the 12-digit number must not be in the request.
 *
 * A plain, unkeyed SHA-256 of 12 digits can be reversed by trying every number, so this is a lookup key and not
 * protection against someone who can read the stored value.
 *
 * Written out in full instead of using `crypto.subtle` because that API is asynchronous and only exists in secure
 * contexts, while the callers (a form-value getter, a blur handler) need the answer synchronously and the app may be
 * served over plain HTTP.
 */
 const K = [
  0x428a2f98,
  0x71374491,
  0xb5c0fbcf,
  0xe9b5dba5,
  0x3956c25b,
  0x59f111f1,
  0x923f82a4,
  0xab1c5ed5,
  0xd807aa98,
  0x12835b01,
  0x243185be,
  0x550c7dc3,
  0x72be5d74,
  0x80deb1fe,
  0x9bdc06a7,
  0xc19bf174,
  0xe49b69c1,
  0xefbe4786,
  0x0fc19dc6,
  0x240ca1cc,
  0x2de92c6f,
  0x4a7484aa,
  0x5cb0a9dc,
  0x76f988da,
  0x983e5152,
  0xa831c66d,
  0xb00327c8,
  0xbf597fc7,
  0xc6e00bf3,
  0xd5a79147,
  0x06ca6351,
  0x14292967,
  0x27b70a85,
  0x2e1b2138,
  0x4d2c6dfc,
  0x53380d13,
  0x650a7354,
  0x766a0abb,
  0x81c2c92e,
  0x92722c85,
  0xa2bfe8a1,
  0xa81a664b,
  0xc24b8b70,
  0xc76c51a3,
  0xd192e819,
  0xd6990624,
  0xf40e3585,
  0x106aa070,
  0x19a4c116,
  0x1e376c08,
  0x2748774c,
  0x34b0bcb5,
  0x391c0cb3,
  0x4ed8aa4a,
  0x5b9cca4f,
  0x682e6ff3,
  0x748f82ee,
  0x78a5636f,
  0x84c87814,
  0x8cc70208,
  0x90befffa,
  0xa4506ceb,
  0xbef9a3f7,
  0xc67178f2
 ];
 function rotr(x: number, n: number): number {
  return (x >>> n) | (x << (32 - n));
 }
 /** SHA-256 of a string (UTF-8 encoded), as lowercase hex. */
 export function sha256Hex(text: string): string {
  const bytes: number[] = [];
  for (const ch of unescape(encodeURIComponent(text))) {
    bytes.push(ch.charCodeAt(0));
  }
  const bitLength = bytes.length * 8;
  bytes.push(0x80);
  while (bytes.length % 64 !== 56) {
    bytes.push(0);
  }
  // 64-bit big-endian message length; inputs here are tiny so the high word is always 0.
  const high = Math.floor(bitLength / 0x100000000);
  const low = bitLength >>> 0;
  for (const word of [
    high,
    low
  ]) {
    bytes.push((word >>> 24) & 0xff, (word >>> 16) & 0xff, (word >>> 8) & 0xff, word & 0xff);
  }
  const h = [
    0x6a09e667,
    0xbb67ae85,
    0x3c6ef372,
    0xa54ff53a,
    0x510e527f,
    0x9b05688c,
    0x1f83d9ab,
    0x5be0cd19
  ];
  const w = new Array<number>(64);
  for (let offset = 0; offset < bytes.length; offset += 64) {
    for (let i = 0; i < 16; i++) {
      const j = offset + i * 4;
      w[i] = (bytes[j] << 24) | (bytes[j + 1] << 16) | (bytes[j + 2] << 8) | bytes[j + 3];
    }
    for (let i = 16; i < 64; i++) {
      const s0 = rotr(w[i - 15], 7) ^ rotr(w[i - 15], 18) ^ (w[i - 15] >>> 3);
      const s1 = rotr(w[i - 2], 17) ^ rotr(w[i - 2], 19) ^ (w[i - 2] >>> 10);
      w[i] = (w[i - 16] + s0 + w[i - 7] + s1) | 0;
    }
    let [
      a,
      b,
      c,
      d,
      e,
      f,
      g,
      hh
    ] = h;
    for (let i = 0; i < 64; i++) {
      const S1 = rotr(e, 6) ^ rotr(e, 11) ^ rotr(e, 25);
      const ch = (e & f) ^ (~e & g);
      const t1 = (hh + S1 + ch + K[i] + w[i]) | 0;
      const S0 = rotr(a, 2) ^ rotr(a, 13) ^ rotr(a, 22);
      const maj = (a & b) ^ (a & c) ^ (b & c);
      const t2 = (S0 + maj) | 0;
      hh = g;
      g = f;
      f = e;
      e = (d + t1) | 0;
      d = c;
      c = b;
      b = a;
      a = (t1 + t2) | 0;
    }
    h[0] = (h[0] + a) | 0;
    h[1] = (h[1] + b) | 0;
    h[2] = (h[2] + c) | 0;
    h[3] = (h[3] + d) | 0;
    h[4] = (h[4] + e) | 0;
    h[5] = (h[5] + f) | 0;
    h[6] = (h[6] + g) | 0;
    h[7] = (h[7] + hh) | 0;
  }
  return h.map((x) => (x >>> 0).toString(16).padStart(8, '0')).join('');
 }
 /**
 * The fingerprint for a 12-digit Aadhaar, or null when the value is not one (too short, masked, a placeholder).
 * Spaces and hyphens people type between the groups are ignored.
 */
 export function aadhaarHash(aadhaar: string | null | undefined): string | null {
  const digits = (aadhaar ?? '').replace(/[\s-]/g, '');
  return /^\d{12}$/.test(digits) ? sha256Hex(digits) : null;
 }
@@ -6,7 +6,7 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-import { toProperNameCase } from './name-case.util';
+import { toPersonNameCase, toProperNameCase } from './name-case.util';
 describe('toProperNameCase', () => {
  it('raises a lower-case first letter on every word', () => {
@@ -53,3 +53,20 @@ describe('toProperNameCase', () => {
    expect(toProperNameCase(undefined)).toBe('');
  });
 });
 describe('toPersonNameCase', () => {
  it('title-cases every word, lowering mixed or upper case', () => {
    expect(toPersonNameCase('keshav SIngh sisodiya')).toBe('Keshav Singh Sisodiya');
    expect(toPersonNameCase('KESHAV')).toBe('Keshav');
  });
  it('keeps hyphen and apostrophe name prefixes', () => {
    expect(toPersonNameCase('JEAN-marie')).toBe('Jean-Marie');
    expect(toPersonNameCase("D'SOUZA")).toBe("D'Souza");
  });
  it('returns an empty string for blank or non-string input', () => {
    expect(toPersonNameCase('  ')).toBe('');
    expect(toPersonNameCase(null)).toBe('');
  });
 });
@@ -62,3 +62,17 @@ export function toProperNameCase(value: string | null | undefined): string {
  }
  return collapsed.split(' ').map(capitalizeWord).join(' ');
 }
 /**
 * Title case for an individual's first, middle and last name: each word's first letter raised,
 * the rest lowered, so 'SIngh' and 'singh' both become 'Singh'. This is what the Full Name line on
 * the general step has always shown; using it for the stored value too keeps the preview and the
 * saved client the same as that line. Entity names stay on {@link toProperNameCase} — their
 * spelling is matched against the registered PAN name.
 */
 export function toPersonNameCase(value: string | null | undefined): string {
  if (typeof value !== 'string') {
    return '';
  }
  return toProperNameCase(value.toLowerCase());
 }
@@ -35,6 +35,7 @@ export class CacheInterceptor implements HttpInterceptor {
    '/rbireservereturn',
    '/rbireserveconfig',
    '/tdsconfig',
    '/profitappropriationconfig',
    '/tds/deposit-interest',
    // Declarations and challans are entered on the very screens that read them back.
    '/tds/declarations',
@@ -53,7 +54,12 @@ export class CacheInterceptor implements HttpInterceptor {
    // deposit may be closed at all - a stale copy would show a released lien as still blocking.
    '/liens',
    // The RD Dashboard counts late installments as of today; a cached copy would hide a payment just taken.
-    '/recurringdepositaccounts/dashboard'
+    '/recurringdepositaccounts/dashboard',
    // Notes are also written by action screens (approve, close, deposit...), so a cached list would hide them.
    '/notes',
    // The ALM maturity breakdown counts deposits and loans as of the date asked and reads the bank's
    // own bucket edges from the query; a cached copy would show another date's or another setting's figures.
    '/almreturn'
  ];
  private isCacheable(url: string): boolean {
@@ -0,0 +1,16 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { HttpContextToken } from '@angular/common/http';
 /**
 * Per-request opt-out of the top progress bar. Set via `{ context: new HttpContext().set(NO_PROGRESS_BAR, true) }`
 * on background calls the user did not ask for (such as the Approvals badge listening for changes), which would
 * otherwise keep the bar running or make it flash on a screen that has not changed.
 */
 export const NO_PROGRESS_BAR = new HttpContextToken<boolean>(() => false);
@@ -16,6 +16,7 @@ import { finalize } from 'rxjs/operators';
 /** Custom Services */
 import { ProgressBarService } from './progress-bar.service';
 import { NO_PROGRESS_BAR } from './no-progress.token';
 /**
 * Http Request interceptor to start/stop loading the progress bar.
@@ -29,6 +30,9 @@ export class ProgressInterceptor implements HttpInterceptor {
   * and stop when a response or error is received.
   */
  intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
    if (request.context.get(NO_PROGRESS_BAR)) {
      return next.handle(request);
    }
    this.progressBarService.increase();
    return next.handle(request).pipe(
      finalize(() => {
@@ -131,6 +131,14 @@
            </svg>
            My Closure Requests
          </a>
          <a
            class="cashier-nav__item cashier-nav__item--sec"
            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/voucher-correction')"
            [routerLink]="['/clerk/voucher-correction']"
          >
            <fa-icon icon="undo"></fa-icon>
            Voucher Correction
          </a>
          @if (clerkAccountLoaded) {
            <div class="cashier-nav__item-wrap">
              <a
@@ -287,6 +295,13 @@
          <a class="cashier-nav__item" [routerLink]="['/cashier/my-work']" routerLinkActive="cashier-nav__item--active">
            <fa-icon icon="user-check"></fa-icon> My Vouchers
          </a>
          <a
            class="cashier-nav__item"
            [routerLink]="['/cashier/voucher-correction']"
            routerLinkActive="cashier-nav__item--active"
          >
            <fa-icon icon="undo"></fa-icon> Voucher Correction
          </a>
          <a
            class="cashier-nav__item"
            [routerLink]="['/cashier/received-report']"
@@ -450,6 +465,11 @@
            *mifosxHasPermission="'MENU_TASKS'"
          >
            <fa-icon icon="check" class="ni-ico"></fa-icon>Approvals
            @if (approvalTotal > 0) {
              <span class="ni-badge" title="Requests waiting for approval">{{
                approvalTotal > 99 ? '99+' : approvalTotal
              }}</span>
            }
          </a>
          <a class="ni" tabindex="0" [matMenuTriggerFor]="cashierMenu" *mifosxHasPermission="'MENU_CASHIER'">
            <fa-icon icon="money-bill" class="ni-ico"></fa-icon>Cashier
@@ -1164,6 +1184,9 @@
          <button mat-menu-item tabindex="0" [routerLink]="['/system/denomination-master']">
            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Cash Denomination
          </button>
          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-correction']">
            <fa-icon icon="undo" class="menu-item-icon"></fa-icon> Voucher Correction
          </button>
        </div>
        <!-- Transfers & Settlement -->
@@ -2018,11 +2041,11 @@
            </a>
            <a
              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('ALM')"
+              [class.hidden]="!matchesRbiSearch('ALM Average Liabilities and Assets Time Bucket Breakdown')"
-              (click)="rbiMenuOpen = false; openAlmReportDialog()"
+              (click)="rbiMenuOpen = false; openAlmBucketBreakdownDialog()"
            >
-              <fa-icon icon="balance-scale" class="gl-icon" style="color: #4f46e5"></fa-icon> ALM (Asset Liability
+              <fa-icon icon="balance-scale" class="gl-icon" style="color: #4f46e5"></fa-icon> ALM (Average Liabilities
-              Management)
+              and Assets) – Time Bucket Breakdown
            </a>
            <a class="gl-link" [class.hidden]="!matchesRbiSearch('Balance Sheet')" (click)="rbiMenuOpen = false">
              <fa-icon icon="file-alt" class="gl-icon"></fa-icon> Balance Sheet (BR Act & Others)
@@ -1082,3 +1082,18 @@ $gray-700: #334155;
    width: $bar;
  }
 }
 // How many requests are waiting under Approvals.
 .ni-badge {
  min-width: 16px;
  height: 16px;
  margin-left: 4px;
  padding: 0 5px;
  border-radius: 999px;
  background: #f59e0b;
  color: #fff;
  font-size: 10px;
  font-weight: 700;
  line-height: 16px;
  text-align: center;
 }
@@ -17,6 +17,7 @@ import { TenantMenuAccessService } from '../../directives/has-permission/tenant-
 /** rxjs Imports */
 import { Observable, Subscription } from 'rxjs';
 import { ApprovalCountsService } from '../../tasks/approval-counts.service';
 import { map, filter } from 'rxjs/operators';
 /** Custom Services */
@@ -68,6 +69,11 @@ export class ShellComponent implements OnInit, OnDestroy {
  private authService = inject(AuthenticationService);
  private clerkUiStateService = inject(ClerkUiStateService);
  private tenantMenuAccessService = inject(TenantMenuAccessService);
  private approvalCounts = inject(ApprovalCountsService);
  /** Requests waiting across every Approval Center tab this user can see, shown on the Approvals menu. */
  approvalTotal = 0;
  private approvalTotalSub?: Subscription;
  /** Subscription to breakpoint observer for handset. */
  isHandset$: Observable<boolean> = this.breakpointObserver
@@ -144,6 +150,13 @@ export class ShellComponent implements OnInit, OnDestroy {
   * Subscribes to progress bar to update its mode.
   */
  ngOnInit() {
    // The Approvals badge: counts refresh every minute while the app is open, and again whenever the Approval Center opens.
    this.approvalTotalSub = this.approvalCounts.total$.subscribe((total) => {
      this.approvalTotal = total;
      this.cdr.markForCheck();
    });
    this.approvalCounts.start();
    this.progressBar$ = this.progressBarService.updateProgressBar.subscribe((mode: string) => {
      this.progressBarMode = mode;
      this.cdr.detectChanges();
@@ -364,10 +377,31 @@ export class ShellComponent implements OnInit, OnDestroy {
    });
  }
  /**
   * Opens the ALM Time-Bucket Breakdown: which balance-sheet item goes to which bucket of the
   * Structural Liquidity Statement. Rules are editable and kept per browser.
   */
  async openAlmBucketBreakdownDialog(): Promise<void> {
    const { AlmBucketBreakdownDialogComponent } =
      await import('../../home/dashboard/alm-bucket-breakdown-dialog/alm-bucket-breakdown-dialog.component');
    this.dialog.open(AlmBucketBreakdownDialogComponent, {
      width: '94vw',
      maxWidth: '1320px',
      maxHeight: '92vh',
      panelClass: 'crr-slr-dialog-panel',
      autoFocus: false,
      disableClose: false,
      hasBackdrop: true,
      backdropClass: 'alm-dlg-backdrop'
    });
  }
  /**
   * Unsubscribes from progress bar.
   */
  ngOnDestroy() {
    this.approvalTotalSub?.unsubscribe();
    this.approvalCounts.stop();
    if (this.progressBar$) {
      this.progressBar$.unsubscribe();
    }
@@ -838,9 +838,23 @@
                      <span class="ni-mono">{{ c.clientCif || '—' }}</span>
                    </td>
                    <td class="ni-td ni-td--center">
-                      <span class="ni-pct-badge" [class.ni-pct-badge--full]="c.sharePercentage === 100">
+                      @if (readOnly) {
-                        {{ c.sharePercentage }}%
+                        <span class="ni-pct-badge" [class.ni-pct-badge--full]="c.sharePercentage === 100">
-                      </span>
+                          {{ c.sharePercentage }}%
                        </span>
                      } @else {
                        <span class="ni-pct-input">
                          <input
                            #pct
                            type="number"
                            min="0"
                            max="100"
                            [value]="c.sharePercentage"
                            (change)="setPartnerShare(c, pct.value); pct.value = '' + c.sharePercentage"
                            aria-label="Ownership percentage"
                          />%
                        </span>
                      }
                    </td>
                    <td class="ni-td ni-td--center">
                      <button
@@ -465,6 +465,31 @@ $ni-bg: #f9fafb;
  color: #374151;
 }
 .ni-pct-input {
  display: inline-flex;
  align-items: center;
  gap: 2px;
  font-size: 12px;
  font-weight: 700;
  color: $ni-primary;
  input {
    width: 52px;
    padding: 3px 6px;
    border: 1px solid #c7d2fe;
    border-radius: 6px;
    background: #eef2ff;
    font: inherit;
    color: inherit;
    text-align: right;
    &:focus {
      outline: 2px solid $ni-primary;
      outline-offset: 0;
    }
  }
 }
 .ni-pct-badge {
  display: inline-flex;
  align-items: center;
@@ -29,6 +29,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { IntroducerSearchComponent } from 'app/shared/introducer-search/introducer-search.component';
 import { AddRelatedClientDialogComponent } from './add-related-client-dialog/add-related-client-dialog.component';
 import { AlertService } from 'app/core/alert/alert.service';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 /**
 * Current Account Details Step
@@ -207,6 +209,9 @@ export class CurrentAccountDetailsStepComponent implements OnInit {
            this.autoDetectAccountStatus();
          }
        }
        if (this.isNonIndividualClient && !this.isEditMode && !this.readOnly) {
          this.prefillPartnersFromClientSignatories(client);
        }
        this.cdr.detectChanges();
      });
    }
@@ -622,6 +627,52 @@ export class CurrentAccountDetailsStepComponent implements OnInit {
  }
  // ── Non-Individual (existing) helpers ──────────────────────────────────
  /**
   * A new entity account starts with the authorised signatories recorded on the client at creation
   * (clientNonPersonDetails.authorizedSignatoryClientIds), so they need not be added again. Ownership is
   * not captured at client creation, so it starts at 0 and is entered in the table; Add Partner stays
   * available for anyone else.
   */
  private prefillPartnersFromClientSignatories(client: any): void {
    if (this.relatedClients.length > 0) {
      return;
    }
    const ids: number[] = String(client?.clientNonPersonDetails?.authorizedSignatoryClientIds ?? '')
      .split(',')
      .map((id) => Number(id.trim()))
      .filter((id, i, all) => id > 0 && id !== this.primaryClientId && all.indexOf(id) === i);
    if (!ids.length) {
      return;
    }
    // One lookup per signatory for the CIF; a signatory that can no longer be read is skipped, not fatal.
    forkJoin(
      ids.map((id) => this.clientsService.getClientData(String(id), true).pipe(catchError(() => of(null))))
    ).subscribe((signatories: any[]) => {
      // The user may have added partners by hand while the lookups ran — never overwrite those.
      if (this.relatedClients.length > 0) {
        return;
      }
      this.relatedClients = signatories
        .filter((s) => !!s?.id)
        .map((s) => ({
          clientId: s.id,
          clientName: s.displayName ?? s.fullname ?? '',
          clientCif: s.cifNumber ?? s.cifNo ?? '',
          sharePercentage: 0,
          isMandatory: false
        }));
      this.autoSetSignatoryRights();
      this.cdr.detectChanges();
    });
  }
  /** Inline ownership edit — clamped so the partners' total never exceeds 100%. */
  setPartnerShare(client: any, raw: any): void {
    const othersTotal = this.totalSharePercentage - (client.sharePercentage || 0);
    const value = Math.round(Number(raw) || 0);
    client.sharePercentage = Math.min(Math.max(value, 0), Math.max(0, 100 - othersTotal));
  }
  openAddRelatedClientDialog(): void {
    const excludedClientIds = [
      ...(this.primaryClientId ? [this.primaryClientId] : []),
@@ -331,12 +331,14 @@
                    <span class="fdrc-maturity-row__value">{{ matchResult.appliedRate | number: '1.2-2' }}% p.a.</span>
                  </div>
                  <div class="fdrc-maturity-row fdrc-maturity-row--interest">
-                    <span class="fdrc-maturity-row__label">Interest Earned</span>
+                    <span class="fdrc-maturity-row__label">{{
                      isSpecial ? 'Total Interest (paid out monthly)' : 'Interest Earned'
                    }}</span>
                    <span class="fdrc-maturity-row__value">₹ {{ matchResult.interestEarned | number: '1.2-2' }}</span>
                  </div>
                  @if (isSpecial && matchResult.estimatedMonthlyPayout) {
                    <div class="fdrc-maturity-row">
-                      <span class="fdrc-maturity-row__label">Monthly Payout</span>
+                      <span class="fdrc-maturity-row__label">Monthly Payout (approx., by days in the month)</span>
                      <span class="fdrc-maturity-row__value fdrc-maturity-row__value--highlight">
                        ₹ {{ matchResult.estimatedMonthlyPayout | number: '1.2-2' }} / month
                      </span>
@@ -351,13 +353,64 @@
                      }
                    </span>
                    <span class="fdrc-maturity-row__value fdrc-maturity-row__value--big">
-                      ₹ {{ (isSpecial ? principalAmount : matchResult.maturityAmount) | number: '1.2-2' }}
+                      ₹ {{ matchResult.maturityAmount | number: '1.2-2' }}
                    </span>
                  </div>
                  @if (isSpecial && specialPreview) {
                    <div class="fdrc-maturity-row">
                      <span class="fdrc-maturity-row__label">Maturity Date</span>
                      <span class="fdrc-maturity-row__value">{{
                        specialPreview.maturityDate | date: 'dd MMM yyyy'
                      }}</span>
                    </div>
                    <div class="fdrc-maturity-row">
                      <span class="fdrc-maturity-row__label">Monthly payouts</span>
                      <span class="fdrc-maturity-row__value">{{ specialPreview.numberOfPayouts }}</span>
                    </div>
                    <div class="fdrc-maturity-row">
                      <span class="fdrc-maturity-row__label">Principal + all payouts</span>
                      <span class="fdrc-maturity-row__value"
                        >₹ {{ specialPreview.totalValueAtMaturity | number: '1.2-2' }}</span
                      >
                    </div>
                  }
                </div>
              </div>
              @if (isSpecial && specialPreview) {
                <div class="fdrc-schedule">
                  <div class="fdrc-schedule__head">
                    <span><i class="fas fa-calendar-alt"></i> Monthly Interest Payout Schedule</span>
                    <button
                      mat-stroked-button
                      type="button"
                      class="fdrc-schedule__toggle"
                      (click)="openSpecialSchedule()"
                    >
                      View payout schedule ({{ specialPreview.numberOfPayouts }})
                    </button>
                  </div>
                  <div class="fdrc-schedule__note">
                    From {{ specialPreview.startDate | date: 'dd MMM yyyy' }} (the day the account is opened) to
                    {{ specialPreview.maturityDate | date: 'dd MMM yyyy' }}, worked out by the account engine from the
                    product.
                  </div>
                </div>
              }
            }
-            @if (!matchResult.maturityAmount) {
+            @if (specialPreviewLoading) {
              <div class="fdrc-payout-hint">
                <i class="fas fa-spinner fa-spin"></i>
                Working out the maturity from the product…
              </div>
            }
            @if (specialPreviewError) {
              <div class="fdrc-payout-hint fdrc-payout-hint--error">
                <i class="fas fa-exclamation-triangle"></i>
                {{ specialPreviewError }}
              </div>
            }
            @if (!matchResult.maturityAmount && !specialPreviewLoading && !specialPreviewError) {
              <div class="fdrc-payout-hint">
                <i class="fas fa-lightbulb"></i>
                Enter a deposit amount above to see the maturity calculation.
@@ -1229,3 +1229,72 @@ $red-light: #fee2e2;
    font-weight: 700;
  }
 }
 /* FD Special: payout schedule from the backend preview */
 .fdrc-schedule {
  margin-top: 12px;
  border: 1px solid #bbf7d0;
  border-radius: 10px;
  background: #fff;
  overflow: hidden;
  &__head {
    display: flex;
    align-items: center;
    justify-content: space-between;
    gap: 8px;
    padding: 8px 14px;
    background: #f0fdf4;
    font-size: 12px;
    font-weight: 700;
    color: #166534;
    text-transform: uppercase;
    letter-spacing: 0.05em;
  }
  &__note {
    padding: 6px 14px;
    font-size: 12px;
    color: #475569;
  }
  &__wrap {
    max-height: 360px;
    overflow: auto;
  }
  &__table {
    width: 100%;
    border-collapse: collapse;
    font-size: 13px;
    th,
    td {
      padding: 6px 14px;
      border-top: 1px solid #e2e8f0;
      text-align: left;
    }
    th {
      position: sticky;
      top: 0;
      background: #f8fafc;
      font-size: 11px;
      text-transform: uppercase;
      color: #64748b;
    }
    .num {
      text-align: right;
    }
    tfoot td {
      font-weight: 700;
      background: #f0fdf4;
    }
  }
 }
 .fdrc-payout-hint--error {
  color: #b91c1c;
 }
@@ -36,12 +36,39 @@ import { FormsModule } from '@angular/forms';
 import { DateFormatPipe } from '../../../../pipes/date-format.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { FixedDepositsService } from '../../fixed-deposits.service';
 import { MatDialog } from '@angular/material/dialog';
 import { InterestScheduleDialogComponent } from '../../fixed-deposit-account-view/custom-dialogs/interest-schedule-dialog/interest-schedule-dialog.component';
 import { ClientsService } from 'app/clients/clients.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { SENIOR_CITIZEN_AGE_THRESHOLD, deriveSeniorCitizenStatus } from 'app/clients/shared/client-age.util';
 export type FdPeriodUnit = 'Days' | 'Months' | 'Years';
 /**
 * yyyy-MM-dd of the calendar day as the user sees it. toISOString() gives the UTC day instead, which in India is the day
 * before for any date at local midnight - so a deposit opened on the 21st was quoted from the 20th.
 */
 function localIsoDate(d: Date): string {
  const pad = (n: number) => String(n).padStart(2, '0');
  return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
 }
 /** FD quote from POST fixeddepositaccounts/account-preview (worked out by the account engine, every FD type). */
 export interface SpecialPayoutPreview {
  fdType: string;
  depositAmount: number;
  annualInterestRate: number;
  seniorCitizen: boolean;
  startDate: string;
  maturityDate: string;
  numberOfPayouts: number;
  fullMonthPayout: number;
  totalInterest: number;
  maturityAmount: number;
  totalValueAtMaturity: number;
  periods: { period: number; fromDate: string; toDate: string; days: number; interestAmount: number }[];
 }
 export interface SlabMatchResult {
  slab: any;
  slabIndex: number;
@@ -87,6 +114,7 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
  private clientsService = inject(ClientsService);
  private settingsService = inject(SettingsService);
  private cdr = inject(ChangeDetectorRef);
  private dialog = inject(MatDialog);
  @Input() fixedDepositsAccountTemplate: any;
  @Input() fixedDepositsAccountProductTemplate: any;
@@ -163,6 +191,10 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
  }
  matchResult: SlabMatchResult | null = null;
  /** FD Special only: the backend's quote and payout schedule for the tenure and amount entered. */
  specialPreview: SpecialPayoutPreview | null = null;
  specialPreviewLoading = false;
  specialPreviewError: string | null = null;
  validationWarning: string | null = null;
  // ── FD Type labels ──────────────────────────────────────────────────────
@@ -270,6 +302,8 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
  calculateRate() {
    this.validationWarning = null;
    this.matchResult = null;
    this.specialPreview = null;
    this.specialPreviewError = null;
    if (!this.tenureValue || this.tenureValue <= 0) {
      this.validationWarning = 'Please enter a valid tenure value greater than 0.';
@@ -334,30 +368,6 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
    const frequencyId = this.resolveFrequencyId(this.tenurePeriodUnit);
    if (this.principalAmount && this.principalAmount > 0) {
      // Years and Months convert exactly; a Days tenure is sent as days and never converted.
      let tenureInMonths: number | undefined;
      let tenureInDays: number | undefined;
      if (this.tenurePeriodUnit === 'Years') {
        tenureInMonths = this.tenureValue * 12;
      } else if (this.tenurePeriodUnit === 'Months') {
        tenureInMonths = this.tenureValue;
      } else {
        // Sent as days, whatever the count. Converting to whole months silently dropped the
        // remainder — a 200-day deposit quoted as six months lost 20 days of interest, and the
        // screen still said "200 Days" above the figure. The backend takes days directly and
        // works the calendar out itself.
        tenureInDays = enteredDays;
      }
      // Map compounding period type id → months (0=Daily, 1=Daily, 4=Monthly, 5=Quarterly, 6=SemiAnnual, 7=Annual)
      const compMap: Record<number, number> = { 1: 0, 4: 1, 5: 3, 6: 6, 7: 12 };
      const compId = this.fixedDepositsAccountProductTemplate?.interestCompoundingPeriodType?.id ?? 4;
      const compMonths = compMap[compId] ?? 1;
      // Map posting period type id → months
      const postId = this.fixedDepositsAccountProductTemplate?.interestPostingPeriodType?.id ?? 4;
      const postMonths = compMap[postId] ?? 1;
      const emitResult = () => {
        if (frequencyId !== null) {
          this.tenureSelected.emit({
@@ -375,7 +385,7 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
      // Get submittedOnDate — Input takes priority over template data
      let submittedOnDateStr: string;
      if (this.submittedOnDate) {
-        submittedOnDateStr = this.submittedOnDate.toISOString().split('T')[0];
+        submittedOnDateStr = localIsoDate(this.submittedOnDate);
      } else {
        const submittedOnDateRaw =
          this.fixedDepositsAccountTemplate?.timeline?.submittedOnDate ??
@@ -384,63 +394,18 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
          const d = Array.isArray(submittedOnDateRaw)
            ? new Date(submittedOnDateRaw[0], submittedOnDateRaw[1] - 1, submittedOnDateRaw[2])
            : new Date(submittedOnDateRaw);
-          submittedOnDateStr = !isNaN(d.getTime())
+          submittedOnDateStr = !isNaN(d.getTime()) ? localIsoDate(d) : localIsoDate(new Date());
            ? d.toISOString().split('T')[0]
            : new Date().toISOString().split('T')[0];
        } else {
-          submittedOnDateStr = new Date().toISOString().split('T')[0];
+          submittedOnDateStr = localIsoDate(new Date());
        }
      }
-      const daysInYearVal =
+      // The whole quote - rate, maturity date, maturity amount and, for FD Special, the month-by-month payout
-        this.fixedDepositsAccountProductTemplate?.interestCalculationDaysInYearType?.id === 360 ? 360 : 365;
+      // schedule - comes from the backend, which builds the would-be account from the product exactly as Submit does
-
+      // (its posting periods, compounding, days in year, rate card, senior-citizen rate) and runs the account's own
-      // Always use backend API for accurate calculation (including daily compounding with 0)
+      // interest engine. Nothing is worked out here: on an error the quote is simply not shown, never estimated.
-      this.fixedDepositsService
+      if (frequencyId !== null) {
-        .calculateFixedDepositInterest({
+        this.loadAccountPreview(result, rate, submittedOnDateStr, frequencyId, emitResult);
-          principalAmount: this.principalAmount,
+      }
          annualInterestRate: rate,
          tenureInMonths,
          tenureInDays,
          interestCompoundingPeriodInMonths: compMonths, // 0 = daily, now supported by backend
          interestPostingPeriodInMonths: postMonths,
          submittedOnDate: submittedOnDateStr,
          daysInYear: daysInYearVal
        })
        .subscribe({
          next: (apiResult: any) => {
            result.maturityAmount = apiResult.maturityAmount;
            result.interestEarned =
              apiResult.totalInterest ?? Math.round((apiResult.maturityAmount - this.principalAmount) * 100) / 100;
            this.matchResult = { ...result };
            emitResult();
          },
          error: () => {
            // Fallback if API fails: frontend formula
            const r = rate / 100;
            if (compMonths === 0) {
              // Daily compounding fallback
              result.maturityAmount =
                Math.round(this.principalAmount * Math.pow(1 + r / daysInYearVal, enteredDays) * 100) / 100;
            } else {
              const n = 12 / compMonths;
              const effectiveMonths = tenureInMonths ?? enteredDays / 30;
              const rPerCompounding = rate / (n * 100);
              // Whole compounding periods, then simple interest on the days left over. Flooring the
              // periods and stopping there dropped the remainder entirely: a 200-day deposit
              // compounding monthly quoted only six months of interest and lost the other twenty
              // days, which is the depositor's money.
              const wholePeriods = Math.floor(effectiveMonths / compMonths);
              const compounded = this.principalAmount * Math.pow(1 + rPerCompounding, wholePeriods);
              const leftoverDays = enteredDays - wholePeriods * compMonths * 30;
              const leftoverInterest =
                leftoverDays > 0 ? (compounded * rate * leftoverDays) / (100 * daysInYearVal) : 0;
              result.maturityAmount = Math.round((compounded + leftoverInterest) * 100) / 100;
            }
            result.interestEarned = Math.round((result.maturityAmount - this.principalAmount) * 100) / 100;
            this.matchResult = { ...result };
            emitResult();
          }
        });
    } else {
      this.matchResult = result;
      if (frequencyId !== null) {
@@ -457,6 +422,96 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
    }
  }
  /** The backend's payout schedule in the same popup the account itself uses, in its quote (preview) mode. */
  openSpecialSchedule(): void {
    if (!this.specialPreview) return;
    this.dialog.open(InterestScheduleDialogComponent, {
      width: '760px',
      data: {
        preview: true,
        currencyCode: this.fixedDepositsAccountProductTemplate?.currency?.code ?? 'INR',
        note:
          'Worked out by the account engine from the product, starting ' +
          this.specialPreview.startDate +
          ' (the day the account is opened) and ending the day before maturity on ' +
          this.specialPreview.maturityDate +
          '. The first and last periods are part-months; each pays for the days it covers.',
        schedule: this.specialPreview.periods.map((p) => ({
          fromDate: p.fromDate,
          toDate: p.toDate,
          days: p.days,
          interestAmount: Number(p.interestAmount),
          paid: false
        }))
      }
    });
  }
  /**
   * Asks the backend for the quote (POST fixeddepositaccounts/account-preview) with the same terms Submit sends: the
   * product's own interest terms, and the senior-citizen rate the same way Submit overrides it. The rate, maturity
   * amount and interest shown are the backend's, so they match the account once it is created.
   */
  private loadAccountPreview(
    result: SlabMatchResult,
    rate: number,
    submittedOnDateStr: string,
    frequencyId: number,
    emitResult: () => void
  ): void {
    const pt = this.fixedDepositsAccountProductTemplate ?? {};
    const body: any = {
      clientId: pt.clientId ?? this.fixedDepositsAccountTemplate?.clientId,
      productId: pt.depositProductId ?? pt.productId ?? this.fixedDepositsAccountTemplate?.productId,
      submittedOnDate: submittedOnDateStr,
      dateFormat: 'yyyy-MM-dd',
      locale: 'en',
      depositAmount: this.principalAmount,
      depositPeriod: this.tenureValue,
      depositPeriodFrequencyId: frequencyId
    };
    if (pt.nominalAnnualInterestRate != null) body.nominalAnnualInterestRate = pt.nominalAnnualInterestRate;
    if (pt.interestCompoundingPeriodType?.id != null)
      body.interestCompoundingPeriodType = pt.interestCompoundingPeriodType.id;
    if (pt.interestPostingPeriodType?.id != null) body.interestPostingPeriodType = pt.interestPostingPeriodType.id;
    if (pt.interestCalculationType?.id != null) body.interestCalculationType = pt.interestCalculationType.id;
    if (pt.interestCalculationDaysInYearType?.id != null)
      body.interestCalculationDaysInYearType = pt.interestCalculationDaysInYearType.id;
    if (this.isSeniorCitizen && rate > 0) {
      body.isSeniorCitizen = true;
      body.seniorCitizenInterestRate = rate;
      body.nominalAnnualInterestRate = rate;
    }
    this.specialPreview = null;
    this.specialPreviewError = null;
    this.specialPreviewLoading = true;
    this.fixedDepositsService.accountPreview(body).subscribe({
      next: (preview: SpecialPayoutPreview) => {
        this.specialPreviewLoading = false;
        this.specialPreview = preview;
        result.appliedRate = Number(preview.annualInterestRate);
        result.interestEarned = Number(preview.totalInterest);
        result.estimatedMonthlyPayout = preview.fullMonthPayout != null ? Number(preview.fullMonthPayout) : undefined;
        result.maturityAmount = Number(preview.maturityAmount);
        this.matchResult = { ...result };
        emitResult();
        this.cdr.markForCheck();
      },
      error: (e: any) => {
        this.specialPreviewLoading = false;
        this.specialPreviewError =
          e?.error?.errors?.[0]?.defaultUserMessage ||
          e?.error?.defaultUserMessage ||
          'Could not work out the maturity. Check the deposit details and try again.';
        result.maturityAmount = undefined;
        result.interestEarned = undefined;
        this.matchResult = { ...result };
        this.cdr.markForCheck();
      }
    });
  }
  private resolveFrequencyId(unit: FdPeriodUnit): number | null {
    const options: any[] = this.fixedDepositsAccountProductTemplate?.periodFrequencyTypeOptions ?? [];
    const unitLower = unit.toLowerCase();
@@ -471,12 +526,16 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
    this.tenureValue = null;
    this.principalAmount = null;
    this.matchResult = null;
    this.specialPreview = null;
    this.specialPreviewError = null;
    this.validationWarning = null;
    this.tenurePeriodUnit = this.allowedPeriodUnits[0];
  }
  onPeriodUnitChange() {
    this.matchResult = null;
    this.specialPreview = null;
    this.specialPreviewError = null;
    this.validationWarning = null;
  }
@@ -524,6 +583,8 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
      this.calculateRate();
    } else {
      this.matchResult = null;
      this.specialPreview = null;
      this.specialPreviewError = null;
    }
  }
@@ -326,7 +326,7 @@
            <div class="preview-dorm-step__body">
              <span class="preview-dorm-step__label">Inactive</span>
              <span class="preview-dorm-step__days">
-                @if (fixedDepositsAccountProductTemplate?.daysToInactive != null) {
+                @if ((fixedDepositsAccountProductTemplate?.daysToInactive ?? null) !== null) {
                  After {{ fixedDepositsAccountProductTemplate.daysToInactive }} days of no transaction
                } @else {
                  Not configured
@@ -340,7 +340,7 @@
            <div class="preview-dorm-step__body">
              <span class="preview-dorm-step__label">Dormant</span>
              <span class="preview-dorm-step__days">
-                @if (fixedDepositsAccountProductTemplate?.daysToDormancy != null) {
+                @if ((fixedDepositsAccountProductTemplate?.daysToDormancy ?? null) !== null) {
                  {{ fixedDepositsAccountProductTemplate.daysToDormancy }} days after inactive
                } @else {
                  Not configured
@@ -354,7 +354,7 @@
            <div class="preview-dorm-step__body">
              <span class="preview-dorm-step__label">Escheat</span>
              <span class="preview-dorm-step__days">
-                @if (fixedDepositsAccountProductTemplate?.daysToEscheat != null) {
+                @if ((fixedDepositsAccountProductTemplate?.daysToEscheat ?? null) !== null) {
                  {{ fixedDepositsAccountProductTemplate.daysToEscheat }} days after dormant
                } @else {
                  Not configured
@@ -458,13 +458,15 @@
            <span class="preview-value">{{ maturitySummary.tenureLabel }}</span>
          </div>
          <div class="preview-field">
-            <span class="preview-label">Estimated Interest Earned</span>
+            <span class="preview-label">{{
              isSpecial ? 'Total Interest (paid out monthly)' : 'Estimated Interest Earned'
            }}</span>
            <span class="preview-value" style="color: var(--theme-success, #28a745); font-weight: 500">
              + {{ maturitySummary.totalInterest | formatNumber }} {{ currencyName }}
            </span>
          </div>
          <div class="preview-field" style="grid-column: span 2">
-            <span class="preview-label">Projected Maturity Amount</span>
+            <span class="preview-label">{{ isSpecial ? 'Principal at Maturity' : 'Projected Maturity Amount' }}</span>
            <span class="preview-value preview-mono" style="font-weight: 600; font-size: 1.25rem">
              {{ maturitySummary.maturityAmount | formatNumber }} {{ currencyName }}
            </span>
@@ -145,6 +145,11 @@ export class FixedDepositAccountPreviewStepComponent implements OnChanges {
    SPECIAL: 'FD Special (Monthly Interest Payout)'
  };
  /** FD Special pays its interest out monthly; the principal alone comes back at maturity. */
  get isSpecial(): boolean {
    return this.fixedDepositsAccountProductTemplate?.fdType === 'SPECIAL';
  }
  getFdTypeLabel(fdType: string): string {
    return this.fdTypeLabels[fdType] || fdType;
  }
@@ -11,15 +11,25 @@
    <span class="isd-header__icon"><fa-icon icon="calendar-alt"></fa-icon></span>
    <span class="isd-header__text">
      <span class="isd-header__title">{{ 'labels.heading.Monthly Interest Payout Schedule' | translate }}</span>
-      <span class="isd-header__sub">{{ paidCount }} of {{ schedule.length }} periods paid so far</span>
+      <span class="isd-header__sub">
        @if (isPreview) {
          {{ schedule.length }} monthly payouts
        } @else {
          {{ paidCount }} of {{ schedule.length }} periods paid so far
        }
      </span>
    </span>
  </h2>
  <div mat-dialog-content class="isd-content">
    <p class="isd-note">
      <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-      Computed by the actual interest engine for this account's full term -- the exact amount posted each month can vary
+      @if (data.note) {
-      slightly with the number of days in that month.
+        {{ data.note }}
      } @else {
        Computed by the actual interest engine for this account's full term -- the exact amount posted each month can
        vary slightly with the number of days in that month.
      }
    </p>
    <div class="isd-scroll">
@@ -28,8 +38,13 @@
          <tr>
            <th>{{ 'labels.inputs.From Date' | translate }}</th>
            <th>{{ 'labels.inputs.To Date' | translate }}</th>
            @if (isPreview) {
              <th class="isd-table__amount-col">Days</th>
            }
            <th class="isd-table__amount-col">{{ 'labels.inputs.Interest Amount' | translate }}</th>
-            <th class="isd-table__status-col">{{ 'labels.inputs.Status' | translate }}</th>
+            @if (!isPreview) {
              <th class="isd-table__status-col">{{ 'labels.inputs.Status' | translate }}</th>
            }
          </tr>
        </thead>
        <tbody>
@@ -37,28 +52,35 @@
            <tr [class.isd-table__row--paid]="period.paid">
              <td>{{ period.fromDate | dateFormat }}</td>
              <td>{{ period.toDate | dateFormat }}</td>
              @if (isPreview) {
                <td class="isd-table__amount-col">{{ period.days }}</td>
              }
              <td class="isd-table__amount-col">
                {{ period.interestAmount | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
              </td>
-              <td class="isd-table__status-col">
+              @if (!isPreview) {
-                @if (period.paid) {
+                <td class="isd-table__status-col">
-                  <span class="isd-badge isd-badge--paid">
+                  @if (period.paid) {
-                    <fa-icon icon="check-circle" class="m-r-5"></fa-icon>Paid
+                    <span class="isd-badge isd-badge--paid">
-                  </span>
+                      <fa-icon icon="check-circle" class="m-r-5"></fa-icon>Paid
-                } @else {
+                    </span>
-                  <span class="isd-badge isd-badge--pending">Pending</span>
+                  } @else {
-                }
+                    <span class="isd-badge isd-badge--pending">Pending</span>
-              </td>
+                  }
                </td>
              }
            </tr>
          }
        </tbody>
        <tfoot>
          <tr>
-            <td colspan="2">{{ 'labels.inputs.Total Interest Payable' | translate }}</td>
+            <td [attr.colspan]="isPreview ? 3 : 2">{{ 'labels.inputs.Total Interest Payable' | translate }}</td>
            <td class="isd-table__amount-col">
              {{ totalInterest | currency: currencyCode : 'symbol-narrow' : '1.2-2' }}
            </td>
-            <td></td>
+            @if (!isPreview) {
              <td></td>
            }
          </tr>
        </tfoot>
      </table>
@@ -26,6 +26,9 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 * a 24+ month term makes for a long table that would otherwise push every other card on the tab down
 * the page. Each row also shows whether that period's interest has actually posted yet, not just what
 * the engine projects it to be.
 *
 * Also opened from the account-opening screen with `preview: true`: the backend's quote for an FD Special
 * not opened yet, so there is no paid / pending status, and each period shows its number of days.
 */
@Component({
  selector: 'mifosx-interest-schedule-dialog',
@@ -46,14 +49,22 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 export class InterestScheduleDialogComponent {
  dialogRef = inject<MatDialogRef<InterestScheduleDialogComponent>>(MatDialogRef);
  data: {
-    schedule: Array<{ fromDate: any; toDate: any; interestAmount: number; paid: boolean }>;
+    schedule: Array<{ fromDate: any; toDate: any; interestAmount: number; paid: boolean; days?: number }>;
    currencyCode: string;
    /** Account-opening quote: no paid / pending status. */
    preview?: boolean;
    /** Shown above the table instead of the account note. */
    note?: string;
  } = inject(MAT_DIALOG_DATA);
-  get schedule(): Array<{ fromDate: any; toDate: any; interestAmount: number; paid: boolean }> {
+  get schedule(): Array<{ fromDate: any; toDate: any; interestAmount: number; paid: boolean; days?: number }> {
    return this.data.schedule ?? [];
  }
  get isPreview(): boolean {
    return !!this.data.preview;
  }
  get currencyCode(): string {
    return this.data.currencyCode;
  }
@@ -154,6 +154,16 @@ export class FixedDepositsService {
    return this.http.get(`/fixeddepositaccounts/calculate-fd-interest`, { params: httpParams });
  }
  /**
   * FD quote while opening the account, for every FD type: the same body as create (clientId, productId,
   * submittedOnDate, depositAmount, depositPeriod, depositPeriodFrequencyId, interest terms, senior citizen ...). The
   * backend builds the would-be account from the product, without saving it, and returns the applied rate, maturity
   * date and amount Submit would store, and the interest periods (FD Special: the monthly payout schedule).
   */
  accountPreview(body: any): Observable<any> {
    return this.http.post(`/fixeddepositaccounts/account-preview`, body);
  }
  /**
   * FD Dashboard's "Renew" action on a matured FD whose product has a renewal grace period
   * configured: backdated to the original maturity date within the grace window, or from today
@@ -110,8 +110,8 @@ export class CreateRecurringDepositsAccountComponent {
   */
  setTemplate($event: any) {
    this.recurringDepositsAccountProductTemplate = $event;
-    this.productsService.getFdBaseInterestRates().subscribe({
+    this.productsService.getRdBaseInterestRates().subscribe({
-      next: (rates: any[]) => (this.cbsBaseRates = rates || []),
+      next: (rates: any) => (this.cbsBaseRates = Array.isArray(rates) ? rates : rates ? [rates] : []),
      error: () => (this.cbsBaseRates = [])
    });
  }
@@ -198,7 +198,8 @@ export class CreateRecurringDepositsAccountComponent {
    if (this.recurringDepositsAccountProductTemplate?.introducerRequired && !detailsStep?.introducerId) {
      this.alertService.alert({
        type: 'Error',
-        message: 'This product requires an introducer. Please choose an existing customer as introducer before submitting.'
+        message:
          'This product requires an introducer. Please choose an existing customer as introducer before submitting.'
      });
      return;
    }
@@ -144,8 +144,8 @@ export class EditRecurringDepositAccountComponent {
  setTemplate($event: any) {
    this.recurringDepositsAccountProductTemplate = $event;
-    this.productsService.getFdBaseInterestRates().subscribe({
+    this.productsService.getRdBaseInterestRates().subscribe({
-      next: (rates: any[]) => (this.cbsBaseRates = rates || []),
+      next: (rates: any) => (this.cbsBaseRates = Array.isArray(rates) ? rates : rates ? [rates] : []),
      error: () => (this.cbsBaseRates = [])
    });
  }
@@ -127,7 +127,8 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
  }>();
  get activeBase(): any {
-    return (this.cbsBaseRates || []).find((r) => r.fdType === 'DOUBLE' && r.isActive);
+    // The recurring deposit's own CBS base chart; its active version carries the senior citizen rate of each slab.
    return (this.cbsBaseRates || []).find((r) => r.isActive) ?? (this.cbsBaseRates || [])[0];
  }
  /**
@@ -173,7 +174,10 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
      return baseSlabs;
    }
    // Products made before RD charts moved to months still hold the base chart's own year slabs
-    const candidates = [...baseSlabs, ...this.normalizeCbsSlabs(cbsSlabs)];
+    const candidates = [
      ...baseSlabs,
      ...this.normalizeCbsSlabs(cbsSlabs)
    ];
    return productSlabs.map((slab: any) => {
      if (slab.seniorCitizenRate != null) {
        return slab;
@@ -50,6 +50,34 @@
            <span class="nx-row__label">{{ 'labels.inputs.Maturity Date' | translate }}</span>
            <span class="nx-row__value">{{ recurringDepositsAccountData.maturityDate | dateFormat }}</span>
          </div>
          @if (installmentPosition) {
            <div class="nx-row">
              <span class="nx-row__label">Next Installment Due</span>
              <span class="nx-row__value">
                @if (installmentPosition.nextDueDate) {
                  {{ installmentPosition.nextDueDate | dateFormat }} &middot;
                  {{ installmentPosition.installmentAmount | currency: currency?.code : 'symbol-narrow' : '1.2-2' }}
                } @else {
                  <span class="nx-muted">All installments paid</span>
                }
              </span>
            </div>
            <div class="nx-row">
              <span class="nx-row__label">Installments Paid</span>
              <span class="nx-row__value"
                >{{ installmentPosition.paidInstallments }} of {{ installmentPosition.totalInstallments }}</span
              >
            </div>
            @if (installmentPosition.overdueInstallments > 0) {
              <div class="nx-row">
                <span class="nx-row__label">Overdue</span>
                <span class="nx-row__value" style="color: var(--mat-sys-error, #d32f2f)">
                  {{ installmentPosition.overdueInstallments }} installment(s) &middot;
                  {{ installmentPosition.overdueAmount | currency: currency?.code : 'symbol-narrow' : '1.2-2' }}
                </span>
              </div>
            }
          }
          @if (
            recurringDepositsAccountData.timeline.closedOnDate || recurringDepositsAccountData.summary.totalWitddrawals
          ) {
@@ -46,11 +46,21 @@ export class GeneralTabComponent {
  totalLienAmount = 0;
  /** Loan limit today (Lien Marked products only): % that applies, what it comes to, and what is left. */
  lienLimit: { percentage: number; maxLoanAmount: number; availableForLoan: number } | null = null;
  /** When the next installment is expected and how much, plus anything already overdue; null once fully paid. */
  installmentPosition: {
    nextDueDate: string | null;
    installmentAmount: number;
    paidInstallments: number;
    totalInstallments: number;
    overdueInstallments: number;
    overdueAmount: number;
  } | null = null;
  constructor() {
    this.route.parent.data.subscribe((data: { recurringDepositsAccountData: any }) => {
      this.recurringDepositsAccountData = data.recurringDepositsAccountData;
      this.loadLiens(this.recurringDepositsAccountData?.id);
      this.loadInstallmentPosition(this.recurringDepositsAccountData?.id);
      this.currency = this.recurringDepositsAccountData.currency;
      this.isprematureAllowed = data.recurringDepositsAccountData.maturityDate != null;
      if (this.router.url.includes('clients')) {
@@ -63,6 +73,27 @@ export class GeneralTabComponent {
    });
  }
  private loadInstallmentPosition(accountId: any) {
    this.installmentPosition = null;
    if (!accountId) {
      return;
    }
    this.recurringDepositsService.getRecurringDepositInstallmentPosition(accountId).subscribe((response: any) => {
      const row = (response?.accounts ?? []).find((a: any) => Number(a.id) === Number(accountId));
      if (!row) {
        return;
      }
      this.installmentPosition = {
        nextDueDate: row.nextDueDate || null,
        installmentAmount: Number(row.installmentAmount) || 0,
        paidInstallments: Number(row.paidInstallments) || 0,
        totalInstallments: Number(row.totalInstallments) || 0,
        overdueInstallments: Number(row.overdueInstallments) || 0,
        overdueAmount: Number(row.overdueAmount) || 0
      };
    });
  }
  private loadLiens(accountId: any) {
    this.liens = [];
    this.totalLienAmount = 0;
@@ -39,6 +39,16 @@ export class RecurringDepositsService {
    return this.http.get(`/recurringdepositaccounts/${recurringDepositAccountId}/liens`);
  }
  /**
   * This deposit's installment position as of the business date (next due date, overdue count/amount), from the
   * RD Dashboard endpoint - the same paid/overdue rule the auto-debit and penalty jobs use. Older backends ignore
   * `accountId` and return every RD, so callers pick the row by id.
   */
  getRecurringDepositInstallmentPosition(recurringDepositAccountId: any): Observable<any> {
    const httpParams = new HttpParams().set('accountId', recurringDepositAccountId);
    return this.http.get('/recurringdepositaccounts/dashboard', { params: httpParams });
  }
  /**
   * @param clientId Client Id
   * @param clientName Client Name
@@ -10,7 +10,7 @@ import { Directive, HostListener, Input, ElementRef, inject } from '@angular/cor
 import { NgControl } from '@angular/forms';
 /** The kinds of field this knows how to hold to a shape. */
-export type RestrictKind = 'digits' | 'phone' | 'pan' | 'aadhaar';
+export type RestrictKind = 'digits' | 'phone' | 'pan' | 'aadhaar' | 'gstin' | 'tan';
 interface Rule {
  /** Characters this kind will accept at all. */
@@ -27,7 +27,10 @@ const RULES: Record<RestrictKind, Rule> = {
  // A PAN is five letters, four digits, one letter - and is always written in capitals.
  pan: { allowed: /[A-Za-z0-9]/, maxLength: 10, upper: true },
  // Twelve digits, or the masked form CKYC returns, which is Xs and the last four digits.
-  aadhaar: { allowed: /[0-9Xx]/, maxLength: 12, upper: true }
+  aadhaar: { allowed: /[0-9Xx]/, maxLength: 12, upper: true },
  // GSTIN is fifteen letters and digits, TAN ten; both are always written in capitals.
  gstin: { allowed: /[A-Za-z0-9]/, maxLength: 15, upper: true },
  tan: { allowed: /[A-Za-z0-9]/, maxLength: 10, upper: true }
 };
 /**
@@ -54,6 +54,8 @@ export interface CtrTransaction {
  declaration: string;
  /** Customer name resolved from KC1 (UI convenience, not in actual TC2 schema) */
  customerName?: string;
  /** True for a transaction that has crossed the threshold but is not yet in a generated CTR. */
  pendingFiling?: boolean;
  /**
   * CTR does not judge suspicion. It records only whether the source of funds was
   * evidenced at the counter (CTR filed, nothing further) or could not be, in which
@@ -223,6 +223,15 @@
          <div class="fiu-note">Loading the generated CTR lines…</div>
        } @else if (ctrLinesError) {
          <div class="fiu-note fiu-note--warn"><fa-icon icon="exclamation-triangle"></fa-icon> {{ ctrLinesError }}</div>
        } @else if (ctrPendingCount > 0) {
          <div class="fiu-note">
            <fa-icon icon="info-circle"></fa-icon>
            {{ ctrPendingCount }} cash transaction{{ ctrPendingCount > 1 ? 's' : '' }} of ₹10,00,000 or more
            {{ ctrPendingCount > 1 ? 'are' : 'is' }} listed below automatically as soon as
            {{ ctrPendingCount > 1 ? 'they are' : 'it is' }} posted.
            {{ ctrPendingCount > 1 ? 'They are' : 'It is' }} not in a filed report yet — pick the month under “Generate
            CTR” and run it to include {{ ctrPendingCount > 1 ? 'them' : 'it' }}.
          </div>
        } @else if (!ctrTxns.length) {
          <div class="fiu-note fiu-note--warn">
            <fa-icon icon="exclamation-triangle"></fa-icon>
@@ -342,27 +351,103 @@
              <th class="ta-c">Records</th>
              <th>Status</th>
              <th>Submitted On</th>
              <th class="ta-c">Customers</th>
            </tr>
          </thead>
          <tbody>
            @for (r of amlCtrReports; track r.id) {
-              <tr>
+              <tr style="cursor: pointer" (click)="openCtrReport(r)">
                <td>{{ r.reportMonth }}</td>
-                <td>{{ r.generatedOn | date: 'medium' }}</td>
+                <td>{{ r.generatedOn ? (asDate(r.generatedOn) | date: 'medium') : '—' }}</td>
                <td class="ta-c">{{ r.recordCount }}</td>
                <td>
                  <span [class]="amlStatusClass(r.status)">{{ r.status }}</span>
                </td>
-                <td>{{ r.submittedOn ? (r.submittedOn | date: 'medium') : '—' }}</td>
+                <td>{{ r.submittedOn ? (asDate(r.submittedOn) | date: 'medium') : '—' }}</td>
                <td class="ta-c" (click)="$event.stopPropagation()">
                  <button class="fiu-btn fiu-btn-g" (click)="openCtrReport(r)">View</button>
                  <button class="fiu-btn fiu-btn-g" (click)="exportCtrReport(r)">Excel</button>
                </td>
              </tr>
            } @empty {
              <tr>
-                <td colspan="5" class="fiu-empty">No CTR reports generated yet.</td>
+                <td colspan="6" class="fiu-empty">No CTR reports generated yet.</td>
              </tr>
            }
          </tbody>
        </table>
      </div>
      <!-- The customers and transactions one CTR report names. Opened from a row above; declared here so it keeps this
           component's state and styles. -->
      <ng-template #ctrReportDialog>
        <div class="fiu-dialog">
          @if (ctrReportView; as report) {
            <div class="fiu-form-meta">
              <div class="fiu-form-title">
                <h3>CTR report — {{ report.reportMonth }}</h3>
                <p>
                  {{ report.status }} · {{ ctrReportLines.length }} record{{ ctrReportLines.length === 1 ? '' : 's' }} ·
                  total ₹{{ ctrReportTotal | number: '1.2-2' }}
                </p>
              </div>
              <div class="fiu-action-group">
                <button
                  class="fiu-btn fiu-btn-xml"
                  [disabled]="ctrReportLinesLoading"
                  (click)="exportCtrReport(report)"
                >
                  Export Excel
                </button>
                <button class="fiu-btn fiu-btn-g" (click)="closeCtrReport()">Close</button>
              </div>
            </div>
            @if (ctrReportLinesLoading) {
              <div class="fiu-note">Loading the customers in this report…</div>
            } @else {
              <div class="fiu-tbl-wrap">
                <table class="fiu-tbl">
                  <thead>
                    <tr>
                      <th>Customer</th>
                      <th>Customer ID / CKYC</th>
                      <th>Account</th>
                      <th>Branch</th>
                      <th>Date</th>
                      <th>Direction</th>
                      <th>Type</th>
                      <th class="ta-r">Amount</th>
                    </tr>
                  </thead>
                  <tbody>
                    @for (l of ctrReportLines; track $index) {
                      <tr>
                        <td>
                          {{ l.clientName }}
                          <div style="font-size: 11px; color: var(--f-g500)">
                            {{ l.individual === false ? 'Entity' : 'Individual' }}
                          </div>
                        </td>
                        <td class="mono">{{ l.ckycNumber || l.clientExternalId || '—' }}</td>
                        <td class="mono">{{ l.accountNo || '—' }}</td>
                        <td>{{ l.branchName || '—' }}</td>
                        <td>{{ l.transactionDate ? (asDate(l.transactionDate) | date: 'dd MMM yyyy') : '—' }}</td>
                        <td>{{ l.direction || '—' }}</td>
                        <td>{{ l.connectedGroup ? 'Connected group (month total)' : 'Single transaction' }}</td>
                        <td class="ta-r">₹{{ l.amount | number: '1.2-2' }}</td>
                      </tr>
                    } @empty {
                      <tr>
                        <td colspan="8" class="fiu-empty">This report names no customers.</td>
                      </tr>
                    }
                  </tbody>
                </table>
              </div>
            }
          }
        </div>
      </ng-template>
    </div>
  }
@@ -581,146 +666,153 @@
        </div>
      }
-      @if (selectedStrCase) {
+      <!-- The case investigation. Opened as a popup by selectStrCase(); declared here so it keeps this component's state. -->
-        <div class="str-case-detail">
+      <ng-template #strCaseDialog>
-          <div class="fiu-form-meta">
+        <div class="fiu-dialog">
-            <div class="fiu-form-title">
+          @if (selectedStrCase) {
-              <h3>STR Case #{{ selectedStrCase.id }} — {{ selectedStrCase.clientDisplayName }}</h3>
+            <div class="str-case-detail">
-              <p>
+              <div class="fiu-form-meta">
-                Alert #{{ selectedStrCase.alertId }} &middot;
+                <div class="fiu-form-title">
-                {{ selectedStrCase.cumulativeStrCaseCountForClient }} cumulative STR case(s) for this client
+                  <h3>STR Case #{{ selectedStrCase.id }} — {{ selectedStrCase.clientDisplayName }}</h3>
-                @if (selectedStrCase.cumulativeStrCaseCountForClient >= 3) {
+                  <p>
-                  <span class="escalation-badge">Risk category auto-escalated</span>
+                    Alert #{{ selectedStrCase.alertId }} &middot;
                    {{ selectedStrCase.cumulativeStrCaseCountForClient }} cumulative STR case(s) for this client
                    @if (selectedStrCase.cumulativeStrCaseCountForClient >= 3) {
                      <span class="escalation-badge">Risk category auto-escalated</span>
                    }
                  </p>
                </div>
                <button class="fiu-btn fiu-btn-g" (click)="closeStrCaseDetail()">Close</button>
              </div>
              <div
                class="case-outcome"
                [class.case-outcome--clear]="selectedStrCase.status === 'CONCLUDED_CLEAR'"
                [class.case-outcome--suspicious]="
                  selectedStrCase.status === 'CONCLUDED_SUSPICIOUS' || selectedStrCase.status === 'FILED'
                "
              >
                <span [class]="amlStatusClass(selectedStrCase.status)">{{ selectedStrCase.status }}</span>
                <span>{{ strCaseOutcome(selectedStrCase) }}</span>
              </div>
              <div class="case-form" *mifosxHasPermission="'CONCLUDE_AML_STR'">
                <div class="form-row">
                  <label for="fiuInvestigationNotes"
                    >Investigation notes (source-of-transaction history reviewed)</label
                  >
                  <textarea id="fiuInvestigationNotes" rows="3" [(ngModel)]="concludeInvestigationNotes"></textarea>
                </div>
                <div class="form-row">
                  <label for="fiuSourceOfFundsNotes">Source-of-funds notes</label>
                  <textarea id="fiuSourceOfFundsNotes" rows="2" [(ngModel)]="concludeSourceOfFundsNotes"></textarea>
                </div>
                <!-- Verification checklist — the verdict is derived, not chosen. -->
                <div class="checklist">
                  <div class="checklist-head">
                    <span>Principal Officer verification — mark each point as found</span>
                    <span class="checklist-progress" [class.done]="allAnswered">
                      {{ answeredCount }} / {{ strChecklist.length }} answered
                    </span>
                  </div>
                  <table class="checklist-tbl">
                    <thead>
                      <tr>
                        <th>Verification point</th>
                        <th class="ta-c col-yes">Genuine</th>
                        <th class="ta-c col-no">Not satisfied</th>
                      </tr>
                    </thead>
                    <tbody>
                      @for (item of strChecklist; track item.key) {
                        <tr
                          [class.row-yes]="strFindings[item.key] === true"
                          [class.row-no]="strFindings[item.key] === false"
                          [class.row-pending]="strFindings[item.key] === null"
                        >
                          <td>
                            <div class="chk-label">{{ item.label }}</div>
                            <div class="chk-hint">{{ item.hint }}</div>
                          </td>
                          <td class="ta-c">
                            <button
                              type="button"
                              class="chk-box chk-box--yes"
                              [class.on]="strFindings[item.key] === true"
                              [attr.aria-pressed]="strFindings[item.key] === true"
                              [attr.aria-label]="'Mark ' + item.label + ' as genuine'"
                              (click)="setFinding(item.key, true)"
                            >
                              <fa-icon icon="check-circle"></fa-icon>
                            </button>
                          </td>
                          <td class="ta-c">
                            <button
                              type="button"
                              class="chk-box chk-box--no"
                              [class.on]="strFindings[item.key] === false"
                              [attr.aria-pressed]="strFindings[item.key] === false"
                              [attr.aria-label]="'Mark ' + item.label + ' as not satisfied'"
                              (click)="setFinding(item.key, false)"
                            >
                              <fa-icon icon="exclamation-triangle"></fa-icon>
                            </button>
                          </td>
                        </tr>
                      }
                    </tbody>
                  </table>
                </div>
                <!-- Derived verdict -->
                <div
                  class="verdict"
                  [class.verdict--clear]="allAnswered && derivedConclusion === 'NOT_SUSPICIOUS'"
                  [class.verdict--suspicious]="allAnswered && derivedConclusion === 'SUSPICIOUS'"
                >
                  @if (!allAnswered) {
                    <fa-icon icon="info-circle"></fa-icon>
                    <span>
                      Answer every verification point to determine the outcome —
                      {{ strChecklist.length - answeredCount }} still pending.
                    </span>
                  } @else if (derivedConclusion === 'NOT_SUSPICIOUS') {
                    <fa-icon icon="check-circle"></fa-icon>
                    <span>
                      <strong>Not suspicious.</strong> All {{ strChecklist.length }} points found genuine — the case
                      will be closed and nothing filed with FIU-IND.
                    </span>
                  } @else {
                    <fa-icon icon="exclamation-triangle"></fa-icon>
                    <span>
                      <strong>Suspicious — STR must be filed.</strong>
                      {{ failedFindings.length }} of {{ strChecklist.length }} points not satisfied:
                      {{ failedFindings[0].label }}
                      @if (failedFindings.length > 1) {
                        <span> and {{ failedFindings.length - 1 }} more</span>
                      }
                      .
                    </span>
                  }
                </div>
                <button class="fiu-btn fiu-btn-xml" [disabled]="!allAnswered" (click)="concludeStrCase()">
                  Conclude as
                  {{ allAnswered ? (derivedConclusion === 'SUSPICIOUS' ? 'Suspicious' : 'Not Suspicious') : '…' }}
                </button>
                @if (selectedStrCase.status === 'CONCLUDED_SUSPICIOUS') {
                  <div class="file-str-row">
                    <label for="fiuFileReferenceNo">FIU-IND acknowledgement / reference number</label>
                    <input id="fiuFileReferenceNo" class="fiu-inp" type="text" [(ngModel)]="fileReferenceNo" />
                    <button class="fiu-btn fiu-btn-xml" (click)="fileStrCase()">Mark STR Filed</button>
                  </div>
                }
              </p>
            </div>
            <button class="fiu-btn fiu-btn-g" (click)="closeStrCaseDetail()">Close</button>
          </div>
          <div
            class="case-outcome"
            [class.case-outcome--clear]="selectedStrCase.status === 'CONCLUDED_CLEAR'"
            [class.case-outcome--suspicious]="
              selectedStrCase.status === 'CONCLUDED_SUSPICIOUS' || selectedStrCase.status === 'FILED'
            "
          >
            <span [class]="amlStatusClass(selectedStrCase.status)">{{ selectedStrCase.status }}</span>
            <span>{{ strCaseOutcome(selectedStrCase) }}</span>
          </div>
          <div class="case-form" *mifosxHasPermission="'CONCLUDE_AML_STR'">
            <div class="form-row">
              <label for="fiuInvestigationNotes">Investigation notes (source-of-transaction history reviewed)</label>
              <textarea id="fiuInvestigationNotes" rows="3" [(ngModel)]="concludeInvestigationNotes"></textarea>
            </div>
            <div class="form-row">
              <label for="fiuSourceOfFundsNotes">Source-of-funds notes</label>
              <textarea id="fiuSourceOfFundsNotes" rows="2" [(ngModel)]="concludeSourceOfFundsNotes"></textarea>
            </div>
            <!-- Verification checklist — the verdict is derived, not chosen. -->
            <div class="checklist">
              <div class="checklist-head">
                <span>Principal Officer verification — mark each point as found</span>
                <span class="checklist-progress" [class.done]="allAnswered">
                  {{ answeredCount }} / {{ strChecklist.length }} answered
                </span>
              </div>
              <table class="checklist-tbl">
                <thead>
                  <tr>
                    <th>Verification point</th>
                    <th class="ta-c col-yes">Genuine</th>
                    <th class="ta-c col-no">Not satisfied</th>
                  </tr>
                </thead>
                <tbody>
                  @for (item of strChecklist; track item.key) {
                    <tr
                      [class.row-yes]="strFindings[item.key] === true"
                      [class.row-no]="strFindings[item.key] === false"
                      [class.row-pending]="strFindings[item.key] === null"
                    >
                      <td>
                        <div class="chk-label">{{ item.label }}</div>
                        <div class="chk-hint">{{ item.hint }}</div>
                      </td>
                      <td class="ta-c">
                        <button
                          type="button"
                          class="chk-box chk-box--yes"
                          [class.on]="strFindings[item.key] === true"
                          [attr.aria-pressed]="strFindings[item.key] === true"
                          [attr.aria-label]="'Mark ' + item.label + ' as genuine'"
                          (click)="setFinding(item.key, true)"
                        >
                          <fa-icon icon="check-circle"></fa-icon>
                        </button>
                      </td>
                      <td class="ta-c">
                        <button
                          type="button"
                          class="chk-box chk-box--no"
                          [class.on]="strFindings[item.key] === false"
                          [attr.aria-pressed]="strFindings[item.key] === false"
                          [attr.aria-label]="'Mark ' + item.label + ' as not satisfied'"
                          (click)="setFinding(item.key, false)"
                        >
                          <fa-icon icon="exclamation-triangle"></fa-icon>
                        </button>
                      </td>
                    </tr>
                  }
                </tbody>
              </table>
            </div>
-
+          }
            <!-- Derived verdict -->
            <div
              class="verdict"
              [class.verdict--clear]="allAnswered && derivedConclusion === 'NOT_SUSPICIOUS'"
              [class.verdict--suspicious]="allAnswered && derivedConclusion === 'SUSPICIOUS'"
            >
              @if (!allAnswered) {
                <fa-icon icon="info-circle"></fa-icon>
                <span>
                  Answer every verification point to determine the outcome —
                  {{ strChecklist.length - answeredCount }} still pending.
                </span>
              } @else if (derivedConclusion === 'NOT_SUSPICIOUS') {
                <fa-icon icon="check-circle"></fa-icon>
                <span>
                  <strong>Not suspicious.</strong> All {{ strChecklist.length }} points found genuine — the case will be
                  closed and nothing filed with FIU-IND.
                </span>
              } @else {
                <fa-icon icon="exclamation-triangle"></fa-icon>
                <span>
                  <strong>Suspicious — STR must be filed.</strong>
                  {{ failedFindings.length }} of {{ strChecklist.length }} points not satisfied:
                  {{ failedFindings[0].label }}
                  @if (failedFindings.length > 1) {
                    <span> and {{ failedFindings.length - 1 }} more</span>
                  }
                  .
                </span>
              }
            </div>
            <button class="fiu-btn fiu-btn-xml" [disabled]="!allAnswered" (click)="concludeStrCase()">
              Conclude as
              {{ allAnswered ? (derivedConclusion === 'SUSPICIOUS' ? 'Suspicious' : 'Not Suspicious') : '…' }}
            </button>
            @if (selectedStrCase.status === 'CONCLUDED_SUSPICIOUS') {
              <div class="file-str-row">
                <label for="fiuFileReferenceNo">FIU-IND acknowledgement / reference number</label>
                <input id="fiuFileReferenceNo" class="fiu-inp" type="text" [(ngModel)]="fileReferenceNo" />
                <button class="fiu-btn fiu-btn-xml" (click)="fileStrCase()">Mark STR Filed</button>
              </div>
            }
          </div>
        </div>
-      }
+      </ng-template>
      <!-- FINnet export template (separate concern — STR XML file-format generation) -->
      <div class="fiu-form-meta">
@@ -6,7 +6,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-:host {
+:host,
 .fiu-dialog {
  --f-navy: #0b1e3d;
  --f-blue: #1d4ed8;
  --f-blue-l: #eff6ff;
@@ -1858,3 +1859,8 @@
  white-space: normal;
  font-size: 12.5px;
 }
 /* The STR case popup renders in the overlay, outside :host, so it carries the page's colour variables itself. */
 .fiu-dialog {
  padding: 4px;
 }
@@ -6,7 +6,12 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit, inject, ViewChild, TemplateRef } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { forkJoin, of } from 'rxjs';
 import { exportWorkbook } from 'app/cashier/cashier-export';
 import { catchError } from 'rxjs/operators';
 import { ActivatedRoute } from '@angular/router';
 import { FormsModule } from '@angular/forms';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -131,6 +136,134 @@ export class FiuComponent implements OnInit {
  private sanctionsLogsService = inject(SanctionsLogsService);
  private authenticationService = inject(AuthenticationService);
  private route = inject(ActivatedRoute);
  private dialog = inject(MatDialog);
  private snackBar = inject(MatSnackBar);
  /** The STR case investigation, shown in a popup rather than a panel pushed in under the case list. */
  @ViewChild('strCaseDialog') strCaseDialogTpl!: TemplateRef<unknown>;
  private strCaseDialogRef: MatDialogRef<unknown> | null = null;
  /** The CTR report whose customers are open in the popup, and the lines behind it. */
  @ViewChild('ctrReportDialog') ctrReportDialogTpl!: TemplateRef<unknown>;
  private ctrReportDialogRef: MatDialogRef<unknown> | null = null;
  ctrReportView: any = null;
  ctrReportLines: any[] = [];
  ctrReportLinesLoading = false;
  /** Opens a generated CTR report with every customer and transaction it names. */
  openCtrReport(report: any): void {
    this.ctrReportView = report;
    this.ctrReportLines = [];
    this.ctrReportLinesLoading = true;
    this.amlService.getCtrReportLines(report.id).subscribe({
      next: (lines) => {
        this.ctrReportLines = lines || [];
        this.ctrReportLinesLoading = false;
      },
      error: () => {
        this.ctrReportLinesLoading = false;
        this.toast(`Could not load the customers in the ${report.reportMonth} report`);
      }
    });
    this.ctrReportDialogRef?.close();
    this.ctrReportDialogRef = this.dialog.open(this.ctrReportDialogTpl, {
      width: '1280px',
      maxWidth: '96vw',
      maxHeight: '92vh',
      autoFocus: false
    });
    this.ctrReportDialogRef.afterClosed().subscribe(() => {
      this.ctrReportView = null;
      this.ctrReportDialogRef = null;
    });
  }
  closeCtrReport(): void {
    this.ctrReportDialogRef?.close();
  }
  /** Total of the amounts in the open report, so the popup states what the filing adds up to. */
  get ctrReportTotal(): number {
    return this.ctrReportLines.reduce((sum, l) => sum + (Number(l.amount) || 0), 0);
  }
  /**
   * Excel workbook of a CTR report with the customer behind every line. Fetches the lines itself unless the popup
   * already holds them, so it works straight from the reports table as well as from inside the popup.
   */
  exportCtrReport(report: any): void {
    const build = (lines: any[]) => this.buildCtrReportWorkbook(report, lines);
    if (this.ctrReportView?.id === report.id && !this.ctrReportLinesLoading) {
      build(this.ctrReportLines);
      return;
    }
    this.amlService.getCtrReportLines(report.id).subscribe({
      next: (lines) => build(lines || []),
      error: () => this.toast(`Could not load the ${report.reportMonth} report to export it`)
    });
  }
  private async buildCtrReportWorkbook(report: any, lines: any[]): Promise<void> {
    const total = lines.reduce((sum, l) => sum + (Number(l.amount) || 0), 0);
    await exportWorkbook(
      [
        {
          sheetName: `CTR ${report.reportMonth}`,
          title: `Cash Transaction Report — ${report.reportMonth}`,
          subtitle: `${report.status} · ${lines.length} record${lines.length === 1 ? '' : 's'} · total ₹${total.toLocaleString('en-IN')} · generated ${new Date().toLocaleString('en-IN')}`,
          headers: [
            'Report Month',
            'Customer',
            'Customer ID / CKYC Ref',
            'CKYC Number',
            'Customer Type',
            'Account No',
            'Branch',
            'Account Status',
            'Account Opened',
            'Transaction ID',
            'Transaction Date',
            'Direction',
            'Line Type',
            'Amount (₹)'
          ],
          rows: lines.map((l) => [
            l.reportMonth || report.reportMonth,
            l.clientName || '',
            l.clientExternalId || '',
            l.ckycNumber || '',
            l.individual === false ? 'Entity' : 'Individual',
            l.accountNo || '',
            l.branchName || '',
            l.accountStatus || '',
            toIsoDate(l.accountOpenedOn) || '',
            l.transactionId ?? null,
            toIsoDate(l.transactionDate) || '',
            l.direction || '',
            l.connectedGroup ? 'Connected group — month total' : 'Single transaction',
            Number(l.amount) || 0
          ]),
          widths: [
            12,
            28,
            22,
            18,
            14,
            20,
            18,
            16,
            16,
            14,
            16,
            12,
            28,
            18
          ]
        }
      ],
      `CTR-${report.reportMonth}`
    );
  }
  /** Active tab */
  activeTab: 'dashboard' | 'ctr' | 'str' | 'customers' | 'files' = 'dashboard';
@@ -145,6 +278,8 @@ export class FiuComponent implements OnInit {
   */
  ctrTxns: CtrTransaction[] = [];
  ctrLinesLoading = false;
  /** Reportable cash transactions already posted but not yet in a generated CTR, listed automatically. */
  ctrPendingCount = 0;
  ctrLinesError = '';
  /**
   * ATM / card-rail cash, which feeds the same CTR as the counter transactions in TC2.
@@ -682,10 +817,23 @@ export class FiuComponent implements OnInit {
  loadCtrLines(): void {
    this.ctrLinesLoading = true;
    this.ctrLinesError = '';
-    this.amlService.getCtrReportLines().subscribe({
+    // The pending list is an extra: if it cannot be read, the generated lines still show.
-      next: (lines) => {
+    forkJoin({
      generated: this.amlService.getCtrReportLines(),
      pending: this.amlService.getCtrPendingLines().pipe(catchError(() => of([] as any[])))
    }).subscribe({
      next: ({ generated, pending }) => {
        this.ctrLinesLoading = false;
-        this.ctrTxns = (lines || []).map((l: any, i: number) => this.toCtrTransaction(l, i + 1));
+        const generatedRows = (generated || []).map((l: any, i: number) => this.toCtrTransaction(l, i + 1));
        const pendingRows = (pending || []).map((l: any, i: number) => ({
          ...this.toCtrTransaction(l, generatedRows.length + i + 1),
          pendingFiling: true
        }));
        this.ctrPendingCount = pendingRows.length;
        this.ctrTxns = [
          ...generatedRows,
          ...pendingRows
        ];
        // Cached so the compliance flags an officer sets below survive a reload, keyed on the rows
        // that actually came back rather than on a seeded set.
        this.applyStoredCtrCompliance();
@@ -693,6 +841,7 @@ export class FiuComponent implements OnInit {
      error: (err: any) => {
        this.ctrLinesLoading = false;
        this.ctrTxns = [];
        this.ctrPendingCount = 0;
        this.ctrLinesError =
          err?.error?.defaultUserMessage ||
          'Could not load the generated CTR lines. Generate a report for the month first.';
@@ -820,6 +969,17 @@ export class FiuComponent implements OnInit {
    this.concludeSourceOfFundsNotes = strCase.sourceOfFundsNotes || '';
    this.fileReferenceNo = strCase.strReferenceNo || '';
    this.resetChecklist();
    this.strCaseDialogRef?.close();
    this.strCaseDialogRef = this.dialog.open(this.strCaseDialogTpl, {
      width: '1100px',
      maxWidth: '96vw',
      maxHeight: '92vh',
      autoFocus: false
    });
    this.strCaseDialogRef.afterClosed().subscribe(() => {
      this.selectedStrCase = null;
      this.strCaseDialogRef = null;
    });
  }
  /** Plain-language outcome for a live STR case, shown in the investigation panel. */
@@ -837,6 +997,7 @@ export class FiuComponent implements OnInit {
  }
  closeStrCaseDetail(): void {
    this.strCaseDialogRef?.close();
    this.selectedStrCase = null;
  }
@@ -871,8 +1032,9 @@ export class FiuComponent implements OnInit {
              ? `STR case #${updated.id} concluded suspicious — file with FIU-IND by ${updated.fiuDueDate}`
              : `STR case #${updated.id} concluded not suspicious — no filing required`
          );
          this.selectedStrCase = updated;
          this.loadAmlStrCases();
          // Concluded: close the popup so the case's new status is what the officer sees in the list.
          this.closeStrCaseDetail();
        },
        error: this.apiError(`Concluding STR case #${this.selectedStrCase.id}`)
      });
@@ -889,8 +1051,8 @@ export class FiuComponent implements OnInit {
    this.amlService.fileStr(this.selectedStrCase.id, this.fileReferenceNo).subscribe({
      next: (updated) => {
        this.toast(`STR case #${updated.id} recorded as filed (ref ${updated.strReferenceNo})`);
        this.selectedStrCase = updated;
        this.loadAmlStrCases();
        this.closeStrCaseDetail();
      },
      error: this.apiError(`Filing STR case #${this.selectedStrCase.id}`)
    });
@@ -1784,6 +1946,12 @@ export class FiuComponent implements OnInit {
  }
  toast(msg: string): void {
    // The page's own toast sits behind the popup's backdrop, so while the STR case popup is open the message would be
    // there but unseen - which read as the action having done nothing. A snackbar is drawn above the popup.
    if (this.strCaseDialogRef || this.ctrReportDialogRef) {
      this.snackBar.open(msg, 'OK', { duration: 5000 });
      return;
    }
    this.toastMsg = msg;
    this.toastVisible = true;
    if (this.toastTimer) clearTimeout(this.toastTimer);
@@ -0,0 +1,852 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <div class="bkd">
  <div class="bkd-head">
    <div class="bkd-head-left">
      <div class="bkd-head-ic"><fa-icon icon="balance-scale"></fa-icon></div>
      <div>
        <h2 class="bkd-title">ALM Time-Bucket Breakdown</h2>
        <p class="bkd-sub">Day-wise breakdown of FD / RD / Loan from the as-on date</p>
      </div>
    </div>
    <div class="bkd-head-actions">
      @if (view === 'config') {
        <button type="button" class="bkd-btn" [class.bkd-btn-on]="editMode" (click)="toggleEdit()">
          {{ editMode ? 'Done editing lines' : 'Edit lines' }}
        </button>
        <button type="button" class="bkd-btn" (click)="reset()">Reset to RBI defaults</button>
      }
      <button class="bkd-close" (click)="close()" matTooltip="Close" aria-label="Close">&#10005;</button>
    </div>
  </div>
  <div class="bkd-tabs" role="tablist">
    <button type="button" role="tab" class="bkd-tab" [class.on]="view === 'days'" (click)="view = 'days'">
      Day-wise breakdown
    </button>
    <button type="button" role="tab" class="bkd-tab" [class.on]="view === 'config'" (click)="view = 'config'">
      Configuration table
    </button>
  </div>
  <div class="bkd-body">
    @if (view === 'config') {
      <p class="bkd-note">
        <fa-icon icon="info-circle"></fa-icon>&nbsp; Each line shows which bucket its money goes to. You can change the
        <strong>%</strong> and the rule. Changes are saved in this browser straight away. Hover over a line name to see
        why it is slotted that way.
      </p>
      @if (problemCount > 0) {
        <p class="bkd-warn bkd-banner">
          {{ problemCount }} line(s) have a % total that is not 100 or is not filled in yet. See the red or yellow
          totals below.
        </p>
      }
    }
    @if (view === 'config') {
      <!-- The date the figures are as on, and how they are read -->
      <div class="bkd-toolbar">
        <label>
          <span>As-on date</span>
          <input type="date" [(ngModel)]="asOnIso" (ngModelChange)="loadBreakdown()" aria-label="As-on date" />
        </label>
        <label>
          <span>Amount unit</span>
          <select [(ngModel)]="unit" aria-label="Unit">
            @for (u of units; track u.value) {
              <option [value]="u.value">{{ u.label }}</option>
            }
          </select>
        </label>
        <div class="bkd-toolbar-state">
          @if (loading) {
            <span>Loading data from accounts…</span>
          } @else if (loadError) {
            <span class="bkd-warn">{{ loadError }}</span>
          } @else if (breakdown) {
            <span class="bkd-ok"> FD, RD and Loan data as on {{ breakdown.asOnDate }}. </span>
          }
        </div>
      </div>
    }
    @if (view === 'days') {
      <section class="bkd-days-view">
        <h4 class="bkd-h4 bkd-h4-first">1. Select</h4>
        <div class="bkd-modes" role="tablist">
          <button type="button" class="bkd-mode" [class.on]="selectBy === 'types'" (click)="setSelectBy('types')">
            By account type
          </button>
          <button type="button" class="bkd-mode" [class.on]="selectBy === 'accounts'" (click)="setSelectBy('accounts')">
            Individual accounts
          </button>
        </div>
        @if (selectBy === 'types') {
          <p class="bkd-days-intro">Tick one or more. You can pick from both sides together.</p>
          @for (grp of pickGroups; track grp.side) {
            <div class="bkd-pick-group">
              <div
                class="bkd-pick-title"
                [class.bkd-pick-liab]="grp.side === 'liability'"
                [class.bkd-pick-asset]="grp.side === 'asset'"
              >
                {{ grp.title }}
              </div>
              <div class="bkd-pick-list">
                @for (t of grp.items; track t.value) {
                  <button
                    type="button"
                    class="bkd-pick-opt"
                    [class.on]="isTypePicked(t.value)"
                    role="checkbox"
                    [attr.aria-checked]="isTypePicked(t.value)"
                    (click)="toggleType(t.value)"
                  >
                    <span class="bkd-pick-box">{{ isTypePicked(t.value) ? '✓' : '' }}</span>
                    {{ t.label }}
                  </button>
                }
              </div>
            </div>
          }
          <div class="bkd-pick-actions">
            <button type="button" class="bkd-link" (click)="selectAllTypes()">Select all</button>
            <button type="button" class="bkd-link" (click)="clearTypes()">Clear</button>
          </div>
        } @else {
          <div class="bkd-search">
            <input
              type="text"
              [(ngModel)]="searchText"
              (ngModelChange)="onSearchInput()"
              placeholder="Search by account number or customer name"
              aria-label="Search accounts"
            />
            <select [(ngModel)]="searchKind" (ngModelChange)="onSearchInput()" aria-label="Kind of account">
              <option value="">All accounts</option>
              <option value="FD">FD</option>
              <option value="RD">RD</option>
              <option value="LOAN">Loan</option>
            </select>
          </div>
          @if (searching) {
            <p class="bkd-days-note">Searching…</p>
          } @else if (searchError) {
            <p class="bkd-warn">{{ searchError }}</p>
          } @else if (searchText.trim().length < 2) {
            <p class="bkd-days-note">Type at least 2 characters of an account number or a customer name.</p>
          } @else if (!searchResults.length) {
            <p class="bkd-days-note">No accounts found.</p>
          }
          @if (searchResults.length) {
            <div class="bkd-hits">
              @for (hit of searchResults; track hit.kind + '-' + hit.id) {
                <button type="button" class="bkd-hit" [class.picked]="isPicked(hit)" (click)="pick(hit)">
                  <span class="bkd-hit-kind">{{ hit.kind }}</span>
                  <span class="bkd-hit-main">
                    <strong>{{ hit.accountNo }}</strong> &middot; {{ hit.customer }}
                    <small
                      >{{ hit.product }}
                      @if (hit.date) {
                        &middot; matures {{ hit.date | date: 'dd-MMM-yyyy' }}
                      }
                    </small>
                  </span>
                  <span class="bkd-hit-amt">{{ amountText(hit.amount) }}</span>
                  <span class="bkd-hit-state">{{ isPicked(hit) ? 'Selected' : 'Select' }}</span>
                </button>
              }
            </div>
          }
          @if (picked.length) {
            <div class="bkd-picked">
              <strong>Selected ({{ picked.length }})</strong>
              @for (p of picked; track p.kind + '-' + p.id) {
                <span class="bkd-pill-sel">
                  {{ p.kind }} {{ p.accountNo }}
                  <button type="button" (click)="unpick(p)" aria-label="Remove">&#10005;</button>
                </span>
              }
              <button type="button" class="bkd-link" (click)="clearPicked()">Clear all</button>
            </div>
          }
        }
        <h4 class="bkd-h4">2. Date and unit</h4>
        <div class="bkd-submit-row">
          <label>
            <span>As-on date</span>
            <input type="date" [(ngModel)]="asOnIso" (ngModelChange)="onAsOnChange()" aria-label="As-on date" />
          </label>
          <label>
            <span>Amount unit</span>
            <select [(ngModel)]="unit" aria-label="Amount unit">
              @for (u of units; track u.value) {
                <option [value]="u.value">{{ u.label }}</option>
              }
            </select>
          </label>
          <button type="button" class="bkd-btn bkd-btn-on bkd-submit" [disabled]="!canSubmit" (click)="submitReport()">
            Submit
          </button>
        </div>
        @if (reportShown && selectBy === 'types') {
          <section class="bkd-report-out">
            <h4 class="bkd-h4 bkd-report-title">
              {{ typeColumns.length }} account {{ typeColumns.length === 1 ? 'type' : 'types' }}
              <small>as on {{ asOnIso }} &middot; Amounts in {{ unitWord }}</small>
            </h4>
            @if (loading) {
              <p class="bkd-days-note">Loading data from accounts…</p>
            }
            @if (loadError) {
              <p class="bkd-warn">{{ loadError }}</p>
            }
            @if (breakdown) {
              @for (c of typeColumns; track c.value) {
                @if (c.notice) {
                  <p class="bkd-warn bkd-banner">{{ c.label }}: {{ c.notice }}</p>
                }
              }
              <div class="bkd-acc-wrap bkd-matrix-wrap">
                <table class="bkd-tbl bkd-matrix">
                  <thead>
                    <tr>
                      <th>Bucket</th>
                      <th>Days</th>
                      <th>Dates</th>
                      @for (c of typeColumns; track c.value) {
                        <th
                          class="bkd-num"
                          [class.bkd-pick-liab]="c.side === 'liability'"
                          [class.bkd-pick-asset]="c.side === 'asset'"
                        >
                          {{ c.label }}
                        </th>
                      }
                      @if (typeHasLiability && typeHasAsset) {
                        <th class="bkd-num bkd-pick-liab">Liabilities total</th>
                        <th class="bkd-num bkd-pick-asset">Assets total</th>
                      } @else if (typeColumns.length > 1) {
                        <th class="bkd-num">Total</th>
                      }
                    </tr>
                  </thead>
                  <tbody>
                    @for (r of typeMatrix; track r.label) {
                      <tr [class.bkd-dim]="!r.liab && !r.asset">
                        <td class="bkd-b-name">{{ r.label }}</td>
                        <td>{{ r.days }}</td>
                        <td>{{ r.dates }}</td>
                        @for (v of r.cells; track $index) {
                          <td class="bkd-num">{{ amountText(v) }}</td>
                        }
                        @if (typeHasLiability && typeHasAsset) {
                          <td class="bkd-num">{{ amountText(r.liab) }}</td>
                          <td class="bkd-num">{{ amountText(r.asset) }}</td>
                        } @else if (typeColumns.length > 1) {
                          <td class="bkd-num">{{ amountText(r.liab + r.asset) }}</td>
                        }
                      </tr>
                    }
                  </tbody>
                  <tfoot>
                    <tr>
                      <td colspan="3">Total</td>
                      @for (c of typeColumns; track c.value) {
                        <td class="bkd-num">{{ amountText(c.total) }}</td>
                      }
                      @if (typeHasLiability && typeHasAsset) {
                        <td class="bkd-num">{{ amountText(liabilityGrandTotal) }}</td>
                        <td class="bkd-num">{{ amountText(assetGrandTotal) }}</td>
                      } @else if (typeColumns.length > 1) {
                        <td class="bkd-num">{{ amountText(liabilityGrandTotal + assetGrandTotal) }}</td>
                      }
                    </tr>
                  </tfoot>
                </table>
              </div>
              <p class="bkd-days-note">
                Deposits and term loans are slotted by their own dates: a deposit once on its maturity date, a loan once
                for each unpaid instalment on its due date. Anything already due goes in the first bucket (a loan
                instalment follows the Overdue rule). CC / OD and NPA loans are divided by the bucket-wise % set for
                them in the Configuration table. Deposit amounts are balances, loan amounts are principal; interest is a
                separate line of the statement.
              </p>
            }
          </section>
        }
        @if (reportShown && selectBy === 'accounts') {
          <section class="bkd-report-out">
            <h4 class="bkd-h4 bkd-report-title">
              {{ picked.length }} {{ picked.length === 1 ? 'account' : 'accounts' }}
              <small>as on {{ asOnIso }} &middot; Amounts in {{ unitWord }}</small>
            </h4>
            @if (reportLoading) {
              <p class="bkd-days-note">Loading…</p>
            }
            @if (reportError) {
              <p class="bkd-warn">{{ reportError }}</p>
            }
            @if (report; as rep) {
              <table class="bkd-tbl bkd-focus-tbl">
                <thead>
                  <tr>
                    <th>Bucket</th>
                    <th>Days</th>
                    <th>Dates</th>
                    <th class="bkd-num">Amount</th>
                    <th class="bkd-num">%</th>
                    <th class="bkd-num">Entries</th>
                  </tr>
                </thead>
                <tbody>
                  @for (r of reportBuckets; track r.label) {
                    <tr [class.bkd-dim]="!r.amount">
                      <td class="bkd-b-name">{{ r.label }}</td>
                      <td>{{ r.days }}</td>
                      <td>{{ r.dates }}</td>
                      <td class="bkd-num">{{ amountText(r.amount) }}</td>
                      <td class="bkd-num">{{ r.amount ? (r.pct | number: '1.0-1') + '%' : '' }}</td>
                      <td class="bkd-num">{{ r.count || '' }}</td>
                    </tr>
                  }
                </tbody>
                <tfoot>
                  <tr>
                    <td colspan="3">Total</td>
                    <td class="bkd-num">{{ amountText(rep.total) }}</td>
                    <td class="bkd-num">{{ rep.total ? '100%' : '' }}</td>
                    <td class="bkd-num">{{ rep.count }}</td>
                  </tr>
                </tfoot>
              </table>
              <p class="bkd-days-note">
                A deposit counts once, on its maturity date; a loan counts once for each unpaid instalment, on its due
                date. Anything already due goes in the first bucket (a loan instalment follows the Overdue rule).
                Deposit amounts are balances, loan amounts are the principal of each instalment; interest is a separate
                line of the statement.
              </p>
              <h4 class="bkd-h4">Each entry</h4>
              <div class="bkd-acc-wrap">
                <table class="bkd-tbl bkd-acc">
                  <thead>
                    <tr>
                      <th>Account</th>
                      <th>Customer</th>
                      <th>Product</th>
                      <th>Due / maturity date</th>
                      <th class="bkd-num">Days</th>
                      <th>Bucket</th>
                      <th>Status</th>
                      <th class="bkd-num">Amount</th>
                    </tr>
                  </thead>
                  <tbody>
                    @for (r of rep.rows; track $index) {
                      <tr>
                        <td class="bkd-b-name">
                          {{ r.kind }} {{ r.accountNo }}
                          @if (r.installment) {
                            <span class="bkd-b-hint">instalment {{ r.installment }}</span>
                          }
                        </td>
                        <td>{{ r.customer }}</td>
                        <td>
                          {{ r.product }}
                          @if (r.note) {
                            <div class="bkd-warn">{{ r.note }}</div>
                          }
                        </td>
                        <td>{{ r.date ? (r.date | date: 'dd-MMM-yyyy') : '—' }}</td>
                        <td class="bkd-num">{{ r.days === null ? '' : r.days }}</td>
                        <td>{{ bucketName(r.bucket) }}</td>
                        <td>{{ r.status }}</td>
                        <td class="bkd-num">{{ amountText(r.amount) }}</td>
                      </tr>
                    } @empty {
                      <tr>
                        <td colspan="8" class="bkd-empty">Nothing to show for these accounts on this date.</td>
                      </tr>
                    }
                  </tbody>
                </table>
              </div>
            }
          </section>
        }
      </section>
    } @else {
      <section class="bkd-setup">
        <div class="bkd-range-head">
          <h4 class="bkd-h4 bkd-h4-first">Bucket ranges</h4>
          <button type="button" class="bkd-btn bkd-btn-sm" [class.bkd-btn-on]="rangeEdit" (click)="toggleRangeEdit()">
            {{ rangeEdit ? 'Done' : 'Edit' }}
          </button>
        </div>
        <p class="bkd-days-intro">
          @if (rangeEdit) {
            Change the Start / End of a bucket, or add and remove buckets. When you change the End of a bucket, the
            Start of the next one and its heading change with it.
          } @else {
            Start and End of each bucket. Click Edit to change, add or remove buckets.
          }
        </p>
        <table class="bkd-tbl bkd-range">
          <thead>
            <tr>
              <th>#</th>
              <th>Start</th>
              <th>End</th>
              <th>Heading</th>
              <th>Days / Dates</th>
              @if (rangeEdit) {
                <th></th>
              }
            </tr>
          </thead>
          <tbody>
            @for (b of cfg.buckets; track $index) {
              <tr>
                <td class="bkd-range-n">{{ $index + 1 }}</td>
                <td>
                  @if (fromOf($index); as f) {
                    @if (rangeEdit) {
                      <span class="bkd-span-edit">
                        <input
                          type="number"
                          min="1"
                          [ngModel]="f.n"
                          (ngModelChange)="setFrom($index, { n: $event })"
                          aria-label="Start"
                        />
                        <select
                          [ngModel]="f.unit"
                          (ngModelChange)="setFrom($index, { unit: $event })"
                          aria-label="Start unit"
                        >
                          <option value="day">d</option>
                          <option value="month">m</option>
                          <option value="year">y</option>
                        </select>
                      </span>
                    } @else {
                      <span class="bkd-range-val">{{ f.n }} {{ unitLetter(f.unit) }}</span>
                    }
                  }
                </td>
                <td>
                  @if (b.upTo; as t) {
                    @if (rangeEdit) {
                      <span class="bkd-span-edit">
                        <input
                          type="number"
                          min="1"
                          [ngModel]="t.n"
                          (ngModelChange)="setTo($index, { n: $event })"
                          aria-label="End"
                        />
                        <select
                          [ngModel]="t.unit"
                          (ngModelChange)="setTo($index, { unit: $event })"
                          aria-label="End unit"
                        >
                          <option value="day">d</option>
                          <option value="month">m</option>
                          <option value="year">y</option>
                        </select>
                      </span>
                    } @else {
                      <span class="bkd-range-val">{{ t.n }} {{ unitLetter(t.unit) }}</span>
                    }
                  } @else {
                    <span class="bkd-none">end</span>
                  }
                </td>
                <td class="bkd-b-name">
                  {{ b.label }}
                  @if (rangeProblem($index); as problem) {
                    <div class="bkd-warn">{{ problem }}</div>
                  }
                </td>
                <td class="bkd-b-hint">
                  @if (windows[$index]; as w) {
                    {{ dayRange(w) }} &middot; {{ dateRange(w) }}
                  }
                </td>
                @if (rangeEdit) {
                  <td>
                    @if (cfg.buckets.length > 2) {
                      <button
                        type="button"
                        class="bkd-x"
                        (click)="removeBucket($index)"
                        matTooltip="Remove this bucket"
                        aria-label="Remove bucket"
                      >
                        &#10005;
                      </button>
                    }
                  </td>
                }
              </tr>
            }
          </tbody>
        </table>
        @if (rangeEdit) {
          <!-- A bucket the rules did not have yesterday: add it here, it lands in date order -->
          <div class="bkd-addbucket">
            <span class="bkd-addbucket-title">+ Add a bucket ending at:</span>
            <span class="bkd-span-edit">
              <input type="number" min="1" [(ngModel)]="newEnd.n" aria-label="End of the new bucket" />
              <select [(ngModel)]="newEnd.unit" aria-label="Unit of the new bucket">
                <option value="day">d</option>
                <option value="month">m</option>
                <option value="year">y</option>
              </select>
            </span>
            <button type="button" class="bkd-btn bkd-btn-sm" (click)="addBucket()">Add</button>
            <span class="bkd-b-hint">
              It is placed in the right position automatically and splits the bucket it falls inside into two.
            </span>
          </div>
        }
        <div class="bkd-calc">
          <label>
            <span>Check a maturity date</span>
            <input type="date" [(ngModel)]="maturityIso" aria-label="Maturity date" />
          </label>
          @if (dayCheck; as c) {
            <div class="bkd-calc-out">
              @if (c.due) {
                <strong>Already due</strong> ({{ -c.days }} days ago) &rarr; <strong>{{ c.bucket }}</strong>
              } @else {
                <strong>{{ c.days }} days left</strong> &rarr; <strong>{{ c.bucket }}</strong>
              }
            </div>
          } @else {
            <div class="bkd-calc-out bkd-none">Pick a maturity date and its bucket will show here.</div>
          }
        </div>
      </section>
      <!-- ═══ The configuration table, laid out like the filed statement ═══ -->
      @for (sec of sections; track sec.side) {
        <div class="bkd-sheet-wrap">
          <table class="bkd-sheet">
            <thead>
              <tr>
                <th colspan="3" rowspan="2" class="s-title">{{ sec.title }}</th>
                <th [attr.colspan]="cfg.buckets.length" class="s-span">RESIDUAL MATURITY</th>
                <th rowspan="2" class="s-total-h">Total</th>
                @if (editMode) {
                  <th rowspan="2" class="s-tools-h">Line</th>
                }
              </tr>
              <tr>
                @for (b of cfg.buckets; track $index) {
                  <th class="s-bucket">{{ b.label }}</th>
                }
              </tr>
            </thead>
            <tbody>
              @for (item of itemsOf(sec.side); track item.id) {
                @if (item.header) {
                  <tr class="s-head">
                    <td class="s-ref">
                      @if (editMode) {
                        <input type="text" [(ngModel)]="item.ref" (ngModelChange)="changed()" aria-label="Number" />
                      } @else {
                        {{ item.ref }}
                      }
                    </td>
                    <td colspan="2" class="s-name">
                      @if (editMode) {
                        <input type="text" [(ngModel)]="item.name" (ngModelChange)="changed()" aria-label="Naam" />
                      } @else {
                        {{ item.name }}
                      }
                    </td>
                    <td [attr.colspan]="cfg.buckets.length + 1" class="s-head-fill"></td>
                    @if (editMode) {
                      <td class="s-tools">
                        <button type="button" class="bkd-x" (click)="removeLine(item)" aria-label="Hatayein">
                          &#10005;
                        </button>
                      </td>
                    }
                  </tr>
                } @else {
                  <tr [class.s-off]="item.included === false">
                    <td class="s-ref">
                      @if (editMode) {
                        <input type="text" [(ngModel)]="item.ref" (ngModelChange)="changed()" aria-label="Number" />
                      } @else {
                        {{ item.ref }}
                      }
                    </td>
                    <td
                      class="s-name"
                      [class.s-sub]="item.level === 1"
                      [matTooltip]="item.reason"
                      matTooltipPosition="above"
                    >
                      @if (editMode) {
                        <input type="text" [(ngModel)]="item.name" (ngModelChange)="changed()" aria-label="Naam" />
                      } @else {
                        {{ item.name }}
                      }
                    </td>
                    <td class="s-rule">
                      <select
                        [ngModel]="item.rule"
                        (ngModelChange)="ruleChanged(item, $event)"
                        aria-label="Rule"
                        [matTooltip]="item.reason"
                      >
                        @for (r of ruleOptions; track r.value) {
                          <option [value]="r.value">{{ r.label }}</option>
                        }
                      </select>
                      @if (item.rule === 'maturity' || item.rule === 'behavioural') {
                        <!-- Which accounts fill a due-date line, or give a percentage-split line its total -->
                        <select
                          class="s-src"
                          [(ngModel)]="item.source"
                          (ngModelChange)="changed()"
                          aria-label="Which accounts the amount comes from"
                          matTooltip="Which accounts the amount of this line comes from"
                        >
                          @for (o of sourceOptions; track o.value) {
                            <option [value]="o.value">{{ o.label }}</option>
                          }
                        </select>
                      }
                    </td>
                    @if (item.rule === 'maturity') {
                      @if (autoAmounts(item); as amounts) {
                        <!-- Filled by the accounts themselves, each in the bucket of its own date -->
                        @for (v of amounts; track $index) {
                          <td class="s-auto" [class.s-auto-zero]="!v">{{ amountText(v) }}</td>
                        }
                        <td class="s-tot s-auto-total" [matTooltip]="autoAccounts(item) + ' accounts'">
                          {{ amountText(autoTotal(amounts)) }}
                        </td>
                      } @else {
                        <td [attr.colspan]="cfg.buckets.length" class="s-due">
                          @if (!item.source) {
                            This line has to be filled by hand: it has no account source yet
                          } @else if (loading) {
                            Data aa raha hai…
                          } @else {
                            No data came from the accounts
                          }
                        </td>
                        <td class="s-tot">&mdash;</td>
                      }
                    } @else if (item.rule === 'fixed') {
                      <!-- A fixed line sits in one bucket: click the bucket it should move to -->
                      @for (b of cfg.buckets; track $index) {
                        <td
                          class="s-cell s-pick"
                          [class.s-cell-on]="share(item, $index) !== null"
                          role="button"
                          tabindex="0"
                          [attr.aria-label]="'Put it in ' + b.label"
                          [matTooltip]="share(item, $index) !== null ? b.label : 'Yahan le jaayein: ' + b.label"
                          (click)="setFixed(item, $index)"
                          (keydown.enter)="setFixed(item, $index)"
                          (keydown.space)="setFixed(item, $index); $event.preventDefault()"
                        >
                          {{ share(item, $index) !== null ? '100%' : '' }}
                        </td>
                      }
                    } @else {
                      @for (b of cfg.buckets; track $index) {
                        <td class="s-cell s-cell-input" [class.s-cell-on]="share(item, $index) !== null">
                          <input
                            type="number"
                            min="0"
                            max="100"
                            step="any"
                            placeholder="%"
                            [ngModel]="share(item, $index)"
                            (ngModelChange)="setShare(item, $index, $event)"
                            [attr.aria-label]="b.label"
                          />
                        </td>
                      }
                      <td
                        class="s-tot"
                        [class.s-tot-ok]="rowState(item) === 'ok'"
                        [class.s-tot-bad]="rowState(item) === 'bad'"
                        [class.s-tot-todo]="rowState(item) === 'todo'"
                      >
                        {{ rowState(item) === 'todo' ? 'fill in' : rowTotal(item) + '%' }}
                      </td>
                    }
                    @if (editMode) {
                      <td class="s-tools">
                        <label class="s-incl" matTooltip="Show in report">
                          <input
                            type="checkbox"
                            [ngModel]="item.included !== false"
                            (ngModelChange)="item.included = $event; changed()"
                            aria-label="In report"
                          />
                        </label>
                        <button type="button" class="bkd-x" (click)="removeLine(item)" aria-label="Hatayein">
                          &#10005;
                        </button>
                      </td>
                    }
                  </tr>
                }
              }
            </tbody>
          </table>
          @if (editMode) {
            <button type="button" class="bkd-btn bkd-btn-sm s-add" (click)="addLine(sec.side)">
              + Add {{ sec.title === 'OUTFLOWS' ? 'an Outflow' : 'an Inflow' }} line
            </button>
          }
        </div>
      }
      @if (editMode) {
        <div class="bkd-bucket-edit">
          <div class="bkd-editor-sub">Bucket names and day span</div>
          @for (b of cfg.buckets; track $index) {
            <div class="bkd-bucket-edit-row">
              <span class="bkd-step-n">{{ $index + 1 }}</span>
              <input type="text" [(ngModel)]="b.label" (ngModelChange)="changed()" aria-label="Bucket name" />
              <input type="text" [(ngModel)]="b.hint" (ngModelChange)="changed()" aria-label="Bucket description" />
              <div class="bkd-span">
                @if (b.upTo) {
                  <input
                    type="number"
                    min="1"
                    [(ngModel)]="b.upTo.n"
                    (ngModelChange)="bucketsChanged()"
                    aria-label="How far it reaches"
                  />
                  <select [(ngModel)]="b.upTo.unit" (ngModelChange)="bucketsChanged()" aria-label="Unit">
                    <option value="day">d</option>
                    <option value="month">m</option>
                    <option value="year">y</option>
                  </select>
                } @else {
                  <span class="bkd-none">No end</span>
                }
                <label class="bkd-check">
                  <input
                    type="checkbox"
                    [ngModel]="!b.upTo"
                    (ngModelChange)="setOpenEnded(b, $event)"
                    aria-label="No end"
                  />
                  No end
                </label>
              </div>
            </div>
          }
          @if (cfg.overdue; as o) {
            <div class="bkd-editor-sub bkd-overdue-title">Overdue (due but not received): which bucket</div>
            <div class="bkd-overdue">
              <label>
                <span>Overdue less than a month</span>
                <select [(ngModel)]="o.recent" (ngModelChange)="bucketsChanged()" aria-label="Recent overdue bucket">
                  @for (b of cfg.buckets; track $index) {
                    <option [ngValue]="$index">{{ b.label }}</option>
                  }
                </select>
              </label>
              <label>
                <span>Overdue more than a month</span>
                <select [(ngModel)]="o.old" (ngModelChange)="bucketsChanged()" aria-label="Old overdue bucket">
                  @for (b of cfg.buckets; track $index) {
                    <option [ngValue]="$index">{{ b.label }}</option>
                  }
                </select>
              </label>
            </div>
          }
        </div>
      }
      <!-- What the accounts could not put in a date bucket, so nothing is silently left out -->
      @if (breakdown; as b) {
        <section class="bkd-apart-box">
          <h4 class="bkd-h4">Shown separately (not slotted by date)</h4>
          <ul class="bkd-apart">
            @for (n of b.notSlotted; track n.key) {
              <li>
                <strong>{{ n.label }}</strong> &mdash; {{ n.accounts }} loan, outstanding
                {{ amountText(n.outstanding) }}
                <div class="bkd-b-hint">{{ n.why }}</div>
              </li>
            }
          </ul>
          <ul class="bkd-notes">
            @for (note of b.notes; track note) {
              <li>{{ note }}</li>
            }
          </ul>
        </section>
      }
      <!-- ═══ What the report will show ═══ -->
      <section class="bkd-report">
        <h3 class="bkd-h3">What the report will show</h3>
        <div class="bkd-report-card">
          <div class="r-title">Statement of Structural Liquidity as on {{ asOnIso }}</div>
          <div class="r-sub">( Amounts in {{ unitWord }} )</div>
        </div>
        <ul class="bkd-report-list">
          <li>
            Two tables, <strong>OUTFLOWS</strong> and <strong>INFLOWS</strong>, with the lines above. Each line’s amount
            sits in its bucket, with a <strong>Total</strong> in the last column.
          </li>
          <li><strong>A. TOTAL OUTFLOWS</strong> &mdash; the sum of all outflow lines, bucket by bucket.</li>
          <li><strong>B. TOTAL INFLOWS</strong> &mdash; the sum of all inflow lines, bucket by bucket.</li>
          <li><strong>C. MISMATCH (B − A)</strong> &mdash; inflow minus outflow, in each bucket.</li>
          <li>
            <strong>D. CUMULATIVE MISMATCH</strong> &mdash; running total of C, from the first bucket up to that bucket.
          </li>
          <li><strong>E. C as % to A</strong> &mdash; mismatch divided by outflow, times 100.</li>
          @for (l of cfg.limits; track $index) {
            <li class="bkd-limit">
              <strong>{{ cfg.buckets[l.bucket]?.label }}</strong
              >: negative mismatch must not exceed {{ l.pct }}%. The report shows it in red when it does.
            </li>
          }
        </ul>
        <p class="bkd-days-note">
          Where the amount comes from: <strong>By due date</strong> lines take their data from FD, RD and Loan accounts.
          <strong>Fixed</strong>, <strong>Split</strong> and <strong>By study</strong> lines take the ledger (GL)
          balance and apply the % above. Lines with no register have to be filled in by hand.
        </p>
      </section>
    }
  </div>
 </div>
@@ -0,0 +1,962 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, DestroyRef, inject } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { Subject, catchError, debounceTime, of, switchMap } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatDialogRef, MatDialogModule } from '@angular/material/dialog';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { businessTodayIso } from 'app/core/utils/business-today';
 import {
  AlmBucket,
  AlmConfig,
  AlmItem,
  AlmRule,
  AlmSide,
  AlmPlacement,
  AlmSource,
  AlmSpan,
  AlmUnit,
  RULE_OPTIONS,
  SHARE_SOURCES,
  SOURCE_OPTIONS,
  defaultConfig
 } from './alm-bucket-breakdown.config';
 import {
  BucketWindow,
  addSpan,
  bucketIndexFor,
  bucketLabel,
  bucketWindows,
  dayRangeText,
  daysBetween,
  formatDate,
  fromSpanOf,
  parseIsoDate,
  setFromSpan
 } from './alm-bucket.util';
 import { AccountHit, AccountRow, AlmMaturityService, MaturityBreakdown, SelectedReport } from './alm-maturity.service';
 type AmountUnit = 'rupee' | 'lakh' | 'crore';
 /** How a line's shares stand: whether the bank still has something to fill in. */
 type RowState = 'spread' | 'ok' | 'todo' | 'bad';
 /** Which of the server's account groups each source adds together. */
 const SOURCE_GROUPS: Record<'FD_RD' | 'FD' | 'RD' | 'LOAN', string[]> = {
  FD_RD: [
    'FD',
    'RD'
  ],
  FD: ['FD'],
  RD: ['RD'],
  LOAN: ['LOAN']
 };
 /** The two tables of the statement, in the order it prints them. */
 const SECTIONS: { side: AlmSide; title: string }[] = [
  { side: 'liability', title: 'OUTFLOWS' },
  { side: 'asset', title: 'INFLOWS' }
 ];
 /**
 * Where the browser keeps the bank's edits. Same arrangement as the OSS GL mapping: there is no
 * backend table for this yet, so the setting belongs to the browser it was made in. The suffix is
 * the shape of what is stored; a different shape starts again from RBI's defaults.
 */
 const STORAGE_KEY = 'alm_bucket_breakdown_config_v2';
 /**
 * ALM Time-Bucket Breakdown — the configuration of the Structural Liquidity Statement.
 *
 * One table laid out like the statement the bank files: the same numbered Outflow and Inflow lines
 * down the side, the same residual-maturity buckets across the top. Each line says how its balance
 * is slotted — wholly in one bucket, by the due date of each account, or by percentages the bank
 * sets. The statement itself is computed from this configuration.
 *
 * Rules start from RBI's Urban Co-operative Bank defaults but none is fixed: every line, bucket and
 * percentage can be edited, and "Reset" returns to RBI's.
 */
@Component({
  selector: 'mifosx-alm-bucket-breakdown-dialog',
  standalone: true,
  templateUrl: './alm-bucket-breakdown-dialog.component.html',
  styleUrls: ['./alm-bucket-breakdown-dialog.component.scss'],
  imports: [
    CommonModule,
    FormsModule,
    MatDialogModule,
    MatTooltipModule,
    FaIconComponent
  ]
 })
 export class AlmBucketBreakdownDialogComponent {
  private dialogRef = inject(MatDialogRef<AlmBucketBreakdownDialogComponent>);
  private service = inject(AlmMaturityService);
  private destroyRef = inject(DestroyRef);
  readonly ruleOptions = RULE_OPTIONS;
  readonly sourceOptions = SOURCE_OPTIONS;
  readonly sections = SECTIONS;
  cfg: AlmConfig = this.load();
  /** Which tab is open: the day breakdown of one product, or the statement's configuration table. */
  view: 'days' | 'config' = 'days';
  /** Lines can be renamed, added, removed and left out of the report only while this is on. */
  editMode = false;
  /** The date the buckets are counted from — the business date, not the browser's clock. */
  asOnIso = businessTodayIso();
  /** Maturity typed into the day calculator. */
  maturityIso = '';
  /** Amounts come back in rupees; the bank reads them in lakhs unless told otherwise. */
  readonly units: { value: AmountUnit; label: string; divisor: number }[] = [
    { value: 'rupee', label: '₹ (rupaye)', divisor: 1 },
    { value: 'lakh', label: 'Lakh', divisor: 100_000 },
    { value: 'crore', label: 'Crore', divisor: 10_000_000 }
  ];
  unit: AmountUnit = 'lakh';
  /** FD / RD / loan totals per bucket for the as-on date, from the server. */
  breakdown: MaturityBreakdown | null = null;
  loading = false;
  loadError = '';
  /** Only the newest request's answer may land; a slow earlier one must not overwrite it. */
  private loadSeq = 0;
  constructor() {
    this.watchSearch();
    this.loadBreakdown();
  }
  // ── The configuration table ──
  /** The lines of one table, headings included, in statement order. */
  itemsOf(side: AlmSide): AlmItem[] {
    return this.cfg.items.filter((i) => i.side === side);
  }
  /** Columns across a table: reference, line, rule, every bucket, total, and the row tools while editing. */
  get columnCount(): number {
    return 3 + this.cfg.buckets.length + 1 + (this.editMode ? 1 : 0);
  }
  /** Share of a line's balance that goes to one bucket, or null when none does. */
  share(item: AlmItem, bucket: number): number | null {
    const placed = item.placements.filter((p) => p.bucket === bucket);
    if (!placed.length) {
      return null;
    }
    const explicit = placed.filter((p) => p.pct !== null && p.pct !== undefined && `${p.pct}` !== '');
    if (explicit.length) {
      return explicit.reduce((sum, p) => sum + Number(p.pct), 0);
    }
    // No share written down: a line with one bucket puts the whole balance there.
    return item.placements.length === 1 ? 100 : null;
  }
  /** Set the share going to one bucket; empty or zero takes the bucket out of the line. */
  setShare(item: AlmItem, bucket: number, raw: number | string | null): void {
    const value = raw === null || raw === '' ? 0 : Math.max(0, Math.min(100, Number(raw)));
    const rest = item.placements.filter((p) => p.bucket !== bucket);
    if (value > 0 && !Number.isNaN(value)) {
      const kept = item.placements.find((p) => p.bucket === bucket);
      rest.push({ bucket, pct: value, label: kept?.label });
    }
    item.placements = rest.sort((a, b) => a.bucket - b.bucket);
    this.changed();
  }
  /**
   * The amounts a due-date line gets from its accounts, in rupees; null while there is nothing to
   * show (no source chosen, not loaded yet, or the server could not answer).
   */
  autoAmounts(item: AlmItem): number[] | null {
    return item.rule === 'maturity' ? this.itemAmounts(item) : null;
  }
  /**
   * What a line has in each bucket, in rupees. Deposits and term loans come bucket by bucket from
   * their own dates; cash-credit and NPA loans come as one outstanding figure that the line's own
   * percentages divide. Null when the line has no accounts behind it, or nothing has loaded yet.
   */
  itemAmounts(item: AlmItem | null): number[] | null {
    return item?.source ? this.amountsOf(item.source, item) : null;
  }
  /**
   * What one kind of account has in each bucket. For cash-credit and NPA loans the percentages come
   * from the statement line that names that kind, and are zero until that line has them.
   */
  private amountsOf(source: AlmSource, line: AlmItem | null): number[] | null {
    if (!this.breakdown) {
      return null;
    }
    if (SHARE_SOURCES.includes(source)) {
      const outstanding = this.apartLine(source)?.outstanding ?? 0;
      return this.cfg.buckets.map((_b, i) => (outstanding * (line ? (this.share(line, i) ?? 0) : 0)) / 100);
    }
    const keys = SOURCE_GROUPS[source as keyof typeof SOURCE_GROUPS];
    const groups = this.breakdown.groups.filter((g) => keys?.includes(g.key));
    if (!groups.length) {
      return null;
    }
    return this.cfg.buckets.map((_b, i) => groups.reduce((sum, g) => sum + (g.buckets[i] ?? 0), 0));
  }
  /** The loans the server reports apart from the date buckets: CC/OD, or NPA. */
  private apartLine(source: AlmSource): { outstanding: number; accounts: number } | undefined {
    const key = source === 'CCOD' ? 'REVOLVING' : 'NPA';
    return this.breakdown?.notSlotted.find((n) => n.key === key);
  }
  /** Accounts behind a line, for the tooltip and the day view's total. */
  autoAccounts(item: AlmItem | null): number {
    const source = item?.source;
    if (!source || !this.breakdown) {
      return 0;
    }
    if (SHARE_SOURCES.includes(source)) {
      return this.apartLine(source)?.accounts ?? 0;
    }
    const keys = SOURCE_GROUPS[source as keyof typeof SOURCE_GROUPS] ?? [];
    return this.breakdown.groups.filter((g) => keys.includes(g.key)).reduce((sum, g) => sum + g.accounts, 0);
  }
  autoTotal(amounts: number[]): number {
    return amounts.reduce((sum, v) => sum + v, 0);
  }
  // ── Picking kinds of account ──
  /** Whether the day-wise breakdown is by kind of account, or for individual accounts found by search. */
  selectBy: 'types' | 'accounts' = 'types';
  /** The kinds of account that can be picked, on the liability and the asset side. */
  readonly pickTypes: { value: AlmSource; label: string; side: AlmSide }[] = [
    { value: 'FD', label: 'Fixed Deposits (FD)', side: 'liability' },
    { value: 'RD', label: 'Recurring Deposits (RD)', side: 'liability' },
    { value: 'LOAN', label: 'Term Loans', side: 'asset' },
    { value: 'CCOD', label: 'CC / OD Loans', side: 'asset' },
    { value: 'NPA', label: 'NPA Loans', side: 'asset' }
  ];
  /** The kinds picked; any number of them, from either side. */
  pickedTypes: AlmSource[] = [
    'FD',
    'RD'
  ];
  get pickGroups(): { side: AlmSide; title: string; items: { value: AlmSource; label: string; side: AlmSide }[] }[] {
    return [
      {
        side: 'liability',
        title: 'Liabilities: deposits (customers)',
        items: this.pickTypes.filter((t) => t.side === 'liability')
      },
      { side: 'asset', title: 'Assets: loans (customers)', items: this.pickTypes.filter((t) => t.side === 'asset') }
    ];
  }
  setSelectBy(mode: 'types' | 'accounts'): void {
    this.selectBy = mode;
    this.reportShown = false;
  }
  isTypePicked(value: AlmSource): boolean {
    return this.pickedTypes.includes(value);
  }
  /** Tick or untick a kind. Any number can be ticked together; a report already open is put away. */
  toggleType(value: AlmSource): void {
    this.pickedTypes = this.isTypePicked(value) ? this.pickedTypes.filter((v) => v !== value) : [
          ...this.pickedTypes,
          value
        ];
    this.reportShown = false;
  }
  selectAllTypes(): void {
    this.pickedTypes = this.pickTypes.map((t) => t.value);
    this.reportShown = false;
  }
  clearTypes(): void {
    this.pickedTypes = [];
    this.reportShown = false;
  }
  /** One column per kind picked: what it has in every bucket, and a note where something is still to be filled in. */
  get typeColumns(): {
    value: AlmSource;
    label: string;
    side: AlmSide;
    amounts: number[];
    total: number;
    notice: string;
  }[] {
    return this.pickTypes
      .filter((t) => this.isTypePicked(t.value))
      .map((t) => {
        const amounts =
          this.amountsOf(t.value, this.cfg.items.find((i) => !i.header && i.source === t.value) ?? null) ??
          this.cfg.buckets.map(() => 0);
        const total = this.autoTotal(amounts);
        const outstanding = SHARE_SOURCES.includes(t.value) ? (this.apartLine(t.value)?.outstanding ?? 0) : 0;
        const notice =
          outstanding > 0 && total === 0
            ? `The bucket-wise % for this kind are not filled in yet, so nothing is divided. Fill them in the Configuration table (outstanding is ${this.amountText(outstanding)}).`
            : '';
        return { value: t.value, label: t.label, side: t.side, amounts, total, notice };
      });
  }
  /** One row per bucket across the picked kinds, with the liability and asset sides added up separately. */
  get typeMatrix(): { label: string; days: string; dates: string; cells: number[]; liab: number; asset: number }[] {
    const cols = this.typeColumns;
    return this.windows.map((w, i) => {
      const cells = cols.map((c) => c.amounts[i] ?? 0);
      return {
        label: this.cfg.buckets[i]?.label ?? w.label,
        days: dayRangeText(w),
        dates: this.dateRange(w),
        cells,
        liab: cols.reduce((sum, c, k) => sum + (c.side === 'liability' ? cells[k] : 0), 0),
        asset: cols.reduce((sum, c, k) => sum + (c.side === 'asset' ? cells[k] : 0), 0)
      };
    });
  }
  get liabilityGrandTotal(): number {
    return this.typeColumns.reduce((sum, c) => sum + (c.side === 'liability' ? c.total : 0), 0);
  }
  get assetGrandTotal(): number {
    return this.typeColumns.reduce((sum, c) => sum + (c.side === 'asset' ? c.total : 0), 0);
  }
  get typeHasLiability(): boolean {
    return this.typeColumns.some((c) => c.side === 'liability');
  }
  get typeHasAsset(): boolean {
    return this.typeColumns.some((c) => c.side === 'asset');
  }
  // ── Picking accounts one by one ──
  /** What is typed in the search box. */
  searchText = '';
  /** Which kind of account the search looks in: all, or one kind. */
  searchKind: '' | 'FD' | 'RD' | 'LOAN' = '';
  searchResults: AccountHit[] = [];
  searching = false;
  searchError = '';
  /** The accounts picked so far. */
  picked: AccountHit[] = [];
  private searchTyped = new Subject<void>();
  /** Whether the report of the picked accounts is on screen: only after Submit, and until the picks or the date change. */
  reportShown = false;
  report: SelectedReport | null = null;
  reportLoading = false;
  reportError = '';
  /** Only the newest request's answer may land; a slow earlier one must not overwrite it. */
  private reportSeq = 0;
  /** Set up the search so it waits for typing to pause, and a slow answer to an old search never replaces a newer one. */
  private watchSearch(): void {
    this.searchTyped
      .pipe(
        debounceTime(300),
        switchMap(() =>
          this.service.searchAccounts(this.searchText.trim(), this.searchKind).pipe(
            catchError((err) => {
              this.searchError =
                err?.error?.defaultUserMessage ||
                err?.error?.developerMessage ||
                'Search failed. The backend needs a restart with the new endpoint.';
              return of({ results: [] as AccountHit[] });
            })
          )
        ),
        takeUntilDestroyed(this.destroyRef)
      )
      .subscribe((found) => {
        this.searching = false;
        this.searchResults = found.results;
      });
  }
  /** Typing or changing the kind: search again once typing pauses. */
  onSearchInput(): void {
    this.searchError = '';
    if (this.searchText.trim().length < 2) {
      this.searchResults = [];
      this.searching = false;
      return;
    }
    this.searching = true;
    this.searchTyped.next();
  }
  /** Whether an account is already picked. */
  isPicked(hit: AccountHit): boolean {
    return this.picked.some((p) => p.kind === hit.kind && p.id === hit.id);
  }
  pick(hit: AccountHit): void {
    if (!this.isPicked(hit)) {
      this.picked = [
        ...this.picked,
        hit
      ];
      this.reportShown = false;
    }
  }
  unpick(hit: AccountHit): void {
    this.picked = this.picked.filter((p) => !(p.kind === hit.kind && p.id === hit.id));
    this.reportShown = false;
  }
  clearPicked(): void {
    this.picked = [];
    this.reportShown = false;
  }
  /** Show the day-wise breakdown of the picked accounts for the chosen date. */
  submitReport(): void {
    if (this.selectBy === 'types') {
      if (this.pickedTypes.length) {
        this.reportShown = true;
        this.loadBreakdown();
      }
      return;
    }
    if (!this.picked.length) {
      return;
    }
    this.reportShown = true;
    this.loadReport();
  }
  /** Whether Submit has anything to submit. */
  get canSubmit(): boolean {
    return this.selectBy === 'types' ? this.pickedTypes.length > 0 : this.picked.length > 0;
  }
  /** Fetch the report of the picked accounts; also called again when the bucket setting changes under an open report. */
  private loadReport(): void {
    const seq = ++this.reportSeq;
    this.reportError = '';
    if (!parseIsoDate(this.asOnIso)) {
      this.report = null;
      this.reportError = 'The as-on date is not valid.';
      return;
    }
    if (this.bucketSpecInvalid) {
      this.report = null;
      this.reportError = 'Only the last bucket may have no end; every other bucket needs an end.';
      return;
    }
    this.reportLoading = true;
    this.service
      .getSelected(this.picked.map((p) => `${p.kind}:${p.id}`).join(','), {
        asOnDate: this.asOnIso,
        buckets: this.edgeSpec,
        overdueRecentBucket: this.cfg.overdue?.recent ?? 0,
        overdueOldBucket: this.cfg.overdue?.old ?? 2
      })
      .pipe(takeUntilDestroyed(this.destroyRef))
      .subscribe({
        next: (result) => {
          if (seq === this.reportSeq) {
            this.reportLoading = false;
            this.report = result;
          }
        },
        error: (err) => {
          if (seq === this.reportSeq) {
            this.reportLoading = false;
            this.report = null;
            this.reportError =
              err?.error?.defaultUserMessage ||
              err?.error?.developerMessage ||
              'No data came back. The backend needs a restart with the new endpoint.';
          }
        }
      });
  }
  /** A new as-on date means a new report: put the old one away until Submit is pressed again. */
  onAsOnChange(): void {
    this.reportShown = false;
    this.loadBreakdown();
  }
  /** The report by bucket: what the picked accounts put in each one, with the days and dates of the bucket. */
  get reportBuckets(): { label: string; days: string; dates: string; amount: number; count: number; pct: number }[] {
    const rows = this.report?.rows ?? [];
    const total = rows.reduce((sum, r) => sum + r.amount, 0);
    return this.windows.map((w, i) => {
      const inBucket = rows.filter((r) => r.bucket === i);
      const amount = inBucket.reduce((sum, r) => sum + r.amount, 0);
      return {
        label: this.cfg.buckets[i]?.label ?? w.label,
        days: dayRangeText(w),
        dates: this.dateRange(w),
        amount,
        count: inBucket.length,
        pct: total ? (amount / total) * 100 : 0
      };
    });
  }
  bucketName(index: number | null): string {
    return index === null ? '' : (this.cfg.buckets[index]?.label ?? '');
  }
  // ── The bucket ranges, as a From / To table ──
  /** Where a bucket starts, as the table writes it; null for the first, which always starts on day 1. */
  fromOf(index: number): AlmSpan | null {
    return fromSpanOf(this.cfg.buckets, index);
  }
  /** Change where a bucket starts. That is where the one before it ends, so that one moves too. */
  setFrom(index: number, change: { n?: number | string; unit?: AlmUnit }): void {
    const current = this.fromOf(index);
    if (!current) {
      return;
    }
    const n = change.n !== undefined ? Number(change.n) : current.n;
    this.applyRange(index - 1, () =>
      setFromSpan(this.cfg.buckets, index, { n: n > 0 ? n : 1, unit: change.unit ?? current.unit })
    );
  }
  /** Change where a bucket ends. */
  setTo(index: number, change: { n?: number | string; unit?: AlmUnit }): void {
    const current = this.cfg.buckets[index]?.upTo;
    if (!current) {
      return;
    }
    const n = change.n !== undefined ? Number(change.n) : current.n;
    this.applyRange(index, () => {
      this.cfg.buckets[index].upTo = { n: n > 0 ? n : 1, unit: change.unit ?? current.unit };
    });
  }
  /**
   * Apply a change to the end of one bucket, and keep the headings of the two buckets it touches in
   * step — but only a heading still worded the way the table would word it; one the bank has typed
   * over is left alone.
   */
  private applyRange(endingIndex: number, apply: () => void): void {
    const touched = [
      endingIndex,
      endingIndex + 1
    ].filter((i) => i >= 0 && i < this.cfg.buckets.length);
    const wasGenerated = touched.map((i) => this.cfg.buckets[i].label === bucketLabel(this.cfg.buckets, i));
    apply();
    touched.forEach((i, k) => {
      if (wasGenerated[k]) {
        this.cfg.buckets[i].label = bucketLabel(this.cfg.buckets, i);
      }
    });
    this.bucketsChanged();
  }
  /** The end typed into the "add a bucket" form. */
  newEnd: { n: number; unit: AlmUnit } = { n: 7, unit: 'day' };
  /** Start, End, adding and removing buckets work only while this is on, so a stray click cannot change them. */
  rangeEdit = false;
  toggleRangeEdit(): void {
    this.rangeEdit = !this.rangeEdit;
  }
  /** 'd', 'm' or 'y' — a unit the way the range table writes it. */
  unitLetter(unit: AlmUnit): string {
    return unit === 'day' ? 'd' : unit === 'month' ? 'm' : 'y';
  }
  /**
   * Add a bucket ending where the form says. It lands in date order and takes the front part of the
   * bucket it falls inside, so what was placed there stays with the later part; lines, the overdue
   * rule and limits keep pointing at the buckets they pointed at.
   */
  addBucket(): void {
    const end: AlmSpan = { n: Math.max(1, Number(this.newEnd.n) || 1), unit: this.newEnd.unit };
    const buckets = this.cfg.buckets;
    const reference = parseIsoDate(this.asOnIso) ?? new Date();
    const endTime = addSpan(reference, end).getTime();
    if (buckets.some((b) => b.upTo && addSpan(reference, b.upTo).getTime() === endTime)) {
      window.alert('A bucket already ends there.');
      return;
    }
    let position = buckets.findIndex((b) => !b.upTo || addSpan(reference, b.upTo).getTime() > endTime);
    if (position < 0) {
      position = buckets.length;
    }
    const laterWasGenerated = position < buckets.length && buckets[position].label === bucketLabel(buckets, position);
    this.shiftBucketRefs((i) => (i >= position ? i + 1 : i));
    // A bucket put in front becomes the first and starts on day 1; the old first now starts where it ends.
    if (position === 0 && buckets[0]) {
      buckets[0].startSpan = undefined;
    }
    buckets.splice(position, 0, { label: '', hint: '', upTo: end });
    buckets[position].label = bucketLabel(buckets, position);
    if (laterWasGenerated && position + 1 < buckets.length) {
      buckets[position + 1].label = bucketLabel(buckets, position + 1);
    }
    this.bucketsChanged();
  }
  /**
   * Remove a bucket. Whatever was placed in it moves to the next one (to the one before, if it was
   * the last, which then runs on without end), so no line loses its money.
   */
  removeBucket(index: number): void {
    const buckets = this.cfg.buckets;
    if (buckets.length <= 2) {
      return;
    }
    if (!window.confirm(`Remove the "${buckets[index].label}" bucket? Its money will move to the next bucket.`)) {
      return;
    }
    const last = index === buckets.length - 1;
    const target = last ? index - 1 : index + 1;
    const targetWasGenerated = buckets[target].label === bucketLabel(buckets, target);
    this.shiftBucketRefs((i) => {
      const moved = i === index ? target : i;
      return moved > index ? moved - 1 : moved;
    });
    const removedStart = buckets[index].startSpan;
    buckets.splice(index, 1);
    // Removing the first bucket makes the next one the first, which keeps the statement's start.
    if (index === 0 && removedStart) {
      buckets[0].startSpan = removedStart;
    }
    if (last) {
      buckets[index - 1].upTo = null;
    }
    const now = last ? index - 1 : index;
    if (targetWasGenerated) {
      buckets[now].label = bucketLabel(buckets, now);
    }
    this.mergeShares();
    this.bucketsChanged();
  }
  /** Re-point everything that names a bucket by its position: lines, the overdue rule, the limits. */
  private shiftBucketRefs(map: (index: number) => number): void {
    this.cfg.items.forEach((item) => item.placements.forEach((p) => (p.bucket = map(p.bucket))));
    if (this.cfg.overdue) {
      this.cfg.overdue.recent = map(this.cfg.overdue.recent);
      this.cfg.overdue.old = map(this.cfg.overdue.old);
    }
    this.cfg.limits.forEach((l) => (l.bucket = map(l.bucket)));
  }
  /** After two buckets became one, a line's two shares there become one share, and a limit is kept once. */
  private mergeShares(): void {
    this.cfg.items.forEach((item) => {
      const merged = new Map<number, AlmPlacement>();
      for (const p of item.placements) {
        const have = merged.get(p.bucket);
        if (!have) {
          merged.set(p.bucket, { ...p });
        } else if (have.pct != null || p.pct != null) {
          have.pct = (Number(have.pct) || 0) + (Number(p.pct) || 0);
        }
      }
      item.placements = [...merged.values()].sort((a, b) => a.bucket - b.bucket);
    });
    const seen = new Set<number>();
    this.cfg.limits = this.cfg.limits.filter((l) => !seen.has(l.bucket) && !!seen.add(l.bucket));
  }
  /** A bucket that ends before it starts, or no later than the one before. Empty when the range is fine. */
  rangeProblem(index: number): string {
    const w = this.windows[index];
    if (!w || !w.to) {
      return '';
    }
    return w.to < w.from ? 'End is before Start: keep it later than the end of the previous bucket.' : '';
  }
  /** Move a whole line to one bucket: its balance all goes there and nowhere else. */
  setFixed(item: AlmItem, bucket: number): void {
    const label = item.placements.find((p) => p.bucket === bucket)?.label;
    item.placements = [{ bucket, pct: 100, label }];
    this.changed();
  }
  /** What a line's shares add up to, or null for a line that follows due dates. */
  rowTotal(item: AlmItem): number | null {
    if (item.rule === 'maturity') {
      return null;
    }
    return this.cfg.buckets.reduce((sum, _b, i) => sum + (this.share(item, i) ?? 0), 0);
  }
  rowState(item: AlmItem): RowState {
    const total = this.rowTotal(item);
    if (total === null) {
      return 'spread';
    }
    if (total === 0) {
      return 'todo';
    }
    return Math.abs(total - 100) < 0.005 ? 'ok' : 'bad';
  }
  /** Shares that do not make up the whole balance, over every line that is in the report. */
  get problemCount(): number {
    return this.cfg.items.filter(
      (i) => !i.header && i.included !== false && [
          'bad',
          'todo'
        ].includes(this.rowState(i))
    ).length;
  }
  /** Changing a line's rule: due-date lines follow each account's date, the rest carry shares. */
  ruleChanged(item: AlmItem, rule: AlmRule): void {
    item.rule = rule;
    item.spreads = rule === 'maturity';
    if (rule === 'fixed') {
      // A fixed line sits in one bucket: keep the one that held the most, or start in the first.
      const biggest = [...item.placements].sort((a, b) => (Number(b.pct) || 0) - (Number(a.pct) || 0))[0];
      item.placements = [{ bucket: biggest?.bucket ?? 0, pct: 100, label: biggest?.label }];
    }
    this.changed();
  }
  // ── Editing the lines themselves ──
  toggleEdit(): void {
    this.editMode = !this.editMode;
  }
  addLine(side: AlmSide): void {
    const items = this.itemsOf(side);
    const last = items[items.length - 1];
    this.cfg.items.splice(this.cfg.items.indexOf(last) + 1, 0, {
      id: `u${Date.now()}`,
      side,
      ref: '',
      level: 0,
      name: side === 'liability' ? 'Nayi liability' : 'Nayi asset',
      rule: 'fixed',
      reason: '',
      spreads: false,
      placements: [{ bucket: 0, pct: 100 }]
    });
    this.changed();
  }
  removeLine(item: AlmItem): void {
    if (!window.confirm(`"${item.name}" hata dein?`)) {
      return;
    }
    this.cfg.items = this.cfg.items.filter((i) => i.id !== item.id);
    this.changed();
  }
  /** Open-ended means "and beyond" — only the last bucket should be. */
  setOpenEnded(bucket: AlmBucket, open: boolean): void {
    bucket.upTo = open ? null : { n: 5, unit: 'year' };
    this.bucketsChanged();
  }
  /** Called after any edit — the change is kept right away, there is no separate save step. */
  changed(): void {
    try {
      localStorage.setItem(STORAGE_KEY, JSON.stringify(this.cfg));
    } catch {
      /* private window or blocked storage — the edit still holds for this session */
    }
  }
  reset(): void {
    if (!window.confirm('All settings will go back to the RBI defaults and your changes will be lost. Continue?')) {
      return;
    }
    try {
      localStorage.removeItem(STORAGE_KEY);
    } catch {
      /* nothing stored to remove */
    }
    this.cfg = defaultConfig();
    this.loadBreakdown();
  }
  close(): void {
    this.dialogRef.close();
  }
  // ── Days from the as-on date ──
  /** Every bucket as dates, for the chosen as-on date. */
  get windows(): BucketWindow[] {
    const asOn = parseIsoDate(this.asOnIso);
    return asOn ? bucketWindows(asOn, this.cfg.buckets) : [];
  }
  /** Day-by-day text for a window: 'Din 1 se 14'. */
  dayRange(w: BucketWindow): string {
    return dayRangeText(w);
  }
  dateRange(w: BucketWindow): string {
    return w.to ? `${formatDate(w.from)} to ${formatDate(w.to)}` : `${formatDate(w.from)} onwards`;
  }
  /** What the day calculator says for the maturity typed in; null until both dates are valid. */
  get dayCheck(): { days: number; bucket: string; due: boolean } | null {
    const asOn = parseIsoDate(this.asOnIso);
    const maturity = parseIsoDate(this.maturityIso);
    if (!asOn || !maturity) {
      return null;
    }
    const days = daysBetween(asOn, maturity);
    return {
      days,
      due: days <= 0,
      bucket: this.cfg.buckets[bucketIndexFor(asOn, maturity, this.cfg.buckets)]?.label ?? ''
    };
  }
  // ── Live FD / RD / loan totals for the as-on date ──
  /** The bank's bucket edges as the server reads them: '14d,28d,3m,6m,1y,3y,5y'. */
  private get edgeSpec(): string {
    const letter = { day: 'd', month: 'm', year: 'y' };
    return this.cfg.buckets
      .filter((b) => b.upTo)
      .map((b) => `${b.upTo?.n}${letter[b.upTo?.unit ?? 'day']}`)
      .join(',');
  }
  /** Only the last bucket may be open-ended, and every other one needs an end. */
  private get bucketSpecInvalid(): boolean {
    const last = this.cfg.buckets.length - 1;
    return this.cfg.buckets.some((b, i) => !b.upTo && i < last) || !!this.cfg.buckets[last]?.upTo;
  }
  /** Fetch the fixed-term breakdown for the chosen as-on date and the current bucket setting. */
  loadBreakdown(): void {
    const seq = ++this.loadSeq;
    this.loadError = '';
    if (!parseIsoDate(this.asOnIso)) {
      this.breakdown = null;
      this.loadError = 'The as-on date is not valid.';
      return;
    }
    if (this.bucketSpecInvalid) {
      this.breakdown = null;
      this.loadError = 'Only the last bucket may have no end; every other bucket needs an end.';
      return;
    }
    this.loading = true;
    this.service
      .getBreakdown({
        asOnDate: this.asOnIso,
        buckets: this.edgeSpec,
        overdueRecentBucket: this.cfg.overdue?.recent ?? 0,
        overdueOldBucket: this.cfg.overdue?.old ?? 2
      })
      .pipe(takeUntilDestroyed(this.destroyRef))
      .subscribe({
        next: (result) => {
          if (seq !== this.loadSeq) {
            return;
          }
          this.loading = false;
          this.breakdown = result;
        },
        error: (err) => {
          if (seq !== this.loadSeq) {
            return;
          }
          this.loading = false;
          this.breakdown = null;
          this.loadError =
            err?.error?.defaultUserMessage ||
            err?.error?.developerMessage ||
            'No data came back. The backend needs a restart with the new endpoint.';
        }
      });
  }
  /** A bucket edge or the overdue rule changed: the server must slot everything again. */
  bucketsChanged(): void {
    this.changed();
    this.loadBreakdown();
    if (this.reportShown && this.selectBy === 'accounts') {
      this.loadReport();
    }
  }
  /** The unit as the statement's heading words it: 'Lakhs of Rupees'. */
  get unitWord(): string {
    return { rupee: 'Rupees', lakh: 'Lakhs of Rupees', crore: 'Crores of Rupees' }[this.unit];
  }
  /** An amount in rupees as the chosen unit; a dash when there is nothing in it. */
  amountText(rupees: number): string {
    if (!rupees) {
      return '–';
    }
    const divisor = this.units.find((u) => u.value === this.unit)?.divisor ?? 1;
    return (rupees / divisor).toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
  }
  /** The saved edits if they are intact, otherwise RBI's defaults. */
  private load(): AlmConfig {
    const fallback = defaultConfig();
    try {
      const saved = JSON.parse(localStorage.getItem(STORAGE_KEY) || 'null') as AlmConfig | null;
      if (
        saved &&
        Array.isArray(saved.buckets) &&
        saved.buckets.length >= 2 &&
        Array.isArray(saved.items) &&
        Array.isArray(saved.limits)
      ) {
        const overdue = (saved.overdue ??= fallback.overdue ?? { recent: 0, old: 2 });
        // Buckets can be added and removed, so anything pointing past the last one is cut back.
        const last = saved.buckets.length - 1;
        overdue.recent = Math.min(overdue.recent, last);
        overdue.old = Math.min(overdue.old, last);
        saved.limits = saved.limits.filter((l) => l.bucket <= last);
        saved.items.forEach((item) => {
          item.placements = (item.placements ?? []).filter((p) => p.bucket <= last);
        });
        // Lines saved before due-date lines could name their accounts take the default's, by id.
        saved.items.forEach((item) => {
          if (item.source === undefined) {
            item.source = fallback.items.find((d) => d.id === item.id)?.source ?? '';
          }
        });
        return saved;
      }
    } catch {
      /* unreadable — start from the defaults */
    }
    return fallback;
  }
 }
@@ -0,0 +1,463 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 /**
 * The Structural Liquidity Statement of an Urban Co-operative Bank (non-scheduled — 8 residual-maturity
 * buckets, 1-14 days not split), laid out row for row like the statement the bank files: the same
 * numbered Outflow and Inflow lines, the same buckets.
 *
 * Everything in this file is only the DEFAULT. It follows RBI's Urban Co-operative Banks (Asset
 * Liability Management) circular of 17 September 2008 and the 2025 Directions, and where the bank's
 * own filed statement slots a line differently (Interest Payable, Provisions, Other Liabilities) it
 * follows the bank's statement. The screen works on a copy the bank can edit and falls back to these
 * values on "Reset"; percentages in particular are a benchmark that a bank may replace with its own
 * behavioural study approved by the Board / ALCO.
 */
 export type AlmSide = 'liability' | 'asset';
 /**
 * How the bucket is decided.
 * - fixed:       always the same bucket(s).
 * - maturity:    follows the due date of each account/instalment, so it spreads over the buckets.
 * - split:       one balance divided between buckets by share.
 * - behavioural: the bank's own past-data study decides.
 */
 export type AlmRule = 'fixed' | 'maturity' | 'split' | 'behavioural';
 /**
 * Which accounts feed a due-date line on their own. Empty means nothing does yet and the line has to
 * be filled by hand. FD_RD is the two deposit kinds added together, as RBI's "Term Deposits" head is.
 */
 export type AlmSource = 'FD' | 'RD' | 'FD_RD' | 'LOAN' | 'CCOD' | 'NPA' | '';
 export const SOURCE_OPTIONS: { value: AlmSource; label: string }[] = [
  { value: '', label: 'None (fill by hand)' },
  { value: 'FD_RD', label: 'FD + RD accounts (by maturity)' },
  { value: 'FD', label: 'FD accounts only (by maturity)' },
  { value: 'RD', label: 'RD accounts only (by maturity)' },
  { value: 'LOAN', label: 'Term Loan accounts (by instalment)' },
  { value: 'CCOD', label: 'CC / OD loan accounts (outstanding × %)' },
  { value: 'NPA', label: 'NPA loan accounts (outstanding × %)' }
 ];
 /** Sources whose accounts give one outstanding figure that the line's own percentages then divide. */
 export const SHARE_SOURCES: AlmSource[] = [
  'CCOD',
  'NPA'
 ];
 export type AlmUnit = 'day' | 'month' | 'year';
 /** How far out a bucket reaches, counted from the as-on date. */
 export interface AlmSpan {
  n: number;
  unit: AlmUnit;
 }
 export interface AlmBucket {
  /** The column heading, as the statement prints it. */
  label: string;
  /** One line a branch user can follow. */
  hint: string;
  /**
   * Last day the bucket takes, counted from the as-on date. Calendar months and years are used
   * as they are, so '3 months' from 30 June is 30 September. Null means no upper end.
   */
  upTo: AlmSpan | null;
  /**
   * Only on the first bucket: where it starts, when that is not day 1. Every later bucket starts where
   * the one before it ends. Money due before this start still counts in the first bucket, since
   * nothing may fall outside the statement.
   */
  startSpan?: AlmSpan;
 }
 export interface AlmPlacement {
  /** Index into the bucket list. */
  bucket: number;
  /** Share of the balance that goes to this bucket, 0-100; blank when the whole line goes there. */
  pct?: number | null;
  /** Short name for the portion, e.g. 'Core'. */
  label?: string;
 }
 export interface AlmItem {
  id: string;
  side: AlmSide;
  /** The statement's own numbering: '1.', '3.', 'I)'. */
  ref: string;
  /** 0 for a numbered head, 1 for a line under a head. */
  level: 0 | 1;
  /** A heading only, such as '3. Deposits': it carries no figure of its own. */
  header?: boolean;
  /** Left out of the report when false; shown when absent or true. */
  included?: boolean;
  name: string;
  rule: AlmRule;
  /** Plain-language reason, in the words a branch manager would use. */
  reason: string;
  /** True when each account falls in the bucket of its own due date. */
  spreads: boolean;
  /** For a due-date line: the accounts whose maturities fill it. */
  source?: AlmSource;
  placements: AlmPlacement[];
 }
 /** Prudential cap on the net cumulative negative mismatch, as a % of cumulative outflow in that bucket. */
 export interface AlmLimit {
  bucket: number;
  pct: number;
 }
 /**
 * Where an instalment or receivable that is already due and unpaid is slotted — the bank's Overdue
 * Receivables rule. Both are bucket positions: 'recent' for one that fell due less than a month ago,
 * 'old' for anything older.
 */
 export interface AlmOverdueRule {
  recent: number;
  old: number;
 }
 export interface AlmConfig {
  buckets: AlmBucket[];
  items: AlmItem[];
  limits: AlmLimit[];
  overdue?: AlmOverdueRule;
 }
 export const RULE_OPTIONS: { value: AlmRule; label: string; help: string }[] = [
  { value: 'fixed', label: 'Fixed', help: 'Always in the same bucket' },
  { value: 'maturity', label: 'By due date', help: 'Each account by its own maturity' },
  { value: 'split', label: 'Split', help: 'Balance divided by percentages' },
  { value: 'behavioural', label: 'By study', help: 'Percentages from the bank’s own study' }
 ];
 /** Column headings as the filed statement prints them, with the span each one covers. */
 export const DEFAULT_BUCKETS: AlmBucket[] = [
  { label: '1 to 14 days', hint: 'Needed straight away', upTo: { n: 14, unit: 'day' } },
  { label: '15 to 28 days', hint: 'After the next two weeks', upTo: { n: 28, unit: 'day' } },
  { label: '29 days and upto 3 months', hint: 'Within this quarter', upTo: { n: 3, unit: 'month' } },
  { label: 'Over 3 months and upto 6 months', hint: 'Next quarter', upTo: { n: 6, unit: 'month' } },
  { label: 'Over 6 months and upto 1 year', hint: 'Within the year', upTo: { n: 1, unit: 'year' } },
  { label: 'Over 1 year and upto 3 years', hint: 'Medium term', upTo: { n: 3, unit: 'year' } },
  { label: 'Over 3 years and upto 5 years', hint: 'Long term', upTo: { n: 5, unit: 'year' } },
  { label: 'Over 5 years', hint: 'Permanent items', upTo: null }
 ];
 /** Non-scheduled UCB: negative mismatch in 1-14 and 15-28 days must stay within 20% of outflows. */
 export const DEFAULT_LIMITS: AlmLimit[] = [
  { bucket: 0, pct: 20 },
  { bucket: 1, pct: 20 }
 ];
 /** Buckets by position, so the lines below read as the bucket they mean. */
 const B = { d14: 0, d28: 1, m3: 2, m6: 3, y1: 4, y3: 5, y5: 6, over5: 7 };
 const whole = (bucket: number): AlmPlacement[] => [{ bucket, pct: 100 }];
 type Seed = Omit<AlmItem, 'id' | 'spreads' | 'level'> & { level?: 0 | 1; spreads?: boolean };
 const head = (side: AlmSide, ref: string, name: string): Seed => ({
  side,
  ref,
  level: 0,
  header: true,
  name,
  rule: 'fixed',
  reason: '',
  placements: []
 });
 const line = (
  side: AlmSide,
  ref: string,
  name: string,
  rule: AlmRule,
  reason: string,
  placements: AlmPlacement[] = [],
  level: 0 | 1 = 1,
  source: AlmSource = ''
 ): Seed => ({ side, ref, level, name, rule, reason, placements, spreads: rule === 'maturity', source });
 const SEED: Seed[] = [
  // ── OUTFLOWS (liabilities) ──
  line(
    'liability',
    '1.',
    'Capital',
    'fixed',
    'This is the bank’s own money and is never paid back, so it goes in the farthest bucket.',
    whole(B.over5),
    0
  ),
  line(
    'liability',
    '2.',
    'Reserves & Surplus',
    'fixed',
    'The bank’s own money, never paid back. Farthest bucket.',
    whole(B.over5),
    0
  ),
  head('liability', '3.', 'Deposits'),
  line(
    'liability',
    'I)',
    'Current Deposits',
    'split',
    'A part can be withdrawn at any time (volatile), so it goes in 1-14 days. The rest is stable (core), so it goes in 1-3 years. Change the % from the bank’s own study.',
    [
      { bucket: B.d14, pct: 10, label: 'Volatile' },
      { bucket: B.y3, pct: 90, label: 'Core' }
    ]
  ),
  line(
    'liability',
    'II)',
    'Saving Bank Deposits',
    'split',
    'Same as Current. RBI’s benchmark is about 10% volatile. Change the % from the bank’s own study.',
    [
      { bucket: B.d14, pct: 10, label: 'Volatile' },
      { bucket: B.y3, pct: 90, label: 'Core' }
    ]
  ),
  line(
    'liability',
    'III)',
    'Term Deposits (FD and RD)',
    'maturity',
    'The maturity date of each FD and RD decides its bucket. An FD that is already due goes in the first bucket.',
    [],
    1,
    'FD_RD'
  ),
  line('liability', 'IV)', 'Certificates of Deposit', 'maturity', 'By maturity date.'),
  head('liability', '4.', 'Borrowings'),
  line('liability', 'I.', 'Call and short Notice', 'maturity', 'The bucket of the day it has to be repaid.'),
  line('liability', 'II.', 'Inter-Bank (Term)', 'maturity', 'The bucket of the day it has to be repaid.'),
  line('liability', 'III.', 'Refinances', 'maturity', 'The bucket of the day it has to be repaid.'),
  line('liability', 'IV.', 'Others (specify)', 'maturity', 'The bucket of the day it has to be repaid.'),
  head('liability', '5.', 'Other Liabilities & Provisions'),
  line('liability', 'I.', 'DD / Bills Payable', 'fixed', 'These are paid quickly, so 1-14 days.', whole(B.d14)),
  line('liability', 'II.', 'Branch Adjustments', 'fixed', 'Settled between branches, usually quickly.', whole(B.d14)),
  line(
    'liability',
    'III.',
    'Provisions',
    'fixed',
    'In your filed statement provisions are in 1-14 days. Change it according to the purpose of the provision.',
    whole(B.d14)
  ),
  line(
    'liability',
    'IV.',
    'Other Liabilities',
    'fixed',
    'Amounts that are not to be paid out (like fees received in advance) go in the farthest bucket. Your filed statement has them in over 5 years.',
    whole(B.over5)
  ),
  line(
    'liability',
    '6.',
    'Unavailed portion of Cash Credit / Overdraft / Demand Loan component of Working Capital',
    'behavioural',
    'How much of the limit customers will use comes from the bank’s past history. RBI: fill the % in the buckets within 12 months.',
    [],
    0
  ),
  line(
    'liability',
    '7.',
    'Letters of Credit / Guarantees',
    'behavioural',
    'How much of the LC / guarantee will devolve comes from the bank’s history, net of margin. Fill in the %.',
    [],
    0
  ),
  line('liability', '8.', 'Repos', 'maturity', 'The bucket of the day it has to be repaid.', [], 0),
  line('liability', '9.', 'Bills Rediscounted (DUPN)', 'maturity', 'By the due date of the bill.', [], 0),
  line('liability', '10.', 'Swaps (Sell/Buy/Maturing forwards)', 'maturity', 'By maturity date.', [], 0),
  line(
    'liability',
    '11.',
    'Interest Payable',
    'fixed',
    'Interest still to be paid as per the books. Your filed statement has it in 1-14 days. RBI: the bucket of the date it is due.',
    whole(B.d14),
    0
  ),
  line(
    'liability',
    '12.',
    'Others (specify)',
    'fixed',
    'Anything else. Your filed statement has it in over 5 years.',
    whole(B.over5),
    0
  ),
  // ── INFLOWS (assets) ──
  line(
    'asset',
    '1.',
    'Cash',
    'fixed',
    'Cash is with the bank right now, so it is available straight away.',
    whole(B.d14),
    0
  ),
  line(
    'asset',
    '2.',
    'Balances with RBI',
    'behavioural',
    'Balance above the CRR/SLR requirement is in 1-14 days. The required part follows the maturity of the bank’s deposits (DTL). Fill in the %.',
    [],
    0
  ),
  head('asset', '3.', 'Balances with other Banks'),
  line(
    'asset',
    'I)',
    'Current Account',
    'fixed',
    'What can be withdrawn goes in 1-14 days. RBI: the minimum balance that has to be kept goes in 1-3 years; split it if you want.',
    whole(B.d14)
  ),
  line(
    'asset',
    'II)',
    'Money at Call and short Notice, Term Deposits and other placements with other banks including DCCBs and SCBs',
    'maturity',
    'By the maturity date of the FD / call money placed with the bank.'
  ),
  line(
    'asset',
    '4.',
    'Investments (including those under Repos but excluding Reverse Repos)',
    'maturity',
    'By the maturity of the bond / G-Sec, leaving out the part needed to maintain SLR.',
    [],
    0
  ),
  head('asset', '5.', 'Advances (Performing)'),
  line(
    'asset',
    'I.',
    'Bills Purchased and Discounted (including bills under DUPN)',
    'maturity',
    'By the due date of the bill.'
  ),
  line(
    'asset',
    'II.',
    'Cash Credits, Overdrafts and Loans repayable on demand',
    'behavioural',
    'The part that comes back quickly goes in a short bucket; the part that always stays (core) goes in 1-3 years. Fill in the % from the bank’s study.',
    [],
    1,
    'CCOD'
  ),
  line(
    'asset',
    'III.',
    'Term Loans',
    'maturity',
    'Each EMI goes in the bucket of its own due date, not the whole loan at once.',
    [],
    1,
    'LOAN'
  ),
  line(
    'asset',
    '6.',
    'NPAs (Advances and Investments)',
    'behavioural',
    'Sub-standard NPA in 3-5 years; doubtful and loss in the farthest bucket (net of provision). Fill in the % as the bank sees fit.',
    [],
    0,
    'NPA'
  ),
  line(
    'asset',
    '7.',
    'Fixed Assets',
    'fixed',
    'Things like buildings and furniture, which do not bring in money quickly.',
    whole(B.over5),
    0
  ),
  head('asset', '8.', 'Other Assets'),
  line(
    'asset',
    'I.',
    'Branch Adjustments',
    'fixed',
    'Debit balance of branch adjustments, usually settled quickly.',
    whole(B.d14)
  ),
  line('asset', 'II.', 'Leased Assets', 'maturity', 'By the date of the lease’s interim cash flows.'),
  line(
    'asset',
    'III.',
    'Others',
    'fixed',
    'Things that are not real money (intangibles, non-cash) go in the farthest bucket. Your filed statement has them in over 5 years.',
    whole(B.over5)
  ),
  line('asset', '9.', 'Reverse Repos', 'maturity', 'The bucket of the day the money comes back.', [], 0),
  line('asset', '10.', 'Swaps (Buy/Sell)/Maturing forwards', 'maturity', 'By maturity date.', [], 0),
  line('asset', '11.', 'Bills Rediscounted (DUPN)', 'maturity', 'By the due date of the bill.', [], 0),
  line(
    'asset',
    '12.',
    'Interest Receivable',
    'fixed',
    'Interest still to be received. Your filed statement has it in over 5 years. RBI: the bucket of the date it is due.',
    whole(B.over5),
    0
  ),
  line(
    'asset',
    '13.',
    'Export Refinance from RBI',
    'fixed',
    'Limit that has not been used yet can be drawn straight away.',
    whole(B.d14),
    0
  ),
  line(
    'asset',
    '14.',
    'Others (specify)',
    'behavioural',
    'Anything else. Fill in the % as the bank’s study gives.',
    [],
    0
  )
 ];
 /** A fresh, independent copy of the RBI defaults — callers are free to mutate it. */
 export function defaultConfig(): AlmConfig {
  return {
    buckets: DEFAULT_BUCKETS.map((b) => ({ ...b })),
    limits: DEFAULT_LIMITS.map((l) => ({ ...l })),
    // RBI (2008 UCB circular): under a month overdue is expected within 14 days; older goes to 29 days-3 months.
    overdue: { recent: 0, old: 2 },
    items: SEED.map((s, i) => ({
      ...s,
      level: s.level ?? 1,
      id: `d${i + 1}`,
      spreads: s.spreads ?? false,
      placements: s.placements.map((p) => ({ ...p }))
    }))
  };
 }
@@ -0,0 +1,209 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { AlmBucket, AlmSpan } from './alm-bucket-breakdown.config';
 /**
 * The day arithmetic behind the Structural Liquidity Statement: how many days a maturity is from the
 * as-on date, and which bucket that lands it in. The statement and this screen both use it, so what
 * the screen shows is what the return will do.
 *
 * Dates are plain calendar days ('yyyy-MM-dd'), never timestamps, so the browser's time zone and
 * daylight saving cannot move a maturity into the next bucket.
 */
 const MS_PER_DAY = 86_400_000;
 /** Where the first bucket starts unless told otherwise: the day after the as-on date. */
 const DAY_ONE: AlmSpan = { n: 1, unit: 'day' };
 const MONTHS = [
  'Jan',
  'Feb',
  'Mar',
  'Apr',
  'May',
  'Jun',
  'Jul',
  'Aug',
  'Sep',
  'Oct',
  'Nov',
  'Dec'
 ];
 /** One bucket laid over a calendar, for a given as-on date. */
 export interface BucketWindow {
  label: string;
  /** First day the bucket takes. */
  from: Date;
  /** Last day the bucket takes, or null when it runs on without end. */
  to: Date | null;
  /** Days from the as-on date to the first / last day. */
  fromDays: number;
  toDays: number | null;
 }
 /** 'yyyy-MM-dd' to a local calendar date; null when it is not a real date. */
 export function parseIsoDate(iso: string | null | undefined): Date | null {
  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(iso ?? '');
  if (!m) {
    return null;
  }
  const date = new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]));
  return date.getFullYear() === Number(m[1]) && date.getMonth() === Number(m[2]) - 1 && date.getDate() === Number(m[3])
    ? date
    : null;
 }
 /** '30-Jun-2026'. */
 export function formatDate(date: Date): string {
  return `${String(date.getDate()).padStart(2, '0')}-${MONTHS[date.getMonth()]}-${date.getFullYear()}`;
 }
 /** Whole days from one calendar date to another; negative when `to` is earlier. */
 export function daysBetween(from: Date, to: Date): number {
  const a = Date.UTC(from.getFullYear(), from.getMonth(), from.getDate());
  const b = Date.UTC(to.getFullYear(), to.getMonth(), to.getDate());
  return Math.round((b - a) / MS_PER_DAY);
 }
 /**
 * The date a span reaches. Months and years are calendar months and years, and a day that does not
 * exist in the target month falls back to that month's last day (31 Jan + 1 month = 28/29 Feb).
 */
 export function addSpan(from: Date, span: AlmSpan): Date {
  if (span.unit === 'day') {
    return new Date(from.getFullYear(), from.getMonth(), from.getDate() + span.n);
  }
  const months = span.unit === 'year' ? span.n * 12 : span.n;
  const target = new Date(from.getFullYear(), from.getMonth() + months, 1);
  const lastDay = new Date(target.getFullYear(), target.getMonth() + 1, 0).getDate();
  return new Date(target.getFullYear(), target.getMonth(), Math.min(from.getDate(), lastDay));
 }
 /**
 * Index of the bucket a maturity falls in. A maturity on or before the as-on date is already due, so
 * it is slotted in the first bucket rather than falling out of the statement.
 */
 export function bucketIndexFor(asOn: Date, maturity: Date, buckets: AlmBucket[]): number {
  if (!buckets.length || maturity <= asOn) {
    return 0;
  }
  for (let i = 0; i < buckets.length; i++) {
    const upTo = buckets[i].upTo;
    if (!upTo || maturity <= addSpan(asOn, upTo)) {
      return i;
    }
  }
  return buckets.length - 1;
 }
 /** Each bucket as a run of calendar days from the as-on date, in bucket order. */
 export function bucketWindows(asOn: Date, buckets: AlmBucket[]): BucketWindow[] {
  let from = addSpan(asOn, fromSpanOf(buckets, 0) ?? DAY_ONE);
  return buckets.map((b) => {
    const to = b.upTo ? addSpan(asOn, b.upTo) : null;
    const window: BucketWindow = {
      label: b.label,
      from,
      to,
      fromDays: daysBetween(asOn, from),
      toDays: to ? daysBetween(asOn, to) : null
    };
    if (to) {
      from = new Date(to.getFullYear(), to.getMonth(), to.getDate() + 1);
    }
    return window;
  });
 }
 /** 'Days 1 to 14', 'Days 29 to 92', 'Day 1827 onwards'. */
 export function dayRangeText(w: BucketWindow): string {
  return w.toDays === null ? `Day ${w.fromDays} onwards` : `Days ${w.fromDays} to ${w.toDays}`;
 }
 // ── The bucket ranges as a From / To table ──
 /** '14 d', '3 m', '1 y' — how a span is written in the From / To table. */
 export function spanText(span: AlmSpan): string {
  return `${span.n} ${span.unit === 'day' ? 'd' : span.unit === 'month' ? 'm' : 'y'}`;
 }
 /** '14 days', '1 month', '5 years' — a span in words, as the statement's headings put it. */
 function spanWords(span: AlmSpan): string {
  const word = span.unit === 'day' ? 'day' : span.unit === 'month' ? 'month' : 'year';
  return `${span.n} ${word}${span.n === 1 ? '' : 's'}`;
 }
 /**
 * Where bucket `index` starts, as it is written in the table: the first starts on day 1, a bucket
 * after one that ends in days starts the day after (14 d then 15 d), and one after a month or year
 * starts "over" it (3 m then 3 m). Null for the first bucket, whose start is fixed.
 */
 export function fromSpanOf(buckets: AlmBucket[], index: number): AlmSpan | null {
  if (index === 0) {
    return { ...(buckets[0]?.startSpan ?? DAY_ONE) };
  }
  const previous = buckets[index - 1].upTo;
  if (!previous) {
    return null;
  }
  return previous.unit === 'day' ? { n: previous.n + 1, unit: 'day' } : { ...previous };
 }
 /** Move the start of bucket `index`, which is the end of the one before it. */
 export function setFromSpan(buckets: AlmBucket[], index: number, from: AlmSpan): void {
  const n = Number(from.n) || 1;
  if (index === 0) {
    // Day 1 is the ordinary start, so it is stored as no override at all.
    buckets[0].startSpan = n === 1 && from.unit === 'day' ? undefined : { n, unit: from.unit };
    return;
  }
  buckets[index - 1].upTo = from.unit === 'day' ? { n: Math.max(1, n - 1), unit: 'day' } : { n, unit: from.unit };
 }
 /**
 * The column heading a range deserves, worded the way the filed statement words them:
 * '1 to 14 days', '29 days and upto 3 months', 'Over 3 months and upto 6 months', 'Over 5 years'.
 */
 export function bucketLabel(buckets: AlmBucket[], index: number): string {
  const to = buckets[index]?.upTo ?? null;
  const previous = index > 0 ? buckets[index - 1].upTo : null;
  if (index === 0) {
    const start = buckets[0].startSpan;
    if (start) {
      if (start.unit === 'day') {
        return !to
          ? `Over ${spanWords(start)}`
          : to.unit === 'day'
            ? `${start.n} to ${to.n} days`
            : `${start.n} days and upto ${spanWords(to)}`;
      }
      return to ? `Over ${spanWords(start)} and upto ${spanWords(to)}` : `Over ${spanWords(start)}`;
    }
    if (to?.unit === 'day' && to.n === 1) {
      return 'Next day';
    }
    return !to ? 'Over 0 days' : to.unit === 'day' ? `1 to ${to.n} days` : `1 day and upto ${spanWords(to)}`;
  }
  if (!previous) {
    return buckets[index].label;
  }
  if (previous.unit === 'day') {
    const from = previous.n + 1;
    if (!to) {
      return `Over ${spanWords(previous)}`;
    }
    if (to.unit === 'day' && to.n === from) {
      return `Day ${from}`;
    }
    return to.unit === 'day' ? `${from} to ${to.n} days` : `${from} days and upto ${spanWords(to)}`;
  }
  return to ? `Over ${spanWords(previous)} and upto ${spanWords(to)}` : `Over ${spanWords(previous)}`;
 }
@@ -0,0 +1,125 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 /** One product's total, split by bucket, in rupees. */
 export interface MaturityGroup {
  key: string;
  label: string;
  side: 'liability' | 'asset';
  accounts: number;
  total: number;
  buckets: number[];
 }
 /** Loans reported apart from the date buckets, with the reason they are not slotted by date. */
 export interface NotSlotted {
  key: string;
  label: string;
  accounts: number;
  outstanding: number;
  why: string;
 }
 export interface MaturityBreakdown {
  asOnDate: string;
  bucketCount: number;
  groups: MaturityGroup[];
  notSlotted: NotSlotted[];
  notes: string[];
 }
 /** What the screen asks the server for: the date, the bank's own bucket edges and its overdue rule. */
 export interface MaturityQuery {
  asOnDate: string;
  /** Edges like '14d,28d,3m,6m,1y,3y,5y'. */
  buckets: string;
  overdueRecentBucket: number;
  overdueOldBucket: number;
 }
 /** One account found by a search, to be picked. */
 export interface AccountHit {
  /** FD, RD or LOAN. */
  kind: 'FD' | 'RD' | 'LOAN';
  id: number;
  accountNo: string;
  customer: string | null;
  product: string;
  /** Maturity date of a deposit; null for a loan. */
  date: string | null;
  /** Deposit balance, or loan principal outstanding. */
  amount: number;
 }
 /** One deposit, or one unpaid loan instalment, of the accounts picked. */
 export interface AccountRow {
  id: number;
  accountNo: string;
  customer: string | null;
  product: string;
  kind: string;
  /** Loan instalment number, for term loans. */
  installment?: number;
  /** Maturity date of a deposit, or due date of an instalment. */
  date: string | null;
  /** Days from the as-on date to that date; negative once it has passed. */
  days: number | null;
  status: string;
  /** Position of the bucket it falls in. */
  bucket: number | null;
  amount: number;
  /** Why the row needs a second look, for an NPA or a cash-credit / overdraft loan. */
  note?: string | null;
 }
 export interface SelectedReport {
  asOnDate: string;
  bucketCount: number;
  count: number;
  total: number;
  rows: AccountRow[];
 }
 /** Fixed-term deposits and loans of the bank's customers, slotted into residual-maturity buckets. */
@Injectable({ providedIn: 'root' })
 export class AlmMaturityService {
  private http = inject(HttpClient);
  getBreakdown(query: MaturityQuery): Observable<MaturityBreakdown> {
    const params = new HttpParams()
      .set('asOnDate', query.asOnDate)
      .set('buckets', query.buckets)
      .set('overdueRecentBucket', query.overdueRecentBucket)
      .set('overdueOldBucket', query.overdueOldBucket);
    return this.http.get<MaturityBreakdown>('/almreturn/maturity-breakdown', { params });
  }
  /** Find accounts by account number or customer name; at least two characters. A kind of FD, RD or LOAN narrows it. */
  searchAccounts(q: string, kind: string): Observable<{ results: AccountHit[] }> {
    let params = new HttpParams().set('q', q);
    if (kind) {
      params = params.set('kind', kind);
    }
    return this.http.get<{ results: AccountHit[] }>('/almreturn/maturity-breakdown/search', { params });
  }
  /** The day-wise breakdown of the picked accounts, given as KIND:id pairs like FD:12,RD:5,LOAN:33. */
  getSelected(accounts: string, query: MaturityQuery): Observable<SelectedReport> {
    const params = new HttpParams()
      .set('accounts', accounts)
      .set('asOnDate', query.asOnDate)
      .set('buckets', query.buckets)
      .set('overdueRecentBucket', query.overdueRecentBucket)
      .set('overdueOldBucket', query.overdueOldBucket);
    return this.http.get<SelectedReport>('/almreturn/maturity-breakdown/selected', { params });
  }
 }
@@ -15,7 +15,7 @@
        RBI Liabilities Register
      </div>
      <h2 class="dialog-title">Demand &amp; Time Liabilities</h2>
-      <p class="dialog-sub">NDTL &middot; CRR/SLR Computation Base &middot; As per RBI Master Circular</p>
+      <p class="dialog-sub">What the bank owes, and what it must hold against it</p>
    </div>
    <div class="header-right">
      <!-- The close being reported, and under it the close the ratios are charged on. Two dates,
@@ -45,36 +45,39 @@
    </div>
  </div>
-  <!-- Summary Cards -->
+  <!-- What the liabilities are, and what they come to. Four cards rather than five: the CRR
       requirement that used to sit here is on the compliance bar below, beside what is held
       against it, where it answers a question rather than repeating one. -->
  <div class="summary-row">
    <div class="summary-card sc-demand">
-      <div class="sc-label">Total Demand Liabilities</div>
+      <div class="sc-label">Demand liabilities</div>
-      <div class="sc-value">{{ crore(totalDemand) }}<span class="cr" *ngIf="totalDemand !== null">Cr</span></div>
+      <div class="sc-value" [title]="money(totalDemand)">{{ tile(totalDemand) }}</div>
-      <div class="sc-sub">Payable on demand</div>
+      <div class="sc-sub">Repayable on demand</div>
    </div>
    <div class="summary-card sc-time">
-      <div class="sc-label">Total Time Liabilities</div>
+      <div class="sc-label">Time liabilities</div>
-      <div class="sc-value">{{ crore(totalTime) }}<span class="cr" *ngIf="totalTime !== null">Cr</span></div>
+      <div class="sc-value" [title]="money(totalTime)">{{ tile(totalTime) }}</div>
-      <div class="sc-sub">Payable on maturity</div>
+      <div class="sc-sub">Repayable on maturity</div>
    </div>
    <div class="summary-card sc-asset">
-      <div class="sc-label">Assets with Banking System</div>
+      <div class="sc-label">Held with other banks</div>
-      <div class="sc-value">
+      <!-- Scaled on the tile, exact on hover: the card is read for order of magnitude, but the
-        {{ crore(totalBankingAssets) }}<span class="cr" *ngIf="totalBankingAssets !== null">Cr</span>
+           figure behind it should never be more than a pointer away. -->
      <div class="sc-value" [title]="money(totalBankingAssets)">
        {{ tile(totalBankingAssets) }}
      </div>
      <!-- These assets net against what the bank OWES other banks, not against the whole base, and
           the netting floors at zero — so where they exceed what is owed, nothing comes off at all.
           Said plainly, because "deducted from NDTL" was being printed on a card where no
           deduction had been made. -->
      <div class="sc-sub" [class.dn]="bankingAssetsNet">
        {{ bankingAssetsNet ? 'Reduces the base below' : 'More than we owe banks — base unchanged' }}
      </div>
      <div class="sc-change dn">&#8595; Deducted from NDTL</div>
    </div>
    <div class="summary-card sc-ndtl">
-      <div class="sc-label">Net Demand &amp; Time Liabilities (NDTL)</div>
+      <div class="sc-label">NDTL &mdash; the base</div>
-      <div class="sc-value">{{ crore(ndtl) }}<span class="cr" *ngIf="ndtl !== null">Cr</span></div>
+      <div class="sc-value" [title]="money(ndtl)">{{ tile(ndtl) }}</div>
-      <div class="sc-sub">After deducting banking assets</div>
+      <div class="sc-sub">Demand + time, net of bank balances</div>
    </div>
    <div class="summary-card sc-crr">
      <!-- The rate is named from the configuration, not fixed here: a card headed "CRR Required
           (3%)" while Admin holds 4% states a rate the bank is not on. -->
      <div class="sc-label">CRR Required{{ crrRate === null ? '' : ' (' + crrRate + '%)' }}</div>
      <div class="sc-value">{{ crore(crrRequired) }}<span class="cr" *ngIf="crrRequired !== null">Cr</span></div>
      <div class="sc-sub">SLR Req: {{ crore(slrRequired) }}{{ slrRate === null ? '' : ' Cr (' + slrRate + '%)' }}</div>
    </div>
  </div>
@@ -94,26 +97,33 @@
      <span class="tab-pill pill-time">02</span> Time Liabilities
    </button>
    <button class="tab-btn" [class.active]="activeTab === 'assets'" (click)="activeTab = 'assets'">
-      <span class="tab-pill pill-asset">03</span> Assets with Banking System
+      <span class="tab-pill pill-asset">03</span> Held with other banks
    </button>
    <button class="tab-btn" [class.active]="activeTab === 'slr'" (click)="activeTab = 'slr'">
-      <span class="tab-pill pill-slr">04</span> SLR &mdash; Liquid Assets
+      <span class="tab-pill pill-slr">04</span> SLR assets
    </button>
    <!-- Where the reserve is actually held, and what it holds TODAY. The four tabs above report the
         fortnight close the return is made up to; this one answers the question a treasury desk
         asks every morning — as things stand now, are we short, and which account do we cover it
         into. A close two weeks old cannot say that, because the balances have since moved. -->
    <button class="tab-btn" [class.active]="activeTab === 'held'" (click)="activeTab = 'held'">
      <span class="tab-pill pill-held">05</span> Our accounts today
    </button>
  </div>
  <!-- Demand Liabilities Table -->
  @if (activeTab === 'demand') {
-    <div class="section-desc">Amounts payable on demand &mdash; RBI Schedule II</div>
+    <div class="section-desc">Money the bank must repay whenever a customer asks for it.</div>
    <div class="table-wrap">
      <table>
        <thead>
          <tr>
            <th class="sl">#</th>
            <th>Liability Item</th>
-            <th>Account Code</th>
+            <th>Item</th>
-            <th class="right">Opening (&#8377; Cr)</th>
+            <th class="right">Opening</th>
-            <th class="right">Current (&#8377; Cr)</th>
+            <th class="right">Current</th>
-            <th class="right">Change (&#8377; Cr)</th>
+            <th class="right">Change</th>
            <th>Status</th>
          </tr>
        </thead>
@@ -167,17 +177,17 @@
  <!-- Time Liabilities Table -->
  @if (activeTab === 'time') {
-    <div class="section-desc">Amounts payable after a specified period &mdash; RBI Schedule III</div>
+    <div class="section-desc">Money the bank repays only when the deposit matures.</div>
    <div class="table-wrap">
      <table>
        <thead>
          <tr>
            <th class="sl">#</th>
            <th>Liability Item</th>
-            <th>Account Code</th>
+            <th>Item</th>
-            <th class="right">Opening (&#8377; Cr)</th>
+            <th class="right">Opening</th>
-            <th class="right">Current (&#8377; Cr)</th>
+            <th class="right">Current</th>
-            <th class="right">Change (&#8377; Cr)</th>
+            <th class="right">Change</th>
            <th>Status</th>
          </tr>
        </thead>
@@ -231,17 +241,20 @@
  <!-- Assets with Banking System Table -->
  @if (activeTab === 'assets') {
-    <div class="section-desc">Deducted from gross liabilities to arrive at NDTL &mdash; RBI Master Circular</div>
+    <div class="section-desc">
      What the bank keeps with other banks. This comes off what it owes them — and only off that, so where it is the
      larger of the two the base is left as it is.
    </div>
    <div class="table-wrap">
      <table>
        <thead>
          <tr>
            <th class="sl">#</th>
            <th>Asset Item</th>
-            <th>Account Code</th>
+            <th>Item</th>
-            <th class="right">Opening (&#8377; Cr)</th>
+            <th class="right">Opening</th>
-            <th class="right">Current (&#8377; Cr)</th>
+            <th class="right">Current</th>
-            <th class="right">Change (&#8377; Cr)</th>
+            <th class="right">Change</th>
            <th>Status</th>
          </tr>
        </thead>
@@ -275,7 +288,12 @@
        <tfoot>
          <tr>
            <td colspan="3">
-              <strong>Total Assets with Banking System</strong> <span class="deduct-tag">( Deducted from NDTL )</span>
+              <strong>Total Assets with Banking System</strong>
              <span class="deduct-tag">{{
                bankingAssetsNet
                  ? '( Deducted from NDTL )'
                  : '( Netted against item I, which is smaller — no deduction )'
              }}</span>
            </td>
            <td class="right foot-asset">{{ totalOf(bankingAssets, 'openingValue') }}</td>
            <td class="right foot-asset">{{ totalOf(bankingAssets, 'currentValue') }}</td>
@@ -289,20 +307,18 @@
  <!-- SLR - Liquid Assets Table -->
  @if (activeTab === 'slr') {
-    <div class="section-desc">
+    <div class="section-desc">Cash, bank balances and securities the bank holds against its SLR requirement.</div>
      SLR = (Liquid Assets / NDTL) &times; 100 &mdash; RBI Sec 24(2A) of Banking Regulation Act, 1949
    </div>
    <div class="table-wrap">
      <table>
        <thead>
          <tr>
            <th class="sl">#</th>
            <th>Liquid Asset</th>
-            <th>Account Code</th>
+            <th>Item</th>
            <th>Category</th>
-            <th class="right">Opening (&#8377; Cr)</th>
+            <th class="right">Opening</th>
-            <th class="right">Current (&#8377; Cr)</th>
+            <th class="right">Current</th>
-            <th class="right">Change (&#8377; Cr)</th>
+            <th class="right">Change</th>
            <th>Status</th>
          </tr>
        </thead>
@@ -348,119 +364,141 @@
      </table>
    </div>
-    <!-- SLR Formula -->
+    <!-- How the ratio is struck. The "× 100" box that stood here was a term whose value was 100 and
         whose label was 100 — it took a quarter of the row to say that a fraction is written as a
         percentage. -->
    <div class="formula-block slr-formula">
-      <div class="formula-title">SLR Computation &mdash; (Liquid Assets / NDTL) &times; 100</div>
+      <div class="formula-title">How the SLR ratio is worked out</div>
      <div class="formula-row">
        <div class="formula-term ft-slr">
-          <div class="formula-term-label">Liquid Assets</div>
+          <div class="formula-term-label">Assets we hold</div>
-          <div class="formula-term-val">&#8377;13,238.80</div>
+          <div class="formula-term-val">{{ money(totalLiquidAssets) }}</div>
-          <div class="formula-term-sub">6 asset categories</div>
+          <div class="formula-term-sub">{{ liquidAssets.length }} categories</div>
        </div>
        <div class="formula-op">&divide;</div>
        <div class="formula-term ft-ndtl">
-          <div class="formula-term-label">NDTL</div>
+          <div class="formula-term-label">NDTL base</div>
-          <div class="formula-term-val">&#8377;69,221.30</div>
+          <div class="formula-term-val">{{ money(baseNdtl) }}</div>
-          <div class="formula-term-sub">Net Demand &amp; Time</div>
+          <div class="formula-term-sub">as at {{ baseDateStr || '—' }}</div>
        </div>
        <div class="formula-op">&times;</div>
        <div class="formula-term" style="border-color: #e2e8f0; background: #f8fafc">
          <div class="formula-term-label" style="color: #64748b">100</div>
          <div class="formula-term-val" style="color: #334155">100</div>
          <div class="formula-term-sub">&nbsp;</div>
        </div>
        <div class="formula-op equals">=</div>
        <div class="formula-term ft-slr-result">
-          <div class="formula-term-label">Actual SLR</div>
+          <div class="formula-term-label">SLR held</div>
          <div class="formula-term-val">{{ slrActualPercent }}%</div>
-          <div class="formula-term-sub">Min required: {{ slrRate }}%</div>
+          <div class="formula-term-sub">minimum {{ slrRate }}%</div>
        </div>
      </div>
    </div>
-    <!-- SLR Status Bar -->
+    <!-- The SLR compliance bar that used to sit here said the same three figures as the row above
-    <div class="slr-status-bar">
+         it and the bar below it — required, held, surplus, three times on one screen. It is gone;
-      <div class="slr-status-left">
+         the compliance bar at the foot carries both ratios for every tab. -->
        <div class="slr-status-title">SLR Compliance Status</div>
        <div class="slr-status-desc">
          Actual: {{ slrActualPercent }}% &middot; Required: {{ slrRate }}.00% &middot; NDTL: &#8377;{{
            ndtl | number: '1.2-2'
          }}
          Cr
        </div>
      </div>
      <div class="slr-status-calcs">
        <div class="slr-calc">
          <div class="slr-calc-label">SLR Required ({{ slrRate }}%)</div>
          <div class="slr-calc-val">&#8377;{{ slrRequired | number: '1.2-2' }} Cr</div>
        </div>
        <div class="slr-calc">
          <div class="slr-calc-label">Liquid Assets Held</div>
          <div class="slr-calc-val">&#8377;{{ totalLiquidAssets | number: '1.2-2' }} Cr</div>
        </div>
        <div class="slr-calc">
          <div class="slr-calc-label">Surplus</div>
          <div class="slr-calc-val surplus">&#8377;{{ slrSurplus | number: '1.2-2' }} Cr</div>
        </div>
      </div>
    </div>
  }
-  <!-- NDTL Formula Block -->
+  <!-- Required against held, for both ratios. Always on screen, under whichever tab is open:
-  <div class="formula-block">
+       whether the bank is short is the one thing a reader must not have to go looking for. -->
-    <div class="formula-title">
+  <div class="crr-bar">
-      NDTL Computation &mdash; Formula Breakdown &middot; Data as of {{ reportingDateStr }}
+    <div class="crr-text">
      <div class="crr-title">Are we meeting the requirement?</div>
      <div class="crr-desc">
        Charged on the NDTL of {{ money(baseNdtl) }} as at {{ baseDateStr || reportingDateStr }}
      </div>
    </div>
-    <div class="formula-row">
+    <!-- Required AND held, side by side. The requirement alone answers half the question: a screen
-      <div class="formula-term ft-demand">
+         headed "Reserve Requirements" that states ₹2.10 Cr without saying what is against it sends
-        <div class="formula-term-label">Demand Liabilities</div>
+         a reader to another tab to find out whether the bank is short — which is the one thing they
-        <div class="formula-term-val">&#8377;{{ totalDemand | number: '1.2-2' }}</div>
+         opened this bar to learn. -->
-        <div class="formula-term-sub">16 line items</div>
+    <div class="crr-calcs">
-      </div>
+      @for (r of positionRatios(); track r.name) {
-      <div class="formula-op">+</div>
+        <div class="crr-calc" [class.crr-calc--short]="!r.met">
-      <div class="formula-term ft-time">
+          <!-- A ratio with no rate on record is said to have none. It used to print "SLR @ null%" and
-        <div class="formula-term-label">Time Liabilities</div>
+               a surplus of nothing, which reads as a requirement met rather than one not set. -->
-        <div class="formula-term-val">&#8377;{{ totalTime | number: '1.2-2' }}</div>
+          <div class="crr-calc-label">{{ r.name }}{{ r.rate === null ? ' — rate not set' : ' @ ' + r.rate + '%' }}</div>
-        <div class="formula-term-sub">13 line items</div>
+          <div class="crr-calc-val">{{ money(r.required) }}</div>
-      </div>
+          <div class="crr-calc-held">
-      <div class="formula-op minus">&minus;</div>
+            held {{ money(r.maintained) }}
-      <div class="formula-term ft-asset">
+            <span [class.crr-short]="!r.met">
-        <div class="formula-term-label">Assets with Banking</div>
+              &middot; {{ r.met ? '+' + money(r.surplus) : 'short ' + money(r.shortfall) }}
-        <div class="formula-term-val">&#8377;{{ totalBankingAssets | number: '1.2-2' }}</div>
+            </span>
-        <div class="formula-term-sub">3 line items</div>
+          </div>
-      </div>
+        </div>
-      <div class="formula-op equals">=</div>
+      }
-      <div class="formula-term ft-ndtl">
+      <div class="crr-calc">
-        <div class="formula-term-label">NDTL</div>
+        <div class="crr-calc-label">Total Reserve</div>
-        <div class="formula-term-val">&#8377;{{ ndtl | number: '1.2-2' }}</div>
+        <div class="crr-calc-val">{{ money(totalReserve) }}</div>
-        <div class="formula-term-sub">CRR &amp; SLR base</div>
+        <div class="crr-calc-held">CRR + SLR required</div>
      </div>
    </div>
  </div>
-  <!-- CRR/SLR Bar -->
+  <!-- Reserve accounts, as they stand today -->
-  <div class="crr-bar">
+  @if (activeTab === 'held') {
-    <div class="crr-text">
+    <div class="section-desc">
-      <div class="crr-title">CRR &amp; SLR Reserve Requirements &mdash; RBI Computation on NDTL</div>
+      Where the cash reserve is held, with each account's balance on the business date
-      <div class="crr-desc">
+      <strong>{{ position?.onDate || '—' }}</strong
-        Based on NDTL of &#8377;{{ ndtl | number: '1.2-2' }} Cr &middot; Data as of {{ reportingDateStr }} (45-day lag)
+      >. The requirement below is charged on <strong>{{ position?.baseDate || '—' }}</strong
-      </div>
+      >, a fortnight back — RBI's lag is a rule, so today's own liabilities settle nothing yet.
    </div>
-    <div class="crr-calcs">
+
-      <div class="crr-calc">
+    @if (position) {
-        <div class="crr-calc-label">CRR @ {{ crrRate }}.00%</div>
+      <!-- Required against held, for each ratio. Stated before the accounts because a desk reads
-        <div class="crr-calc-val">&#8377;{{ crrRequired | number: '1.2-2' }} Cr</div>
+           the gap first and only then asks which account to move money into. -->
      <div class="held-ratios">
        @for (r of positionRatios(); track r.name) {
          <div class="held-ratio" [class.held-ratio--short]="!r.met">
            <div class="held-ratio__name">{{ r.name }}{{ r.rate === null ? '' : ' @ ' + r.rate + '%' }}</div>
            <div class="held-ratio__grid">
              <span>Required</span><strong>{{ money(r.required) }}</strong> <span>Maintained</span
              ><strong>{{ money(r.maintained) }}</strong>
              <span>{{ r.met ? 'Surplus' : 'Shortfall' }}</span>
              <strong [class.held-short]="!r.met">{{ money(r.met ? r.surplus : r.shortfall) }}</strong>
            </div>
          </div>
        }
      </div>
-      <div class="crr-calc">
+
-        <div class="crr-calc-label">SLR @ {{ slrRate }}.00%</div>
+      <div class="table-wrap">
-        <div class="crr-calc-val">&#8377;{{ slrRequired | number: '1.2-2' }} Cr</div>
+        <table>
          <thead>
            <tr>
              <th class="sl">#</th>
              <th>Account</th>
              <th>Form 1 head</th>
              <th class="right">Balance today</th>
              <th>&nbsp;</th>
            </tr>
          </thead>
          <tbody>
            @for (a of position.accounts; track a.glAccountId) {
              <tr>
                <td class="sl">{{ $index + 1 }}</td>
                <td>
                  <div class="item-name">{{ a.name }}</div>
                  <div class="item-sub mono">{{ a.glCode }}</div>
                </td>
                <td>
                  {{ a.item }} &middot; {{ a.head }}
                  <!-- An account the return does not read is named as such. It can still be moved
                       into — the money is real — but adding it to what is maintained would have
                       this screen claim a compliance the filed form does not. -->
                  @if (!a.countsTowardMaintained) {
                    <span class="held-chip">not counted on the return</span>
                  }
                </td>
                <td class="right amt">{{ money(a.balance) }}</td>
                <td class="right">
                  <button class="held-move" (click)="openTransfer(a)">
                    <fa-icon icon="exchange-alt"></fa-icon>
                    Transfer
                  </button>
                </td>
              </tr>
            }
          </tbody>
        </table>
      </div>
-      <div class="crr-calc">
+    }
-        <div class="crr-calc-label">Total Reserve</div>
+  }
        <div class="crr-calc-val">&#8377;{{ totalReserve | number: '1.2-2' }} Cr</div>
      </div>
    </div>
  </div>
  <!-- Footer -->
  <div class="dialog-footer">
@@ -158,7 +158,10 @@ $mono: 'IBM Plex Mono', 'Roboto Mono', monospace;
 // ===== Summary Cards =====
 .summary-row {
  display: grid;
-  grid-template-columns: repeat(5, 1fr);
+  // Five cards only while each can still hold its figure. A seventy-crore NDTL printed to the
  // paise needs room, and fixed fifths cut it off at the card edge — the figures were there and
  // unreadable. Below that width the row wraps to fewer, wider cards instead.
  grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
  gap: 14px;
  padding: 20px 28px;
 }
@@ -167,8 +170,12 @@ $mono: 'IBM Plex Mono', 'Roboto Mono', monospace;
  background: $surface;
  border: 1px solid $border;
  border-radius: 12px;
-  padding: 16px 18px;
+  // 18px of side padding on a fifth of the row left the figure barely more than half the card.
  padding: 16px 14px;
  position: relative;
  // A grid item will not shrink below its content by default, which is how a long figure pushed
  // its own card wider than its column and off the edge of the dialog.
  min-width: 0;
  overflow: hidden;
  transition: box-shadow 0.2s;
@@ -210,16 +217,29 @@ $mono: 'IBM Plex Mono', 'Roboto Mono', monospace;
  font-size: 10px;
  color: $ink3;
  font-family: $mono;
-  letter-spacing: 1px;
+  // Tightened from 1px: on a five-up row the tracking alone pushed "NET DEMAND & TIME LIABILITIES
  // (NDTL)" onto a third line and squeezed the figure beneath it.
  letter-spacing: 0.4px;
  text-transform: uppercase;
  margin-bottom: 6px;
  // Wraps rather than clipping — a heading that reads "ASSETS WITH BANKIN" names nothing.
  overflow-wrap: anywhere;
 }
 .sc-value {
-  font-size: 20px;
+  // Sized to the card rather than fixed: a figure that outgrows its box is worse than a smaller
  // one, because the digits that fall off the right are the ones that distinguish it. Floors at
  // 14px so a long figure shrinks rather than wraps mid-number.
  font-size: clamp(14px, 1.45vw, 20px);
  font-weight: 600;
  color: $ink;
  font-family: $mono;
  // Figures are read by lining their digits up; a proportional fallback would stagger them.
  font-variant-numeric: tabular-nums;
  // A rupee figure never breaks across lines — "₹6,35,05," over "967.50" reads as two numbers.
  white-space: nowrap;
  overflow: hidden;
  text-overflow: ellipsis;
 }
 .cr {
@@ -232,12 +252,16 @@ $mono: 'IBM Plex Mono', 'Roboto Mono', monospace;
 .sc-change {
  font-size: 11px;
  margin-top: 4px;
  line-height: 1.35;
  overflow-wrap: anywhere;
 }
 .sc-sub {
  font-size: 11px;
  color: $ink3;
  margin-top: 4px;
  line-height: 1.35;
  overflow-wrap: anywhere;
 }
 .up {
@@ -869,3 +893,112 @@ $slr-b: #bae6fd;
  line-height: 1.6;
  background: #fafafa;
 }
 /* ── Reserve accounts, as they stand today ── */
 .pill-held {
  background: #0b5394;
  color: #fff;
 }
 /* Required against held, per ratio — read before the accounts, because a desk asks how big the
   gap is before asking which account to cover it from. */
 .held-ratios {
  display: flex;
  gap: 16px;
  padding: 16px 20px 0;
  flex-wrap: wrap;
 }
 .held-ratio {
  flex: 1 1 260px;
  padding: 14px 16px;
  border: 1px solid #e2e8f0;
  border-left: 4px solid #137333;
  border-radius: 8px;
  background: #f8faf9;
 }
 /* A ratio that is not met is the thing this tab exists to surface. */
 .held-ratio--short {
  border-left-color: #c5221f;
  background: #fdf6f6;
 }
 .held-ratio__name {
  font-size: 12px;
  font-weight: 700;
  letter-spacing: 0.04em;
  text-transform: uppercase;
  color: #5f6368;
  margin-bottom: 10px;
 }
 .held-ratio__grid {
  display: grid;
  grid-template-columns: auto 1fr;
  gap: 4px 14px;
  font-size: 13px;
  span {
    color: #5f6368;
  }
  strong {
    text-align: right;
    font-variant-numeric: tabular-nums;
  }
 }
 .held-short {
  color: #c5221f;
 }
 /* An account the filed return does not read. Named rather than hidden: the money is real and can
   be moved, but it settles nothing on the form. */
 .held-chip {
  display: inline-block;
  margin-left: 8px;
  padding: 1px 7px;
  border-radius: 10px;
  background: #fff4e5;
  color: #b06000;
  font-size: 10px;
  font-weight: 600;
  white-space: nowrap;
 }
 .held-move {
  padding: 5px 12px;
  border: 1px solid #0b5394;
  border-radius: 6px;
  background: #fff;
  color: #0b5394;
  font-size: 12px;
  font-weight: 600;
  cursor: pointer;
  white-space: nowrap;
  &:hover {
    background: #0b5394;
    color: #fff;
  }
 }
 /* What is held against each requirement, under the requirement itself. */
 .crr-calc-held {
  margin-top: 4px;
  font-size: 11px;
  color: $ink3;
  white-space: nowrap;
 }
 /* A ratio that is not met — on a compliance bar this is the one thing that must not be missed. */
 .crr-calc--short {
  border-color: $red;
 }
 .crr-short,
 .sc-short {
  color: $red;
  font-weight: 600;
 }
@@ -8,12 +8,14 @@
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule, DecimalPipe } from '@angular/common';
-import { MatDialogRef, MatDialogModule } from '@angular/material/dialog';
+import { MatDialog, MatDialogRef, MatDialogModule } from '@angular/material/dialog';
 import { MatButtonModule } from '@angular/material/button';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { RbiCircularsService } from '../../../rbi-circulars/rbi-circulars.service';
 import { AuthenticationService } from '../../../core/authentication/authentication.service';
 import { ReserveTransferDialogComponent } from './reserve-transfer-dialog.component';
 /** One account under a head, at the base date and the reporting date. */
 interface CrrSlrRow {
@@ -31,6 +33,47 @@ interface CrrSlrRow {
  status: string;
 }
 /** One reserve account, with what it holds on the business date. */
 interface ReserveAccount {
  glAccountId: number;
  glCode: string;
  name: string;
  balance: number;
  /** The Form 1 item the account answers — V, VI(a), VI(b), VI(c). */
  item: string;
  head: string;
  /**
   * Whether the filed return reads this balance.
   *
   * An account the bank holds but has not mapped is still somewhere money can be moved, so it is
   * listed — but counting it toward what is maintained would have this screen claim a compliance
   * the return does not.
   */
  countsTowardMaintained: boolean;
 }
 /** One ratio's standing: what it needs, what it has, and which way the gap runs. */
 interface ReserveRatio {
  required: number;
  maintained: number;
  surplus: number;
  /** Positive — a shortfall is an amount to cover, not a negative surplus. */
  shortfall: number;
  met: boolean;
 }
 /** The reserve position as it stands on the business date. */
 interface ReservePosition {
  onDate: string;
  /** The close the requirement is charged on — a fortnight back, by RBI's lag rule. */
  baseDate: string;
  crrPercentage: number | null;
  slrPercentage: number | null;
  crr: ReserveRatio;
  slr: ReserveRatio;
  accounts: ReserveAccount[];
 }
@Component({
  selector: 'mifosx-crr-slr-dialog',
  standalone: true,
@@ -49,8 +92,18 @@ interface CrrSlrRow {
 export class CrrSlrDialogComponent implements OnInit {
  private dialogRef = inject(MatDialogRef<CrrSlrDialogComponent>);
  private rbi = inject(RbiCircularsService);
  private dialog = inject(MatDialog);
  private auth = inject(AuthenticationService);
-  activeTab: 'demand' | 'time' | 'assets' | 'slr' = 'demand';
+  activeTab: 'demand' | 'time' | 'assets' | 'slr' | 'held' = 'demand';
  /**
   * The reserve position on the business date — null until it loads, or if it cannot be read.
   *
   * Separate from the return the other tabs show: those report a fortnight close, this reports
   * where the money is now.
   */
  position: ReservePosition | null = null;
  /** The date the figures were struck at, as the return itself reports it. */
  reportingDateStr = '';
@@ -82,7 +135,23 @@ export class CrrSlrDialogComponent implements OnInit {
  totalDemand: number | null = null;
  totalTime: number | null = null;
  totalBankingAssets: number | null = null;
  /**
   * Whether item III was actually deducted from the base.
   *
   * It nets against item I rather than against the whole base, and the netting floors at zero — so
   * a bank holding more with other banks than it owes them has nothing deducted at all.
   */
  bankingAssetsNet = false;
  /** Item IV(a) — the bank's own net liabilities on the date being reported. */
  ndtl: number | null = null;
  /**
   * Item IV(b) — the base a fortnight back, which both ratios are actually charged on.
   *
   * A separate figure from `ndtl` above and not interchangeable with it: the requirement is struck
   * on this one, so a ratio or a tile that quotes the other states a percentage of something the
   * requirement was never computed from.
   */
  baseNdtl: number | null = null;
  crrRate: number | null = null;
  slrRate: number | null = null;
  crrRequired: number | null = null;
@@ -98,7 +167,7 @@ export class CrrSlrDialogComponent implements OnInit {
   * A dash and a zero say different things — "not reported" against "reported as nil" — and on a
   * regulatory screen the difference decides whether anyone goes looking for the missing mapping.
   */
-  crore(value: number | null): string {
+  rupees(value: number | null): string {
    if (value === null) {
      return '—';
    }
@@ -106,9 +175,19 @@ export class CrrSlrDialogComponent implements OnInit {
  }
  ngOnInit(): void {
-    // The return is reported in rupees; this screen reads in crore, as a dashboard tile does.
+    // Today's position, alongside the return below. The two answer different questions and are
-    const toCrore = (v: number | null | undefined): number | null =>
+    // fetched separately: the return reports a fortnight close, this reports the balances as they
-      v === null || v === undefined ? null : +(v / 1e7).toFixed(2);
+    // stand on the business date, which is what a desk can still act on.
    this.rbi.getReservePosition().subscribe({
      next: (data: ReservePosition) => (this.position = data),
      // A position that cannot be read leaves the other four tabs working. The tab simply shows
      // nothing rather than taking the whole dialog down with it.
      error: () => (this.position = null)
    });
    // Figures stay in rupees. They were rounded to crore until now, which on a bank this size threw
    // away everything that tells one fortnight from the next — a seventy-crore NDTL and the one a
    // fortnight later both read "₹70 Cr".
    // The statutory Form 1, not the working report. Form 1 is filed twice a month — at the 15th and
    // at the month end — and this screen should show the close the bank last filed, not a position
@@ -139,27 +218,66 @@ export class CrrSlrDialogComponent implements OnInit {
        // Part A's own lines, read by the Roman numeral each carries. Read from the return rather
        // than recomputed, so this screen and the filed form cannot come to disagree.
        const lines: any[] = data?.partA?.lines ?? [];
        // Matched without regard to case: the form prints its heads in capitals — "(A) DEMAND
        // LIABILITIES :" — and matching them as written left every tile reading a dash while the
        // figures sat in the response.
        // Matched without regard to case, and only against lines that actually carry figures. The
        // form heads item I with "(a) Demand Liabilities:" — a caption with no values — directly
        // above item II's "(A) DEMAND LIABILITIES :", which holds the figure. Matching on text
        // alone found the caption first and read a dash off it.
        const at = (startsWith: string): number | null => {
-          const line = lines.find((l: any) => String(l?.label ?? '').startsWith(startsWith));
+          const want = startsWith.toUpperCase();
          const line = lines.find(
            (l: any) =>
              Array.isArray(l?.values) &&
              String(l?.label ?? '')
                .toUpperCase()
                .startsWith(want)
          );
          return line?.values?.[latest] ?? null;
        };
-        this.totalDemand = toCrore(at('(A) Demand liabilities'));
+        // Item II's own two lines, matched including the trailing colon the form prints. Item I
-        this.totalTime = toCrore(at('(B) Time liabilities'));
+        // carries a "(b) Time Liabilities to the banking system" of its own — a different figure,
-        this.totalBankingAssets = toCrore(at('TOTAL OF III'));
+        // and the one a looser match found first.
-        // IV(b) is the base the ratios are actually charged on — the figure behind the requirement,
+        this.totalDemand = at('(A) DEMAND LIABILITIES :');
-        // not the bank's liabilities on the day being reported.
+        this.totalTime = at('(B) TIME LIABILITIES :');
-        this.ndtl = toCrore(at('IV. b)'));
+        this.totalBankingAssets = at('TOTAL OF III');
-        this.crrRequired = toCrore(data?.partB?.required?.[latest]);
+        // Whether item III actually came off the base. The form nets it against item I — the
-        this.slrRequired = toCrore(data?.partC?.required?.[latest]);
+        // liabilities OWED TO the banking system — and floors that netting at zero: where the
-        this.totalLiquidAssets = toCrore(data?.partC?.maintained?.[latest]);
+        // bank's assets with other banks exceed what it owes them, the excess is NOT deducted and
        // the base is item II alone. Stating "deducted from NDTL" in that case names a subtraction
        // the return did not make, and a reader checking the arithmetic finds it does not work.
        const liabilitiesToBanks = at('TOTAL OF I');
        this.bankingAssetsNet =
          liabilitiesToBanks !== null &&
          this.totalBankingAssets !== null &&
          liabilitiesToBanks > this.totalBankingAssets;
        // Two different figures, and the screen needs both.
        //
        // IV(a) is the bank's OWN net liabilities on the reporting date — what the demand, time and
        // banking-asset tiles add up to, so it is the one the formula row must end at. IV(b) is the
        // base a fortnight back, which is what the requirement is charged on.
        //
        // Showing IV(b) as the result of the formula was arithmetic that did not work: three terms
        // struck on one date reaching a figure struck on another, off by whatever the liabilities
        // had moved in between.
        this.ndtl = at('IV. a)');
        this.baseNdtl = at('IV. b)');
        this.crrRequired = data?.partB?.required?.[latest] ?? null;
        this.slrRequired = data?.partC?.required?.[latest] ?? null;
        this.totalLiquidAssets = data?.partC?.maintained?.[latest] ?? null;
        if (this.slrRequired !== null && this.totalLiquidAssets !== null) {
          this.slrSurplus = +(this.totalLiquidAssets - this.slrRequired).toFixed(2);
        }
-        if (this.ndtl) {
+        // Struck on the base, not on today's own liabilities: the requirement below it is charged
        // on the base, and a ratio measured against a different denominator from the one the
        // requirement uses cannot be compared with it — "33.62% against a minimum of 18%" would be
        // two percentages of two different things.
        if (this.baseNdtl) {
          this.slrActualPercent =
-            this.totalLiquidAssets === null ? null : +((this.totalLiquidAssets / this.ndtl) * 100).toFixed(2);
+            this.totalLiquidAssets === null ? null : +((this.totalLiquidAssets / this.baseNdtl) * 100).toFixed(2);
        }
        if (this.crrRequired !== null && this.slrRequired !== null) {
          this.totalReserve = +(this.crrRequired + this.slrRequired).toFixed(2);
@@ -209,13 +327,20 @@ export class CrrSlrDialogComponent implements OnInit {
        // The form's own wording, with its numbering trimmed off the front — the table has a column
        // of its own for that.
        name: label.replace(/^\s*\(?[a-zA-Z0-9]+\)?[.)]?\s*/, '').trim() || label.trim(),
-        sub: line.configKey ? String(line.configKey).replace(/_/g, ' ') : 'Derived from the form',
+        // The form's own numbering — I(a)(ii), II(A), VII(c) — rather than the configuration key
-        code: line.configKey ?? '—',
+        // behind it. A reader checking this screen against the filed return looks for the item
-        opening: this.crore(opening),
+        // number; FORM1_I_A_II_OTHER_DEMAND_BS is the name of a database row and means nothing to
-        current: this.crore(current),
+        // them.
        sub: '',
        code: (label.match(/^\s*\(?([IVXivx]+|[A-Za-z0-9]+)\)?[.)]?/) ?? [
            ,
            '—'
          ])[1] ?? '—',
        opening: this.rupees(opening),
        current: this.rupees(current),
        openingValue: opening,
        currentValue: current,
-        change: change === null ? '—' : `${change >= 0 ? '+' : ''}${this.crore(change).replace('₹', '')}`,
+        change: change === null ? '—' : `${change >= 0 ? '+' : ''}${this.rupees(change).replace('₹', '')}`,
        changeDir: change === null ? 'flat' : change >= 0 ? 'up' : 'dn',
        // A head with no GL mapped reports nothing, and the form says so rather than reporting nil.
        status: line.configured === false ? 'Not mapped' : 'Active'
@@ -235,7 +360,7 @@ export class CrrSlrDialogComponent implements OnInit {
   */
  totalOf(rows: CrrSlrRow[], column: 'openingValue' | 'currentValue'): string {
    const values = rows.map((r) => r[column]).filter((v): v is number => v !== null);
-    return values.length ? this.crore(values.reduce((a, b) => a + b, 0)) : '—';
+    return values.length ? this.rupees(values.reduce((a, b) => a + b, 0)) : '—';
  }
  /** The movement across a tab, between the two closes the form reports. */
@@ -246,7 +371,7 @@ export class CrrSlrDialogComponent implements OnInit {
      return '—';
    }
    const change = current.reduce((a, b) => a + b, 0) - opening.reduce((a, b) => a + b, 0);
-    return `${change >= 0 ? '+' : ''}${this.crore(change).replace('₹', '')}`;
+    return `${change >= 0 ? '+' : ''}${this.rupees(change).replace('₹', '')}`;
  }
  /** Fills the four tabs from one reading of the form. */
@@ -257,16 +382,148 @@ export class CrrSlrDialogComponent implements OnInit {
    };
    // Matched on how the form labels each head, not on a fixed list of account names: a bank that
    // maps a new account to a head gets it on the right tab without this screen being changed.
-    this.demandLiabilities = this.rowsFrom(lines, latest, (l) => has(l, 'demand liabilit'));
+    // Item II only — what the bank owes its own depositors. Item I's lines are worded the same way
-    this.timeLiabilities = this.rowsFrom(lines, latest, (l) => has(l, 'time liabilit') && !has(l, 'demand and time'));
+    // but are owed to the banking system, and the form nets them against item III rather than
-    // III — what the banking system owes this bank, which nets off the liability base.
+    // adding them here, so a tab headed "payable on demand" that carried both would double-count
-    this.bankingAssets = this.rowsFrom(lines, latest, (l) =>
+    // the one and misstate the other.
-      has(l, 'current account balances with sbi', 'balances in all accounts', 'money at call', 'advances and any other')
+    const toBankingSystem = (l: string): boolean => has(l, 'to the banking system', 'banking system');
    this.demandLiabilities = this.rowsFrom(lines, latest, (l) => has(l, 'demand liabilit') && !toBankingSystem(l));
    this.timeLiabilities = this.rowsFrom(
      lines,
      latest,
      (l) => has(l, 'time liabilit') && !has(l, 'demand and time') && !toBankingSystem(l)
    );
-    // V, VI and VII — the cash, balances and securities the two ratios are met in.
+    // III — what the banking system owes this bank, which nets off the liability base. Matched on
-    this.liquidAssets = this.rowsFrom(lines, latest, (l) =>
+    // the words the form actually prints: its item III(a) reads "TOTAL OF CREDIT BALANCES IN
-      has(l, 'cash on hand', 'reserve bank of india', 'co-operative bank', 'government securities')
+    // CURRENT ACCOUNT maintained with S.B.I...", which the shorter phrases this looked for never
    // appeared in, so the tab came out empty while its total showed a figure.
    this.bankingAssets = this.rowsFrom(
      lines,
      latest,
      (l) =>
        has(
          l,
          'credit balances in current account',
          'other assets with the banking system',
          'balances in all accounts',
          'money at call',
          'advances & any other'
        ) &&
        // Item I(a)(i) is worded almost identically but is the opposite side of the ledger: what
        // the banking system holds WITH this bank, a liability. On a tab headed "deducted from
        // gross liabilities" it would be read as an asset and netted the wrong way.
        !has(l, 'maintained with the co-operative bank by state')
    );
    // V, VI and VII — the cash, balances and securities the two ratios are met in. Item I's own
    // SBI line is excluded: it is a liability TO the banking system, and listing it among the
    // assets held against a ratio reads as something the bank can count toward it.
    this.liquidAssets = this.rowsFrom(
      lines,
      latest,
      (l) =>
        has(l, 'cash on hand', 'reserve bank of india', 'co.op.bank', 'co-operative bank', 'govt. security') &&
        !has(l, 'maintained with the co-operative bank by state')
    );
  }
  /**
   * The two ratios as rows, so the template states them once rather than twice over.
   */
  positionRatios(): {
    name: string;
    rate: number | null;
    required: number;
    maintained: number;
    surplus: number;
    shortfall: number;
    met: boolean;
  }[] {
    if (!this.position) {
      return [];
    }
    return [
      { name: 'CRR', rate: this.position.crrPercentage, ...this.position.crr },
      { name: 'SLR', rate: this.position.slrPercentage, ...this.position.slr }
    ];
  }
  /**
   * A reserve figure in rupees, to the paisa.
   *
   * Not rounded like the table cells above: a desk covering a shortfall transfers an exact amount, and
   * "₹0.37 Cr" is not an amount anyone can send.
   */
  money(value: number | null | undefined): string {
    if (value === null || value === undefined) {
      return '—';
    }
    return `₹${value.toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
  }
  /**
   * A figure for a summary tile, scaled so it fits however large the bank grows.
   *
   * Tiles are read for order of magnitude, so they carry whole rupees up to a crore and switch to
   * crore above it: ₹70,10,45,062 is nineteen characters and overflows its card, where ₹70.10 Cr
   * is seven and says the same thing to anyone glancing at it. The exact amount, to the paise, is
   * on the tables below and on the reserve-accounts tab — which is where anyone acting on a figure
   * rather than scanning it goes.
   *
   * Scaled rather than merely shrunk, because a fixed format only ever fits the balances the bank
   * happens to hold today. This one holds at four or five characters whether the figure is lakhs
   * or lakh-crore, so a bank that grows ten-fold does not come back to a row of clipped tiles.
   */
  tile(value: number | null | undefined): string {
    if (value === null || value === undefined) {
      return '—';
    }
    const abs = Math.abs(value);
    const sign = value < 0 ? '-' : '';
    // Indian scale: a crore is 1e7, a lakh 1e5. Below a lakh the whole rupee figure is already
    // short enough that scaling it would hide detail for nothing.
    if (abs >= 1e7) {
      return `${sign}₹${(abs / 1e7).toLocaleString('en-IN', { maximumFractionDigits: 2 })} Cr`;
    }
    if (abs >= 1e5) {
      return `${sign}₹${(abs / 1e5).toLocaleString('en-IN', { maximumFractionDigits: 2 })} L`;
    }
    return `${sign}₹${Math.round(abs).toLocaleString('en-IN')}`;
  }
  /**
   * Move money into or out of a reserve account.
   *
   * The entry posts through the platform's own journal command, so it goes to maker-checker like
   * any other entry against the ledger — the money is real, and a transfer that settles a statutory
   * requirement is not a thing one person should be able to post alone.
   */
  openTransfer(account: ReserveAccount): void {
    const ref = this.dialog.open(ReserveTransferDialogComponent, {
      data: {
        from: account,
        // Only the reserve accounts. A transfer out of the cash reserve into something that does
        // not count toward it would quietly reduce what is maintained, and this screen exists to
        // keep that figure up.
        accounts: this.position?.accounts ?? [],
        // The entry posts against the user's own office — the one whose books hold these accounts.
        // Falls back to head office, which Fineract seeds as 1, rather than failing to open.
        officeId: this.auth.getCredentials()?.officeId ?? 1,
        currencyCode: 'INR'
      },
      autoFocus: false
    });
    ref.afterClosed().subscribe((posted: boolean) => {
      if (posted) {
        // The balances on screen are now a step behind the ledger. Read again rather than adjusting
        // them here: the entry may have gone to maker-checker and not yet moved anything, and a
        // screen that assumed it had would show a position the bank is not in.
        this.rbi.getReservePosition().subscribe({
          next: (data: ReservePosition) => (this.position = data),
          error: () => undefined
        });
      }
    });
  }
  close(): void {
@@ -0,0 +1,124 @@
 <!--
  Copyright since 2025 Mifos Initiative
  This Source Code Form is subject to the terms of the Mozilla Public
  License, v. 2.0. If a copy of the MPL was not distributed with this
  file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 <div class="rt">
  <div class="rt-head">
    <h2 class="rt-title">Transfer between reserve accounts</h2>
    <button class="rt-x" (click)="close()" aria-label="Close">
      <fa-icon icon="times"></fa-icon>
    </button>
  </div>
  <!-- The two accounts, the way a desk thinks about them: money leaves one and arrives in the
       other. The ledger's debit and credit are worked out when the entry posts, because asking a
       treasury user which side to credit in order to move their own money is asking them to do the
       ledger's job. -->
  <div class="rt-from">
    <div class="rt-field-label">From</div>
    <div class="rt-acct">
      <div class="rt-acct-name">{{ from.name }}</div>
      <div class="rt-acct-sub">{{ from.glCode }} &middot; {{ from.item }} {{ from.head }}</div>
    </div>
    <div class="rt-bal">
      <span class="rt-bal-label">Balance</span>
      <span class="rt-bal-val">{{ money(from.balance) }}</span>
    </div>
  </div>
  <div class="rt-arrow"><fa-icon icon="arrow-down"></fa-icon></div>
  <div class="rt-row">
    <label class="rt-field-label" for="rt-to">To</label>
    <select id="rt-to" class="rt-input" [(ngModel)]="toAccountId">
      <option [ngValue]="null">Choose the account to receive it</option>
      @for (a of destinations; track a.glAccountId) {
        <option [ngValue]="a.glAccountId">{{ a.glCode }} &middot; {{ a.name }} &mdash; {{ money(a.balance) }}</option>
      }
    </select>
  </div>
  <div class="rt-row">
    <label class="rt-field-label" for="rt-amt">Amount to transfer</label>
    <div class="rt-amount-wrap">
      <span class="rt-rupee">&#8377;</span>
      <input
        id="rt-amt"
        class="rt-input rt-amount"
        type="number"
        min="0"
        step="0.01"
        placeholder="0.00"
        [(ngModel)]="amount"
      />
    </div>
    <!-- An account cannot send more than it holds: the ledger would carry a negative balance on a
         bank account, which is not a position that exists. Said as the amount is typed rather than
         on submit, so the figure is corrected before anyone commits to it. -->
    @if (overdrawn) {
      <div class="rt-warn">More than {{ from.name }} holds. It has {{ money(from.balance) }}.</div>
    }
  </div>
  <!-- What each account would hold once this posts. A transfer is made to reach a balance, so the
       balance it reaches is the thing worth showing before it is sent. -->
  @if (to && (amount ?? 0) > 0 && !overdrawn) {
    <div class="rt-after">
      <div class="rt-after-row">
        <span>{{ from.name }}</span>
        <span
          >{{ money(from.balance) }} &rarr; <strong>{{ money(fromAfter) }}</strong></span
        >
      </div>
      <div class="rt-after-row">
        <span>{{ to.name }}</span>
        <span
          >{{ money(to.balance) }} &rarr; <strong>{{ money(toAfter) }}</strong></span
        >
      </div>
    </div>
  }
  <div class="rt-row">
    <label class="rt-field-label" for="rt-ref">Reference <span class="rt-opt">optional</span></label>
    <input id="rt-ref" class="rt-input" type="text" placeholder="NEFT / RTGS reference" [(ngModel)]="reference" />
  </div>
  <div class="rt-row">
    <label class="rt-field-label" for="rt-note">Note <span class="rt-opt">optional</span></label>
    <input
      id="rt-note"
      class="rt-input"
      type="text"
      placeholder="Why the money is being moved"
      [(ngModel)]="comments"
    />
  </div>
  <!-- What this does and does not do. The entry is the bank's record of the movement; the money
       reaches the other bank when the desk sends the NEFT or RTGS. A screen that posted silently
       would leave someone believing the funds had moved. -->
  <div class="rt-note">
    <fa-icon icon="info-circle"></fa-icon>
    This records the movement in the ledger and goes for approval. Send the NEFT or RTGS separately &mdash; the money
    does not move until you do.
  </div>
  @if (error) {
    <div class="rt-error">
      <fa-icon icon="exclamation-triangle"></fa-icon>
      {{ error }}
    </div>
  }
  <div class="rt-actions">
    <button mat-button (click)="close()">Cancel</button>
    <button mat-raised-button color="primary" [disabled]="!canSubmit" (click)="submit()">
      {{ submitting ? 'Posting…' : 'Post transfer' }}
    </button>
  </div>
 </div>
@@ -0,0 +1,223 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 $ink: #202124;
 $ink2: #3c4043;
 $ink3: #5f6368;
 $border: #e2e8f0;
 $primary: #0b5394;
 $red: #c5221f;
 $amber: #b06000;
 $surface: #fff;
 $mono: 'Roboto Mono', 'Courier New', monospace;
 .rt {
  padding: 20px 24px 16px;
  min-width: 420px;
  max-width: 520px;
 }
 .rt-head {
  display: flex;
  align-items: flex-start;
  justify-content: space-between;
  margin-bottom: 18px;
 }
 .rt-title {
  margin: 0;
  font-size: 17px;
  font-weight: 600;
  color: $ink;
 }
 .rt-x {
  border: none;
  background: none;
  color: $ink3;
  cursor: pointer;
  padding: 2px 6px;
  &:hover {
    color: $ink;
  }
 }
 .rt-field-label {
  display: block;
  font-size: 11px;
  font-weight: 600;
  letter-spacing: 0.4px;
  text-transform: uppercase;
  color: $ink3;
  margin-bottom: 6px;
 }
 .rt-opt {
  font-weight: 400;
  text-transform: none;
  letter-spacing: 0;
  color: $ink3;
  opacity: 0.75;
 }
 // The source account — fixed, since the dialog is opened from its row, so it reads as a statement
 // rather than as another field to fill in.
 .rt-from {
  padding: 12px 14px;
  border: 1px solid $border;
  border-radius: 8px;
  background: #f8fafc;
 }
 .rt-acct-name {
  font-size: 14px;
  font-weight: 600;
  color: $ink;
 }
 .rt-acct-sub {
  font-size: 11px;
  color: $ink3;
  font-family: $mono;
  margin-top: 2px;
 }
 .rt-bal {
  display: flex;
  justify-content: space-between;
  align-items: baseline;
  margin-top: 8px;
  padding-top: 8px;
  border-top: 1px dashed $border;
 }
 .rt-bal-label {
  font-size: 11px;
  color: $ink3;
 }
 .rt-bal-val {
  font-family: $mono;
  font-size: 14px;
  font-weight: 600;
  color: $ink;
  font-variant-numeric: tabular-nums;
 }
 .rt-arrow {
  text-align: center;
  color: $primary;
  margin: 10px 0;
 }
 .rt-row {
  margin-bottom: 14px;
 }
 .rt-input {
  width: 100%;
  box-sizing: border-box;
  padding: 9px 11px;
  border: 1px solid $border;
  border-radius: 6px;
  font-size: 14px;
  color: $ink2;
  background: $surface;
  &:focus {
    outline: none;
    border-color: $primary;
  }
 }
 // The amount carries the rupee inside the field, so the figure is read as money without the sign
 // being something anyone has to type.
 .rt-amount-wrap {
  position: relative;
 }
 .rt-rupee {
  position: absolute;
  left: 11px;
  top: 50%;
  transform: translateY(-50%);
  color: $ink3;
  font-size: 14px;
 }
 .rt-amount {
  padding-left: 26px;
  font-family: $mono;
  font-variant-numeric: tabular-nums;
 }
 .rt-warn {
  margin-top: 6px;
  font-size: 12px;
  color: $red;
 }
 // What each account would hold once this posts — a transfer is made to reach a balance, so the
 // balance it reaches belongs on screen before it is sent.
 .rt-after {
  padding: 10px 14px;
  margin-bottom: 14px;
  border: 1px solid #cfe3d4;
  border-radius: 8px;
  background: #f1f8f3;
  font-size: 12px;
 }
 .rt-after-row {
  display: flex;
  justify-content: space-between;
  gap: 16px;
  color: $ink2;
  & + & {
    margin-top: 5px;
  }
  strong {
    font-family: $mono;
    font-variant-numeric: tabular-nums;
  }
 }
 // What the entry does and does not do: the money moves when the desk sends the NEFT, not when this
 // posts, and a dialog that stayed silent would leave someone believing otherwise.
 .rt-note {
  display: flex;
  gap: 8px;
  padding: 10px 12px;
  border-radius: 8px;
  background: #fff8e6;
  color: $amber;
  font-size: 12px;
  line-height: 1.45;
 }
 .rt-error {
  display: flex;
  gap: 8px;
  margin-top: 12px;
  padding: 10px 12px;
  border-radius: 8px;
  background: #fdecea;
  color: $red;
  font-size: 12px;
  line-height: 1.45;
 }
 .rt-actions {
  display: flex;
  justify-content: flex-end;
  gap: 8px;
  margin-top: 18px;
 }
@@ -0,0 +1,167 @@
 /**
 * Copyright since 2025 Mifos Initiative
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 import { Component, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialogRef, MatDialogModule } from '@angular/material/dialog';
 import { MatButtonModule } from '@angular/material/button';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { RbiCircularsService } from '../../../rbi-circulars/rbi-circulars.service';
 /** A reserve account as the position screen lists it. */
 export interface TransferAccount {
  glAccountId: number;
  glCode: string;
  name: string;
  balance: number;
  item: string;
  head: string;
 }
 /** What the dialog is opened with: the account clicked, and everything it may move to. */
 export interface ReserveTransferData {
  from: TransferAccount;
  accounts: TransferAccount[];
  /** The office the entry posts against, and the date it posts on. */
  officeId: number;
  currencyCode: string;
 }
 /**
 * Moves money between the accounts the cash reserve is held in.
 *
 * The entry posts through the platform's own journal command, so it goes to maker-checker like any
 * other entry against the ledger. That is deliberate: the amounts settle a statutory requirement,
 * and a transfer that changes whether the bank is compliant is not something one person should be
 * able to post alone.
 *
 * It records the movement; it does not make it. The money reaches the other bank when the treasury
 * desk sends the NEFT or RTGS, and this entry is the bank's own record of having done so — which is
 * why the dialog says as much before it posts.
 */
@Component({
  selector: 'mifosx-reserve-transfer-dialog',
  standalone: true,
  templateUrl: './reserve-transfer-dialog.component.html',
  styleUrls: ['./reserve-transfer-dialog.component.scss'],
  imports: [
    CommonModule,
    FormsModule,
    MatDialogModule,
    MatButtonModule,
    FaIconComponent
  ]
 })
 export class ReserveTransferDialogComponent {
  private dialogRef = inject(MatDialogRef<ReserveTransferDialogComponent>);
  private rbi = inject(RbiCircularsService);
  /** The account money leaves. Fixed — the dialog is opened from its row. */
  readonly from: TransferAccount;
  /** Everything it can move to: the other reserve accounts, never itself. */
  readonly destinations: TransferAccount[];
  toAccountId: number | null = null;
  amount: number | null = null;
  reference = '';
  comments = '';
  submitting = false;
  error = '';
  readonly data = inject<ReserveTransferData>(MAT_DIALOG_DATA);
  constructor() {
    this.from = this.data.from;
    this.destinations = (this.data.accounts ?? []).filter((a) => a.glAccountId !== this.data.from.glAccountId);
  }
  /** The account chosen to receive the money, while one is chosen. */
  get to(): TransferAccount | null {
    return this.destinations.find((a) => a.glAccountId === this.toAccountId) ?? null;
  }
  /** What the source would hold once this posts — the figure that decides whether it may. */
  get fromAfter(): number {
    return this.from.balance - (this.amount ?? 0);
  }
  get toAfter(): number {
    return (this.to?.balance ?? 0) + (this.amount ?? 0);
  }
  /**
   * Whether the amount can actually be sent.
   *
   * An account cannot send more than it holds: the ledger would carry a negative balance on a cash
   * or bank account, which is not a position that exists.
   */
  get overdrawn(): boolean {
    return this.amount !== null && this.amount > this.from.balance;
  }
  get canSubmit(): boolean {
    return !this.submitting && this.toAccountId !== null && (this.amount ?? 0) > 0 && !this.overdrawn;
  }
  money(value: number | null | undefined): string {
    if (value === null || value === undefined) {
      return '—';
    }
    return `₹${value.toLocaleString('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
  }
  /**
   * Posts the transfer as a single journal entry.
   *
   * These are asset accounts, so the one money LEAVES is credited and the one it arrives in is
   * debited — the opposite of how the screen words it, and deliberately so: a treasury user thinks
   * "send from here, receive there", and making them think in debits and credits to move their own
   * money would be asking them to do the ledger's job.
   */
  submit(): void {
    if (!this.canSubmit || !this.to) {
      return;
    }
    this.submitting = true;
    this.error = '';
    // The reserve endpoint, not the manual journal entry one: that is turned off at the HTTP edge
    // on this installation. The sides are named from and to, as a desk thinks of them; the debit
    // and credit are worked out on the server, where the accounts can also be checked.
    const transfer = {
      fromGlAccountId: this.from.glAccountId,
      toGlAccountId: this.to.glAccountId,
      amount: this.amount as number,
      officeId: this.data.officeId,
      reference: this.reference || undefined,
      comments:
        this.comments || `Reserve transfer: ${this.from.glCode} ${this.from.name} to ${this.to.glCode} ${this.to.name}`
    };
    this.rbi.transferReserve(transfer).subscribe({
      next: () => this.dialogRef.close(true),
      error: (err: any) => {
        this.submitting = false;
        // The platform's own message, not a rewritten one: it names the rule that stopped the
        // entry — a closed accounting period, a disabled account — and a generic "could not post"
        // sends the user to look for a fault that has already been explained.
        this.error =
          err?.error?.developerMessage ||
          err?.error?.defaultUserMessage ||
          err?.error?.errors?.[0]?.defaultUserMessage ||
          'The transfer could not be posted.';
      }
    });
  }
  close(): void {
    this.dialogRef.close(false);
  }
 }
@@ -38,12 +38,18 @@
            >
            <span class="metric-value">{{ crrSlr.crrRequired }}</span>
          </div>
          @if (crrSlr.crrGap) {
            <div class="metric-gap" [class.metric-gap--short]="crrSlr.crrGap.short">{{ crrSlr.crrGap.text }}</div>
          }
          <div class="metric-row">
            <span class="metric-label"
              >SLR Required{{ crrSlr.slrRate === null ? '' : ' (' + crrSlr.slrRate + '%)' }}</span
            >
            <span class="metric-value">{{ crrSlr.slrRequired }}</span>
          </div>
          @if (crrSlr.slrGap) {
            <div class="metric-gap" [class.metric-gap--short]="crrSlr.slrGap.short">{{ crrSlr.slrGap.text }}</div>
          }
        </div>
        <!-- "Within Limits" is a compliance statement, so it is made only where the return actually
             says so. Where it cannot compute, the card says that instead of passing the bank. -->
@@ -899,3 +899,17 @@ $purple: #7c3aed;
    text-align: center;
  }
 }
 // What is held against a requirement, under the requirement itself. Surplus is quiet; a shortfall is
 // red, because on a compliance card it is the one line that must not be read past.
 .metric-gap {
  margin: -2px 0 8px;
  text-align: right;
  font-size: 11px;
  color: #137333;
 }
 .metric-gap--short {
  color: #c5221f;
  font-weight: 700;
 }
@@ -61,8 +61,19 @@ export class DashboardComponent implements OnInit {
    slrRate: number | null;
    crrRequired: string;
    slrRequired: string;
    /** Surplus, or the shortfall, per ratio. A shortfall is its own amount, not a negative surplus. */
    crrGap: { text: string; short: boolean } | null;
    slrGap: { text: string; short: boolean } | null;
    status: 'ok' | 'short' | 'unknown';
-  } = { crrRate: null, slrRate: null, crrRequired: '—', slrRequired: '—', status: 'unknown' };
+  } = {
    crrRate: null,
    slrRate: null,
    crrRequired: '—',
    slrRequired: '—',
    crrGap: null,
    slrGap: null,
    status: 'unknown'
  };
  /** Array of all user activities */
  userActivity: string[];
@@ -93,8 +104,27 @@ export class DashboardComponent implements OnInit {
  /** Fills the CRR/SLR tile from the return, leaving it dashed where the return cannot compute. */
  private loadCrrSlr(): void {
-    const crore = (v: number | null | undefined): string =>
+    // Rupees, not crore. Rounding to crore on a bank this size collapsed the figures to "₹2 Cr"
-      v === null || v === undefined ? '—' : `₹${Math.round(v / 1e7).toLocaleString('en-IN')} Cr`;
+    // and "₹13 Cr" — two requirements a crore apart both read the same, and a tile a treasury desk
    // glances at said nothing it could act on.
    // Scaled to the Indian crore/lakh so the tile holds its figure however large the bank grows.
    // Plain rupees ran to nineteen characters on a seventy-crore requirement and overflowed the
    // card; rounding to crore outright collapsed two requirements a crore apart to the same "₹2
    // Cr". This keeps four or five characters and two decimals of precision at any scale.
    const money = (v: number | null | undefined): string => {
      if (v === null || v === undefined) {
        return '—';
      }
      const abs = Math.abs(v);
      const sign = v < 0 ? '-' : '';
      if (abs >= 1e7) {
        return `${sign}₹${(abs / 1e7).toLocaleString('en-IN', { maximumFractionDigits: 2 })} Cr`;
      }
      if (abs >= 1e5) {
        return `${sign}₹${(abs / 1e5).toLocaleString('en-IN', { maximumFractionDigits: 2 })} L`;
      }
      return `${sign}₹${Math.round(abs).toLocaleString('en-IN')}`;
    };
    // The statutory Form 1, which is the return this bank files — twice a month, at the 15th and at
    // the month end. The working report's 45-day lag lands mid-fortnight, on a date the bank never
@@ -107,8 +137,8 @@ export class DashboardComponent implements OnInit {
        }
        this.crrSlr.crrRate = data?.crrPercentage ?? null;
        this.crrSlr.slrRate = data?.slrPercentage ?? null;
-        this.crrSlr.crrRequired = crore(data?.partB?.required?.[latest]);
+        this.crrSlr.crrRequired = money(data?.partB?.required?.[latest]);
-        this.crrSlr.slrRequired = crore(data?.partC?.required?.[latest]);
+        this.crrSlr.slrRequired = money(data?.partC?.required?.[latest]);
        // Compliant only where BOTH ratios are met: the tile carries one tag for the pair, and a
        // bank short on SLR is not within limits because its cash reserve happens to be ample.
@@ -116,6 +146,19 @@ export class DashboardComponent implements OnInit {
        const crrNeed = data?.partB?.required?.[latest];
        const slrHeld = data?.partC?.maintained?.[latest];
        const slrNeed = data?.partC?.required?.[latest];
        // Each ratio's own standing, under its requirement: surplus where it is met, and the
        // shortfall — in red, named as one — where it is not. A single "Shortfall" tag said the bank
        // was short without saying which ratio or by how much, which is the first thing asked.
        const gap = (held: number | null | undefined, need: number | null | undefined) => {
          if (held === null || held === undefined || need === null || need === undefined) {
            return null;
          }
          const short = held < need;
          return { text: `${short ? 'Short' : 'Surplus'} ${money(Math.abs(held - need))}`, short };
        };
        this.crrSlr.crrGap = gap(crrHeld, crrNeed);
        this.crrSlr.slrGap = gap(slrHeld, slrNeed);
        if ([
            crrHeld,
            crrNeed,
@@ -47,23 +47,6 @@
    </div>
  </div>
  <!-- Pending investment interest vouchers (coupon / provision due now or within two days) -->
  @if (pendingInvestmentInterest.length) {
    <a class="investment-interest-alert" routerLink="/investment/bonds" [queryParams]="{ tab: 'interest' }">
      <span class="iia-icon">🔔</span>
      <span class="iia-text">
        <strong>{{ pendingInvestmentInterest.length }} investment interest voucher(s) pending</strong>
        @for (t of pendingInvestmentInterest; track t.purchaseId) {
          <span class="iia-item">
            {{ t.lineType === 'COUPON' ? 'Coupon' : 'Provision' }} · {{ t.scriptDesc }} · deal {{ t.dealNo }} ·
            {{ t.overdue ? 'overdue since ' + t.intDate : t.postable ? 'due today' : 'due ' + t.intDate }}
          </span>
        }
      </span>
      <span class="iia-action">Open Interest Entry →</span>
    </a>
  }
  <!-- Quick Action Cards -->
  <div class="quick-actions">
    <a class="qa-card" [routerLink]="['/dashboard']" #buttonDashboard>
@@ -424,39 +424,3 @@ $accent: #0ea5e9;
    grid-template-columns: 1fr;
  }
 }
 .investment-interest-alert {
  display: flex;
  align-items: flex-start;
  gap: 12px;
  margin: 12px 0;
  padding: 12px 16px;
  border: 1px solid #f5c26b;
  border-left: 4px solid #e08e0b;
  border-radius: 8px;
  background: #fff8e6;
  color: #5c3d00;
  text-decoration: none;
  .iia-icon {
    font-size: 20px;
    line-height: 1.2;
  }
  .iia-text {
    display: flex;
    flex: 1;
    flex-direction: column;
    gap: 2px;
  }
  .iia-item {
    font-size: 13px;
  }
  .iia-action {
    align-self: center;
    font-weight: 600;
    white-space: nowrap;
  }
 }
@@ -26,7 +26,6 @@ import { PopoverService } from '../configuration-wizard/popover/popover.service'
 import { ConfigurationWizardService } from '../configuration-wizard/configuration-wizard.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { DscService } from 'app/users/dsc/dsc.service';
 import { InvestmentInterestDueDto, InvestmentService } from 'app/investment/investment.service';
 /** Custom Components */
 import { NextStepDialogComponent } from '../configuration-wizard/next-step-dialog/next-step-dialog.component';
@@ -110,7 +109,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
    this.tenant = this.tenantIdentifier();
    this.setFilteredActivities();
    this.loadDscStatus();
    this.loadPendingInvestmentInterest();
    if (!this.authenticationService.hasDialogBeenShown()) {
      this.dialog.open(WarningDialogComponent, {
        disableClose: false,
@@ -120,18 +118,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
    }
  }
  /** Investment interest lines due now or within two days, shown on the home screen so nobody has to look for them. */
  pendingInvestmentInterest: InvestmentInterestDueDto[] = [];
  private readonly investmentService = inject(InvestmentService);
  /** Silent when the user cannot see investments or nothing is due — the strip simply does not render. */
  private loadPendingInvestmentInterest(): void {
    this.investmentService.getDueInterest().subscribe({
      next: (due) => (this.pendingInvestmentInterest = due ?? []),
      error: () => (this.pendingInvestmentInterest = [])
    });
  }
  /**
   * Surface a small "DSC verified" badge in the welcome banner when the
   * signed-in user has at least one ACTIVE DSC certificate. Silent on
@@ -137,12 +137,11 @@
            <th class="num">Units</th>
            <th class="num">Face Value</th>
            <th class="num">Rate</th>
-            <th>Settlement Date</th>
+            <th>Purchase Date</th>
            <th>Maturity Date</th>
            <th class="num col-in">Accrued Interest</th>
            <th class="num col-net">Maturity Value</th>
            <th>Status</th>
            <th>Settlement</th>
          </tr>
        </thead>
        <tbody>
@@ -161,23 +160,12 @@
              <td class="num col-in">₹{{ accrued(h) | number: '1.2-2' }}</td>
              <td class="num col-net">₹{{ maturity(h) | number: '1.2-2' }}</td>
              <td>
-                <span [class]="statusClass(h)">{{
+                <span [class]="statusClass(h)">{{ h.status }}</span>
                  h.status === 'PENDING_SETTLEMENT' ? 'PENDING SETTLEMENT' : h.status
                }}</span>
              </td>
              <td>
                @if (h.status === 'PENDING_SETTLEMENT') {
                  <button type="button" class="pg-btn pg-btn--primary" (click)="settleDeal(h)">
                    Settle ({{ h.settlementDate }})
                  </button>
                } @else if (h.glTransactionId) {
                  <span class="pg-chip" title="Journal entry transaction">GL {{ h.glTransactionId }}</span>
                }
              </td>
            </tr>
          } @empty {
            <tr>
-              <td colspan="12" class="pg-empty">No {{ instrumentLabel(bondType) }} holdings yet.</td>
+              <td colspan="11" class="pg-empty">No {{ instrumentLabel(bondType) }} holdings yet.</td>
            </tr>
          }
        </tbody>
@@ -188,9 +176,8 @@
  <!-- ===================== 01 PURCHASE ENTRY ===================== -->
  @if (activeTab === 'purchase') {
    <div class="pg-card">
      <!-- 1. Deal details — the only fields the dealer has to fill -->
      <div class="pos-section-label">
-        Purchase Entry — {{ instrumentLabel(purchaseForm.bondType) }} (fields marked * are mandatory)
+        Investment - Govt.Security/Bond Entry ({{ instrumentLabel(purchaseForm.bondType) }})
      </div>
      <div class="inv-form-grid">
        <label class="inv-form-field">
@@ -201,6 +188,17 @@
            }
          </select>
        </label>
        <label class="inv-form-field"
          ><span>Deal No</span><input type="text" [(ngModel)]="purchaseForm.dealNo" readonly
        /></label>
        <label class="inv-form-field"
          ><span>* Deal Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.dealDate"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field"
          ><span>* Deal Time (24 hr, HH:mm:ss)</span
          ><input type="text" [(ngModel)]="purchaseForm.dealTime" placeholder="HH:mm:ss"
        /></label>
        <label class="inv-form-field"><span>* ISIN</span><input type="text" [(ngModel)]="purchaseForm.isin" /></label>
        <label class="inv-form-field">
          <span>* Script Code</span>
          <select [(ngModel)]="purchaseForm.scriptCode" (ngModelChange)="onScriptChange()">
@@ -210,50 +208,167 @@
            }
          </select>
        </label>
        <label class="inv-form-field">
          <span>* Party Code</span>
          <select [(ngModel)]="purchaseForm.partyCode">
            <option value="">-- Select --</option>
            @for (p of activePartyOptions; track p.partyCode) {
              <option [value]="p.partyCode">{{ p.partyCode }} — {{ p.partyName }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
-          ><span>* Deal Date</span
+          ><span>* Cert No</span><input type="text" [(ngModel)]="purchaseForm.certNo"
          ><mifosx-date-ddmmyyyy
            [(ngModel)]="purchaseForm.dealDate"
            (ngModelChange)="onDealDateChange()"
          ></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field"
          ><span>* Deal Time (HH:mm:ss)</span
          ><input type="text" [(ngModel)]="purchaseForm.dealTime" placeholder="HH:mm:ss"
        /></label>
        <label class="inv-form-field">
-          <span>* Settlement Type</span>
+          <span>Settlement Type</span>
          <select [(ngModel)]="purchaseForm.settlementType">
            <option value="T+0">T+0</option>
            <option value="T+1">T+1</option>
            <option value="T+2">T+2</option>
          </select>
        </label>
        <label class="inv-form-field"
          ><span>Settlement Dt</span
          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.settlementDt"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field">
          <span>* Party Code</span>
          <select [(ngModel)]="purchaseForm.partyCode">
            <option value="">-- Select --</option>
            @for (p of partyOptions; track p.partyCode) {
              <option [value]="p.partyName">{{ p.partyName }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field">
          <span>Sub Type</span>
          <select [(ngModel)]="purchaseForm.subType">
            @for (s of subTypeOptions; track s.subTypeCode + s.subTypeName) {
              <option [value]="s.subTypeName">{{ s.subTypeName }}</option>
            }
          </select>
        </label>
        @if (isMutualFund) {
          <label class="inv-form-field">
            <span>* Product Name</span>
            <select [(ngModel)]="purchaseForm.productName">
              <option value="">-- Select --</option>
              @for (p of mfProductOptions; track p.productCode) {
                <option [value]="p.productName">{{ p.productName }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field"
-            ><span>* Consider Amt (₹)</span><input type="number" [(ngModel)]="purchaseForm.considerAmt" min="0"
+            ><span>Holding Days</span><input type="number" [(ngModel)]="purchaseForm.holdingDays" min="0"
          /></label>
          <label class="inv-form-field"
-            ><span>* NAV</span><input type="number" [(ngModel)]="purchaseForm.nav" min="0" step="0.0001"
+            ><span>* Consider Amt</span><input type="number" [(ngModel)]="purchaseForm.considerAmt" min="0"
          /></label>
          <label class="inv-form-field"
            ><span>Trade Amt</span><input type="number" [(ngModel)]="purchaseForm.tradeAmt" min="0"
          /></label>
          <label class="inv-form-field"
            ><span>NAV</span><input type="number" [(ngModel)]="purchaseForm.nav" min="0" step="0.0001"
          /></label>
          <label class="inv-form-field"
            ><span>Stamp Duty</span><input type="number" [(ngModel)]="purchaseForm.stampDuty" min="0"
          /></label>
          <label class="inv-form-field"
            ><span>StampDuty A/c</span><input type="text" [(ngModel)]="purchaseForm.stampDutyAc"
          /></label>
        } @else {
          <label class="inv-form-field"
-            ><span>* Face Value (₹)</span><input type="number" [(ngModel)]="purchaseForm.faceValue" min="0"
+            ><span>Face Value</span><input type="number" [(ngModel)]="purchaseForm.faceValue" min="0"
          /></label>
          <label class="inv-form-field"
-            ><span>* Purchase Rate (per ₹100)</span
+            ><span>Purchase Rate (per 100)</span
            ><input type="number" [(ngModel)]="purchaseForm.purchaseRate" min="0" step="0.0001"
          /></label>
          <label class="inv-form-field"
            ><span>Unit Val</span><input type="text" [value]="purchaseUnitVal" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Book Value</span><input type="text" [value]="purchaseBookValue | number: '1.2-2'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Premium Amt.</span><input type="number" [(ngModel)]="purchaseForm.premiumAmt"
          /></label>
        }
        <label class="inv-form-field"
          ><span>* No Unit</span><input type="text" [value]="purchaseUnits" readonly
        /></label>
        <label class="inv-form-field"
          ><span>* CR. To A/c</span><input type="text" [(ngModel)]="purchaseForm.crToAc"
        /></label>
        <label class="inv-form-field"
          ><span>TBill GL.A/C.</span><input type="text" [(ngModel)]="purchaseForm.tbillGlAc"
        /></label>
        <label class="inv-form-field"
          ><span>Brokerage</span><input type="number" [(ngModel)]="purchaseForm.brokerage" min="0"
        /></label>
        <label class="inv-form-field">
          <span>Broker Nm.</span>
          <select [(ngModel)]="purchaseForm.brokerName">
            <option value="">-- Select --</option>
            @for (b of brokerOptions; track b.brokerCode) {
              <option [value]="b.brokerCode">{{ b.brokerCode }} — {{ b.brokerName }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
          ><span>Trade No.</span><input type="text" [(ngModel)]="purchaseForm.tradeNo"
        /></label>
        <label class="inv-form-field"
          ><span>Order No.</span><input type="text" [(ngModel)]="purchaseForm.orderNo"
        /></label>
        <label class="inv-form-field">
          <span>Recomm. Authority</span>
          <select [(ngModel)]="purchaseForm.recommAuthority">
            <option value="">-- Select --</option>
            @for (a of authorityOptions; track a) {
              <option [value]="a">{{ a }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field">
          <span>Sanction Authority</span>
          <select [(ngModel)]="purchaseForm.sanctionAuthority">
            <option value="">-- Select --</option>
            @for (a of authorityOptions; track a) {
              <option [value]="a">{{ a }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
          ><span>* Issue Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.issueDate"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field"
          ><span>Period(Year)</span><input type="number" [(ngModel)]="purchaseForm.periodYear" min="0"
        /></label>
        <label class="inv-form-field"
          ><span>Period(Month)</span><input type="number" [(ngModel)]="purchaseForm.periodMonth" min="0" max="11"
        /></label>
        <label class="inv-form-field"
          ><span>Period(Days)</span><input type="number" [(ngModel)]="purchaseForm.periodDays" min="0"
        /></label>
        <label class="inv-form-field"
          ><span>Desc Inv</span><input type="text" [(ngModel)]="purchaseForm.descInv"
        /></label>
        <label class="inv-form-field"
          ><span>Folio No</span><input type="text" [(ngModel)]="purchaseForm.folioNo"
        /></label>
        <label class="inv-form-field"
          ><span>Call Option</span><input type="text" [(ngModel)]="purchaseForm.callOption"
        /></label>
        <label class="inv-form-field"
          ><span>Meet Dt</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.meetDt"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field"
          ><span>Reso No</span><input type="text" [(ngModel)]="purchaseForm.resoNo"
        /></label>
        <label class="inv-form-field"
          ><span>From Dist</span><input type="text" [(ngModel)]="purchaseForm.fromDist"
        /></label>
        <label class="inv-form-field"
          ><span>To Dist</span><input type="text" [(ngModel)]="purchaseForm.toDist"
        /></label>
        <label class="inv-form-field"
          ><span>Redum/Mat Dt</span
          ><input type="text" [(ngModel)]="purchaseForm.redumMatDt" placeholder="DD-MM-YYYY (blank = use period)"
        /></label>
        <label class="inv-form-field">
          <span>* Category</span>
          <select [(ngModel)]="purchaseForm.category">
@@ -265,258 +380,32 @@
        </label>
        @if (!isMutualFund) {
          <label class="inv-form-field"
-            ><span>* Last Interest Date</span
+            ><span>Int Rate</span><input type="number" [(ngModel)]="purchaseForm.intRate" min="0" step="0.01"
            ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.lastIntDt"></mifosx-date-ddmmyyyy
          ></label>
        }
        <label class="inv-form-field">
          <span>* CR. To A/c (Paid From)</span>
          <select [(ngModel)]="purchaseForm.crToAc">
            @for (g of settlementBankOptions; track g.glCode) {
              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
          ><span>Stamp Duty (₹)</span><input type="number" [(ngModel)]="purchaseForm.stampDuty" min="0"
        /></label>
        <label class="inv-form-field"
          ><span>Brokerage (₹)</span><input type="number" [(ngModel)]="purchaseForm.brokerage" min="0"
        /></label>
        <label class="inv-form-field"
          ><span>Other Charges (₹)</span><input type="number" [(ngModel)]="purchaseForm.otherCharges" min="0"
        /></label>
      </div>
      @if (purchaseMarketRate) {
        <p class="pg-sub" style="padding: 0 16px 8px">
          Market rate (Daily Script Master) as on {{ purchaseMarketRate.rateDate }}: Close
          {{ purchaseMarketRate.closeRate | number: '1.2-4' }}
          @if (purchaseMarketRate.lowRate && purchaseMarketRate.highRate) {
            (Low {{ purchaseMarketRate.lowRate | number: '1.2-4' }} – High
            {{ purchaseMarketRate.highRate | number: '1.2-4' }})
          }
          @if (purchaseMarketRate.rateDate !== purchaseForm.dealDate) {
            — no rate entered for the deal date, the latest earlier rate is used.
          }
        </p>
        @if (purchaseRateOutOfRange) {
          <p class="pg-sub" style="padding: 0 16px 8px; color: #b42318; font-weight: 600">
            Warning: the rate entered is outside the day's market range.
          </p>
        }
      } @else if (purchaseMarketRate === null) {
        <p class="pg-sub" style="padding: 0 16px 8px; color: #b42318">
          No rate in the Daily Script Master for this script — enter the day's rate there first.
        </p>
      }
      <!-- 2. Calculated — filled by the system, read-only -->
      <div class="pos-section-label">Calculated by System</div>
      <div class="inv-form-grid">
        <label class="inv-form-field"
          ><span>Deal No</span><input type="text" [value]="purchaseForm.dealNo" readonly
        /></label>
        <label class="inv-form-field"
          ><span>Cert No</span><input type="text" [value]="purchaseForm.certNo" readonly
        /></label>
        <label class="inv-form-field"
          ><span>Settlement Date</span><input type="text" [value]="purchaseSettlementDate" readonly
        /></label>
        <label class="inv-form-field"
          ><span>ISIN</span><input type="text" [value]="purchaseForm.isin || '—'" readonly
        /></label>
        <label class="inv-form-field"
          ><span>Sub Type</span><input type="text" [value]="purchaseForm.subType || '—'" readonly
        /></label>
        @if (!isMutualFund) {
          <label class="inv-form-field"
            ><span>Int Rate %</span><input type="text" [value]="purchaseForm.intRate ?? '—'" readonly
          /></label>
          <label class="inv-form-field"
-            ><span>Issue Date</span><input type="text" [value]="purchaseForm.issueDate || '—'" readonly
+            ><span>YTM (computed)</span><input type="text" [value]="purchaseYtm" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Maturity Date</span><input type="text" [value]="purchaseMaturityDate || '—'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Period (Y / M / D)</span
            ><input
              type="text"
              [value]="purchaseForm.periodYear + ' / ' + purchaseForm.periodMonth + ' / ' + purchaseForm.periodDays"
              readonly
          /></label>
        }
        <label class="inv-form-field"
          ><span>No. of Units</span><input type="text" [value]="purchaseUnits | number: '1.0-4'" readonly
        /></label>
        <label class="inv-form-field"
          ><span>Book Value</span><input type="text" [value]="'₹' + (purchaseBookValue | number: '1.2-2')" readonly
        /></label>
        @if (!isMutualFund) {
          <label class="inv-form-field"
            ><span>Premium (+) / Discount (−)</span
            ><input type="text" [value]="'₹' + (purchasePremiumDiscount | number: '1.0-0')" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Accrued Interest ({{ purchaseAccruedDays }} days)</span
            ><input type="text" [value]="'₹' + (purchaseAccruedInterest | number: '1.2-2')" readonly
          /></label>
          <label class="inv-form-field"><span>YTM %</span><input type="text" [value]="purchaseYtm" readonly /></label>
        }
        <label class="inv-form-field"
          ><span>Charges (expense)</span
          ><input type="text" [value]="'₹' + (purchaseTotalCharges | number: '1.2-2')" readonly
        /></label>
        <label class="inv-form-field"
          ><span>Total Settlement Amount</span
          ><input type="text" [value]="'₹' + (purchaseSettlementAmount | number: '1.2-2')" readonly
        /></label>
      </div>
      @if (!isMutualFund && purchaseCouponDates) {
        <div class="pos-section-label">Interest Cycle</div>
        <div class="inv-form-grid">
          <label class="inv-form-field"
            ><span>Interest Dates (half-yearly)</span><input type="text" [value]="purchaseCouponDates" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Last Coupon</span><input type="text" [value]="purchaseForm.lastIntDt || '—'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Next Coupon</span><input type="text" [value]="purchaseNextCouponDate || '—'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Next Coupon Amount</span
            ><input type="text" [value]="'₹' + (purchaseNextCouponAmount | number: '1.2-2')" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Days to Next Coupon</span><input type="text" [value]="purchaseDaysToNextCoupon" readonly
          /></label>
        </div>
      }
      <!-- 3. Accounting preview -->
      <div class="pos-section-label">Accounting Preview (posted on Settle, dated the settlement date)</div>
      @if (purchaseAccountingPreview.length) {
        <table class="pg-table">
          <thead>
            <tr>
              <th>Dr / Cr</th>
              <th>GL Code</th>
              <th>GL Name</th>
              <th class="num">Amount</th>
            </tr>
          </thead>
          <tbody>
            @for (l of purchaseAccountingPreview; track l.side + l.glCode) {
              <tr>
                <td>{{ l.side }}</td>
                <td>{{ l.glCode }}</td>
                <td>{{ l.glName || '—' }}</td>
                <td class="num">₹{{ l.amount | number: '1.2-2' }}</td>
              </tr>
            }
          </tbody>
        </table>
      } @else {
        <p class="pg-sub">Select a script, enter the amount and CR. To A/c to see the entry.</p>
      }
      <!-- 4. More details — optional, collapsed by default -->
      <div class="inv-form-actions">
        <button type="button" class="pg-btn pg-btn--ghost" (click)="showMoreDetails = !showMoreDetails">
          {{ showMoreDetails ? '▾ Hide More Details' : '▸ More Details (optional)' }}
        </button>
      </div>
      @if (showMoreDetails) {
        <div class="pos-section-label">More Details (optional)</div>
        <div class="inv-form-grid">
          <label class="inv-form-field">
-            <span>Sub Type</span>
+            <span>Int Type</span>
-            <select [(ngModel)]="purchaseForm.subType">
+            <select [(ngModel)]="purchaseForm.intType">
-              @for (s of subTypeOptions; track s.subTypeCode + s.subTypeName) {
+              @for (i of intTypeOptions; track i.value) {
-                <option [value]="s.subTypeName">{{ s.subTypeName }}</option>
+                <option [value]="i.value">{{ i.label }}</option>
              }
            </select>
          </label>
          @if (isMutualFund) {
            <label class="inv-form-field"
              ><span>Trade Amt</span><input type="number" [(ngModel)]="purchaseForm.tradeAmt" min="0"
            /></label>
            <label class="inv-form-field"
              ><span>Stamp Duty A/c</span><input type="text" [(ngModel)]="purchaseForm.stampDutyAc"
            /></label>
            <label class="inv-form-field"
              ><span>Holding Days</span><input type="number" [(ngModel)]="purchaseForm.holdingDays" min="0"
            /></label>
          } @else {
            <label class="inv-form-field">
              <span>Int Type</span>
              <select [(ngModel)]="purchaseForm.intType">
                @for (i of intTypeOptions; track i.value) {
                  <option [value]="i.value">{{ i.label }}</option>
                }
              </select>
            </label>
            <label class="inv-form-field">
              <span>Bond Rating</span>
              <select [(ngModel)]="purchaseForm.bondRating">
                @for (r of bondRatingOptions; track r) {
                  <option [value]="r">{{ r }}</option>
                }
              </select>
            </label>
            <label class="inv-form-field">
              <span>SGL with Bank</span>
              <select [(ngModel)]="purchaseForm.sglWithBank">
                <option value="">-- Select --</option>
                @for (s of sglBankOptions; track s.sglCode) {
                  <option [value]="s.bankName">{{ s.bankName }} — {{ s.branch }}</option>
                }
              </select>
            </label>
            <label class="inv-form-field"
              ><span>TBill GL A/c</span><input type="text" [(ngModel)]="purchaseForm.tbillGlAc"
            /></label>
          }
          <label class="inv-form-field">
            <span>Broker</span>
            <select [(ngModel)]="purchaseForm.brokerName">
              <option value="">-- Select --</option>
              @for (b of brokerOptions; track b.brokerCode) {
                <option [value]="b.brokerCode">{{ b.brokerCode }} — {{ b.brokerName }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field"
-            ><span>Trade No.</span><input type="text" [(ngModel)]="purchaseForm.tradeNo"
+            ><span>Int Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.intDate"></mifosx-date-ddmmyyyy
          /></label>
          <label class="inv-form-field"
            ><span>Order No.</span><input type="text" [(ngModel)]="purchaseForm.orderNo"
          /></label>
          <label class="inv-form-field">
            <span>Recomm. Authority</span>
            <select [(ngModel)]="purchaseForm.recommAuthority">
              <option value="">-- Select --</option>
              @for (a of authorityOptions; track a) {
                <option [value]="a">{{ a }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>Sanction Authority</span>
            <select [(ngModel)]="purchaseForm.sanctionAuthority">
              <option value="">-- Select --</option>
              @for (a of authorityOptions; track a) {
                <option [value]="a">{{ a }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field"
            ><span>Meet Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.meetDt"></mifosx-date-ddmmyyyy
          ></label>
          <label class="inv-form-field"
-            ><span>Reso No</span><input type="text" [(ngModel)]="purchaseForm.resoNo"
+            ><span>* Last Int.dt</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.lastIntDt"></mifosx-date-ddmmyyyy
          ></label>
          <label class="inv-form-field"
            ><span>Accrued Interest (computed)</span
            ><input type="text" [value]="purchaseAccruedInterest | number: '1.2-2'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Settlement Amt of Pur. (computed)</span
            ><input type="text" [value]="purchaseSettlementAmount | number: '1.4-4'" readonly
          /></label>
          <label class="inv-form-field">
            <span>Deal Type</span>
@@ -534,80 +423,6 @@
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>Payment Mode</span>
            <select [(ngModel)]="purchaseForm.paymentMode">
              <option value="">-- Select --</option>
              @for (p of paymentModeOptions; track p) {
                <option [value]="p">{{ p }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>Delivery Mode</span>
            <select [(ngModel)]="purchaseForm.deliveryMode">
              <option value="">-- Select --</option>
              @for (d of deliveryModeOptions; track d) {
                <option [value]="d">{{ d }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>LIEN</span>
            <select [(ngModel)]="purchaseForm.lien">
              <option value="NO">NO</option>
              <option value="YES">YES</option>
            </select>
          </label>
          @if (purchaseForm.lien === 'YES') {
            <label class="inv-form-field"
              ><span>LIEN Amount</span><input type="number" [(ngModel)]="purchaseForm.lienAmount"
            /></label>
            <label class="inv-form-field">
              <span>LIEN Reason</span>
              <select [(ngModel)]="purchaseForm.lienReason">
                <option value="">-- Select --</option>
                @for (l of lienReasonOptions; track l.reasonCode) {
                  <option [value]="l.reasonDescription">{{ l.reasonDescription }}</option>
                }
              </select>
            </label>
          }
          <label class="inv-form-field"
            ><span>Folio No</span><input type="text" [(ngModel)]="purchaseForm.folioNo"
          /></label>
          <label class="inv-form-field"
            ><span>Call Option</span><input type="text" [(ngModel)]="purchaseForm.callOption"
          /></label>
          <label class="inv-form-field"
            ><span>Register Address</span><input type="text" [(ngModel)]="purchaseForm.registerAdd"
          /></label>
          <label class="inv-form-field"
            ><span>Register City</span><input type="text" [(ngModel)]="purchaseForm.regiCity"
          /></label>
          <label class="inv-form-field"
            ><span>Register Pin</span><input type="text" [(ngModel)]="purchaseForm.regiPin"
          /></label>
          <label class="inv-form-field"
            ><span>Issue Date (override)</span
            ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.issueDate"></mifosx-date-ddmmyyyy
          ></label>
          <label class="inv-form-field"
            ><span>Redum / Mat Date (override)</span
            ><input type="text" [(ngModel)]="purchaseForm.redumMatDt" placeholder="DD-MM-YYYY"
          /></label>
          <label class="inv-form-field"
            ><span>Int Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.intDate"></mifosx-date-ddmmyyyy
          ></label>
          <label class="inv-form-field"
            ><span>Desc Inv</span><input type="text" [(ngModel)]="purchaseForm.descInv"
          /></label>
          <label class="inv-form-field"
            ><span>From Dist</span><input type="text" [(ngModel)]="purchaseForm.fromDist"
          /></label>
          <label class="inv-form-field"
            ><span>To Dist</span><input type="text" [(ngModel)]="purchaseForm.toDist"
          /></label>
          <label class="inv-form-field">
            <span>Mark CBLO</span>
            <select [(ngModel)]="purchaseForm.markCblo">
@@ -618,6 +433,14 @@
          <label class="inv-form-field"
            ><span>Amortize Amt.</span><input type="number" [(ngModel)]="purchaseForm.amortizeAmt"
          /></label>
          <label class="inv-form-field">
            <span>Bond Rating</span>
            <select [(ngModel)]="purchaseForm.bondRating">
              @for (r of bondRatingOptions; track r) {
                <option [value]="r">{{ r }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>Corp. Bond</span>
            <select [(ngModel)]="purchaseForm.corpBond">
@@ -625,19 +448,76 @@
              <option value="YES">YES</option>
            </select>
          </label>
          <label class="inv-form-field">
            <span>SGL with Bank</span>
            <select [(ngModel)]="purchaseForm.sglWithBank">
              <option value="">-- Select --</option>
              @for (s of sglBankOptions; track s.sglCode) {
                <option [value]="s.bankName">{{ s.bankName }} — {{ s.branch }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field"
-            ><span>Remarks</span><input type="text" [(ngModel)]="purchaseForm.remarks"
+            ><span>Register Add</span><input type="text" [(ngModel)]="purchaseForm.registerAdd"
          /></label>
          <label class="inv-form-field"
-            ><span>Description</span><input type="text" [(ngModel)]="purchaseForm.description"
+            ><span>Regi City</span><input type="text" [(ngModel)]="purchaseForm.regiCity"
          /></label>
-        </div>
+          <label class="inv-form-field"
-      }
+            ><span>Regi Pin</span><input type="text" [(ngModel)]="purchaseForm.regiPin"
-
+          /></label>
-      <div class="inv-form-actions">
+        }
        <label class="inv-form-field">
          <span>LIEN</span>
          <select [(ngModel)]="purchaseForm.lien">
            <option value="NO">NO</option>
            <option value="YES">YES</option>
          </select>
        </label>
        @if (purchaseForm.lien === 'YES') {
          <label class="inv-form-field"
            ><span>LIEN Amount</span><input type="number" [(ngModel)]="purchaseForm.lienAmount"
          /></label>
          <label class="inv-form-field">
            <span>LIEN Reason</span>
            <select [(ngModel)]="purchaseForm.lienReason">
              <option value="">-- Select --</option>
              @for (l of lienReasonOptions; track l.reasonCode) {
                <option [value]="l.reasonDescription">{{ l.reasonDescription }}</option>
              }
            </select>
          </label>
        }
        <label class="inv-form-field">
          <span>Payment Mode</span>
          <select [(ngModel)]="purchaseForm.paymentMode">
            <option value="">--Select--</option>
            @for (p of paymentModeOptions; track p) {
              <option [value]="p">{{ p }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field">
          <span>Delivery Mode</span>
          <select [(ngModel)]="purchaseForm.deliveryMode">
            <option value="">--Select--</option>
            @for (d of deliveryModeOptions; track d) {
              <option [value]="d">{{ d }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
-          ><span>Retrieve Cert No</span><input type="text" placeholder="e.g. 30" [(ngModel)]="retrieveCertNo"
+          ><span>Remarks</span><input type="text" [(ngModel)]="purchaseForm.remarks"
        /></label>
        <label class="inv-form-field"
          ><span>Description</span><input type="text" [(ngModel)]="purchaseForm.description"
        /></label>
        <label class="inv-form-field"
          ><span>Maturity / Redemption Value (computed)</span
          ><input type="text" [value]="'₹' + (purchaseMaturityAmount | number: '1.2-2')" readonly
        /></label>
      </div>
      <div class="inv-form-actions">
        <button type="button" class="pg-btn pg-btn--primary" (click)="savePurchase()">Save</button>
        <button type="button" class="pg-btn pg-btn--ghost" (click)="retrievePurchase()">Retrieve</button>
        <button type="button" class="pg-btn pg-btn--ghost" (click)="dropPurchase()">Drop</button>
@@ -689,47 +569,20 @@
    </div>
  }
-  <!-- ===================== 03 INTEREST ENTRY ===================== -->
+  <!-- ===================== 03 INTEREST ENTRY / CALCULATION ===================== -->
  @if (activeTab === 'interest') {
    <div class="pg-card">
-      <div class="pos-section-label">Interest Entry — coupon and 31 Mar / 30 Sep provision schedule</div>
+      <div class="pos-section-label">Investment - Govt./Bond Interest calculation</div>
      @if (intDueTasks.length) {
        <div class="pos-section-label">🔔 Interest entries due ({{ intDueTasks.length }})</div>
        <table class="pg-table">
          <thead>
            <tr>
              <th>Deal No</th>
              <th>Script</th>
              <th>Type</th>
              <th>Int Date</th>
              <th class="num">Amount</th>
              <th>Status</th>
              <th></th>
            </tr>
          </thead>
          <tbody>
            @for (t of intDueTasks; track t.purchaseId) {
              <tr>
                <td>
                  <span class="pg-chip">{{ t.dealNo }}</span>
                </td>
                <td>{{ t.scriptCode }} — {{ t.scriptDesc }}</td>
                <td>{{ t.lineType === 'COUPON' ? 'Coupon' : 'Provision' }}</td>
                <td>{{ t.intDate }}</td>
                <td class="num">₹{{ (t.lineType === 'COUPON' ? t.grossInterest : t.amount) | number: '1.2-2' }}</td>
                <td>{{ t.overdue ? 'Overdue — post now' : t.postable ? 'Due today' : 'Due on ' + t.intDate }}</td>
                <td>
                  <button type="button" class="pg-btn pg-btn--ghost" (click)="openDueTask(t)">Open</button>
                </td>
              </tr>
            }
          </tbody>
        </table>
      }
      <div class="inv-form-grid">
        <label class="inv-form-field"
          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcFromDate"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field"
          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcToDate"></mifosx-date-ddmmyyyy
        ></label>
        <label class="inv-form-field">
          <span>Type</span>
-          <select [(ngModel)]="intType" (ngModelChange)="onIntFilterChange()">
+          <select [(ngModel)]="intCalcType" (ngModelChange)="onIntCalcTypeChange()">
            <option value="">-- All Types --</option>
            @for (o of bondTypeOptions; track o.value) {
              <option [value]="o.value">{{ o.label }}</option>
@@ -738,182 +591,67 @@
        </label>
        <label class="inv-form-field">
          <span>Script</span>
-          <select [(ngModel)]="intScript" (ngModelChange)="onIntFilterChange()">
+          <select [(ngModel)]="intCalcScript">
            <option value="">-- All Scripts --</option>
-            @for (s of intScriptOptions; track s.scriptCode) {
+            @for (s of scriptOptions; track s.scriptCode) {
              <option [value]="s.scriptCode">{{ s.scriptCode }} — {{ s.scriptName }}</option>
            }
          </select>
        </label>
        <label class="inv-form-field"><span>Deal No</span><input type="text" [(ngModel)]="intCalcDealNo" /></label>
        <label class="inv-form-field"
          ><span>ALL</span><input type="checkbox" [(ngModel)]="intCalcAll" style="height: 18px; width: 18px"
        /></label>
        <label class="inv-form-field">
-          <span>* Deal No</span>
+          <span>Post To (Interest Income GL)</span>
-          <select [(ngModel)]="intPurchaseId" (ngModelChange)="intSchedule = null">
+          <select [(ngModel)]="intCalcGlCode">
-            <option [ngValue]="null">-- Select --</option>
+            @for (g of interestIncomeGlOptions; track g.glCode) {
-            @for (h of intDealOptions; track h.id) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
              <option [ngValue]="h.id">{{ h.dealNo }} — {{ h.scriptCode }} (Cert {{ h.certNo }})</option>
            }
          </select>
        </label>
        <label class="inv-form-field"
          ><span>As On Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intAsOnDate"></mifosx-date-ddmmyyyy
        ></label>
      </div>
      <div class="inv-form-actions">
-        <button
+        <button type="button" class="pg-btn pg-btn--primary" (click)="processInterest()">Process</button>
          type="button"
          class="pg-btn pg-btn--primary"
          [disabled]="intLoading"
          (click)="retrieveInterestSchedule()"
        >
          {{ intLoading ? 'Retrieving…' : 'Retrieve' }}
        </button>
        <button type="button" class="pg-btn pg-btn--ghost" (click)="setTab('holdings')">Exit</button>
      </div>
-
+      @if (intCalcExcludedNpi.length > 0) {
      @if (intSchedule; as sc) {
        <div class="pos-section-label">Purchase Details</div>
        <div class="inv-form-grid">
          <label class="inv-form-field"
            ><span>Deal No / Cert No</span><input type="text" [value]="sc.dealNo + ' / ' + sc.certNo" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Script</span><input type="text" [value]="sc.scriptCode + ' — ' + sc.scriptDesc" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Face Value Held</span><input type="text" [value]="'₹' + (sc.faceValue | number: '1.2-2')" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Interest Rate</span><input type="text" [value]="sc.intRate + '%'" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Coupon per Half-Year</span
            ><input type="text" [value]="'₹' + (sc.couponPerHalfYear | number: '1.2-2')" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Deal Date</span><input type="text" [value]="sc.dealDate" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Last Interest Date</span><input type="text" [value]="sc.lastIntDate" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Maturity Date</span><input type="text" [value]="sc.maturityDate" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Broken Period Interest Paid (expense 500606)</span
            ><input type="text" [value]="'₹' + (sc.purchasedAccruedInterest | number: '1.2-2')" readonly
          /></label>
          <label class="inv-form-field"
            ><span>Book Value</span><input type="text" [value]="'₹' + (sc.bookValue | number: '1.2-2')" readonly
          /></label>
        </div>
        <div class="pos-section-label">
          Interest Schedule ({{ intVisibleRows.length }} of {{ sc.rows.length }} lines) — due up to {{ sc.asOnDate }}:
          ₹{{ intDueTotal | number: '1.2-2' }}
        </div>
        <p class="pg-sub" style="padding: 0 16px">
          Days are 30/360. A provision books the interest earned since the last coupon; the coupon then clears what is
          already booked. Post each line with Generate Voucher on or after its date, in date order — the JV voucher is
          passed as it is raised.
        </p>
        <div class="inv-form-grid">
          <label class="inv-form-field">
            <span>Coupon received into (Bank)</span>
            <select [(ngModel)]="intBankGlCode">
              @for (g of settlementBankOptions; track g.glCode) {
                <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
              }
            </select>
          </label>
          <label class="inv-form-field">
            <span>Schedule</span>
            <button type="button" class="pg-btn pg-btn--ghost" (click)="intShowFullSchedule = !intShowFullSchedule">
              {{ intShowFullSchedule ? 'Show up to next year' : 'Show full schedule to maturity' }}
            </button>
          </label>
        </div>
        <table class="pg-table">
          <thead>
            <tr>
              <th>Type</th>
              <th>Int Date</th>
              <th>From</th>
              <th>To</th>
              <th class="num">Days</th>
              <th class="num">Int %</th>
              <th class="num">Gross Interest</th>
              <th class="num">Already Booked</th>
              <th class="num col-in">Amount</th>
              <th>Accounting</th>
              <th>Voucher</th>
            </tr>
          </thead>
          <tbody>
            @for (r of intVisibleRows; track r.type + r.intDate) {
              <tr [style.opacity]="r.due ? 1 : 0.6">
                <td>
                  <span class="pg-chip">{{ r.type === 'COUPON' ? 'Coupon' : 'Provision' }}</span>
                  @if (r.due) {
                    <span class="pg-chip">Due</span>
                  }
                </td>
                <td>{{ r.intDate }}</td>
                <td>{{ r.fromDate }}</td>
                <td>{{ r.toDate }}</td>
                <td class="num">{{ r.days }}</td>
                <td class="num">{{ sc.intRate }}</td>
                <td class="num">₹{{ r.grossInterest | number: '1.2-2' }}</td>
                <td class="num">₹{{ r.alreadyBooked | number: '1.2-2' }}</td>
                <td class="num col-in">₹{{ r.amount | number: '1.2-2' }}</td>
                <td style="white-space: nowrap; font-size: 12px">
                  @if (r.type === 'COUPON') {
                    <div>Dr Bank ₹{{ r.grossInterest | number: '1.0-0' }}</div>
                    @if (r.alreadyBooked > 0) {
                      <div>
                        Cr {{ interestReceivableGl.glCode }} Int. Receivable ₹{{ r.alreadyBooked | number: '1.0-0' }}
                      </div>
                    }
                    <div>Cr {{ sc.interestGlCode }} Int. Income ₹{{ r.amount | number: '1.0-0' }}</div>
                  } @else {
                    <div>Dr {{ interestReceivableGl.glCode }} Int. Receivable ₹{{ r.amount | number: '1.0-0' }}</div>
                    <div>Cr {{ sc.interestGlCode }} Int. Income ₹{{ r.amount | number: '1.0-0' }}</div>
                  }
                </td>
                <td style="white-space: nowrap">
                  @if (r.posted) {
                    <span class="pg-chip" [title]="'GL ' + r.glTransactionId">Posted · {{ r.voucherNo }}</span>
                  } @else if (r.postable) {
                    <button
                      type="button"
                      class="pg-btn pg-btn--primary"
                      [disabled]="intPosting"
                      (click)="generateVoucher(r)"
                    >
                      Generate Voucher
                    </button>
                  } @else if (r.dueSoon) {
                    <span class="pg-chip">🔔 Due {{ r.intDate }}</span>
                  }
                </td>
              </tr>
            } @empty {
              <tr>
                <td colspan="11" class="pg-empty">
                  No interest lines — check the rate, last interest date and maturity date.
                </td>
              </tr>
            }
          </tbody>
        </table>
        <p class="pg-sub" style="padding: 8px 16px 12px">
          Interest income GL: {{ sc.interestGlCode }} — {{ sc.interestGlName }} · Interest receivable GL:
          {{ interestReceivableGl.glCode }}.
        </p>
      } @else {
        <p class="pg-sub" style="padding: 0 16px 12px">
-          Select a Deal No and press Retrieve to see its interest schedule.
+          {{ intCalcExcludedNpi.length }} holding(s) excluded — classified Non-Performing, interest is not posted on
          accrual basis (collectible on cash basis only, via Interest Receive in the Investment Interest module).
        </p>
      }
      <div class="pos-section-label">Holdings matching the filter ({{ intCalcTargets.length }})</div>
      <table class="pg-table">
        <thead>
          <tr>
            <th>Cert No</th>
            <th>Script</th>
            <th>Type</th>
            <th class="num">Rate</th>
            <th>Frequency</th>
            <th class="num col-in">Interest to Post</th>
          </tr>
        </thead>
        <tbody>
          @for (h of intCalcTargets; track h.certNo) {
            <tr>
              <td>
                <span class="pg-chip">{{ h.certNo }}</span>
              </td>
              <td>{{ h.scriptName }}</td>
              <td>{{ instrumentLabel(h.instrumentType) }}</td>
              <td class="num">{{ h.interestRate }}%</td>
              <td>{{ h.interestFreq }}</td>
              <td class="num col-in">₹{{ interestAccrued(h) | number: '1.2-2' }}</td>
            </tr>
          } @empty {
            <tr>
              <td colspan="6" class="pg-empty">No holdings match the selected filters.</td>
            </tr>
          }
        </tbody>
      </table>
    </div>
  }
@@ -1362,7 +1100,7 @@
              <td>{{ t.certNo }}</td>
              <td>{{ t.txnType }}</td>
              <td>{{ t.particulars }}</td>
-              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : t.glName || '—' }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
              <td class="num">₹{{ t.amount | number: '1.2-2' }}</td>
            </tr>
          } @empty {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
keshav	357f666421	KYC management: stage-wise notices, pagination, RD base chart	2026-10-20 17:23:42 +05:30
niteshandClaude Opus 5.5	3e5cc26e49	feat(fixed-deposits): FD quote from the account engine, FD Special payout schedule popup, Special terms locked - Rate chart step (account opening): the rate, maturity date, maturity amount and interest now come from POST fixeddepositaccounts/account-preview for every FD type, so the quote matches the account once created (the old calculate-fd-interest call counted quarters from the deposit date and was off, e.g. FD DOUBLE by 36,979.23). The client-side formula fallback is removed: on an error the message is shown, nothing is estimated. - Dates are sent as the local calendar day (toISOString() turned 21 Oct at local midnight into 20 Oct). - FD Special: total interest paid out monthly, monthly payout, principal at maturity, maturity date, number of payouts, and "View payout schedule", which opens the existing Monthly Interest Payout Schedule dialog in a new preview mode (Days column, no paid / pending status). - Preview step: FD Special labels (total interest paid out monthly, principal at maturity). - FD product terms: choosing FD Special locks Interest Calculation Type to Simple, as Compounding and Posting are locked to Monthly (the backend refuses anything else). - Preview step: three existing `!= null` template checks rewritten for the eqeqeq lint rule, same meaning. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-20 16:44:47 +05:30
niteshandClaude Opus 5.5	c3713f8a90	Merge feature/approval-live-badge-counts into dev-latest Live pending-count badges on the Approval Center tabs and the Approvals menu, served over one SSE stream. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-20 11:09:08 +05:30
niteshandClaude Sonnet 5.5	f804d356d7	fix(rd-products): save RD Interest Paid under expenses, as on FD and savings The backend finds the account by name in any group. Products saved while it was under liabilities are still read from there, so the name is not left behind as an "other" liability row. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-20 10:48:37 +05:30
niteshandClaude Sonnet 5.5	1daa8e60a0	fix(cashier): keep the A/C TP kind on SD/FD/RD lookups in transaction entry SD, FD and RD share one /savingsaccounts list that returns a deposit account of any kind for a number. The lookup now keeps only the deposit type chosen in A/C TP, and when the number belongs to another kind the error says so, so the clerk can fix A/C TP. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-20 10:48:23 +05:30
niteshandClaude Opus 5.5	55f5c1cf32	feat(ui): longer startup splash and updated loading animation The startup splash now holds for at least 4 seconds (progress 2% per tick up to 90%) instead of 2, and the loading animation is updated. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 12:31:24 +05:30
niteshandClaude Opus 5.5	6507e68203	feat(cashier): FD is credit-only on the transaction entry, and a Bank Transfer can fund an FD - A Fixed Deposit row is credit-only on the clerk and cashier screens (isFdCreditOnly): its DR button is disabled, and Save refuses any FD row left on DR (for example by a Withdrawal Slip TYPE). Money leaves an FD only through its maturity or premature closure; the clerk's "Close this account" flow is the one exception. - Bank Transfer / Fund Transfer accepts an FD on the CR side, so an FD can be funded from the customer's own Savings or Current account. The server enforces the funding rules (first and only funding, exactly the principal, the source account's owner, freeze status and available balance). Requires the backend change "FD funding rules and no FD withdrawals from clerk/cashier requests". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-16 12:31:03 +05:30
niteshandClaude Sonnet 5.5	4d205672df	feat(approvals): live pending-count badges on every Approval Center tab and the Approvals menu The badges are pushed, not polled. ApprovalCountsService opens one Server-Sent Events stream (/approvals/counts/stream) through HttpClient so the login and tenant headers apply; the server writes a `counts` event the moment the numbers change. - Total badge on the Approvals menu, count badge on 26 Approval Center tabs (Reject Account and Terminated Account are lists, not requests: no badge). - Last numbers are kept per login in localStorage, so a page refresh shows them at once until the stream's first event makes them exact. - Stream recycles every few minutes and reconnects at once; after a failure it retries with a growing wait and reads /approvals/counts meanwhile. - NO_PROGRESS_BAR token: the background stream does not run the top progress bar. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-15 15:49:36 +05:30
niteshandClaude Sonnet 5.5	ab8ed7e67e	feat(vouchers): voucher correction screens and a correction status on the voucher registers A cash deposit posted to the wrong account is moved to the right one in four steps: unpass the voucher, a manager approves, the cashier enters the correct account, a manager approves again. Nothing changes on any account until the final approval. - Voucher Correction page with four-step strip and popups: today's vouchers to unpass (admin or clerk), the unpassed vouchers waiting for their correct account (cashier) with the wrong and correct account side by side and the balance check, and the caller's own requests. A cashier whose customer has used the money closes the request and deposits separately. - Reached from the cashier bar, the clerk bar and the Cashier menu; the manager reviews both steps under Approvals > Voucher Corrections, laid out like the other approval tabs. Routes for Cash Transfers approvals are added to the same tab bar. - A Correction column on My Vouchers, the day book and the voucher register (and in the voucher detail popup) says whether a voucher is unpassed, revoked in favour of another, a correction, or closed, with the reason. - The deposit taken off the wrong account no longer shows on its passbook or transaction list. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-15 12:28:27 +05:30
niteshandClaude Sonnet 5.5	7ee230e58a	feat(cashier): maker-checker on cash transfer, real branches, compact Approval Center - Cash Transfer now raises a request ("Send for approval") instead of posting. A My Requests button in the page header opens the caller's requests with their status, and a Cash Transfers approvals page (review popup with the full denomination breakdown, approve, reject with a reason) lets a different manager release the cash. - Transaction Entry's Branch dropdown lists the installation's real offices instead of a fixed list. A login that cannot read offices is offered only its own branch (read-only), so no "Unauthorized Request" popup. - Approval Center header and tab bar made compact so more tabs fit on a 100% window. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-15 12:27:39 +05:30
niteshandClaude Sonnet 5.5	7f3c97a205	feat(cashier): GL withdrawal slips, GL account panel with parent GL, and Payment lock on token withdrawals Transaction Entry: - GL withdrawal slip: a GL Withdrawal Slip is always a debit. The clerk raises it as a request (GL, cash vault GL, office and currency ride on the payload), the manager approves it and the cashier pays it against its token; nothing posts directly from this screen any more (submitGlJournalEntry removed). Cashiers without an approved token are told to enter one. GL credit-only rules moved into isGlCreditOnly(), and extra rows are not allowed while a Withdrawal Slip is selected. - A/C NO. now starts the automatic account search after six characters. - Clerk: with AC. TP. = GL show a "GL Account Information" panel (code, name, type, usage, normal balance, parent GL, manual entries, status, description) instead of the empty client panels; the parent GL name is looked up from /glaccounts/{parentId} for GL only. - Cashier: once a token (withdrawal / closure request) is verified, TYPE is disabled and fixed to Payment, and onTypChange refuses to change it. Requires the backend change "GL withdrawal slips through request, approval and cashier payment". Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>	2026-10-14 13:51:38 +05:30