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

- 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>

src/app/accounting/accounting.service.ts

@@ -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.

src/app/aml/aml.service.ts

@@ -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 });

src/app/cashier/cash-transfer/cash-transfer.component.ts

@@ -19,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;
@@ -54,6 +55,7 @@ export class CashTransferComponent implements OnInit {
 
   @ViewChild('requestsDialog') requestsDialog!: TemplateRef<unknown>;
   private requestsRef: MatDialogRef<unknown> | null = null;
+  private authenticationService = inject(AuthenticationService);
 
   notes: Denom[] = [];
   coins: Denom[] = [];
@@ -139,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);
         }

src/app/cashier/transaction-entry/transaction-entry.component.html

@@ -132,12 +132,12 @@
                       <select
                         class="ws-f__ctl"
                         [(ngModel)]="row.br"
-                        [disabled]="branches.length <= 1"
+                        [disabled]="branchSelectOptions.length <= 1"
-                        [title]="branches.length <= 1 ? 'Your branch' : 'Branch'"
+                        [title]="branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
                         (click)="$event.stopPropagation()"
                       >
-                        @for (b of branches; track b.id) {
+                        @for (b of branchSelectOptions; track b.id) {
-                          <option [ngValue]="b.id">{{ b.label }}</option>
+                          <option [ngValue]="b.id">{{ b.name }}</option>
                         }
                       </select>
                     </div>
@@ -184,7 +184,7 @@
                           class="ws-f__ctl"
                           [(ngModel)]="row.acTyp"
                           (click)="$event.stopPropagation()"
-                          (change)="isGlCreditOnly(row) && (row.dbCr = 'Cr')"
+                          (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                         >
                           @for (a of acTypOptionsFor(row); track a) {
                             <option [value]="a">{{ a }}</option>
@@ -267,7 +267,7 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--dr"
                           [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                          [disabled]="isGlCreditOnly(row)"
+                          [disabled]="isCreditOnly(row)"
                           (click)="row.dbCr = 'Dr'"
                         >
                           DR
@@ -722,7 +722,24 @@
             } @else {
               <div class="te-panel__body">
                 <div class="te-field">
-                  <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</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">A/c No.</span
@@ -1201,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>
               {{
@@ -1592,12 +1626,12 @@
                           <select
                             class="ws-f__ctl"
                             [(ngModel)]="row.br"
-                            [disabled]="branches.length <= 1"
+                            [disabled]="branchSelectOptions.length <= 1"
-                            [title]="branches.length <= 1 ? 'Your branch' : 'Branch'"
+                            [title]="branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
                             (click)="$event.stopPropagation()"
                           >
-                            @for (b of branches; track b.id) {
+                            @for (b of branchSelectOptions; track b.id) {
-                              <option [ngValue]="b.id">{{ b.label }}</option>
+                              <option [ngValue]="b.id">{{ b.name }}</option>
                             }
                           </select>
                         </div>
@@ -1644,7 +1678,7 @@
                               class="ws-f__ctl"
                               [(ngModel)]="row.acTyp"
                               (click)="$event.stopPropagation()"
-                              (change)="isGlCreditOnly(row) && (row.dbCr = 'Cr')"
+                              (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
                             >
                               @for (a of acTypOptionsFor(row); track a) {
                                 <option [value]="a">{{ a }}</option>
@@ -1715,7 +1749,7 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--dr"
                               [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                              [disabled]="isGlCreditOnly(row)"
+                              [disabled]="isCreditOnly(row)"
                               (click)="$event.stopPropagation(); row.dbCr = 'Dr'"
                             >
                               DR

src/app/cashier/transaction-entry/transaction-entry.component.scss

@@ -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;
+}

src/app/cashier/transaction-entry/transaction-entry.component.ts

@@ -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';
@@ -2344,6 +2345,20 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     );
   }
 
+  /**
+   * 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
@@ -2696,7 +2711,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   branchNameFor(branchId: number): string {
-    return this.branches.find((b) => b.id === branchId)?.label ?? `Branch ${branchId}`;
+    return (
+      this.seenBranches.find((b) => b.id === branchId)?.name ??
+      this.branches.find((b) => b.id === branchId)?.label ??
+      `Branch ${branchId}`
+    );
   }
 
   /**
@@ -4046,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());
@@ -4077,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}`;
       });
   }
 
@@ -4141,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') {
@@ -4221,6 +4258,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return {
         list: '/savingsaccounts',
         detail: '/fixeddepositaccounts',
+        depositTypeId: 200,
         nominee: 'FD',
         search: 'fixeddeposit',
         siAccountType: 2,
@@ -4238,6 +4276,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return {
         list: '/savingsaccounts',
         detail: '/recurringdepositaccounts',
+        depositTypeId: 300,
         nominee: 'RD',
         search: 'recurringdeposit',
         siAccountType: 2,
@@ -4255,6 +4294,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     return {
       list: '/savingsaccounts',
       detail: '/savingsaccounts',
+      depositTypeId: 100,
       nominee: 'SB',
       search: 'saving',
       siAccountType: 2,
@@ -4314,6 +4354,7 @@ 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;
@@ -4930,6 +4971,75 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     ];
   }
 
+  /**
+   * 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 ??
@@ -5272,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.
@@ -5349,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',
@@ -5357,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;

src/app/clerk/disbursement-review/disbursement-review.component.html

@@ -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>

src/app/clerk/disbursement-review/disbursement-review.component.scss

@@ -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;
+  }
+}

src/app/clerk/disbursement-review/disbursement-review.component.ts

@@ -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);

src/app/clients/client-stepper/client-general-step/client-general-step.component.html

@@ -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>
         }

src/app/clients/client-stepper/client-general-step/client-general-step.component.ts

@@ -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);

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.html

@@ -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>

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.scss

@@ -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;
+  }
+}

src/app/clients/client-stepper/client-identity-check/client-identity-check.component.ts

@@ -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;
+  }
+}

src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts

@@ -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

src/app/clients/clients-view/general-tab/general-tab.component.html

@@ -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>
               }

src/app/clients/clients-view/general-tab/general-tab.component.scss

@@ -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;
+}

src/app/clients/clients-view/general-tab/general-tab.component.ts

@@ -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;

src/app/clients/clients.component.html

@@ -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>

src/app/clients/clients.component.scss

@@ -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;
+}

src/app/clients/clients.component.ts

@@ -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;

src/app/clients/clients.service.ts

@@ -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.
    *

src/app/clients/create-client/create-client.component.html

@@ -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>
 

src/app/clients/create-client/create-client.component.ts

@@ -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(() => {

src/app/clients/models/client-identity.model.ts

@@ -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 };
+}

src/app/clients/utils/aadhaar-hash.util.spec.ts

@@ -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();
+  });
+});

src/app/clients/utils/aadhaar-hash.util.ts

@@ -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;
+}

src/app/clients/utils/name-case.util.spec.ts

@@ -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('');
+  });
+});

src/app/clients/utils/name-case.util.ts

@@ -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());
+}

src/app/core/http/cache.interceptor.ts

@@ -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 {

src/app/core/progress-bar/no-progress.token.ts

@@ -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);

src/app/core/progress-bar/progress.interceptor.ts

@@ -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(() => {

src/app/core/shell/shell.component.html

@@ -465,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
@@ -2036,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)

src/app/core/shell/shell.component.scss

@@ -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;
+}

src/app/core/shell/shell.component.ts

@@ -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();
     }

src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.html

@@ -838,9 +838,23 @@
                       <span class="ni-mono">{{ c.clientCif || '—' }}</span>
                     </td>
                     <td class="ni-td ni-td--center">
+                      @if (readOnly) {
                         <span class="ni-pct-badge" [class.ni-pct-badge--full]="c.sharePercentage === 100">
                           {{ 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

src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.scss

@@ -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;

src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts

@@ -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] : []),

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.html

@@ -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.

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.scss

@@ -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;
+}

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.ts

@@ -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;
     }
   }
 

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html

@@ -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>

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.ts

@@ -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;
   }

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/interest-schedule-dialog/interest-schedule-dialog.component.html

@@ -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>
+            @if (!isPreview) {
               <th class="isd-table__status-col">{{ 'labels.inputs.Status' | translate }}</th>
+            }
           </tr>
         </thead>
         <tbody>
@@ -37,9 +52,13 @@
             <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>
+              @if (!isPreview) {
                 <td class="isd-table__status-col">
                   @if (period.paid) {
                     <span class="isd-badge isd-badge--paid">
@@ -49,16 +68,19 @@
                     <span class="isd-badge isd-badge--pending">Pending</span>
                   }
                 </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>
+            @if (!isPreview) {
               <td></td>
+            }
           </tr>
         </tfoot>
       </table>

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/interest-schedule-dialog/interest-schedule-dialog.component.ts

@@ -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;
   }

src/app/deposits/fixed-deposits/fixed-deposits.service.ts

@@ -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

src/app/deposits/recurring-deposits/create-recurring-deposits-account/create-recurring-deposits-account.component.ts

@@ -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;
     }

src/app/deposits/recurring-deposits/edit-recurring-deposit-account/edit-recurring-deposit-account.component.ts

@@ -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 = [])
     });
   }

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-interest-rate-chart-step/recurring-deposits-account-interest-rate-chart-step.component.ts

@@ -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;

src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html

@@ -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
           ) {

src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.ts

@@ -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;

src/app/deposits/recurring-deposits/recurring-deposits.service.ts

@@ -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

src/app/directives/restrict-input.directive.ts

@@ -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 }
 };
 
 /**

src/app/fiu/fiu-data.ts

@@ -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

src/app/fiu/fiu.component.html

@@ -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,6 +666,9 @@
         </div>
       }
 
+      <!-- The case investigation. Opened as a popup by selectStrCase(); declared here so it keeps this component's state. -->
+      <ng-template #strCaseDialog>
+        <div class="fiu-dialog">
           @if (selectedStrCase) {
             <div class="str-case-detail">
               <div class="fiu-form-meta">
@@ -610,7 +698,9 @@
 
               <div class="case-form" *mifosxHasPermission="'CONCLUDE_AML_STR'">
                 <div class="form-row">
-              <label for="fiuInvestigationNotes">Investigation notes (source-of-transaction history reviewed)</label>
+                  <label for="fiuInvestigationNotes"
+                    >Investigation notes (source-of-transaction history reviewed)</label
+                  >
                   <textarea id="fiuInvestigationNotes" rows="3" [(ngModel)]="concludeInvestigationNotes"></textarea>
                 </div>
                 <div class="form-row">
@@ -689,8 +779,8 @@
                   } @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
+                      <strong>Not suspicious.</strong> All {{ strChecklist.length }} points found genuine — the case
-                  closed and nothing filed with FIU-IND.
+                      will be closed and nothing filed with FIU-IND.
                     </span>
                   } @else {
                     <fa-icon icon="exclamation-triangle"></fa-icon>
@@ -721,6 +811,8 @@
               </div>
             </div>
           }
+        </div>
+      </ng-template>
 
       <!-- FINnet export template (separate concern — STR XML file-format generation) -->
       <div class="fiu-form-meta">

src/app/fiu/fiu.component.scss

@@ -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;
+}

src/app/fiu/fiu.component.ts

@@ -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);

src/app/home/dashboard/alm-bucket-breakdown-dialog/alm-bucket-breakdown-dialog.component.html

@@ -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>

src/app/home/dashboard/alm-bucket-breakdown-dialog/alm-bucket-breakdown-dialog.component.ts

@@ -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;
+  }
+}

src/app/home/dashboard/alm-bucket-breakdown-dialog/alm-bucket-breakdown.config.ts

@@ -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 }))
+    }))
+  };
+}

src/app/home/dashboard/alm-bucket-breakdown-dialog/alm-bucket.util.ts

@@ -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)}`;
+}

src/app/home/dashboard/alm-bucket-breakdown-dialog/alm-maturity.service.ts

@@ -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 });
+  }
+}

src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.html

@@ -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,120 +364,142 @@
       </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;{{
+  <!-- Required against held, for both ratios. Always on screen, under whichever tab is open:
-            ndtl | number: '1.2-2'
+       whether the bank is short is the one thing a reader must not have to go looking for. -->
-          }}
+  <div class="crr-bar">
-          Cr
+    <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="slr-status-calcs">
+    <!-- Required AND held, side by side. The requirement alone answers half the question: a screen
-        <div class="slr-calc">
+         headed "Reserve Requirements" that states ₹2.10 Cr without saying what is against it sends
-          <div class="slr-calc-label">SLR Required ({{ slrRate }}%)</div>
+         a reader to another tab to find out whether the bank is short — which is the one thing they
-          <div class="slr-calc-val">&#8377;{{ slrRequired | number: '1.2-2' }} Cr</div>
+         opened this bar to learn. -->
-        </div>
+    <div class="crr-calcs">
-        <div class="slr-calc">
+      @for (r of positionRatios(); track r.name) {
-          <div class="slr-calc-label">Liquid Assets Held</div>
+        <div class="crr-calc" [class.crr-calc--short]="!r.met">
-          <div class="slr-calc-val">&#8377;{{ totalLiquidAssets | number: '1.2-2' }} Cr</div>
+          <!-- A ratio with no rate on record is said to have none. It used to print "SLR @ null%" and
-        </div>
+               a surplus of nothing, which reads as a requirement met rather than one not set. -->
-        <div class="slr-calc">
+          <div class="crr-calc-label">{{ r.name }}{{ r.rate === null ? ' — rate not set' : ' @ ' + r.rate + '%' }}</div>
-          <div class="slr-calc-label">Surplus</div>
+          <div class="crr-calc-val">{{ money(r.required) }}</div>
-          <div class="slr-calc-val surplus">&#8377;{{ slrSurplus | number: '1.2-2' }} Cr</div>
+          <div class="crr-calc-held">
-        </div>
+            held {{ money(r.maintained) }}
+            <span [class.crr-short]="!r.met">
+              &middot; {{ r.met ? '+' + money(r.surplus) : 'short ' + money(r.shortfall) }}
+            </span>
           </div>
         </div>
       }
-
-  <!-- NDTL Formula Block -->
-  <div class="formula-block">
-    <div class="formula-title">
-      NDTL Computation &mdash; Formula Breakdown &middot; Data as of {{ reportingDateStr }}
-    </div>
-    <div class="formula-row">
-      <div class="formula-term ft-demand">
-        <div class="formula-term-label">Demand Liabilities</div>
-        <div class="formula-term-val">&#8377;{{ totalDemand | number: '1.2-2' }}</div>
-        <div class="formula-term-sub">16 line items</div>
-      </div>
-      <div class="formula-op">+</div>
-      <div class="formula-term ft-time">
-        <div class="formula-term-label">Time Liabilities</div>
-        <div class="formula-term-val">&#8377;{{ totalTime | number: '1.2-2' }}</div>
-        <div class="formula-term-sub">13 line items</div>
-      </div>
-      <div class="formula-op minus">&minus;</div>
-      <div class="formula-term ft-asset">
-        <div class="formula-term-label">Assets with Banking</div>
-        <div class="formula-term-val">&#8377;{{ totalBankingAssets | number: '1.2-2' }}</div>
-        <div class="formula-term-sub">3 line items</div>
-      </div>
-      <div class="formula-op equals">=</div>
-      <div class="formula-term ft-ndtl">
-        <div class="formula-term-label">NDTL</div>
-        <div class="formula-term-val">&#8377;{{ ndtl | number: '1.2-2' }}</div>
-        <div class="formula-term-sub">CRR &amp; SLR base</div>
-      </div>
-    </div>
-  </div>
-
-  <!-- CRR/SLR Bar -->
-  <div class="crr-bar">
-    <div class="crr-text">
-      <div class="crr-title">CRR &amp; SLR Reserve Requirements &mdash; RBI Computation on NDTL</div>
-      <div class="crr-desc">
-        Based on NDTL of &#8377;{{ ndtl | number: '1.2-2' }} Cr &middot; Data as of {{ reportingDateStr }} (45-day lag)
-      </div>
-    </div>
-    <div class="crr-calcs">
-      <div class="crr-calc">
-        <div class="crr-calc-label">CRR @ {{ crrRate }}.00%</div>
-        <div class="crr-calc-val">&#8377;{{ crrRequired | number: '1.2-2' }} Cr</div>
-      </div>
-      <div class="crr-calc">
-        <div class="crr-calc-label">SLR @ {{ slrRate }}.00%</div>
-        <div class="crr-calc-val">&#8377;{{ slrRequired | number: '1.2-2' }} Cr</div>
-      </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 class="crr-calc-val">{{ money(totalReserve) }}</div>
+        <div class="crr-calc-held">CRR + SLR required</div>
       </div>
     </div>
   </div>
 
+  <!-- Reserve accounts, as they stand today -->
+  @if (activeTab === 'held') {
+    <div class="section-desc">
+      Where the cash reserve is held, with each account's balance on the business date
+      <strong>{{ position?.onDate || '—' }}</strong
+      >. The requirement below is charged on <strong>{{ position?.baseDate || '—' }}</strong
+      >, a fortnight back — RBI's lag is a rule, so today's own liabilities settle nothing yet.
+    </div>
+
+    @if (position) {
+      <!-- Required against held, for each ratio. Stated before the accounts because a desk reads
+           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="table-wrap">
+        <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>
+    }
+  }
+
   <!-- Footer -->
   <div class="dialog-footer">
     <span>CBSNexora &middot; RBI Liabilities Register</span>

src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.scss

@@ -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;
+}

src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.ts

@@ -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 {

src/app/home/dashboard/crr-slr-dialog/reserve-transfer-dialog.component.html

@@ -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>

src/app/home/dashboard/crr-slr-dialog/reserve-transfer-dialog.component.scss

@@ -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;
+}

src/app/home/dashboard/crr-slr-dialog/reserve-transfer-dialog.component.ts

@@ -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);
+  }
+}

src/app/home/dashboard/dashboard.component.html

@@ -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. -->

src/app/home/dashboard/dashboard.component.scss

@@ -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;
+}

src/app/home/dashboard/dashboard.component.ts

@@ -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,

src/app/kyc-management/kyc-management.component.scss

@@ -108,7 +108,6 @@
 
 .km-main {
   padding: 20px 24px;
-  max-width: 1400px;
 }
 
 .km-page-head {
@@ -1778,3 +1777,7 @@
     border-radius: 2px;
   }
 }
+
+.km-rep {
+  margin-top: 24px;
+}

src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.html

@@ -7,27 +7,6 @@
 -->
 
 <form [formGroup]="loansAccountDetailsForm">
-  <div class="layout-row-wrap layout-lt-md-column gap-2percent">
-    <mat-form-field class="flex-48">
-      <mat-label>Category</mat-label>
-      <mat-select [value]="categoryFilter" (selectionChange)="categoryFilter = $event.value; onCategoryChange()">
-        <mat-option value="">All categories</mat-option>
-        @for (category of categories; track category.id) {
-          <mat-option [value]="category.id">{{ category.label }}</mat-option>
-        }
-      </mat-select>
-    </mat-form-field>
-    <mat-form-field class="flex-48">
-      <mat-label>Product type</mat-label>
-      <mat-select [value]="typeFilter" (selectionChange)="typeFilter = $event.value; applyProductFilters()">
-        <mat-option value="">All types</mat-option>
-        @for (type of typeOptions; track type.id) {
-          <mat-option [value]="type.id">{{ type.label }}</mat-option>
-        }
-      </mat-select>
-    </mat-form-field>
-  </div>
-
   <div class="layout-row-wrap gap-2px responsive-column">
     <mat-form-field class="flex-fill">
       <mat-label>{{ 'labels.inputs.Product Name' | translate }}</mat-label>
@@ -56,8 +35,6 @@
     </mat-form-field>
   </div>
 
-  <mifosx-loan-product-template-card [product]="selectedProduct"></mifosx-loan-product-template-card>
-
   @if (loanProductSelected) {
     <div class="layout-row-wrap layout-lt-md-column gap-2percent">
       <mat-form-field class="flex-48">

src/app/organization/institution-profile/institution-profile.component.html

@@ -144,15 +144,15 @@
             </mat-form-field>
             <mat-form-field appearance="outline" class="ip-field ip-field--third">
               <mat-label>PAN</mat-label>
-              <input matInput formControlName="pan" />
+              <input matInput formControlName="pan" mifosxRestrictInput="pan" style="text-transform: uppercase" />
             </mat-form-field>
             <mat-form-field appearance="outline" class="ip-field ip-field--third">
               <mat-label>TAN</mat-label>
-              <input matInput formControlName="tan" />
+              <input matInput formControlName="tan" mifosxRestrictInput="tan" style="text-transform: uppercase" />
             </mat-form-field>
             <mat-form-field appearance="outline" class="ip-field ip-field--third">
               <mat-label>GSTIN</mat-label>
-              <input matInput formControlName="gstin" />
+              <input matInput formControlName="gstin" mifosxRestrictInput="gstin" style="text-transform: uppercase" />
             </mat-form-field>
           </div>
         </div>

src/app/organization/institution-profile/institution-profile.component.ts

@@ -10,6 +10,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms';
 import { catchError, of } from 'rxjs';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RestrictInputDirective } from '../../directives/restrict-input.directive';
 import { OrganizationService } from '../organization.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { DISABLED_ACCOUNTING_FEATURES } from '../../accounting/disabled-features';
@@ -57,7 +58,10 @@ const STATUSES = [
   selector: 'mifosx-institution-profile',
   templateUrl: './institution-profile.component.html',
   styleUrls: ['./institution-profile.component.scss'],
-  imports: [...STANDALONE_SHARED_IMPORTS]
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    RestrictInputDirective
+  ]
 })
 export class InstitutionProfileComponent implements OnInit {
   private formBuilder = inject(UntypedFormBuilder);

src/app/organization/organization-routing.module.ts

@@ -308,6 +308,13 @@ const routes: Routes = [
           loadComponent: () => import('./tds-config/tds-config.component').then((m) => m.TdsConfigComponent),
           data: { title: 'TDS Configuration', breadcrumb: 'TDS Configuration' }
         },
+        {
+          // Reserve funds and the percentage of year-end net profit appropriated to each, with their GL accounts.
+          path: 'reserve-fund-config',
+          loadComponent: () =>
+            import('./reserve-fund-config/reserve-fund-config.component').then((m) => m.ReserveFundConfigComponent),
+          data: { title: 'Reserve Fund Configuration', breadcrumb: 'Reserve Fund Configuration' }
+        },
         {
           // OSS 1 keeps its own screen: sixteen roles of its own, none shared with CRR or SLR.
           path: 'oss1-gl-config',

src/app/organization/organization.component.html

@@ -104,6 +104,26 @@
       </a>
     </div>
 
+    <!-- Reserve Fund Configuration -->
+    <div>
+      <a
+        class="org-card"
+        [routerLink]="['reserve-fund-config']"
+        *mifosxHasPermission="'READ_PROFITAPPROPRIATIONCONFIG'"
+      >
+        <div class="org-card__icon org-card__icon--amber">
+          <i class="fas fa-piggy-bank"></i>
+        </div>
+        <div class="org-card__body">
+          <h3 class="org-card__title">Reserve Fund Configuration</h3>
+          <p class="org-card__desc">
+            Reserve funds, their GL accounts and the share of year-end net profit each receives
+          </p>
+        </div>
+        <i class="fas fa-chevron-right org-card__arrow"></i>
+      </a>
+    </div>
+
     <!-- OSS 1 GL Configuration -->
     <div #oss1GlConfig>
       <a class="org-card" [routerLink]="['oss1-gl-config']" *mifosxHasPermission="'READ_RBIRESERVECONFIG'">

src/app/organization/organization.service.ts

@@ -1339,4 +1339,38 @@ export class OrganizationService {
   deleteRbiReserveRate(rateId: number): Observable<any> {
     return this.http.delete(`/rbireserveconfig/rate/${rateId}`);
   }
+
+  /**
+   * @returns {Observable<any>} `{ reserves[], totalPercentage, remainingPercentage, updatedOn, updatedBy }` — each
+   *   reserve fund, the GL account it is credited to (may be unset) and its percentage of the year's net profit.
+   */
+  getProfitAppropriationConfig(): Observable<any> {
+    return this.http.get('/profitappropriationconfig');
+  }
+
+  /** @returns {Observable<any>} `{ glAccountOptions[] }` — postable equity and liability accounts. */
+  getProfitAppropriationConfigTemplate(): Observable<any> {
+    return this.http.get('/profitappropriationconfig/template');
+  }
+
+  /** Replaces the whole list of reserve funds; the list as sent is exactly what is stored. */
+  updateProfitAppropriationConfig(
+    reserves: { name: string; glAccountId: number | null; percentage: number }[]
+  ): Observable<any> {
+    return this.http.put('/profitappropriationconfig', { reserves });
+  }
+
+  /**
+   * What appropriating a year's profit into the reserves would post (or, once posted, what was posted).
+   * Without a year, the backend picks the newest closed year not yet appropriated.
+   */
+  getProfitAppropriationPosting(financialYear?: string): Observable<any> {
+    const query = financialYear ? `?financialYear=${encodeURIComponent(financialYear)}` : '';
+    return this.http.get(`/profitappropriationconfig/posting${query}`);
+  }
+
+  /** Posts the year's appropriation: Dr profit GL / Cr each reserve GL, as one journal entry. */
+  postProfitAppropriation(financialYear: string, note: string | null): Observable<any> {
+    return this.http.post('/profitappropriationconfig/posting', { financialYear, note });
+  }
 }

src/app/organization/reserve-fund-config/reserve-fund-config.component.html

@@ -0,0 +1,359 @@
+<!--
+  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="rrc-container">
+  <div class="rrc-header">
+    <button mat-stroked-button [routerLink]="['/organization']" class="rrc-back">
+      <i class="fas fa-arrow-left"></i> Organization
+    </button>
+    <h2 class="rrc-header__title">Reserve Fund Configuration</h2>
+  </div>
+  <p class="rrc-sub">
+    The reserve funds the bank keeps, the percentage of each year's net profit appropriated to each, and the GL account
+    each one is credited to. Whatever is not appropriated stays in profit.
+  </p>
+
+  @if (errorMsg) {
+    <div class="rrc-alert rrc-alert--error">{{ errorMsg }}</div>
+  }
+  @if (successMsg) {
+    <div class="rrc-alert rrc-alert--success">{{ successMsg }}</div>
+  }
+
+  @if (loading) {
+    <div class="rrc-loading">Loading…</div>
+  } @else {
+    <!-- Where the appropriated profit comes from. Not set on this screen: it is the "Distributable Profit"
+         financial activity mapping, which the year-end close posts the year's net profit into. -->
+    <div class="rrc-card rfc-source">
+      <div class="rfc-source__icon"><i class="fas fa-coins"></i></div>
+      <div class="rfc-source__body">
+        <span class="rfc-source__label">Profit is taken from</span>
+        @switch (profitSource.state) {
+          @case ('mapped') {
+            @if (profitSource.state === 'mapped') {
+              <span class="rfc-source__gl">{{ profitSource.glCode }} · {{ profitSource.glName }}</span>
+            }
+            <span class="rrc-card__hint">
+              The GL mapped to <strong>Distributable Profit</strong>. The year-end close posts the year's net profit
+              into it, and each reserve below is credited from it.
+            </span>
+          }
+          @case ('unmapped') {
+            <span class="rfc-source__gl rfc-error">No profit GL is mapped</span>
+            <span class="rrc-card__hint">
+              Map a GL to <strong>Distributable Profit</strong> before any profit can be appropriated.
+            </span>
+          }
+          @case ('unknown') {
+            <span class="rfc-source__gl">The GL mapped to Distributable Profit</span>
+            <span class="rrc-card__hint">You do not have access to view the financial activity mappings.</span>
+          }
+          @default {
+            <span class="rrc-card__hint">Loading…</span>
+          }
+        }
+      </div>
+      @if (profitSource.state === 'mapped') {
+        <a
+          mat-stroked-button
+          class="rfc-source__link"
+          [routerLink]="['/accounting/financial-activity-mappings/view', profitSource.mappingId]"
+        >
+          Change
+        </a>
+      } @else if (profitSource.state === 'unmapped') {
+        <a mat-stroked-button class="rfc-source__link" [routerLink]="['/accounting/financial-activity-mappings']">
+          Map profit GL
+        </a>
+      }
+    </div>
+
+    <div class="rrc-card">
+      <h3 class="rrc-card__title">Reserve funds</h3>
+      <p class="rrc-card__hint">
+        Only postable equity and liability accounts are listed, and each account can back one reserve only. A reserve
+        can be saved before its GL account exists; it cannot receive an appropriation until one is selected.
+      </p>
+
+      @if (rows.length) {
+        <div class="rfc-table-wrap">
+          <table class="rrc-map rfc-table">
+            <thead>
+              <tr>
+                <th class="rfc-sr">#</th>
+                <th>Reserve / fund</th>
+                <th>Credited to (GL)</th>
+                <th class="rrc-map__narrow">
+                  % of profit
+                  @if (profitSource.state === 'mapped') {
+                    <span class="rfc-th-sub">from {{ profitSource.glCode }}</span>
+                  }
+                </th>
+                <th class="rrc-map__actions"></th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (row of rows; track row.rowId; let i = $index) {
+                <tr [class.rrc-map__row--invalid]="isRowInvalid(row)">
+                  <td class="rfc-sr">{{ i + 1 }}</td>
+                  <td>
+                    <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-map__field">
+                      <input
+                        matInput
+                        [(ngModel)]="row.name"
+                        maxlength="100"
+                        placeholder="e.g. Statutory Reserve"
+                        [disabled]="saving"
+                        aria-label="Reserve name"
+                      />
+                      @if (isNameDuplicate(row)) {
+                        <mat-hint class="rfc-error">Listed twice</mat-hint>
+                      }
+                    </mat-form-field>
+                  </td>
+                  <td>
+                    <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-map__field">
+                      <mat-select
+                        [(ngModel)]="row.glAccountId"
+                        [disabled]="saving"
+                        placeholder="Select GL account"
+                        (openedChange)="accountSearch = ''"
+                        aria-label="GL account"
+                      >
+                        <mat-option>
+                          <ngx-mat-select-search
+                            [(ngModel)]="accountSearch"
+                            [ngModelOptions]="{ standalone: true }"
+                            placeholderLabel="Search by GL code or name"
+                            noEntriesFoundLabel="No account matches"
+                          ></ngx-mat-select-search>
+                        </mat-option>
+                        <mat-option [value]="null">— Not selected —</mat-option>
+                        @for (o of availableAccounts(row); track o.id) {
+                          <mat-option [value]="o.id">{{ o.glCode }} · {{ o.name }}</mat-option>
+                        }
+                      </mat-select>
+                      @if (row.glAccountId == null) {
+                        <mat-hint class="rfc-warn">GL not selected</mat-hint>
+                      }
+                    </mat-form-field>
+                  </td>
+                  <td>
+                    <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-map__field">
+                      <input
+                        matInput
+                        type="number"
+                        min="0"
+                        max="100"
+                        step="0.01"
+                        [(ngModel)]="row.percentage"
+                        [disabled]="saving"
+                        aria-label="Percentage of net profit"
+                      />
+                      <span matTextSuffix>%</span>
+                    </mat-form-field>
+                  </td>
+                  <td class="rrc-map__actions">
+                    <button
+                      mat-button
+                      class="rrc-remove"
+                      (click)="removeRow(row)"
+                      [disabled]="saving"
+                      title="Remove this reserve"
+                    >
+                      <i class="fas fa-trash"></i>
+                    </button>
+                  </td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr class="rfc-total" [class.rfc-total--over]="overLimit">
+                <td></td>
+                <td colspan="2">Total appropriated</td>
+                <td class="rrc-num">{{ totalPercentage }}%</td>
+                <td></td>
+              </tr>
+              <tr class="rfc-remaining">
+                <td></td>
+                <td colspan="2">Remaining in profit</td>
+                <td class="rrc-num">{{ remainingPercentage }}%</td>
+                <td></td>
+              </tr>
+            </tfoot>
+          </table>
+        </div>
+      } @else {
+        <div class="rrc-alert rrc-alert--warn">No reserve fund is configured yet. Add one to begin.</div>
+      }
+
+      @if (overLimit) {
+        <div class="rrc-alert rrc-alert--error">
+          The reserves add up to {{ totalPercentage }}% of net profit. The total cannot exceed 100%.
+        </div>
+      }
+      @if (unmappedCount > 0) {
+        <div class="rrc-alert rrc-alert--warn">
+          {{ unmappedCount }} reserve{{ unmappedCount === 1 ? ' has' : 's have' }} no GL account yet. Create the account
+          in Chart of Accounts if needed, then select it here.
+        </div>
+      }
+
+      <div class="rrc-role__controls">
+        <button mat-stroked-button (click)="addRow()" [disabled]="saving">
+          <i class="fas fa-plus"></i> Add reserve
+        </button>
+        <button mat-raised-button color="primary" [disabled]="!canSave" (click)="save()">
+          {{ saving ? 'Saving…' : 'Save' }}
+        </button>
+        @if (dirty && !saving) {
+          <button mat-button (click)="reset()">Discard changes</button>
+        }
+        @if (updatedOn) {
+          <span class="rrc-card__hint">
+            Last saved {{ updatedOn | slice: 0 : 16 }}
+            @if (updatedBy) {
+              by {{ updatedBy }}
+            }
+          </span>
+        }
+      </div>
+    </div>
+
+    <!-- ═══ Post to reserves ═══ -->
+    <div class="rrc-card">
+      <h3 class="rrc-card__title">Post to reserves</h3>
+      <p class="rrc-card__hint">
+        Moves a closed year's profit out of the profit GL into the reserve GLs above, at their percentages — one journal
+        entry, dated the last day of the year. Each year can be posted once.
+      </p>
+
+      @if (postingError) {
+        <div class="rrc-alert rrc-alert--error">{{ postingError }}</div>
+      }
+      @if (postingSuccess) {
+        <div class="rrc-alert rrc-alert--success">{{ postingSuccess }}</div>
+      }
+
+      <div class="rfc-post-head">
+        <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rfc-post-head__fy">
+          <mat-label>Financial year</mat-label>
+          <mat-select
+            [(ngModel)]="postingYear"
+            (selectionChange)="loadPosting($event.value)"
+            [disabled]="postingLoading || postingBusy"
+          >
+            @for (fy of posting?.financialYearOptions || []; track fy) {
+              <mat-option [value]="fy">FY {{ fy }}</mat-option>
+            }
+          </mat-select>
+        </mat-form-field>
+
+        @if (posting) {
+          <div class="rfc-post-head__profit">
+            <span class="rfc-source__label">Profit in {{ posting.profitGlCode || 'profit GL' }}</span>
+            <span class="rfc-source__gl">₹{{ posting.profitAmount | number: '1.2-2' }}</span>
+          </div>
+          <div class="rfc-post-head__status">
+            @if (posting.posted) {
+              <span class="rrc-badge rrc-badge--mapped">Posted</span>
+            } @else if (posting.yearClosed) {
+              <span class="rrc-badge rrc-badge--active">Year closed</span>
+            } @else {
+              <span class="rrc-badge rrc-badge--unmapped">Year not closed</span>
+            }
+          </div>
+        }
+      </div>
+
+      @if (postingLoading) {
+        <div class="rrc-loading">Loading…</div>
+      } @else if (posting) {
+        <div class="rfc-table-wrap">
+          <table class="rrc-map rfc-table">
+            <thead>
+              <tr>
+                <th>Reserve / fund</th>
+                <th>Credited to (GL)</th>
+                <th class="rrc-map__narrow">%</th>
+                <th class="rfc-post-amt">Amount</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (l of posting.lines || []; track $index) {
+                <tr>
+                  <td>{{ l.reserveName }}</td>
+                  <td>
+                    @if (l.glCode) {
+                      {{ l.glCode }} · {{ l.glAccountName }}
+                    } @else {
+                      <span class="rfc-warn">GL not selected</span>
+                    }
+                  </td>
+                  <td class="rrc-num">{{ l.percentage }}%</td>
+                  <td class="rfc-post-amt rrc-num">₹{{ l.amount | number: '1.2-2' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr class="rfc-total">
+                <td colspan="3">{{ posting.posted ? 'Posted to reserves' : 'To be posted to reserves' }}</td>
+                <td class="rfc-post-amt rrc-num">₹{{ posting.totalAmount | number: '1.2-2' }}</td>
+              </tr>
+              <tr class="rfc-remaining">
+                <td colspan="3">Remaining in {{ posting.profitGlCode || 'profit GL' }}</td>
+                <td class="rfc-post-amt rrc-num">₹{{ posting.remainingAmount | number: '1.2-2' }}</td>
+              </tr>
+            </tfoot>
+          </table>
+        </div>
+
+        @if (posting.posted) {
+          <p class="rrc-card__hint">
+            Posted on {{ posting.postedOnDate }} by {{ posting.postedBy || '—' }} · Transaction
+            <strong>{{ posting.glTransactionId }}</strong>
+            @if (posting.note) {
+              · {{ posting.note }}
+            }
+          </p>
+        } @else {
+          @for (b of posting.blockers || []; track $index) {
+            <div class="rrc-alert rrc-alert--warn">{{ b }}</div>
+          }
+          @if (dirty) {
+            <div class="rrc-alert rrc-alert--warn">
+              Save the reserve changes above first — posting uses the saved configuration.
+            </div>
+          }
+
+          <div class="rfc-post-actions">
+            <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rfc-post-actions__note">
+              <mat-label>Note (e.g. AGM / board resolution no.)</mat-label>
+              <input matInput [(ngModel)]="postingNote" maxlength="500" [disabled]="!canPost" />
+            </mat-form-field>
+            @if (!postingConfirm) {
+              <button mat-raised-button color="primary" [disabled]="!canPost" (click)="postingConfirm = true">
+                Post to reserves
+              </button>
+            } @else {
+              <span class="rfc-post-actions__confirm">
+                Post ₹{{ posting.totalAmount | number: '1.2-2' }} from {{ posting.profitGlCode }} for FY
+                {{ postingYear }}? This cannot be undone here.
+              </span>
+              <button mat-raised-button color="warn" [disabled]="postingBusy" (click)="post()">
+                {{ postingBusy ? 'Posting…' : 'Confirm post' }}
+              </button>
+              <button mat-button [disabled]="postingBusy" (click)="postingConfirm = false">Cancel</button>
+            }
+          </div>
+        }
+      }
+    </div>
+  }
+</div>

src/app/organization/reserve-fund-config/reserve-fund-config.component.scss

@@ -0,0 +1,143 @@
+/**
+ * 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/.
+ */
+
+/* Layout on top of the RBI reserve configuration styles this screen shares. */
+
+.rfc-source {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  flex-wrap: wrap;
+
+  &__icon {
+    flex: 0 0 auto;
+    width: 40px;
+    height: 40px;
+    border-radius: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #fef3c7;
+    color: #b45309;
+  }
+
+  &__body {
+    flex: 1 1 260px;
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+    min-width: 0;
+  }
+
+  &__label {
+    font-size: 0.72rem;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: rgb(0 0 0 / 55%);
+    font-weight: 600;
+  }
+
+  &__gl {
+    font-size: 15px;
+    font-weight: 600;
+  }
+
+  &__link {
+    flex: 0 0 auto;
+  }
+}
+
+/* Four columns do not fit a phone; the table scrolls inside its card rather than widening the page. */
+.rfc-table-wrap {
+  overflow-x: auto;
+}
+
+.rfc-table {
+  min-width: 600px;
+}
+
+.rfc-post-head {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 16px 24px;
+  margin-bottom: 8px;
+
+  &__fy {
+    width: 180px;
+  }
+
+  &__profit {
+    display: flex;
+    flex-direction: column;
+    gap: 2px;
+  }
+}
+
+.rfc-post-amt {
+  width: 10rem;
+  text-align: right;
+  white-space: nowrap;
+}
+
+.rfc-post-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 12px;
+  margin-top: 12px;
+
+  &__note {
+    flex: 1 1 280px;
+    max-width: 480px;
+  }
+
+  &__confirm {
+    font-weight: 600;
+    color: #b45309;
+  }
+}
+
+.rfc-th-sub {
+  display: block;
+  text-transform: none;
+  letter-spacing: 0;
+  font-weight: 500;
+}
+
+.rfc-sr {
+  width: 2rem;
+  color: rgb(0 0 0 / 55%);
+}
+
+.rfc-warn {
+  color: #b45309;
+}
+
+.rfc-error {
+  color: #b91c1c;
+}
+
+.rfc-total td,
+.rfc-remaining td {
+  padding-top: 0.6rem;
+  font-weight: 600;
+}
+
+.rfc-total td {
+  border-top: 1px solid rgb(0 0 0 / 12%);
+}
+
+.rfc-total--over td {
+  color: #b91c1c;
+}
+
+.rfc-remaining td {
+  font-weight: 500;
+  color: rgb(0 0 0 / 60%);
+}

src/app/organization/reserve-fund-config/reserve-fund-config.component.ts

@@ -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, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { forkJoin } from 'rxjs';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { OrganizationService } from '../organization.service';
+import { AccountingService } from 'app/accounting/accounting.service';
+
+/** Financial activity whose GL holds the year's closed-out profit (FinancialActivity.DISTRIBUTABLE_PROFIT). */
+const DISTRIBUTABLE_PROFIT_ACTIVITY = 302;
+
+/** Where the appropriated profit is taken from, as shown at the top of the screen. */
+type ProfitSource =
+  | { state: 'loading' }
+  | { state: 'mapped'; mappingId: number; glCode: string; glName: string }
+  | { state: 'unmapped' }
+  | { state: 'unknown' };
+
+/** One reserve fund on screen, as a working copy - committed on Save. */
+interface ReserveRow {
+  /** Screen-only identity, so deleting a row never shifts the inputs bound to the rows after it. */
+  rowId: number;
+  name: string;
+  glAccountId: number | null;
+  percentage: number | null;
+}
+
+interface GlOption {
+  id: number;
+  name: string;
+  glCode: string;
+}
+
+/**
+ * Reserve funds (Statutory Reserve, Building Fund, Investment Fluctuation Fund...) and the percentage of the
+ * year's net profit appropriated to each, with the GL account each one is credited to.
+ *
+ * The list is saved as a whole: what is on screen when Save is pressed is exactly what is stored.
+ */
+@Component({
+  selector: 'mifosx-reserve-fund-config',
+  templateUrl: './reserve-fund-config.component.html',
+  styleUrls: [
+    '../rbi-reserve-config/rbi-reserve-config.component.scss',
+    './reserve-fund-config.component.scss'
+  ],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FormsModule,
+    NgxMatSelectSearchModule
+  ]
+})
+export class ReserveFundConfigComponent implements OnInit {
+  private organizationService = inject(OrganizationService);
+  private accountingService = inject(AccountingService);
+
+  loading = true;
+  saving = false;
+  errorMsg = '';
+  successMsg = '';
+
+  rows: ReserveRow[] = [];
+  glAccountOptions: GlOption[] = [];
+  accountSearch = '';
+  updatedOn: string | null = null;
+  updatedBy: string | null = null;
+  profitSource: ProfitSource = { state: 'loading' };
+
+  /** "Post to reserves": the chosen year's preview, or what was posted for it. */
+  posting: any = null;
+  postingYear = '';
+  postingLoading = false;
+  postingBusy = false;
+  postingConfirm = false;
+  postingNote = '';
+  postingError = '';
+  postingSuccess = '';
+
+  private nextRowId = 1;
+  private savedSnapshot = '[]';
+
+  ngOnInit(): void {
+    forkJoin({
+      config: this.organizationService.getProfitAppropriationConfig(),
+      template: this.organizationService.getProfitAppropriationConfigTemplate()
+    }).subscribe({
+      next: ({ config, template }) => {
+        this.glAccountOptions = template?.glAccountOptions || [];
+        this.applyConfig(config);
+        this.loading = false;
+      },
+      error: (err) => {
+        this.errorMsg = this.messageFrom(err, 'Could not load the reserve fund configuration.');
+        this.loading = false;
+      }
+    });
+    this.loadProfitSource();
+    this.loadPosting();
+  }
+
+  /** Loads the posting preview for a year; with none, the backend picks the year to open on. */
+  loadPosting(financialYear?: string): void {
+    this.postingLoading = true;
+    this.postingConfirm = false;
+    this.postingError = '';
+    this.organizationService.getProfitAppropriationPosting(financialYear).subscribe({
+      next: (preview) => {
+        this.posting = preview;
+        this.postingYear = preview?.financialYear ?? '';
+        this.postingLoading = false;
+      },
+      error: (err) => {
+        this.postingError = this.messageFrom(err, 'Could not load the appropriation for this year.');
+        this.postingLoading = false;
+      }
+    });
+  }
+
+  /** Unsaved reserve edits are not what would be posted - the backend posts the saved configuration. */
+  get canPost(): boolean {
+    return !!this.posting?.canPost && !this.dirty && !this.postingBusy;
+  }
+
+  post(): void {
+    if (!this.canPost) {
+      return;
+    }
+    this.postingBusy = true;
+    this.postingError = '';
+    this.postingSuccess = '';
+    this.organizationService.postProfitAppropriation(this.postingYear, this.postingNote.trim() || null).subscribe({
+      next: (result) => {
+        this.posting = result;
+        this.postingBusy = false;
+        this.postingConfirm = false;
+        this.postingNote = '';
+        this.postingSuccess = `Profit for FY ${this.postingYear} posted to the reserves (${result?.glTransactionId}).`;
+      },
+      error: (err) => {
+        this.postingBusy = false;
+        this.postingConfirm = false;
+        this.postingError = this.messageFrom(err, 'Could not post the appropriation.');
+      }
+    });
+  }
+
+  /**
+   * The profit GL is not chosen here: it is the account mapped to "Distributable Profit" under Accounting →
+   * Accounts Linked to Financial Activities, which the year-end close posts net profit into. Loaded on its own so
+   * a user without access to the mappings still gets the rest of the screen.
+   */
+  private loadProfitSource(): void {
+    this.accountingService.getFinancialActivityAccounts().subscribe({
+      next: (mappings: any[]) => {
+        const profit = (mappings || []).find((m) => m?.financialActivityData?.id === DISTRIBUTABLE_PROFIT_ACTIVITY);
+        this.profitSource = profit?.glAccountData
+          ? {
+              state: 'mapped',
+              mappingId: profit.id,
+              glCode: profit.glAccountData.glCode,
+              glName: profit.glAccountData.name
+            }
+          : { state: 'unmapped' };
+      },
+      error: () => (this.profitSource = { state: 'unknown' })
+    });
+  }
+
+  addRow(): void {
+    this.rows = [
+      ...this.rows,
+      { rowId: this.nextRowId++, name: '', glAccountId: null, percentage: null }];
+    this.successMsg = '';
+  }
+
+  removeRow(row: ReserveRow): void {
+    this.rows = this.rows.filter((r) => r.rowId !== row.rowId);
+    this.successMsg = '';
+  }
+
+  /** Accounts a row may pick: matching the search, and not already credited by another reserve. */
+  availableAccounts(row: ReserveRow): GlOption[] {
+    const taken = new Set(
+      this.rows.filter((r) => r.rowId !== row.rowId && r.glAccountId != null).map((r) => r.glAccountId)
+    );
+    const term = this.accountSearch.trim().toLowerCase();
+    return this.glAccountOptions.filter(
+      (o) =>
+        (!taken.has(o.id) || o.id === row.glAccountId) &&
+        (!term || o.glCode?.toLowerCase().includes(term) || o.name?.toLowerCase().includes(term))
+    );
+  }
+
+  get totalPercentage(): number {
+    return this.round(this.rows.reduce((sum, r) => sum + (Number(r.percentage) || 0), 0));
+  }
+
+  get remainingPercentage(): number {
+    return this.round(100 - this.totalPercentage);
+  }
+
+  get overLimit(): boolean {
+    return this.totalPercentage > 100;
+  }
+
+  get unmappedCount(): number {
+    return this.rows.filter((r) => r.glAccountId == null).length;
+  }
+
+  isNameDuplicate(row: ReserveRow): boolean {
+    const name = row.name.trim().toLowerCase();
+    return !!name && this.rows.some((r) => r.rowId !== row.rowId && r.name.trim().toLowerCase() === name);
+  }
+
+  isRowInvalid(row: ReserveRow): boolean {
+    const pct = Number(row.percentage);
+    return (
+      !row.name.trim() ||
+      row.name.trim().length > 100 ||
+      this.isNameDuplicate(row) ||
+      row.percentage == null ||
+      !(pct > 0) ||
+      pct > 100
+    );
+  }
+
+  get dirty(): boolean {
+    return this.snapshot(this.rows) !== this.savedSnapshot;
+  }
+
+  get canSave(): boolean {
+    return !this.saving && this.dirty && !this.overLimit && !this.rows.some((r) => this.isRowInvalid(r));
+  }
+
+  save(): void {
+    if (!this.canSave) {
+      return;
+    }
+    this.saving = true;
+    this.errorMsg = '';
+    this.successMsg = '';
+    const payload = this.rows.map((r) => ({
+      name: r.name.trim(),
+      glAccountId: r.glAccountId,
+      percentage: Number(r.percentage)
+    }));
+    this.organizationService.updateProfitAppropriationConfig(payload).subscribe({
+      next: (config) => {
+        this.applyConfig(config);
+        this.saving = false;
+        this.successMsg = 'Reserve fund configuration saved.';
+        this.loadPosting(this.postingYear || undefined);
+      },
+      error: (err) => {
+        this.saving = false;
+        this.errorMsg = this.messageFrom(err, 'Could not save the reserve fund configuration.');
+      }
+    });
+  }
+
+  /** Throws away unsaved edits. */
+  reset(): void {
+    this.rows = JSON.parse(this.savedSnapshot).map((r: Omit<ReserveRow, 'rowId'>) => ({
+      ...r,
+      rowId: this.nextRowId++
+    }));
+    this.errorMsg = '';
+    this.successMsg = '';
+  }
+
+  private applyConfig(config: any): void {
+    this.rows = (config?.reserves || []).map((r: any) => ({
+      rowId: this.nextRowId++,
+      name: r.name ?? '',
+      glAccountId: r.glAccountId ?? null,
+      percentage: r.percentage != null ? Number(r.percentage) : null
+    }));
+    this.savedSnapshot = this.snapshot(this.rows);
+    this.updatedOn = config?.updatedOn ?? null;
+    this.updatedBy = config?.updatedBy ?? null;
+  }
+
+  private snapshot(rows: ReserveRow[]): string {
+    return JSON.stringify(
+      rows.map((r) => ({
+        name: r.name.trim(),
+        glAccountId: r.glAccountId,
+        percentage: r.percentage == null ? null : Number(r.percentage)
+      }))
+    );
+  }
+
+  private round(value: number): number {
+    return Math.round(value * 10000) / 10000;
+  }
+
+  private messageFrom(err: any, fallback: string): string {
+    return err?.error?.errors?.[0]?.defaultUserMessage || err?.error?.defaultUserMessage || fallback;
+  }
+}

src/app/products/current-products/current-product-stepper/current-product-preview-step/current-product-preview-step.component.html

@@ -452,15 +452,22 @@
 
   <mat-divider class="flex-100"></mat-divider>
   @if (isCashOrAccrualAccounting()) {
+    <!-- Rows mirror the Accounting step: receivable/payable rows exist only under Accrual (a current account
+         product is always Cash), Escheat only while dormancy tracking is on. -->
     <div class="spa-gl-summary flex-100">
       <div class="spa-gl-summary__header">
         <h4 class="mat-h4">GL Mapping</h4>
       </div>
 
+      <div class="spa-gl-row">
+        <span class="spa-gl-row__label">Accounting Rule</span>
+        <span class="spa-gl-row__value">{{ accountingRule?.value }}</span>
+      </div>
+
       <div class="spa-gl-section">
         <h5 class="mat-h5">Assets</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Overdraft portfolio control</span>
+          <span class="spa-gl-row__label">Overdraft Portfolio Control</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               CurrentProduct.overdraftPortfolioControlId,
@@ -468,8 +475,9 @@
             )
           }}</span>
         </div>
+        @if (isAccrualAccounting()) {
           <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Interest receivable account</span>
+            <span class="spa-gl-row__label">Interest Receivable Account</span>
             <span class="spa-gl-row__value">{{
               formatGlAccountById(
                 CurrentProduct.interestReceivableAccountId,
@@ -478,7 +486,7 @@
             }}</span>
           </div>
           <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Fees receivable account</span>
+            <span class="spa-gl-row__label">Fees Receivable Account</span>
             <span class="spa-gl-row__value">{{
               formatGlAccountById(
                 CurrentProduct.feesReceivableAccountId,
@@ -487,7 +495,7 @@
             }}</span>
           </div>
           <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Penalties receivable account</span>
+            <span class="spa-gl-row__label">Penalties Receivable Account</span>
             <span class="spa-gl-row__value">{{
               formatGlAccountById(
                 CurrentProduct.penaltiesReceivableAccountId,
@@ -495,12 +503,13 @@
               )
             }}</span>
           </div>
+        }
       </div>
 
       <div class="spa-gl-section">
         <h5 class="mat-h5">Liabilities</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Current control account</span>
+          <span class="spa-gl-row__label">Current Control Account</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               CurrentProduct.savingsControlAccountId,
@@ -508,8 +517,9 @@
             )
           }}</span>
         </div>
+        @if (isAccrualAccounting()) {
           <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Interest payable account</span>
+            <span class="spa-gl-row__label">Interest Payable Account</span>
             <span class="spa-gl-row__value">{{
               formatGlAccountById(
                 CurrentProduct.interestPayableAccountId,
@@ -517,9 +527,10 @@
               )
             }}</span>
           </div>
+        }
         @if (CurrentProduct.isDormancyTrackingActive) {
           <div class="spa-gl-row">
-            <span class="spa-gl-row__label">Escheat liability account</span>
+            <span class="spa-gl-row__label">Escheat Liability Account</span>
             <span class="spa-gl-row__value">{{
               formatGlAccountById(
                 CurrentProduct.escheatLiabilityId,
@@ -533,7 +544,7 @@
       <div class="spa-gl-section">
         <h5 class="mat-h5">Income</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Income from fees</span>
+          <span class="spa-gl-row__label">Income From Fees</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               CurrentProduct.incomeFromFeeAccountId,
@@ -542,7 +553,7 @@
           }}</span>
         </div>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Income from penalties</span>
+          <span class="spa-gl-row__label">Income From Penalties</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               CurrentProduct.incomeFromPenaltyAccountId,
@@ -551,7 +562,7 @@
           }}</span>
         </div>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Income from interest</span>
+          <span class="spa-gl-row__label">Income From Interest</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               CurrentProduct.incomeFromInterestId,

src/app/products/fixed-deposit-products/base-fd-interest-rate-chart/base-fd-interest-rate-chart.component.html

@@ -11,16 +11,18 @@
     <div>
       <h2>CBS Base Interest Rate</h2>
       <p class="page-subtitle">
-        Manage master CBS interest rate slabs by deposit type. Saving a new version automatically
+        Manage master CBS interest rate slabs by deposit type. SINGLE, DOUBLE and SPECIAL are the fixed deposit charts;
-        <strong>deactivates</strong> the current active version and <strong>activates</strong> the new one. This chart
+        the
-        is used as the reference for both Fixed Deposit and Recurring Deposit products.
+        <strong>RD</strong> tab is the recurring deposit chart, with its own senior citizen rates, used when an RD
+        product is created and when an RD account is opened. Saving a new version automatically
+        <strong>deactivates</strong> the current active version and <strong>activates</strong> the new one.
       </p>
     </div>
   </div>
 
   <mat-tab-group animationDuration="150ms">
     @for (fdType of fdTypes; track fdType) {
-      <mat-tab [label]="fdType">
+      <mat-tab [label]="tabLabel(fdType)">
         <div class="tab-content">
           @if (!showPreview[fdType]) {
             <!-- ── Editable Slabs Table ── -->
@@ -31,6 +33,14 @@
               </button>
             </div>
 
+            @if (fdType === 'RD' && rdChartInDays) {
+              <p class="empty-text">
+                The recurring deposit chart in use is still in days. Recurring deposits are priced by months or years,
+                so enter the slabs below in Months or Years (for example 1 to 3 Months, 4 to 5 Months, 6 to 11 Months,
+                12 to 35 Months) and save.
+              </p>
+            }
+
             @if (slabs(fdType).length === 0) {
               <p class="empty-text">No slabs defined. Click "Add Slab" to begin.</p>
             } @else {
@@ -55,7 +65,7 @@
                     <td mat-cell *matCellDef="let row">
                       <mat-form-field class="cell-field cell-field--sm">
                         <mat-select [formControl]="row.get('periodTypeEnum')">
-                          @for (pt of periodTypes; track pt.id) {
+                          @for (pt of periodTypesFor(fdType); track pt.id) {
                             <mat-option [value]="pt.id">{{ pt.label }}</mat-option>
                           }
                         </mat-select>
@@ -198,7 +208,7 @@
                       </ng-container>
                       <ng-container matColumnDef="periodType">
                         <th mat-header-cell *matHeaderCellDef>Period</th>
-                        <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum) }}</td>
+                        <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum, fdType) }}</td>
                       </ng-container>
                       <ng-container matColumnDef="fromPeriod">
                         <th mat-header-cell *matHeaderCellDef>From</th>
@@ -245,7 +255,7 @@
                     </ng-container>
                     <ng-container matColumnDef="periodType">
                       <th mat-header-cell *matHeaderCellDef>Period</th>
-                      <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum) }}</td>
+                      <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum, fdType) }}</td>
                     </ng-container>
                     <ng-container matColumnDef="fromPeriod">
                       <th mat-header-cell *matHeaderCellDef>From</th>
