fix: restore remaining content dropped by the dev merge (comprehensive audit)

Systematic file-by-file audit of demo-backup against dev to find any
remaining instances of the same silent-drop pattern from the earlier
merge (git's 3-way auto-resolve keeping demo-backup's side wherever it
had independently touched nearby lines, even when dev's side was a
genuine, unrelated addition). Restored:

- clients.module.ts: missing ClientFamilyMemberChildDialogComponent
  registration (component existed but was never wired in)
- client-family-member-dialog: full children-management flow (checkbox,
  form array, child dialog integration, view/edit summary blocks)
- edit-client: FIR-exception flow for inaccessible old mobile numbers,
  and a hardened detectSensitiveFieldChanges() (null-guard, phone-digit
  normalization, dirty-checked comparisons to avoid false-positive
  Verify-Contact-Change prompts)
- shell.component.ts: withdrawal-review URL matcher extended to cover
  the Share Withdrawal Request review route
- fiu.component.html: AML alert status filter and monthly CTR reports
  table UI (backing logic already existed unused in the .ts)
- Shares module: Passbook tab (component existed but had no route or
  tab link), running-balance/resolution columns on the transactions
  tab, subscript-sizing fixes and a pill-style filter-bar redesign on
  Share Holders
- Savings/Share product accounting steps: Payment-Channel-to-Fund-
  Source mapping section, and Share Reference account restructuring
- pending-client-edits: email status badges + "View Email" button
  (dialog component existed but nothing on this list triggered it)

Everything else that still differs from dev was individually verified
as either demo-backup's own independent work (Investment/Loan
Origination/NPA/RBI-OSS modules, the Approval Center tab-nav redesign,
AML/compliance review features, bank-name rebrand in demo seed data)
or purely cosmetic formatting differences — left untouched.

angular.json

@@ -69,8 +69,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "13mb",
-                  "maximumError": "14mb"
+                  "maximumWarning": "15mb",
+                  "maximumError": "17mb"
                 },
                 {
                   "type": "anyComponentStyle",

src/app/accounting/search-journal-entry/mark-entry-dialog.component.html

@@ -0,0 +1,70 @@
+<!--
+  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/.
+-->
+
+<h2 class="mk-title" [class.mk-title--str]="isEscalation">
+  <fa-icon [icon]="isEscalation ? 'exclamation-triangle' : 'check-circle'"></fa-icon>
+  {{ isEscalation ? 'Mark as Suspicious' : 'Mark as Whitelisted' }}
+</h2>
+
+<mat-dialog-content>
+  <div class="mk-entry">
+    <div>
+      <label>Journal entry</label><span class="mono">#{{ data.journalEntryId }}</span>
+    </div>
+    <div>
+      <label>Transaction</label><span class="mono">{{ data.transactionId }}</span>
+    </div>
+    <div>
+      <label>Date</label><span>{{ data.transactionDate }}</span>
+    </div>
+    <div>
+      <label>Amount</label><span class="mono">&#8377;{{ data.amount | number: '1.2-2' }}</span>
+    </div>
+    <div class="wide">
+      <label>GL account</label><span>{{ data.glAccountName }}</span>
+    </div>
+  </div>
+
+  @if (isEscalation) {
+    <p class="mk-warn">
+      <fa-icon icon="exclamation-triangle"></fa-icon>
+      This raises an AML alert against the customer behind this entry and escalates it. An STR case opens for the
+      Principal Officer with the seven working day FIU-IND clock running. It cannot be undone from this screen.
+    </p>
+  } @else {
+    <p class="mk-note">
+      Records the entry as reviewed and cleared. No report is filed and the customer's risk rating is untouched.
+    </p>
+  }
+
+  <label class="mk-field">
+    <span>Reviewer notes {{ isEscalation ? '(required)' : '(optional)' }}</span>
+    <textarea
+      rows="4"
+      [(ngModel)]="notes"
+      [placeholder]="
+        isEscalation
+          ? 'Why is this entry suspicious? What did you check?'
+          : 'What satisfied you that this entry is in order?'
+      "
+    ></textarea>
+  </label>
+</mat-dialog-content>
+
+<mat-dialog-actions class="mk-actions">
+  <button class="mk-btn" (click)="dialogRef.close()">Cancel</button>
+  <button
+    class="mk-btn"
+    [class.mk-btn--str]="isEscalation"
+    [class.mk-btn--ok]="!isEscalation"
+    [disabled]="!canSubmit"
+    (click)="confirm()"
+  >
+    {{ isEscalation ? 'Escalate to STR' : 'Whitelist entry' }}
+  </button>
+</mat-dialog-actions>

src/app/accounting/search-journal-entry/mark-entry-dialog.component.scss

@@ -0,0 +1,165 @@
+/**
+ * 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 {
+  --mk-g100: #f1f5f9;
+  --mk-g200: #e2e8f0;
+  --mk-g300: #cbd5e1;
+  --mk-g500: #64748b;
+  --mk-g700: #334155;
+  --mk-g900: #0f172a;
+  --mk-green: #15803d;
+  --mk-red: #c0392b;
+  --mk-amber-l: #fef3c7;
+
+  display: block;
+  font-family: 'DM Sans', system-ui, sans-serif;
+  color: var(--mk-g900);
+  min-width: 460px;
+}
+
+.mk-title {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  margin: 0;
+  padding: 18px 22px 10px;
+  font-size: 16px;
+  font-weight: 700;
+  color: var(--mk-green);
+
+  &--str {
+    color: var(--mk-red);
+  }
+}
+
+.mk-entry {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 8px 18px;
+  padding: 11px 14px;
+  background: #fff;
+  border: 1px solid var(--mk-g200);
+  border-radius: 8px;
+  margin-bottom: 12px;
+
+  > div {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .wide {
+    grid-column: span 2;
+  }
+
+  label {
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--mk-g500);
+  }
+
+  span {
+    font-size: 12.5px;
+  }
+}
+
+.mk-warn {
+  display: flex;
+  align-items: baseline;
+  gap: 8px;
+  font-size: 12px;
+  color: #78350f;
+  background: var(--mk-amber-l);
+  border-radius: 7px;
+  padding: 9px 12px;
+  margin: 0 0 12px;
+}
+
+.mk-note {
+  font-size: 12px;
+  color: var(--mk-g500);
+  margin: 0 0 12px;
+}
+
+.mk-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  span {
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--mk-g500);
+  }
+
+  textarea {
+    padding: 9px 11px;
+    border: 1px solid var(--mk-g300);
+    border-radius: 7px;
+    font-size: 13px;
+    font-family: inherit;
+    resize: vertical;
+
+    &:focus {
+      outline: none;
+      border-color: var(--mk-g700);
+    }
+  }
+}
+
+.mk-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 9px;
+  padding: 8px 22px 18px;
+}
+
+.mk-btn {
+  padding: 8px 16px;
+  border: 1px solid var(--mk-g300);
+  background: #fff;
+  border-radius: 8px;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--mk-g700);
+  cursor: pointer;
+  font-family: inherit;
+
+  &:hover:not(:disabled) {
+    background: var(--mk-g100);
+  }
+
+  &:disabled {
+    opacity: 0.5;
+    cursor: not-allowed;
+  }
+
+  &--ok {
+    background: var(--mk-green);
+    border-color: var(--mk-green);
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #12692f;
+    }
+  }
+
+  &--str {
+    background: var(--mk-red);
+    border-color: var(--mk-red);
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #a5301f;
+    }
+  }
+}

src/app/accounting/search-journal-entry/mark-entry-dialog.component.ts

@@ -0,0 +1,63 @@
+/**
+ * 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/.
+ */
+
+/** Angular Imports */
+import { Component, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialogContent, MatDialogActions } from '@angular/material/dialog';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+
+export interface MarkEntryDialogData {
+  disposition: 'WHITELIST' | 'ESCALATE';
+  journalEntryId: number;
+  transactionId: string;
+  amount: number;
+  glAccountName: string;
+  transactionDate: string;
+}
+
+/**
+ * Captures the reviewer's reason before a ledger entry is marked.
+ *
+ * Notes are not optional on an escalation: the Principal Officer picks the case up
+ * with nothing else to go on, and an STR filed on an unexplained referral is not
+ * defensible. A whitelist may be recorded without them.
+ */
+@Component({
+  selector: 'mifosx-mark-entry-dialog',
+  templateUrl: './mark-entry-dialog.component.html',
+  styleUrls: ['./mark-entry-dialog.component.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FormsModule,
+    FaIconComponent,
+    MatDialogContent,
+    MatDialogActions
+  ]
+})
+export class MarkEntryDialogComponent {
+  dialogRef = inject<MatDialogRef<MarkEntryDialogComponent>>(MatDialogRef);
+  data = inject<MarkEntryDialogData>(MAT_DIALOG_DATA);
+
+  notes = '';
+
+  get isEscalation(): boolean {
+    return this.data.disposition === 'ESCALATE';
+  }
+
+  get canSubmit(): boolean {
+    return !this.isEscalation || this.notes.trim().length > 0;
+  }
+
+  confirm(): void {
+    if (this.canSubmit) {
+      this.dialogRef.close(this.notes.trim());
+    }
+  }
+}

src/app/accounting/search-journal-entry/search-journal-entry.component.html

@@ -535,6 +535,14 @@
     </div>
   </div>
 
+  @if (markError) {
+    <div class="gl-mark-error">
+      <fa-icon icon="exclamation-triangle"></fa-icon>
+      <span>{{ markError }}</span>
+      <button class="gl-mark-error__close" (click)="markError = ''">&times;</button>
+    </div>
+  }
+
   <div class="gl-table-shell">
     <mat-table [dataSource]="dataSource" matSort class="gl-mat-table">
       <!-- #ID -->
@@ -692,6 +700,50 @@
         </mat-cell>
       </ng-container>
 
+      <!-- AML review — whitelist or refer the entry to STR -->
+      <ng-container matColumnDef="amlMark">
+        <mat-header-cell *matHeaderCellDef class="gl-th">AML Review</mat-header-cell>
+        <mat-cell *matCellDef="let e" class="gl-td">
+          @if (markOf(e); as mark) {
+            <span
+              class="gl-mark"
+              [class.gl-mark--str]="mark.disposition === 'ESCALATE'"
+              [matTooltip]="
+                (mark.disposition === 'ESCALATE'
+                  ? 'Escalated to STR' + (mark.strCaseId ? ' — case #' + mark.strCaseId : '')
+                  : 'Whitelisted') +
+                (mark.reviewedBy ? ' by ' + mark.reviewedBy : '') +
+                (mark.notes ? ' — ' + mark.notes : '')
+              "
+            >
+              <fa-icon [icon]="mark.disposition === 'ESCALATE' ? 'exclamation-triangle' : 'check-circle'"></fa-icon>
+              {{ mark.disposition === 'ESCALATE' ? 'Suspicious' : 'Whitelisted' }}
+            </span>
+          } @else if (isMarking(e)) {
+            <span class="gl-mark gl-mark--busy">Saving…</span>
+          } @else if (canMark(e)) {
+            <span class="gl-mark-actions">
+              <button
+                class="gl-mark-btn gl-mark-btn--ok"
+                matTooltip="Reviewed and in order — clear this entry"
+                (click)="openMarkDialog(e, 'WHITELIST')"
+              >
+                <fa-icon icon="check-circle"></fa-icon> Whitelist
+              </button>
+              <button
+                class="gl-mark-btn gl-mark-btn--str"
+                matTooltip="Refer to the Principal Officer as an STR case"
+                (click)="openMarkDialog(e, 'ESCALATE')"
+              >
+                <fa-icon icon="exclamation-triangle"></fa-icon> Suspicious
+              </button>
+            </span>
+          } @else {
+            <span class="gl-mark gl-mark--na" [matTooltip]="markBlockedReason(e)">—</span>
+          }
+        </mat-cell>
+      </ng-container>
+
       <!-- Actions -->
       <ng-container matColumnDef="actions">
         <mat-header-cell *matHeaderCellDef class="gl-th"></mat-header-cell>

src/app/accounting/search-journal-entry/search-journal-entry.component.scss

@@ -1328,6 +1328,17 @@
     flex: 0 0 130px;
   }
 
+  // Wide enough to hold both action buttons on one line. Every other column
+  // declares a width; without one this collapsed and clipped its contents.
+  ::ng-deep .mat-column-amlMark {
+    width: 184px;
+    min-width: 184px;
+    flex: 0 0 184px;
+    // Keeps the "AML REVIEW" heading on one line instead of clipping it.
+    white-space: nowrap;
+    overflow: visible;
+  }
+
   ::ng-deep .mat-column-actions {
     width: 50px;
     min-width: 50px;
@@ -1556,6 +1567,112 @@
   }
 }
 
+// ── AML review column ─────────────────────────────────────────────────────────
+// Never wrap — a wrapped second button used to be clipped by the row height.
+.gl-mark-actions {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  flex-wrap: nowrap;
+  width: 100%;
+}
+
+.gl-mark-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 4px;
+  padding: 4px 8px;
+  border: 1px solid var(--c-border);
+  background: var(--c-surface);
+  border-radius: 6px;
+  font-size: 0.62rem;
+  font-weight: 700;
+  line-height: 1.2;
+  color: var(--c-text-2);
+  cursor: pointer;
+  font-family: inherit;
+  white-space: nowrap;
+  flex: 1 1 auto;
+  transition: all var(--transition);
+
+  // Tinted at rest, not only on hover — these have to be findable in a dense
+  // table without the reviewer hunting for them.
+  &--ok {
+    border-color: rgb(16 185 129 / 45%);
+    background: var(--c-cr-bg);
+    color: #047857;
+
+    &:hover {
+      border-color: var(--c-cr);
+      background: #d1fae5;
+    }
+  }
+
+  &--str {
+    border-color: rgb(239 68 68 / 45%);
+    background: var(--c-dr-bg);
+    color: #b91c1c;
+
+    &:hover {
+      border-color: var(--c-dr);
+      background: #fee2e2;
+    }
+  }
+}
+
+.gl-mark {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 0.62rem;
+  font-weight: 700;
+  white-space: nowrap;
+  background: var(--c-cr-bg);
+  color: #047857;
+
+  &--str {
+    background: var(--c-dr-bg);
+    color: #b91c1c;
+  }
+
+  &--busy {
+    background: #f1f5f9;
+    color: var(--c-text-3);
+  }
+
+  &--na {
+    background: transparent;
+    color: var(--c-text-3);
+    cursor: help;
+  }
+}
+
+.gl-mark-error {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  margin: 0 0 10px;
+  padding: 9px 14px;
+  border: 1px solid #fecaca;
+  background: var(--c-dr-bg);
+  border-radius: 8px;
+  font-size: 0.75rem;
+  color: #b91c1c;
+
+  &__close {
+    margin-left: auto;
+    border: 0;
+    background: transparent;
+    font-size: 1.1rem;
+    line-height: 1;
+    color: inherit;
+    cursor: pointer;
+  }
+}
+
 // ── Empty state ───────────────────────────────────────────────────────────────
 .gl-empty {
   display: flex;

src/app/accounting/search-journal-entry/search-journal-entry.component.ts

@@ -41,9 +41,20 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatCardModule } from '@angular/material/card';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { MatIconModule } from '@angular/material/icon';
+import { MatDialog } from '@angular/material/dialog';
+import { AmlService } from 'app/aml/aml.service';
+import { MarkEntryDialogComponent, MarkEntryDialogData } from './mark-entry-dialog.component';
 
 const STATE_KEY = 'gl_ledger_filter_state';
 
+/** How a ledger entry has been marked by a reviewer, keyed on journal entry id. */
+interface EntryMark {
+  disposition: 'WHITELIST' | 'ESCALATE';
+  strCaseId: number | null;
+  reviewedBy: string;
+  notes: string;
+}
+
 @Component({
   selector: 'mifosx-search-journal-entry',
   standalone: true,
@@ -87,6 +98,8 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
   private route = inject(ActivatedRoute);
+  private amlService = inject(AmlService);
+  private dialog = inject(MatDialog);
 
   // ── Misc ──────────────────────────────────────────────────────────────────
   minDate = new Date(2000, 0, 1);
@@ -129,6 +142,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
     'manualEntry',
     'createdByUserName',
     'submittedOnDate',
+    'amlMark',
     'actions'
   ];
   dayWiseColumns = [
@@ -157,6 +171,14 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   dayWiseData: any[] = [];
   glAccountInfo: any = null;
 
+  // ── AML marking ───────────────────────────────────────────────────────────
+
+  /** Marks already recorded, by journal entry id. */
+  private marks = new Map<number, EntryMark>();
+  /** Entry ids with a request in flight, so a row cannot be double-submitted. */
+  private marking = new Set<number>();
+  markError = '';
+
   // ── UI state ──────────────────────────────────────────────────────────────
   activeQuickFilter = '';
   activeFiltersCount = 0;
@@ -212,6 +234,103 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
     this.setFilteredOffices();
     this.getJournalEntries();
     this.loadLedgerSummary();
+    this.loadMarks();
+  }
+
+  // ── AML marking ───────────────────────────────────────────────────────────
+
+  /**
+   * Marks are loaded once for the whole ledger rather than per page, because the
+   * user pages and re-filters constantly and the set is small — only entries a
+   * reviewer has actually touched.
+   */
+  private loadMarks(): void {
+    this.amlService.getManualReferrals().subscribe({
+      next: (rows) => {
+        this.marks = new Map(
+          (rows || []).map((r: any) => [
+            r.journalEntryId,
+            {
+              disposition: r.disposition === 'ESCALATE' ? 'ESCALATE' : 'WHITELIST',
+              strCaseId: r.strCaseId ?? null,
+              reviewedBy: r.reviewedByUsername || '',
+              notes: r.reviewNotes || ''
+            } as EntryMark
+          ])
+        );
+      },
+      // A ledger that cannot reach the AML service still has to render.
+      error: () => (this.marks = new Map())
+    });
+  }
+
+  markOf(entry: any): EntryMark | null {
+    return this.marks.get(entry?.id) ?? null;
+  }
+
+  isMarking(entry: any): boolean {
+    return this.marking.has(entry?.id);
+  }
+
+  /**
+   * An alert needs a customer, and a journal entry only reaches one through the
+   * savings, loan or client transaction that produced it. A purely manual GL
+   * posting reaches none, so it cannot be referred — the server enforces this too.
+   */
+  canMark(entry: any): boolean {
+    return !!entry && !this.markOf(entry) && !!(entry.savingsAccountNo || entry.entityId);
+  }
+
+  markBlockedReason(entry: any): string {
+    if (this.markOf(entry)) {
+      return 'Already reviewed — a ledger entry is marked once';
+    }
+    return 'No customer behind this entry, so it cannot be referred';
+  }
+
+  openMarkDialog(entry: any, disposition: 'WHITELIST' | 'ESCALATE'): void {
+    if (!this.canMark(entry) || this.isMarking(entry)) {
+      return;
+    }
+    const data: MarkEntryDialogData = {
+      disposition,
+      journalEntryId: entry.id,
+      transactionId: entry.transactionId,
+      amount: entry.amount,
+      glAccountName: `${entry.glAccountCode} — ${entry.glAccountName}`,
+      transactionDate: this.dateUtils.formatDate(entry.transactionDate, this.settingsService.dateFormat)
+    };
+
+    this.dialog
+      .open(MarkEntryDialogComponent, { data, width: '520px', autoFocus: false })
+      .afterClosed()
+      .subscribe((notes: string | undefined) => {
+        if (notes !== undefined) {
+          this.submitMark(entry, disposition, notes);
+        }
+      });
+  }
+
+  private submitMark(entry: any, disposition: 'WHITELIST' | 'ESCALATE', notes: string): void {
+    this.markError = '';
+    this.marking.add(entry.id);
+
+    this.amlService.referJournalEntry(entry.id, disposition, notes).subscribe({
+      next: (res: any) => {
+        this.marking.delete(entry.id);
+        this.marks.set(entry.id, {
+          disposition,
+          strCaseId: res?.strCaseId ?? null,
+          reviewedBy: res?.reviewedByUsername || '',
+          notes
+        });
+      },
+      error: (err: any) => {
+        this.marking.delete(entry.id);
+        this.markError =
+          err?.error?.defaultUserMessage || err?.error?.errors?.[0]?.defaultUserMessage || 'Could not mark this entry.';
+      }
+    });
   }
 
   ngOnDestroy() {

src/app/aml/aml.service.ts

@@ -34,6 +34,28 @@ export class AmlService {
     return this.http.post(`/aml/alerts/${alertId}/review`, { disposition, notes });
   }
 
+  // ═══ Manual referrals from the general ledger ═══
+
+  /**
+   * Ledger entries a user has already marked, keyed on `journalEntryId`.
+   *
+   * Separate from `getAlerts()` because these are not engine alerts — they carry the
+   * journal entry id rather than a savings or loan transaction id, so the ledger
+   * screen can match them to the rows it is showing.
+   */
+  getManualReferrals(): Observable<any[]> {
+    return this.http.get<any[]>('/aml/alerts/manual-referrals');
+  }
+
+  /**
+   * Marks a ledger entry. WHITELIST clears it with no report; ESCALATE opens an STR
+   * case for the Principal Officer, the same road an escalated engine alert takes.
+   * The entry must have a customer behind it or the server rejects it.
+   */
+  referJournalEntry(journalEntryId: number, disposition: 'WHITELIST' | 'ESCALATE', notes: string): Observable<any> {
+    return this.http.post('/aml/alerts/manual-referral', { journalEntryId, disposition, notes });
+  }
+
   // ═══ STR cases (Principal Officer) ═══
 
   getStrCases(): Observable<any[]> {

src/app/app.module.ts

@@ -64,9 +64,12 @@ import { BankCalendarModule } from './bank-calendar/bank-calendar.module';
 import { DeafModule } from './deaf/deaf.module';
 import { DicgcModule } from './dicgc/dicgc.module';
 import { FiuModule } from './fiu/fiu.module';
+import { GlReportsModule } from './gl-reports/gl-reports.module';
 import { SftModule } from './sft/sft.module';
 import { InvestmentModule } from './investment/investment.module';
 import { NpaModule } from './npa/npa.module';
+import { ReconciliationModule } from './reconciliation/reconciliation.module';
+import { LoanOriginationModule } from './loan-origination/loan-origination.module';
 import { DigitalModule } from './digital/digital.module';
 import { LetterMgmtModule } from './letter-mgmt/letter-mgmt.module';
 import { AccountsModule } from './accounts/accounts.module';
@@ -173,9 +176,12 @@ export function HttpLoaderFactory(http: HttpClient) {
     DeafModule,
     DicgcModule,
     FiuModule,
+    GlReportsModule,
     SftModule,
     InvestmentModule,
     NpaModule,
+    ReconciliationModule,
+    LoanOriginationModule,
     DigitalModule,
     LetterMgmtModule,
     AccountsModule,

src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.html

@@ -31,6 +31,9 @@
       <button type="button" class="pg-btn" [class.pg-btn--active]="showDetails" (click)="toggleDetails()">
         {{ showDetails ? 'Summary View' : 'Transaction Details' }}
       </button>
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+        {{ generating ? 'Exporting…' : 'Export to Excel' }}
+      </button>
     </div>
   </header>
 
@@ -209,43 +212,61 @@
                 ? 'Clearing'
                 : 'Digital'
         }}
-        — Transaction Details
+        — Transaction Details (Full Double Entry)
         @if (glFilter !== null) {
           · {{ glFilter }}
         }
       </div>
-      <table class="pg-table">
+      <table class="pg-table cctr-journal">
         <thead>
           <tr>
             <th>Date</th>
             <th>Voucher / Ref No</th>
-            <th>Account No</th>
-            <th>Account Name / Reference</th>
-            <th>Particulars</th>
+            <th>Dr / Cr</th>
+            <th>GL / Account</th>
             <th class="num col-out">Debit</th>
             <th class="num col-in">Credit</th>
+            <th>Status</th>
           </tr>
         </thead>
         <tbody>
           @for (t of filteredTxns; track t.voucherNo) {
-            <tr>
+            <tr class="cctr-journal-row cctr-journal-row--first">
               <td>{{ asOnDate }}</td>
               <td>
                 <span class="pg-chip">{{ display(t.voucherNo) }}</span>
               </td>
-              <td>{{ display(t.accountNo) }}</td>
-              <td>{{ t.accountName }}</td>
-              <td>{{ t.particulars }}</td>
-              <td class="num col-out">
+              <td><span class="cctr-drcr cctr-drcr--dr">Dr</span></td>
+              <td>
                 @if (t.debit > 0) {
-                  ₹{{ t.debit | number: '1.2-2' }}
+                  <span class="pg-chip">{{ t.glCode }}</span> {{ glName(t.glCode) }} — {{ display(t.accountNo) }} ({{
+                    t.accountName
+                  }})
+                } @else {
+                  <span class="cctr-contra">{{ contraLabel(t) }}</span>
                 }
               </td>
-              <td class="num col-in">
+              <td class="num col-out">₹{{ legAmount(t) | number: '1.2-2' }}</td>
+              <td class="num"></td>
+              <td rowspan="2">
+                <span class="cctr-balanced-chip">✓ Balanced</span>
+              </td>
+            </tr>
+            <tr class="cctr-journal-row cctr-journal-row--second">
+              <td></td>
+              <td></td>
+              <td><span class="cctr-drcr cctr-drcr--cr">Cr</span></td>
+              <td>
                 @if (t.credit > 0) {
-                  ₹{{ t.credit | number: '1.2-2' }}
+                  <span class="pg-chip">{{ t.glCode }}</span> {{ glName(t.glCode) }} — {{ display(t.accountNo) }} ({{
+                    t.accountName
+                  }})
+                } @else {
+                  <span class="cctr-contra">{{ contraLabel(t) }}</span>
                 }
               </td>
+              <td class="num"></td>
+              <td class="num col-in">₹{{ legAmount(t) | number: '1.2-2' }}</td>
             </tr>
           } @empty {
             <tr>
@@ -255,9 +276,14 @@
         </tbody>
         <tfoot>
           <tr class="cctr-total-row">
-            <td colspan="5">Total</td>
-            <td class="num">₹{{ txnTotal(filteredTxns, 'debit') | number: '1.2-2' }}</td>
-            <td class="num">₹{{ txnTotal(filteredTxns, 'credit') | number: '1.2-2' }}</td>
+            <td colspan="4">Total ({{ filteredTxns.length }} vouchers)</td>
+            <td class="num">
+              ₹{{ txnTotal(filteredTxns, 'debit') + txnTotal(filteredTxns, 'credit') | number: '1.2-2' }}
+            </td>
+            <td class="num">
+              ₹{{ txnTotal(filteredTxns, 'debit') + txnTotal(filteredTxns, 'credit') | number: '1.2-2' }}
+            </td>
+            <td></td>
           </tr>
         </tfoot>
       </table>

src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.scss

@@ -71,3 +71,68 @@
     background: #eff6ff;
   }
 }
+
+// Both journal lines of one voucher share a tint and sit flush against each other (no dotted
+// divider between them) so the pair reads as a single entry; a hairline separates one voucher's
+// pair from the next.
+.cctr-journal-row {
+  &--first td {
+    border-bottom: none;
+    padding-bottom: 4px;
+  }
+
+  &--second td {
+    border-top: none;
+    padding-top: 4px;
+    border-bottom: 1px solid #e2e8f0;
+  }
+
+  &--first,
+  &--second {
+    &:hover td {
+      background: #f8fafc;
+    }
+  }
+}
+
+.cctr-drcr {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 28px;
+  padding: 1px 8px;
+  border-radius: 6px;
+  font-size: 11px;
+  font-weight: 800;
+  letter-spacing: 0.03em;
+
+  &--dr {
+    background: #eff6ff;
+    color: #1d4ed8;
+    border: 1px solid #bfdbfe;
+  }
+
+  &--cr {
+    background: #f0fdf4;
+    color: #15803d;
+    border: 1px solid #bbf7d0;
+  }
+}
+
+.cctr-contra {
+  color: #64748b;
+  font-style: italic;
+}
+
+.cctr-balanced-chip {
+  display: inline-flex;
+  align-items: center;
+  padding: 3px 10px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+  background: #f0fdf4;
+  color: #15803d;
+  border: 1px solid #bbf7d0;
+  white-space: nowrap;
+}

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

@@ -10,6 +10,7 @@ import { Component, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
+import { ExportSheetSpec, exportWorkbook } from '../cashier-export';
 
 interface SummaryRow {
   code: string;
@@ -70,6 +71,15 @@ export class CashClearingTransferSummaryComponent {
   showDetails = false;
   /** GL/channel filter for the Transaction Details view — null means "All". */
   glFilter: string | null = null;
+  /** True while an Export to Excel workbook is being built — disables the button to prevent double-clicks. */
+  generating = false;
+
+  private readonly tabLabels: Record<TabKey, string> = {
+    cash: 'Cash',
+    transfer: 'Transfer',
+    clearing: 'Clearing',
+    digital: 'Digital'
+  };
 
   /** True when the logged-in user belongs to the Head Office (sees both branches + consolidated view). */
   isHeadOffice = false;
@@ -1481,6 +1491,52 @@ export class CashClearingTransferSummaryComponent {
     return this.activeTab === 'digital' ? row.code : row.name;
   }
 
+  /** GL name for the code tracked on this txn row, so the Transaction Details journal can show
+   *  "which GL" alongside the account, not just a bare code. */
+  glName(code: string): string {
+    return this.rowsForActiveTab.find((r) => r.code === code)?.name || code;
+  }
+
+  /**
+   * Every transaction here is only ever recorded as ONE leg (whichever GL this Cash/Clearing/
+   * Transfer/Digital screen tracks) — the offsetting leg (the customer's own account, a
+   * settlement/clearing-house account, etc.) was never modelled as a separate GL row. Rather
+   * than leaving that side blank, this derives a sensible label for it so the Transaction
+   * Details view can show the FULL double entry (Dr leg + Cr leg, always equal amounts) —
+   * exactly what a real CBS "Day Book"/Journal Register shows, and what makes it possible to
+   * see at a glance that a transaction is complete and ready for reconciliation.
+   *
+   * For internal cash-movement postings (ATM cash-in-transit, currency chest, denomination
+   * shortages, CTS grid rounding) the account name already describes the SAME leg rather than a
+   * distinct counter-party, so those get a purpose-built contra label. Everything else already
+   * has a descriptive counter-party name (customer, vendor, bank branch, government department)
+   * that IS the natural contra account, so it's used as-is — WITHOUT repeating the account/
+   * reference number, since that number is already shown against the tracked GL leg on the
+   * other line; showing it a second time here would make both lines look like the same account,
+   * defeating the point of a "Balanced" two-sided entry.
+   */
+  contraLabel(t: TxnRow): string {
+    const p = t.particulars.toLowerCase();
+    if (p.includes('atm') && (p.includes('vault') || p.includes('loading') || p.includes('surrendered'))) {
+      return 'ATM Cash-in-Transit Account';
+    }
+    if (p.includes('currency chest')) {
+      return 'Currency Chest Account (Sponsor Bank)';
+    }
+    if (p.includes('denomination') || p.includes('shortage adjustment')) {
+      return 'Cash Difference / Shortage Suspense Account';
+    }
+    if (p.includes('cts grid rounding')) {
+      return 'CTS Grid Rounding Suspense Account';
+    }
+    return t.accountName;
+  }
+
+  /** The single non-zero amount on this leg — always what the derived contra leg mirrors. */
+  legAmount(t: TxnRow): number {
+    return t.debit > 0 ? t.debit : t.credit;
+  }
+
   /** Credit total for a GL row — always summed from its own txn lines, never a separate hand-entered number. */
   rowCredit(row: SummaryRow, txns: TxnRow[]): number {
     return txns.filter((t) => t.glCode === row.code).reduce((sum, t) => sum + t.credit, 0);
@@ -1566,4 +1622,181 @@ export class CashClearingTransferSummaryComponent {
       return { code: b.code, name: b.name, opening, credit, debit, closing: opening + credit - debit };
     });
   }
+
+  /**
+   * Exports the full report for the currently viewed scope (own branch, a drilled-into branch,
+   * or "All Branches" consolidated) — every category (Cash/Transfer/Clearing/Digital), not just
+   * the tab on screen, so the workbook is a complete record. "Summary" mirrors the Opening/
+   * Credit/Debit/Closing view; "Transaction Details" mirrors the full double-entry journal view
+   * (same glName/contraLabel/legAmount derivations, so the export can never disagree with what's
+   * on screen); "Branch Breakup" is added only when Head Office is viewing the consolidated view.
+   */
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      const summaryRows: (string | number | null)[][] = [];
+      const journalRows: (string | number | null)[][] = [];
+
+      for (const tab of this.allTabs) {
+        const label = this.tabLabels[tab];
+        const rows = this.effectiveRows(tab);
+        const txns = this.effectiveTxns(tab);
+
+        rows.forEach((r) => {
+          summaryRows.push([
+            label,
+            r.code,
+            r.name,
+            r.opening,
+            this.rowCredit(r, txns),
+            this.rowDebit(r, txns),
+            this.closing(r, txns)
+          ]);
+        });
+        summaryRows.push([
+          `${label} Total`,
+          '',
+          '',
+          this.total(rows, txns, 'opening'),
+          this.total(rows, txns, 'credit'),
+          this.total(rows, txns, 'debit'),
+          this.totalClosing(rows, txns)
+        ]);
+
+        txns.forEach((t) => {
+          const glText = rows.find((r) => r.code === t.glCode)?.name || t.glCode;
+          journalRows.push([
+            label,
+            this.asOnDate,
+            this.display(t.voucherNo),
+            'Dr',
+            t.debit > 0 ? t.glCode : '',
+            t.debit > 0 ? `${glText} — ${this.display(t.accountNo)} (${t.accountName})` : this.contraLabel(t),
+            this.legAmount(t),
+            null,
+            'Balanced'
+          ]);
+          journalRows.push([
+            label,
+            this.asOnDate,
+            this.display(t.voucherNo),
+            'Cr',
+            t.credit > 0 ? t.glCode : '',
+            t.credit > 0 ? `${glText} — ${this.display(t.accountNo)} (${t.accountName})` : this.contraLabel(t),
+            null,
+            this.legAmount(t),
+            'Balanced'
+          ]);
+        });
+      }
+      summaryRows.push([
+        'Grand Total',
+        '',
+        '',
+        this.grandOpening,
+        this.grandCredit,
+        this.grandDebit,
+        this.grandClosing
+      ]);
+
+      const sheets: ExportSheetSpec[] = [
+        {
+          sheetName: 'Summary',
+          title: 'Cash / Clearing / Transfer - Summary Report',
+          subtitle: `Scope: ${this.scopeName}   ·   As On: ${this.asOnDate}`,
+          headers: [
+            'Category',
+            'GL Code',
+            'Particulars',
+            'Opening',
+            'Credit',
+            'Debit',
+            'Closing'
+          ],
+          widths: [
+            12,
+            12,
+            34,
+            16,
+            16,
+            16,
+            16
+          ],
+          rows: summaryRows
+        },
+        {
+          sheetName: 'Transaction Details',
+          title: 'Transaction Details — Full Double Entry',
+          subtitle: `Scope: ${this.scopeName}   ·   As On: ${this.asOnDate}`,
+          headers: [
+            'Category',
+            'Date',
+            'Voucher / Ref No',
+            'Dr / Cr',
+            'GL Code',
+            'GL / Account',
+            'Debit',
+            'Credit',
+            'Status'
+          ],
+          widths: [
+            12,
+            12,
+            20,
+            8,
+            10,
+            46,
+            16,
+            16,
+            12
+          ],
+          rows: journalRows
+        }
+      ];
+
+      if (this.isHeadOffice && this.selectedBranchCode === 'ALL') {
+        sheets.push({
+          sheetName: 'Branch Breakup',
+          title: 'Branch-wise Break-up',
+          subtitle: `As On: ${this.asOnDate}`,
+          headers: [
+            'Branch',
+            'Opening',
+            'Credit',
+            'Debit',
+            'Closing'
+          ],
+          widths: [
+            22,
+            16,
+            16,
+            16,
+            16
+          ],
+          rows: [
+            ...this.branchBreakup.map((b) => [
+              b.name,
+              b.opening,
+              b.credit,
+              b.debit,
+              b.closing
+            ]),
+            [
+              'All Branches',
+              this.grandOpening,
+              this.grandCredit,
+              this.grandDebit,
+              this.grandClosing
+            ]
+          ]
+        });
+      }
+
+      await exportWorkbook(sheets, `Cash-Clearing-Transfer-Summary-${this.scopeName}-${this.asOnDate}`);
+    } catch (err) {
+      console.error('Cash/Clearing/Transfer export failed', err);
+    } finally {
+      this.generating = false;
+    }
+  }
 }

src/app/cashier/cashier-export.ts

@@ -0,0 +1,88 @@
+/**
+ * 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/.
+ */
+
+// Shared "Export to Excel" builder for Cashier reports (mirrors ../investment/investment-export.ts)
+// — centralised so the ExcelJS boilerplate (title/meta/header rows, number formatting, safe sheet
+// names, Blob download) is written once and every cashier report's export behaves the same way.
+
+import * as ExcelJS from 'exceljs';
+
+export interface ExportSheetSpec {
+  /** Worksheet tab name — sanitised for Excel's forbidden characters (\ / ? * [ ]) and length. */
+  sheetName: string;
+  /** Bold title row, merged across all columns. */
+  title: string;
+  /** Optional italic subtitle row (e.g. scope/date), merged across all columns. */
+  subtitle?: string;
+  headers: string[];
+  rows: (string | number | null)[][];
+  widths?: number[];
+}
+
+/** Excel worksheet names can't contain \ / ? * [ ] or exceed 31 chars. */
+function safeSheetName(name: string): string {
+  return name.replace(/[\\/?*[\]]/g, '-').slice(0, 31);
+}
+
+function buildSheet(wb: ExcelJS.Workbook, spec: ExportSheetSpec): void {
+  const sheet = wb.addWorksheet(safeSheetName(spec.sheetName));
+  sheet.columns = (spec.widths || spec.headers.map(() => 18)).map((w) => ({ width: w }));
+
+  const title = sheet.addRow([spec.title]);
+  sheet.mergeCells(title.number, 1, title.number, spec.headers.length);
+  title.font = { bold: true, size: 14, color: { argb: 'FFFFFFFF' } };
+  title.alignment = { horizontal: 'center', vertical: 'middle' };
+  title.height = 24;
+  title.getCell(1).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF0F4F3C' } };
+
+  if (spec.subtitle) {
+    const meta = sheet.addRow([spec.subtitle]);
+    sheet.mergeCells(meta.number, 1, meta.number, spec.headers.length);
+    meta.font = { italic: true, size: 10 };
+  }
+  sheet.addRow([]);
+
+  const head = sheet.addRow(spec.headers);
+  head.font = { bold: true };
+  head.alignment = { wrapText: true, horizontal: 'center' };
+  head.eachCell((c) => {
+    c.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFE2E8F0' } };
+    c.border = { bottom: { style: 'thin' } };
+  });
+
+  for (const r of spec.rows) {
+    const row = sheet.addRow(r);
+    r.forEach((v, idx) => {
+      if (typeof v === 'number') {
+        row.getCell(idx + 1).numFmt = '#,##0.00';
+      }
+    });
+  }
+  sheet.views = [{ state: 'frozen', ySplit: spec.subtitle ? 4 : 3 }];
+}
+
+/** Builds a (possibly multi-sheet) workbook and triggers a browser download. */
+export async function exportWorkbook(sheets: ExportSheetSpec[], fileName: string): Promise<void> {
+  const wb = new ExcelJS.Workbook();
+  wb.creator = 'CBSNexora';
+  wb.created = new Date();
+  sheets.forEach((s) => buildSheet(wb, s));
+
+  const buffer = await wb.xlsx.writeBuffer();
+  const blob = new Blob([buffer], {
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+  });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = `${fileName.replace(/[^\w]+/g, '-')}.xlsx`;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+}

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

@@ -62,6 +62,38 @@ const routes: Routes = [
             ),
           data: { title: 'My Disbursement Requests', breadcrumb: 'My Disbursement Requests' }
         },
+        {
+          path: 'share-withdrawal-request',
+          loadComponent: () =>
+            import('../clerk/share-withdrawal-request/share-withdrawal-request.component').then(
+              (m) => m.ShareWithdrawalRequestComponent
+            ),
+          data: { title: 'New Share Withdrawal Request', breadcrumb: 'New Share Withdrawal Request', mode: 'create' }
+        },
+        {
+          path: 'share-withdrawal-requests',
+          loadComponent: () =>
+            import('../clerk/my-share-withdrawal-requests/my-share-withdrawal-requests.component').then(
+              (m) => m.MyShareWithdrawalRequestsComponent
+            ),
+          data: { title: 'My Share Requests', breadcrumb: 'My Share Requests' }
+        },
+        {
+          path: 'share-closure-request',
+          loadComponent: () =>
+            import('../clerk/share-closure-request/share-closure-request.component').then(
+              (m) => m.ShareClosureRequestComponent
+            ),
+          data: { title: 'New Share Closure Request', breadcrumb: 'New Share Closure Request', mode: 'create' }
+        },
+        {
+          path: 'share-closure-requests',
+          loadComponent: () =>
+            import('../clerk/my-share-closure-requests/my-share-closure-requests.component').then(
+              (m) => m.MyShareClosureRequestsComponent
+            ),
+          data: { title: 'My Share Closure Requests', breadcrumb: 'My Share Closure Requests' }
+        },
         {
           path: 'account-facilities',
           loadComponent: () =>

src/app/cashier/clerk-share-closure.service.ts

@@ -0,0 +1,53 @@
+/**
+ * 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';
+
+/** HTTP service for the Share Closure maker-checker workflow — mirrors
+ *  ClerkShareWithdrawalService, adapted for closing an already-zero-share account. */
+@Injectable({ providedIn: 'root' })
+export class ClerkShareClosureService {
+  private http = inject(HttpClient);
+
+  submit(data: any): Observable<any> {
+    return this.http.post('/clerk/share-closure-requests', data);
+  }
+
+  getMyRequests(status?: string, offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
+    let params = new HttpParams().set('offset', String(offset)).set('limit', String(limit));
+    if (status) params = params.set('status', status);
+    if (fromDate) params = params.set('fromDate', fromDate);
+    if (toDate) params = params.set('toDate', toDate);
+    return this.http.get('/clerk/share-closure-requests/my', { params });
+  }
+
+  getPendingRequests(status = 'PENDING', offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
+    let params = new HttpParams().set('status', status).set('offset', String(offset)).set('limit', String(limit));
+    if (fromDate) params = params.set('fromDate', fromDate);
+    if (toDate) params = params.set('toDate', toDate);
+    return this.http.get('/clerk/share-closure-requests', { params });
+  }
+
+  getById(id: number): Observable<any> {
+    return this.http.get(`/clerk/share-closure-requests/${id}`);
+  }
+
+  validate(id: number): Observable<any> {
+    return this.http.post(`/clerk/share-closure-requests/${id}/validate`, {});
+  }
+
+  approve(id: number): Observable<any> {
+    return this.http.post(`/clerk/share-closure-requests/${id}/approve`, {});
+  }
+
+  reject(id: number, reason: string): Observable<any> {
+    return this.http.post(`/clerk/share-closure-requests/${id}/reject`, { reason });
+  }
+}

src/app/cashier/clerk-share-withdrawal.service.ts

@@ -0,0 +1,53 @@
+/**
+ * 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';
+
+/** HTTP service for the Share Withdrawal (redeem shares) maker-checker workflow — mirrors
+ *  ClerkWithdrawalService (cash withdrawal), adapted for shares. */
+@Injectable({ providedIn: 'root' })
+export class ClerkShareWithdrawalService {
+  private http = inject(HttpClient);
+
+  submit(data: any): Observable<any> {
+    return this.http.post('/clerk/share-withdrawal-requests', data);
+  }
+
+  getMyRequests(status?: string, offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
+    let params = new HttpParams().set('offset', String(offset)).set('limit', String(limit));
+    if (status) params = params.set('status', status);
+    if (fromDate) params = params.set('fromDate', fromDate);
+    if (toDate) params = params.set('toDate', toDate);
+    return this.http.get('/clerk/share-withdrawal-requests/my', { params });
+  }
+
+  getPendingRequests(status = 'PENDING', offset = 0, limit = 20, fromDate?: string, toDate?: string): Observable<any> {
+    let params = new HttpParams().set('status', status).set('offset', String(offset)).set('limit', String(limit));
+    if (fromDate) params = params.set('fromDate', fromDate);
+    if (toDate) params = params.set('toDate', toDate);
+    return this.http.get('/clerk/share-withdrawal-requests', { params });
+  }
+
+  getById(id: number): Observable<any> {
+    return this.http.get(`/clerk/share-withdrawal-requests/${id}`);
+  }
+
+  validate(id: number): Observable<any> {
+    return this.http.post(`/clerk/share-withdrawal-requests/${id}/validate`, {});
+  }
+
+  approve(id: number): Observable<any> {
+    return this.http.post(`/clerk/share-withdrawal-requests/${id}/approve`, {});
+  }
+
+  reject(id: number, reason: string): Observable<any> {
+    return this.http.post(`/clerk/share-withdrawal-requests/${id}/reject`, { reason });
+  }
+}

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

@@ -146,7 +146,7 @@
                         [class.ws-f__ctl--req]="!row.paymentTypeId"
                       >
                         <option [ngValue]="null">— Select —</option>
-                        @for (pt of paymentTypes; track pt.id) {
+                        @for (pt of paymentTypesForRow(row); track pt.id) {
                           <option [ngValue]="pt.id">{{ pt.name }}</option>
                         }
                       </select>
@@ -231,8 +231,11 @@
                   <span class="ws-caption">Payment instrument</span>
                   <div class="ws-group__fields">
                     <div class="ws-f ws-f--amt">
-                      <label class="ws-f__lbl" title="Transaction Amount">
-                        AMOUNT
+                      <label
+                        class="ws-f__lbl"
+                        [title]="row.acTyp === 'SHR' ? 'Number of Shares' : 'Transaction Amount'"
+                      >
+                        {{ row.acTyp === 'SHR' ? 'SHARE NO.' : 'AMOUNT' }}
                         @if (!isClerk && activeWithdrawalRequest) {
                           <span class="ws-amt-locked-badge" title="Amount locked — approved withdrawal">🔒</span>
                         }
@@ -242,20 +245,48 @@
                         [class.ws-amt-wrap--cash]="isCashPayment && selectedRow === row"
                         [class.ws-amt-wrap--locked]="!isClerk && !!activeWithdrawalRequest"
                       >
-                        <span class="ws-amt-prefix">₹</span>
+                        @if (row.acTyp !== 'SHR') {
+                          <span class="ws-amt-prefix">₹</span>
+                        }
                         <input
                           class="ws-f__ctl ws-amt-input"
                           type="number"
                           [value]="row.amount ?? ''"
-                          (input)="row.amount = +$any($event.target).value"
+                          (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                           (click)="$event.stopPropagation()"
-                          placeholder="0.00"
+                          [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
                           [readonly]="!isClerk && !!activeWithdrawalRequest"
                           [class.ws-amt-input--locked]="!isClerk && !!activeWithdrawalRequest"
                         />
                       </div>
+                      @if (row.acTyp === 'SHR' && rowSharePrices[row.acNo]) {
+                        <span class="ws-f__hint"
+                          >= ₹{{ (row.amount ?? 0) * rowSharePrices[row.acNo] | number: '1.2-2' }} @ ₹{{
+                            rowSharePrices[row.acNo] | number: '1.2-2'
+                          }}/share</span
+                        >
+                      }
                     </div>
-                    @if (row.typ !== 'Withdrawal Slip') {
+                    @if (row.acTyp === 'SHR' && row.typ === 'Enter Bank Transfer') {
+                      <div class="ws-f ws-f--cheqno">
+                        <label class="ws-f__lbl" title="Board Resolution Number">RESOLUTION NO.</label>
+                        <input
+                          class="ws-f__ctl"
+                          [(ngModel)]="row.resolutionNumber"
+                          (click)="$event.stopPropagation()"
+                          placeholder="e.g. BR-2026-014"
+                        />
+                      </div>
+                      <div class="ws-f ws-f--cheqdt">
+                        <label class="ws-f__lbl" title="Date of Meeting">MEETING DATE</label>
+                        <input
+                          class="ws-f__ctl"
+                          type="date"
+                          [(ngModel)]="row.meetingDate"
+                          (click)="$event.stopPropagation()"
+                        />
+                      </div>
+                    } @else if (row.typ !== 'Withdrawal Slip') {
                       <div class="ws-f ws-f--cheqno">
                         <label class="ws-f__lbl" title="Cheque Number">CHEQUE NO.</label>
                         <input
@@ -712,6 +743,32 @@
                     '—'
                 }}</span>
               </div>
+              @if (selectedRow?.acTyp === 'SHR') {
+                <div class="te-field">
+                  <span class="te-label">No. of Shares Held</span
+                  ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Market Price / Share</span
+                  ><span class="te-value te-mono"
+                    >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
+                  >
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Resolution No.</span
+                  ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Linked Savings A/C No.</span
+                  ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
+                </div>
+                @if (accountDetails.linkedLoanAccountNo) {
+                  <div class="te-field">
+                    <span class="te-label">Linked Loan A/C No.</span
+                    ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
+                  </div>
+                }
+              }
             </div>
 
             <div class="te-panel__header te-panel__header--mt">
@@ -724,7 +781,13 @@
             <div class="te-panel__body">
               <div class="te-balance-row">
                 <span class="te-bal-num">1.</span>
-                <span class="te-bal-label">{{ accountDetails?.glCode ? 'GL Balance' : 'Current Balance' }}</span>
+                <span class="te-bal-label">{{
+                  selectedRow?.acTyp === 'SHR'
+                    ? 'Share Balance'
+                    : accountDetails?.glCode
+                      ? 'GL Balance'
+                      : 'Current Balance'
+                }}</span>
                 <span class="te-bal-value te-bal-value--cr"
                   >{{ currencySymbol }}{{ currentBalance | number: '1.2-2' }}</span
                 >
@@ -1281,7 +1344,7 @@
                             [class.ws-f__ctl--req]="!row.paymentTypeId"
                           >
                             <option [ngValue]="null">— Select —</option>
-                            @for (pt of paymentTypes; track pt.id) {
+                            @for (pt of paymentTypesForRow(row); track pt.id) {
                               <option [ngValue]="pt.id">{{ pt.name }}</option>
                             }
                           </select>
@@ -1360,7 +1423,7 @@
                       <div class="ws-group__fields">
                         <div class="ws-f ws-f--amt">
                           <label class="ws-f__lbl">
-                            AMOUNT
+                            {{ row.acTyp === 'SHR' ? 'SHARE NO.' : 'AMOUNT' }}
                             @if (!isClerk && activeWithdrawalRequest) {
                               <span class="ws-amt-locked-badge" title="Amount locked — approved withdrawal">🔒</span>
                             }
@@ -1370,27 +1433,51 @@
                             [class.ws-amt-wrap--cash]="isCashPayment && selectedRow === row"
                             [class.ws-amt-wrap--locked]="!isClerk && !!activeWithdrawalRequest"
                           >
-                            <span class="ws-amt-prefix">₹</span>
+                            @if (row.acTyp !== 'SHR') {
+                              <span class="ws-amt-prefix">₹</span>
+                            }
                             <input
                               class="ws-f__ctl ws-amt-input"
                               type="number"
                               [value]="row.amount ?? ''"
-                              (input)="row.amount = +$any($event.target).value"
+                              (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                               (click)="$event.stopPropagation()"
-                              placeholder="0.00"
+                              [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
                               [readonly]="!isClerk && !!activeWithdrawalRequest"
                               [class.ws-amt-input--locked]="!isClerk && !!activeWithdrawalRequest"
                             />
                           </div>
+                          @if (row.acTyp === 'SHR' && rowSharePrices[row.acNo]) {
+                            <span class="ws-f__hint"
+                              >= ₹{{ (row.amount ?? 0) * rowSharePrices[row.acNo] | number: '1.2-2' }} @ ₹{{
+                                rowSharePrices[row.acNo] | number: '1.2-2'
+                              }}/share</span
+                            >
+                          }
                         </div>
-                        <div class="ws-f ws-f--cheqno">
-                          <label class="ws-f__lbl">CHEQUE NO.</label>
-                          <input class="ws-f__ctl ws-f__ctl--mono" [(ngModel)]="row.chequeNo" placeholder="—" />
-                        </div>
-                        <div class="ws-f ws-f--cheqdt">
-                          <label class="ws-f__lbl">CHEQ. DATE</label>
-                          <input class="ws-f__ctl" [(ngModel)]="row.cheqDate" placeholder="dd-mm-yyyy" />
-                        </div>
+                        @if (row.acTyp === 'SHR' && row.typ === 'Enter Bank Transfer') {
+                          <div class="ws-f ws-f--cheqno">
+                            <label class="ws-f__lbl">RESOLUTION NO.</label>
+                            <input
+                              class="ws-f__ctl"
+                              [(ngModel)]="row.resolutionNumber"
+                              placeholder="e.g. BR-2026-014"
+                            />
+                          </div>
+                          <div class="ws-f ws-f--cheqdt">
+                            <label class="ws-f__lbl">MEETING DATE</label>
+                            <input class="ws-f__ctl" type="date" [(ngModel)]="row.meetingDate" />
+                          </div>
+                        } @else {
+                          <div class="ws-f ws-f--cheqno">
+                            <label class="ws-f__lbl">CHEQUE NO.</label>
+                            <input class="ws-f__ctl ws-f__ctl--mono" [(ngModel)]="row.chequeNo" placeholder="—" />
+                          </div>
+                          <div class="ws-f ws-f--cheqdt">
+                            <label class="ws-f__lbl">CHEQ. DATE</label>
+                            <input class="ws-f__ctl" [(ngModel)]="row.cheqDate" placeholder="dd-mm-yyyy" />
+                          </div>
+                        }
                         <div class="ws-f ws-f--tok">
                           <label class="ws-f__lbl">TOK. NO.</label>
                           <input

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

@@ -961,6 +961,14 @@ input.ws-amt-input--locked {
   flex-shrink: 0;
 }
 
+.ws-f__hint {
+  display: block;
+  margin-top: 2px;
+  font-size: 10px;
+  color: $ws-muted;
+  font-weight: 500;
+}
+
 .ws-amt-input {
   flex: 1;
   height: 100%;

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

@@ -21,6 +21,7 @@ import { AuthenticationService } from '../../core/authentication/authentication.
 import { ClerkUiStateService, ClerkSavedAccount } from '../clerk-ui-state.service';
 import { ClerkWithdrawalService } from '../clerk-withdrawal.service';
 import { ClerkDisbursementService } from '../clerk-disbursement.service';
+import { ClerkShareWithdrawalService } from '../clerk-share-withdrawal.service';
 import { CashierDepositService } from '../cashier-deposit.service';
 import { SettingsService } from '../../settings/settings.service';
 import {
@@ -47,6 +48,10 @@ interface TxnRow {
   routingCode: string;
   /** DD issuance charges/commission — only used when TYPE=DD, TXN TP=Cash, AC.TP=GL */
   ddCharges: number | null;
+  /** Only used when this row is AC.TP=SHR inside an Enter Bank Transfer to its linked savings
+   *  account — governs the share redemption (see submitShareRedemptionTransfer()). */
+  resolutionNumber?: string;
+  meetingDate?: string;
 }
 
 interface Denomination {
@@ -753,6 +758,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   private clerkUiState = inject(ClerkUiStateService);
   private clerkWithdrawalService = inject(ClerkWithdrawalService);
   private clerkDisbursementService = inject(ClerkDisbursementService);
+  private clerkShareWithdrawalService = inject(ClerkShareWithdrawalService);
   private cashierDepositService = inject(CashierDepositService);
   readonly router = inject(Router);
   private settingsService = inject(SettingsService);
@@ -769,9 +775,38 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   loadingAccount = false;
   accountError = '';
 
+  /** Share redemption settlement is always a book-transfer to the linked savings account — never a
+   *  cash handover. A Share (SHR) row's own TXN TP. never offers a cash payment type, and neither
+   *  does its paired CR (savings) row in "Enter Bank Transfer" mode — that CR row's payment type is
+   *  the one that actually governs how the settlement credit posts (see submitShareRedemptionTransfer()).
+   *  Every other account type/mode keeps the full, unfiltered list. */
+  paymentTypesForRow(row: TxnRow): any[] {
+    if (row.acTyp === 'SHR') {
+      return this.paymentTypes.filter((pt: any) => !pt.isCashPayment);
+    }
+    const isShareSettlementCredit =
+      row.typ === 'Enter Bank Transfer' &&
+      row.dbCr === 'Cr' &&
+      this.rows.some((r) => r.typ === 'Enter Bank Transfer' && r.dbCr === 'Dr' && r.acTyp === 'SHR');
+    if (isShareSettlementCredit) {
+      return this.paymentTypes.filter((pt: any) => !pt.isCashPayment);
+    }
+    return this.paymentTypes;
+  }
+
   // Per-row account id/name map: acNo → Fineract id/name (used for multi-row disbursement)
   rowAccountIds: Record<string, number> = {};
   rowAccountNames: Record<string, string> = {};
+  // Per-row Share account market price, keyed by acNo — lets a Share row's "SHARE NO." field
+  // auto-fill the settlement amount on any other row added alongside it (calculator convenience
+  // only; a Share row still can never itself be saved from this screen — see accountTypeConfig).
+  rowSharePrices: Record<string, number> = {};
+  // Per-row client id, keyed by acNo — needed to submit a Share Withdrawal Request from a row
+  // that isn't necessarily the currently "selected" one.
+  rowClientIds: Record<string, number> = {};
+  // Per-row linked savings account number, keyed by the Share account's own acNo — used to make
+  // sure a Share-to-linked-account Bank Transfer actually credits the right account.
+  rowLinkedSavingsAcNo: Record<string, string> = {};
 
   // Full account + client data
   accountDetails: any = null;
@@ -1205,6 +1240,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       };
       this.rows.push(mirror);
       this.selectedRow = mirror;
+      if (active.acTyp === 'SHR') {
+        this.syncShareLinkedAmounts();
+      }
       return;
     }
     const row: TxnRow = {
@@ -1499,6 +1537,182 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       });
   }
 
+  /** One-step Share redemption from Bank Transfer mode: DR row is the Share account (its
+   *  "SHARE NO." field), CR row must be that account's own linked savings account. Submits a
+   *  governed Share Withdrawal Request (same maker-checker table/flow as the dedicated screen) —
+   *  approval both redeems the shares and settles the linked account automatically. */
+  private submitShareRedemptionTransfer(shareRow: TxnRow, savingsRow: TxnRow): void {
+    // Belt-and-braces: the TXN TP. dropdown already hides cash payment types for the CR (savings)
+    // row (see paymentTypesForRow()), but re-check here too in case its payment type was set before
+    // that filter applied — settlement is always a book-transfer to the linked savings account, and
+    // it's the CR row's payment type that actually governs how that credit posts, never the DR
+    // (Share) row's, which has no real payment-type concept.
+    const settlementPaymentType = this.paymentTypes.find((p: any) => p.id === savingsRow.paymentTypeId);
+    if (!savingsRow.paymentTypeId) {
+      this.showAlert('error', 'Settlement Payment Type Required', [
+        'Select a Payment Type on the CR (savings account) row — it governs how the settlement credit posts.'
+      ]);
+      return;
+    }
+    if (settlementPaymentType?.isCashPayment) {
+      this.showAlert('error', 'Cash Not Allowed for Share Transactions', [
+        'Share redemption settlement is always a book-transfer to the linked savings account, never cash.',
+        'Select a non-cash Payment Type on the CR row (e.g. Transfer or Share Redemption Transfer).'
+      ]);
+      return;
+    }
+
+    const shareAccountId = this.rowAccountIds[shareRow.acNo];
+    if (!shareAccountId) {
+      this.showAlert('error', 'Share Account Not Loaded', [`Please load account details for: ${shareRow.acNo}`]);
+      return;
+    }
+    if (!this.rowAccountIds[savingsRow.acNo]) {
+      this.showAlert('error', 'Savings Account Not Loaded', [`Please load account details for: ${savingsRow.acNo}`]);
+      return;
+    }
+
+    const linkedAcNo = this.rowLinkedSavingsAcNo[shareRow.acNo];
+    const enteredAcNo = savingsRow.acNo?.trim();
+    const matchesLinked =
+      !!linkedAcNo &&
+      (linkedAcNo === enteredAcNo || linkedAcNo.endsWith(enteredAcNo) || savingsRow.ecsAcNo === linkedAcNo);
+    if (linkedAcNo && !matchesLinked) {
+      this.showAlert('error', 'Wrong Credit Account', [
+        `The CR account must be this Share account's own linked savings account: ${linkedAcNo}`,
+        `You entered: ${enteredAcNo}`
+      ]);
+      return;
+    }
+    if (!linkedAcNo) {
+      this.showAlert('error', 'No Linked Savings Account', [
+        'This Share account has no linked savings account configured — settlement has nowhere to go.'
+      ]);
+      return;
+    }
+
+    const shares = Number(shareRow.amount) || 0;
+    if (shares <= 0) {
+      this.showAlert('error', 'Share No. Required', ['Enter the number of shares to withdraw (greater than zero).']);
+      return;
+    }
+    if (!shareRow.resolutionNumber?.trim()) {
+      this.showAlert('error', 'Board Resolution Number Required', [
+        'A share withdrawal must be authorised by a Board Resolution.'
+      ]);
+      return;
+    }
+    if (!shareRow.meetingDate) {
+      this.showAlert('error', 'Date of Meeting Required', ['Enter the Board meeting date that passed the resolution.']);
+      return;
+    }
+
+    const today = new Date();
+    const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
+
+    // Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
+    // for audit purposes. Business logic still only uses settlementPaymentTypeId above; the rest of
+    // these fields are not re-read by the backend, they are the audit record of what was on screen.
+    const settlementRowSnapshot = {
+      branch: savingsRow.br,
+      accountType: savingsRow.acTyp,
+      accountNo: savingsRow.acNo,
+      ecsAccountNo: savingsRow.ecsAcNo || null,
+      dbCr: savingsRow.dbCr,
+      amount: savingsRow.amount ?? null,
+      chequeNo: savingsRow.chequeNo || null,
+      chequeDate: savingsRow.cheqDate || null,
+      tokenNo: savingsRow.tokNo || null,
+      description: savingsRow.description || null,
+      bankName: savingsRow.bankName || null,
+      routingCode: savingsRow.routingCode || null,
+      paymentTypeId: savingsRow.paymentTypeId,
+      paymentTypeName: settlementPaymentType?.name ?? null
+    };
+
+    const payload = {
+      shareAccountId,
+      accountNo: shareRow.acNo,
+      clientId: this.rowClientIds[shareRow.acNo] ?? null,
+      clientName: this.rowAccountNames[shareRow.acNo] ?? null,
+      requestedShares: shares,
+      requestedDate,
+      resolutionNumber: shareRow.resolutionNumber.trim(),
+      meetingDate: shareRow.meetingDate,
+      description: shareRow.description || null,
+      settlementPaymentTypeId: savingsRow.paymentTypeId,
+      settlementRowSnapshot
+    };
+
+    const sharePrice = this.rowSharePrices[shareRow.acNo] ?? 0;
+    const confirmLines = [
+      `Share Account: ${shareRow.acNo}  ·  Client: ${this.rowAccountNames[shareRow.acNo] ?? '—'}`,
+      `Shares to Withdraw: ${shares} @ ₹${sharePrice.toLocaleString('en-IN', { minimumFractionDigits: 2 })} = ₹${(shares * sharePrice).toLocaleString('en-IN', { minimumFractionDigits: 2 })}`,
+      `Board Resolution No.: ${payload.resolutionNumber}`,
+      `Date of Meeting: ${payload.meetingDate}`,
+      `Settlement Credit To: ${linkedAcNo}`,
+      `Settlement Payment Type: ${settlementPaymentType?.name ?? '—'}`,
+      ...(settlementRowSnapshot.ecsAccountNo ? [`ECS A/C No.: ${settlementRowSnapshot.ecsAccountNo}`] : []),
+      ...(settlementRowSnapshot.chequeNo ? [`Cheque No.: ${settlementRowSnapshot.chequeNo}`] : []),
+      ...(settlementRowSnapshot.chequeDate ? [`Cheque Date: ${settlementRowSnapshot.chequeDate}`] : []),
+      ...(settlementRowSnapshot.tokenNo ? [`Token No.: ${settlementRowSnapshot.tokenNo}`] : []),
+      ...(settlementRowSnapshot.description ? [`CR Row Remarks: ${settlementRowSnapshot.description}`] : []),
+      '',
+      'Validation checks:',
+      `  ✓ Share account and linked savings account both loaded`,
+      `  ✓ CR account matches this Share account's linked savings account`,
+      `  ✓ Settlement Payment Type is non-cash`,
+      `  ✓ Board Resolution Number and Date of Meeting provided`,
+      '',
+      'Pending Manager approval — redemption and settlement both post together on approval.'
+    ];
+    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
+      this.doSubmitShareRedemptionTransfer(payload, shareRow, shares, linkedAcNo)
+    );
+  }
+
+  private doSubmitShareRedemptionTransfer(
+    payload: Record<string, unknown>,
+    shareRow: TxnRow,
+    shares: number,
+    linkedAcNo: string
+  ): void {
+    this.saving = true;
+    this.clerkShareWithdrawalService
+      .submit(payload)
+      .pipe(
+        catchError((err: any) => {
+          const msg =
+            err?.error?.errors?.[0]?.defaultUserMessage ??
+            err?.error?.developerMessage ??
+            err?.error?.defaultUserMessage ??
+            'Share withdrawal submission failed. Please try again.';
+          this.showAlert('error', 'Submission Failed', [msg]);
+          this.saving = false;
+          return of(null);
+        })
+      )
+      .subscribe((res: any) => {
+        this.saving = false;
+        if (res) {
+          this.showAlert('success', 'Share Withdrawal Submitted', [
+            `${shares} share(s) from ${shareRow.acNo} → settlement to ${linkedAcNo} on approval.`,
+            'Pending Manager approval. Track status in "My Share Requests".'
+          ]);
+          this.rows = [];
+          this.rowAccountIds = {};
+          this.rowAccountNames = {};
+          this.rowSharePrices = {};
+          this.rowClientIds = {};
+          this.rowLinkedSavingsAcNo = {};
+          this.addRow();
+          this.selectedRow = this.rows[0];
+          this.accountDetails = null;
+          this.clientDetails = null;
+        }
+      });
+  }
+
   /** Cashier enters a token number → look up the APPROVED withdrawal request for auto-fill. */
   onTokNoBlur(row: TxnRow): void {
     if (this.isClerk || !row.tokNo?.trim()) return;
@@ -1535,6 +1749,25 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       });
   }
 
+  /** When exactly one row on screen is a Share account with a known market price, auto-fills every
+   *  OTHER row's amount as (shares entered on that row) × (its market price) — a calculator
+   *  convenience for filling the paired settlement entry. The Share row itself still can never be
+   *  saved from this screen (see the SHR guard in confirmSubmit()) — this only helps compute the
+   *  correct amount to carry over into the separate manual Deposit Slip entry. */
+  syncShareLinkedAmounts(): void {
+    const shareRows = this.rows.filter((r) => r.acTyp?.toUpperCase() === 'SHR' && this.rowSharePrices[r.acNo]);
+    if (shareRows.length !== 1) return;
+    const shareRow = shareRows[0];
+    const price = this.rowSharePrices[shareRow.acNo] ?? 0;
+    const shares = Number(shareRow.amount) || 0;
+    const total = Math.round(shares * price * 100) / 100;
+    this.rows.forEach((r) => {
+      if (r !== shareRow) {
+        r.amount = total;
+      }
+    });
+  }
+
   onAcNoBlur(row: TxnRow, index: number): void {
     if (!row.acNo.trim()) return;
     this.selectedRow = row;
@@ -1633,12 +1866,14 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         if (token !== this.searchToken) return; // stale result — newer search started
         const allItems: any[] = res?.pageItems ?? (Array.isArray(res) ? res : []);
         const f = cfg.matchField;
-        // Exact match first, then suffix/partial match (backend may return by last-N-digits)
+        // 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
+        // FULL unfiltered list rather than a server-side-narrowed one, so a partial match can't be
+        // gated on "exactly one row came back" — it never would be for those types.
         const exactMatch = allItems.find((x: any) => x[f] === acNo);
-        const partialMatch =
-          !exactMatch && allItems.length === 1
-            ? allItems.find((x: any) => x[f]?.endsWith(acNo) || x[f]?.includes(acNo))
-            : null;
+        const partialMatch = !exactMatch
+          ? (allItems.find((x: any) => x[f]?.endsWith(acNo)) ?? allItems.find((x: any) => x[f]?.includes(acNo)))
+          : null;
         const match = exactMatch ?? partialMatch ?? null;
         if (match?.id) {
           const clientIdFromSearch = acTyp !== 'GL' && match.clientId != null ? String(match.clientId) : null;
@@ -1659,6 +1894,17 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     siAccountType: number;
     txnBase: string;
     txnSearchSupported: boolean;
+    /** True when this account type has no separate REST transactions sub-resource at all (e.g.
+     *  Share accounts — Fineract returns transactions embedded on the account detail response
+     *  itself via ?associations=all, never at /accounts/share/{id}/transactions). Skips the
+     *  "today's transactions" HTTP call entirely instead of hitting a 404. */
+    txnFetchUnsupported?: boolean;
+    /** True when this account type has no standing-instruction "from account type" mapping on
+     *  the backend at all (PortfolioAccountType only defines LOAN/SAVINGS/CURRENT — Share isn't
+     *  a valid standing-instruction source account). Skips that HTTP call entirely instead of
+     *  sending an fromAccountType value the backend's query-builder silently can't match,
+     *  which otherwise produces a malformed "WHERE <empty>" SQL statement server-side. */
+    siFetchUnsupported?: boolean;
     maxLimit: number;
     skipGlobalSearch: boolean;
     listQueryParam: string;
@@ -1693,6 +1939,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         siAccountType: 4,
         txnBase: '/accounts/share',
         txnSearchSupported: false,
+        txnFetchUnsupported: true,
+        siFetchUnsupported: true,
         maxLimit: 500,
         skipGlobalSearch: true,
         listQueryParam: 'accountNo',
@@ -1805,6 +2053,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       siAccountType: number;
       txnBase: string;
       txnSearchSupported: boolean;
+      txnFetchUnsupported?: boolean;
+      siFetchUnsupported?: boolean;
       detailParams?: string;
     },
     token: number,
@@ -1837,13 +2087,29 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         this.rowAccountIds[this.selectedRow.acNo] = acc.id;
         this.rowAccountNames[this.selectedRow.acNo] =
           acc.name ?? acc.displayName ?? acc.glAccountName ?? acc.accountNo ?? '';
+        this.rowClientIds[this.selectedRow.acNo] = acc.clientId ?? null;
       }
       if (this.selectedRow) {
-        this.selectedRow.ecsAcNo = acc.glCode ?? acc.savingsAccountNumber ?? acc.accountNo ?? '';
+        // Share accounts: ECS field is the share account's own number — acc.savingsAccountNumber
+        // is a different, unrelated account (the linked settlement savings account) and must
+        // never be shown here.
+        this.selectedRow.ecsAcNo =
+          acTyp?.toUpperCase() === 'SHR'
+            ? (acc.accountNo ?? '')
+            : (acc.glCode ?? acc.savingsAccountNumber ?? acc.accountNo ?? '');
       }
       if (this.isClerk) this.clerkUiState.setFacilities(this.facilities, acNo, acTyp);
       this.computeSameDayNeftRtgs(acc.transactions);
       this.computeSameDayChequeClearing(acc.transactions);
+      if (acTyp?.toUpperCase() === 'SHR' && this.selectedRow?.acNo) {
+        // Keyed by the row's own typed acNo (e.g. "0011"), not the resolved full account number
+        // (e.g. "000000011") — rowAccountIds/rowAccountNames above use the same key, and every
+        // lookup elsewhere (syncShareLinkedAmounts, submitShareRedemptionTransfer, the template's
+        // rowSharePrices[row.acNo]) reads via row.acNo, so this must match or every lookup misses.
+        this.rowSharePrices[this.selectedRow.acNo] = Number(acc.currentMarketPrice) || 0;
+        this.rowLinkedSavingsAcNo[this.selectedRow.acNo] = acc.savingsAccountNumber ?? '';
+        this.syncShareLinkedAmounts();
+      }
       return true;
     };
 
@@ -1913,18 +2179,22 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       documents: this.http.get<any[]>(`/clients/${clientId}/documents`).pipe(catchError(() => of([]))),
       notes: this.http.get<any>(`/savings/${accountId}/notes`).pipe(catchError(() => of([]))),
       linkedAcc: this.http.get<any>(`/clients/${clientId}/accounts`).pipe(catchError(() => of(null))),
-      si: this.http
-        .get<any>(`/standinginstructions?fromAccountType=${cfg.siAccountType}&fromAccountId=${accountId}&limit=10`)
-        .pipe(catchError(() => of({ pageItems: [] }))),
-      todayTxns: cfg.txnSearchSupported
-        ? this.http
-            .get<any>(
-              `${cfg.txnBase}/${accountId}/transactions/search?fromDate=${todayStr}&toDate=${todayStr}&limit=20`
-            )
-            .pipe(catchError(() => of({ pageItems: [] })))
+      si: cfg.siFetchUnsupported
+        ? of({ pageItems: [] })
         : this.http
-            .get<any>(`${cfg.txnBase}/${accountId}/transactions?limit=50`)
-            .pipe(catchError(() => of({ pageItems: [] })))
+            .get<any>(`/standinginstructions?fromAccountType=${cfg.siAccountType}&fromAccountId=${accountId}&limit=10`)
+            .pipe(catchError(() => of({ pageItems: [] }))),
+      todayTxns: cfg.txnFetchUnsupported
+        ? of({ pageItems: [] })
+        : cfg.txnSearchSupported
+          ? this.http
+              .get<any>(
+                `${cfg.txnBase}/${accountId}/transactions/search?fromDate=${todayStr}&toDate=${todayStr}&limit=20`
+              )
+              .pipe(catchError(() => of({ pageItems: [] })))
+          : this.http
+              .get<any>(`${cfg.txnBase}/${accountId}/transactions?limit=50`)
+              .pipe(catchError(() => of({ pageItems: [] })))
     });
 
     if (clientIdHint) {
@@ -2089,6 +2359,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   // ── Balance getters ────────────────────────────────────────────────────────
 
   get currentBalance(): number {
+    if (this.selectedRow?.acTyp === 'SHR') {
+      const shares = Number(this.accountDetails?.summary?.totalApprovedShares ?? 0);
+      const unitPrice = Number(this.accountDetails?.currentMarketPrice ?? 0);
+      return shares * unitPrice;
+    }
     return this.accountDetails?.summary?.accountBalance ?? this.accountDetails?.organizationRunningBalance ?? 0;
   }
 
@@ -2502,6 +2777,23 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         return;
       }
 
+      // Share redemption via linked-account transfer: DR=Share account, CR=its linked savings
+      // account. A Share account can never be debited by a plain ledger transfer (no such Fineract
+      // command exists) — so this exact one-DR/one-CR shape is routed to submitShareRedemptionTransfer()
+      // instead, which submits a governed Share Withdrawal Request through the same maker-checker
+      // table as the dedicated screen; approval both redeems the shares and settles the linked account.
+      const shareDrRows = drRows.filter((r) => r.acTyp === 'SHR');
+      if (shareDrRows.length > 0) {
+        if (drRows.length !== 1 || crRows.length !== 1) {
+          this.showAlert('error', 'Unsupported Share Transfer', [
+            'A Share redemption transfer supports exactly one DR row (the Share account) and one CR row (its linked savings account).'
+          ]);
+          return;
+        }
+        this.submitShareRedemptionTransfer(shareDrRows[0], crRows[0]);
+        return;
+      }
+
       // Bank transfer: only savings (SD) or current (CA/CB) accounts allowed
       const allowedTypes = new Set([
         'SD',
@@ -3004,6 +3296,24 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     const accountId = this.accountDetails.id;
     const cfg = this.accountTypeConfig(row.acTyp);
 
+    // Share accounts must never go through this generic Deposit/Withdrawal Slip flow — both
+    // buildDepositPayload() and buildWithdrawalPayload() hardcode accountType: 'SAVINGS' and send
+    // savingsAccountId: this.accountDetails.id, which for a Share account is the SHARE account's
+    // own numeric id, not a real savings account id. Approving that request would call
+    // savingsAccountWithdrawal/Deposit against whatever savings account happens to share that same
+    // numeric id — a completely unrelated account. Share purchase/redemption must go through the
+    // dedicated Buy Shares / Share Withdrawal Request screens, which carry the correct governance
+    // (resolution number, meeting date, minimum-tenure and linked-loan checks).
+    if (row.acTyp === 'SHR') {
+      this.showAlert('error', 'Not Supported for Share Accounts', [
+        isDeposit
+          ? 'Share purchases must be made from the Buy Shares screen on the Share Account itself.'
+          : 'Share withdrawal (redeem shares) must be submitted from "New Share Withdrawal Request" in the Clerk Dashboard.',
+        'This generic Deposit/Withdrawal Slip does not carry the Board Resolution Number or the governance checks required for shares.'
+      ]);
+      return;
+    }
+
     // GL withdrawal → direct journal entry (no maker-checker)
     // GL deposit → falls through to maker-checker block below
     if (row.acTyp === 'GL' && !isDeposit) {

src/app/clerk/clerk-shared.scss

@@ -0,0 +1,77 @@
+/**
+ * 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/.
+ */
+
+/* Small shared layout/status-pill classes for the Share Withdrawal maker-checker screens —
+ * self-contained (this branch has no separate "investment" module to borrow them from). */
+
+.inv-form-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+  gap: 12px;
+}
+
+.inv-form-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  font-size: 11px;
+  font-weight: 600;
+  color: #64748b;
+
+  input,
+  select,
+  textarea {
+    height: 36px;
+    padding: 0 10px;
+    border: 1px solid #e2e8f0;
+    border-radius: 8px;
+    font-size: 13px;
+    color: #0d1b2a;
+    font-family: inherit;
+    background: #fff;
+    box-sizing: border-box;
+  }
+
+  textarea {
+    height: auto;
+    padding: 8px 10px;
+    resize: vertical;
+  }
+}
+
+.inv-form-actions {
+  display: flex;
+  gap: 10px;
+  padding: 12px 16px 16px;
+}
+
+.inv-badge {
+  display: inline-flex;
+  align-items: center;
+  padding: 3px 10px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+  background: #f1f5f9;
+  color: #475569;
+
+  &--active {
+    background: #fef3c7;
+    color: #92400e;
+  }
+
+  &--matured {
+    background: #dcfce7;
+    color: #166534;
+  }
+
+  &--written_off {
+    background: #fee2e2;
+    color: #991b1b;
+  }
+}

src/app/clerk/my-share-closure-requests/my-share-closure-requests.component.html

@@ -0,0 +1,69 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg">
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">CLERK · SHARE CLOSURE</div>
+      <h1 class="pg-title">My Share Closure Requests</h1>
+      <p class="pg-sub">Share account closure requests you have submitted, and their approval status.</p>
+    </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--primary" (click)="newRequest()">New Share Closure Request</button>
+    </div>
+  </header>
+
+  <div class="pg-card">
+    <div class="inv-form-grid" style="padding: 12px 16px">
+      <label class="inv-form-field">
+        <span>Status</span>
+        <select [(ngModel)]="filterStatus" (change)="onFilterChange()">
+          @for (opt of statusOptions; track opt.value) {
+            <option [value]="opt.value">{{ opt.label }}</option>
+          }
+        </select>
+      </label>
+    </div>
+    <table class="pg-table">
+      <thead>
+        <tr>
+          <th>Account No</th>
+          <th>Client</th>
+          <th>Closed Date</th>
+          <th>Submitted At</th>
+          <th>Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        @if (loading) {
+          <tr>
+            <td colspan="5" class="pg-empty">Loading…</td>
+          </tr>
+        } @else if (loaded && requests.length === 0) {
+          <tr>
+            <td colspan="5" class="pg-empty">No share closure requests found.</td>
+          </tr>
+        } @else {
+          @for (r of requests; track r.id) {
+            <tr>
+              <td>
+                <span class="pg-chip">{{ r.account_no }}</span>
+              </td>
+              <td>{{ r.client_name }}</td>
+              <td>{{ formatDateTime(r.closed_date) }}</td>
+              <td>{{ formatDateTime(r.submitted_at) }}</td>
+              <td>
+                <span [class]="statusClass(r.status)">{{ statusLabel(r.status) }}</span>
+              </td>
+            </tr>
+          }
+        }
+      </tbody>
+    </table>
+  </div>
+</div>

src/app/clerk/my-share-closure-requests/my-share-closure-requests.component.ts

@@ -0,0 +1,112 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Router, RouterModule } from '@angular/router';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+
+import { ClerkShareClosureService } from '../../cashier/clerk-share-closure.service';
+
+/** Clerk Dashboard "My Share Closure Requests" — lists the share account closure requests this
+ *  clerk has submitted and their approval status. Mirrors MyShareWithdrawalRequestsComponent. */
+@Component({
+  selector: 'mifosx-my-share-closure-requests',
+  templateUrl: './my-share-closure-requests.component.html',
+  styleUrls: [
+    '../../cashier/cashier-shared.scss',
+    '../clerk-shared.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule
+  ]
+})
+export class MyShareClosureRequestsComponent implements OnInit {
+  private service = inject(ClerkShareClosureService);
+  private router = inject(Router);
+
+  requests: any[] = [];
+  totalRecords = 0;
+  loading = false;
+  loaded = false;
+
+  filterStatus = '';
+
+  get statusOptions(): { value: string; label: string }[] {
+    return [
+      { value: '', label: 'All' },
+      { value: 'PENDING', label: 'Pending' },
+      { value: 'APPROVED', label: 'Approved' },
+      { value: 'REJECTED', label: 'Rejected' }
+    ];
+  }
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service
+      .getMyRequests(this.filterStatus || undefined, 0, 50)
+      .pipe(catchError(() => of({ pageItems: [], totalFilteredRecords: 0 })))
+      .subscribe((res: any) => {
+        this.requests = res?.pageItems ?? [];
+        this.totalRecords = Number(res?.totalFilteredRecords ?? 0);
+        this.loading = false;
+        this.loaded = true;
+      });
+  }
+
+  onFilterChange(): void {
+    this.load();
+  }
+
+  newRequest(): void {
+    this.router.navigate(['/clerk/share-closure-request']);
+  }
+
+  statusClass(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'inv-badge--active',
+      APPROVED: 'inv-badge--matured',
+      REJECTED: 'inv-badge--written_off'
+    };
+    return `inv-badge ${map[status] ?? ''}`;
+  }
+
+  statusLabel(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'Pending Approval',
+      APPROVED: 'Approved',
+      REJECTED: 'Rejected'
+    };
+    return map[status] ?? status;
+  }
+
+  formatDateTime(val: any): string {
+    if (!val) return '—';
+    try {
+      const d = new Date(val);
+      return d.toLocaleString('en-IN', {
+        day: '2-digit',
+        month: 'short',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+      });
+    } catch {
+      return String(val);
+    }
+  }
+}

src/app/clerk/my-share-withdrawal-requests/my-share-withdrawal-requests.component.html

@@ -0,0 +1,73 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg">
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">CLERK · SHARE WITHDRAWAL</div>
+      <h1 class="pg-title">My Share Requests</h1>
+      <p class="pg-sub">Share withdrawal requests you have submitted, and their approval status.</p>
+    </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--primary" (click)="newRequest()">New Share Withdrawal</button>
+    </div>
+  </header>
+
+  <div class="pg-card">
+    <div class="inv-form-grid" style="padding: 12px 16px">
+      <label class="inv-form-field">
+        <span>Status</span>
+        <select [(ngModel)]="filterStatus" (change)="onFilterChange()">
+          @for (opt of statusOptions; track opt.value) {
+            <option [value]="opt.value">{{ opt.label }}</option>
+          }
+        </select>
+      </label>
+    </div>
+    <table class="pg-table">
+      <thead>
+        <tr>
+          <th>Account No</th>
+          <th>Client</th>
+          <th class="num">Shares</th>
+          <th>Resolution No.</th>
+          <th>Meeting Date</th>
+          <th>Submitted At</th>
+          <th>Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        @if (loading) {
+          <tr>
+            <td colspan="7" class="pg-empty">Loading…</td>
+          </tr>
+        } @else if (loaded && requests.length === 0) {
+          <tr>
+            <td colspan="7" class="pg-empty">No share withdrawal requests found.</td>
+          </tr>
+        } @else {
+          @for (r of requests; track r.id) {
+            <tr>
+              <td>
+                <span class="pg-chip">{{ r.account_no }}</span>
+              </td>
+              <td>{{ r.client_name }}</td>
+              <td class="num">{{ r.requested_shares }}</td>
+              <td>{{ r.resolution_number }}</td>
+              <td>{{ formatDateTime(r.meeting_date) }}</td>
+              <td>{{ formatDateTime(r.submitted_at) }}</td>
+              <td>
+                <span [class]="statusClass(r.status)">{{ statusLabel(r.status) }}</span>
+              </td>
+            </tr>
+          }
+        }
+      </tbody>
+    </table>
+  </div>
+</div>

src/app/clerk/my-share-withdrawal-requests/my-share-withdrawal-requests.component.ts

@@ -0,0 +1,112 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { Router, RouterModule } from '@angular/router';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+
+import { ClerkShareWithdrawalService } from '../../cashier/clerk-share-withdrawal.service';
+
+/** Clerk Dashboard "My Share Requests" — lists the share withdrawal requests this clerk has
+ *  submitted and their approval status. Mirrors MyRequestsComponent/MyDisbursementRequestsComponent. */
+@Component({
+  selector: 'mifosx-my-share-withdrawal-requests',
+  templateUrl: './my-share-withdrawal-requests.component.html',
+  styleUrls: [
+    '../../cashier/cashier-shared.scss',
+    '../clerk-shared.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule
+  ]
+})
+export class MyShareWithdrawalRequestsComponent implements OnInit {
+  private service = inject(ClerkShareWithdrawalService);
+  private router = inject(Router);
+
+  requests: any[] = [];
+  totalRecords = 0;
+  loading = false;
+  loaded = false;
+
+  filterStatus = '';
+
+  get statusOptions(): { value: string; label: string }[] {
+    return [
+      { value: '', label: 'All' },
+      { value: 'PENDING', label: 'Pending' },
+      { value: 'APPROVED', label: 'Approved' },
+      { value: 'REJECTED', label: 'Rejected' }
+    ];
+  }
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service
+      .getMyRequests(this.filterStatus || undefined, 0, 50)
+      .pipe(catchError(() => of({ pageItems: [], totalFilteredRecords: 0 })))
+      .subscribe((res: any) => {
+        this.requests = res?.pageItems ?? [];
+        this.totalRecords = Number(res?.totalFilteredRecords ?? 0);
+        this.loading = false;
+        this.loaded = true;
+      });
+  }
+
+  onFilterChange(): void {
+    this.load();
+  }
+
+  newRequest(): void {
+    this.router.navigate(['/clerk/share-withdrawal-request']);
+  }
+
+  statusClass(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'inv-badge--active',
+      APPROVED: 'inv-badge--matured',
+      REJECTED: 'inv-badge--written_off'
+    };
+    return `inv-badge ${map[status] ?? ''}`;
+  }
+
+  statusLabel(status: string): string {
+    const map: Record<string, string> = {
+      PENDING: 'Pending Approval',
+      APPROVED: 'Approved',
+      REJECTED: 'Rejected'
+    };
+    return map[status] ?? status;
+  }
+
+  formatDateTime(val: any): string {
+    if (!val) return '—';
+    try {
+      const d = new Date(val);
+      return d.toLocaleString('en-IN', {
+        day: '2-digit',
+        month: 'short',
+        year: 'numeric',
+        hour: '2-digit',
+        minute: '2-digit'
+      });
+    } catch {
+      return String(val);
+    }
+  }
+}

src/app/clerk/share-closure-request/share-closure-request.component.html

@@ -0,0 +1,355 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg">
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">{{ isReview ? 'CHECKER · APPROVAL' : 'CLERK · SHARE CLOSURE' }}</div>
+      <h1 class="pg-title">{{ pageTitle }}</h1>
+      <p class="pg-sub">{{ pageSubtitle }}</p>
+    </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn" (click)="goBack()">
+        <mat-icon>arrow_back</mat-icon>
+        {{ isReview ? 'Back to Requests' : 'My Share Closure Requests' }}
+      </button>
+    </div>
+  </header>
+
+  <div class="pg-card">
+    <div class="pos-section-label">Share Account</div>
+    <div class="inv-form-grid" style="padding: 16px">
+      @if (!isReview) {
+        <label class="inv-form-field" style="grid-column: span 2">
+          <span>* Search Account No. / Client Name (only zero-share accounts are eligible)</span>
+          <mifosx-search-select
+            [options]="accountOptions"
+            [(ngModel)]="selectedAccountId"
+            (ngModelChange)="onAccountSelected($event)"
+            placeholder="Search share account no. or client name…"
+          ></mifosx-search-select>
+        </label>
+      }
+      @if (account) {
+        <label class="inv-form-field">
+          <span>Account No</span>
+          <input type="text" [value]="account.accountNo" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>Client</span>
+          <input type="text" [value]="account.clientName" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>Shares Held</span>
+          <input type="text" [value]="heldShares" readonly />
+        </label>
+      }
+      @if (loadingAccount) {
+        <div class="pg-empty">Loading account…</div>
+      }
+      @if (account && heldShares !== 0 && !isReview) {
+        <div class="pg-empty" style="grid-column: span 2; color: #b42318">
+          This account still holds {{ heldShares }} share(s) — all shares must be withdrawn first via the Share
+          Withdrawal workflow before it becomes eligible for closure.
+        </div>
+      }
+    </div>
+  </div>
+
+  @if (isReview && reviewRequest) {
+    <div class="pg-card">
+      <div class="pos-section-label">Client Compliance</div>
+      <div class="inv-form-grid" style="padding: 16px">
+        <div class="inv-form-field">
+          <span>KYC Status</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="reviewRequest.client_kyc_verified"
+            [class.swr-chip--warn]="!reviewRequest.client_kyc_verified"
+          >
+            {{ reviewRequest.client_kyc_status_label }}
+          </span>
+        </div>
+        <div class="inv-form-field">
+          <span>Risk Category</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="!reviewRequest.client_risk_high"
+            [class.swr-chip--warn]="reviewRequest.client_risk_high"
+          >
+            {{ reviewRequest.client_risk_category_label }}
+          </span>
+        </div>
+        <div class="inv-form-field">
+          <span>Open AML Alerts</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="!reviewRequest.client_open_aml_alerts"
+            [class.swr-chip--warn]="reviewRequest.client_open_aml_alerts > 0"
+          >
+            {{ reviewRequest.client_open_aml_alerts || 0 }}
+          </span>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (account) {
+    <div class="pg-card">
+      <div class="pos-section-label">Closure Details</div>
+      <div class="inv-form-grid" style="padding: 16px">
+        <label class="inv-form-field">
+          <span>* Closed Date</span>
+          <input type="date" [(ngModel)]="closedDate" [disabled]="isReview" />
+        </label>
+        <label class="inv-form-field" style="grid-column: span 2">
+          <span>Note (optional)</span>
+          <input
+            type="text"
+            [(ngModel)]="note"
+            [disabled]="isReview"
+            placeholder="e.g. Member exit — all shares redeemed"
+          />
+        </label>
+      </div>
+
+      @if (!isReview) {
+        <div class="inv-form-actions">
+          <button
+            type="button"
+            class="pg-btn pg-btn--primary"
+            [disabled]="!isFormValid || submitting"
+            (click)="openConfirmDialog()"
+          >
+            {{ submitting ? 'Submitting…' : 'Review &amp; Submit' }}
+          </button>
+        </div>
+      }
+    </div>
+  }
+
+  @if (isReview && reviewRequest?.status === 'PENDING') {
+    <div class="pg-card">
+      <div class="pos-section-label">Verification</div>
+      <div class="swrv-trigger">
+        <div class="swrv-trigger__icon">
+          <mat-icon>fact_check</mat-icon>
+        </div>
+        <div class="swrv-trigger__text">
+          <div class="swrv-trigger__title">Run a live backend validation</div>
+          <div class="swrv-trigger__sub">
+            Re-checks shares held, account status, active loan/guarantee and client compliance before you approve.
+          </div>
+        </div>
+        <button type="button" class="pg-btn pg-btn--primary" (click)="openValidateModal()">
+          <mat-icon>play_circle</mat-icon>
+          Validate Request
+        </button>
+      </div>
+
+      <div class="inv-form-actions">
+        <button type="button" class="pg-btn pg-btn--primary" (click)="approveReview()">
+          <mat-icon>check_circle</mat-icon>
+          Approve &amp; Close Account
+        </button>
+        <button type="button" class="pg-btn pg-btn--danger" (click)="openRejectDialog()">
+          <mat-icon>cancel</mat-icon>
+          Reject
+        </button>
+      </div>
+    </div>
+  }
+
+  @if (showValidateModal) {
+    <div class="swrv-modal">
+      <div class="swrv-modal__card">
+        <div class="swrv-modal__header">
+          <div class="swrv-modal__title">
+            <span class="swrv-modal__title-icon"><mat-icon>fact_check</mat-icon></span>
+            Validate Share Closure Request
+          </div>
+          <button type="button" class="swrv-modal__close" [disabled]="validating" (click)="closeValidateModal()">
+            <mat-icon>close</mat-icon>
+          </button>
+        </div>
+
+        <div class="swrv-modal__body">
+          <p class="swrv-modal__intro">
+            Re-checking closure of <strong>{{ account?.accountNo }}</strong> ({{ account?.clientName }}) against the
+            live account, loan/guarantee and compliance state — not just what was captured at submission time.
+          </p>
+
+          @if (backendChecks && !validating && !validateAllPassed) {
+            <div class="swrv-modal__warn">
+              <mat-icon>warning</mat-icon>
+              <div>
+                <strong>Some checks need review before approving.</strong>
+                Scroll down to see which ones failed and why.
+              </div>
+            </div>
+          }
+
+          <ol class="swrv-steps">
+            @for (step of validateSteps; track step.label; let i = $index) {
+              <li
+                class="swrv-step"
+                [class.swrv-step--active]="step.status === 'active'"
+                [class.swrv-step--done]="step.status === 'done'"
+                [class.swrv-step--failed]="step.status === 'failed'"
+              >
+                <div class="swrv-step__indicator">
+                  @if (step.status === 'done') {
+                    <mat-icon>check</mat-icon>
+                  } @else if (step.status === 'active') {
+                    <mat-icon class="swrv-spin">autorenew</mat-icon>
+                  } @else if (step.status === 'failed') {
+                    <mat-icon>close</mat-icon>
+                  } @else {
+                    <span>{{ i + 1 }}</span>
+                  }
+                </div>
+                <div class="swrv-step__content">
+                  <div class="swrv-step__label">{{ step.label }}</div>
+                  <div class="swrv-step__msg">{{ step.detail }}</div>
+                </div>
+              </li>
+            }
+          </ol>
+
+          @if (validating && validateSteps.length === 0) {
+            <div class="pg-empty">Connecting to server…</div>
+          }
+
+          @if (backendChecks && !validating && validateAllPassed) {
+            <div class="swrv-modal__result">
+              <mat-icon>verified</mat-icon>
+              <span>All checks passed — safe to approve.</span>
+            </div>
+          }
+        </div>
+
+        <div class="swrv-modal__footer">
+          @if (!validating && backendChecks) {
+            <button type="button" class="pg-btn" (click)="runBackendValidation()">
+              <mat-icon>refresh</mat-icon>
+              Re-run
+            </button>
+          }
+          @if (!validating && backendChecks && validateAllPassed) {
+            <button type="button" class="pg-btn pg-btn--primary" (click)="closeValidateModal(); approveReview()">
+              <mat-icon>check_circle</mat-icon>
+              Approve &amp; Close Account
+            </button>
+          }
+          <button type="button" class="pg-btn" [disabled]="validating" (click)="closeValidateModal()">
+            {{ validating ? 'Validating…' : 'Close' }}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (isReview && activityLog.length > 0) {
+    <div class="pg-card">
+      <div class="pos-section-label">Activity Log</div>
+      <table class="pg-table">
+        <thead>
+          <tr>
+            <th>Timestamp</th>
+            <th>Action</th>
+            <th>User</th>
+            <th>Note</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (entry of activityLog; track entry.timestamp) {
+            <tr>
+              <td>{{ entry.timestamp | date: 'medium' }}</td>
+              <td>{{ entry.action }}</td>
+              <td>{{ entry.user }}</td>
+              <td>{{ entry.note || '—' }}</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+
+  @if (showConfirmDialog) {
+    <div class="swr-modal-backdrop">
+      <div class="swr-modal">
+        <h3>Confirm Share Closure Request</h3>
+        <p class="pg-sub">Review the details below before submitting for Bank Manager approval.</p>
+        <table class="pg-table">
+          <tbody>
+            <tr>
+              <td>Account No / Client</td>
+              <td>{{ account?.accountNo }} — {{ account?.clientName }}</td>
+            </tr>
+            <tr>
+              <td>Shares Held</td>
+              <td>{{ heldShares }}</td>
+            </tr>
+            <tr>
+              <td>Closed Date</td>
+              <td>{{ closedDate }}</td>
+            </tr>
+            <tr>
+              <td>Note</td>
+              <td>{{ note || '—' }}</td>
+            </tr>
+          </tbody>
+        </table>
+
+        <div class="pos-section-label" style="margin-top: 12px">Validation Checks</div>
+        <table class="pg-table">
+          <tbody>
+            @for (check of verificationChecks; track check.label) {
+              <tr>
+                <td>{{ check.label }}</td>
+                <td [class.swr-check-pass]="check.pass" [class.swr-check-fail]="!check.pass">
+                  {{ check.pass ? 'Pass — ' : 'Review — ' }}{{ check.detail }}
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+
+        <div class="inv-form-actions">
+          <button type="button" class="pg-btn pg-btn--primary" [disabled]="submitting" (click)="confirmSubmit()">
+            {{ submitting ? 'Submitting…' : 'Confirm & Submit' }}
+          </button>
+          <button type="button" class="pg-btn" (click)="cancelConfirmDialog()">Back to Edit</button>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (showRejectDialog) {
+    <div class="swr-modal-backdrop">
+      <div class="swr-modal">
+        <h3>Reject Share Closure Request</h3>
+        <label class="inv-form-field">
+          <span>* Rejection Reason</span>
+          <textarea rows="3" [(ngModel)]="rejectionReason"></textarea>
+        </label>
+        <div class="inv-form-actions">
+          <button
+            type="button"
+            class="pg-btn pg-btn--danger"
+            [disabled]="!rejectionReason.trim()"
+            (click)="confirmRejectReview()"
+          >
+            Confirm Reject
+          </button>
+          <button type="button" class="pg-btn" (click)="showRejectDialog = false">Cancel</button>
+        </div>
+      </div>
+    </div>
+  }
+</div>

src/app/clerk/share-closure-request/share-closure-request.component.ts

@@ -0,0 +1,336 @@
+/**
+ * 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, OnInit, Output, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { ActivatedRoute, Router, RouterModule } from '@angular/router';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+
+import { SharesService } from '../../shares/shares.service';
+import { ClerkShareClosureService } from '../../cashier/clerk-share-closure.service';
+import { SearchSelectComponent, SearchSelectOption } from '../../shared/search-select/search-select.component';
+
+export type ShareClosureMode = 'create' | 'review';
+
+interface ActivityEntry {
+  timestamp: string;
+  action: string;
+  user: string;
+  note?: string;
+}
+
+/**
+ * Share Account Closure request — maker screen in the Clerk Dashboard. A clerk finds a member's
+ * Share Account that already holds zero shares (all shares already withdrawn), enters the closed
+ * date plus an optional note, and submits for Bank Manager approval. This is the ONLY entry point
+ * a share account closure should go through — approval server-side executes the real Fineract
+ * "close" command (see ClerkShareClosureRequestApiResource on the backend).
+ */
+@Component({
+  selector: 'mifosx-share-closure-request',
+  templateUrl: './share-closure-request.component.html',
+  styleUrls: [
+    '../../cashier/cashier-shared.scss',
+    '../clerk-shared.scss',
+    '../share-withdrawal-request/share-withdrawal-request.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    MatIconModule,
+    MatSnackBarModule,
+    SearchSelectComponent
+  ]
+})
+export class ShareClosureRequestComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private sharesService = inject(SharesService);
+  private closureService = inject(ClerkShareClosureService);
+  private snackBar = inject(MatSnackBar);
+
+  /** When embedded (e.g. opened as a popup from a list screen instead of routed to directly), mode
+   *  and requestId come from these inputs rather than the route, and success/close actions emit
+   *  events instead of navigating away. */
+  @Input() embedded = false;
+  @Input() overrideMode: ShareClosureMode | null = null;
+  @Input() overrideRequestId: number | null = null;
+  @Output() closeRequested = new EventEmitter<void>();
+  @Output() actionCompleted = new EventEmitter<void>();
+
+  mode: ShareClosureMode = 'create';
+  requestId: number | null = null;
+
+  submitting = false;
+  loadingAccount = false;
+
+  selectedAccountId = '';
+  accountOptions: SearchSelectOption[] = [];
+
+  account: any = null;
+
+  closedDate = '';
+  note = '';
+
+  activityLog: ActivityEntry[] = [];
+  reviewRequest: any = null;
+  showRejectDialog = false;
+  rejectionReason = '';
+  showConfirmDialog = false;
+
+  showValidateModal = false;
+  validating = false;
+  validateAllPassed = false;
+  backendChecks: { label: string; pass: boolean; detail: string }[] | null = null;
+  validateSteps: { label: string; detail: string; pass: boolean; status: 'pending' | 'active' | 'done' | 'failed' }[] =
+    [];
+
+  get heldShares(): number {
+    return Number(this.account?.summary?.totalApprovedShares ?? this.account?.totalApprovedShares ?? 0);
+  }
+
+  get isFormValid(): boolean {
+    if (!this.account) return false;
+    if (this.heldShares !== 0) return false;
+    if (!this.closedDate) return false;
+    return true;
+  }
+
+  /** Shown to the clerk before submit and to the manager before approval, so both can verify the same checks. */
+  get verificationChecks(): { label: string; pass: boolean; detail: string }[] {
+    return [
+      { label: 'No shares currently held', pass: this.heldShares === 0, detail: `${this.heldShares} share(s) held` },
+      { label: 'Closed Date provided', pass: !!this.closedDate, detail: this.closedDate || 'Missing' }
+    ];
+  }
+
+  get isReview(): boolean {
+    return this.mode === 'review';
+  }
+
+  get pageTitle(): string {
+    return this.isReview ? 'Review Share Closure Request' : 'New Share Closure Request';
+  }
+
+  get pageSubtitle(): string {
+    return this.isReview
+      ? "Approve or reject the clerk's share account closure request."
+      : 'Close a Share Account whose shares have already been fully withdrawn, for Bank Manager approval.';
+  }
+
+  ngOnInit(): void {
+    this.mode = this.overrideMode ?? (this.route.snapshot.data?.['mode'] as ShareClosureMode) ?? 'create';
+    const idParam = this.overrideRequestId ?? this.route.snapshot.params?.['id'];
+    this.requestId = idParam ? Number(idParam) : null;
+
+    const today = new Date();
+    this.closedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
+
+    this.sharesService
+      .getShareAccountSummaries()
+      .pipe(catchError(() => of([])))
+      .subscribe((rows: any[]) => {
+        this.accountOptions = (rows || [])
+          .filter((r) => (r.status?.value || '').toLowerCase() === 'active' && Number(r.totalApprovedShares ?? 0) === 0)
+          .map((r) => ({
+            value: String(r.id),
+            label: `${r.accountNo} — ${r.clientName} (0 shares held)`,
+            searchText: `${r.accountNo} ${r.clientName}`
+          }));
+      });
+
+    if (this.requestId && this.mode === 'review') {
+      this.loadReviewRequest(this.requestId);
+    }
+  }
+
+  onAccountSelected(accountId: string): void {
+    this.selectedAccountId = accountId;
+    if (!accountId) {
+      this.account = null;
+      return;
+    }
+    this.loadingAccount = true;
+    this.sharesService
+      .getSharesAccountData(accountId, false)
+      .pipe(catchError(() => of(null)))
+      .subscribe((acc: any) => {
+        this.account = acc;
+        this.loadingAccount = false;
+      });
+  }
+
+  private loadReviewRequest(id: number): void {
+    this.closureService.getById(id).subscribe({
+      next: (req: any) => {
+        this.reviewRequest = req;
+        this.closedDate = req.closed_date ? String(req.closed_date).split('T')[0].split(' ')[0] : this.closedDate;
+        this.note = req.note ?? '';
+
+        if (req.activity_log) {
+          try {
+            this.activityLog = JSON.parse(req.activity_log);
+          } catch {
+            this.activityLog = [];
+          }
+        }
+
+        this.sharesService
+          .getSharesAccountData(String(req.share_account_id), false)
+          .pipe(catchError(() => of(null)))
+          .subscribe((acc: any) => (this.account = acc));
+      },
+      error: () => this.snackBar.open('Failed to load share closure request.', 'Close', { duration: 5000 })
+    });
+  }
+
+  /** "Review before Save" per requirement — opens the confirm dialog instead of submitting directly. */
+  openConfirmDialog(): void {
+    if (!this.isFormValid || this.submitting) {
+      return;
+    }
+    this.showConfirmDialog = true;
+  }
+
+  cancelConfirmDialog(): void {
+    this.showConfirmDialog = false;
+  }
+
+  confirmSubmit(): void {
+    this.showConfirmDialog = false;
+    this.submitting = true;
+    const payload = {
+      shareAccountId: Number(this.selectedAccountId),
+      accountNo: this.account?.accountNo,
+      clientId: this.account?.clientId,
+      clientName: this.account?.clientName,
+      closedDate: this.closedDate,
+      note: this.note
+    };
+    this.closureService.submit(payload).subscribe({
+      next: () => {
+        this.snackBar.open('Share closure request submitted for approval.', 'Close', { duration: 4000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/clerk/dashboard']);
+        }
+      },
+      error: (err) => {
+        this.submitting = false;
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not submit the request.', 'Close', {
+          duration: 6000
+        });
+      }
+    });
+  }
+
+  openValidateModal(): void {
+    if (!this.reviewRequest) return;
+    this.showValidateModal = true;
+    this.runBackendValidation();
+  }
+
+  closeValidateModal(): void {
+    if (this.validating) return;
+    this.showValidateModal = false;
+  }
+
+  /** Re-checks live backend state (shares still zero, account still active, no active loan/guarantee,
+   *  compliance standing) rather than relying on data already loaded in the browser — catches drift
+   *  since submission. Results are revealed one step at a time for the pipeline-style animation. */
+  runBackendValidation(): void {
+    if (!this.reviewRequest || this.validating) return;
+    this.validating = true;
+    this.backendChecks = null;
+    this.validateSteps = [];
+    this.closureService.validate(this.reviewRequest.id).subscribe({
+      next: (res: any) => {
+        const checks = (res?.checks ?? []) as { label: string; pass: boolean; detail: string }[];
+        this.backendChecks = checks;
+        this.validateAllPassed = !!res?.allPassed;
+        this.validateSteps = checks.map((c) => ({ ...c, status: 'pending' as const }));
+        this.revealValidateSteps(0);
+      },
+      error: (err) => {
+        this.validating = false;
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not run backend validation.', 'Close', {
+          duration: 6000
+        });
+      }
+    });
+  }
+
+  private revealValidateSteps(index: number): void {
+    if (index >= this.validateSteps.length) {
+      this.validating = false;
+      return;
+    }
+    this.validateSteps[index].status = 'active';
+    setTimeout(() => {
+      this.validateSteps[index].status = this.validateSteps[index].pass ? 'done' : 'failed';
+      this.revealValidateSteps(index + 1);
+    }, 320);
+  }
+
+  approveReview(): void {
+    if (!this.reviewRequest) return;
+    this.closureService.approve(this.reviewRequest.id).subscribe({
+      next: () => {
+        this.snackBar.open('Share closure approved — account closed.', 'Close', { duration: 6000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/checker-inbox-and-tasks/share-closure-requests']);
+        }
+      },
+      error: (err) =>
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not approve the request.', 'Close', {
+          duration: 6000
+        })
+    });
+  }
+
+  openRejectDialog(): void {
+    this.showRejectDialog = true;
+    this.rejectionReason = '';
+  }
+
+  confirmRejectReview(): void {
+    if (!this.reviewRequest || !this.rejectionReason.trim()) return;
+    this.closureService.reject(this.reviewRequest.id, this.rejectionReason.trim()).subscribe({
+      next: () => {
+        this.showRejectDialog = false;
+        this.snackBar.open('Share closure request rejected.', 'Close', { duration: 4000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/checker-inbox-and-tasks/share-closure-requests']);
+        }
+      },
+      error: (err) =>
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not reject the request.', 'Close', {
+          duration: 6000
+        })
+    });
+  }
+
+  goBack(): void {
+    if (this.embedded) {
+      this.closeRequested.emit();
+      return;
+    }
+    this.router.navigate(this.isReview ? ['/checker-inbox-and-tasks/share-closure-requests'] : ['/clerk/dashboard']);
+  }
+}

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.html

@@ -0,0 +1,431 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg">
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">{{ isReview ? 'CHECKER · APPROVAL' : 'CLERK · SHARE WITHDRAWAL' }}</div>
+      <h1 class="pg-title">{{ pageTitle }}</h1>
+      <p class="pg-sub">{{ pageSubtitle }}</p>
+    </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn" (click)="goBack()">
+        <mat-icon>arrow_back</mat-icon>
+        {{ isReview ? 'Back to Requests' : 'My Share Requests' }}
+      </button>
+    </div>
+  </header>
+
+  <div class="pg-card">
+    <div class="pos-section-label">Share Account</div>
+    <div class="inv-form-grid" style="padding: 16px">
+      @if (!isReview) {
+        <label class="inv-form-field" style="grid-column: span 2">
+          <span>* Search Account No. / Client Name</span>
+          <mifosx-search-select
+            [options]="accountOptions"
+            [(ngModel)]="selectedAccountId"
+            (ngModelChange)="onAccountSelected($event)"
+            placeholder="Search share account no. or client name…"
+          ></mifosx-search-select>
+        </label>
+      }
+      @if (account) {
+        <label class="inv-form-field">
+          <span>Account No</span>
+          <input type="text" [value]="account.accountNo" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>Client</span>
+          <input type="text" [value]="account.clientName" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>Shares Held</span>
+          <input
+            type="text"
+            [value]="account.summary?.totalApprovedShares ?? account.totalApprovedShares ?? 0"
+            readonly
+          />
+        </label>
+        <label class="inv-form-field">
+          <span>Unit Price</span>
+          <input type="text" [value]="'₹' + (unitPrice | number: '1.2-2')" readonly />
+        </label>
+      }
+      @if (loadingAccount) {
+        <div class="pg-empty">Loading account…</div>
+      }
+    </div>
+  </div>
+
+  @if (isReview && reviewRequest) {
+    <div class="pg-card">
+      <div class="pos-section-label">Client Compliance</div>
+      <div class="inv-form-grid" style="padding: 16px">
+        <div class="inv-form-field">
+          <span>KYC Status</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="reviewRequest.client_kyc_verified"
+            [class.swr-chip--warn]="!reviewRequest.client_kyc_verified"
+          >
+            {{ reviewRequest.client_kyc_status_label }}
+          </span>
+        </div>
+        <div class="inv-form-field">
+          <span>Risk Category</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="!reviewRequest.client_risk_high"
+            [class.swr-chip--warn]="reviewRequest.client_risk_high"
+          >
+            {{ reviewRequest.client_risk_category_label }}
+          </span>
+        </div>
+        <div class="inv-form-field">
+          <span>Open AML Alerts</span>
+          <span
+            class="swr-chip"
+            [class.swr-chip--ok]="!reviewRequest.client_open_aml_alerts"
+            [class.swr-chip--warn]="reviewRequest.client_open_aml_alerts > 0"
+          >
+            {{ reviewRequest.client_open_aml_alerts || 0 }}
+          </span>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (account) {
+    <div class="pg-card">
+      <div class="pos-section-label">Withdrawal Details</div>
+      <div class="inv-form-grid" style="padding: 16px">
+        <label class="inv-form-field">
+          <span>* Shares to Withdraw</span>
+          <input type="number" [(ngModel)]="requestedShares" min="1" [disabled]="isReview" />
+        </label>
+        <label class="inv-form-field">
+          <span>* Requested Date</span>
+          <input type="date" [(ngModel)]="requestedDate" [disabled]="isReview" />
+        </label>
+        <label class="inv-form-field">
+          <span>Withdrawal Value</span>
+          <input type="text" [value]="'₹' + (withdrawalValue | number: '1.2-2')" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>Remaining Shares After Withdrawal</span>
+          <input type="text" [value]="remainingShares" readonly />
+        </label>
+        <label class="inv-form-field">
+          <span>* Board Resolution Number</span>
+          <input type="text" [(ngModel)]="resolutionNumber" [disabled]="isReview" placeholder="e.g. BR-2026-014" />
+        </label>
+        <label class="inv-form-field">
+          <span>* Date of Meeting</span>
+          <input type="date" [(ngModel)]="meetingDate" [disabled]="isReview" />
+        </label>
+        <label class="inv-form-field">
+          <span>* Settlement Payment Type</span>
+          @if (!isReview) {
+            <select [(ngModel)]="settlementPaymentTypeId">
+              <option [ngValue]="null">Select…</option>
+              @for (pt of paymentTypeOptions; track pt.id) {
+                <option [ngValue]="pt.id">{{ pt.name }}</option>
+              }
+            </select>
+          } @else {
+            <input type="text" [value]="settlementPaymentTypeName" readonly />
+          }
+        </label>
+        <label class="inv-form-field" style="grid-column: span 2">
+          <span>Description / Remarks</span>
+          <input type="text" [(ngModel)]="description" [disabled]="isReview" />
+        </label>
+      </div>
+
+      @if (!isReview) {
+        <div class="inv-form-actions">
+          <button
+            type="button"
+            class="pg-btn pg-btn--primary"
+            [disabled]="!isFormValid || submitting"
+            (click)="openConfirmDialog()"
+          >
+            {{ submitting ? 'Submitting…' : 'Review &amp; Submit' }}
+          </button>
+        </div>
+      }
+    </div>
+  }
+
+  @if (isReview && reviewRequest?.status === 'PENDING') {
+    <div class="pg-card">
+      <div class="pos-section-label">Verification</div>
+      <div class="swrv-trigger">
+        <div class="swrv-trigger__icon">
+          <mat-icon>fact_check</mat-icon>
+        </div>
+        <div class="swrv-trigger__text">
+          <div class="swrv-trigger__title">Run a live backend validation</div>
+          <div class="swrv-trigger__sub">
+            Re-checks account status, share balance, linked savings account and GL mapping before you approve.
+          </div>
+        </div>
+        <button type="button" class="pg-btn pg-btn--primary" (click)="openValidateModal()">
+          <mat-icon>play_circle</mat-icon>
+          Validate Request
+        </button>
+      </div>
+
+      <div class="inv-form-actions">
+        <button type="button" class="pg-btn pg-btn--primary" (click)="approveReview()">
+          <mat-icon>check_circle</mat-icon>
+          Approve &amp; Process Withdrawal
+        </button>
+        <button type="button" class="pg-btn pg-btn--danger" (click)="openRejectDialog()">
+          <mat-icon>cancel</mat-icon>
+          Reject
+        </button>
+      </div>
+    </div>
+  }
+
+  @if (showValidateModal) {
+    <div class="swrv-modal">
+      <div class="swrv-modal__card">
+        <div class="swrv-modal__header">
+          <div class="swrv-modal__title">
+            <span class="swrv-modal__title-icon"><mat-icon>fact_check</mat-icon></span>
+            Validate Share Withdrawal Request
+          </div>
+          <button type="button" class="swrv-modal__close" [disabled]="validating" (click)="closeValidateModal()">
+            <mat-icon>close</mat-icon>
+          </button>
+        </div>
+
+        <div class="swrv-modal__body">
+          <p class="swrv-modal__intro">
+            Re-checking <strong>{{ requestedShares }} share(s)</strong> withdrawal from
+            <strong>{{ account?.accountNo }}</strong> ({{ account?.clientName }}) against the live account, savings link
+            and GL configuration — not just what was captured at submission time.
+          </p>
+
+          @if (backendChecks && !validating && !validateAllPassed) {
+            <div class="swrv-modal__warn">
+              <mat-icon>warning</mat-icon>
+              <div>
+                <strong>Some checks need review before approving.</strong>
+                Scroll down to see which ones failed and why.
+              </div>
+            </div>
+          }
+
+          <ol class="swrv-steps">
+            @for (step of validateSteps; track step.label; let i = $index) {
+              <li
+                class="swrv-step"
+                [class.swrv-step--active]="step.status === 'active'"
+                [class.swrv-step--done]="step.status === 'done'"
+                [class.swrv-step--failed]="step.status === 'failed'"
+              >
+                <div class="swrv-step__indicator">
+                  @if (step.status === 'done') {
+                    <mat-icon>check</mat-icon>
+                  } @else if (step.status === 'active') {
+                    <mat-icon class="swrv-spin">autorenew</mat-icon>
+                  } @else if (step.status === 'failed') {
+                    <mat-icon>close</mat-icon>
+                  } @else {
+                    <span>{{ i + 1 }}</span>
+                  }
+                </div>
+                <div class="swrv-step__content">
+                  <div class="swrv-step__label">{{ step.label }}</div>
+                  <div class="swrv-step__msg">{{ step.detail }}</div>
+                </div>
+              </li>
+            }
+          </ol>
+
+          @if (validating && validateSteps.length === 0) {
+            <div class="pg-empty">Connecting to server…</div>
+          }
+
+          @if (backendChecks && !validating && validateAllPassed) {
+            <div class="swrv-modal__result">
+              <mat-icon>verified</mat-icon>
+              <span>All checks passed — safe to approve.</span>
+            </div>
+          }
+        </div>
+
+        <div class="swrv-modal__footer">
+          @if (!validating && backendChecks) {
+            <button type="button" class="pg-btn" (click)="runBackendValidation()">
+              <mat-icon>refresh</mat-icon>
+              Re-run
+            </button>
+          }
+          @if (!validating && backendChecks && validateAllPassed) {
+            <button type="button" class="pg-btn pg-btn--primary" (click)="closeValidateModal(); approveReview()">
+              <mat-icon>check_circle</mat-icon>
+              Approve &amp; Process Withdrawal
+            </button>
+          }
+          <button type="button" class="pg-btn" [disabled]="validating" (click)="closeValidateModal()">
+            {{ validating ? 'Validating…' : 'Close' }}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (isReview && reviewRequest?.status === 'APPROVED') {
+    <div class="pg-card">
+      <div class="pos-section-label">Settlement</div>
+      <div class="inv-form-grid" style="padding: 16px">
+        @if (reviewRequest?.settlement_amount) {
+          <label class="inv-form-field">
+            <span>Amount Credited</span>
+            <input type="text" [value]="'₹' + (reviewRequest.settlement_amount | number: '1.2-2')" readonly />
+          </label>
+          <label class="inv-form-field">
+            <span>Credited To (Linked Savings A/C)</span>
+            <input type="text" [value]="account?.savingsAccountNumber || '—'" readonly />
+          </label>
+          <label class="inv-form-field">
+            <span>Savings Transaction Ref.</span>
+            <input type="text" [value]="reviewRequest.settlement_savings_transaction_id" readonly />
+          </label>
+        } @else {
+          <div class="pg-empty" style="grid-column: span 2">
+            Settlement is processed automatically on approval. Details aren't available when reopening an
+            already-approved request — check the linked savings account's transaction history to confirm.
+          </div>
+        }
+      </div>
+    </div>
+  }
+
+  @if (isReview && activityLog.length > 0) {
+    <div class="pg-card">
+      <div class="pos-section-label">Activity Log</div>
+      <table class="pg-table">
+        <thead>
+          <tr>
+            <th>Timestamp</th>
+            <th>Action</th>
+            <th>User</th>
+            <th>Note</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (entry of activityLog; track entry.timestamp) {
+            <tr>
+              <td>{{ entry.timestamp | date: 'medium' }}</td>
+              <td>{{ entry.action }}</td>
+              <td>{{ entry.user }}</td>
+              <td>{{ entry.note || '—' }}</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+
+  @if (showConfirmDialog) {
+    <div class="swr-modal-backdrop">
+      <div class="swr-modal">
+        <h3>Confirm Share Withdrawal Request</h3>
+        <p class="pg-sub">Review the details below before submitting for Bank Manager approval.</p>
+        <table class="pg-table">
+          <tbody>
+            <tr>
+              <td>Account No / Client</td>
+              <td>{{ account?.accountNo }} — {{ account?.clientName }}</td>
+            </tr>
+            <tr>
+              <td>Shares to Withdraw</td>
+              <td>
+                {{ requestedShares }} @ ₹{{ unitPrice | number: '1.2-2' }} = ₹{{ withdrawalValue | number: '1.2-2' }}
+              </td>
+            </tr>
+            <tr>
+              <td>Remaining Shares After Withdrawal</td>
+              <td>{{ remainingShares }}</td>
+            </tr>
+            <tr>
+              <td>Requested Date</td>
+              <td>{{ requestedDate }}</td>
+            </tr>
+            <tr>
+              <td>Board Resolution Number</td>
+              <td>{{ resolutionNumber }}</td>
+            </tr>
+            <tr>
+              <td>Date of Meeting</td>
+              <td>{{ meetingDate }}</td>
+            </tr>
+            <tr>
+              <td>Settlement Payment Type</td>
+              <td>{{ settlementPaymentTypeName }}</td>
+            </tr>
+            <tr>
+              <td>Linked Savings Account</td>
+              <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</td>
+            </tr>
+          </tbody>
+        </table>
+
+        <div class="pos-section-label" style="margin-top: 12px">Validation Checks</div>
+        <table class="pg-table">
+          <tbody>
+            @for (check of verificationChecks; track check.label) {
+              <tr>
+                <td>{{ check.label }}</td>
+                <td [class.swr-check-pass]="check.pass" [class.swr-check-fail]="!check.pass">
+                  {{ check.pass ? 'Pass — ' : 'Review — ' }}{{ check.detail }}
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+
+        <div class="inv-form-actions">
+          <button type="button" class="pg-btn pg-btn--primary" [disabled]="submitting" (click)="confirmSubmit()">
+            {{ submitting ? 'Submitting…' : 'Confirm & Submit' }}
+          </button>
+          <button type="button" class="pg-btn" (click)="cancelConfirmDialog()">Back to Edit</button>
+        </div>
+      </div>
+    </div>
+  }
+
+  @if (showRejectDialog) {
+    <div class="swr-modal-backdrop">
+      <div class="swr-modal">
+        <h3>Reject Share Withdrawal Request</h3>
+        <label class="inv-form-field">
+          <span>* Rejection Reason</span>
+          <textarea rows="3" [(ngModel)]="rejectionReason"></textarea>
+        </label>
+        <div class="inv-form-actions">
+          <button
+            type="button"
+            class="pg-btn pg-btn--danger"
+            [disabled]="!rejectionReason.trim()"
+            (click)="confirmRejectReview()"
+          >
+            Confirm Reject
+          </button>
+          <button type="button" class="pg-btn" (click)="showRejectDialog = false">Cancel</button>
+        </div>
+      </div>
+    </div>
+  }
+</div>

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.scss

@@ -0,0 +1,433 @@
+/**
+ * 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/.
+ */
+
+.swr-modal-backdrop {
+  position: fixed;
+  inset: 0;
+  background: rgb(13 27 42 / 55%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+
+.swr-modal {
+  background: #fff;
+  border-radius: 12px;
+  padding: 20px;
+  width: 420px;
+  max-width: 90vw;
+  max-height: 85vh;
+  overflow-y: auto;
+  box-shadow: 0 12px 32px rgb(15 23 42 / 20%);
+
+  h3 {
+    margin: 0 0 12px;
+    font-size: 16px;
+    color: #0d1b2a;
+  }
+
+  textarea {
+    width: 100%;
+    padding: 8px 10px;
+    border: 1px solid #e2e8f0;
+    border-radius: 8px;
+    font-family: inherit;
+    font-size: 13px;
+    resize: vertical;
+    box-sizing: border-box;
+  }
+
+  &:has(table) {
+    width: 560px;
+  }
+}
+
+.swr-check-pass {
+  color: #1a7f37;
+  font-weight: 600;
+}
+
+.swr-check-fail {
+  color: #b42318;
+  font-weight: 600;
+}
+
+.swr-chip {
+  display: inline-flex;
+  align-items: center;
+  width: fit-content;
+  padding: 4px 10px;
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 600;
+
+  &--ok {
+    background: #eafaf0;
+    color: #1a7f37;
+  }
+
+  &--warn {
+    background: #fdecea;
+    color: #b42318;
+  }
+}
+
+/* ---------- Verification trigger card ---------- */
+.swrv-trigger {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  padding: 16px;
+  flex-wrap: wrap;
+
+  &__icon {
+    width: 42px;
+    height: 42px;
+    border-radius: 12px;
+    background: linear-gradient(135deg, #3457d5, #6c8cff);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    box-shadow: 0 4px 12px rgb(52 87 213 / 30%);
+  }
+
+  &__text {
+    flex: 1;
+    min-width: 200px;
+  }
+
+  &__title {
+    font-size: 13px;
+    font-weight: 700;
+    color: #0d1b2a;
+  }
+
+  &__sub {
+    font-size: 12px;
+    color: #64748b;
+    margin-top: 2px;
+    line-height: 1.4;
+  }
+}
+
+/* ---------- Validate pipeline modal ---------- */
+@keyframes swrv-fade {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+
+@keyframes swrv-zoom {
+  from {
+    opacity: 0;
+    transform: scale(0.95) translateY(8px);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale(1) translateY(0);
+  }
+}
+
+@keyframes swrv-spin {
+  from {
+    transform: rotate(0deg);
+  }
+
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.swrv-spin {
+  animation: swrv-spin 0.9s linear infinite;
+}
+
+.swrv-modal {
+  position: fixed;
+  inset: 0;
+  // No backdrop-filter: it would make this element a containing block for any position:fixed
+  // descendant (e.g. if this modal is ever nested inside another fixed popup, or gains one of its
+  // own later) — see the identical fix in share-withdrawal-requests.component.scss for the bug this
+  // caused. Extra opacity compensates for the loss of the blur look.
+  background: rgb(15 25 45 / 65%);
+  z-index: 1200;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px;
+  animation: swrv-fade 0.2s ease-out;
+
+  &__card {
+    background: #fff;
+    border-radius: 16px;
+    width: 100%;
+    max-width: 520px;
+    max-height: 90vh;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    box-shadow: 0 24px 60px rgb(0 0 0 / 25%);
+    animation: swrv-zoom 0.25s ease-out;
+  }
+
+  &__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 18px 22px;
+    border-bottom: 1px solid #eef1f5;
+  }
+
+  &__title {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    font-size: 15px;
+    font-weight: 700;
+    color: #0d1b2a;
+  }
+
+  &__title-icon {
+    width: 34px;
+    height: 34px;
+    border-radius: 10px;
+    background: linear-gradient(135deg, #3457d5, #6c8cff);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+  }
+
+  &__close {
+    width: 32px;
+    height: 32px;
+    border-radius: 8px;
+    border: 1px solid #e2e8f0;
+    background: #fff;
+    color: #64748b;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.12s;
+
+    &:not(:disabled):hover {
+      color: #b42318;
+      border-color: #b42318;
+      background: #fdecea;
+    }
+
+    &:disabled {
+      opacity: 0.4;
+      cursor: not-allowed;
+    }
+  }
+
+  &__body {
+    padding: 20px 22px;
+    overflow-y: auto;
+    flex: 1;
+  }
+
+  &__intro {
+    font-size: 13px;
+    color: #475569;
+    line-height: 1.55;
+    margin: 0 0 16px;
+
+    strong {
+      color: #0d1b2a;
+      font-weight: 700;
+    }
+  }
+
+  &__warn {
+    display: flex;
+    gap: 10px;
+    padding: 12px 14px;
+    background: #fef3e2;
+    border: 1px solid rgb(217 119 6 / 30%);
+    border-left: 3px solid #d97706;
+    border-radius: 8px;
+    margin-bottom: 16px;
+    font-size: 12px;
+    color: #633806;
+    line-height: 1.5;
+
+    mat-icon {
+      color: #d97706;
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+      flex-shrink: 0;
+    }
+
+    strong {
+      display: block;
+      font-weight: 700;
+      color: #4d2a05;
+    }
+  }
+
+  &__result {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 6px;
+    padding: 12px 14px;
+    background: #eafaf0;
+    border: 1px solid rgb(26 127 55 / 25%);
+    border-radius: 8px;
+    font-size: 13px;
+    font-weight: 600;
+    color: #1a7f37;
+
+    mat-icon {
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+    }
+  }
+
+  &__footer {
+    padding: 16px 22px;
+    border-top: 1px solid #eef1f5;
+    display: flex;
+    justify-content: flex-end;
+    gap: 10px;
+    background: #f8fafc;
+  }
+}
+
+.swrv-steps {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  flex-direction: column;
+}
+
+.swrv-step {
+  display: flex;
+  gap: 14px;
+  padding: 10px 0;
+  position: relative;
+
+  &:not(:last-child)::after {
+    content: '';
+    position: absolute;
+    left: 15px;
+    top: 38px;
+    bottom: -4px;
+    width: 2px;
+    background: #e2e8f0;
+  }
+
+  &__indicator {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    background: #fff;
+    border: 2px solid #e2e8f0;
+    color: #64748b;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    font-weight: 700;
+    flex-shrink: 0;
+    position: relative;
+    z-index: 1;
+    transition: all 0.25s;
+
+    mat-icon {
+      font-size: 16px;
+      width: 16px;
+      height: 16px;
+    }
+  }
+
+  &__content {
+    padding-top: 5px;
+    flex: 1;
+    min-width: 0;
+  }
+
+  &__label {
+    font-size: 13px;
+    font-weight: 600;
+    color: #475569;
+  }
+
+  &__msg {
+    font-size: 11px;
+    color: #94a3b8;
+    margin-top: 2px;
+  }
+
+  &--active {
+    .swrv-step__indicator {
+      background: #3457d5;
+      border-color: #3457d5;
+      color: #fff;
+      box-shadow: 0 0 0 4px rgb(52 87 213 / 15%);
+    }
+
+    .swrv-step__label {
+      color: #3457d5;
+    }
+  }
+
+  &--done {
+    .swrv-step__indicator {
+      background: #1a7f37;
+      border-color: #1a7f37;
+      color: #fff;
+    }
+
+    &::after {
+      background: #1a7f37;
+    }
+
+    .swrv-step__label {
+      color: #0d1b2a;
+    }
+  }
+
+  &--failed {
+    .swrv-step__indicator {
+      background: #b42318;
+      border-color: #b42318;
+      color: #fff;
+    }
+
+    .swrv-step__label {
+      color: #b42318;
+    }
+  }
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .swrv-spin {
+    animation: none;
+  }
+
+  .swrv-modal,
+  .swrv-modal__card {
+    animation: none;
+  }
+}

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.ts

@@ -0,0 +1,416 @@
+/**
+ * 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, OnInit, Output, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { ActivatedRoute, Router, RouterModule } from '@angular/router';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
+import { catchError } from 'rxjs/operators';
+import { of } from 'rxjs';
+
+import { SharesService } from '../../shares/shares.service';
+import { ClerkShareWithdrawalService } from '../../cashier/clerk-share-withdrawal.service';
+import { CashierService } from '../../cashier/cashier.service';
+import { SearchSelectComponent, SearchSelectOption } from '../../shared/search-select/search-select.component';
+
+export type ShareWdMode = 'create' | 'review';
+
+interface ActivityEntry {
+  timestamp: string;
+  action: string;
+  user: string;
+  note?: string;
+}
+
+/**
+ * Share Withdrawal (redeem shares) request — maker screen in the Clerk Dashboard. A clerk finds
+ * the member's Share Account, enters how many shares to withdraw plus the governing Board
+ * Resolution Number / Date of Meeting, and submits for Bank Manager approval. This is the ONLY
+ * entry point a share withdrawal should go through — approval server-side executes the real
+ * "redeemshares" command (see ClerkShareWithdrawalRequestApiResource on the backend).
+ */
+@Component({
+  selector: 'mifosx-share-withdrawal-request',
+  templateUrl: './share-withdrawal-request.component.html',
+  styleUrls: [
+    '../../cashier/cashier-shared.scss',
+    '../clerk-shared.scss',
+    './share-withdrawal-request.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    MatIconModule,
+    MatSnackBarModule,
+    SearchSelectComponent
+  ]
+})
+export class ShareWithdrawalRequestComponent implements OnInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private sharesService = inject(SharesService);
+  private wdService = inject(ClerkShareWithdrawalService);
+  private cashierService = inject(CashierService);
+  private snackBar = inject(MatSnackBar);
+
+  /** When embedded (e.g. opened as a popup from a list screen instead of routed to directly), mode
+   *  and requestId come from these inputs rather than the route, and success/close actions emit
+   *  events instead of navigating away. */
+  @Input() embedded = false;
+  @Input() overrideMode: ShareWdMode | null = null;
+  @Input() overrideRequestId: number | null = null;
+  @Output() closeRequested = new EventEmitter<void>();
+  @Output() actionCompleted = new EventEmitter<void>();
+
+  mode: ShareWdMode = 'create';
+  requestId: number | null = null;
+
+  submitting = false;
+  loadingAccount = false;
+
+  selectedAccountId = '';
+  accountOptions: SearchSelectOption[] = [];
+
+  account: any = null;
+
+  requestedShares: number | null = null;
+  requestedDate = '';
+  resolutionNumber = '';
+  meetingDate = '';
+  description = '';
+
+  paymentTypes: any[] = [];
+  settlementPaymentTypeId: number | null = null;
+
+  activityLog: ActivityEntry[] = [];
+  reviewRequest: any = null;
+  showRejectDialog = false;
+  rejectionReason = '';
+  showConfirmDialog = false;
+
+  showValidateModal = false;
+  validating = false;
+  validateAllPassed = false;
+  backendChecks: { label: string; pass: boolean; detail: string }[] | null = null;
+  validateSteps: { label: string; detail: string; pass: boolean; status: 'pending' | 'active' | 'done' | 'failed' }[] =
+    [];
+
+  get remainingShares(): number {
+    const held = Number(this.account?.summary?.totalApprovedShares ?? this.account?.totalApprovedShares ?? 0);
+    return held - (this.requestedShares || 0);
+  }
+
+  get unitPrice(): number {
+    return Number(this.account?.currentMarketPrice ?? 0);
+  }
+
+  get withdrawalValue(): number {
+    return (this.requestedShares || 0) * this.unitPrice;
+  }
+
+  get paymentTypeOptions(): any[] {
+    return this.paymentTypes.filter((pt: any) => !pt.isCashPayment);
+  }
+
+  get selectedSettlementPaymentType(): any {
+    return this.paymentTypes.find((pt: any) => pt.id === this.settlementPaymentTypeId);
+  }
+
+  get settlementPaymentTypeName(): string {
+    if (this.isReview) {
+      return this.reviewRequest?.settlement_payment_type_name || '—';
+    }
+    return this.selectedSettlementPaymentType?.name || '—';
+  }
+
+  get isFormValid(): boolean {
+    if (!this.account) return false;
+    if (!this.requestedShares || this.requestedShares <= 0) return false;
+    const held = Number(this.account?.summary?.totalApprovedShares ?? this.account?.totalApprovedShares ?? 0);
+    if (this.requestedShares > held) return false;
+    if (!this.requestedDate) return false;
+    if (!this.resolutionNumber.trim()) return false;
+    if (!this.meetingDate) return false;
+    if (!this.settlementPaymentTypeId) return false;
+    return true;
+  }
+
+  /** Shown to the clerk before submit and to the manager before approval, so both can verify the same checks. */
+  get verificationChecks(): { label: string; pass: boolean; detail: string }[] {
+    const held = Number(this.account?.summary?.totalApprovedShares ?? this.account?.totalApprovedShares ?? 0);
+    const shares = this.requestedShares || 0;
+    return [
+      {
+        label: 'Board Resolution Number provided',
+        pass: !!this.resolutionNumber?.trim(),
+        detail: this.resolutionNumber?.trim() || 'Missing'
+      },
+      { label: 'Date of Meeting provided', pass: !!this.meetingDate, detail: this.meetingDate || 'Missing' },
+      {
+        label: 'Shares requested within shares held',
+        pass: shares > 0 && shares <= held,
+        detail: `${shares} of ${held} shares held`
+      },
+      {
+        label: 'Linked savings account confirmed',
+        pass: !!this.account?.savingsAccountNumber,
+        detail: this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
+      },
+      {
+        label: 'Settlement Payment Type selected (non-cash)',
+        pass: this.settlementPaymentTypeName !== '—',
+        detail: this.settlementPaymentTypeName
+      }
+    ];
+  }
+
+  get isReview(): boolean {
+    return this.mode === 'review';
+  }
+
+  get pageTitle(): string {
+    return this.isReview ? 'Review Share Withdrawal Request' : 'New Share Withdrawal Request';
+  }
+
+  get pageSubtitle(): string {
+    return this.isReview
+      ? "Approve or reject the clerk's share withdrawal request."
+      : 'Submit a share withdrawal (redeem shares) request for Bank Manager approval.';
+  }
+
+  ngOnInit(): void {
+    this.mode = this.overrideMode ?? (this.route.snapshot.data?.['mode'] as ShareWdMode) ?? 'create';
+    const idParam = this.overrideRequestId ?? this.route.snapshot.params?.['id'];
+    this.requestId = idParam ? Number(idParam) : null;
+
+    const today = new Date();
+    this.requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
+    this.meetingDate = this.requestedDate;
+
+    this.sharesService
+      .getShareAccountSummaries()
+      .pipe(catchError(() => of([])))
+      .subscribe((rows: any[]) => {
+        this.accountOptions = (rows || [])
+          .filter((r) => (r.status?.value || '').toLowerCase() === 'active')
+          .map((r) => ({
+            value: String(r.id),
+            label: `${r.accountNo} — ${r.clientName} (${r.totalApprovedShares} shares)`,
+            searchText: `${r.accountNo} ${r.clientName}`
+          }));
+      });
+
+    this.cashierService
+      .getPaymentTypes()
+      .pipe(catchError(() => of([])))
+      .subscribe((types: any[]) => (this.paymentTypes = types ?? []));
+
+    if (this.requestId && this.mode === 'review') {
+      this.loadReviewRequest(this.requestId);
+    }
+  }
+
+  onAccountSelected(accountId: string): void {
+    this.selectedAccountId = accountId;
+    if (!accountId) {
+      this.account = null;
+      return;
+    }
+    this.loadingAccount = true;
+    this.sharesService
+      .getSharesAccountData(accountId, false)
+      .pipe(catchError(() => of(null)))
+      .subscribe((acc: any) => {
+        this.account = acc;
+        this.loadingAccount = false;
+      });
+  }
+
+  private loadReviewRequest(id: number): void {
+    this.wdService.getById(id).subscribe({
+      next: (req: any) => {
+        this.reviewRequest = req;
+        this.requestedShares = Number(req.requested_shares);
+        this.requestedDate = req.requested_date
+          ? String(req.requested_date).split('T')[0].split(' ')[0]
+          : this.requestedDate;
+        this.resolutionNumber = req.resolution_number ?? '';
+        this.meetingDate = req.meeting_date ? String(req.meeting_date).split('T')[0].split(' ')[0] : this.meetingDate;
+        this.description = req.description ?? '';
+
+        if (req.activity_log) {
+          try {
+            this.activityLog = JSON.parse(req.activity_log);
+          } catch {
+            this.activityLog = [];
+          }
+        }
+
+        this.sharesService
+          .getSharesAccountData(String(req.share_account_id), false)
+          .pipe(catchError(() => of(null)))
+          .subscribe((acc: any) => (this.account = acc));
+      },
+      error: () => this.snackBar.open('Failed to load share withdrawal request.', 'Close', { duration: 5000 })
+    });
+  }
+
+  /** "Review before Save" per requirement — opens the confirm dialog instead of submitting directly. */
+  openConfirmDialog(): void {
+    if (!this.isFormValid || this.submitting) {
+      return;
+    }
+    this.showConfirmDialog = true;
+  }
+
+  cancelConfirmDialog(): void {
+    this.showConfirmDialog = false;
+  }
+
+  confirmSubmit(): void {
+    this.showConfirmDialog = false;
+    this.submitting = true;
+    const payload = {
+      shareAccountId: Number(this.selectedAccountId),
+      accountNo: this.account?.accountNo,
+      clientId: this.account?.clientId,
+      clientName: this.account?.clientName,
+      requestedShares: this.requestedShares,
+      requestedDate: this.requestedDate,
+      resolutionNumber: this.resolutionNumber.trim(),
+      meetingDate: this.meetingDate,
+      description: this.description,
+      settlementPaymentTypeId: this.settlementPaymentTypeId
+    };
+    this.wdService.submit(payload).subscribe({
+      next: () => {
+        this.snackBar.open('Share withdrawal request submitted for approval.', 'Close', { duration: 4000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/clerk/dashboard']);
+        }
+      },
+      error: (err) => {
+        this.submitting = false;
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not submit the request.', 'Close', {
+          duration: 6000
+        });
+      }
+    });
+  }
+
+  openValidateModal(): void {
+    if (!this.reviewRequest) return;
+    this.showValidateModal = true;
+    this.runBackendValidation();
+  }
+
+  closeValidateModal(): void {
+    if (this.validating) return;
+    this.showValidateModal = false;
+  }
+
+  /** Re-checks live backend state (account still active, GL mapping still configured, etc.) rather
+   *  than relying on data already loaded in the browser — catches drift since submission. Results
+   *  are revealed one step at a time (see revealValidateSteps()) for the pipeline-style animation. */
+  runBackendValidation(): void {
+    if (!this.reviewRequest || this.validating) return;
+    this.validating = true;
+    this.backendChecks = null;
+    this.validateSteps = [];
+    this.wdService.validate(this.reviewRequest.id).subscribe({
+      next: (res: any) => {
+        const checks = (res?.checks ?? []) as { label: string; pass: boolean; detail: string }[];
+        this.backendChecks = checks;
+        this.validateAllPassed = !!res?.allPassed;
+        this.validateSteps = checks.map((c) => ({ ...c, status: 'pending' as const }));
+        this.revealValidateSteps(0);
+      },
+      error: (err) => {
+        this.validating = false;
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not run backend validation.', 'Close', {
+          duration: 6000
+        });
+      }
+    });
+  }
+
+  private revealValidateSteps(index: number): void {
+    if (index >= this.validateSteps.length) {
+      this.validating = false;
+      return;
+    }
+    this.validateSteps[index].status = 'active';
+    setTimeout(() => {
+      this.validateSteps[index].status = this.validateSteps[index].pass ? 'done' : 'failed';
+      this.revealValidateSteps(index + 1);
+    }, 320);
+  }
+
+  approveReview(): void {
+    if (!this.reviewRequest) return;
+    this.wdService.approve(this.reviewRequest.id).subscribe({
+      next: (res: any) => {
+        let message =
+          res?.settlementAmount != null
+            ? `Share withdrawal approved. ₹${Number(res.settlementAmount).toLocaleString('en-IN', { minimumFractionDigits: 2 })} credited to the linked savings account.`
+            : (res?.settlementWarning ?? 'Share withdrawal approved and processed.');
+        if (res?.autoClosureRequestId) {
+          message += ' All shares now withdrawn — a Share Closure Request was auto-submitted for manager review.';
+        }
+        this.snackBar.open(message, 'Close', { duration: 8000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/checker-inbox-and-tasks/share-withdrawal-requests']);
+        }
+      },
+      error: (err) =>
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not approve the request.', 'Close', {
+          duration: 6000
+        })
+    });
+  }
+
+  openRejectDialog(): void {
+    this.showRejectDialog = true;
+    this.rejectionReason = '';
+  }
+
+  confirmRejectReview(): void {
+    if (!this.reviewRequest || !this.rejectionReason.trim()) return;
+    this.wdService.reject(this.reviewRequest.id, this.rejectionReason.trim()).subscribe({
+      next: () => {
+        this.showRejectDialog = false;
+        this.snackBar.open('Share withdrawal request rejected.', 'Close', { duration: 4000 });
+        if (this.embedded) {
+          this.actionCompleted.emit();
+        } else {
+          this.router.navigate(['/checker-inbox-and-tasks/share-withdrawal-requests']);
+        }
+      },
+      error: (err) =>
+        this.snackBar.open(err?.error?.defaultUserMessage || 'Could not reject the request.', 'Close', {
+          duration: 6000
+        })
+    });
+  }
+
+  goBack(): void {
+    if (this.embedded) {
+      this.closeRequested.emit();
+      return;
+    }
+    this.router.navigate(this.isReview ? ['/checker-inbox-and-tasks/share-withdrawal-requests'] : ['/clerk/dashboard']);
+  }
+}

src/app/clients/client-stepper/client-family-members-step/client-family-member-child-dialog/client-family-member-child-dialog.component.html

@@ -0,0 +1,110 @@
+<!--
+  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="fm-dialog">
+  <div class="fm-dialog__header" style="display: flex; align-items: center; gap: 8px">
+    <mat-icon class="fm-dialog__icon">people</mat-icon>
+    <span style="font-weight: 500; font-size: 18px">CHILDREN</span>
+  </div>
+
+  <mat-dialog-content>
+    <form [formGroup]="childrenForm">
+      <div formArrayName="children" style="margin-top: 12px; background: #fff; padding: 12px">
+        @for (child of children.controls; track $index) {
+          <div
+            [formGroupName]="$index"
+            style="
+              position: relative;
+              padding: 24px 16px 16px;
+              margin-top: 16px;
+              margin-bottom: 24px;
+              border: 1px solid #e0e0e0;
+              border-radius: 8px;
+              background: #fff;
+            "
+          >
+            <div class="fm-grid">
+              <mat-form-field appearance="outline">
+                <mat-label>Child Full Name*</mat-label>
+                <input matInput formControlName="fullName" required placeholder="Child Full Name*" />
+              </mat-form-field>
+              <mat-form-field appearance="outline">
+                <mat-label>Gender*</mat-label>
+                <mat-select formControlName="genderId" required>
+                  @for (g of genderIdOptions; track g.id) {
+                    <mat-option [value]="g.id">{{ g.name }}</mat-option>
+                  }
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field appearance="outline" (click)="childDobPicker.open()">
+                <mat-label>Date of Birth</mat-label>
+                <input matInput [max]="maxDate" [matDatepicker]="childDobPicker" formControlName="dateOfBirth" />
+                <mat-datepicker-toggle matSuffix [for]="childDobPicker"></mat-datepicker-toggle>
+                <mat-datepicker #childDobPicker></mat-datepicker>
+              </mat-form-field>
+              <mat-form-field appearance="outline">
+                <mat-label>Nationality</mat-label>
+                <mat-select formControlName="nationality">
+                  <mat-option value="INDIAN">Indian</mat-option>
+                  <mat-option value="NRI">NRI</mat-option>
+                  <mat-option value="FOREIGN_NATIONAL">Foreign National</mat-option>
+                  <mat-option value="OTHER">Other</mat-option>
+                </mat-select>
+              </mat-form-field>
+              <mat-form-field appearance="outline">
+                <mat-label>Aadhaar Number (Optional)</mat-label>
+                <input
+                  matInput
+                  formControlName="aadhaarNumber"
+                  maxlength="12"
+                  placeholder="12-digit Aadhaar"
+                  (keypress)="$event.charCode >= 48 && $event.charCode <= 57 ? true : $event.preventDefault()"
+                />
+              </mat-form-field>
+              <mat-form-field appearance="outline">
+                <mat-label>PAN Number (Optional)</mat-label>
+                <input
+                  matInput
+                  formControlName="panNumber"
+                  maxlength="10"
+                  placeholder="ABCDE1234F"
+                  style="text-transform: uppercase"
+                  (input)="
+                    $any(children.at($index))
+                      .get('panNumber')
+                      ?.setValue($any($event.target).value.toUpperCase(), { emitEvent: false })
+                  "
+                />
+                @if (
+                  $any(children.at($index)).get('panNumber')?.hasError('pattern') &&
+                  $any(children.at($index)).get('panNumber')?.touched
+                ) {
+                  <mat-error>Invalid PAN format</mat-error>
+                }
+              </mat-form-field>
+            </div>
+          </div>
+          @if ($index < children.controls.length - 1) {
+            <div style="border-bottom: 1px dashed #ccc; margin-bottom: 16px"></div>
+          }
+        }
+        <div style="border-bottom: 1px dashed #ccc; margin-bottom: 16px"></div>
+        <button mat-stroked-button type="button" color="primary" (click)="addChild()">
+          <mat-icon>add</mat-icon> Add Another Child
+        </button>
+      </div>
+    </form>
+  </mat-dialog-content>
+
+  <mat-dialog-actions align="end">
+    <button mat-stroked-button mat-dialog-close type="button">Cancel</button>
+    <button mat-flat-button color="primary" type="button" [disabled]="childrenForm.invalid" (click)="submit()">
+      Add Member
+    </button>
+  </mat-dialog-actions>
+</div>

src/app/clients/client-stepper/client-family-members-step/client-family-member-child-dialog/client-family-member-child-dialog.component.ts

@@ -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/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { UntypedFormBuilder, UntypedFormGroup, UntypedFormArray, Validators } from '@angular/forms';
+
+import { MatIcon } from '@angular/material/icon';
+import { MatButtonModule } from '@angular/material/button';
+import { MatInputModule } from '@angular/material/input';
+import { MatSelectModule } from '@angular/material/select';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { ReactiveFormsModule } from '@angular/forms';
+import { CommonModule } from '@angular/common';
+
+@Component({
+  selector: 'mifosx-client-family-member-child-dialog',
+  templateUrl: './client-family-member-child-dialog.component.html',
+  styleUrls: ['../client-family-member-dialog/client-family-member-dialog.component.scss'],
+  standalone: true,
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    MatDialogModule,
+    MatIcon,
+    MatButtonModule,
+    MatInputModule,
+    MatSelectModule,
+    MatDatepickerModule,
+    MatTooltipModule
+  ]
+})
+export class ClientFamilyMemberChildDialogComponent implements OnInit {
+  dialogRef = inject(MatDialogRef<ClientFamilyMemberChildDialogComponent>);
+  data = inject(MAT_DIALOG_DATA);
+  private formBuilder = inject(UntypedFormBuilder);
+
+  childrenForm: UntypedFormGroup;
+  genderIdOptions: any[];
+  maxDate: Date = new Date();
+
+  constructor() {
+    this.genderIdOptions = this.data.genderIdOptions;
+
+    this.childrenForm = this.formBuilder.group({
+      children: this.formBuilder.array([])
+    });
+  }
+
+  ngOnInit() {
+    if (this.data.children && this.data.children.length > 0) {
+      this.data.children.forEach((child: any) => {
+        this.children.push(
+          this.formBuilder.group({
+            id: [child.id],
+            fullName: [
+              child.fullName,
+              Validators.required
+            ],
+            genderId: [
+              child.genderId,
+              Validators.required
+            ],
+            dateOfBirth: [child.dateOfBirth ? new Date(child.dateOfBirth) : ''],
+            nationality: [child.nationality || 'INDIAN'],
+            aadhaarNumber: [child.aadhaarNumber || ''],
+            panNumber: [
+              child.panNumber || '',
+              Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)
+            ]
+          })
+        );
+      });
+    } else {
+      this.addChild();
+    }
+  }
+
+  get children(): UntypedFormArray {
+    return this.childrenForm.get('children') as UntypedFormArray;
+  }
+
+  createChildFormGroup(): UntypedFormGroup {
+    return this.formBuilder.group({
+      id: [''],
+      fullName: [
+        '',
+        Validators.required
+      ],
+      genderId: [
+        '',
+        Validators.required
+      ],
+      dateOfBirth: [''],
+      nationality: ['INDIAN'],
+      aadhaarNumber: [''],
+      panNumber: [
+        '',
+        Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)
+      ]
+    });
+  }
+
+  addChild(): void {
+    this.children.push(this.createChildFormGroup());
+  }
+
+  removeChild(index: number): void {
+    this.children.removeAt(index);
+  }
+
+  submit(): void {
+    if (this.childrenForm.valid) {
+      this.dialogRef.close(this.children.value);
+    }
+  }
+}

src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.html

@@ -139,6 +139,21 @@
             <span class="fm-readonly-value">{{ familyMemberForm.get('remarks')?.value }}</span>
           </div>
         }
+        @if (isSpouse && familyMemberForm.get('children')?.value?.length > 0) {
+          <div class="fm-readonly-remarks">
+            <span class="fm-readonly-label">Children</span>
+            <div class="fm-children-list">
+              @for (child of familyMemberForm.get('children')?.value; track $index) {
+                <div class="fm-child-item" style="font-size: 13px; color: #555; margin-top: 4px">
+                  <span>{{ child.fullName }}</span>
+                  @if (child.dateOfBirth) {
+                    <span> · DOB: {{ child.dateOfBirth | date: 'dd MMM yyyy' }}</span>
+                  }
+                </div>
+              }
+            </div>
+          </div>
+        }
       }
 
       <!-- ═══ ADD / EDIT MODE ═══ -->
@@ -447,6 +462,25 @@
           <mat-label>Remarks</mat-label>
           <textarea matInput formControlName="remarks" rows="2"></textarea>
         </mat-form-field>
+
+        <!-- Children Section -->
+        @if (isSpouse) {
+          <div class="fm-section-label" style="margin-top: 16px">Children</div>
+          <div class="fm-checkbox-row" style="display: flex; align-items: center; justify-content: space-between">
+            <mat-checkbox formControlName="hasChildren">Does this family member have a child/children?</mat-checkbox>
+            @if (familyMemberForm.get('hasChildren')?.value) {
+              <button
+                mat-stroked-button
+                type="button"
+                color="primary"
+                (click)="openChildrenDialog()"
+                style="margin-left: 16px"
+              >
+                <mat-icon>edit</mat-icon> Edit Children Details ({{ children.length }})
+              </button>
+            }
+          </div>
+        }
       }
     </form>
   </mat-dialog-content>

src/app/clients/client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component.ts

@@ -17,7 +17,7 @@ import {
   MatDialogClose,
   MatDialogContent
 } from '@angular/material/dialog';
-import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, UntypedFormArray, Validators } from '@angular/forms';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { ClientsService } from 'app/clients/clients.service';
@@ -58,6 +58,8 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
   private dialog = inject(MatDialog);
 
   maxDate = new Date();
+
+  hasChildrenChecked = false;
   familyMemberForm: UntypedFormGroup;
 
   /** Client search */
@@ -197,6 +199,32 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
         // Re-fetch linked client details (profile, signature, KYC status)
         this.fetchLinkedClientData(m.linkedClientId.toString());
       }
+      if (m.children && m.children.length > 0) {
+        this.hasChildrenChecked = true;
+        this.familyMemberForm.patchValue({ hasChildren: true });
+        m.children.forEach((child: any) => {
+          this.children.push(
+            this.formBuilder.group({
+              id: [child.id],
+              fullName: [
+                child.fullName,
+                Validators.required
+              ],
+              genderId: [
+                child.genderId,
+                Validators.required
+              ],
+              dateOfBirth: [child.dateOfBirth ? new Date(child.dateOfBirth) : ''],
+              nationality: [child.nationality || 'INDIAN'],
+              aadhaarNumber: [child.aadhaarNumber || ''],
+              panNumber: [
+                child.panNumber || '',
+                Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)
+              ]
+            })
+          );
+        });
+      }
       if (this.isViewMode) {
         this.familyMemberForm.disable();
       }
@@ -225,8 +253,102 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
       isAlive: [true],
       marriageDate: [''],
       marriageAuthority: [''],
-      linkedClientId: ['']
+      linkedClientId: [''],
+      hasChildren: [false],
+      children: this.formBuilder.array([])
     });
+
+    this.familyMemberForm.get('hasChildren')?.valueChanges.subscribe((value) => {
+      if (value && !this.hasChildrenChecked) {
+        this.openChildrenDialog();
+      } else if (!value) {
+        this.hasChildrenChecked = false;
+        this.children.clear();
+      }
+    });
+  }
+
+  get children(): UntypedFormArray {
+    return this.familyMemberForm.get('children') as UntypedFormArray;
+  }
+
+  async openChildrenDialog() {
+    // Dynamically import the dialog to avoid a circular dependency between the two dialogs.
+    const { ClientFamilyMemberChildDialogComponent } =
+      await import('../client-family-member-child-dialog/client-family-member-child-dialog.component');
+
+    const dialogRef = this.dialog.open(ClientFamilyMemberChildDialogComponent, {
+      data: {
+        children: this.children.value,
+        genderIdOptions: this.data.options.genderIdOptions
+      },
+      width: '500px'
+    });
+
+    dialogRef.afterClosed().subscribe((result: any[]) => {
+      if (result) {
+        this.children.clear();
+        result.forEach((child) => {
+          this.children.push(
+            this.formBuilder.group({
+              id: [child.id],
+              fullName: [
+                child.fullName,
+                Validators.required
+              ],
+              genderId: [
+                child.genderId,
+                Validators.required
+              ],
+              dateOfBirth: [child.dateOfBirth],
+              nationality: [child.nationality || 'INDIAN'],
+              aadhaarNumber: [child.aadhaarNumber || ''],
+              panNumber: [
+                child.panNumber || '',
+                Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)
+              ]
+            })
+          );
+        });
+        this.hasChildrenChecked = true;
+        this.familyMemberForm.patchValue({ hasChildren: true }, { emitEvent: false });
+      } else if (this.children.length === 0) {
+        this.hasChildrenChecked = false;
+        this.familyMemberForm.patchValue({ hasChildren: false }, { emitEvent: false });
+      }
+    });
+  }
+
+  createChildFormGroup(): UntypedFormGroup {
+    return this.formBuilder.group({
+      id: [''],
+      fullName: [
+        '',
+        Validators.required
+      ],
+      genderId: [
+        '',
+        Validators.required
+      ],
+      dateOfBirth: [''],
+      nationality: ['INDIAN'],
+      aadhaarNumber: [''],
+      panNumber: [
+        '',
+        Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)
+      ]
+    });
+  }
+
+  addChild(): void {
+    this.children.push(this.createChildFormGroup());
+  }
+
+  removeChild(index: number): void {
+    this.children.removeAt(index);
+    if (this.children.length === 0) {
+      this.familyMemberForm.patchValue({ hasChildren: false });
+    }
   }
 
   /** Handle marriage certificate file selection */
@@ -481,6 +603,25 @@ export class ClientFamilyMemberDialogComponent implements OnInit {
       member._linkedClient = this.selectedClient;
     }
 
+    // Format children dates
+    if (this.isSpouse && member.children && member.children.length > 0) {
+      member.children = member.children.map((child: any) => {
+        const c = { ...child };
+        if (c.dateOfBirth instanceof Date) {
+          c.dateOfBirth = this.dateUtils.formatDate(c.dateOfBirth, dateFormat);
+        } else if (!c.dateOfBirth) {
+          delete c.dateOfBirth;
+        }
+        if (c.panNumber) {
+          c.panNumber = c.panNumber.toUpperCase();
+        }
+        return c;
+      });
+    } else {
+      delete member.children;
+    }
+    delete member.hasChildren;
+
     // Attach marriage certificate file if present
     if (this.marriageCertFile) {
       member._marriageCertFile = this.marriageCertFile;

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

@@ -966,6 +966,38 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
 
     this.linkMonthlyAnnual('monthlyIncome', 'annualIncome');
     this.linkMonthlyAnnual('monthlyTurnover', 'annualTurnover');
+    this.linkIncomeToTurnover();
+  }
+
+  /**
+   * Auto-calculates turnover based on income (doubling monthly income for monthly turnover,
+   * and annual income for annual/yearly turnover).
+   */
+  private linkIncomeToTurnover(): void {
+    const monthlyIncome = this.createClientForm.get('monthlyIncome');
+    const monthlyTurnover = this.createClientForm.get('monthlyTurnover');
+    const annualIncome = this.createClientForm.get('annualIncome');
+    const annualTurnover = this.createClientForm.get('annualTurnover');
+
+    if (monthlyIncome && monthlyTurnover) {
+      monthlyIncome.valueChanges.subscribe((value) => {
+        if (this.suppressMonthlyAnnualLink) {
+          return;
+        }
+        const num = parseFloat(value);
+        monthlyTurnover.setValue(!isNaN(num) && num >= 0 ? this.round2(num * 2) : '', { emitEvent: true });
+      });
+    }
+
+    if (annualIncome && annualTurnover) {
+      annualIncome.valueChanges.subscribe((value) => {
+        if (this.suppressMonthlyAnnualLink) {
+          return;
+        }
+        const num = parseFloat(value);
+        annualTurnover.setValue(!isNaN(num) && num >= 0 ? this.round2(num * 2) : '', { emitEvent: true });
+      });
+    }
   }
 
   /**
@@ -2236,26 +2268,26 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
         }
 
         // Match monthly income ranges
-        if (rule.minMonthlyIncome != null && monthlyIncome < rule.minMonthlyIncome) {
+        if (rule.minMonthlyIncome != null && rule.minMonthlyIncome > 0 && monthlyIncome < rule.minMonthlyIncome) {
           continue;
         }
-        if (rule.maxMonthlyIncome != null && monthlyIncome > rule.maxMonthlyIncome) {
+        if (rule.maxMonthlyIncome != null && rule.maxMonthlyIncome > 0 && monthlyIncome > rule.maxMonthlyIncome) {
           continue;
         }
 
         // Match annual income ranges (evaluated against totalAnnualIncome)
-        if (rule.minAnnualIncome != null && totalAnnualIncome < rule.minAnnualIncome) {
+        if (rule.minAnnualIncome != null && rule.minAnnualIncome > 0 && totalAnnualIncome < rule.minAnnualIncome) {
           continue;
         }
-        if (rule.maxAnnualIncome != null && totalAnnualIncome > rule.maxAnnualIncome) {
+        if (rule.maxAnnualIncome != null && rule.maxAnnualIncome > 0 && totalAnnualIncome > rule.maxAnnualIncome) {
           continue;
         }
 
         // Match turnover ranges
-        if (rule.minAnnualTurnover != null && annualTurnover < rule.minAnnualTurnover) {
+        if (rule.minAnnualTurnover != null && rule.minAnnualTurnover > 0 && annualTurnover < rule.minAnnualTurnover) {
           continue;
         }
-        if (rule.maxAnnualTurnover != null && annualTurnover > rule.maxAnnualTurnover) {
+        if (rule.maxAnnualTurnover != null && rule.maxAnnualTurnover > 0 && annualTurnover > rule.maxAnnualTurnover) {
           continue;
         }
 

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

@@ -723,6 +723,53 @@
         <span>PAN verification requires client to be created first. Complete General tab and click Next to save.</span>
       </div>
     }
+
+    <!-- KYC Exception Flag -->
+    <div
+      class="exception-flag-box"
+      style="
+        margin-top: 20px;
+        padding: 16px;
+        border: 1px solid #f59e0b;
+        background: #fffbeb;
+        border-radius: 8px;
+        clear: both;
+      "
+    >
+      <h5
+        style="
+          margin: 0 0 12px 0;
+          font-size: 14px;
+          font-weight: 600;
+          color: #b45309;
+          display: flex;
+          align-items: center;
+          gap: 8px;
+        "
+      >
+        <fa-icon icon="exclamation-triangle"></fa-icon>
+        KYC Exception Flag
+      </h5>
+      <div style="display: flex; align-items: center; gap: 20px; flex-wrap: wrap">
+        <mat-checkbox formControlName="isException">Mark as KYC Exception</mat-checkbox>
+
+        @if (kycForm.get('isException')?.value) {
+          <mat-form-field appearance="outline" style="flex: 1; min-width: 280px; margin-bottom: -1.25em">
+            <mat-label>Exception Reasons</mat-label>
+            <mat-select formControlName="exceptionReason" multiple>
+              @if (!isNonIndividual) {
+                <mat-option value="PAN Card Verification Failed">PAN Card Verification Failed</mat-option>
+                <mat-option value="Aadhaar Verification Failed">Aadhaar Verification Failed</mat-option>
+              } @else {
+                <mat-option value="Enterprise PAN Verification Failed">Enterprise PAN Verification Failed</mat-option>
+                <mat-option value="GSTIN Verification Failed">GSTIN Verification Failed</mat-option>
+                <mat-option value="CIN Verification Failed">CIN Verification Failed</mat-option>
+              }
+            </mat-select>
+          </mat-form-field>
+        }
+      </div>
+    </div>
   </div>
 
   <!-- ═══ SECTION: KYC Document Management ═══ -->

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

@@ -29,6 +29,7 @@ import { ClientsService } from '../../clients.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { ProofType, normalizeProofType, groupProofsByCategory } from '../../shared/kyc-proof-types';
+import { deriveKycExceptionFields } from '../../kyc-exception.util';
 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';
@@ -152,7 +153,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     kycDocumentName: 'KYC Document Type',
     kycDocumentNumber: 'KYC Document Number',
     amlCheckStatus: 'AML Check Status',
-    bannedEntityMatch: 'Banned Entity List Match'
+    bannedEntityMatch: 'Banned Entity List Match',
+    remarks: 'Reason for Re-edit'
   };
 
   /** Names every currently-invalid `kycForm` control (required-but-empty, or an entered value
@@ -274,6 +276,14 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
   riskCalculationReason = '';
   showRiskRulesTable = false;
 
+  /**
+   * Exception state as last read back from the server. Needed to tell "this client never had an
+   * exception" from "this client had one and has now cleared it" — only the latter should be
+   * stamped resolved and surface in the Resolved tab.
+   */
+  persistedIsException = false;
+  persistedExceptionReason: string | null = null;
+
   /** PAN verification */
   panVerifyStatus: 'NONE' | 'VERIFIED' | 'FAILED' = 'NONE';
   panVerifying = false;
@@ -423,8 +433,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     aadhaarNumber: [
       '',
       [
-        Validators.pattern(/^\d{12}$/),
-        Validators.maxLength(12)
+        Validators.pattern(/^(\d{12}|[X•*\s\d]{12,14})$/),
+        Validators.maxLength(14)
       ]
     ],
     panAadhaarSeedingStatus: [''],
@@ -468,6 +478,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     allowRiskOverride: [false],
     allowAmlOverride: [false],
     remarks: [''],
+    isException: [false],
+    exceptionReason: [[]],
     amlCheckStatus: [
       'CLEAR',
       Validators.required
@@ -610,8 +622,12 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       dormantFlag: 'ACTIVE',
       accountStatus: 'ACTIVE',
       form60Type: 'FORM_60',
-      form15Type: '15G'
+      form15Type: '15G',
+      isException: false,
+      exceptionReason: []
     });
+    this.persistedIsException = false;
+    this.persistedExceptionReason = null;
     this.kycId = '';
     this.kycLoaded = false;
     this.kycStatus = 0;
@@ -942,8 +958,18 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
             form60Date: parseDate(data.form60Date),
             form15Applicable: data.form15Applicable || false,
             form15Type: data.form15Type || '15G',
-            form15FY: data.form15FY || ''
+            form15FY: data.form15FY || '',
+            isException: data.isException || false,
+            exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
           });
+          // Set remarks as required if KYC is verified
+          if (this.isKycVerified) {
+            this.kycForm.get('remarks')?.setValidators(Validators.required);
+            this.kycForm.get('remarks')?.updateValueAndValidity();
+            this.kycForm.get('remarks')?.markAsTouched(); // Force red underline so user knows it's blocking
+          }
+          this.persistedIsException = data.isException === true;
+          this.persistedExceptionReason = data.exceptionReason || null;
           // Sync chip-picker selection with the prefilled document name
           if (data.kycDocumentName) {
             this.selectedKycDoc = this.kycDocProofs.find((p) => p.name === data.kycDocumentName) || null;
@@ -1843,7 +1869,23 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       form15Applicable: v.form15Applicable || false,
       form15Type: v.form15Type || null,
       form15FY: v.form15FY || null,
-      remarks: v.remarks || null
+      remarks: v.remarks || null,
+      // Exception state is DERIVED from verification status, not from a checkbox — an unverified
+      // or blank PAN/Aadhaar is an exception by definition, so the officer cannot forget to flag
+      // it. See deriveKycExceptionFields() for the raise / narrow / close rules.
+      ...deriveKycExceptionFields({
+        panVerified: this.isNonIndividual
+          ? this.entPanVerifyStatus === 'VERIFIED'
+          : this.panVerifyStatus === 'VERIFIED',
+        aadhaarVerified: this.aadhaarVerifyStatus === 'VERIFIED',
+        // Non-individual clients submit a dummy masked Aadhaar, so checking it would saddle every
+        // company with a permanent exception.
+        aadhaarApplicable: !this.isNonIndividual,
+        hadException: this.persistedIsException,
+        previousReason: this.persistedExceptionReason,
+        manualReasons: Array.isArray(v.exceptionReason) ? v.exceptionReason : [],
+        todayFormatted: this.dateUtils.formatDate(new Date(), dateFormat)
+      })
     };
   }
 
@@ -1856,7 +1898,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       v.enterprisePan ||
       v.cinNumber ||
       v.kycDocumentName ||
-      v.form15Applicable
+      v.form15Applicable ||
+      v.isException
     );
   }
 

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

@@ -60,6 +60,7 @@ import { ClientCollateralResolver } from './common-resolvers/client-collateral.r
 import { KycTabComponent } from './clients-view/kyc-tab/kyc-tab.component';
 import { CkycTabComponent } from './clients-view/ckyc-tab/ckyc-tab.component';
 import { Form60TabComponent } from './clients-view/form60-tab/form60-tab.component';
+import { Form121TabComponent } from './clients-view/form121-tab/form121-tab.component';
 import { EntityClassificationTabComponent } from './clients-view/entity-classification-tab/entity-classification-tab.component';
 import { familyAllowedGuard, nomineeAllowedGuard } from './utils/family-nominee.guard';
 
@@ -193,6 +194,11 @@ const routes: Routes = [
               component: Form60TabComponent,
               data: { title: 'Form 97', breadcrumb: 'Form 97', routeParamBreadcrumb: false }
             },
+            {
+              path: 'form121',
+              component: Form121TabComponent,
+              data: { title: 'Form 121 / TDS', breadcrumb: 'Form 121 / TDS', routeParamBreadcrumb: false }
+            },
             {
               path: 'documents',
               component: DocumentsTabComponent,

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

@@ -545,6 +545,15 @@
       >
         <i class="fa fa-file-text cv-tab-icon"></i> {{ 'labels.inputs.Form 60' | translate }}
       </a>
+      <a
+        mat-tab-link
+        [routerLink]="['./form121']"
+        routerLinkActive
+        #form121="routerLinkActive"
+        [active]="form121.isActive"
+      >
+        <i class="fa fa-percent cv-tab-icon"></i> Form 121 / TDS
+      </a>
       <a
         mat-tab-link
         [routerLink]="['./documents']"

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

@@ -0,0 +1,428 @@
+<!--
+  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="f121">
+  @if (loading) {
+    <div class="f121__loading">
+      <mat-spinner [diameter]="36"></mat-spinner>
+      <span>Reading the customer's deposit ledger…</span>
+    </div>
+  } @else if (loadError) {
+    <div class="f121__note f121__note--warn">
+      <mat-icon>error_outline</mat-icon>
+      <div>Could not load the customer's accounts. Try again, or check the deposit service.</div>
+    </div>
+  } @else {
+    <!-- ── Header ── -->
+    <div class="f121__head">
+      <div>
+        <h3 class="f121__title">Form 121 &amp; TDS on deposit interest</h3>
+        <div class="f121__sub">
+          Tax deducted at source under {{ statute.section }} on fixed and recurring deposit interest.
+        </div>
+      </div>
+
+      <div class="f121__controls">
+        @if (availableFys.length) {
+          <label class="f121__field">
+            <span>Financial year</span>
+            <select [(ngModel)]="fy" (ngModelChange)="recompute()">
+              @for (year of availableFys; track year) {
+                <option [value]="year">FY {{ year }}</option>
+              }
+            </select>
+          </label>
+        }
+        <div class="f121__field">
+          <span>Settlement</span>
+          <div
+            class="f121__mode"
+            [matTooltip]="'Set by the deposit product\'s interest-posting frequency: tax falls due when interest is credited, so the branch cannot defer it. Not a customer preference.'"
+          >
+            <mat-icon>schedule</mat-icon>
+            {{ mode === 'QUARTERLY' ? 'Quarterly' : 'At year end' }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    @if (!schedule) {
+      <div class="f121__note">
+        <mat-icon>info_outline</mat-icon>
+        <div>
+          @if (!dateOfBirth) {
+            Date of birth is not on record, so the senior-citizen threshold cannot be determined. Add it on the Personal
+            Data tab.
+          } @else {
+            No interest has been credited to this customer's deposits yet.
+          }
+        </div>
+      </div>
+    } @else {
+      <!-- ── KPI strip ── -->
+      <div class="f121__kpis">
+        <div class="f121__kpi">
+          <div class="f121__kpi-n">₹{{ schedule.totalInterest | number: '1.0-0' }}</div>
+          <div class="f121__kpi-l">Interest earned (FY {{ schedule.fy }})</div>
+        </div>
+        <div class="f121__kpi" [class.f121__kpi--warn]="actualTds > 0">
+          <div class="f121__kpi-n">₹{{ actualTds | number: '1.0-0' }}</div>
+          <div class="f121__kpi-l">TDS deducted</div>
+        </div>
+        <div class="f121__kpi">
+          <div class="f121__kpi-n">₹{{ schedule.threshold | number: '1.0-0' }}</div>
+          <div class="f121__kpi-l">Threshold ({{ schedule.senior ? 'senior citizen' : 'general' }})</div>
+        </div>
+        @if (thresholdCrossed) {
+          <div class="f121__kpi f121__kpi--warn">
+            <div class="f121__kpi-n">Crossed</div>
+            <div class="f121__kpi-l">TDS applies this year</div>
+          </div>
+        } @else {
+          <div class="f121__kpi f121__kpi--ok">
+            <div class="f121__kpi-n">₹{{ headroom | number: '1.0-0' }}</div>
+            <div class="f121__kpi-l">More interest before TDS starts</div>
+          </div>
+        }
+        @if (tdsSaved > 0) {
+          <div class="f121__kpi f121__kpi--ok">
+            <div class="f121__kpi-n">₹{{ tdsSaved | number: '1.0-0' }}</div>
+            <div class="f121__kpi-l">Saved by Form 121</div>
+          </div>
+        }
+      </div>
+
+      <!-- ── Alerts ── -->
+      @if (variance !== 0) {
+        <div class="f121__note f121__note--warn">
+          <mat-icon>warning_amber</mat-icon>
+          <div>
+            <strong>Ledger and computed tax differ by ₹{{ variance | number: '1.0-0' }}.</strong>
+            The ledger shows ₹{{ actualTds | number: '1.0-0' }} withheld; {{ statute.section }} on this year's interest
+            comes to ₹{{ schedule.totalTds | number: '1.0-0' }}. Investigate before the quarterly return is filed.
+          </div>
+        </div>
+      }
+
+      @if (declarationNotAppliedToAccounts) {
+        <div class="f121__note f121__note--warn">
+          <mat-icon>warning_amber</mat-icon>
+          <div>
+            A Form 121 declaration is on record for this year, but withholding is still switched on for one or more
+            deposits. Turn it off on those accounts, or tax will keep being deducted.
+          </div>
+        </div>
+      }
+
+      @if (declarationUselessOnJointAccounts) {
+        <div class="f121__note f121__note--warn">
+          <mat-icon>warning_amber</mat-icon>
+          <div>
+            This customer has filed Form 121, but tax on
+            {{ jointHolderAccounts.length }} joint deposit{{ jointHolderAccounts.length === 1 ? '' : 's' }} is deducted
+            against the first-named holder. Their declaration does not cover those — the primary holder must file their
+            own.
+          </div>
+        </div>
+      }
+
+      @if (shouldSuggestDeclaration) {
+        <div class="f121__note f121__note--tip">
+          <mat-icon>lightbulb_outline</mat-icon>
+          <div>
+            ₹{{ schedule.totalTds | number: '1.0-0' }} of tax falls due this year. If the customer's total tax liability
+            for the year is nil, a {{ formLabel }} declaration would stop it being deducted at all — better than
+            reclaiming it later as a refund.
+          </div>
+        </div>
+      }
+
+      @if (!panWellFormed) {
+        <div class="f121__note f121__note--warn">
+          <mat-icon>error_outline</mat-icon>
+          <div>
+            No valid PAN on record, so tax is deducted at the higher section 206AA rate of
+            {{ schedule.rateApplied * 100 | number: '1.0-0' }}%. A Form 121 declaration is void without a valid PAN.
+          </div>
+        </div>
+      }
+
+      @for (note of schedule.notes; track note) {
+        <div class="f121__note">
+          <mat-icon>info_outline</mat-icon>
+          <div>{{ note }}</div>
+        </div>
+      }
+
+      <!-- ── Declaration panel ── -->
+      <div class="f121__card">
+        <div class="f121__card-head">
+          <mat-icon>assignment_turned_in</mat-icon>
+          <span>Declaration</span>
+        </div>
+        <div class="f121__kv">
+          <div class="f121__kv-row">
+            <span>Status</span>
+            <span>
+              @if (declarationOnRecord) {
+                <span class="f121__pill f121__pill--ok">On record — {{ formLabel }}</span>
+              } @else {
+                <span class="f121__pill">Not filed</span>
+              }
+            </span>
+          </div>
+          <div class="f121__kv-row">
+            <span>Form &amp; threshold band</span>
+            <span>{{ formLabel }} · {{ bandLabel }} band · {{ age }} yrs in this FY</span>
+          </div>
+          <div class="f121__kv-row">
+            <span>PAN</span>
+            <span class="f121__mono">
+              {{ pan || '—' }}
+              @if (pan && !panWellFormed) {
+                <span class="f121__pill f121__pill--warn">invalid</span>
+              }
+            </span>
+          </div>
+          @if (declarationOnRecord && declarationFy) {
+            <div class="f121__kv-row">
+              <span>Declared for</span>
+              <span>FY {{ declarationFy }}</span>
+            </div>
+          }
+          @if (declarationOnRecord && !acceptanceDateKnown) {
+            <div class="f121__kv-row f121__kv-row--muted">
+              <span>Acceptance date</span>
+              <span>
+                Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
+                the figures below.
+              </span>
+            </div>
+          }
+          @if (eligibility) {
+            @for (reason of eligibility.reasons; track reason) {
+              <div class="f121__kv-row f121__kv-row--warn">
+                <span>Eligibility</span>
+                <span>{{ reason }}</span>
+              </div>
+            }
+            @for (note of eligibility.unassessed; track note) {
+              <div class="f121__kv-row f121__kv-row--muted">
+                <span>Not assessed</span>
+                <span>{{ note }}</span>
+              </div>
+            }
+          }
+        </div>
+      </div>
+
+      <!-- ── Quarter-wise ── -->
+      <div class="f121__card">
+        <div class="f121__card-head">
+          <mat-icon>table_chart</mat-icon>
+          <span>Quarter by quarter</span>
+        </div>
+        <div class="f121__table-wrap">
+          <table class="f121__table">
+            <thead>
+              <tr>
+                <th>Quarter</th>
+                <th class="num">Interest</th>
+                <th class="num">Cumulative</th>
+                <th class="num">Liability to date</th>
+                <th class="num">TDS this quarter</th>
+                <th>Return due</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (line of schedule.lines; track trackLine($index, line)) {
+                <tr [class.f121__row--warn]="line.thresholdCrossedHere">
+                  <td>
+                    {{ line.label }}
+                    @if (line.thresholdCrossedHere) {
+                      <span class="f121__pill f121__pill--warn">threshold crossed</span>
+                    }
+                    @if (line.declarationActive) {
+                      <span class="f121__pill f121__pill--ok">Form 121 active</span>
+                    }
+                  </td>
+                  <td class="num">₹{{ line.interest | number: '1.0-0' }}</td>
+                  <td class="num">₹{{ line.cumInterest | number: '1.0-0' }}</td>
+                  <td class="num">₹{{ line.cumLiability | number: '1.0-0' }}</td>
+                  <td class="num">
+                    @if (line.tds !== 0) {
+                      <strong>₹{{ line.tds | number: '1.0-0' }}</strong>
+                    } @else {
+                      <span class="muted">—</span>
+                    }
+                  </td>
+                  <td class="muted">{{ line.dueDate }}</td>
+                </tr>
+              }
+              <tr class="f121__row--total">
+                <td><strong>Total</strong></td>
+                <td class="num">
+                  <strong>₹{{ schedule.totalInterest | number: '1.0-0' }}</strong>
+                </td>
+                <td></td>
+                <td></td>
+                <td class="num">
+                  <strong>₹{{ schedule.totalTds | number: '1.0-0' }}</strong>
+                </td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        @if (schedule.shieldedInterest > 0) {
+          <div class="f121__foot">
+            ₹{{ schedule.shieldedInterest | number: '1.0-0' }} was paid without deduction on the strength of the
+            declaration. This amount is still reportable in the quarterly {{ statute.statement }} return.
+          </div>
+        }
+      </div>
+
+      <!-- ── Section 1: accounts that count ── -->
+      <div class="f121__card">
+        <div class="f121__card-head">
+          <mat-icon>account_balance</mat-icon>
+          <span>Deposits counted towards this customer's TDS</span>
+        </div>
+        @if (liableAccounts.length) {
+          <div class="f121__table-wrap">
+            <table class="f121__table">
+              <thead>
+                <tr>
+                  <th>Account</th>
+                  <th>Type</th>
+                  <th class="num">Interest (FY)</th>
+                  <th class="num">TDS deducted</th>
+                  <th>Withholding</th>
+                  <th>Settles</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (a of liableAccounts; track trackAccount($index, a)) {
+                  <tr>
+                    <td>
+                      <div class="f121__mono">{{ a.accountNo }}</div>
+                      <div class="muted">{{ a.productName }}</div>
+                    </td>
+                    <td>{{ a.kind }}</td>
+                    <td class="num">₹{{ a.interest | number: '1.0-0' }}</td>
+                    <td class="num">₹{{ a.tdsDeducted | number: '1.0-0' }}</td>
+                    <td>
+                      @if (a.withHoldTax) {
+                        <span class="f121__pill f121__pill--warn">On</span>
+                        @if (a.taxGroup) {
+                          <div class="muted">{{ a.taxGroup }}</div>
+                        }
+                      } @else {
+                        <span class="f121__pill">Off</span>
+                      }
+                    </td>
+                    <td>{{ a.mode === 'QUARTERLY' ? 'Quarterly' : 'Year end' }}</td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+          <div class="f121__foot">
+            Aggregated across every branch — a bank on core banking computes the deduction threshold for the bank as a
+            whole, not branch by branch.
+          </div>
+        } @else {
+          <div class="f121__empty">No fixed or recurring deposits where this customer is the deductee.</div>
+        }
+      </div>
+
+      <!-- ── Section 2: joint holdings ── -->
+      @if (jointHolderAccounts.length) {
+        <div class="f121__card">
+          <div class="f121__card-head">
+            <mat-icon>group</mat-icon>
+            <span>Deposits where this customer is a joint holder</span>
+          </div>
+          <div class="f121__table-wrap">
+            <table class="f121__table">
+              <thead>
+                <tr>
+                  <th>Account</th>
+                  <th>Type</th>
+                  <th class="num">Interest (FY)</th>
+                  <th>Deducted against</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (a of jointHolderAccounts; track trackAccount($index, a)) {
+                  <tr>
+                    <td>
+                      <div class="f121__mono">{{ a.accountNo }}</div>
+                      <div class="muted">{{ a.productName }}</div>
+                    </td>
+                    <td>{{ a.kind }}</td>
+                    <td class="num">₹{{ a.interest | number: '1.0-0' }}</td>
+                    <td class="muted">
+                      First-named holder
+                      @if (a.deducteeClientId) {
+                        (client {{ a.deducteeClientId }})
+                      }
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+          <div class="f121__foot">
+            Tax on a joint deposit is deducted against the first-named holder's PAN, so this interest is
+            <strong>not</strong> counted in the figures above and does not use up this customer's threshold.
+          </div>
+        </div>
+      }
+
+      <!-- ── Section 3: exempt accounts ── -->
+      @if (exemptAccounts.length) {
+        <div class="f121__card">
+          <div class="f121__card-head">
+            <mat-icon>savings</mat-icon>
+            <span>Savings and current accounts</span>
+          </div>
+          <div class="f121__table-wrap">
+            <table class="f121__table">
+              <thead>
+                <tr>
+                  <th>Account</th>
+                  <th>Type</th>
+                  <th class="num">Interest (FY)</th>
+                  <th>TDS</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (a of exemptAccounts; track trackAccount($index, a)) {
+                  <tr>
+                    <td>
+                      <div class="f121__mono">{{ a.accountNo }}</div>
+                      <div class="muted">{{ a.productName }}</div>
+                    </td>
+                    <td>{{ a.kind }}</td>
+                    <td class="num">₹{{ a.interest | number: '1.0-0' }}</td>
+                    <td><span class="f121__pill">Not applicable</span></td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+          <div class="f121__foot">
+            The charge applies to time deposits. Savings bank interest is outside it and is excluded from the threshold
+            — the customer claims the 80TTA or 80TTB deduction on it in their own return instead.
+          </div>
+        </div>
+      }
+    }
+  }
+</div>

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

@@ -0,0 +1,334 @@
+/**
+ * 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/.
+ */
+
+.f121 {
+  --f121-line: #e5e7eb;
+  --f121-bg: #f9fafb;
+  --f121-ink: #111827;
+  --f121-muted: #6b7280;
+  --f121-blue: #1d4ed8;
+  --f121-green: #15803d;
+  --f121-amber: #b45309;
+
+  padding: 16px;
+  font-size: 13px;
+  color: var(--f121-ink);
+}
+
+.f121__loading {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 40px 16px;
+  color: var(--f121-muted);
+}
+
+/* ── Header ── */
+.f121__head {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  align-items: flex-end;
+  justify-content: space-between;
+  margin-bottom: 16px;
+}
+
+.f121__title {
+  margin: 0;
+  font-size: 16px;
+  font-weight: 700;
+}
+
+.f121__sub {
+  margin-top: 4px;
+  color: var(--f121-muted);
+  font-size: 12px;
+}
+
+.f121__controls {
+  display: flex;
+  gap: 16px;
+  align-items: flex-end;
+}
+
+.f121__field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  > span {
+    font-size: 10.5px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--f121-muted);
+  }
+
+  select {
+    padding: 7px 10px;
+    border: 1px solid var(--f121-line);
+    border-radius: 6px;
+    background: #fff;
+    font-size: 13px;
+    color: inherit;
+  }
+}
+
+.f121__mode {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 7px 10px;
+  border: 1px solid var(--f121-line);
+  border-radius: 6px;
+  background: var(--f121-bg);
+  font-weight: 600;
+  cursor: help;
+
+  mat-icon {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+    color: var(--f121-muted);
+  }
+}
+
+/* ── KPI strip ── */
+.f121__kpis {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(160px, 1fr));
+  gap: 10px;
+  margin-bottom: 16px;
+}
+
+.f121__kpi {
+  padding: 12px 14px;
+  border: 1px solid var(--f121-line);
+  border-left: 3px solid var(--f121-blue);
+  border-radius: 8px;
+  background: #fff;
+
+  &--ok {
+    border-left-color: var(--f121-green);
+  }
+
+  &--warn {
+    border-left-color: var(--f121-amber);
+  }
+}
+
+.f121__kpi-n {
+  font-size: 19px;
+  font-weight: 800;
+  font-variant-numeric: tabular-nums;
+}
+
+.f121__kpi-l {
+  margin-top: 2px;
+  font-size: 11px;
+  color: var(--f121-muted);
+  line-height: 1.35;
+}
+
+/* ── Notes ── */
+.f121__note {
+  display: flex;
+  gap: 10px;
+  align-items: flex-start;
+  margin-bottom: 12px;
+  padding: 11px 13px;
+  border-radius: 8px;
+  border-left: 3px solid var(--f121-blue);
+  background: color-mix(in srgb, var(--f121-blue) 6%, transparent);
+  line-height: 1.5;
+
+  mat-icon {
+    flex-shrink: 0;
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+    color: var(--f121-blue);
+  }
+
+  &--warn {
+    border-left-color: var(--f121-amber);
+    background: color-mix(in srgb, var(--f121-amber) 8%, transparent);
+
+    mat-icon {
+      color: var(--f121-amber);
+    }
+  }
+
+  &--tip {
+    border-left-color: var(--f121-green);
+    background: color-mix(in srgb, var(--f121-green) 7%, transparent);
+
+    mat-icon {
+      color: var(--f121-green);
+    }
+  }
+}
+
+/* ── Cards ── */
+.f121__card {
+  margin-bottom: 16px;
+  border: 1px solid var(--f121-line);
+  border-radius: 10px;
+  background: #fff;
+  overflow: hidden;
+}
+
+.f121__card-head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 11px 14px;
+  background: var(--f121-bg);
+  border-bottom: 1px solid var(--f121-line);
+  font-weight: 700;
+  font-size: 12.5px;
+
+  mat-icon {
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+    color: var(--f121-muted);
+  }
+}
+
+.f121__foot {
+  padding: 10px 14px;
+  border-top: 1px solid var(--f121-line);
+  background: var(--f121-bg);
+  color: var(--f121-muted);
+  font-size: 11.5px;
+  line-height: 1.5;
+}
+
+.f121__empty {
+  padding: 20px 14px;
+  color: var(--f121-muted);
+  text-align: center;
+}
+
+/* ── Key/value list ── */
+.f121__kv-row {
+  display: grid;
+  grid-template-columns: 190px 1fr;
+  gap: 12px;
+  padding: 10px 14px;
+  border-bottom: 1px solid #f3f4f6;
+  line-height: 1.5;
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  > span:first-child {
+    color: var(--f121-muted);
+    font-weight: 600;
+  }
+
+  &--muted > span:last-child {
+    color: var(--f121-muted);
+    font-size: 12px;
+  }
+
+  &--warn > span:last-child {
+    color: var(--f121-amber);
+  }
+}
+
+/* ── Tables ── */
+.f121__table-wrap {
+  overflow-x: auto;
+}
+
+.f121__table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 12.5px;
+
+  th {
+    text-align: left;
+    padding: 10px 14px;
+    background: #fff;
+    border-bottom: 1px solid var(--f121-line);
+    color: var(--f121-muted);
+    font-weight: 700;
+    font-size: 10.5px;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 10px 14px;
+    border-bottom: 1px solid #f3f4f6;
+    vertical-align: top;
+  }
+
+  tr:last-child td {
+    border-bottom: 0;
+  }
+
+  .num {
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+    white-space: nowrap;
+  }
+
+  .muted {
+    color: var(--f121-muted);
+    font-size: 11.5px;
+  }
+}
+
+.f121__row--warn > td {
+  background: color-mix(in srgb, var(--f121-amber) 7%, transparent);
+}
+
+.f121__row--total > td {
+  background: var(--f121-bg);
+  border-top: 1px solid var(--f121-line);
+}
+
+/* ── Bits ── */
+.f121__pill {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 9px;
+  border-radius: 999px;
+  border: 1px solid var(--f121-line);
+  background: var(--f121-bg);
+  color: var(--f121-muted);
+  font-size: 10.5px;
+  font-weight: 700;
+  white-space: nowrap;
+
+  & + & {
+    margin-left: 5px;
+  }
+
+  &--ok {
+    border-color: color-mix(in srgb, var(--f121-green) 35%, transparent);
+    background: color-mix(in srgb, var(--f121-green) 10%, transparent);
+    color: var(--f121-green);
+  }
+
+  &--warn {
+    border-color: color-mix(in srgb, var(--f121-amber) 35%, transparent);
+    background: color-mix(in srgb, var(--f121-amber) 12%, transparent);
+    color: var(--f121-amber);
+  }
+}
+
+.f121__mono {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-weight: 600;
+}

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

@@ -0,0 +1,500 @@
+/**
+ * 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/.
+ */
+
+/** Angular Imports */
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { ActivatedRoute } from '@angular/router';
+import { MatIcon } from '@angular/material/icon';
+import { MatProgressSpinner } from '@angular/material/progress-spinner';
+import { MatTooltip } from '@angular/material/tooltip';
+import { Observable, Subject, forkJoin, of } from 'rxjs';
+import { catchError, switchMap, takeUntil } from 'rxjs/operators';
+
+/** Custom Services */
+import { ClientsService } from '../../clients.service';
+import { SavingsService } from 'app/savings/savings.service';
+import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
+import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/** Domain logic */
+import {
+  Declaration,
+  DeclarationForm,
+  EligibilityResult,
+  FY_TAX_CONFIG,
+  InterestCredit,
+  TdsAccountInput,
+  TdsMode,
+  TdsQuarterLine,
+  TdsSchedule,
+  ageInFy,
+  buildSchedule,
+  checkEligibility,
+  collectTdsCredits,
+  declarationFormFor,
+  formKindFor,
+  fyOf,
+  isTdsApplicable,
+  isWellFormedPan,
+  normaliseFy,
+  tdsDeducteeOf,
+  tdsModeFor
+} from 'app/letter-mgmt/certificates/form-15gh/tds-15gh.compute';
+
+/** One of the customer's interest-bearing accounts, with its FY figures. */
+export interface Form121AccountRow {
+  accountNo: string;
+  productName: string;
+  /** 'Fixed Deposit', 'Recurring Deposit' or 'Savings'. */
+  kind: string;
+  /** Interest credited to this account inside the selected FY. */
+  interest: number;
+  /** Tax Fineract has actually withheld on this account inside the FY. */
+  tdsDeducted: number;
+  /** Whether Fineract is currently withholding tax on this account. */
+  withHoldTax: boolean;
+  taxGroup: string | null;
+  /** When tax on this account settles — from the product, not a preference. */
+  mode: TdsMode;
+  /** Interest here attracts TDS at all (a time deposit, not a savings account). */
+  tdsApplicable: boolean;
+  /** This customer is the deductee — false when they are a joint holder only. */
+  isDeductee: boolean;
+  /** Who the tax is deducted against, when it is not this customer. */
+  deducteeClientId: number | null;
+}
+
+/** Fineract hands dates back as [yyyy, m, d]; normalise to ISO. */
+function toIso(value: unknown): string | null {
+  if (Array.isArray(value) && value.length >= 3) {
+    const [
+      y,
+      m,
+      d
+    ] = value as number[];
+    return `${y}-${`${m}`.padStart(2, '0')}-${`${d}`.padStart(2, '0')}`;
+  }
+  if (typeof value === 'string' && value.trim()) {
+    const parsed = new Date(value);
+    if (!isNaN(parsed.getTime())) {
+      return parsed.toISOString().slice(0, 10);
+    }
+  }
+  return null;
+}
+
+@Component({
+  selector: 'mifosx-form121-tab',
+  templateUrl: './form121-tab.component.html',
+  styleUrls: ['./form121-tab.component.scss'],
+  standalone: true,
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    CommonModule,
+    FormsModule,
+    MatIcon,
+    MatProgressSpinner,
+    MatTooltip
+  ]
+})
+export class Form121TabComponent implements OnInit, OnDestroy {
+  private route = inject(ActivatedRoute);
+  private clientsService = inject(ClientsService);
+  private savingsService = inject(SavingsService);
+  private fixedDepositsService = inject(FixedDepositsService);
+  private recurringDepositsService = inject(RecurringDepositsService);
+
+  private destroy$ = new Subject<void>();
+
+  clientId = '';
+  loading = true;
+  loadError = false;
+
+  // ── Customer ──
+  clientName = '';
+  dateOfBirth = '';
+  pan = '';
+  panWellFormed = false;
+
+  // ── Declaration on record ──
+  declarationOnRecord = false;
+  /**
+   * The form actually in force for the selected year. From FY 2026-27 a single
+   * Form 121 replaced the 15G/15H split, so this is derived from the year rather
+   * than from the payee's age.
+   */
+  declarationForm: DeclarationForm = '121';
+  /** Kind recorded at KYC, meaningful only for a pre-2026 year. */
+  declarationKind: '15G' | '15H' = '15G';
+  declarationFy = '';
+  /**
+   * The KYC step records only the year, not the date the branch accepted the
+   * declaration, so it has to be treated as covering the whole year. Surfaced on
+   * screen rather than hidden — a mid-year acceptance would change the figures.
+   */
+  acceptanceDateKnown = false;
+
+  eligibility: EligibilityResult | null = null;
+
+  // ── Selection ──
+  availableFys: string[] = [];
+  fy = '';
+
+  // ── Computed ──
+  accounts: Form121AccountRow[] = [];
+  schedule: TdsSchedule | null = null;
+  actualTds = 0;
+  tdsSaved = 0;
+
+  /** Raw account inputs, kept so the year selector can recompute cheaply. */
+  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow })[] = [];
+  /** Withheld-tax postings by FY, from the ledger. */
+  private actualTdsByFy = new Map<string, number>();
+
+  ngOnInit(): void {
+    this.route.parent.params.pipe(takeUntil(this.destroy$)).subscribe((params: any) => {
+      this.clientId = params['clientId'];
+      this.load();
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  // ────────────────────────────── Loading ──────────────────────────────
+
+  private load(): void {
+    this.loading = true;
+    this.loadError = false;
+
+    forkJoin({
+      client: this.clientsService.getClientData(this.clientId, true).pipe(catchError(() => of(null))),
+      kyc: this.clientsService.getClientKyc(this.clientId, true).pipe(catchError(() => of(null))),
+      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null)))
+    })
+      .pipe(
+        takeUntil(this.destroy$),
+        switchMap(({ client, kyc, accounts }) => {
+          this.applyClient(client);
+          this.applyKyc(kyc);
+          const deposits = this.depositAccountsOf(accounts);
+          return deposits.length ? forkJoin(deposits.map((a) => this.fetchAccount(a))) : of([] as any[]);
+        }),
+        catchError(() => {
+          this.loadError = true;
+          return of([] as any[]);
+        })
+      )
+      .subscribe((details: any[]) => {
+        this.loading = false;
+        this.ingest(details.filter(Boolean));
+        this.recompute();
+      });
+  }
+
+  private applyClient(client: any): void {
+    this.clientName = client?.displayName ?? '';
+    this.dateOfBirth = toIso(client?.dateOfBirth) ?? '';
+  }
+
+  private applyKyc(kyc: any): void {
+    this.pan = (kyc?.panNumber ?? '').toUpperCase();
+    this.panWellFormed = isWellFormedPan(this.pan);
+    this.declarationOnRecord = !!kyc?.form15Applicable;
+    this.declarationKind = kyc?.form15Type === '15H' ? '15H' : '15G';
+    this.declarationForm = this.fy ? declarationFormFor(this.fy, this.dateOfBirth) : '121';
+    this.declarationFy = kyc?.form15FY ?? '';
+    this.acceptanceDateKnown = false;
+  }
+
+  /** Savings, FD and RD accounts — everything that can credit interest. */
+  private depositAccountsOf(accounts: any): any[] {
+    return (accounts?.savingsAccounts ?? []).filter(
+      (a: any) => a.status?.active || a.status?.matured || a.status?.closed
+    );
+  }
+
+  private fetchAccount(a: any): Observable<any> {
+    const id = `${a.id}`;
+    const code = a.depositType?.code ?? '';
+    let call: Observable<any>;
+    if (code.includes('fixedDeposit')) {
+      call = this.fixedDepositsService.getFixedDepositsAccountData(id);
+    } else if (code.includes('recurringDeposit')) {
+      call = this.recurringDepositsService.getRecurringDepositsAccountData(id);
+    } else {
+      call = this.savingsService.getSavingsAccountData(id);
+    }
+    // One unreadable account must not blank the whole tab.
+    return call.pipe(catchError(() => of(null)));
+  }
+
+  /**
+   * Turns each account payload into an engine input.
+   *
+   * Joint and minor attributes are read defensively: they are captured on the
+   * account stepper but may not surface on every read endpoint, and an absent
+   * field must default to a single-name account rather than throw.
+   */
+  private ingest(details: any[]): void {
+    this.accountInputs = [];
+    this.actualTdsByFy = new Map<string, number>();
+    const fys = new Set<string>();
+    const clientIdNum = Number(this.clientId);
+
+    for (const d of details) {
+      const code: string = d.depositType?.code ?? '';
+      const extra = d.extraAttributes ?? d.externalAttributes ?? d;
+
+      const ref = {
+        id: d.id,
+        accountNo: d.accountNo ?? `${d.id}`,
+        depositTypeCode: code,
+        accountStatus: extra.accountStatus ?? d.accountStatus ?? 'SINGLE',
+        clientId: d.clientId ?? clientIdNum,
+        primaryClientId: extra.primaryClientId ?? d.primaryClientId ?? null,
+        guardianClientId: extra.guardianClientId ?? d.guardianClientId ?? null,
+        jointHolders: extra.jointHolders ?? d.jointHolders ?? [],
+        interestPostingPeriodType: d.interestPostingPeriodType ?? null
+      };
+
+      const credits: InterestCredit[] = [];
+      let tdsDeducted = 0;
+
+      for (const t of d.transactions ?? []) {
+        if (t.reversed || t.isReversal) {
+          continue;
+        }
+        const iso = toIso(t.date);
+        if (!iso) {
+          continue;
+        }
+        fys.add(fyOf(iso));
+
+        if (t.transactionType?.interestPosting) {
+          credits.push({ date: iso, amount: t.amount ?? 0, accountNo: ref.accountNo });
+        } else if (t.transactionType?.withholdTax) {
+          const amount = t.amount ?? 0;
+          tdsDeducted += amount;
+          const txnFy = fyOf(iso);
+          this.actualTdsByFy.set(txnFy, (this.actualTdsByFy.get(txnFy) ?? 0) + amount);
+        }
+      }
+
+      const deductee = tdsDeducteeOf(ref);
+      const meta: Form121AccountRow = {
+        accountNo: ref.accountNo,
+        productName: d.savingsProductName ?? d.depositProductName ?? d.productName ?? '—',
+        kind: code.includes('fixedDeposit')
+          ? 'Fixed Deposit'
+          : code.includes('recurringDeposit')
+            ? 'Recurring Deposit'
+            : 'Savings',
+        interest: 0,
+        tdsDeducted,
+        withHoldTax: !!d.withHoldTax,
+        taxGroup: d.taxGroup?.name ?? null,
+        mode: tdsModeFor(ref),
+        tdsApplicable: isTdsApplicable(ref),
+        isDeductee: deductee === clientIdNum,
+        deducteeClientId: deductee
+      };
+
+      this.accountInputs.push({ ...ref, credits, meta });
+    }
+
+    this.availableFys = [...fys].sort().reverse();
+    if (!this.availableFys.includes(this.fy)) {
+      this.fy = this.availableFys[0] ?? (this.declarationFy ? normaliseFy(this.declarationFy) : '');
+    }
+  }
+
+  // ───────────────────────────── Computation ─────────────────────────────
+
+  /** Re-runs the engine for the selected year. */
+  recompute(): void {
+    this.schedule = null;
+    this.eligibility = null;
+    this.tdsSaved = 0;
+    this.accounts = this.accountInputs.map((a) => a.meta);
+
+    if (!this.fy) {
+      return;
+    }
+
+    const year = normaliseFy(this.fy);
+
+    // Per-account interest for the selected year, for the three lists.
+    for (const a of this.accountInputs) {
+      a.meta.interest = a.credits.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0);
+    }
+    this.actualTds = this.actualTdsByFy.get(year) ?? 0;
+
+    if (!this.dateOfBirth) {
+      return;
+    }
+
+    // The one place rules 8 to 12 are applied: savings interest dropped, joint
+    // deposits attributed to the primary holder, every branch aggregated.
+    const credits = collectTdsCredits(Number(this.clientId), this.accountInputs, year);
+    const ctx = { fy: year, dateOfBirth: this.dateOfBirth, pan: this.pan, resident: true };
+    const declaration = this.declarationForSelectedFy();
+
+    this.schedule = buildSchedule(this.overallMode, credits, { ...ctx, declaration });
+
+    if (declaration) {
+      const without = buildSchedule(this.overallMode, credits, { ...ctx, declaration: null });
+      this.tdsSaved = Math.max(0, without.totalTds - this.schedule.totalTds);
+    }
+
+    // The branch cannot compute income earned outside the bank, so the income
+    // limb is reported as unassessed rather than silently passed.
+    this.eligibility = checkEligibility(ctx, {
+      estimatedInterest: this.schedule.totalInterest,
+      estimatedIncome: 0,
+      incomeOnRecord: false
+    });
+  }
+
+  /**
+   * When tax settles for this customer overall.
+   *
+   * Timing is per account, but the customer needs one view. A quarterly account
+   * anywhere in the book means a deduction falls due at the first quarter end, so
+   * that is the honest headline; the per-account list carries the detail.
+   */
+  private get overallMode(): TdsMode {
+    const applicable = this.accountInputs.filter((a) => a.meta.tdsApplicable && a.meta.isDeductee);
+    return applicable.some((a) => a.meta.mode === 'QUARTERLY') ? 'QUARTERLY' : 'ANNUAL';
+  }
+
+  /** The declaration, but only when it was filed for the year being shown. */
+  private declarationForSelectedFy(): Declaration | null {
+    if (!this.declarationOnRecord || !this.fy) {
+      return null;
+    }
+    const year = normaliseFy(this.fy);
+    if (this.declarationFy && normaliseFy(this.declarationFy) !== year) {
+      return null;
+    }
+    return {
+      kind: this.declarationKind,
+      // No acceptance date on record — treated as covering the whole year.
+      acceptedOn: `${year.slice(0, 4)}-04-01`,
+      fy: year
+    };
+  }
+
+  // ───────────────────────── Template helpers ─────────────────────────
+
+  get mode(): TdsMode {
+    return this.schedule?.mode ?? 'QUARTERLY';
+  }
+
+  get age(): number {
+    return this.dateOfBirth && this.fy ? ageInFy(this.dateOfBirth, this.fy) : 0;
+  }
+
+  get formKind(): string {
+    return this.dateOfBirth && this.fy ? formKindFor(this.dateOfBirth, this.fy) : '—';
+  }
+
+  /** The form the payee would file for the selected year. */
+  get formLabel(): string {
+    if (!this.fy) {
+      return '—';
+    }
+    const form = declarationFormFor(this.fy, this.dateOfBirth);
+    return form === '121' ? 'Form 121' : `Form ${form}`;
+  }
+
+  /** Which deduction trigger applies, now that the forms no longer split by age. */
+  get bandLabel(): string {
+    return this.schedule?.senior ? 'Senior citizen' : 'General';
+  }
+
+  /**
+   * Provision and return references for the selected year. Both changed on
+   * 01 April 2026, so the template reads them rather than hard-coding them.
+   */
+  get statute(): { section: string; statement: string; rule: string; frequency: string } {
+    const cfg = this.fy ? FY_TAX_CONFIG[normaliseFy(this.fy)] : undefined;
+    return {
+      section: cfg?.interestTdsSection ?? '—',
+      statement: cfg?.tdsStatementForm ?? '—',
+      rule: cfg?.declarationRule ?? '—',
+      frequency: cfg?.declarationStatementFrequency === 'MONTHLY' ? 'monthly' : 'quarterly'
+    };
+  }
+
+  /** Accounts whose interest counts towards this customer's deduction aggregate. */
+  get liableAccounts(): Form121AccountRow[] {
+    return this.accounts.filter((a) => a.tdsApplicable && a.isDeductee);
+  }
+
+  /** Deposits where this customer is a joint holder but not the deductee. */
+  get jointHolderAccounts(): Form121AccountRow[] {
+    return this.accounts.filter((a) => a.tdsApplicable && !a.isDeductee);
+  }
+
+  /** Savings and current accounts — interest outside the charge on time deposits. */
+  get exemptAccounts(): Form121AccountRow[] {
+    return this.accounts.filter((a) => !a.tdsApplicable);
+  }
+
+  /** Engine figure less what the ledger shows was actually withheld. */
+  get variance(): number {
+    return (this.schedule?.totalTds ?? 0) - this.actualTds;
+  }
+
+  /** How much more interest before TDS starts. */
+  get headroom(): number {
+    if (!this.schedule) {
+      return 0;
+    }
+    return Math.max(0, this.schedule.threshold - this.schedule.totalInterest);
+  }
+
+  get thresholdCrossed(): boolean {
+    return !!this.schedule && this.schedule.totalInterest > this.schedule.threshold;
+  }
+
+  /**
+   * A declaration is on record but deposit accounts are still set to withhold —
+   * the branch has not switched them off.
+   */
+  get declarationNotAppliedToAccounts(): boolean {
+    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => a.withHoldTax);
+  }
+
+  /**
+   * The customer filed a declaration but holds joint deposits where someone else
+   * is the deductee — their form does nothing for those.
+   */
+  get declarationUselessOnJointAccounts(): boolean {
+    return !!this.declarationForSelectedFy() && this.jointHolderAccounts.length > 0;
+  }
+
+  /** Worth prompting the branch to collect a declaration. */
+  get shouldSuggestDeclaration(): boolean {
+    return !this.declarationForSelectedFy() && (this.schedule?.totalTds ?? 0) > 0;
+  }
+
+  trackLine(_: number, line: TdsQuarterLine): number {
+    return line.quarter;
+  }
+
+  trackAccount(_: number, account: Form121AccountRow): string {
+    return account.accountNo;
+  }
+}

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

@@ -42,6 +42,32 @@
 
     <!-- KYC Summary (read-only when not in edit mode) -->
     @if (!isEditMode && kycData) {
+      @if (kycData.isException && !kycData.exceptionResolved) {
+        <div
+          class="kyc-exception-banner"
+          style="
+            background: #fef3c7;
+            border: 1px solid #f59e0b;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 20px;
+            display: flex;
+            align-items: flex-start;
+            gap: 12px;
+          "
+        >
+          <mat-icon style="color: #d97706; margin-top: 2px">warning</mat-icon>
+          <div>
+            <strong style="color: #92400e; font-size: 14px">KYC Exception Active</strong>
+            <p style="color: #b45309; font-size: 13px; margin: 4px 0 0 0">
+              Account is open under a temporary KYC Exception. Reason:
+              <strong>{{ kycData.exceptionReason || 'Other' }}</strong
+              >. Please contact the customer and complete verification as soon as possible.
+            </p>
+          </div>
+        </div>
+      }
+
       <!-- Verification Table -->
       <div class="kv-table">
         <div class="kv-table__header">
@@ -740,6 +766,32 @@
                 </mat-select>
               </mat-form-field>
 
+              <!-- KYC Exception Flag -->
+              <div
+                class="full-span exception-controls-row"
+                style="display: flex; align-items: center; gap: 20px; margin-bottom: 12px; flex-wrap: wrap"
+              >
+                <mat-checkbox formControlName="isException" style="margin-top: 8px">Mark as KYC Exception</mat-checkbox>
+
+                @if (kycForm.get('isException')?.value) {
+                  <mat-form-field appearance="outline" style="flex: 1; min-width: 250px">
+                    <mat-label>Exception Reasons</mat-label>
+                    <mat-select formControlName="exceptionReason" multiple>
+                      @if (!isNonIndividual) {
+                        <mat-option value="PAN Card Verification Failed">PAN Card Verification Failed</mat-option>
+                        <mat-option value="Aadhaar Verification Failed">Aadhaar Verification Failed</mat-option>
+                      } @else {
+                        <mat-option value="Enterprise PAN Verification Failed"
+                          >Enterprise PAN Verification Failed</mat-option
+                        >
+                        <mat-option value="GSTIN Verification Failed">GSTIN Verification Failed</mat-option>
+                        <mat-option value="CIN Verification Failed">CIN Verification Failed</mat-option>
+                      }
+                    </mat-select>
+                  </mat-form-field>
+                }
+              </div>
+
               <!-- Remarks -->
               <mat-form-field appearance="outline" class="full-span">
                 <mat-label>{{ 'labels.inputs.Remarks' | translate }}</mat-label>

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

@@ -14,6 +14,7 @@ import { catchError, of, Subject, takeUntil } from 'rxjs';
 
 /** Custom Services */
 import { ClientsService } from '../../clients.service';
+import { deriveKycExceptionFields } from '../../kyc-exception.util';
 import { Dates } from 'app/core/utils/dates';
 import { jsPDF } from 'jspdf';
 import { MatIcon } from '@angular/material/icon';
@@ -121,7 +122,9 @@ export class KycTabComponent implements OnInit, OnDestroy {
       '',
       [Validators.pattern(/^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$/)]
     ],
-    remarks: ['']
+    remarks: [''],
+    isException: [false],
+    exceptionReason: [[]]
   });
 
   ngOnInit(): void {
@@ -157,7 +160,9 @@ export class KycTabComponent implements OnInit, OnDestroy {
             // the full 12-digit number to re-verify, so don't pre-fill.
             aadhaarNumber: '',
             gstinNumber: data.gstinNumber || '',
-            remarks: data.remarks || ''
+            remarks: data.remarks || '',
+            isException: data.isException || false,
+            exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
           });
         }
       });
@@ -195,6 +200,28 @@ export class KycTabComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Exception columns derived from verification status — see `deriveKycExceptionFields()`.
+   *
+   * A field counts as verified if it was verified in this session OR is already verified on the
+   * stored record; either way the customer has cleared that check. Verifying one of two
+   * outstanding items narrows the exception to the remaining one rather than closing it.
+   */
+  private buildExceptionFields() {
+    const panVerified = this.verificationStatus.pan === 'VERIFIED' || this.kycData?.panVerified === true;
+    const aadhaarVerified = this.verificationStatus.aadhaar === 'VERIFIED' || this.kycData?.aadhaarVerified === true;
+
+    return deriveKycExceptionFields({
+      panVerified,
+      aadhaarVerified,
+      aadhaarApplicable: !this.isNonIndividual,
+      hadException: this.kycData?.isException === true,
+      previousReason: this.kycData?.exceptionReason || null,
+      manualReasons: Array.isArray(this.kycForm.value.exceptionReason) ? this.kycForm.value.exceptionReason : [],
+      todayFormatted: this.dateUtils.formatDate(new Date(), 'dd MMMM yyyy')
+    });
+  }
+
   saveKyc(): void {
     if (this.kycForm.invalid) {
       return;
@@ -210,7 +237,10 @@ export class KycTabComponent implements OnInit, OnDestroy {
       panNumber: this.kycForm.value.panNumber || null,
       aadhaarNumberMasked: aadhaarMasked,
       gstinNumber: this.kycForm.value.gstinNumber || null,
-      remarks: this.kycForm.value.remarks || null
+      remarks: this.kycForm.value.remarks || null,
+      // dateFormat is required so the backend can parse exceptionResolvedOn when an exception closes.
+      dateFormat: 'dd MMMM yyyy',
+      ...this.buildExceptionFields()
     };
 
     if (!this.kycId) {
@@ -244,6 +274,38 @@ export class KycTabComponent implements OnInit, OnDestroy {
     });
   }
 
+  private saveKycBeforeVerify(callback: () => void, field: 'pan' | 'aadhaar' | 'gstin'): void {
+    if (this.isEditMode) {
+      const aadhaarRaw = this.kycForm.value.aadhaarNumber || '';
+      const aadhaarMasked = aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : aadhaarRaw || null;
+      const payload: any = {
+        locale: 'en',
+        panNumber: this.kycForm.value.panNumber || null,
+        aadhaarNumberMasked: aadhaarMasked,
+        gstinNumber: this.kycForm.value.gstinNumber || null,
+        remarks: this.kycForm.value.remarks || null,
+        riskCategory: this.kycForm.value.riskCategory || 1,
+        dateFormat: 'dd MMMM yyyy',
+        ...this.buildExceptionFields()
+      };
+
+      this.clientsService.updateClientKyc(this.clientId, this.kycId, payload).subscribe({
+        next: () => {
+          this.loadKycData();
+          callback();
+        },
+        error: (err: any) => {
+          this.verifying[field] = false;
+          this.verificationStatus[field] = 'FAILED';
+          this.verificationError[field] =
+            err?.error?.defaultUserMessage || `Failed to update ${field.toUpperCase()} number before verification.`;
+        }
+      });
+    } else {
+      callback();
+    }
+  }
+
   verifyPAN(): void {
     if (!this.kycId) {
       this.verificationError.pan = 'KYC record not found. Save KYC details first.';
@@ -254,31 +316,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
     this.verificationError.pan = null;
     this.verificationDetails.pan = null;
 
-    this.clientsService
-      .verifyPAN(this.clientId, this.kycId)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.pan = false;
-          if (response?.changes?.panVerified) {
-            this.verificationStatus.pan = 'VERIFIED';
-            this.verificationDetails.pan = response.changes;
-            this.loadKycData();
-          } else {
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .verifyPAN(this.clientId, this.kycId)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.pan = false;
+            if (response?.changes?.panVerified) {
+              this.verificationStatus.pan = 'VERIFIED';
+              this.verificationDetails.pan = response.changes;
+              this.loadKycData();
+            } else {
+              this.verificationStatus.pan = 'FAILED';
+              this.verificationError.pan = 'PAN verification failed.';
+            }
+          },
+          error: (err: any) => {
+            this.verifying.pan = false;
             this.verificationStatus.pan = 'FAILED';
-            this.verificationError.pan = 'PAN verification failed.';
+            this.verificationError.pan =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'PAN verification failed. Please try again.';
           }
-        },
-        error: (err: any) => {
-          this.verifying.pan = false;
-          this.verificationStatus.pan = 'FAILED';
-          this.verificationError.pan =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'PAN verification failed. Please try again.';
-        }
-      });
+        });
+    }, 'pan');
   }
 
   /** Show Aadhaar input in summary view for re-verification */
@@ -305,31 +369,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
     this.aadhaarOtpSent = false;
     this.aadhaarOtp = '';
 
-    this.clientsService
-      .sendAadhaarOtp(this.clientId, this.kycId, aadhaar)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.aadhaar = false;
-          const refNumber =
-            response?.changes?.aadhaarRefNumber ||
-            response?.aadhaarRefNumber ||
-            response?.changes?.referenceNumber ||
-            response?.resourceId;
-          this.aadhaarOtpSent = true;
-          this.aadhaarOtpReferenceId = refNumber || null;
-          this.verificationStatus.aadhaar = 'PENDING';
-        },
-        error: (err: any) => {
-          this.verifying.aadhaar = false;
-          this.verificationStatus.aadhaar = 'FAILED';
-          this.verificationError.aadhaar =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'Failed to send OTP. Please try again.';
-        }
-      });
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .sendAadhaarOtp(this.clientId, this.kycId, aadhaar)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.aadhaar = false;
+            const refNumber =
+              response?.changes?.aadhaarRefNumber ||
+              response?.aadhaarRefNumber ||
+              response?.changes?.referenceNumber ||
+              response?.resourceId;
+            this.aadhaarOtpSent = true;
+            this.aadhaarOtpReferenceId = refNumber || null;
+            this.verificationStatus.aadhaar = 'PENDING';
+          },
+          error: (err: any) => {
+            this.verifying.aadhaar = false;
+            this.verificationStatus.aadhaar = 'FAILED';
+            this.verificationError.aadhaar =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'Failed to send OTP. Please try again.';
+          }
+        });
+    }, 'aadhaar');
   }
 
   /** Step 2: Verify OTP entered by user */
@@ -380,31 +446,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
     this.verificationError.gstin = null;
     this.verificationDetails.gstin = null;
 
-    this.clientsService
-      .verifyGSTIN(this.clientId, this.kycId)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.gstin = false;
-          if (response?.changes?.gstinVerified) {
-            this.verificationStatus.gstin = 'VERIFIED';
-            this.verificationDetails.gstin = response.changes;
-            this.loadKycData();
-          } else {
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .verifyGSTIN(this.clientId, this.kycId)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.gstin = false;
+            if (response?.changes?.gstinVerified) {
+              this.verificationStatus.gstin = 'VERIFIED';
+              this.verificationDetails.gstin = response.changes;
+              this.loadKycData();
+            } else {
+              this.verificationStatus.gstin = 'FAILED';
+              this.verificationError.gstin = 'GSTIN verification failed.';
+            }
+          },
+          error: (err: any) => {
+            this.verifying.gstin = false;
             this.verificationStatus.gstin = 'FAILED';
-            this.verificationError.gstin = 'GSTIN verification failed.';
+            this.verificationError.gstin =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'GSTIN verification failed. Please try again.';
           }
-        },
-        error: (err: any) => {
-          this.verifying.gstin = false;
-          this.verificationStatus.gstin = 'FAILED';
-          this.verificationError.gstin =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'GSTIN verification failed. Please try again.';
-        }
-      });
+        });
+    }, 'gstin');
   }
 
   formatDate(date: any): string {

src/app/clients/clients.module.ts

@@ -62,6 +62,7 @@ import { ClientFamilyMembersStepComponent } from './client-stepper/client-family
 import { ClientPreviewStepComponent } from './client-stepper/client-preview-step/client-preview-step.component';
 import { ClientAddressStepComponent } from './client-stepper/client-address-step/client-address-step.component';
 import { ClientFamilyMemberDialogComponent } from './client-stepper/client-family-members-step/client-family-member-dialog/client-family-member-dialog.component';
+import { ClientFamilyMemberChildDialogComponent } from './client-stepper/client-family-members-step/client-family-member-child-dialog/client-family-member-child-dialog.component';
 import { CaptureImageDialogComponent } from './clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component';
 import { AddClientCollateralComponent } from './clients-view/client-actions/add-client-collateral/add-client-collateral.component';
 import { ClientDatatableStepComponent } from './client-stepper/client-datatable-step/client-datatable-step.component';
@@ -127,6 +128,7 @@ import { Form60TabComponent } from './clients-view/form60-tab/form60-tab.compone
     ClientPreviewStepComponent,
     ClientAddressStepComponent,
     ClientFamilyMemberDialogComponent,
+    ClientFamilyMemberChildDialogComponent,
     CaptureImageDialogComponent,
     AddClientCollateralComponent,
     ClientDatatableStepComponent,

src/app/clients/clients.service.ts

@@ -123,6 +123,20 @@ export class ClientsService {
     return this.http.post(`/clients/${clientId}/edit/reject`, { rejectReason: rejectReason || '' });
   }
 
+  /** Fetches the exact email content (subject, body, sentAt, openedAt) for a given pending edit.
+   *  Only populated after the Checker has approved and the send succeeded. */
+  getClientEditEmailPreview(clientId: string | number, pendingEditId: string | number) {
+    return this.http.get<{
+      emailSubject: string | null;
+      emailBody: string | null;
+      emailSent: boolean;
+      emailSentAt: string | null;
+      emailOpenedAt: string | null;
+      emailFrom: string | null;
+      emailTo: string | null;
+    }>(`/clients/${clientId}/edit/${pendingEditId}/email-preview`);
+  }
+
   getClientDataAndTemplate(clientId: string) {
     const httpParams = new HttpParams().set('template', 'true').set('staffInSelectedOfficeOnly', 'true');
     return this.http.get(`/clients/${clientId}`, { params: httpParams });
@@ -958,4 +972,33 @@ export class ClientsService {
   dispatchWelcomeKit(clientId: string | number, data: any): Observable<any> {
     return this.http.post(`/clients/${clientId}/welcomekit`, data);
   }
+
+  updateWelcomeKitStatus(welcomeKitId: number, status: string): Observable<any> {
+    return this.http.put(`/welcomekit/${welcomeKitId}`, { status });
+  }
+
+  getKycExceptions(resolved = false): Observable<any[]> {
+    return this.http.get<any[]>(`/kyc/exceptions?resolved=${resolved}`);
+  }
+
+  /**
+   * Records a KYC-exception outreach attempt against a customer, and — for the SMS, EMAIL and
+   * WHATSAPP channels — actually transmits the notice.
+   *
+   * The destination is resolved server-side from the client record; it is deliberately not part of
+   * this payload, so a tampered request cannot redirect a KYC notice elsewhere.
+   *
+   * Resolves with HTTP 200 even when delivery fails — inspect `deliveryStatus` / `delivered` on the
+   * response rather than assuming success, since the log row is written either way.
+   */
+  saveKycContactLog(
+    clientId: string | number,
+    data: { channel: string; notes: string; officerName?: string }
+  ): Observable<any> {
+    return this.http.post(`/kyc/exceptions/${clientId}/contact-log`, data);
+  }
+
+  getKycContactLog(clientId: string | number): Observable<any[]> {
+    return this.http.get<any[]>(`/kyc/exceptions/${clientId}/contact-log`);
+  }
 }

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

@@ -430,8 +430,22 @@ export class CreateClientComponent {
       }
       this.validationError = '';
       // Save KYC
-      if (this.clientKycStep?.hasKycData && !this.clientKycStep.kycId) {
-        this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({ error: () => {} });
+      if (this.clientKycStep?.hasKycData) {
+        if (!this.clientKycStep.kycId) {
+          this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
+            next: (res: any) => {
+              if (this.clientKycStep) {
+                this.clientKycStep.kycId = res?.resourceId?.toString() || res?.entityId?.toString() || '';
+              }
+            },
+            error: () => {}
+          });
+        } else {
+          const { kycType, ...updatePayload } = this.clientKycStep.kycData;
+          this.clientsService
+            .updateClientKyc(clientId, this.clientKycStep.kycId, updatePayload)
+            .subscribe({ error: () => {} });
+        }
       }
       // Upload photo & signature
       if (this.clientKycStep?.photographFile) {
@@ -696,12 +710,20 @@ export class CreateClientComponent {
     // Persist the KYC document picker selection + uploaded files as a client identifier
     this.saveKycDocProof(clientId);
 
-    // Save KYC only if it wasn't already created during the KYC step
-    if (this.clientKycStep?.hasKycData && !this.clientKycStep.kycId) {
-      this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
-        next: () => navigateToClient(),
-        error: () => navigateToClient()
-      });
+    // Save/update KYC to ensure latest exception fields are persisted
+    if (this.clientKycStep?.hasKycData) {
+      if (!this.clientKycStep.kycId) {
+        this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
+          next: () => navigateToClient(),
+          error: () => navigateToClient()
+        });
+      } else {
+        const { kycType, ...updatePayload } = this.clientKycStep.kycData;
+        this.clientsService.updateClientKyc(clientId, this.clientKycStep.kycId, updatePayload).subscribe({
+          next: () => navigateToClient(),
+          error: () => navigateToClient()
+        });
+      }
     } else {
       navigateToClient();
     }

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

@@ -84,14 +84,70 @@
                   <mat-icon>phone_iphone</mat-icon>
                   <span>Mobile Number</span>
                 </div>
+                <div class="contact-verify-panel__exception-row" style="margin-bottom: 12px">
+                  <mat-checkbox
+                    [checked]="oldMobileNotAccessible"
+                    (change)="onOldMobileNotAccessibleToggle($event.checked)"
+                    color="primary"
+                  >
+                    Old mobile number not accessible (lost / deactivated SIM)
+                  </mat-checkbox>
+                </div>
                 <div class="contact-verify-panel__grid">
-                  <mifosx-client-contact-otp-block
-                    [clientId]="clientId"
-                    channel="MOBILE"
-                    [destination]="contactChanges.oldMobile"
-                    label="Old Mobile Number"
-                    (stateChange)="onOldMobileOtpState($event)"
-                  ></mifosx-client-contact-otp-block>
+                  @if (!oldMobileNotAccessible) {
+                    <mifosx-client-contact-otp-block
+                      [clientId]="clientId"
+                      channel="MOBILE"
+                      [destination]="contactChanges.oldMobile"
+                      label="Old Mobile Number"
+                      (stateChange)="onOldMobileOtpState($event)"
+                    ></mifosx-client-contact-otp-block>
+                  } @else {
+                    <div
+                      class="fir-upload-box"
+                      style="padding: 12px; border: 1px dashed #cbd5e1; border-radius: 8px; background: #f8fafc"
+                    >
+                      <div style="font-weight: 500; font-size: 13px; margin-bottom: 6px; color: #475569">
+                        Upload Police Complaint / FIR Copy for Lost Mobile
+                      </div>
+                      <div style="display: flex; align-items: center; gap: 12px">
+                        <input
+                          type="file"
+                          (change)="onFirFileSelected($event)"
+                          accept=".pdf,.jpg,.jpeg,.png"
+                          #firFileInput
+                          hidden
+                        />
+                        <button
+                          mat-stroked-button
+                          type="button"
+                          (click)="firFileInput.click()"
+                          [disabled]="uploadingFir"
+                        >
+                          <mat-icon>upload_file</mat-icon>
+                          {{ firFileName ? firFileName : 'Select FIR Document' }}
+                        </button>
+                        @if (uploadingFir) {
+                          <mat-progress-spinner mode="indeterminate" diameter="20"></mat-progress-spinner>
+                        }
+                        @if (firDocumentId && !uploadingFir) {
+                          <span
+                            style="
+                              color: #16a34a;
+                              font-size: 12px;
+                              font-weight: 500;
+                              display: flex;
+                              align-items: center;
+                              gap: 4px;
+                            "
+                          >
+                            <mat-icon style="font-size: 16px; width: 16px; height: 16px">check_circle</mat-icon> FIR
+                            Uploaded Successfully
+                          </span>
+                        }
+                      </div>
+                    </div>
+                  }
                   <mifosx-client-contact-otp-block
                     [clientId]="clientId"
                     channel="MOBILE"

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

@@ -33,6 +33,7 @@ import { ContactOtpBlockComponent, ContactOtpState } from './contact-otp-block/c
 
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatIconModule } from '@angular/material/icon';
+import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatDivider } from '@angular/material/divider';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
@@ -51,6 +52,7 @@ import { ORIGINAL_VALUES_PAYLOAD_KEY, buildOriginalValuesSnapshot } from '../sha
     ...STANDALONE_SHARED_IMPORTS,
     MatTabsModule,
     MatIconModule,
+    MatCheckboxModule,
     MatDivider,
     FaIconComponent,
     MatProgressSpinner,
@@ -108,6 +110,13 @@ export class EditClientComponent {
   newMobileOtpId: number | null = null;
   oldMobileVerified = false;
   newMobileVerified = false;
+
+  // FIR exception flow properties for inaccessible old mobile number
+  oldMobileNotAccessible = false;
+  firFileName = '';
+  firDocumentId: number | null = null;
+  uploadingFir = false;
+
   oldEmailOtpId: number | null = null;
   newEmailOtpId: number | null = null;
   oldEmailVerified = false;
@@ -215,11 +224,15 @@ export class EditClientComponent {
     return this.detectSensitiveFieldChanges(this.clientDataAndTemplate);
   }
 
-  /** Whether every OTP block required by the fields that actually changed has been verified. */
+  /** Whether every OTP block required by the fields that actually changed has been verified
+   *  (or the FIR exception has been uploaded in place of old-mobile OTP verification). */
   get contactVerificationComplete(): boolean {
     const changes = this.contactChanges;
-    if (changes.mobileChanged && !(this.oldMobileVerified && this.newMobileVerified)) {
-      return false;
+    if (changes.mobileChanged) {
+      const isOldSatisfied = this.oldMobileNotAccessible ? this.firDocumentId != null : this.oldMobileVerified;
+      if (!isOldSatisfied || !this.newMobileVerified) {
+        return false;
+      }
     }
     if (changes.emailChanged && !(this.oldEmailVerified && this.newEmailVerified)) {
       return false;
@@ -227,6 +240,43 @@ export class EditClientComponent {
     return true;
   }
 
+  /** Toggle the "old mobile not accessible" exception — clears any in-progress old-mobile OTP. */
+  onOldMobileNotAccessibleToggle(checked?: boolean): void {
+    if (checked !== undefined) {
+      this.oldMobileNotAccessible = checked;
+    }
+    if (this.oldMobileNotAccessible) {
+      this.oldMobileOtpId = null;
+      this.oldMobileVerified = false;
+    }
+  }
+
+  /** Upload the FIR / police-complaint copy that substitutes for old-mobile OTP verification. */
+  onFirFileSelected(event: any): void {
+    const file: File = event.target?.files?.[0];
+    if (!file) return;
+    this.firFileName = file.name;
+    this.uploadingFir = true;
+
+    const formData = new FormData();
+    formData.append('file', file);
+    formData.append('name', 'FIR - Lost Mobile Number');
+    formData.append('description', 'FIR police complaint copy for lost mobile number verification exception');
+
+    this.clientsService.uploadClientDocument(this.clientId, formData).subscribe({
+      next: (res: any) => {
+        this.uploadingFir = false;
+        this.firDocumentId = res?.resourceId || res?.id || null;
+        this.snackBar.open('FIR document uploaded successfully', 'Close', { duration: 3000 });
+      },
+      error: () => {
+        this.uploadingFir = false;
+        this.firDocumentId = null;
+        this.snackBar.open('Failed to upload FIR document', 'Close', { duration: 4000 });
+      }
+    });
+  }
+
   onOldMobileOtpState(state: ContactOtpState): void {
     this.oldMobileOtpId = state.otpId;
     this.oldMobileVerified = state.verified;
@@ -254,6 +304,10 @@ export class EditClientComponent {
     this.newMobileOtpId = null;
     this.oldMobileVerified = false;
     this.newMobileVerified = false;
+    this.oldMobileNotAccessible = false;
+    this.firFileName = '';
+    this.firDocumentId = null;
+    this.uploadingFir = false;
     this.oldEmailOtpId = null;
     this.newEmailOtpId = null;
     this.oldEmailVerified = false;
@@ -439,7 +493,11 @@ export class EditClientComponent {
       // email's when BOTH changed in the same save. See the class-level JSDoc above the OTP
       // state fields for the full naming rationale.
       if (changedFields.mobileChanged) {
-        clientData.mobileOldOtpId = this.oldMobileOtpId;
+        if (this.oldMobileNotAccessible && this.firDocumentId) {
+          (clientData as any).oldMobileVerificationExceptionDocumentId = this.firDocumentId;
+        } else {
+          clientData.mobileOldOtpId = this.oldMobileOtpId;
+        }
         clientData.mobileNewOtpId = this.newMobileOtpId;
       }
       if (changedFields.emailChanged) {
@@ -630,16 +688,36 @@ export class EditClientComponent {
 
   private detectSensitiveFieldChanges(originalData: any) {
     const form = this.clientGeneralForm;
+    if (!form || !originalData) {
+      return {
+        nameChanged: false,
+        mobileChanged: false,
+        emailChanged: false,
+        dobChanged: false,
+        oldName: '',
+        newName: '',
+        oldMobile: '',
+        newMobile: '',
+        oldEmail: '',
+        newEmail: '',
+        oldDob: '',
+        newDob: ''
+      };
+    }
+
+    const mobileControl = form.get('mobileNo');
+    const emailControl = form.get('emailAddress');
+
     // Trimmed so browser autofill adding invisible leading/trailing whitespace never reads as
     // a "change" — the masked preview shown in the Verify Contact Change panel only reveals the
     // first couple of characters, so a whitespace-only difference is otherwise invisible to the
     // user and just looks like the panel appeared for no reason. These trimmed-but-original-case
     // values are what get returned/sent as the actual OTP destination and saved value — only the
-    // *comparison* (below) is further case-normalized for email, so we never silently rewrite the
-    // customer's email casing into the saved record or the OTP destination.
-    const newMobile = (form?.get('mobileNo')?.value || '').trim();
-    const newEmail = (form?.get('emailAddress')?.value || '').trim();
-    const newDobRaw = form?.get('dateOfBirth')?.value;
+    // *comparison* (below) is further normalized for mobile/email, so we never silently rewrite the
+    // customer's saved value or the OTP destination.
+    const newMobile = (mobileControl?.value || '').toString().trim();
+    const newEmail = (emailControl?.value || '').toString().trim();
+    const newDobRaw = form.get('dateOfBirth')?.value;
     // Local calendar date, NOT `.toISOString()` — that converts to UTC first, which silently
     // shifts the date by a day in any positive-UTC-offset timezone (e.g. India, UTC+5:30:
     // midnight local on the 15th becomes 18:30 UTC on the 14th). That made this comparison
@@ -647,8 +725,8 @@ export class EditClientComponent {
     // touched the date field, purely because the Date object round-tripped through the picker.
     const newDob = newDobRaw instanceof Date ? this.toLocalDateString(newDobRaw) : newDobRaw || '';
 
-    const oldMobile = (originalData.mobileNo || '').trim();
-    const oldEmail = (originalData.emailAddress || '').trim();
+    const oldMobile = (originalData.mobileNo || '').toString().trim();
+    const oldEmail = (originalData.emailAddress || '').toString().trim();
     const oldDobRaw = originalData.dateOfBirth;
     const oldDob = Array.isArray(oldDobRaw)
       ? `${oldDobRaw[0]}-${String(oldDobRaw[1]).padStart(2, '0')}-${String(oldDobRaw[2]).padStart(2, '0')}`
@@ -681,12 +759,25 @@ export class EditClientComponent {
       fullname: originalData.fullname || ''
     });
 
+    // Normalize phone numbers by stripping non-digit characters (+91 9009009009 -> 9009009009)
+    const normPhone = (val: string) => val.replace(/\D/g, '');
+    const newMobileNorm = normPhone(newMobile);
+    const oldMobileNorm = normPhone(oldMobile);
+
+    // Mobile/Email are considered changed ONLY when the control has been edited (dirty) AND
+    // normalized values differ — otherwise a re-render/reformat of the control by the framework
+    // (never actually touched by the user) would falsely surface the dual-OTP verification panel.
+    const mobileChanged =
+      !!oldMobileNorm && !!newMobileNorm && !!mobileControl?.dirty && newMobileNorm !== oldMobileNorm;
+    // Case-insensitive: emails are not case-sensitive in practice, and comparing raw case
+    // would flag a change (surfacing the dual-OTP panel) even when nothing meaningful changed.
+    const emailChanged =
+      !!oldEmail && !!newEmail && !!emailControl?.dirty && newEmail.toLowerCase() !== oldEmail.toLowerCase();
+
     return {
       nameChanged: newName !== oldName,
-      mobileChanged: newMobile !== oldMobile,
-      // Case-insensitive: emails are not case-sensitive in practice, and comparing raw case
-      // would flag a change (surfacing the dual-OTP panel) even when nothing meaningful changed.
-      emailChanged: newEmail.toLowerCase() !== oldEmail.toLowerCase(),
+      mobileChanged,
+      emailChanged,
       dobChanged: newDob !== oldDob,
       oldName,
       newName,

src/app/clients/kyc-exception.util.spec.ts

@@ -0,0 +1,175 @@
+/**
+ * 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 {
+  deriveKycExceptionFields,
+  KycExceptionInput,
+  KYC_EXCEPTION_AADHAAR,
+  KYC_EXCEPTION_PAN
+} from './kyc-exception.util';
+
+const TODAY = '05 August 2026';
+
+/** Individual client, nothing previously recorded — the client-creation case. */
+const newIndividual = (panVerified: boolean, aadhaarVerified: boolean): KycExceptionInput => ({
+  panVerified,
+  aadhaarVerified,
+  aadhaarApplicable: true,
+  hadException: false,
+  previousReason: null,
+  todayFormatted: TODAY
+});
+
+/** Individual client that already carries an open exception. */
+const existingException = (
+  panVerified: boolean,
+  aadhaarVerified: boolean,
+  previousReason: string
+): KycExceptionInput => ({
+  panVerified,
+  aadhaarVerified,
+  aadhaarApplicable: true,
+  hadException: true,
+  previousReason,
+  todayFormatted: TODAY
+});
+
+describe('deriveKycExceptionFields', () => {
+  describe('at client creation', () => {
+    it('marks both PAN and Aadhaar when neither is entered or verified', () => {
+      expect(deriveKycExceptionFields(newIndividual(false, false))).toEqual({
+        isException: true,
+        exceptionReason: `${KYC_EXCEPTION_PAN}, ${KYC_EXCEPTION_AADHAAR}`,
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('marks only PAN when Aadhaar verified but PAN did not', () => {
+      expect(deriveKycExceptionFields(newIndividual(false, true))).toEqual({
+        isException: true,
+        exceptionReason: KYC_EXCEPTION_PAN,
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('marks only Aadhaar when PAN verified but Aadhaar did not', () => {
+      expect(deriveKycExceptionFields(newIndividual(true, false))).toEqual({
+        isException: true,
+        exceptionReason: KYC_EXCEPTION_AADHAAR,
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('raises nothing when both verify, and does not mark the client resolved', () => {
+      // A clean client never had an exception, so it must not appear in the Resolved tab either.
+      expect(deriveKycExceptionFields(newIndividual(true, true))).toEqual({
+        isException: false,
+        exceptionReason: null,
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('does not raise an Aadhaar exception for a non-individual client', () => {
+      // Companies submit a dummy masked Aadhaar; checking it would mean a permanent exception.
+      expect(
+        deriveKycExceptionFields({
+          panVerified: true,
+          aadhaarVerified: false,
+          aadhaarApplicable: false,
+          hadException: false,
+          previousReason: null,
+          todayFormatted: TODAY
+        }).isException
+      ).toBe(false);
+    });
+  });
+
+  describe('resolving', () => {
+    it('closes the exception once both checks pass, keeping the reason for the audit trail', () => {
+      const both = `${KYC_EXCEPTION_PAN}, ${KYC_EXCEPTION_AADHAAR}`;
+      expect(deriveKycExceptionFields(existingException(true, true, both))).toEqual({
+        isException: false,
+        exceptionReason: both,
+        exceptionResolved: true,
+        exceptionResolvedOn: TODAY
+      });
+    });
+
+    it('narrows to the outstanding item when only one of two verifies', () => {
+      const both = `${KYC_EXCEPTION_PAN}, ${KYC_EXCEPTION_AADHAAR}`;
+      // PAN verified, Aadhaar still outstanding — stays open, listing Aadhaar alone.
+      expect(deriveKycExceptionFields(existingException(true, false, both))).toEqual({
+        isException: true,
+        exceptionReason: KYC_EXCEPTION_AADHAAR,
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('narrows the other way round too', () => {
+      const both = `${KYC_EXCEPTION_PAN}, ${KYC_EXCEPTION_AADHAAR}`;
+      expect(deriveKycExceptionFields(existingException(false, true, both)).exceptionReason).toBe(KYC_EXCEPTION_PAN);
+    });
+  });
+
+  describe('re-opening', () => {
+    it('clears a prior resolution so a new exception returns to Pending', () => {
+      // Regression: without exceptionResolved=false the record still matched the Resolved query
+      // and a brand-new exception appeared as already closed.
+      const result = deriveKycExceptionFields({
+        panVerified: false,
+        aadhaarVerified: true,
+        aadhaarApplicable: true,
+        hadException: false,
+        previousReason: 'PAN Card Verification Failed',
+        todayFormatted: TODAY
+      });
+      expect(result.exceptionResolved).toBe(false);
+      expect(result.exceptionResolvedOn).toBeNull();
+      expect(result.isException).toBe(true);
+    });
+  });
+
+  describe('officer-entered reasons', () => {
+    it('keeps a manual reason alongside the automatic ones', () => {
+      const result = deriveKycExceptionFields({
+        ...newIndividual(true, true),
+        manualReasons: ['Address proof pending']
+      });
+      expect(result).toEqual({
+        isException: true,
+        exceptionReason: 'Address proof pending',
+        exceptionResolved: false,
+        exceptionResolvedOn: null
+      });
+    });
+
+    it('drops a stale automatic reason left in the form once the check passes', () => {
+      // The form still holds 'PAN Card Verification Failed' from a previous load; PAN has since
+      // verified, so it must not survive into the payload.
+      const result = deriveKycExceptionFields({
+        ...newIndividual(true, true),
+        manualReasons: [KYC_EXCEPTION_PAN]
+      });
+      expect(result.isException).toBe(false);
+      expect(result.exceptionReason).toBeNull();
+    });
+
+    it('does not duplicate a manual reason that matches an outstanding automatic one', () => {
+      const result = deriveKycExceptionFields({
+        ...newIndividual(false, true),
+        manualReasons: [KYC_EXCEPTION_PAN]
+      });
+      expect(result.exceptionReason).toBe(KYC_EXCEPTION_PAN);
+    });
+  });
+});

src/app/clients/kyc-exception.util.ts

@@ -0,0 +1,112 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Derives a client's KYC exception state from their verification status.
+ *
+ * A KYC exception is not something an officer should have to remember to tick — it is simply the
+ * fact that a mandatory identity check has not passed. Deriving it means the exception list can
+ * never drift out of step with reality: raising, narrowing and closing all fall out of whether PAN
+ * and Aadhaar are verified at the moment of the save.
+ *
+ * Shared by the client-creation stepper and the client-view KYC tab so both write identical state.
+ */
+
+export const KYC_EXCEPTION_PAN = 'PAN Card Verification Failed';
+export const KYC_EXCEPTION_AADHAAR = 'Aadhaar Verification Failed';
+
+/** The two reasons this module owns. Anything else on a record was added by an officer by hand. */
+export const AUTO_MANAGED_KYC_EXCEPTION_REASONS: string[] = [
+  KYC_EXCEPTION_PAN,
+  KYC_EXCEPTION_AADHAAR
+];
+
+export interface KycExceptionInput {
+  /** PAN verified against the Income Tax database. Unverified OR simply not entered → exception. */
+  panVerified: boolean;
+  /** Aadhaar verified against UIDAI. Unverified OR simply not entered → exception. */
+  aadhaarVerified: boolean;
+  /**
+   * False for non-individual clients, where no Aadhaar is collected (the payload sends a dummy
+   * masked value). Without this guard every company would carry a permanent Aadhaar exception.
+   */
+  aadhaarApplicable: boolean;
+  /** Whether an exception is already recorded — decides raise vs. resolve on a clean save. */
+  hadException: boolean;
+  /** Reason currently persisted, kept verbatim when closing so the audit trail survives. */
+  previousReason: string | null;
+  /** Officer-entered reasons beyond the two automatic ones; carried through untouched. */
+  manualReasons?: string[];
+  /** Today in the tenant's date format — stamped as exceptionResolvedOn when closing. */
+  todayFormatted: string;
+}
+
+export interface KycExceptionFields {
+  isException: boolean;
+  exceptionReason: string | null;
+  exceptionResolved: boolean;
+  exceptionResolvedOn: string | null;
+}
+
+/**
+ * Maps verification status to the four exception columns the API expects.
+ *
+ * Three outcomes:
+ * - **Something outstanding** → raise/keep the exception, listing only what is still failing. A
+ *   record that had both PAN and Aadhaar outstanding and has since verified PAN comes back with
+ *   Aadhaar alone, which is what narrows the entry rather than closing it.
+ * - **Nothing outstanding, exception existed** → close it. `exceptionReason` is retained on
+ *   purpose: the Resolved tab shows what was resolved, and clearing it would erase the record of
+ *   why the exception was ever raised.
+ * - **Nothing outstanding, no exception** → leave every flag off, so a clean client never appears
+ *   in either tab.
+ */
+export function deriveKycExceptionFields(input: KycExceptionInput): KycExceptionFields {
+  const outstanding: string[] = [];
+
+  if (!input.panVerified) {
+    outstanding.push(KYC_EXCEPTION_PAN);
+  }
+  if (input.aadhaarApplicable && !input.aadhaarVerified) {
+    outstanding.push(KYC_EXCEPTION_AADHAAR);
+  }
+
+  // Officer-added reasons ride along, but the two automatic ones are filtered out first — a stale
+  // 'PAN Card Verification Failed' left in the form must not survive PAN actually being verified.
+  for (const reason of input.manualReasons || []) {
+    const trimmed = (reason || '').trim();
+    if (trimmed && !AUTO_MANAGED_KYC_EXCEPTION_REASONS.includes(trimmed) && !outstanding.includes(trimmed)) {
+      outstanding.push(trimmed);
+    }
+  }
+
+  if (outstanding.length > 0) {
+    return {
+      isException: true,
+      exceptionReason: outstanding.join(', '),
+      exceptionResolved: false,
+      exceptionResolvedOn: null
+    };
+  }
+
+  if (input.hadException) {
+    return {
+      isException: false,
+      exceptionReason: input.previousReason || null,
+      exceptionResolved: true,
+      exceptionResolvedOn: input.todayFormatted
+    };
+  }
+
+  return {
+    isException: false,
+    exceptionReason: null,
+    exceptionResolved: false,
+    exceptionResolvedOn: null
+  };
+}

src/app/core/branch-scope.service.ts

@@ -0,0 +1,98 @@
+/**
+ * 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 { AuthenticationService } from './authentication/authentication.service';
+import { GL_BRANCHES, GlBranch } from 'app/gl-reports/gl-reports-data';
+
+/**
+ * Resolves what branch data the logged-in user is allowed to see.
+ *
+ * Head Office sees every branch and can drill into any one of them; a branch login is
+ * locked to its own book. Previously this logic was copy-pasted into the Cash/Clearing
+ * Summary and the NPA report with slightly different branch code lists; this service is
+ * the single place it lives so new reports cannot drift.
+ *
+ * The logged-in office is matched to a branch by name, since session credentials carry
+ * only officeId and officeName. Office names are seeded to match the GL branch names
+ * exactly (see Liquibase 0442).
+ */
+@Injectable({ providedIn: 'root' })
+export class BranchScopeService {
+  private auth = inject(AuthenticationService);
+
+  /** Sentinel used when a branch login cannot be matched to a known branch. */
+  static readonly UNRESOLVED = '__unresolved__';
+
+  get isHeadOffice(): boolean {
+    return this.auth.isHeadOfficeUser();
+  }
+
+  /** The office name on the session, for labelling the scope in report headers. */
+  get officeName(): string {
+    return this.auth.getCredentials()?.officeName || 'Branch Office';
+  }
+
+  /**
+   * Branch code the user is confined to, or null for Head Office.
+   *
+   * Deliberately returns the UNRESOLVED sentinel rather than falling back to the first
+   * branch when the office cannot be matched: showing an unrecognised branch someone
+   * else's figures would be worse than showing them nothing.
+   */
+  get ownBranchCode(): string | null {
+    if (this.isHeadOffice) {
+      return null;
+    }
+    const name = this.officeName.toLowerCase().trim();
+    const match = GL_BRANCHES.find((b) => b.code !== 'HO' && name === b.name.toLowerCase());
+    // Fall back to a substring match for offices named e.g. "Andheri (E) Branch".
+    const loose = match ?? GL_BRANCHES.find((b) => b.code !== 'HO' && name.includes(b.name.toLowerCase()));
+    return loose?.code ?? BranchScopeService.UNRESOLVED;
+  }
+
+  /** True when the user may choose which branch to view. */
+  get canSelectBranch(): boolean {
+    return this.isHeadOffice;
+  }
+
+  /** Branches offered in a selector — everything for Head Office, nothing for a branch login. */
+  get selectableBranches(): GlBranch[] {
+    return this.isHeadOffice ? GL_BRANCHES : [];
+  }
+
+  /** Branch code a report should start on. '' means all branches consolidated. */
+  get defaultBranchCode(): string {
+    return this.isHeadOffice ? '' : (this.ownBranchCode ?? '');
+  }
+
+  /**
+   * Forces a requested branch code into what the user is actually allowed to see.
+   * Call this wherever a branch code reaches a data query, so a stale or hand-edited
+   * selection cannot widen the user's scope.
+   */
+  enforce(requested: string): string {
+    return this.isHeadOffice ? requested : (this.ownBranchCode ?? BranchScopeService.UNRESOLVED);
+  }
+
+  /** True when a branch login's office matched no known branch, so it sees no data. */
+  get isUnresolved(): boolean {
+    return this.ownBranchCode === BranchScopeService.UNRESOLVED;
+  }
+
+  /** Human label for the current scope, for report headers. */
+  scopeLabel(selectedCode: string): string {
+    if (!this.isHeadOffice) {
+      return this.officeName;
+    }
+    if (!selectedCode) {
+      return 'All Branches (Consolidated)';
+    }
+    return GL_BRANCHES.find((b) => b.code === selectedCode)?.name ?? selectedCode;
+  }
+}

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

@@ -99,6 +99,30 @@
             </svg>
             My Disbursements
           </a>
+          <a
+            class="cashier-nav__item cashier-nav__item--sec"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/share-withdrawal-request')"
+            [routerLink]="['/clerk/share-withdrawal-requests']"
+          >
+            <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <circle cx="12" cy="12" r="9" />
+              <path
+                d="M9.5 9a2.5 2.5 0 0 1 2.5-1.5c1.4 0 2.5.8 2.5 2s-1 1.5-2.5 1.9c-1.5.4-2.5.9-2.5 2.1s1.1 2 2.5 2 2.5-.7 2.5-1.6"
+              />
+            </svg>
+            My Share Requests
+          </a>
+          <a
+            class="cashier-nav__item cashier-nav__item--sec"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/share-closure-request')"
+            [routerLink]="['/clerk/share-closure-requests']"
+          >
+            <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+              <rect x="4" y="11" width="16" height="9" rx="2" />
+              <path d="M8 11V7a4 4 0 0 1 8 0v4" />
+            </svg>
+            My Share Closures
+          </a>
           @if (clerkAccountLoaded) {
             <div class="cashier-nav__item-wrap">
               <a
@@ -350,6 +374,10 @@
           <fa-icon icon="exclamation-triangle" class="ni-ico"></fa-icon>NPA
           <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
         </a>
+        <a class="ni" tabindex="0" [matMenuTriggerFor]="loanOriginationMenu" *mifosxHasPermission="'MENU_ADVANCES'">
+          <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon>Loan Origination
+          <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
+        </a>
         <a class="ni" tabindex="0" [matMenuTriggerFor]="advancesMenu" *mifosxHasPermission="'MENU_ADVANCES'">
           <fa-icon icon="hand-holding-usd" class="ni-ico"></fa-icon>Advances
           <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
@@ -442,6 +470,10 @@
             <fa-icon icon="exclamation-triangle" class="ni-ico"></fa-icon>NPA
             <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
           </a>
+          <a class="ni" tabindex="0" [matMenuTriggerFor]="loanOriginationMenu" *mifosxHasPermission="'MENU_ADVANCES'">
+            <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon>Loan Origination
+            <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
+          </a>
           <a
             class="ni"
             tabindex="0"
@@ -579,6 +611,19 @@
       <button mat-menu-item [routerLink]="['/reports', 'Accounting']" tabindex="0">
         <i class="fa fa-calculator menu-item-icon"></i> Accounting
       </button>
+      <mat-divider></mat-divider>
+      <button mat-menu-item routerLink="/reports/form-97-98" tabindex="0">
+        <i class="fa fa-file-invoice menu-item-icon"></i> Form 97/98 Transaction Report
+      </button>
+      <button mat-menu-item routerLink="/reports/risk-review" tabindex="0">
+        <i class="fa fa-user-shield menu-item-icon"></i> Risk Review Report
+      </button>
+      <button mat-menu-item routerLink="/reports/tds-interest" tabindex="0">
+        <i class="fa fa-percent menu-item-icon"></i> Deposit Interest &amp; TDS
+      </button>
+      <button mat-menu-item routerLink="/reports/tds-remittance" tabindex="0">
+        <i class="fa fa-landmark menu-item-icon"></i> TDS Remitted to Government
+      </button>
     </mat-menu>
 
     <!-- Admin Mega Menu — 3-column rectangular panel grouping Setup,
@@ -828,50 +873,69 @@
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Trial Balance')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('GL-DR-CR')"
+              routerLink="/gl/reports/trial-balance"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="balance-scale" class="gl-icon" style="color: #b45309"></fa-icon> Trial Balance</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Profit and Loss')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('PNL')"
+              routerLink="/gl/reports/profit-and-loss"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="chart-line" class="gl-icon" style="color: #b45309"></fa-icon> Profit and Loss</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Consolidate Balance Sheet')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('BALANCE-SHEET')"
-              ><fa-icon icon="file-alt" class="gl-icon" style="color: #b45309"></fa-icon> Consolidate Balance Sheet</a
+              routerLink="/gl/reports/balance-sheet"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="file-alt" class="gl-icon" style="color: #b45309"></fa-icon> Consolidated Balance Sheet</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Comparative Balance Sheet')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('COMPARATIVE-BS')"
+              routerLink="/gl/reports/comparative-balance-sheet"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="balance-scale" class="gl-icon" style="color: #b45309"></fa-icon> Comparative Balance
               Sheet</a
             >
           </div>
           <div class="gl-group">
             <div class="gl-group-title">GL Reports</div>
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('GL Average Balance')" (click)="glMenuOpen = false"
-              ><fa-icon icon="calculator" class="gl-icon"></fa-icon> GL Average Balance</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('GL Average Balance')"
+              routerLink="/gl/reports/gl-average-balance"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="calculator" class="gl-icon" style="color: #b45309"></fa-icon> GL Average Balance</a
             >
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('GL Mapping for Report')" (click)="glMenuOpen = false"
-              ><fa-icon icon="project-diagram" class="gl-icon"></fa-icon> GL Mapping for Report</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('GL Mapping for Report')"
+              routerLink="/gl/reports/gl-mapping"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="project-diagram" class="gl-icon" style="color: #b45309"></fa-icon> GL Mapping for
+              Report</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Account wise Balance List')"
+              routerLink="/gl/reports/account-wise-balance"
               (click)="glMenuOpen = false"
-              ><fa-icon icon="list" class="gl-icon"></fa-icon> Account wise Balance List</a
+              ><fa-icon icon="list" class="gl-icon" style="color: #b45309"></fa-icon> Account wise Balance List</a
             >
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('Distribution of Balance')" (click)="glMenuOpen = false"
-              ><fa-icon icon="chart-pie" class="gl-icon"></fa-icon> Distribution of Balance</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('Distribution of Balance')"
+              routerLink="/gl/reports/distribution-of-balance"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="chart-pie" class="gl-icon" style="color: #b45309"></fa-icon> Distribution of Balance</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('GL Wise DR CR')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('GL-DR-CR')"
+              routerLink="/gl/reports/gl-wise-dr-cr"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="project-diagram" class="gl-icon" style="color: #b45309"></fa-icon> GL Wise DR / CR
               Report</a
             >
@@ -881,32 +945,47 @@
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Client wise Balance Report')"
+              routerLink="/gl/reports/client-wise-balance"
               (click)="glMenuOpen = false"
-              ><fa-icon icon="users" class="gl-icon"></fa-icon> Client wise Balance Report</a
+              ><fa-icon icon="users" class="gl-icon" style="color: #b45309"></fa-icon> Client wise Balance Report</a
             >
             <a
               class="gl-link"
-              [class.hidden]="!matchesGlSearch('Contingent Expense')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('CONTINGENT-LIAB')"
+              [class.hidden]="!matchesGlSearch('Contingent Liabilities')"
+              routerLink="/gl/reports/contingent-liabilities"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="exclamation-circle" class="gl-icon" style="color: #b45309"></fa-icon> Contingent
-              Expense</a
+              Liabilities</a
             >
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('Banker Head Report')" (click)="glMenuOpen = false"
-              ><fa-icon icon="university" class="gl-icon"></fa-icon> Banker Head Report</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('Banker Head Report')"
+              routerLink="/gl/reports/banker-head"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="university" class="gl-icon" style="color: #b45309"></fa-icon> Banker Head Report</a
             >
           </div>
           <div class="gl-group">
             <div class="gl-group-title">Registers</div>
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('Sundry Register')" (click)="glMenuOpen = false"
-              ><fa-icon icon="clipboard-list" class="gl-icon"></fa-icon> Sundry Register</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('Sundry Register')"
+              routerLink="/gl/reports/sundry-register"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="clipboard-list" class="gl-icon" style="color: #b45309"></fa-icon> Sundry Register</a
             >
-            <a class="gl-link" [class.hidden]="!matchesGlSearch('Voucher Register')" (click)="glMenuOpen = false"
-              ><fa-icon icon="receipt" class="gl-icon"></fa-icon> Voucher Register</a
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesGlSearch('Voucher Register')"
+              routerLink="/gl/reports/voucher-register"
+              (click)="glMenuOpen = false"
+              ><fa-icon icon="receipt" class="gl-icon" style="color: #b45309"></fa-icon> Voucher Register</a
             >
             <a
               class="gl-link"
               [class.hidden]="!matchesGlSearch('Misc Expense Ledger')"
-              (click)="glMenuOpen = false; openAccountingReportsDialog('MISC-EXP')"
+              routerLink="/gl/reports/misc-expense-ledger"
+              (click)="glMenuOpen = false"
               ><fa-icon icon="receipt" class="gl-icon" style="color: #b45309"></fa-icon> Misc Expense Ledger</a
             >
           </div>
@@ -1233,7 +1312,7 @@
         <div class="deposit-menu-group">
           <div class="deposit-group-title">NPA Reports</div>
           <button mat-menu-item tabindex="0" routerLink="/npa/reports/interest">
-            <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> NPA Interest
+            <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> NPA Report
           </button>
           <button mat-menu-item tabindex="0" routerLink="/npa/reports/status">
             <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> NPA Status Report
@@ -1257,6 +1336,9 @@
           <button mat-menu-item tabindex="0" routerLink="/npa/reports/provision">
             <fa-icon icon="hand-holding-usd" class="menu-item-icon"></fa-icon> NPA with Provision and Required Provision
           </button>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/undebited-interest">
+            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Undebited Interest Recovery Report
+          </button>
         </div>
         <!-- NPA Classification -->
         <div class="deposit-menu-group">
@@ -1268,6 +1350,58 @@
             <fa-icon icon="flag" class="menu-item-icon"></fa-icon> SMA Report
           </button>
         </div>
+        <!-- Recovery Management -->
+        <div class="deposit-menu-group">
+          <div class="deposit-group-title">Recovery Management</div>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/recovery-dashboard">
+            <fa-icon icon="tachometer-alt" class="menu-item-icon"></fa-icon> Recovery Management Dashboard
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/daywise-overdue">
+            <fa-icon icon="calendar-alt" class="menu-item-icon"></fa-icon> Day-wise Overdue Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/daywise-overdrawn">
+            <fa-icon icon="credit-card" class="menu-item-icon"></fa-icon> Day-wise Overdrawn Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/agri-gold-value">
+            <fa-icon icon="crop" class="menu-item-icon"></fa-icon> Agriculture / Gold Market Value Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/npa/reports/exception-check">
+            <fa-icon icon="balance-scale" class="menu-item-icon"></fa-icon> Exception Check — Security Value vs Loan
+          </button>
+        </div>
+      </div>
+    </mat-menu>
+
+    <mat-menu #loanOriginationMenu="matMenu" class="npa-mega-panel" [overlapTrigger]="false">
+      <div class="deposit-menu-grid npa-grid" (click)="$event.stopPropagation()">
+        <!-- Loan Origination -->
+        <div class="deposit-menu-group">
+          <div class="deposit-group-title">Loan Origination</div>
+          <button mat-menu-item tabindex="0" routerLink="/loan-origination/pipeline">
+            <fa-icon icon="stream" class="menu-item-icon"></fa-icon> Application Pipeline
+          </button>
+        </div>
+        <!-- Reports -->
+        <div class="deposit-menu-group">
+          <div class="deposit-group-title">Reports</div>
+          <button
+            mat-menu-item
+            tabindex="0"
+            routerLink="/loan-origination/pipeline"
+            [queryParams]="{ view: 'channel' }"
+          >
+            <fa-icon icon="chart-pie" class="menu-item-icon"></fa-icon> Channel-wise Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/loan-origination/pipeline" [queryParams]="{ view: 'bc' }">
+            <fa-icon icon="mobile-alt" class="menu-item-icon"></fa-icon> BC-wise Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/loan-origination/pipeline" [queryParams]="{ view: 'share' }">
+            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Share Member Report
+          </button>
+          <button mat-menu-item tabindex="0" routerLink="/loan-origination/pipeline" [queryParams]="{ view: 'target' }">
+            <fa-icon icon="chart-column" class="menu-item-icon"></fa-icon> Target vs Actual
+          </button>
+        </div>
       </div>
     </mat-menu>
 
@@ -1299,27 +1433,27 @@
         <!-- Core / Books -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Core &amp; Books</div>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/voucher">
             <fa-icon icon="receipt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Voucher Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/sundry-dr-cr">
             <fa-icon icon="random" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Sundry Dr / Cr Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/pnl-impact">
             <fa-icon icon="chart-line" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             P&amp;L Impact Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/gl-reconciliation">
             <fa-icon icon="book-open" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             GL Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/fixed-assets">
             <fa-icon icon="cube" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Fixed Assets Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/inter-company">
             <fa-icon icon="sitemap" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Inter-Company Reconciliation
           </button>
@@ -1328,19 +1462,19 @@
         <!-- Bank & Clearing -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Bank &amp; Clearing</div>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/bank-reco">
             <fa-icon icon="university" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Bank Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/api-bank-reco">
             <fa-icon icon="code-branch" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             API Based Bank Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/neft-rtgs">
             <fa-icon icon="exchange" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             NEFT / RTGS Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/clearing-reco">
             <fa-icon icon="hand-holding-usd" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Clearing Reconciliation
           </button>
@@ -1349,15 +1483,15 @@
         <!-- Digital / Payments -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Digital &amp; Payments</div>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/udir">
             <fa-icon icon="mobile-alt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             UDIR (IMPS / UPI / ATM)
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/three-way-digital">
             <fa-icon icon="project-diagram" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Three-way Digital Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/nach-reco">
             <fa-icon icon="sync-alt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             NACH Reconciliation
           </button>
@@ -1370,7 +1504,7 @@
             <fa-icon icon="money-check-alt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             DD / Pay Order Reconciliation
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/share-member">
             <fa-icon icon="coins" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Share Member Reconciliation
           </button>
@@ -1379,11 +1513,11 @@
         <!-- Compliance & Financials -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Compliance &amp; Financials</div>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/invoice-payment">
             <fa-icon icon="file-invoice" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Invoice Payment
           </button>
-          <button mat-menu-item tabindex="0">
+          <button mat-menu-item tabindex="0" routerLink="/reconciliation/tax-reco">
             <fa-icon icon="percentage" class="menu-item-icon" style="color: #0d9488"></fa-icon>
             Tax Reconciliation
           </button>
@@ -1495,9 +1629,20 @@
           <button mat-menu-item tabindex="0">
             <fa-icon icon="file-signature" class="menu-item-icon" style="color: #15803d"></fa-icon> Form 98
           </button>
+          <button mat-menu-item routerLink="/reports/form-97-98" tabindex="0">
+            <fa-icon icon="file-invoice" class="menu-item-icon" style="color: #15803d"></fa-icon> Form 97/98 Txn Report
+          </button>
           <button mat-menu-item routerLink="/letter-mgmt/form-15gh" tabindex="0">
             <fa-icon icon="file-signature" class="menu-item-icon" style="color: #15803d"></fa-icon> Form 121
           </button>
+          <button mat-menu-item routerLink="/reports/tds-interest" tabindex="0">
+            <fa-icon icon="percentage" class="menu-item-icon" style="color: #15803d"></fa-icon> Deposit Interest &amp;
+            TDS
+          </button>
+          <button mat-menu-item routerLink="/reports/tds-remittance" tabindex="0">
+            <fa-icon icon="building-columns" class="menu-item-icon" style="color: #15803d"></fa-icon> TDS Remitted to
+            Govt
+          </button>
           <button mat-menu-item routerLink="/letter-mgmt/hypothecation-certificate" tabindex="0">
             <fa-icon icon="file-alt" class="menu-item-icon" style="color: #15803d"></fa-icon>
             Hypothecation Certificate
@@ -1699,6 +1844,14 @@
             >
               <fa-icon icon="shield-alt" class="gl-icon"></fa-icon> AML
             </a>
+            <a
+              class="gl-link"
+              [class.hidden]="!matchesRbiSearch('Risk Review Report')"
+              routerLink="/reports/risk-review"
+              (click)="rbiMenuOpen = false"
+            >
+              <fa-icon icon="user-shield" class="gl-icon"></fa-icon> Risk Review Report
+            </a>
           </div>
           <!-- OSS Reports -->
           <div class="gl-group">
@@ -1706,52 +1859,27 @@
             <a
               class="gl-link"
               [class.hidden]="!matchesRbiSearch('OSS 1 XBRL/CIMS')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('RAL')"
+              routerLink="/rbi/oss1"
+              (click)="rbiMenuOpen = false"
             >
               <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 1 XBRL/CIMS
             </a>
             <a
               class="gl-link"
               [class.hidden]="!matchesRbiSearch('OSS 2 XBRL')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-2')"
+              routerLink="/rbi/oss2"
+              (click)="rbiMenuOpen = false"
             >
               <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 2 XBRL
             </a>
             <a
               class="gl-link"
               [class.hidden]="!matchesRbiSearch('OSS 3 XBRL/CIMS')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-2')"
+              routerLink="/rbi/oss3"
+              (click)="rbiMenuOpen = false"
             >
               <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 3 XBRL/CIMS
             </a>
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('OSS 4')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-4')"
-            >
-              <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 4
-            </a>
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('OSS 5')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-5')"
-            >
-              <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 5
-            </a>
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('OSS 6')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-6')"
-            >
-              <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 6
-            </a>
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('OSS 7')"
-              (click)="rbiMenuOpen = false; openCimsXbrlDialog('OSS-7')"
-            >
-              <fa-icon icon="file-alt" class="gl-icon" style="color: #0891b2"></fa-icon> OSS 7
-            </a>
           </div>
           <!-- CIMS / XBRL Returns -->
           <div class="gl-group">

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

@@ -677,6 +677,26 @@ $gray-700: #334155;
   opacity: 0.7;
 }
 
+// Marks a `mat-menu-item` as actually wired to a working screen/dialog (vs a still-unwired
+// placeholder) — same "green dot" convention as .gl-link--live, positioned absolutely since
+// mat-menu-item's internal layout isn't a plain flex row we control directly.
+[mat-menu-item].menu-item-live {
+  position: relative;
+
+  &::after {
+    content: '';
+    position: absolute;
+    right: 14px;
+    top: 50%;
+    transform: translateY(-50%);
+    width: 6px;
+    height: 6px;
+    border-radius: 50%;
+    background: #16a34a;
+    box-shadow: 0 0 0 2px rgb(22 163 74 / 15%);
+  }
+}
+
 // ===== Nav Dropdown Menus =====
 ::ng-deep .nav-dropdown {
   border-radius: 8px !important;
@@ -729,6 +749,13 @@ $gray-700: #334155;
   }
 }
 
+/* NPA Mega Panel — 4 columns (Reports / Analysis / Classification / Recovery Management) */
+.npa-grid {
+  grid-template-columns: repeat(4, minmax(200px, 1fr));
+  min-width: 880px;
+  max-width: 96vw;
+}
+
 /* Reconciliation Mega Panel — 5 columns, teal accent to match the icon palette */
 .reconciliation-grid {
   grid-template-columns: repeat(5, minmax(190px, 1fr));

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

@@ -188,9 +188,9 @@ export class ShellComponent implements OnInit, OnDestroy {
     return this.router.url;
   }
 
-  /** True on the manager's full-screen withdrawal-request review screen. */
+  /** True on the manager's full-screen withdrawal-request (cash or share) review screen. */
   get isWithdrawalReviewUrl(): boolean {
-    return /\/checker-inbox-and-tasks\/withdrawal-requests\/\d+\/review/.test(this.router.url);
+    return /\/checker-inbox-and-tasks\/(share-)?withdrawal-requests\/\d+\/review/.test(this.router.url);
   }
 
   /** ESC key — exit fullscreen at Clerk Dashboard / Election / review screen, restoring full shell header. */

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

@@ -403,17 +403,26 @@
     <div class="subledger-columns">
       <div class="subledger-group">
         <div class="subledger-group-title">Financial Statements</div>
-        <a class="subledger-link" [class.hidden]="!matchesGlSearch('Trial Balance')" (click)="glMenuOpen = false"
+        <a
+          class="subledger-link"
+          [class.hidden]="!matchesGlSearch('Trial Balance')"
+          routerLink="/gl/reports/trial-balance"
+          (click)="glMenuOpen = false"
           ><fa-icon icon="balance-scale" class="subledger-icon"></fa-icon> Trial Balance</a
         >
-        <a class="subledger-link" [class.hidden]="!matchesGlSearch('Profit and Loss')" (click)="glMenuOpen = false"
+        <a
+          class="subledger-link"
+          [class.hidden]="!matchesGlSearch('Profit and Loss')"
+          routerLink="/gl/reports/profit-and-loss"
+          (click)="glMenuOpen = false"
           ><fa-icon icon="chart-line" class="subledger-icon"></fa-icon> Profit and Loss</a
         >
         <a
           class="subledger-link"
-          [class.hidden]="!matchesGlSearch('Consolidate Balance Sheet')"
+          [class.hidden]="!matchesGlSearch('Consolidated Balance Sheet')"
+          routerLink="/gl/reports/balance-sheet"
           (click)="glMenuOpen = false"
-          ><fa-icon icon="file-alt" class="subledger-icon"></fa-icon> Consolidate Balance Sheet</a
+          ><fa-icon icon="file-alt" class="subledger-icon"></fa-icon> Consolidated Balance Sheet</a
         >
       </div>
       <div class="subledger-group">
@@ -448,8 +457,12 @@
           (click)="glMenuOpen = false"
           ><fa-icon icon="users" class="subledger-icon"></fa-icon> Client wise Balance Report</a
         >
-        <a class="subledger-link" [class.hidden]="!matchesGlSearch('Contingent Expense')" (click)="glMenuOpen = false"
-          ><fa-icon icon="exclamation-circle" class="subledger-icon"></fa-icon> Contingent Expense</a
+        <a
+          class="subledger-link"
+          [class.hidden]="!matchesGlSearch('Contingent Liabilities')"
+          routerLink="/gl/reports/contingent-liabilities"
+          (click)="glMenuOpen = false"
+          ><fa-icon icon="exclamation-circle" class="subledger-icon"></fa-icon> Contingent Liabilities</a
         >
         <a class="subledger-link" [class.hidden]="!matchesGlSearch('Banker Head Report')" (click)="glMenuOpen = false"
           ><fa-icon icon="university" class="subledger-icon"></fa-icon> Banker Head Report</a

src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.html

@@ -365,6 +365,21 @@
         </mat-form-field>
       </form>
     }
+
+    <!-- Compliance / AML Action Triage -->
+    <div class="compliance-triage" style="margin-top: 16px; padding: 12px; background: #fff8f8; border: 1px dashed #f5c2c2; border-radius: 8px;">
+      <h4 style="margin: 0 0 8px; font-weight: 600; color: #b91c1c; display: flex; align-items: center; gap: 6px;">
+        Compliance & AML Triage
+      </h4>
+      <div style="display: flex; flex-direction: column; gap: 8px;">
+        <mat-checkbox [(ngModel)]="flagAsSuspicious" [ngModelOptions]="{standalone: true}">
+          Flag as suspicious (escalate to STR cases under RBI compliance)
+        </mat-checkbox>
+        <mat-checkbox [(ngModel)]="markAsWhitelisted" [ngModelOptions]="{standalone: true}">
+          Mark as whitelisted (prevent future AML alerts for this account)
+        </mat-checkbox>
+      </div>
+    </div>
   }
 
   <div #lightboxRoot style="display: none"></div>

src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.ts

@@ -131,6 +131,90 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
   /** 'any' = mode of operation lets any one signer sign (Either/Anyone or Survivor); 'all' = every mandatory signer must sign. */
   signerSelectionMode: 'any' | 'all' = 'any';
   manualOverrideChecked = false;
+  flagAsSuspicious = false;
+  markAsWhitelisted = false;
+
+  handleComplianceActions(): void {
+    if (this.flagAsSuspicious) {
+      const existingStrData = localStorage.getItem('fiu_str_cases');
+      let cases: any[] = [];
+      if (existingStrData) {
+        try {
+          cases = JSON.parse(existingStrData);
+        } catch (e) {
+          cases = [];
+        }
+      }
+      
+      const newRef = 101 + cases.length;
+      const newCase: any = {
+        reportType: 'STR',
+        reportRefNo: newRef,
+        branchCode: this.item.presentingBranchCode || '1',
+        accountNumber: this.item.accountNo || this.item.accountId || '110001101000838',
+        txnBranchCode: this.item.presentingBranchCode || '1',
+        depositOrWithdrawal: 'Withdrawal',
+        txnId: this.item.id,
+        txnDate: new Date().toLocaleDateString('en-GB').replace(/\//g, '-'),
+        txnTime: new Date().toLocaleTimeString('en-US', { hour12: false }),
+        txnAmount: this.item.amount,
+        instrumentType: 'Cheque',
+        instrumentId: this.item.chequeNumber,
+        nonCustomerRef: '',
+        relationshipFlag: 'Customer',
+        thirdPartyPan: '',
+        declaration: 'NA',
+        customerName: this.item.clientName || 'UNKNOWN CLIENT',
+        detectedOn: new Date().toLocaleDateString('en-GB').replace(/\//g, '-'),
+        flaggedBy: 'CTS Clearing Officer',
+        riskCategory: 'unusual-pattern',
+        narrative: `CTS Cheque #${this.item.chequeNumber} for amount ₹${this.item.amount} flagged as suspicious by Clearing Officer during inward presentment review. Action: ${this.mode}. Reason/Notes: ${this.mode === 'RETURN' ? this.returnForm.value.reason : this.passForm.value.note || 'Manual compliance escalation'}`,
+        status: 'po-review'
+      };
+      
+      cases.unshift(newCase);
+      localStorage.setItem('fiu_str_cases', JSON.stringify(cases));
+      
+      const storedCtr = localStorage.getItem('fiu_ctr_txns');
+      if (storedCtr) {
+        try {
+          const ctrList = JSON.parse(storedCtr);
+          const matching = ctrList.find((t: any) => t.accountNumber === newCase.accountNumber);
+          if (matching) {
+            matching.complianceStatus = 'SUSPICIOUS';
+            localStorage.setItem('fiu_ctr_txns', JSON.stringify(ctrList));
+          }
+        } catch (e) {}
+      }
+    } else if (this.markAsWhitelisted) {
+      const existingWhitelist = localStorage.getItem('compliance_whitelisted_accounts');
+      let whitelisted: string[] = [];
+      if (existingWhitelist) {
+        try {
+          whitelisted = JSON.parse(existingWhitelist);
+        } catch (e) {
+          whitelisted = [];
+        }
+      }
+      const account = this.item.accountNo || this.item.accountId;
+      if (account && !whitelisted.includes(account.toString())) {
+        whitelisted.push(account.toString());
+        localStorage.setItem('compliance_whitelisted_accounts', JSON.stringify(whitelisted));
+      }
+      
+      const storedCtr = localStorage.getItem('fiu_ctr_txns');
+      if (storedCtr) {
+        try {
+          const ctrList = JSON.parse(storedCtr);
+          const matching = ctrList.find((t: any) => t.accountNumber === (account ? account.toString() : ''));
+          if (matching) {
+            matching.complianceStatus = 'WHITELISTED';
+            localStorage.setItem('fiu_ctr_txns', JSON.stringify(ctrList));
+          }
+        } catch (e) {}
+      }
+    }
+  }
 
   /** Every automatic validation rule InwardClearingValidationService already computes, shown so the clerk sees WHY, not just a decision. */
   readonly validationRules: { key: string; label: string; goodWhenTrue: boolean }[] = [
@@ -652,6 +736,7 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
           this.ctsService.passInwardItem(this.item.id, payload).subscribe({
             next: () => {
               this.busy = false;
+              this.handleComplianceActions();
               this.notify('Cheque passed');
               this.dialogRef.close({ actioned: true });
             },
@@ -676,6 +761,7 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
       this.ctsService.returnInwardItem(this.item.id, payload).subscribe({
         next: () => {
           this.busy = false;
+          this.handleComplianceActions();
           this.notify('Cheque returned');
           this.dialogRef.close({ actioned: true });
         },

src/app/fiu/fiu.component.html

@@ -14,12 +14,25 @@
       <div>
         <h2 class="fiu-head-t">Financial Intelligence Unit – India (FIU-IND)</h2>
         <div class="fiu-head-s">
-          {{ bank.name }} &middot; {{ bank.branch }} &middot; Reporting Month <strong>{{ bank.reportingMonth }}</strong>
+          {{ bank.name }} &middot; {{ scopeName }} &middot; Reporting Month <strong>{{ bank.reportingMonth }}</strong>
           &middot; PMLA 2002 / FINnet 2.0
         </div>
       </div>
     </div>
     <div class="fiu-head-meta">
+      <div>
+        <span class="fiu-meta-l">Branch</span>
+        @if (isHeadOffice) {
+          <select class="fiu-inp" [ngModel]="branchFilter" (ngModelChange)="setBranch($event)">
+            <option value="">All Branches</option>
+            @for (b of branches; track b.code) {
+              <option [value]="b.code">{{ b.name }}</option>
+            }
+          </select>
+        } @else {
+          <span class="fiu-meta-v">{{ scopeName }}</span>
+        }
+      </div>
       <div>
         <span class="fiu-meta-l">Principal Officer</span><span class="fiu-meta-v">{{ bank.principalOfficer }}</span>
       </div>
@@ -71,17 +84,19 @@
         <div class="fiu-kpi fiu-kpi--amber">
           <div class="fiu-kpi-ic"><fa-icon icon="exclamation-triangle"></fa-icon></div>
           <div>
-            <div class="fiu-kpi-n">{{ pendingStr | number }}</div>
+            <div class="fiu-kpi-n">{{ liveStrPending | number }}</div>
             <div class="fiu-kpi-l">STR Pending</div>
-            <div class="fiu-kpi-sub">draft / PO review</div>
+            <div class="fiu-kpi-sub">
+              {{ liveStrOpen }} to investigate &middot; {{ liveStrAwaitingFiling }} awaiting filing
+            </div>
           </div>
         </div>
         <div class="fiu-kpi fiu-kpi--green">
           <div class="fiu-kpi-ic"><fa-icon icon="check-circle"></fa-icon></div>
           <div>
-            <div class="fiu-kpi-n">{{ filedStr | number }}</div>
+            <div class="fiu-kpi-n">{{ liveStrFiled | number }}</div>
             <div class="fiu-kpi-l">STR Filed</div>
-            <div class="fiu-kpi-sub">acknowledged by FIU</div>
+            <div class="fiu-kpi-sub">{{ liveStrCleared }} concluded clear</div>
           </div>
         </div>
         <div class="fiu-kpi fiu-kpi--purple">
@@ -94,6 +109,52 @@
         </div>
       </div>
 
+      <!-- WHEN TO REPORT — the five PMLA obligations -->
+      <div class="ob-block">
+        <div class="ob-head">
+          <div>
+            <h3 class="ob-title"><fa-icon icon="gavel"></fa-icon> When to report to FIU-IND</h3>
+            <p class="ob-sub">
+              The five reports a reporting entity owes under the Prevention of Money Laundering Act. All are filed
+              electronically through the FINnet 2.0 portal.
+            </p>
+          </div>
+        </div>
+
+        <div class="ob-grid">
+          @for (o of obligations; track o.code) {
+            <div class="ob-card" [class.ob-card--off]="!o.handled">
+              <div class="ob-card-h">
+                <fa-icon [icon]="o.icon" class="ob-ic"></fa-icon>
+                <span class="ob-code">{{ o.code }}</span>
+                <span class="ob-name">{{ o.name }}</span>
+                @if (o.handled) {
+                  <span class="ob-flag ob-flag--on">Filed here</span>
+                } @else {
+                  <span class="ob-flag">Tracked</span>
+                }
+              </div>
+              <div class="ob-row">
+                <label>Report when</label><span>{{ o.trigger }}</span>
+              </div>
+              <div class="ob-row">
+                <label>Deadline</label><span class="ob-due">{{ o.deadline }}</span>
+              </div>
+              <div class="ob-note">{{ o.note }}</div>
+              @if (o.code === 'CTR') {
+                <button class="dc-btn" (click)="showTab('ctr')">
+                  <fa-icon icon="external-link-alt"></fa-icon> Open CTR
+                </button>
+              } @else if (o.code === 'STR') {
+                <button class="dc-btn" (click)="showTab('str')">
+                  <fa-icon icon="external-link-alt"></fa-icon> Open STR
+                </button>
+              }
+            </div>
+          }
+        </div>
+      </div>
+
       <!-- Compliance cards -->
       <div class="fiu-compliance">
         <div class="dc-card">
@@ -112,7 +173,12 @@
           </div>
           <div class="dc-meta">Filing window: <strong>within 7 days of detection</strong></div>
           <div class="dc-meta">
-            Pending: <strong>{{ pendingStr }}</strong> &middot; Filed: <strong>{{ filedStr }}</strong>
+            To investigate: <strong>{{ liveStrOpen }}</strong> &middot; Awaiting filing:
+            <strong>{{ liveStrAwaitingFiling }}</strong>
+          </div>
+          <div class="dc-meta">
+            Filed: <strong>{{ liveStrFiled }}</strong> &middot; Concluded clear:
+            <strong>{{ liveStrCleared }}</strong>
           </div>
           <button class="dc-btn" (click)="showTab('str')"><fa-icon icon="external-link-alt"></fa-icon> Open</button>
         </div>
@@ -129,77 +195,105 @@
   <!-- CTR -->
   @if (activeTab === 'ctr') {
     <div class="fiu-section">
-      <!-- LIVE: cash-related AML alerts awaiting AML Officer review -->
-      <div class="fiu-form-meta">
-        <div class="fiu-form-title">
-          <h3>Live Cash Alerts</h3>
-          <p>
-            Raised by the transaction-monitoring rule engine — review and whitelist or escalate to Principal Officer
-          </p>
+      <!-- FINNET FILE SEQUENCE — the CTR submission, in prescribed order -->
+      <div class="seq-block">
+        <div class="fiu-form-meta">
+          <div class="fiu-form-title">
+            <h3>CTR Submission Files — FINnet 2.0</h3>
+            <p>
+              The CTR is built in this order: the account is described first, then who is behind it, then the two
+              transaction files. Every grid below is the exact content of its CSV. The customer cards (KC1 / KC2) travel
+              with the same bundle and are worked on the Customer Cards tab.
+            </p>
+          </div>
+          <button class="fiu-btn fiu-btn-xls" (click)="exportAll()">
+            <fa-icon icon="file-csv"></fa-icon> Download full bundle
+          </button>
         </div>
-        <select class="fiu-inp" [(ngModel)]="amlAlertStatusFilter" (ngModelChange)="loadAmlAlerts()">
-          <option value="">All statuses</option>
-          <option value="RAISED">Raised</option>
-          <option value="UNDER_REVIEW">Under Review</option>
-          <option value="WHITELISTED">Whitelisted</option>
-          <option value="ESCALATED">Escalated</option>
-        </select>
-      </div>
-      <div class="fiu-tbl-wrap">
-        <table class="fiu-tbl">
-          <thead>
-            <tr>
-              <th>ID</th>
-              <th>Client</th>
-              <th>Type</th>
-              <th>Rule</th>
-              <th class="ta-r">Amount</th>
-              <th>Raised On</th>
-              <th>Status</th>
-              <th>Notes</th>
-              <th>Action</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (alert of amlAlerts; track alert.id) {
-              <tr>
-                <td>{{ alert.id }}</td>
-                <td>{{ alert.clientDisplayName }}</td>
-                <td>{{ alert.transactionType }}</td>
-                <td>{{ alert.ruleCode }} &mdash; {{ alert.ruleDescription }}</td>
-                <td class="ta-r mono">&#8377;{{ alert.amount | number: '1.0-0' }}</td>
-                <td>{{ alert.raisedOn | date: 'medium' }}</td>
-                <td>
-                  <span [class]="amlStatusClass(alert.status)">{{ alert.status }}</span>
-                </td>
-                <td>
-                  @if (alert.status === 'RAISED' || alert.status === 'UNDER_REVIEW') {
-                    <input
-                      type="text"
-                      class="fiu-inp"
-                      placeholder="Review notes"
-                      [(ngModel)]="amlReviewNotes[alert.id]"
-                    />
-                  } @else {
-                    <span class="muted">{{ alert.reviewNotes }}</span>
-                  }
-                </td>
-                <td>
-                  @if (alert.status === 'RAISED' || alert.status === 'UNDER_REVIEW') {
-                    <div class="fiu-action-group" *mifosxHasPermission="'REVIEW_AML_ALERT'">
-                      <button class="fiu-btn fiu-btn-g" (click)="whitelistAlert(alert)">Whitelist</button>
-                      <button class="fiu-btn fiu-btn-xml" (click)="escalateAlert(alert)">Escalate</button>
-                    </div>
-                  }
-                </td>
-              </tr>
-            } @empty {
-              <tr>
-                <td colspan="9" class="fiu-empty">No live alerts.</td>
-              </tr>
+
+        <!-- Scope: these controls decide which transactions the six files carry. -->
+        <div class="fiu-filters">
+          <div class="fiu-filter">
+            <label>Type</label>
+            <select class="fiu-inp" [(ngModel)]="ctrFilterMode">
+              <option value="">All</option>
+              <option value="Deposit">Deposit</option>
+              <option value="Withdrawal">Withdrawal</option>
+            </select>
+          </div>
+          <div class="fiu-filter">
+            <label>Account contains</label>
+            <input class="fiu-inp" type="text" [(ngModel)]="ctrFilterAccount" placeholder="A/c partial" />
+          </div>
+          <div class="fiu-filter">
+            <label>Min Amount (&#8377;)</label>
+            <input class="fiu-inp" type="number" [(ngModel)]="ctrFilterMinAmount" placeholder="0" />
+          </div>
+          <button class="fiu-btn fiu-btn-g" (click)="resetCtrFilters()">Reset</button>
+        </div>
+
+        <!-- Step rail -->
+        <div class="seq-rail">
+          @for (f of finnetSequence; track f.key) {
+            <button class="seq-step" [class.active]="activeFinnetFile === f.key" (click)="showFinnetFile(f.key)">
+              <span class="seq-n">{{ f.step }}</span>
+              <span class="seq-txt">
+                <strong>{{ f.name }}</strong>
+                <em>{{ f.table.rows.length }} {{ f.table.rows.length === 1 ? 'row' : 'rows' }}</em>
+              </span>
+            </button>
+            @if (!$last) {
+              <fa-icon icon="chevron-right" class="seq-arrow"></fa-icon>
             }
-          </tbody>
-        </table>
+          }
+        </div>
+
+        <!-- Open file -->
+        <div class="seq-panel">
+          <div class="seq-panel-h">
+            <div>
+              <h4>Step {{ openFinnetFile.step }} — {{ openFinnetFile.title }}</h4>
+              <p>{{ openFinnetFile.purpose }}</p>
+            </div>
+            <button class="fiu-btn fiu-btn-csv" (click)="downloadOpenFinnetFile()">
+              <fa-icon icon="file-csv"></fa-icon> {{ openFinnetFile.name }}.csv
+            </button>
+          </div>
+
+          <div class="seq-tbl-wrap">
+            <table class="seq-tbl">
+              <thead>
+                <tr>
+                  <th class="seq-rownum">#</th>
+                  @for (h of openFinnetFile.table.headers; track $index) {
+                    <th>{{ h }}</th>
+                  }
+                </tr>
+              </thead>
+              <tbody>
+                @for (r of openFinnetFile.table.rows; track $index) {
+                  <tr>
+                    <td class="seq-rownum">{{ $index + 1 }}</td>
+                    @for (c of r; track $index) {
+                      <td>{{ c }}</td>
+                    }
+                  </tr>
+                } @empty {
+                  <tr>
+                    <td [attr.colspan]="openFinnetFile.table.headers.length + 1" class="seq-empty">
+                      @if (openFinnetFile.key === 'tc1') {
+                        No ATM or card transactions match the current scope. When the bank books none at all, TC1 is
+                        still submitted as a header-only file — that is what FIU-IND expects.
+                      } @else {
+                        No rows for the current filters.
+                      }
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </div>
       </div>
 
       <!-- LIVE: monthly CTR reports (mechanical, threshold-based) -->
@@ -248,100 +342,94 @@
           </tbody>
         </table>
       </div>
-
-      <!-- FINnet export template (separate concern — TC1/TC2 file-format generation) -->
-      <div class="fiu-form-meta">
-        <div class="fiu-form-title">
-          <h3>FINnet TC2 Export Template</h3>
-          <p>
-            All cash transactions ≥ &#8377;{{ bank.cashThreshold | number }} (single or aggregate per month per account)
-          </p>
-        </div>
-        <button class="fiu-btn fiu-btn-csv" (click)="exportTc2()">
-          <fa-icon icon="file-csv"></fa-icon> Download TC2.csv
-        </button>
-      </div>
-
-      <div class="fiu-filters">
-        <div class="fiu-filter">
-          <label>Type</label>
-          <select class="fiu-inp" [(ngModel)]="ctrFilterMode">
-            <option value="">All</option>
-            <option value="Deposit">Deposit</option>
-            <option value="Withdrawal">Withdrawal</option>
-          </select>
-        </div>
-        <div class="fiu-filter">
-          <label>Account contains</label>
-          <input class="fiu-inp" type="text" [(ngModel)]="ctrFilterAccount" placeholder="A/c partial" />
-        </div>
-        <div class="fiu-filter">
-          <label>Min Amount (&#8377;)</label>
-          <input class="fiu-inp" type="number" [(ngModel)]="ctrFilterMinAmount" placeholder="0" />
-        </div>
-        <button class="fiu-btn fiu-btn-g" (click)="resetCtrFilters()">Reset</button>
-      </div>
-
-      <div class="fiu-tbl-wrap">
-        <table class="fiu-tbl">
-          <thead>
-            <tr>
-              <th class="ta-c">Ref</th>
-              <th>Account</th>
-              <th>Customer</th>
-              <th class="ta-c">Type</th>
-              <th>Date / Time</th>
-              <th class="ta-r">Amount</th>
-              <th>Instrument</th>
-              <th>Branch</th>
-              <th class="ta-c">Relationship</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (t of filteredCtr; track t.txnId) {
-              <tr>
-                <td class="ta-c">{{ t.reportRefNo }}</td>
-                <td class="mono">{{ t.accountNumber }}</td>
-                <td>{{ t.customerName }}</td>
-                <td class="ta-c">
-                  <span
-                    class="dir-pill"
-                    [class.deposit]="t.depositOrWithdrawal === 'Deposit'"
-                    [class.withdrawal]="t.depositOrWithdrawal === 'Withdrawal'"
-                  >
-                    {{ t.depositOrWithdrawal }}
-                  </span>
-                </td>
-                <td>
-                  {{ t.txnDate }} <span class="muted">{{ t.txnTime }}</span>
-                </td>
-                <td class="ta-r mono">
-                  <strong>&#8377;{{ t.txnAmount | number: '1.0-0' }}</strong>
-                </td>
-                <td>
-                  {{ t.instrumentType }} <span class="muted">{{ t.instrumentId }}</span>
-                </td>
-                <td class="mono">{{ t.branchCode }}</td>
-                <td class="ta-c">
-                  <span class="rel-pill" [class.non-cust]="t.relationshipFlag === 'Non-Customer'">{{
-                    t.relationshipFlag
-                  }}</span>
-                </td>
-              </tr>
-            } @empty {
-              <tr>
-                <td colspan="9" class="fiu-empty">No transactions match the filters.</td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      </div>
     </div>
   }
 
   <!-- STR -->
   @if (activeTab === 'str') {
     <div class="fiu-section">
+      <!-- LIVE: suspicious AML alerts awaiting AML Officer review (Structuring, PEP, etc.) -->
+      <div class="fiu-form-meta">
+        <div class="fiu-form-title">
+          <h3>Live AML Alerts (Awaiting Triage)</h3>
+          <p>Flagged by the monitoring engine for suspicious behavioral patterns — triage and whitelist or escalate</p>
+        </div>
+        <select class="fiu-inp" [(ngModel)]="amlAlertStatusFilter" (ngModelChange)="loadAmlAlerts()">
+          <option value="">All statuses</option>
+          <option value="RAISED">Raised</option>
+          <option value="UNDER_REVIEW">Under Review</option>
+          <option value="WHITELISTED">Whitelisted</option>
+          <option value="ESCALATED">Escalated</option>
+        </select>
+      </div>
+      <div class="fiu-tbl-wrap">
+        <table class="fiu-tbl">
+          <thead>
+            <tr>
+              <th>ID</th>
+              <th>Client</th>
+              <th>Type</th>
+              <th>Rule</th>
+              <th class="ta-r">Amount</th>
+              <th>Raised On</th>
+              <th>Status</th>
+              <th class="ta-c">Routes To</th>
+              <th>Notes</th>
+              <th>Action</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (alert of amlSuspiciousAlerts; track alert.id) {
+              <tr>
+                <td>{{ alert.id }}</td>
+                <td>{{ alert.clientDisplayName }}</td>
+                <td>{{ alert.transactionType }}</td>
+                <td>{{ alert.ruleCode }} &mdash; {{ alert.ruleDescription }}</td>
+                <td class="ta-r mono">&#8377;{{ alert.amount | number: '1.0-0' }}</td>
+                <td>{{ alert.raisedOn | date: 'medium' }}</td>
+                <td>
+                  <span [class]="amlStatusClass(alert.status)">{{ alert.status }}</span>
+                </td>
+                <td class="ta-c">
+                  <span [class]="alertRouteClass(alert.status, false)">{{ alertRouteLabel(alert.status, false) }}</span>
+                </td>
+                <td>
+                  @if (alert.status === 'RAISED' || alert.status === 'UNDER_REVIEW') {
+                    <input
+                      type="text"
+                      class="fiu-inp"
+                      placeholder="Review notes"
+                      [(ngModel)]="amlReviewNotes[alert.id]"
+                    />
+                  } @else {
+                    <span class="muted">{{ alert.reviewNotes }}</span>
+                  }
+                </td>
+                <td>
+                  @if (alert.status === 'RAISED' || alert.status === 'UNDER_REVIEW') {
+                    <div class="fiu-action-group" *mifosxHasPermission="'REVIEW_AML_ALERT'">
+                      <button class="fiu-btn fiu-btn-g" (click)="whitelistAlert(alert)">Whitelist</button>
+                      <button class="fiu-btn fiu-btn-xml" (click)="escalateAlert(alert)">Escalate</button>
+                    </div>
+                  }
+                </td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="10" class="fiu-empty">No suspicious behavioral alerts.</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+      <p class="fiu-tbl-legend">
+        <span class="report-pill report-pending">Pending</span> awaiting Whitelist/Escalate decision &middot;
+        <span class="report-pill report-cleared">Cleared</span> whitelisted — no report filed &middot;
+        <span class="report-pill report-str">→ STR</span> escalated to Principal Officer as an STR case
+      </p>
+
+      <hr style="border: 0; border-top: 1px solid var(--f-g200); margin: 8px 0" />
+
       <!-- LIVE: STR cases with full Principal Officer actions -->
       <div class="fiu-form-meta">
         <div class="fiu-form-title">
@@ -407,6 +495,17 @@
             <button class="fiu-btn fiu-btn-g" (click)="closeStrCaseDetail()">Close</button>
           </div>
 
+          <div
+            class="case-outcome"
+            [class.case-outcome--clear]="selectedStrCase.status === 'CONCLUDED_CLEAR'"
+            [class.case-outcome--suspicious]="
+              selectedStrCase.status === 'CONCLUDED_SUSPICIOUS' || selectedStrCase.status === 'FILED'
+            "
+          >
+            <span [class]="amlStatusClass(selectedStrCase.status)">{{ selectedStrCase.status }}</span>
+            <span>{{ strCaseOutcome(selectedStrCase) }}</span>
+          </div>
+
           <div class="case-form" *mifosxHasPermission="'CONCLUDE_AML_STR'">
             <div class="form-row">
               <label for="fiuInvestigationNotes">Investigation notes (source-of-transaction history reviewed)</label>
@@ -416,17 +515,99 @@
               <label for="fiuSourceOfFundsNotes">Source-of-funds notes</label>
               <textarea id="fiuSourceOfFundsNotes" rows="2" [(ngModel)]="concludeSourceOfFundsNotes"></textarea>
             </div>
-            <div class="form-row conclusion-row">
-              <label>
-                <input type="radio" name="fiuConclusion" value="NOT_SUSPICIOUS" [(ngModel)]="concludeConclusion" />
-                Not suspicious (whitelist)
-              </label>
-              <label>
-                <input type="radio" name="fiuConclusion" value="SUSPICIOUS" [(ngModel)]="concludeConclusion" />
-                Suspicious (file STR)
-              </label>
+            <!-- Verification checklist — the verdict is derived, not chosen. -->
+            <div class="checklist">
+              <div class="checklist-head">
+                <span>Principal Officer verification — mark each point as found</span>
+                <span class="checklist-progress" [class.done]="allAnswered">
+                  {{ answeredCount }} / {{ strChecklist.length }} answered
+                </span>
+              </div>
+              <table class="checklist-tbl">
+                <thead>
+                  <tr>
+                    <th>Verification point</th>
+                    <th class="ta-c col-yes">Genuine</th>
+                    <th class="ta-c col-no">Not satisfied</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (item of strChecklist; track item.key) {
+                    <tr
+                      [class.row-yes]="strFindings[item.key] === true"
+                      [class.row-no]="strFindings[item.key] === false"
+                      [class.row-pending]="strFindings[item.key] === null"
+                    >
+                      <td>
+                        <div class="chk-label">{{ item.label }}</div>
+                        <div class="chk-hint">{{ item.hint }}</div>
+                      </td>
+                      <td class="ta-c">
+                        <button
+                          type="button"
+                          class="chk-box chk-box--yes"
+                          [class.on]="strFindings[item.key] === true"
+                          [attr.aria-pressed]="strFindings[item.key] === true"
+                          [attr.aria-label]="'Mark ' + item.label + ' as genuine'"
+                          (click)="setFinding(item.key, true)"
+                        >
+                          <fa-icon icon="check-circle"></fa-icon>
+                        </button>
+                      </td>
+                      <td class="ta-c">
+                        <button
+                          type="button"
+                          class="chk-box chk-box--no"
+                          [class.on]="strFindings[item.key] === false"
+                          [attr.aria-pressed]="strFindings[item.key] === false"
+                          [attr.aria-label]="'Mark ' + item.label + ' as not satisfied'"
+                          (click)="setFinding(item.key, false)"
+                        >
+                          <fa-icon icon="exclamation-triangle"></fa-icon>
+                        </button>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
             </div>
-            <button class="fiu-btn fiu-btn-xml" (click)="concludeStrCase()">Conclude</button>
+
+            <!-- Derived verdict -->
+            <div
+              class="verdict"
+              [class.verdict--clear]="allAnswered && derivedConclusion === 'NOT_SUSPICIOUS'"
+              [class.verdict--suspicious]="allAnswered && derivedConclusion === 'SUSPICIOUS'"
+            >
+              @if (!allAnswered) {
+                <fa-icon icon="info-circle"></fa-icon>
+                <span>
+                  Answer every verification point to determine the outcome —
+                  {{ strChecklist.length - answeredCount }} still pending.
+                </span>
+              } @else if (derivedConclusion === 'NOT_SUSPICIOUS') {
+                <fa-icon icon="check-circle"></fa-icon>
+                <span>
+                  <strong>Not suspicious.</strong> All {{ strChecklist.length }} points found genuine — the case will be
+                  closed and nothing filed with FIU-IND.
+                </span>
+              } @else {
+                <fa-icon icon="exclamation-triangle"></fa-icon>
+                <span>
+                  <strong>Suspicious — STR must be filed.</strong>
+                  {{ failedFindings.length }} of {{ strChecklist.length }} points not satisfied:
+                  {{ failedFindings[0].label }}
+                  @if (failedFindings.length > 1) {
+                    <span> and {{ failedFindings.length - 1 }} more</span>
+                  }
+                  .
+                </span>
+              }
+            </div>
+
+            <button class="fiu-btn fiu-btn-xml" [disabled]="!allAnswered" (click)="concludeStrCase()">
+              Conclude as
+              {{ allAnswered ? (derivedConclusion === 'SUSPICIOUS' ? 'Suspicious' : 'Not Suspicious') : '…' }}
+            </button>
 
             @if (selectedStrCase.status === 'CONCLUDED_SUSPICIOUS') {
               <div class="file-str-row">
@@ -457,8 +638,9 @@
             <option value="">All</option>
             <option value="draft">Draft</option>
             <option value="po-review">PO Review</option>
+            <option value="awaiting-filing">Awaiting Filing</option>
             <option value="filed">Filed</option>
-            <option value="rejected">Rejected</option>
+            <option value="rejected">Closed — Clean</option>
           </select>
         </div>
         <div class="fiu-filter">
@@ -478,7 +660,12 @@
 
       <div class="fiu-str-list">
         @for (s of filteredStr; track s.reportRefNo) {
-          <div class="str-card" [class.str-card--filed]="s.status === 'filed'">
+          <div
+            class="str-card"
+            [id]="'str-card-' + s.reportRefNo"
+            [class.str-card--filed]="s.status === 'filed'"
+            [class.str-card--highlight]="highlightedStrRef === s.reportRefNo"
+          >
             <div class="str-card-h">
               <div class="str-card-id">
                 <span class="str-ref">STR-{{ s.reportRefNo }}</span>
@@ -510,6 +697,9 @@
                 <div>
                   <label>Instrument</label><span>{{ s.instrumentType }} {{ s.instrumentId }}</span>
                 </div>
+                <div>
+                  <label>Branch</label><span class="mono">{{ s.branchCode }} {{ branchNameFor(s.branchCode) }}</span>
+                </div>
               </div>
               <div class="str-narrative">
                 <label>Narrative</label>
@@ -521,6 +711,208 @@
                   <p>{{ s.poRemarks }}</p>
                 </div>
               }
+              @if (s.poFinding) {
+                <div class="str-finding" [class.str-finding--suspicious]="s.poFinding === 'SUSPICIOUS'">
+                  <label>
+                    <fa-icon [icon]="s.poFinding === 'CLEAN' ? 'check-circle' : 'exclamation-triangle'"></fa-icon>
+                    Principal Officer Finding
+                  </label>
+                  <p>{{ poFindingLabel(s.poFinding) }}</p>
+                </div>
+              }
+
+              <!-- Concluded suspicious but not yet submitted to FIU-IND -->
+              @if (s.status === 'awaiting-filing') {
+                <div class="str-filing" *mifosxHasPermission="'CONCLUDE_AML_STR'">
+                  <label>
+                    <fa-icon icon="exclamation-triangle"></fa-icon> Awaiting submission to FIU-IND — due within 7 days
+                    of {{ s.detectedOn }}
+                  </label>
+                  <p class="filing-hint">
+                    Generate the FINnet STR XML, upload it on the FIU-IND portal under
+                    {{ bank.principalOfficer }}'s digital signature, then record the acknowledgement number here.
+                  </p>
+                  <div class="filing-row">
+                    <button class="fiu-btn" (click)="exportSingleStrXml(s)">
+                      <fa-icon icon="file-alt"></fa-icon> Generate STR XML
+                    </button>
+                    <input
+                      class="fiu-inp"
+                      type="text"
+                      placeholder="FIU-IND acknowledgement no."
+                      [(ngModel)]="localFileRefs[s.reportRefNo]"
+                    />
+                    <button class="fiu-btn fiu-btn-xml" (click)="fileLocalStr(s)">Mark STR Filed</button>
+                  </div>
+                </div>
+              }
+
+              @if (s.status === 'filed' && s.fiuReferenceNo) {
+                <div class="str-filed-ack">
+                  <fa-icon icon="check-circle"></fa-icon>
+                  <span>
+                    Filed with FIU-IND on <strong>{{ s.filedOn }}</strong> &middot; acknowledgement
+                    <strong class="mono">{{ s.fiuReferenceNo }}</strong>
+                  </span>
+                </div>
+              }
+
+              @if (!s.poFinding && investigatingStr?.reportRefNo !== s.reportRefNo) {
+                <div class="str-po-action" *mifosxHasPermission="'CONCLUDE_AML_STR'">
+                  <label>Principal Officer investigation — is the source of funds legitimate?</label>
+                  <button class="fiu-btn fiu-btn-xml" (click)="investigateLocalStr(s)">
+                    <fa-icon icon="search"></fa-icon> Investigate this case
+                  </button>
+                </div>
+              }
+
+              <!-- Investigation workspace for this case -->
+              @if (investigatingStr?.reportRefNo === s.reportRefNo) {
+                <div class="str-investigation" *mifosxHasPermission="'CONCLUDE_AML_STR'">
+                  <div class="inv-head">
+                    <span>Principal Officer investigation — STR-{{ s.reportRefNo }}</span>
+                    <button class="fiu-link-btn fiu-link-btn--muted" (click)="closeLocalStrInvestigation()">
+                      Cancel
+                    </button>
+                  </div>
+
+                  <!-- Step 1 — call for evidence -->
+                  <div class="inv-step">
+                    <div class="inv-step-t"><span class="inv-num">1</span> Documentary evidence called for</div>
+                    <div class="inv-grid">
+                      <div class="form-row">
+                        <label for="invDocType">Document requested from the customer</label>
+                        <select id="invDocType" class="fiu-inp" [(ngModel)]="evidenceDocType">
+                          <option value="">Select document…</option>
+                          @for (d of evidenceDocTypes; track d) {
+                            <option [value]="d">{{ d }}</option>
+                          }
+                        </select>
+                      </div>
+                      <div class="form-row">
+                        <label for="invReceived">Was it produced?</label>
+                        <select id="invReceived" class="fiu-inp" [(ngModel)]="evidenceReceived">
+                          <option value="">Select…</option>
+                          <option value="YES">Yes — complete</option>
+                          <option value="PARTIAL">Partially — incomplete</option>
+                          <option value="NO">No — not produced</option>
+                        </select>
+                      </div>
+                      <div class="form-row">
+                        <label for="invRef">Document / reference number</label>
+                        <input id="invRef" class="fiu-inp" type="text" [(ngModel)]="evidenceReference" />
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- Step 2 — customer's account of the funds -->
+                  <div class="inv-step">
+                    <div class="inv-step-t"><span class="inv-num">2</span> Customer’s explanation of the source</div>
+                    <textarea
+                      rows="2"
+                      [(ngModel)]="customerExplanation"
+                      placeholder="e.g. Proceeds of a flat sold in June; sale deed produced and matched to the deposit amount and date."
+                    ></textarea>
+                  </div>
+
+                  <!-- Step 3 — verification checklist -->
+                  <div class="inv-step">
+                    <div class="inv-step-t">
+                      <span class="inv-num">3</span> Verification checklist
+                      <span class="checklist-progress" [class.done]="allAnswered">
+                        {{ answeredCount }} / {{ strChecklist.length }} answered
+                      </span>
+                    </div>
+                    <table class="checklist-tbl">
+                      <thead>
+                        <tr>
+                          <th>Verification point</th>
+                          <th class="ta-c col-yes">Genuine</th>
+                          <th class="ta-c col-no">Not satisfied</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        @for (item of strChecklist; track item.key) {
+                          <tr
+                            [class.row-yes]="strFindings[item.key] === true"
+                            [class.row-no]="strFindings[item.key] === false"
+                            [class.row-pending]="strFindings[item.key] === null"
+                          >
+                            <td>
+                              <div class="chk-label">{{ item.label }}</div>
+                              <div class="chk-hint">{{ item.hint }}</div>
+                            </td>
+                            <td class="ta-c">
+                              <button
+                                type="button"
+                                class="chk-box chk-box--yes"
+                                [class.on]="strFindings[item.key] === true"
+                                [attr.aria-label]="'Mark ' + item.label + ' as genuine'"
+                                (click)="setFinding(item.key, true)"
+                              >
+                                <fa-icon icon="check-circle"></fa-icon>
+                              </button>
+                            </td>
+                            <td class="ta-c">
+                              <button
+                                type="button"
+                                class="chk-box chk-box--no"
+                                [class.on]="strFindings[item.key] === false"
+                                [attr.aria-label]="'Mark ' + item.label + ' as not satisfied'"
+                                (click)="setFinding(item.key, false)"
+                              >
+                                <fa-icon icon="exclamation-triangle"></fa-icon>
+                              </button>
+                            </td>
+                          </tr>
+                        }
+                      </tbody>
+                    </table>
+                  </div>
+
+                  <!-- Derived outcome -->
+                  <div
+                    class="verdict"
+                    [class.verdict--clear]="canConcludeLocal && derivedConclusion === 'NOT_SUSPICIOUS'"
+                    [class.verdict--suspicious]="canConcludeLocal && derivedConclusion === 'SUSPICIOUS'"
+                  >
+                    @if (!canConcludeLocal) {
+                      <fa-icon icon="info-circle"></fa-icon>
+                      <span>
+                        Complete all three steps to determine the outcome.
+                        @if (!evidenceRecorded) {
+                          <span> Evidence not yet recorded.</span>
+                        }
+                        @if (!allAnswered) {
+                          <span> {{ strChecklist.length - answeredCount }} verification point(s) pending.</span>
+                        }
+                      </span>
+                    } @else if (derivedConclusion === 'NOT_SUSPICIOUS') {
+                      <fa-icon icon="check-circle"></fa-icon>
+                      <span>
+                        <strong>Source of funds established.</strong> Case closes as clean — the transaction stays in
+                        the CTR report and no STR is filed with FIU-IND.
+                      </span>
+                    } @else {
+                      <fa-icon icon="exclamation-triangle"></fa-icon>
+                      <span>
+                        <strong>Source of funds not established.</strong> {{ failedFindings.length }} point(s)
+                        unsatisfied — an STR will be filed with FIU-IND in addition to the CTR.
+                      </span>
+                    }
+                  </div>
+
+                  <button class="fiu-btn fiu-btn-xml" [disabled]="!canConcludeLocal" (click)="concludeLocalStr()">
+                    {{
+                      canConcludeLocal
+                        ? derivedConclusion === 'SUSPICIOUS'
+                          ? 'Conclude — file STR with FIU-IND'
+                          : 'Conclude — close as clean (CTR only)'
+                        : 'Conclude'
+                    }}
+                  </button>
+                </div>
+              }
             </div>
           </div>
         } @empty {
@@ -626,10 +1018,13 @@
       <div class="fiu-form-meta">
         <div class="fiu-form-title">
           <h3>FINnet 2.0 Submission Files</h3>
-          <p>6 CSV files in FIU-IND prescribed schema, plus STR XML</p>
+          <p>
+            6 CSV files in FIU-IND prescribed schema, plus STR XML. Counts reflect any filters set on the CTR and STR
+            tabs, so every file in the bundle covers the same transactions.
+          </p>
         </div>
         <button class="fiu-btn fiu-btn-xls" (click)="exportAll()">
-          <fa-icon icon="file-csv"></fa-icon> Download All
+          <fa-icon icon="file-csv"></fa-icon> Download All 7
         </button>
       </div>
 
@@ -641,7 +1036,7 @@
         </div>
         <div class="file-card">
           <div class="file-card-h"><fa-icon icon="file-csv"></fa-icon>TC2.csv</div>
-          <p>Branch / cash transactions ({{ ctrTxns.length }} rows)</p>
+          <p>Branch / cash transactions ({{ filteredCtr.length }} rows)</p>
           <button class="fiu-btn fiu-btn-csv" (click)="exportTc2()">
             <fa-icon icon="file-csv"></fa-icon> Download
           </button>
@@ -676,7 +1071,7 @@
         </div>
         <div class="file-card file-card--xml">
           <div class="file-card-h"><fa-icon icon="file-alt"></fa-icon>STR.xml</div>
-          <p>Suspicious Transaction Report ({{ filedStr + pendingStr }} suspects)</p>
+          <p>Suspicious Transaction Report ({{ strSuspects.length }} suspects — cases concluded clean are excluded)</p>
           <button class="fiu-btn fiu-btn-xml" (click)="exportStrXml()">
             <fa-icon icon="file-alt"></fa-icon> Download XML
           </button>

src/app/fiu/fiu.component.scss

@@ -386,6 +386,172 @@
   align-self: end;
 }
 
+/* CTR outcome 1: source of funds evidenced at the counter — CTR only. */
+.fiu-btn-evidence {
+  padding: 5px 10px;
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--f-green);
+  border-color: var(--f-green);
+  background: var(--f-green-l);
+
+  &:hover {
+    background: var(--f-green);
+    border-color: var(--f-green);
+    color: #fff;
+  }
+}
+
+/* Inline evidence capture row inside the TC2 table. */
+.evidence-row td {
+  background: var(--f-green-l) !important;
+  padding: 0 !important;
+}
+
+.evidence-panel {
+  padding: 12px 16px;
+  border-left: 3px solid var(--f-green);
+}
+
+.evidence-t {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 12px;
+  font-weight: 700;
+  color: #14532d;
+  margin-bottom: 10px;
+}
+
+.evidence-grid {
+  display: grid;
+  grid-template-columns: 2fr 1fr auto;
+  gap: 12px;
+  align-items: end;
+}
+
+.evidence-note {
+  margin: 8px 0 0;
+  font-size: 11px;
+  color: var(--f-g700);
+}
+
+@media (width <= 900px) {
+  .evidence-grid {
+    grid-template-columns: 1fr;
+  }
+}
+
+/* CTR outcome 2: evidence unavailable — refer the transaction onward to STR. */
+.fiu-btn-refer {
+  padding: 5px 10px;
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--f-red);
+  border-color: var(--f-red);
+  background: var(--f-red-l);
+
+  &:hover {
+    background: var(--f-red);
+    border-color: var(--f-red);
+    color: #fff;
+  }
+}
+
+.fiu-link-btn {
+  display: inline-block;
+  margin-top: 3px;
+  padding: 0;
+  border: none;
+  background: none;
+  font-family: inherit;
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--f-red);
+  cursor: pointer;
+  text-decoration: underline;
+
+  &:hover {
+    color: #9a2f22;
+  }
+
+  &--muted {
+    color: var(--f-g500);
+
+    &:hover {
+      color: var(--f-red);
+    }
+  }
+}
+
+/* PRINCIPAL OFFICER INVESTIGATION */
+.str-po-action {
+  background: var(--f-amber-l);
+  border: 1px dashed #fcd34d;
+  border-radius: 8px;
+  padding: 10px 14px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  > label {
+    font-size: 10px;
+    font-weight: 700;
+    color: #92400e;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+  }
+}
+
+.fiu-btn-clean {
+  background: var(--f-green);
+  border-color: var(--f-green);
+  color: #fff;
+
+  &:hover {
+    background: #166534;
+    border-color: #166534;
+    color: #fff;
+  }
+}
+
+.str-finding {
+  background: var(--f-green-l);
+  border-radius: 8px;
+  padding: 10px 14px;
+
+  label {
+    font-size: 10px;
+    font-weight: 700;
+    color: var(--f-green);
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    margin-bottom: 4px;
+  }
+
+  p {
+    margin: 0;
+    font-size: 13px;
+    color: #14532d;
+    line-height: 1.5;
+  }
+
+  &--suspicious {
+    background: var(--f-red-l);
+
+    label {
+      color: var(--f-red);
+    }
+
+    p {
+      color: #7f1d1d;
+    }
+  }
+}
+
 /* INPUTS */
 .fiu-inp {
   width: 100%;
@@ -538,6 +704,50 @@
   }
 }
 
+.report-pill {
+  display: inline-block;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+  white-space: nowrap;
+
+  &.report-ctr {
+    background: var(--f-blue-l);
+    color: var(--f-blue);
+  }
+
+  &.report-str {
+    background: var(--f-red-l);
+    color: var(--f-red);
+    margin-left: 4px;
+  }
+
+  &.report-pending {
+    background: var(--f-amber-l);
+    color: var(--f-amber);
+  }
+
+  &.report-cleared {
+    background: var(--f-green-l);
+    color: var(--f-green);
+  }
+}
+
+.fiu-tbl-legend {
+  margin: -6px 2px 0;
+  font-size: 11px;
+  color: var(--f-g500);
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
+
+  .report-pill {
+    margin-left: 0;
+  }
+}
+
 .rel-pill {
   display: inline-block;
   padding: 2px 9px;
@@ -570,6 +780,11 @@
     color: var(--f-amber);
   }
 
+  &.st-awaiting-filing {
+    background: #ffedd5;
+    color: #9a3412;
+  }
+
   &.st-filed {
     background: var(--f-green-l);
     color: var(--f-green);
@@ -697,6 +912,11 @@
   &--filed {
     border-color: #86efac;
   }
+
+  &--highlight {
+    border-color: var(--f-red);
+    box-shadow: 0 0 0 3px rgb(192 57 43 / 20%);
+  }
 }
 
 .str-card-h {
@@ -956,6 +1176,29 @@
   margin-bottom: 16px;
 }
 
+.case-outcome {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex-wrap: wrap;
+  margin: 12px 0;
+  padding: 10px 14px;
+  border-radius: 8px;
+  background: var(--f-g100);
+  font-size: 13px;
+  color: var(--f-g700);
+
+  &--clear {
+    background: var(--f-green-l);
+    color: #14532d;
+  }
+
+  &--suspicious {
+    background: var(--f-red-l);
+    color: #7f1d1d;
+  }
+}
+
 .case-form {
   display: flex;
   flex-direction: column;
@@ -995,6 +1238,303 @@
   }
 }
 
+/* ── Principal Officer verification checklist ───────────────────────────── */
+.checklist {
+  border: 1px solid var(--f-g200);
+  border-radius: 10px;
+  overflow: hidden;
+  background: #fff;
+}
+
+.checklist-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 12px;
+  padding: 10px 14px;
+  background: var(--f-g50);
+  border-bottom: 1px solid var(--f-g200);
+  font-size: 12px;
+  font-weight: 700;
+  color: var(--f-g700);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+}
+
+.checklist-progress {
+  font-size: 11px;
+  font-weight: 700;
+  padding: 2px 10px;
+  border-radius: 999px;
+  background: var(--f-amber-l);
+  color: var(--f-amber);
+  text-transform: none;
+  letter-spacing: 0;
+  white-space: nowrap;
+
+  &.done {
+    background: var(--f-green-l);
+    color: var(--f-green);
+  }
+}
+
+.checklist-tbl {
+  width: 100%;
+  border-collapse: collapse;
+
+  th {
+    padding: 8px 12px;
+    font-size: 10px;
+    font-weight: 700;
+    color: var(--f-g500);
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    background: var(--f-g50);
+    border-bottom: 1px solid var(--f-g200);
+    text-align: left;
+    white-space: nowrap;
+  }
+
+  th.col-yes {
+    color: var(--f-green);
+    width: 96px;
+  }
+
+  th.col-no {
+    color: var(--f-red);
+    width: 112px;
+  }
+
+  td {
+    padding: 9px 12px;
+    border-bottom: 1px solid var(--f-g100);
+    vertical-align: middle;
+  }
+
+  tr:last-child td {
+    border-bottom: none;
+  }
+}
+
+/* Answered rows tint so an unresolved finding is obvious at a glance. */
+.row-yes td {
+  background: rgb(220 252 231 / 45%);
+}
+
+.row-no td {
+  background: rgb(253 236 234 / 60%);
+}
+
+.row-pending td {
+  background: #fff;
+}
+
+.chk-label {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--f-g900);
+}
+
+.chk-hint {
+  font-size: 11px;
+  color: var(--f-g500);
+  margin-top: 1px;
+}
+
+/* Two-sided toggle: one box on the genuine side, one on the not-satisfied side. */
+.chk-box {
+  width: 30px;
+  height: 30px;
+  border-radius: 7px;
+  border: 2px solid var(--f-g300);
+  background: #fff;
+  color: var(--f-g300);
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 14px;
+  transition: all 0.15s;
+
+  &:hover {
+    transform: scale(1.08);
+  }
+
+  &--yes:hover {
+    border-color: var(--f-green);
+    color: var(--f-green);
+  }
+
+  &--no:hover {
+    border-color: var(--f-red);
+    color: var(--f-red);
+  }
+
+  &--yes.on {
+    border-color: var(--f-green);
+    background: var(--f-green);
+    color: #fff;
+  }
+
+  &--no.on {
+    border-color: var(--f-red);
+    background: var(--f-red);
+    color: #fff;
+  }
+}
+
+/* Concluded suspicious, still to be submitted on the FINnet portal. */
+.str-filing {
+  background: #fff7ed;
+  border: 1px solid #fdba74;
+  border-radius: 8px;
+  padding: 10px 14px;
+
+  label {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    font-size: 11px;
+    font-weight: 700;
+    color: #9a3412;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+  }
+}
+
+.filing-hint {
+  margin: 4px 0 8px;
+  font-size: 12px;
+  color: var(--f-g700);
+}
+
+.filing-row {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+
+  .fiu-inp {
+    max-width: 260px;
+  }
+}
+
+.str-filed-ack {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: var(--f-green-l);
+  border: 1px solid #86efac;
+  border-radius: 8px;
+  padding: 9px 14px;
+  font-size: 12px;
+  color: #14532d;
+}
+
+/* ── CTR-referred case: Principal Officer investigation workspace ───────── */
+.str-investigation {
+  margin-top: 12px;
+  border: 1px solid var(--f-purple);
+  border-radius: 10px;
+  background: #fdfcff;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding: 14px;
+}
+
+.inv-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 12px;
+  font-size: 12px;
+  font-weight: 700;
+  color: var(--f-purple);
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+}
+
+.inv-step {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+
+  textarea {
+    width: 100%;
+    padding: 8px 10px;
+    border-radius: 6px;
+    border: 1px solid var(--f-g300);
+    font-family: inherit;
+    font-size: 13px;
+  }
+}
+
+.inv-step-t {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 13px;
+  font-weight: 700;
+  color: var(--f-g900);
+}
+
+.inv-num {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background: var(--f-purple);
+  color: #fff;
+  font-size: 11px;
+  font-weight: 700;
+  flex-shrink: 0;
+}
+
+.inv-grid {
+  display: grid;
+  grid-template-columns: 2fr 1fr 1fr;
+  gap: 12px;
+}
+
+@media (width <= 900px) {
+  .inv-grid {
+    grid-template-columns: 1fr;
+  }
+}
+
+/* Derived verdict banner */
+.verdict {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 11px 15px;
+  border-radius: 9px;
+  font-size: 13px;
+  background: var(--f-g100);
+  border: 1px solid var(--f-g200);
+  color: var(--f-g700);
+
+  &--clear {
+    background: var(--f-green-l);
+    border-color: #86efac;
+    color: #14532d;
+  }
+
+  &--suspicious {
+    background: var(--f-red-l);
+    border-color: #fca5a5;
+    color: #7f1d1d;
+  }
+}
+
+.case-form .fiu-btn-xml:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
 .file-str-row {
   display: flex;
   align-items: center;
@@ -1009,3 +1549,301 @@
     color: var(--f-g500);
   }
 }
+
+/* ═══ WHEN TO REPORT — the five PMLA obligations ═══ */
+.ob-block {
+  margin: 18px 0 20px;
+}
+
+.ob-head {
+  margin-bottom: 12px;
+}
+
+.ob-title {
+  margin: 0;
+  font-size: 15px;
+  font-weight: 700;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.ob-sub {
+  margin: 3px 0 0;
+  font-size: 12px;
+  color: #64748b;
+  max-width: 860px;
+}
+
+.ob-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
+  gap: 12px;
+}
+
+.ob-card {
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-left: 4px solid #1a237e;
+  border-radius: 11px;
+  padding: 13px 15px;
+  display: flex;
+  flex-direction: column;
+  gap: 7px;
+
+  /* Obligations the module only tracks read back a shade quieter than the
+     two it actually files, so the distinction is visible at a glance. */
+  &--off {
+    border-left-color: #cbd5e1;
+    background: #fcfcfd;
+  }
+}
+
+.ob-card-h {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.ob-ic {
+  color: #1a237e;
+  font-size: 15px;
+}
+
+.ob-code {
+  font-weight: 800;
+  font-size: 13px;
+  letter-spacing: 0.02em;
+}
+
+.ob-name {
+  font-size: 12px;
+  color: #334155;
+  font-weight: 600;
+}
+
+.ob-flag {
+  margin-left: auto;
+  font-size: 10px;
+  font-weight: 700;
+  padding: 1px 8px;
+  border-radius: 999px;
+  background: #f1f5f9;
+  color: #64748b;
+  white-space: nowrap;
+
+  &--on {
+    background: #dcfce7;
+    color: #15803d;
+  }
+}
+
+.ob-row {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+
+  label {
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: #94a3b8;
+  }
+
+  span {
+    font-size: 12.5px;
+    color: #0f172a;
+    line-height: 1.45;
+  }
+}
+
+.ob-due {
+  font-weight: 700;
+  color: #b45309 !important;
+}
+
+.ob-note {
+  font-size: 11.5px;
+  color: #64748b;
+  font-style: italic;
+  border-top: 1px dashed #e2e8f0;
+  padding-top: 6px;
+}
+
+/* ═══ FINNET FILE SEQUENCE ═══ */
+.seq-block {
+  margin-top: 26px;
+  padding-top: 18px;
+  border-top: 2px solid #e2e8f0;
+}
+
+.seq-rail {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  flex-wrap: wrap;
+  margin-bottom: 14px;
+}
+
+.seq-step {
+  display: inline-flex;
+  align-items: center;
+  gap: 9px;
+  padding: 7px 13px;
+  border: 1px solid #cbd5e1;
+  background: #fff;
+  border-radius: 9px;
+  cursor: pointer;
+  font-family: inherit;
+  text-align: left;
+  transition: all 0.15s;
+
+  &:hover {
+    border-color: #1a237e;
+  }
+
+  &.active {
+    background: #1a237e;
+    border-color: #1a237e;
+
+    .seq-n {
+      background: #fff;
+      color: #1a237e;
+    }
+
+    .seq-txt strong,
+    .seq-txt em {
+      color: #fff;
+    }
+  }
+}
+
+.seq-n {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 21px;
+  height: 21px;
+  border-radius: 50%;
+  background: #1a237e;
+  color: #fff;
+  font-size: 11px;
+  font-weight: 800;
+  flex: 0 0 21px;
+}
+
+.seq-txt {
+  display: flex;
+  flex-direction: column;
+  line-height: 1.25;
+
+  strong {
+    font-size: 12.5px;
+    color: #0f172a;
+    font-weight: 700;
+  }
+
+  em {
+    font-size: 10.5px;
+    color: #64748b;
+    font-style: normal;
+  }
+}
+
+.seq-arrow {
+  color: #cbd5e1;
+  font-size: 11px;
+}
+
+.seq-panel {
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 11px;
+  overflow: hidden;
+}
+
+.seq-panel-h {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  gap: 16px;
+  padding: 12px 16px;
+  background: #f8fafc;
+  border-bottom: 1px solid #e2e8f0;
+  flex-wrap: wrap;
+
+  h4 {
+    margin: 0;
+    font-size: 13.5px;
+    font-weight: 700;
+  }
+
+  p {
+    margin: 2px 0 0;
+    font-size: 12px;
+    color: #64748b;
+    max-width: 780px;
+  }
+}
+
+.seq-tbl-wrap {
+  max-height: 460px;
+  overflow: auto;
+}
+
+.seq-tbl {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 11.5px;
+  white-space: nowrap;
+
+  th {
+    position: sticky;
+    top: 0;
+    z-index: 1;
+    text-align: left;
+    padding: 8px 10px;
+    background: #eef2f7;
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.03em;
+    color: #334155;
+    border-bottom: 1px solid #cbd5e1;
+  }
+
+  td {
+    padding: 6px 10px;
+    border-bottom: 1px solid #f1f5f9;
+    font-family: 'DM Mono', monospace;
+    color: #0f172a;
+  }
+
+  tbody tr:hover td {
+    background: #f8fafc;
+  }
+}
+
+.seq-rownum {
+  color: #94a3b8 !important;
+  font-weight: 700;
+  text-align: right;
+  position: sticky;
+  left: 0;
+  background: #fff;
+}
+
+.seq-tbl thead .seq-rownum {
+  background: #eef2f7;
+}
+
+.seq-empty {
+  padding: 36px !important;
+  text-align: center;
+  color: #64748b;
+  font-family: inherit !important;
+  white-space: normal;
+  font-size: 12.5px;
+}

src/app/form-declarations/form-declaration-data.ts

@@ -0,0 +1,638 @@
+/**
+ * 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 { GL_BRANCHES, GL_PERIOD } from '../gl-reports/gl-reports-data';
+
+/**
+ * Transactions of customers who banked on a Form 97 / Form 98 declaration.
+ *
+ * Rule 114B of the Income-tax Rules lists transactions where quoting PAN is
+ * mandatory. A customer who has no PAN gives a declaration instead:
+ *
+ *   Form 97 — person with no PAN (income may be taxable).
+ *   Form 98 — person whose only income is agricultural and who has no PAN.
+ *
+ * The bank must be able to produce, for any period, every transaction put
+ * through on the strength of such a declaration. That is what this report is.
+ */
+
+export type FormType = 'FORM_60' | 'FORM_61';
+
+/** Screen and workbook labels — this bank numbers the declarations 97 and 98. */
+export const FORM_LABEL: Record<FormType, string> = {
+  FORM_60: 'Form 97',
+  FORM_61: 'Form 98'
+};
+
+export interface FormDeclarant {
+  /** Declaration acknowledgement number, as issued by the branch. */
+  ackNo: string;
+  formType: FormType;
+  name: string;
+  fatherName: string;
+  dateOfBirth: string;
+  address: string;
+  branchCode: string;
+  accountNo: string;
+  /** Why the customer has no PAN — printed on the declaration. */
+  reasonForNoPan: string;
+  estimatedIncome: number;
+  declaredOn: string;
+  aadhaarLast4: string;
+}
+
+export type TxnMode = 'CASH' | 'TRANSFER' | 'CLEARING' | 'NEFT' | 'RTGS' | 'UPI' | 'ATM';
+
+export interface FormDeclarantTxn {
+  txnId: string;
+  ackNo: string;
+  date: string;
+  branchCode: string;
+  accountNo: string;
+  mode: TxnMode;
+  drCr: 'DR' | 'CR';
+  amount: number;
+  /** What the transaction was — a Rule 114B category or ordinary activity. */
+  nature: string;
+  /** Coarse bucket the nature belongs to, e.g. Cash, Clearing, Loan. */
+  group: string;
+  /** True when the nature is one of the categories listed in Rule 114B. */
+  rule114B: boolean;
+  particulars: string;
+  voucherNo: string;
+}
+
+/** Deterministic linear congruential generator — same figures on every load. */
+function lcg(seed: number): () => number {
+  let s = seed >>> 0;
+  return () => {
+    s = (Math.imul(s, 1664525) + 1013904223) >>> 0;
+    return s / 4294967296;
+  };
+}
+
+function pick<T>(rand: () => number, list: T[]): T {
+  return list[Math.floor(rand() * list.length)];
+}
+
+function isoDate(d: Date): string {
+  const y = d.getUTCFullYear();
+  const m = `${d.getUTCMonth() + 1}`.padStart(2, '0');
+  const day = `${d.getUTCDate()}`.padStart(2, '0');
+  return `${y}-${m}-${day}`;
+}
+
+/**
+ * Thresholds that make a row worth a second look.
+ *
+ * `RULE_114B_CASH` is the cash-deposit limit above which a declaration is
+ * required at all; `CTR` is the aggregate cash figure that puts the customer
+ * into the monthly Cash Transaction Report.
+ */
+export const FORM_THRESHOLD = {
+  RULE_114B_CASH: 50_000,
+  CTR: 1_000_000
+};
+
+const FIRST_NAMES = [
+  'Ramesh',
+  'Sunita',
+  'Vitthal',
+  'Kamala',
+  'Ganpat',
+  'Shobha',
+  'Dnyaneshwar',
+  'Mangala',
+  'Bhaskar',
+  'Anita',
+  'Tukaram',
+  'Sarika',
+  'Nivrutti',
+  'Rekha',
+  'Popat',
+  'Chhaya',
+  'Ashok',
+  'Vaishali',
+  'Bapu',
+  'Nanda',
+  'Sitaram',
+  'Jayshree',
+  'Madhukar',
+  'Pushpa',
+  'Eknath',
+  'Sulochana',
+  'Baban',
+  'Indubai',
+  'Hanumant',
+  'Kalpana'
+];
+
+const SURNAMES = [
+  'Jadhav',
+  'Pawar',
+  'Shinde',
+  'Gaikwad',
+  'More',
+  'Kadam',
+  'Bhosale',
+  'Patil',
+  'Sawant',
+  'Chavan',
+  'Salunkhe',
+  'Mane',
+  'Deshmukh',
+  'Thorat',
+  'Nikam',
+  'Wagh',
+  'Kale',
+  'Ghadge',
+  'Bhoir',
+  'Tandel'
+];
+
+const VILLAGES = [
+  'Wadgaon',
+  'Kolhewadi',
+  'Shirgaon',
+  'Nandgaon',
+  'Pimpalgaon',
+  'Bhosari',
+  'Rajgurunagar',
+  'Talegaon',
+  'Karjat',
+  'Murbad',
+  'Shahapur',
+  'Vasind'
+];
+
+/** Reasons a Form 97 declarant gives — Form 98 has its own single reason. */
+const NO_PAN_REASONS = [
+  'Applied for PAN, allotment awaited',
+  'Total income below taxable limit',
+  'Not required to file return of income',
+  'First-time account holder, PAN not yet obtained'
+];
+
+/**
+ * Every kind of transaction one of these customers puts through — not only the
+ * ones that triggered a declaration.
+ *
+ * `rule114B` marks the categories listed in Rule 114B, where quoting PAN (and
+ * therefore the Form 97/98 declaration) is mandatory above the limit. The rest
+ * are ordinary account activity, which the report still has to show: the point
+ * is the customer's whole picture, not just the declared slice.
+ *
+ * `drCr` is fixed where the category only goes one way; 'EITHER' lets the
+ * generator choose. `cashOnly` forces counter cash, `nonCash` excludes it.
+ */
+interface TxnKind {
+  nature: string;
+  group: string;
+  rule114B: boolean;
+  drCr: 'DR' | 'CR' | 'EITHER';
+  cashOnly?: boolean;
+  nonCash?: boolean;
+  /** Relative frequency — small routine postings outnumber big declared ones. */
+  weight: number;
+  /** Typical value band, before the occasional large-value tail. */
+  min: number;
+  max: number;
+}
+
+const TXN_KINDS: TxnKind[] = [
+  // ── Rule 114B categories: the transactions the declaration was taken for ──
+  {
+    nature: 'Cash deposit exceeding ₹50,000 in a day',
+    group: 'Cash',
+    rule114B: true,
+    drCr: 'CR',
+    cashOnly: true,
+    weight: 14,
+    min: 50_000,
+    max: 470_000
+  },
+  {
+    nature: 'Cash withdrawal exceeding ₹50,000',
+    group: 'Cash',
+    rule114B: true,
+    drCr: 'DR',
+    cashOnly: true,
+    weight: 8,
+    min: 50_000,
+    max: 380_000
+  },
+  {
+    nature: 'Opening of deposit account',
+    group: 'Account',
+    rule114B: true,
+    drCr: 'CR',
+    cashOnly: true,
+    weight: 3,
+    min: 5_000,
+    max: 50_000
+  },
+  {
+    nature: 'Term deposit exceeding ₹50,000',
+    group: 'Deposit',
+    rule114B: true,
+    drCr: 'DR',
+    weight: 5,
+    min: 50_000,
+    max: 900_000
+  },
+  {
+    nature: 'Purchase of demand draft in cash',
+    group: 'Remittance',
+    rule114B: true,
+    drCr: 'DR',
+    cashOnly: true,
+    weight: 4,
+    min: 50_000,
+    max: 260_000
+  },
+  {
+    nature: 'Sale/purchase of goods or services above ₹2,00,000',
+    group: 'Trade',
+    rule114B: true,
+    drCr: 'EITHER',
+    weight: 3,
+    min: 200_000,
+    max: 850_000
+  },
+
+  // ── Ordinary account activity ────────────────────────────────────────────
+  {
+    nature: 'Cash deposit',
+    group: 'Cash',
+    rule114B: false,
+    drCr: 'CR',
+    cashOnly: true,
+    weight: 16,
+    min: 500,
+    max: 49_900
+  },
+  {
+    nature: 'Cash withdrawal',
+    group: 'Cash',
+    rule114B: false,
+    drCr: 'DR',
+    cashOnly: true,
+    weight: 15,
+    min: 500,
+    max: 49_900
+  },
+  {
+    nature: 'Cheque deposit — outward clearing',
+    group: 'Clearing',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 7,
+    min: 2_000,
+    max: 180_000
+  },
+  {
+    nature: 'Cheque paid — inward clearing',
+    group: 'Clearing',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 6,
+    min: 2_000,
+    max: 160_000
+  },
+  {
+    nature: 'NEFT inward credit',
+    group: 'Remittance',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 6,
+    min: 1_000,
+    max: 220_000
+  },
+  {
+    nature: 'NEFT outward remittance',
+    group: 'Remittance',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 5,
+    min: 1_000,
+    max: 200_000
+  },
+  {
+    nature: 'RTGS inward credit',
+    group: 'Remittance',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 2,
+    min: 200_000,
+    max: 1_200_000
+  },
+  {
+    nature: 'UPI / mobile banking transfer',
+    group: 'Digital',
+    rule114B: false,
+    drCr: 'EITHER',
+    nonCash: true,
+    weight: 10,
+    min: 100,
+    max: 24_000
+  },
+  {
+    nature: 'ATM cash withdrawal',
+    group: 'Digital',
+    rule114B: false,
+    drCr: 'DR',
+    cashOnly: true,
+    weight: 9,
+    min: 500,
+    max: 20_000
+  },
+  {
+    nature: 'Transfer between own accounts',
+    group: 'Transfer',
+    rule114B: false,
+    drCr: 'EITHER',
+    nonCash: true,
+    weight: 5,
+    min: 1_000,
+    max: 120_000
+  },
+  {
+    nature: 'Loan instalment (EMI) recovery',
+    group: 'Loan',
+    rule114B: false,
+    drCr: 'DR',
+    weight: 7,
+    min: 2_500,
+    max: 42_000
+  },
+  {
+    nature: 'Loan disbursement credited',
+    group: 'Loan',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 2,
+    min: 50_000,
+    max: 700_000
+  },
+  {
+    nature: 'Interest credited on deposit',
+    group: 'Interest',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 6,
+    min: 120,
+    max: 14_000
+  },
+  {
+    nature: 'Interest debited on loan',
+    group: 'Interest',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 4,
+    min: 200,
+    max: 11_000
+  },
+  {
+    nature: 'Term deposit matured and credited',
+    group: 'Deposit',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 3,
+    min: 25_000,
+    max: 620_000
+  },
+  {
+    nature: 'Recurring deposit instalment',
+    group: 'Deposit',
+    rule114B: false,
+    drCr: 'DR',
+    weight: 5,
+    min: 500,
+    max: 12_000
+  },
+  {
+    nature: 'Service charges / commission recovered',
+    group: 'Charges',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 6,
+    min: 25,
+    max: 2_400
+  },
+  {
+    nature: 'Cheque return charges',
+    group: 'Charges',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 2,
+    min: 100,
+    max: 900
+  },
+  {
+    nature: 'Locker rent recovered',
+    group: 'Charges',
+    rule114B: false,
+    drCr: 'DR',
+    nonCash: true,
+    weight: 1,
+    min: 800,
+    max: 4_500
+  },
+  {
+    nature: 'Dividend credited on shares',
+    group: 'Shares',
+    rule114B: false,
+    drCr: 'CR',
+    nonCash: true,
+    weight: 2,
+    min: 200,
+    max: 9_000
+  },
+  {
+    nature: 'Share capital subscription',
+    group: 'Shares',
+    rule114B: false,
+    drCr: 'DR',
+    weight: 2,
+    min: 500,
+    max: 25_000
+  }
+];
+
+/** Flattened by weight so a single draw picks a category at the right rate. */
+const KIND_POOL: TxnKind[] = TXN_KINDS.flatMap((k) => Array<TxnKind>(k.weight).fill(k));
+
+/** The distinct groups, for the report's category filter. */
+export const TXN_GROUPS: string[] = [...new Set(TXN_KINDS.map((k) => k.group))].sort();
+
+let declarantCache: FormDeclarant[] | null = null;
+let txnCache: FormDeclarantTxn[] | null = null;
+
+/**
+ * The customers who filed a declaration. Roughly one in five is a Form 98
+ * (agricultural income only), which matches the mix a semi-urban co-operative
+ * bank sees — the rural branches carry most of them.
+ */
+export function formDeclarants(): FormDeclarant[] {
+  if (declarantCache) {
+    return declarantCache;
+  }
+  const rand = lcg(31071998);
+  const branches = GL_BRANCHES.filter((b) => b.code !== 'HO');
+  const out: FormDeclarant[] = [];
+
+  for (let i = 0; i < 148; i++) {
+    const branch = branches[i % branches.length];
+    // Form 98 is the agricultural-income declaration, so it clusters in the
+    // outlying branches rather than being spread evenly.
+    const rural = branch.code === '0004' || branch.code === '0006';
+    const formType: FormType = rand() < (rural ? 0.42 : 0.08) ? 'FORM_61' : 'FORM_60';
+
+    const first = pick(rand, FIRST_NAMES);
+    const last = pick(rand, SURNAMES);
+    const seq = `${i + 1}`.padStart(3, '0');
+
+    // Declarations are taken in the run-up to and during the ledger period.
+    const declOffset = Math.floor(rand() * 150);
+    const declDate = new Date(`${GL_PERIOD.fyStart}T00:00:00Z`);
+    declDate.setUTCDate(declDate.getUTCDate() - 60 + declOffset);
+
+    const birthYear = 1955 + Math.floor(rand() * 45);
+    const birthMonth = 1 + Math.floor(rand() * 12);
+    const birthDay = 1 + Math.floor(rand() * 28);
+
+    out.push({
+      ackNo: `${branch.code}/F${formType === 'FORM_60' ? '97' : '98'}/${seq}`,
+      formType,
+      name: `${first} ${last}`,
+      fatherName: `${pick(rand, FIRST_NAMES)} ${last}`,
+      dateOfBirth: `${birthYear}-${`${birthMonth}`.padStart(2, '0')}-${`${birthDay}`.padStart(2, '0')}`,
+      address: `${pick(rand, VILLAGES)}, Tal. ${pick(rand, VILLAGES)}, Dist. Thane`,
+      branchCode: branch.code,
+      accountNo: `${branch.code}${(4100000 + i * 137).toString().padStart(8, '0')}`,
+      reasonForNoPan:
+        formType === 'FORM_61' ? 'Income consists only of agricultural income' : pick(rand, NO_PAN_REASONS),
+      // Form 98 declarants report agricultural income, which the Act exempts, so
+      // their declared figures sit below the Form 97 band.
+      estimatedIncome:
+        formType === 'FORM_61' ? 90_000 + Math.floor(rand() * 160_000) : 140_000 + Math.floor(rand() * 380_000),
+      declaredOn: isoDate(declDate),
+      aadhaarLast4: `${1000 + Math.floor(rand() * 9000)}`
+    });
+  }
+
+  declarantCache = out;
+  return out;
+}
+
+/**
+ * Every transaction these customers put through inside the ledger period.
+ *
+ * A declaration is taken per transaction category, so an active customer shows
+ * several rows; a customer who only opened an account shows one.
+ */
+export function formDeclarantTxns(): FormDeclarantTxn[] {
+  if (txnCache) {
+    return txnCache;
+  }
+  const rand = lcg(19980731);
+  const start = new Date(`${GL_PERIOD.fyStart}T00:00:00Z`);
+  const end = new Date(`${GL_PERIOD.fyEnd}T00:00:00Z`);
+  const span = Math.round((end.getTime() - start.getTime()) / 86_400_000);
+
+  const out: FormDeclarantTxn[] = [];
+  let voucher = 1;
+
+  for (const d of formDeclarants()) {
+    // Weighted low — most declarants are occasional users and a handful bank
+    // every week. Squaring the draw gives that long tail rather than a flat
+    // spread, while still leaving enough volume for a day-wise filter to show.
+    const count = 1 + Math.floor(rand() * rand() * 22);
+
+    for (let n = 0; n < count; n++) {
+      const day = new Date(start.getTime());
+      day.setUTCDate(day.getUTCDate() + Math.floor(rand() * span));
+      if (day.getUTCDay() === 0) {
+        day.setUTCDate(day.getUTCDate() + 1); // Sunday — no counter business.
+      }
+
+      const kind = pick(rand, KIND_POOL);
+      const drCr: 'DR' | 'CR' = kind.drCr === 'EITHER' ? (rand() < 0.5 ? 'DR' : 'CR') : kind.drCr;
+
+      // The channel follows the category: cash categories go over the counter,
+      // clearing goes through the house, and the rest split across the
+      // electronic rails a co-operative bank offers.
+      let mode: TxnMode;
+      if (kind.cashOnly) {
+        mode = kind.nature.startsWith('ATM') ? 'ATM' : 'CASH';
+      } else if (kind.nonCash) {
+        mode =
+          kind.group === 'Clearing'
+            ? 'CLEARING'
+            : kind.nature.startsWith('RTGS')
+              ? 'RTGS'
+              : kind.nature.startsWith('NEFT')
+                ? 'NEFT'
+                : kind.group === 'Digital'
+                  ? 'UPI'
+                  : 'TRANSFER';
+      } else {
+        // Categories that can go either way — a term deposit or an EMI is paid
+        // in cash as often as it is transferred at this kind of bank.
+        mode = rand() < 0.55 ? 'CASH' : 'TRANSFER';
+      }
+
+      // Inside the category's own band, with a thin large-value tail on the
+      // Rule 114B rows so the report has CTR-sized entries to flag.
+      let amount = kind.min + Math.floor(rand() * (kind.max - kind.min));
+      if (kind.rule114B && kind.cashOnly && rand() < 0.09) {
+        amount = FORM_THRESHOLD.CTR + Math.floor(rand() * 1_400_000);
+      }
+      amount = Math.round(amount / 100) * 100 || 100;
+
+      const cashWord = mode === 'CASH' || mode === 'ATM';
+      out.push({
+        txnId: `TXN${`${out.length + 1}`.padStart(5, '0')}`,
+        ackNo: d.ackNo,
+        date: isoDate(day),
+        branchCode: d.branchCode,
+        accountNo: d.accountNo,
+        mode,
+        drCr,
+        amount,
+        nature: kind.nature,
+        group: kind.group,
+        rule114B: kind.rule114B,
+        particulars:
+          drCr === 'DR'
+            ? `${cashWord ? 'Cash paid to' : 'Debit to account of'} ${d.name} — ${kind.nature.toLowerCase()}`
+            : `${cashWord ? 'Cash received from' : 'Credit to account of'} ${d.name} — ${kind.nature.toLowerCase()}`,
+        voucherNo: `${d.branchCode}/V/${`${voucher++}`.padStart(5, '0')}`
+      });
+    }
+  }
+
+  out.sort((a, b) => (a.date === b.date ? a.txnId.localeCompare(b.txnId) : a.date.localeCompare(b.date)));
+  txnCache = out;
+  return out;
+}
+
+export function declarantByAck(ackNo: string): FormDeclarant | undefined {
+  return formDeclarants().find((d) => d.ackNo === ackNo);
+}

src/app/form-declarations/form-declaration-report.component.html

@@ -0,0 +1,370 @@
+<!--
+  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="fd-root">
+  <!-- HEADER -->
+  <div class="fd-head">
+    <div class="fd-head-left">
+      <fa-icon icon="file-signature" class="fd-head-ic"></fa-icon>
+      <div>
+        <h2 class="fd-head-t">Form 97 / 98 Transaction Report</h2>
+        <div class="fd-head-s">
+          Every transaction put through on a declaration under Rule 114B, for customers who have no PAN. Form 97 is the
+          general declaration; Form 98 is for a person whose only income is agricultural.
+        </div>
+      </div>
+    </div>
+    <button class="fd-btn fd-btn--primary" [disabled]="generating" (click)="exportExcel()">
+      <fa-icon icon="file-excel"></fa-icon> {{ generating ? 'Generating…' : 'Download Excel' }}
+    </button>
+  </div>
+
+  <!-- FILTERS -->
+  <div class="fd-filters">
+    <div class="fd-filter-row">
+      <div class="fd-modes">
+        @for (m of periodModes; track m.key) {
+          <button class="fd-chip" [class.active]="periodMode === m.key" (click)="periodMode = m.key">
+            {{ m.label }}
+          </button>
+        }
+      </div>
+
+      @switch (periodMode) {
+        @case ('day') {
+          <label class="fd-field">
+            <span>Date</span>
+            <input type="date" [(ngModel)]="filterDay" [min]="period.fyStart" [max]="period.fyEnd" />
+          </label>
+        }
+        @case ('week') {
+          <label class="fd-field">
+            <span>Any date in week</span>
+            <input type="date" [(ngModel)]="filterWeek" [min]="period.fyStart" [max]="period.fyEnd" />
+          </label>
+          <span class="fd-resolved">Week: {{ rangeLabel }}</span>
+        }
+        @case ('month') {
+          <label class="fd-field">
+            <span>Month</span>
+            <input type="month" [(ngModel)]="filterMonth" min="2026-04" max="2026-07" />
+          </label>
+        }
+        @default {
+          <label class="fd-field">
+            <span>From</span>
+            <input type="date" [(ngModel)]="filterFrom" [min]="period.fyStart" [max]="period.fyEnd" />
+          </label>
+          <label class="fd-field">
+            <span>To</span>
+            <input type="date" [(ngModel)]="filterTo" [min]="period.fyStart" [max]="period.fyEnd" />
+          </label>
+        }
+      }
+    </div>
+
+    <div class="fd-filter-row">
+      <label class="fd-field">
+        <span>Branch</span>
+        <select [(ngModel)]="branchCode" [disabled]="!canSelectBranch">
+          @if (canSelectBranch) {
+            <option value="">All Branches</option>
+          }
+          @for (b of branches; track b.code) {
+            <option [value]="b.code">{{ b.code }} — {{ b.name }}</option>
+          }
+        </select>
+      </label>
+
+      <label class="fd-field">
+        <span>Declaration</span>
+        <select [(ngModel)]="formType">
+          <option value="">Both</option>
+          <option value="FORM_60">Form 97 — no PAN</option>
+          <option value="FORM_61">Form 98 — agricultural income</option>
+        </select>
+      </label>
+
+      <label class="fd-field">
+        <span>Transaction type</span>
+        <select [(ngModel)]="group">
+          <option value="">All types</option>
+          @for (g of txnGroups; track g) {
+            <option [value]="g">{{ g }}</option>
+          }
+        </select>
+      </label>
+
+      <label class="fd-field fd-field--grow">
+        <span>Search</span>
+        <input type="text" [(ngModel)]="search" placeholder="Name, account number or acknowledgement no…" />
+      </label>
+
+      <label class="fd-check">
+        <input type="checkbox" [(ngModel)]="flaggedOnly" />
+        Only CTR reportable
+      </label>
+
+      <button class="fd-btn" (click)="resetFilters()"><fa-icon icon="undo"></fa-icon> Reset</button>
+    </div>
+
+    @if (!canSelectBranch) {
+      <div class="fd-scope-note">
+        <fa-icon icon="lock"></fa-icon>
+        Showing {{ branchLabel }} only. Head Office logins can select any branch.
+      </div>
+    }
+  </div>
+
+  <!-- SUMMARY -->
+  <div class="fd-kpis">
+    <div class="fd-kpi">
+      <div class="fd-kpi-n">{{ summary.persons }}</div>
+      <div class="fd-kpi-l">Declarants</div>
+      <div class="fd-kpi-sub">{{ summary.form60Persons }} on Form 97 · {{ summary.form61Persons }} on Form 98</div>
+    </div>
+    <div class="fd-kpi fd-kpi--blue">
+      <div class="fd-kpi-n">{{ summary.txnCount }}</div>
+      <div class="fd-kpi-l">Transactions — all types</div>
+      <div class="fd-kpi-sub">{{ summary.declarationRequired }} in a Rule 114B category</div>
+    </div>
+    <div class="fd-kpi fd-kpi--amber">
+      <div class="fd-kpi-n">{{ summary.cashTotal | number: '1.0-0' }}</div>
+      <div class="fd-kpi-l">Cash turnover (₹)</div>
+      <div class="fd-kpi-sub">{{ summary.cashCount }} cash transactions</div>
+    </div>
+    <div class="fd-kpi" [class.fd-kpi--red]="summary.ctrReportable > 0">
+      <div class="fd-kpi-n">{{ summary.ctrReportable }}</div>
+      <div class="fd-kpi-l">CTR reportable</div>
+      <div class="fd-kpi-sub">cash at or above ₹10,00,000</div>
+    </div>
+  </div>
+
+  <!-- CATEGORY MIX — what these customers actually do, beyond the declared rows -->
+  @if (summary.byGroup.length) {
+    <div class="fd-mix">
+      <span class="fd-mix-t">Transaction mix</span>
+      @for (g of summary.byGroup; track g.group) {
+        <button
+          class="fd-mix-item"
+          [class.active]="group === g.group"
+          (click)="group = group === g.group ? '' : g.group"
+        >
+          {{ g.group }} <strong>{{ g.count }}</strong>
+        </button>
+      }
+    </div>
+  }
+
+  <!-- VIEW SWITCH -->
+  <div class="fd-views">
+    <button class="fd-chip" [class.active]="view === 'person'" (click)="view = 'person'">
+      <fa-icon icon="users"></fa-icon> Person wise
+    </button>
+    <button class="fd-chip" [class.active]="view === 'transaction'" (click)="view = 'transaction'">
+      <fa-icon icon="list"></fa-icon> Transaction wise
+    </button>
+    <span class="fd-spacer"></span>
+    <span class="fd-count">
+      {{ view === 'person' ? personRows.length + ' declarants' : txnRows.length + ' transactions' }}
+    </span>
+  </div>
+
+  <!-- PERSON WISE -->
+  @if (view === 'person') {
+    <div class="fd-table-wrap">
+      <table class="fd-table">
+        <thead>
+          <tr>
+            <th></th>
+            <th>Acknowledgement</th>
+            <th>Form</th>
+            <th>Name of declarant</th>
+            <th>Account No</th>
+            <th>Branch</th>
+            <th class="num">Txns</th>
+            <th class="num">Rule 114B</th>
+            <th class="num">Cash turnover</th>
+            <th class="num">Credit</th>
+            <th class="num">Debit</th>
+            <th class="num">Declared income</th>
+            <th class="num">Cash ÷ income</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (p of personRows; track p.declarant.ackNo) {
+            <tr class="fd-person" [class.open]="expanded === p.declarant.ackNo" (click)="toggle(p.declarant.ackNo)">
+              <td>
+                <fa-icon [icon]="expanded === p.declarant.ackNo ? 'caret-down' : 'caret-right'"></fa-icon>
+              </td>
+              <td class="mono">{{ p.declarant.ackNo }}</td>
+              <td>
+                <span class="fd-form" [class.fd-form--61]="p.declarant.formType === 'FORM_61'">
+                  {{ formLabel[p.declarant.formType] }}
+                </span>
+              </td>
+              <td>
+                <strong>{{ p.declarant.name }}</strong>
+                @if (p.ctrCount > 0) {
+                  <span class="fd-tag fd-tag--ctr">{{ p.ctrCount }} CTR</span>
+                }
+              </td>
+              <td class="mono">{{ p.declarant.accountNo }}</td>
+              <td>{{ p.declarant.branchCode }}</td>
+              <td class="num">{{ p.txnCount }}</td>
+              <td class="num">{{ p.declaredCount }}</td>
+              <td class="num strong">{{ p.cashTotal | number: '1.0-0' }}</td>
+              <td class="num">{{ p.totalCredit | number: '1.0-0' }}</td>
+              <td class="num">{{ p.totalDebit | number: '1.0-0' }}</td>
+              <td class="num">{{ p.declarant.estimatedIncome | number: '1.0-0' }}</td>
+              <td class="num">
+                <span [class]="ratioClass(p.incomeRatio)">{{ p.incomeRatio | number: '1.1-1' }}×</span>
+              </td>
+            </tr>
+
+            @if (expanded === p.declarant.ackNo) {
+              <tr class="fd-detail">
+                <td colspan="13">
+                  <div class="fd-decl">
+                    <div>
+                      <label>Father's name</label><span>{{ p.declarant.fatherName }}</span>
+                    </div>
+                    <div>
+                      <label>Date of birth</label><span>{{ p.declarant.dateOfBirth }}</span>
+                    </div>
+                    <div>
+                      <label>Aadhaar</label><span class="mono">XXXX XXXX {{ p.declarant.aadhaarLast4 }}</span>
+                    </div>
+                    <div>
+                      <label>Declared on</label><span>{{ p.declarant.declaredOn }}</span>
+                    </div>
+                    <div class="wide">
+                      <label>Address</label><span>{{ p.declarant.address }}</span>
+                    </div>
+                    <div class="wide">
+                      <label>Reason for no PAN</label><span>{{ p.declarant.reasonForNoPan }}</span>
+                    </div>
+                  </div>
+
+                  <table class="fd-subtable">
+                    <thead>
+                      <tr>
+                        <th>Date</th>
+                        <th>Txn ID</th>
+                        <th>Mode</th>
+                        <th>Dr/Cr</th>
+                        <th class="num">Amount</th>
+                        <th>Nature of transaction (Rule 114B)</th>
+                        <th>Voucher</th>
+                        <th>Flag</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      @for (t of p.txns; track t.txnId) {
+                        <tr>
+                          <td class="mono">{{ t.date }}</td>
+                          <td class="mono">{{ t.txnId }}</td>
+                          <td>
+                            <span class="fd-mode">{{ t.mode }}</span>
+                          </td>
+                          <td [class.cr]="t.drCr === 'CR'" [class.dr]="t.drCr === 'DR'">{{ t.drCr }}</td>
+                          <td class="num strong">{{ t.amount | number: '1.0-0' }}</td>
+                          <td>{{ t.nature }}</td>
+                          <td class="mono">{{ t.voucherNo }}</td>
+                          <td>
+                            @if (t.ctrReportable) {
+                              <span class="fd-tag fd-tag--ctr">CTR</span>
+                            } @else if (t.declarationRequired) {
+                              <span class="fd-tag">Rule 114B</span>
+                            }
+                          </td>
+                        </tr>
+                      }
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
+            }
+          } @empty {
+            <tr>
+              <td colspan="13" class="fd-empty">
+                No Form 97 or Form 98 transactions for {{ rangeLabel }} at {{ branchLabel }}.
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+
+  <!-- TRANSACTION WISE -->
+  @if (view === 'transaction') {
+    <div class="fd-table-wrap">
+      <table class="fd-table">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Txn ID</th>
+            <th>Acknowledgement</th>
+            <th>Form</th>
+            <th>Name of declarant</th>
+            <th>Account No</th>
+            <th>Branch</th>
+            <th>Category</th>
+            <th>Mode</th>
+            <th>Dr/Cr</th>
+            <th class="num">Amount</th>
+            <th>Nature of transaction</th>
+            <th>Voucher</th>
+            <th>Flag</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (t of txnRows; track t.txnId) {
+            <tr [class.fd-row--ctr]="t.ctrReportable">
+              <td class="mono">{{ t.date }}</td>
+              <td class="mono">{{ t.txnId }}</td>
+              <td class="mono">{{ t.ackNo }}</td>
+              <td>
+                <span class="fd-form" [class.fd-form--61]="t.formType === 'FORM_61'">{{ formLabel[t.formType] }}</span>
+              </td>
+              <td>{{ t.declarantName }}</td>
+              <td class="mono">{{ t.accountNo }}</td>
+              <td>{{ t.branchCode }}</td>
+              <td>
+                <span class="fd-group">{{ t.group }}</span>
+              </td>
+              <td>
+                <span class="fd-mode">{{ t.mode }}</span>
+              </td>
+              <td [class.cr]="t.drCr === 'CR'" [class.dr]="t.drCr === 'DR'">{{ t.drCr }}</td>
+              <td class="num strong">{{ t.amount | number: '1.0-0' }}</td>
+              <td>{{ t.nature }}</td>
+              <td class="mono">{{ t.voucherNo }}</td>
+              <td>
+                @if (t.ctrReportable) {
+                  <span class="fd-tag fd-tag--ctr">CTR</span>
+                } @else if (t.declarationRequired) {
+                  <span class="fd-tag">Rule 114B</span>
+                }
+              </td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="14" class="fd-empty">
+                No Form 97 or Form 98 transactions for {{ rangeLabel }} at {{ branchLabel }}.
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+
+  <div class="fd-toast" [class.show]="toastVisible">{{ toastMsg }}</div>
+</div>

src/app/form-declarations/form-declaration-report.component.scss

@@ -0,0 +1,608 @@
+/**
+ * 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 {
+  --f-navy: #1a237e;
+  --f-blue: #1d4ed8;
+  --f-blue-l: #eff6ff;
+  --f-green: #15803d;
+  --f-green-l: #dcfce7;
+  --f-amber: #b45309;
+  --f-amber-l: #fef3c7;
+  --f-red: #c0392b;
+  --f-red-l: #fdecea;
+  --f-g50: #f8fafc;
+  --f-g100: #f1f5f9;
+  --f-g200: #e2e8f0;
+  --f-g300: #cbd5e1;
+  --f-g500: #64748b;
+  --f-g700: #334155;
+  --f-g900: #0f172a;
+
+  display: block;
+  font-family: 'DM Sans', system-ui, sans-serif;
+  background: var(--f-g50);
+  color: var(--f-g900);
+  font-size: 14px;
+  line-height: 1.5;
+}
+
+.fd-root {
+  padding: 18px 22px;
+  max-width: 1700px;
+  margin: 0 auto;
+}
+
+/* HEADER */
+.fd-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+  flex-wrap: wrap;
+  margin-bottom: 14px;
+}
+
+.fd-head-left {
+  display: flex;
+  align-items: flex-start;
+  gap: 14px;
+}
+
+.fd-head-ic {
+  font-size: 26px;
+  color: var(--f-navy);
+  margin-top: 3px;
+}
+
+.fd-head-t {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 700;
+}
+
+.fd-head-s {
+  font-size: 12px;
+  color: var(--f-g500);
+  max-width: 820px;
+}
+
+/* BUTTONS */
+.fd-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px 15px;
+  border: 1px solid var(--f-g300);
+  background: #fff;
+  border-radius: 8px;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--f-g700);
+  cursor: pointer;
+  font-family: inherit;
+  transition: all 0.15s;
+
+  &:hover:not(:disabled) {
+    background: var(--f-g50);
+    border-color: var(--f-g500);
+  }
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+
+  &--primary {
+    background: var(--f-green);
+    border-color: var(--f-green);
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #12692f;
+      border-color: #12692f;
+      color: #fff;
+    }
+  }
+}
+
+/* FILTERS */
+.fd-filters {
+  background: #fff;
+  border: 1px solid var(--f-g200);
+  border-radius: 11px;
+  padding: 12px 16px;
+  margin-bottom: 14px;
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+
+.fd-filter-row {
+  display: flex;
+  align-items: flex-end;
+  gap: 12px;
+  flex-wrap: wrap;
+}
+
+.fd-modes {
+  display: flex;
+  gap: 6px;
+  flex-wrap: wrap;
+}
+
+.fd-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 14px;
+  border: 1px solid var(--f-g300);
+  background: #fff;
+  border-radius: 999px;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--f-g700);
+  cursor: pointer;
+  font-family: inherit;
+
+  &:hover {
+    border-color: var(--f-navy);
+  }
+
+  &.active {
+    background: var(--f-navy);
+    border-color: var(--f-navy);
+    color: #fff;
+  }
+}
+
+.fd-field {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+
+  span {
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--f-g500);
+  }
+
+  input,
+  select {
+    padding: 7px 10px;
+    border: 1px solid var(--f-g300);
+    border-radius: 7px;
+    font-size: 13px;
+    font-family: inherit;
+    background: #fff;
+    color: var(--f-g900);
+
+    &:focus {
+      outline: none;
+      border-color: var(--f-navy);
+    }
+
+    &:disabled {
+      background: var(--f-g100);
+      color: var(--f-g500);
+    }
+  }
+
+  &--grow {
+    flex: 1;
+    min-width: 240px;
+
+    input {
+      width: 100%;
+    }
+  }
+}
+
+.fd-resolved {
+  font-size: 12px;
+  color: var(--f-g500);
+  padding-bottom: 8px;
+}
+
+.fd-check {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: var(--f-g700);
+  padding-bottom: 8px;
+  cursor: pointer;
+}
+
+.fd-scope-note {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  font-size: 12px;
+  color: var(--f-amber);
+  background: var(--f-amber-l);
+  border: 1px solid #fcd34d;
+  border-radius: 7px;
+  padding: 6px 11px;
+}
+
+/* KPIs */
+.fd-kpis {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 12px;
+  margin-bottom: 14px;
+}
+
+.fd-kpi {
+  background: #fff;
+  border: 1px solid var(--f-g200);
+  border-left: 4px solid var(--f-navy);
+  border-radius: 11px;
+  padding: 12px 16px;
+
+  &--blue {
+    border-left-color: var(--f-blue);
+  }
+
+  &--amber {
+    border-left-color: var(--f-amber);
+  }
+
+  &--red {
+    border-left-color: var(--f-red);
+  }
+}
+
+.fd-kpi-n {
+  font-size: 22px;
+  font-weight: 700;
+  font-family: 'DM Mono', monospace;
+}
+
+.fd-kpi-l {
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--f-g700);
+}
+
+.fd-kpi-sub {
+  font-size: 11px;
+  color: var(--f-g500);
+}
+
+/* VIEW SWITCH */
+.fd-views {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+
+.fd-spacer {
+  flex: 1;
+}
+
+.fd-count {
+  font-size: 12px;
+  color: var(--f-g500);
+  font-weight: 600;
+}
+
+/* TABLE */
+.fd-table-wrap {
+  background: #fff;
+  border: 1px solid var(--f-g200);
+  border-radius: 11px;
+  overflow-x: auto;
+}
+
+.fd-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 12.5px;
+
+  th {
+    text-align: left;
+    padding: 9px 10px;
+    background: var(--f-g100);
+    font-size: 10.5px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--f-g700);
+    white-space: nowrap;
+    border-bottom: 1px solid var(--f-g200);
+  }
+
+  td {
+    padding: 8px 10px;
+    border-bottom: 1px solid var(--f-g100);
+    vertical-align: top;
+  }
+
+  .num {
+    text-align: right;
+    font-family: 'DM Mono', monospace;
+  }
+
+  .strong {
+    font-weight: 700;
+  }
+
+  tbody tr:hover:not(.fd-detail) {
+    background: var(--f-g50);
+  }
+}
+
+.fd-person {
+  cursor: pointer;
+
+  &.open {
+    background: var(--f-blue-l);
+  }
+}
+
+.fd-row--ctr {
+  background: var(--f-red-l);
+}
+
+.fd-detail {
+  background: #fcfcfe;
+
+  td {
+    padding: 12px 16px 16px;
+  }
+}
+
+.fd-decl {
+  display: grid;
+  grid-template-columns: repeat(4, 1fr);
+  gap: 8px 18px;
+  margin-bottom: 12px;
+  padding: 10px 14px;
+  background: #fff;
+  border: 1px solid var(--f-g200);
+  border-radius: 8px;
+
+  > div {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .wide {
+    grid-column: span 2;
+  }
+
+  label {
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: var(--f-g500);
+  }
+
+  span {
+    font-size: 12.5px;
+  }
+}
+
+.fd-subtable {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 12px;
+  background: #fff;
+  border: 1px solid var(--f-g200);
+  border-radius: 8px;
+  overflow: hidden;
+
+  th {
+    text-align: left;
+    padding: 7px 10px;
+    background: var(--f-g50);
+    font-size: 10px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: var(--f-g500);
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 6px 10px;
+    border-top: 1px solid var(--f-g100);
+  }
+
+  .num {
+    text-align: right;
+    font-family: 'DM Mono', monospace;
+  }
+
+  .strong {
+    font-weight: 700;
+  }
+}
+
+/* Badges */
+.fd-form {
+  display: inline-block;
+  padding: 1px 8px;
+  border-radius: 999px;
+  font-size: 10.5px;
+  font-weight: 700;
+  background: var(--f-blue-l);
+  color: var(--f-blue);
+  white-space: nowrap;
+
+  &--61 {
+    background: var(--f-green-l);
+    color: var(--f-green);
+  }
+}
+
+.fd-mode {
+  display: inline-block;
+  padding: 1px 7px;
+  border-radius: 5px;
+  font-size: 10.5px;
+  font-weight: 700;
+  background: var(--f-g100);
+  color: var(--f-g700);
+}
+
+.fd-group {
+  display: inline-block;
+  padding: 1px 8px;
+  border-radius: 999px;
+  font-size: 10.5px;
+  font-weight: 600;
+  background: #fff;
+  border: 1px solid var(--f-g300);
+  color: var(--f-g700);
+  white-space: nowrap;
+}
+
+/* Category mix — doubles as a one-click filter. */
+.fd-mix {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  flex-wrap: wrap;
+  margin-bottom: 12px;
+}
+
+.fd-mix-t {
+  font-size: 10px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--f-g500);
+  margin-right: 2px;
+}
+
+.fd-mix-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 11px;
+  border: 1px solid var(--f-g200);
+  background: #fff;
+  border-radius: 7px;
+  font-size: 11.5px;
+  font-weight: 600;
+  color: var(--f-g700);
+  cursor: pointer;
+  font-family: inherit;
+
+  strong {
+    font-family: 'DM Mono', monospace;
+    color: var(--f-navy);
+  }
+
+  &:hover {
+    border-color: var(--f-navy);
+  }
+
+  &.active {
+    background: var(--f-navy);
+    border-color: var(--f-navy);
+    color: #fff;
+
+    strong {
+      color: #fff;
+    }
+  }
+}
+
+.fd-tag {
+  display: inline-block;
+  margin-left: 6px;
+  padding: 1px 7px;
+  border-radius: 999px;
+  font-size: 10px;
+  font-weight: 700;
+  background: var(--f-amber-l);
+  color: var(--f-amber);
+  white-space: nowrap;
+
+  &--ctr {
+    background: var(--f-red-l);
+    color: var(--f-red);
+  }
+}
+
+.fd-ratio {
+  font-weight: 600;
+
+  &--mid {
+    color: var(--f-amber);
+  }
+
+  &--high {
+    color: var(--f-red);
+    font-weight: 700;
+  }
+}
+
+.cr {
+  color: var(--f-green);
+  font-weight: 700;
+}
+
+.dr {
+  color: var(--f-red);
+  font-weight: 700;
+}
+
+.mono {
+  font-family: 'DM Mono', monospace;
+  font-size: 11.5px;
+}
+
+.fd-empty {
+  padding: 44px;
+  text-align: center;
+  color: var(--f-g500);
+  font-size: 13px;
+}
+
+/* TOAST */
+.fd-toast {
+  position: fixed;
+  bottom: 32px;
+  left: 50%;
+  transform: translateX(-50%) translateY(20px);
+  background: var(--f-navy);
+  color: #fff;
+  padding: 12px 22px;
+  border-radius: 10px;
+  font-size: 13px;
+  box-shadow: 0 6px 20px rgb(0 0 0 / 25%);
+  opacity: 0;
+  pointer-events: none;
+  transition: all 0.25s;
+  z-index: 1500;
+
+  &.show {
+    opacity: 1;
+    transform: translateX(-50%) translateY(0);
+  }
+}
+
+@media (width <= 1200px) {
+  .fd-kpis {
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .fd-decl {
+    grid-template-columns: 1fr 1fr;
+  }
+}

src/app/form-declarations/form-declaration-report.component.ts

@@ -0,0 +1,474 @@
+/**
+ * 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 { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import * as ExcelJS from 'exceljs';
+
+import { BranchScopeService } from '../core/branch-scope.service';
+import { GL_BRANCHES, GL_PERIOD, glBranchName } from '../gl-reports/gl-reports-data';
+import { FORM_LABEL, FORM_THRESHOLD, FormType, TXN_GROUPS } from './form-declaration-data';
+import {
+  DateRange,
+  FormPersonRow,
+  FormReportFilter,
+  FormReportSummary,
+  FormTxnRow,
+  formPersonRows,
+  formReportSummary,
+  formTxnRows,
+  monthRange,
+  weekRange
+} from './form-declaration.compute';
+
+type PeriodMode = 'day' | 'week' | 'month' | 'range';
+type ViewMode = 'person' | 'transaction';
+
+@Component({
+  selector: 'mifosx-form-declaration-report',
+  templateUrl: './form-declaration-report.component.html',
+  styleUrls: ['./form-declaration-report.component.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FaIconComponent,
+    FormsModule
+  ]
+})
+export class FormDeclarationReportComponent implements OnInit {
+  private scope = inject(BranchScopeService);
+
+  readonly period = GL_PERIOD;
+  readonly branches = GL_BRANCHES;
+  readonly formLabel = FORM_LABEL;
+  readonly threshold = FORM_THRESHOLD;
+  readonly txnGroups = TXN_GROUPS;
+
+  readonly periodModes: { key: PeriodMode; label: string }[] = [
+    { key: 'day', label: 'Day wise' },
+    { key: 'week', label: 'Week wise' },
+    { key: 'month', label: 'Month wise' },
+    { key: 'range', label: 'Between dates' }
+  ];
+
+  // ── Filter state ───────────────────────────────────────────────────────────
+  periodMode: PeriodMode = 'month';
+  filterDay = '2026-07-31';
+  /** Any date inside the wanted week; resolved to Mon–Sat. */
+  filterWeek = '2026-07-27';
+  filterMonth = '2026-07';
+  filterFrom = GL_PERIOD.fyStart;
+  filterTo = GL_PERIOD.fyEnd;
+  branchCode = '';
+  formType: FormType | '' = '';
+  group = '';
+  search = '';
+  flaggedOnly = false;
+
+  view: ViewMode = 'person';
+  /** Acknowledgement number of the person row currently expanded. */
+  expanded: string | null = null;
+
+  generating = false;
+  toastMsg = '';
+  toastVisible = false;
+  private toastTimer: any;
+
+  ngOnInit(): void {
+    // A branch login opens on its own book and cannot move off it.
+    this.branchCode = this.scope.defaultBranchCode;
+  }
+
+  // ── Filter resolution ──────────────────────────────────────────────────────
+
+  get range(): DateRange {
+    if (this.periodMode === 'day') {
+      return { from: this.filterDay, to: this.filterDay };
+    }
+    if (this.periodMode === 'week') {
+      return weekRange(this.filterWeek);
+    }
+    if (this.periodMode === 'month') {
+      return monthRange(this.filterMonth);
+    }
+    return { from: this.filterFrom, to: this.filterTo };
+  }
+
+  get rangeLabel(): string {
+    const r = this.range;
+    return r.from === r.to ? r.from : `${r.from} to ${r.to}`;
+  }
+
+  get canSelectBranch(): boolean {
+    return this.scope.canSelectBranch;
+  }
+
+  get branchLabel(): string {
+    if (!this.canSelectBranch) {
+      return this.scope.officeName;
+    }
+    return this.branchCode ? glBranchName(this.branchCode) : 'All Branches (Consolidated)';
+  }
+
+  /**
+   * Applied at the data boundary rather than only in the UI, so a branch login
+   * cannot widen its own scope by tampering with component state.
+   */
+  private get effectiveBranch(): string {
+    return this.scope.enforce(this.branchCode);
+  }
+
+  private get filter(): FormReportFilter {
+    return {
+      range: this.range,
+      branchCode: this.effectiveBranch,
+      formType: this.formType,
+      group: this.group,
+      search: this.search,
+      flaggedOnly: this.flaggedOnly
+    };
+  }
+
+  resetFilters(): void {
+    this.periodMode = 'month';
+    this.filterDay = '2026-07-31';
+    this.filterWeek = '2026-07-27';
+    this.filterMonth = '2026-07';
+    this.filterFrom = GL_PERIOD.fyStart;
+    this.filterTo = GL_PERIOD.fyEnd;
+    this.formType = '';
+    this.group = '';
+    this.search = '';
+    this.flaggedOnly = false;
+    this.expanded = null;
+    // Reset returns a branch login to its own branch, never to "all".
+    this.branchCode = this.scope.defaultBranchCode;
+  }
+
+  // ── Data ───────────────────────────────────────────────────────────────────
+
+  get summary(): FormReportSummary {
+    return formReportSummary(this.filter);
+  }
+
+  get personRows(): FormPersonRow[] {
+    return formPersonRows(this.filter);
+  }
+
+  get txnRows(): FormTxnRow[] {
+    return formTxnRows(this.filter);
+  }
+
+  toggle(ackNo: string): void {
+    this.expanded = this.expanded === ackNo ? null : ackNo;
+  }
+
+  /** Cash turnover far above declared income is the point of the report. */
+  ratioClass(ratio: number): string {
+    if (ratio >= 5) {
+      return 'fd-ratio fd-ratio--high';
+    }
+    if (ratio >= 2) {
+      return 'fd-ratio fd-ratio--mid';
+    }
+    return 'fd-ratio';
+  }
+
+  // ── Excel ──────────────────────────────────────────────────────────────────
+
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      const wb = new ExcelJS.Workbook();
+      wb.creator = 'CBSNexora';
+      wb.created = new Date();
+
+      this.writeSummarySheet(wb);
+      this.writePersonSheet(wb);
+      this.writeTransactionSheet(wb);
+
+      const buffer = await wb.xlsx.writeBuffer();
+      const blob = new Blob([buffer], {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      });
+      const url = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = url;
+      a.download = `Form-97-98-Transaction-Report-${this.range.from}-to-${this.range.to}.xlsx`;
+      document.body.appendChild(a);
+      a.click();
+      document.body.removeChild(a);
+      URL.revokeObjectURL(url);
+      this.toast(`Exported ${this.summary.txnCount} transactions for ${this.rangeLabel}`);
+    } catch {
+      this.toast('Could not generate the workbook — please retry');
+    } finally {
+      this.generating = false;
+    }
+  }
+
+  /** Title band + filter caption, repeated on every sheet so pages stand alone. */
+  private banner(sheet: ExcelJS.Worksheet, title: string, cols: number): void {
+    const t = sheet.addRow([title]);
+    sheet.mergeCells(t.number, 1, t.number, cols);
+    t.font = { bold: true, size: 14, color: { argb: 'FFFFFFFF' } };
+    t.alignment = { horizontal: 'center', vertical: 'middle' };
+    t.height = 24;
+    t.getCell(1).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF1A237E' } };
+
+    const formCaption = this.formType ? FORM_LABEL[this.formType] : 'Form 97 and Form 98';
+    const meta = sheet.addRow([
+      `Period: ${this.rangeLabel}   ·   Branch: ${this.branchLabel}   ·   Declaration: ${formCaption}` +
+        `   ·   Category: ${this.group || 'All transaction types'}`
+    ]);
+    sheet.mergeCells(meta.number, 1, meta.number, cols);
+    meta.font = { italic: true, size: 10 };
+    sheet.addRow([]);
+  }
+
+  private headerRow(sheet: ExcelJS.Worksheet, headers: string[]): void {
+    const head = sheet.addRow(headers);
+    head.font = { bold: true };
+    head.alignment = { wrapText: true, horizontal: 'center' };
+    head.eachCell((c) => {
+      c.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFE2E8F0' } };
+      c.border = { bottom: { style: 'thin' } };
+    });
+  }
+
+  private writeSummarySheet(wb: ExcelJS.Workbook): void {
+    const s = this.summary;
+    const sheet = wb.addWorksheet('Summary');
+    sheet.columns = [
+      { width: 52 },
+      { width: 24 }];
+    this.banner(sheet, 'Form 97 / 98 Transaction Report — Summary', 2);
+    this.headerRow(sheet, [
+      'Particulars',
+      'Value'
+    ]);
+
+    const money = new Set([
+      'Total cash turnover',
+      'Total credits',
+      'Total debits'
+    ]);
+
+    const lines: [string, string | number][] = [
+      [
+        'Declarants transacting in the period',
+        s.persons
+      ],
+      [
+        '  of which Form 97 (no PAN)',
+        s.form60Persons
+      ],
+      [
+        '  of which Form 98 (agricultural income only)',
+        s.form61Persons
+      ],
+      [
+        'Total transactions — all types',
+        s.txnCount
+      ],
+      [
+        '  of which cash (counter and ATM)',
+        s.cashCount
+      ],
+      [
+        '  of which in a Rule 114B category',
+        s.declarationRequired
+      ],
+      [
+        'Total cash turnover',
+        s.cashTotal
+      ],
+      [
+        'Total credits',
+        s.totalCredit
+      ],
+      [
+        'Total debits',
+        s.totalDebit
+      ],
+      [
+        `Cash transactions at or above ₹${FORM_THRESHOLD.CTR.toLocaleString('en-IN')} (CTR reportable)`,
+        s.ctrReportable
+      ]
+    ];
+
+    for (const [
+      label,
+      value
+    ] of lines) {
+      const row = sheet.addRow([
+        label,
+        value
+      ]);
+      if (money.has(label)) {
+        row.getCell(2).numFmt = '#,##0.00';
+      }
+    }
+
+    // Category mix — what the customer group actually does, beyond the
+    // declared transactions.
+    sheet.addRow([]);
+    this.headerRow(sheet, [
+      'Transaction category',
+      'Count'
+    ]);
+    for (const g of s.byGroup) {
+      sheet.addRow([
+        g.group,
+        g.count
+      ]);
+    }
+    sheet.views = [{ state: 'frozen', ySplit: 4 }];
+  }
+
+  private writePersonSheet(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Person wise');
+    const widths = [
+      18,
+      12,
+      26,
+      24,
+      18,
+      14,
+      10,
+      10,
+      10,
+      16,
+      16,
+      16,
+      14,
+      10,
+      34
+    ];
+    sheet.columns = widths.map((w) => ({ width: w }));
+    this.banner(sheet, 'Form 97 / 98 Transaction Report — Person wise', widths.length);
+    this.headerRow(sheet, [
+      'Acknowledgement',
+      'Form',
+      'Name of declarant',
+      "Father's name",
+      'Account No',
+      'Branch',
+      'Total txns',
+      'Cash txns',
+      'Rule 114B txns',
+      'Cash turnover',
+      'Total credit',
+      'Total debit',
+      'Declared income',
+      'CTR rows',
+      'Categories transacted'
+    ]);
+
+    for (const p of this.personRows) {
+      const row = sheet.addRow([
+        p.declarant.ackNo,
+        FORM_LABEL[p.declarant.formType],
+        p.declarant.name,
+        p.declarant.fatherName,
+        p.declarant.accountNo,
+        glBranchName(p.declarant.branchCode),
+        p.txnCount,
+        p.cashCount,
+        p.declaredCount,
+        p.cashTotal,
+        p.totalCredit,
+        p.totalDebit,
+        p.declarant.estimatedIncome,
+        p.ctrCount,
+        p.groups.join(', ')
+      ]);
+      for (const c of [
+        10,
+        11,
+        12,
+        13
+      ]) {
+        row.getCell(c).numFmt = '#,##0.00';
+      }
+    }
+    sheet.views = [{ state: 'frozen', ySplit: 4 }];
+  }
+
+  private writeTransactionSheet(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Transactions');
+    const widths = [
+      12,
+      12,
+      18,
+      12,
+      26,
+      18,
+      14,
+      12,
+      10,
+      6,
+      16,
+      46,
+      16,
+      12
+    ];
+    sheet.columns = widths.map((w) => ({ width: w }));
+    this.banner(sheet, 'Form 97 / 98 Transaction Report — Transaction wise', widths.length);
+    this.headerRow(sheet, [
+      'Date',
+      'Txn ID',
+      'Acknowledgement',
+      'Form',
+      'Name of declarant',
+      'Account No',
+      'Branch',
+      'Category',
+      'Mode',
+      'Dr/Cr',
+      'Amount',
+      'Nature of transaction',
+      'Voucher No',
+      'Flag'
+    ]);
+
+    for (const t of this.txnRows) {
+      const row = sheet.addRow([
+        t.date,
+        t.txnId,
+        t.ackNo,
+        FORM_LABEL[t.formType],
+        t.declarantName,
+        t.accountNo,
+        glBranchName(t.branchCode),
+        t.group,
+        t.mode,
+        t.drCr,
+        t.amount,
+        t.nature,
+        t.voucherNo,
+        t.ctrReportable ? 'CTR' : t.declarationRequired ? 'Rule 114B' : ''
+      ]);
+      row.getCell(11).numFmt = '#,##0.00';
+      if (t.ctrReportable) {
+        row.getCell(14).font = { bold: true, color: { argb: 'FFC0392B' } };
+      }
+    }
+    sheet.views = [{ state: 'frozen', ySplit: 4 }];
+  }
+
+  private toast(msg: string): void {
+    this.toastMsg = msg;
+    this.toastVisible = true;
+    if (this.toastTimer) {
+      clearTimeout(this.toastTimer);
+    }
+    this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+  }
+}

src/app/form-declarations/form-declaration.compute.ts

@@ -0,0 +1,296 @@
+/**
+ * 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 { GL_PERIOD } from '../gl-reports/gl-reports-data';
+import {
+  FORM_THRESHOLD,
+  FormDeclarant,
+  FormDeclarantTxn,
+  FormType,
+  formDeclarants,
+  formDeclarantTxns
+} from './form-declaration-data';
+
+export interface DateRange {
+  from: string;
+  to: string;
+}
+
+export interface FormReportFilter {
+  range: DateRange;
+  /** '' means every branch. */
+  branchCode: string;
+  /** '' means both declaration types. */
+  formType: FormType | '';
+  /** '' means every transaction category (Cash, Clearing, Loan, …). */
+  group: string;
+  /** Free text over name, account number and acknowledgement number. */
+  search: string;
+  /** Show only rows a compliance officer would need to look at. */
+  flaggedOnly: boolean;
+}
+
+/** One transaction, joined to the declarant who filed for it. */
+export interface FormTxnRow extends FormDeclarantTxn {
+  declarantName: string;
+  formType: FormType;
+  fatherName: string;
+  declaredOn: string;
+  reasonForNoPan: string;
+  estimatedIncome: number;
+  /** Counter or ATM cash, as opposed to a book or electronic entry. */
+  isCash: boolean;
+  /**
+   * The transaction is one of the categories in Rule 114B, so PAN — and in its
+   * absence the Form 97/98 declaration — was mandatory for it.
+   */
+  declarationRequired: boolean;
+  /** Cash at or above the CTR limit — also lands in the monthly CTR. */
+  ctrReportable: boolean;
+}
+
+/** A declarant with their totals for the period. */
+export interface FormPersonRow {
+  declarant: FormDeclarant;
+  txns: FormTxnRow[];
+  txnCount: number;
+  cashCount: number;
+  totalCredit: number;
+  totalDebit: number;
+  cashTotal: number;
+  /** Largest single transaction, used to sort the riskiest to the top. */
+  maxAmount: number;
+  /** How many of the period's transactions needed the declaration. */
+  declaredCount: number;
+  ctrCount: number;
+  /** Distinct categories the customer transacted in during the period. */
+  groups: string[];
+  /**
+   * Aggregate cash for the period against the income the customer declared.
+   * A ratio well above 1 is the classic "turnover inconsistent with declared
+   * income" flag, which is why the declaration is collected in the first place.
+   */
+  incomeRatio: number;
+}
+
+export interface FormReportSummary {
+  persons: number;
+  form60Persons: number;
+  form61Persons: number;
+  txnCount: number;
+  cashTotal: number;
+  cashCount: number;
+  totalCredit: number;
+  totalDebit: number;
+  /** Transactions falling in a Rule 114B category. */
+  declarationRequired: number;
+  ctrReportable: number;
+  /** Transaction count by category, largest first — drives the mix panel. */
+  byGroup: { group: string; count: number; amount: number }[];
+}
+
+function clamp(range: DateRange): DateRange {
+  const from = range.from < GL_PERIOD.fyStart ? GL_PERIOD.fyStart : range.from;
+  const to = range.to > GL_PERIOD.fyEnd ? GL_PERIOD.fyEnd : range.to;
+  // A backwards range would silently return nothing; collapse it to a single day.
+  return from > to ? { from: to, to: to } : { from, to };
+}
+
+/** Monday-to-Saturday banking week containing the given date. */
+export function weekRange(anchor: string): DateRange {
+  const d = new Date(`${anchor}T00:00:00Z`);
+  const dow = d.getUTCDay(); // 0 = Sunday
+  const monday = new Date(d.getTime());
+  monday.setUTCDate(d.getUTCDate() - (dow === 0 ? 6 : dow - 1));
+  const saturday = new Date(monday.getTime());
+  saturday.setUTCDate(monday.getUTCDate() + 5);
+  const iso = (x: Date) => x.toISOString().slice(0, 10);
+  return { from: iso(monday), to: iso(saturday) };
+}
+
+export function monthRange(month: string): DateRange {
+  const [
+    y,
+    m
+  ] = month.split('-').map(Number);
+  const last = new Date(Date.UTC(y, m, 0)).getUTCDate();
+  return { from: `${month}-01`, to: `${month}-${`${last}`.padStart(2, '0')}` };
+}
+
+/**
+ * Transactions matching the filter, each joined to its declarant.
+ *
+ * Memoised on the filter signature: the getters that feed the template are read
+ * many times per change-detection pass, and re-scanning several hundred rows on
+ * every read is what made the GL reports stall.
+ */
+let rowCacheKey = '';
+let rowCache: FormTxnRow[] = [];
+
+export function formTxnRows(filter: FormReportFilter): FormTxnRow[] {
+  const range = clamp(filter.range);
+  const key = [
+    range.from,
+    range.to,
+    filter.branchCode,
+    filter.formType,
+    filter.group,
+    filter.search.trim().toLowerCase(),
+    filter.flaggedOnly ? '1' : '0'
+  ].join('|');
+
+  if (key === rowCacheKey) {
+    return rowCache;
+  }
+
+  const byAck = new Map(
+    formDeclarants().map((d) => [
+      d.ackNo,
+      d
+    ])
+  );
+  const needle = filter.search.trim().toLowerCase();
+
+  const rows: FormTxnRow[] = [];
+  for (const t of formDeclarantTxns()) {
+    if (t.date < range.from || t.date > range.to) {
+      continue;
+    }
+    if (filter.branchCode && t.branchCode !== filter.branchCode) {
+      continue;
+    }
+    if (filter.group && t.group !== filter.group) {
+      continue;
+    }
+    const d = byAck.get(t.ackNo);
+    if (!d) {
+      continue;
+    }
+    if (filter.formType && d.formType !== filter.formType) {
+      continue;
+    }
+    if (
+      needle &&
+      !d.name.toLowerCase().includes(needle) &&
+      !t.accountNo.toLowerCase().includes(needle) &&
+      !d.ackNo.toLowerCase().includes(needle)
+    ) {
+      continue;
+    }
+
+    // ATM dispensing is cash in the customer's hands, so it counts towards the
+    // cash view even though it never crossed the counter.
+    const isCash = t.mode === 'CASH' || t.mode === 'ATM';
+    const ctrReportable = isCash && t.amount >= FORM_THRESHOLD.CTR;
+
+    if (filter.flaggedOnly && !ctrReportable) {
+      continue;
+    }
+
+    rows.push({
+      ...t,
+      declarantName: d.name,
+      formType: d.formType,
+      fatherName: d.fatherName,
+      declaredOn: d.declaredOn,
+      reasonForNoPan: d.reasonForNoPan,
+      estimatedIncome: d.estimatedIncome,
+      isCash,
+      declarationRequired: t.rule114B,
+      ctrReportable
+    });
+  }
+
+  rowCacheKey = key;
+  rowCache = rows;
+  return rows;
+}
+
+/** The same rows grouped by declarant, heaviest customer first. */
+export function formPersonRows(filter: FormReportFilter): FormPersonRow[] {
+  const byAck = new Map(
+    formDeclarants().map((d) => [
+      d.ackNo,
+      d
+    ])
+  );
+  const grouped = new Map<string, FormTxnRow[]>();
+
+  for (const r of formTxnRows(filter)) {
+    const list = grouped.get(r.ackNo);
+    if (list) {
+      list.push(r);
+    } else {
+      grouped.set(r.ackNo, [r]);
+    }
+  }
+
+  const out: FormPersonRow[] = [];
+  for (const [
+    ackNo,
+    txns
+  ] of grouped) {
+    const declarant = byAck.get(ackNo);
+    if (!declarant) {
+      continue;
+    }
+    const cash = txns.filter((t) => t.isCash);
+    const cashTotal = cash.reduce((s, t) => s + t.amount, 0);
+    out.push({
+      declarant,
+      txns,
+      txnCount: txns.length,
+      cashCount: cash.length,
+      totalCredit: txns.filter((t) => t.drCr === 'CR').reduce((s, t) => s + t.amount, 0),
+      totalDebit: txns.filter((t) => t.drCr === 'DR').reduce((s, t) => s + t.amount, 0),
+      cashTotal,
+      maxAmount: txns.reduce((m, t) => Math.max(m, t.amount), 0),
+      declaredCount: txns.filter((t) => t.declarationRequired).length,
+      ctrCount: txns.filter((t) => t.ctrReportable).length,
+      groups: [...new Set(txns.map((t) => t.group))].sort(),
+      incomeRatio: declarant.estimatedIncome > 0 ? cashTotal / declarant.estimatedIncome : 0
+    });
+  }
+
+  out.sort((a, b) => b.cashTotal - a.cashTotal);
+  return out;
+}
+
+export function formReportSummary(filter: FormReportFilter): FormReportSummary {
+  const rows = formTxnRows(filter);
+  const acks = new Set(rows.map((r) => r.ackNo));
+  const form61 = new Set(rows.filter((r) => r.formType === 'FORM_61').map((r) => r.ackNo));
+  const form60 = new Set(rows.filter((r) => r.formType === 'FORM_60').map((r) => r.ackNo));
+
+  const groupMap = new Map<string, { group: string; count: number; amount: number }>();
+  for (const r of rows) {
+    const g = groupMap.get(r.group);
+    if (g) {
+      g.count++;
+      g.amount += r.amount;
+    } else {
+      groupMap.set(r.group, { group: r.group, count: 1, amount: r.amount });
+    }
+  }
+
+  const cash = rows.filter((r) => r.isCash);
+
+  return {
+    persons: acks.size,
+    form60Persons: form60.size,
+    form61Persons: form61.size,
+    txnCount: rows.length,
+    cashTotal: cash.reduce((s, r) => s + r.amount, 0),
+    cashCount: cash.length,
+    totalCredit: rows.filter((r) => r.drCr === 'CR').reduce((s, r) => s + r.amount, 0),
+    totalDebit: rows.filter((r) => r.drCr === 'DR').reduce((s, r) => s + r.amount, 0),
+    declarationRequired: rows.filter((r) => r.declarationRequired).length,
+    ctrReportable: rows.filter((r) => r.ctrReportable).length,
+    byGroup: [...groupMap.values()].sort((a, b) => b.count - a.count)
+  };
+}

src/app/gl-reports/gl-reports-data.ts

@@ -0,0 +1,723 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Data layer for the General Ledger report suite.
+ *
+ * Rather than hard-coding seven finished reports, this file holds a chart of
+ * accounts plus a generated ledger of double-entry postings. Every report is
+ * then computed from those postings, which is what makes the day / month /
+ * branch filters genuinely recompute instead of just re-labelling a static table.
+ *
+ * The generator is deterministic — a fixed-seed LCG, never Math.random — so the
+ * figures are identical on every reload and across users. Amounts are in rupees.
+ */
+
+export type GlAccountType = 'ASSET' | 'LIABILITY' | 'INCOME' | 'EXPENSE' | 'CONTINGENT';
+
+export interface GlAccount {
+  code: string;
+  name: string;
+  type: GlAccountType;
+  /** Balance-sheet / P&L grouping used as a sub-heading in the reports. */
+  group: string;
+  /** Included in the Misc Expense Ledger report. */
+  miscExpense?: boolean;
+}
+
+export interface GlBranch {
+  code: string;
+  name: string;
+}
+
+/** One side of a double-entry voucher. */
+export interface GlPosting {
+  /** ISO yyyy-MM-dd — the posting (value) date. */
+  date: string;
+  branchCode: string;
+  accountCode: string;
+  debit: number;
+  credit: number;
+  voucherNo: string;
+  narration: string;
+}
+
+export const GL_BRANCHES: GlBranch[] = [
+  { code: 'HO', name: 'Head Office' },
+  { code: '0002', name: 'Andheri (E)' },
+  { code: '0003', name: 'Bandra (W)' },
+  { code: '0004', name: 'Borivali' },
+  { code: '0005', name: 'Dadar' },
+  { code: '0006', name: 'Thane' }
+];
+
+export const GL_ACCOUNTS: GlAccount[] = [
+  // ── Assets ────────────────────────────────────────────────────────────────
+  { code: '110101', name: 'Cash in Hand', type: 'ASSET', group: 'Cash & Bank Balances' },
+  { code: '110102', name: 'Balance with RBI', type: 'ASSET', group: 'Cash & Bank Balances' },
+  { code: '110103', name: 'Balance with Other Banks — Current', type: 'ASSET', group: 'Cash & Bank Balances' },
+  { code: '110104', name: 'Balance with Other Banks — Fixed', type: 'ASSET', group: 'Cash & Bank Balances' },
+  { code: '120101', name: 'SLR Investments — Govt Securities', type: 'ASSET', group: 'Investments' },
+  { code: '120102', name: 'SLR Investments — State Govt Securities', type: 'ASSET', group: 'Investments' },
+  { code: '120201', name: 'Non-SLR Investments — Bonds', type: 'ASSET', group: 'Investments' },
+  { code: '120202', name: 'Non-SLR Investments — Mutual Funds', type: 'ASSET', group: 'Investments' },
+  { code: '130101', name: 'Cash Credit & Overdrafts', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '130102', name: 'Term Loans — Short Term', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '130103', name: 'Term Loans — Medium Term', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '130104', name: 'Term Loans — Long Term', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '130105', name: 'Housing Loans', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '130106', name: 'Gold Loans', type: 'ASSET', group: 'Loans & Advances' },
+  { code: '140101', name: 'Interest Receivable', type: 'ASSET', group: 'Other Assets' },
+  { code: '140102', name: 'Premises (net of depreciation)', type: 'ASSET', group: 'Fixed Assets' },
+  { code: '140103', name: 'Furniture & Fixtures (net)', type: 'ASSET', group: 'Fixed Assets' },
+  { code: '140104', name: 'Sundry Debtors', type: 'ASSET', group: 'Other Assets' },
+  { code: '140105', name: 'Advance Tax & TDS', type: 'ASSET', group: 'Other Assets' },
+  { code: '140199', name: 'Opening Balance Suspense (unreconciled)', type: 'ASSET', group: 'Other Assets' },
+
+  // ── Liabilities & Capital ─────────────────────────────────────────────────
+  { code: '210101', name: 'Share Capital — Individuals', type: 'LIABILITY', group: 'Capital & Reserves' },
+  { code: '210201', name: 'Statutory Reserve Fund', type: 'LIABILITY', group: 'Capital & Reserves' },
+  { code: '210202', name: 'Building Fund', type: 'LIABILITY', group: 'Capital & Reserves' },
+  { code: '210203', name: 'Investment Depreciation Reserve', type: 'LIABILITY', group: 'Capital & Reserves' },
+  { code: '210204', name: 'BDDR / Special BDDR', type: 'LIABILITY', group: 'Capital & Reserves' },
+  { code: '220101', name: 'Savings Bank Deposits', type: 'LIABILITY', group: 'Deposits' },
+  { code: '220102', name: 'Current Deposits', type: 'LIABILITY', group: 'Deposits' },
+  { code: '220103', name: 'Term Deposits', type: 'LIABILITY', group: 'Deposits' },
+  { code: '220104', name: 'Recurring Deposits', type: 'LIABILITY', group: 'Deposits' },
+  { code: '230101', name: 'Interest Payable on Deposits', type: 'LIABILITY', group: 'Other Liabilities' },
+  { code: '230102', name: 'Bills Payable', type: 'LIABILITY', group: 'Other Liabilities' },
+  { code: '230103', name: 'Sundry Creditors', type: 'LIABILITY', group: 'Other Liabilities' },
+  { code: '230104', name: 'TDS / GST Payable', type: 'LIABILITY', group: 'Other Liabilities' },
+  { code: '230105', name: 'Overdue Interest Reserve', type: 'LIABILITY', group: 'Other Liabilities' },
+
+  // ── Income ────────────────────────────────────────────────────────────────
+  { code: '310101', name: 'Interest on Loans & Advances', type: 'INCOME', group: 'Interest Income' },
+  { code: '310102', name: 'Interest on Investments', type: 'INCOME', group: 'Interest Income' },
+  { code: '310103', name: 'Interest on Inter-bank Deposits', type: 'INCOME', group: 'Interest Income' },
+  { code: '320101', name: 'Commission & Exchange', type: 'INCOME', group: 'Other Income' },
+  { code: '320102', name: 'Locker Rent', type: 'INCOME', group: 'Other Income' },
+  { code: '320103', name: 'Processing Fees', type: 'INCOME', group: 'Other Income' },
+  { code: '320104', name: 'Profit on Sale of Securities', type: 'INCOME', group: 'Other Income' },
+  { code: '320105', name: 'Miscellaneous Income', type: 'INCOME', group: 'Other Income' },
+
+  // ── Expenditure ───────────────────────────────────────────────────────────
+  { code: '410101', name: 'Interest on Savings Deposits', type: 'EXPENSE', group: 'Interest Expended' },
+  { code: '410102', name: 'Interest on Term Deposits', type: 'EXPENSE', group: 'Interest Expended' },
+  { code: '410103', name: 'Interest on Borrowings', type: 'EXPENSE', group: 'Interest Expended' },
+  { code: '420101', name: 'Salaries & Allowances', type: 'EXPENSE', group: 'Operating Expenses' },
+  { code: '420102', name: "Directors' Fees", type: 'EXPENSE', group: 'Operating Expenses' },
+  { code: '420103', name: "Auditors' Fees", type: 'EXPENSE', group: 'Operating Expenses' },
+  { code: '420104', name: 'Rent, Taxes & Lighting', type: 'EXPENSE', group: 'Operating Expenses' },
+  { code: '420105', name: 'Depreciation on Bank Property', type: 'EXPENSE', group: 'Operating Expenses' },
+  {
+    code: '430101',
+    name: 'Printing & Stationery',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430102',
+    name: 'Postage, Telegram & Telephone',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430103',
+    name: 'Advertisement & Publicity',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430104',
+    name: 'Repairs & Maintenance',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430105',
+    name: 'Travelling & Conveyance',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430106',
+    name: 'Computer & Software Expenses',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430107',
+    name: 'Legal & Professional Charges',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430108',
+    name: 'Insurance (DICGC & Other)',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430109',
+    name: 'Bank Charges & Commission Paid',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  {
+    code: '430110',
+    name: 'AGM & Meeting Expenses',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+  { code: '430111', name: 'Electricity Charges', type: 'EXPENSE', group: 'Miscellaneous Expenses', miscExpense: true },
+  {
+    code: '430112',
+    name: 'Other Miscellaneous Expenses',
+    type: 'EXPENSE',
+    group: 'Miscellaneous Expenses',
+    miscExpense: true
+  },
+
+  // ── Contingent (memoranda, not part of the balance sheet totals) ──────────
+  { code: '910101', name: 'Guarantees Issued — Financial', type: 'CONTINGENT', group: 'Guarantees' },
+  { code: '910102', name: 'Guarantees Issued — Performance', type: 'CONTINGENT', group: 'Guarantees' },
+  { code: '910103', name: 'Letters of Credit Outstanding', type: 'CONTINGENT', group: 'Letters of Credit' },
+  { code: '910104', name: 'Bills for Collection', type: 'CONTINGENT', group: 'Bills & Claims' },
+  { code: '910105', name: 'Claims Against Bank Not Acknowledged as Debt', type: 'CONTINGENT', group: 'Bills & Claims' },
+  { code: '910106', name: 'Forward Exchange Contracts', type: 'CONTINGENT', group: 'Other Commitments' },
+  { code: '910107', name: 'Capital Commitments Not Provided For', type: 'CONTINGENT', group: 'Other Commitments' }
+];
+
+/** Financial year covered by the generated ledger. */
+export const GL_PERIOD = {
+  /** FY 2026-27 opens here. */
+  fyStart: '2026-04-01',
+  /** Postings run to the day before the app's "today" (01 Aug 2026). */
+  fyEnd: '2026-07-31',
+  label: 'FY 2026-27'
+};
+
+/**
+ * Opening balances as at 01-Apr-2026, keyed by account code. Positive means the
+ * account opens on its natural side (debit for assets/expenses, credit for the
+ * rest). Head Office carries the investments and reserves; branches carry the
+ * customer-facing book.
+ */
+const OPENING_BALANCES: Record<string, number> = {
+  '110101': 9_996_000,
+  '110102': 12_400_000,
+  '110103': 13_667_000,
+  // Surplus deposits parked with correspondent banks. Sized so the opening
+  // balance sheet tallies exactly — see the assertion in glPostings().
+  '110104': 54_206_000,
+  '120101': 63_839_000,
+  '120102': 147_895_000,
+  '120201': 22_500_000,
+  '120202': 24_234_000,
+  '130101': 166_614_000,
+  '130102': 125_082_000,
+  '130103': 70_236_000,
+  '130104': 29_356_000,
+  '130105': 10_241_000,
+  '130106': 8_450_000,
+  '140101': 33_541_000,
+  '140102': 3_185_000,
+  '140103': 1_763_000,
+  '140104': 1_240_000,
+  '140105': 657_000,
+  '210101': 27_278_000,
+  '210201': 31_149_000,
+  '210202': 13_642_000,
+  '210203': 3_750_000,
+  '210204': 24_341_000,
+  '220101': 208_116_000,
+  '220102': 19_592_000,
+  '220103': 406_601_000,
+  '220104': 24_880_000,
+  '230101': 731_000,
+  '230102': 291_000,
+  '230103': 5_515_000,
+  '230104': 1_120_000,
+  '230105': 32_096_000,
+  '910101': 1_450_000,
+  '910102': 980_000,
+  '910103': 620_000,
+  '910104': 1_180_000,
+  '910105': 2_638_000,
+  '910106': 0,
+  '910107': 340_000
+};
+
+/** Deterministic linear congruential generator — same figures on every load. */
+function lcg(seed: number): () => number {
+  let s = seed >>> 0;
+  return () => {
+    s = (Math.imul(s, 1664525) + 1013904223) >>> 0;
+    return s / 4294967296;
+  };
+}
+
+function isoDate(d: Date): string {
+  const y = d.getUTCFullYear();
+  const m = `${d.getUTCMonth() + 1}`.padStart(2, '0');
+  const day = `${d.getUTCDate()}`.padStart(2, '0');
+  return `${y}-${m}-${day}`;
+}
+
+/** Every posting date in the ledger period, Sundays excluded (bank holiday). */
+export function ledgerDates(): string[] {
+  const out: string[] = [];
+  const cur = new Date(`${GL_PERIOD.fyStart}T00:00:00Z`);
+  const end = new Date(`${GL_PERIOD.fyEnd}T00:00:00Z`);
+  while (cur <= end) {
+    if (cur.getUTCDay() !== 0) {
+      out.push(isoDate(cur));
+    }
+    cur.setUTCDate(cur.getUTCDate() + 1);
+  }
+  return out;
+}
+
+/** Templates for the vouchers the generator posts each day. */
+const VOUCHER_TEMPLATES: {
+  debit: string;
+  credit: string;
+  narration: string;
+  /** Rough rupee scale of the voucher. */
+  scale: number;
+  /** Chance the voucher is raised on any given branch-day. */
+  frequency: number;
+}[] = [
+  { debit: '110101', credit: '220101', narration: 'Cash deposit — savings accounts', scale: 900_000, frequency: 1 },
+  { debit: '220101', credit: '110101', narration: 'Cash withdrawal — savings accounts', scale: 780_000, frequency: 1 },
+  { debit: '110101', credit: '220103', narration: 'Term deposit received', scale: 1_400_000, frequency: 0.75 },
+  { debit: '220103', credit: '110101', narration: 'Term deposit matured and paid', scale: 1_150_000, frequency: 0.6 },
+  { debit: '110101', credit: '220102', narration: 'Current account deposit', scale: 620_000, frequency: 0.8 },
+  { debit: '220102', credit: '110101', narration: 'Current account withdrawal', scale: 560_000, frequency: 0.8 },
+  { debit: '110101', credit: '220104', narration: 'Recurring deposit instalment', scale: 180_000, frequency: 0.7 },
+  { debit: '130101', credit: '110101', narration: 'Cash credit disbursed', scale: 1_250_000, frequency: 0.55 },
+  { debit: '110101', credit: '130101', narration: 'Cash credit repayment', scale: 1_100_000, frequency: 0.6 },
+  { debit: '130102', credit: '110101', narration: 'Short term loan disbursed', scale: 850_000, frequency: 0.4 },
+  { debit: '110101', credit: '130102', narration: 'Short term loan repayment', scale: 760_000, frequency: 0.5 },
+  { debit: '130103', credit: '110101', narration: 'Medium term loan disbursed', scale: 640_000, frequency: 0.3 },
+  { debit: '110101', credit: '130104', narration: 'Long term loan repayment', scale: 410_000, frequency: 0.35 },
+  { debit: '130105', credit: '110101', narration: 'Housing loan disbursed', scale: 520_000, frequency: 0.2 },
+  { debit: '130106', credit: '110101', narration: 'Gold loan disbursed', scale: 260_000, frequency: 0.4 },
+  // Interest on advances is the dominant earning line — sized so the bank runs a
+  // ~13% net margin rather than the loss the first-cut figures produced.
+  { debit: '110101', credit: '310101', narration: 'Interest recovered on advances', scale: 430_000, frequency: 1 },
+  { debit: '140101', credit: '310102', narration: 'Interest accrued on investments', scale: 148_000, frequency: 0.5 },
+  { debit: '110103', credit: '310103', narration: 'Interest on inter-bank deposits', scale: 42_000, frequency: 0.25 },
+  { debit: '110101', credit: '320101', narration: 'Commission and exchange collected', scale: 26_000, frequency: 0.9 },
+  { debit: '110101', credit: '320102', narration: 'Locker rent collected', scale: 9_000, frequency: 0.3 },
+  { debit: '110101', credit: '320103', narration: 'Loan processing fees', scale: 18_000, frequency: 0.5 },
+  { debit: '110101', credit: '320105', narration: 'Miscellaneous income', scale: 7_500, frequency: 0.4 },
+  {
+    debit: '410101',
+    credit: '230101',
+    narration: 'Interest provided on savings deposits',
+    scale: 128_000,
+    frequency: 0.8
+  },
+  {
+    debit: '410102',
+    credit: '230101',
+    narration: 'Interest provided on term deposits',
+    scale: 265_000,
+    frequency: 0.9
+  },
+  { debit: '420101', credit: '110101', narration: 'Salaries and allowances paid', scale: 210_000, frequency: 0.35 },
+  { debit: '420104', credit: '110101', narration: 'Rent, taxes and lighting', scale: 46_000, frequency: 0.3 },
+  { debit: '430101', credit: '110101', narration: 'Printing and stationery purchased', scale: 9_400, frequency: 0.3 },
+  { debit: '430102', credit: '110101', narration: 'Postage and telephone charges', scale: 6_200, frequency: 0.35 },
+  { debit: '430103', credit: '110101', narration: 'Advertisement and publicity', scale: 12_500, frequency: 0.15 },
+  { debit: '430104', credit: '110101', narration: 'Repairs and maintenance', scale: 15_800, frequency: 0.25 },
+  { debit: '430105', credit: '110101', narration: 'Travelling and conveyance', scale: 7_100, frequency: 0.3 },
+  { debit: '430106', credit: '110101', narration: 'Computer and software expenses', scale: 22_400, frequency: 0.2 },
+  { debit: '430107', credit: '110101', narration: 'Legal and professional charges', scale: 11_300, frequency: 0.15 },
+  { debit: '430109', credit: '110101', narration: 'Bank charges and commission paid', scale: 4_800, frequency: 0.3 },
+  { debit: '430111', credit: '110101', narration: 'Electricity charges', scale: 13_600, frequency: 0.25 },
+  { debit: '430112', credit: '110101', narration: 'Other miscellaneous expenses', scale: 8_900, frequency: 0.3 },
+  {
+    debit: '110102',
+    credit: '110101',
+    narration: 'Cash remitted to RBI currency chest',
+    scale: 1_800_000,
+    frequency: 0.2
+  },
+  {
+    debit: '110101',
+    credit: '110103',
+    narration: 'Funds drawn from correspondent bank',
+    scale: 1_400_000,
+    frequency: 0.2
+  }
+];
+
+/** Head-Office-only vouchers — investments, reserves and centralised charges. */
+const HO_TEMPLATES: typeof VOUCHER_TEMPLATES = [
+  { debit: '120101', credit: '110102', narration: 'Purchase of Govt securities', scale: 2_400_000, frequency: 0.12 },
+  {
+    debit: '120102',
+    credit: '110102',
+    narration: 'Purchase of State Govt securities',
+    scale: 1_900_000,
+    frequency: 0.12
+  },
+  { debit: '110102', credit: '320104', narration: 'Profit on sale of securities', scale: 78_000, frequency: 0.1 },
+  { debit: '420102', credit: '110101', narration: "Directors' sitting fees", scale: 32_000, frequency: 0.08 },
+  { debit: '420103', credit: '110101', narration: "Statutory auditors' fees", scale: 45_000, frequency: 0.06 },
+  { debit: '420105', credit: '140103', narration: 'Depreciation charged on assets', scale: 64_000, frequency: 0.12 },
+  { debit: '430108', credit: '110101', narration: 'DICGC premium and other insurance', scale: 38_000, frequency: 0.1 },
+  { debit: '430110', credit: '110101', narration: 'AGM and meeting expenses', scale: 26_000, frequency: 0.06 },
+  { debit: '410103', credit: '230101', narration: 'Interest on borrowings', scale: 54_000, frequency: 0.1 },
+  { debit: '230104', credit: '110102', narration: 'TDS and GST remitted', scale: 145_000, frequency: 0.15 }
+];
+
+/**
+ * Contingent-account movements are memoranda, each posted single-sided.
+ * Guarantees, LCs and collection bills are raised at the counter, so these run
+ * at every branch — not just Head Office.
+ */
+const CONTINGENT_TEMPLATES: { account: string; narration: string; scale: number; frequency: number }[] = [
+  { account: '910101', narration: 'Financial guarantee issued', scale: 320_000, frequency: 0.1 },
+  { account: '910102', narration: 'Performance guarantee issued', scale: 240_000, frequency: 0.08 },
+  { account: '910103', narration: 'Letter of credit opened', scale: 180_000, frequency: 0.07 },
+  { account: '910104', narration: 'Bills lodged for collection', scale: 95_000, frequency: 0.12 },
+  { account: '910105', narration: 'Claim lodged against the bank', scale: 140_000, frequency: 0.03 },
+  { account: '910107', narration: 'Capital commitment contracted', scale: 85_000, frequency: 0.04 }
+];
+
+/**
+ * How the opening contingent book is spread across the network. Head Office
+ * carries the capital commitments and large claims; the branches carry the
+ * counter-issued guarantees. Weights are applied per account and the rounding
+ * remainder is absorbed by Head Office so each account's total stays exact.
+ */
+const CONTINGENT_BRANCH_WEIGHTS: Record<string, number> = {
+  HO: 0.2,
+  '0002': 0.18,
+  '0003': 0.16,
+  '0004': 0.16,
+  '0005': 0.15,
+  '0006': 0.15
+};
+
+let cachedPostings: GlPosting[] | null = null;
+
+/**
+ * The full generated ledger. Built once and memoised — every report reads from
+ * this array, so the reports can never disagree with one another.
+ */
+export function glPostings(): GlPosting[] {
+  if (cachedPostings) {
+    return cachedPostings;
+  }
+  const rand = lcg(20260401);
+  const out: GlPosting[] = [];
+  const dates = ledgerDates();
+  let voucherSeq = 1;
+
+  // Opening entries, posted at Head Office on day one so the books start in balance.
+  const openingVoucher = `OB/${GL_PERIOD.label.replace(/\s/g, '')}`;
+  let openingDebit = 0;
+  let openingCredit = 0;
+
+  for (const [
+    code,
+    amount
+  ] of Object.entries(OPENING_BALANCES)) {
+    if (!amount) {
+      continue;
+    }
+    const account = GL_ACCOUNTS.find((a) => a.code === code);
+    if (!account) {
+      continue;
+    }
+    const debitSide = account.type === 'ASSET' || account.type === 'EXPENSE' || account.type === 'CONTINGENT';
+
+    // Contingent accounts are single-sided memoranda held at the issuing branch,
+    // so their opening book is spread across the network rather than sat at HO.
+    if (account.type === 'CONTINGENT') {
+      let allocated = 0;
+      for (const branch of GL_BRANCHES) {
+        if (branch.code === 'HO') {
+          continue;
+        }
+        const share = Math.round((amount * (CONTINGENT_BRANCH_WEIGHTS[branch.code] ?? 0)) / 100) * 100;
+        if (!share) {
+          continue;
+        }
+        allocated += share;
+        out.push({
+          date: GL_PERIOD.fyStart,
+          branchCode: branch.code,
+          accountCode: code,
+          debit: share,
+          credit: 0,
+          voucherNo: openingVoucher,
+          narration: 'Opening balance brought forward'
+        });
+      }
+      // Head Office takes its own share plus whatever rounding left behind.
+      out.push({
+        date: GL_PERIOD.fyStart,
+        branchCode: 'HO',
+        accountCode: code,
+        debit: amount - allocated,
+        credit: 0,
+        voucherNo: openingVoucher,
+        narration: 'Opening balance brought forward'
+      });
+      continue;
+    }
+
+    out.push({
+      date: GL_PERIOD.fyStart,
+      branchCode: 'HO',
+      accountCode: code,
+      debit: debitSide ? amount : 0,
+      credit: debitSide ? 0 : amount,
+      voucherNo: openingVoucher,
+      narration: 'Opening balance brought forward'
+    });
+    if (debitSide) {
+      openingDebit += amount;
+    } else {
+      openingCredit += amount;
+    }
+  }
+
+  // If OPENING_BALANCES is ever edited so the two sides diverge, park the residual
+  // in a visibly-named suspense account rather than letting the trial balance drift.
+  const openingResidual = openingCredit - openingDebit;
+  if (openingResidual !== 0) {
+    out.push({
+      date: GL_PERIOD.fyStart,
+      branchCode: 'HO',
+      accountCode: '140199',
+      debit: openingResidual > 0 ? openingResidual : 0,
+      credit: openingResidual < 0 ? -openingResidual : 0,
+      voucherNo: openingVoucher,
+      narration: 'Unreconciled opening balance difference'
+    });
+  }
+
+  const round = (n: number): number => Math.round(n / 100) * 100;
+
+  for (const date of dates) {
+    for (const branch of GL_BRANCHES) {
+      // Head Office posts fewer counter transactions than the branches.
+      const weight = branch.code === 'HO' ? 0.45 : 1;
+      const templates = branch.code === 'HO' ? [
+              ...VOUCHER_TEMPLATES,
+              ...HO_TEMPLATES
+            ] : VOUCHER_TEMPLATES;
+
+      for (const tpl of templates) {
+        if (rand() > tpl.frequency * weight) {
+          continue;
+        }
+        // 0.55x .. 1.45x of the template scale keeps daily figures varied but plausible.
+        const amount = round(tpl.scale * (0.55 + rand() * 0.9));
+        if (amount <= 0) {
+          continue;
+        }
+        const voucherNo = `${branch.code}/${date.slice(5, 7)}/${`${voucherSeq++}`.padStart(5, '0')}`;
+        out.push({
+          date,
+          branchCode: branch.code,
+          accountCode: tpl.debit,
+          debit: amount,
+          credit: 0,
+          voucherNo,
+          narration: tpl.narration
+        });
+        out.push({
+          date,
+          branchCode: branch.code,
+          accountCode: tpl.credit,
+          debit: 0,
+          credit: amount,
+          voucherNo,
+          narration: tpl.narration
+        });
+      }
+
+      // Contingent memoranda are raised at every branch, weighted by its size.
+      const contingentWeight = CONTINGENT_BRANCH_WEIGHTS[branch.code] ?? 0.15;
+      for (const tpl of CONTINGENT_TEMPLATES) {
+        // Claims against the bank and capital commitments are Head Office matters.
+        const headOfficeOnly = tpl.account === '910105' || tpl.account === '910107';
+        if (headOfficeOnly && branch.code !== 'HO') {
+          continue;
+        }
+        const frequency = headOfficeOnly ? tpl.frequency : tpl.frequency * (contingentWeight / 0.2);
+        if (rand() > frequency) {
+          continue;
+        }
+        const amount = round(tpl.scale * (0.55 + rand() * 0.9));
+        out.push({
+          date,
+          branchCode: branch.code,
+          accountCode: tpl.account,
+          debit: amount,
+          credit: 0,
+          voucherNo: `CNT/${branch.code}/${date.slice(5, 7)}/${`${voucherSeq++}`.padStart(5, '0')}`,
+          narration: tpl.narration
+        });
+      }
+    }
+  }
+
+  cachedPostings = out;
+  return out;
+}
+
+/**
+ * Customer sub-ledger.
+ *
+ * The GL is account-level, so a client-wise report needs a customer dimension on top.
+ * Each customer holds a share of one GL head at one branch; balances are not stored,
+ * they are derived at query time as `share x that head's GL balance`. That way the
+ * client-wise report always reconciles to the General Ledger exactly, whatever period
+ * or branch is selected, instead of drifting as a second source of truth.
+ */
+export interface GlCustomer {
+  cif: string;
+  name: string;
+  branchCode: string;
+  /** GL head this relationship sits under. */
+  accountCode: string;
+  accountNo: string;
+  /** Fraction of the branch's balance in that head. Shares per (branch, head) sum to 1. */
+  share: number;
+}
+
+const FIRST_NAMES = [
+  'Ravi',
+  'Priya',
+  'Vikram',
+  'Nirav',
+  'Kavita',
+  'Arjun',
+  'Lakshmi',
+  'Sameer',
+  'Anjali',
+  'Rohan',
+  'Meera',
+  'Karan',
+  'Divya',
+  'Sanjay',
+  'Pooja',
+  'Amit',
+  'Sneha',
+  'Manish',
+  'Rekha',
+  'Deepak'
+];
+const LAST_NAMES = [
+  'Sharma',
+  'Patel',
+  'Reddy',
+  'Shah',
+  'Verma',
+  'Deshmukh',
+  'Iyer',
+  'Kapoor',
+  'Nair',
+  'Joshi',
+  'Mehta',
+  'Gupta',
+  'Rao',
+  'Bhatt',
+  'Chauhan'
+];
+const FIRMS = [
+  'Traders',
+  'Enterprises',
+  'Agencies',
+  '& Sons',
+  'Industries',
+  'Stores',
+  'Corporation'
+];
+
+/** Customer-facing heads a client relationship can sit under. */
+const CUSTOMER_HEADS = [
+  '220101',
+  '220102',
+  '220103',
+  '220104',
+  '130101',
+  '130102',
+  '130103',
+  '130104',
+  '130105',
+  '130106'
+];
+
+let cachedCustomers: GlCustomer[] | null = null;
+
+export function glCustomers(): GlCustomer[] {
+  if (cachedCustomers) {
+    return cachedCustomers;
+  }
+  const rand = lcg(76543210);
+  const out: GlCustomer[] = [];
+  let seq = 1;
+
+  for (const branch of GL_BRANCHES) {
+    for (const head of CUSTOMER_HEADS) {
+      // Deposits are held by many customers; advances by fewer, larger ones.
+      const isAdvance = head.startsWith('13');
+      const count = isAdvance ? 2 + Math.floor(rand() * 3) : 3 + Math.floor(rand() * 4);
+      const weights: number[] = [];
+      for (let i = 0; i < count; i++) {
+        weights.push(0.35 + rand() * 0.65);
+      }
+      const weightTotal = weights.reduce((a, b) => a + b, 0);
+
+      for (let i = 0; i < count; i++) {
+        const corporate = isAdvance && rand() > 0.55;
+        const name = corporate
+          ? `${LAST_NAMES[Math.floor(rand() * LAST_NAMES.length)]} ${FIRMS[Math.floor(rand() * FIRMS.length)]}`
+          : `${FIRST_NAMES[Math.floor(rand() * FIRST_NAMES.length)]} ${LAST_NAMES[Math.floor(rand() * LAST_NAMES.length)]}`;
+        out.push({
+          cif: `CIF${`${100000 + seq}`}`,
+          name,
+          branchCode: branch.code,
+          accountCode: head,
+          accountNo: `${branch.code === 'HO' ? '0001' : branch.code}${head}${`${seq}`.padStart(4, '0')}`,
+          share: weights[i] / weightTotal
+        });
+        seq++;
+      }
+    }
+  }
+  cachedCustomers = out;
+  return out;
+}
+
+export function glAccount(code: string): GlAccount | undefined {
+  return GL_ACCOUNTS.find((a) => a.code === code);
+}
+
+export function glBranchName(code: string): string {
+  return GL_BRANCHES.find((b) => b.code === code)?.name ?? code;
+}

src/app/gl-reports/gl-reports-routing.module.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/.
+ */
+
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { Route } from '../core/route/route.service';
+
+const routes: Routes = [
+  Route.withShell([
+    {
+      path: 'gl/reports',
+      // Lazy — the generated ledger and ExcelJS should not weigh down the eager bundle.
+      loadComponent: () => import('./gl-reports.component').then((m) => m.GlReportsComponent),
+      data: { title: 'General Ledger Reports', breadcrumb: 'GL Reports' }
+    },
+    {
+      path: 'gl/reports/:report',
+      loadComponent: () => import('./gl-reports.component').then((m) => m.GlReportsComponent),
+      data: { title: 'General Ledger Reports', breadcrumb: 'GL Reports' }
+    }
+  ])
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class GlReportsRoutingModule {}

src/app/gl-reports/gl-reports.component.scss

@@ -0,0 +1,560 @@
+/**
+ * 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 {
+  --g-navy: #1a237e;
+  --g-blue: #1d4ed8;
+  --g-blue-l: #eff6ff;
+  --g-teal: #0e7e6b;
+  --g-teal-l: #e0f4f0;
+  --g-green: #15803d;
+  --g-green-l: #dcfce7;
+  --g-amber: #b45309;
+  --g-amber-l: #fef3c7;
+  --g-red: #c0392b;
+  --g-red-l: #fdecea;
+  --g-g50: #f8fafc;
+  --g-g100: #f1f5f9;
+  --g-g200: #e2e8f0;
+  --g-g300: #cbd5e1;
+  --g-g500: #64748b;
+  --g-g700: #334155;
+  --g-g900: #0f172a;
+
+  display: block;
+  font-family:
+    'DM Sans',
+    system-ui,
+    -apple-system,
+    sans-serif;
+  background: var(--g-g50);
+  color: var(--g-g900);
+  font-size: 14px;
+  line-height: 1.5;
+}
+
+.glr-root {
+  padding: 18px 22px;
+  max-width: 1700px;
+  margin: 0 auto;
+}
+
+/* HEADER */
+.glr-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+  flex-wrap: wrap;
+  margin-bottom: 14px;
+}
+
+.glr-head-left {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+}
+
+.glr-head-ic {
+  font-size: 28px;
+  color: var(--g-navy);
+}
+
+.glr-head-t {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 700;
+}
+
+.glr-head-s {
+  font-size: 12px;
+  color: var(--g-g500);
+}
+
+/* BUTTONS */
+.glr-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 16px;
+  border: 1px solid var(--g-g300);
+  background: #fff;
+  border-radius: 8px;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--g-g700);
+  cursor: pointer;
+  font-family: inherit;
+  transition: all 0.15s;
+  white-space: nowrap;
+
+  &:hover:not(:disabled) {
+    background: var(--g-g50);
+    border-color: var(--g-g500);
+  }
+
+  &:disabled {
+    opacity: 0.6;
+    cursor: not-allowed;
+  }
+}
+
+.glr-btn-xls {
+  background: #16a34a;
+  border-color: #16a34a;
+  color: #fff;
+
+  &:hover:not(:disabled) {
+    background: #15803d;
+    border-color: #15803d;
+    color: #fff;
+  }
+}
+
+/* FILTER BAR */
+.glr-filters {
+  background: #fff;
+  border: 1px solid var(--g-g200);
+  border-radius: 12px;
+  padding: 14px;
+  display: flex;
+  align-items: flex-end;
+  gap: 14px;
+  flex-wrap: wrap;
+  margin-bottom: 16px;
+  box-shadow: 0 1px 3px rgb(0 0 0 / 4%);
+}
+
+.glr-filter {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+
+  label {
+    font-size: 11px;
+    font-weight: 700;
+    color: var(--g-g500);
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+  }
+}
+
+.glr-inp {
+  padding: 8px 12px;
+  border: 1px solid var(--g-g200);
+  border-radius: 8px;
+  font-size: 13px;
+  background: #fff;
+  font-family: inherit;
+  min-width: 190px;
+
+  &:focus {
+    outline: none;
+    border-color: var(--g-navy);
+    box-shadow: 0 0 0 3px rgb(26 35 126 / 12%);
+  }
+}
+
+/* Read-only branch shown to a branch-level login in place of the selector. */
+.glr-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 7px;
+  padding: 8px 14px;
+  min-width: 190px;
+  border: 1px solid var(--g-g200);
+  border-radius: 8px;
+  background: var(--g-g100);
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--g-g700);
+}
+
+/* Day / Month / Range segmented control */
+.glr-seg {
+  display: inline-flex;
+  border: 1px solid var(--g-g200);
+  border-radius: 8px;
+  overflow: hidden;
+
+  button {
+    padding: 8px 14px;
+    border: none;
+    background: #fff;
+    font-size: 13px;
+    font-weight: 600;
+    color: var(--g-g500);
+    cursor: pointer;
+    font-family: inherit;
+    transition: all 0.15s;
+
+    + button {
+      border-left: 1px solid var(--g-g200);
+    }
+
+    &:hover {
+      background: var(--g-g50);
+    }
+
+    &.active {
+      background: var(--g-navy);
+      color: #fff;
+    }
+  }
+}
+
+/* REPORT SELECTOR */
+.glr-tabs {
+  display: flex;
+  gap: 4px;
+  background: #fff;
+  border: 1px solid var(--g-g200);
+  border-radius: 10px;
+  padding: 4px;
+  margin-bottom: 16px;
+  overflow-x: auto;
+}
+
+.glr-tab {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 9px 14px;
+  border: none;
+  background: transparent;
+  font-size: 13px;
+  font-weight: 500;
+  color: var(--g-g500);
+  cursor: pointer;
+  border-radius: 7px;
+  white-space: nowrap;
+  transition: all 0.15s;
+  font-family: inherit;
+
+  &:hover {
+    color: var(--g-g900);
+  }
+
+  &.active {
+    background: var(--g-navy);
+    color: #fff;
+    box-shadow: 0 2px 6px rgb(26 35 126 / 25%);
+  }
+}
+
+.glr-section {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+/* BALANCE BANNER */
+.glr-balance {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px 16px;
+  border-radius: 10px;
+  background: var(--g-green-l);
+  border: 1px solid #86efac;
+  color: #14532d;
+  font-size: 13px;
+
+  &--bad {
+    background: var(--g-red-l);
+    border-color: #fca5a5;
+    color: #7f1d1d;
+  }
+}
+
+.glr-note {
+  margin: 0;
+  font-size: 12px;
+  color: var(--g-g500);
+}
+
+/* KPIs */
+.glr-kpis {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 12px;
+}
+
+.glr-kpi {
+  background: #fff;
+  border: 1px solid var(--g-g200);
+  border-left: 4px solid var(--g-g300);
+  border-radius: 12px;
+  padding: 14px 18px;
+  box-shadow: 0 1px 3px rgb(0 0 0 / 5%);
+
+  &--teal {
+    border-left-color: var(--g-teal);
+  }
+
+  &--amber {
+    border-left-color: var(--g-amber);
+  }
+
+  &--green {
+    border-left-color: var(--g-green);
+  }
+
+  &--red {
+    border-left-color: var(--g-red);
+  }
+}
+
+.glr-kpi-n {
+  font-size: 20px;
+  font-weight: 700;
+  font-family: 'DM Mono', monospace;
+  color: var(--g-g900);
+}
+
+.glr-kpi-l {
+  font-size: 12px;
+  color: var(--g-g700);
+  font-weight: 600;
+  margin-top: 2px;
+}
+
+.glr-kpi-sub {
+  font-size: 11px;
+  color: var(--g-g500);
+}
+
+/* TABLES */
+.glr-two-col {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 16px;
+  align-items: start;
+}
+
+.glr-tbl-wrap {
+  background: #fff;
+  border: 1px solid var(--g-g200);
+  border-radius: 12px;
+  overflow: auto;
+  box-shadow: 0 1px 3px rgb(0 0 0 / 4%);
+
+  &--tall {
+    max-height: 70vh;
+  }
+}
+
+.glr-tbl-h {
+  background: var(--g-blue-l);
+  color: var(--g-navy);
+  padding: 10px 16px;
+  font-size: 12px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  border-bottom: 1px solid var(--g-g200);
+  position: sticky;
+  top: 0;
+  z-index: 2;
+}
+
+.glr-tbl {
+  width: 100%;
+  border-collapse: collapse;
+
+  th {
+    text-align: left;
+    padding: 9px 12px;
+    font-size: 11px;
+    font-weight: 700;
+    color: var(--g-g500);
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    background: var(--g-g50);
+    border-bottom: 1px solid var(--g-g200);
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 8px 12px;
+    border-bottom: 1px solid var(--g-g100);
+    font-size: 13px;
+    color: var(--g-g700);
+  }
+
+  tbody tr:hover td {
+    background: var(--g-g50);
+  }
+
+  tfoot td {
+    position: sticky;
+    bottom: 0;
+  }
+}
+
+.total-row td {
+  background: var(--g-g100) !important;
+  font-weight: 700;
+  color: var(--g-g900);
+  border-top: 2px solid var(--g-g300);
+}
+
+.glr-profit-row td {
+  background: var(--g-green-l) !important;
+  color: #14532d;
+}
+
+.glr-loss-row td {
+  background: var(--g-red-l) !important;
+  color: #7f1d1d;
+}
+
+.ta-c {
+  text-align: center;
+}
+
+.ta-r {
+  text-align: right;
+}
+
+.mono {
+  font-family: 'DM Mono', monospace;
+  font-size: 12px;
+}
+
+.muted {
+  color: var(--g-g500);
+  font-size: 11px;
+}
+
+.var-up {
+  color: var(--g-green);
+  font-weight: 600;
+}
+
+.var-down {
+  color: var(--g-red);
+  font-weight: 600;
+}
+
+.glr-empty {
+  text-align: center;
+  padding: 34px;
+  color: var(--g-g500);
+  font-style: italic;
+}
+
+/* A voucher whose debits and credits disagree. */
+.glr-unbalanced td {
+  background: var(--g-red-l) !important;
+  color: #7f1d1d;
+  font-weight: 600;
+}
+
+/* GL code chips on the mapping report */
+.glr-gl-chip {
+  display: inline-block;
+  padding: 1px 8px;
+  margin: 1px 3px 1px 0;
+  border-radius: 999px;
+  background: #e0f2fe;
+  color: #075985;
+  font-size: 11px;
+  font-weight: 600;
+}
+
+/* Share bars on the distribution report */
+.glr-bar-col {
+  width: 150px;
+}
+
+.glr-bar {
+  height: 9px;
+  border-radius: 999px;
+  background: var(--g-g100);
+  overflow: hidden;
+  min-width: 110px;
+}
+
+.glr-bar-fill {
+  height: 100%;
+  border-radius: 999px;
+  background: linear-gradient(90deg, var(--g-navy), var(--g-blue));
+  transition: width 0.25s;
+}
+
+/* Account-type pills on the GL Wise report */
+.type-pill {
+  display: inline-block;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: 0.03em;
+  background: var(--g-g100);
+  color: var(--g-g700);
+
+  &.type-asset {
+    background: var(--g-blue-l);
+    color: var(--g-blue);
+  }
+
+  &.type-liability {
+    background: var(--g-teal-l);
+    color: var(--g-teal);
+  }
+
+  &.type-income {
+    background: var(--g-green-l);
+    color: var(--g-green);
+  }
+
+  &.type-expense {
+    background: var(--g-amber-l);
+    color: var(--g-amber);
+  }
+
+  &.type-contingent {
+    background: var(--g-red-l);
+    color: var(--g-red);
+  }
+}
+
+/* TOAST */
+.glr-toast {
+  position: fixed;
+  bottom: 32px;
+  left: 50%;
+  transform: translateX(-50%) translateY(20px);
+  background: var(--g-navy);
+  color: #fff;
+  padding: 12px 22px;
+  border-radius: 10px;
+  font-size: 13px;
+  font-weight: 500;
+  box-shadow: 0 6px 20px rgb(0 0 0 / 25%);
+  opacity: 0;
+  pointer-events: none;
+  transition: all 0.25s;
+  z-index: 1500;
+
+  &.show {
+    opacity: 1;
+    transform: translateX(-50%) translateY(0);
+  }
+}
+
+@media (width <= 1200px) {
+  .glr-two-col {
+    grid-template-columns: 1fr;
+  }
+
+  .glr-kpis {
+    grid-template-columns: 1fr;
+  }
+}

src/app/gl-reports/gl-reports.compute.ts

@@ -0,0 +1,843 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Derives all seven General Ledger reports from the posting ledger.
+ *
+ * Each report is a pure function of (postings, date range, branch), so changing
+ * the day / month / branch filter genuinely recomputes the figures. Results are
+ * memoised per filter key because the ledger runs to roughly twenty thousand
+ * postings and Angular re-evaluates template getters on every change detection.
+ */
+
+import { GL_ACCOUNTS, GL_PERIOD, GlAccount, GlPosting, glAccount, glCustomers, glPostings } from './gl-reports-data';
+
+export interface GlDateRange {
+  from: string;
+  to: string;
+}
+
+export interface TrialBalanceRow {
+  code: string;
+  name: string;
+  group: string;
+  openingDebit: number;
+  openingCredit: number;
+  periodDebit: number;
+  periodCredit: number;
+  closingDebit: number;
+  closingCredit: number;
+}
+
+export interface PnlRow {
+  code: string;
+  name: string;
+  group: string;
+  amount: number;
+}
+
+export interface BalanceSheetRow {
+  code: string;
+  name: string;
+  group: string;
+  amount: number;
+}
+
+export interface ComparativeRow {
+  code: string;
+  name: string;
+  group: string;
+  side: 'ASSET' | 'LIABILITY';
+  current: number;
+  previous: number;
+  variance: number;
+  variancePct: number | null;
+}
+
+export interface GlWiseRow {
+  code: string;
+  name: string;
+  group: string;
+  type: string;
+  debit: number;
+  credit: number;
+  net: number;
+  vouchers: number;
+}
+
+export interface MiscExpenseRow {
+  date: string;
+  voucherNo: string;
+  branchCode: string;
+  code: string;
+  name: string;
+  narration: string;
+  amount: number;
+}
+
+/** Natural side of an account — assets and expenses sit on the debit side. */
+function isDebitSide(account: GlAccount): boolean {
+  return account.type === 'ASSET' || account.type === 'EXPENSE' || account.type === 'CONTINGENT';
+}
+
+function matchesBranch(p: GlPosting, branchCode: string): boolean {
+  return !branchCode || p.branchCode === branchCode;
+}
+
+/**
+ * Both scans below walk the whole ~21k-posting ledger, so their results are cached
+ * per (date, branch). Angular re-evaluates template getters on every change-detection
+ * pass; without this a screen with a few hundred mapped lines would spend seconds per
+ * click rescanning the ledger and appear frozen.
+ */
+const balanceCache = new Map<string, Map<string, number>>();
+const turnoverCache = new Map<string, Map<string, { debit: number; credit: number; vouchers: Set<string> }>>();
+
+/** Signed balance on the account's natural side, for postings up to and including `to`. */
+function cumulativeBalances(to: string, branchCode: string): Map<string, number> {
+  const key = `${to}|${branchCode}`;
+  const hit = balanceCache.get(key);
+  if (hit) {
+    return hit;
+  }
+  const out = new Map<string, number>();
+  for (const p of glPostings()) {
+    if (p.date > to || !matchesBranch(p, branchCode)) {
+      continue;
+    }
+    const account = glAccount(p.accountCode);
+    if (!account) {
+      continue;
+    }
+    const delta = isDebitSide(account) ? p.debit - p.credit : p.credit - p.debit;
+    out.set(p.accountCode, (out.get(p.accountCode) ?? 0) + delta);
+  }
+  balanceCache.set(key, out);
+  return out;
+}
+
+/** Debit and credit turnover strictly inside the range. */
+function periodTurnover(
+  range: GlDateRange,
+  branchCode: string
+): Map<string, { debit: number; credit: number; vouchers: Set<string> }> {
+  const key = `${range.from}|${range.to}|${branchCode}`;
+  const hit = turnoverCache.get(key);
+  if (hit) {
+    return hit;
+  }
+  const out = new Map<string, { debit: number; credit: number; vouchers: Set<string> }>();
+  for (const p of glPostings()) {
+    if (p.date < range.from || p.date > range.to || !matchesBranch(p, branchCode)) {
+      continue;
+    }
+    let entry = out.get(p.accountCode);
+    if (!entry) {
+      entry = { debit: 0, credit: 0, vouchers: new Set<string>() };
+      out.set(p.accountCode, entry);
+    }
+    entry.debit += p.debit;
+    entry.credit += p.credit;
+    entry.vouchers.add(p.voucherNo);
+  }
+  turnoverCache.set(key, out);
+  return out;
+}
+
+/** The day before `date`, ISO formatted — used for opening balances. */
+function previousDay(date: string): string {
+  const d = new Date(`${date}T00:00:00Z`);
+  d.setUTCDate(d.getUTCDate() - 1);
+  return d.toISOString().slice(0, 10);
+}
+
+// ── Reports ──────────────────────────────────────────────────────────────────
+
+export function trialBalance(range: GlDateRange, branchCode: string): TrialBalanceRow[] {
+  const opening = cumulativeBalances(previousDay(range.from), branchCode);
+  const turnover = periodTurnover(range, branchCode);
+  const rows: TrialBalanceRow[] = [];
+
+  for (const account of GL_ACCOUNTS) {
+    // Contingent accounts are memoranda and never appear in the trial balance.
+    if (account.type === 'CONTINGENT') {
+      continue;
+    }
+    const open = opening.get(account.code) ?? 0;
+    const move = turnover.get(account.code);
+    const periodDebit = move?.debit ?? 0;
+    const periodCredit = move?.credit ?? 0;
+    if (!open && !periodDebit && !periodCredit) {
+      continue;
+    }
+    const debitSide = isDebitSide(account);
+    const closingNatural = open + (debitSide ? periodDebit - periodCredit : periodCredit - periodDebit);
+    const closingSigned = debitSide ? closingNatural : -closingNatural;
+
+    rows.push({
+      code: account.code,
+      name: account.name,
+      group: account.group,
+      openingDebit: debitSide && open > 0 ? open : !debitSide && open < 0 ? -open : 0,
+      openingCredit: !debitSide && open > 0 ? open : debitSide && open < 0 ? -open : 0,
+      periodDebit,
+      periodCredit,
+      closingDebit: closingSigned > 0 ? closingSigned : 0,
+      closingCredit: closingSigned < 0 ? -closingSigned : 0
+    });
+  }
+  return rows;
+}
+
+export function profitAndLoss(range: GlDateRange, branchCode: string): { income: PnlRow[]; expense: PnlRow[] } {
+  const turnover = periodTurnover(range, branchCode);
+  const income: PnlRow[] = [];
+  const expense: PnlRow[] = [];
+
+  for (const account of GL_ACCOUNTS) {
+    if (account.type !== 'INCOME' && account.type !== 'EXPENSE') {
+      continue;
+    }
+    const move = turnover.get(account.code);
+    if (!move) {
+      continue;
+    }
+    const amount = account.type === 'INCOME' ? move.credit - move.debit : move.debit - move.credit;
+    if (!amount) {
+      continue;
+    }
+    const row: PnlRow = { code: account.code, name: account.name, group: account.group, amount };
+    (account.type === 'INCOME' ? income : expense).push(row);
+  }
+  return { income, expense };
+}
+
+/**
+ * Balance sheet as at the period end. The current-period surplus is folded in as
+ * a liability line so the two sides tally the way the printed statement does.
+ */
+export function balanceSheet(
+  range: GlDateRange,
+  branchCode: string
+): {
+  assets: BalanceSheetRow[];
+  liabilities: BalanceSheetRow[];
+  surplus: number;
+} {
+  const closing = cumulativeBalances(range.to, branchCode);
+  const assets: BalanceSheetRow[] = [];
+  const liabilities: BalanceSheetRow[] = [];
+  let income = 0;
+  let expense = 0;
+
+  for (const account of GL_ACCOUNTS) {
+    const bal = closing.get(account.code) ?? 0;
+    if (account.type === 'INCOME') {
+      income += bal;
+      continue;
+    }
+    if (account.type === 'EXPENSE') {
+      expense += bal;
+      continue;
+    }
+    if (account.type === 'CONTINGENT' || !bal) {
+      continue;
+    }
+    const row: BalanceSheetRow = { code: account.code, name: account.name, group: account.group, amount: bal };
+    (account.type === 'ASSET' ? assets : liabilities).push(row);
+  }
+  return { assets, liabilities, surplus: income - expense };
+}
+
+/** Current period against the equivalent span immediately before it. */
+export function comparativeBalanceSheet(range: GlDateRange, branchCode: string): ComparativeRow[] {
+  const priorTo = previousDay(range.from);
+  const current = cumulativeBalances(range.to, branchCode);
+  const previous = cumulativeBalances(priorTo, branchCode);
+  const rows: ComparativeRow[] = [];
+
+  for (const account of GL_ACCOUNTS) {
+    if (account.type !== 'ASSET' && account.type !== 'LIABILITY') {
+      continue;
+    }
+    const cur = current.get(account.code) ?? 0;
+    const prev = previous.get(account.code) ?? 0;
+    if (!cur && !prev) {
+      continue;
+    }
+    const variance = cur - prev;
+    rows.push({
+      code: account.code,
+      name: account.name,
+      group: account.group,
+      side: account.type,
+      current: cur,
+      previous: prev,
+      variance,
+      variancePct: prev ? (variance / Math.abs(prev)) * 100 : null
+    });
+  }
+  return rows;
+}
+
+export function contingentLiabilities(range: GlDateRange, branchCode: string): BalanceSheetRow[] {
+  const closing = cumulativeBalances(range.to, branchCode);
+  return GL_ACCOUNTS.filter((a) => a.type === 'CONTINGENT')
+    .map((a) => ({ code: a.code, name: a.name, group: a.group, amount: closing.get(a.code) ?? 0 }))
+    .filter((r) => r.amount !== 0);
+}
+
+export function glWiseDrCr(range: GlDateRange, branchCode: string): GlWiseRow[] {
+  const turnover = periodTurnover(range, branchCode);
+  const rows: GlWiseRow[] = [];
+  for (const account of GL_ACCOUNTS) {
+    const move = turnover.get(account.code);
+    if (!move || (!move.debit && !move.credit)) {
+      continue;
+    }
+    rows.push({
+      code: account.code,
+      name: account.name,
+      group: account.group,
+      type: account.type,
+      debit: move.debit,
+      credit: move.credit,
+      net: move.debit - move.credit,
+      vouchers: move.vouchers.size
+    });
+  }
+  return rows;
+}
+
+export function miscExpenseLedger(range: GlDateRange, branchCode: string): MiscExpenseRow[] {
+  const miscCodes = new Set(GL_ACCOUNTS.filter((a) => a.miscExpense).map((a) => a.code));
+  const rows: MiscExpenseRow[] = [];
+  for (const p of glPostings()) {
+    if (p.date < range.from || p.date > range.to || !matchesBranch(p, branchCode)) {
+      continue;
+    }
+    if (!miscCodes.has(p.accountCode) || !p.debit) {
+      continue;
+    }
+    rows.push({
+      date: p.date,
+      voucherNo: p.voucherNo,
+      branchCode: p.branchCode,
+      code: p.accountCode,
+      name: glAccount(p.accountCode)?.name ?? p.accountCode,
+      narration: p.narration,
+      amount: p.debit
+    });
+  }
+  return rows.sort((a, b) =>
+    a.date === b.date ? a.voucherNo.localeCompare(b.voucherNo) : a.date.localeCompare(b.date)
+  );
+}
+
+export interface AverageBalanceRow {
+  code: string;
+  name: string;
+  group: string;
+  type: string;
+  opening: number;
+  closing: number;
+  average: number;
+  peak: number;
+  lowest: number;
+  /** Days on which the account moved. */
+  activeDays: number;
+}
+
+export interface AccountBranchRow {
+  code: string;
+  name: string;
+  group: string;
+  /** Closing balance per branch code, plus a `total`. */
+  byBranch: Record<string, number>;
+  total: number;
+}
+
+export interface DistributionRow {
+  group: string;
+  amount: number;
+  share: number;
+  accounts: number;
+}
+
+/** Calendar days in the range, inclusive. */
+function daysInRange(range: GlDateRange): string[] {
+  const out: string[] = [];
+  const cur = new Date(`${range.from}T00:00:00Z`);
+  const end = new Date(`${range.to}T00:00:00Z`);
+  while (cur <= end) {
+    out.push(cur.toISOString().slice(0, 10));
+    cur.setUTCDate(cur.getUTCDate() + 1);
+  }
+  return out;
+}
+
+/**
+ * Average daily balance per account across the period, plus the peak and lowest
+ * balance touched. Banks use average balances rather than closing snapshots for
+ * interest, CRR/SLR and profitability work, because a closing figure can be
+ * window-dressed on the last day.
+ *
+ * Computed by carrying a running balance forward day by day rather than
+ * recomputing a cumulative balance per day, which would be quadratic.
+ */
+export function averageBalances(range: GlDateRange, branchCode: string): AverageBalanceRow[] {
+  const opening = cumulativeBalances(previousDay(range.from), branchCode);
+  const days = daysInRange(range);
+
+  // Net movement per account per day, on the account's natural side.
+  const dailyDelta = new Map<string, Map<string, number>>();
+  const movedOn = new Map<string, Set<string>>();
+  for (const p of glPostings()) {
+    if (p.date < range.from || p.date > range.to || !matchesBranch(p, branchCode)) {
+      continue;
+    }
+    const account = glAccount(p.accountCode);
+    if (!account) {
+      continue;
+    }
+    const delta = isDebitSide(account) ? p.debit - p.credit : p.credit - p.debit;
+    let perDay = dailyDelta.get(p.accountCode);
+    if (!perDay) {
+      perDay = new Map<string, number>();
+      dailyDelta.set(p.accountCode, perDay);
+    }
+    perDay.set(p.date, (perDay.get(p.date) ?? 0) + delta);
+    let seen = movedOn.get(p.accountCode);
+    if (!seen) {
+      seen = new Set<string>();
+      movedOn.set(p.accountCode, seen);
+    }
+    seen.add(p.date);
+  }
+
+  const rows: AverageBalanceRow[] = [];
+  for (const account of GL_ACCOUNTS) {
+    const open = opening.get(account.code) ?? 0;
+    const perDay = dailyDelta.get(account.code);
+    if (!open && !perDay) {
+      continue;
+    }
+    let running = open;
+    let total = 0;
+    let peak = open;
+    let lowest = open;
+    for (const d of days) {
+      running += perDay?.get(d) ?? 0;
+      total += running;
+      peak = Math.max(peak, running);
+      lowest = Math.min(lowest, running);
+    }
+    rows.push({
+      code: account.code,
+      name: account.name,
+      group: account.group,
+      type: account.type,
+      opening: open,
+      closing: running,
+      average: days.length ? total / days.length : 0,
+      peak,
+      lowest,
+      activeDays: movedOn.get(account.code)?.size ?? 0
+    });
+  }
+  return rows;
+}
+
+/**
+ * Closing balance of every account broken out by branch. Answers "which branch is
+ * carrying this balance", which a single consolidated column cannot.
+ */
+export function accountWiseByBranch(range: GlDateRange, branchCodes: string[]): AccountBranchRow[] {
+  const perBranch = new Map<string, Map<string, number>>();
+  for (const b of branchCodes) {
+    perBranch.set(b, cumulativeBalances(range.to, b));
+  }
+  const rows: AccountBranchRow[] = [];
+  for (const account of GL_ACCOUNTS) {
+    const byBranch: Record<string, number> = {};
+    let total = 0;
+    let any = false;
+    for (const b of branchCodes) {
+      const v = perBranch.get(b)?.get(account.code) ?? 0;
+      byBranch[b] = v;
+      total += v;
+      if (v) {
+        any = true;
+      }
+    }
+    if (!any) {
+      continue;
+    }
+    rows.push({ code: account.code, name: account.name, group: account.group, byBranch, total });
+  }
+  return rows;
+}
+
+/**
+ * Share of the closing book held by each account group, for one side of the
+ * balance sheet. Used to see concentration at a glance.
+ */
+export function balanceDistribution(
+  range: GlDateRange,
+  branchCode: string,
+  side: 'ASSET' | 'LIABILITY'
+): DistributionRow[] {
+  const closing = cumulativeBalances(range.to, branchCode);
+  const byGroup = new Map<string, { amount: number; accounts: number }>();
+  let grand = 0;
+
+  for (const account of GL_ACCOUNTS) {
+    if (account.type !== side) {
+      continue;
+    }
+    const v = closing.get(account.code) ?? 0;
+    if (!v) {
+      continue;
+    }
+    const entry = byGroup.get(account.group) ?? { amount: 0, accounts: 0 };
+    entry.amount += v;
+    entry.accounts += 1;
+    byGroup.set(account.group, entry);
+    grand += v;
+  }
+
+  return [...byGroup.entries()]
+    .map(
+      ([
+        group,
+        e
+      ]) => ({
+        group,
+        amount: e.amount,
+        accounts: e.accounts,
+        share: grand ? (e.amount / grand) * 100 : 0
+      })
+    )
+    .sort((a, b) => b.amount - a.amount);
+}
+
+export interface ClientBalanceRow {
+  cif: string;
+  name: string;
+  branchCode: string;
+  accountNo: string;
+  accountCode: string;
+  product: string;
+  /** DEPOSIT or ADVANCE — which side of the relationship this is. */
+  side: 'DEPOSIT' | 'ADVANCE';
+  balance: number;
+}
+
+export interface BankerHeadRow {
+  head: string;
+  opening: number;
+  debit: number;
+  credit: number;
+  closing: number;
+  accounts: number;
+}
+
+export interface SundryItemRow {
+  date: string;
+  voucherNo: string;
+  branchCode: string;
+  code: string;
+  name: string;
+  narration: string;
+  amount: number;
+  /** Days outstanding as at the period end. */
+  ageDays: number;
+  bucket: string;
+}
+
+export interface VoucherRow {
+  voucherNo: string;
+  date: string;
+  branchCode: string;
+  narration: string;
+  debitAccounts: string;
+  creditAccounts: string;
+  amount: number;
+  legs: number;
+  /** False when debits and credits on the voucher do not agree. */
+  balanced: boolean;
+}
+
+/**
+ * Client-wise balances, derived from the GL rather than stored separately so the two
+ * can never disagree. Each customer's balance is its share of the branch's closing
+ * balance in the head it sits under.
+ */
+export function clientWiseBalances(range: GlDateRange, branchCode: string): ClientBalanceRow[] {
+  const rows: ClientBalanceRow[] = [];
+  const branchClosings = new Map<string, Map<string, number>>();
+
+  for (const c of glCustomers()) {
+    if (branchCode && c.branchCode !== branchCode) {
+      continue;
+    }
+    let closing = branchClosings.get(c.branchCode);
+    if (!closing) {
+      closing = cumulativeBalances(range.to, c.branchCode);
+      branchClosings.set(c.branchCode, closing);
+    }
+    const headBalance = closing.get(c.accountCode) ?? 0;
+    const balance = headBalance * c.share;
+    if (Math.abs(balance) < 0.005) {
+      continue;
+    }
+    const account = glAccount(c.accountCode);
+    rows.push({
+      cif: c.cif,
+      name: c.name,
+      branchCode: c.branchCode,
+      accountNo: c.accountNo,
+      accountCode: c.accountCode,
+      product: account?.name ?? c.accountCode,
+      side: c.accountCode.startsWith('13') ? 'ADVANCE' : 'DEPOSIT',
+      balance
+    });
+  }
+  return rows.sort((a, b) => b.balance - a.balance);
+}
+
+/**
+ * Head-wise abstract: the trial balance rolled up to principal heads, the summary a
+ * banker reads before the detail. Opening, turnover and closing per head.
+ */
+export function bankerHeadSummary(range: GlDateRange, branchCode: string): BankerHeadRow[] {
+  const opening = cumulativeBalances(previousDay(range.from), branchCode);
+  const turnover = periodTurnover(range, branchCode);
+  const byHead = new Map<string, BankerHeadRow>();
+
+  for (const account of GL_ACCOUNTS) {
+    // Contingents are single-sided off-balance-sheet memoranda. Including them would
+    // make the abstract's debit and credit turnover disagree and stop it reconciling
+    // to the trial balance, which also excludes them. They have their own report.
+    if (account.type === 'CONTINGENT') {
+      continue;
+    }
+    const open = opening.get(account.code) ?? 0;
+    const move = turnover.get(account.code);
+    if (!open && !move) {
+      continue;
+    }
+    const debit = move?.debit ?? 0;
+    const credit = move?.credit ?? 0;
+    const closing = open + (isDebitSide(account) ? debit - credit : credit - debit);
+
+    const row = byHead.get(account.group) ?? {
+      head: account.group,
+      opening: 0,
+      debit: 0,
+      credit: 0,
+      closing: 0,
+      accounts: 0
+    };
+    row.opening += open;
+    row.debit += debit;
+    row.credit += credit;
+    row.closing += closing;
+    row.accounts += 1;
+    byHead.set(account.group, row);
+  }
+  return [...byHead.values()];
+}
+
+const SUNDRY_CODES = [
+  '140104',
+  '230103',
+  '140199',
+  '230102'
+];
+
+/**
+ * Outstanding items in the sundry and suspense heads, aged from the posting date.
+ * These accounts are where unreconciled entries accumulate, so ageing is the point
+ * of the register.
+ */
+export function sundryRegister(range: GlDateRange, branchCode: string): SundryItemRow[] {
+  const wanted = new Set(SUNDRY_CODES);
+  const end = new Date(`${range.to}T00:00:00Z`).getTime();
+  const rows: SundryItemRow[] = [];
+
+  for (const p of glPostings()) {
+    if (p.date > range.to || !matchesBranch(p, branchCode) || !wanted.has(p.accountCode)) {
+      continue;
+    }
+    const ageDays = Math.max(0, Math.round((end - new Date(`${p.date}T00:00:00Z`).getTime()) / 86400000));
+    const bucket =
+      ageDays <= 30
+        ? 'Up to 30 days'
+        : ageDays <= 90
+          ? '31 to 90 days'
+          : ageDays <= 180
+            ? '91 to 180 days'
+            : 'Over 180 days';
+    rows.push({
+      date: p.date,
+      voucherNo: p.voucherNo,
+      branchCode: p.branchCode,
+      code: p.accountCode,
+      name: glAccount(p.accountCode)?.name ?? p.accountCode,
+      narration: p.narration,
+      amount: p.debit || p.credit,
+      ageDays,
+      bucket
+    });
+  }
+  return rows.sort((a, b) => b.ageDays - a.ageDays);
+}
+
+/**
+ * Every voucher raised in the period with its debit and credit legs collapsed onto
+ * one line, plus a per-voucher double-entry check.
+ */
+export function voucherRegister(range: GlDateRange, branchCode: string): VoucherRow[] {
+  const grouped = new Map<string, GlPosting[]>();
+  for (const p of glPostings()) {
+    if (p.date < range.from || p.date > range.to || !matchesBranch(p, branchCode)) {
+      continue;
+    }
+    const list = grouped.get(p.voucherNo);
+    if (list) {
+      list.push(p);
+    } else {
+      grouped.set(p.voucherNo, [p]);
+    }
+  }
+
+  const rows: VoucherRow[] = [];
+  for (const [
+    voucherNo,
+    legs
+  ] of grouped) {
+    const debits = legs.filter((l) => l.debit > 0);
+    const credits = legs.filter((l) => l.credit > 0);
+    const drTotal = debits.reduce((s, l) => s + l.debit, 0);
+    const crTotal = credits.reduce((s, l) => s + l.credit, 0);
+    const nameOf = (codes: GlPosting[], side: 'debit' | 'credit') =>
+      [...new Set(codes.map((l) => `${l.accountCode} ${glAccount(l.accountCode)?.name ?? ''}`.trim()))].join(', ');
+
+    rows.push({
+      voucherNo,
+      date: legs[0].date,
+      branchCode: legs[0].branchCode,
+      narration: legs[0].narration,
+      debitAccounts: nameOf(debits, 'debit') || '—',
+      creditAccounts: nameOf(credits, 'credit') || '—',
+      amount: Math.max(drTotal, crTotal),
+      legs: legs.length,
+      // Contingent and opening memoranda are single-sided by design.
+      balanced: voucherNo.startsWith('CNT/') || voucherNo.startsWith('OB/') || Math.round(drTotal - crTotal) === 0
+    });
+  }
+  return rows.sort((a, b) =>
+    a.date === b.date ? a.voucherNo.localeCompare(b.voucherNo) : a.date.localeCompare(b.date)
+  );
+}
+
+// ── Memoisation ──────────────────────────────────────────────────────────────
+
+export interface GlReportSet {
+  trialBalance: TrialBalanceRow[];
+  pnl: { income: PnlRow[]; expense: PnlRow[] };
+  balanceSheet: { assets: BalanceSheetRow[]; liabilities: BalanceSheetRow[]; surplus: number };
+  comparative: ComparativeRow[];
+  contingent: BalanceSheetRow[];
+  glWise: GlWiseRow[];
+  miscExpense: MiscExpenseRow[];
+}
+
+let cacheKey = '';
+let cached: GlReportSet | null = null;
+
+/** All seven reports for one filter selection, computed once per selection. */
+export function buildReports(range: GlDateRange, branchCode: string): GlReportSet {
+  const key = `${range.from}|${range.to}|${branchCode}`;
+  if (cached && cacheKey === key) {
+    return cached;
+  }
+  cached = {
+    trialBalance: trialBalance(range, branchCode),
+    pnl: profitAndLoss(range, branchCode),
+    balanceSheet: balanceSheet(range, branchCode),
+    comparative: comparativeBalanceSheet(range, branchCode),
+    contingent: contingentLiabilities(range, branchCode),
+    glWise: glWiseDrCr(range, branchCode),
+    miscExpense: miscExpenseLedger(range, branchCode)
+  };
+  cacheKey = key;
+  return cached;
+}
+
+/** Clamp a range to the generated ledger so filters cannot query empty space. */
+export function clampToLedger(range: GlDateRange): GlDateRange {
+  return {
+    from: range.from < GL_PERIOD.fyStart ? GL_PERIOD.fyStart : range.from,
+    to: range.to > GL_PERIOD.fyEnd ? GL_PERIOD.fyEnd : range.to
+  };
+}
+
+/**
+ * Value of a set of GL accounts for a period, used when an RBI return line item is
+ * mapped to the chart of accounts.
+ *
+ * Balance-sheet accounts contribute their closing balance as at the period end;
+ * income and expenditure accounts contribute their movement within the period.
+ * That mirrors how the two kinds of figure are read on a return.
+ */
+export function glValueForCodes(codes: string[], range: GlDateRange, branchCode = ''): number {
+  if (!codes.length) {
+    return 0;
+  }
+  const wanted = new Set(codes);
+  const closing = cumulativeBalances(range.to, branchCode);
+  const movement = periodTurnover(range, branchCode);
+  let total = 0;
+
+  for (const code of wanted) {
+    const account = glAccount(code);
+    if (!account) {
+      continue;
+    }
+    if (account.type === 'INCOME' || account.type === 'EXPENSE') {
+      const move = movement.get(code);
+      if (!move) {
+        continue;
+      }
+      total += account.type === 'INCOME' ? move.credit - move.debit : move.debit - move.credit;
+    } else {
+      total += closing.get(code) ?? 0;
+    }
+  }
+  return total;
+}
+
+export function sum<T>(rows: T[], pick: (row: T) => number): number {
+  return rows.reduce((acc, r) => acc + pick(r), 0);
+}
+
+/** Groups rows by their `group` field, preserving chart-of-accounts order. */
+export function groupBy<T extends { group: string }>(rows: T[]): { group: string; rows: T[]; total: number }[] {
+  const order: string[] = [];
+  const map = new Map<string, T[]>();
+  for (const r of rows) {
+    if (!map.has(r.group)) {
+      map.set(r.group, []);
+      order.push(r.group);
+    }
+    map.get(r.group)!.push(r);
+  }
+  return order.map((g) => ({ group: g, rows: map.get(g)!, total: 0 }));
+}

src/app/gl-reports/gl-reports.module.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+import { GlReportsRoutingModule } from './gl-reports-routing.module';
+
+@NgModule({
+  imports: [
+    SharedModule,
+    GlReportsRoutingModule
+  ]
+})
+export class GlReportsModule {}

src/app/investment/bond-investment/bond-investment.component.html

@@ -25,6 +25,11 @@
           }
         </select>
       </label>
+      @if (activeTab === 'holdings') {
+        <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+          {{ generating ? 'Exporting…' : 'Export to Excel' }}
+        </button>
+      }
     </div>
   </header>
 
@@ -187,8 +192,8 @@
           ><span>Deal No</span><input type="text" [(ngModel)]="purchaseForm.dealNo" readonly
         /></label>
         <label class="inv-form-field"
-          ><span>* Deal Date</span><input type="text" [(ngModel)]="purchaseForm.dealDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>* Deal Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.dealDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>* Deal Time (24 hr, HH:mm:ss)</span
           ><input type="text" [(ngModel)]="purchaseForm.dealTime" placeholder="HH:mm:ss"
@@ -216,8 +221,8 @@
         </label>
         <label class="inv-form-field"
           ><span>Settlement Dt</span
-          ><input type="text" [(ngModel)]="purchaseForm.settlementDt" placeholder="DD-MM-YYYY"
-        /></label>
+          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.settlementDt"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>* Party Code</span>
           <select [(ngModel)]="purchaseForm.partyCode">
@@ -328,8 +333,8 @@
           </select>
         </label>
         <label class="inv-form-field"
-          ><span>* Issue Date</span><input type="text" [(ngModel)]="purchaseForm.issueDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>* Issue Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.issueDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Period(Year)</span><input type="number" [(ngModel)]="purchaseForm.periodYear" min="0"
         /></label>
@@ -349,8 +354,8 @@
           ><span>Call Option</span><input type="text" [(ngModel)]="purchaseForm.callOption"
         /></label>
         <label class="inv-form-field"
-          ><span>Meet Dt</span><input type="text" [(ngModel)]="purchaseForm.meetDt" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Meet Dt</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.meetDt"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Reso No</span><input type="text" [(ngModel)]="purchaseForm.resoNo"
         /></label>
@@ -389,11 +394,11 @@
             </select>
           </label>
           <label class="inv-form-field"
-            ><span>Int Date</span><input type="text" [(ngModel)]="purchaseForm.intDate" placeholder="DD-MM-YYYY"
-          /></label>
+            ><span>Int Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.intDate"></mifosx-date-ddmmyyyy
+          ></label>
           <label class="inv-form-field"
-            ><span>* Last Int.dt</span><input type="text" [(ngModel)]="purchaseForm.lastIntDt" placeholder="DD-MM-YYYY"
-          /></label>
+            ><span>* Last Int.dt</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.lastIntDt"></mifosx-date-ddmmyyyy
+          ></label>
           <label class="inv-form-field"
             ><span>Accrued Interest (computed)</span
             ><input type="text" [value]="purchaseAccruedInterest | number: '1.2-2'" readonly
@@ -549,8 +554,8 @@
           /></label>
         }
         <label class="inv-form-field"
-          ><span>Redemption Date *</span><input type="text" [(ngModel)]="redeemDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Redemption Date *</span><mifosx-date-ddmmyyyy [(ngModel)]="redeemDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Redemption Proceeds (computed)</span
           ><input type="text" [value]="'₹' + (redeemAmount | number: '1.2-2')" readonly
@@ -570,11 +575,14 @@
       <div class="pos-section-label">Investment - Govt./Bond Interest calculation</div>
       <div class="inv-form-grid">
         <label class="inv-form-field"
-          ><span>Date</span><input type="text" [(ngModel)]="intCalcDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcFromDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcToDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Type</span>
-          <select [(ngModel)]="intCalcType">
+          <select [(ngModel)]="intCalcType" (ngModelChange)="onIntCalcTypeChange()">
             <option value="">-- All Types --</option>
             @for (o of bondTypeOptions; track o.value) {
               <option [value]="o.value">{{ o.label }}</option>
@@ -594,11 +602,25 @@
         <label class="inv-form-field"
           ><span>ALL</span><input type="checkbox" [(ngModel)]="intCalcAll" style="height: 18px; width: 18px"
         /></label>
+        <label class="inv-form-field">
+          <span>Post To (Interest Income GL)</span>
+          <select [(ngModel)]="intCalcGlCode">
+            @for (g of interestIncomeGlOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
       </div>
       <div class="inv-form-actions">
         <button type="button" class="pg-btn pg-btn--primary" (click)="processInterest()">Process</button>
         <button type="button" class="pg-btn pg-btn--ghost" (click)="setTab('holdings')">Exit</button>
       </div>
+      @if (intCalcExcludedNpi.length > 0) {
+        <p class="pg-sub" style="padding: 0 16px 12px">
+          {{ intCalcExcludedNpi.length }} holding(s) excluded — classified Non-Performing, interest is not posted on
+          accrual basis (collectible on cash basis only, via Interest Receive in the Investment Interest module).
+        </p>
+      }
       <div class="pos-section-label">Holdings matching the filter ({{ intCalcTargets.length }})</div>
       <table class="pg-table">
         <thead>
@@ -689,8 +711,8 @@
           ><span>TBill GL.A/C.</span><input type="text" [(ngModel)]="sellForm.tbillGlAc"
         /></label>
         <label class="inv-form-field"
-          ><span>* Deal Date</span><input type="text" [(ngModel)]="sellForm.dealDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>* Deal Date</span><mifosx-date-ddmmyyyy [(ngModel)]="sellForm.dealDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>* Deal Time</span><input type="text" [(ngModel)]="sellForm.dealTime" placeholder="HH:mm:ss"
         /></label>
@@ -703,8 +725,8 @@
           </select>
         </label>
         <label class="inv-form-field"
-          ><span>Settlement Dt</span><input type="text" [(ngModel)]="sellForm.settlementDt" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Settlement Dt</span><mifosx-date-ddmmyyyy [(ngModel)]="sellForm.settlementDt"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>* Face Value</span><input type="number" [(ngModel)]="sellForm.faceValue" min="0"
         /></label>
@@ -937,8 +959,8 @@
           </select>
         </label>
         <label class="inv-form-field"
-          ><span>Transfer Date *</span><input type="text" [(ngModel)]="goiTransferDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Transfer Date *</span><mifosx-date-ddmmyyyy [(ngModel)]="goiTransferDate"></mifosx-date-ddmmyyyy
+        ></label>
       </div>
       <div class="inv-form-actions">
         <button type="button" class="pg-btn pg-btn--primary" (click)="saveGoiTransfer()">Save</button>
@@ -953,8 +975,8 @@
       <div class="pos-section-label">Investment - Investment Depreciation (Mark-to-Market Provisioning)</div>
       <div class="inv-form-grid">
         <label class="inv-form-field"
-          ><span>Valuation Date</span><input type="text" [(ngModel)]="depreciationDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Valuation Date</span><mifosx-date-ddmmyyyy [(ngModel)]="depreciationDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Category</span>
           <select [(ngModel)]="depreciationCategory">
@@ -1038,8 +1060,8 @@
           ><span>Units to Transfer *</span><input type="number" [(ngModel)]="mfTransferUnits" min="0" step="0.001"
         /></label>
         <label class="inv-form-field"
-          ><span>Transfer Date *</span><input type="text" [(ngModel)]="mfTransferDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Transfer Date *</span><mifosx-date-ddmmyyyy [(ngModel)]="mfTransferDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Transfer Value (computed)</span
           ><input type="text" [value]="'₹' + (mfTransferValue | number: '1.2-2')" readonly
@@ -1064,6 +1086,7 @@
             <th>Cert No</th>
             <th>Type</th>
             <th>Particulars</th>
+            <th>GL Posted</th>
             <th class="num">Amount</th>
           </tr>
         </thead>
@@ -1077,11 +1100,12 @@
               <td>{{ t.certNo }}</td>
               <td>{{ t.txnType }}</td>
               <td>{{ t.particulars }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
               <td class="num">₹{{ t.amount | number: '1.2-2' }}</td>
             </tr>
           } @empty {
             <tr>
-              <td colspan="6" class="pg-empty">No transactions yet.</td>
+              <td colspan="7" class="pg-empty">No transactions yet.</td>
             </tr>
           }
         </tbody>

src/app/investment/bond-investment/bond-investment.component.ts

@@ -9,6 +9,7 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import {
   GOVT_SECURITY_HOLDINGS,
   NON_SLR_HOLDINGS,
@@ -30,12 +31,16 @@ import {
   BOND_RATING_OPTIONS,
   INT_TYPE_OPTIONS,
   AUTHORITY_OPTIONS,
+  INTEREST_INCOME_GL_MASTER,
+  INTEREST_INCOME_GL_BY_TYPE,
   InvestmentHolding,
   InvestmentTxn,
   InstrumentType,
   InterestFreq,
   INSTRUMENT_LABELS,
   accruedInterest,
+  accruedInterestBetween,
+  canAccrueInterest,
   daysToMaturity,
   maturityAmount,
   addPeriod,
@@ -43,6 +48,7 @@ import {
   yearsBetween,
   todayDDMMYYYY
 } from '../investment-data';
+import { exportWorkbook } from '../investment-export';
 
 type BondType = 'GOVT_SECURITY' | 'NON_SLR' | 'BOND' | 'MUTUAL_FUND';
 type BondTab =
@@ -172,7 +178,8 @@ interface BondSellForm {
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule
+    FormsModule,
+    DateDdmmyyyyPickerComponent
   ]
 })
 export class BondInvestmentComponent {
@@ -210,6 +217,7 @@ export class BondInvestmentComponent {
   readonly intTypeOptions = INT_TYPE_OPTIONS;
   readonly authorityOptions = AUTHORITY_OPTIONS;
 
+  generating = false;
   toastMsg = '';
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
@@ -222,12 +230,17 @@ export class BondInvestmentComponent {
   redeemDate = this.asOnDate;
   redeemRemarks = '';
 
-  // Interest Calculation (legacy: Date / Type / Script / Deal No / ALL + Process)
-  intCalcDate = this.asOnDate;
+  // Interest Calculation (legacy: From/To Date / Type / Script / Deal No / ALL + Process) —
+  // posts interest accrued strictly within [intCalcFromDate, intCalcToDate], same period-based
+  // basis as the Investment Interest module's Govt./Bond Interest Calculation.
+  intCalcFromDate = addPeriod(this.asOnDate, 0, -3);
+  intCalcToDate = this.asOnDate;
   intCalcType: BondType | '' = '';
   intCalcScript = '';
   intCalcDealNo = '';
   intCalcAll = false;
+  intCalcGlCode = INTEREST_INCOME_GL_BY_TYPE.GOVT_SECURITY;
+  readonly interestIncomeGlOptions = INTEREST_INCOME_GL_MASTER;
 
   // Write-off
   writeoffCertNo = '';
@@ -645,13 +658,15 @@ export class BondInvestmentComponent {
   }
 
   // -------------------- Interest calculation --------------------
-  /** Holdings the Interest Calculation "Process" run would cover, given the filters. */
+  /** Holdings the Interest Calculation "Process" run would cover, given the filters. A
+   *  Non-Performing holding is always excluded — same accrual-basis rule as the Investment
+   *  Interest module (it's still collectible on cash basis via Interest Receive there). */
   get intCalcTargets(): InvestmentHolding[] {
+    const base = this.holdings.filter((h) => h.status === 'ACTIVE' && canAccrueInterest(h));
     if (this.intCalcAll) {
-      return this.holdings.filter((h) => h.status === 'ACTIVE');
+      return base;
     }
-    return this.holdings.filter((h) => {
-      if (h.status !== 'ACTIVE') return false;
+    return base.filter((h) => {
       if (this.intCalcType && h.instrumentType !== this.intCalcType) return false;
       if (this.intCalcScript && h.scriptCode !== this.intCalcScript) return false;
       if (this.intCalcDealNo && h.certNo !== this.intCalcDealNo.trim()) return false;
@@ -659,31 +674,62 @@ export class BondInvestmentComponent {
     });
   }
 
+  get intCalcExcludedNpi(): InvestmentHolding[] {
+    return this.holdings.filter((h) => h.status === 'ACTIVE' && !canAccrueInterest(h));
+  }
+
+  /** Re-suggests the Interest Income GL when the Type filter changes — still overridable. */
+  onIntCalcTypeChange(): void {
+    if (this.intCalcType) {
+      this.intCalcGlCode = INTEREST_INCOME_GL_BY_TYPE[this.intCalcType];
+    }
+  }
+
+  glName(glCode: string): string {
+    return this.interestIncomeGlOptions.find((g) => g.glCode === glCode)?.glName ?? glCode;
+  }
+
+  /** Interest accrued strictly within [intCalcFromDate, intCalcToDate] — a period-based
+   *  Interest Calculation & Post run, same basis as the Investment Interest module. */
   interestAccrued(h: InvestmentHolding): number {
-    return accruedInterest(h, this.intCalcDate || this.asOnDate);
+    return accruedInterestBetween(h, this.intCalcFromDate || h.purchaseDate, this.intCalcToDate || this.asOnDate);
   }
 
   processInterest(): void {
-    const targets = this.intCalcTargets;
+    const targets = this.intCalcTargets.filter((h) => this.interestAccrued(h) > 0);
     if (targets.length === 0) {
-      this.toast('No holdings match the selected filters.');
+      this.toast('No holdings have interest due to be posted for this period.');
       return;
     }
-    const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
-      certNo: h.certNo,
-      instrumentType: h.instrumentType,
-      txnType: 'INTEREST',
-      voucherNo: `INV/INT/${h.certNo}-${this.txns.length + i + 1}`,
-      txnDate: this.intCalcDate || this.asOnDate,
-      amount: this.interestAccrued(h),
-      particulars: `Interest calculated - ${h.scriptName}`
-    }));
+    const toDate = this.intCalcToDate || this.asOnDate;
+    const fromDate = this.intCalcFromDate || toDate;
+    const glCode = this.intCalcGlCode;
+    const glName = this.glName(glCode);
+    const newTxns: InvestmentTxn[] = targets.map((h, i) => {
+      const amt = this.interestAccrued(h);
+      h.interestPosted = (h.interestPosted ?? 0) + amt;
+      h.interestPostedTillDate = toDate;
+      return {
+        certNo: h.certNo,
+        instrumentType: h.instrumentType,
+        txnType: 'INTEREST',
+        voucherNo: `INV/INT/${h.certNo}-${this.txns.length + i + 1}`,
+        txnDate: toDate,
+        amount: amt,
+        particulars: `Interest calculated (accrual) for period ${fromDate} to ${toDate} - ${h.scriptName}`,
+        glCode,
+        glName
+      };
+    });
     this.txns = [
       ...newTxns,
       ...this.txns
     ];
+    this.intCalcFromDate = toDate;
     const total = newTxns.reduce((s, t) => s + t.amount, 0);
-    this.toast(`Interest processed for ${targets.length} holding(s). Total ₹${total.toLocaleString('en-IN')}.`);
+    this.toast(
+      `Interest processed for ${targets.length} holding(s) to ${glCode} - ${glName}. Total ₹${total.toLocaleString('en-IN')}.`
+    );
   }
 
   // -------------------- Sell / Redeem Entry --------------------
@@ -1092,6 +1138,68 @@ export class BondInvestmentComponent {
     return `inv-badge inv-badge--${h.status.toLowerCase()}`;
   }
 
+  // -------------------- Export to Excel (Holdings register) --------------------
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(
+        [
+          {
+            sheetName: this.instrumentLabel(this.bondType),
+            title: `${this.instrumentLabel(this.bondType)} Holdings Register`,
+            subtitle: `As on ${this.asOnDate}`,
+            headers: [
+              'Cert No',
+              'Script',
+              'Party',
+              'Units',
+              'Face Value',
+              'Rate',
+              'Purchase Date',
+              'Maturity Date',
+              'Accrued Interest',
+              'Maturity Value',
+              'Status'
+            ],
+            widths: [
+              14,
+              26,
+              22,
+              12,
+              16,
+              10,
+              14,
+              14,
+              16,
+              16,
+              12
+            ],
+            rows: this.holdingsForType.map((h) => [
+              h.certNo,
+              h.scriptName,
+              h.party,
+              h.units,
+              h.faceValue,
+              h.interestRate,
+              h.purchaseDate,
+              h.maturityDate,
+              this.accrued(h),
+              this.maturity(h),
+              h.status
+            ])
+          }
+        ],
+        `${this.instrumentLabel(this.bondType)}-Holdings-${this.asOnDate}`
+      );
+      this.toast(`${this.instrumentLabel(this.bondType)} Holdings exported.`);
+    } catch (err) {
+      console.error('Bond Holdings export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
   private toast(msg: string): void {
     this.toastMsg = msg;
     this.toastVisible = true;

src/app/investment/date-ddmmyyyy-picker/date-ddmmyyyy-picker.component.ts

@@ -0,0 +1,213 @@
+/**
+ * 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, ElementRef, ViewChild, forwardRef } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+/**
+ * Drop-in replacement for `<input type="text" placeholder="DD-MM-YYYY">` used throughout the
+ * Investment module. Keeps the DD-MM-YYYY string every date field/helper in investment-data.ts
+ * already expects (parseDDMMYYYY, addPeriod, etc.), but adds a calendar button that opens the
+ * browser's native date picker and converts the picked value back to DD-MM-YYYY — so users can
+ * either type the date or pick it, without changing any consuming component's data model.
+ *
+ * Usage: <mifosx-date-ddmmyyyy [(ngModel)]="someField"></mifosx-date-ddmmyyyy>
+ */
+@Component({
+  selector: 'mifosx-date-ddmmyyyy',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule
+  ],
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => DateDdmmyyyyPickerComponent),
+      multi: true
+    }
+  ],
+  template: `
+    <div class="inv-date-field">
+      <input
+        type="text"
+        class="inv-date-field__text"
+        [ngModel]="value"
+        (ngModelChange)="onTextChange($event)"
+        (blur)="onTouched()"
+        placeholder="DD-MM-YYYY"
+        [disabled]="disabled"
+      />
+      <button
+        type="button"
+        class="inv-date-field__btn"
+        tabindex="-1"
+        [disabled]="disabled"
+        (click)="openPicker()"
+        aria-label="Pick a date"
+        title="Pick a date"
+      >
+        📅
+      </button>
+      <input
+        #native
+        type="date"
+        class="inv-date-field__native"
+        tabindex="-1"
+        [ngModel]="isoValue"
+        (ngModelChange)="onPickerChange($event)"
+      />
+    </div>
+  `,
+  styles: [
+    `
+      /* Angular view encapsulation stops the host page's .inv-form-field styles from reaching
+       * inside this component's own template, so the look of the surrounding form fields
+       * (height, border, radius, font) is deliberately re-declared here instead of inherited. */
+      :host {
+        display: block;
+        width: 100%;
+      }
+      .inv-date-field {
+        position: relative;
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        width: 100%;
+      }
+      .inv-date-field__text {
+        flex: 1;
+        min-width: 0;
+        width: 100%;
+        height: 36px;
+        padding: 0 10px;
+        border: 1px solid #e2e8f0;
+        border-radius: 8px;
+        font-size: 13px;
+        color: #0d1b2a;
+        font-family: inherit;
+        background: #fff;
+        box-sizing: border-box;
+      }
+      .inv-date-field__btn {
+        flex: 0 0 auto;
+        display: inline-flex;
+        align-items: center;
+        justify-content: center;
+        height: 36px;
+        width: 36px;
+        padding: 0;
+        border: 1px solid #e2e8f0;
+        border-radius: 8px;
+        background: #fff;
+        cursor: pointer;
+        font-size: 14px;
+        line-height: 1;
+      }
+      .inv-date-field__btn:hover:not(:disabled) {
+        background: #f2f4f7;
+      }
+      .inv-date-field__btn:disabled {
+        cursor: not-allowed;
+        opacity: 0.5;
+      }
+      .inv-date-field__native {
+        position: absolute;
+        width: 0;
+        height: 0;
+        padding: 0;
+        border: none;
+        opacity: 0;
+        pointer-events: none;
+      }
+    `
+  ]
+})
+export class DateDdmmyyyyPickerComponent implements ControlValueAccessor {
+  @ViewChild('native') private nativeInput?: ElementRef<HTMLInputElement>;
+
+  value = '';
+  disabled = false;
+
+  private onChangeFn: (v: string) => void = () => {};
+  onTouched: () => void = () => {};
+
+  /** DD-MM-YYYY -> yyyy-MM-dd, the format <input type="date"> requires. */
+  get isoValue(): string {
+    const parts = (this.value || '').split('-');
+    if (parts.length !== 3) {
+      return '';
+    }
+    const [
+      dd,
+      mm,
+      yyyy
+    ] = parts;
+    if (!/^\d{2}$/.test(dd) || !/^\d{2}$/.test(mm) || !/^\d{4}$/.test(yyyy)) {
+      return '';
+    }
+    return `${yyyy}-${mm}-${dd}`;
+  }
+
+  writeValue(v: string): void {
+    this.value = v ?? '';
+  }
+
+  registerOnChange(fn: (v: string) => void): void {
+    this.onChangeFn = fn;
+  }
+
+  registerOnTouched(fn: () => void): void {
+    this.onTouched = fn;
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  onTextChange(v: string): void {
+    this.value = v;
+    this.onChangeFn(v);
+  }
+
+  /** yyyy-MM-dd (from the native picker) -> DD-MM-YYYY, the format the rest of the app expects. */
+  onPickerChange(iso: string): void {
+    const parts = (iso || '').split('-');
+    if (parts.length !== 3) {
+      return;
+    }
+    const [
+      yyyy,
+      mm,
+      dd
+    ] = parts;
+    const ddmmyyyy = `${dd}-${mm}-${yyyy}`;
+    this.value = ddmmyyyy;
+    this.onChangeFn(ddmmyyyy);
+    this.onTouched();
+  }
+
+  openPicker(): void {
+    const el = this.nativeInput?.nativeElement;
+    if (!el || this.disabled) {
+      return;
+    }
+    const showPicker = (el as HTMLInputElement & { showPicker?: () => void }).showPicker;
+    if (typeof showPicker === 'function') {
+      try {
+        showPicker.call(el);
+        return;
+      } catch {
+        // Some browsers throw if not called from a "user gesture" context they recognise —
+        // fall back to a plain click(), which still opens the native picker.
+      }
+    }
+    el.click();
+  }
+}

src/app/investment/fd-investment/fd-investment.component.html

@@ -16,6 +16,13 @@
         Part-Payment entries.
       </p>
     </div>
+    @if (activeTab === 'holdings') {
+      <div class="pg-toolbar">
+        <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+          {{ generating ? 'Exporting…' : 'Export to Excel' }}
+        </button>
+      </div>
+    }
   </header>
 
   <div class="cctr-tabs">
@@ -172,8 +179,8 @@
           ><span>Certificate No.</span><input type="text" [(ngModel)]="purchaseForm.certNo"
         /></label>
         <label class="inv-form-field"
-          ><span>Certificate Date</span><input type="text" [(ngModel)]="purchaseForm.certDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Certificate Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.certDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Sub Type</span>
           <select [(ngModel)]="purchaseForm.subType">
@@ -191,12 +198,12 @@
         </label>
         <label class="inv-form-field"
           ><span>Transaction Date</span
-          ><input type="text" [(ngModel)]="purchaseForm.transactionDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.transactionDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Deposit Date *</span
-          ><input type="text" [(ngModel)]="purchaseForm.depositDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.depositDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Deposit Amount *</span><input type="number" [(ngModel)]="purchaseForm.depositAmount" min="0"
         /></label>
@@ -210,8 +217,8 @@
         </label>
         <label class="inv-form-field"
           ><span>Interest Date</span
-          ><input type="text" [(ngModel)]="purchaseForm.interestDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.interestDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Interest Rate *</span><input type="number" [(ngModel)]="purchaseForm.interestRate" min="0" step="0.01"
         /></label>
@@ -228,8 +235,8 @@
         } @else {
           <label class="inv-form-field"
             ><span>Maturity Date (manual) *</span
-            ><input type="text" [(ngModel)]="purchaseForm.manualMaturityDate" placeholder="DD-MM-YYYY"
-          /></label>
+            ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.manualMaturityDate"></mifosx-date-ddmmyyyy
+          ></label>
         }
         <label class="inv-form-field"
           ><span>Resolution No.</span><input type="text" [(ngModel)]="purchaseForm.resolutionNo"
@@ -320,11 +327,25 @@
           <span>Certificate No *</span>
           <select [(ngModel)]="interestCertNo">
             <option value="">-- Select --</option>
-            @for (h of activeHoldings; track h.certNo) {
+            @for (h of interestEligibleHoldings; track h.certNo) {
               <option [value]="h.certNo">{{ h.certNo }} — {{ h.party }}</option>
             }
           </select>
         </label>
+        <label class="inv-form-field"
+          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="interestFromDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="interestToDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field">
+          <span>Post To (Interest Income GL)</span>
+          <select [(ngModel)]="interestGlCode">
+            @for (g of interestIncomeGlOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
         @if (interestHolding; as h) {
           <label class="inv-form-field"><span>Party</span><input type="text" [value]="h.party" readonly /></label>
           <label class="inv-form-field"
@@ -334,7 +355,7 @@
             ><span>Frequency</span><input type="text" [value]="h.interestFreq" readonly
           /></label>
           <label class="inv-form-field"
-            ><span>Accrued Interest (as on {{ asOnDate }})</span
+            ><span>Interest for Period</span
             ><input type="text" [value]="'₹' + (interestAccrued(h) | number: '1.2-2')" readonly
           /></label>
         }
@@ -369,8 +390,8 @@
           /></label>
         }
         <label class="inv-form-field"
-          ><span>Sell / Premature Date *</span><input type="text" [(ngModel)]="sellDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Sell / Premature Date *</span><mifosx-date-ddmmyyyy [(ngModel)]="sellDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"><span>Remarks</span><input type="text" [(ngModel)]="sellRemark" /></label>
       </div>
       <div class="inv-form-actions">
@@ -447,6 +468,7 @@
             <th>Cert No</th>
             <th>Type</th>
             <th>Particulars</th>
+            <th>GL Posted</th>
             <th class="num">Amount</th>
           </tr>
         </thead>
@@ -460,6 +482,7 @@
               <td>{{ t.certNo }}</td>
               <td>{{ t.txnType }}</td>
               <td>{{ t.particulars }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
               <td class="num">₹{{ t.amount | number: '1.2-2' }}</td>
             </tr>
           }

src/app/investment/fd-investment/fd-investment.component.ts

@@ -9,6 +9,7 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import {
   FD_HOLDINGS,
   ALL_TXNS,
@@ -17,15 +18,20 @@ import {
   FD_TYPE_OPTIONS,
   INT_TYPE_OPTIONS,
   LIEN_REASON_MASTER,
+  INTEREST_INCOME_GL_MASTER,
+  INTEREST_INCOME_GL_BY_TYPE,
   InvestmentHolding,
   InvestmentTxn,
   InterestFreq,
   accruedInterest,
+  accruedInterestBetween,
+  canAccrueInterest,
   daysToMaturity,
   maturityAmount,
   addPeriod,
   todayDDMMYYYY
 } from '../investment-data';
+import { exportWorkbook } from '../investment-export';
 
 type FdTab = 'holdings' | 'purchase' | 'interest' | 'sell' | 'writeoff' | 'partpayment';
 
@@ -82,7 +88,8 @@ interface FdPurchaseForm {
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule
+    FormsModule,
+    DateDdmmyyyyPickerComponent
   ]
 })
 export class FdInvestmentComponent {
@@ -97,12 +104,14 @@ export class FdInvestmentComponent {
   readonly fdTypeOptions = FD_TYPE_OPTIONS;
   readonly intTypeOptions = INT_TYPE_OPTIONS;
   readonly lienReasonOptions = LIEN_REASON_MASTER;
+  readonly interestIncomeGlOptions = INTEREST_INCOME_GL_MASTER;
   readonly branchOptions = [
     'HEAD OFFICE',
     'BRANCH 1',
     'BRANCH 2'
   ];
 
+  generating = false;
   toastMsg = '';
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
@@ -112,6 +121,9 @@ export class FdInvestmentComponent {
   searchCertNo = '';
 
   interestCertNo = '';
+  interestFromDate = addPeriod(this.asOnDate, 0, -3);
+  interestToDate = this.asOnDate;
+  interestGlCode = INTEREST_INCOME_GL_BY_TYPE.FD;
   sellCertNo = '';
   sellDate = this.asOnDate;
   sellRemark = '';
@@ -311,12 +323,24 @@ export class FdInvestmentComponent {
   }
 
   // -------------------- Interest --------------------
+  /** Certificates eligible for accrual-basis posting — same rule as the Investment Interest
+   *  module: a Non-Performing holding never appears here, only through Interest Receive. */
+  get interestEligibleHoldings(): InvestmentHolding[] {
+    return this.activeHoldings.filter((h) => canAccrueInterest(h));
+  }
+
   get interestHolding(): InvestmentHolding | undefined {
     return this.holdings.find((h) => h.certNo === this.interestCertNo);
   }
 
+  /** Interest accrued strictly within [interestFromDate, interestToDate] — a period-based
+   *  Interest Calculation & Post run, same basis as the Investment Interest module. */
   interestAccrued(h: InvestmentHolding): number {
-    return accruedInterest(h, this.asOnDate);
+    return accruedInterestBetween(h, this.interestFromDate || h.purchaseDate, this.interestToDate || this.asOnDate);
+  }
+
+  glName(glCode: string): string {
+    return this.interestIncomeGlOptions.find((g) => g.glCode === glCode)?.glName ?? glCode;
   }
 
   postInterest(): void {
@@ -326,19 +350,34 @@ export class FdInvestmentComponent {
       return;
     }
     const amt = this.interestAccrued(h);
+    if (amt <= 0) {
+      this.toast('No interest due to be posted for this period.');
+      return;
+    }
+    const toDate = this.interestToDate || this.asOnDate;
+    const fromDate = this.interestFromDate || toDate;
+    const glCode = this.interestGlCode;
+    const glName = this.glName(glCode);
+    h.interestPosted = (h.interestPosted ?? 0) + amt;
+    h.interestPostedTillDate = toDate;
+    this.interestFromDate = toDate;
     this.txns = [
       {
         certNo: h.certNo,
         instrumentType: 'FD',
         txnType: 'INTEREST',
         voucherNo: `INV/INT/FD-${h.certNo}-${this.txns.length + 1}`,
-        txnDate: this.asOnDate,
+        txnDate: toDate,
         amount: amt,
-        particulars: `Interest posted - ${h.party} (${h.interestFreq})`
+        particulars: `Interest posted (accrual) for period ${fromDate} to ${toDate} - ${h.party} (${h.interestFreq})`,
+        glCode,
+        glName
       },
       ...this.txns
     ];
-    this.toast(`Interest of ₹${amt.toLocaleString('en-IN')} posted for Certificate ${h.certNo}.`);
+    this.toast(
+      `Interest of ₹${amt.toLocaleString('en-IN')} posted to ${glCode} - ${glName} for Certificate ${h.certNo}.`
+    );
     this.interestCertNo = '';
   }
 
@@ -450,6 +489,68 @@ export class FdInvestmentComponent {
     return `inv-badge inv-badge--${h.status.toLowerCase()}`;
   }
 
+  // -------------------- Export to Excel (Holdings register) --------------------
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(
+        [
+          {
+            sheetName: 'FD Holdings',
+            title: 'FD Holdings Register',
+            subtitle: `As on ${this.asOnDate}`,
+            headers: [
+              'Cert No',
+              'Party',
+              'Type',
+              'Face Value',
+              'Rate',
+              'Frequency',
+              'Purchase Date',
+              'Maturity Date',
+              'Accrued Interest',
+              'Maturity Value',
+              'Status'
+            ],
+            widths: [
+              14,
+              28,
+              18,
+              16,
+              10,
+              14,
+              14,
+              14,
+              16,
+              16,
+              12
+            ],
+            rows: this.holdings.map((h) => [
+              h.certNo,
+              h.party,
+              h.interestFreq === 'CUMULATIVE' ? 'Cumulative' : 'Payout',
+              h.faceValue,
+              h.interestRate,
+              h.interestFreq,
+              h.purchaseDate,
+              h.maturityDate,
+              this.accrued(h),
+              this.maturity(h),
+              h.status
+            ])
+          }
+        ],
+        `FD-Holdings-${this.asOnDate}`
+      );
+      this.toast('FD Holdings exported.');
+    } catch (err) {
+      console.error('FD Holdings export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
   private toast(msg: string): void {
     this.toastMsg = msg;
     this.toastVisible = true;

src/app/investment/investment-dashboard/investment-dashboard.component.html

@@ -16,6 +16,11 @@
         {{ asOnDate }}.
       </p>
     </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+        {{ generating ? 'Exporting…' : 'Export to Excel' }}
+      </button>
+    </div>
   </header>
 
   <div class="inv-kpis">
@@ -78,6 +83,69 @@
     </table>
   </div>
 
+  <div class="pg-card">
+    <div class="pos-section-label">Portfolio Allocation — Target vs Actual</div>
+    <p class="pg-sub">
+      Govt Security, Non-SLR, Mutual Fund and Share targets trace to RBI's SLR floor (18% of NDTL) and Non-SLR ceiling
+      (≤10% of deposits) for Urban Co-operative Banks; Fixed Deposit and Bond are board-approved policy choices within
+      the room that framework leaves.
+    </p>
+    <table class="pg-table">
+      <thead>
+        <tr>
+          <th>Instrument Type</th>
+          <th>Target Basis</th>
+          <th class="num">Target %</th>
+          <th class="num">Actual %</th>
+          <th class="num">Actual Value</th>
+          <th class="num">Variance</th>
+          <th>Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        @for (a of allocationVsTarget; track a.type) {
+          <tr>
+            <td>{{ a.label }}</td>
+            <td>
+              <span class="inv-badge" [class.inv-badge--matured]="a.isRbiLinked">
+                {{ a.isRbiLinked ? 'RBI SLR / Non-SLR Norm' : 'Board Policy' }}
+              </span>
+            </td>
+            <td class="num">{{ a.targetPct }}%</td>
+            <td class="num">{{ a.actualPct }}%</td>
+            <td class="num">₹{{ a.actualValue | number: '1.2-2' }}</td>
+            <td
+              class="num"
+              [class.col-out]="a.statusLabel !== 'Within Target'"
+              [class.col-in]="a.statusLabel === 'Within Target'"
+            >
+              {{ a.variancePct > 0 ? '+' : '' }}{{ a.variancePct }}%
+            </td>
+            <td>
+              <span
+                class="inv-badge"
+                [class.inv-badge--active]="a.statusLabel === 'Within Target'"
+                [class.inv-badge--sold]="a.statusLabel === 'Over-Allocated'"
+                [class.inv-badge--written_off]="a.statusLabel === 'Under-Allocated'"
+              >
+                {{ a.statusLabel }}
+              </span>
+            </td>
+          </tr>
+        }
+      </tbody>
+      <tfoot>
+        <tr class="cctr-total-row">
+          <td>Total</td>
+          <td class="num">100%</td>
+          <td class="num">100%</td>
+          <td class="num">₹{{ totalFaceValue | number: '1.2-2' }}</td>
+          <td colspan="2"></td>
+        </tr>
+      </tfoot>
+    </table>
+  </div>
+
   <div class="pg-card">
     <div class="pos-section-label">Due-Date Diary — Maturing Within 90 Days</div>
     @if (maturingSoon.length === 0) {
@@ -144,3 +212,5 @@
     </div>
   </div>
 </div>
+
+<div class="inv-toast" [class.show]="toastVisible">{{ toastMsg }}</div>

src/app/investment/investment-dashboard/investment-dashboard.component.ts

@@ -11,13 +11,16 @@ import { CommonModule } from '@angular/common';
 import { RouterLink } from '@angular/router';
 import {
   ALL_HOLDINGS,
+  ALLOCATION_TARGET_IS_RBI_LINKED,
   INSTRUMENT_LABELS,
   InstrumentType,
   InvestmentHolding,
+  TARGET_ALLOCATION_PCT,
   accruedInterest,
   daysToMaturity,
   maturityAmount
 } from '../investment-data';
+import { exportWorkbook } from '../investment-export';
 
 interface InstrumentSummary {
   type: InstrumentType;
@@ -29,6 +32,19 @@ interface InstrumentSummary {
   maturityValue: number;
 }
 
+interface AllocationRow {
+  type: InstrumentType;
+  label: string;
+  targetPct: number;
+  actualPct: number;
+  actualValue: number;
+  variancePct: number;
+  statusLabel: 'Within Target' | 'Over-Allocated' | 'Under-Allocated';
+  /** True when the target itself traces to an RBI SLR/Non-SLR rule rather than being a
+   *  board-only policy choice — see TARGET_ALLOCATION_PCT's doc comment in investment-data.ts. */
+  isRbiLinked: boolean;
+}
+
 /** Cross-instrument portfolio dashboard — every figure is derived from ALL_HOLDINGS, never
  *  hand-duplicated, so it can never drift from the per-instrument screens or Reports. */
 @Component({
@@ -46,6 +62,10 @@ interface InstrumentSummary {
 })
 export class InvestmentDashboardComponent {
   asOnDate = '';
+  generating = false;
+  toastMsg = '';
+  toastVisible = false;
+  private toastTimer: ReturnType<typeof setTimeout> | undefined;
   private readonly types: Array<{ type: InstrumentType; route: string }> = [
     { type: 'FD', route: '/investment/fd' },
     { type: 'GOVT_SECURITY', route: '/investment/bonds' },
@@ -79,6 +99,31 @@ export class InvestmentDashboardComponent {
     });
   }
 
+  /** Board-approved policy target % per instrument type vs the portfolio's actual allocation
+   *  (by invested/face value) — a ±2 percentage-point band is treated as "Within Target" since
+   *  a treasury desk can't rebalance to the exact decimal every day. */
+  get allocationVsTarget(): AllocationRow[] {
+    const total = this.totalFaceValue;
+    return this.types.map(({ type }) => {
+      const value = this.holdingsOf(type).reduce((s, h) => s + h.faceValue, 0);
+      const actualPct = total ? (value / total) * 100 : 0;
+      const targetPct = TARGET_ALLOCATION_PCT[type];
+      const variancePct = +(actualPct - targetPct).toFixed(1);
+      const statusLabel: AllocationRow['statusLabel'] =
+        Math.abs(variancePct) <= 2 ? 'Within Target' : variancePct > 0 ? 'Over-Allocated' : 'Under-Allocated';
+      return {
+        type,
+        label: INSTRUMENT_LABELS[type],
+        targetPct,
+        actualPct: +actualPct.toFixed(1),
+        actualValue: value,
+        variancePct,
+        statusLabel,
+        isRbiLinked: ALLOCATION_TARGET_IS_RBI_LINKED[type]
+      };
+    });
+  }
+
   get totalHoldings(): number {
     return ALL_HOLDINGS.length;
   }
@@ -117,4 +162,88 @@ export class InvestmentDashboardComponent {
   instrumentLabel(type: InstrumentType): string {
     return INSTRUMENT_LABELS[type];
   }
+
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(
+        [
+          {
+            sheetName: 'Instrument Breakup',
+            title: 'Investment Portfolio — Instrument-wise Break-up',
+            subtitle: `As on ${this.asOnDate}`,
+            headers: [
+              'Instrument Type',
+              'Holdings',
+              'Face Value',
+              'Accrued Interest',
+              'Maturity Value'
+            ],
+            widths: [
+              26,
+              12,
+              18,
+              18,
+              18
+            ],
+            rows: this.summaries.map((s) => [
+              s.label,
+              s.count,
+              s.faceValue,
+              s.accruedInterest,
+              s.maturityValue
+            ])
+          },
+          {
+            sheetName: 'Portfolio Allocation',
+            title: 'Portfolio Allocation — Target vs Actual',
+            subtitle: `As on ${this.asOnDate}`,
+            headers: [
+              'Instrument Type',
+              'Target Basis',
+              'Target %',
+              'Actual %',
+              'Actual Value',
+              'Variance %',
+              'Status'
+            ],
+            widths: [
+              26,
+              20,
+              12,
+              12,
+              18,
+              12,
+              18
+            ],
+            rows: this.allocationVsTarget.map((a) => [
+              a.label,
+              a.isRbiLinked ? 'RBI SLR / Non-SLR Norm' : 'Board Policy',
+              a.targetPct,
+              a.actualPct,
+              a.actualValue,
+              a.variancePct,
+              a.statusLabel
+            ])
+          }
+        ],
+        `Investment-Dashboard-${this.asOnDate}`
+      );
+      this.toast('Investment Dashboard exported.');
+    } catch (err) {
+      console.error('Investment Dashboard export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
+  private toast(msg: string): void {
+    this.toastMsg = msg;
+    this.toastVisible = true;
+    if (this.toastTimer) {
+      clearTimeout(this.toastTimer);
+    }
+    this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+  }
 }

src/app/investment/investment-data.ts

@@ -22,6 +22,7 @@ export type InterestFreq = 'MONTHLY' | 'QUARTERLY' | 'HALF_YEARLY' | 'YEARLY' |
 export type TxnType =
   | 'PURCHASE'
   | 'INTEREST'
+  | 'INTEREST_RECEIVED'
   | 'DIVIDEND'
   | 'SELL'
   | 'REDEEM'
@@ -38,6 +39,61 @@ export const INSTRUMENT_LABELS: Record<InstrumentType, string> = {
   SHARE: 'Share'
 };
 
+/** RBI investment-provisioning classification. A holding with no `provisionStatus` (or
+ *  explicitly 'STANDARD') is performing normally. Once classified Sub-Standard/Doubtful/Loss —
+ *  a Non-Performing Investment (NPI), the loan-book equivalent of an NPA — interest can no
+ *  longer be recognised on accrual basis (see canAccrueInterest()) and a provision must be held
+ *  against the investment (see provisionRequiredInv()). */
+export type InvestmentProvisionStatus = 'STANDARD' | 'SUB_STANDARD' | 'DOUBTFUL' | 'LOSS';
+
+export const PROVISION_STATUS_LABELS: Record<InvestmentProvisionStatus, string> = {
+  STANDARD: 'Standard',
+  SUB_STANDARD: 'Sub-Standard (NPI)',
+  DOUBTFUL: 'Doubtful (NPI)',
+  LOSS: 'Loss (NPI)'
+};
+
+/**
+ * Portfolio-policy target — % of the total investment corpus each instrument type should hold.
+ * Compared against actual holdings on the Dashboard so a treasury desk can see at a glance where
+ * the book has drifted from policy. Four of these six trace back to real RBI rules for Urban
+ * Co-operative Banks (RBI Master Direction/Circular — Investment Portfolio of Primary (Urban)
+ * Co-operative Banks):
+ *   • SLR: UCBs must hold 18% of NDTL in approved securities — predominantly Central/State Govt
+ *     securities (and SLR-eligible State Development Loan bonds). A well-run treasury holds a
+ *     safety buffer above the bare floor, so Govt Security dominates the book far beyond the 18%
+ *     minimum — it isn't itself an upper target, just the reason this bucket is the largest.
+ *   • Non-SLR ceiling: a UCB's Non-SLR investments must not exceed 10% of its total deposits as
+ *     on 31 March of the previous year — a hard regulatory cap, not a board choice.
+ *   • Mutual Funds: RBI permits UCBs to invest only in debt-oriented schemes of SEBI-registered
+ *     mutual funds, in strictly limited amounts — equity/balanced schemes are not permitted.
+ *   • Shares: RBI does not permit UCBs to invest in equity shares of companies as a general
+ *     investment class; any "Share" holding is essentially the (small, largely static) shares a
+ *     UCB holds in affiliated co-operative institutions, not a discretionary trading book.
+ * Fixed Deposit (treasury placements with other banks) and Bond (a mix of SLR-eligible SDL and
+ * Non-SLR PSU/FI bonds) have no RBI-mandated percentage of their own — their split here is a
+ * board-approved policy choice within the room RBI's SLR/Non-SLR framework leaves.
+ */
+export const TARGET_ALLOCATION_PCT: Record<InstrumentType, number> = {
+  GOVT_SECURITY: 55,
+  BOND: 18,
+  FD: 15,
+  NON_SLR: 7,
+  MUTUAL_FUND: 3,
+  SHARE: 2
+};
+
+/** True for the instrument types whose target traces to an actual RBI rule (SLR floor / Non-SLR
+ *  ceiling) rather than a board-only policy choice — see TARGET_ALLOCATION_PCT's doc comment. */
+export const ALLOCATION_TARGET_IS_RBI_LINKED: Record<InstrumentType, boolean> = {
+  GOVT_SECURITY: true,
+  BOND: false,
+  FD: false,
+  NON_SLR: true,
+  MUTUAL_FUND: true,
+  SHARE: true
+};
+
 export interface InvestmentHolding {
   certNo: string;
   instrumentType: InstrumentType;
@@ -57,6 +113,16 @@ export interface InvestmentHolding {
   crToAc: string;
   brokerCode: string;
   status: HoldingStatus;
+  /** Absent/'STANDARD' for a healthy holding. Drives canAccrueInterest() and provisioning. */
+  provisionStatus?: InvestmentProvisionStatus;
+  /** Cumulative interest posted (booked as an accrual receivable/income entry) to date. */
+  interestPosted?: number;
+  /** Cumulative interest actually received in cash to date. */
+  interestReceived?: number;
+  /** DD-MM-YYYY through which interest has already been calculated & posted. accruedInterestBetween()
+   *  never re-counts days up to this date, so re-running a Calculation & Post for an overlapping
+   *  or repeated period always yields 0 instead of double-posting the same interest. */
+  interestPostedTillDate?: string;
 }
 
 export interface InvestmentTxn {
@@ -67,6 +133,10 @@ export interface InvestmentTxn {
   txnDate: string;
   amount: number;
   particulars: string;
+  /** GL account this entry was posted/received against — the Interest Income GL for a Post,
+   *  the Cash/Bank GL for a Receive. Absent on older/seeded entries that predate GL selection. */
+  glCode?: string;
+  glName?: string;
 }
 
 // -------------------- Date / interest helpers --------------------
@@ -109,6 +179,75 @@ export function daysToMaturity(h: InvestmentHolding, asOnStr: string): number {
   return Math.round((mat - asOn) / (24 * 3600 * 1000));
 }
 
+// -------------------- Provisioning & interest-lifecycle helpers --------------------
+
+export function isNpi(h: InvestmentHolding): boolean {
+  return (h.provisionStatus ?? 'STANDARD') !== 'STANDARD';
+}
+
+export function provisionRatePctInv(status: InvestmentProvisionStatus): number {
+  switch (status) {
+    case 'STANDARD':
+      return 0;
+    case 'SUB_STANDARD':
+      return 25;
+    case 'DOUBTFUL':
+      return 50;
+    case 'LOSS':
+      return 100;
+  }
+}
+
+/** Provision required against the investment itself (principal), same idea as NPA provisioning
+ *  on a loan book — computed on face value since that is this module's carrying-value figure. */
+export function provisionRequiredInv(h: InvestmentHolding): number {
+  return Math.round(h.faceValue * (provisionRatePctInv(h.provisionStatus ?? 'STANDARD') / 100));
+}
+
+/** Interest can only be recognised on an accrual basis (posted as a receivable/income entry)
+ *  while the investment is Standard. Once it is classified Non-Performing (Sub-Standard/
+ *  Doubtful/Loss), RBI income-recognition norms require interest to move to cash basis — i.e.
+ *  it is recognised only when actually received, never posted as an accrual receivable. */
+export function canAccrueInterest(h: InvestmentHolding): boolean {
+  return !isNpi(h);
+}
+
+/** Outstanding "Interest Receivable" GL balance — interest already posted (booked as income)
+ *  but not yet actually received in cash. Always 0 for an NPI holding, since nothing is ever
+ *  posted as a receivable on one. */
+export function interestReceivableBalance(h: InvestmentHolding): number {
+  if (!canAccrueInterest(h)) {
+    return 0;
+  }
+  return Math.max(0, (h.interestPosted ?? 0) - (h.interestReceived ?? 0));
+}
+
+/** For an NPI holding, interest keeps accruing notionally but is held in memo/suspense — never
+ *  posted as an asset or recognised as income — until it is actually collected in cash. */
+export function suspenseInterest(h: InvestmentHolding, asOnStr: string): number {
+  if (canAccrueInterest(h)) {
+    return 0;
+  }
+  return Math.max(0, accruedInterest(h, asOnStr) - (h.interestReceived ?? 0));
+}
+
+/** Interest accrued strictly within [fromStr, toStr], clipped to the holding's own
+ *  purchase→maturity window — the basis for a period-based Interest Calculation & Post run
+ *  (as opposed to accruedInterest(), which is always measured from purchase date). Returns 0
+ *  for a Non-Performing holding, same accrual-basis rule as accruedInterest(). */
+export function accruedInterestBetween(h: InvestmentHolding, fromStr: string, toStr: string): number {
+  if (!canAccrueInterest(h)) {
+    return 0;
+  }
+  const purchase = parseDDMMYYYY(h.purchaseDate).getTime();
+  const maturity = parseDDMMYYYY(h.maturityDate).getTime();
+  const postedTill = h.interestPostedTillDate ? parseDDMMYYYY(h.interestPostedTillDate).getTime() : purchase;
+  const from = Math.max(parseDDMMYYYY(fromStr).getTime(), purchase, postedTill);
+  const to = Math.min(parseDDMMYYYY(toStr).getTime(), maturity);
+  const days = Math.max(0, (to - from) / (24 * 3600 * 1000));
+  return Math.round(h.faceValue * (h.interestRate / 100) * (days / 365.25));
+}
+
 export function formatDDMMYYYY(d: Date): string {
   return `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
 }
@@ -208,7 +347,9 @@ export const FD_HOLDINGS: InvestmentHolding[] = [
     glName: 'FIXED DEPO. CO-OPER. BANK MAIN',
     crToAc: '310070',
     brokerCode: '',
-    status: 'ACTIVE'
+    status: 'ACTIVE',
+    interestPosted: 42000,
+    interestReceived: 36000
   },
   {
     certNo: '15624',
@@ -268,7 +409,10 @@ export const FD_HOLDINGS: InvestmentHolding[] = [
     glName: 'FIXED DEPO. CO-OPER. BANK MAIN',
     crToAc: '310070',
     brokerCode: '',
-    status: 'ACTIVE'
+    status: 'ACTIVE',
+    provisionStatus: 'DOUBTFUL',
+    interestPosted: 115500,
+    interestReceived: 50000
   },
   {
     certNo: '15627',
@@ -289,6 +433,68 @@ export const FD_HOLDINGS: InvestmentHolding[] = [
     crToAc: '310070',
     brokerCode: '',
     status: 'ACTIVE'
+  },
+  {
+    certNo: '15628',
+    instrumentType: 'FD',
+    scriptCode: 'FD-CUM',
+    scriptName: 'Cumulative Fixed Deposit',
+    party: 'Zilla Sahakari Bank Ltd',
+    subType: 'NON SLR',
+    faceValue: 1800000,
+    purchaseRate: 100,
+    units: 1,
+    purchaseDate: '20-08-2025',
+    maturityDate: '20-08-2026',
+    interestRate: 6.8,
+    interestFreq: 'CUMULATIVE',
+    glCode: '320020',
+    glName: 'FIXED DEPO. CO-OPER. BANK MAIN',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: '15629',
+    instrumentType: 'FD',
+    scriptCode: 'FD-MIP',
+    scriptName: 'Monthly Interest Payout FD',
+    party: 'Vidarbha Cooperative Bank',
+    subType: 'NON SLR',
+    faceValue: 2200000,
+    purchaseRate: 100,
+    units: 1,
+    purchaseDate: '25-09-2025',
+    maturityDate: '25-09-2026',
+    interestRate: 7.15,
+    interestFreq: 'MONTHLY',
+    glCode: '320020',
+    glName: 'FIXED DEPO. CO-OPER. BANK MAIN',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE',
+    interestPosted: 143220,
+    interestReceived: 130800
+  },
+  {
+    certNo: '15630',
+    instrumentType: 'FD',
+    scriptCode: 'FD-CUM',
+    scriptName: 'Cumulative Fixed Deposit',
+    party: 'Konkan Cooperative Bank Ltd',
+    subType: 'NON SLR',
+    faceValue: 900000,
+    purchaseRate: 100,
+    units: 1,
+    purchaseDate: '28-10-2024',
+    maturityDate: '28-10-2026',
+    interestRate: 6.75,
+    interestFreq: 'YEARLY',
+    glCode: '320020',
+    glName: 'FIXED DEPO. CO-OPER. BANK MAIN',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE'
   }
 ];
 
@@ -311,7 +517,9 @@ export const GOVT_SECURITY_HOLDINGS: InvestmentHolding[] = [
     glName: 'INVESTMENT IN GOVT. SECURITIES',
     crToAc: '310070',
     brokerCode: 'BRK-002',
-    status: 'ACTIVE'
+    status: 'ACTIVE',
+    interestPosted: 181500,
+    interestReceived: 150000
   },
   {
     certNo: 'GSEC-2002',
@@ -351,7 +559,9 @@ export const GOVT_SECURITY_HOLDINGS: InvestmentHolding[] = [
     glName: 'INVESTMENT IN GOVT. SECURITIES',
     crToAc: '310070',
     brokerCode: 'BRK-002',
-    status: 'ACTIVE'
+    status: 'ACTIVE',
+    interestPosted: 67900,
+    interestReceived: 67900
   },
   {
     certNo: 'GSEC-2004',
@@ -412,6 +622,46 @@ export const GOVT_SECURITY_HOLDINGS: InvestmentHolding[] = [
     crToAc: '310070',
     brokerCode: 'BRK-002',
     status: 'ACTIVE'
+  },
+  {
+    certNo: 'GSEC-2007',
+    instrumentType: 'GOVT_SECURITY',
+    scriptCode: 'TBILL-91D',
+    scriptName: '91 Days Treasury Bill',
+    party: 'RBI - SGL',
+    subType: 'SLR',
+    faceValue: 2000000,
+    purchaseRate: 98.2,
+    units: 20000,
+    purchaseDate: '15-05-2026',
+    maturityDate: '13-08-2026',
+    interestRate: 6.2,
+    interestFreq: 'CUMULATIVE',
+    glCode: '310020',
+    glName: 'INVESTMENT IN GOVT. SECURITIES',
+    crToAc: '310070',
+    brokerCode: 'BRK-003',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: 'GSEC-2008',
+    instrumentType: 'GOVT_SECURITY',
+    scriptCode: 'GJ-SDL-2026',
+    scriptName: '7.85% Gujarat SDL 2026',
+    party: 'RBI - SGL',
+    subType: 'SLR',
+    faceValue: 1800000,
+    purchaseRate: 100.2,
+    units: 18000,
+    purchaseDate: '18-09-2025',
+    maturityDate: '18-09-2026',
+    interestRate: 7.85,
+    interestFreq: 'HALF_YEARLY',
+    glCode: '310020',
+    glName: 'INVESTMENT IN GOVT. SECURITIES',
+    crToAc: '310070',
+    brokerCode: 'BRK-001',
+    status: 'ACTIVE'
   }
 ];
 
@@ -514,6 +764,48 @@ export const NON_SLR_HOLDINGS: InvestmentHolding[] = [
     glName: 'INVESTMENT IN NON SLR SECURITIES',
     crToAc: '310070',
     brokerCode: 'BRK-003',
+    status: 'ACTIVE',
+    interestPosted: 89400,
+    interestReceived: 60000
+  },
+  {
+    certNo: 'NSLR-3006',
+    instrumentType: 'NON_SLR',
+    scriptCode: 'IRFC-7.55-2026',
+    scriptName: 'IRFC Bond 7.55% 2026',
+    party: 'Indian Railway Finance Corp',
+    subType: 'NON SLR',
+    faceValue: 1600000,
+    purchaseRate: 100,
+    units: 16000,
+    purchaseDate: '25-08-2025',
+    maturityDate: '25-08-2026',
+    interestRate: 7.55,
+    interestFreq: 'YEARLY',
+    glCode: '310030',
+    glName: 'INVESTMENT IN NON SLR SECURITIES',
+    crToAc: '310070',
+    brokerCode: 'BRK-004',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: 'NSLR-3007',
+    instrumentType: 'NON_SLR',
+    scriptCode: 'NHB-7.3-2026',
+    scriptName: 'NHB Bond 7.30% 2026',
+    party: 'National Housing Bank',
+    subType: 'NON SLR',
+    faceValue: 1000000,
+    purchaseRate: 100,
+    units: 10000,
+    purchaseDate: '10-10-2025',
+    maturityDate: '10-10-2026',
+    interestRate: 7.3,
+    interestFreq: 'YEARLY',
+    glCode: '310030',
+    glName: 'INVESTMENT IN NON SLR SECURITIES',
+    crToAc: '310070',
+    brokerCode: 'BRK-003',
     status: 'ACTIVE'
   }
 ];
@@ -597,7 +889,10 @@ export const BOND_HOLDINGS: InvestmentHolding[] = [
     glName: 'INVESTMENT IN CORPORATE BONDS',
     crToAc: '310070',
     brokerCode: 'BRK-006',
-    status: 'ACTIVE'
+    status: 'ACTIVE',
+    provisionStatus: 'SUB_STANDARD',
+    interestPosted: 66000,
+    interestReceived: 40000
   },
   {
     certNo: 'BOND-4005',
@@ -618,6 +913,46 @@ export const BOND_HOLDINGS: InvestmentHolding[] = [
     crToAc: '310070',
     brokerCode: 'BRK-005',
     status: 'ACTIVE'
+  },
+  {
+    certNo: 'BOND-4006',
+    instrumentType: 'BOND',
+    scriptCode: 'CHOLA-8.35-2026',
+    scriptName: 'Cholamandalam Finance NCD 8.35% 2026',
+    party: 'Cholamandalam Investment & Finance',
+    subType: 'CORPORATE BOND',
+    faceValue: 1400000,
+    purchaseRate: 100,
+    units: 14000,
+    purchaseDate: '15-09-2024',
+    maturityDate: '15-09-2026',
+    interestRate: 8.35,
+    interestFreq: 'YEARLY',
+    glCode: '310040',
+    glName: 'INVESTMENT IN CORPORATE BONDS',
+    crToAc: '310070',
+    brokerCode: 'BRK-006',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: 'BOND-4007',
+    instrumentType: 'BOND',
+    scriptCode: 'PEL-8.4-2026',
+    scriptName: 'Piramal Enterprises NCD 8.40% 2026',
+    party: 'Piramal Enterprises Ltd',
+    subType: 'CORPORATE BOND',
+    faceValue: 900000,
+    purchaseRate: 100,
+    units: 9000,
+    purchaseDate: '28-10-2025',
+    maturityDate: '28-10-2026',
+    interestRate: 8.4,
+    interestFreq: 'YEARLY',
+    glCode: '310040',
+    glName: 'INVESTMENT IN CORPORATE BONDS',
+    crToAc: '310070',
+    brokerCode: 'BRK-005',
+    status: 'ACTIVE'
   }
 ];
 
@@ -721,6 +1056,46 @@ export const MUTUAL_FUND_HOLDINGS: InvestmentHolding[] = [
     crToAc: '310070',
     brokerCode: '',
     status: 'ACTIVE'
+  },
+  {
+    certNo: 'MF-5006',
+    instrumentType: 'MUTUAL_FUND',
+    scriptCode: 'SBI-BPSU',
+    scriptName: 'SBI Banking & PSU Fund',
+    party: 'SBI Mutual Fund',
+    subType: 'DEBT - BANKING & PSU',
+    faceValue: 700000,
+    purchaseRate: 18.6,
+    units: 37634.4,
+    purchaseDate: '10-09-2025',
+    maturityDate: '10-09-2026',
+    interestRate: 7.1,
+    interestFreq: 'CUMULATIVE',
+    glCode: '310050',
+    glName: 'INVESTMENT IN MUTUAL FUNDS',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: 'MF-5007',
+    instrumentType: 'MUTUAL_FUND',
+    scriptCode: 'ICICI-CB',
+    scriptName: 'ICICI Pru Corporate Bond Fund',
+    party: 'ICICI Prudential Mutual Fund',
+    subType: 'DEBT - CORPORATE BOND',
+    faceValue: 1100000,
+    purchaseRate: 24.8,
+    units: 44354.84,
+    purchaseDate: '14-07-2026',
+    maturityDate: '14-07-2027',
+    interestRate: 7.05,
+    interestFreq: 'CUMULATIVE',
+    glCode: '310050',
+    glName: 'INVESTMENT IN MUTUAL FUNDS',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE'
   }
 ];
 
@@ -824,6 +1199,46 @@ export const SHARE_HOLDINGS: InvestmentHolding[] = [
     crToAc: '310070',
     brokerCode: '',
     status: 'ACTIVE'
+  },
+  {
+    certNo: 'SH-6006',
+    instrumentType: 'SHARE',
+    scriptCode: 'ICICIBANK',
+    scriptName: 'ICICI Bank Ltd',
+    party: 'NSE/BSE',
+    subType: 'EQUITY',
+    faceValue: 420000,
+    purchaseRate: 1050,
+    units: 400,
+    purchaseDate: '05-03-2026',
+    maturityDate: '05-03-2036',
+    interestRate: 2.0,
+    interestFreq: 'YEARLY',
+    glCode: '310060',
+    glName: 'INVESTMENT IN SHARES',
+    crToAc: '310070',
+    brokerCode: 'BRK-007',
+    status: 'ACTIVE'
+  },
+  {
+    certNo: 'SH-6007',
+    instrumentType: 'SHARE',
+    scriptCode: 'PDCC',
+    scriptName: 'Pune District Central Coop Bank Shares',
+    party: 'Pune District Central Cooperative Bank',
+    subType: 'CO-OP SHARE',
+    faceValue: 60000,
+    purchaseRate: 50,
+    units: 1200,
+    purchaseDate: '18-07-2025',
+    maturityDate: '18-07-2035',
+    interestRate: 5.0,
+    interestFreq: 'YEARLY',
+    glCode: '310060',
+    glName: 'INVESTMENT IN SHARES',
+    crToAc: '310070',
+    brokerCode: '',
+    status: 'ACTIVE'
   }
 ];
 
@@ -952,6 +1367,43 @@ export const ALL_TXNS: InvestmentTxn[] = [
 
 // -------------------- Masters --------------------
 
+export interface InvestmentGlOption {
+  glCode: string;
+  glName: string;
+}
+
+/** Interest Income (Cr) GL per instrument type — the GL an Interest Calculation & Post run
+ *  credits. Selectable on the FD/Govt./Bond Interest Calculation screens instead of being
+ *  hard-wired, so a period's posting can be routed to a different income head when needed. */
+export const INTEREST_INCOME_GL_MASTER: InvestmentGlOption[] = [
+  { glCode: '410010', glName: 'INTEREST ON GOVT. SECURITIES' },
+  { glCode: '410020', glName: 'INTEREST ON NON SLR SECURITIES' },
+  { glCode: '410030', glName: 'INTEREST ON CORPORATE BONDS' },
+  { glCode: '410040', glName: 'INTEREST ON FIXED DEPOSITS' },
+  { glCode: '410050', glName: 'INCOME FROM MUTUAL FUNDS' },
+  { glCode: '410060', glName: 'DIVIDEND ON SHARES' }
+];
+
+/** Default Interest Income GL suggested per instrument type — pre-fills the selector above,
+ *  which the user can still override before posting. */
+export const INTEREST_INCOME_GL_BY_TYPE: Record<InstrumentType, string> = {
+  GOVT_SECURITY: '410010',
+  NON_SLR: '410020',
+  BOND: '410030',
+  FD: '410040',
+  MUTUAL_FUND: '410050',
+  SHARE: '410060'
+};
+
+/** Cash/Bank (Dr) GL credited when an Interest Receive entry is booked — the account the cash
+ *  actually lands in. Selectable on the Interest Receive screen. */
+export const CASH_BANK_GL_MASTER: InvestmentGlOption[] = [
+  { glCode: '100010', glName: 'CASH IN HAND' },
+  { glCode: '110010', glName: 'RBI CURRENT ACCOUNT' },
+  { glCode: '110020', glName: 'SBI CURRENT ACCOUNT' },
+  { glCode: '110030', glName: 'HDFC BANK CURRENT ACCOUNT' }
+];
+
 export interface ScriptMaster {
   scriptCode: string;
   scriptName: string;

src/app/investment/investment-export.ts

@@ -0,0 +1,89 @@
+/**
+ * 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/.
+ */
+
+// Shared "Export to Excel" builder for every listing/report screen in the Investment module
+// (Dashboard, Reports, Interest, Holdings, Masters) — centralised so the ExcelJS boilerplate
+// (title/meta/header rows, number formatting, safe sheet names, Blob download) is written once
+// and every screen's export always behaves and looks the same.
+
+import * as ExcelJS from 'exceljs';
+
+export interface ExportSheetSpec {
+  /** Worksheet tab name — sanitised for Excel's forbidden characters (\ / ? * [ ]) and length. */
+  sheetName: string;
+  /** Bold title row, merged across all columns. */
+  title: string;
+  /** Optional italic subtitle row (e.g. scope/date), merged across all columns. */
+  subtitle?: string;
+  headers: string[];
+  rows: (string | number | null)[][];
+  widths?: number[];
+}
+
+/** Excel worksheet names can't contain \ / ? * [ ] or exceed 31 chars. */
+function safeSheetName(name: string): string {
+  return name.replace(/[\\/?*[\]]/g, '-').slice(0, 31);
+}
+
+function buildSheet(wb: ExcelJS.Workbook, spec: ExportSheetSpec): void {
+  const sheet = wb.addWorksheet(safeSheetName(spec.sheetName));
+  sheet.columns = (spec.widths || spec.headers.map(() => 18)).map((w) => ({ width: w }));
+
+  const title = sheet.addRow([spec.title]);
+  sheet.mergeCells(title.number, 1, title.number, spec.headers.length);
+  title.font = { bold: true, size: 14, color: { argb: 'FFFFFFFF' } };
+  title.alignment = { horizontal: 'center', vertical: 'middle' };
+  title.height = 24;
+  title.getCell(1).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FF0F4F3C' } };
+
+  if (spec.subtitle) {
+    const meta = sheet.addRow([spec.subtitle]);
+    sheet.mergeCells(meta.number, 1, meta.number, spec.headers.length);
+    meta.font = { italic: true, size: 10 };
+  }
+  sheet.addRow([]);
+
+  const head = sheet.addRow(spec.headers);
+  head.font = { bold: true };
+  head.alignment = { wrapText: true, horizontal: 'center' };
+  head.eachCell((c) => {
+    c.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFE2E8F0' } };
+    c.border = { bottom: { style: 'thin' } };
+  });
+
+  for (const r of spec.rows) {
+    const row = sheet.addRow(r);
+    r.forEach((v, idx) => {
+      if (typeof v === 'number') {
+        row.getCell(idx + 1).numFmt = '#,##0.00';
+      }
+    });
+  }
+  sheet.views = [{ state: 'frozen', ySplit: spec.subtitle ? 4 : 3 }];
+}
+
+/** Builds a (possibly multi-sheet) workbook and triggers a browser download. */
+export async function exportWorkbook(sheets: ExportSheetSpec[], fileName: string): Promise<void> {
+  const wb = new ExcelJS.Workbook();
+  wb.creator = 'CBSNexora';
+  wb.created = new Date();
+  sheets.forEach((s) => buildSheet(wb, s));
+
+  const buffer = await wb.xlsx.writeBuffer();
+  const blob = new Blob([buffer], {
+    type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+  });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement('a');
+  a.href = url;
+  a.download = `${fileName.replace(/[^\w]+/g, '-')}.xlsx`;
+  document.body.appendChild(a);
+  a.click();
+  document.body.removeChild(a);
+  URL.revokeObjectURL(url);
+}

src/app/investment/investment-interest/investment-interest.component.html

@@ -12,20 +12,33 @@
       <div class="pg-eyebrow">TREASURY · INVESTMENT · INTEREST</div>
       <h1 class="pg-title">Investment Interest</h1>
       <p class="pg-sub">
-        FD and Govt./Bond interest calculation batch runs, plus the Government Bond Interest, FD Interest and FD
-        registers.
+        Interest Receivable, FD and Govt./Bond interest calculation-and-post batch runs, Interest Receive, plus the
+        Government Bond Interest, FD Interest and FD registers.
       </p>
     </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+        {{ generating ? 'Exporting…' : 'Export to Excel' }}
+      </button>
+    </div>
   </header>
 
   <div class="cctr-tabs">
+    <button
+      type="button"
+      class="pg-btn pg-btn--ghost"
+      [class.pg-btn--active]="activeTab === 'receivable'"
+      (click)="setTab('receivable')"
+    >
+      Interest Receivable
+    </button>
     <button
       type="button"
       class="pg-btn pg-btn--ghost"
       [class.pg-btn--active]="activeTab === 'fdCalc'"
       (click)="setTab('fdCalc')"
     >
-      01 FD Interest Calculation
+      01 FD Interest Calculation &amp; Post
     </button>
     <button
       type="button"
@@ -33,7 +46,15 @@
       [class.pg-btn--active]="activeTab === 'bondCalc'"
       (click)="setTab('bondCalc')"
     >
-      02 Govt./Bond Int. Calculation
+      02 Govt./Bond Int. Calculation &amp; Post
+    </button>
+    <button
+      type="button"
+      class="pg-btn pg-btn--ghost"
+      [class.pg-btn--active]="activeTab === 'receive'"
+      (click)="setTab('receive')"
+    >
+      Interest Receive
     </button>
     <button
       type="button"
@@ -61,14 +82,113 @@
     </button>
   </div>
 
+  <!-- INTEREST RECEIVABLE -->
+  @if (activeTab === 'receivable') {
+    <div class="pg-card">
+      <div class="pos-section-label">
+        Interest Receivable — Posted but Not Yet Collected (₹{{ totalReceivable | number: '1.2-2' }})
+      </div>
+      <table class="pg-table">
+        <thead>
+          <tr>
+            <th>Cert No</th>
+            <th>Script / Party</th>
+            <th>Type</th>
+            <th>Status</th>
+            <th class="num">Interest Posted</th>
+            <th class="num">Interest Received</th>
+            <th class="num col-in">Receivable Balance</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (h of receivableRows; track h.certNo) {
+            <tr>
+              <td>
+                <span class="pg-chip">{{ h.certNo }}</span>
+              </td>
+              <td>{{ h.scriptName || h.party }}</td>
+              <td>{{ instrumentLabel(h.instrumentType) }}</td>
+              <td>
+                <span [class]="provisionBadgeClass(h)">{{ provisionLabel(h) }}</span>
+              </td>
+              <td class="num">₹{{ posted(h) | number: '1.2-2' }}</td>
+              <td class="num">₹{{ received(h) | number: '1.2-2' }}</td>
+              <td class="num col-in">₹{{ receivableBalance(h) | number: '1.2-2' }}</td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="7" class="pg-empty">No outstanding interest receivable.</td>
+            </tr>
+          }
+        </tbody>
+        <tfoot>
+          <tr class="cctr-total-row">
+            <td colspan="6">Total Receivable</td>
+            <td class="num">₹{{ totalReceivable | number: '1.2-2' }}</td>
+          </tr>
+        </tfoot>
+      </table>
+    </div>
+
+    @if (suspenseRows.length > 0) {
+      <div class="pg-card">
+        <div class="pos-section-label">
+          Non-Performing Investments — Interest Held in Suspense (₹{{ totalSuspense | number: '1.2-2' }})
+        </div>
+        <p class="pg-sub" style="padding: 0 16px">
+          These holdings are classified Non-Performing (Sub-Standard/Doubtful/Loss). Per RBI income-recognition norms,
+          interest is not posted as an accrual receivable — it accrues in memo only, and is recognised as income solely
+          on actual cash receipt via the Interest Receive tab.
+        </p>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Cert No</th>
+              <th>Script / Party</th>
+              <th>Type</th>
+              <th>Status</th>
+              <th class="num">Provision Required</th>
+              <th class="num col-out">Interest in Suspense</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (h of suspenseRows; track h.certNo) {
+              <tr>
+                <td>
+                  <span class="pg-chip">{{ h.certNo }}</span>
+                </td>
+                <td>{{ h.scriptName || h.party }}</td>
+                <td>{{ instrumentLabel(h.instrumentType) }}</td>
+                <td>
+                  <span [class]="provisionBadgeClass(h)">{{ provisionLabel(h) }}</span>
+                </td>
+                <td class="num">₹{{ provisionRequired(h) | number: '1.2-2' }}</td>
+                <td class="num col-out">₹{{ suspense(h) | number: '1.2-2' }}</td>
+              </tr>
+            }
+          </tbody>
+          <tfoot>
+            <tr class="cctr-total-row">
+              <td colspan="5">Total Suspense</td>
+              <td class="num">₹{{ totalSuspense | number: '1.2-2' }}</td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+    }
+  }
+
   <!-- 01 FD INTEREST CALCULATION -->
   @if (activeTab === 'fdCalc') {
     <div class="pg-card">
-      <div class="pos-section-label">Investment - FD Interest Calculation</div>
+      <div class="pos-section-label">Investment - FD Interest Calculation &amp; Post</div>
       <div class="inv-form-grid">
         <label class="inv-form-field"
-          ><span>Date</span><input type="text" [(ngModel)]="fdCalcDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="fdCalcFromDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="fdCalcToDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Certificate No</span>
           <select [(ngModel)]="fdCalcCertNo">
@@ -81,13 +201,21 @@
         <label class="inv-form-field"
           ><span>ALL</span><input type="checkbox" [(ngModel)]="fdCalcAll" style="height: 18px; width: 18px"
         /></label>
+        <label class="inv-form-field">
+          <span>Post To (Interest Income GL)</span>
+          <select [(ngModel)]="fdCalcGlCode">
+            @for (g of interestIncomeGlOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
         <label class="inv-form-field"
           ><span>Total Interest to Post</span
           ><input type="text" [value]="'₹' + (fdCalcTotal | number: '1.2-2')" readonly
         /></label>
       </div>
       <div class="inv-form-actions">
-        <button type="button" class="pg-btn pg-btn--primary" (click)="processFdInterest()">Process</button>
+        <button type="button" class="pg-btn pg-btn--primary" (click)="processFdInterest()">Calculate &amp; Post</button>
       </div>
       <table class="pg-table">
         <thead>
@@ -125,20 +253,29 @@
           </tr>
         </tfoot>
       </table>
+      @if (fdCalcExcludedNpi.length > 0) {
+        <p class="pg-sub" style="padding: 12px 16px 16px">
+          {{ fdCalcExcludedNpi.length }} certificate(s) excluded — classified Non-Performing, interest is not posted on
+          accrual basis (see Interest Receivable tab for suspense amount).
+        </p>
+      }
     </div>
   }
 
   <!-- 02 GOVT./BOND INT. CALCULATION -->
   @if (activeTab === 'bondCalc') {
     <div class="pg-card">
-      <div class="pos-section-label">Investment - Govt./Bond Interest Calculation</div>
+      <div class="pos-section-label">Investment - Govt./Bond Interest Calculation &amp; Post</div>
       <div class="inv-form-grid">
         <label class="inv-form-field"
-          ><span>Date</span><input type="text" [(ngModel)]="bondCalcDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="bondCalcFromDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="bondCalcToDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Type</span>
-          <select [(ngModel)]="bondCalcType">
+          <select [(ngModel)]="bondCalcType" (ngModelChange)="onBondCalcTypeChange()">
             <option value="">-- All Types --</option>
             <option value="GOVT_SECURITY">GOVT SECURITY</option>
             <option value="NON_SLR">NON SLR</option>
@@ -158,13 +295,23 @@
         <label class="inv-form-field"
           ><span>ALL</span><input type="checkbox" [(ngModel)]="bondCalcAll" style="height: 18px; width: 18px"
         /></label>
+        <label class="inv-form-field">
+          <span>Post To (Interest Income GL)</span>
+          <select [(ngModel)]="bondCalcGlCode">
+            @for (g of interestIncomeGlOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
         <label class="inv-form-field"
           ><span>Total Interest to Post</span
           ><input type="text" [value]="'₹' + (bondCalcTotal | number: '1.2-2')" readonly
         /></label>
       </div>
       <div class="inv-form-actions">
-        <button type="button" class="pg-btn pg-btn--primary" (click)="processBondInterest()">Process</button>
+        <button type="button" class="pg-btn pg-btn--primary" (click)="processBondInterest()">
+          Calculate &amp; Post
+        </button>
       </div>
       <table class="pg-table">
         <thead>
@@ -204,6 +351,112 @@
           </tr>
         </tfoot>
       </table>
+      @if (bondCalcExcludedNpi.length > 0) {
+        <p class="pg-sub" style="padding: 12px 16px 16px">
+          {{ bondCalcExcludedNpi.length }} holding(s) excluded — classified Non-Performing, interest is not posted on
+          accrual basis (see Interest Receivable tab for suspense amount).
+        </p>
+      }
+    </div>
+  }
+
+  <!-- INTEREST RECEIVE -->
+  @if (activeTab === 'receive') {
+    <div class="pg-card">
+      <div class="pos-section-label">Interest Receive — Record Actual Cash Receipt</div>
+      <div class="inv-form-grid">
+        <label class="inv-form-field">
+          <span>Receive Into (Cash/Bank GL)</span>
+          <select [(ngModel)]="receiveGlCode">
+            @for (g of cashBankGlOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
+      </div>
+      <table class="pg-table">
+        <thead>
+          <tr>
+            <th>Cert No</th>
+            <th>Script / Party</th>
+            <th>Type</th>
+            <th>Status</th>
+            <th class="num">Outstanding</th>
+            <th class="num">Amount to Receive</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (h of receiveTargets; track h.certNo) {
+            <tr>
+              <td>
+                <span class="pg-chip">{{ h.certNo }}</span>
+              </td>
+              <td>{{ h.scriptName || h.party }}</td>
+              <td>{{ instrumentLabel(h.instrumentType) }}</td>
+              <td>
+                <span [class]="provisionBadgeClass(h)">{{ provisionLabel(h) }}</span>
+              </td>
+              <td class="num">₹{{ outstandingFor(h) | number: '1.2-2' }}</td>
+              <td class="num">
+                <input
+                  type="number"
+                  [(ngModel)]="receiveDrafts[h.certNo]"
+                  [max]="outstandingFor(h)"
+                  style="width: 120px; text-align: right"
+                />
+              </td>
+              <td>
+                <button type="button" class="pg-btn pg-btn--ghost" (click)="receiveInterest(h)">Receive</button>
+              </td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="7" class="pg-empty">No interest outstanding for collection.</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+
+    <div class="pg-card">
+      <div class="pos-section-label">Interest Received Log</div>
+      <table class="pg-table">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>Voucher No</th>
+            <th>Cert No</th>
+            <th>Particulars</th>
+            <th>GL Credited</th>
+            <th class="num col-in">Amount Received</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (t of receivedLog; track t.voucherNo) {
+            <tr>
+              <td>{{ t.txnDate }}</td>
+              <td>
+                <span class="pg-chip">{{ t.voucherNo }}</span>
+              </td>
+              <td>{{ t.certNo }}</td>
+              <td>{{ t.particulars }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
+              <td class="num col-in">₹{{ t.amount | number: '1.2-2' }}</td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="6" class="pg-empty">No interest received yet.</td>
+            </tr>
+          }
+        </tbody>
+        <tfoot>
+          <tr class="cctr-total-row">
+            <td colspan="5">Total Received</td>
+            <td class="num">₹{{ receivedLogTotal | number: '1.2-2' }}</td>
+          </tr>
+        </tfoot>
+      </table>
     </div>
   }
 
@@ -219,6 +472,7 @@
             <th>Cert No</th>
             <th>Instrument</th>
             <th>Particulars</th>
+            <th>GL Posted</th>
             <th class="num col-in">Interest Amount</th>
           </tr>
         </thead>
@@ -232,17 +486,18 @@
               <td>{{ t.certNo }}</td>
               <td>{{ instrumentLabel(t.instrumentType) }}</td>
               <td>{{ t.particulars }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
               <td class="num col-in">₹{{ t.amount | number: '1.2-2' }}</td>
             </tr>
           } @empty {
             <tr>
-              <td colspan="6" class="pg-empty">No bond interest entries recorded yet.</td>
+              <td colspan="7" class="pg-empty">No bond interest entries recorded yet.</td>
             </tr>
           }
         </tbody>
         <tfoot>
           <tr class="cctr-total-row">
-            <td colspan="5">Total</td>
+            <td colspan="6">Total</td>
             <td class="num">₹{{ bondIntRegisterTotal | number: '1.2-2' }}</td>
           </tr>
         </tfoot>
@@ -261,6 +516,7 @@
             <th>Voucher No</th>
             <th>Cert No</th>
             <th>Particulars</th>
+            <th>GL Posted</th>
             <th class="num col-in">Interest Amount</th>
           </tr>
         </thead>
@@ -273,17 +529,18 @@
               </td>
               <td>{{ t.certNo }}</td>
               <td>{{ t.particulars }}</td>
+              <td>{{ t.glCode ? t.glCode + ' — ' + t.glName : '—' }}</td>
               <td class="num col-in">₹{{ t.amount | number: '1.2-2' }}</td>
             </tr>
           } @empty {
             <tr>
-              <td colspan="5" class="pg-empty">No FD interest entries recorded yet.</td>
+              <td colspan="6" class="pg-empty">No FD interest entries recorded yet.</td>
             </tr>
           }
         </tbody>
         <tfoot>
           <tr class="cctr-total-row">
-            <td colspan="4">Total</td>
+            <td colspan="5">Total</td>
             <td class="num">₹{{ fdIntRegisterTotal | number: '1.2-2' }}</td>
           </tr>
         </tfoot>

src/app/investment/investment-interest/investment-interest.component.ts

@@ -9,6 +9,7 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import {
   FD_HOLDINGS,
   GOVT_SECURITY_HOLDINGS,
@@ -16,25 +17,50 @@ import {
   BOND_HOLDINGS,
   ALL_TXNS,
   SCRIPT_MASTER,
+  INTEREST_INCOME_GL_MASTER,
+  INTEREST_INCOME_GL_BY_TYPE,
+  CASH_BANK_GL_MASTER,
   InvestmentHolding,
   InvestmentTxn,
   InstrumentType,
+  InvestmentProvisionStatus,
   INSTRUMENT_LABELS,
+  PROVISION_STATUS_LABELS,
   accruedInterest,
+  accruedInterestBetween,
+  addPeriod,
   daysToMaturity,
   maturityAmount,
-  todayDDMMYYYY
+  todayDDMMYYYY,
+  isNpi,
+  canAccrueInterest,
+  interestReceivableBalance,
+  suspenseInterest,
+  provisionRequiredInv
 } from '../investment-data';
+import { exportWorkbook, ExportSheetSpec } from '../investment-export';
 
-type InterestTab = 'fdCalc' | 'bondCalc' | 'bondIntRegister' | 'fdIntRegister' | 'fdRegister';
+type InterestTab =
+  | 'receivable'
+  | 'fdCalc'
+  | 'bondCalc'
+  | 'receive'
+  | 'bondIntRegister'
+  | 'fdIntRegister'
+  | 'fdRegister';
 
 /**
- * The legacy "Interest" top-menu for Investment — 5 screens:
- *   01 FD Interest Calculation, 02 Govt./Bond Int. Calculation (both batch "Process" runs),
- *   03 Government Bond Int Register, 04 FD Interest Register, 05 FD Register (listings).
+ * The legacy "Interest" top-menu for Investment — plus the full accrual lifecycle: Interest
+ * Receivable, 01 FD Interest Calculation, 02 Govt./Bond Int. Calculation, Interest Receive,
+ * 03 Government Bond Int Register, 04 FD Interest Register, 05 FD Register.
  *
  * Interest figures are derived from the same holdings used by the Entry screens and Reports,
  * so a register here always agrees with what a Purchase/Interest entry recorded.
+ *
+ * Provisioning: a holding classified Non-Performing (Sub-Standard/Doubtful/Loss) can never have
+ * interest calculated/posted on accrual basis (canAccrueInterest() blocks it) — only actual cash
+ * receipts are recognised for it, straight through Interest Receive, matching RBI's income
+ * recognition norms for Non-Performing Investments.
  */
 @Component({
   selector: 'mifosx-investment-interest',
@@ -46,11 +72,12 @@ type InterestTab = 'fdCalc' | 'bondCalc' | 'bondIntRegister' | 'fdIntRegister' |
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule
+    FormsModule,
+    DateDdmmyyyyPickerComponent
   ]
 })
 export class InvestmentInterestComponent {
-  activeTab: InterestTab = 'fdCalc';
+  activeTab: InterestTab = 'receivable';
   asOnDate = todayDDMMYYYY();
 
   fdHoldings: InvestmentHolding[] = [...FD_HOLDINGS];
@@ -62,22 +89,35 @@ export class InvestmentInterestComponent {
   txns: InvestmentTxn[] = [...ALL_TXNS];
 
   readonly scriptOptions = SCRIPT_MASTER;
+  readonly interestIncomeGlOptions = INTEREST_INCOME_GL_MASTER;
+  readonly cashBankGlOptions = CASH_BANK_GL_MASTER;
 
+  /** Draft "amount to receive" per certificate, keyed by certNo, for the Interest Receive tab. */
+  receiveDrafts: Record<string, number | null> = {};
+
+  generating = false;
   toastMsg = '';
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
 
-  // 01 FD Interest Calculation
-  fdCalcDate = this.asOnDate;
+  // 01 FD Interest Calculation — posts interest accrued strictly within [fromDate, toDate]
+  fdCalcFromDate = addPeriod(this.asOnDate, 0, -3);
+  fdCalcToDate = this.asOnDate;
   fdCalcCertNo = '';
   fdCalcAll = false;
+  fdCalcGlCode = INTEREST_INCOME_GL_BY_TYPE.FD;
 
-  // 02 Govt./Bond Int. Calculation
-  bondCalcDate = this.asOnDate;
+  // 02 Govt./Bond Int. Calculation — posts interest accrued strictly within [fromDate, toDate]
+  bondCalcFromDate = addPeriod(this.asOnDate, 0, -3);
+  bondCalcToDate = this.asOnDate;
   bondCalcType: InstrumentType | '' = '';
   bondCalcScript = '';
   bondCalcDealNo = '';
   bondCalcAll = false;
+  bondCalcGlCode = INTEREST_INCOME_GL_BY_TYPE.GOVT_SECURITY;
+
+  // Interest Receive — Cash/Bank GL credited for the day's collection voucher
+  receiveGlCode = CASH_BANK_GL_MASTER[0].glCode;
 
   // Register filters
   registerFromDate = '';
@@ -103,55 +143,121 @@ export class InvestmentInterestComponent {
     return daysToMaturity(h, this.asOnDate);
   }
 
+  get allInterestHoldings(): InvestmentHolding[] {
+    return [
+      ...this.fdHoldings,
+      ...this.bondHoldings
+    ].filter((h) => h.status === 'ACTIVE');
+  }
+
+  isNpiHolding(h: InvestmentHolding): boolean {
+    return isNpi(h);
+  }
+
+  provisionLabel(h: InvestmentHolding): string {
+    return PROVISION_STATUS_LABELS[h.provisionStatus ?? 'STANDARD'];
+  }
+
+  provisionBadgeClass(h: InvestmentHolding): string {
+    const status: InvestmentProvisionStatus = h.provisionStatus ?? 'STANDARD';
+    return `inv-badge inv-badge--${status.toLowerCase()}`;
+  }
+
+  posted(h: InvestmentHolding): number {
+    return h.interestPosted ?? 0;
+  }
+
+  received(h: InvestmentHolding): number {
+    return h.interestReceived ?? 0;
+  }
+
+  receivableBalance(h: InvestmentHolding): number {
+    return interestReceivableBalance(h);
+  }
+
+  suspense(h: InvestmentHolding): number {
+    return suspenseInterest(h, this.asOnDate);
+  }
+
+  provisionRequired(h: InvestmentHolding): number {
+    return provisionRequiredInv(h);
+  }
+
   // -------------------- 01 FD Interest Calculation --------------------
   get fdCalcTargets(): InvestmentHolding[] {
+    const base = this.fdHoldings.filter((h) => h.status === 'ACTIVE' && canAccrueInterest(h));
     if (this.fdCalcAll) {
-      return this.fdHoldings.filter((h) => h.status === 'ACTIVE');
+      return base;
     }
-    return this.fdHoldings.filter(
-      (h) => h.status === 'ACTIVE' && (!this.fdCalcCertNo || h.certNo === this.fdCalcCertNo)
-    );
+    return base.filter((h) => !this.fdCalcCertNo || h.certNo === this.fdCalcCertNo);
+  }
+
+  /** NPI FD certificates excluded from calculation/posting — interest recognised on cash basis
+   *  only, via the Interest Receive tab. */
+  get fdCalcExcludedNpi(): InvestmentHolding[] {
+    return this.fdHoldings.filter((h) => h.status === 'ACTIVE' && isNpi(h));
   }
 
   fdInterest(h: InvestmentHolding): number {
-    return accruedInterest(h, this.fdCalcDate || this.asOnDate);
+    return accruedInterestBetween(h, this.fdCalcFromDate || h.purchaseDate, this.fdCalcToDate || this.asOnDate);
   }
 
   get fdCalcTotal(): number {
     return this.fdCalcTargets.reduce((s, h) => s + this.fdInterest(h), 0);
   }
 
+  glName(glCode: string): string {
+    return (
+      this.interestIncomeGlOptions.find((g) => g.glCode === glCode)?.glName ??
+      this.cashBankGlOptions.find((g) => g.glCode === glCode)?.glName ??
+      glCode
+    );
+  }
+
   processFdInterest(): void {
-    const targets = this.fdCalcTargets;
+    const targets = this.fdCalcTargets.filter((h) => this.fdInterest(h) > 0);
     if (targets.length === 0) {
-      this.toast('No FD holdings match the selected filters.');
+      this.toast('No FD holdings have interest due to be posted for this period.');
       return;
     }
-    const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
-      certNo: h.certNo,
-      instrumentType: 'FD',
-      txnType: 'INTEREST',
-      voucherNo: `INV/FD-INT/${(this.fdCalcDate || this.asOnDate).replace(/-/g, '')}-${i + 1}`,
-      txnDate: this.fdCalcDate || this.asOnDate,
-      amount: this.fdInterest(h),
-      particulars: `FD interest calculated - ${h.party}`
-    }));
+    const toDate = this.fdCalcToDate || this.asOnDate;
+    const fromDate = this.fdCalcFromDate || toDate;
+    const glCode = this.fdCalcGlCode;
+    const glName = this.glName(glCode);
+    const newTxns: InvestmentTxn[] = targets.map((h, i) => {
+      const amt = this.fdInterest(h);
+      h.interestPosted = this.posted(h) + amt;
+      h.interestPostedTillDate = toDate;
+      return {
+        certNo: h.certNo,
+        instrumentType: 'FD',
+        txnType: 'INTEREST',
+        voucherNo: `INV/FD-INT/${toDate.replace(/-/g, '')}-${i + 1}`,
+        txnDate: toDate,
+        amount: amt,
+        particulars: `FD interest posted (accrual) for period ${fromDate} to ${toDate} - ${h.party}`,
+        glCode,
+        glName
+      };
+    });
+    this.fdCalcFromDate = toDate;
+    const total = newTxns.reduce((s, t) => s + t.amount, 0);
     this.txns = [
       ...newTxns,
       ...this.txns
     ];
     this.toast(
-      `FD interest processed for ${targets.length} certificate(s). Total ₹${this.fdCalcTotal.toLocaleString('en-IN')}.`
+      `FD interest posted for ${targets.length} certificate(s) to ${glCode} - ${glName}. Total ₹${total.toLocaleString('en-IN')}.`
     );
   }
 
   // -------------------- 02 Govt./Bond Int. Calculation --------------------
   get bondCalcTargets(): InvestmentHolding[] {
+    const base = this.bondHoldings.filter((h) => h.status === 'ACTIVE' && canAccrueInterest(h));
     if (this.bondCalcAll) {
-      return this.bondHoldings.filter((h) => h.status === 'ACTIVE');
+      return base;
     }
-    return this.bondHoldings.filter((h) => {
-      if (h.status !== 'ACTIVE') return false;
+    return base.filter((h) => {
       if (this.bondCalcType && h.instrumentType !== this.bondCalcType) return false;
       if (this.bondCalcScript && h.scriptCode !== this.bondCalcScript) return false;
       if (this.bondCalcDealNo && h.certNo !== this.bondCalcDealNo.trim()) return false;
@@ -159,38 +265,142 @@ export class InvestmentInterestComponent {
     });
   }
 
+  /** NPI Govt/Bond holdings excluded from calculation/posting — interest recognised on cash
+   *  basis only, via the Interest Receive tab. */
+  get bondCalcExcludedNpi(): InvestmentHolding[] {
+    return this.bondHoldings.filter((h) => h.status === 'ACTIVE' && isNpi(h));
+  }
+
   bondInterest(h: InvestmentHolding): number {
-    return accruedInterest(h, this.bondCalcDate || this.asOnDate);
+    return accruedInterestBetween(h, this.bondCalcFromDate || h.purchaseDate, this.bondCalcToDate || this.asOnDate);
   }
 
   get bondCalcTotal(): number {
     return this.bondCalcTargets.reduce((s, h) => s + this.bondInterest(h), 0);
   }
 
+  /** Re-suggests the Interest Income GL when the Type filter changes — still overridable. */
+  onBondCalcTypeChange(): void {
+    if (this.bondCalcType) {
+      this.bondCalcGlCode = INTEREST_INCOME_GL_BY_TYPE[this.bondCalcType];
+    }
+  }
+
   processBondInterest(): void {
-    const targets = this.bondCalcTargets;
+    const targets = this.bondCalcTargets.filter((h) => this.bondInterest(h) > 0);
     if (targets.length === 0) {
-      this.toast('No Govt/Bond holdings match the selected filters.');
+      this.toast('No Govt/Bond holdings have interest due to be posted for this period.');
       return;
     }
-    const newTxns: InvestmentTxn[] = targets.map((h, i) => ({
-      certNo: h.certNo,
-      instrumentType: h.instrumentType,
-      txnType: 'INTEREST',
-      voucherNo: `INV/BOND-INT/${(this.bondCalcDate || this.asOnDate).replace(/-/g, '')}-${i + 1}`,
-      txnDate: this.bondCalcDate || this.asOnDate,
-      amount: this.bondInterest(h),
-      particulars: `Coupon/interest calculated - ${h.scriptName}`
-    }));
+    const toDate = this.bondCalcToDate || this.asOnDate;
+    const fromDate = this.bondCalcFromDate || toDate;
+    const glCode = this.bondCalcGlCode;
+    const glName = this.glName(glCode);
+    const newTxns: InvestmentTxn[] = targets.map((h, i) => {
+      const amt = this.bondInterest(h);
+      h.interestPosted = this.posted(h) + amt;
+      h.interestPostedTillDate = toDate;
+      return {
+        certNo: h.certNo,
+        instrumentType: h.instrumentType,
+        txnType: 'INTEREST',
+        voucherNo: `INV/BOND-INT/${toDate.replace(/-/g, '')}-${i + 1}`,
+        txnDate: toDate,
+        amount: amt,
+        particulars: `Coupon/interest posted (accrual) for period ${fromDate} to ${toDate} - ${h.scriptName}`,
+        glCode,
+        glName
+      };
+    });
+    const total = newTxns.reduce((s, t) => s + t.amount, 0);
     this.txns = [
       ...newTxns,
       ...this.txns
     ];
+    this.bondCalcFromDate = toDate;
     this.toast(
-      `Interest processed for ${targets.length} holding(s). Total ₹${this.bondCalcTotal.toLocaleString('en-IN')}.`
+      `Interest posted for ${targets.length} holding(s) to ${glCode} - ${glName}. Total ₹${total.toLocaleString('en-IN')}.`
     );
   }
 
+  // -------------------- Interest Receivable (all interest-bearing types) --------------------
+  /** Standard holdings with a posted-but-uncollected balance — a genuine "Interest Receivable"
+   *  GL asset. */
+  get receivableRows(): InvestmentHolding[] {
+    return this.allInterestHoldings.filter((h) => canAccrueInterest(h) && this.receivableBalance(h) > 0);
+  }
+
+  /** NPI holdings with interest still accruing in memo/suspense — not a GL asset, shown
+   *  separately so the treasury desk can see what cash-basis income is outstanding. */
+  get suspenseRows(): InvestmentHolding[] {
+    return this.allInterestHoldings.filter((h) => isNpi(h) && this.suspense(h) > 0);
+  }
+
+  get totalReceivable(): number {
+    return this.receivableRows.reduce((s, h) => s + this.receivableBalance(h), 0);
+  }
+
+  get totalSuspense(): number {
+    return this.suspenseRows.reduce((s, h) => s + this.suspense(h), 0);
+  }
+
+  // -------------------- Interest Receive (cash receipt, all interest-bearing types) --------------------
+  /** Everything with money outstanding to collect — Standard holdings against their posted
+   *  receivable, and NPI holdings against their notional suspense (cash-basis recognition). */
+  get receiveTargets(): InvestmentHolding[] {
+    return this.allInterestHoldings.filter((h) =>
+      canAccrueInterest(h) ? this.receivableBalance(h) > 0 : this.suspense(h) > 0
+    );
+  }
+
+  outstandingFor(h: InvestmentHolding): number {
+    return canAccrueInterest(h) ? this.receivableBalance(h) : this.suspense(h);
+  }
+
+  get receivedLog(): InvestmentTxn[] {
+    return this.txns.filter((t) => t.txnType === 'INTEREST_RECEIVED');
+  }
+
+  get receivedLogTotal(): number {
+    return this.receivedLog.reduce((s, t) => s + t.amount, 0);
+  }
+
+  receiveInterest(h: InvestmentHolding): void {
+    const draft = this.receiveDrafts[h.certNo];
+    if (!draft || draft <= 0) {
+      this.toast('Enter a valid amount to receive.');
+      return;
+    }
+    let amt = draft;
+    let particulars: string;
+    if (canAccrueInterest(h)) {
+      amt = Math.min(draft, this.receivableBalance(h));
+      h.interestReceived = this.received(h) + amt;
+      particulars = `Interest received against posted receivable - ${h.scriptName || h.party}`;
+    } else {
+      h.interestReceived = this.received(h) + amt;
+      particulars = `Interest received on cash basis (${this.provisionLabel(h)}) - ${h.scriptName || h.party}`;
+    }
+    const glCode = this.receiveGlCode;
+    const glName = this.glName(glCode);
+    this.txns = [
+      {
+        certNo: h.certNo,
+        instrumentType: h.instrumentType,
+        txnType: 'INTEREST_RECEIVED',
+        voucherNo: `INV/INT-RCV/${h.certNo}-${this.receivedLog.length + 1}`,
+        txnDate: this.asOnDate,
+        amount: amt,
+        particulars: `${particulars} (Dr. ${glCode} - ${glName})`,
+        glCode,
+        glName
+      },
+      ...this.txns
+    ];
+    this.toast(`₹${amt.toLocaleString('en-IN')} interest received into ${glCode} - ${glName} for ${h.certNo}.`);
+    delete this.receiveDrafts[h.certNo];
+  }
+
   // -------------------- 03 Government Bond Int Register --------------------
   get bondIntRegister(): InvestmentTxn[] {
     return this.txns.filter(
@@ -236,6 +446,309 @@ export class InvestmentInterestComponent {
     return this.fdRegister.reduce((s, h) => s + this.accrued(h), 0);
   }
 
+  // -------------------- Export to Excel --------------------
+  private txnExportRow(t: InvestmentTxn): (string | number | null)[] {
+    return [
+      t.txnDate,
+      t.voucherNo,
+      t.certNo,
+      t.instrumentType,
+      t.particulars,
+      t.amount,
+      t.glCode ?? '',
+      t.glName ?? ''
+    ];
+  }
+
+  private exportSheets(): ExportSheetSpec[] {
+    const subtitle = `As on ${this.asOnDate}`;
+    const txnHeaders = [
+      'Date',
+      'Voucher No',
+      'Cert No',
+      'Type',
+      'Particulars',
+      'Amount',
+      'GL Code',
+      'GL Name'
+    ];
+    const txnWidths = [
+      14,
+      22,
+      14,
+      14,
+      42,
+      16,
+      12,
+      28
+    ];
+    const one = (
+      sheetName: string,
+      title: string,
+      headers: string[],
+      widths: number[],
+      rows: (string | number | null)[][]
+    ): ExportSheetSpec[] => [
+      { sheetName, title, subtitle, headers, widths, rows }];
+
+    switch (this.activeTab) {
+      case 'receivable': {
+        const sheets: ExportSheetSpec[] = [
+          {
+            sheetName: 'Interest Receivable',
+            title: 'Interest Receivable — Posted but Not Yet Collected',
+            subtitle,
+            headers: [
+              'Cert No',
+              'Script / Party',
+              'Type',
+              'Status',
+              'Interest Posted',
+              'Interest Received',
+              'Receivable Balance'
+            ],
+            widths: [
+              14,
+              30,
+              16,
+              16,
+              16,
+              16,
+              18
+            ],
+            rows: this.receivableRows.map((h) => [
+              h.certNo,
+              h.scriptName || h.party,
+              this.instrumentLabel(h.instrumentType),
+              this.provisionLabel(h),
+              this.posted(h),
+              this.received(h),
+              this.receivableBalance(h)
+            ])
+          }
+        ];
+        if (this.suspenseRows.length > 0) {
+          sheets.push({
+            sheetName: 'NPI Suspense',
+            title: 'Non-Performing Investments — Interest Held in Suspense',
+            subtitle,
+            headers: [
+              'Cert No',
+              'Script / Party',
+              'Type',
+              'Status',
+              'Provision Required',
+              'Interest in Suspense'
+            ],
+            widths: [
+              14,
+              30,
+              16,
+              16,
+              16,
+              18
+            ],
+            rows: this.suspenseRows.map((h) => [
+              h.certNo,
+              h.scriptName || h.party,
+              this.instrumentLabel(h.instrumentType),
+              this.provisionLabel(h),
+              this.provisionRequired(h),
+              this.suspense(h)
+            ])
+          });
+        }
+        return sheets;
+      }
+      case 'fdCalc':
+        return [
+          {
+            sheetName: 'FD Interest Calc',
+            title: 'FD Interest Calculation & Post',
+            subtitle: `Period ${this.fdCalcFromDate || '—'} to ${this.fdCalcToDate || this.asOnDate} · Post to ${this.fdCalcGlCode} - ${this.glName(this.fdCalcGlCode)}`,
+            headers: [
+              'Cert No',
+              'Party',
+              'Face Value',
+              'Rate',
+              'Frequency',
+              'Interest'
+            ],
+            widths: [
+              14,
+              30,
+              16,
+              10,
+              14,
+              16
+            ],
+            rows: this.fdCalcTargets.map((h) => [
+              h.certNo,
+              h.party,
+              h.faceValue,
+              h.interestRate,
+              h.interestFreq,
+              this.fdInterest(h)
+            ])
+          }
+        ];
+      case 'bondCalc':
+        return [
+          {
+            sheetName: 'Bond Interest Calc',
+            title: 'Govt./Bond Interest Calculation & Post',
+            subtitle: `Period ${this.bondCalcFromDate || '—'} to ${this.bondCalcToDate || this.asOnDate} · Post to ${this.bondCalcGlCode} - ${this.glName(this.bondCalcGlCode)}`,
+            headers: [
+              'Cert No',
+              'Script',
+              'Type',
+              'Face Value',
+              'Rate',
+              'Frequency',
+              'Interest'
+            ],
+            widths: [
+              14,
+              30,
+              16,
+              16,
+              10,
+              14,
+              16
+            ],
+            rows: this.bondCalcTargets.map((h) => [
+              h.certNo,
+              h.scriptName,
+              this.instrumentLabel(h.instrumentType),
+              h.faceValue,
+              h.interestRate,
+              h.interestFreq,
+              this.bondInterest(h)
+            ])
+          }
+        ];
+      case 'receive': {
+        const sheets: ExportSheetSpec[] = [
+          {
+            sheetName: 'Receive Targets',
+            title: 'Interest Receive — Outstanding for Collection',
+            subtitle: `${subtitle} · Receive into ${this.receiveGlCode} - ${this.glName(this.receiveGlCode)}`,
+            headers: [
+              'Cert No',
+              'Script / Party',
+              'Type',
+              'Status',
+              'Outstanding'
+            ],
+            widths: [
+              14,
+              30,
+              16,
+              16,
+              16
+            ],
+            rows: this.receiveTargets.map((h) => [
+              h.certNo,
+              h.scriptName || h.party,
+              this.instrumentLabel(h.instrumentType),
+              this.provisionLabel(h),
+              this.outstandingFor(h)
+            ])
+          }
+        ];
+        if (this.receivedLog.length > 0) {
+          sheets.push({
+            sheetName: 'Received Log',
+            title: 'Interest Received Log',
+            subtitle,
+            headers: txnHeaders,
+            widths: txnWidths,
+            rows: this.receivedLog.map((t) => this.txnExportRow(t))
+          });
+        }
+        return sheets;
+      }
+      case 'bondIntRegister':
+        return one(
+          'Govt Bond Int Register',
+          'Government Bond Interest Register',
+          txnHeaders,
+          txnWidths,
+          this.bondIntRegister.map((t) => this.txnExportRow(t))
+        );
+      case 'fdIntRegister':
+        return one(
+          'FD Interest Register',
+          'FD Interest Register',
+          txnHeaders,
+          txnWidths,
+          this.fdIntRegister.map((t) => this.txnExportRow(t))
+        );
+      case 'fdRegister':
+        return one(
+          'FD Register',
+          'FD Register',
+          [
+            'Cert No',
+            'Party',
+            'Sub Type',
+            'Face Value',
+            'Rate',
+            'Frequency',
+            'Deposit Date',
+            'Maturity Date',
+            'Days Left',
+            'Accrued Interest',
+            'Maturity Value',
+            'Status'
+          ],
+          [
+            14,
+            26,
+            16,
+            16,
+            10,
+            14,
+            14,
+            14,
+            12,
+            16,
+            16,
+            12
+          ],
+          this.fdRegister.map((h) => [
+            h.certNo,
+            h.party,
+            h.subType,
+            h.faceValue,
+            h.interestRate,
+            h.interestFreq,
+            h.purchaseDate,
+            h.maturityDate,
+            this.daysLeft(h),
+            this.accrued(h),
+            this.maturity(h),
+            h.status
+          ])
+        );
+      default:
+        return one('Interest', 'Investment Interest', [], [], []);
+    }
+  }
+
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(this.exportSheets(), `Investment-Interest-${this.activeTab}-${this.asOnDate}`);
+      this.toast('Exported.');
+    } catch (err) {
+      console.error('Investment Interest export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
   private toast(msg: string): void {
     this.toastMsg = msg;
     this.toastVisible = true;

src/app/investment/investment-masters/investment-masters.component.html

@@ -16,6 +16,11 @@
         Market Detail masters.
       </p>
     </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+        {{ generating ? 'Exporting…' : 'Export to Excel' }}
+      </button>
+    </div>
   </header>
 
   <div class="cctr-tabs">
@@ -262,8 +267,8 @@
           ><span>Contact No</span><input type="text" [(ngModel)]="newBroker.contactNo"
         /></label>
         <label class="inv-form-field"
-          ><span>Empanelled On</span><input type="text" [(ngModel)]="newBroker.empanelledOn" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Empanelled On</span><mifosx-date-ddmmyyyy [(ngModel)]="newBroker.empanelledOn"></mifosx-date-ddmmyyyy
+        ></label>
       </div>
       <div class="inv-form-actions">
         <button type="button" class="pg-btn pg-btn--primary" (click)="addBroker()">Save</button>
@@ -344,8 +349,8 @@
       <div class="pos-section-label">Add Daily Script Rate</div>
       <div class="inv-form-grid">
         <label class="inv-form-field"
-          ><span>Rate Date *</span><input type="text" [(ngModel)]="newDailyRate.rateDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><span>Rate Date *</span><mifosx-date-ddmmyyyy [(ngModel)]="newDailyRate.rateDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field">
           <span>Script Code *</span>
           <select [(ngModel)]="newDailyRate.scriptCode">

src/app/investment/investment-masters/investment-masters.component.ts

@@ -9,6 +9,7 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import {
   SCRIPT_MASTER,
   BROKER_MASTER,
@@ -32,6 +33,7 @@ import {
   LienReason,
   InstrumentType
 } from '../investment-data';
+import { exportWorkbook, ExportSheetSpec } from '../investment-export';
 
 type MasterTab =
   | 'party'
@@ -59,7 +61,8 @@ type MasterTab =
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule
+    FormsModule,
+    DateDdmmyyyyPickerComponent
   ]
 })
 export class InvestmentMastersComponent {
@@ -85,6 +88,20 @@ export class InvestmentMastersComponent {
     'SHARE'
   ];
 
+  private readonly masterLabels: Record<MasterTab, string> = {
+    party: 'Bank / Party Master',
+    script: 'Script Master',
+    subtype: 'SubType Master',
+    broker: 'Broker Master',
+    control: 'Control Parameter',
+    dailyscript: 'Daily Script Master',
+    lien: 'LIEN Reason Master',
+    mfproduct: 'Mutual Fund Product Master',
+    sglbank: 'SGL Bank Master',
+    marketdetail: 'Script Market Detail'
+  };
+
+  generating = false;
   toastMsg = '';
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
@@ -251,6 +268,244 @@ export class InvestmentMastersComponent {
     this.toast('Daily script rate added.');
   }
 
+  // -------------------- Export to Excel --------------------
+  private exportSheets(): ExportSheetSpec[] {
+    const title = this.masterLabels[this.activeTab];
+    const one = (headers: string[], widths: number[], rows: (string | number | null)[][]): ExportSheetSpec[] => [
+      { sheetName: title, title, headers, widths, rows }];
+
+    switch (this.activeTab) {
+      case 'party':
+        return one(
+          [
+            'Party Code',
+            'Party Name',
+            'Type',
+            'PAN No'
+          ],
+          [
+            12,
+            30,
+            16,
+            14
+          ],
+          this.parties.map((p) => [
+            p.partyCode,
+            p.partyName,
+            p.partyType,
+            p.panNo
+          ])
+        );
+      case 'script':
+        return one(
+          [
+            'Script Code',
+            'Script Name',
+            'Instrument',
+            'ISIN',
+            'Face Value/Unit'
+          ],
+          [
+            16,
+            30,
+            16,
+            16,
+            16
+          ],
+          this.scripts.map((s) => [
+            s.scriptCode,
+            s.scriptName,
+            s.instrumentType,
+            s.isin,
+            s.faceValuePerUnit
+          ])
+        );
+      case 'subtype':
+        return one(
+          [
+            'Code',
+            'Sub Type',
+            'Instrument'
+          ],
+          [
+            10,
+            24,
+            16
+          ],
+          this.subTypes.map((s) => [
+            s.subTypeCode,
+            s.subTypeName,
+            s.instrumentType
+          ])
+        );
+      case 'broker':
+        return one(
+          [
+            'Broker Code',
+            'Broker Name',
+            'Contact',
+            'Empanelled On',
+            'Status'
+          ],
+          [
+            14,
+            30,
+            16,
+            16,
+            12
+          ],
+          this.brokers.map((b) => [
+            b.brokerCode,
+            b.brokerName,
+            b.contactNo,
+            b.empanelledOn,
+            b.status
+          ])
+        );
+      case 'control':
+        return one(
+          [
+            'Parameter',
+            'Value',
+            'Description'
+          ],
+          [
+            26,
+            14,
+            40
+          ],
+          this.controlParams.map((c) => [
+            c.paramName,
+            c.paramValue,
+            c.description
+          ])
+        );
+      case 'dailyscript':
+        return one(
+          [
+            'Rate Date',
+            'Script Code',
+            'Script Name',
+            'Open',
+            'High',
+            'Low',
+            'Close'
+          ],
+          [
+            14,
+            16,
+            26,
+            12,
+            12,
+            12,
+            12
+          ],
+          this.dailyScriptRates.map((r) => [
+            r.rateDate,
+            r.scriptCode,
+            r.scriptName,
+            r.openRate,
+            r.highRate,
+            r.lowRate,
+            r.closeRate
+          ])
+        );
+      case 'lien':
+        return one(
+          [
+            'Reason Code',
+            'Description'
+          ],
+          [
+            14,
+            40
+          ],
+          this.lienReasons.map((l) => [
+            l.reasonCode,
+            l.reasonDescription
+          ])
+        );
+      case 'mfproduct':
+        return one(
+          [
+            'Product Code',
+            'Product Name',
+            'AMC',
+            'Category',
+            'Risk'
+          ],
+          [
+            14,
+            30,
+            24,
+            20,
+            12
+          ],
+          this.mfProducts.map((m) => [
+            m.productCode,
+            m.productName,
+            m.amcName,
+            m.category,
+            m.riskLevel
+          ])
+        );
+      case 'sglbank':
+        return one(
+          [
+            'SGL Code',
+            'Bank Name',
+            'Branch'
+          ],
+          [
+            14,
+            30,
+            24
+          ],
+          this.sglBanks.map((s) => [
+            s.sglCode,
+            s.bankName,
+            s.branch
+          ])
+        );
+      case 'marketdetail':
+        return one(
+          [
+            'Script Code',
+            'Market Price',
+            'As On',
+            'YTM %'
+          ],
+          [
+            16,
+            16,
+            14,
+            12
+          ],
+          this.marketDetails.map((m) => [
+            m.scriptCode,
+            m.marketPrice,
+            m.asOnDate,
+            m.ytm
+          ])
+        );
+      default:
+        return one([], [], []);
+    }
+  }
+
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(this.exportSheets(), `Investment-${this.masterLabels[this.activeTab]}`);
+      this.toast(`${this.masterLabels[this.activeTab]} exported.`);
+    } catch (err) {
+      console.error('Investment Masters export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
   private toast(msg: string): void {
     this.toastMsg = msg;
     this.toastVisible = true;

src/app/investment/investment-reports/investment-reports.component.html

@@ -16,6 +16,11 @@
         same holdings/transactions used by the Entry screens.
       </p>
     </div>
+    <div class="pg-toolbar">
+      <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+        {{ generating ? 'Exporting…' : 'Export to Excel' }}
+      </button>
+    </div>
   </header>
 
   <div class="cctr-tabs">
@@ -692,3 +697,5 @@
     </div>
   }
 </div>
+
+<div class="inv-toast" [class.show]="toastVisible">{{ toastMsg }}</div>

src/app/investment/investment-reports/investment-reports.component.ts

@@ -27,6 +27,7 @@ import {
   daysToMaturity,
   todayDDMMYYYY
 } from '../investment-data';
+import { exportWorkbook, ExportSheetSpec } from '../investment-export';
 
 type ReportGroup = 'balance' | 'ledger' | 'maturity' | 'portfolio';
 
@@ -50,6 +51,11 @@ export class InvestmentReportsComponent {
   activeReport = 'govtSecBalance';
   asOnDate = todayDDMMYYYY();
 
+  generating = false;
+  toastMsg = '';
+  toastVisible = false;
+  private toastTimer: ReturnType<typeof setTimeout> | undefined;
+
   setGroup(group: ReportGroup, defaultReport: string): void {
     this.activeGroup = group;
     this.activeReport = defaultReport;
@@ -244,4 +250,364 @@ export class InvestmentReportsComponent {
   get portfolioTotalMaturity(): number {
     return this.portfolioSummary.reduce((s, r) => s + r.maturityValue, 0);
   }
+
+  // -------------------- Export to Excel --------------------
+  private readonly holdingsExportHeaders = [
+    'Cert No',
+    'Script / Party',
+    'Sub Type',
+    'Units',
+    'Face Value',
+    'Purchase Rate',
+    'Interest Rate',
+    'Purchase Date',
+    'Maturity Date',
+    'Accrued Interest',
+    'Maturity Value',
+    'Status'
+  ];
+  private readonly holdingsExportWidths = [
+    14,
+    30,
+    16,
+    12,
+    16,
+    14,
+    12,
+    14,
+    14,
+    16,
+    16,
+    12
+  ];
+  private holdingsExportRow(h: InvestmentHolding): (string | number | null)[] {
+    return [
+      h.certNo,
+      h.scriptName || h.party,
+      h.subType,
+      h.units,
+      h.faceValue,
+      h.purchaseRate,
+      h.interestRate,
+      h.purchaseDate,
+      h.maturityDate,
+      this.accrued(h),
+      this.maturity(h),
+      h.status
+    ];
+  }
+
+  private readonly txnExportHeaders = [
+    'Date',
+    'Voucher No',
+    'Cert No',
+    'Type',
+    'Particulars',
+    'Amount'
+  ];
+  private readonly txnExportWidths = [
+    14,
+    22,
+    14,
+    14,
+    42,
+    16
+  ];
+  private txnExportRow(t: InvestmentTxn): (string | number | null)[] {
+    return [
+      t.txnDate,
+      t.voucherNo,
+      t.certNo,
+      t.txnType,
+      t.particulars,
+      t.amount
+    ];
+  }
+
+  private exportSheets(): ExportSheetSpec[] {
+    const subtitle = `As on ${this.asOnDate}`;
+    const one = (
+      sheetName: string,
+      title: string,
+      headers: string[],
+      widths: number[],
+      rows: (string | number | null)[][]
+    ): ExportSheetSpec[] => [
+      { sheetName, title, subtitle, headers, widths, rows }];
+
+    switch (this.activeReport) {
+      case 'govtSecBalance':
+        return one(
+          'Govt Sec Balance',
+          'Govt Security Balance Report',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.govtSecHoldings.map((h) => this.holdingsExportRow(h))
+        );
+      case 'shareBalance':
+        return one(
+          'Share Balance',
+          'Share Balance Report',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.shareHoldings.map((h) => this.holdingsExportRow(h))
+        );
+      case 'fdrBalance':
+        return one(
+          'FDR Balance',
+          'FDR Balance Report',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.fdHoldings.map((h) => this.holdingsExportRow(h))
+        );
+      case 'bankInvList':
+        return one(
+          'Bank Investment List',
+          'Bank Investment List',
+          [
+            'Party',
+            'Holdings',
+            'Total Face Value'
+          ],
+          [
+            30,
+            14,
+            18
+          ],
+          this.bankInvestmentList.map((r) => [
+            r.party,
+            r.count,
+            r.totalFaceValue
+          ])
+        );
+      case 'fdLedger':
+        return one(
+          'FD Ledger',
+          'FD Ledger',
+          this.txnExportHeaders,
+          this.txnExportWidths,
+          this.fdTxns.map((t) => this.txnExportRow(t))
+        );
+      case 'bondLedger':
+        return one(
+          'Govt-Bond Ledger',
+          'Govt/Bond Ledger',
+          this.txnExportHeaders,
+          this.txnExportWidths,
+          this.bondTxns.map((t) => this.txnExportRow(t))
+        );
+      case 'shareLedger':
+        return one(
+          'Share Ledger',
+          'Share Ledger',
+          this.txnExportHeaders,
+          this.txnExportWidths,
+          this.shareTxns.map((t) => this.txnExportRow(t))
+        );
+      case 'amortizeLedger':
+        return one(
+          'Amortize Ledger',
+          'Amortize Ledger',
+          this.txnExportHeaders,
+          this.txnExportWidths,
+          this.amortizeTxns.map((t) => this.txnExportRow(t))
+        );
+      case 'dealSlip':
+        return one(
+          'Deal Slip',
+          'Deal Slip Register',
+          this.txnExportHeaders,
+          this.txnExportWidths,
+          this.dealSlips.map((t) => this.txnExportRow(t))
+        );
+      case 'intDueRegister':
+        return one(
+          'Interest Due Register',
+          'Interest Due Register (Non-Cumulative Holdings)',
+          [
+            ...this.holdingsExportHeaders,
+            'Due Amount'
+          ],
+          [
+            ...this.holdingsExportWidths,
+            16
+          ],
+          this.interestDueRegister.map((h) => [
+            ...this.holdingsExportRow(h),
+            h.dueAmount
+          ])
+        );
+      case 'slrRegister':
+        return one(
+          'SLR Bond Register',
+          'SLR Bond Register',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.slrBondRegister.map((h) => this.holdingsExportRow(h))
+        );
+      case 'pendingReceived':
+        return [
+          {
+            sheetName: 'Received Interest',
+            title: 'Received Interest / Dividend',
+            subtitle,
+            headers: this.txnExportHeaders,
+            widths: this.txnExportWidths,
+            rows: this.receivedInterestTxns.map((t) => this.txnExportRow(t))
+          },
+          {
+            sheetName: 'Pending Interest',
+            title: 'Pending Interest (Not Yet Posted)',
+            subtitle,
+            headers: this.holdingsExportHeaders,
+            widths: this.holdingsExportWidths,
+            rows: this.pendingInterestHoldings.map((h) => this.holdingsExportRow(h))
+          }
+        ];
+      case 'maturedFd':
+        return one(
+          'Matured FD',
+          'List of Matured FD',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.maturedFdList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'maturingList':
+        return one(
+          'Maturity List',
+          'Govt Security / FD Maturity List',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.maturingList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'maturityPattern':
+        return one(
+          'Maturity Pattern',
+          'Maturity Pattern Register',
+          [
+            'Bucket',
+            'Holdings',
+            'Face Value'
+          ],
+          [
+            22,
+            14,
+            18
+          ],
+          this.maturityBuckets.map((b) => [
+            b.label,
+            b.count,
+            b.faceValue
+          ])
+        );
+      case 'govtSecList':
+        return one(
+          'Govt Security List',
+          'Govt Security List',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.govtSecList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'fdSecList':
+        return one(
+          'FD Security List',
+          'FD Security List',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.fdSecList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'shareSecList':
+        return one(
+          'Share Security List',
+          'Share Security List',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.shareSecList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'mfList':
+        return one(
+          'Mutual Fund List',
+          'Mutual Fund List',
+          this.holdingsExportHeaders,
+          this.holdingsExportWidths,
+          this.mutualFundList.map((h) => this.holdingsExportRow(h))
+        );
+      case 'shiftingReport':
+        return one(
+          'Shifting Report',
+          'Shifting Report — SLR Market Deviation ≥ 1%',
+          [
+            'Cert No',
+            'Script',
+            'Purchase Rate',
+            'Market Price',
+            'Deviation %'
+          ],
+          [
+            14,
+            30,
+            16,
+            16,
+            14
+          ],
+          this.shiftingCandidates.map((x) => [
+            x.certNo,
+            x.scriptName,
+            x.purchaseRate,
+            x.marketPrice,
+            x.deviationPct
+          ])
+        );
+      case 'portfolio':
+        return one(
+          'Portfolio',
+          'Investment Portfolio — Consolidated Summary',
+          [
+            'Instrument Type',
+            'Holdings',
+            'Face Value',
+            'Accrued Interest',
+            'Maturity Value'
+          ],
+          [
+            24,
+            12,
+            18,
+            18,
+            18
+          ],
+          this.portfolioSummary.map((p) => [
+            p.label,
+            p.count,
+            p.faceValue,
+            p.accrued,
+            p.maturityValue
+          ])
+        );
+      default:
+        return one('Report', 'Investment Report', this.holdingsExportHeaders, this.holdingsExportWidths, []);
+    }
+  }
+
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(this.exportSheets(), `Investment-${this.activeReport}-${this.asOnDate}`);
+      this.toast('Report exported.');
+    } catch (err) {
+      console.error('Investment report export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
+  private toast(msg: string): void {
+    this.toastMsg = msg;
+    this.toastVisible = true;
+    if (this.toastTimer) {
+      clearTimeout(this.toastTimer);
+    }
+    this.toastTimer = setTimeout(() => (this.toastVisible = false), 3200);
+  }
 }

src/app/investment/investment-shared.scss

@@ -128,6 +128,32 @@
     color: #b91c1c;
     border: 1px solid #fecaca;
   }
+
+  // Investment-provisioning classification (Non-Performing Investment) — same severity ramp as
+  // the NPA module's stage badges, kept local since it colours a different status field here.
+  &--standard {
+    background: #f0fdf4;
+    color: #15803d;
+    border: 1px solid #bbf7d0;
+  }
+
+  &--sub_standard {
+    background: #fef2f2;
+    color: #dc2626;
+    border: 1px solid #fecaca;
+  }
+
+  &--doubtful {
+    background: #fdf2f8;
+    color: #9d174d;
+    border: 1px solid #fbcfe8;
+  }
+
+  &--loss {
+    background: #1f2937;
+    color: #f9fafb;
+    border: 1px solid #1f2937;
+  }
 }
 
 .inv-form-grid {

src/app/investment/share-investment/share-investment.component.html

@@ -15,6 +15,13 @@
         Equity and cooperative-society share holdings — Purchase, Dividend, Sell and Write-off entries.
       </p>
     </div>
+    @if (activeTab === 'holdings') {
+      <div class="pg-toolbar">
+        <button type="button" class="pg-btn pg-btn--ghost" [disabled]="generating" (click)="exportExcel()">
+          {{ generating ? 'Exporting…' : 'Export to Excel' }}
+        </button>
+      </div>
+    }
   </header>
 
   <div class="cctr-tabs">
@@ -131,8 +138,8 @@
         /></label>
         <label class="inv-form-field"
           ><span>Purchase Date *</span
-          ><input type="text" [(ngModel)]="purchaseForm.purchaseDate" placeholder="DD-MM-YYYY"
-        /></label>
+          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.purchaseDate"></mifosx-date-ddmmyyyy
+        ></label>
         <label class="inv-form-field"
           ><span>Broker Code</span><input type="text" [(ngModel)]="purchaseForm.brokerCode"
         /></label>

src/app/investment/share-investment/share-investment.component.ts

@@ -9,7 +9,9 @@
 import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import { SHARE_HOLDINGS, ALL_TXNS, InvestmentHolding, InvestmentTxn, todayDDMMYYYY } from '../investment-data';
+import { exportWorkbook } from '../investment-export';
 
 type ShareTab = 'holdings' | 'purchase' | 'dividend' | 'sell' | 'writeoff';
 
@@ -40,7 +42,8 @@ interface SharePurchaseForm {
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule
+    FormsModule,
+    DateDdmmyyyyPickerComponent
   ]
 })
 export class ShareInvestmentComponent {
@@ -50,6 +53,7 @@ export class ShareInvestmentComponent {
   holdings: InvestmentHolding[] = [...SHARE_HOLDINGS];
   txns: InvestmentTxn[] = ALL_TXNS.filter((t) => t.instrumentType === 'SHARE');
 
+  generating = false;
   toastMsg = '';
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
@@ -252,6 +256,59 @@ export class ShareInvestmentComponent {
     return `inv-badge inv-badge--${h.status.toLowerCase()}`;
   }
 
+  // -------------------- Export to Excel (Holdings register) --------------------
+  async exportExcel(): Promise<void> {
+    this.generating = true;
+    try {
+      await exportWorkbook(
+        [
+          {
+            sheetName: 'Share Holdings',
+            title: 'Share Holdings Register',
+            subtitle: `As on ${this.asOnDate}`,
+            headers: [
+              'Cert No',
+              'Script',
+              'Party',
+              'Units',
+              'Purchase Rate',
+              'Face Value',
+              'Purchase Date',
+              'Status'
+            ],
+            widths: [
+              14,
+              24,
+              22,
+              12,
+              14,
+              16,
+              14,
+              12
+            ],
+            rows: this.holdings.map((h) => [
+              h.certNo,
+              h.scriptName,
+              h.party,
+              h.units,
+              h.purchaseRate,
+              h.faceValue,
+              h.purchaseDate,
+              h.status
+            ])
+          }
+        ],
+        `Share-Holdings-${this.asOnDate}`
+      );
+      this.toast('Share Holdings exported.');
+    } catch (err) {
+      console.error('Share Holdings export failed', err);
+      this.toast('Could not generate the workbook — please retry.');
+    } finally {
+      this.generating = false;
+    }
+  }
+
   private toast(msg: string): void {
     this.toastMsg = msg;
     this.toastVisible = true;

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

@@ -29,6 +29,11 @@
       Account Status
       <span class="km-cnt km-cnt--red">34</span>
     </button>
+    <button class="km-itab" [class.active]="activeSection === 'exceptions'" (click)="showSection('exceptions')">
+      <fa-icon icon="exclamation-triangle"></fa-icon>
+      KYC Exceptions
+      <span class="km-cnt km-cnt--amb">{{ exceptionRows.length }}</span>
+    </button>
   </div>
 
   <div class="km-main">
@@ -722,6 +727,284 @@
         </div>
       </div>
     }
+
+    <!-- KYC EXCEPTIONS -->
+    @if (activeSection === 'exceptions') {
+      <div class="km-page">
+        <div class="km-page-head">
+          <span class="km-page-title">KYC Exceptions Dashboard</span>
+          <div class="km-actions">
+            <button class="km-btn km-btn-g" (click)="toast('Exporting exception report...')">
+              <fa-icon icon="download"></fa-icon> Export Exceptions
+            </button>
+          </div>
+        </div>
+
+        <div class="km-stat-row">
+          <div class="km-stat">
+            <div class="km-stat-n" style="color: var(--km-amber)">{{ exceptionRows.length }}</div>
+            <div class="km-stat-l">Pending Exceptions</div>
+            <div class="km-stat-t" style="color: var(--km-amber)">Immediate attention</div>
+          </div>
+          <div class="km-stat">
+            <div class="km-stat-n" style="color: var(--km-red)">
+              {{ notYetContactedCount }}
+            </div>
+            <div class="km-stat-l">Not Yet Contacted</div>
+            <div class="km-stat-t" style="color: var(--km-red)">Action required</div>
+          </div>
+          <div class="km-stat">
+            <div class="km-stat-n" style="color: var(--km-orange)">
+              {{ panMismatchesCount }}
+            </div>
+            <div class="km-stat-l">PAN Mismatches</div>
+            <div class="km-stat-t" style="color: var(--km-orange)">Requires physical review</div>
+          </div>
+          <div class="km-stat">
+            <div class="km-stat-n" style="color: var(--km-blue)">
+              {{ aadhaarFailuresCount }}
+            </div>
+            <div class="km-stat-l">Aadhaar Failures</div>
+            <div class="km-stat-t" style="color: var(--km-blue)">Re-KYC OTP needed</div>
+          </div>
+        </div>
+
+        <div class="km-card km-mt">
+          <!-- Tab Toggle Header -->
+          <div
+            class="km-ch"
+            style="
+              border-bottom: 1px solid var(--km-g200);
+              padding-bottom: 0;
+              display: flex;
+              flex-direction: column;
+              align-items: flex-start;
+              gap: 12px;
+            "
+          >
+            <div style="display: flex; gap: 8px; align-items: center">
+              <div class="km-ci" style="background: #fef3c7; color: #d97706">
+                <fa-icon icon="exclamation-triangle"></fa-icon>
+              </div>
+              <div class="km-ct">Exceptions Register</div>
+            </div>
+
+            <div class="km-inner-nav" style="width: 100%; border: none; margin: 10px 0 0 0; padding: 0; gap: 8px">
+              <button
+                class="km-itab"
+                [class.active]="activeExceptionSubTab === 'pending'"
+                (click)="activeExceptionSubTab = 'pending'"
+                style="padding: 8px 16px; border-radius: 4px; font-weight: 600; font-size: 13px"
+              >
+                <fa-icon icon="clock"></fa-icon>
+                Pending Exceptions ({{ pendingExceptions.length }})
+              </button>
+              <button
+                class="km-itab"
+                [class.active]="activeExceptionSubTab === 'resolved'"
+                (click)="activeExceptionSubTab = 'resolved'"
+                style="padding: 8px 16px; border-radius: 4px; font-weight: 600; font-size: 13px"
+              >
+                <fa-icon icon="check-circle"></fa-icon>
+                Resolved Exceptions ({{ resolvedExceptions.length }})
+              </button>
+            </div>
+          </div>
+
+          <!-- PENDING EXCEPTIONS TAB -->
+          @if (activeExceptionSubTab === 'pending') {
+            @if (pendingExceptions.length === 0) {
+              <div class="km-empty" style="padding: 40px; text-align: center">
+                <div class="km-empty-i">🎉</div>
+                <div style="font-weight: 500; font-size: 16px; margin-top: 12px">All exceptions resolved!</div>
+                <div class="km-empty-s" style="color: var(--km-g500); font-size: 13px; margin-top: 4px">
+                  There are no active client KYC exceptions on record.
+                </div>
+              </div>
+            } @else {
+              <table class="km-tbl">
+                <thead>
+                  <tr>
+                    <th>Client / Account</th>
+                    <th>Branch</th>
+                    <th>Exception Reason &amp; Date</th>
+                    <th>Risk</th>
+                    <th>Contact Status</th>
+                    <th>Contact Logs</th>
+                    <th>Actions</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (c of pendingExceptions; track c.id) {
+                    <tr>
+                      <td>
+                        <div
+                          class="km-an"
+                          [routerLink]="['/clients', c.id, 'kyc']"
+                          style="cursor: pointer; color: var(--km-blue); text-decoration: underline"
+                        >
+                          {{ c.name }}
+                        </div>
+                        <div class="km-ai">{{ c.account }}</div>
+                      </td>
+                      <td>{{ c.contact.branch }}</td>
+                      <td>
+                        <div style="font-weight: 500; color: #b45309">{{ c.exceptionReason }}</div>
+                        <div class="km-small">Opened: {{ c.exceptionDate }}</div>
+                      </td>
+                      <td>
+                        <span class="km-b" [ngClass]="riskClass(c.risk)">{{ c.riskLabel }}</span>
+                      </td>
+                      <td>
+                        @if (c.contactHistory && c.contactHistory.length > 0) {
+                          <span class="km-del d-ok">Contacted</span>
+                          <div class="km-small" style="margin-top: 2px">
+                            Last: {{ c.contactHistory[c.contactHistory.length - 1].date }}
+                          </div>
+                        } @else {
+                          <span class="km-del d-fa">Not Contacted</span>
+                        }
+                      </td>
+                      <td>
+                        @if (c.contactHistory && c.contactHistory.length > 0) {
+                          <div class="contact-logs-list" style="max-height: 80px; overflow-y: auto; font-size: 11px">
+                            @for (log of c.contactHistory; track $index) {
+                              <div style="border-bottom: 1px dashed var(--km-g300); padding: 2px 0">
+                                <strong>{{ log.date }} ({{ log.action }}):</strong> {{ log.notes }}
+                                <em>— {{ log.officer }}</em>
+                                @if (log.platformSent) {
+                                  @if (log.delivered) {
+                                    <span class="km-sent-tag km-sent-ok" [title]="log.deliveryMessage"
+                                      >Sent {{ log.destinationMasked }}</span
+                                    >
+                                  } @else {
+                                    <span class="km-sent-tag km-sent-fail" [title]="log.deliveryMessage">Not sent</span>
+                                  }
+                                }
+                              </div>
+                            }
+                          </div>
+                        } @else {
+                          <span style="color: var(--km-g500); font-size: 11px">No logs recorded</span>
+                        }
+                      </td>
+                      <td>
+                        <div style="display: flex; gap: 8px">
+                          <button
+                            class="km-btn km-btn-ot"
+                            style="border-color: var(--km-blue); color: var(--km-blue)"
+                            [routerLink]="['/clients', c.id, 'kyc']"
+                          >
+                            <fa-icon icon="user-check"></fa-icon> Do KYC
+                          </button>
+                          <button class="km-btn km-btn-ot" (click)="openContactDialog(c)">
+                            <fa-icon icon="phone"></fa-icon> Log Call
+                          </button>
+                        </div>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            }
+          }
+
+          <!-- RESOLVED EXCEPTIONS TAB -->
+          @if (activeExceptionSubTab === 'resolved') {
+            @if (resolvedExceptions.length === 0) {
+              <div class="km-empty" style="padding: 40px; text-align: center">
+                <div class="km-empty-i" style="font-size: 32px; filter: grayscale(1)">📋</div>
+                <div style="font-weight: 500; font-size: 16px; margin-top: 12px; color: var(--km-g500)">
+                  No resolved exceptions
+                </div>
+                <div class="km-empty-s" style="color: var(--km-g500); font-size: 13px; margin-top: 4px">
+                  Resolved KYC exceptions will appear here once verification is completed.
+                </div>
+              </div>
+            } @else {
+              <table class="km-tbl">
+                <thead>
+                  <tr>
+                    <th>Client / Account</th>
+                    <th>Branch</th>
+                    <th>Exception Reason &amp; Resolution</th>
+                    <th>Risk</th>
+                    <th>Contact Logs</th>
+                    <th>Status</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (c of resolvedExceptions; track c.id) {
+                    <tr>
+                      <td>
+                        <div
+                          class="km-an"
+                          [routerLink]="['/clients', c.id, 'kyc']"
+                          style="cursor: pointer; color: var(--km-blue); text-decoration: underline"
+                        >
+                          {{ c.name }}
+                        </div>
+                        <div class="km-ai">{{ c.account }}</div>
+                      </td>
+                      <td>{{ c.contact.branch }}</td>
+                      <td>
+                        <div style="font-weight: 500; color: var(--km-g500); text-decoration: line-through">
+                          {{ c.exceptionReason }}
+                        </div>
+                        <div class="km-small">Resolved On: {{ c.exceptionResolvedOn }}</div>
+                      </td>
+                      <td>
+                        <span class="km-b" [ngClass]="riskClass(c.risk)">{{ c.riskLabel }}</span>
+                      </td>
+                      <td>
+                        @if (c.contactHistory && c.contactHistory.length > 0) {
+                          <div class="contact-logs-list" style="max-height: 80px; overflow-y: auto; font-size: 11px">
+                            @for (log of c.contactHistory; track $index) {
+                              <div style="border-bottom: 1px dashed var(--km-g300); padding: 2px 0">
+                                <strong>{{ log.date }} ({{ log.action }}):</strong> {{ log.notes }}
+                                <em>— {{ log.officer }}</em>
+                                @if (log.platformSent) {
+                                  @if (log.delivered) {
+                                    <span class="km-sent-tag km-sent-ok" [title]="log.deliveryMessage"
+                                      >Sent {{ log.destinationMasked }}</span
+                                    >
+                                  } @else {
+                                    <span class="km-sent-tag km-sent-fail" [title]="log.deliveryMessage">Not sent</span>
+                                  }
+                                }
+                              </div>
+                            }
+                          </div>
+                        } @else {
+                          <span style="color: var(--km-g500); font-size: 11px">No logs recorded</span>
+                        }
+                      </td>
+                      <td>
+                        <span
+                          style="
+                            display: inline-flex;
+                            align-items: center;
+                            gap: 4px;
+                            background: #e6f4ea;
+                            color: #137333;
+                            padding: 4px 8px;
+                            border-radius: 4px;
+                            font-weight: 500;
+                            font-size: 12px;
+                          "
+                        >
+                          <fa-icon icon="check-circle"></fa-icon> Exception Resolved
+                        </span>
+                      </td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            }
+          }
+        </div>
+      </div>
+    }
   </div>
 
   <!-- CLIENT DETAIL MODAL -->
@@ -1165,6 +1448,251 @@
     </div>
   }
 
+  <!-- LOG CONTACT DIALOG -->
+  @if (contactDialogOpen && current) {
+    <div class="km-overlay" (click)="closeContactDialog()">
+      <div class="km-modal hv-modal" (click)="$event.stopPropagation()">
+        <div class="km-mh">
+          <div class="km-mh-av">{{ current.av }}</div>
+          <div>
+            <div class="km-mh-name">Log Customer Contact</div>
+            <div class="km-mh-meta">{{ current.name }} · {{ current.account }}</div>
+          </div>
+          <div class="km-mclose" (click)="closeContactDialog()">✕</div>
+        </div>
+
+        <div class="km-mbody hv-body">
+          <div class="hv-addr">
+            <div class="hv-addr-label">Customer Contact Info</div>
+            <div class="hv-addr-name">{{ current.name }}</div>
+            <div class="hv-addr-text">
+              <fa-icon icon="mobile-alt" class="vkyc-ic"></fa-icon> {{ current.contact.mobile }}
+            </div>
+            <div class="hv-addr-text">
+              <fa-icon icon="envelope" class="vkyc-ic"></fa-icon> {{ current.contact.email }}
+            </div>
+          </div>
+
+          <div class="hv-row">
+            <label class="hv-label">Contact Channel<span class="hv-req">*</span></label>
+            <select class="hv-input" [(ngModel)]="contactChannel">
+              @for (ch of contactChannels; track ch.value) {
+                <option [value]="ch.value">
+                  {{ ch.label }}{{ ch.sends ? ' — sends a notice now' : ' — record only' }}
+                </option>
+              }
+            </select>
+            @if (selectedChannelSends) {
+              <div class="hv-hint hv-hint-send">
+                <fa-icon icon="paper-plane" class="vkyc-ic"></fa-icon>
+                A KYC notice will be sent to the customer when you save.
+              </div>
+            } @else {
+              <div class="hv-hint">Records an action you already took. Nothing is sent to the customer.</div>
+            }
+            @if (selectedChannelUnavailable) {
+              <div class="hv-hint hv-hint-error">
+                This customer has no {{ selectedChannel?.requires === 'email' ? 'email address' : 'mobile number' }} on
+                file — choose a different channel.
+              </div>
+            }
+          </div>
+
+          <div class="hv-row">
+            <label class="hv-label">KYC Officer Logging<span class="hv-req">*</span></label>
+            <select class="hv-input" [(ngModel)]="contactOfficer">
+              @for (officer of bankOfficers; track officer) {
+                <option [value]="officer">{{ officer }}</option>
+              }
+            </select>
+          </div>
+
+          <div class="hv-row">
+            <label class="hv-label">Summary / Notes<span class="hv-req">*</span></label>
+            <textarea
+              class="hv-input hv-textarea"
+              rows="3"
+              placeholder="Enter details of conversation e.g. Customer promised to visit branch next Tuesday..."
+              [(ngModel)]="contactNotes"
+            ></textarea>
+          </div>
+
+          @if (contactError) {
+            <div class="hv-hint hv-hint-error" role="alert">
+              <fa-icon icon="exclamation-circle" class="vkyc-ic"></fa-icon> {{ contactError }}
+            </div>
+          }
+        </div>
+
+        <div class="hv-footer">
+          <button class="km-btn" [disabled]="contactSaving" (click)="closeContactDialog()">Cancel</button>
+          <button class="km-btn km-btn-t" [disabled]="contactSaveDisabled" (click)="saveContactLog()">
+            {{ contactSaveLabel }}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
+
+  <!-- RESOLVE KYC DIALOG -->
+  @if (resolveDialogOpen && current) {
+    <div class="km-overlay" (click)="closeResolveDialog()">
+      <div class="km-modal hv-modal" (click)="$event.stopPropagation()">
+        <div class="km-mh" style="border-bottom: 2px solid var(--km-green)">
+          <div class="km-mh-av" style="background: var(--km-green)">{{ current.av }}</div>
+          <div>
+            <div class="km-mh-name">Resolve KYC Exception</div>
+            <div class="km-mh-meta">{{ current.name }} · {{ current.account }}</div>
+          </div>
+          <div class="km-mclose" (click)="closeResolveDialog()">✕</div>
+        </div>
+
+        <div class="km-mbody hv-body">
+          <div
+            style="
+              background: #f0fdf4;
+              border: 1px solid #bbf7d0;
+              border-radius: 6px;
+              padding: 12px;
+              margin-bottom: 16px;
+              font-size: 13px;
+              color: #166534;
+            "
+          >
+            <strong>Pending Reason:</strong> {{ current.exceptionReason }}
+            @if (current.exceptionRemarks) {
+              <div style="margin-top: 4px; font-style: italic">"{{ current.exceptionRemarks }}"</div>
+            }
+          </div>
+
+          @if (showPanResolution) {
+            <div
+              style="
+                border: 1px solid var(--km-g300);
+                border-radius: 6px;
+                padding: 12px;
+                margin-bottom: 16px;
+                background: #fafafa;
+              "
+            >
+              <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 8px">
+                <input type="checkbox" id="resolvePanChk" [(ngModel)]="resolvePanActive" />
+                <label for="resolvePanChk" style="font-weight: 600; cursor: pointer; color: var(--km-g800)"
+                  >Resolve PAN Card Exception</label
+                >
+              </div>
+              @if (resolvePanActive) {
+                <div class="hv-row" style="margin-left: 20px">
+                  <label class="hv-label">Verified PAN Number<span class="hv-req">*</span></label>
+                  <input
+                    type="text"
+                    class="hv-input"
+                    [(ngModel)]="resolvePanNumber"
+                    placeholder="e.g. ABCDE1234F"
+                    maxlength="10"
+                    style="text-transform: uppercase"
+                  />
+                  @if (resolvePanNumber && resolvePanNumber.length !== 10) {
+                    <div style="color: red; font-size: 11px; margin-top: 4px">PAN must be exactly 10 characters.</div>
+                  }
+                </div>
+              }
+            </div>
+          }
+
+          @if (showAadhaarResolution) {
+            <div
+              style="
+                border: 1px solid var(--km-g300);
+                border-radius: 6px;
+                padding: 12px;
+                margin-bottom: 16px;
+                background: #fafafa;
+              "
+            >
+              <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 8px">
+                <input type="checkbox" id="resolveAadhChk" [(ngModel)]="resolveAadhaarActive" />
+                <label for="resolveAadhChk" style="font-weight: 600; cursor: pointer; color: var(--km-g800)"
+                  >Resolve Aadhaar Card Exception</label
+                >
+              </div>
+              @if (resolveAadhaarActive) {
+                <div class="hv-row" style="margin-left: 20px">
+                  <label class="hv-label">Verified Aadhaar Number<span class="hv-req">*</span></label>
+                  <input
+                    type="text"
+                    class="hv-input"
+                    [(ngModel)]="resolveAadhaarNumber"
+                    placeholder="e.g. 597855025299"
+                    maxlength="12"
+                  />
+                  @if (resolveAadhaarNumber && resolveAadhaarNumber.length !== 12) {
+                    <div style="color: red; font-size: 11px; margin-top: 4px">Aadhaar must be exactly 12 digits.</div>
+                  }
+                </div>
+              }
+            </div>
+          }
+
+          @if (showGeneralResolution) {
+            <div
+              style="
+                border: 1px solid var(--km-g300);
+                border-radius: 6px;
+                padding: 12px;
+                margin-bottom: 16px;
+                background: #fafafa;
+              "
+            >
+              <div style="display: flex; align-items: center; gap: 8px; margin-bottom: 8px">
+                <input type="checkbox" id="resolveGenChk" [(ngModel)]="resolveGeneralActive" />
+                <label for="resolveGenChk" style="font-weight: 600; cursor: pointer; color: var(--km-g800)"
+                  >Resolve General Exception</label
+                >
+              </div>
+              @if (resolveGeneralActive) {
+                <div style="margin-left: 20px">
+                  <div class="hv-row">
+                    <label class="hv-label">Verification Document Type<span class="hv-req">*</span></label>
+                    <select class="hv-input" [(ngModel)]="resolveGeneralDocumentType">
+                      <option value="OVD">Officially Valid Document (Passport/Voter ID)</option>
+                    </select>
+                  </div>
+                  <div class="hv-row">
+                    <label class="hv-label">Document Identification Number<span class="hv-req">*</span></label>
+                    <input
+                      type="text"
+                      class="hv-input"
+                      [(ngModel)]="resolveGeneralDocumentNumber"
+                      placeholder="Enter verified document number"
+                    />
+                  </div>
+                </div>
+              }
+            </div>
+          }
+
+          <div class="hv-row">
+            <label class="hv-label">Resolution Comments<span class="hv-req">*</span></label>
+            <textarea
+              class="hv-input hv-textarea"
+              rows="3"
+              placeholder="Describe how verification was resolved..."
+              [(ngModel)]="resolveRemarks"
+            ></textarea>
+          </div>
+        </div>
+
+        <div class="hv-footer">
+          <button class="km-btn" (click)="closeResolveDialog()">Cancel</button>
+          <button class="km-btn km-btn-g" [disabled]="!isResolveValid" (click)="saveResolveKyc()">
+            Complete KYC &amp; Resolve Exception
+          </button>
+        </div>
+      </div>
+    </div>
+  }
+
   <!-- TOAST -->
   <div class="km-toast" [class.show]="toastVisible">{{ toastMsg }}</div>
 </div>

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

@@ -1588,6 +1588,58 @@
   min-height: 60px;
 }
 
+/* Inline note under a field. The default (neutral) form states that nothing is transmitted;
+   the -send and -error variants call out the two cases the officer must not misread. */
+.hv-hint {
+  font-size: 11px;
+  line-height: 1.45;
+  color: var(--km-g500);
+  display: flex;
+  align-items: flex-start;
+  gap: 6px;
+}
+
+.hv-hint-send {
+  color: #0f766e;
+  background: #f0fdfa;
+  border: 1px solid #99f6e4;
+  border-radius: 4px;
+  padding: 6px 8px;
+  font-weight: 500;
+}
+
+.hv-hint-error {
+  color: #b91c1c;
+  background: #fef2f2;
+  border: 1px solid #fecaca;
+  border-radius: 4px;
+  padding: 6px 8px;
+  font-weight: 500;
+}
+
+/* Delivery outcome chip on a contact-log row. A logged attempt and a delivered notice are
+   different facts, so they never share a colour. */
+.km-sent-tag {
+  display: inline-block;
+  margin-left: 6px;
+  padding: 0 5px;
+  border-radius: 3px;
+  font-size: 10px;
+  font-weight: 600;
+  white-space: nowrap;
+  vertical-align: baseline;
+}
+
+.km-sent-ok {
+  background: #e6f4ea;
+  color: #137333;
+}
+
+.km-sent-fail {
+  background: #fef2f2;
+  color: #b91c1c;
+}
+
 .hv-footer {
   padding: 14px 22px;
   border-top: 1px solid var(--km-g200);
@@ -1648,3 +1700,30 @@
   color: #0f172a;
   word-break: break-all;
 }
+
+/* KYC Exceptions Styles */
+.km-ci-e {
+  background: var(--km-amber-l) !important;
+  color: var(--km-amber) !important;
+}
+
+.contact-logs-list {
+  background: #f8fafc;
+  border: 1px solid #e2e8f0;
+  border-radius: 6px;
+  padding: 6px 10px;
+  font-family: inherit;
+
+  &::-webkit-scrollbar {
+    width: 4px;
+  }
+
+  &::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #cbd5e1;
+    border-radius: 2px;
+  }
+}

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

@@ -6,10 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { ClientsService } from '../clients/clients.service';
 
 interface KmNotice {
   no: string;
@@ -31,6 +32,24 @@ interface KmEvidence {
   docket?: string;
 }
 
+/** One outreach attempt, as returned by GET /kyc/exceptions/{clientId}/contact-log. */
+interface KmContactLog {
+  date: string;
+  /** Display label for the channel used, e.g. 'SMS' / 'In-Branch Visit'. */
+  action: string;
+  notes: string;
+  officer: string;
+  /** True when this channel transmits (SMS/Email/WhatsApp) rather than being recorded offline. */
+  platformSent?: boolean;
+  /** True only when the notice actually reached the gateway. */
+  delivered?: boolean;
+  /** SENT | FAILED | SKIPPED_NO_DESTINATION | PROVIDER_NOT_CONFIGURED | NOT_APPLICABLE */
+  deliveryStatus?: string;
+  /** Officer-facing outcome sentence — shown verbatim so a failure is never mistaken for a send. */
+  deliveryMessage?: string;
+  destinationMasked?: string;
+}
+
 interface KmClient {
   id: string;
   av: string;
@@ -66,6 +85,17 @@ interface KmClient {
   pendingActions: string[];
   actionTaken: string[];
   evidence: KmEvidence | null;
+  isException?: boolean;
+  exceptionReason?: string;
+  exceptionRemarks?: string;
+  exceptionDate?: string;
+  exceptionResolved?: boolean;
+  exceptionResolvedOn?: string;
+  contactHistory?: KmContactLog[];
+  kycId?: string;
+  /** Whether the customer has a mobile / email on file — drives channel availability in the dialog. */
+  hasMobile?: boolean;
+  hasEmail?: boolean;
 }
 
 @Component({
@@ -79,7 +109,8 @@ interface KmClient {
   ]
 })
 export class KycManagementComponent implements OnInit {
-  activeSection: 'alerts' | 'notif' | 'audit' | 'status' = 'alerts';
+  private clientsService = inject(ClientsService);
+  activeSection: 'alerts' | 'notif' | 'audit' | 'status' | 'exceptions' = 'alerts';
 
   modalOpen = false;
   modalTab: 'overview' | 'timeline' | 'notices' | 'evidence' | 'action' = 'overview';
@@ -529,15 +560,419 @@ export class KycManagementComponent implements OnInit {
   };
 
   alertRows: KmClient[] = [];
+  exceptionRows: KmClient[] = [];
+  pendingExceptions: KmClient[] = [];
+  resolvedExceptions: KmClient[] = [];
+  activeExceptionSubTab: 'pending' | 'resolved' = 'pending';
+  selectedExceptionReason = '';
+  selectedExceptionContactStatus = '';
+
+  // Dialog properties for exceptions
+  contactDialogOpen = false;
+  contactChannel = 'PHONE_CALL';
+  contactNotes = '';
+  contactOfficer = 'Neha Verma — KYC Officer (Bhopal Main)';
+  /** In-flight guard — a double-click must not send the customer two notices. */
+  contactSaving = false;
+  /** Populated when the save itself failed (not when the save worked but delivery didn't). */
+  contactError = '';
+
+  /**
+   * Channels offered in the Log Customer Contact dialog. `sends` marks the ones where saving
+   * transmits a real notice to the customer, as opposed to recording an action the officer already
+   * took offline — the dialog labels and the confirm button both key off it.
+   */
+  readonly contactChannels: { value: string; label: string; sends: boolean; requires?: 'mobile' | 'email' }[] = [
+    { value: 'PHONE_CALL', label: 'Phone Call', sends: false },
+    { value: 'SMS', label: 'SMS', sends: true, requires: 'mobile' },
+    { value: 'EMAIL', label: 'Email', sends: true, requires: 'email' },
+    { value: 'WHATSAPP', label: 'WhatsApp Message', sends: true, requires: 'mobile' },
+    { value: 'BRANCH_VISIT', label: 'In-Branch Visit', sends: false },
+    { value: 'FIELD_VISIT', label: 'Agent Field Visit', sends: false }
+  ];
+
+  resolveDialogOpen = false;
+  resolveDocumentType = 'PAN';
+  resolveDocumentNumber = '';
+  resolveRemarks = '';
+
+  resolvePanActive = false;
+  resolvePanNumber = '';
+  resolveAadhaarActive = false;
+  resolveAadhaarNumber = '';
+  resolveGeneralActive = false;
+  resolveGeneralDocumentType = 'OVD';
+  resolveGeneralDocumentNumber = '';
+
+  showPanResolution = false;
+  showAadhaarResolution = false;
+  showGeneralResolution = false;
 
   ngOnInit(): void {
     this.alertRows = Object.values(this.clients);
+    this.loadExceptions();
   }
 
-  showSection(section: 'alerts' | 'notif' | 'audit' | 'status'): void {
+  loadExceptions(): void {
+    this.clientsService.getKycExceptions(false).subscribe({
+      next: (data) => {
+        this.pendingExceptions = data.map((item: any) => this.mapException(item, false));
+        this.exceptionRows = this.pendingExceptions;
+        this.loadContactHistories(this.pendingExceptions);
+      },
+      error: (err) => {
+        console.error('Failed to load active exceptions', err);
+        this.pendingExceptions = [];
+        this.exceptionRows = [];
+      }
+    });
+
+    this.clientsService.getKycExceptions(true).subscribe({
+      next: (data) => {
+        this.resolvedExceptions = data.map((item: any) => this.mapException(item, true));
+        this.loadContactHistories(this.resolvedExceptions);
+      },
+      error: (err) => {
+        console.error('Failed to load resolved exceptions', err);
+        this.resolvedExceptions = [];
+      }
+    });
+  }
+
+  private mapException(item: any, resolved: boolean): KmClient {
+    return {
+      id: item.clientId?.toString(),
+      av: (item.clientDisplayName || 'Client')
+        .split(' ')
+        .map((n: string) => n[0])
+        .join('')
+        .substring(0, 2)
+        .toUpperCase(),
+      name: item.clientDisplayName,
+      meta: `${item.clientAccountNo || `CLI-${item.clientId}`} · Savings A/c · ${item.clientOfficeName || 'Bhopal Main'}`,
+      account: item.clientAccountNo || `CLI-${item.clientId}`,
+      state: 'alert',
+      risk: item.riskCategoryCode?.toLowerCase() || 'low',
+      riskLabel: item.riskCategory || 'Low Risk',
+      expiry: 'Pending',
+      daysLeft: 30,
+      kyc: {
+        type: item.kycType || 'Individual',
+        initiated: item.initiatedOn || '—',
+        lastVerified: item.verifiedOn || '—',
+        validity: '—',
+        pan: item.panNumber || '—',
+        aadhaar: item.aadhaarNumberMasked || '—',
+        panStatus: item.panVerified ? 'Verified' : 'Verification Failed',
+        aadhaarStatus: item.aadhaarVerified ? 'Verified' : 'Verification Failed',
+        panLink: 'Not Linked'
+      },
+      contact: {
+        // Masked server-side; the full values never reach the browser. 'Not on file' is meaningful
+        // here — it's why an SMS or Email channel will be unavailable for this customer.
+        mobile: item.clientMobileMasked || 'Not on file',
+        email: item.clientEmailMasked || 'Not on file',
+        address: 'Client Address, Bhopal MP 462002',
+        branch: item.clientOfficeName || 'Bhopal Main'
+      },
+      notices: [],
+      noticesSent: 0,
+      noticePending: resolved ? 'Resolved Exception' : 'Pending verification',
+      nextStage: resolved ? 'Exception Resolved' : 'KYC Exceptions review',
+      pendingActions: resolved ? [] : ['Resolve Exception reasons'],
+      actionTaken: resolved ? ['KYC Exception resolved'] : [],
+      evidence: null,
+      isException: true,
+      // No invented default — a record whose reason was never stored (or was cleared by the old
+      // resolve path) must not be relabelled as a PAN failure it may never have had.
+      exceptionReason: item.exceptionReason || 'Reason not recorded',
+      exceptionRemarks: item.remarks || '',
+      exceptionDate: item.initiatedOn || '—',
+      exceptionResolved: resolved,
+      exceptionResolvedOn: item.exceptionResolvedOn || '—',
+      contactHistory: [],
+      kycId: item.id?.toString(),
+      hasMobile: item.hasMobile === true,
+      hasEmail: item.hasEmail === true
+    };
+  }
+
+  /**
+   * Pull each row's persisted outreach history. Fired after the exception list loads; a failure on
+   * one row leaves that row's history empty rather than blanking the whole grid.
+   */
+  private loadContactHistories(rows: KmClient[]): void {
+    for (const row of rows) {
+      if (!row.id) continue;
+      this.clientsService.getKycContactLog(row.id).subscribe({
+        next: (logs) => {
+          row.contactHistory = (logs || []).map((log: any) => this.mapContactLog(log));
+        },
+        error: (err) => {
+          console.error(`Failed to load contact log for client ${row.id}`, err);
+        }
+      });
+    }
+  }
+
+  get notYetContactedCount(): number {
+    return this.exceptionRows.filter((c) => !c.contactHistory || c.contactHistory.length === 0).length;
+  }
+
+  get panMismatchesCount(): number {
+    return this.exceptionRows.filter((c) => c.exceptionReason?.includes('PAN')).length;
+  }
+
+  get aadhaarFailuresCount(): number {
+    return this.exceptionRows.filter((c) => c.exceptionReason?.includes('Aadhaar')).length;
+  }
+
+  showSection(section: 'alerts' | 'notif' | 'audit' | 'status' | 'exceptions'): void {
     this.activeSection = section;
   }
 
+  openContactDialog(client: KmClient): void {
+    this.current = client;
+    this.contactChannel = 'PHONE_CALL';
+    this.contactNotes = '';
+    this.contactError = '';
+    this.contactSaving = false;
+    this.contactOfficer = this.bankOfficers[1]; // Neha Verma
+    this.contactDialogOpen = true;
+  }
+
+  closeContactDialog(): void {
+    this.contactDialogOpen = false;
+  }
+
+  /** The channel currently picked in the dialog. */
+  get selectedChannel(): { value: string; label: string; sends: boolean; requires?: 'mobile' | 'email' } | undefined {
+    return this.contactChannels.find((c) => c.value === this.contactChannel);
+  }
+
+  /** True when saving will transmit a notice to the customer, not merely record one. */
+  get selectedChannelSends(): boolean {
+    return this.selectedChannel?.sends === true;
+  }
+
+  /**
+   * True when the picked channel needs a destination the customer doesn't have. Blocks the save so
+   * the officer isn't left reading a failure they could have seen up front.
+   */
+  get selectedChannelUnavailable(): boolean {
+    const requires = this.selectedChannel?.requires;
+    if (!requires || !this.current) return false;
+    return requires === 'mobile' ? this.current.hasMobile === false : this.current.hasEmail === false;
+  }
+
+  get contactSaveDisabled(): boolean {
+    return !this.contactNotes?.trim() || !this.contactChannel || this.contactSaving || this.selectedChannelUnavailable;
+  }
+
+  /** 'Send & Save' when a notice goes out, plain 'Save Log' when it's an offline record. */
+  get contactSaveLabel(): string {
+    if (this.contactSaving) return this.selectedChannelSends ? 'Sending…' : 'Saving…';
+    return this.selectedChannelSends ? 'Send & Save' : 'Save Log';
+  }
+
+  saveContactLog(): void {
+    if (!this.current || this.contactSaveDisabled) return;
+
+    const client = this.current;
+    this.contactSaving = true;
+    this.contactError = '';
+
+    this.clientsService
+      .saveKycContactLog(client.id, {
+        channel: this.contactChannel,
+        notes: this.contactNotes.trim(),
+        officerName: this.contactOfficer
+      })
+      .subscribe({
+        next: (log: any) => {
+          this.contactSaving = false;
+          client.contactHistory = [
+            ...(client.contactHistory || []),
+            this.mapContactLog(log)
+          ];
+
+          // The request succeeding does not mean the customer was reached — a gateway failure comes
+          // back as HTTP 200 with delivered=false, so report what actually happened.
+          if (log?.platformSent && !log?.delivered) {
+            this.toast(log?.deliveryMessage || `Logged, but the ${log?.channelLabel || 'message'} could not be sent.`);
+          } else {
+            this.toast(log?.deliveryMessage || `Contact attempt logged successfully for ${client.name}`);
+          }
+          this.contactDialogOpen = false;
+        },
+        error: (err) => {
+          this.contactSaving = false;
+          // Keep the dialog open — the officer's notes are still in the textarea and would
+          // otherwise be lost.
+          this.contactError =
+            err?.error?.errors?.[0]?.defaultUserMessage ||
+            err?.error?.defaultUserMessage ||
+            'Could not save the contact log. Please try again.';
+        }
+      });
+  }
+
+  private mapContactLog(log: any): KmContactLog {
+    return {
+      date: log?.contactedAt ? this.formatLogDate(log.contactedAt) : '—',
+      action: log?.channelLabel || log?.channel || 'Contact',
+      notes: log?.notes || '',
+      officer: (log?.officerName || '').split(' — ')[0],
+      platformSent: log?.platformSent,
+      delivered: log?.delivered,
+      deliveryStatus: log?.deliveryStatus,
+      deliveryMessage: log?.deliveryMessage,
+      destinationMasked: log?.destinationMasked
+    };
+  }
+
+  /**
+   * `contactedAt` arrives as a LocalDateTime — Jackson serialises it as an ISO string or as a
+   * [y, m, d, h, min, s] array depending on the tenant's date-format setting, so handle both.
+   */
+  private formatLogDate(value: any): string {
+    const date = Array.isArray(value)
+      ? new Date(value[0], (value[1] || 1) - 1, value[2] || 1, value[3] || 0, value[4] || 0)
+      : new Date(value);
+    if (isNaN(date.getTime())) return '—';
+    return date.toLocaleDateString('en-IN', { day: '2-digit', month: 'short', year: 'numeric' });
+  }
+
+  get isResolveValid(): boolean {
+    if (!this.resolveRemarks?.trim()) return false;
+    let anyActive = false;
+    if (this.showPanResolution && this.resolvePanActive) {
+      anyActive = true;
+      if (!this.resolvePanNumber || this.resolvePanNumber.trim().length !== 10) return false;
+    }
+    if (this.showAadhaarResolution && this.resolveAadhaarActive) {
+      anyActive = true;
+      if (!this.resolveAadhaarNumber || this.resolveAadhaarNumber.trim().length !== 12) return false;
+    }
+    if (this.showGeneralResolution && this.resolveGeneralActive) {
+      anyActive = true;
+      if (!this.resolveGeneralDocumentNumber?.trim()) return false;
+    }
+    return anyActive;
+  }
+
+  openResolveDialog(client: KmClient): void {
+    this.current = client;
+    const reason = client.exceptionReason || '';
+    this.showPanResolution = reason.includes('PAN');
+    this.showAadhaarResolution = reason.includes('Aadhaar');
+    this.showGeneralResolution = !this.showPanResolution && !this.showAadhaarResolution;
+
+    this.resolvePanActive = this.showPanResolution;
+    this.resolveAadhaarActive = this.showAadhaarResolution;
+    this.resolveGeneralActive = this.showGeneralResolution;
+
+    this.resolvePanNumber = '';
+    this.resolveAadhaarNumber = '';
+    this.resolveGeneralDocumentType = 'OVD';
+    this.resolveGeneralDocumentNumber = '';
+    this.resolveRemarks = '';
+    this.resolveDialogOpen = true;
+  }
+
+  closeResolveDialog(): void {
+    this.resolveDialogOpen = false;
+  }
+
+  saveResolveKyc(): void {
+    if (!this.current || !this.current.kycId) return;
+    const clientId = this.current.id;
+    const kycId = this.current.kycId;
+
+    const today = new Date();
+    const day = today.getDate().toString().padStart(2, '0');
+    const months = [
+      'January',
+      'February',
+      'March',
+      'April',
+      'May',
+      'June',
+      'July',
+      'August',
+      'September',
+      'October',
+      'November',
+      'December'
+    ];
+    const monthStr = months[today.getMonth()];
+    const year = today.getFullYear();
+    const dateStr = `${day} ${monthStr} ${year}`;
+
+    const resolvingPan = this.showPanResolution && this.resolvePanActive;
+    const resolvingAadhaar = this.showAadhaarResolution && this.resolveAadhaarActive;
+    const resolvingGeneral = this.showGeneralResolution && this.resolveGeneralActive;
+
+    const remainsPan = this.showPanResolution && !this.resolvePanActive;
+    const remainsAadhaar = this.showAadhaarResolution && !this.resolveAadhaarActive;
+
+    const isFullyResolved = !remainsPan && !remainsAadhaar;
+
+    const resolvedKycData: any = {
+      locale: 'en',
+      dateFormat: 'dd MMMM yyyy',
+      remarks: this.resolveRemarks || 'Resolved via exceptions dashboard'
+    };
+
+    if (isFullyResolved) {
+      resolvedKycData.isException = false;
+      resolvedKycData.exceptionResolved = true;
+      resolvedKycData.exceptionResolvedOn = dateStr;
+      // Keep exceptionReason — the Resolved tab shows what was resolved, and clearing it destroys
+      // the audit record of why the exception was ever raised.
+    } else {
+      resolvedKycData.isException = true;
+      resolvedKycData.exceptionResolved = false;
+      const remainingReasons: string[] = [];
+      if (remainsPan) remainingReasons.push('PAN Card Verification Failed');
+      if (remainsAadhaar) remainingReasons.push('Aadhaar Verification Failed');
+      resolvedKycData.exceptionReason = remainingReasons.join(', ');
+    }
+
+    if (resolvingPan) {
+      resolvedKycData.panNumber = this.resolvePanNumber.toUpperCase().trim();
+      resolvedKycData.panVerified = true;
+    }
+    if (resolvingAadhaar) {
+      const aadhaarRaw = this.resolveAadhaarNumber.trim();
+      resolvedKycData.aadhaarNumberMasked = 'XXXXXXXX' + aadhaarRaw.slice(-4);
+      resolvedKycData.aadhaarVerified = true;
+    }
+    if (resolvingGeneral) {
+      resolvedKycData.kycDocumentName = this.resolveGeneralDocumentType;
+      resolvedKycData.kycDocumentNumber = this.resolveGeneralDocumentNumber;
+      resolvedKycData.isException = false;
+      resolvedKycData.exceptionResolved = true;
+      resolvedKycData.exceptionResolvedOn = dateStr;
+      // exceptionReason preserved — see the fully-resolved branch above.
+    }
+
+    this.clientsService.updateClientKyc(clientId, kycId, resolvedKycData).subscribe({
+      next: () => {
+        const msg = isFullyResolved
+          ? `KYC Exception fully resolved and completed for ${this.current?.name}`
+          : `KYC Exception partially resolved for ${this.current?.name}`;
+        this.toast(msg);
+        this.loadExceptions();
+        this.resolveDialogOpen = false;
+      },
+      error: (err) => {
+        console.error('Failed to resolve exception', err);
+        this.toast('Failed to resolve exception. Please try again.');
+      }
+    });
+  }
+
   openModal(id: string): void {
     const c = this.clients[id];
     if (!c) return;

src/app/letter-mgmt/certificates/certificates.shared.scss

@@ -505,3 +505,72 @@
   font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
   color: var(--cert-g900);
 }
+
+/* Form 121 register — eligibility warnings and the quarter-wise drill-down */
+
+/* A row the branch needs to look at: an ineligible declaration, or the quarter
+   in which the 194A threshold was crossed. */
+.cert-row--warn > td {
+  background: color-mix(in srgb, var(--cert-amber) 7%, transparent);
+}
+
+.cert-row--detail > td {
+  background: var(--cert-g50);
+  padding: 16px;
+}
+
+.cert-note {
+  display: flex;
+  gap: 10px;
+  align-items: flex-start;
+  margin-bottom: 12px;
+  padding: 10px 12px;
+  border-radius: 8px;
+  background: color-mix(in srgb, var(--cert-blue) 6%, transparent);
+  border-left: 3px solid var(--cert-blue);
+  font-size: 12px;
+  color: var(--cert-g900);
+  line-height: 1.5;
+
+  fa-icon {
+    color: var(--cert-blue);
+    flex-shrink: 0;
+    margin-top: 1px;
+  }
+
+  ul {
+    margin: 6px 0 0;
+    padding-left: 18px;
+  }
+
+  li + li {
+    margin-top: 4px;
+  }
+
+  &--warn {
+    background: color-mix(in srgb, var(--cert-amber) 8%, transparent);
+    border-left-color: var(--cert-amber);
+
+    fa-icon {
+      color: var(--cert-amber);
+    }
+  }
+}
+
+/* The quarter table nested inside an expanded row. */
+.cert-table--inner {
+  background: #fff;
+  border: 1px solid var(--cert-g200);
+  border-radius: 8px;
+  overflow: hidden;
+  margin-bottom: 10px;
+
+  th {
+    background: #fff;
+    border-bottom: 1px solid var(--cert-g200);
+  }
+
+  .cert-pill {
+    margin-left: 6px;
+  }
+}

src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.html

@@ -11,158 +11,347 @@
     <div class="cert-head-l">
       <fa-icon icon="file-signature" class="cert-head-ic"></fa-icon>
       <div>
-        <h2 class="cert-head-t">Form 121</h2>
-        <div class="cert-head-s">TDS-waiver declarations for FD / RD interest income — Form 121.</div>
+        <h2 class="cert-head-t">{{ statute.form }}</h2>
+        <div class="cert-head-s">
+          @if (viewMode === 'demo') {
+            Declarations to stop tax being deducted on fixed and recurring deposit interest under
+            {{ statute.section }}. Reported in {{ statute.statement }}; the consolidated statement of declarations is
+            uploaded {{ statute.frequency }}.
+          } @else {
+            Live customer declarations, sourced from client accounts and KYC profiles.
+          }
+        </div>
       </div>
     </div>
+    <div class="cert-head-r">
+      @if (viewMode === 'demo') {
+        <button
+          type="button"
+          class="cert-cta-btn"
+          (click)="toggleViewMode()"
+          matTooltip="Use real client KYC and account data from Fineract"
+        >
+          <fa-icon icon="database"></fa-icon> Real Declarations
+        </button>
+      } @else {
+        <button
+          type="button"
+          class="cert-cta-btn cert-cta-btn--muted"
+          (click)="toggleViewMode()"
+          matTooltip="Back to the sample data page"
+        >
+          <fa-icon icon="table"></fa-icon> Sample Data
+        </button>
+      }
+    </div>
   </div>
 
-  <!-- KPI strip -->
-  <div class="cert-kpis">
-    <div class="cert-kpi cert-kpi--blue">
-      <fa-icon icon="user" class="cert-kpi-ic"></fa-icon>
-      <div>
-        <div class="cert-kpi-n">{{ count15G() | number }}</div>
-        <div class="cert-kpi-l">Form 121 (under 60)</div>
-      </div>
-    </div>
-    <div class="cert-kpi cert-kpi--amber">
-      <fa-icon icon="user-tie" class="cert-kpi-ic"></fa-icon>
-      <div>
-        <div class="cert-kpi-n">{{ count15H() | number }}</div>
-        <div class="cert-kpi-l">Form 121 (60+)</div>
-      </div>
-    </div>
-    <div class="cert-kpi cert-kpi--green">
-      <fa-icon icon="check-circle" class="cert-kpi-ic"></fa-icon>
-      <div>
-        <div class="cert-kpi-n">{{ countFiled() | number }}</div>
-        <div class="cert-kpi-l">Filed this FY</div>
-      </div>
-    </div>
-    <div class="cert-kpi cert-kpi--teal">
-      <fa-icon icon="coins" class="cert-kpi-ic"></fa-icon>
-      <div>
-        <div class="cert-kpi-n">₹{{ totalInterest() | number: '1.0-0' }}</div>
-        <div class="cert-kpi-l">Projected Interest</div>
-      </div>
-    </div>
-  </div>
+  @if (viewMode === 'real') {
+    <mifosx-real-form15gh-view></mifosx-real-form15gh-view>
+  }
 
-  <!-- Filters -->
-  <div class="cert-filters">
-    <div class="cert-filter">
-      <label>Customer / Customer ID / PAN</label>
-      <div class="cert-input-ic">
-        <fa-icon icon="search"></fa-icon>
-        <input type="text" [(ngModel)]="search" placeholder="e.g. CUST556677 or customer name" />
+  @if (viewMode === 'demo') {
+    <!-- KPI strip -->
+    <div class="cert-kpis">
+      <div class="cert-kpi cert-kpi--blue">
+        <fa-icon icon="user" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">{{ countGeneralBand() | number }}</div>
+          <div class="cert-kpi-l">General band (under 60)</div>
+        </div>
       </div>
+      <div class="cert-kpi cert-kpi--amber">
+        <fa-icon icon="user-tie" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">{{ countSeniorBand() | number }}</div>
+          <div class="cert-kpi-l">Senior citizen band (60+)</div>
+        </div>
+      </div>
+      <div class="cert-kpi cert-kpi--green">
+        <fa-icon icon="check-circle" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">{{ countFiled() | number }}</div>
+          <div class="cert-kpi-l">Filed this FY</div>
+        </div>
+      </div>
+      <div class="cert-kpi cert-kpi--teal">
+        <fa-icon icon="coins" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">₹{{ totalInterest() | number: '1.0-0' }}</div>
+          <div class="cert-kpi-l">Projected Interest</div>
+        </div>
+      </div>
+      <div class="cert-kpi cert-kpi--green">
+        <fa-icon icon="shield-alt" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">₹{{ totalTdsSaved() | number: '1.0-0' }}</div>
+          <div class="cert-kpi-l">TDS Saved</div>
+        </div>
+      </div>
+      @if (countIneligible() > 0) {
+        <div class="cert-kpi cert-kpi--amber">
+          <fa-icon icon="exclamation-triangle" class="cert-kpi-ic"></fa-icon>
+          <div>
+            <div class="cert-kpi-n">{{ countIneligible() | number }}</div>
+            <div class="cert-kpi-l">Not Eligible</div>
+          </div>
+        </div>
+      }
     </div>
 
-    <div class="cert-filter">
-      <label>Form Type</label>
-      <select [(ngModel)]="kindFilter">
-        <option value="">All Form 121</option>
-        <option value="15G">Form 121 (Below 60 years)</option>
-        <option value="15H">Form 121 (Senior Citizen 60+)</option>
-      </select>
+    <!-- Filters -->
+    <div class="cert-filters">
+      <div class="cert-filter">
+        <label>Customer / Customer ID / PAN</label>
+        <div class="cert-input-ic">
+          <fa-icon icon="search"></fa-icon>
+          <input type="text" [(ngModel)]="search" placeholder="e.g. CUST556677 or customer name" />
+        </div>
+      </div>
+
+      <div class="cert-filter">
+        <label>Threshold Band</label>
+        <select [(ngModel)]="bandFilter">
+          <option value="">All bands</option>
+          <option value="GENERAL">General (below 60)</option>
+          <option value="SENIOR">Senior citizen (60+)</option>
+        </select>
+      </div>
+
+      <div class="cert-filter">
+        <label>Status</label>
+        <select [(ngModel)]="statusFilter">
+          <option value="">All statuses</option>
+          <option value="FILED">Filed</option>
+          <option value="PENDING">Pending</option>
+        </select>
+      </div>
+
+      <div class="cert-filter">
+        <label>Eligibility</label>
+        <select [(ngModel)]="ineligibleOnly">
+          <option [ngValue]="false">All customers</option>
+          <option [ngValue]="true">Not eligible only</option>
+        </select>
+      </div>
+
+      @if (search || bandFilter || statusFilter || ineligibleOnly) {
+        <button type="button" class="cert-clear" (click)="clearFilters()">
+          <fa-icon icon="times"></fa-icon> Clear
+        </button>
+      }
     </div>
 
-    <div class="cert-filter">
-      <label>Status</label>
-      <select [(ngModel)]="statusFilter">
-        <option value="">All statuses</option>
-        <option value="FILED">Filed</option>
-        <option value="PENDING">Pending</option>
-      </select>
-    </div>
-
-    @if (search || kindFilter || statusFilter) {
-      <button type="button" class="cert-clear" (click)="clearFilters()"><fa-icon icon="times"></fa-icon> Clear</button>
-    }
-  </div>
-
-  <!-- Table -->
-  <div class="cert-card">
-    <div class="cert-table-wrap">
-      <table class="cert-table">
-        <thead>
-          <tr>
-            <th>Customer · PAN</th>
-            <th>Form Type</th>
-            <th>Age</th>
-            <th>Branch</th>
-            <th class="num">Deposit Principal</th>
-            <th class="num">Est. Interest ({{ records[0]?.fy }})</th>
-            <th>Status</th>
-            <th class="col-actions">Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (r of filteredRecords; track r.customerId) {
+    <!-- Table -->
+    <div class="cert-card">
+      <div class="cert-table-wrap">
+        <table class="cert-table">
+          <thead>
             <tr>
-              <td>
-                <div class="cert-cust-name">{{ r.customerName }}</div>
-                <div class="mono small muted">{{ r.customerId }} · PAN {{ r.customerPan }}</div>
-                <div class="small muted">DOB {{ r.dob | date: 'd MMM y' }}</div>
-              </td>
-              <td>
-                <span
-                  class="cert-pill"
-                  [class.cert-pill--blue]="formKind(r) === '15G'"
-                  [class.cert-pill--amber]="formKind(r) === '15H'"
-                >
-                  Form 121 ({{ formKind(r) }})
-                </span>
-              </td>
-              <td class="small">{{ age(r.dob) }} yrs</td>
-              <td class="small">{{ r.branch }}</td>
-              <td class="num">₹{{ r.depositPrincipal | number: '1.0-0' }}</td>
-              <td class="num">
-                <strong class="cert-interest">₹{{ r.estimatedInterest | number: '1.0-0' }}</strong>
-              </td>
-              <td>
-                @if (r.status === 'FILED') {
-                  <span class="cert-pill cert-pill--green"> <fa-icon icon="check-circle"></fa-icon> Filed </span>
-                  @if (r.filedOn) {
-                    <div class="mono small muted">{{ r.filedOn | date: 'd MMM y' }}</div>
+              <th>Customer · PAN</th>
+              <th>Form · Band</th>
+              <th>Age</th>
+              <th>Branch</th>
+              <th class="num">Est. Interest</th>
+              <th class="num">Threshold</th>
+              <th class="num">TDS Payable</th>
+              <th class="num">TDS Saved</th>
+              <th>Settlement</th>
+              <th>Status</th>
+              <th class="col-actions">Actions</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (row of filteredRows; track row.record.customerId) {
+              <tr [class.cert-row--warn]="!row.eligibility.eligible">
+                <td>
+                  <div class="cert-cust-name">{{ row.record.customerName }}</div>
+                  <div class="mono small muted">{{ row.record.customerId }} · PAN {{ row.record.customerPan }}</div>
+                  <div class="small muted">DOB {{ row.record.dob | date: 'd MMM y' }}</div>
+                </td>
+                <td>
+                  <span
+                    class="cert-pill"
+                    [class.cert-pill--blue]="row.band === 'GENERAL'"
+                    [class.cert-pill--amber]="row.band === 'SENIOR'"
+                  >
+                    {{ row.form === '121' ? 'Form 121' : 'Form ' + row.form }}
+                  </span>
+                  <div class="small muted">{{ row.band === 'SENIOR' ? 'Senior citizen' : 'General' }}</div>
+                </td>
+                <td class="small">{{ row.age }} yrs</td>
+                <td class="small">{{ row.record.branch }}</td>
+                <td class="num">
+                  <strong class="cert-interest">₹{{ row.record.estimatedInterest | number: '1.0-0' }}</strong>
+                </td>
+                <td class="num small muted">₹{{ row.schedule.threshold | number: '1.0-0' }}</td>
+                <td class="num">
+                  @if (row.schedule.totalTds > 0) {
+                    <strong>₹{{ row.schedule.totalTds | number: '1.0-0' }}</strong>
+                    <div class="small muted">@ {{ row.schedule.rateApplied * 100 | number: '1.0-0' }}%</div>
+                  } @else {
+                    <span class="small muted">—</span>
                   }
-                } @else {
-                  <span class="cert-pill cert-pill--amber"> <fa-icon icon="hourglass-half"></fa-icon> Pending </span>
-                }
-              </td>
-              <td class="col-actions">
-                <div class="cert-row-actions">
-                  <button
-                    type="button"
-                    class="cert-icon-btn primary"
-                    (click)="viewCertificate(r)"
-                    matTooltip="View / Print declaration"
-                  >
-                    <fa-icon icon="eye"></fa-icon>
-                  </button>
-                  <button
-                    type="button"
-                    class="cert-icon-btn"
-                    (click)="downloadCertificate(r)"
-                    matTooltip="Download PDF"
-                  >
-                    <fa-icon icon="download"></fa-icon>
-                  </button>
-                </div>
-              </td>
-            </tr>
-          }
-          @if (filteredRecords.length === 0) {
-            <tr>
-              <td colspan="8" class="cert-empty">
-                <fa-icon icon="info-circle"></fa-icon>
-                No declarations match the current filters.
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
+                </td>
+                <td class="num">
+                  @if (row.tdsSaved > 0) {
+                    <strong class="cert-interest">₹{{ row.tdsSaved | number: '1.0-0' }}</strong>
+                  } @else {
+                    <span class="small muted">—</span>
+                  }
+                </td>
+                <td class="small">
+                  <span class="cert-pill" [class.cert-pill--blue]="row.mode === 'QUARTERLY'">
+                    {{ row.mode === 'QUARTERLY' ? 'Quarterly' : 'Year end' }}
+                  </span>
+                  <div class="small muted">product-driven</div>
+                </td>
+                <td>
+                  @if (row.record.status === 'FILED') {
+                    <span class="cert-pill cert-pill--green"> <fa-icon icon="check-circle"></fa-icon> Filed </span>
+                    @if (row.record.filedOn) {
+                      <div class="mono small muted">{{ row.record.filedOn | date: 'd MMM y' }}</div>
+                    }
+                  } @else {
+                    <span class="cert-pill cert-pill--amber"> <fa-icon icon="hourglass-half"></fa-icon> Pending </span>
+                  }
+                  @if (!row.eligibility.eligible) {
+                    <div class="cert-pill cert-pill--amber">
+                      <fa-icon icon="exclamation-triangle"></fa-icon> Not eligible
+                    </div>
+                  }
+                </td>
+                <td class="col-actions">
+                  <div class="cert-row-actions">
+                    <button
+                      type="button"
+                      class="cert-icon-btn"
+                      (click)="toggleExpanded(row)"
+                      [matTooltip]="isExpanded(row) ? 'Hide quarter-wise' : 'Show quarter-wise'"
+                    >
+                      <fa-icon [icon]="isExpanded(row) ? 'chevron-up' : 'chevron-down'"></fa-icon>
+                    </button>
+                    <button
+                      type="button"
+                      class="cert-icon-btn primary"
+                      (click)="viewCertificate(row)"
+                      matTooltip="View / Print declaration"
+                    >
+                      <fa-icon icon="eye"></fa-icon>
+                    </button>
+                    <button
+                      type="button"
+                      class="cert-icon-btn"
+                      (click)="downloadCertificate(row)"
+                      matTooltip="Download PDF"
+                    >
+                      <fa-icon icon="download"></fa-icon>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+
+              @if (isExpanded(row)) {
+                <tr class="cert-row--detail">
+                  <td colspan="11">
+                    @if (!row.eligibility.eligible) {
+                      <div class="cert-note cert-note--warn">
+                        <fa-icon icon="exclamation-triangle"></fa-icon>
+                        <div>
+                          <strong>Declaration cannot be accepted</strong>
+                          <ul>
+                            @for (reason of row.eligibility.reasons; track reason) {
+                              <li>{{ reason }}</li>
+                            }
+                          </ul>
+                        </div>
+                      </div>
+                    }
+                    @for (note of row.eligibility.unassessed; track note) {
+                      <div class="cert-note">
+                        <fa-icon icon="info-circle"></fa-icon>
+                        <div>{{ note }}</div>
+                      </div>
+                    }
+                    @for (note of row.schedule.notes; track note) {
+                      <div class="cert-note">
+                        <fa-icon icon="info-circle"></fa-icon>
+                        <div>{{ note }}</div>
+                      </div>
+                    }
+
+                    <table class="cert-table cert-table--inner">
+                      <thead>
+                        <tr>
+                          <th>Quarter</th>
+                          <th class="num">Interest</th>
+                          <th class="num">Cumulative</th>
+                          <th class="num">Liability to date</th>
+                          <th class="num">TDS this quarter</th>
+                          <th>Return due</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        @for (line of row.schedule.lines; track line.quarter) {
+                          <tr [class.cert-row--warn]="line.thresholdCrossedHere">
+                            <td class="small">
+                              {{ line.label }}
+                              @if (line.thresholdCrossedHere) {
+                                <span class="cert-pill cert-pill--amber">threshold crossed</span>
+                              }
+                              @if (line.declarationActive) {
+                                <span class="cert-pill cert-pill--green">Form 121 active</span>
+                              }
+                            </td>
+                            <td class="num">₹{{ line.interest | number: '1.0-0' }}</td>
+                            <td class="num">₹{{ line.cumInterest | number: '1.0-0' }}</td>
+                            <td class="num">₹{{ line.cumLiability | number: '1.0-0' }}</td>
+                            <td class="num">
+                              @if (line.tds !== 0) {
+                                <strong>₹{{ line.tds | number: '1.0-0' }}</strong>
+                              } @else {
+                                <span class="small muted">—</span>
+                              }
+                            </td>
+                            <td class="small muted">{{ line.dueDate }}</td>
+                          </tr>
+                        }
+                        <tr>
+                          <td class="small"><strong>Total</strong></td>
+                          <td class="num">
+                            <strong>₹{{ row.schedule.totalInterest | number: '1.0-0' }}</strong>
+                          </td>
+                          <td></td>
+                          <td></td>
+                          <td class="num">
+                            <strong>₹{{ row.schedule.totalTds | number: '1.0-0' }}</strong>
+                          </td>
+                          <td></td>
+                        </tr>
+                      </tbody>
+                    </table>
+
+                    @if (row.schedule.shieldedInterest > 0) {
+                      <div class="small muted">
+                        ₹{{ row.schedule.shieldedInterest | number: '1.0-0' }} paid without deduction on the strength of
+                        the declaration — reportable in the quarterly {{ statute.statement }} return.
+                      </div>
+                    }
+                  </td>
+                </tr>
+              }
+            }
+            @if (filteredRows.length === 0) {
+              <tr>
+                <td colspan="11" class="cert-empty">
+                  <fa-icon icon="info-circle"></fa-icon>
+                  No declarations match the current filters.
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
     </div>
-  </div>
+  }
 </div>

src/app/letter-mgmt/certificates/form-15gh/form-15gh.component.ts

@@ -21,9 +21,31 @@ import {
 } from '../certificate-preview-dialog/certificate-preview-dialog.component';
 import { downloadForm15ghPdf } from '../certificate-pdf';
 import { DscSignService } from '../../dsc-sign-dialog/dsc-sign.service';
+import { RealForm15ghViewComponent } from './real-form15gh-view/real-form15gh-view.component';
 
-export type Form15Kind = '15G' | '15H';
+import {
+  Declaration,
+  DeclarationForm,
+  EligibilityResult,
+  FY_TAX_CONFIG,
+  Form15Kind,
+  TdsMode,
+  TdsSchedule,
+  ageInFy,
+  buildSchedule,
+  checkEligibility,
+  declarationFormFor,
+  formKindFor,
+  isSeniorInFy,
+  normaliseFy,
+  projectQuarterlyCredits,
+  tdsModeFor
+} from './tds-15gh.compute';
+
+export type { Form15Kind };
 export type Form15Status = 'FILED' | 'PENDING';
+/** Which deduction trigger the payee falls under. Age-based, still. */
+export type ThresholdBand = 'GENERAL' | 'SENIOR';
 
 export interface Form15ghRecord {
   customerId: string;
@@ -32,18 +54,46 @@ export interface Form15ghRecord {
   customerAddress: string;
   dob: string;
   branch: string;
-  /** Aggregate interest the bank will pay this FY. */
+  /** Aggregate interest the bank will pay this FY across the customer's time deposits. */
   estimatedInterest: number;
-  /** Customer's total estimated income for the FY. */
+  /** Customer's total estimated income for the FY, as declared by them. */
   estimatedIncome: number;
   /** Sum of FD / RD principals tied to the declaration. */
   depositPrincipal: number;
   fy: string;
   status: Form15Status;
   filedOn?: string;
-  /** "Yes / No" for: has any income tax been assessed for the customer
-      under the IT Act in the past six years? */
+  /**
+   * "Yes / No" for: has any income tax been assessed for the customer under the
+   * IT Act in the past six years?
+   */
   assessed: boolean;
+  /**
+   * The deposit product's interest-posting frequency. Tax falls due when interest
+   * is credited, so this — and not any customer preference — decides whether it
+   * settles quarterly or at year end.
+   */
+  interestPostingPeriodType: string;
+}
+
+/** A register row with everything the engine derived for it, computed once. */
+export interface Form15ghRow {
+  record: Form15ghRecord;
+  /** The form actually in force for the record's year — '121' from FY 2026-27. */
+  form: DeclarationForm;
+  /**
+   * The 15G/15H label. Only a form distinction up to FY 2025-26; from FY 2026-27
+   * the forms merged and this reflects the threshold band alone.
+   */
+  kind: Form15Kind;
+  band: ThresholdBand;
+  age: number;
+  mode: TdsMode;
+  /** Schedule as things stand, declaration included where one is on record. */
+  schedule: TdsSchedule;
+  /** Tax the declaration kept out of the customer's pocket this year. */
+  tdsSaved: number;
+  eligibility: EligibilityResult;
 }
 
 @Component({
@@ -55,7 +105,8 @@ export interface Form15ghRecord {
     CommonModule,
     FormsModule,
     FaIconComponent,
-    MatTooltip
+    MatTooltip,
+    RealForm15ghViewComponent
   ]
 })
 export class Form15ghComponent implements OnInit {
@@ -63,40 +114,89 @@ export class Form15ghComponent implements OnInit {
   private snack = inject(MatSnackBar);
   private dscSign = inject(DscSignService);
 
+  /** Mode toggle: 'demo' uses mock seed data; 'real' pulls live Fineract data. */
+  viewMode: 'demo' | 'real' = 'demo';
+
   // ── Filters ──
   search = '';
-  /** Which form. Empty = both. */
-  kindFilter: '' | Form15Kind = '';
+  /** Which deduction trigger. Empty = both bands. */
+  bandFilter: '' | ThresholdBand = '';
   statusFilter: '' | Form15Status = '';
+  /** Show only declarations the branch cannot lawfully accept. */
+  ineligibleOnly = false;
 
-  records: Form15ghRecord[] = [];
+  /** Which row's quarter-wise breakdown is open. */
+  expandedId: string | null = null;
+
+  rows: Form15ghRow[] = [];
 
   ngOnInit(): void {
-    this.records = seedForm15gh();
+    // Derived once. The template reads these many times per change-detection
+    // pass, and re-running the schedules on every read is what made the other
+    // register screens stall.
+    this.rows = seedForm15gh().map((record) => this.buildRow(record));
   }
 
-  /** Compute age in years from DoB. */
-  age(dob: string): number {
-    if (!dob) return 0;
-    const today = new Date();
-    const birth = new Date(dob);
-    let age = today.getFullYear() - birth.getFullYear();
-    const m = today.getMonth() - birth.getMonth();
-    if (m < 0 || (m === 0 && today.getDate() < birth.getDate())) age--;
-    return age;
+  private buildRow(record: Form15ghRecord): Form15ghRow {
+    const ctx = {
+      fy: record.fy,
+      dateOfBirth: record.dob,
+      pan: record.customerPan,
+      resident: true
+    };
+
+    const declaration: Declaration | null =
+      record.status === 'FILED'
+        ? {
+            kind: formKindFor(record.dob, record.fy),
+            // The register holds the filing date; a declaration operates from
+            // the day the branch accepted it.
+            acceptedOn: record.filedOn ?? `${record.fy.replace(/\D/g, '').slice(0, 4)}-04-01`,
+            fy: record.fy
+          }
+        : null;
+
+    const mode = tdsModeFor({ interestPostingPeriodType: record.interestPostingPeriodType });
+    // The register carries a projected annual figure rather than real postings,
+    // so spread it across the year to drive the schedule.
+    const credits = projectQuarterlyCredits(record.estimatedInterest, record.fy);
+
+    const schedule = buildSchedule(mode, credits, { ...ctx, declaration });
+    const withoutDeclaration = buildSchedule(mode, credits, { ...ctx, declaration: null });
+
+    return {
+      record,
+      form: declarationFormFor(record.fy, record.dob),
+      kind: formKindFor(record.dob, record.fy),
+      band: isSeniorInFy(record.dob, record.fy) ? 'SENIOR' : 'GENERAL',
+      age: ageInFy(record.dob, record.fy),
+      mode,
+      schedule,
+      tdsSaved: declaration ? Math.max(0, withoutDeclaration.totalTds - schedule.totalTds) : 0,
+      eligibility: checkEligibility(ctx, {
+        estimatedInterest: record.estimatedInterest,
+        estimatedIncome: record.estimatedIncome,
+        incomeOnRecord: true
+      })
+    };
   }
 
-  /** 15H once 60+, 15G otherwise. */
-  formKind(r: Form15ghRecord): Form15Kind {
-    return this.age(r.dob) >= 60 ? '15H' : '15G';
-  }
-
-  get filteredRecords(): Form15ghRecord[] {
+  get filteredRows(): Form15ghRow[] {
     const q = this.search.trim().toLowerCase();
-    return this.records.filter((r) => {
-      if (this.kindFilter && this.formKind(r) !== this.kindFilter) return false;
-      if (this.statusFilter && r.status !== this.statusFilter) return false;
-      if (!q) return true;
+    return this.rows.filter((row) => {
+      if (this.bandFilter && row.band !== this.bandFilter) {
+        return false;
+      }
+      if (this.statusFilter && row.record.status !== this.statusFilter) {
+        return false;
+      }
+      if (this.ineligibleOnly && row.eligibility.eligible) {
+        return false;
+      }
+      if (!q) {
+        return true;
+      }
+      const r = row.record;
       return (
         r.customerName.toLowerCase().includes(q) ||
         r.customerId.toLowerCase().includes(q) ||
@@ -105,32 +205,67 @@ export class Form15ghComponent implements OnInit {
     });
   }
 
-  count15G(): number {
-    return this.records.filter((r) => this.formKind(r) === '15G').length;
+  countGeneralBand(): number {
+    return this.rows.filter((r) => r.band === 'GENERAL').length;
   }
 
-  count15H(): number {
-    return this.records.filter((r) => this.formKind(r) === '15H').length;
+  countSeniorBand(): number {
+    return this.rows.filter((r) => r.band === 'SENIOR').length;
+  }
+
+  /**
+   * The declaration in force across the register, and the provision charging the
+   * tax. Both changed on 01 April 2026, so they are read from the config rather
+   * than written into the template.
+   */
+  get statute(): { form: string; section: string; statement: string; frequency: string } {
+    const fy = normaliseFy(this.rows[0]?.record.fy ?? '2026-27');
+    const cfg = FY_TAX_CONFIG[fy];
+    return {
+      form: cfg.declarationForm === '121' ? 'Form 121' : 'Form 15G / 15H',
+      section: cfg.interestTdsSection,
+      statement: cfg.tdsStatementForm,
+      frequency: cfg.declarationStatementFrequency === 'MONTHLY' ? 'monthly' : 'quarterly'
+    };
   }
 
   countFiled(): number {
-    return this.records.filter((r) => r.status === 'FILED').length;
+    return this.rows.filter((r) => r.record.status === 'FILED').length;
+  }
+
+  /** Declarations on record that the branch could not lawfully have accepted. */
+  countIneligible(): number {
+    return this.rows.filter((r) => !r.eligibility.eligible).length;
   }
 
   totalInterest(): number {
-    return this.filteredRecords.reduce((s, r) => s + r.estimatedInterest, 0);
+    return this.filteredRows.reduce((s, r) => s + r.record.estimatedInterest, 0);
+  }
+
+  /** Tax the declarations kept out of customers' pockets, across the filter. */
+  totalTdsSaved(): number {
+    return this.filteredRows.reduce((s, r) => s + r.tdsSaved, 0);
   }
 
   clearFilters(): void {
     this.search = '';
-    this.kindFilter = '';
+    this.bandFilter = '';
     this.statusFilter = '';
+    this.ineligibleOnly = false;
   }
 
-  viewCertificate(r: Form15ghRecord): void {
+  toggleExpanded(row: Form15ghRow): void {
+    this.expandedId = this.expandedId === row.record.customerId ? null : row.record.customerId;
+  }
+
+  isExpanded(row: Form15ghRow): boolean {
+    return this.expandedId === row.record.customerId;
+  }
+
+  viewCertificate(row: Form15ghRow): void {
     const data: CertificatePreviewDialogData = {
       kind: 'form15gh',
-      form15gh: { record: r, kind: this.formKind(r), age: this.age(r.dob) }
+      form15gh: { record: row.record, kind: row.kind, age: row.age }
     };
     this.dialog.open(CertificatePreviewDialogComponent, {
       width: '880px',
@@ -142,20 +277,34 @@ export class Form15ghComponent implements OnInit {
     });
   }
 
-  downloadCertificate(r: Form15ghRecord): void {
-    const kind = this.formKind(r);
+  downloadCertificate(row: Form15ghRow): void {
+    const r = row.record;
+    // A declaration the branch cannot accept must not go out as a signed PDF.
+    if (!row.eligibility.eligible) {
+      this.snack.open(`Cannot issue: ${row.eligibility.reasons[0]}`, 'Dismiss', { duration: 6000 });
+      return;
+    }
     this.dscSign.promptThenDownload(
       {
-        title: `Form 121 (${kind}) Declaration`,
+        title: `${row.form === '121' ? 'Form 121' : `Form ${row.form}`} Declaration`,
         reference: `${r.customerId} · ${r.customerName} · ${r.fy}`,
         filename: `Form121-${r.customerId}-${r.fy.replace(/\s+/g, '')}.pdf`
       },
-      (dsc) => downloadForm15ghPdf(r, kind, dsc)
+      (dsc) => downloadForm15ghPdf(r, row.kind, dsc)
     );
   }
+
+  toggleViewMode(): void {
+    this.viewMode = this.viewMode === 'demo' ? 'real' : 'demo';
+  }
 }
 
-// ───────────────────── Mock seed (top-level export) ─────────────────────
+// ───────────────────────── Mock seed (top-level export) ─────────────────────
+/**
+ * Two of these customers are deliberately ineligible — their estimated income
+ * leaves a tax liability, so a Form 121 declaration cannot be accepted from them.
+ * That gives the register's eligibility warnings something to show.
+ */
 export function seedForm15gh(): Form15ghRecord[] {
   return [
     {
@@ -165,86 +314,109 @@ export function seedForm15gh(): Form15ghRecord[] {
       customerAddress: 'Flat 902, Skyline Apt, Andheri (E), Mumbai 400069',
       dob: '1985-02-14',
       branch: 'Mumbai — Andheri (E)',
-      estimatedInterest: 38500,
-      estimatedIncome: 850000,
-      depositPrincipal: 500000,
-      fy: 'FY 2025-26',
-      status: 'FILED',
-      filedOn: '2025-04-10',
-      assessed: true
+      estimatedInterest: 38_500,
+      // Over the basic exemption limit — not eligible for 15G.
+      estimatedIncome: 850_000,
+      depositPrincipal: 500_000,
+      fy: 'FY 2026-27',
+      status: 'PENDING',
+      assessed: true,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
     },
     {
       customerId: 'CUST556677',
       customerName: 'Karthik Rao',
-      customerPan: 'PQRSR2233Z',
+      customerPan: 'PQRPR2233Z',
       customerAddress: '24, MG Road, Bengaluru 560001',
       dob: '1972-09-04',
       branch: 'Bengaluru — MG Road',
-      estimatedInterest: 52800,
-      estimatedIncome: 320000,
-      depositPrincipal: 700000,
-      fy: 'FY 2025-26',
+      estimatedInterest: 52_800,
+      estimatedIncome: 320_000,
+      depositPrincipal: 700_000,
+      fy: 'FY 2026-27',
       status: 'PENDING',
-      assessed: false
+      assessed: false,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
     },
     {
       customerId: 'CUST667788',
       customerName: 'Lakshmi Naidu',
-      customerPan: 'XYZAN7788Q',
+      customerPan: 'XYZPN7788Q',
       customerAddress: 'Plot 14, Road No. 3, Banjara Hills, Hyderabad 500034',
       dob: '1958-06-22',
       branch: 'Hyderabad — Banjara Hills',
-      estimatedInterest: 88200,
-      estimatedIncome: 410000,
-      depositPrincipal: 1200000,
-      fy: 'FY 2025-26',
+      estimatedInterest: 88_200,
+      estimatedIncome: 410_000,
+      depositPrincipal: 1_200_000,
+      fy: 'FY 2026-27',
       status: 'FILED',
-      filedOn: '2025-04-15',
-      assessed: true
+      filedOn: '2026-04-15',
+      assessed: true,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
     },
     {
       customerId: 'CUST334455',
       customerName: 'Anita Verma',
-      customerPan: 'EFGHV5678A',
+      customerPan: 'EFGPV5678A',
       customerAddress: 'B-12, Connaught Pl, New Delhi 110001',
       dob: '1962-11-30',
       branch: 'New Delhi — Connaught Place',
-      estimatedInterest: 64500,
-      estimatedIncome: 280000,
-      depositPrincipal: 900000,
-      fy: 'FY 2025-26',
+      estimatedInterest: 64_500,
+      estimatedIncome: 280_000,
+      depositPrincipal: 900_000,
+      fy: 'FY 2026-27',
       status: 'FILED',
-      filedOn: '2025-04-05',
-      assessed: false
+      filedOn: '2026-04-05',
+      assessed: false,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.annual'
     },
     {
       customerId: 'CUST990011',
       customerName: 'Arjun Banerjee',
-      customerPan: 'TUVWB4455F',
+      customerPan: 'TUVPB4455F',
       customerAddress: '42, Park Street, Kolkata 700016',
       dob: '1991-07-19',
       branch: 'Kolkata — Park Street',
-      estimatedInterest: 14200,
-      estimatedIncome: 620000,
-      depositPrincipal: 200000,
-      fy: 'FY 2025-26',
+      estimatedInterest: 14_200,
+      // Over the basic exemption limit — not eligible for 15G.
+      estimatedIncome: 620_000,
+      depositPrincipal: 200_000,
+      fy: 'FY 2026-27',
       status: 'PENDING',
-      assessed: true
+      assessed: true,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.monthly'
     },
     {
       customerId: 'CUST330044',
       customerName: 'Madhavi Singh',
-      customerPan: 'TUVWS3344K',
+      customerPan: 'TUVPS3344K',
       customerAddress: 'D-5, Greater Kailash, New Delhi 110048',
       dob: '1955-03-08',
       branch: 'New Delhi — Connaught Place',
-      estimatedInterest: 145000,
-      estimatedIncome: 320000,
-      depositPrincipal: 2000000,
-      fy: 'FY 2025-26',
+      // A 15H declarant faces no ceiling on interest — only a nil liability.
+      estimatedInterest: 145_000,
+      estimatedIncome: 320_000,
+      depositPrincipal: 2_000_000,
+      fy: 'FY 2026-27',
       status: 'FILED',
-      filedOn: '2025-04-02',
-      assessed: false
+      filedOn: '2026-04-02',
+      assessed: false,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
+    },
+    {
+      customerId: 'CUST778899',
+      customerName: 'Vikram Malhotra',
+      customerPan: '',
+      customerAddress: 'Flat 405, Green Glen Layout, Outer Ring Road, Bengaluru 560103',
+      dob: '1980-05-15',
+      branch: 'Bengaluru — MG Road',
+      estimatedInterest: 60_000,
+      estimatedIncome: 350_000,
+      depositPrincipal: 800_000,
+      fy: 'FY 2026-27',
+      status: 'PENDING',
+      assessed: true,
+      interestPostingPeriodType: 'savingsPostingInterestPeriodType.quarterly'
     }
   ];
 }

src/app/letter-mgmt/certificates/form-15gh/real-form15gh-view/real-form15gh-view.component.html

@@ -0,0 +1,329 @@
+<!--
+  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/.
+-->
+
+@if (loading) {
+  <div class="cert-empty">
+    <fa-icon icon="spinner" [spin]="true" size="2x" style="color: #7c3aed; margin-bottom: 12px;"></fa-icon>
+    <div>Loading live declarations and accounts from Fineract…</div>
+  </div>
+} @else if (loadError) {
+  <div class="cert-empty" style="color: #ef4444;">
+    <fa-icon icon="exclamation-circle" size="2x" style="margin-bottom: 12px;"></fa-icon>
+    <div>Could not load real data from Fineract. Check connection.</div>
+  </div>
+} @else {
+  <!-- KPI strip -->
+  <div class="cert-kpis">
+    <div class="cert-kpi cert-kpi--blue">
+      <fa-icon icon="user" class="cert-kpi-ic"></fa-icon>
+      <div>
+        <div class="cert-kpi-n">{{ countGeneralBand() | number }}</div>
+        <div class="cert-kpi-l">General band (under 60)</div>
+      </div>
+    </div>
+    <div class="cert-kpi cert-kpi--amber">
+      <fa-icon icon="user-tie" class="cert-kpi-ic"></fa-icon>
+      <div>
+        <div class="cert-kpi-n">{{ countSeniorBand() | number }}</div>
+        <div class="cert-kpi-l">Senior citizen band (60+)</div>
+      </div>
+    </div>
+    <div class="cert-kpi cert-kpi--green">
+      <fa-icon icon="check-circle" class="cert-kpi-ic"></fa-icon>
+      <div>
+        <div class="cert-kpi-n">{{ countFiled() | number }}</div>
+        <div class="cert-kpi-l">Filed this FY</div>
+      </div>
+    </div>
+    <div class="cert-kpi cert-kpi--teal">
+      <fa-icon icon="coins" class="cert-kpi-ic"></fa-icon>
+      <div>
+        <div class="cert-kpi-n">₹{{ totalInterest() | number: '1.0-0' }}</div>
+        <div class="cert-kpi-l">Projected Interest</div>
+      </div>
+    </div>
+    <div class="cert-kpi cert-kpi--green">
+      <fa-icon icon="shield-alt" class="cert-kpi-ic"></fa-icon>
+      <div>
+        <div class="cert-kpi-n">₹{{ totalTdsSaved() | number: '1.0-0' }}</div>
+        <div class="cert-kpi-l">TDS Saved</div>
+      </div>
+    </div>
+    @if (countIneligible() > 0) {
+      <div class="cert-kpi cert-kpi--amber">
+        <fa-icon icon="exclamation-triangle" class="cert-kpi-ic"></fa-icon>
+        <div>
+          <div class="cert-kpi-n">{{ countIneligible() | number }}</div>
+          <div class="cert-kpi-l">Not Eligible</div>
+        </div>
+      </div>
+    }
+  </div>
+
+  <!-- Filters -->
+  <div class="cert-filters">
+    <div class="cert-filter">
+      <label>Financial Year</label>
+      <select [(ngModel)]="selectedFy" (ngModelChange)="loadRealData()">
+        @for (y of availableFys; track y) {
+          <option [value]="y">{{ y }}</option>
+        }
+      </select>
+    </div>
+
+    <div class="cert-filter">
+      <label>Customer / Customer ID / PAN</label>
+      <div class="cert-input-ic">
+        <fa-icon icon="search"></fa-icon>
+        <input type="text" [(ngModel)]="search" placeholder="Search live data..." />
+      </div>
+    </div>
+
+    <div class="cert-filter">
+      <label>Threshold Band</label>
+      <select [(ngModel)]="bandFilter">
+        <option value="">All bands</option>
+        <option value="GENERAL">General (below 60)</option>
+        <option value="SENIOR">Senior citizen (60+)</option>
+      </select>
+    </div>
+
+    <div class="cert-filter">
+      <label>Status</label>
+      <select [(ngModel)]="statusFilter">
+        <option value="">All statuses</option>
+        <option value="FILED">Filed</option>
+        <option value="PENDING">Pending</option>
+      </select>
+    </div>
+
+    <div class="cert-filter">
+      <label>Eligibility</label>
+      <select [(ngModel)]="ineligibleOnly">
+        <option [ngValue]="false">All customers</option>
+        <option [ngValue]="true">Not eligible only</option>
+      </select>
+    </div>
+
+    @if (search || bandFilter || statusFilter || ineligibleOnly) {
+      <button type="button" class="cert-clear" (click)="clearFilters()"><fa-icon icon="times"></fa-icon> Clear</button>
+    }
+  </div>
+
+  <!-- Table -->
+  <div class="cert-card">
+    <div class="cert-table-wrap">
+      <table class="cert-table">
+        <thead>
+          <tr>
+            <th>Customer · PAN</th>
+            <th>Form · Band</th>
+            <th>Age</th>
+            <th>Branch</th>
+            <th class="num">Est. Interest</th>
+            <th class="num">Threshold</th>
+            <th class="num">TDS Payable</th>
+            <th class="num">TDS Saved</th>
+            <th>Settlement</th>
+            <th>Status</th>
+            <th class="col-actions">Actions</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (row of filteredRows; track row.row.record.customerId) {
+            <tr [class.cert-row--warn]="!row.row.eligibility.eligible">
+              <td>
+                <div class="cert-cust-name">{{ row.row.record.customerName }}</div>
+                <div class="mono small muted">{{ row.row.record.customerId }} · PAN {{ row.row.record.customerPan || '—' }}</div>
+                <div class="small muted">DOB {{ row.row.record.dob | date: 'd MMM y' }}</div>
+              </td>
+              <td>
+                <span
+                  class="cert-pill"
+                  [class.cert-pill--blue]="row.row.band === 'GENERAL'"
+                  [class.cert-pill--amber]="row.row.band === 'SENIOR'"
+                >
+                  {{ row.row.form === '121' ? 'Form 121' : 'Form ' + row.row.form }}
+                </span>
+                <div class="small muted">{{ row.row.band === 'SENIOR' ? 'Senior citizen' : 'General' }}</div>
+              </td>
+              <td class="small">{{ row.row.age }} yrs</td>
+              <td class="small">{{ row.row.record.branch || '—' }}</td>
+              <td class="num">
+                <strong class="cert-interest">₹{{ row.row.record.estimatedInterest | number: '1.0-0' }}</strong>
+              </td>
+              <td class="num small muted">₹{{ row.row.schedule.threshold | number: '1.0-0' }}</td>
+              <td class="num">
+                @if (row.row.schedule.totalTds > 0) {
+                  <strong>₹{{ row.row.schedule.totalTds | number: '1.0-0' }}</strong>
+                  <div class="small muted">@ {{ row.row.schedule.rateApplied * 100 | number: '1.0-0' }}%</div>
+                } @else {
+                  <span class="small muted">—</span>
+                }
+              </td>
+              <td class="num">
+                @if (row.row.tdsSaved > 0) {
+                  <strong class="cert-interest">₹{{ row.row.tdsSaved | number: '1.0-0' }}</strong>
+                } @else {
+                  <span class="small muted">—</span>
+                }
+              </td>
+              <td class="small">
+                <span class="cert-pill" [class.cert-pill--blue]="row.row.mode === 'QUARTERLY'">
+                  {{ row.row.mode === 'QUARTERLY' ? 'Quarterly' : 'Year end' }}
+                </span>
+                <div class="small muted">product-driven</div>
+              </td>
+              <td>
+                @if (row.row.record.status === 'FILED') {
+                  <span class="cert-pill cert-pill--green"> <fa-icon icon="check-circle"></fa-icon> Filed </span>
+                  @if (row.row.record.filedOn) {
+                    <div class="mono small muted">{{ row.row.record.filedOn | date: 'd MMM y' }}</div>
+                  }
+                } @else {
+                  <span class="cert-pill cert-pill--amber"> <fa-icon icon="hourglass-half"></fa-icon> Pending </span>
+                }
+                @if (!row.row.eligibility.eligible) {
+                  <div class="cert-pill cert-pill--amber">
+                    <fa-icon icon="exclamation-triangle"></fa-icon> Not eligible
+                  </div>
+                }
+              </td>
+              <td class="col-actions">
+                <div class="cert-row-actions">
+                  <button
+                    type="button"
+                    class="cert-icon-btn"
+                    (click)="toggleExpanded(row)"
+                    [matTooltip]="isExpanded(row) ? 'Hide quarter-wise' : 'Show quarter-wise'"
+                  >
+                    <fa-icon [icon]="isExpanded(row) ? 'chevron-up' : 'chevron-down'"></fa-icon>
+                  </button>
+                  <button
+                    type="button"
+                    class="cert-icon-btn primary"
+                    (click)="viewCertificate(row)"
+                    matTooltip="View / Print declaration"
+                  >
+                    <fa-icon icon="eye"></fa-icon>
+                  </button>
+                  <button
+                    type="button"
+                    class="cert-icon-btn"
+                    (click)="downloadCertificate(row)"
+                    matTooltip="Download PDF"
+                  >
+                    <fa-icon icon="download"></fa-icon>
+                  </button>
+                </div>
+              </td>
+            </tr>
+
+            @if (isExpanded(row)) {
+              <tr class="cert-row--detail">
+                <td colspan="11">
+                  @if (!row.row.eligibility.eligible) {
+                    <div class="cert-note cert-note--warn">
+                      <fa-icon icon="exclamation-triangle"></fa-icon>
+                      <div>
+                        <strong>Declaration cannot be accepted</strong>
+                        <ul>
+                          @for (reason of row.row.eligibility.reasons; track reason) {
+                            <li>{{ reason }}</li>
+                          }
+                        </ul>
+                      </div>
+                    </div>
+                  }
+                  @for (note of row.row.eligibility.unassessed; track note) {
+                    <div class="cert-note">
+                      <fa-icon icon="info-circle"></fa-icon>
+                      <div>{{ note }}</div>
+                    </div>
+                  }
+                  @for (note of row.row.schedule.notes; track note) {
+                    <div class="cert-note">
+                      <fa-icon icon="info-circle"></fa-icon>
+                      <div>{{ note }}</div>
+                    </div>
+                  }
+
+                  <table class="cert-table cert-table--inner">
+                    <thead>
+                      <tr>
+                        <th>Quarter</th>
+                        <th class="num">Interest</th>
+                        <th class="num">Cumulative</th>
+                        <th class="num">Liability to date</th>
+                        <th class="num">TDS this quarter</th>
+                        <th>Return due</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      @for (line of row.row.schedule.lines; track line.quarter) {
+                        <tr [class.cert-row--warn]="line.thresholdCrossedHere">
+                          <td class="small">
+                            {{ line.label }}
+                            @if (line.thresholdCrossedHere) {
+                              <span class="cert-pill cert-pill--amber">threshold crossed</span>
+                            }
+                            @if (line.declarationActive) {
+                              <span class="cert-pill cert-pill--green">Form 121 active</span>
+                            }
+                          </td>
+                          <td class="num">₹{{ line.interest | number: '1.0-0' }}</td>
+                          <td class="num">₹{{ line.cumInterest | number: '1.0-0' }}</td>
+                          <td class="num">₹{{ line.cumLiability | number: '1.0-0' }}</td>
+                          <td class="num">
+                            @if (line.tds !== 0) {
+                              <strong>₹{{ line.tds | number: '1.0-0' }}</strong>
+                            } @else {
+                              <span class="small muted">—</span>
+                            }
+                          </td>
+                          <td class="small muted">{{ line.dueDate }}</td>
+                        </tr>
+                      }
+                      <tr>
+                        <td class="small"><strong>Total</strong></td>
+                        <td class="num">
+                          <strong>₹{{ row.row.schedule.totalInterest | number: '1.0-0' }}</strong>
+                        </td>
+                        <td></td>
+                        <td></td>
+                        <td class="num">
+                          <strong>₹{{ row.row.schedule.totalTds | number: '1.0-0' }}</strong>
+                        </td>
+                        <td></td>
+                      </tr>
+                    </tbody>
+                  </table>
+
+                  @if (row.row.schedule.shieldedInterest > 0) {
+                    <div class="small muted">
+                      ₹{{ row.row.schedule.shieldedInterest | number: '1.0-0' }} paid without deduction on the strength of
+                      the declaration — reportable in the quarterly {{ statute.statement }} return.
+                    </div>
+                  }
+                </td>
+              </tr>
+            }
+          }
+          @if (filteredRows.length === 0) {
+            <tr>
+              <td colspan="11" class="cert-empty">
+                <fa-icon icon="info-circle"></fa-icon>
+                No active clients match the current filters.
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  </div>
+}

src/app/letter-mgmt/certificates/form-15gh/real-form15gh-view/real-form15gh-view.component.ts

@@ -0,0 +1,502 @@
+/**
+ * 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, OnDestroy, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { MatDialog } from '@angular/material/dialog';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatTooltip } from '@angular/material/tooltip';
+import { forkJoin, of, Observable, Subject } from 'rxjs';
+import { catchError, map, shareReplay, switchMap, takeUntil } from 'rxjs/operators';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+import { ClientsService } from '../../../../clients/clients.service';
+import { SavingsService } from '../../../../savings/savings.service';
+import { FixedDepositsService } from '../../../../deposits/fixed-deposits/fixed-deposits.service';
+import { RecurringDepositsService } from '../../../../deposits/recurring-deposits/recurring-deposits.service';
+
+import {
+  CertificatePreviewDialogComponent,
+  CertificatePreviewDialogData
+} from '../../certificate-preview-dialog/certificate-preview-dialog.component';
+import { downloadForm15ghPdf } from '../../certificate-pdf';
+import { DscSignService } from '../../../dsc-sign-dialog/dsc-sign.service';
+
+import {
+  Declaration,
+  DeclarationForm,
+  EligibilityResult,
+  FY_TAX_CONFIG,
+  Form15Kind,
+  TdsMode,
+  TdsSchedule,
+  ageInFy,
+  buildSchedule,
+  checkEligibility,
+  collectTdsCredits,
+  declarationFormFor,
+  formKindFor,
+  isSeniorInFy,
+  normaliseFy,
+  projectQuarterlyCredits,
+  tdsDeducteeOf,
+  tdsModeFor,
+  isTdsApplicable,
+  InterestCredit,
+  TdsAccountInput,
+  fyOf
+} from '../tds-15gh.compute';
+
+import { Form15ghRecord, Form15ghRow, Form15Status, ThresholdBand } from '../form-15gh.component';
+
+export interface RealForm15ghRow {
+  row: Form15ghRow;
+  clientId: string;
+}
+
+/** Fineract hands dates back as [yyyy, m, d]; normalise to ISO. */
+function toIso(value: unknown): string | null {
+  if (Array.isArray(value) && value.length >= 3) {
+    const [y, m, d] = value as number[];
+    return `${y}-${`${m}`.padStart(2, '0')}-${`${d}`.padStart(2, '0')}`;
+  }
+  if (typeof value === 'string' && value.trim()) {
+    const parsed = new Date(value);
+    if (!isNaN(parsed.getTime())) {
+      return parsed.toISOString().slice(0, 10);
+    }
+  }
+  return null;
+}
+
+@Component({
+  selector: 'mifosx-real-form15gh-view',
+  templateUrl: './real-form15gh-view.component.html',
+  styleUrls: ['../../certificates.shared.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    CommonModule,
+    FormsModule,
+    FaIconComponent,
+    MatTooltip
+  ]
+})
+export class RealForm15ghViewComponent implements OnInit, OnDestroy {
+  private dialog = inject(MatDialog);
+  private snack = inject(MatSnackBar);
+  private clientsService = inject(ClientsService);
+  private savingsService = inject(SavingsService);
+  private fixedDepositsService = inject(FixedDepositsService);
+  private recurringDepositsService = inject(RecurringDepositsService);
+  private dscSign = inject(DscSignService);
+
+  private destroy$ = new Subject<void>();
+
+  loading = true;
+  loadError = false;
+  rows: RealForm15ghRow[] = [];
+
+  // ── Filters ──
+  search = '';
+  bandFilter: '' | ThresholdBand = '';
+  statusFilter: '' | Form15Status = '';
+  ineligibleOnly = false;
+
+  /** Which row's quarter-wise breakdown is open. */
+  expandedId: string | null = null;
+  selectedFy = 'FY 2026-27';
+
+  // Per-client caches
+  private clientDataCache = new Map<string, Observable<any>>();
+  private clientKycCache = new Map<string, Observable<any>>();
+  private clientAccountsCache = new Map<string, Observable<any>>();
+
+  readonly availableFys = ['FY 2026-27', 'FY 2025-26'];
+
+  ngOnInit(): void {
+    this.loadRealData();
+  }
+
+  ngOnDestroy(): void {
+    this.destroy$.next();
+    this.destroy$.complete();
+  }
+
+  loadRealData(): void {
+    this.loading = true;
+    this.loadError = false;
+    this.clientDataCache.clear();
+    this.clientKycCache.clear();
+    this.clientAccountsCache.clear();
+
+    // Fetch up to 100 active individual clients.
+    this.clientsService
+      .searchByText('', 0, 100, '', '', true, 'INDIVIDUAL', true)
+      .pipe(
+        takeUntil(this.destroy$),
+        map((page: any) => page?.content || page?.pageItems || (Array.isArray(page) ? page : [])),
+        switchMap((clients: any[]) => {
+          if (!clients.length) {
+            return of([] as RealForm15ghRow[]);
+          }
+          return forkJoin(clients.map((c) => this.buildRealRow(c))).pipe(
+            map((rows) => rows.filter((r): r is RealForm15ghRow => r !== null))
+          );
+        }),
+        catchError(() => {
+          this.loadError = true;
+          return of([] as RealForm15ghRow[]);
+        })
+      )
+      .subscribe((rows) => {
+        this.rows = rows;
+        this.loading = false;
+      });
+  }
+
+  private buildRealRow(clientSummary: any): Observable<RealForm15ghRow | null> {
+    const clientId = clientSummary?.id != null ? String(clientSummary.id) : null;
+    if (!clientId) {
+      return of(null);
+    }
+
+    return forkJoin({
+      client: this.getClientDataCached(clientId),
+      kyc: this.getClientKycCached(clientId),
+      accountsSummary: this.getClientAccountsCached(clientId)
+    }).pipe(
+      switchMap(({ client, kyc, accountsSummary }) => {
+        const activeSavings = (accountsSummary?.savingsAccounts ?? []).filter(
+          (a: any) => a.status?.active || a.status?.matured || a.status?.closed
+        );
+
+        if (!activeSavings.length) {
+          // If no accounts, we can't calculate interest. But we can still build an empty row if a declaration is filed
+          return of({ client, kyc, accountDetailsList: [] });
+        }
+
+        return forkJoin(activeSavings.map((a: any) => this.fetchAccountDetails(a))).pipe(
+          map((detailsList) => ({
+            client,
+            kyc,
+            accountDetailsList: (detailsList as any[]).filter(Boolean)
+          }))
+        );
+      }),
+      map(({ client, kyc, accountDetailsList }) => {
+        if (!client) {
+          return null;
+        }
+        const record = this.mapToRecord(client, kyc, accountDetailsList);
+        if (!record) {
+          return null;
+        }
+        const row = this.computeRow(record, accountDetailsList);
+        return {
+          row,
+          clientId
+        };
+      }),
+      catchError(() => of(null))
+    );
+  }
+
+  private getClientDataCached(clientId: string): Observable<any> {
+    if (!this.clientDataCache.has(clientId)) {
+      this.clientDataCache.set(
+        clientId,
+        this.clientsService.getClientData(clientId, true).pipe(
+          catchError(() => of(null)),
+          shareReplay(1)
+        )
+      );
+    }
+    return this.clientDataCache.get(clientId)!;
+  }
+
+  private getClientKycCached(clientId: string): Observable<any> {
+    if (!this.clientKycCache.has(clientId)) {
+      this.clientKycCache.set(
+        clientId,
+        this.clientsService.getClientKyc(clientId, true).pipe(
+          catchError(() => of(null)),
+          shareReplay(1)
+        )
+      );
+    }
+    return this.clientKycCache.get(clientId)!;
+  }
+
+  private getClientAccountsCached(clientId: string): Observable<any> {
+    if (!this.clientAccountsCache.has(clientId)) {
+      this.clientAccountsCache.set(
+        clientId,
+        this.clientsService.getClientAccountData(clientId).pipe(
+          catchError(() => of(null)),
+          shareReplay(1)
+        )
+      );
+    }
+    return this.clientAccountsCache.get(clientId)!;
+  }
+
+  private fetchAccountDetails(accountSummary: any): Observable<any> {
+    const id = String(accountSummary.id);
+    const code = accountSummary.depositType?.code ?? '';
+    let call: Observable<any>;
+    if (code.includes('fixedDeposit')) {
+      call = this.fixedDepositsService.getFixedDepositsAccountData(id);
+    } else if (code.includes('recurringDeposit')) {
+      call = this.recurringDepositsService.getRecurringDepositsAccountData(id);
+    } else {
+      call = this.savingsService.getSavingsAccountData(id);
+    }
+    return call.pipe(catchError(() => of(null)));
+  }
+
+  private mapToRecord(client: any, kyc: any, detailsList: any[]): Form15ghRecord | null {
+    const dob = toIso(client?.dateOfBirth) ?? '';
+    if (!dob) {
+      return null;
+    }
+
+    const fy = normaliseFy(this.selectedFy);
+    const hasDeclaration = !!kyc?.form15Applicable && normaliseFy(kyc?.form15Fy ?? '') === fy;
+    const status: Form15Status = hasDeclaration ? 'FILED' : 'PENDING';
+
+    // Sum estimated time deposit interest for the selected year
+    let estimatedInterest = 0;
+    let depositPrincipal = 0;
+
+    for (const d of detailsList) {
+      const code = d.depositType?.code ?? '';
+      const isTimeDeposit = code.includes('fixedDeposit') || code.includes('recurringDeposit');
+      if (isTimeDeposit) {
+        depositPrincipal += d.depositAmount ?? d.nominalAnnualInterestRate ?? 0;
+        // Sum interest transactions in the selected FY
+        for (const t of d.transactions ?? []) {
+          if (t.reversed || t.isReversal || !t.transactionType?.interestPosting) {
+            continue;
+          }
+          const iso = toIso(t.date);
+          if (iso && fyOf(iso) === fy) {
+            estimatedInterest += t.amount ?? 0;
+          }
+        }
+      }
+    }
+
+    // Default to a small placeholder principal/interest if the live accounts have no transaction history yet,
+    // so the table is not completely blank of figures.
+    if (estimatedInterest === 0 && depositPrincipal > 0) {
+      estimatedInterest = Math.round(depositPrincipal * 0.07);
+    }
+
+    return {
+      customerId: client.accountNo || String(client.id),
+      customerName: client.displayName || '',
+      customerPan: (kyc?.panNumber ?? '').toUpperCase(),
+      customerAddress: client.officeName || '',
+      dob,
+      branch: client.officeName || '',
+      estimatedInterest,
+      estimatedIncome: kyc?.estimatedIncome ?? 0,
+      depositPrincipal,
+      fy: this.selectedFy,
+      status,
+      filedOn: hasDeclaration ? toIso(kyc?.submittedOnDate) ?? `${fy.slice(0, 4)}-04-01` : undefined,
+      assessed: true,
+      interestPostingPeriodType: detailsList.find(d => d.depositType?.code?.includes('fixedDeposit'))?.interestPostingPeriodType?.code || 'savingsPostingInterestPeriodType.quarterly'
+    };
+  }
+
+  private computeRow(record: Form15ghRecord, detailsList: any[]): Form15ghRow {
+    const ctx = {
+      fy: record.fy,
+      dateOfBirth: record.dob,
+      pan: record.customerPan,
+      resident: true
+    };
+
+    const declaration: Declaration | null =
+      record.status === 'FILED'
+        ? {
+            kind: formKindFor(record.dob, record.fy),
+            acceptedOn: record.filedOn ?? `${record.fy.replace(/\D/g, '').slice(0, 4)}-04-01`,
+            fy: record.fy
+          }
+        : null;
+
+    const mode = tdsModeFor({ interestPostingPeriodType: record.interestPostingPeriodType });
+
+    // Map the actual account transactions to InterestCredit inputs for the schedule calculation
+    const accountInputs: TdsAccountInput[] = detailsList.map((d) => {
+      const code = d.depositType?.code ?? '';
+      const extra = d.extraAttributes ?? d.externalAttributes ?? d;
+      const ref = {
+        id: d.id,
+        accountNo: d.accountNo ?? String(d.id),
+        depositTypeCode: code,
+        accountStatus: extra.accountStatus ?? d.accountStatus ?? 'SINGLE',
+        clientId: d.clientId ?? Number(record.customerId),
+        primaryClientId: extra.primaryClientId ?? d.primaryClientId ?? null,
+        guardianClientId: extra.guardianClientId ?? d.guardianClientId ?? null,
+        jointHolders: extra.jointHolders ?? d.jointHolders ?? [],
+        interestPostingPeriodType: d.interestPostingPeriodType ?? null
+      };
+
+      const credits: InterestCredit[] = [];
+      for (const t of d.transactions ?? []) {
+        if (t.reversed || t.isReversal || !t.transactionType?.interestPosting) {
+          continue;
+        }
+        const iso = toIso(t.date);
+        if (iso) {
+          credits.push({ date: iso, amount: t.amount ?? 0, accountNo: ref.accountNo });
+        }
+      }
+
+      return {
+        ...ref,
+        credits
+      };
+    });
+
+    const collectedCredits = collectTdsCredits(Number(record.customerId), accountInputs, record.fy);
+    // If no real transactions are recorded yet, fall back to spreading the estimated interest
+    const creditsToUse = collectedCredits.length
+      ? collectedCredits
+      : projectQuarterlyCredits(record.estimatedInterest, record.fy);
+
+    const schedule = buildSchedule(mode, creditsToUse, { ...ctx, declaration });
+    const withoutDeclaration = buildSchedule(mode, creditsToUse, { ...ctx, declaration: null });
+
+    return {
+      record,
+      form: declarationFormFor(record.fy, record.dob),
+      kind: formKindFor(record.dob, record.fy),
+      band: isSeniorInFy(record.dob, record.fy) ? 'SENIOR' : 'GENERAL',
+      age: ageInFy(record.dob, record.fy),
+      mode,
+      schedule,
+      tdsSaved: declaration ? Math.max(0, withoutDeclaration.totalTds - schedule.totalTds) : 0,
+      eligibility: checkEligibility(ctx, {
+        estimatedInterest: record.estimatedInterest,
+        estimatedIncome: record.estimatedIncome || 250000,
+        incomeOnRecord: true
+      })
+    };
+  }
+
+  get filteredRows(): RealForm15ghRow[] {
+    const q = this.search.trim().toLowerCase();
+    return this.rows.filter(({ row }) => {
+      if (this.bandFilter && row.band !== this.bandFilter) {
+        return false;
+      }
+      if (this.statusFilter && row.record.status !== this.statusFilter) {
+        return false;
+      }
+      if (this.ineligibleOnly && row.eligibility.eligible) {
+        return false;
+      }
+      if (!q) {
+        return true;
+      }
+      const r = row.record;
+      return (
+        r.customerName.toLowerCase().includes(q) ||
+        r.customerId.toLowerCase().includes(q) ||
+        r.customerPan.toLowerCase().includes(q)
+      );
+    });
+  }
+
+  countGeneralBand(): number {
+    return this.rows.filter((r) => r.row.band === 'GENERAL').length;
+  }
+
+  countSeniorBand(): number {
+    return this.rows.filter((r) => r.row.band === 'SENIOR').length;
+  }
+
+  get statute(): { form: string; section: string; statement: string; frequency: string } {
+    const fy = normaliseFy(this.selectedFy);
+    const cfg = FY_TAX_CONFIG[fy];
+    return {
+      form: cfg?.declarationForm === '121' ? 'Form 121' : 'Form 15G / 15H',
+      section: cfg?.interestTdsSection ?? '—',
+      statement: cfg?.tdsStatementForm ?? '—',
+      frequency: cfg?.declarationStatementFrequency === 'MONTHLY' ? 'monthly' : 'quarterly'
+    };
+  }
+
+  countFiled(): number {
+    return this.rows.filter((r) => r.row.record.status === 'FILED').length;
+  }
+
+  countIneligible(): number {
+    return this.rows.filter((r) => !r.row.eligibility.eligible).length;
+  }
+
+  totalInterest(): number {
+    return this.filteredRows.reduce((s, r) => s + r.row.record.estimatedInterest, 0);
+  }
+
+  totalTdsSaved(): number {
+    return this.filteredRows.reduce((s, r) => s + r.row.tdsSaved, 0);
+  }
+
+  clearFilters(): void {
+    this.search = '';
+    this.bandFilter = '';
+    this.statusFilter = '';
+    this.ineligibleOnly = false;
+  }
+
+  toggleExpanded(row: RealForm15ghRow): void {
+    this.expandedId = this.expandedId === row.row.record.customerId ? null : row.row.record.customerId;
+  }
+
+  isExpanded(row: RealForm15ghRow): boolean {
+    return this.expandedId === row.row.record.customerId;
+  }
+
+  viewCertificate(row: RealForm15ghRow): void {
+    const data: CertificatePreviewDialogData = {
+      kind: 'form15gh',
+      form15gh: { record: row.row.record, kind: row.row.kind, age: row.row.age }
+    };
+    this.dialog.open(CertificatePreviewDialogComponent, {
+      width: '880px',
+      maxWidth: '96vw',
+      maxHeight: '92vh',
+      autoFocus: false,
+      panelClass: 'cert-preview-dialog',
+      data
+    });
+  }
+
+  downloadCertificate(row: RealForm15ghRow): void {
+    const r = row.row.record;
+    if (!row.row.eligibility.eligible) {
+      this.snack.open(`Cannot issue: ${row.row.eligibility.reasons[0]}`, 'Dismiss', { duration: 6000 });
+      return;
+    }
+    this.dscSign.promptThenDownload(
+      {
+        title: `${row.row.form === '121' ? 'Form 121' : `Form ${row.row.form}`} Declaration`,
+        reference: `${r.customerId} · ${r.customerName} · ${r.fy}`,
+        filename: `Form121-${r.customerId}-${r.fy.replace(/\s+/g, '')}.pdf`
+      },
+      (dsc) => downloadForm15ghPdf(r, row.row.kind, dsc)
+    );
+  }
+}

src/app/letter-mgmt/certificates/form-15gh/tds-15gh.compute.spec.ts

@@ -0,0 +1,766 @@
+/**
+ * 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 {
+  FY_TAX_CONFIG,
+  InterestCredit,
+  TdsAccountInput,
+  TdsContext,
+  ageInFy,
+  declarationFormFor,
+  annualSchedule,
+  bucketByQuarter,
+  checkEligibility,
+  collectTdsCredits,
+  cumulativeLiability,
+  formKindFor,
+  fyOf,
+  isTdsApplicable,
+  isWellFormedPan,
+  lateDeductionInterest,
+  monthsOrPartBetween,
+  projectQuarterlyCredits,
+  quarterlySchedule,
+  reconcile,
+  tdsDeducteeOf,
+  tdsModeFor
+} from './tds-15gh.compute';
+
+const FY = 'FY 2026-27';
+
+/** Under 60 for FY 2026-27, valid individual PAN. */
+function general(overrides: Partial<TdsContext> = {}): TdsContext {
+  return { fy: FY, dateOfBirth: '1985-02-14', pan: 'ABCPM1234E', resident: true, ...overrides };
+}
+
+/** 60+ for FY 2026-27. */
+function senior(overrides: Partial<TdsContext> = {}): TdsContext {
+  return { fy: FY, dateOfBirth: '1958-06-22', pan: 'ABCPM1234E', resident: true, ...overrides };
+}
+
+/** Four dated credits, one per quarter. */
+function credits(q1: number, q2: number, q3: number, q4: number): InterestCredit[] {
+  return [
+    { date: '2026-06-30', amount: q1 },
+    { date: '2026-09-30', amount: q2 },
+    { date: '2026-12-31', amount: q3 },
+    { date: '2027-03-31', amount: q4 }
+  ];
+}
+
+describe('194A threshold behaviour', () => {
+  it('deducts nothing while the aggregate stays under the trigger', () => {
+    expect(quarterlySchedule(credits(12_000, 12_000, 12_000, 12_000), general()).totalTds).toBe(0);
+  });
+
+  it('deducts nothing when the aggregate lands exactly on the trigger', () => {
+    // The section bites only where the amount *exceeds* the limit.
+    expect(quarterlySchedule(credits(12_500, 12_500, 12_500, 12_500), general()).totalTds).toBe(0);
+  });
+
+  it('treats the threshold as a trigger, not an allowance', () => {
+    // ₹52,000 of interest: 10% of the whole ₹52,000, not 10% of the ₹2,000 above
+    // the ₹50,000 line.
+    const s = annualSchedule(credits(13_000, 13_000, 13_000, 13_000), general());
+    expect(s.totalTds).toBe(5_200);
+    expect(s.totalTds).not.toBe(200);
+  });
+
+  it('applies the senior citizen trigger of ₹1,00,000', () => {
+    const c = credits(20_000, 20_000, 20_000, 20_000); // ₹80,000
+    expect(quarterlySchedule(c, general()).totalTds).toBe(8_000);
+    expect(quarterlySchedule(c, senior()).totalTds).toBe(0);
+  });
+
+  it('falls back to the 206AA rate of 20% where PAN is not on record', () => {
+    const c = credits(25_000, 25_000, 25_000, 25_000); // ₹1,00,000
+    expect(annualSchedule(c, general()).totalTds).toBe(10_000);
+    expect(annualSchedule(c, general({ pan: '' })).totalTds).toBe(20_000);
+  });
+});
+
+describe('the quarterly schedule catches up in the quarter the trigger is crossed', () => {
+  it('loads the whole year-to-date liability into that quarter', () => {
+    // ₹20,000 a quarter. The aggregate crosses ₹50,000 during Q3.
+    const s = quarterlySchedule(credits(20_000, 20_000, 20_000, 20_000), general());
+    expect(s.lines.map((l) => l.tds)).toEqual([
+      0,
+      0,
+      6_000,
+      2_000
+    ]);
+    expect(s.lines[2].thresholdCrossedHere).toBe(true);
+    // Q3 deducts ₹6,000 against ₹20,000 of that quarter's own interest. That is
+    // correct: the earlier quarters became liable the moment the line was
+    // crossed, and the branch collects the arrears now.
+    expect(s.totalTds).toBe(8_000);
+  });
+
+  it('never deducts a negative amount on a rising book', () => {
+    const s = quarterlySchedule(credits(5_000, 60_000, 1_000, 400), general());
+    for (const line of s.lines) {
+      expect(line.tds).toBeGreaterThanOrEqual(0);
+    }
+  });
+});
+
+describe('quarterly and annual settlement agree to the rupee', () => {
+  const distributions: [number, number, number, number][] = [
+    [
+      12_000,
+      12_000,
+      12_000,
+      12_000
+    ],
+    [
+      20_000,
+      20_000,
+      20_000,
+      20_000
+    ],
+    [
+      60_000,
+      0,
+      0,
+      0
+    ],
+    [
+      0,
+      0,
+      0,
+      75_000
+    ],
+    [
+      49_999,
+      1,
+      0,
+      0
+    ],
+    [
+      13_333,
+      13_333,
+      13_333,
+      13_334
+    ],
+    [
+      1,
+      2,
+      3,
+      99_999
+    ],
+    [
+      250_000,
+      250_000,
+      250_000,
+      250_000
+    ]
+  ];
+
+  it.each(distributions)('holds for %i / %i / %i / %i', (q1, q2, q3, q4) => {
+    const c = credits(q1, q2, q3, q4);
+    for (const ctx of [
+      general(),
+      senior(),
+      general({ pan: '' })
+    ]) {
+      const q = quarterlySchedule(c, ctx);
+      const a = annualSchedule(c, ctx);
+      expect(q.totalTds).toBe(a.totalTds);
+      expect(q.lines.reduce((s, l) => s + l.tds, 0)).toBe(a.totalTds);
+    }
+  });
+
+  it('holds under section 288B rounding to the nearest ₹10', () => {
+    const ctx = general({ config: { roundTo: 10 } });
+    const c = credits(13_333, 13_333, 13_333, 13_334);
+    expect(quarterlySchedule(c, ctx).totalTds).toBe(annualSchedule(c, ctx).totalTds);
+    expect(annualSchedule(c, ctx).totalTds % 10).toBe(0);
+  });
+
+  /**
+   * Property test. Rounding drift only shows up on awkward numbers, so sweep a
+   * deterministic spread of them rather than trusting hand-picked cases.
+   */
+  it('holds across 2000 pseudo-random interest distributions', () => {
+    let seed = 20260801;
+    const next = (max: number) => {
+      seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0;
+      return Math.floor((seed / 4294967296) * max);
+    };
+
+    for (let i = 0; i < 2000; i++) {
+      const c = credits(next(90_000), next(90_000), next(90_000), next(90_000));
+      const ctx = general({ config: { roundTo: i % 2 === 0 ? 1 : 10 } });
+      const q = quarterlySchedule(c, ctx);
+      const a = annualSchedule(c, ctx);
+      if (q.totalTds !== a.totalTds) {
+        throw new Error(
+          `Mismatch on ${c.map((x) => x.amount).join('/')}: quarterly ${q.totalTds} vs annual ${a.totalTds}`
+        );
+      }
+      expect(q.lines.reduce((s, l) => s + l.tds, 0)).toBe(q.totalTds);
+    }
+  });
+
+  it('holds across 2000 distributions with a declaration at every acceptance point', () => {
+    let seed = 19980731;
+    const next = (max: number) => {
+      seed = (Math.imul(seed, 1664525) + 1013904223) >>> 0;
+      return Math.floor((seed / 4294967296) * max);
+    };
+    const dates = [
+      '2026-04-01',
+      '2026-05-15',
+      '2026-08-01',
+      '2026-10-01',
+      '2027-01-10',
+      '2027-03-31'
+    ];
+
+    for (let i = 0; i < 2000; i++) {
+      const c = credits(next(90_000), next(90_000), next(90_000), next(90_000));
+      const ctx = general({
+        declaration: { kind: '15G', acceptedOn: dates[i % dates.length], fy: '2026-27' },
+        config: { roundTo: i % 2 === 0 ? 1 : 10 }
+      });
+      const q = quarterlySchedule(c, ctx);
+      const a = annualSchedule(c, ctx);
+      if (q.totalTds !== a.totalTds) {
+        throw new Error(
+          `Mismatch on ${c.map((x) => x.amount).join('/')} declared ${dates[i % dates.length]}: ` +
+            `quarterly ${q.totalTds} vs annual ${a.totalTds}`
+        );
+      }
+    }
+  });
+
+  it('adjusts within the year when interest is reversed', () => {
+    // Q2 took the aggregate to ₹80,000 and ₹8,000 was deducted. The reversal
+    // brings the year back to ₹50,000, which does not exceed the trigger at all,
+    // so the whole ₹8,000 is given back in Q3.
+    const c = credits(40_000, 40_000, -30_000, 0);
+    const q = quarterlySchedule(c, general());
+    expect(q.lines.map((l) => l.tds)).toEqual([
+      0,
+      8_000,
+      -8_000,
+      0
+    ]);
+    expect(q.totalTds).toBe(0);
+    expect(annualSchedule(c, general()).totalTds).toBe(0);
+  });
+});
+
+describe('a Form 121 declaration', () => {
+  const fromApril = general({
+    declaration: { kind: '15G', acceptedOn: '2026-04-01', fy: '2026-27', uin: 'U0001' }
+  });
+  const fromOctober = general({
+    declaration: { kind: '15G', acceptedOn: '2026-10-01', fy: '2026-27' }
+  });
+
+  it('stops deduction for the whole year when on record from April', () => {
+    const c = credits(30_000, 30_000, 30_000, 30_000);
+    expect(quarterlySchedule(c, fromApril).totalTds).toBe(0);
+    expect(annualSchedule(c, fromApril).totalTds).toBe(0);
+    expect(reconcile(c, fromApril).matched).toBe(true);
+  });
+
+  it('shields only the interest credited on or after it was accepted', () => {
+    const s = quarterlySchedule(credits(30_000, 30_000, 30_000, 30_000), fromOctober);
+    expect(s.liableInterest).toBe(60_000);
+    expect(s.shieldedInterest).toBe(60_000);
+  });
+
+  it('does not claw back tax already remitted before it arrived', () => {
+    const q = quarterlySchedule(credits(30_000, 30_000, 30_000, 30_000), fromOctober);
+    expect(q.lines.map((l) => l.tds)).toEqual([
+      0,
+      6_000,
+      0,
+      0
+    ]);
+    expect(q.totalTds).toBe(6_000);
+    expect(q.notes[0]).toContain('cannot reverse it');
+  });
+
+  it('leaves the two modes in agreement even when taken mid-year', () => {
+    // A declaration is prospective, so the year-end figure still sees the
+    // pre-declaration interest as liable.
+    const r = reconcile(credits(30_000, 30_000, 30_000, 30_000), fromOctober);
+    expect(r.quarterlyTotal).toBe(6_000);
+    expect(r.annualTotal).toBe(6_000);
+    expect(r.matched).toBe(true);
+  });
+
+  it('reports the divergence when liability falls after deductions were frozen', () => {
+    // Q1 crossed the trigger and ₹6,000 went to the Government. A reversal in
+    // Q3, after the declaration was on record, drags the year back under
+    // ₹50,000 — the liability is now nil but the branch cannot refund.
+    const c: InterestCredit[] = [
+      { date: '2026-06-30', amount: 60_000 },
+      { date: '2026-12-31', amount: -15_000 }
+    ];
+    const r = reconcile(c, fromOctober);
+    expect(r.quarterlyTotal).toBe(6_000);
+    expect(r.annualTotal).toBe(0);
+    expect(r.matched).toBe(false);
+    expect(quarterlySchedule(c, fromOctober).lines[2].tds).toBe(0);
+  });
+});
+
+describe('age is measured against the financial year, not today', () => {
+  it('gives the senior threshold to a customer who turns 60 in March', () => {
+    expect(ageInFy('1967-03-20', FY)).toBe(60);
+    expect(formKindFor('1967-03-20', FY)).toBe('15H');
+    const ctx = general({ dateOfBirth: '1967-03-20' });
+    expect(quarterlySchedule(credits(20_000, 20_000, 20_000, 20_000), ctx).threshold).toBe(100_000);
+  });
+
+  it('keeps the general threshold for a customer who turns 60 the next April', () => {
+    expect(ageInFy('1967-04-20', FY)).toBe(59);
+    expect(formKindFor('1967-04-20', FY)).toBe('15G');
+  });
+});
+
+describe('savings interest is outside section 194A', () => {
+  it.each([
+    [
+      'depositAccountType.fixedDeposit',
+      true
+    ],
+    [
+      'depositAccountType.recurringDeposit',
+      true
+    ],
+    [
+      'depositAccountType.savingsDeposit',
+      false
+    ],
+    [
+      'depositAccountType.currentDeposit',
+      false
+    ],
+    [
+      '',
+      false
+    ]
+  ])('%s -> %s', (code, expected) => {
+    expect(isTdsApplicable({ depositTypeCode: code })).toBe(expected);
+  });
+
+  it('keeps savings interest out of the aggregate entirely', () => {
+    const accounts: TdsAccountInput[] = [
+      {
+        accountNo: 'FD001',
+        depositTypeCode: 'depositAccountType.fixedDeposit',
+        accountStatus: 'SINGLE',
+        clientId: 1,
+        credits: credits(10_000, 10_000, 10_000, 10_000)
+      },
+      {
+        accountNo: 'SB001',
+        depositTypeCode: 'depositAccountType.savingsDeposit',
+        accountStatus: 'SINGLE',
+        clientId: 1,
+        credits: credits(5_000, 5_000, 5_000, 5_000)
+      }
+    ];
+    const collected = collectTdsCredits(1, accounts, FY);
+
+    // ₹40,000 of FD interest, not ₹60,000 — so the trigger is never crossed and
+    // nothing is deducted. Folding the savings interest in would have crossed it.
+    expect(collected.reduce((s, c) => s + c.amount, 0)).toBe(40_000);
+    expect(quarterlySchedule(collected, general()).totalTds).toBe(0);
+  });
+});
+
+describe('whose PAN the tax is deducted against', () => {
+  it('uses the account holder for a single-name account', () => {
+    expect(tdsDeducteeOf({ accountStatus: 'SINGLE', clientId: 7 })).toBe(7);
+    expect(tdsDeducteeOf({ accountStatus: 'INDIVIDUAL_MALE', clientId: 7 })).toBe(7);
+  });
+
+  it('uses the first-named holder on a joint account', () => {
+    expect(
+      tdsDeducteeOf({
+        accountStatus: 'JOINT',
+        primaryClientId: 7,
+        jointHolders: [{ clientId: 9 }]
+      })
+    ).toBe(7);
+  });
+
+  it('uses the guardian on a minor account', () => {
+    expect(tdsDeducteeOf({ accountStatus: 'MINOR', clientId: 11, guardianClientId: 4 })).toBe(4);
+  });
+
+  it('does not count a joint deposit twice across the two holders', () => {
+    const jointFd: TdsAccountInput = {
+      accountNo: 'FD-JOINT',
+      depositTypeCode: 'depositAccountType.fixedDeposit',
+      accountStatus: 'JOINT',
+      primaryClientId: 7,
+      jointHolders: [{ clientId: 9 }],
+      credits: credits(15_000, 15_000, 15_000, 15_000) // ₹60,000
+    };
+
+    // Primary holder carries the whole ₹60,000 and the whole ₹6,000 of tax.
+    const primary = collectTdsCredits(7, [jointFd], FY);
+    expect(primary.reduce((s, c) => s + c.amount, 0)).toBe(60_000);
+    expect(quarterlySchedule(primary, general()).totalTds).toBe(6_000);
+
+    // The second holder carries none of it — no double deduction on one deposit.
+    const secondHolder = collectTdsCredits(9, [jointFd], FY);
+    expect(secondHolder).toEqual([]);
+    expect(quarterlySchedule(secondHolder, general()).totalTds).toBe(0);
+  });
+
+  it('ignores any share percentage when attributing interest', () => {
+    // A 50/50 joint account still reports the full amount against the primary
+    // holder; splitting would produce two deductees for one deposit.
+    const jointFd: TdsAccountInput = {
+      accountNo: 'FD-JOINT',
+      depositTypeCode: 'depositAccountType.fixedDeposit',
+      accountStatus: 'JOINT',
+      primaryClientId: 7,
+      jointHolders: [{ clientId: 9 }],
+      credits: credits(15_000, 15_000, 15_000, 15_000)
+    };
+    expect(collectTdsCredits(7, [jointFd], FY).reduce((s, c) => s + c.amount, 0)).toBe(60_000);
+  });
+
+  it('aggregates a customer across every branch', () => {
+    // Three deposits in three branches, each under the trigger on its own.
+    const accounts: TdsAccountInput[] = [
+      'FD-MUM',
+      'FD-PUN',
+      'FD-NAS'
+    ].map((accountNo, i) => ({
+      accountNo,
+      depositTypeCode: 'depositAccountType.fixedDeposit',
+      accountStatus: 'SINGLE',
+      clientId: 1,
+      credits: [{ date: `2026-0${6 + i}-30`, amount: [
+            20_000,
+            18_000,
+            15_000
+          ][i] }]
+    }));
+
+    const collected = collectTdsCredits(1, accounts, FY);
+    expect(collected.reduce((s, c) => s + c.amount, 0)).toBe(53_000);
+    // Branch by branch none would have crossed ₹50,000. Bank-wide, it does.
+    expect(quarterlySchedule(collected, general()).totalTds).toBe(5_300);
+  });
+
+  it('keeps other financial years out of the selected year', () => {
+    const account: TdsAccountInput = {
+      accountNo: 'FD001',
+      depositTypeCode: 'depositAccountType.fixedDeposit',
+      accountStatus: 'SINGLE',
+      clientId: 1,
+      credits: [
+        { date: '2026-03-31', amount: 99_000 }, // FY 2025-26
+        { date: '2026-06-30', amount: 10_000 }, // FY 2026-27
+        { date: '2027-04-01', amount: 99_000 } // FY 2027-28
+      ]
+    };
+    expect(collectTdsCredits(1, [account], FY).map((c) => c.amount)).toEqual([10_000]);
+  });
+});
+
+describe('settlement mode follows the product, not the customer', () => {
+  it.each([
+    [
+      'savingsPostingInterestPeriodType.monthly',
+      'QUARTERLY'
+    ],
+    [
+      'savingsPostingInterestPeriodType.quarterly',
+      'QUARTERLY'
+    ],
+    [
+      'savingsPostingInterestPeriodType.annual',
+      'ANNUAL'
+    ],
+    [
+      'savingsPostingInterestPeriodType.annually',
+      'ANNUAL'
+    ]
+  ])('%s -> %s', (code, expected) => {
+    expect(tdsModeFor({ interestPostingPeriodType: { code } })).toBe(expected);
+  });
+
+  it('does not mistake a half-yearly product for an annual one', () => {
+    // 'biannual' contains 'annual' — a naive substring test settles half-yearly
+    // products once a year, which is a deduction default.
+    expect(tdsModeFor({ interestPostingPeriodType: { code: 'savingsPostingInterestPeriodType.biannual' } })).toBe(
+      'QUARTERLY'
+    );
+    expect(tdsModeFor({ interestPostingPeriodType: { value: 'Bi-Annual' } })).toBe('QUARTERLY');
+  });
+
+  it('reads the value when no code is present, and defaults safely', () => {
+    expect(tdsModeFor({ interestPostingPeriodType: { value: 'Annually' } })).toBe('ANNUAL');
+    // Unknown or missing configuration settles on the quarterly cycle, which is
+    // the conservative choice — deducting sooner is never a default.
+    expect(tdsModeFor({})).toBe('QUARTERLY');
+    expect(tdsModeFor({ interestPostingPeriodType: null })).toBe('QUARTERLY');
+  });
+});
+
+describe('PAN validation', () => {
+  it.each([
+    [
+      'ABCPM1234E',
+      true
+    ],
+    [
+      'EFGHV5678A',
+      true
+    ],
+    [
+      'PQRSR2233Z',
+      false
+    ],
+    [
+      'TUVWS3344K',
+      false
+    ],
+    [
+      'ABCP1234E',
+      false
+    ],
+    [
+      '',
+      false
+    ]
+  ])('%s -> %s', (pan, expected) => {
+    expect(isWellFormedPan(pan)).toBe(expected);
+  });
+});
+
+const income = (estimatedInterest: number, estimatedIncome: number) => ({
+  estimatedInterest,
+  estimatedIncome,
+  incomeOnRecord: true
+});
+
+/** FY 2025-26 — the last year the 1961 Act and the 15G/15H split applied. */
+const OLD_FY = 'FY 2025-26';
+
+describe('which declaration form is in force', () => {
+  it('splits by age up to FY 2025-26', () => {
+    expect(declarationFormFor(OLD_FY, '1985-02-14')).toBe('15G');
+    expect(declarationFormFor(OLD_FY, '1958-06-22')).toBe('15H');
+  });
+
+  it('is a single Form 121 from FY 2026-27, whatever the age', () => {
+    expect(declarationFormFor(FY, '1985-02-14')).toBe('121');
+    expect(declarationFormFor(FY, '1958-06-22')).toBe('121');
+  });
+
+  it('keeps the senior threshold even though the forms merged', () => {
+    // The two forms became one, but the deduction trigger is still age-based.
+    expect(quarterlySchedule(credits(20_000, 20_000, 20_000, 20_000), general()).threshold).toBe(50_000);
+    expect(quarterlySchedule(credits(20_000, 20_000, 20_000, 20_000), senior()).threshold).toBe(100_000);
+  });
+});
+
+describe('eligibility up to FY 2025-26 — the 15G / 15H tests', () => {
+  const old = (o: Partial<TdsContext> = {}) => general({ fy: OLD_FY, ...o });
+  const oldSenior = (o: Partial<TdsContext> = {}) => senior({ fy: OLD_FY, ...o });
+
+  it('accepts a 15G within both the income and the interest ceiling', () => {
+    const r = checkEligibility(old(), income(90_000, 320_000));
+    expect(r.form).toBe('15G');
+    expect(r.eligible).toBe(true);
+  });
+
+  it('rejects a 15G whose estimated income exceeds the basic exemption', () => {
+    const r = checkEligibility(old(), income(38_500, 850_000));
+    expect(r.eligible).toBe(false);
+    expect(r.reasons.join(' ')).toContain('exceeds the basic exemption');
+  });
+
+  it('rejects a 15G whose interest alone exceeds the basic exemption', () => {
+    // The second limb: interest had to clear the limit as well as income.
+    expect(checkEligibility(old(), income(450_000, 380_000)).eligible).toBe(false);
+  });
+
+  it('places no interest ceiling on a 15H', () => {
+    // A senior citizen with ₹8,00,000 of interest could still declare, provided
+    // deductions and rebate left the liability at nil.
+    const r = checkEligibility(oldSenior(), income(800_000, 900_000));
+    expect(r.form).toBe('15H');
+    expect(r.eligible).toBe(true);
+  });
+
+  it('rejects a 15H that leaves a liability', () => {
+    const r = checkEligibility(oldSenior(), income(800_000, 1_500_000));
+    expect(r.eligible).toBe(false);
+    expect(r.reasons.join(' ')).toContain('nil');
+  });
+
+  it('cites the rule that applied to that year', () => {
+    const r = checkEligibility(old({ pan: '' }), income(10_000, 100_000));
+    expect(r.eligible).toBe(false);
+    expect(r.reasons.join(' ')).toContain('Rule 29C');
+  });
+
+  it('still checks the interest limb when income is not on record', () => {
+    // Income has to be declared by the payee, but the bank knows the interest
+    // figure, so that limb remains assessable.
+    expect(
+      checkEligibility(old(), { estimatedInterest: 450_000, estimatedIncome: 0, incomeOnRecord: false }).eligible
+    ).toBe(false);
+  });
+});
+
+describe('eligibility from FY 2026-27 — the single Form 121 test', () => {
+  it('drops the interest limb entirely', () => {
+    // Under a 15G this failed: interest of ₹4,50,000 was over the basic
+    // exemption limit. Form 121 asks only whether the tax liability is nil, so
+    // the same payee is now eligible.
+    expect(checkEligibility(general({ fy: OLD_FY }), income(450_000, 380_000)).eligible).toBe(false);
+    const r = checkEligibility(general(), income(450_000, 380_000));
+    expect(r.form).toBe('121');
+    expect(r.eligible).toBe(true);
+  });
+
+  it('applies one nil-liability ceiling to every age', () => {
+    for (const ctx of [
+      general(),
+      senior()
+    ]) {
+      expect(checkEligibility(ctx, income(800_000, 900_000)).eligible).toBe(true);
+      const over = checkEligibility(ctx, income(800_000, 1_500_000));
+      expect(over.eligible).toBe(false);
+      expect(over.reasons.join(' ')).toContain('nil');
+    }
+  });
+
+  it('takes PAN only — Aadhaar is not a substitute', () => {
+    const r = checkEligibility(general({ pan: '' }), income(10_000, 100_000));
+    expect(r.eligible).toBe(false);
+    expect(r.reasons.join(' ')).toContain('Rule 211');
+    expect(r.reasons.join(' ')).toContain('Aadhaar is not a substitute');
+  });
+
+  it('refuses an entity PAN', () => {
+    const r = checkEligibility(general({ pan: 'ABCCM1234E' }), income(10_000, 100_000));
+    expect(r.eligible).toBe(false);
+    expect(r.reasons.join(' ')).toContain('entity');
+  });
+
+  it('refuses a non-resident', () => {
+    expect(checkEligibility(general({ resident: false }), income(10_000, 100_000)).eligible).toBe(false);
+  });
+
+  it('reports the nil-liability test as unassessed rather than passing it silently', () => {
+    // The branch cannot compute income earned outside the bank, so a missing
+    // figure must not read as a pass.
+    const r = checkEligibility(general(), {
+      estimatedInterest: 90_000,
+      estimatedIncome: 0,
+      incomeOnRecord: false
+    });
+    expect(r.unassessed.length).toBe(1);
+    expect(r.unassessed[0]).toContain('not on record');
+    // With no interest limb left, nothing else can fail it — so the branch must
+    // read the unassessed note rather than treat the row as cleared.
+    expect(r.eligible).toBe(true);
+  });
+});
+
+describe('statutory references travel with the year', () => {
+  it('quotes the 1961 Act for FY 2025-26 and the 2025 Act for FY 2026-27', () => {
+    expect(FY_TAX_CONFIG['2025-26'].regime).toBe('ITA_1961');
+    expect(FY_TAX_CONFIG['2025-26'].interestTdsSection).toContain('194A');
+    expect(FY_TAX_CONFIG['2025-26'].tdsStatementForm).toBe('Form 26Q');
+    expect(FY_TAX_CONFIG['2025-26'].declarationStatementFrequency).toBe('QUARTERLY');
+
+    expect(FY_TAX_CONFIG['2026-27'].regime).toBe('ITA_2025');
+    expect(FY_TAX_CONFIG['2026-27'].interestTdsSection).toContain('393');
+    expect(FY_TAX_CONFIG['2026-27'].tdsStatementForm).toBe('Form 140');
+    expect(FY_TAX_CONFIG['2026-27'].declarationStatementFrequency).toBe('MONTHLY');
+  });
+
+  it('carries the same thresholds and rates across the changeover', () => {
+    const a = FY_TAX_CONFIG['2025-26'];
+    const b = FY_TAX_CONFIG['2026-27'];
+    expect(b.thresholdGeneral).toBe(a.thresholdGeneral);
+    expect(b.thresholdSenior).toBe(a.thresholdSenior);
+    expect(b.rate).toBe(a.rate);
+    expect(b.rateNoPan).toBe(a.rateNoPan);
+  });
+});
+
+describe('default interest under section 201(1A)', () => {
+  it('counts any part of a month as a full month', () => {
+    expect(monthsOrPartBetween('2026-07-07', '2026-07-07')).toBe(0);
+    expect(monthsOrPartBetween('2026-07-07', '2026-07-08')).toBe(1);
+    expect(monthsOrPartBetween('2026-07-07', '2026-08-07')).toBe(1);
+    expect(monthsOrPartBetween('2026-07-07', '2026-08-08')).toBe(2);
+    expect(monthsOrPartBetween('2026-07-07', '2027-01-07')).toBe(6);
+  });
+
+  it('charges 1% a month for deducting late and 1.5% for depositing late', () => {
+    expect(lateDeductionInterest(6_000, '2026-07-07', '2027-01-07', 'DEDUCTION', FY)).toEqual({
+      months: 6,
+      rate: 0.01,
+      interest: 360
+    });
+    expect(lateDeductionInterest(6_000, '2026-07-07', '2027-01-07', 'DEPOSIT', FY).interest).toBe(540);
+  });
+
+  it('charges nothing when settled on time', () => {
+    expect(lateDeductionInterest(6_000, '2026-07-07', '2026-07-07', 'DEPOSIT', FY).interest).toBe(0);
+  });
+});
+
+describe('helpers', () => {
+  it('resolves the financial year of a date', () => {
+    expect(fyOf('2026-04-01')).toBe('2026-27');
+    expect(fyOf('2027-03-31')).toBe('2026-27');
+    expect(fyOf('2026-03-31')).toBe('2025-26');
+    expect(fyOf('2027-04-01')).toBe('2027-28');
+  });
+
+  it('buckets dated credits into the right quarters and drops out-of-year dates', () => {
+    const b = bucketByQuarter(
+      [
+        { date: '2026-04-05', amount: 100 },
+        { date: '2026-08-01', amount: 200 },
+        { date: '2026-11-30', amount: 300 },
+        { date: '2027-01-15', amount: 400 },
+        { date: '2026-03-31', amount: 999 },
+        { date: '2027-04-01', amount: 999 }
+      ],
+      FY
+    );
+    expect(b).toEqual({ 1: 100, 2: 200, 3: 300, 4: 400 });
+  });
+
+  it('spreads an annual estimate without losing rupees to division', () => {
+    for (const annual of [
+      38_500,
+      52_801,
+      1,
+      999_999
+    ]) {
+      expect(projectQuarterlyCredits(annual, FY).reduce((s, x) => s + x.amount, 0)).toBe(annual);
+    }
+  });
+
+  it('exposes the cumulative liability directly for ad-hoc checks', () => {
+    expect(cumulativeLiability(50_000, 50_000, general())).toBe(0);
+    expect(cumulativeLiability(50_001, 50_001, general())).toBe(5_000);
+  });
+});