@@ -335,7 +345,7 @@
                       </ng-container>
                       <ng-container matColumnDef="periodType">
                         <th mat-header-cell *matHeaderCellDef>Period</th>
-                        <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum) }}</td>
+                        <td mat-cell *matCellDef="let s">{{ getPeriodLabel(s.periodTypeEnum, fdType) }}</td>
                       </ng-container>
                       <ng-container matColumnDef="fromPeriod">
                         <th mat-header-cell *matHeaderCellDef>From</th>

src/app/products/fixed-deposit-products/base-fd-interest-rate-chart/base-fd-interest-rate-chart.component.ts

@@ -58,10 +58,12 @@ export class BaseFdInterestRateChartComponent implements OnInit {
   private productsService = inject(ProductsService);
   private alertService = inject(AlertService);
 
+  /** SINGLE, DOUBLE and SPECIAL are the fixed deposit charts; RD is the recurring deposit's own chart. */
   readonly fdTypes = [
     'SINGLE',
     'DOUBLE',
-    'SPECIAL'
+    'SPECIAL',
+    'RD'
   ];
   readonly periodTypes = [
     { id: 0, label: 'Days' },
@@ -69,6 +71,14 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     { id: 2, label: 'Months' },
     { id: 3, label: 'Years' }
   ];
+  /**
+   * Recurring deposits keep tenure in months or years, and the server numbers the units its own way (1 days, 2 months,
+   * 3 years), so the RD tab offers only those two.
+   */
+  readonly rdPeriodTypes = [
+    { id: 2, label: 'Months' },
+    { id: 3, label: 'Years' }
+  ];
   readonly slabColumns = [
     'srNo',
     'description',
@@ -89,6 +99,9 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     'seniorRate'
   ];
 
+  /** Set when the recurring deposit's active chart is still the old one, kept in days, which this screen no longer edits. */
+  rdChartInDays = false;
+
   forms: Record<string, FormGroup> = {};
   slabsDataSources: Record<string, MatTableDataSource<AbstractControl>> = {};
   activeRates: Record<string, any> = {};
@@ -110,6 +123,16 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     this.loadAll();
   }
 
+  /** The period units a slab of this chart can use. */
+  periodTypesFor(fdType: string): { id: number; label: string }[] {
+    return fdType === 'RD' ? this.rdPeriodTypes : this.periodTypes;
+  }
+
+  /** The tab's heading: RD spelled out, the fixed deposit types as they are. */
+  tabLabel(fdType: string): string {
+    return fdType === 'RD' ? 'RD (Recurring Deposit)' : fdType;
+  }
+
   slabs(fdType: string): FormArray {
     return this.forms[fdType].get('slabs') as FormArray;
   }
@@ -158,6 +181,8 @@ export class BaseFdInterestRateChartComponent implements OnInit {
         return 3; // Years
       case 'SPECIAL':
         return 2; // Months
+      case 'RD':
+        return 2; // Months
       default:
         return 0;
     }
@@ -264,7 +289,11 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     }
     this.isSaving[fdType] = true;
     const { versionLabel, remarks, slabs } = this.forms[fdType].value;
-    this.productsService.saveFdBaseInterestRates({ fdType, versionLabel, remarks, slabs }).subscribe({
+    const save$ =
+      fdType === 'RD'
+        ? this.productsService.saveRdBaseInterestRates({ versionLabel, remarks, slabs })
+        : this.productsService.saveFdBaseInterestRates({ fdType, versionLabel, remarks, slabs });
+    save$.subscribe({
       next: (response: any) => {
         this.isSaving[fdType] = false;
         this.showPreview[fdType] = false;
@@ -286,8 +315,13 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     });
   }
 
-  getPeriodLabel(enumVal: number): string {
+  getPeriodLabel(enumVal: number, fdType?: string): string {
-    return this.periodTypes.find((p) => p.id === enumVal)?.label ?? String(enumVal);
+    // The RD chart numbers its units differently from the fixed deposit ones, so its labels are read from its own list.
+    const units = fdType === 'RD' ? [
+            { id: 1, label: 'Days' },
+            ...this.rdPeriodTypes
+          ] : this.periodTypes;
+    return units.find((p) => p.id === enumVal)?.label ?? String(enumVal);
   }
 
   historyForType(fdType: string): any[] {
@@ -305,13 +339,25 @@ export class BaseFdInterestRateChartComponent implements OnInit {
   private loadAll(): void {
     this.isLoading = true;
     this.fdTypes.forEach((type) => {
-      this.productsService.getFdBaseInterestRates(type).subscribe({
+      const rates$ =
-        next: (rates: any[]) => {
+        type === 'RD'
-          const active = (rates || []).find((r: any) => r.isActive);
+          ? this.productsService.getRdBaseInterestRates()
+          : this.productsService.getFdBaseInterestRates(type);
+      rates$.subscribe({
+        next: (rates: any) => {
+          const versions: any[] = Array.isArray(rates) ? rates : rates ? [rates] : [];
+          const active = versions.find((r: any) => r.isActive);
           this.activeRates[type] = active ?? null;
           const arr = this.slabs(type);
           arr.clear();
-          (active?.slabs ?? []).forEach((s: any) => arr.push(this.buildSlabRow(s)));
+          // A recurring deposit is priced by months or years. A chart still held in days cannot be shown in those units, so
+          // it is not loaded: the rows would open with no period type, and the officer enters the chart afresh.
+          const rows: any[] = active?.slabs ?? [];
+          const inDays = type === 'RD' && rows.some((s: any) => s.periodTypeEnum === 1);
+          if (type === 'RD') {
+            this.rdChartInDays = inDays;
+          }
+          (inDays ? [] : rows).forEach((s: any) => arr.push(this.buildSlabRow(s)));
           this.slabsDataSources[type].data = [...arr.controls];
           this.forms[type].patchValue({ versionLabel: '', remarks: '' });
         },
@@ -323,10 +369,27 @@ export class BaseFdInterestRateChartComponent implements OnInit {
     this.productsService.getFdBaseInterestRateHistory().subscribe({
       next: (h: any[]) => {
         this.historyRates = h || [];
-        this.isLoading = false;
+        this.loadRdHistory();
       },
       error: () => {
         this.historyRates = [];
+        this.loadRdHistory();
+      }
+    });
+  }
+
+  /** The RD chart's past versions, tagged RD so they sit under their own tab. */
+  private loadRdHistory(): void {
+    this.productsService.getRdBaseInterestRateHistory().subscribe({
+      next: (h: any) => {
+        const versions: any[] = Array.isArray(h) ? h : h ? [h] : [];
+        this.historyRates = [
+          ...this.historyRates,
+          ...versions.map((v) => ({ ...v, fdType: 'RD' }))
+        ];
+        this.isLoading = false;
+      },
+      error: () => {
         this.isLoading = false;
       }
     });

src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.ts

@@ -129,12 +129,24 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
    * (see DepositAccountAssembler#assembleFrom on the backend), so the product itself is locked to the
    * same values here to avoid an admin configuring a combination that the backend will silently override
    * at account-creation time.
+   *
+   * Its interest is paid out every month, so nothing compounds on the principal: the Interest Calculation Type is
+   * locked to Simple as well. The backend refuses an FD Special product with any other value for these three
+   * (DepositProductDataValidator), so a request from anywhere else cannot save them either.
    */
   private applyFdTypeConstraints() {
     if (!this.fixedDepositProductTermsForm) return;
     const postingCtrl = this.fixedDepositProductTermsForm.get('interestPostingPeriodType');
     const compoundingCtrl = this.fixedDepositProductTermsForm.get('interestCompoundingPeriodType');
+    const calculationTypeCtrl = this.fixedDepositProductTermsForm.get('interestCalculateSelector');
     if (this.fdType === 'SPECIAL') {
+      const simple = (this.interestCalculationTypeOptionData || []).find(
+        (o: any) => String(o.value ?? o.name ?? '').toLowerCase() === 'simple'
+      );
+      if (calculationTypeCtrl && simple) {
+        calculationTypeCtrl.setValue(simple.id);
+        calculationTypeCtrl.disable();
+      }
       // Monthly = id 4 (MONTHLY in Fineract's SavingsPostingInterestPeriodType/SavingsCompoundingInterestPeriodType enums)
       const findMonthly = (data: any) => data?.find((o: any) => o.value?.toLowerCase() === 'monthly' || o.id === 4);
       if (postingCtrl && this.interestPostingPeriodTypeData) {
@@ -154,6 +166,7 @@ export class FixedDepositProductTermsStepComponent implements OnInit, OnChanges
     } else {
       postingCtrl?.enable();
       compoundingCtrl?.enable();
+      calculationTypeCtrl?.enable();
     }
   }
 

src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html

@@ -96,15 +96,6 @@
                     >
                       Edit · Submit
                     </button>
-                    <button
-                      type="button"
-                      class="lirr__icon-btn lirr__icon-btn--danger"
-                      title="Delete draft"
-                      aria-label="Delete draft"
-                      (click)="deleteDraft(r, $event)"
-                    >
-                      <i class="fas fa-trash"></i>
-                    </button>
                   </ng-container>
                   <ng-container *ngSwitchCase="'Active'">
                     <button

src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.scss

@@ -522,31 +522,3 @@
     color: #3730a3;
   }
 }
-
-/* Icon-only action on a row (delete draft). */
-.lirr__icon-btn {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  margin-left: 8px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  background: #fff;
-  color: #64748b;
-  cursor: pointer;
-
-  &:hover {
-    background: #f8fafc;
-  }
-
-  &--danger {
-    color: #dc2626;
-    border-color: #fecaca;
-
-    &:hover {
-      background: #fef2f2;
-    }
-  }
-}

src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.ts

@@ -10,8 +10,6 @@ import { Component, OnInit, inject } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import { Router } from '@angular/router';
 import { MatSnackBar } from '@angular/material/snack-bar';
-import { MatDialog } from '@angular/material/dialog';
-import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 import { MatExpansionModule } from '@angular/material/expansion';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { RateRegisterService } from './rate-register.service';
@@ -35,7 +33,6 @@ export class LoanInterestRateRegisterComponent implements OnInit {
   private readonly service = inject(RateRegisterService);
   private readonly router = inject(Router);
   private readonly snack = inject(MatSnackBar);
-  private readonly dialog = inject(MatDialog);
 
   registers: RateRegister[] = [];
   active?: RateRegister;
@@ -74,22 +71,6 @@ export class LoanInterestRateRegisterComponent implements OnInit {
     }
   }
 
-  /** Deletes a draft (a version that was never submitted) after a confirmation. */
-  deleteDraft(register: RateRegister, event: Event): void {
-    event.stopPropagation();
-    const label = register.name || `draft from ${this.formatShort(register.effectiveFrom)}`;
-    this.dialog
-      .open(DeleteDialogComponent, { data: { deleteContext: label } })
-      .afterClosed()
-      .subscribe((response: any) => {
-        if (response?.delete) {
-          this.service.deleteDraft(register.id);
-          this.snack.open('Draft deleted', 'OK', { duration: 3000 });
-          this.reload();
-        }
-      });
-  }
-
   /** Checker approves the pending register. The previously-Active one is deactivated. */
   approve(register: RateRegister, event: Event): void {
     event.stopPropagation();

src/app/products/loan-interest-rate-register/rate-register.service.ts

@@ -52,13 +52,6 @@ export class RateRegisterService {
     }
   }
 
-  /** Throws a draft away. Only a local, never-submitted draft can go; server versions are never touched. */
-  deleteDraft(id: number): void {
-    this.localDrafts = this.localDrafts.filter((d) => !(d.id === id && d.status === 'Draft'));
-    this.cache = this.cache.filter((d) => !(d.id === id && d.status === 'Draft'));
-    this.saveDrafts();
-  }
-
   /** Persist the current drafts (call after any edit the user should not lose). */
   saveDrafts(): void {
     try {

src/app/products/loan-products/create-loan-product/create-loan-product.component.html

@@ -9,9 +9,7 @@
 <div class="lp-container">
   <div class="lp-header">
     <i class="fas fa-hand-holding-usd lp-header__icon"></i>
-    <h2 class="lp-header__title">
+    <h2 class="lp-header__title">{{ 'labels.heading.Create Loan Product' | translate }}</h2>
-      {{ isEdit ? 'Edit Loan Product' : ('labels.heading.Create Loan Product' | translate) }}
-    </h2>
   </div>
 
   <mat-tab-group
@@ -32,7 +30,7 @@
       </div>
     </mat-tab>
 
-    <mat-tab [disabled]="!hasProductType">
+    <mat-tab>
       <ng-template mat-tab-label>
         <i class="fas fa-coins lp-tab-icon"></i>
         {{ 'labels.inputs.CURRENCY' | translate }}
@@ -45,16 +43,10 @@
     </mat-tab>
 
     @if (isAdvanceProduct) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-shield-alt lp-tab-icon"></i>
-          {{
+          SECURITY &amp; LIEN
-            advanceSubType === 'gold'
-              ? 'SECURITY & GOLD'
-              : advanceSubType === 'warehouse'
-                ? 'SECURITY & WAREHOUSE'
-                : 'SECURITY & LIEN'
-          }}
         </ng-template>
         <div class="lp-tab-content">
           <mifosx-loan-product-security-lien-step
@@ -65,7 +57,7 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-sliders-h lp-tab-icon"></i>
           LIMIT &amp; TENURE
@@ -77,7 +69,7 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-percent lp-tab-icon"></i>
           INTEREST
@@ -90,7 +82,19 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <i class="fas fa-triangle-exclamation lp-tab-icon"></i>
+          PENAL &amp; NPA
+        </ng-template>
+        <div class="lp-tab-content">
+          <mifosx-loan-product-penal-npa-step
+            [loanProductsTemplate]="loanProductsTemplate"
+          ></mifosx-loan-product-penal-npa-step>
+        </div>
+      </mat-tab>
+
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-arrows-rotate lp-tab-icon"></i>
           RENEWAL &amp; CLOSURE
@@ -101,7 +105,7 @@
       </mat-tab>
 
       @if (isOverdraftFacility) {
-        <mat-tab [disabled]="!hasProductType">
+        <mat-tab>
           <ng-template mat-tab-label>
             <i class="fas fa-money-check lp-tab-icon"></i>
             CHEQUE BOOK
@@ -114,31 +118,27 @@
     }
 
     @if (isLoanAccount) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-shield-alt lp-tab-icon"></i>
           SECURITY &amp; COLLATERAL
         </ng-template>
         <div class="lp-tab-content">
-          <mifosx-loan-product-loan-security-step
+          <mifosx-loan-product-loan-security-step></mifosx-loan-product-loan-security-step>
-            [productTypeSubGroup]="loanProductDetailsForm.get('productTypeSubGroup')"
-          ></mifosx-loan-product-loan-security-step>
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-sliders-h lp-tab-icon"></i>
           AMOUNT &amp; TENURE
         </ng-template>
         <div class="lp-tab-content">
-          <mifosx-loan-product-loan-amount-tenure-step
+          <mifosx-loan-product-loan-amount-tenure-step></mifosx-loan-product-loan-amount-tenure-step>
-            [productSubType]="advanceSubType"
-          ></mifosx-loan-product-loan-amount-tenure-step>
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-calendar-alt lp-tab-icon"></i>
           REPAYMENT &amp; EMI
@@ -148,7 +148,7 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-percent lp-tab-icon"></i>
           INTEREST
@@ -161,7 +161,19 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
+        <ng-template mat-tab-label>
+          <i class="fas fa-triangle-exclamation lp-tab-icon"></i>
+          PENAL &amp; NPA
+        </ng-template>
+        <div class="lp-tab-content">
+          <mifosx-loan-product-penal-npa-step
+            [loanProductsTemplate]="loanProductsTemplate"
+          ></mifosx-loan-product-penal-npa-step>
+        </div>
+      </mat-tab>
+
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-flag-checkered lp-tab-icon"></i>
           PREPAYMENT &amp; CLOSURE
@@ -172,27 +184,12 @@
       </mat-tab>
     }
 
-    <!-- Common to both Advances A/C and Loans A/C (and visible even before a product type is chosen). -->
-    <mat-tab [disabled]="!hasProductType">
-      <ng-template mat-tab-label>
-        <i class="fas fa-triangle-exclamation lp-tab-icon"></i>
-        PENAL &amp; NPA
-      </ng-template>
-      <div class="lp-tab-content">
-        <mifosx-loan-product-penal-npa-step
-          [loanProductsTemplate]="loanProductsTemplate"
-          [productTypeGroup]="loanProductDetailsForm.get('productTypeGroup')"
-          [productTypeSubGroup]="loanProductDetailsForm.get('productTypeSubGroup')"
-        ></mifosx-loan-product-penal-npa-step>
-      </div>
-    </mat-tab>
-
     <!--
       OLD LOANS A/C PATH — commented out for now (replaced by the Loans A/C steps above).
       Settings, Interest Refund, Payment Allocation and Terms tabs are kept here so they can be restored.
 
     @if (!isAdvanceProduct) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-cog lp-tab-icon"></i>
           {{ 'labels.inputs.SETTINGS' | translate }}
@@ -209,7 +206,7 @@
     }
 
     @if (isAdvancedPaymentStrategy) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-undo lp-tab-icon"></i>
           {{ 'labels.inputs.INTEREST REFUND' | translate }}
@@ -222,7 +219,7 @@
         </div>
       </mat-tab>
 
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-exchange-alt lp-tab-icon"></i>
           {{ 'labels.inputs.PAYMENT ALLOCATION' | translate }}
@@ -243,7 +240,7 @@
     }
 
     @if (!isAdvanceProduct) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-sliders-h lp-tab-icon"></i>
           {{ 'labels.inputs.TERMS' | translate }}
@@ -257,7 +254,7 @@
     }
     -->
 
-    <mat-tab [disabled]="!hasProductType">
+    <mat-tab>
       <ng-template mat-tab-label>
         <i class="fas fa-receipt lp-tab-icon"></i>
         {{ 'labels.inputs.CHARGES' | translate }}
@@ -273,7 +270,7 @@
 
     <!-- OLD LOANS A/C PATH (Deferred Income Recognition) — commented out for now.
     @if (isAdvancedPaymentStrategy) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-clock lp-tab-icon"></i>
           {{ 'labels.inputs.DEFERRED INCOME RECOGNITION' | translate }}
@@ -294,7 +291,7 @@
     }
     -->
 
-    <mat-tab [disabled]="!hasProductType">
+    <mat-tab>
       <ng-template mat-tab-label>
         <i class="fas fa-book lp-tab-icon"></i>
         {{ 'labels.inputs.ACCOUNTING' | translate }}
@@ -305,15 +302,12 @@
           [accountingRuleData]="accountingRuleData"
           [loanProductFormValid]="loanProductFormValid"
           [deferredIncomeRecognition]="deferredIncomeRecognition"
-          [productTypeGroup]="loanProductDetailsForm.get('productTypeGroup')?.value"
-          [productTypeSubGroup]="loanProductDetailsForm.get('productTypeSubGroup')?.value"
-          [productGlAccountId]="productGlAccount"
         ></mifosx-loan-product-accounting-step>
       </div>
     </mat-tab>
 
     @if (loanProductFormValid) {
-      <mat-tab [disabled]="!hasProductType">
+      <mat-tab>
         <ng-template mat-tab-label>
           <i class="fas fa-eye lp-tab-icon"></i>
           {{ 'labels.inputs.PREVIEW' | translate }}
@@ -322,7 +316,7 @@
           <mifosx-loan-product-preview-step
             [loanProductsTemplate]="loanProductsTemplate"
             [accountingRuleData]="accountingRuleData"
-            [loanProduct]="previewLoanProduct"
+            [loanProduct]="loanProduct"
             (submitEvent)="submit()"
           ></mifosx-loan-product-preview-step>
         </div>
@@ -330,25 +324,6 @@
     }
   </mat-tab-group>
 
-  @if (hasProductType && !loanProductFormValid) {
-    <div class="lp-incomplete">
-      <i class="fas fa-circle-info"></i>
-      <div>
-        <strong>The Review tab appears once every tab is complete.</strong>
-        Still to finish:
-        @for (item of incompleteTabs; track item.tab; let last = $last) {
-          <b>{{ item.tab }}</b>
-          @if (item.fields.length > 0) {
-            ({{ item.fields.join(', ') }})
-          }
-          @if (!last) {
-            ,
-          }
-        }
-      </div>
-    </div>
-  }
-
   <div class="lp-action-bar">
     <button mat-raised-button [routerLink]="['../']" class="lp-action-bar__cancel">
       {{ 'labels.buttons.Cancel' | translate }}
@@ -361,12 +336,7 @@
         </button>
       }
       @if (selectedTabIndex < totalTabs - 1) {
-        <button
+        <button mat-raised-button color="primary" (click)="selectedTabIndex = selectedTabIndex + 1">
-          mat-raised-button
-          color="primary"
-          [disabled]="!hasProductType"
-          (click)="selectedTabIndex = selectedTabIndex + 1"
-        >
           {{ 'labels.buttons.Next' | translate }}
           <i class="fas fa-arrow-right" style="margin-left: 8px"></i>
         </button>
@@ -374,7 +344,7 @@
       @if (loanProductFormValid && selectedTabIndex === totalTabs - 1) {
         <button mat-raised-button color="primary" (click)="submit()">
           <i class="fas fa-check" style="margin-right: 8px"></i>
-          {{ isEdit ? 'Save changes' : ('labels.buttons.Submit' | translate) }}
+          {{ 'labels.buttons.Submit' | translate }}
         </button>
       }
     </div>

src/app/products/loan-products/create-loan-product/create-loan-product.component.scss

@@ -90,27 +90,3 @@ $primary: #1353a0;
     gap: 12px;
   }
 }
-
-/* Tells the user which tabs still block the Review tab. */
-.lp-incomplete {
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-  margin: 16px 0 0;
-  padding: 10px 14px;
-  border: 1px solid #fcd34d;
-  border-radius: 8px;
-  background: #fffbeb;
-  color: #78350f;
-  font-size: 13px;
-  line-height: 1.5;
-
-  i {
-    margin-top: 3px;
-    color: #d97706;
-  }
-
-  b {
-    color: #92400e;
-  }
-}

src/app/products/loan-products/create-loan-product/create-loan-product.component.ts

@@ -7,7 +7,7 @@
  */
 
 /** Angular Imports */
-import { AfterViewInit, Component, OnInit, ViewChild, inject } from '@angular/core';
+import { Component, OnInit, ViewChild, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
 /** Custom Components */
@@ -84,7 +84,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     LoanProductPreviewStepComponent
   ]
 })
-export class CreateLoanProductComponent implements OnInit, AfterViewInit {
+export class CreateLoanProductComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private productsService = inject(ProductsService);
   private alertService = inject(AlertService);
@@ -135,8 +135,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
   loanProductAccountingStep: LoanProductAccountingStepComponent;
 
   loanProductsTemplate: any;
-  /** True when this wizard edits a saved product (the edit route) instead of creating one. */
-  isEdit = false;
   accountingRuleData: string[] = [];
   itemsByDefault: any[] = [];
   selectedTabIndex = 0;
@@ -160,11 +158,8 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
   constructor() {
     const loanProducts = this.loanProducts;
 
-    this.route.data.subscribe(
+    this.route.data.subscribe((data: { loanProductsTemplate: any; configurations: any }) => {
-      (data: { loanProductsTemplate: any; loanProductAndTemplate: any; configurations: any }) => {
+      this.loanProductsTemplate = data.loanProductsTemplate;
-        // The edit route resolves the saved product together with the template options.
-        this.isEdit = !!data.loanProductAndTemplate;
-        this.loanProductsTemplate = data.loanProductAndTemplate ?? data.loanProductsTemplate;
       const assetAccountData = this.loanProductsTemplate.accountingMappingOptions.assetAccountOptions || [];
       const liabilityAccountData = this.loanProductsTemplate.accountingMappingOptions.liabilityAccountOptions || [];
       this.loanProductsTemplate.accountingMappingOptions.assetAndLiabilityAccountOptions =
@@ -172,370 +167,13 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
 
       this.itemsByDefault = loanProducts.setItemsByDefault(data.configurations);
       this.loanProductsTemplate['itemsByDefault'] = this.itemsByDefault;
-        if (!this.isEdit) {
       this.loanProductsTemplate = loanProducts.updateLoanProductDefaults(this.loanProductsTemplate, false);
-        }
+    });
-      }
-    );
   }
 
   ngOnInit() {
     this.accountingRuleData = this.accounting.getAccountingRulesForLoans();
     this.buildAdvancedPaymentAllocation();
-    // Advances and Loans A/C (EMI) products are filled into the curated tabs. A product made before the type was saved
-    // uses the old editor instead of an empty form.
-    const savedGroup = this.loanProductsTemplate?.advanceExtensions?.productTypeGroup;
-    if (this.isEdit && savedGroup !== 'advances' && savedGroup !== 'loans') {
-      this.router.navigate(['../edit-legacy'], { relativeTo: this.route });
-    }
-  }
-
-  ngAfterViewInit(): void {
-    if (this.isEdit) {
-      this.populateWhenReady(0);
-    }
-  }
-
-  /** The tabs of the product's type appear after the Details step sets the type; fill them once they exist. */
-  private populateWhenReady(attempt: number): void {
-    const group = this.loanProductsTemplate?.advanceExtensions?.productTypeGroup;
-    const ready =
-      group === 'advances'
-        ? !!(
-            this.loanProductSecurityLienStep &&
-            this.loanProductAdvanceLimitTenureStep &&
-            this.loanProductAdvanceInterestStep &&
-            this.loanProductRenewalClosureStep &&
-            this.loanProductPenalNpaStep &&
-            (!this.isOverdraftFacility || this.loanProductChequeBookStep)
-          )
-        : group === 'loans'
-          ? !!(
-              this.loanProductLoanSecurityStep &&
-              this.loanProductLoanAmountTenureStep &&
-              this.loanProductLoanRepaymentStep &&
-              this.loanProductLoanInterestStep &&
-              this.loanProductLoanPrepaymentStep &&
-              this.loanProductPenalNpaStep
-            )
-          : false;
-    if (!ready) {
-      if (attempt < 60) {
-        setTimeout(() => this.populateWhenReady(attempt + 1), 150);
-      }
-      return;
-    }
-    if (group === 'loans') {
-      this.populateLoans();
-    } else {
-      this.populateAdvance();
-    }
-  }
-
-  /** Reverse of assembleLoanProduct: the saved core fields and the extension record go back into the Loans tabs. */
-  private populateLoans(): void {
-    const p = this.loanProductsTemplate;
-    const e = p.advanceExtensions ?? {};
-    const repayment = this.loanProductLoanRepaymentStep;
-    const interest = this.loanProductLoanInterestStep;
-    const frequency = repayment.frequencyOptions.find((o) => o.fineractId === p.repaymentFrequencyType?.id)?.id;
-    const daysInYear = interest.daysInYearOptions.find((o) => o.fineractId === p.daysInYearType?.id)?.id;
-    const daysInMonth = interest.daysInMonthOptions.find((o) => o.fineractId === p.daysInMonthType?.id)?.id;
-
-    this.fill(this.loanProductCurrencyStep?.loanProductCurrencyForm, {
-      currencyCode: p.currency?.code,
-      digitsAfterDecimal: p.currency?.decimalPlaces
-    });
-
-    this.fill(this.loanProductLoanSecurityStep.loanProductLoanSecurityForm, {
-      securityType: e.securityType,
-      securityMandatory: e.securityMandatory,
-      margin: e.margin,
-      guarantorsRequired: e.guarantorsRequired,
-      coApplicant: e.coApplicant,
-      thirdPartySecurity: e.thirdPartySecurity,
-      legalOpinionRequired: e.legalOpinionRequired,
-      propertyInsuranceRequired: e.propertyInsuranceRequired,
-      registerCharge: e.registerCharge,
-      autoReleaseOnClosure: e.releaseSecurityOnClosure,
-      allowMultipleSecurities: e.allowMultipleSecurities,
-      allowThirdPartyDeposit: e.allowThirdPartyDeposit
-    });
-
-    this.fill(this.loanProductLoanAmountTenureStep.loanProductLoanAmountTenureForm, {
-      minAmount: p.minPrincipal,
-      defaultAmount: p.principal,
-      maxAmount: p.maxPrincipal,
-      minTenure: p.minNumberOfRepayments,
-      defaultTenure: p.numberOfRepayments,
-      maxTenure: p.maxNumberOfRepayments,
-      minAge: e.minAge,
-      maxAgeAtMaturity: e.maxAgeAtMaturity,
-      minCibil: e.minCibil,
-      minMonthlyIncome: e.minMonthlyIncome,
-      maxFoir: e.maxFoir,
-      maxLoansPerCustomer: e.maxLoansPerCustomer,
-      memberRequired: e.memberRequired,
-      guarantorMustBeMember: e.guarantorMustBeMember,
-      incomeMultiple: e.incomeMultiple,
-      disbursementType: e.disbursementType,
-      // The tranche count only applies to a multiple disbursement; a single one leaves the field at its own default.
-      maxTranches: e.disbursementType === 'multiple' ? p.maxTrancheCount : undefined,
-      disbursementMode: e.disbursementMode,
-      undisbursedInterest: e.undisbursedInterest,
-      preEmiInterest: e.preEmiInterest
-    });
-
-    this.fill(repayment.loanProductLoanRepaymentForm, {
-      repaymentType: e.repaymentType,
-      repaidEvery: p.repaymentEvery,
-      frequency,
-      minDaysToFirstRepayment: p.minimumDaysBetweenDisbursalAndFirstRepayment,
-      emiDueDay: e.emiDueDay,
-      holidayRule: e.holidayRule,
-      moratoriumMonths: e.moratoriumMonths,
-      moratoriumInterest: e.moratoriumInterest,
-      variableInstallments: e.variableInstallments,
-      repaymentMode: e.repaymentMode,
-      linkedAccountType: e.linkedAccountType,
-      pdcCollection: e.pdcCollection,
-      mandateRequired: e.mandateRequired,
-      appropriationOrder: e.appropriationOrder,
-      advanceEmi: e.advanceEmi
-    });
-
-    this.fill(interest.loanProductLoanInterestForm, {
-      interestType: e.rateType,
-      registerParticular: e.registerParticular,
-      applyCibilAdjustment: e.applyCibilAdjustment,
-      spread: e.spread,
-      rateResolvedAt: e.rateResolvedAt,
-      minRate: p.minInterestRatePerPeriod,
-      defaultRate: p.interestRatePerPeriod,
-      maxRate: p.maxInterestRatePerPeriod,
-      calcMethod: e.interestCalcMethod,
-      daysInYear,
-      daysInMonth,
-      calcPeriod: e.calcPeriod,
-      interestStartsFrom: e.interestStartsFrom,
-      compounding: e.compounding,
-      benchmark: e.benchmark,
-      resetFrequency: e.resetFrequency,
-      resetChange: e.resetChange
-    });
-
-    this.fill(this.loanProductLoanPrepaymentStep.loanProductLoanPrepaymentForm, {
-      partPrepaymentAllowed: e.partPrepaymentAllowed,
-      minPartPayment: e.minPartPayment,
-      allowedOn: e.allowedOn,
-      partPaymentsPerYear: e.partPaymentsPerYear,
-      partPrepaymentMode: e.partPrepaymentMode,
-      foreclosureFloatingIndividual: e.foreclosureFloatingIndividual,
-      foreclosureFixedIndividual: e.foreclosureFixedIndividual,
-      foreclosureNonIndividual: e.foreclosureNonIndividual,
-      foreclosureTakeover: e.foreclosureTakeover,
-      lockInMonths: e.lockInMonths,
-      interestOnPreclosure: e.interestOnPreclosure,
-      foreclosureQuoteValidDays: e.foreclosureQuoteValidDays,
-      autoCloseOnZeroBalance: e.autoCloseOnZeroBalance,
-      nocLetter: e.nocLetter,
-      restructuring: e.restructuring,
-      topUpAllowed: e.topUpAllowed,
-      balanceTransferOutAllowed: e.balanceTransferOutAllowed
-    });
-
-    this.fill(this.loanProductPenalNpaStep.loanProductPenalNpaForm, {
-      penalApplicable: e.penalApplicable,
-      penalRate: e.penalRate,
-      penalAppliedOn: e.penalAppliedOn,
-      penalGraceDays: e.penalGraceDays,
-      delinquencyBucketId: p.delinquencyBucket?.id,
-      npaDays: p.overdueDaysForNPA,
-      npaTrigger: e.npaTrigger,
-      interestAfterNpa: e.interestAfterNpa,
-      smaStartAfterMonths: e.smaStartAfterMonths,
-      inArrearsTolerance: p.inArrearsTolerance,
-      upgradeOnlyAllArrears: e.npaUpgradeOnlyAllArrears
-    });
-
-    this.fill(this.loanProductAccountingStep?.loanProductAccountingForm, {
-      undebitedInterestAccountId: e.undebitedInterestGlId
-    });
-
-    // Filling the currency empties the Charges list; put the saved charges back, or saving would detach them.
-    if (this.loanProductChargesStep) {
-      this.loanProductChargesStep.chargesDataSource = [...(p.charges ?? [])];
-    }
-  }
-
-  /** Sets the controls and marks them touched-by-user so a sub type default does not overwrite the saved value. */
-  private fill(form: UntypedFormGroup | undefined, values: Record<string, any>): void {
-    if (!form) {
-      return;
-    }
-    Object.keys(values).forEach((name) => {
-      const control = form.get(name);
-      const value = values[name];
-      if (control && value !== undefined && value !== null) {
-        // A YES / NO select is saved as true / false; give it the word the select understands.
-        const isYesNoSelect = control.value === 'YES' || control.value === 'NO';
-        control.setValue(isYesNoSelect && typeof value === 'boolean' ? (value ? 'YES' : 'NO') : value);
-        control.markAsDirty();
-      }
-    });
-  }
-
-  /** Reverse of assembleAdvanceProduct: the saved core fields and the extension record go back into the tabs. */
-  private populateAdvance(): void {
-    const p = this.loanProductsTemplate;
-    const e = p.advanceExtensions ?? {};
-    const split = (value: any) =>
-      value
-        ? String(value)
-            .split('|')
-            .filter((v) => v !== '')
-        : undefined;
-
-    this.fill(this.loanProductCurrencyStep?.loanProductCurrencyForm, {
-      currencyCode: p.currency?.code,
-      digitsAfterDecimal: p.currency?.decimalPlaces
-    });
-
-    this.fill(this.loanProductSecurityLienStep.loanProductSecurityLienForm, {
-      securityType: e.securityType,
-      eligibleAmountBasis: e.eligibleAmountBasis,
-      margin: e.margin,
-      lienMarkingStage: e.lienMarkingStage,
-      eligibleDepositProducts: split(e.eligibleDepositProducts),
-      tenureNotExceedMaturity: e.lienTenureNotExceedMaturity,
-      autoReleaseOnClosure: e.lienAutoReleaseOnClosure,
-      allowMultipleDeposits: e.lienAllowMultipleDeposits,
-      adjustFromMaturity: e.lienAdjustFromMaturity,
-      allowThirdPartyDeposit: e.lienAllowThirdParty,
-      allowRenewalUnderLien: e.lienAllowRenewalUnderLien,
-      lienCertificateRequired: e.lienCertificateRequired,
-      lienCertificatePrefix: e.lienCertificatePrefix,
-      printOnDisbursement: e.printCertificateOnDisbursement,
-      goldMaxLtv: e.goldMaxLtv,
-      goldMinPurityCarat: e.goldMinPurityCarat,
-      goldRateSource: e.goldRateSource,
-      goldMaxPerGram: e.goldMaxPerGram,
-      goldMinNetWeight: e.goldMinNetWeight,
-      goldMaxNetWeightPerCustomer: e.goldMaxNetWeightPerCustomer,
-      goldAllowedItems: e.goldAllowedItems,
-      goldValuationCertificateRequired: e.goldValuationCertificateRequired,
-      goldMaxValuationPerAppraiser: e.goldMaxValuationPerAppraiser,
-      goldPacketPrefix: e.goldPacketPrefix,
-      goldRevalueOnNpa: e.goldRevalueOnNpa,
-      goldRevaluationChargeApplicable: e.goldRevaluationChargeApplicable,
-      insuranceRequired: e.insuranceRequired,
-      goldAuctionNoticeDays: e.goldAuctionNoticeDays,
-      goldPartialReleaseAllowed: e.goldPartialReleaseAllowed,
-      goldThirdPartyAllowed: e.goldThirdPartyAllowed,
-      goldDisbursementMode: e.goldDisbursementMode,
-      goldCashDisbursementLimit: e.goldCashDisbursementLimit,
-      goldLtvBreachAlert: e.goldLtvBreachAlert,
-      goldAuctionReservePct: e.goldAuctionReservePct,
-      wrMaxLtv: e.wrMaxLtv,
-      wrReceiptType: e.wrReceiptType,
-      wrTenureWithinReceiptValidity: e.wrTenureWithinReceiptValidity,
-      wrPledgeMarkedBeforeDisbursement: e.wrPledgeMarkedBeforeDisbursement,
-      wrCommodityGroups: split(e.wrCommodityGroups),
-      wrValuationPriceSource: e.wrValuationPriceSource,
-      wrMaxLoanPerQuintal: e.wrMaxLoanPerQuintal,
-      wrStockInspectionMonths: e.wrStockInspectionMonths,
-      wrLtvBreachAlert: e.wrLtvBreachAlert,
-      wrPartialReleaseAllowed: e.wrPartialReleaseAllowed,
-      wrDisposalNoticeDays: e.wrDisposalNoticeDays,
-      wrDisposalReservePct: e.wrDisposalReservePct
-    });
-
-    this.fill(this.loanProductAdvanceLimitTenureStep.loanProductAdvanceLimitTenureForm, {
-      facilityType: e.facilityType,
-      minLimit: p.minPrincipal,
-      defaultLimit: p.principal,
-      maxLimit: p.maxPrincipal,
-      minTenure: p.minNumberOfRepayments,
-      defaultTenure: p.numberOfRepayments,
-      maxTenure: p.maxNumberOfRepayments,
-      repaymentType: e.repaymentType,
-      appropriationOrder: e.appropriationOrder,
-      debitBalanceAllow: e.debitBalanceAllow,
-      allowDebitTransAfterDueDate: e.allowDebitAfterDueDate,
-      branchLevelAccountType: e.branchLevelAccountType
-    });
-
-    this.fill(this.loanProductAdvanceInterestStep.loanProductAdvanceInterestForm, {
-      interestBasis: e.interestBasis,
-      registerParticular: e.registerParticular,
-      spread: e.spread,
-      calcMethod: e.interestCalcMethod,
-      interestChargedOn: e.interestChargedOn,
-      interestOnCreditBalance: e.interestOnCreditBalance,
-      postingFrequency: e.interestPostingFrequency,
-      postingDay: e.interestPostingDay
-    });
-
-    this.fill(this.loanProductRenewalClosureStep.loanProductRenewalClosureForm, {
-      renewalAllowed: e.renewalAllowed,
-      renewalPeriodMonths: e.renewalPeriodMonths,
-      renewalGraceDays: e.renewalGraceDays,
-      preclosureAllowed: e.preclosureAllowed,
-      lockInMonths: e.lockInMonths,
-      interestOnPreclosure: e.interestOnPreclosure
-    });
-
-    this.fill(this.loanProductPenalNpaStep.loanProductPenalNpaForm, {
-      penalApplicable: e.penalApplicable,
-      penalRate: e.penalRate,
-      penalAppliedOn: e.penalAppliedOn,
-      penalGraceDays: e.penalGraceDays,
-      delinquencyBucketId: p.delinquencyBucket?.id,
-      npaDays: p.overdueDaysForNPA,
-      npaTrigger: e.npaTrigger,
-      interestAfterNpa: e.interestAfterNpa,
-      smaStartAfterMonths: e.smaStartAfterMonths,
-      stockStatementValidityDays: e.stockStatementValidityDays,
-      inArrearsTolerance: p.inArrearsTolerance,
-      upgradeOnlyAllArrears: e.npaUpgradeOnlyAllArrears,
-      keepStandardIfDepositCovers: e.npaKeepStandardIfDepositCovers,
-      npaOutOfOrderBasis: e.npaOutOfOrderBasis,
-      cropDuration: e.cropDuration
-    });
-
-    if (this.isOverdraftFacility && this.loanProductChequeBookStep) {
-      this.fill(this.loanProductChequeBookStep.loanProductChequeBookForm, {
-        chequeType: e.chequeType,
-        bookSizes: split(e.chequeBookSizes),
-        defaultBookSize: e.defaultChequeBookSize !== undefined ? String(e.defaultChequeBookSize) : undefined,
-        maxBooksOutstanding: e.chequeMaxBooksOutstanding,
-        firstBookFree: e.chequeFirstBookFree,
-        freeBooksPerYear: e.chequeFreeBooksPerYear,
-        namePrinted: e.chequeNamePrinted,
-        ppsThreshold: e.ppsThreshold,
-        ppsMandatoryAbove: e.ppsMandatoryAbove,
-        stopPaymentAllowed: e.chequeStopPaymentAllowed,
-        maintainStockRegister: e.chequeMaintainStockRegister,
-        allowWithdrawalSlip: e.chequeAllowWithdrawalSlip,
-        blockNpa: e.chequeBlockNpa,
-        blockLimitExpired: e.chequeBlockLimitExpired,
-        blockOverDp: e.chequeBlockOverDp,
-        blockFrozen: e.chequeBlockFrozen,
-        blockLienReleased: e.chequeBlockLienReleased
-      });
-    }
-
-    // The nine GLs: the core ones are filled by the Accounting step from the saved mappings; the suspense GL is
-    // kept on the extension record.
-    this.fill(this.loanProductAccountingStep?.loanProductAccountingForm, {
-      undebitedInterestAccountId: e.undebitedInterestGlId
-    });
-
-    // Filling the currency above empties the Charges list (a new currency invalidates it); put the saved charges back,
-    // or saving the edit would detach every charge from the product.
-    if (this.loanProductChargesStep) {
-      this.loanProductChargesStep.chargesDataSource = [...(p.charges ?? [])];
-    }
   }
 
   get loanProductDetailsForm() {
@@ -667,12 +305,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
     return this.loanProductAccountingStep.loanProductAccountingForm;
   }
 
-  /** True once the Details step has both a product type and a sub type; every other tab stays locked until then. */
-  get hasProductType(): boolean {
-    const details = this.loanProductDetailsForm;
-    return !!details?.get('productTypeGroup')?.value && !!details?.get('productTypeSubGroup')?.value;
-  }
-
   /** The Details step's chosen product type; drives the Advances-only tabs. */
   get isAdvanceProduct(): boolean {
     return this.loanProductDetailsForm?.get('productTypeGroup')?.value === 'advances';
@@ -684,14 +316,14 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
   }
 
   get totalTabs(): number {
-    let tabs = 5; // details, currency, penal & npa, charges, accounting (always)
+    let tabs = 4; // details, currency, charges, accounting (always)
     if (this.isAdvanceProduct) {
-      // security & lien, limit & tenure, interest, renewal & closure
+      // security & lien, limit & tenure, interest, penal & npa, renewal & closure
-      tabs += 4;
+      tabs += 5;
       if (this.isOverdraftFacility) tabs += 1; // cheque book
     } else if (this.isLoanAccount) {
-      // security & collateral, amount & tenure, repayment & emi, interest, prepayment & closure
+      // security & collateral, amount & tenure, repayment & emi, interest, penal & npa, prepayment & closure
-      tabs += 5;
+      tabs += 6;
     }
     // Old Loans A/C path (Settings, Terms, Interest Refund, Payment Allocation, Deferred Income) — commented out:
     // else {
@@ -702,114 +334,9 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
     return tabs;
   }
 
-  /**
-   * The tabs that still block the Review tab, each with the fields to fix. The Review tab only appears once every
-   * tab is valid, and a tab that was never opened or a missing field is otherwise invisible to the user.
-   */
-  get incompleteTabs(): { tab: string; fields: string[] }[] {
-    const humanize = (name: string) =>
-      name
-        .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
-        .replace(/Id$/, '')
-        .replace(/^./, (ch) => ch.toUpperCase());
-    const tabs: [string, any][] = [
-      [
-        'Details',
-        this.loanProductDetailsForm
-      ],
-      [
-        'Currency',
-        this.loanProductCurrencyForm
-      ]
-    ];
-    if (this.isAdvanceProduct) {
-      tabs.push(
-        [
-          'Security & Lien',
-          this.loanProductSecurityLienStep?.loanProductSecurityLienForm
-        ],
-        [
-          'Limit & Tenure',
-          this.loanProductAdvanceLimitTenureStep?.loanProductAdvanceLimitTenureForm
-        ],
-        [
-          'Interest',
-          this.loanProductAdvanceInterestStep?.loanProductAdvanceInterestForm
-        ],
-        [
-          'Renewal & Closure',
-          this.loanProductRenewalClosureStep?.loanProductRenewalClosureForm
-        ]
-      );
-      if (this.isOverdraftFacility) {
-        tabs.push([
-          'Cheque Book',
-          this.loanProductChequeBookStep?.loanProductChequeBookForm
-        ]);
-      }
-    } else if (this.isLoanAccount) {
-      tabs.push(
-        [
-          'Security & Collateral',
-          this.loanProductLoanSecurityStep?.loanProductLoanSecurityForm
-        ],
-        [
-          'Amount & Tenure',
-          this.loanProductLoanAmountTenureStep?.loanProductLoanAmountTenureForm
-        ],
-        [
-          'Repayment & EMI',
-          this.loanProductLoanRepaymentStep?.loanProductLoanRepaymentForm
-        ],
-        [
-          'Interest',
-          this.loanProductLoanInterestStep?.loanProductLoanInterestForm
-        ],
-        [
-          'Prepayment & Closure',
-          this.loanProductLoanPrepaymentStep?.loanProductLoanPrepaymentForm
-        ]
-      );
-    }
-    tabs.push(
-      [
-        'Penal & NPA',
-        this.loanProductPenalNpaStep?.loanProductPenalNpaForm
-      ],
-      [
-        'Accounting',
-        this.loanProductAccountingStep?.loanProductAccountingForm
-      ]
-    );
-    return tabs
-      .filter(
-        ([
-          ,
-          form
-        ]) => !form || form.invalid
-      )
-      .map(
-        ([
-          tab,
-          form
-        ]) => ({
-          tab,
-          fields: form
-            ? Object.keys(form.controls)
-                .filter((key) => form.controls[key].invalid)
-                .slice(0, 4)
-                .map(humanize)
-            : []
-        })
-      );
-  }
-
   get loanProductFormValid() {
     const base =
-      this.loanProductDetailsForm.valid &&
+      this.loanProductDetailsForm.valid && this.loanProductCurrencyForm.valid && this.loanProductAccountingForm.valid;
-      this.loanProductCurrencyForm.valid &&
-      this.loanProductAccountingForm.valid &&
-      !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid;
 
     // Advances A/C: the curated Figma steps gate the form; Settings/Terms tabs are hidden.
     if (this.isAdvanceProduct) {
@@ -818,6 +345,7 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
         !!this.loanProductSecurityLienStep?.loanProductSecurityLienForm?.valid &&
         !!this.loanProductAdvanceLimitTenureStep?.loanProductAdvanceLimitTenureForm?.valid &&
         !!this.loanProductAdvanceInterestStep?.loanProductAdvanceInterestForm?.valid &&
+        !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid &&
         !!this.loanProductRenewalClosureStep?.loanProductRenewalClosureForm?.valid &&
         (!this.isOverdraftFacility || !!this.loanProductChequeBookStep?.loanProductChequeBookForm?.valid)
       );
@@ -831,6 +359,7 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
         !!this.loanProductLoanAmountTenureStep?.loanProductLoanAmountTenureForm?.valid &&
         !!this.loanProductLoanRepaymentStep?.loanProductLoanRepaymentForm?.valid &&
         !!this.loanProductLoanInterestStep?.loanProductLoanInterestForm?.valid &&
+        !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid &&
         !!this.loanProductLoanPrepaymentStep?.loanProductLoanPrepaymentForm?.valid
       );
     }
@@ -846,33 +375,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
     // return base && loansValid;
   }
 
-  private previewKey = '';
-  private previewProduct: any = {};
-
-  /**
-   * The product the Review tab shows. It is rebuilt only when a form value changes, so the summary gets a stable object
-   * (it fills in currency, schedule type and so on on the object it receives). Submit still uses the fresh `loanProduct`.
-   */
-  get previewLoanProduct(): any {
-    const key = JSON.stringify(
-      Object.keys(this)
-        .filter((name) => /Step$/.test(name))
-        .map((name) => {
-          const step = (this as any)[name];
-          return step
-            ? Object.keys(step)
-                .filter((prop) => /Form$/.test(prop))
-                .map((prop) => step[prop]?.getRawValue?.())
-            : null;
-        })
-    );
-    if (key !== this.previewKey) {
-      this.previewKey = key;
-      this.previewProduct = this.loanProduct;
-    }
-    return this.previewProduct;
-  }
-
   get loanProduct() {
     // Advances A/C builds its own payload: the curated steps map onto Fineract's mandatory core fields
     // (principal, tenure, rate, amortization defaults) plus the whitelisted satellite params.
@@ -1033,14 +535,9 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       penalAppliedOn: pn.penalAppliedOn,
       penalGraceDays: num(pn.penalGraceDays),
       npaTrigger: pn.npaTrigger,
-      smaStartAfterMonths: num(pn.smaStartAfterMonths),
       interestAfterNpa: pn.interestAfterNpa,
       npaUpgradeOnlyAllArrears: pn.upgradeOnlyAllArrears,
-
+      npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers,
-      // The SICR & LGD (ECL) card is hidden for now, so its values are not sent. "Out of order" (CC / OD only) and the
-      // deposit-cover rule do not apply to a term loan, so neither is sent.
-      cropDuration: pn.cropDuration || undefined,
-
       securityMandatory: sec.securityMandatory,
       guarantorsRequired: num(sec.guarantorsRequired),
       coApplicant: sec.coApplicant,
@@ -1057,9 +554,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       minMonthlyIncome: num(at.minMonthlyIncome),
       maxFoir: num(at.maxFoir),
       maxLoansPerCustomer: num(at.maxLoansPerCustomer),
-      memberRequired: at.memberRequired,
-      guarantorMustBeMember: at.guarantorMustBeMember,
-      incomeMultiple: num(at.incomeMultiple),
       disbursementType: at.disbursementType,
       disbursementMode: at.disbursementMode,
       undisbursedInterest: at.undisbursedInterest,
@@ -1097,6 +591,7 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       autoCloseOnZeroBalance: pp.autoCloseOnZeroBalance,
       nocLetter: pp.nocLetter,
       restructuring: pp.restructuring,
+      releaseCollateralOnClosure: pp.releaseCollateralOnClosure,
       topUpAllowed: pp.topUpAllowed,
       balanceTransferOutAllowed: pp.balanceTransferOutAllowed
     };
@@ -1118,9 +613,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
     const d = this.loanProductDetailsStep.loanProductDetails;
     const cur = this.loanProductCurrencyStep.loanProductCurrency;
     const sec = this.loanProductSecurityLienStep.loanProductSecurityLien;
-    const lien = this.loanProductSecurityLienStep.isLienSubType;
-    const gold = this.loanProductSecurityLienStep.isGold ? sec.gold : null;
-    const wr = this.loanProductSecurityLienStep.isWarehouse ? sec.warehouse : null;
     const lt = this.loanProductAdvanceLimitTenureStep.loanProductAdvanceLimitTenure;
     const intr = this.loanProductAdvanceInterestStep.loanProductAdvanceInterest;
     const pn = this.loanProductPenalNpaStep.loanProductPenalNpa;
@@ -1196,62 +688,10 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       ltv: sec.ltv,
       dpMethod: 'security_value_x_ltv',
       lienRequired: this.loanProductSecurityLienStep.isLienSubType,
-      // Lien settings exist only for a deposit / policy sub type; a pledged one (Gold ...) sends none of them.
-      ...(lien
-        ? {
       lienMarkingStage: sec.lienMarkingStage,
       lienCertificateRequired: sec.lienCertificateRequired,
       lienCertificatePrefix: sec.lienCertificatePrefix,
-            printCertificateOnDisbursement: sec.printOnDisbursement
+      printCertificateOnDisbursement: sec.printOnDisbursement,
-          }
-        : {}),
-      ...(gold
-        ? {
-            goldMaxLtv: num(gold.maxLtv),
-            goldMinPurityCarat: num(gold.minPurityCarat),
-            goldRateSource: gold.rateSource,
-            goldMaxPerGram: num(gold.maxPerGram),
-            goldMinNetWeight: num(gold.minNetWeight),
-            goldMaxNetWeightPerCustomer: num(gold.maxNetWeightPerCustomer),
-            goldAllowedItems: gold.allowedItems,
-            goldAppraiserRequired: true,
-            goldValuationCertificateRequired: gold.valuationCertificateRequired === 'YES',
-            goldMaxValuationPerAppraiser: num(gold.maxValuationPerAppraiser),
-            goldPacketPrefix: gold.packetPrefix || undefined,
-            goldRevalueOnNpa: gold.revalueOnNpa,
-            goldRevaluationChargeApplicable: gold.revaluationChargeApplicable,
-            insuranceRequired: gold.insuranceRequired === 'YES',
-            goldAuctionNoticeDays: num(gold.auctionNoticeDays),
-            goldPartialReleaseAllowed: gold.partialReleaseAllowed,
-            goldThirdPartyAllowed: gold.thirdPartyAllowed,
-            goldDisbursementMode: gold.disbursementMode,
-            goldCashDisbursementLimit:
-              gold.disbursementMode === 'account_credit_cash_limit' ? num(gold.cashDisbursementLimit) : undefined,
-            goldLtvBreachAlert: num(gold.ltvBreachAlert),
-            goldAuctionReservePct: num(gold.auctionReservePct),
-            goldRedeemBeforeAuction: true
-          }
-        : {}),
-      ...(wr
-        ? {
-            wrMaxLtv: num(wr.maxLtv),
-            wrReceiptType: wr.receiptType,
-            wrWdraRegistered: true,
-            wrAssayCertificateRequired: true,
-            wrTenureWithinReceiptValidity: wr.tenureWithinReceiptValidity,
-            wrPledgeMarkedBeforeDisbursement: wr.pledgeMarkedBeforeDisbursement,
-            wrCommodityGroups: (wr.commodityGroups ?? []).join('|'),
-            wrValuationPriceSource: wr.valuationPriceSource,
-            wrMaxLoanPerQuintal: num(wr.maxLoanPerQuintal),
-            wrStockInspectionMonths: num(wr.stockInspectionMonths),
-            insuranceRequired: wr.insuranceRequired === 'YES',
-            wrLtvBreachAlert: num(wr.ltvBreachAlert),
-            wrPartialReleaseAllowed: wr.partialReleaseAllowed,
-            wrDisposalNoticeDays: num(wr.disposalNoticeDays),
-            wrDisposalReservePct: num(wr.disposalReservePct),
-            wrRedeemBeforeDisposal: true
-          }
-        : {}),
       interestBasis: intr.interestBasis,
       registerParticular: intr.registerParticular || undefined,
       spread: num(intr.spread),
@@ -1262,14 +702,7 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       penalAppliedOn: pn.penalAppliedOn,
       penalGraceDays: num(pn.penalGraceDays),
       npaTrigger: pn.npaTrigger,
-      smaStartAfterMonths: num(pn.smaStartAfterMonths),
-      stockStatementValidityDays: num(pn.stockStatementValidityDays),
       interestAfterNpa: pn.interestAfterNpa,
-
-      // The SICR & LGD (ECL) card is hidden for now, so its values are not sent.
-      npaOutOfOrderBasis: pn.npaOutOfOrderBasis || undefined,
-      cropDuration: pn.cropDuration || undefined,
-
       renewalAllowed: rc.renewalAllowed,
       renewalPeriodMonths: num(rc.renewalPeriodMonths),
       renewalGraceDays: num(rc.renewalGraceDays),
@@ -1283,18 +716,14 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       ppsMandatoryAbove: num(cb?.ppsMandatoryAbove),
 
       // ---- remaining wizard fields ----
-      // security & lien extras (deposit list joined; rule checkboxes), only for a deposit / policy sub type
+      // security & lien extras (deposit list joined; rule checkboxes)
-      ...(lien
-        ? {
       eligibleDepositProducts: (sec.eligibleDepositProducts ?? []).join('|'),
       lienTenureNotExceedMaturity: sec.lienRules?.tenureNotExceedMaturity,
       lienAutoReleaseOnClosure: sec.lienRules?.autoReleaseOnClosure,
       lienAllowMultipleDeposits: sec.lienRules?.allowMultipleDeposits,
       lienAdjustFromMaturity: sec.lienRules?.adjustFromMaturity,
       lienAllowThirdParty: sec.lienRules?.allowThirdPartyDeposit,
-            lienAllowRenewalUnderLien: sec.lienRules?.allowRenewalUnderLien
+      lienAllowRenewalUnderLien: sec.lienRules?.allowRenewalUnderLien,
-          }
-        : {}),
       // limit & tenure extras
       repaymentType: lt.repaymentType,
       appropriationOrder: lt.appropriationOrder,
@@ -1307,13 +736,15 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       interestPostingDay: intr.postingDay,
       // NPA upgrade rules
       npaUpgradeOnlyAllArrears: pn.upgradeOnlyAllArrears,
-      ...(lien ? { npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers } : {}),
+      npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers,
       // cheque book full config
       chequeBookSizes: (cb?.bookSizes ?? []).join('|'),
       chequeMaxBooksOutstanding: num(cb?.maxBooksOutstanding),
+      chequeReissueWhenLeaves: num(cb?.reissueWhenLeaves),
       chequeFirstBookFree: cb?.firstBookFree,
       chequeFreeBooksPerYear: num(cb?.freeBooksPerYear),
       chequeNamePrinted: cb?.namePrinted,
+      chequePrintDescription: cb?.chequePrintDescription,
       chequeStopPaymentAllowed: cb?.stopPaymentAllowed,
       chequeMaintainStockRegister: cb?.maintainStockRegister,
       chequeAllowWithdrawalSlip: cb?.allowWithdrawalSlip,
@@ -1340,19 +771,6 @@ export class CreateLoanProductComponent implements OnInit, AfterViewInit {
       delete loanProduct['daysInYearCustomStrategy'];
     }
 
-    if (this.isEdit) {
-      this.productsService.updateLoanProduct(this.loanProductsTemplate.id, loanProduct).subscribe((response: any) => {
-        if (response?.rollbackTransaction) {
-          this.alertService.alert({
-            type: 'Success',
-            message: 'Loan product update request submitted successfully for approval.'
-          });
-        }
-        this.router.navigate(['../'], { relativeTo: this.route });
-      });
-      return;
-    }
-
     this.productsService.createLoanProduct(loanProduct).subscribe({
       next: (response: any) => {
         if (response?.rollbackTransaction) {

src/app/products/loan-products/loan-product-original.util.ts

@@ -1,79 +0,0 @@
-/**
- * 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/.
- */
-
-/**
- * A saved Advances / Loans product keeps most of its settings in an extension record (`advanceExtensions`), under the
- * same names the edit form submits. Putting those next to the core fields gives every submitted field a current value
- * to compare against, so a pending edit shows only what really changed. Core fields win on a name clash.
- *
- * The product read leaves out a core number that is zero, while the edit form always sends it, so that one is filled in
- * as 0 rather than reading as "newly set" on every edit.
- */
-export function withExtensions(product: any): any {
-  if (!product) {
-    return product;
-  }
-  const merged = product.advanceExtensions ? { ...product.advanceExtensions, ...product } : { ...product };
-  if (merged.inArrearsTolerance === undefined || merged.inArrearsTolerance === null) {
-    merged.inArrearsTolerance = 0;
-  }
-  // Same for the arrears grace: a Loans A/C (EMI) product counts arrears from day one, and the read leaves a zero out.
-  if (merged.graceOnArrearsAgeing === undefined || merged.graceOnArrearsAgeing === null) {
-    merged.graceOnArrearsAgeing = 0;
-  }
-  return merged;
-}
-
-/** Core accounting mapping name on the product read -> the payload name the Review reader uses. */
-const GL_MAPPING_KEYS: Record<string, string> = {
-  loanPortfolioAccount: 'loanPortfolioAccountId',
-  fundSourceAccount: 'fundSourceAccountId',
-  interestOnLoanAccount: 'interestOnLoanAccountId',
-  incomeFromFeeAccount: 'incomeFromFeeAccountId',
-  incomeFromPenaltyAccount: 'incomeFromPenaltyAccountId',
-  writeOffAccount: 'writeOffAccountId',
-  receivableInterestAccount: 'receivableInterestAccountId',
-  overpaymentLiabilityAccount: 'overpaymentLiabilityAccountId'
-};
-
-/** A date the API sends as [2026, 10, 15] shown as 15-10-2026. */
-function dateText(value: any): string | undefined {
-  if (!Array.isArray(value) || value.length < 3) {
-    return value ?? undefined;
-  }
-  const [
-    year,
-    month,
-    day
-  ] = value;
-  return `${String(day).padStart(2, '0')}-${String(month).padStart(2, '0')}-${year}`;
-}
-
-/**
- * A saved Advances product as the read-only Review page needs it: the flat field names the create wizard submits
- * (core fields plus the extension record), the GL mappings as ids with a matching option list so each shows by name,
- * and the attached charges as one readable line. Pure; the product object is not changed.
- */
-export function reviewProductOf(product: any): { product: any; template: any } {
-  const flat: any = { ...withExtensions(product) };
-  const accounts: any[] = [];
-  Object.keys(GL_MAPPING_KEYS).forEach((name) => {
-    const account = product?.accountingMappings?.[name];
-    if (account?.id !== undefined) {
-      flat[GL_MAPPING_KEYS[name]] = account.id;
-      accounts.push({ id: account.id, glCode: account.glCode, name: account.name });
-    }
-  });
-  flat.currencyCode = product?.currency?.code;
-  flat.digitsAfterDecimal = product?.currency?.decimalPlaces;
-  flat.startDate = dateText(product?.startDate);
-  flat.closeDate = dateText(product?.closeDate);
-  flat.delinquencyBucketId = undefined;
-  flat.chargesSummary = (product?.charges ?? []).map((charge: any) => `${charge.name} (${charge.amount})`).join(', ');
-  return { product: flat, template: { accountingMappingOptions: { assetAccountOptions: accounts } } };
-}

src/app/products/loan-products/loan-product-stepper/advance-steps.scss

@@ -214,242 +214,3 @@ $gray-900: #202124;
     grid-template-columns: 1fr;
   }
 }
-
-/* Penal / SMA / NPA / ECL cards: each gets its own accent so they read as separate blocks. */
-.pn-card {
-  border-left-width: 4px;
-
-  &--penal {
-    border-left-color: #0ea5e9;
-  }
-
-  &--sma {
-    border-left-color: #f59e0b;
-  }
-
-  &--npa {
-    border-left-color: #dc2626;
-  }
-
-  &--ecl {
-    border-left-color: #6366f1;
-  }
-}
-
-.pn-stages {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  padding: 0 16px 16px;
-}
-
-.pn-stage {
-  padding: 4px 12px;
-  border-radius: 999px;
-  font-size: 12px;
-  font-weight: 600;
-
-  &--0 {
-    background: #fef9c3;
-    color: #854d0e;
-  }
-
-  &--1 {
-    background: #ffedd5;
-    color: #9a3412;
-  }
-
-  &--2 {
-    background: #fee2e2;
-    color: #991b1b;
-  }
-}
-
-/* ECL card: collapsed by default, grouped, plain wording. */
-.pn-ecl-head {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  width: 100%;
-  padding: 14px 16px;
-  border: 0;
-  background: #f8fafc;
-  color: #1e293b;
-  font: inherit;
-  text-align: left;
-  cursor: pointer;
-
-  &:hover {
-    background: #f1f5f9;
-  }
-
-  &__title {
-    display: inline-flex;
-    align-items: center;
-    gap: 10px;
-    white-space: nowrap;
-
-    i {
-      color: #6366f1;
-    }
-  }
-
-  &__tag {
-    padding: 2px 8px;
-    border-radius: 999px;
-    background: #e0e7ff;
-    color: #3730a3;
-    font-size: 11px;
-    font-weight: 600;
-  }
-
-  &__summary {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-    color: #64748b;
-    font-size: 12px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-}
-
-.pn-ecl-body {
-  padding: 4px 16px 16px;
-}
-
-.pn-ecl-intro {
-  margin: 8px 0 16px;
-  color: #475569;
-  font-size: 13px;
-  line-height: 1.5;
-}
-
-.pn-ecl-group {
-  margin-bottom: 20px;
-
-  h4 {
-    margin: 0 0 12px;
-    color: #1e293b;
-    font-size: 14px;
-    font-weight: 600;
-  }
-}
-
-.pn-ecl-row {
-  margin-top: 12px;
-}
-
-.pn-ecl-check {
-  display: flex;
-  align-items: center;
-  min-height: 40px;
-}
-
-/* Eligibility & Documents tab. */
-.ed-body {
-  padding: 16px;
-}
-
-.ed-count {
-  margin-left: auto;
-  padding: 2px 10px;
-  border-radius: 999px;
-  background: #e0f2fe;
-  color: #075985;
-  font-size: 12px;
-  font-weight: 600;
-}
-
-.ed-rules {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 12px;
-
-  @media (width <= 900px) {
-    grid-template-columns: 1fr;
-  }
-}
-
-.ed-rule {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 14px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  cursor: pointer;
-
-  &__text {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-
-    strong {
-      color: #1e293b;
-      font-size: 14px;
-      font-weight: 600;
-    }
-
-    small {
-      color: #64748b;
-      font-size: 12px;
-    }
-  }
-}
-
-.ed-group {
-  margin-bottom: 18px;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-
-  &__title {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    margin-bottom: 8px;
-    color: #475569;
-    font-size: 12px;
-    font-weight: 700;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-
-    i {
-      color: #6366f1;
-    }
-  }
-}
-
-.ed-docs {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 8px 12px;
-
-  @media (width <= 900px) {
-    grid-template-columns: 1fr;
-  }
-}
-
-.ed-doc {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 4px 12px 4px 4px;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-  color: #334155;
-  font-size: 14px;
-  cursor: pointer;
-
-  &:hover {
-    background: #f8fafc;
-  }
-
-  &--on {
-    border-color: #a5b4fc;
-    background: #eef2ff;
-    color: #1e1b4b;
-  }
-}

src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.html

@@ -38,12 +38,18 @@
         <div class="lpa-group">
           <div class="lpa-group__header">
             <h4>{{ section.title }}</h4>
+            <button
+              type="button"
+              class="lpa-add-other-btn"
+              (click)="addOtherGlMapping(section.otherMappingsControlName)"
+            >
+              + Add Other
+            </button>
           </div>
           <div class="lpa-list">
             @for (row of section.rows; track row.key) {
               @if (
-                basicControls.has(row.controlName) &&
+                (!row.accrualOnly || isAccrualAccounting()) &&
-                (!row.accrualOnly || isAccrualAccounting() || basicControls.has(row.controlName)) &&
                 (!row.deferredOnly || isDeferredOnly()) &&
                 (!row.deferredCapitalizationOnly || isDeferredCapitalizationOnly()) &&
                 (!row.deferredBuyDownOnly || isDeferredBuyDownOnly()) &&
@@ -72,6 +78,334 @@
               }
             }
           </div>
+
+          <!-- Other GL Mappings -->
+          <div class="lpa-list" [formArrayName]="section.otherMappingsControlName">
+            @for (
+              otherRow of getOtherGlMappingsArray(section.otherMappingsControlName).controls;
+              track $index;
+              let i = $index
+            ) {
+              <div class="lpa-other-row-wrap">
+                <div class="lpa-row lpa-row--other" [formGroupName]="i">
+                  <div class="lpa-row__meta lpa-row__meta--other">
+                    <span
+                      class="lpa-pill"
+                      [class.lpa-pill--green]="section.pillClass === 'green'"
+                      [class.lpa-pill--amber]="section.pillClass === 'amber'"
+                      [class.lpa-pill--blue]="section.pillClass === 'blue'"
+                    >
+                      {{ section.pillLabel }}
+                    </span>
+                    <input
+                      class="lpa-row__name lpa-row__name--other-account"
+                      formControlName="accountName"
+                      placeholder="Enter account name..."
+                      type="text"
+                    />
+                  </div>
+
+                  <div class="lpa-row__actions lpa-row__actions--other">
+                    <mat-form-field class="lpa-row__other-field" appearance="outline" subscriptSizing="dynamic">
+                      <mat-label>GL Code</mat-label>
+                      <mat-select
+                        [formControl]="getOtherGlMappingControl(section.otherMappingsControlName, i, 'glAccountId')"
+                      >
+                        @for (glAccount of section.otherAccountOptions; track glAccount.id) {
+                          <mat-option [value]="glAccount.id">
+                            {{ '(' + glAccount.glCode + ') ' + glAccount.name }}
+                          </mat-option>
+                        }
+                      </mat-select>
+                    </mat-form-field>
+                  </div>
+                </div>
+                <button
+                  type="button"
+                  class="lpa-remove-btn lpa-remove-btn--side"
+                  (click)="removeOtherGlMapping(section.otherMappingsControlName, i)"
+                >
+                  <i class="fas fa-times"></i>
+                </button>
+              </div>
+            }
+          </div>
+        </div>
+      }
+
+      <!-- Advanced Accounting Rules Section -->
+      @if (loanProductAccountingForm.value.accountingRule >= 2 && loanProductAccountingForm.value.accountingRule <= 4) {
+        <div class="lpa-group">
+          <div class="lpa-group__header">
+            <h4>Advanced Accounting Rules</h4>
+          </div>
+          <div class="lpa-checkbox-row">
+            <mat-checkbox formControlName="advancedAccountingRules">{{
+              'labels.heading.Advanced Accounting Rules' | translate
+            }}</mat-checkbox>
+          </div>
+
+          @if (loanProductAccountingForm.value.advancedAccountingRules) {
+            <!-- Payment Fund Sources -->
+            <div class="lpa-subsection">
+              <div class="lpa-subsection-header">
+                <h4>{{ 'labels.heading.Configure Fund Sources for Payment Channels' | translate }}</h4>
+                <button
+                  type="button"
+                  mat-raised-button
+                  color="primary"
+                  class="lpa-add-btn"
+                  (click)="add('PaymentFundSource', paymentChannelToFundSourceMappings)"
+                >
+                  <fa-icon icon="plus" class="m-r-10"></fa-icon>
+                  {{ 'labels.buttons.Add' | translate }}
+                </button>
+              </div>
+              @if (paymentChannelToFundSourceMappings.value.length !== 0) {
+                <div class="lpa-table-wrapper">
+                  <table mat-table [dataSource]="paymentChannelToFundSourceMappings.value">
+                    <ng-container matColumnDef="paymentTypeId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Payment Type' | translate }}</th>
+                      <td mat-cell *matCellDef="let paymentFundSource">
+                        {{ paymentFundSource.paymentTypeId | find: paymentTypeData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="fundSourceAccountId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Fund Source' | translate }}</th>
+                      <td mat-cell *matCellDef="let paymentFundSource">
+                        {{ paymentFundSource.fundSourceAccountId | find: assetAccountData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="actions">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
+                      <td mat-cell *matCellDef="let paymentFundSource; let i = index">
+                        <button
+                          mat-icon-button
+                          color="primary"
+                          (click)="edit('PaymentFundSource', paymentChannelToFundSourceMappings, i)"
+                        >
+                          <fa-icon icon="edit"></fa-icon>
+                        </button>
+                        <button
+                          mat-icon-button
+                          color="warn"
+                          (click)="delete('PaymentFundSource', paymentChannelToFundSourceMappings, i)"
+                        >
+                          <fa-icon icon="trash"></fa-icon>
+                        </button>
+                      </td>
+                    </ng-container>
+                    <tr mat-header-row *matHeaderRowDef="paymentFundSourceDisplayedColumns"></tr>
+                    <tr mat-row *matRowDef="let row; columns: paymentFundSourceDisplayedColumns"></tr>
+                  </table>
+                </div>
+              }
+            </div>
+
+            <!-- Fees to Income -->
+            <div class="lpa-subsection">
+              <div class="lpa-subsection-header">
+                <h4>{{ 'labels.heading.Map Fees to Specific Income Accounts' | translate }}</h4>
+                <button
+                  type="button"
+                  mat-raised-button
+                  color="primary"
+                  class="lpa-add-btn"
+                  (click)="add('FeesIncome', feeToIncomeAccountMappings)"
+                >
+                  <fa-icon icon="plus" class="m-r-10"></fa-icon>
+                  {{ 'labels.buttons.Add' | translate }}
+                </button>
+              </div>
+              @if (feeToIncomeAccountMappings.value.length !== 0) {
+                <div class="lpa-table-wrapper">
+                  <table mat-table [dataSource]="feeToIncomeAccountMappings.value">
+                    <ng-container matColumnDef="chargeId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Fees' | translate }}</th>
+                      <td mat-cell *matCellDef="let feesIncome">
+                        {{ feesIncome.chargeId | find: chargeData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="incomeAccountId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Income Account' | translate }}</th>
+                      <td mat-cell *matCellDef="let feesIncome">
+                        {{ feesIncome.incomeAccountId | find: incomeAndLiabilityAccountData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="actions">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
+                      <td mat-cell *matCellDef="let feesIncome; let i = index">
+                        <button
+                          mat-icon-button
+                          color="primary"
+                          (click)="edit('FeesIncome', feeToIncomeAccountMappings, i)"
+                        >
+                          <fa-icon icon="edit"></fa-icon>
+                        </button>
+                        <button
+                          mat-icon-button
+                          color="warn"
+                          (click)="delete('FeesIncome', feeToIncomeAccountMappings, i)"
+                        >
+                          <fa-icon icon="trash"></fa-icon>
+                        </button>
+                      </td>
+                    </ng-container>
+                    <tr mat-header-row *matHeaderRowDef="feesPenaltyIncomeDisplayedColumns"></tr>
+                    <tr mat-row *matRowDef="let row; columns: feesPenaltyIncomeDisplayedColumns"></tr>
+                  </table>
+                </div>
+              }
+            </div>
+
+            <!-- Penalties to Income -->
+            <div class="lpa-subsection">
+              <div class="lpa-subsection-header">
+                <h4>{{ 'labels.heading.Map Penalties to Specific Income Accounts' | translate }}</h4>
+                <button
+                  type="button"
+                  mat-raised-button
+                  color="primary"
+                  class="lpa-add-btn"
+                  (click)="add('PenaltyIncome', penaltyToIncomeAccountMappings)"
+                >
+                  <fa-icon icon="plus" class="m-r-10"></fa-icon>
+                  {{ 'labels.buttons.Add' | translate }}
+                </button>
+              </div>
+              @if (penaltyToIncomeAccountMappings.value.length !== 0) {
+                <div class="lpa-table-wrapper">
+                  <table mat-table [dataSource]="penaltyToIncomeAccountMappings.value">
+                    <ng-container matColumnDef="chargeId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Penalty' | translate }}</th>
+                      <td mat-cell *matCellDef="let penaltyIncome">
+                        {{ penaltyIncome.chargeId | find: penaltyData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="incomeAccountId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Income Account' | translate }}</th>
+                      <td mat-cell *matCellDef="let penaltyIncome">
+                        {{ penaltyIncome.incomeAccountId | find: incomeAccountData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="actions">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
+                      <td mat-cell *matCellDef="let penaltyIncome; let i = index">
+                        <button
+                          mat-icon-button
+                          color="primary"
+                          (click)="edit('PenaltyIncome', penaltyToIncomeAccountMappings, i)"
+                        >
+                          <fa-icon icon="edit"></fa-icon>
+                        </button>
+                        <button
+                          mat-icon-button
+                          color="warn"
+                          (click)="delete('PenaltyIncome', penaltyToIncomeAccountMappings, i)"
+                        >
+                          <fa-icon icon="trash"></fa-icon>
+                        </button>
+                      </td>
+                    </ng-container>
+                    <tr mat-header-row *matHeaderRowDef="feesPenaltyIncomeDisplayedColumns"></tr>
+                    <tr mat-row *matRowDef="let row; columns: feesPenaltyIncomeDisplayedColumns"></tr>
+                  </table>
+                </div>
+              }
+            </div>
+
+            <!-- Charge-off Reasons to Expense -->
+            <div class="lpa-subsection">
+              <div class="lpa-subsection-header">
+                <h4>{{ 'labels.heading.Map Charge-off reasons to Expense accounts' | translate }}</h4>
+                <button
+                  type="button"
+                  mat-raised-button
+                  color="primary"
+                  class="lpa-add-btn"
+                  [disabled]="!allowAddChargeOffReasonExpense"
+                  (click)="add('ChargeOffReasonExpense', chargeOffReasonToExpenseAccountMappings)"
+                >
+                  <fa-icon icon="plus" class="m-r-10"></fa-icon>
+                  {{ 'labels.buttons.Add' | translate }}
+                </button>
+              </div>
+              @if (chargeOffReasonToExpenseAccountMappings.value.length !== 0) {
+                <div class="lpa-table-wrapper">
+                  <table mat-table [dataSource]="chargeOffReasonToExpenseAccountMappings.value">
+                    <ng-container matColumnDef="chargeOffReasonCodeValueId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Charge-off reason' | translate }}</th>
+                      <td mat-cell *matCellDef="let chargeOffReasonExpense">
+                        {{
+                          chargeOffReasonExpense.chargeOffReasonCodeValueId
+                            | find: chargeOffReasonOptions : 'id' : 'name'
+                        }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="expenseAccountId">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Expense Account' | translate }}</th>
+                      <td mat-cell *matCellDef="let chargeOffReasonExpense">
+                        {{ chargeOffReasonExpense.expenseAccountId | find: expenseAccountData : 'id' : 'name' }}
+                      </td>
+                    </ng-container>
+                    <ng-container matColumnDef="actions">
+                      <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
+                      <td mat-cell *matCellDef="let chargeOffReasonExpense; let i = index">
+                        <button
+                          mat-icon-button
+                          color="primary"
+                          (click)="edit('ChargeOffReasonExpense', chargeOffReasonToExpenseAccountMappings, i)"
+                        >
+                          <fa-icon icon="edit"></fa-icon>
+                        </button>
+                        <button
+                          mat-icon-button
+                          color="warn"
+                          (click)="delete('ChargeOffReasonExpense', chargeOffReasonToExpenseAccountMappings, i)"
+                        >
+                          <fa-icon icon="trash"></fa-icon>
+                        </button>
+                      </td>
+                    </ng-container>
+                    <tr mat-header-row *matHeaderRowDef="chargeOffReasonExpenseDisplayedColumns"></tr>
+                    <tr mat-row *matRowDef="let row; columns: chargeOffReasonExpenseDisplayedColumns"></tr>
+                  </table>
+                </div>
+              }
+            </div>
+
+            <!-- Advanced Mapping Rule Components -->
+            <mifosx-advanced-accounting-mapping-rule
+              class="lpa-full-width"
+              [textField]="'Classification'"
+              [formType]="'BuydownFeeClassificationToIncome'"
+              [formArray]="buydownfeeClassificationToIncomeAccountMappings"
+              [textHeading]="'Buydown Fee classifications to Income accounts'"
+              [incomeAccountData]="incomeAccountData"
+              [accountingMappingOptions]="buydownFeeClassificationOptions"
+              (formChangeEvent)="formChangeEvent($event)"
+            ></mifosx-advanced-accounting-mapping-rule>
+            <mifosx-advanced-accounting-mapping-rule
+              class="lpa-full-width"
+              [textField]="'Classification'"
+              [formType]="'CapitalizedIncomeClassificationToIncome'"
+              [formArray]="capitalizedIncomeClassificationToIncomeAccountMappings"
+              [textHeading]="'Capitalized Income classifications to Income accounts'"
+              [incomeAccountData]="incomeAccountData"
+              [accountingMappingOptions]="capitalizedIncomeClassificationOptions"
+              (formChangeEvent)="formChangeEvent($event)"
+            ></mifosx-advanced-accounting-mapping-rule>
+            <mifosx-advanced-accounting-mapping-rule
+              class="lpa-full-width"
+              [textField]="'WriteOff Reason'"
+              [formType]="'WriteOffReasonToExpense'"
+              [formArray]="writeOffReasonsToExpenseMappings"
+              [textHeading]="'WriteOff reasons to Expense accounts'"
+              [expenseAccountData]="expenseAccountData"
+              [accountingMappingOptions]="writeOffReasonOptions"
+              (formChangeEvent)="formChangeEvent($event)"
+            ></mifosx-advanced-accounting-mapping-rule>
+          }
         </div>
       }
     </div>

src/app/products/loan-products/loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component.ts

@@ -104,23 +104,6 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
   @Input() accountingRuleData: any;
   @Input() loanProductFormValid: boolean;
   @Input() deferredIncomeRecognition: DeferredIncomeRecognition;
-  /** The product's category / type and its portfolio GL, from the Details step; they drive the default GL mapping. */
-  @Input() productTypeGroup: string | null = null;
-  @Input() productTypeSubGroup: string | null = null;
-  @Input() productGlAccountId: number | string | null = null;
-
-  /** The mappings every product needs; the rest default from these and sit behind "Show all mappings". */
-  readonly basicControls = new Set<string>([
-    'loanPortfolioAccountId',
-    'fundSourceAccountId',
-    'interestOnLoanAccountId',
-    'incomeFromFeeAccountId',
-    'incomeFromPenaltyAccountId',
-    'writeOffAccountId',
-    'receivableInterestAccountId',
-    'overpaymentLiabilityAccountId',
-    'undebitedInterestAccountId'
-  ]);
 
   public loanProductAccountingForm!: UntypedFormGroup;
 
@@ -168,73 +151,6 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
     if (this.loanProductAccountingForm) {
       this.setDeferredIncomeRecognitionControls();
     }
-    if (changes['productTypeGroup'] || changes['productTypeSubGroup'] || changes['productGlAccountId']) {
-      this.applyDefaultMapping();
-    }
-  }
-
-  /** The id of the GL account with this GL code among all the accounting options, or null. */
-  private glIdByCode(code: string): number | null {
-    const all = [
-      ...(this.assetAccountData ?? []),
-      ...(this.incomeAccountData ?? []),
-      ...(this.expenseAccountData ?? []),
-      ...(this.liabilityAccountData ?? [])
-    ];
-    return all.find((account: any) => String(account.glCode) === code)?.id ?? null;
-  }
-
-  /**
-   * Pre-fills the GL mappings from the product type: the portfolio GL is the product's own GL, interest income follows
-   * the loan term (Advances short, Loans medium, Housing long), the rest are the bank's shared GLs. A mapping the
-   * officer has already changed is left alone.
-   */
-  applyDefaultMapping(): void {
-    // A saved product keeps its own mappings; one saved without any still gets the defaults.
-    const hasSavedMappings = !!this.loanProductsTemplate?.id && !!this.loanProductsTemplate?.accountingMappings;
-    if (!this.loanProductAccountingForm || !this.assetAccountData || hasSavedMappings) {
-      return;
-    }
-    const isAdvance = this.productTypeGroup === 'advances';
-    const interestCode = isAdvance ? '400301' : this.productTypeSubGroup === 'housing' ? '400303' : '400302';
-    const cash = this.glIdByCode('100101');
-    const interest = this.glIdByCode(interestCode);
-    const fee = this.glIdByCode('400106') ?? this.glIdByCode('400101');
-    const penal = this.glIdByCode('400304') ?? this.glIdByCode('400101');
-    const writeOff = this.glIdByCode('500503');
-    const receivable = this.glIdByCode('100601');
-    const overpayment = this.glIdByCode('200907');
-    const suspense = this.glIdByCode('200908');
-    const defaults: Record<string, number | string | null> = {
-      loanPortfolioAccountId: this.productGlAccountId || null,
-      fundSourceAccountId: cash,
-      transfersInSuspenseAccountId: cash,
-      interestOnLoanAccountId: interest,
-      incomeFromFeeAccountId: fee,
-      incomeFromPenaltyAccountId: penal,
-      incomeFromRecoveryAccountId: interest,
-      writeOffAccountId: writeOff,
-      goodwillCreditAccountId: writeOff,
-      chargeOffFraudExpenseAccountId: writeOff,
-      chargeOffExpenseAccountId: writeOff,
-      incomeFromChargeOffPenaltyAccountId: penal,
-      incomeFromChargeOffFeesAccountId: fee,
-      incomeFromChargeOffInterestAccountId: interest,
-      incomeFromGoodwillCreditInterestAccountId: interest,
-      incomeFromGoodwillCreditFeesAccountId: fee,
-      incomeFromGoodwillCreditPenaltyAccountId: penal,
-      receivableInterestAccountId: receivable,
-      receivableFeeAccountId: receivable,
-      receivablePenaltyAccountId: receivable,
-      overpaymentLiabilityAccountId: overpayment,
-      undebitedInterestAccountId: suspense
-    };
-    Object.keys(defaults).forEach((name) => {
-      const control = this.loanProductAccountingForm.get(name);
-      if (control && !control.dirty && defaults[name]) {
-        control.setValue(defaults[name]);
-      }
-    });
   }
 
   ngOnInit() {
@@ -261,7 +177,6 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
     this.loanProductAccountingForm.get('accountingRule').disable();
 
     this.buildAccountingSectionConfigs();
-    this.applyDefaultMapping();
 
     const accountingMappings = this.loanProductsTemplate.accountingMappings;
     this.setDeferredIncomeRecognitionControls();
@@ -362,33 +277,6 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
       'incomeFromGoodwillCreditFeesAccountId',
       'incomeFromGoodwillCreditPenaltyAccountId',
       'receivableInterestAccountId',
-      'receivableInterestAccountId',
-      'receivableFeeAccountId',
-      'receivablePenaltyAccountId',
-      'intReceivablesGlAccountId',
-      'intPayableGlAccountId',
-      'deafIntPayableGlAccountId',
-      'intOverdueReserveAccountId',
-      'undebitedInterestAccountId',
-      'penalIntCrGlAccountId',
-      'rdMaturedGlAccountId'
-    ];
-    // CBS-specific mappings the backend does not accept yet: optional here so a product can be created without
-    // them (empty values are dropped from the payload in LoanProducts.buildPayload).
-    const optionalCbsFields = [
-      // derived by the backend from the nine mapped GLs (LoanGlMappingDefaults)
-      'transfersInSuspenseAccountId',
-      'incomeFromRecoveryAccountId',
-      'goodwillCreditAccountId',
-      'chargeOffFraudExpenseAccountId',
-      'chargeOffExpenseAccountId',
-      'incomeFromChargeOffPenaltyAccountId',
-      'incomeFromChargeOffFeesAccountId',
-      'incomeFromChargeOffInterestAccountId',
-      'incomeFromGoodwillCreditInterestAccountId',
-      'incomeFromGoodwillCreditFeesAccountId',
-      'incomeFromGoodwillCreditPenaltyAccountId',
-      'receivableInterestAccountId',
       'receivableFeeAccountId',
       'receivablePenaltyAccountId',
       'intReceivablesGlAccountId',
@@ -401,10 +289,7 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
     ];
     commonFields.forEach((field) => {
       if (!this.loanProductAccountingForm.contains(field)) {
-        this.loanProductAccountingForm.addControl(
+        this.loanProductAccountingForm.addControl(field, new UntypedFormControl('', Validators.required));
-          field,
-          new UntypedFormControl('', optionalCbsFields.includes(field) ? null : Validators.required)
-        );
       }
     });
 
@@ -682,20 +567,8 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
     } = this.loanProductAccountingForm.getRawValue();
     const otherGlMappings = this.getOtherGlMappings();
 
-    // Only the nine mapped GLs are sent. The other Fineract placeholders (recovery, goodwill credit, charge-off ...)
-    // are derived by the backend. Interest Suspense has no core mapping, so it is kept on the satellite record.
-    const payload: any = {};
-    this.basicControls.forEach((name) => {
-      if (name !== 'undebitedInterestAccountId' && loanProductAccounting[name]) {
-        payload[name] = loanProductAccounting[name];
-      }
-    });
-    if (loanProductAccounting.undebitedInterestAccountId) {
-      payload.undebitedInterestGlId = loanProductAccounting.undebitedInterestAccountId;
-    }
     return {
-      accountingRule: loanProductAccounting.accountingRule,
+      ...loanProductAccounting,
-      ...payload,
       ...(otherGlMappings ? { otherGlMappings } : {})
     };
   }
@@ -811,7 +684,7 @@ export class LoanProductAccountingStepComponent implements OnInit, OnChanges {
             inputLabel: 'Interest Receivable',
             controlName: 'receivableInterestAccountId',
             options: this.assetAccountData,
-            required: false,
+            required: true,
             accrualOnly: true
           },
           {

src/app/products/loan-products/loan-product-stepper/loan-product-advance-limit-tenure-step/loan-product-advance-limit-tenure-step.component.html

@@ -61,12 +61,12 @@
       <mat-form-field appearance="outline" class="adv-field">
         <mat-label>Minimum Tenure (months)</mat-label>
         <input matInput type="number" formControlName="minTenure" [min]="tenureMin" [max]="tenureMax" required />
-        @if (tenureBand; as band) {
+        @if (isFdTenureLocked) {
-          <mat-hint>{{ band.label }} policy: {{ band.min }}–{{ band.max }} months only</mat-hint>
+          <mat-hint>FD policy: 12–15 months only</mat-hint>
         }
         <mat-error>
-          @if (tenureBand; as band) {
+          @if (isFdTenureLocked) {
-            Must be between <strong>{{ band.min }} and {{ band.max }}</strong> months
+            Must be between <strong>12 and 15</strong> months
           } @else {
             Minimum Tenure is <strong>required</strong>
           }
@@ -75,31 +75,22 @@
       <mat-form-field appearance="outline" class="adv-field">
         <mat-label>Default Tenure (months)</mat-label>
         <input matInput type="number" formControlName="defaultTenure" [min]="tenureMin" [max]="tenureMax" />
-        @if (tenureBand; as band) {
+        @if (isFdTenureLocked) {
-          <mat-hint>Between {{ band.min }} and {{ band.max }}</mat-hint>
+          <mat-hint>Between 12 and 15</mat-hint>
-        }
+          <mat-error>Must be between <strong>12 and 15</strong> months</mat-error>
-        @if (tenureBand; as band) {
-          <mat-error
-            >Must be between <strong>{{ band.min }} and {{ band.max }}</strong> months</mat-error
-          >
         }
       </mat-form-field>
       <mat-form-field appearance="outline" class="adv-field">
         <mat-label>Maximum Tenure (months)</mat-label>
         <input matInput type="number" formControlName="maxTenure" [min]="tenureMin" [max]="tenureMax" required />
-        @if (tenureBand; as band) {
+        @if (isFdTenureLocked) {
-          <mat-hint>
+          <mat-hint>FD policy: max 15 months (also capped at deposit maturity)</mat-hint>
-            {{ band.label }} policy: max {{ band.max }} months
-            @if (band.label === 'FD') {
-              (also capped at deposit maturity)
-            }
-          </mat-hint>
         } @else {
           <mat-hint>Also capped at the deposit's maturity (Lien rule)</mat-hint>
         }
         <mat-error>
-          @if (tenureBand; as band) {
+          @if (isFdTenureLocked) {
-            Must be between <strong>{{ band.min }} and {{ band.max }}</strong> months
+            Must be between <strong>12 and 15</strong> months
           } @else {
             Maximum Tenure is <strong>required</strong>
           }