feat(investment): Daily Script Master, market rate on purchase, broken-period interest as expense

- 09 Daily Script Master now saves to and loads from the backend (sample
  rows removed), with Drop to correct a wrong rate.
- Purchase Entry takes the rate (NAV for a mutual fund) from the newest
  Daily Script Master rate on or before the deal date, shows which rate
  was used, warns when the rate entered is outside the day's low-high,
  and clears the rate when the script has none.
- Broken-period interest paid to the seller is debited to expense GL
  500606 instead of Interest Receivable (RBI UCB Investment Directions,
  para 152, confirmed by Jitendra Sir); Interest Entry labels it so.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

src/app/cashier/account-register/account-register.component.ts

@@ -12,6 +12,7 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface RegisterRow {
   accountId: number;
@@ -83,7 +84,7 @@ export class AccountRegisterComponent implements OnInit {
 
   /** Local date — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = new Date();
+    const d = businessToday();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

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

@@ -11,6 +11,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
 import { ExportSheetSpec, exportWorkbook } from '../cashier-export';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface SummaryRow {
   code: string;
@@ -1316,7 +1317,7 @@ export class CashClearingTransferSummaryComponent {
   private dateTag = '2607';
 
   constructor() {
-    const d = new Date();
+    const d = businessToday();
     this.asOnDate = `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
     this.dateTag = `${String(d.getFullYear()).slice(-2)}${String(d.getMonth() + 1).padStart(2, '0')}`;
 

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts

@@ -12,6 +12,7 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -63,7 +64,7 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.exchangeDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {

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

@@ -18,6 +18,7 @@ import { MatInputModule } from '@angular/material/input';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 type PageState = 'loading' | 'no-cashier' | 'needs-reconciliation' | 'already-settled' | 'form';
 
@@ -90,7 +91,7 @@ export class CashSettlementComponent implements OnInit {
   saving = false;
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.settlementDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service
       .getTellers()

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

@@ -17,6 +17,7 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -82,7 +83,7 @@ export class CashTransferComponent implements OnInit {
   loadingVault = false;
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {

src/app/cashier/cashier-position/cashier-position.component.ts

@@ -17,6 +17,7 @@ import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -71,7 +72,7 @@ export class CashierPositionComponent implements OnInit {
   isCashierMode = false;
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.isCashierMode = this.authService.isCashierUser();

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

@@ -51,6 +51,12 @@ export class ClerkShareWithdrawalService {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/validate`, {});
   }
 
+  /** Runs the exact same checklist approve() will run, against a draft that hasn't been submitted
+   *  yet — so the clerk sees it in the confirm dialog, before committing to the request. */
+  previewValidate(data: any): Observable<any> {
+    return this.http.post('/clerk/share-withdrawal-requests/preview-validate', data);
+  }
+
   approve(id: number): Observable<any> {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/approve`, {});
   }

src/app/cashier/closing-cash-report/closing-cash-report.component.ts

@@ -12,6 +12,7 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 /** Day-wise denomination-wise closing cash collected from deposits. */
 @Component({
@@ -204,7 +205,7 @@ export class ClosingCashReportComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.date = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.load();
     this.service.getTellers().subscribe({ next: (t: any[]) => (this.tellers = t || []), error: () => {} });

src/app/cashier/day-book/day-book.component.ts

@@ -13,6 +13,7 @@ import { MatIconModule } from '@angular/material/icon';
 import { Router } from '@angular/router';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Which part of the day's work a row came from. Set by the server, one per source register.
@@ -95,7 +96,7 @@ export class DayBookComponent implements OnInit {
 
   /** Local date as yyyy-MM-dd — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = new Date();
+    const d = businessToday();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

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

@@ -17,6 +17,7 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -79,7 +80,7 @@ export class InterCashierTransferComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {

src/app/cashier/my-work/my-work.component.ts

@@ -14,6 +14,7 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { catchError, finalize, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
+import { businessToday } from 'app/core/utils/business-today';
 
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -357,7 +358,7 @@ export class MyWorkComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const d = new Date();
+    const d = businessToday();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 }

src/app/cashier/reconciliation/reconciliation.component.ts

@@ -18,6 +18,7 @@ import { MatTabsModule } from '@angular/material/tabs';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -85,7 +86,7 @@ export class ReconciliationComponent implements OnInit {
   loadingHistory = false;
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.reconDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service
       .getTellers()

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

@@ -11,7 +11,7 @@ import { CommonModule } from '@angular/common';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { catchError, debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
+import { catchError, debounceTime, distinctUntilChanged, map, timeout } from 'rxjs/operators';
 import { forkJoin, of, Subject } from 'rxjs';
 import { MatDialog, MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -33,6 +33,7 @@ import {
 import { SponsorDDService } from '../../sponsor-dd/sponsor-dd.service';
 import { OrganizationService } from '../../organization/organization.service';
 import { CashierIssueDdDialogComponent } from './cashier-issue-dd-dialog.component';
+import { businessToday, businessTodayIso } from 'app/core/utils/business-today';
 
 interface TxnRow {
   typ: string;
@@ -621,7 +622,7 @@ export class AccountStatementDialogComponent implements OnInit {
 
   @ViewChild('statementContent') statementContent!: ElementRef;
 
-  today = new Date().toISOString().slice(0, 10);
+  today = businessTodayIso();
   fromDate = '';
   toDate = this.today;
 
@@ -1870,7 +1871,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   saving = false;
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
     this.addRow();
     this.loadDenominations();
@@ -2103,7 +2104,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   private loadOpeningPosition(): void {
-    const d = new Date();
+    const d = businessToday();
     const asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.cashierService
       .getCashierPositionForMe(asOfDate)
@@ -2837,7 +2838,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     fundingAccountId: number,
     fundingClientId: number | null
   ): void {
-    const d = new Date();
+    const d = businessToday();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
     const isGl = row.acTyp === 'GL';
@@ -2969,7 +2970,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = new Date();
+    const d = businessToday();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
 
@@ -3068,7 +3069,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = new Date();
+    const d = businessToday();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     const payload = {
@@ -3391,7 +3392,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = new Date();
+    const today = businessToday();
     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
@@ -3425,6 +3426,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       meetingDate: shareRow.meetingDate,
       description: shareRow.description || null,
       settlementPaymentTypeId: savingsRow.paymentTypeId,
+      settlementMode: 'SAVINGS',
       settlementRowSnapshot
     };
 
@@ -3455,11 +3457,60 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
+    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
       this.doSubmitShareRedemptionTransfer(payload, shareRow, shares, linkedAcNo)
     );
   }
 
+  /**
+   * Shows the confirm dialog with the same checklist the Manager will see when approving this
+   * request — fetched live from the backend (`previewValidate`) rather than re-implemented here,
+   * so it can never show the clerk something different from what the approver actually sees. A
+   * failing check is shown, not blocked: approve() enforces its own hard rules separately (e.g.
+   * Share Advance Collection applied), this list is advisory so problems surface to whoever can
+   * still fix them, before a manager's time is spent on a request that was always going to fail.
+   */
+  private showShareWithdrawalConfirm(
+    payload: Record<string, unknown>,
+    baseLines: string[],
+    onConfirm: () => void
+  ): void {
+    this.clerkShareWithdrawalService
+      .previewValidate(payload)
+      .pipe(
+        // A request that never resolves (slow network, server busy) must not leave the Submit
+        // button looking dead — the dialog still has to open, just without the checklist.
+        timeout(5000),
+        catchError(() => of({ __previewFailed: true }))
+      )
+      .subscribe((res: any) => {
+        const checks: { label: string; pass: boolean; detail: string }[] = res?.checks ?? [];
+        // A failed call (most likely the backend not yet carrying the /preview-validate endpoint)
+        // says so explicitly rather than just omitting the section — a silently empty checklist
+        // looks identical to "everything passed, nothing to show", which is the one reading this
+        // must never give.
+        const checkLines = res?.__previewFailed ? [
+              '',
+              '⚠ Validation checklist unavailable right now — the request can still be submitted.'
+            ] : checks.length ? [
+                '',
+                'Validation Checks (same as Manager approval):',
+                ...checks.map((c) => `${c.pass ? '✓' : '⚠'} ${c.label}: ${c.detail}`)
+              ] : [];
+        // baseLines ends with a blank line followed by the "Pending Manager approval…" footer
+        // sentence, which must stay last so the modal renders it as a footnote rather than a
+        // key/value row — so the checklist is spliced in just before that pair, not appended after.
+        const footerStart =
+          baseLines.length >= 2 && baseLines[baseLines.length - 2] === '' ? baseLines.length - 2 : baseLines.length;
+        const lines = [
+          ...baseLines.slice(0, footerStart),
+          ...checkLines,
+          ...baseLines.slice(footerStart)
+        ];
+        this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', lines, 'Submit for Approval', onConfirm);
+      });
+  }
+
   /**
    * Share redemption settled to a GL account the clerk picks on the CR row, instead of the
    * member's linked savings account — mirrors submitShareRedemptionTransfer() above, but the
@@ -3512,7 +3563,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = new Date();
+    const today = businessToday();
     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
@@ -3571,7 +3622,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
+    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
       this.doSubmitShareGlSettlementTransfer(payload, shareRow, shares, glRow.acNo)
     );
   }
@@ -4173,7 +4224,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   ): void {
     const accountUrl = `${cfg.detail}/${accountId}${cfg.detailParams ?? '?associations=all'}`;
     const todayStr = (() => {
-      const d = new Date();
+      const d = businessToday();
       return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     })();
 
@@ -4549,7 +4600,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   get todayIso(): string {
-    const d = new Date();
+    const d = businessToday();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 
@@ -5071,7 +5122,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.sameDayChequeClearing = 0;
       return;
     }
-    const today = new Date();
+    const today = businessToday();
     const sameDay = (d: any) => {
       if (!d) return false;
       const t = Array.isArray(d) && d.length >= 3 ? new Date(d[0], d[1] - 1, d[2]) : new Date(d);
@@ -5959,7 +6010,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = new Date();
+    const today = businessToday();
     const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
 
     const payload: any = {
@@ -6154,7 +6205,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the withdrawal-request payload from the current row + loaded account. */
   private buildWithdrawalPayload(row: TxnRow, amount: number): any {
-    const today = new Date();
+    const today = businessToday();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
 
@@ -6259,7 +6310,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the deposit-request payload from the current row + loaded account. */
   private buildDepositPayload(row: TxnRow, amount: number): any {
-    const today = new Date();
+    const today = businessToday();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
     // Send denominations only for cash payments — stale counts on a cheque
@@ -6370,7 +6421,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = new Date();
+    const today = businessToday();
     const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 

src/app/cashier/vault-position/vault-position.component.ts

@@ -16,6 +16,7 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -67,7 +68,7 @@ export class VaultPositionComponent implements OnInit {
   errorMsg = '';
 
   ngOnInit(): void {
-    const d = new Date();
+    const d = businessToday();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.service

src/app/cashier/voucher-report/voucher-report.component.ts

@@ -13,6 +13,7 @@ import { ActivatedRoute } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Which side of the register a screen shows.
@@ -227,7 +228,7 @@ export class VoucherReportComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const now = new Date();
+    const now = businessToday();
     return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
   }
 

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

@@ -129,6 +129,31 @@
           <span>* Date of Meeting</span>
           <input type="date" [(ngModel)]="meetingDate" [disabled]="isReview" />
         </label>
+        <label class="inv-form-field">
+          <span>* Settlement Destination</span>
+          @if (!isReview) {
+            <select [ngModel]="settlementMode" (ngModelChange)="onSettlementModeChange($event)">
+              <option value="SAVINGS">Member's Linked Savings Account</option>
+              <option value="GL">GL Account</option>
+            </select>
+          } @else {
+            <input
+              type="text"
+              [value]="reviewRequest?.settlement_mode === 'GL' ? 'GL Account' : 'Linked Savings Account'"
+              readonly
+            />
+          }
+        </label>
+        @if (!isReview && settlementMode === 'GL') {
+          <label class="inv-form-field">
+            <span>* Settlement GL Account</span>
+            <mifosx-gl-account-selector
+              [inputFormControl]="toGlAccountControl"
+              [glAccountList]="glAccountsData"
+              [required]="true"
+            ></mifosx-gl-account-selector>
+          </label>
+        }
         <label class="inv-form-field">
           <span>* Settlement Payment Type</span>
           @if (!isReview) {
@@ -386,14 +411,25 @@
               <td>Date of Meeting</td>
               <td>{{ meetingDate }}</td>
             </tr>
+            <tr>
+              <td>Settlement Destination</td>
+              <td>{{ settlementMode === 'GL' ? 'GL Account' : 'Linked Savings Account' }}</td>
+            </tr>
+            @if (settlementMode === 'GL') {
+              <tr>
+                <td>Settlement GL Account</td>
+                <td>{{ selectedSettlementGlName }}</td>
+              </tr>
+            } @else {
+              <tr>
+                <td>Linked Savings Account</td>
+                <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</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>
 

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

@@ -8,7 +8,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, UntypedFormControl } from '@angular/forms';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
@@ -19,6 +19,9 @@ 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';
+import { GlAccountSelectorComponent } from '../../shared/accounting/gl-account-selector/gl-account-selector.component';
+import { AccountingService } from '../../accounting/accounting.service';
+import { GLAccount } from '../../shared/models/general.model';
 
 export type ShareWdMode = 'create' | 'review';
 
@@ -51,7 +54,8 @@ interface ActivityEntry {
     RouterModule,
     MatIconModule,
     MatSnackBarModule,
-    SearchSelectComponent
+    SearchSelectComponent,
+    GlAccountSelectorComponent
   ]
 })
 export class ShareWithdrawalRequestComponent implements OnInit {
@@ -60,6 +64,7 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   private sharesService = inject(SharesService);
   private wdService = inject(ClerkShareWithdrawalService);
   private cashierService = inject(CashierService);
+  private accountingService = inject(AccountingService);
   private snackBar = inject(MatSnackBar);
 
   /** When embedded (e.g. opened as a popup from a list screen instead of routed to directly), mode
@@ -91,6 +96,17 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   paymentTypes: any[] = [];
   settlementPaymentTypeId: number | null = null;
 
+  /** Where the redeemed value goes. 'SAVINGS' (the long-standing default) credits the member's
+   *  linked savings account. 'GL' lets the clerk pick any postable GL account directly — same
+   *  option the Cashier's Transaction Entry screen already offers on its CR row, now available
+   *  here too so both entry points behave the same way. Naming the product's own Share Sundry GL
+   *  here is still fine: the backend recognises it and books straight to Sundry with no further
+   *  settlement leg (see ClerkShareWithdrawalRequestApiResource#submit). */
+  settlementMode: 'SAVINGS' | 'GL' = 'SAVINGS';
+  settlementGlAccountId: number | null = null;
+  glAccountsData: GLAccount[] = [];
+  toGlAccountControl = new UntypedFormControl('');
+
   activityLog: ActivityEntry[] = [];
   reviewRequest: any = null;
   showRejectDialog = false;
@@ -132,6 +148,17 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     return this.selectedSettlementPaymentType?.name || '—';
   }
 
+  /** The chosen GL account's display name, for the confirm dialog and the checklist. Falls back to
+   *  the raw id while the GL account list is still loading. */
+  get selectedSettlementGlName(): string {
+    if (!this.settlementGlAccountId) {
+      return '—';
+    }
+    return (
+      this.glAccountsData.find((g) => g.id === this.settlementGlAccountId)?.name || `GL #${this.settlementGlAccountId}`
+    );
+  }
+
   get isFormValid(): boolean {
     if (!this.account) return false;
     if (!this.requestedShares || this.requestedShares <= 0) return false;
@@ -141,6 +168,7 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     if (!this.resolutionNumber.trim()) return false;
     if (!this.meetingDate) return false;
     if (!this.settlementPaymentTypeId) return false;
+    if (this.settlementMode === 'GL' && !this.settlementGlAccountId) return false;
     return true;
   }
 
@@ -160,11 +188,18 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         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'
-      },
+      this.settlementMode === 'GL'
+        ? {
+            label: 'Settlement GL Account selected',
+            pass: !!this.settlementGlAccountId,
+            detail: this.settlementGlAccountId ? this.selectedSettlementGlName : 'Missing'
+          }
+        : {
+            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 !== '—',
@@ -214,11 +249,37 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       .pipe(catchError(() => of([])))
       .subscribe((types: any[]) => (this.paymentTypes = types ?? []));
 
+    this.toGlAccountControl.valueChanges.subscribe((id: any) => {
+      this.settlementGlAccountId = id ? Number(id) : null;
+    });
+
     if (this.requestId && this.mode === 'review') {
       this.loadReviewRequest(this.requestId);
     }
   }
 
+  /** Flips the settlement destination. Switching away from GL clears whatever was picked so a
+   *  stale GL id can never ride along on a SAVINGS submission. */
+  onSettlementModeChange(mode: 'SAVINGS' | 'GL'): void {
+    this.settlementMode = mode;
+    if (mode === 'GL') {
+      this.loadGlAccounts();
+    } else {
+      this.settlementGlAccountId = null;
+      this.toGlAccountControl.setValue('');
+    }
+  }
+
+  /** Fetched on first use rather than with the page, since most withdrawals settle to savings. */
+  private loadGlAccounts(): void {
+    if (this.glAccountsData.length) {
+      return;
+    }
+    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
+      this.glAccountsData = accounts ?? [];
+    });
+  }
+
   onAccountSelected(accountId: string): void {
     this.selectedAccountId = accountId;
     if (!accountId) {
@@ -246,6 +307,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         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 ?? '';
+        this.settlementMode = req.settlement_mode === 'GL' ? 'GL' : 'SAVINGS';
+        this.settlementGlAccountId = req.settlement_gl_account_id ? Number(req.settlement_gl_account_id) : null;
+        if (this.settlementMode === 'GL') {
+          this.loadGlAccounts();
+        }
 
         if (req.activity_log) {
           try {
@@ -289,7 +355,9 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       resolutionNumber: this.resolutionNumber.trim(),
       meetingDate: this.meetingDate,
       description: this.description,
-      settlementPaymentTypeId: this.settlementPaymentTypeId
+      settlementPaymentTypeId: this.settlementPaymentTypeId,
+      settlementMode: this.settlementMode,
+      ...(this.settlementMode === 'GL' ? { settlementGlAccountId: this.settlementGlAccountId } : {})
     };
     this.wdService.submit(payload).subscribe({
       next: () => {

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

@@ -116,8 +116,8 @@
         <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.
+            A declaration is on record for this year, but one or more deposits still carry a tax group. Those accounts
+            deduct on their own and ignore the declaration — remove the tax group from them.
           </div>
         </div>
       }
@@ -192,20 +192,90 @@
               }
             </span>
           </div>
-          @if (declarationOnRecord && declarationFy) {
+          @if (declarationRecord; as d) {
             <div class="f121__kv-row">
               <span>Declared for</span>
-              <span>FY {{ declarationFy }}</span>
+              <span>FY {{ d.fy }} · Form {{ d.formType }}</span>
             </div>
-          }
-          @if (declarationOnRecord && !acceptanceDateKnown) {
-            <div class="f121__kv-row f121__kv-row--muted">
-              <span>Acceptance date</span>
+            <div class="f121__kv-row">
+              <span>Accepted on</span>
               <span>
-                Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
-                the figures below.
+                {{ d.acceptedOn | date: 'd MMM y' }} — no TDS on interest credited from this day to 31 March. Interest
+                credited before it is taxed as usual.
               </span>
             </div>
+            @if (d.uin) {
+              <div class="f121__kv-row">
+                <span>UIN</span>
+                <span class="f121__mono">{{ d.uin }}</span>
+              </div>
+            }
+            <div class="f121__kv-row">
+              <span></span>
+              <span>
+                <button type="button" class="f121__btn f121__btn--warn" (click)="revokeDeclaration()">
+                  Withdraw declaration
+                </button>
+              </span>
+            </div>
+          } @else if (fy && !configMissing) {
+            <div class="f121__kv-row">
+              <span></span>
+              <span>
+                @if (!showDeclarationForm) {
+                  <button type="button" class="f121__btn" (click)="openDeclarationForm()" [disabled]="!panWellFormed">
+                    Record {{ formLabel }} for FY {{ fy }}
+                  </button>
+                  @if (!panWellFormed) {
+                    <div class="muted">A valid PAN must be on the KYC first — a declaration without one is void.</div>
+                  }
+                }
+              </span>
+            </div>
+            @if (showDeclarationForm) {
+              <div class="f121__decl-form">
+                <label>
+                  <span>Accepted on *</span>
+                  <input type="date" [(ngModel)]="newDeclaration.acceptedOn" />
+                </label>
+                <label>
+                  <span>UIN</span>
+                  <input type="text" [(ngModel)]="newDeclaration.uin" placeholder="Allotted on acceptance" />
+                </label>
+                <label>
+                  <span>Estimated income for the year (₹)</span>
+                  <input type="number" min="0" [(ngModel)]="newDeclaration.estimatedIncome" />
+                </label>
+                @if (declarationError) {
+                  <div class="f121__note f121__note--warn">
+                    <mat-icon>error_outline</mat-icon>
+                    <div>{{ declarationError }}</div>
+                  </div>
+                }
+                <div class="f121__decl-actions">
+                  <button type="button" class="f121__btn" (click)="showDeclarationForm = false">Cancel</button>
+                  <button
+                    type="button"
+                    class="f121__btn f121__btn--primary"
+                    (click)="saveDeclaration()"
+                    [disabled]="savingDeclaration"
+                  >
+                    {{ savingDeclaration ? 'Saving…' : 'Save declaration' }}
+                  </button>
+                </div>
+              </div>
+            }
+          }
+          @for (old of declarations; track old.id) {
+            @if (old.revoked && old.fy === fy) {
+              <div class="f121__kv-row f121__kv-row--muted">
+                <span>Withdrawn</span>
+                <span>
+                  Form {{ old.formType }} accepted {{ old.acceptedOn | date: 'd MMM y' }}, withdrawn
+                  {{ old.revokedOn | date: 'd MMM y' }} — {{ old.revokeReason }}
+                </span>
+              </div>
+            }
           }
           @if (eligibility) {
             @for (reason of eligibility.reasons; track reason) {

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

@@ -332,3 +332,61 @@
   font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
   font-weight: 600;
 }
+
+/* ── Recording a declaration ── */
+.f121__btn {
+  padding: 6px 14px;
+  border: 1px solid #d1d5db;
+  border-radius: 6px;
+  background: #fff;
+  font: inherit;
+  font-size: 12.5px;
+  font-weight: 600;
+  cursor: pointer;
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+
+  &--primary {
+    border-color: #1d4ed8;
+    background: #1d4ed8;
+    color: #fff;
+  }
+
+  &--warn {
+    border-color: #b45309;
+    color: #b45309;
+  }
+}
+
+.f121__decl-form {
+  display: grid;
+  gap: 10px;
+  padding: 12px 16px;
+
+  label {
+    display: grid;
+    gap: 4px;
+    font-size: 12px;
+
+    span {
+      color: #6b7280;
+      font-weight: 600;
+    }
+
+    input {
+      max-width: 280px;
+      padding: 6px 8px;
+      border: 1px solid #d1d5db;
+      border-radius: 6px;
+      font: inherit;
+    }
+  }
+}
+
+.f121__decl-actions {
+  display: flex;
+  gap: 8px;
+}

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

@@ -23,6 +23,8 @@ 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';
+import { TdsDeclarationRecord, TdsReportsService } from 'app/tds-reports/tds-reports.service';
+import { TdsDeductee } from 'app/tds-reports/tds-reports-data';
 
 /** Domain logic */
 import {
@@ -111,6 +113,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   private savingsService = inject(SavingsService);
   private fixedDepositsService = inject(FixedDepositsService);
   private recurringDepositsService = inject(RecurringDepositsService);
+  private tdsService = inject(TdsReportsService);
 
   private destroy$ = new Subject<void>();
 
@@ -124,23 +127,25 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   pan = '';
   panWellFormed = false;
 
-  // ── Declaration on record ──
-  declarationOnRecord = false;
+  // ── Declarations on record ──
+  /**
+   * Every declaration the customer has given, each for one year and from the day the branch
+   * accepted it. The KYC record only ever held a type and a year, which made a September
+   * declaration shield interest back to April and let last year's form run on.
+   */
+  declarations: TdsDeclarationRecord[] = [];
   /**
    * 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;
+
+  // ── Recording a declaration ──
+  showDeclarationForm = false;
+  savingDeclaration = false;
+  declarationError = '';
+  newDeclaration = { acceptedOn: '', uin: '', estimatedIncome: null as number | null };
 
   eligibility: EligibilityResult | null = null;
 
@@ -157,9 +162,9 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   configMissing = false;
 
   /** 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>();
+  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow; taxLines: InterestCredit[] })[] = [];
+  /** This customer's FD/RD interest received in savings, and TDS taken there, per year. */
+  private platformByFy = new Map<string, TdsDeductee | null>();
 
   ngOnInit(): void {
     this.route.parent.params.pipe(takeUntil(this.destroy$)).subscribe((params: any) => {
@@ -182,13 +187,15 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     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)))
+      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null))),
+      declarations: this.tdsService.getDeclarations(Number(this.clientId)).pipe(catchError(() => of([])))
     })
       .pipe(
         takeUntil(this.destroy$),
-        switchMap(({ client, kyc, accounts }) => {
+        switchMap(({ client, kyc, accounts, declarations }) => {
           this.applyClient(client);
           this.applyKyc(kyc);
+          this.declarations = declarations || [];
           const deposits = this.depositAccountsOf(accounts);
           return deposits.length ? forkJoin(deposits.map((a) => this.fetchAccount(a))) : of([] as any[]);
         }),
@@ -212,12 +219,8 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   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 && FY_TAX_CONFIG[normaliseFy(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. */
@@ -251,7 +254,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
    */
   private ingest(details: any[]): void {
     this.accountInputs = [];
-    this.actualTdsByFy = new Map<string, number>();
+    this.platformByFy = new Map<string, TdsDeductee | null>();
     const fys = new Set<string>();
     const clientIdNum = Number(this.clientId);
 
@@ -272,6 +275,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
       };
 
       const credits: InterestCredit[] = [];
+      const taxLines: InterestCredit[] = [];
       let tdsDeducted = 0;
 
       for (const t of d.transactions ?? []) {
@@ -289,8 +293,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         } 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);
+          taxLines.push({ date: iso, amount, accountNo: ref.accountNo });
         }
       }
 
@@ -313,12 +316,12 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         deducteeClientId: deductee
       };
 
-      this.accountInputs.push({ ...ref, credits, meta });
+      this.accountInputs.push({ ...ref, credits, taxLines, meta });
     }
 
     this.availableFys = [...fys].sort().reverse();
     if (!this.availableFys.includes(this.fy)) {
-      this.fy = this.availableFys[0] ?? (this.declarationFy ? normaliseFy(this.declarationFy) : '');
+      this.fy = this.availableFys[0] ?? this.declarations[0]?.fy ?? Object.keys(FY_TAX_CONFIG).sort().reverse()[0] ?? '';
     }
   }
 
@@ -338,11 +341,35 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     const year = normaliseFy(this.fy);
     this.configMissing = !FY_TAX_CONFIG[year];
 
+    // TDS is tracked on FD/RD interest once it reaches savings, and deducted there. Those figures live
+    // on the platform, not in the deposit's own transactions, so they are fetched once per year and
+    // the computation waits for them.
+    if (!this.platformByFy.has(year)) {
+      this.loadPlatformYear(year);
+      return;
+    }
+    const platform = this.platformByFy.get(year);
+    for (const a of this.accountInputs) {
+      if (!a.meta.tdsApplicable) {
+        continue;
+      }
+      const match = platform?.accounts.find((p) => p.accountNo === a.accountNo);
+      a.credits = match?.credits ?? [];
+      a.taxLines = match?.deductions ?? [];
+    }
+
     // 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);
+      // The selected year only - this used to total every year the account had ever been taxed in.
+      a.meta.tdsDeducted = a.meta.tdsApplicable
+        ? a.taxLines.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0)
+        : 0;
     }
-    this.actualTds = this.actualTdsByFy.get(year) ?? 0;
+    // What was actually debited for this customer as deductee, wherever the savings account sits.
+    this.actualTds = this.accountInputs
+      .filter((a) => a.meta.tdsApplicable)
+      .reduce((s, a) => s + a.meta.tdsDeducted, 0);
 
     if (!this.dateOfBirth || this.configMissing) {
       return;
@@ -382,21 +409,95 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     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) {
+  private loadPlatformYear(year: string): void {
+    this.tdsService
+      .getDepositInterest(Number(year.slice(0, 4)), Number(this.clientId))
+      .pipe(
+        catchError(() => of([])),
+        takeUntil(this.destroy$)
+      )
+      .subscribe((rows) => {
+        this.platformByFy.set(year, rows.find((r) => `${r.clientId}` === `${this.clientId}`) ?? null);
+        this.recompute();
+      });
+  }
+
+  /** The live declaration recorded for the year being shown, if any. */
+  get declarationRecord(): TdsDeclarationRecord | null {
+    if (!this.fy) {
       return null;
     }
     const year = normaliseFy(this.fy);
-    if (this.declarationFy && normaliseFy(this.declarationFy) !== year) {
+    return this.declarations.find((d) => d.fy === year && !d.revoked) ?? null;
+  }
+
+  get declarationOnRecord(): boolean {
+    return !!this.declarationRecord;
+  }
+
+  /** The declaration as the engine takes it — operative from the day it was accepted. */
+  private declarationForSelectedFy(): Declaration | null {
+    const d = this.declarationRecord;
+    if (!d) {
       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
-    };
+    const kind = d.formType === '15H' ? '15H' : d.formType === '15G' ? '15G' : formKindFor(this.dateOfBirth, d.fy);
+    return { kind, acceptedOn: d.acceptedOn, fy: d.fy, uin: d.uin || undefined };
+  }
+
+  openDeclarationForm(): void {
+    this.newDeclaration = { acceptedOn: new Date().toISOString().slice(0, 10), uin: '', estimatedIncome: null };
+    this.declarationError = '';
+    this.showDeclarationForm = true;
+  }
+
+  saveDeclaration(): void {
+    if (!this.newDeclaration.acceptedOn) {
+      this.declarationError = 'Enter the date the branch accepted the form.';
+      return;
+    }
+    this.savingDeclaration = true;
+    this.declarationError = '';
+    this.tdsService
+      .createDeclaration({
+        clientId: Number(this.clientId),
+        fy: normaliseFy(this.fy),
+        formType: declarationFormFor(this.fy, this.dateOfBirth),
+        acceptedOn: this.newDeclaration.acceptedOn,
+        uin: this.newDeclaration.uin || undefined,
+        estimatedIncome: this.newDeclaration.estimatedIncome
+      })
+      .subscribe({
+        next: (rows) => {
+          this.savingDeclaration = false;
+          this.showDeclarationForm = false;
+          this.declarations = rows || [];
+          this.recompute();
+        },
+        error: (err: any) => {
+          this.savingDeclaration = false;
+          this.declarationError =
+            err?.error?.errors?.[0]?.defaultUserMessage || err?.error?.defaultUserMessage || 'Could not save.';
+        }
+      });
+  }
+
+  revokeDeclaration(): void {
+    const d = this.declarationRecord;
+    if (!d) {
+      return;
+    }
+    const reason = prompt('Why is this declaration being withdrawn? From today, TDS will be deducted again.');
+    if (!reason) {
+      return;
+    }
+    this.tdsService.revokeDeclaration(d.id, reason).subscribe({
+      next: (rows) => {
+        this.declarations = rows || [];
+        this.recompute();
+      },
+      error: (err: any) => alert(err?.error?.defaultUserMessage || 'Could not revoke the declaration.')
+    });
   }
 
   // ───────────────────────── Template helpers ─────────────────────────
@@ -474,11 +575,12 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * A declaration is on record but deposit accounts are still set to withhold —
-   * the branch has not switched them off.
+   * A declaration is on record but a deposit still carries a stock Fineract tax group. Those
+   * accounts withhold on their own rules and never consult the declaration record, so the form
+   * does not stop their deduction until the tax group is removed.
    */
   get declarationNotAppliedToAccounts(): boolean {
-    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => a.withHoldTax);
+    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => !!a.taxGroup);
   }
 
   /**

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

@@ -36,6 +36,10 @@ export class CacheInterceptor implements HttpInterceptor {
     '/rbireserveconfig',
     '/tdsconfig',
     '/tds/deposit-interest',
+    // Declarations and challans are entered on the very screens that read them back.
+    '/tds/declarations',
+    '/tds/challans',
+    '/tds/deducted',
     '/savingsinterestpostingreports',
     // Cash in vaults and drawers changes with every transaction; a cached teller list or position
     // kept showing a branch's old tellers and figures at day close.

src/app/core/http/error-handler.interceptor.ts

@@ -67,12 +67,18 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     // endpoint isn't available on a given backend deployment, the client-general-step
     // component already falls back to riskRules = [] silently; no toast needed here either.
     const isKycRiskRulesRequest = request.url.includes('/kyc/risk-rules');
+    // A document's own file can be missing from the content store (a database copied between
+    // environments without its file store is the usual cause) even though its m_document row
+    // survives — the backend reports that as a 404, same as a client with no photo, and every
+    // caller that fetches a signature/attachment image already recovers with its own catchError.
+    const isDocumentAttachmentRequest = request.url.match(/\/documents\/\d+\/attachment$/);
     const isSilentRequest =
       isClientImageRequest ||
       isClientKycRequest ||
       isDirectorRequest ||
       isClientPendingEditRequest ||
-      isKycRiskRulesRequest;
+      isKycRiskRulesRequest ||
+      isDocumentAttachmentRequest;
 
     // Explicit per-request opt-out (e.g. per-row enrichment fetches on a list page whose
     // component already recovers via its own catchError) — silenced for every status, since
@@ -93,8 +99,8 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
       throw response;
     }
 
-    // Resolved once and emitted in one place below, so every failure here is consistently tagged
-    // as an error and therefore surfaces as a centred modal rather than a corner toast.
+    // Resolved once and emitted in one place below — see the severity decision there for which of
+    // these surfaces as a centred modal versus a corner toast.
     let alert: { type: string; message: string } | null = null;
     if (status === 401 || (environment.oauth.enabled && status === 400)) {
       alert = { type: 'Authentication Error', message: 'Invalid User Details. Please try again!' };
@@ -119,7 +125,13 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
         message: errorMessage || 'This action is not allowed in the current state.'
       };
     } else if (status === 500) {
-      alert = { type: 'Internal Server Error', message: 'Internal Server Error. Please try again later.' };
+      // errorMessage carries the backend's actual explanation (defaultUserMessage/developerMessage)
+      // when one is present; the generic sentence is only a last resort for a response with no body
+      // at all (a proxy timeout, a stack trace the server never wrapped into JSON).
+      alert = {
+        type: 'Internal Server Error',
+        message: errorMessage || 'Internal Server Error. Please try again later.'
+      };
     } else if (status === 501) {
       alert = {
         type: this.translate.instant('error.resource.notImplemented.type'),
@@ -133,7 +145,17 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     }
 
     if (alert) {
-      this.alertService.alert({ ...alert, severity: 'error' });
+      // A GET is the page reading data it did not ask the user for, in the background — a photo,
+      // an attachment, a notes list, a standing-instructions panel. Every one of those already has
+      // its own catchError fallback at the call site (see transaction-entry.component.ts and
+      // similar account-overview loaders), so the page keeps working regardless. Blocking the whole
+      // screen on a dialog the user has to click "OK" on, for data that was never more than a
+      // secondary panel, is the "irritate na ho" complaint this guards against — it goes to the
+      // corner toast instead, same place a non-error alert already goes. A write (POST/PUT/PATCH/
+      // DELETE) is different: that is the one action the user was waiting on, so its failure still
+      // needs the centred, must-acknowledge dialog.
+      const isBackgroundRead = request.method === 'GET' && (status === 500 || status === 501 || status === 503);
+      this.alertService.alert({ ...alert, severity: isBackgroundRead ? undefined : 'error' });
     }
 
     throw response;

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

@@ -20,7 +20,7 @@
       <div class="t-live"></div>
       &nbsp;LIVE
     </div>
-    <div class="t-chip">Branch:&nbsp;<strong>HO</strong></div>
+    <div class="t-chip">Branch:&nbsp;<strong>{{ officeLabel }}</strong></div>
     <div class="t-chip">
       Date:&nbsp;<strong>{{ today | date: 'dd MMM yyyy' }}</strong>
     </div>

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

@@ -49,6 +49,7 @@ import { MatIcon } from '@angular/material/icon';
 import { NotificationsTrayComponent as NotificationsTrayComponent_1 } from '../../../shared/notifications-tray/notifications-tray.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { DocumentationLinksService } from 'app/shared/services/documentation-links.service';
+import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Toolbar component.
@@ -92,6 +93,14 @@ export class ToolbarComponent implements OnInit, AfterViewInit, AfterContentChec
   @ViewChild('templateAppMenu') templateAppMenu: TemplateRef<any>;
   @ViewChild('notificationsTray') notificationsTray: NotificationsTrayComponent;
 
+  /** The signed-in user's office — this chip read "HO" for every login, branch staff included. */
+  get officeLabel(): string {
+    if (this.authenticationService.isHeadOfficeUser()) {
+      return 'HO';
+    }
+    return this.authenticationService.getCredentials()?.officeName || '—';
+  }
+
   /** Subscription to breakpoint observer for handset. */
   isHandset$: Observable<boolean> = this.breakpointObserver
     .observe(Breakpoints.Handset)
@@ -100,8 +109,10 @@ export class ToolbarComponent implements OnInit, AfterViewInit, AfterContentChec
   /** Sets the initial state of sidenav as collapsed. Not collapsed if false. */
   sidenavCollapsed = true;
 
-  /** Current date for top bar display */
-  today = new Date();
+  /** The bank's "today" for the top bar — the business date when enabled, else the server date. */
+  get today(): Date {
+    return businessToday();
+  }
 
   /** Last login time display */
   lastLoginTime = this.formatLastLogin();

src/app/core/utils/business-today.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * The bank's "today": the business date while `enable-business-date` is on, the server's own date
+ * while it is off. The server decides which (GET /branchday/today); the web app stores the answer
+ * in `mifosXServerDate` at login and whenever the business date changes. Before that has happened
+ * the browser clock is the only date there is, so it is the fallback.
+ */
+export function businessToday(): Date {
+  const stored = localStorage.getItem('mifosXServerDate');
+  const match = stored ? /^(\d{4})-(\d{2})-(\d{2})$/.exec(stored) : null;
+  if (!match) {
+    return new Date();
+  }
+  // Built from parts so it is local midnight — new Date('yyyy-MM-dd') would be UTC midnight and
+  // land on the previous day in any timezone behind UTC.
+  return new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]));
+}
+
+/** {@link businessToday} as yyyy-MM-dd. */
+export function businessTodayIso(): string {
+  const d = businessToday();
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+}

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

@@ -18,9 +18,16 @@
       <p class="dialog-sub">NDTL &middot; CRR/SLR Computation Base &middot; As per RBI Master Circular</p>
     </div>
     <div class="header-right">
+      <!-- The close being reported, and under it the close the ratios are charged on. Two dates,
+           because they are not the same day and the requirement belongs to the earlier one. -->
       <div class="as-of-box">
-        <strong>{{ reportingDateStr }}</strong>
-        <span>Reporting Fortnight (45-day lag)</span>
+        <strong>{{ reportingDateStr || '—' }}</strong>
+        <span>
+          Fortnight close
+          @if (baseDateStr) {
+            &middot; charged on {{ baseDateStr }}
+          }
+        </span>
       </div>
       <a
         class="rbi-circular-btn"
@@ -42,31 +49,44 @@
   <div class="summary-row">
     <div class="summary-card sc-demand">
       <div class="sc-label">Total Demand Liabilities</div>
-      <div class="sc-value">&#8377;12,843<span class="cr">Cr</span></div>
-      <div class="sc-change up">&#8593; 3.2% vs prev fortnight</div>
+      <div class="sc-value">{{ crore(totalDemand) }}<span class="cr" *ngIf="totalDemand !== null">Cr</span></div>
+      <div class="sc-sub">Payable on demand</div>
     </div>
     <div class="summary-card sc-time">
       <div class="sc-label">Total Time Liabilities</div>
-      <div class="sc-value">&#8377;64,618<span class="cr">Cr</span></div>
-      <div class="sc-change up">&#8593; 1.8% vs prev fortnight</div>
+      <div class="sc-value">{{ crore(totalTime) }}<span class="cr" *ngIf="totalTime !== null">Cr</span></div>
+      <div class="sc-sub">Payable on maturity</div>
     </div>
     <div class="summary-card sc-asset">
       <div class="sc-label">Assets with Banking System</div>
-      <div class="sc-value">&#8377;8,240<span class="cr">Cr</span></div>
+      <div class="sc-value">
+        {{ crore(totalBankingAssets) }}<span class="cr" *ngIf="totalBankingAssets !== null">Cr</span>
+      </div>
       <div class="sc-change dn">&#8595; Deducted from NDTL</div>
     </div>
     <div class="summary-card sc-ndtl">
       <div class="sc-label">Net Demand &amp; Time Liabilities (NDTL)</div>
-      <div class="sc-value">&#8377;69,221<span class="cr">Cr</span></div>
+      <div class="sc-value">{{ crore(ndtl) }}<span class="cr" *ngIf="ndtl !== null">Cr</span></div>
       <div class="sc-sub">After deducting banking assets</div>
     </div>
     <div class="summary-card sc-crr">
-      <div class="sc-label">CRR Required ({{ crrRate }}%)</div>
-      <div class="sc-value">&#8377;{{ crrRequired | number: '1.0-0' }}<span class="cr">Cr</span></div>
-      <div class="sc-sub">SLR Req: &#8377;{{ slrRequired | number: '1.0-0' }} Cr ({{ slrRate }}%)</div>
+      <!-- The rate is named from the configuration, not fixed here: a card headed "CRR Required
+           (3%)" while Admin holds 4% states a rate the bank is not on. -->
+      <div class="sc-label">CRR Required{{ crrRate === null ? '' : ' (' + crrRate + '%)' }}</div>
+      <div class="sc-value">{{ crore(crrRequired) }}<span class="cr" *ngIf="crrRequired !== null">Cr</span></div>
+      <div class="sc-sub">
+        SLR Req: {{ crore(slrRequired) }}{{ slrRate === null ? '' : ' Cr (' + slrRate + '%)' }}
+      </div>
     </div>
   </div>
 
+  <!-- Why the figures are not there, in the return's own words. A dashboard that simply shows
+       dashes sends an administrator looking for a fault in the dashboard. -->
+  <div class="unavailable-note" *ngIf="unavailable">
+    <fa-icon icon="exclamation-triangle"></fa-icon>
+    {{ unavailable }}
+  </div>
+
   <!-- Tab Navigation -->
   <div class="tab-nav">
     <button class="tab-btn" [class.active]="activeTab === 'demand'" (click)="activeTab = 'demand'">
@@ -124,13 +144,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3"><strong>Total Demand Liabilities (All 16 Items)</strong></td>
-            <td class="right foot-demand">12,114.75</td>
-            <td class="right foot-demand">12,843.50</td>
-            <td class="right up">+728.75</td>
+            <td colspan="3"><strong>Total Demand Liabilities ({{ demandLiabilities.length }} accounts)</strong></td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "openingValue") }}</td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "currentValue") }}</td>
+            <td class="right">{{ totalChange(demandLiabilities) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -179,13 +207,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3"><strong>Total Time Liabilities (All 13 Items)</strong></td>
-            <td class="right foot-time">62,613.10</td>
-            <td class="right foot-time">64,618.00</td>
-            <td class="right up">+2,004.90</td>
+            <td colspan="3"><strong>Total Time Liabilities ({{ timeLiabilities.length }} accounts)</strong></td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "openingValue") }}</td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "currentValue") }}</td>
+            <td class="right">{{ totalChange(timeLiabilities) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -228,15 +264,23 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
             <td colspan="3">
               <strong>Total Assets with Banking System</strong> <span class="deduct-tag">( Deducted from NDTL )</span>
             </td>
-            <td class="right foot-asset">7,600.70</td>
-            <td class="right foot-asset">8,240.20</td>
-            <td class="right up">+639.50</td>
+            <td class="right foot-asset">{{ totalOf(bankingAssets, "openingValue") }}</td>
+            <td class="right foot-asset">{{ totalOf(bankingAssets, "currentValue") }}</td>
+            <td class="right">{{ totalChange(bankingAssets) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -285,13 +329,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
             <td colspan="4"><strong>Total Liquid Assets (SLR Eligible)</strong></td>
-            <td class="right foot-slr">12,511.70</td>
-            <td class="right foot-slr">13,238.80</td>
-            <td class="right up">+727.10</td>
+            <td class="right foot-slr">{{ totalOf(liquidAssets, "openingValue") }}</td>
+            <td class="right foot-slr">{{ totalOf(liquidAssets, "currentValue") }}</td>
+            <td class="right">{{ totalChange(liquidAssets) }}</td>
             <td></td>
           </tr>
         </tfoot>

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

@@ -842,3 +842,30 @@ $slr-b: #bae6fd;
     padding: 8px 16px;
   }
 }
+
+/* Why the figures are missing, in the return's own words — an administrator reading only dashes
+   goes looking for a fault in this screen rather than in the configuration that actually caused it. */
+.unavailable-note {
+  margin: 0 0 16px;
+  padding: 10px 14px;
+  background: #fffbeb;
+  color: #92400e;
+  border-radius: 8px;
+  font-size: 12.5px;
+  line-height: 1.6;
+
+  fa-icon {
+    margin-right: 8px;
+  }
+}
+
+/* A head with nothing mapped. Said in the table rather than left as an empty body, and it names the
+   screen where the mapping is made — an empty table otherwise reads as a fault in this one. */
+.empty-row td {
+  padding: 22px 16px;
+  text-align: center;
+  color: #6b7280;
+  font-size: 12.5px;
+  line-height: 1.6;
+  background: #fafafa;
+}

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

@@ -6,13 +6,30 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule, DecimalPipe } from '@angular/common';
 import { MatDialogRef, MatDialogModule } from '@angular/material/dialog';
 import { MatButtonModule } from '@angular/material/button';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { RbiCircularsService } from '../../../rbi-circulars/rbi-circulars.service';
+
+/** One account under a head, at the base date and the reporting date. */
+interface CrrSlrRow {
+  sl: string;
+  name: string;
+  sub: string;
+  code: string;
+  opening: string;
+  current: string;
+  /** The figures themselves, kept so totals add from values rather than from formatted text. */
+  openingValue: number | null;
+  currentValue: number | null;
+  change: string;
+  changeDir: 'up' | 'dn' | 'flat';
+  status: string;
+}
 
 @Component({
   selector: 'mifosx-crr-slr-dialog',
@@ -29,477 +46,230 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
     FaIconComponent
   ]
 })
-export class CrrSlrDialogComponent {
+export class CrrSlrDialogComponent implements OnInit {
   private dialogRef = inject(MatDialogRef<CrrSlrDialogComponent>);
+  private rbi = inject(RbiCircularsService);
 
   activeTab: 'demand' | 'time' | 'assets' | 'slr' = 'demand';
 
-  /** Reporting fortnight date — 45 days before current date */
-  today = new Date();
-  reportingDate: Date;
-  reportingDateStr: string;
+  /** The date the figures were struck at, as the return itself reports it. */
+  reportingDateStr = '';
 
-  /** NDTL & Reserve computations */
-  readonly totalDemand = 12843.5;
-  readonly totalTime = 64618.0;
-  readonly totalBankingAssets = 8240.2;
-  readonly ndtl = 69221.3; // Demand + Time - Banking Assets
-  readonly crrRate = 3; // Current RBI CRR rate (%)
-  readonly slrRate = 18; // Current RBI SLR rate (%)
-  readonly crrRequired = 69221.3 * 0.03; // ₹2,076.64 Cr
-  readonly slrRequired = 69221.3 * 0.18; // ₹12,459.83 Cr
-  readonly totalLiquidAssets = 13238.8;
-  readonly slrActualPercent = +((13238.8 / 69221.3) * 100).toFixed(2); // 19.12%
-  readonly slrSurplus = +(13238.8 - 69221.3 * 0.18).toFixed(2); // 778.97
-  readonly totalReserve = +(69221.3 * 0.03 + 69221.3 * 0.18).toFixed(2); // 14,536.47
+  /**
+   * The close the ratios are charged on — the second preceding fortnight, not the one reported.
+   *
+   * Named on screen because the gap between the two is the whole of how the rules work: a bank
+   * cannot hold a reserve against liabilities it does not yet know, so the requirement is fixed on
+   * a position already struck and reported. A screen showing one date invites a reader to think the
+   * requirement was worked out on the day it is shown against.
+   */
+  baseDateStr = '';
 
-  constructor() {
-    // CRR/SLR uses data from 45 days ago
-    const lagDays = 45;
-    this.reportingDate = new Date(this.today);
-    this.reportingDate.setDate(this.reportingDate.getDate() - lagDays);
-    this.reportingDateStr = this.reportingDate.toLocaleDateString('en-IN', {
-      day: '2-digit',
-      month: 'short',
-      year: 'numeric'
+  loading = true;
+  /** Set when the return could not be computed — and why, in the return's own words. */
+  unavailable = '';
+
+  /**
+   * The NDTL computation, read from the return rather than stated here.
+   *
+   * These were fixed numbers until now — a demonstration screen that showed ₹69,221 Cr whatever the
+   * ledger held. The figures are the bank's own regulatory position, so a plausible-looking number
+   * is worse than no number: it reads as a reported figure and cannot be told apart from one.
+   *
+   * Null until the return answers, and left null where it cannot compute. The template shows a dash
+   * for a null, which says "not reported" where a zero would say "reported as nil".
+   */
+  totalDemand: number | null = null;
+  totalTime: number | null = null;
+  totalBankingAssets: number | null = null;
+  ndtl: number | null = null;
+  crrRate: number | null = null;
+  slrRate: number | null = null;
+  crrRequired: number | null = null;
+  slrRequired: number | null = null;
+  totalLiquidAssets: number | null = null;
+  slrActualPercent: number | null = null;
+  slrSurplus: number | null = null;
+  totalReserve: number | null = null;
+
+  /**
+   * A figure for display, or a dash where the return did not carry one.
+   *
+   * A dash and a zero say different things — "not reported" against "reported as nil" — and on a
+   * regulatory screen the difference decides whether anyone goes looking for the missing mapping.
+   */
+  crore(value: number | null): string {
+    if (value === null) {
+      return '—';
+    }
+    return `₹${value.toLocaleString('en-IN', { maximumFractionDigits: 0 })}`;
+  }
+
+  ngOnInit(): void {
+    // The return is reported in rupees; this screen reads in crore, as a dashboard tile does.
+    const toCrore = (v: number | null | undefined): number | null =>
+      v === null || v === undefined ? null : +(v / 1e7).toFixed(2);
+
+    // The statutory Form 1, not the working report. Form 1 is filed twice a month — at the 15th and
+    // at the month end — and this screen should show the close the bank last filed, not a position
+    // struck 45 days back by a lag rule that belongs to the other report. Those two disagree by
+    // weeks, and the 45-day one lands mid-fortnight on a date the bank never reported.
+    this.rbi.getForm1Statutory().subscribe({
+      next: (data: any) => {
+        this.loading = false;
+
+        // The later of the two closes the return reports — the one the bank most recently filed.
+        const columns: string[] = data?.columns ?? [];
+        const latest = columns.length - 1;
+        this.reportingDateStr = columns[latest] ?? '';
+        this.baseDateStr = data?.baseColumns?.[latest] ?? '';
+        this.crrRate = data?.crrPercentage ?? null;
+        this.slrRate = data?.slrPercentage ?? null;
+
+        if (!columns.length) {
+          this.unavailable =
+            data?.unmetRequirements?.[0] ??
+            'Form 1 could not be computed. Check the CRR/SLR configuration in Admin.';
+          return;
+        }
+        // The return computes but says something would make it wrong to file — a rate never set, a
+        // base date the ledger cannot answer. Shown rather than swallowed: the reason is the thing
+        // an administrator needs in order to fix it.
+        this.unavailable = data?.unmetRequirements?.[0] ?? '';
+
+        // Part A's own lines, read by the Roman numeral each carries. Read from the return rather
+        // than recomputed, so this screen and the filed form cannot come to disagree.
+        const lines: any[] = data?.partA?.lines ?? [];
+        const at = (startsWith: string): number | null => {
+          const line = lines.find((l: any) => String(l?.label ?? '').startsWith(startsWith));
+          return line?.values?.[latest] ?? null;
+        };
+
+        this.totalDemand = toCrore(at('(A) Demand liabilities'));
+        this.totalTime = toCrore(at('(B) Time liabilities'));
+        this.totalBankingAssets = toCrore(at('TOTAL OF III'));
+        // IV(b) is the base the ratios are actually charged on — the figure behind the requirement,
+        // not the bank's liabilities on the day being reported.
+        this.ndtl = toCrore(at('IV. b)'));
+        this.crrRequired = toCrore(data?.partB?.required?.[latest]);
+        this.slrRequired = toCrore(data?.partC?.required?.[latest]);
+        this.totalLiquidAssets = toCrore(data?.partC?.maintained?.[latest]);
+
+        if (this.slrRequired !== null && this.totalLiquidAssets !== null) {
+          this.slrSurplus = +(this.totalLiquidAssets - this.slrRequired).toFixed(2);
+        }
+        if (this.ndtl) {
+          this.slrActualPercent =
+            this.totalLiquidAssets === null ? null : +((this.totalLiquidAssets / this.ndtl) * 100).toFixed(2);
+        }
+        if (this.crrRequired !== null && this.slrRequired !== null) {
+          this.totalReserve = +(this.crrRequired + this.slrRequired).toFixed(2);
+        }
+
+        this.fillTabs(lines, latest);
+      },
+      error: () => {
+        this.loading = false;
+        this.unavailable = 'The CRR/SLR position could not be read. The return service did not respond.';
+      }
     });
   }
 
-  demandLiabilities = [
-    {
-      sl: '01',
-      name: 'Current Account Deposits',
-      sub: 'Corporate & individual CA balances',
-      code: '2001-CA',
-      opening: '3,842.50',
-      current: '4,120.75',
-      change: '+278.25',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '02',
-      name: 'Savings Bank Deposits (Withdrawable)',
-      sub: 'Demand portion — 10% of SB balance',
-      code: '2002-SB',
-      opening: '1,240.00',
-      current: '1,318.40',
-      change: '+78.40',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '03',
-      name: 'Demand Drafts Payable',
-      sub: 'Issued DDs outstanding for payment',
-      code: '2003-DD',
-      opening: '284.20',
-      current: '311.60',
-      change: '+27.40',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '04',
-      name: "Banker's Cheques / Pay Orders",
-      sub: 'Issued pay orders pending encashment',
-      code: '2004-PO',
-      opening: '198.75',
-      current: '176.30',
-      change: '-22.45',
-      changeDir: 'dn',
-      status: 'Active'
-    },
-    {
-      sl: '05',
-      name: 'Credit Balance in Cash Credit Accounts',
-      sub: 'CC accounts in credit position',
-      code: '2005-CC',
-      opening: '542.10',
-      current: '618.90',
-      change: '+76.80',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '06',
-      name: 'Overdue Fixed Deposits',
-      sub: 'FDs past maturity — treated as demand',
-      code: '2006-OFD',
-      opening: '89.40',
-      current: '112.85',
-      change: '+23.45',
-      changeDir: 'dn',
-      status: 'Overdue'
-    },
-    {
-      sl: '07',
-      name: 'Interest Payable on Demand Deposits',
-      sub: 'Accrued interest on CA/SB',
-      code: '2007-INT',
-      opening: '34.20',
-      current: '38.55',
-      change: '+4.35',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '08',
-      name: 'Margins held against Letters of Credit',
-      sub: 'Withdrawable LC margin deposits',
-      code: '2008-LCM',
-      opening: '412.60',
-      current: '388.20',
-      change: '-24.40',
-      changeDir: 'dn',
-      status: 'Active'
-    },
-    {
-      sl: '09',
-      name: 'Margins held against Bank Guarantees',
-      sub: 'Withdrawable BG margin deposits',
-      code: '2009-BGM',
-      opening: '318.40',
-      current: '342.10',
-      change: '+23.70',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '10',
-      name: 'Security Deposits (Withdrawable)',
-      sub: 'EMD / SD refundable on demand',
-      code: '2010-SD',
-      opening: '124.80',
-      current: '118.60',
-      change: '-6.20',
-      changeDir: 'dn',
-      status: 'Active'
-    },
-    {
-      sl: '11',
-      name: 'Unclaimed Deposits (Demand Portion)',
-      sub: 'Balances unclaimed >10 years',
-      code: '2011-UCD',
-      opening: '56.30',
-      current: '59.40',
-      change: '+3.10',
-      changeDir: 'dn',
-      status: 'Unclaimed'
-    },
-    {
-      sl: '12',
-      name: 'Inter-Bank Demand Deposits',
-      sub: 'Demand deposits from other banks',
-      code: '2012-IBD',
-      opening: '2,840.00',
-      current: '3,120.50',
-      change: '+280.50',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '13',
-      name: 'Clearing Adjustments / Balances',
-      sub: 'Net clearing settlement balances',
-      code: '2013-CLR',
-      opening: '186.40',
-      current: '210.80',
-      change: '+24.40',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '14',
-      name: 'Outstanding Payment Instruments',
-      sub: 'Cheques issued but not yet presented',
-      code: '2014-OPI',
-      opening: '142.60',
-      current: '158.90',
-      change: '+16.30',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '15',
-      name: 'Demand Liabilities towards Other Banks',
-      sub: 'Nostro / Vostro demand obligations',
-      code: '2015-DLB',
-      opening: '984.20',
-      current: '1,048.60',
-      change: '+64.40',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '16',
-      name: 'Deposits Repayable on Demand',
-      sub: 'Miscellaneous on-demand deposits',
-      code: '2016-DRD',
-      opening: '618.30',
-      current: '698.05',
-      change: '+79.75',
-      changeDir: 'up',
-      status: 'Active'
-    }
-  ];
 
-  timeLiabilities = [
-    {
-      sl: '01',
-      name: 'Fixed Deposits (FD)',
-      sub: '7 days to 10 years · 6.5–7.2%',
-      code: '3001-FD',
-      opening: '28,420.50',
-      current: '29,184.30',
-      change: '+763.80',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '02',
-      name: 'Recurring Deposits (RD)',
-      sub: 'Monthly instalment · 6.0–6.8%',
-      code: '3002-RD',
-      opening: '4,218.60',
-      current: '4,412.80',
-      change: '+194.20',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '03',
-      name: 'Time Liability Portion of Savings',
-      sub: '90% of SB balance treated as time',
-      code: '3003-SBT',
-      opening: '10,840.20',
-      current: '11,204.60',
-      change: '+364.40',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '04',
-      name: 'Reinvestment Deposits',
-      sub: 'Cumulative interest plans · 7.0%',
-      code: '3004-RID',
-      opening: '1,842.40',
-      current: '1,918.70',
-      change: '+76.30',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '05',
-      name: 'Staff Security Deposits (Fixed Period)',
-      sub: 'Employee security deposits — locked',
-      code: '3005-SSD',
-      opening: '84.60',
-      current: '86.40',
-      change: '+1.80',
-      changeDir: 'up',
-      status: 'Locked'
-    },
-    {
-      sl: '06',
-      name: 'Margin Money for Guarantees / LC',
-      sub: 'LC/BG margins — fixed lock-in period',
-      code: '3006-MGM',
-      opening: '620.80',
-      current: '644.20',
-      change: '+23.40',
-      changeDir: 'up',
-      status: 'Locked'
-    },
-    {
-      sl: '07',
-      name: 'Certificates of Deposit (CD)',
-      sub: 'Issued to corporates / FIs · 7.35%',
-      code: '3007-CD',
-      opening: '3,840.00',
-      current: '3,920.50',
-      change: '+80.50',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '08',
-      name: 'Interest Accrued on Time Deposits',
-      sub: 'Accrued but unpaid interest on FD/RD',
-      code: '3008-IAT',
-      opening: '842.60',
-      current: '918.40',
-      change: '+75.80',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '09',
-      name: 'Long-term Deposits',
-      sub: 'Tenor >5 years · 7.5%',
-      code: '3009-LTD',
-      opening: '5,620.40',
-      current: '5,818.60',
-      change: '+198.20',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '10',
-      name: 'Tax Saving Deposits',
-      sub: 'Sec 80C FDs — 5-year lock-in · 6.8%',
-      code: '3010-TSD',
-      opening: '1,240.80',
-      current: '1,318.40',
-      change: '+77.60',
-      changeDir: 'up',
-      status: 'Locked'
-    },
-    {
-      sl: '11',
-      name: 'Foreign Currency Deposits',
-      sub: 'FCNR(B), RFC — USD/EUR/GBP',
-      code: '3011-FCD',
-      opening: '2,184.60',
-      current: '2,348.20',
-      change: '+163.60',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '12',
-      name: 'Time Liabilities to Other Banks',
-      sub: 'Inter-bank term deposits — call money',
-      code: '3012-TLB',
-      opening: '1,840.20',
-      current: '1,924.40',
-      change: '+84.20',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '13',
-      name: 'Term Borrowings',
-      sub: 'Bonds, debentures, refinance · 8.1%',
-      code: '3013-TBR',
-      opening: '1,018.40',
-      current: '1,118.50',
-      change: '+100.10',
-      changeDir: 'up',
-      status: 'Active'
+  /**
+   * The four tabs, filled from the return's own lines.
+   *
+   * These were four fixed lists until now — 435 lines of invented accounts with invented balances,
+   * which a reader had no way to tell apart from the bank's real position. They are now built from
+   * the accounts the return actually read, so a tab is empty exactly when the bank has nothing
+   * mapped under that head, and says so.
+   */
+  demandLiabilities: CrrSlrRow[] = [];
+  timeLiabilities: CrrSlrRow[] = [];
+  bankingAssets: CrrSlrRow[] = [];
+  liquidAssets: CrrSlrRow[] = [];
+  /**
+   * Turns Part A's lines into the rows a tab shows.
+   *
+   * The form reports each head at both of the closes it carries, so the earlier column is the
+   * opening and the later one the current — the same pair these tables have always shown, now taken
+   * from the form rather than invented. Headings and totals are skipped: a heading carries no
+   * figure, and a total would be added a second time by the footer below.
+   */
+  private rowsFrom(lines: any[], latest: number, match: (label: string) => boolean): CrrSlrRow[] {
+    const rows: CrrSlrRow[] = [];
+    for (const line of lines ?? []) {
+      const label = String(line?.label ?? '');
+      if (line?.heading || line?.total || !line?.values || !match(label)) {
+        continue;
+      }
+      const opening = latest > 0 ? (line.values[latest - 1] ?? null) : null;
+      const current = line.values[latest] ?? null;
+      const change = opening === null || current === null ? null : current - opening;
+      rows.push({
+        sl: String(rows.length + 1).padStart(2, '0'),
+        // The form's own wording, with its numbering trimmed off the front — the table has a column
+        // of its own for that.
+        name: label.replace(/^\s*\(?[a-zA-Z0-9]+\)?[.)]?\s*/, '').trim() || label.trim(),
+        sub: line.configKey ? String(line.configKey).replace(/_/g, ' ') : 'Derived from the form',
+        code: line.configKey ?? '—',
+        opening: this.crore(opening),
+        current: this.crore(current),
+        openingValue: opening,
+        currentValue: current,
+        change: change === null ? '—' : `${change >= 0 ? '+' : ''}${this.crore(change).replace('₹', '')}`,
+        changeDir: change === null ? 'flat' : change >= 0 ? 'up' : 'dn',
+        // A head with no GL mapped reports nothing, and the form says so rather than reporting nil.
+        status: line.configured === false ? 'Not mapped' : 'Active'
+      });
     }
-  ];
+    return rows;
+  }
 
-  bankingAssets = [
-    {
-      sl: '01',
-      name: 'Balances with Other Banks',
-      sub: 'Nostro / Vostro balances — SBI, PNB, BOB',
-      code: '4001-BWB',
-      opening: '3,840.20',
-      current: '4,112.40',
-      change: '+272.20',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '02',
-      name: 'Money at Call with Banks',
-      sub: 'Overnight & short-notice call money',
-      code: '4002-MCB',
-      opening: '2,180.50',
-      current: '2,418.60',
-      change: '+238.10',
-      changeDir: 'up',
-      status: 'Active'
-    },
-    {
-      sl: '03',
-      name: 'Loans to Banks (Inter-Bank Lending)',
-      sub: 'Term loans & credit lines to SCBs',
-      code: '4003-LTB',
-      opening: '1,580.00',
-      current: '1,709.20',
-      change: '+129.20',
-      changeDir: 'up',
-      status: 'Active'
-    }
-  ];
+  /**
+   * A tab's column total, added from the rows on screen.
+   *
+   * Added from the rows rather than stated separately, so the foot of a table always agrees with
+   * what is above it. The footers used to be fixed text and agreed with nothing.
+   *
+   * Summed from each row's own figure, not from the text it displays: a total parsed back out of
+   * formatted strings would quietly lose the paise the display rounds away.
+   */
+  totalOf(rows: CrrSlrRow[], column: 'openingValue' | 'currentValue'): string {
+    const values = rows.map((r) => r[column]).filter((v): v is number => v !== null);
+    return values.length ? this.crore(values.reduce((a, b) => a + b, 0)) : '—';
+  }
 
-  liquidAssets = [
-    {
-      sl: '01',
-      name: 'Central Government Securities',
-      sub: 'G-Secs held in HTM, AFS & HFT portfolios',
-      code: '5001-CGS',
-      opening: '6,840.50',
-      current: '7,218.40',
-      change: '+377.90',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'G-Sec'
-    },
-    {
-      sl: '02',
-      name: 'State Development Loans (SDLs)',
-      sub: 'State govt bonds — various maturities',
-      code: '5002-SDL',
-      opening: '2,420.30',
-      current: '2,584.60',
-      change: '+164.30',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'SDL'
-    },
-    {
-      sl: '03',
-      name: 'Treasury Bills (91/182/364 day)',
-      sub: 'Short-term govt securities — discounted',
-      code: '5003-TB',
-      opening: '1,840.20',
-      current: '1,962.80',
-      change: '+122.60',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'T-Bill'
-    },
-    {
-      sl: '04',
-      name: 'Gold (valued at current market)',
-      sub: 'Gold reserves held per RBI valuation norms',
-      code: '5004-GLD',
-      opening: '680.40',
-      current: '724.60',
-      change: '+44.20',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'Gold'
-    },
-    {
-      sl: '05',
-      name: 'Special Deposit Scheme with RBI',
-      sub: 'Deposits placed under SDS — SLR eligible',
-      code: '5005-SDS',
-      opening: '420.00',
-      current: '420.00',
-      change: '0.00',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'RBI Dep'
-    },
-    {
-      sl: '06',
-      name: 'NABARD / SIDBI / NHB Bonds',
-      sub: 'PSE bonds approved as SLR-eligible',
-      code: '5006-PSE',
-      opening: '310.80',
-      current: '328.40',
-      change: '+17.60',
-      changeDir: 'up',
-      status: 'Active',
-      category: 'PSE Bond'
+  /** The movement across a tab, between the two closes the form reports. */
+  totalChange(rows: CrrSlrRow[]): string {
+    const opening = rows.map((r) => r.openingValue).filter((v): v is number => v !== null);
+    const current = rows.map((r) => r.currentValue).filter((v): v is number => v !== null);
+    if (!opening.length || !current.length) {
+      return '—';
     }
-  ];
+    const change = current.reduce((a, b) => a + b, 0) - opening.reduce((a, b) => a + b, 0);
+    return `${change >= 0 ? '+' : ''}${this.crore(change).replace('₹', '')}`;
+  }
+
+  /** Fills the four tabs from one reading of the form. */
+  private fillTabs(lines: any[], latest: number): void {
+    const has = (label: string, ...words: string[]): boolean => {
+      const l = label.toLowerCase();
+      return words.some((w) => l.includes(w));
+    };
+    // Matched on how the form labels each head, not on a fixed list of account names: a bank that
+    // maps a new account to a head gets it on the right tab without this screen being changed.
+    this.demandLiabilities = this.rowsFrom(lines, latest, (l) => has(l, 'demand liabilit'));
+    this.timeLiabilities = this.rowsFrom(lines, latest, (l) => has(l, 'time liabilit') && !has(l, 'demand and time'));
+    // III — what the banking system owes this bank, which nets off the liability base.
+    this.bankingAssets = this.rowsFrom(lines, latest, (l) =>
+      has(l, 'current account balances with sbi', 'balances in all accounts', 'money at call', 'advances and any other')
+    );
+    // V, VI and VII — the cash, balances and securities the two ratios are met in.
+    this.liquidAssets = this.rowsFrom(lines, latest, (l) =>
+      has(l, 'cash on hand', 'reserve bank of india', 'co-operative bank', 'government securities')
+    );
+  }
 
   close(): void {
     this.dialogRef.close();

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

@@ -28,17 +28,30 @@
             <fa-icon icon="external-link-alt"></fa-icon> View
           </button>
         </div>
+        <!-- Read from the return, not stated here. Both the rates and the amounts were fixed text
+             until now, so the card reported ₹2,077 Cr at 3% whatever the ledger held and whatever
+             rate Admin was on. -->
         <div class="card-metrics">
           <div class="metric-row">
-            <span class="metric-label">CRR Required (3%)</span>
-            <span class="metric-value">&#8377;2,077 Cr</span>
+            <span class="metric-label">CRR Required{{ crrSlr.crrRate === null ? '' : ' (' + crrSlr.crrRate + '%)' }}</span>
+            <span class="metric-value">{{ crrSlr.crrRequired }}</span>
           </div>
           <div class="metric-row">
-            <span class="metric-label">SLR Required (18%)</span>
-            <span class="metric-value">&#8377;12,460 Cr</span>
+            <span class="metric-label">SLR Required{{ crrSlr.slrRate === null ? '' : ' (' + crrSlr.slrRate + '%)' }}</span>
+            <span class="metric-value">{{ crrSlr.slrRequired }}</span>
           </div>
         </div>
-        <div class="mini-sub"><span class="tag-success">Within Limits</span></div>
+        <!-- "Within Limits" is a compliance statement, so it is made only where the return actually
+             says so. Where it cannot compute, the card says that instead of passing the bank. -->
+        <div class="mini-sub">
+          @if (crrSlr.status === 'ok') {
+            <span class="tag-success">Within Limits</span>
+          } @else if (crrSlr.status === 'short') {
+            <span class="tag-danger">Shortfall</span>
+          } @else {
+            <span class="tag-muted">Not computed</span>
+          }
+        </div>
       </div>
 
       <!-- CRAR -->

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

@@ -444,6 +444,17 @@ $purple: #7c3aed;
   font-weight: 600;
 }
 
+/* A figure that could not be computed. Deliberately not green: a tile that cannot read the ledger
+   has not found the bank compliant, and a success tag on an unknown position is a false all-clear. */
+.tag-muted {
+  background: #f3f4f6;
+  color: #4b5563;
+  padding: 2px 6px;
+  border-radius: 10px;
+  font-size: 10px;
+  font-weight: 600;
+}
+
 /* ─── Compact Detail Cards ─── */
 .dash-card.compact {
   padding: 12px 16px;

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

@@ -19,6 +19,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
 import { AsyncPipe, DatePipe } from '@angular/common';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RbiCircularsService } from '../../rbi-circulars/rbi-circulars.service';
 /**
  * Dashboard component.
  */
@@ -40,9 +41,29 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 export class DashboardComponent implements OnInit {
   private router = inject(Router);
   private dialog = inject(MatDialog);
+  private rbi = inject(RbiCircularsService);
 
   today = new Date();
 
+  /**
+   * The CRR/SLR tile, read from the return.
+   *
+   * The amounts and the rates were both fixed text on the template until now, so the tile reported
+   * ₹2,077 Cr at 3% whatever the ledger held and whatever rate Admin was on. A dashboard figure is
+   * read as the bank's position, and one that cannot move is worse than none: nothing on the tile
+   * says it is a placeholder.
+   *
+   * Dashes until the return answers. 'status' drives the compliance tag, which is only claimed
+   * where the return states it.
+   */
+  crrSlr: {
+    crrRate: number | null;
+    slrRate: number | null;
+    crrRequired: string;
+    slrRequired: string;
+    status: 'ok' | 'short' | 'unknown';
+  } = { crrRate: null, slrRate: null, crrRequired: '—', slrRequired: '—', status: 'unknown' };
+
   /** Array of all user activities */
   userActivity: string[];
   /** Array of most recent user activities */
@@ -67,6 +88,40 @@ export class DashboardComponent implements OnInit {
     this.recentActivities = this.getRecentActivities();
     this.frequentActivities = this.getFrequentActivities();
     this.setFilteredActivities();
+    this.loadCrrSlr();
+  }
+
+  /** Fills the CRR/SLR tile from the return, leaving it dashed where the return cannot compute. */
+  private loadCrrSlr(): void {
+    const crore = (v: number | null | undefined): string =>
+      v === null || v === undefined ? '—' : `₹${Math.round(v / 1e7).toLocaleString('en-IN')} Cr`;
+
+    // The statutory Form 1, which is the return this bank files — twice a month, at the 15th and at
+    // the month end. The working report's 45-day lag lands mid-fortnight, on a date the bank never
+    // reported, so a tile built on it shows a position that appears on no filing.
+    this.rbi.getForm1Statutory().subscribe({
+      next: (data: any) => {
+        const latest = (data?.columns?.length ?? 0) - 1;
+        if (latest < 0) {
+          return;
+        }
+        this.crrSlr.crrRate = data?.crrPercentage ?? null;
+        this.crrSlr.slrRate = data?.slrPercentage ?? null;
+        this.crrSlr.crrRequired = crore(data?.partB?.required?.[latest]);
+        this.crrSlr.slrRequired = crore(data?.partC?.required?.[latest]);
+
+        // Compliant only where BOTH ratios are met: the tile carries one tag for the pair, and a
+        // bank short on SLR is not within limits because its cash reserve happens to be ample.
+        const crrHeld = data?.partB?.maintained?.[latest];
+        const crrNeed = data?.partB?.required?.[latest];
+        const slrHeld = data?.partC?.maintained?.[latest];
+        const slrNeed = data?.partC?.required?.[latest];
+        if ([crrHeld, crrNeed, slrHeld, slrNeed].every((v) => v !== null && v !== undefined)) {
+          this.crrSlr.status = crrHeld >= crrNeed && slrHeld >= slrNeed ? 'ok' : 'short';
+        }
+      },
+      error: () => undefined
+    });
   }
 
   /**

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

@@ -176,8 +176,9 @@
   <!-- ===================== 01 PURCHASE ENTRY ===================== -->
   @if (activeTab === 'purchase') {
     <div class="pg-card">
+      <!-- 1. Deal details — the only fields the dealer has to fill -->
       <div class="pos-section-label">
-        Investment - Govt.Security/Bond Entry ({{ instrumentLabel(purchaseForm.bondType) }})
+        Purchase Entry — {{ instrumentLabel(purchaseForm.bondType) }} (fields marked * are mandatory)
       </div>
       <div class="inv-form-grid">
         <label class="inv-form-field">
@@ -188,17 +189,6 @@
             }
           </select>
         </label>
-        <label class="inv-form-field"
-          ><span>Deal No</span><input type="text" [(ngModel)]="purchaseForm.dealNo" readonly
-        /></label>
-        <label class="inv-form-field"
-          ><span>* Deal Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.dealDate"></mifosx-date-ddmmyyyy
-        ></label>
-        <label class="inv-form-field"
-          ><span>* Deal Time (24 hr, HH:mm:ss)</span
-          ><input type="text" [(ngModel)]="purchaseForm.dealTime" placeholder="HH:mm:ss"
-        /></label>
-        <label class="inv-form-field"><span>* ISIN</span><input type="text" [(ngModel)]="purchaseForm.isin" /></label>
         <label class="inv-form-field">
           <span>* Script Code</span>
           <select [(ngModel)]="purchaseForm.scriptCode" (ngModelChange)="onScriptChange()">
@@ -208,167 +198,50 @@
             }
           </select>
         </label>
+        <label class="inv-form-field">
+          <span>* Party Code</span>
+          <select [(ngModel)]="purchaseForm.partyCode">
+            <option value="">-- Select --</option>
+            @for (p of activePartyOptions; track p.partyCode) {
+              <option [value]="p.partyCode">{{ p.partyCode }} — {{ p.partyName }}</option>
+            }
+          </select>
+        </label>
         <label class="inv-form-field"
-          ><span>* Cert No</span><input type="text" [(ngModel)]="purchaseForm.certNo"
+          ><span>* Deal Date</span
+          ><mifosx-date-ddmmyyyy
+            [(ngModel)]="purchaseForm.dealDate"
+            (ngModelChange)="onDealDateChange()"
+          ></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>* Deal Time (HH:mm:ss)</span
+          ><input type="text" [(ngModel)]="purchaseForm.dealTime" placeholder="HH:mm:ss"
         /></label>
         <label class="inv-form-field">
-          <span>Settlement Type</span>
+          <span>* Settlement Type</span>
           <select [(ngModel)]="purchaseForm.settlementType">
             <option value="T+0">T+0</option>
             <option value="T+1">T+1</option>
             <option value="T+2">T+2</option>
           </select>
         </label>
-        <label class="inv-form-field"
-          ><span>Settlement Dt</span
-          ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.settlementDt"></mifosx-date-ddmmyyyy
-        ></label>
-        <label class="inv-form-field">
-          <span>* Party Code</span>
-          <select [(ngModel)]="purchaseForm.partyCode">
-            <option value="">-- Select --</option>
-            @for (p of partyOptions; track p.partyCode) {
-              <option [value]="p.partyName">{{ p.partyName }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field">
-          <span>Sub Type</span>
-          <select [(ngModel)]="purchaseForm.subType">
-            @for (s of subTypeOptions; track s.subTypeCode + s.subTypeName) {
-              <option [value]="s.subTypeName">{{ s.subTypeName }}</option>
-            }
-          </select>
-        </label>
-
         @if (isMutualFund) {
-          <label class="inv-form-field">
-            <span>* Product Name</span>
-            <select [(ngModel)]="purchaseForm.productName">
-              <option value="">-- Select --</option>
-              @for (p of mfProductOptions; track p.productCode) {
-                <option [value]="p.productName">{{ p.productName }}</option>
-              }
-            </select>
-          </label>
           <label class="inv-form-field"
-            ><span>Holding Days</span><input type="number" [(ngModel)]="purchaseForm.holdingDays" min="0"
+            ><span>* Consider Amt (₹)</span><input type="number" [(ngModel)]="purchaseForm.considerAmt" min="0"
           /></label>
           <label class="inv-form-field"
-            ><span>* Consider Amt</span><input type="number" [(ngModel)]="purchaseForm.considerAmt" min="0"
-          /></label>
-          <label class="inv-form-field"
-            ><span>Trade Amt</span><input type="number" [(ngModel)]="purchaseForm.tradeAmt" min="0"
-          /></label>
-          <label class="inv-form-field"
-            ><span>NAV</span><input type="number" [(ngModel)]="purchaseForm.nav" min="0" step="0.0001"
-          /></label>
-          <label class="inv-form-field"
-            ><span>Stamp Duty</span><input type="number" [(ngModel)]="purchaseForm.stampDuty" min="0"
-          /></label>
-          <label class="inv-form-field"
-            ><span>StampDuty A/c</span><input type="text" [(ngModel)]="purchaseForm.stampDutyAc"
+            ><span>* NAV</span><input type="number" [(ngModel)]="purchaseForm.nav" min="0" step="0.0001"
           /></label>
         } @else {
           <label class="inv-form-field"
-            ><span>Face Value</span><input type="number" [(ngModel)]="purchaseForm.faceValue" min="0"
+            ><span>* Face Value (₹)</span><input type="number" [(ngModel)]="purchaseForm.faceValue" min="0"
           /></label>
           <label class="inv-form-field"
-            ><span>Purchase Rate (per 100)</span
+            ><span>* Purchase Rate (per ₹100)</span
             ><input type="number" [(ngModel)]="purchaseForm.purchaseRate" min="0" step="0.0001"
           /></label>
-          <label class="inv-form-field"
-            ><span>Unit Val</span><input type="text" [value]="purchaseUnitVal" readonly
-          /></label>
-          <label class="inv-form-field"
-            ><span>Book Value</span><input type="text" [value]="purchaseBookValue | number: '1.2-2'" readonly
-          /></label>
-          <label class="inv-form-field"
-            ><span>Premium Amt.</span><input type="number" [(ngModel)]="purchaseForm.premiumAmt"
-          /></label>
         }
-        <label class="inv-form-field"
-          ><span>* No Unit</span><input type="text" [value]="purchaseUnits" readonly
-        /></label>
-        <label class="inv-form-field"
-          ><span>* CR. To A/c</span><input type="text" [(ngModel)]="purchaseForm.crToAc"
-        /></label>
-        <label class="inv-form-field"
-          ><span>TBill GL.A/C.</span><input type="text" [(ngModel)]="purchaseForm.tbillGlAc"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Brokerage</span><input type="number" [(ngModel)]="purchaseForm.brokerage" min="0"
-        /></label>
-        <label class="inv-form-field">
-          <span>Broker Nm.</span>
-          <select [(ngModel)]="purchaseForm.brokerName">
-            <option value="">-- Select --</option>
-            @for (b of brokerOptions; track b.brokerCode) {
-              <option [value]="b.brokerCode">{{ b.brokerCode }} — {{ b.brokerName }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field"
-          ><span>Trade No.</span><input type="text" [(ngModel)]="purchaseForm.tradeNo"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Order No.</span><input type="text" [(ngModel)]="purchaseForm.orderNo"
-        /></label>
-        <label class="inv-form-field">
-          <span>Recomm. Authority</span>
-          <select [(ngModel)]="purchaseForm.recommAuthority">
-            <option value="">-- Select --</option>
-            @for (a of authorityOptions; track a) {
-              <option [value]="a">{{ a }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field">
-          <span>Sanction Authority</span>
-          <select [(ngModel)]="purchaseForm.sanctionAuthority">
-            <option value="">-- Select --</option>
-            @for (a of authorityOptions; track a) {
-              <option [value]="a">{{ a }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field"
-          ><span>* Issue Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.issueDate"></mifosx-date-ddmmyyyy
-        ></label>
-        <label class="inv-form-field"
-          ><span>Period(Year)</span><input type="number" [(ngModel)]="purchaseForm.periodYear" min="0"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Period(Month)</span><input type="number" [(ngModel)]="purchaseForm.periodMonth" min="0" max="11"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Period(Days)</span><input type="number" [(ngModel)]="purchaseForm.periodDays" min="0"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Desc Inv</span><input type="text" [(ngModel)]="purchaseForm.descInv"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Folio No</span><input type="text" [(ngModel)]="purchaseForm.folioNo"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Call Option</span><input type="text" [(ngModel)]="purchaseForm.callOption"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Meet Dt</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.meetDt"></mifosx-date-ddmmyyyy
-        ></label>
-        <label class="inv-form-field"
-          ><span>Reso No</span><input type="text" [(ngModel)]="purchaseForm.resoNo"
-        /></label>
-        <label class="inv-form-field"
-          ><span>From Dist</span><input type="text" [(ngModel)]="purchaseForm.fromDist"
-        /></label>
-        <label class="inv-form-field"
-          ><span>To Dist</span><input type="text" [(ngModel)]="purchaseForm.toDist"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Redum/Mat Dt</span
-          ><input type="text" [(ngModel)]="purchaseForm.redumMatDt" placeholder="DD-MM-YYYY (blank = use period)"
-        /></label>
         <label class="inv-form-field">
           <span>* Category</span>
           <select [(ngModel)]="purchaseForm.category">
@@ -380,32 +253,258 @@
         </label>
         @if (!isMutualFund) {
           <label class="inv-form-field"
-            ><span>Int Rate</span><input type="number" [(ngModel)]="purchaseForm.intRate" min="0" step="0.01"
+            ><span>* Last Interest Date</span
+            ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.lastIntDt"></mifosx-date-ddmmyyyy
+          ></label>
+        }
+        <label class="inv-form-field">
+          <span>* CR. To A/c (Paid From)</span>
+          <select [(ngModel)]="purchaseForm.crToAc">
+            @for (g of settlementBankOptions; track g.glCode) {
+              <option [value]="g.glCode">{{ g.glCode }} — {{ g.glName }}</option>
+            }
+          </select>
+        </label>
+        <label class="inv-form-field"
+          ><span>Stamp Duty (₹)</span><input type="number" [(ngModel)]="purchaseForm.stampDuty" min="0"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Brokerage (₹)</span><input type="number" [(ngModel)]="purchaseForm.brokerage" min="0"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Other Charges (₹)</span><input type="number" [(ngModel)]="purchaseForm.otherCharges" min="0"
+        /></label>
+      </div>
+      @if (purchaseMarketRate) {
+        <p class="pg-sub" style="padding: 0 16px 8px">
+          Market rate (Daily Script Master) as on {{ purchaseMarketRate.rateDate }}: Close
+          {{ purchaseMarketRate.closeRate | number: '1.2-4' }}
+          @if (purchaseMarketRate.lowRate && purchaseMarketRate.highRate) {
+            (Low {{ purchaseMarketRate.lowRate | number: '1.2-4' }} – High
+            {{ purchaseMarketRate.highRate | number: '1.2-4' }})
+          }
+          @if (purchaseMarketRate.rateDate !== purchaseForm.dealDate) {
+            — no rate entered for the deal date, the latest earlier rate is used.
+          }
+        </p>
+        @if (purchaseRateOutOfRange) {
+          <p class="pg-sub" style="padding: 0 16px 8px; color: #b42318; font-weight: 600">
+            Warning: the rate entered is outside the day's market range.
+          </p>
+        }
+      } @else if (purchaseMarketRate === null) {
+        <p class="pg-sub" style="padding: 0 16px 8px; color: #b42318">
+          No rate in the Daily Script Master for this script — enter the day's rate there first.
+        </p>
+      }
+
+      <!-- 2. Calculated — filled by the system, read-only -->
+      <div class="pos-section-label">Calculated by System</div>
+      <div class="inv-form-grid">
+        <label class="inv-form-field"
+          ><span>Deal No</span><input type="text" [value]="purchaseForm.dealNo" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Cert No</span><input type="text" [value]="purchaseForm.certNo" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Settlement Date</span><input type="text" [value]="purchaseSettlementDate" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>ISIN</span><input type="text" [value]="purchaseForm.isin || '—'" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Sub Type</span><input type="text" [value]="purchaseForm.subType || '—'" readonly
+        /></label>
+        @if (!isMutualFund) {
+          <label class="inv-form-field"
+            ><span>Int Rate %</span><input type="text" [value]="purchaseForm.intRate ?? '—'" readonly
           /></label>
           <label class="inv-form-field"
-            ><span>YTM (computed)</span><input type="text" [value]="purchaseYtm" readonly
+            ><span>Issue Date</span><input type="text" [value]="purchaseForm.issueDate || '—'" readonly
           /></label>
+          <label class="inv-form-field"
+            ><span>Maturity Date</span><input type="text" [value]="purchaseMaturityDate || '—'" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Period (Y / M / D)</span
+            ><input
+              type="text"
+              [value]="purchaseForm.periodYear + ' / ' + purchaseForm.periodMonth + ' / ' + purchaseForm.periodDays"
+              readonly
+          /></label>
+        }
+        <label class="inv-form-field"
+          ><span>No. of Units</span><input type="text" [value]="purchaseUnits | number: '1.0-4'" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Book Value</span><input type="text" [value]="'₹' + (purchaseBookValue | number: '1.2-2')" readonly
+        /></label>
+        @if (!isMutualFund) {
+          <label class="inv-form-field"
+            ><span>Premium (+) / Discount (−)</span
+            ><input type="text" [value]="'₹' + (purchasePremiumDiscount | number: '1.0-0')" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Accrued Interest ({{ purchaseAccruedDays }} days)</span
+            ><input type="text" [value]="'₹' + (purchaseAccruedInterest | number: '1.2-2')" readonly
+          /></label>
+          <label class="inv-form-field"><span>YTM %</span><input type="text" [value]="purchaseYtm" readonly /></label>
+        }
+        <label class="inv-form-field"
+          ><span>Charges (expense)</span
+          ><input type="text" [value]="'₹' + (purchaseTotalCharges | number: '1.2-2')" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Total Settlement Amount</span
+          ><input type="text" [value]="'₹' + (purchaseSettlementAmount | number: '1.2-2')" readonly
+        /></label>
+      </div>
+
+      @if (!isMutualFund && purchaseCouponDates) {
+        <div class="pos-section-label">Interest Cycle</div>
+        <div class="inv-form-grid">
+          <label class="inv-form-field"
+            ><span>Interest Dates (half-yearly)</span><input type="text" [value]="purchaseCouponDates" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Last Coupon</span><input type="text" [value]="purchaseForm.lastIntDt || '—'" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Next Coupon</span><input type="text" [value]="purchaseNextCouponDate || '—'" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Next Coupon Amount</span
+            ><input type="text" [value]="'₹' + (purchaseNextCouponAmount | number: '1.2-2')" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Days to Next Coupon</span><input type="text" [value]="purchaseDaysToNextCoupon" readonly
+          /></label>
+        </div>
+      }
+
+      <!-- 3. Accounting preview -->
+      <div class="pos-section-label">Accounting Preview (posted after checker approval)</div>
+      @if (purchaseAccountingPreview.length) {
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Dr / Cr</th>
+              <th>GL Code</th>
+              <th>GL Name</th>
+              <th class="num">Amount</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (l of purchaseAccountingPreview; track l.side + l.glCode) {
+              <tr>
+                <td>{{ l.side }}</td>
+                <td>{{ l.glCode }}</td>
+                <td>{{ l.glName || '—' }}</td>
+                <td class="num">₹{{ l.amount | number: '1.2-2' }}</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      } @else {
+        <p class="pg-sub">Select a script, enter the amount and CR. To A/c to see the entry.</p>
+      }
+
+      <!-- 4. More details — optional, collapsed by default -->
+      <div class="inv-form-actions">
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="showMoreDetails = !showMoreDetails">
+          {{ showMoreDetails ? '▾ Hide More Details' : '▸ More Details (optional)' }}
+        </button>
+      </div>
+      @if (showMoreDetails) {
+        <div class="pos-section-label">More Details (optional)</div>
+        <div class="inv-form-grid">
           <label class="inv-form-field">
-            <span>Int Type</span>
-            <select [(ngModel)]="purchaseForm.intType">
-              @for (i of intTypeOptions; track i.value) {
-                <option [value]="i.value">{{ i.label }}</option>
+            <span>Sub Type</span>
+            <select [(ngModel)]="purchaseForm.subType">
+              @for (s of subTypeOptions; track s.subTypeCode + s.subTypeName) {
+                <option [value]="s.subTypeName">{{ s.subTypeName }}</option>
+              }
+            </select>
+          </label>
+          @if (isMutualFund) {
+            <label class="inv-form-field"
+              ><span>Trade Amt</span><input type="number" [(ngModel)]="purchaseForm.tradeAmt" min="0"
+            /></label>
+            <label class="inv-form-field"
+              ><span>Stamp Duty A/c</span><input type="text" [(ngModel)]="purchaseForm.stampDutyAc"
+            /></label>
+            <label class="inv-form-field"
+              ><span>Holding Days</span><input type="number" [(ngModel)]="purchaseForm.holdingDays" min="0"
+            /></label>
+          } @else {
+            <label class="inv-form-field">
+              <span>Int Type</span>
+              <select [(ngModel)]="purchaseForm.intType">
+                @for (i of intTypeOptions; track i.value) {
+                  <option [value]="i.value">{{ i.label }}</option>
+                }
+              </select>
+            </label>
+            <label class="inv-form-field">
+              <span>Bond Rating</span>
+              <select [(ngModel)]="purchaseForm.bondRating">
+                @for (r of bondRatingOptions; track r) {
+                  <option [value]="r">{{ r }}</option>
+                }
+              </select>
+            </label>
+            <label class="inv-form-field">
+              <span>SGL with Bank</span>
+              <select [(ngModel)]="purchaseForm.sglWithBank">
+                <option value="">-- Select --</option>
+                @for (s of sglBankOptions; track s.sglCode) {
+                  <option [value]="s.bankName">{{ s.bankName }} — {{ s.branch }}</option>
+                }
+              </select>
+            </label>
+            <label class="inv-form-field"
+              ><span>TBill GL A/c</span><input type="text" [(ngModel)]="purchaseForm.tbillGlAc"
+            /></label>
+          }
+          <label class="inv-form-field">
+            <span>Broker</span>
+            <select [(ngModel)]="purchaseForm.brokerName">
+              <option value="">-- Select --</option>
+              @for (b of brokerOptions; track b.brokerCode) {
+                <option [value]="b.brokerCode">{{ b.brokerCode }} — {{ b.brokerName }}</option>
               }
             </select>
           </label>
           <label class="inv-form-field"
-            ><span>Int Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.intDate"></mifosx-date-ddmmyyyy
-          ></label>
-          <label class="inv-form-field"
-            ><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
+            ><span>Trade No.</span><input type="text" [(ngModel)]="purchaseForm.tradeNo"
           /></label>
           <label class="inv-form-field"
-            ><span>Settlement Amt of Pur. (computed)</span
-            ><input type="text" [value]="purchaseSettlementAmount | number: '1.4-4'" readonly
+            ><span>Order No.</span><input type="text" [(ngModel)]="purchaseForm.orderNo"
+          /></label>
+          <label class="inv-form-field">
+            <span>Recomm. Authority</span>
+            <select [(ngModel)]="purchaseForm.recommAuthority">
+              <option value="">-- Select --</option>
+              @for (a of authorityOptions; track a) {
+                <option [value]="a">{{ a }}</option>
+              }
+            </select>
+          </label>
+          <label class="inv-form-field">
+            <span>Sanction Authority</span>
+            <select [(ngModel)]="purchaseForm.sanctionAuthority">
+              <option value="">-- Select --</option>
+              @for (a of authorityOptions; track a) {
+                <option [value]="a">{{ a }}</option>
+              }
+            </select>
+          </label>
+          <label class="inv-form-field"
+            ><span>Meet Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.meetDt"></mifosx-date-ddmmyyyy
+          ></label>
+          <label class="inv-form-field"
+            ><span>Reso No</span><input type="text" [(ngModel)]="purchaseForm.resoNo"
           /></label>
           <label class="inv-form-field">
             <span>Deal Type</span>
@@ -423,6 +522,80 @@
               }
             </select>
           </label>
+          <label class="inv-form-field">
+            <span>Payment Mode</span>
+            <select [(ngModel)]="purchaseForm.paymentMode">
+              <option value="">-- Select --</option>
+              @for (p of paymentModeOptions; track p) {
+                <option [value]="p">{{ p }}</option>
+              }
+            </select>
+          </label>
+          <label class="inv-form-field">
+            <span>Delivery Mode</span>
+            <select [(ngModel)]="purchaseForm.deliveryMode">
+              <option value="">-- Select --</option>
+              @for (d of deliveryModeOptions; track d) {
+                <option [value]="d">{{ d }}</option>
+              }
+            </select>
+          </label>
+          <label class="inv-form-field">
+            <span>LIEN</span>
+            <select [(ngModel)]="purchaseForm.lien">
+              <option value="NO">NO</option>
+              <option value="YES">YES</option>
+            </select>
+          </label>
+          @if (purchaseForm.lien === 'YES') {
+            <label class="inv-form-field"
+              ><span>LIEN Amount</span><input type="number" [(ngModel)]="purchaseForm.lienAmount"
+            /></label>
+            <label class="inv-form-field">
+              <span>LIEN Reason</span>
+              <select [(ngModel)]="purchaseForm.lienReason">
+                <option value="">-- Select --</option>
+                @for (l of lienReasonOptions; track l.reasonCode) {
+                  <option [value]="l.reasonDescription">{{ l.reasonDescription }}</option>
+                }
+              </select>
+            </label>
+          }
+          <label class="inv-form-field"
+            ><span>Folio No</span><input type="text" [(ngModel)]="purchaseForm.folioNo"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Call Option</span><input type="text" [(ngModel)]="purchaseForm.callOption"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Register Address</span><input type="text" [(ngModel)]="purchaseForm.registerAdd"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Register City</span><input type="text" [(ngModel)]="purchaseForm.regiCity"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Register Pin</span><input type="text" [(ngModel)]="purchaseForm.regiPin"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Issue Date (override)</span
+            ><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.issueDate"></mifosx-date-ddmmyyyy
+          ></label>
+          <label class="inv-form-field"
+            ><span>Redum / Mat Date (override)</span
+            ><input type="text" [(ngModel)]="purchaseForm.redumMatDt" placeholder="DD-MM-YYYY"
+          /></label>
+          <label class="inv-form-field"
+            ><span>Int Date</span><mifosx-date-ddmmyyyy [(ngModel)]="purchaseForm.intDate"></mifosx-date-ddmmyyyy
+          ></label>
+          <label class="inv-form-field"
+            ><span>Desc Inv</span><input type="text" [(ngModel)]="purchaseForm.descInv"
+          /></label>
+          <label class="inv-form-field"
+            ><span>From Dist</span><input type="text" [(ngModel)]="purchaseForm.fromDist"
+          /></label>
+          <label class="inv-form-field"
+            ><span>To Dist</span><input type="text" [(ngModel)]="purchaseForm.toDist"
+          /></label>
           <label class="inv-form-field">
             <span>Mark CBLO</span>
             <select [(ngModel)]="purchaseForm.markCblo">
@@ -433,14 +606,6 @@
           <label class="inv-form-field"
             ><span>Amortize Amt.</span><input type="number" [(ngModel)]="purchaseForm.amortizeAmt"
           /></label>
-          <label class="inv-form-field">
-            <span>Bond Rating</span>
-            <select [(ngModel)]="purchaseForm.bondRating">
-              @for (r of bondRatingOptions; track r) {
-                <option [value]="r">{{ r }}</option>
-              }
-            </select>
-          </label>
           <label class="inv-form-field">
             <span>Corp. Bond</span>
             <select [(ngModel)]="purchaseForm.corpBond">
@@ -448,76 +613,19 @@
               <option value="YES">YES</option>
             </select>
           </label>
-          <label class="inv-form-field">
-            <span>SGL with Bank</span>
-            <select [(ngModel)]="purchaseForm.sglWithBank">
-              <option value="">-- Select --</option>
-              @for (s of sglBankOptions; track s.sglCode) {
-                <option [value]="s.bankName">{{ s.bankName }} — {{ s.branch }}</option>
-              }
-            </select>
-          </label>
           <label class="inv-form-field"
-            ><span>Register Add</span><input type="text" [(ngModel)]="purchaseForm.registerAdd"
+            ><span>Remarks</span><input type="text" [(ngModel)]="purchaseForm.remarks"
           /></label>
           <label class="inv-form-field"
-            ><span>Regi City</span><input type="text" [(ngModel)]="purchaseForm.regiCity"
+            ><span>Description</span><input type="text" [(ngModel)]="purchaseForm.description"
           /></label>
-          <label class="inv-form-field"
-            ><span>Regi Pin</span><input type="text" [(ngModel)]="purchaseForm.regiPin"
-          /></label>
-        }
-        <label class="inv-form-field">
-          <span>LIEN</span>
-          <select [(ngModel)]="purchaseForm.lien">
-            <option value="NO">NO</option>
-            <option value="YES">YES</option>
-          </select>
-        </label>
-        @if (purchaseForm.lien === 'YES') {
-          <label class="inv-form-field"
-            ><span>LIEN Amount</span><input type="number" [(ngModel)]="purchaseForm.lienAmount"
-          /></label>
-          <label class="inv-form-field">
-            <span>LIEN Reason</span>
-            <select [(ngModel)]="purchaseForm.lienReason">
-              <option value="">-- Select --</option>
-              @for (l of lienReasonOptions; track l.reasonCode) {
-                <option [value]="l.reasonDescription">{{ l.reasonDescription }}</option>
-              }
-            </select>
-          </label>
-        }
-        <label class="inv-form-field">
-          <span>Payment Mode</span>
-          <select [(ngModel)]="purchaseForm.paymentMode">
-            <option value="">--Select--</option>
-            @for (p of paymentModeOptions; track p) {
-              <option [value]="p">{{ p }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field">
-          <span>Delivery Mode</span>
-          <select [(ngModel)]="purchaseForm.deliveryMode">
-            <option value="">--Select--</option>
-            @for (d of deliveryModeOptions; track d) {
-              <option [value]="d">{{ d }}</option>
-            }
-          </select>
-        </label>
-        <label class="inv-form-field"
-          ><span>Remarks</span><input type="text" [(ngModel)]="purchaseForm.remarks"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Description</span><input type="text" [(ngModel)]="purchaseForm.description"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Maturity / Redemption Value (computed)</span
-          ><input type="text" [value]="'₹' + (purchaseMaturityAmount | number: '1.2-2')" readonly
-        /></label>
-      </div>
+        </div>
+      }
+
       <div class="inv-form-actions">
+        <label class="inv-form-field"
+          ><span>Retrieve Cert No</span><input type="text" placeholder="e.g. 30" [(ngModel)]="retrieveCertNo"
+        /></label>
         <button type="button" class="pg-btn pg-btn--primary" (click)="savePurchase()">Save</button>
         <button type="button" class="pg-btn pg-btn--ghost" (click)="retrievePurchase()">Retrieve</button>
         <button type="button" class="pg-btn pg-btn--ghost" (click)="dropPurchase()">Drop</button>
@@ -569,20 +677,14 @@
     </div>
   }
 
-  <!-- ===================== 03 INTEREST ENTRY / CALCULATION ===================== -->
+  <!-- ===================== 03 INTEREST ENTRY ===================== -->
   @if (activeTab === 'interest') {
     <div class="pg-card">
-      <div class="pos-section-label">Investment - Govt./Bond Interest calculation</div>
+      <div class="pos-section-label">Interest Entry — coupon and 31 Mar / 30 Sep provision schedule</div>
       <div class="inv-form-grid">
-        <label class="inv-form-field"
-          ><span>From Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcFromDate"></mifosx-date-ddmmyyyy
-        ></label>
-        <label class="inv-form-field"
-          ><span>To Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intCalcToDate"></mifosx-date-ddmmyyyy
-        ></label>
         <label class="inv-form-field">
           <span>Type</span>
-          <select [(ngModel)]="intCalcType" (ngModelChange)="onIntCalcTypeChange()">
+          <select [(ngModel)]="intType" (ngModelChange)="onIntFilterChange()">
             <option value="">-- All Types --</option>
             @for (o of bondTypeOptions; track o.value) {
               <option [value]="o.value">{{ o.label }}</option>
@@ -591,67 +693,149 @@
         </label>
         <label class="inv-form-field">
           <span>Script</span>
-          <select [(ngModel)]="intCalcScript">
+          <select [(ngModel)]="intScript" (ngModelChange)="onIntFilterChange()">
             <option value="">-- All Scripts --</option>
-            @for (s of scriptOptions; track s.scriptCode) {
+            @for (s of intScriptOptions; track s.scriptCode) {
               <option [value]="s.scriptCode">{{ s.scriptCode }} — {{ s.scriptName }}</option>
             }
           </select>
         </label>
-        <label class="inv-form-field"><span>Deal No</span><input type="text" [(ngModel)]="intCalcDealNo" /></label>
-        <label class="inv-form-field"
-          ><span>ALL</span><input type="checkbox" [(ngModel)]="intCalcAll" style="height: 18px; width: 18px"
-        /></label>
         <label class="inv-form-field">
-          <span>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>
+          <span>* Deal No</span>
+          <select [(ngModel)]="intPurchaseId" (ngModelChange)="intSchedule = null">
+            <option [ngValue]="null">-- Select --</option>
+            @for (h of intDealOptions; track h.id) {
+              <option [ngValue]="h.id">{{ h.dealNo }} — {{ h.scriptCode }} (Cert {{ h.certNo }})</option>
             }
           </select>
         </label>
+        <label class="inv-form-field"
+          ><span>As On Date</span><mifosx-date-ddmmyyyy [(ngModel)]="intAsOnDate"></mifosx-date-ddmmyyyy
+        ></label>
       </div>
       <div class="inv-form-actions">
-        <button type="button" class="pg-btn pg-btn--primary" (click)="processInterest()">Process</button>
+        <button
+          type="button"
+          class="pg-btn pg-btn--primary"
+          [disabled]="intLoading"
+          (click)="retrieveInterestSchedule()"
+        >
+          {{ intLoading ? 'Retrieving…' : 'Retrieve' }}
+        </button>
         <button type="button" class="pg-btn pg-btn--ghost" (click)="setTab('holdings')">Exit</button>
       </div>
-      @if (intCalcExcludedNpi.length > 0) {
+
+      @if (intSchedule; as sc) {
+        <div class="pos-section-label">Purchase Details</div>
+        <div class="inv-form-grid">
+          <label class="inv-form-field"
+            ><span>Deal No / Cert No</span><input type="text" [value]="sc.dealNo + ' / ' + sc.certNo" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Script</span><input type="text" [value]="sc.scriptCode + ' — ' + sc.scriptDesc" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Face Value Held</span><input type="text" [value]="'₹' + (sc.faceValue | number: '1.2-2')" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Interest Rate</span><input type="text" [value]="sc.intRate + '%'" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Coupon per Half-Year</span
+            ><input type="text" [value]="'₹' + (sc.couponPerHalfYear | number: '1.2-2')" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Deal Date</span><input type="text" [value]="sc.dealDate" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Last Interest Date</span><input type="text" [value]="sc.lastIntDate" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Maturity Date</span><input type="text" [value]="sc.maturityDate" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Broken Period Interest Paid (expense 500606)</span
+            ><input type="text" [value]="'₹' + (sc.purchasedAccruedInterest | number: '1.2-2')" readonly
+          /></label>
+          <label class="inv-form-field"
+            ><span>Book Value</span><input type="text" [value]="'₹' + (sc.bookValue | number: '1.2-2')" readonly
+          /></label>
+        </div>
+
+        <div class="pos-section-label">
+          Interest Schedule ({{ sc.rows.length }} lines) — due up to {{ sc.asOnDate }}: ₹{{
+            intDueTotal | number: '1.2-2'
+          }}
+        </div>
+        <p class="pg-sub" style="padding: 0 16px">
+          Days are 30/360. A provision books the interest earned since the last coupon; the coupon then clears what is
+          already booked. Display only — nothing is posted to GL yet.
+        </p>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Type</th>
+              <th>Int Date</th>
+              <th>From</th>
+              <th>To</th>
+              <th class="num">Days</th>
+              <th class="num">Int %</th>
+              <th class="num">Gross Interest</th>
+              <th class="num">Already Booked</th>
+              <th class="num col-in">Amount</th>
+              <th>Accounting</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (r of sc.rows; track r.intDate) {
+              <tr [style.opacity]="r.due ? 1 : 0.6">
+                <td>
+                  <span class="pg-chip">{{ r.type === 'COUPON' ? 'Coupon' : 'Provision' }}</span>
+                  @if (r.due) {
+                    <span class="pg-chip">Due</span>
+                  }
+                </td>
+                <td>{{ r.intDate }}</td>
+                <td>{{ r.fromDate }}</td>
+                <td>{{ r.toDate }}</td>
+                <td class="num">{{ r.days }}</td>
+                <td class="num">{{ sc.intRate }}</td>
+                <td class="num">₹{{ r.grossInterest | number: '1.2-2' }}</td>
+                <td class="num">₹{{ r.alreadyBooked | number: '1.2-2' }}</td>
+                <td class="num col-in">₹{{ r.amount | number: '1.2-2' }}</td>
+                <td style="white-space: nowrap; font-size: 12px">
+                  @if (r.type === 'COUPON') {
+                    <div>Dr Bank ₹{{ r.grossInterest | number: '1.0-0' }}</div>
+                    @if (r.alreadyBooked > 0) {
+                      <div>
+                        Cr {{ interestReceivableGl.glCode }} Int. Receivable ₹{{ r.alreadyBooked | number: '1.0-0' }}
+                      </div>
+                    }
+                    <div>Cr {{ sc.interestGlCode }} Int. Income ₹{{ r.amount | number: '1.0-0' }}</div>
+                  } @else {
+                    <div>Dr {{ interestReceivableGl.glCode }} Int. Receivable ₹{{ r.amount | number: '1.0-0' }}</div>
+                    <div>Cr {{ sc.interestGlCode }} Int. Income ₹{{ r.amount | number: '1.0-0' }}</div>
+                  }
+                </td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="10" class="pg-empty">
+                  No interest lines — check the rate, last interest date and maturity date.
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+        <p class="pg-sub" style="padding: 8px 16px 12px">
+          Interest income GL: {{ sc.interestGlCode }} — {{ sc.interestGlName }}. Posting to GL will be enabled after
+          approval.
+        </p>
+      } @else {
         <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).
+          Select a Deal No and press Retrieve to see its interest schedule.
         </p>
       }
-      <div class="pos-section-label">Holdings matching the filter ({{ intCalcTargets.length }})</div>
-      <table class="pg-table">
-        <thead>
-          <tr>
-            <th>Cert No</th>
-            <th>Script</th>
-            <th>Type</th>
-            <th class="num">Rate</th>
-            <th>Frequency</th>
-            <th class="num col-in">Interest to Post</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (h of intCalcTargets; track h.certNo) {
-            <tr>
-              <td>
-                <span class="pg-chip">{{ h.certNo }}</span>
-              </td>
-              <td>{{ h.scriptName }}</td>
-              <td>{{ instrumentLabel(h.instrumentType) }}</td>
-              <td class="num">{{ h.interestRate }}%</td>
-              <td>{{ h.interestFreq }}</td>
-              <td class="num col-in">₹{{ interestAccrued(h) | number: '1.2-2' }}</td>
-            </tr>
-          } @empty {
-            <tr>
-              <td colspan="6" class="pg-empty">No holdings match the selected filters.</td>
-            </tr>
-          }
-        </tbody>
-      </table>
     </div>
   }
 

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

@@ -6,16 +6,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component } from '@angular/core';
+import { Component, OnInit, inject } 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,
-  BOND_HOLDINGS,
-  MUTUAL_FUND_HOLDINGS,
-  ALL_TXNS,
   SCRIPT_MASTER,
   PARTY_MASTER,
   SUBTYPE_MASTER,
@@ -31,16 +26,26 @@ import {
   BOND_RATING_OPTIONS,
   INT_TYPE_OPTIONS,
   AUTHORITY_OPTIONS,
-  INTEREST_INCOME_GL_MASTER,
-  INTEREST_INCOME_GL_BY_TYPE,
+  INVESTMENT_GL_BY_TYPE,
+  INVESTMENT_GL_LOOKUP,
+  INTEREST_RECEIVABLE_GL,
+  BROKEN_PERIOD_INTEREST_GL,
+  STAMP_DUTY_GL,
+  BROKERAGE_GL,
+  OTHER_CHARGES_GL,
+  SETTLEMENT_BANK_GL_OPTIONS,
+  periodBetween,
+  parseDDMMYYYY,
+  days360,
+  lastHalfYearlyCouponDate,
+  nextHalfYearlyCouponDate,
+  couponDatesLabel,
   InvestmentHolding,
   InvestmentTxn,
   InstrumentType,
   InterestFreq,
   INSTRUMENT_LABELS,
   accruedInterest,
-  accruedInterestBetween,
-  canAccrueInterest,
   daysToMaturity,
   maturityAmount,
   addPeriod,
@@ -49,6 +54,14 @@ import {
   todayDDMMYYYY
 } from '../investment-data';
 import { exportWorkbook } from '../investment-export';
+import {
+  InvestmentDailyRateDto,
+  InvestmentInterestScheduleDto,
+  InvestmentPurchaseDto,
+  InvestmentService,
+  apiErrorMessage,
+  toHolding
+} from '../investment.service';
 
 type BondType = 'GOVT_SECURITY' | 'NON_SLR' | 'BOND' | 'MUTUAL_FUND';
 type BondTab =
@@ -129,6 +142,14 @@ interface BondPurchaseForm {
   holdingDays: number | null;
   stampDuty: number | null;
   stampDutyAc: string;
+  otherCharges: number | null;
+}
+
+interface AccountingPreviewLine {
+  side: 'Dr' | 'Cr';
+  glCode: string;
+  glName: string;
+  amount: number;
 }
 
 interface BondSellForm {
@@ -182,23 +203,67 @@ interface BondSellForm {
     DateDdmmyyyyPickerComponent
   ]
 })
-export class BondInvestmentComponent {
+export class BondInvestmentComponent implements OnInit {
+  private readonly investmentService = inject(InvestmentService);
+
+  /** Script and party dropdowns offer the masters saved in the backend. */
+  ngOnInit(): void {
+    this.investmentService.syncSharedMasters().subscribe({
+      error: (err) => this.toast(`Could not load Script / Party masters: ${apiErrorMessage(err)}`)
+    });
+    this.investmentService.getAssetGlAccounts().subscribe({
+      next: (gls) =>
+        (this.glIdByCode = new Map(
+          gls.map((g) => [
+            g.glCode,
+            g.id
+          ])
+        )),
+      error: (err) => this.toast(`Could not load GL accounts: ${apiErrorMessage(err)}`)
+    });
+    this.loadPurchases();
+  }
+
+  /** GL id for a GL code — the purchase API takes ids, the form works with codes. */
+  private glIdByCode = new Map<string, number>();
+
+  /** The Holdings register and transaction log are the purchases saved in the backend. */
+  private loadPurchases(): void {
+    this.investmentService.getPurchases().subscribe({
+      next: (purchases) => {
+        this.holdings = purchases.map(toHolding);
+        this.txns = purchases.map((d) => this.purchaseTxn(d));
+        this.purchaseForm = this.blankPurchaseForm();
+      },
+      error: (err) => this.toast(`Could not load purchases: ${apiErrorMessage(err)}`)
+    });
+  }
+
+  private purchaseTxn(d: InvestmentPurchaseDto): InvestmentTxn {
+    return {
+      certNo: d.certNo,
+      instrumentType: d.bondType,
+      txnType: 'PURCHASE',
+      voucherNo: `INV/PUR/${d.dealNo}`,
+      txnDate: d.dealDate,
+      amount: d.settlementAmount,
+      particulars: `Purchase Deal ${d.dealNo} - ${d.scriptDesc} - ${d.partyName} [${d.category}]`,
+      glCode: d.investmentGlCode,
+      glName: d.investmentGlName
+    };
+  }
+
   activeTab: BondTab = 'holdings';
+  /** Purchase Entry shows only the mandatory fields; the rest sit under "More Details". */
+  showMoreDetails = false;
+  /** Cert No typed in the Retrieve box (Cert No itself is system-generated and read-only). */
+  retrieveCertNo = '';
   bondType: BondType = 'GOVT_SECURITY';
   asOnDate = todayDDMMYYYY();
 
-  holdings: InvestmentHolding[] = [
-    ...GOVT_SECURITY_HOLDINGS,
-    ...NON_SLR_HOLDINGS,
-    ...BOND_HOLDINGS,
-    ...MUTUAL_FUND_HOLDINGS
-  ];
-  txns: InvestmentTxn[] = ALL_TXNS.filter((t) => ([
-        'GOVT_SECURITY',
-        'NON_SLR',
-        'BOND',
-        'MUTUAL_FUND'
-      ] as InstrumentType[]).includes(t.instrumentType));
+  /** Loaded from the backend (saved purchases) in ngOnInit. */
+  holdings: InvestmentHolding[] = [];
+  txns: InvestmentTxn[] = [];
 
   // Master-driven dropdown sources
   readonly scriptOptions = SCRIPT_MASTER;
@@ -224,23 +289,23 @@ export class BondInvestmentComponent {
 
   purchaseForm: BondPurchaseForm = this.blankPurchaseForm();
   sellForm: BondSellForm = this.blankSellForm();
+  readonly settlementBankOptions = SETTLEMENT_BANK_GL_OPTIONS;
 
   // Redemption Entry
   redeemCertNo = '';
   redeemDate = this.asOnDate;
   redeemRemarks = '';
 
-  // 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;
+  // 03 Interest Entry (legacy: Type / Script / Deal No + Retrieve) — the backend works out every
+  // half-yearly coupon and 31 Mar / 30 Sep closing provision of the holding. Display only:
+  // nothing is posted to GL until the posting rules are approved.
+  intType: BondType | '' = '';
+  intScript = '';
+  intPurchaseId: number | null = null;
+  intAsOnDate = this.asOnDate;
+  intSchedule: InvestmentInterestScheduleDto | null = null;
+  intLoading = false;
+  readonly interestReceivableGl = INTEREST_RECEIVABLE_GL;
 
   // Write-off
   writeoffCertNo = '';
@@ -305,20 +370,38 @@ export class BondInvestmentComponent {
     return INSTRUMENT_LABELS[type];
   }
 
+  /** Preview of the deal number the backend will assign: FY prefix (e.g. 202627) + running number. */
   private nextDealNo(): string {
-    return `2026${String(27000039 + this.holdings.length).padStart(9, '0')}`;
+    const d = parseDDMMYYYY(this.asOnDate);
+    const fyStart = d.getMonth() >= 3 ? d.getFullYear() : d.getFullYear() - 1;
+    const prefix = `${fyStart}${String((fyStart + 1) % 100).padStart(2, '0')}`;
+    const nums = (this.holdings ?? [])
+      .map((h) => h.dealNo)
+      .filter((n): n is string => !!n && n.startsWith(prefix))
+      .map((n) => parseInt(n.slice(prefix.length), 10));
+    return `${prefix}${String((nums.length ? Math.max(...nums) : 0) + 1).padStart(6, '0')}`;
+  }
+
+  /** Certificate No is system-generated, as in the existing CBS (greyed there). */
+  /** Preview of the certificate number the backend will assign (running number). */
+  private nextCertNo(): string {
+    const nums = (this.holdings ?? []).map((h) => parseInt(h.certNo, 10)).filter((n) => !isNaN(n));
+    return String((nums.length ? Math.max(...nums) : 0) + 1);
   }
 
   private blankPurchaseForm(): BondPurchaseForm {
     const type = this.bondType ?? 'GOVT_SECURITY';
+    this.showMoreDetails = false;
+    this.retrieveCertNo = '';
+    this.purchaseMarketRate = undefined;
     return {
       bondType: type,
       dealNo: this.nextDealNo(),
       dealDate: this.asOnDate,
-      dealTime: '',
+      dealTime: new Date().toTimeString().slice(0, 8),
       isin: '',
       scriptCode: '',
-      certNo: '',
+      certNo: this.nextCertNo(),
       settlementType: 'T+0',
       settlementDt: this.asOnDate,
       faceValue: null,
@@ -326,7 +409,7 @@ export class BondInvestmentComponent {
       partyCode: '',
       subType: type === 'GOVT_SECURITY' ? 'SLR' : type === 'NON_SLR' ? 'NON SLR' : 'CORPORATE BOND',
       tbillGlAc: '',
-      crToAc: '310070',
+      crToAc: SETTLEMENT_BANK_GL_OPTIONS[0]?.glCode ?? '',
       premiumAmt: null,
       brokerage: null,
       brokerName: '',
@@ -374,7 +457,8 @@ export class BondInvestmentComponent {
       nav: null,
       holdingDays: null,
       stampDuty: null,
-      stampDutyAc: ''
+      stampDutyAc: '',
+      otherCharges: null
     };
   }
 
@@ -444,14 +528,41 @@ export class BondInvestmentComponent {
     return this.isMutualFund ? this.purchaseForm.nav || 0 : 100;
   }
 
-  /** Book Value — what the investment is carried at, i.e. amount actually paid. */
+  /** Book Value — the price paid for the security. Charges are expenses and stay out of it (Jitendra Sir). */
   get purchaseBookValue(): number {
     const f = this.purchaseForm;
     if (this.isMutualFund) {
-      return this.purchaseBaseAmount + (f.stampDuty || 0) + (f.brokerage || 0);
+      return this.purchaseBaseAmount;
     }
     const rate = f.purchaseRate || 100;
-    return Math.round((this.purchaseBaseAmount * rate) / 100) + (f.brokerage || 0);
+    return Math.round((this.purchaseBaseAmount * rate) / 100);
+  }
+
+  /** Stamp duty + brokerage + other charges — paid with the settlement, booked to expense GLs. */
+  get purchaseTotalCharges(): number {
+    const f = this.purchaseForm;
+    return (f.stampDuty || 0) + (f.brokerage || 0) + (f.otherCharges || 0);
+  }
+
+  // Interest cycle of the security being bought: its two coupon days and the next coupon after the deal.
+  get purchaseCouponDates(): string {
+    return this.purchaseMaturityDate ? couponDatesLabel(this.purchaseMaturityDate) : '';
+  }
+
+  get purchaseNextCouponDate(): string {
+    const f = this.purchaseForm;
+    return this.purchaseMaturityDate && f.dealDate
+      ? nextHalfYearlyCouponDate(this.purchaseMaturityDate, f.dealDate)
+      : '';
+  }
+
+  get purchaseNextCouponAmount(): number {
+    const f = this.purchaseForm;
+    return f.intRate ? Math.round((this.purchaseBaseAmount * f.intRate) / 200) : 0;
+  }
+
+  get purchaseDaysToNextCoupon(): number {
+    return this.purchaseNextCouponDate ? days360(this.purchaseForm.dealDate, this.purchaseNextCouponDate) : 0;
   }
 
   get purchaseYtm(): number {
@@ -463,18 +574,47 @@ export class BondInvestmentComponent {
   }
 
   /** Accrued Interest at purchase — interest earned by the seller since the last coupon date. */
+  /** Interest owed to the seller from the last coupon date up to the deal date, on a 30/360 basis —
+   *  interest is counted to the event date, not the date the money moves (Jitendra Sir). */
   get purchaseAccruedInterest(): number {
     const f = this.purchaseForm;
     if (!f.intRate || !f.lastIntDt || !f.dealDate) {
       return 0;
     }
-    const yrs = Math.max(0, yearsBetween(f.lastIntDt, f.dealDate));
-    return Math.round(this.purchaseBaseAmount * (f.intRate / 100) * yrs);
+    return Math.round((this.purchaseBaseAmount * (f.intRate / 100) * days360(f.lastIntDt, f.dealDate)) / 360);
   }
 
-  /** Settlement Amt of Purchase — book value plus accrued interest payable to the seller. */
+  get purchaseAccruedDays(): number {
+    const f = this.purchaseForm;
+    return f.lastIntDt && f.dealDate ? days360(f.lastIntDt, f.dealDate) : 0;
+  }
+
+  /** Premium (+) or discount (−) paid over face value. */
+  get purchasePremiumDiscount(): number {
+    const f = this.purchaseForm;
+    if (this.isMutualFund || !f.faceValue || !f.purchaseRate) {
+      return 0;
+    }
+    return Math.round((f.faceValue * (f.purchaseRate - 100)) / 100);
+  }
+
+  /** Re-suggests the last coupon date when the deal date changes. */
+  onDealDateChange(): void {
+    this.suggestLastIntDate();
+    this.loadMarketRate();
+  }
+
+  private suggestLastIntDate(): void {
+    const f = this.purchaseForm;
+    const s = this.purchaseScript;
+    if (!this.isMutualFund && s?.maturityDate && f.dealDate) {
+      f.lastIntDt = lastHalfYearlyCouponDate(s.maturityDate, f.dealDate) || f.lastIntDt;
+    }
+  }
+
+  /** Settlement Amt of Purchase — book value, accrued interest payable to the seller and the charges. */
   get purchaseSettlementAmount(): number {
-    return this.purchaseBookValue + this.purchaseAccruedInterest;
+    return this.purchaseBookValue + this.purchaseAccruedInterest + this.purchaseTotalCharges;
   }
 
   get purchaseMaturityAmount(): number {
@@ -504,69 +644,262 @@ export class BondInvestmentComponent {
     });
   }
 
-  /** Fills ISIN + interest rate when a script is picked, mirroring the legacy form's lookup. */
+  get purchaseScript(): (typeof SCRIPT_MASTER)[number] | undefined {
+    return this.scriptOptions.find((x) => x.scriptCode === this.purchaseForm.scriptCode);
+  }
+
+  /** Picking a script pulls its master details into the deal, as the existing CBS does. */
   onScriptChange(): void {
-    const s = this.scriptOptions.find((x) => x.scriptCode === this.purchaseForm.scriptCode);
-    if (s) {
-      this.purchaseForm.isin = s.isin;
+    const s = this.purchaseScript;
+    if (!s) {
+      return;
     }
+    const f = this.purchaseForm;
+    f.isin = s.isin;
+    if (s.couponRate != null) {
+      f.intRate = s.couponRate;
+    }
+    if (s.issueDate) {
+      f.issueDate = s.issueDate;
+    }
+    if (s.maturityDate) {
+      f.redumMatDt = s.maturityDate;
+      const p = periodBetween(s.issueDate, s.maturityDate);
+      f.periodYear = p.years;
+      f.periodMonth = p.months;
+      f.periodDays = p.days;
+    }
+    if (s.slrType) {
+      f.subType = s.slrType === 'NON_SLR' ? 'NON SLR' : 'SLR';
+    }
+    if (this.isMutualFund) {
+      f.productName = s.scriptName;
+    }
+    this.suggestLastIntDate();
+    this.loadMarketRate();
+  }
+
+  /**
+   * Market rate of the script for the deal date from the Daily Script Master (newest rate on or before it). It fills
+   * the purchase rate (NAV for a mutual fund); the dealer may still change it. undefined = not looked up yet,
+   * null = no rate entered for the script.
+   */
+  purchaseMarketRate: InvestmentDailyRateDto | null | undefined;
+
+  private loadMarketRate(): void {
+    const s = this.purchaseScript;
+    const f = this.purchaseForm;
+    if (!s?.id || !f.dealDate) {
+      this.purchaseMarketRate = undefined;
+      return;
+    }
+    this.investmentService.getLatestDailyRate(s.id, f.dealDate).subscribe({
+      next: (rate) => {
+        this.purchaseMarketRate = rate;
+        // No market rate: clear the field rather than leave another script's rate in it.
+        if (this.isMutualFund) {
+          f.nav = rate ? rate.closeRate : null;
+        } else {
+          f.purchaseRate = rate ? rate.closeRate : null;
+        }
+      },
+      error: (err) => this.toast(`Could not read the market rate: ${apiErrorMessage(err)}`)
+    });
+  }
+
+  /** True when the rate entered is outside the day's low–high in the Daily Script Master. */
+  get purchaseRateOutOfRange(): boolean {
+    const m = this.purchaseMarketRate;
+    const f = this.purchaseForm;
+    const rate = this.isMutualFund ? f.nav : f.purchaseRate;
+    if (!m || rate == null) {
+      return false;
+    }
+    return (m.lowRate != null && rate < m.lowRate) || (m.highRate != null && rate > m.highRate);
+  }
+
+  /** Settlement Date = Deal Date + T+n days (greyed / auto in the existing CBS). */
+  get purchaseSettlementDate(): string {
+    const f = this.purchaseForm;
+    if (!f.dealDate) {
+      return '';
+    }
+    const n = parseInt(f.settlementType.replace('T+', ''), 10) || 0;
+    return addPeriod(f.dealDate, 0, 0, n);
+  }
+
+  /** Parties offered for a new deal — inactive parties are hidden. */
+  get activePartyOptions(): typeof PARTY_MASTER {
+    return this.partyOptions.filter((p) => p.status !== 'INACTIVE');
+  }
+
+  get purchaseInvestmentGlCode(): string {
+    return this.purchaseScript?.glCode || INVESTMENT_GL_BY_TYPE[this.purchaseForm.bondType];
+  }
+
+  glNameOf(glCode: string): string {
+    return INVESTMENT_GL_LOOKUP.find((g) => g.glCode === glCode)?.glName ?? '';
+  }
+
+  /** The journal entry this purchase will post once the checker approves it. */
+  get purchaseAccountingPreview(): AccountingPreviewLine[] {
+    const book = this.purchaseBookValue;
+    const accrued = this.purchaseAccruedInterest;
+    const total = this.purchaseSettlementAmount;
+    const crGl = this.purchaseForm.crToAc;
+    if (!book || !crGl) {
+      return [];
+    }
+    const invGl = this.purchaseInvestmentGlCode;
+    const lines: AccountingPreviewLine[] = [
+      { side: 'Dr', glCode: invGl, glName: this.glNameOf(invGl), amount: book }];
+    // Broken-period interest paid to the seller is an expense (RBI para 152, confirmed by Jitendra Sir).
+    if (accrued > 0) {
+      lines.push({
+        side: 'Dr',
+        glCode: BROKEN_PERIOD_INTEREST_GL.glCode,
+        glName: BROKEN_PERIOD_INTEREST_GL.glName,
+        amount: accrued
+      });
+    }
+    const f = this.purchaseForm;
+    for (const [
+      gl,
+      amount
+    ] of [
+      [
+        STAMP_DUTY_GL,
+        f.stampDuty
+      ],
+      [
+        BROKERAGE_GL,
+        f.brokerage
+      ],
+      [
+        OTHER_CHARGES_GL,
+        f.otherCharges
+      ]
+    ] as const) {
+      if (amount && amount > 0) {
+        lines.push({ side: 'Dr', glCode: gl.glCode, glName: gl.glName, amount });
+      }
+    }
+    lines.push({ side: 'Cr', glCode: crGl, glName: this.glNameOf(crGl), amount: total });
+    return lines;
   }
 
   savePurchase(): void {
     const f = this.purchaseForm;
-    if (!f.certNo || !this.purchaseBaseAmount || !f.partyCode) {
-      this.toast('Please fill Cert No, Face Value / Consider Amt and Party Code.');
+    const missing: string[] = [];
+    if (!f.scriptCode) missing.push('Script Code');
+    if (!f.partyCode) missing.push('Party Code');
+    if (!f.dealDate) missing.push('Deal Date');
+    if (!f.dealTime) missing.push('Deal Time');
+    if (this.isMutualFund) {
+      if (!f.considerAmt) missing.push('Consider Amt');
+      if (!f.nav) missing.push('NAV');
+    } else {
+      if (!f.faceValue) missing.push('Face Value');
+      if (!f.purchaseRate) missing.push('Purchase Rate');
+      if (!f.lastIntDt) missing.push('Last Interest Date');
+    }
+    if (!f.category) missing.push('Category');
+    if (!f.crToAc) missing.push('CR. To A/c');
+    if (missing.length) {
+      this.toast(`Please fill: ${missing.join(', ')}.`);
       return;
     }
-    const holding: InvestmentHolding = {
-      certNo: f.certNo,
-      instrumentType: f.bondType,
-      scriptCode: f.scriptCode || f.isin || f.productName,
-      scriptName: this.isMutualFund
-        ? f.productName
-        : this.scriptOptions.find((s) => s.scriptCode === f.scriptCode)?.scriptName || f.scriptCode || f.isin,
-      party: f.partyCode,
-      subType: f.subType,
-      faceValue: this.purchaseBaseAmount,
-      purchaseRate: this.isMutualFund ? f.nav || 0 : f.purchaseRate || 100,
-      units: this.purchaseUnits,
-      purchaseDate: f.issueDate,
-      maturityDate: this.purchaseMaturityDate || f.issueDate,
-      interestRate: f.intRate || 0,
-      interestFreq: this.isMutualFund ? 'CUMULATIVE' : f.intType,
-      glCode:
-        '31' +
-        (f.bondType === 'GOVT_SECURITY'
-          ? '0020'
-          : f.bondType === 'NON_SLR'
-            ? '0030'
-            : f.bondType === 'BOND'
-              ? '0040'
-              : '0050'),
-      glName: `INVESTMENT IN ${INSTRUMENT_LABELS[f.bondType].toUpperCase()}`,
-      crToAc: f.crToAc,
-      brokerCode: f.brokerName,
-      status: 'ACTIVE'
+    const script = this.purchaseScript;
+    const party = this.partyOptions.find((p) => p.partyCode === f.partyCode);
+    const crGlAccountId = this.glIdByCode.get(f.crToAc);
+    if (!script?.id || !party?.id) {
+      this.toast('Script and Party must be saved in Investment Masters first.');
+      return;
+    }
+    if (!crGlAccountId) {
+      this.toast(`GL ${f.crToAc} was not found in the chart of accounts.`);
+      return;
+    }
+    const body = {
+      bondType: f.bondType,
+      scriptId: script.id,
+      partyId: party.id,
+      dealDate: f.dealDate,
+      dealTime: f.dealTime || '',
+      settlementType: f.settlementType,
+      ...(this.isMutualFund
+        ? { considerAmt: f.considerAmt, nav: f.nav }
+        : { faceValue: f.faceValue, purchaseRate: f.purchaseRate, lastIntDate: f.lastIntDt }),
+      stampDuty: f.stampDuty ?? null,
+      brokerage: f.brokerage ?? null,
+      otherCharges: f.otherCharges ?? null,
+      category: f.category,
+      crGlAccountId,
+      subType: f.subType || '',
+      otherDetails: this.purchaseOtherDetails(),
+      dateFormat: 'dd-MM-yyyy',
+      locale: 'en'
     };
-    this.holdings = [
-      holding,
-      ...this.holdings
-    ];
-    this.txns = [
-      {
-        certNo: holding.certNo,
-        instrumentType: f.bondType,
-        txnType: 'PURCHASE',
-        voucherNo: `INV/PUR/${f.dealNo}`,
-        txnDate: f.dealDate,
-        amount: this.purchaseSettlementAmount,
-        particulars: `Purchase Deal ${f.dealNo} - ${holding.scriptName} - ${holding.party}${f.category ? ' [' + f.category + ']' : ''}`
+    this.investmentService.createPurchase(body).subscribe({
+      next: (res) => {
+        this.toast(`Deal ${res.resourceIdentifier} saved. GL posting will follow once accounting is approved.`);
+        this.activeTab = 'holdings';
+        this.loadPurchases();
       },
-      ...this.txns
-    ];
-    this.toast(`${INSTRUMENT_LABELS[f.bondType]} Certificate ${holding.certNo} saved successfully.`);
-    this.purchaseForm = this.blankPurchaseForm();
-    this.activeTab = 'holdings';
+      error: (err) => this.toast(apiErrorMessage(err))
+    });
+  }
+
+  /** The optional "More Details" fields, kept with the deal as they were entered. */
+  private purchaseOtherDetails(): Record<string, string | number> {
+    const f = this.purchaseForm;
+    const fields: Record<string, string | number | null> = {
+      tradeNo: f.tradeNo,
+      orderNo: f.orderNo,
+      brokerCode: f.brokerName,
+      recommAuthority: f.recommAuthority,
+      sanctionAuthority: f.sanctionAuthority,
+      meetDate: f.meetDt,
+      resoNo: f.resoNo,
+      dealType: f.dealType,
+      market: f.market,
+      markCblo: f.markCblo,
+      paymentMode: f.paymentMode,
+      deliveryMode: f.deliveryMode,
+      lien: f.lien,
+      lienAmount: f.lienAmount,
+      lienReason: f.lienReason,
+      bondRating: f.bondRating,
+      corpBond: f.corpBond,
+      sglWithBank: f.sglWithBank,
+      tbillGlAc: f.tbillGlAc,
+      intType: f.intType,
+      intDate: f.intDate,
+      folioNo: f.folioNo,
+      callOption: f.callOption,
+      descInv: f.descInv,
+      fromDist: f.fromDist,
+      toDist: f.toDist,
+      amortizeAmt: f.amortizeAmt,
+      registerAddress: f.registerAdd,
+      registerCity: f.regiCity,
+      registerPin: f.regiPin,
+      remarks: f.remarks,
+      description: f.description,
+      tradeAmt: f.tradeAmt,
+      holdingDays: f.holdingDays,
+      stampDutyAc: f.stampDutyAc
+    };
+    const out: Record<string, string | number> = {};
+    for (const [
+      k,
+      v
+    ] of Object.entries(fields)) {
+      if (v !== null && v !== undefined && v !== '') {
+        out[k] = v;
+      }
+    }
+    return out;
   }
 
   cancelPurchase(): void {
@@ -576,9 +909,10 @@ export class BondInvestmentComponent {
 
   /** Legacy "Retrieve" button — loads an existing deal back into the form by Cert No. */
   retrievePurchase(): void {
-    const h = this.holdings.find((x) => x.certNo === this.purchaseForm.certNo.trim());
+    const certNo = this.retrieveCertNo.trim();
+    const h = this.holdings.find((x) => x.certNo === certNo);
     if (!h) {
-      this.toast(`Cert No ${this.purchaseForm.certNo} not found.`);
+      this.toast(`Cert No ${certNo || '(blank)'} not found.`);
       return;
     }
     this.purchaseForm = {
@@ -587,7 +921,8 @@ export class BondInvestmentComponent {
       certNo: h.certNo,
       scriptCode: h.scriptCode,
       isin: this.scriptOptions.find((s) => s.scriptCode === h.scriptCode)?.isin || '',
-      partyCode: h.party,
+      dealNo: h.dealNo ?? '',
+      partyCode: h.partyCode ?? '',
       subType: h.subType,
       faceValue: h.faceValue,
       considerAmt: h.faceValue,
@@ -599,22 +934,26 @@ export class BondInvestmentComponent {
       intType: h.interestFreq,
       brokerName: h.brokerCode,
       crToAc: h.crToAc,
-      productName: h.scriptName
+      productName: h.scriptName,
+      category: h.category ?? ''
     };
     this.bondType = h.instrumentType as BondType;
     this.toast(`Deal for Cert No ${h.certNo} retrieved.`);
   }
 
   dropPurchase(): void {
-    const certNo = this.purchaseForm.certNo;
-    if (!this.holdings.some((h) => h.certNo === certNo)) {
-      this.toast('Nothing to drop — this deal is not yet saved.');
+    const h = this.holdings.find((x) => x.certNo === this.purchaseForm.certNo);
+    if (!h?.id) {
+      this.toast('Retrieve a saved deal first, then Drop.');
       return;
     }
-    this.holdings = this.holdings.filter((h) => h.certNo !== certNo);
-    this.txns = this.txns.filter((t) => t.certNo !== certNo);
-    this.purchaseForm = this.blankPurchaseForm();
-    this.toast(`Cert No ${certNo} dropped.`);
+    this.investmentService.deletePurchase(h.id).subscribe({
+      next: () => {
+        this.toast(`Deal ${h.dealNo} (Cert No ${h.certNo}) dropped.`);
+        this.loadPurchases();
+      },
+      error: (err) => this.toast(apiErrorMessage(err))
+    });
   }
 
   exitPurchase(): void {
@@ -658,78 +997,53 @@ export class BondInvestmentComponent {
   }
 
   // -------------------- Interest calculation --------------------
-  /** 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 base;
+  /** Saved holdings for the Deal No dropdown, narrowed by Type and Script. */
+  get intDealOptions(): InvestmentHolding[] {
+    return this.holdings.filter(
+      (h) =>
+        h.id != null &&
+        h.status === 'ACTIVE' &&
+        (!this.intType || h.instrumentType === this.intType) &&
+        (!this.intScript || h.scriptCode === this.intScript)
+    );
+  }
+
+  get intScriptOptions(): typeof SCRIPT_MASTER {
+    return this.scriptOptions.filter((s) => !this.intType || s.instrumentType === this.intType);
+  }
+
+  onIntFilterChange(): void {
+    if (this.intScript && !this.intScriptOptions.some((s) => s.scriptCode === this.intScript)) {
+      this.intScript = '';
     }
-    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;
-      return true;
-    });
-  }
-
-  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];
+    if (this.intPurchaseId != null && !this.intDealOptions.some((h) => h.id === this.intPurchaseId)) {
+      this.intPurchaseId = null;
     }
+    this.intSchedule = null;
   }
 
-  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 accruedInterestBetween(h, this.intCalcFromDate || h.purchaseDate, this.intCalcToDate || this.asOnDate);
-  }
-
-  processInterest(): void {
-    const targets = this.intCalcTargets.filter((h) => this.interestAccrued(h) > 0);
-    if (targets.length === 0) {
-      this.toast('No holdings have interest due to be posted for this period.');
+  retrieveInterestSchedule(): void {
+    if (this.intPurchaseId == null) {
+      this.toast('Select a Deal No first.');
       return;
     }
-    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.intLoading = true;
+    this.investmentService.getInterestSchedule(this.intPurchaseId, this.intAsOnDate || undefined).subscribe({
+      next: (schedule) => {
+        this.intSchedule = schedule;
+        this.intLoading = false;
+      },
+      error: (err) => {
+        this.intSchedule = null;
+        this.intLoading = false;
+        this.toast(apiErrorMessage(err));
+      }
     });
-    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) to ${glCode} - ${glName}. Total ₹${total.toLocaleString('en-IN')}.`
-    );
+  }
+
+  /** Total of the lines falling due up to the as-on date. */
+  get intDueTotal(): number {
+    return (this.intSchedule?.rows ?? []).filter((r) => r.due).reduce((sum, r) => sum + r.amount, 0);
   }
 
   // -------------------- Sell / Redeem Entry --------------------

src/app/investment/investment-data.ts

@@ -123,6 +123,16 @@ export interface InvestmentHolding {
    *  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;
+  /** RBI investment category chosen at purchase — HTM / AFS / HFT. */
+  category?: string;
+  /** SGL / CSGL account the security is held in (custody, not an accounting GL). */
+  sglAccountNo?: string;
+  /** Backend id / deal number / party code once the purchase is saved (absent on sample rows). */
+  id?: number;
+  dealNo?: string;
+  partyCode?: string;
+  bookValue?: number;
+  settlementAmount?: number;
 }
 
 export interface InvestmentTxn {
@@ -248,6 +258,80 @@ export function accruedInterestBetween(h: InvestmentHolding, fromStr: string, to
   return Math.round(h.faceValue * (h.interestRate / 100) * (days / 365.25));
 }
 
+/** Days between two DD-MM-YYYY dates on a 30/360 basis (every month 30 days), as the bank's existing
+ *  CBS counts them — e.g. 10-08 → 30-09 = 50 days, 10-08 → 07-10 = 57 days. */
+export function days360(fromStr: string, toStr: string): number {
+  const a = parseDDMMYYYY(fromStr);
+  const b = parseDDMMYYYY(toStr);
+  if (isNaN(a.getTime()) || isNaN(b.getTime()) || b <= a) {
+    return 0;
+  }
+  const d1 = Math.min(a.getDate(), 30);
+  const d2 = Math.min(b.getDate(), 30);
+  return (b.getFullYear() - a.getFullYear()) * 360 + (b.getMonth() - a.getMonth()) * 30 + (d2 - d1);
+}
+
+/** Most recent half-yearly coupon date on or before `onStr`, derived from the maturity date (coupons
+ *  fall on the maturity day/month and six months either side of it). */
+export function lastHalfYearlyCouponDate(maturityStr: string, onStr: string): string {
+  const mat = parseDDMMYYYY(maturityStr);
+  const on = parseDDMMYYYY(onStr);
+  if (isNaN(mat.getTime()) || isNaN(on.getTime())) {
+    return '';
+  }
+  const day = mat.getDate();
+  const couponOn = (year: number, month: number): Date => {
+    const lastDay = new Date(year, month + 1, 0).getDate();
+    return new Date(year, month, Math.min(day, lastDay));
+  };
+  const months = [
+    mat.getMonth() % 6,
+    (mat.getMonth() % 6) + 6
+  ];
+  let best: Date | undefined;
+  for (const year of [
+    on.getFullYear() - 1,
+    on.getFullYear()
+  ]) {
+    for (const m of months) {
+      const c = couponOn(year, m);
+      if (c <= on && (!best || c > best)) {
+        best = c;
+      }
+    }
+  }
+  return best ? formatDDMMYYYY(best) : '';
+}
+
+/** First half-yearly coupon date after `onStr` (coupons fall on the maturity day/month and six months
+ *  either side), never later than maturity. */
+export function nextHalfYearlyCouponDate(maturityStr: string, onStr: string): string {
+  const last = lastHalfYearlyCouponDate(maturityStr, onStr);
+  const mat = parseDDMMYYYY(maturityStr);
+  if (!last || isNaN(mat.getTime())) {
+    return '';
+  }
+  const l = parseDDMMYYYY(last);
+  const year = l.getFullYear() + (l.getMonth() >= 6 ? 1 : 0);
+  const month = (l.getMonth() + 6) % 12;
+  const next = new Date(year, month, Math.min(mat.getDate(), new Date(year, month + 1, 0).getDate()));
+  return formatDDMMYYYY(next > mat ? mat : next);
+}
+
+/** The two coupon days of a half-yearly security, e.g. "14 Feb / 14 Aug". */
+export function couponDatesLabel(maturityStr: string): string {
+  const mat = parseDDMMYYYY(maturityStr);
+  if (isNaN(mat.getTime())) {
+    return '';
+  }
+  const label = (month: number): string => {
+    const day = Math.min(mat.getDate(), new Date(2001, month + 1, 0).getDate());
+    return `${day} ${new Date(2001, month, 1).toLocaleString('en-US', { month: 'short' })}`;
+  };
+  const first = mat.getMonth() % 6;
+  return `${label(first)} / ${label(first + 6)}`;
+}
+
 export function formatDDMMYYYY(d: Date): string {
   return `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
 }
@@ -1404,99 +1488,331 @@ export const CASH_BANK_GL_MASTER: InvestmentGlOption[] = [
   { glCode: '110030', glName: 'HDFC BANK CURRENT ACCOUNT' }
 ];
 
+/** Investment GLs a script / party can be mapped to. PROPOSED codes awaiting approval — the
+ *  backend will take these from the chart of accounts, never hard-coded. */
+export const INVESTMENT_GL_OPTIONS: InvestmentGlOption[] = [
+  { glCode: '100701', glName: 'INVESTMENT IN CENTRAL GOVT SECURITIES' },
+  { glCode: '100702', glName: 'INVESTMENT IN STATE GOVT SECURITIES' },
+  { glCode: '100703', glName: 'INVESTMENT IN BONDS / DEBENTURES' },
+  { glCode: '100704', glName: 'FIXED DEPOSITS WITH OTHER BANKS' },
+  { glCode: '100705', glName: 'INVESTMENT IN MUTUAL FUNDS' },
+  { glCode: '100706', glName: 'INVESTMENT IN SHARES' }
+];
+
+/** Fallback investment GL when a script has none mapped. */
+export const INVESTMENT_GL_BY_TYPE: Record<InstrumentType, string> = {
+  GOVT_SECURITY: '100701',
+  NON_SLR: '100703',
+  BOND: '100703',
+  FD: '100704',
+  MUTUAL_FUND: '100705',
+  SHARE: '100706'
+};
+
+/** Broken-period interest paid to the seller at purchase — an expense, not part of cost (RBI UCB Investment
+ *  Directions para 152). */
+export const BROKEN_PERIOD_INTEREST_GL: InvestmentGlOption = {
+  glCode: '500606',
+  glName: 'BROKEN PERIOD INTEREST PAID ON INVESTMENTS'
+};
+
+/** Charges on an investment deal — expenses on their own GLs, not part of the book value (Jitendra Sir). */
+export const STAMP_DUTY_GL: InvestmentGlOption = { glCode: '500601', glName: 'STAMP DUTY ON INVESTMENTS' };
+export const BROKERAGE_GL: InvestmentGlOption = { glCode: '500602', glName: 'BROKERAGE ON INVESTMENTS' };
+export const OTHER_CHARGES_GL: InvestmentGlOption = { glCode: '500603', glName: 'OTHER CHARGES ON INVESTMENTS' };
+
+/** Interest receivable (the senior's "Provision A/c") — debited for interest bought from the seller. */
+export const INTEREST_RECEIVABLE_GL: InvestmentGlOption = {
+  glCode: '100603',
+  glName: 'INTEREST RECEIVABLE ON INVESTMENTS (PROVISION)'
+};
+
+/** Bank accounts a purchase can be paid from — these GLs already exist in the chart of accounts. */
+export const SETTLEMENT_BANK_GL_OPTIONS: InvestmentGlOption[] = [
+  { glCode: '100201', glName: 'IDBI BANK' },
+  { glCode: '100202', glName: 'YES BANK' }
+];
+
+/** Every GL the Investment screens can show by name. */
+export const INVESTMENT_GL_LOOKUP: InvestmentGlOption[] = [
+  ...INVESTMENT_GL_OPTIONS,
+  INTEREST_RECEIVABLE_GL,
+  ...SETTLEMENT_BANK_GL_OPTIONS
+];
+
+/** SLR classification on the Script Master, as in the bank's existing CBS ("GOI" = Central Govt). */
+export type SlrType = 'GOI' | 'STATE_GOVT' | 'TREASURY' | 'NON_SLR';
+
+export const SLR_TYPE_OPTIONS: Array<{ value: SlrType; label: string }> = [
+  { value: 'GOI', label: 'GOI' },
+  { value: 'STATE_GOVT', label: 'STATE GOVT' },
+  { value: 'TREASURY', label: 'TREASURY' },
+  { value: 'NON_SLR', label: 'NON SLR' }
+];
+
 export interface ScriptMaster {
+  /** Backend id once the script is saved (absent on the sample rows). */
+  id?: number;
   scriptCode: string;
   scriptName: string;
   instrumentType: InstrumentType;
   isin: string;
   faceValuePerUnit: number;
+  // Fields below follow the bank's existing CBS Script Master; a purchase picks them up instead
+  // of the dealer re-typing them on every deal.
+  slrType?: SlrType;
+  /** Investment GL this script is booked to. */
+  glAccountId?: number;
+  glCode?: string;
+  glName?: string;
+  active?: boolean;
+  /** Interest (coupon) rate % per annum. */
+  couponRate?: number;
+  issueDate?: string;
+  maturityDate?: string;
+  // Issuer details — used for Bond / Mutual Fund scripts.
+  companyName?: string;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  city?: string;
+  pincode?: string;
+  phone?: string;
+  fax?: string;
+  corpCode?: string;
+}
+
+/** Period between two DD-MM-YYYY dates as years / months / days, as shown on the Script Master. */
+export function periodBetween(fromStr?: string, toStr?: string): { years: number; months: number; days: number } {
+  const none = { years: 0, months: 0, days: 0 };
+  if (!fromStr || !toStr) {
+    return none;
+  }
+  const from = parseDDMMYYYY(fromStr);
+  const to = parseDDMMYYYY(toStr);
+  if (isNaN(from.getTime()) || isNaN(to.getTime()) || to < from) {
+    return none;
+  }
+  let years = to.getFullYear() - from.getFullYear();
+  let months = to.getMonth() - from.getMonth();
+  let days = to.getDate() - from.getDate();
+  if (days < 0) {
+    months -= 1;
+    days += new Date(to.getFullYear(), to.getMonth(), 0).getDate();
+  }
+  if (months < 0) {
+    years -= 1;
+    months += 12;
+  }
+  return { years, months, days };
 }
 
 export const SCRIPT_MASTER: ScriptMaster[] = [
-  { scriptCode: 'FD-CUM', scriptName: 'Cumulative Fixed Deposit', instrumentType: 'FD', isin: '', faceValuePerUnit: 1 },
+  {
+    scriptCode: 'FD-CUM',
+    scriptName: 'Cumulative Fixed Deposit',
+    instrumentType: 'FD',
+    isin: '',
+    faceValuePerUnit: 1,
+    slrType: 'NON_SLR',
+    glCode: '100704'
+  },
   {
     scriptCode: 'FD-MIP',
     scriptName: 'Monthly Interest Payout FD',
     instrumentType: 'FD',
     isin: '',
-    faceValuePerUnit: 1
+    faceValuePerUnit: 1,
+    slrType: 'NON_SLR',
+    glCode: '100704'
   },
   {
     scriptCode: 'IN0020230012',
     scriptName: '7.26% GOI 2033',
     instrumentType: 'GOVT_SECURITY',
     isin: 'IN0020230012',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'GOI',
+    glCode: '100701',
+    couponRate: 7.26,
+    issueDate: '15-01-2023',
+    maturityDate: '15-01-2033'
   },
   {
     scriptCode: 'IN0020220089',
     scriptName: '7.10% GOI 2029',
     instrumentType: 'GOVT_SECURITY',
     isin: 'IN0020220089',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'GOI',
+    glCode: '100701',
+    couponRate: 7.1,
+    issueDate: '10-03-2022',
+    maturityDate: '10-03-2029'
+  },
+  {
+    scriptCode: 'IN0020210056',
+    scriptName: '6.79% GOI 2027',
+    instrumentType: 'GOVT_SECURITY',
+    isin: 'IN0020210056',
+    faceValuePerUnit: 100,
+    slrType: 'GOI',
+    glCode: '100701',
+    couponRate: 6.79,
+    issueDate: '05-06-2021',
+    maturityDate: '05-06-2027'
+  },
+  {
+    scriptCode: 'IN0020240034',
+    scriptName: '7.18% GOI 2037',
+    instrumentType: 'GOVT_SECURITY',
+    isin: 'IN0020240034',
+    faceValuePerUnit: 100,
+    slrType: 'GOI',
+    glCode: '100701',
+    couponRate: 7.18,
+    issueDate: '22-04-2024',
+    maturityDate: '22-04-2037'
+  },
+  {
+    scriptCode: 'MH-SDL-2031',
+    scriptName: '8.05% Maharashtra SDL 2031',
+    instrumentType: 'GOVT_SECURITY',
+    isin: '',
+    faceValuePerUnit: 100,
+    slrType: 'STATE_GOVT',
+    glCode: '100702',
+    couponRate: 8.05,
+    issueDate: '15-02-2021',
+    maturityDate: '15-02-2031'
+  },
+  {
+    scriptCode: 'GJ-SDL-2026',
+    scriptName: '7.85% Gujarat SDL 2026',
+    instrumentType: 'GOVT_SECURITY',
+    isin: '',
+    faceValuePerUnit: 100,
+    slrType: 'STATE_GOVT',
+    glCode: '100702',
+    couponRate: 7.85,
+    issueDate: '18-09-2016',
+    maturityDate: '18-09-2026'
   },
   {
     scriptCode: 'TBILL-364D',
     scriptName: '364 Days Treasury Bill',
     instrumentType: 'GOVT_SECURITY',
     isin: '',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'TREASURY',
+    glCode: '100701',
+    couponRate: 0,
+    issueDate: '02-07-2026',
+    maturityDate: '02-07-2027'
+  },
+  {
+    scriptCode: 'TBILL-91D',
+    scriptName: '91 Days Treasury Bill',
+    instrumentType: 'GOVT_SECURITY',
+    isin: '',
+    faceValuePerUnit: 100,
+    slrType: 'TREASURY',
+    glCode: '100701',
+    couponRate: 0,
+    issueDate: '15-05-2026',
+    maturityDate: '13-08-2026'
   },
   {
     scriptCode: 'REC-7.5-2031',
     scriptName: 'REC Ltd Bond 7.50% 2031',
     instrumentType: 'NON_SLR',
     isin: 'INE020B08JN0',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'NON_SLR',
+    glCode: '100703',
+    couponRate: 7.5,
+    issueDate: '11-08-2021',
+    maturityDate: '11-08-2031',
+    companyName: 'REC Limited',
+    city: 'New Delhi'
   },
   {
     scriptCode: 'NABARD-7.35-2030',
     scriptName: 'NABARD Bond 7.35% 2030',
     instrumentType: 'NON_SLR',
     isin: 'INE261F09EU1',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'NON_SLR',
+    glCode: '100703',
+    couponRate: 7.35,
+    issueDate: '20-09-2020',
+    maturityDate: '20-09-2030',
+    companyName: 'NABARD',
+    city: 'Mumbai'
   },
   {
     scriptCode: 'LTF-8.1-2028',
     scriptName: 'L&T Finance NCD 8.10% 2028',
     instrumentType: 'BOND',
     isin: 'INE027E07BR5',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'NON_SLR',
+    glCode: '100703',
+    couponRate: 8.1,
+    companyName: 'L&T Finance Ltd',
+    city: 'Mumbai'
   },
   {
     scriptCode: 'BAF-7.95-2027',
     scriptName: 'Bajaj Finance NCD 7.95% 2027',
     instrumentType: 'BOND',
     isin: 'INE296A07SP0',
-    faceValuePerUnit: 100
+    faceValuePerUnit: 100,
+    slrType: 'NON_SLR',
+    glCode: '100703',
+    couponRate: 7.95,
+    companyName: 'Bajaj Finance Ltd',
+    city: 'Pune'
   },
   {
     scriptCode: 'SBI-OVN',
     scriptName: 'SBI Overnight Fund',
     instrumentType: 'MUTUAL_FUND',
     isin: 'INF200KA1Q40',
-    faceValuePerUnit: 1000
+    faceValuePerUnit: 1000,
+    slrType: 'NON_SLR',
+    glCode: '100705',
+    companyName: 'SBI Mutual Fund',
+    city: 'Mumbai'
   },
   {
     scriptCode: 'HDFC-LIQ',
     scriptName: 'HDFC Liquid Fund',
     instrumentType: 'MUTUAL_FUND',
     isin: 'INF179KA1WR9',
-    faceValuePerUnit: 1000
+    faceValuePerUnit: 1000,
+    slrType: 'NON_SLR',
+    glCode: '100705',
+    companyName: 'HDFC Mutual Fund',
+    city: 'Mumbai'
   },
   {
     scriptCode: 'SBIN',
     scriptName: 'State Bank of India',
     instrumentType: 'SHARE',
     isin: 'INE062A01020',
-    faceValuePerUnit: 1
+    faceValuePerUnit: 1,
+    slrType: 'NON_SLR',
+    glCode: '100706'
   },
   {
     scriptCode: 'HDFCBANK',
     scriptName: 'HDFC Bank Ltd',
     instrumentType: 'SHARE',
     isin: 'INE040A01034',
-    faceValuePerUnit: 1
+    faceValuePerUnit: 1,
+    slrType: 'NON_SLR',
+    glCode: '100706'
   }
 ];
 
@@ -1561,23 +1877,150 @@ export const BROKER_MASTER: BrokerMaster[] = [
 ];
 
 export interface PartyMaster {
+  /** Backend id once the party is saved (absent on the sample rows). */
+  id?: number;
   partyCode: string;
   partyName: string;
   partyType: 'BANK' | 'CORPORATE' | 'GOVT' | 'AMC' | 'EXCHANGE' | 'COOP_SOCIETY';
-  panNo: string;
+  panNo?: string;
+  // Fields below follow the bank's existing CBS Bank / Party Master.
+  bondType?: InstrumentType;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  city?: string;
+  pincode?: string;
+  phone?: string;
+  fax?: string;
+  bankType?: string;
+  /** GL this party is mapped to. */
+  glAccountId?: number;
+  glCode?: string;
+  glName?: string;
+  rbiCode?: string;
+  /** Exposure limit for this party (₹). */
+  limit?: number | null;
+  leiNo?: string;
+  // Counterparty's bank details
+  cpBankName?: string;
+  cpBranchName?: string;
+  cpAccountNo?: string;
+  cpIfsc?: string;
+  /** Absent means ACTIVE. An INACTIVE party is not offered for new deals. */
+  status?: 'ACTIVE' | 'INACTIVE';
 }
 
+/** Sample Bank Type options until the bank confirms its list. */
+export const BANK_TYPE_OPTIONS = [
+  'SCHEDULED COMMERCIAL BANK',
+  'STATE CO-OPERATIVE BANK',
+  'DISTRICT CENTRAL CO-OPERATIVE BANK',
+  'URBAN CO-OPERATIVE BANK',
+  'RBI / GOVERNMENT',
+  'OTHER'
+];
+
 export const PARTY_MASTER: PartyMaster[] = [
-  { partyCode: 'PTY-001', partyName: 'Jila Sahakari Kendriya Bank', partyType: 'BANK', panNo: 'AABCJ1234K' },
-  { partyCode: 'PTY-002', partyName: 'State Cooperative Bank Ltd', partyType: 'BANK', panNo: 'AABCS5678L' },
-  { partyCode: 'PTY-003', partyName: 'RBI - SGL', partyType: 'GOVT', panNo: 'AAACR4849R' },
-  { partyCode: 'PTY-004', partyName: 'REC Limited', partyType: 'CORPORATE', panNo: 'AAACR0641G' },
-  { partyCode: 'PTY-005', partyName: 'NABARD', partyType: 'CORPORATE', panNo: 'AAACN0272B' },
-  { partyCode: 'PTY-006', partyName: 'L&T Finance Ltd', partyType: 'CORPORATE', panNo: 'AAACL0140P' },
-  { partyCode: 'PTY-007', partyName: 'SBI Mutual Fund', partyType: 'AMC', panNo: 'AAATS4325L' },
-  { partyCode: 'PTY-008', partyName: 'HDFC Mutual Fund', partyType: 'AMC', panNo: 'AAATH1234M' },
-  { partyCode: 'PTY-009', partyName: 'NSE/BSE', partyType: 'EXCHANGE', panNo: 'AAACN0028G' },
-  { partyCode: 'PTY-010', partyName: 'District Cooperative Bank', partyType: 'COOP_SOCIETY', panNo: 'AABCD9988K' }
+  {
+    partyCode: 'PTY-001',
+    partyName: 'Jila Sahakari Kendriya Bank',
+    partyType: 'BANK',
+    bondType: 'FD',
+    glCode: '100704',
+    city: 'Vidisha',
+    bankType: 'DISTRICT CENTRAL CO-OPERATIVE BANK',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-002',
+    partyName: 'State Cooperative Bank Ltd',
+    partyType: 'BANK',
+    bondType: 'FD',
+    glCode: '100704',
+    city: 'Bhopal',
+    bankType: 'STATE CO-OPERATIVE BANK',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-003',
+    partyName: 'RBI - SGL',
+    partyType: 'GOVT',
+    bondType: 'GOVT_SECURITY',
+    glCode: '100701',
+    city: 'Mumbai',
+    bankType: 'RBI / GOVERNMENT',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-004',
+    partyName: 'REC Limited',
+    partyType: 'CORPORATE',
+    bondType: 'NON_SLR',
+    glCode: '100703',
+    city: 'New Delhi',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-005',
+    partyName: 'NABARD',
+    partyType: 'CORPORATE',
+    bondType: 'NON_SLR',
+    glCode: '100703',
+    city: 'Mumbai',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-006',
+    partyName: 'L&T Finance Ltd',
+    partyType: 'CORPORATE',
+    bondType: 'BOND',
+    glCode: '100703',
+    city: 'Mumbai',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-007',
+    partyName: 'SBI Mutual Fund',
+    partyType: 'AMC',
+    bondType: 'MUTUAL_FUND',
+    glCode: '100705',
+    city: 'Mumbai',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-008',
+    partyName: 'HDFC Mutual Fund',
+    partyType: 'AMC',
+    bondType: 'MUTUAL_FUND',
+    glCode: '100705',
+    city: 'Mumbai',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-009',
+    partyName: 'NSE/BSE',
+    partyType: 'EXCHANGE',
+    bondType: 'SHARE',
+    glCode: '100706',
+    city: 'Mumbai',
+    bankType: 'OTHER',
+    status: 'ACTIVE'
+  },
+  {
+    partyCode: 'PTY-010',
+    partyName: 'District Cooperative Bank',
+    partyType: 'COOP_SOCIETY',
+    bondType: 'SHARE',
+    glCode: '100706',
+    city: 'Vidisha',
+    bankType: 'DISTRICT CENTRAL CO-OPERATIVE BANK',
+    status: 'ACTIVE'
+  }
 ];
 
 export interface SubTypeMaster {
@@ -1725,13 +2168,15 @@ export const LIEN_REASON_MASTER: LienReason[] = [
 /** Daily Script Master (legacy menu "09") — the day's quoted rate per script, entered/imported
  *  every working day. Distinct from Script Market Detail ("13") which also carries YTM/valuation. */
 export interface DailyScriptRate {
+  /** Backend id once saved. */
+  id?: number;
   rateDate: string;
   scriptCode: string;
   scriptName: string;
-  openRate: number;
+  openRate: number | null;
   closeRate: number;
-  highRate: number;
-  lowRate: number;
+  highRate: number | null;
+  lowRate: number | null;
 }
 
 export const DAILY_SCRIPT_RATES: DailyScriptRate[] = [

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

@@ -106,38 +106,112 @@
     </button>
   </div>
 
-  <!-- PARTY MASTER -->
+  <!-- PARTY MASTER (layout follows the bank's existing CBS Bank / Party Master) -->
   @if (activeTab === 'party') {
     <div class="pg-card">
-      <div class="pos-section-label">Add Bank / Party</div>
+      <div class="pos-section-label">Bank / Party Master — Entry</div>
       <div class="inv-form-grid">
-        <label class="inv-form-field"
-          ><span>Party Name *</span><input type="text" [(ngModel)]="newParty.partyName"
-        /></label>
         <label class="inv-form-field">
-          <span>Party Type *</span>
-          <select [(ngModel)]="newParty.partyType">
+          <span>* Bond Type</span>
+          <select [(ngModel)]="partyForm.bondType">
             <option [ngValue]="undefined">-- Select --</option>
-            <option value="BANK">BANK</option>
-            <option value="CORPORATE">CORPORATE</option>
-            <option value="GOVT">GOVT</option>
-            <option value="AMC">AMC</option>
-            <option value="EXCHANGE">EXCHANGE</option>
-            <option value="COOP_SOCIETY">COOP SOCIETY</option>
+            @for (t of instrumentTypes; track t) {
+              <option [value]="t">{{ t }}</option>
+            }
           </select>
         </label>
-        <label class="inv-form-field"><span>PAN No</span><input type="text" [(ngModel)]="newParty.panNo" /></label>
+        <label class="inv-form-field"
+          ><span>* Party Code</span><input type="text" [value]="partyForm.partyCode || nextPartyCode" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>* Party Name</span><input type="text" [(ngModel)]="partyForm.partyName"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 1 (Building / Flat No.)</span
+          ><input type="text" placeholder="e.g. Shop No. 12, Shanti Complex" [(ngModel)]="partyForm.address1"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 2 (Street / Area)</span
+          ><input type="text" placeholder="e.g. MG Road, Near Bus Stand" [(ngModel)]="partyForm.address2"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 3 (Locality / Landmark)</span
+          ><input type="text" placeholder="e.g. Arera Colony" [(ngModel)]="partyForm.address3"
+        /></label>
+        <label class="inv-form-field"><span>City</span><input type="text" [(ngModel)]="partyForm.city" /></label>
+        <label class="inv-form-field"
+          ><span>Pincode</span><input type="text" maxlength="6" [(ngModel)]="partyForm.pincode"
+        /></label>
+        <label class="inv-form-field"><span>Phone</span><input type="text" [(ngModel)]="partyForm.phone" /></label>
+        <label class="inv-form-field"><span>Fax</span><input type="text" [(ngModel)]="partyForm.fax" /></label>
+        <label class="inv-form-field">
+          <span>Bank Type</span>
+          <select [(ngModel)]="partyForm.bankType">
+            <option [ngValue]="undefined">-- Select --</option>
+            @for (b of bankTypeOptions; track b) {
+              <option [value]="b">{{ b }}</option>
+            }
+          </select>
+        </label>
+        <label class="inv-form-field">
+          <span>* GL A/c No.</span>
+          <select [(ngModel)]="partyForm.glAccountId">
+            <option [ngValue]="undefined">-- Select --</option>
+            @for (g of investmentGlOptions; track g.id) {
+              <option [ngValue]="g.id">{{ g.glCode }} — {{ g.name }}</option>
+            }
+          </select>
+        </label>
+        <label class="inv-form-field"><span>RBI Code</span><input type="text" [(ngModel)]="partyForm.rbiCode" /></label>
+        <label class="inv-form-field"
+          ><span>Limit (₹)</span><input type="number" min="0" [(ngModel)]="partyForm.limit"
+        /></label>
+        <label class="inv-form-field"><span>LEI No</span><input type="text" [(ngModel)]="partyForm.leiNo" /></label>
+        <label class="inv-form-field">
+          <span>Status</span>
+          <select [(ngModel)]="partyForm.status">
+            <option [ngValue]="undefined">ACTIVE</option>
+            <option value="INACTIVE">INACTIVE</option>
+          </select>
+        </label>
+      </div>
+      <div class="pos-section-label">Counterparty's Bank Details</div>
+      <div class="inv-form-grid">
+        <label class="inv-form-field"
+          ><span>Name of Bank</span><input type="text" [(ngModel)]="partyForm.cpBankName"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Name of Branch</span><input type="text" [(ngModel)]="partyForm.cpBranchName"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Account No.</span><input type="text" [(ngModel)]="partyForm.cpAccountNo"
+        /></label>
+        <label class="inv-form-field"
+          ><span>IFSC</span><input type="text" maxlength="11" [(ngModel)]="partyForm.cpIfsc"
+        /></label>
       </div>
       <div class="inv-form-actions">
-        <button type="button" class="pg-btn pg-btn--primary" (click)="addParty()">Save</button>
+        <label class="inv-form-field"
+          ><span>Search Party Code</span><input type="text" placeholder="e.g. PTY-001" [(ngModel)]="partySearchCode"
+        /></label>
+        <button type="button" class="pg-btn pg-btn--primary" [disabled]="saving" (click)="saveParty()">Save</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="searchParty()">Search</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelParty()">Cancel</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="dropParty()">Drop</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelParty()">Exit</button>
       </div>
       <table class="pg-table">
         <thead>
           <tr>
             <th>Party Code</th>
+            <th>Bond Type</th>
             <th>Party Name</th>
-            <th>Type</th>
-            <th>PAN No</th>
+            <th>City</th>
+            <th>Bank Type</th>
+            <th>GL A/c</th>
+            <th class="num">Limit</th>
+            <th>Counterparty Bank / IFSC</th>
+            <th>Status</th>
           </tr>
         </thead>
         <tbody>
@@ -146,9 +220,14 @@
               <td>
                 <span class="pg-chip">{{ p.partyCode }}</span>
               </td>
+              <td>{{ p.bondType || '—' }}</td>
               <td>{{ p.partyName }}</td>
-              <td>{{ p.partyType }}</td>
-              <td>{{ p.panNo }}</td>
+              <td>{{ p.city || '—' }}</td>
+              <td>{{ p.bankType || '—' }}</td>
+              <td>{{ p.glCode ? p.glCode + ' — ' + glName(p.glCode) : '—' }}</td>
+              <td class="num">{{ (p.limit ?? null) !== null ? '₹' + (p.limit | number: '1.0-0') : '—' }}</td>
+              <td>{{ p.cpBankName ? p.cpBankName + (p.cpIfsc ? ' / ' + p.cpIfsc : '') : '—' }}</td>
+              <td>{{ p.status ?? 'ACTIVE' }}</td>
             </tr>
           }
         </tbody>
@@ -156,42 +235,118 @@
     </div>
   }
 
-  <!-- SCRIPT MASTER -->
+  <!-- SCRIPT MASTER (layout follows the bank's existing CBS Script Master) -->
   @if (activeTab === 'script') {
     <div class="pg-card">
-      <div class="pos-section-label">Add Script</div>
+      <div class="pos-section-label">Script Master — Entry</div>
       <div class="inv-form-grid">
-        <label class="inv-form-field"
-          ><span>Script Code</span><input type="text" [(ngModel)]="newScript.scriptCode"
-        /></label>
-        <label class="inv-form-field"
-          ><span>Script Name *</span><input type="text" [(ngModel)]="newScript.scriptName"
-        /></label>
         <label class="inv-form-field">
-          <span>Instrument Type *</span>
-          <select [(ngModel)]="newScript.instrumentType">
+          <span>* Bond Type</span>
+          <select [(ngModel)]="scriptForm.instrumentType" [disabled]="!!scriptForm.scriptCode">
             <option [ngValue]="undefined">-- Select --</option>
             @for (t of instrumentTypes; track t) {
               <option [value]="t">{{ t }}</option>
             }
           </select>
         </label>
-        <label class="inv-form-field"><span>ISIN</span><input type="text" [(ngModel)]="newScript.isin" /></label>
+        <label class="inv-form-field">
+          <span>SLR</span>
+          <select [(ngModel)]="scriptForm.slrType">
+            <option [ngValue]="undefined">-- Select --</option>
+            @for (o of slrTypeOptions; track o.value) {
+              <option [value]="o.value">{{ o.label }}</option>
+            }
+          </select>
+        </label>
         <label class="inv-form-field"
-          ><span>Face Value / Unit</span><input type="number" [(ngModel)]="newScript.faceValuePerUnit"
+          ><span>* Script Code</span><input type="text" [value]="scriptForm.scriptCode || nextScriptCode" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>* Script Desc</span
+          ><input type="text" placeholder="e.g. 7.50%GOI2034" [(ngModel)]="scriptForm.scriptName"
+        /></label>
+        <label class="inv-form-field">
+          <span>* GL A/c No.</span>
+          <select [(ngModel)]="scriptForm.glAccountId">
+            <option [ngValue]="undefined">-- Select --</option>
+            @for (g of investmentGlOptions; track g.id) {
+              <option [ngValue]="g.id">{{ g.glCode }} — {{ g.name }}</option>
+            }
+          </select>
+        </label>
+        <label class="inv-form-field"
+          ><span>{{ scriptIsDebtSecurity ? '* ' : '' }}ISIN</span><input type="text" [(ngModel)]="scriptForm.isin"
+        /></label>
+        <label class="inv-form-field"
+          ><span>{{ scriptIsDebtSecurity ? '* ' : '' }}Int Rate %</span
+          ><input type="number" step="0.01" min="0" [(ngModel)]="scriptForm.couponRate"
+        /></label>
+        <label class="inv-form-field"
+          ><span>{{ scriptIsDebtSecurity ? '* ' : '' }}Issue Date</span
+          ><mifosx-date-ddmmyyyy [(ngModel)]="scriptForm.issueDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>Redum / Mat Date</span
+          ><mifosx-date-ddmmyyyy [(ngModel)]="scriptForm.maturityDate"></mifosx-date-ddmmyyyy
+        ></label>
+        <label class="inv-form-field"
+          ><span>Period (Year)</span><input type="text" [value]="scriptPeriod.years" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Period (Month)</span><input type="text" [value]="scriptPeriod.months" readonly
+        /></label>
+        <label class="inv-form-field"
+          ><span>Period (Days)</span><input type="text" [value]="scriptPeriod.days" readonly
+        /></label>
+      </div>
+      <div class="pos-section-label">Company Details (Bond / Mutual Fund)</div>
+      <div class="inv-form-grid">
+        <label class="inv-form-field"
+          ><span>Company Name</span><input type="text" [(ngModel)]="scriptForm.companyName"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 1 (Building / Flat No.)</span
+          ><input type="text" placeholder="e.g. Shop No. 12, Shanti Complex" [(ngModel)]="scriptForm.address1"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 2 (Street / Area)</span
+          ><input type="text" placeholder="e.g. MG Road, Near Bus Stand" [(ngModel)]="scriptForm.address2"
+        /></label>
+        <label class="inv-form-field"
+          ><span>Address Line 3 (Locality / Landmark)</span
+          ><input type="text" placeholder="e.g. Arera Colony" [(ngModel)]="scriptForm.address3"
+        /></label>
+        <label class="inv-form-field"><span>City</span><input type="text" [(ngModel)]="scriptForm.city" /></label>
+        <label class="inv-form-field"
+          ><span>Pincode</span><input type="text" maxlength="6" [(ngModel)]="scriptForm.pincode"
+        /></label>
+        <label class="inv-form-field"><span>Phone</span><input type="text" [(ngModel)]="scriptForm.phone" /></label>
+        <label class="inv-form-field"><span>Fax</span><input type="text" [(ngModel)]="scriptForm.fax" /></label>
+        <label class="inv-form-field"
+          ><span>Corp. Code</span><input type="text" [(ngModel)]="scriptForm.corpCode"
         /></label>
       </div>
       <div class="inv-form-actions">
-        <button type="button" class="pg-btn pg-btn--primary" (click)="addScript()">Save</button>
+        <label class="inv-form-field"
+          ><span>Search Script Code</span><input type="text" placeholder="e.g. G00001" [(ngModel)]="scriptSearchCode"
+        /></label>
+        <button type="button" class="pg-btn pg-btn--primary" [disabled]="saving" (click)="saveScript()">Save</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="searchScript()">Search</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelScript()">Cancel</button>
+        <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelScript()">Exit</button>
       </div>
       <table class="pg-table">
         <thead>
           <tr>
             <th>Script Code</th>
-            <th>Script Name</th>
-            <th>Instrument</th>
+            <th>Bond Type</th>
+            <th>SLR</th>
+            <th>Script Desc</th>
+            <th>GL A/c</th>
             <th>ISIN</th>
-            <th class="num">Face Value/Unit</th>
+            <th class="num">Int Rate %</th>
+            <th>Issue Date</th>
+            <th>Maturity</th>
           </tr>
         </thead>
         <tbody>
@@ -200,10 +355,14 @@
               <td>
                 <span class="pg-chip">{{ s.scriptCode }}</span>
               </td>
-              <td>{{ s.scriptName }}</td>
               <td>{{ s.instrumentType }}</td>
+              <td>{{ s.slrType || '—' }}</td>
+              <td>{{ s.scriptName }}</td>
+              <td>{{ s.glCode || '—' }}</td>
               <td>{{ s.isin || '—' }}</td>
-              <td class="num">{{ s.faceValuePerUnit }}</td>
+              <td class="num">{{ s.couponRate ?? '—' }}</td>
+              <td>{{ s.issueDate || '—' }}</td>
+              <td>{{ s.maturityDate || '—' }}</td>
             </tr>
           }
         </tbody>
@@ -386,10 +545,11 @@
             <th class="num">High</th>
             <th class="num">Low</th>
             <th class="num">Close</th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
-          @for (r of dailyScriptRates; track r.rateDate + r.scriptCode) {
+          @for (r of dailyScriptRates; track r.id ?? r.rateDate + r.scriptCode) {
             <tr>
               <td>{{ r.rateDate }}</td>
               <td>
@@ -400,6 +560,13 @@
               <td class="num">{{ r.highRate | number: '1.2-2' }}</td>
               <td class="num">{{ r.lowRate | number: '1.2-2' }}</td>
               <td class="num">{{ r.closeRate | number: '1.2-2' }}</td>
+              <td>
+                <button type="button" class="pg-btn pg-btn--ghost" (click)="dropDailyRate(r)">Drop</button>
+              </td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="8" class="pg-empty">No rates entered yet.</td>
             </tr>
           }
         </tbody>

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

@@ -6,20 +6,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component } from '@angular/core';
+import { Component, OnInit, inject } 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,
-  PARTY_MASTER,
   SUBTYPE_MASTER,
   CONTROL_PARAMETERS,
   MUTUAL_FUND_PRODUCTS,
   SGL_BANK_MASTER,
   SCRIPT_MARKET_DETAIL,
-  DAILY_SCRIPT_RATES,
   LIEN_REASON_MASTER,
   ScriptMaster,
   BrokerMaster,
@@ -31,9 +28,14 @@ import {
   ScriptMarketDetail,
   DailyScriptRate,
   LienReason,
-  InstrumentType
+  InstrumentType,
+  BANK_TYPE_OPTIONS,
+  SLR_TYPE_OPTIONS,
+  INVESTMENT_GL_LOOKUP,
+  periodBetween
 } from '../investment-data';
 import { exportWorkbook, ExportSheetSpec } from '../investment-export';
+import { InvestmentGlAccount, InvestmentService, apiErrorMessage, toDailyScriptRate } from '../investment.service';
 
 type MasterTab =
   | 'party'
@@ -65,18 +67,19 @@ type MasterTab =
     DateDdmmyyyyPickerComponent
   ]
 })
-export class InvestmentMastersComponent {
+export class InvestmentMastersComponent implements OnInit {
   activeTab: MasterTab = 'party';
 
-  scripts: ScriptMaster[] = [...SCRIPT_MASTER];
+  scripts: ScriptMaster[] = [];
   brokers: BrokerMaster[] = [...BROKER_MASTER];
-  parties: PartyMaster[] = [...PARTY_MASTER];
+  parties: PartyMaster[] = [];
   subTypes: SubTypeMaster[] = [...SUBTYPE_MASTER];
   controlParams: ControlParameter[] = [...CONTROL_PARAMETERS];
   mfProducts: MutualFundProductMaster[] = [...MUTUAL_FUND_PRODUCTS];
   sglBanks: SglBankMaster[] = [...SGL_BANK_MASTER];
   marketDetails: ScriptMarketDetail[] = [...SCRIPT_MARKET_DETAIL];
-  dailyScriptRates: DailyScriptRate[] = [...DAILY_SCRIPT_RATES];
+  /** Loaded from the backend (Daily Script Master) in ngOnInit. */
+  dailyScriptRates: DailyScriptRate[] = [];
   lienReasons: LienReason[] = [...LIEN_REASON_MASTER];
 
   readonly instrumentTypes: InstrumentType[] = [
@@ -106,8 +109,19 @@ export class InvestmentMastersComponent {
   toastVisible = false;
   private toastTimer: ReturnType<typeof setTimeout> | undefined;
 
-  newParty: Partial<PartyMaster> = {};
-  newScript: Partial<ScriptMaster> = {};
+  // Bank / Party Master and Script Master follow the bank's existing CBS screens (one entry form
+  // with Save / Search / Cancel / Drop / Exit) and are stored in the backend through
+  // InvestmentService; the other master tabs are still sample data.
+  private readonly investmentService = inject(InvestmentService);
+  partyForm: Partial<PartyMaster> = {};
+  partySearchCode = '';
+  scriptForm: Partial<ScriptMaster> = {};
+  scriptSearchCode = '';
+  saving = false;
+  readonly bankTypeOptions = BANK_TYPE_OPTIONS;
+  readonly slrTypeOptions = SLR_TYPE_OPTIONS;
+  /** Enabled ASSET detail GLs from the chart of accounts. */
+  investmentGlOptions: InvestmentGlAccount[] = [];
   newSubType: Partial<SubTypeMaster> = {};
   newBroker: Partial<BrokerMaster> = {};
   newControlParam: Partial<ControlParameter> = {};
@@ -116,43 +130,217 @@ export class InvestmentMastersComponent {
   newSglBank: Partial<SglBankMaster> = {};
   newDailyRate: Partial<DailyScriptRate> = {};
 
+  ngOnInit(): void {
+    this.loadDailyRates();
+    this.investmentService.getAssetGlAccounts().subscribe({
+      next: (gls) => (this.investmentGlOptions = gls),
+      error: (err) => this.toast(`Could not load GL accounts: ${apiErrorMessage(err)}`)
+    });
+    this.reloadMasters();
+  }
+
   setTab(tab: MasterTab): void {
     this.activeTab = tab;
   }
 
-  addParty(): void {
-    if (!this.newParty.partyName || !this.newParty.partyType) {
-      this.toast('Enter Party Name and Type.');
-      return;
-    }
-    this.parties = [
-      {
-        partyCode: `PTY-${String(this.parties.length + 1).padStart(3, '0')}`,
-        panNo: '',
-        ...this.newParty
-      } as PartyMaster,
-      ...this.parties
-    ];
-    this.newParty = {};
-    this.toast('Party/Bank master added.');
+  /** Re-reads both masters from the backend (also refreshes the lists the Purchase screen uses). */
+  private reloadMasters(): void {
+    this.investmentService.syncSharedMasters().subscribe({
+      next: ({ parties, scripts }) => {
+        this.parties = parties;
+        this.scripts = scripts;
+      },
+      error: (err) => this.toast(`Could not load masters: ${apiErrorMessage(err)}`)
+    });
   }
 
-  addScript(): void {
-    if (!this.newScript.scriptName || !this.newScript.instrumentType) {
-      this.toast('Enter Script Name and Instrument Type.');
+  glName(glCode?: string): string {
+    return (
+      this.investmentGlOptions.find((g) => g.glCode === glCode)?.name ??
+      INVESTMENT_GL_LOOKUP.find((g) => g.glCode === glCode)?.glName ??
+      ''
+    );
+  }
+
+  // -------------------- Bank / Party Master --------------------
+  /** Preview of the code the backend will assign; the saved code always comes from the backend. */
+  get nextPartyCode(): string {
+    const nums = this.parties.map((p) => parseInt(p.partyCode.replace(/\D/g, ''), 10)).filter((n) => !isNaN(n));
+    return `PTY-${String((nums.length ? Math.max(...nums) : 0) + 1).padStart(3, '0')}`;
+  }
+
+  saveParty(): void {
+    const f = this.partyForm;
+    if (!f.bondType || !f.partyName || !f.glAccountId) {
+      this.toast('Enter Bond Type, Party Name and GL A/c No.');
       return;
     }
-    this.scripts = [
-      {
-        scriptCode: this.newScript.scriptCode || `SCR-${this.scripts.length + 1}`,
-        isin: '',
-        faceValuePerUnit: 100,
-        ...this.newScript
-      } as ScriptMaster,
-      ...this.scripts
-    ];
-    this.newScript = {};
-    this.toast('Script master added.');
+    const body = {
+      bondType: f.bondType,
+      partyName: f.partyName,
+      address1: f.address1 ?? '',
+      address2: f.address2 ?? '',
+      address3: f.address3 ?? '',
+      city: f.city ?? '',
+      pincode: f.pincode ?? '',
+      phone: f.phone ?? '',
+      fax: f.fax ?? '',
+      bankType: f.bankType ?? '',
+      glAccountId: Number(f.glAccountId),
+      rbiCode: f.rbiCode ?? '',
+      limit: f.limit ?? null,
+      leiNo: f.leiNo ?? '',
+      cpBankName: f.cpBankName ?? '',
+      cpBranchName: f.cpBranchName ?? '',
+      cpAccountNo: f.cpAccountNo ?? '',
+      cpIfsc: f.cpIfsc ?? '',
+      active: f.status !== 'INACTIVE',
+      locale: 'en'
+    };
+    const request = f.id ? this.investmentService.updateParty(f.id, body) : this.investmentService.createParty(body);
+    this.saving = true;
+    request.subscribe({
+      next: (res) => {
+        this.saving = false;
+        this.toast(`Party ${res.resourceIdentifier ?? f.partyCode} ${f.id ? 'updated' : 'saved'}.`);
+        this.partyForm = {};
+        this.reloadMasters();
+      },
+      error: (err) => {
+        this.saving = false;
+        this.toast(apiErrorMessage(err));
+      }
+    });
+  }
+
+  searchParty(): void {
+    const p = this.parties.find((x) => x.partyCode.toUpperCase() === this.partySearchCode.trim().toUpperCase());
+    if (!p) {
+      this.toast(`Party Code ${this.partySearchCode} not found.`);
+      return;
+    }
+    this.partyForm = { ...p };
+    this.toast(`Party ${p.partyCode} loaded.`);
+  }
+
+  cancelParty(): void {
+    this.partyForm = {};
+    this.partySearchCode = '';
+  }
+
+  dropParty(): void {
+    const f = this.partyForm;
+    if (!f.id) {
+      this.toast('Search a saved party first, then Drop.');
+      return;
+    }
+    this.investmentService.deleteParty(f.id).subscribe({
+      next: () => {
+        this.toast(`Party ${f.partyCode} dropped.`);
+        this.partyForm = {};
+        this.reloadMasters();
+      },
+      error: (err) => this.toast(apiErrorMessage(err))
+    });
+  }
+
+  // -------------------- Script Master --------------------
+  /** Coupon / maturity terms only apply to debt securities. */
+  get scriptIsDebtSecurity(): boolean {
+    return [
+      'GOVT_SECURITY',
+      'NON_SLR',
+      'BOND'
+    ].includes(this.scriptForm.instrumentType ?? '');
+  }
+
+  /** Preview of the code the backend will assign — a type letter + running number, e.g. G00001. */
+  get nextScriptCode(): string {
+    const prefixByType: Record<InstrumentType, string> = {
+      GOVT_SECURITY: 'G',
+      NON_SLR: 'N',
+      BOND: 'B',
+      MUTUAL_FUND: 'M',
+      FD: 'F',
+      SHARE: 'S'
+    };
+    const type = this.scriptForm.instrumentType;
+    if (!type) {
+      return '';
+    }
+    const prefix = prefixByType[type];
+    const pattern = new RegExp(`^${prefix}(\\d{5})$`);
+    const nums = this.scripts
+      .map((s) => pattern.exec(s.scriptCode)?.[1])
+      .filter((n): n is string => !!n)
+      .map((n) => parseInt(n, 10));
+    return `${prefix}${String((nums.length ? Math.max(...nums) : 0) + 1).padStart(5, '0')}`;
+  }
+
+  get scriptPeriod(): { years: number; months: number; days: number } {
+    return periodBetween(this.scriptForm.issueDate, this.scriptForm.maturityDate);
+  }
+
+  saveScript(): void {
+    const f = this.scriptForm;
+    if (!f.instrumentType || !f.scriptName || !f.glAccountId) {
+      this.toast('Enter Bond Type, Script Desc and GL A/c No.');
+      return;
+    }
+    if (this.scriptIsDebtSecurity && (!f.isin || f.couponRate == null || !f.issueDate)) {
+      this.toast('Enter ISIN, Int Rate and Issue Date for this security.');
+      return;
+    }
+    const body = {
+      bondType: f.instrumentType,
+      slrType: f.slrType ?? '',
+      scriptDesc: f.scriptName,
+      glAccountId: Number(f.glAccountId),
+      isin: f.isin ?? '',
+      intRate: f.couponRate ?? null,
+      issueDate: f.issueDate ?? '',
+      maturityDate: f.maturityDate ?? '',
+      companyName: f.companyName ?? '',
+      address1: f.address1 ?? '',
+      address2: f.address2 ?? '',
+      address3: f.address3 ?? '',
+      city: f.city ?? '',
+      pincode: f.pincode ?? '',
+      phone: f.phone ?? '',
+      fax: f.fax ?? '',
+      corpCode: f.corpCode ?? '',
+      dateFormat: 'dd-MM-yyyy',
+      locale: 'en'
+    };
+    const request = f.id ? this.investmentService.updateScript(f.id, body) : this.investmentService.createScript(body);
+    this.saving = true;
+    request.subscribe({
+      next: (res) => {
+        this.saving = false;
+        this.toast(`Script ${res.resourceIdentifier ?? f.scriptCode} ${f.id ? 'updated' : 'saved'}.`);
+        this.scriptForm = {};
+        this.reloadMasters();
+      },
+      error: (err) => {
+        this.saving = false;
+        this.toast(apiErrorMessage(err));
+      }
+    });
+  }
+
+  searchScript(): void {
+    const s = this.scripts.find((x) => x.scriptCode.toUpperCase() === this.scriptSearchCode.trim().toUpperCase());
+    if (!s) {
+      this.toast(`Script Code ${this.scriptSearchCode} not found.`);
+      return;
+    }
+    this.scriptForm = { ...s };
+    this.toast(`Script ${s.scriptCode} loaded.`);
+  }
+
+  cancelScript(): void {
+    this.scriptForm = {};
+    this.scriptSearchCode = '';
   }
 
   addSubType(): void {
@@ -248,24 +436,56 @@ export class InvestmentMastersComponent {
     this.toast('SGL Bank master added.');
   }
 
+  private loadDailyRates(): void {
+    this.investmentService.getDailyRates().subscribe({
+      next: (rows) => (this.dailyScriptRates = rows.map(toDailyScriptRate)),
+      error: (err) => this.toast(`Could not load daily script rates: ${apiErrorMessage(err)}`)
+    });
+  }
+
   addDailyRate(): void {
-    if (!this.newDailyRate.scriptCode || !this.newDailyRate.rateDate || this.newDailyRate.closeRate == null) {
+    const r = this.newDailyRate;
+    if (!r.scriptCode || !r.rateDate || r.closeRate == null) {
       this.toast('Enter Rate Date, Script Code and Close Rate.');
       return;
     }
-    const script = this.scripts.find((s) => s.scriptCode === this.newDailyRate.scriptCode);
-    this.dailyScriptRates = [
-      {
-        scriptName: script?.scriptName || '',
-        openRate: this.newDailyRate.closeRate,
-        highRate: this.newDailyRate.closeRate,
-        lowRate: this.newDailyRate.closeRate,
-        ...this.newDailyRate
-      } as DailyScriptRate,
-      ...this.dailyScriptRates
-    ];
-    this.newDailyRate = {};
-    this.toast('Daily script rate added.');
+    const script = this.scripts.find((s) => s.scriptCode === r.scriptCode);
+    if (!script?.id) {
+      this.toast(`Script ${r.scriptCode} is not saved in Script Master.`);
+      return;
+    }
+    const body = {
+      scriptId: script.id,
+      rateDate: r.rateDate,
+      closeRate: r.closeRate,
+      ...(r.openRate != null ? { openRate: r.openRate } : {}),
+      ...(r.highRate != null ? { highRate: r.highRate } : {}),
+      ...(r.lowRate != null ? { lowRate: r.lowRate } : {}),
+      dateFormat: 'dd-MM-yyyy',
+      locale: 'en'
+    };
+    this.investmentService.createDailyRate(body).subscribe({
+      next: () => {
+        this.toast(`Rate for ${r.scriptCode} on ${r.rateDate} saved.`);
+        this.newDailyRate = {};
+        this.loadDailyRates();
+      },
+      error: (err) => this.toast(apiErrorMessage(err))
+    });
+  }
+
+  /** A wrong rate is corrected by dropping it and entering it again. */
+  dropDailyRate(r: DailyScriptRate): void {
+    if (!r.id) {
+      return;
+    }
+    this.investmentService.deleteDailyRate(r.id).subscribe({
+      next: () => {
+        this.toast(`Rate for ${r.scriptCode} on ${r.rateDate} dropped.`);
+        this.loadDailyRates();
+      },
+      error: (err) => this.toast(apiErrorMessage(err))
+    });
   }
 
   // -------------------- Export to Excel --------------------
@@ -279,46 +499,121 @@ export class InvestmentMastersComponent {
         return one(
           [
             'Party Code',
+            'Bond Type',
             'Party Name',
-            'Type',
-            'PAN No'
+            'Address',
+            'City',
+            'Pincode',
+            'Phone',
+            'Fax',
+            'Bank Type',
+            'GL A/c No',
+            'RBI Code',
+            'Limit',
+            'LEI No',
+            'Counterparty Bank',
+            'Branch',
+            'Account No',
+            'IFSC',
+            'Status'
           ],
           [
             12,
+            14,
             30,
-            16,
-            14
+            36,
+            14,
+            10,
+            14,
+            14,
+            24,
+            12,
+            12,
+            14,
+            22,
+            24,
+            20,
+            18,
+            14,
+            10
           ],
           this.parties.map((p) => [
             p.partyCode,
+            p.bondType ?? '',
             p.partyName,
-            p.partyType,
-            p.panNo
+            [
+              p.address1,
+              p.address2,
+              p.address3
+            ]
+              .filter((x) => !!x)
+              .join(', '),
+            p.city ?? '',
+            p.pincode ?? '',
+            p.phone ?? '',
+            p.fax ?? '',
+            p.bankType ?? '',
+            p.glCode ?? '',
+            p.rbiCode ?? '',
+            p.limit ?? null,
+            p.leiNo ?? '',
+            p.cpBankName ?? '',
+            p.cpBranchName ?? '',
+            p.cpAccountNo ?? '',
+            p.cpIfsc ?? '',
+            p.status ?? 'ACTIVE'
           ])
         );
       case 'script':
         return one(
           [
             'Script Code',
-            'Script Name',
-            'Instrument',
+            'Bond Type',
+            'SLR',
+            'Script Desc',
+            'GL A/c No',
             'ISIN',
-            'Face Value/Unit'
+            'Int Rate %',
+            'Issue Date',
+            'Maturity Date',
+            'Period (Y/M/D)',
+            'Face Value/Unit',
+            'Company Name',
+            'Corp Code'
           ],
           [
+            14,
             16,
+            12,
             30,
+            12,
             16,
-            16,
-            16
+            10,
+            14,
+            14,
+            14,
+            14,
+            24,
+            12
           ],
-          this.scripts.map((s) => [
-            s.scriptCode,
-            s.scriptName,
-            s.instrumentType,
-            s.isin,
-            s.faceValuePerUnit
-          ])
+          this.scripts.map((s) => {
+            const p = periodBetween(s.issueDate, s.maturityDate);
+            return [
+              s.scriptCode,
+              s.instrumentType,
+              s.slrType ?? '',
+              s.scriptName,
+              s.glCode ?? '',
+              s.isin,
+              s.couponRate ?? null,
+              s.issueDate ?? '',
+              s.maturityDate ?? '',
+              s.issueDate && s.maturityDate ? `${p.years}/${p.months}/${p.days}` : '',
+              s.faceValuePerUnit,
+              s.companyName ?? '',
+              s.corpCode ?? ''
+            ];
+          })
         );
       case 'subtype':
         return one(

src/app/investment/investment.service.ts

@@ -0,0 +1,394 @@
+/**
+ * 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, HttpErrorResponse } from '@angular/common/http';
+import { Observable, forkJoin } from 'rxjs';
+import { map, tap } from 'rxjs/operators';
+import {
+  DailyScriptRate,
+  InstrumentType,
+  InvestmentHolding,
+  PARTY_MASTER,
+  PartyMaster,
+  SCRIPT_MASTER,
+  ScriptMaster,
+  SlrType
+} from './investment-data';
+
+/** Investment party as returned by /investment/parties. */
+export interface InvestmentPartyDto {
+  id: number;
+  partyCode: string;
+  bondType: InstrumentType;
+  partyName: string;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  city?: string;
+  pincode?: string;
+  phone?: string;
+  fax?: string;
+  bankType?: string;
+  glAccountId: number;
+  glCode: string;
+  glName: string;
+  rbiCode?: string;
+  limit?: number;
+  leiNo?: string;
+  cpBankName?: string;
+  cpBranchName?: string;
+  cpAccountNo?: string;
+  cpIfsc?: string;
+  active: boolean;
+}
+
+/** Investment script as returned by /investment/scripts (dates are DD-MM-YYYY). */
+export interface InvestmentScriptDto {
+  id: number;
+  scriptCode: string;
+  bondType: InstrumentType;
+  slrType?: SlrType;
+  scriptDesc: string;
+  glAccountId: number;
+  glCode: string;
+  glName: string;
+  isin?: string;
+  faceValuePerUnit: number;
+  intRate?: number;
+  issueDate?: string;
+  maturityDate?: string;
+  companyName?: string;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  city?: string;
+  pincode?: string;
+  phone?: string;
+  fax?: string;
+  corpCode?: string;
+  active: boolean;
+}
+
+/** Purchase entry (holding) as returned by /investment/purchases (dates are DD-MM-YYYY). */
+export interface InvestmentPurchaseDto {
+  id: number;
+  dealNo: string;
+  certNo: string;
+  bondType: InstrumentType;
+  scriptId: number;
+  scriptCode: string;
+  scriptDesc: string;
+  isin?: string;
+  partyId: number;
+  partyCode: string;
+  partyName: string;
+  dealDate: string;
+  dealTime?: string;
+  settlementType: string;
+  settlementDate: string;
+  faceValue: number;
+  purchaseRate: number;
+  units: number;
+  balanceUnits: number;
+  brokerage?: number;
+  stampDuty?: number;
+  otherCharges?: number;
+  bookValue: number;
+  premiumDiscount?: number;
+  intRate?: number;
+  issueDate?: string;
+  maturityDate?: string;
+  lastIntDate?: string;
+  accruedDays?: number;
+  accruedInterest?: number;
+  settlementAmount: number;
+  ytm?: number;
+  category: string;
+  subType?: string;
+  investmentGlAccountId: number;
+  investmentGlCode: string;
+  investmentGlName: string;
+  crGlAccountId: number;
+  crGlCode: string;
+  crGlName: string;
+  otherDetails?: string;
+  status: string;
+}
+
+export interface InvestmentGlAccount {
+  id: number;
+  glCode: string;
+  name: string;
+}
+
+/**
+ * Backend calls for the Investment masters (Bank / Party Master and Script Master). Results are also copied into the
+ * shared PARTY_MASTER / SCRIPT_MASTER lists so screens that still read those lists (Purchase Entry) offer the saved
+ * masters.
+ */
+@Injectable({ providedIn: 'root' })
+export class InvestmentService {
+  private http = inject(HttpClient);
+
+  // -------------------- Bank / Party Master --------------------
+  getParties(): Observable<InvestmentPartyDto[]> {
+    return this.http.get<InvestmentPartyDto[]>('/investment/parties');
+  }
+
+  createParty(body: object): Observable<{ resourceId: number; resourceIdentifier: string }> {
+    return this.http.post<{ resourceId: number; resourceIdentifier: string }>('/investment/parties', body);
+  }
+
+  updateParty(id: number, body: object): Observable<{ resourceId: number; resourceIdentifier: string }> {
+    return this.http.put<{ resourceId: number; resourceIdentifier: string }>(`/investment/parties/${id}`, body);
+  }
+
+  deleteParty(id: number): Observable<unknown> {
+    return this.http.delete(`/investment/parties/${id}`);
+  }
+
+  // -------------------- Script Master --------------------
+  getScripts(): Observable<InvestmentScriptDto[]> {
+    return this.http.get<InvestmentScriptDto[]>('/investment/scripts');
+  }
+
+  createScript(body: object): Observable<{ resourceId: number; resourceIdentifier: string }> {
+    return this.http.post<{ resourceId: number; resourceIdentifier: string }>('/investment/scripts', body);
+  }
+
+  updateScript(id: number, body: object): Observable<{ resourceId: number; resourceIdentifier: string }> {
+    return this.http.put<{ resourceId: number; resourceIdentifier: string }>(`/investment/scripts/${id}`, body);
+  }
+
+  // -------------------- Purchase Entry --------------------
+  getPurchases(): Observable<InvestmentPurchaseDto[]> {
+    return this.http.get<InvestmentPurchaseDto[]>('/investment/purchases');
+  }
+
+  /** Coupon and 31 Mar / 30 Sep provision lines of a holding up to maturity (calculated, not posted). */
+  getInterestSchedule(purchaseId: number, asOnDate?: string): Observable<InvestmentInterestScheduleDto> {
+    const params = asOnDate ? `?asOnDate=${encodeURIComponent(asOnDate)}` : '';
+    return this.http.get<InvestmentInterestScheduleDto>(
+      `/investment/purchases/${purchaseId}/interest-schedule${params}`
+    );
+  }
+
+  // -------------------- Daily Script Master --------------------
+  getDailyRates(scriptId?: number): Observable<InvestmentDailyRateDto[]> {
+    const params = scriptId ? `?scriptId=${scriptId}` : '';
+    return this.http.get<InvestmentDailyRateDto[]>(`/investment/daily-rates${params}`);
+  }
+
+  /** Newest Daily Script Master rate of a script on or before a date; null when none has been entered. */
+  getLatestDailyRate(scriptId: number, onDate: string): Observable<InvestmentDailyRateDto | null> {
+    return this.http.get<InvestmentDailyRateDto | null>(
+      `/investment/daily-rates/latest?scriptId=${scriptId}&onDate=${encodeURIComponent(onDate)}`
+    );
+  }
+
+  createDailyRate(body: object): Observable<{ resourceId: number }> {
+    return this.http.post<{ resourceId: number }>('/investment/daily-rates', body);
+  }
+
+  deleteDailyRate(rateId: number): Observable<unknown> {
+    return this.http.delete(`/investment/daily-rates/${rateId}`);
+  }
+
+  createPurchase(body: object): Observable<{ resourceId: number; resourceIdentifier: string }> {
+    return this.http.post<{ resourceId: number; resourceIdentifier: string }>('/investment/purchases', body);
+  }
+
+  deletePurchase(id: number): Observable<unknown> {
+    return this.http.delete(`/investment/purchases/${id}`);
+  }
+
+  // -------------------- GL accounts --------------------
+  /** Enabled ASSET detail GLs — the only kind an investment party / script can be booked to. */
+  getAssetGlAccounts(): Observable<InvestmentGlAccount[]> {
+    return this.http
+      .get<
+        Array<{ id: number; glCode: string; name: string; disabled: boolean }>
+      >('/glaccounts', { params: { type: '1', usage: '1', disabled: 'false' } })
+      .pipe(
+        map((list) =>
+          list
+            .map((g) => ({ id: g.id, glCode: g.glCode, name: g.name }))
+            .sort((a, b) => a.glCode.localeCompare(b.glCode))
+        )
+      );
+  }
+
+  /** Loads both masters from the backend and refreshes the shared lists other screens read. */
+  syncSharedMasters(): Observable<{ parties: PartyMaster[]; scripts: ScriptMaster[] }> {
+    return forkJoin({ parties: this.getParties(), scripts: this.getScripts() }).pipe(
+      map(({ parties, scripts }) => ({ parties: parties.map(toPartyMaster), scripts: scripts.map(toScriptMaster) })),
+      tap(({ parties, scripts }) => {
+        PARTY_MASTER.splice(0, PARTY_MASTER.length, ...parties);
+        SCRIPT_MASTER.splice(0, SCRIPT_MASTER.length, ...scripts);
+      })
+    );
+  }
+}
+
+export function toPartyMaster(p: InvestmentPartyDto): PartyMaster {
+  return {
+    id: p.id,
+    partyCode: p.partyCode,
+    partyName: p.partyName,
+    partyType: 'BANK',
+    bondType: p.bondType,
+    address1: p.address1,
+    address2: p.address2,
+    address3: p.address3,
+    city: p.city,
+    pincode: p.pincode,
+    phone: p.phone,
+    fax: p.fax,
+    bankType: p.bankType,
+    glAccountId: p.glAccountId,
+    glCode: p.glCode,
+    glName: p.glName,
+    rbiCode: p.rbiCode,
+    limit: p.limit ?? null,
+    leiNo: p.leiNo,
+    cpBankName: p.cpBankName,
+    cpBranchName: p.cpBranchName,
+    cpAccountNo: p.cpAccountNo,
+    cpIfsc: p.cpIfsc,
+    status: p.active ? 'ACTIVE' : 'INACTIVE'
+  };
+}
+
+export function toScriptMaster(s: InvestmentScriptDto): ScriptMaster {
+  return {
+    id: s.id,
+    scriptCode: s.scriptCode,
+    scriptName: s.scriptDesc,
+    instrumentType: s.bondType,
+    isin: s.isin ?? '',
+    faceValuePerUnit: s.faceValuePerUnit,
+    slrType: s.slrType,
+    glAccountId: s.glAccountId,
+    glCode: s.glCode,
+    glName: s.glName,
+    couponRate: s.intRate,
+    issueDate: s.issueDate,
+    maturityDate: s.maturityDate,
+    companyName: s.companyName,
+    address1: s.address1,
+    address2: s.address2,
+    address3: s.address3,
+    city: s.city,
+    pincode: s.pincode,
+    phone: s.phone,
+    fax: s.fax,
+    corpCode: s.corpCode,
+    active: s.active
+  };
+}
+
+/** A saved purchase as a row of the Holdings register. */
+export function toHolding(p: InvestmentPurchaseDto): InvestmentHolding {
+  return {
+    id: p.id,
+    dealNo: p.dealNo,
+    certNo: p.certNo,
+    instrumentType: p.bondType,
+    scriptCode: p.scriptCode,
+    scriptName: p.scriptDesc,
+    party: p.partyName,
+    partyCode: p.partyCode,
+    subType: p.subType ?? '',
+    faceValue: p.faceValue,
+    purchaseRate: p.purchaseRate,
+    units: p.balanceUnits,
+    purchaseDate: p.settlementDate,
+    maturityDate: p.maturityDate || p.dealDate,
+    interestRate: p.intRate ?? 0,
+    interestFreq: p.bondType === 'MUTUAL_FUND' ? 'CUMULATIVE' : 'HALF_YEARLY',
+    glCode: p.investmentGlCode,
+    glName: p.investmentGlName,
+    crToAc: p.crGlCode,
+    brokerCode: '',
+    status: 'ACTIVE',
+    category: p.category,
+    bookValue: p.bookValue,
+    settlementAmount: p.settlementAmount
+  };
+}
+
+/** One line of a holding's interest schedule (see InvestmentInterestScheduleData in the backend). */
+export interface InvestmentInterestRowDto {
+  type: 'COUPON' | 'PROVISION';
+  intDate: string;
+  fromDate: string;
+  toDate: string;
+  days: number;
+  grossInterest: number;
+  alreadyBooked: number;
+  amount: number;
+  due: boolean;
+}
+
+export interface InvestmentInterestScheduleDto {
+  purchaseId: number;
+  dealNo: string;
+  certNo: string;
+  scriptCode: string;
+  scriptDesc: string;
+  faceValue: number;
+  unitValue: number;
+  balanceUnits: number;
+  purchaseRate: number;
+  bookValue: number;
+  intRate: number;
+  dealDate: string;
+  lastIntDate: string;
+  maturityDate: string;
+  purchasedAccruedInterest: number;
+  couponPerHalfYear: number;
+  asOnDate: string;
+  interestGlCode: string;
+  interestGlName: string;
+  rows: InvestmentInterestRowDto[];
+}
+
+/** A Daily Script Master row (see InvestmentDailyRateData in the backend). */
+export interface InvestmentDailyRateDto {
+  id: number;
+  scriptId: number;
+  scriptCode: string;
+  scriptDesc: string;
+  bondType: string;
+  rateDate: string;
+  openRate: number | null;
+  highRate: number | null;
+  lowRate: number | null;
+  closeRate: number;
+}
+
+export function toDailyScriptRate(d: InvestmentDailyRateDto): DailyScriptRate {
+  return {
+    id: d.id,
+    rateDate: d.rateDate,
+    scriptCode: d.scriptCode,
+    scriptName: d.scriptDesc,
+    openRate: d.openRate,
+    closeRate: d.closeRate,
+    highRate: d.highRate,
+    lowRate: d.lowRate
+  };
+}
+
+/** The first validation / domain-rule message from a Fineract error response, for a toast. */
+export function apiErrorMessage(err: unknown): string {
+  const e = err as HttpErrorResponse;
+  const body = e?.error;
+  return body?.errors?.[0]?.defaultUserMessage || body?.defaultUserMessage || e?.message || 'Request failed.';
+}

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

@@ -52,7 +52,7 @@
                 }
               } @else {
                 <span class="rrc-rate-now__value rrc-rate-now__value--none">Not set</span>
-                <span class="rrc-rate-now__since">{{ type === 'CRR' ? 'Form 1' : 'Form 9' }} cannot compute</span>
+                <span class="rrc-rate-now__since">{{ type === 'CRR' ? 'Form 1 Part B' : 'Form 1 Part C' }} cannot compute</span>
               }
             </div>
           }
@@ -62,8 +62,10 @@
           <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-rate-form__type">
             <mat-label>Rate</mat-label>
             <mat-select [(ngModel)]="newRate.rateType">
-              <mat-option value="CRR">CRR — Form 1</mat-option>
-              <mat-option value="SLR">SLR — Form 9</mat-option>
+              <!-- Both ratios are Form 1's. Part B charges section 18 on the base, Part C section
+                 24 on the same base - one form, two parts, not two returns. -->
+              <mat-option value="CRR">CRR — Form 1 Part B</mat-option>
+              <mat-option value="SLR">SLR — Form 1 Part C</mat-option>
               <!-- Not a reserve ratio, but set by RBI and effective-dated the same way: the share of
                  savings balances that counts as a demand liability, the rest being time. -->
               <mat-option value="SAVINGS_DEMAND">Savings — demand share</mat-option>

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

@@ -23,8 +23,11 @@ export interface ReserveMapping {
 }
 
 /**
- * Configuration behind RBI Form 1 (CRR) and Form 9 (SLR): the percentages RBI sets, and which GL
- * accounts the returns read their figures from.
+ * Configuration behind RBI Form 1: the percentages RBI sets, and which GL accounts the return reads
+ * its figures from.
+ *
+ * One form settles both ratios. Part B is section 18 (the cash reserve) and Part C is section 24
+ * (the liquid assets), charged on the same base, so CRR and SLR are configured together here.
  *
  * Both halves sit on one screen because they are one decision. A percentage applies to a base, and
  * an administrator who sets the rate but never maps the accounts produces a return that looks
@@ -47,8 +50,8 @@ export class RbiReserveConfigComponent implements OnInit {
   private organizationService = inject(OrganizationService);
 
   /**
-   * Which return's roles this screen configures, as the backend groups them: 'RESERVE' for Form 1
-   * and Form 9, 'OSS1', 'OSS2'. Null shows every role.
+   * Which return's roles this screen configures, as the backend groups them: 'RESERVE' for Form 1,
+   * 'FORM9' for Form IX, 'OSS1', 'OSS2'. Null shows every role.
    *
    * A screen per return rather than one screen for all of them: the four roles that drive CRR and
    * the thirty that do not are separate decisions, made by different people at different times,
@@ -65,13 +68,14 @@ export class RbiReserveConfigComponent implements OnInit {
   roleGroups: { name: string; label: string; roles: any[] }[] = [];
 
   /**
-   * Which return's configuration is on screen: Form 1, Form 9, or both together.
+   * Which return's configuration is on screen: Form 1, Form IX, or both together.
    *
-   * The two returns share a base but maintain their requirement in different assets, so an
-   * administrator setting one up is looking at a different set of heads than one setting up the
-   * other. Showing all twenty-six at once buries the four that matter for the task in hand.
+   * The two returns have nothing in common - Form 1 charges ratios on a liability base, Form IX
+   * reports a balance sheet - so an administrator setting one up is looking at a different set of
+   * heads than one setting up the other. Showing all of them at once buries the handful that matter
+   * for the task in hand.
    */
-  formFilter: 'ALL' | 'FORM_1' | 'FORM_9' | 'FORM_IX' = 'ALL';
+  formFilter: 'ALL' | 'FORM_1' | 'FORM_IX' = 'ALL';
 
   /** Every reserve role the backend returned, before the form filter narrows it. */
   private allRoles: any[] = [];
@@ -95,20 +99,28 @@ export class RbiReserveConfigComponent implements OnInit {
     return scoped.filter((r: any) => this.belongsToSelectedForm(r));
   }
 
+  /**
+   * The returns this bank files, and the only ones that can be configured.
+   *
+   * There is no separate SLR return. Form 1 settles both ratios on one form - Part B is section 18,
+   * the cash reserve, and Part C is section 24, the liquid assets - so the heads that meet SLR are
+   * Form 1's heads. A "Form 9 - SLR" option used to sit here from before that was understood; it
+   * selected a return that has no report behind it, and filtered the SLR heads out of the one form
+   * that actually reports them.
+   */
   readonly formFilters = [
     { value: 'ALL', label: 'All returns' },
-    { value: 'FORM_1', label: 'Form 1 — CRR (fortnightly)' },
-    { value: 'FORM_9', label: 'Form 9 — SLR (monthly)' },
+    { value: 'FORM_1', label: 'Form 1 — CRR & SLR' },
     { value: 'FORM_IX', label: 'Form IX — Assets & Liabilities (R408)' }
   ];
 
   /**
    * Whether a head belongs to the return currently selected.
    *
-   * Decided from how the return consumes the head rather than from its name: MAINTAINED is met in
-   * cash and balances and so is Form 1's, SLR_ASSET is met in securities and gold and so is Form
-   * 9's, and a head that builds or nets the DTL base belongs to both because both charge their rate
-   * on that same base. A memo head is stated on either return and so shows on both.
+   * Form 1 takes every head that is not Form IX's. It reports both ratios: MAINTAINED heads are met
+   * in cash and balances and settle Part B, SLR_ASSET heads are met in securities and gold and
+   * settle Part C, and the heads that build or net the DTL base feed the IV(b) both rates are
+   * charged on. Splitting them across two filters only hid half of one form.
    */
   private belongsToSelectedForm(role: any): boolean {
     if (this.formFilter === 'ALL') {
@@ -125,19 +137,7 @@ export class RbiReserveConfigComponent implements OnInit {
     if (this.formFilter === 'FORM_IX') {
       return false;
     }
-    // The built-in SLR investments role predates the SLR_ASSET usage and still carries MAINTAINED,
-    // so it is placed by name; every other head is placed by how the return consumes it.
-    if (role.configKey === 'SLR_INVESTMENTS') {
-      return this.formFilter === 'FORM_9';
-    }
-    const usage = role.usage || role.roleUsage;
-    if (usage === 'MAINTAINED') {
-      return this.formFilter === 'FORM_1';
-    }
-    if (usage === 'SLR_ASSET') {
-      return this.formFilter === 'FORM_9';
-    }
-    // LIABILITY, ASSET_NET and MEMO all appear on both returns.
+    // Everything left belongs to Form 1, whichever of its two parts it settles.
     return true;
   }
 
@@ -171,15 +171,15 @@ export class RbiReserveConfigComponent implements OnInit {
   /**
    * How a head an administrator adds is consumed by the return.
    *
-   * MAINTAINED and SLR_ASSET are separate because the two returns admit different assets: CRR is
-   * met in cash and balances with banks, SLR in cash, gold and approved securities. One option for
-   * both would let a head meant for Form 1 quietly satisfy Form 9.
+   * MAINTAINED and SLR_ASSET are separate because the two parts admit different assets: CRR is met
+   * in cash and balances with banks, SLR in cash, gold and approved securities. One option for both
+   * would let a head meant for Part B quietly satisfy Part C.
    */
   readonly roleUsages = [
-    { value: 'LIABILITY', label: 'Liability — adds to the DTL base (Form 1 & 9)' },
-    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1 & 9)' },
-    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1)' },
-    { value: 'SLR_ASSET', label: 'Counts toward SLR maintained (Form 9)' },
+    { value: 'LIABILITY', label: 'Liability — adds to the DTL base (Form 1)' },
+    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1)' },
+    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1 Part B)' },
+    { value: 'SLR_ASSET', label: 'Counts toward SLR maintained (Form 1 Part C)' },
     // Form IX has no ratio and no base: its usages say which side of the balance sheet a head sits
     // on. LIABILITY above serves its liability side, and this its asset side.
     { value: 'ASSET', label: 'Asset — enters Total Assets (Form IX)' },
@@ -282,9 +282,9 @@ export class RbiReserveConfigComponent implements OnInit {
 
   get screenSubtitle(): string {
     return (
-      'The CRR and SLR percentages, and the GL accounts that RBI Form 1 (CRR, fortnightly) and Form 9 (SLR, monthly) ' +
-      'read their figures from. A rate applies to a base — so a role left unmapped stops its return computing rather ' +
-      'than reporting a nil figure that looks real.'
+      'The CRR and SLR percentages, and the GL accounts RBI Form 1 reads its figures from — Part B settles the cash ' +
+      'reserve, Part C the liquid assets, both charged on the same base. A rate applies to a base — so a role left ' +
+      'unmapped stops the return computing rather than reporting a nil figure that looks real.'
     );
   }
 

src/app/rbi-circulars/oss-workbook.ts

@@ -27,6 +27,17 @@ export function solidFill(argb: string): ExcelJS.Fill {
   return { type: 'pattern', pattern: 'solid', fgColor: { argb } };
 }
 
+/**
+ * The diagonal hatching RBI's templates put on a cell that is waiting to be filled in by hand.
+ *
+ * It reads differently from an empty cell, and the difference matters on a statutory form: an empty
+ * cell says nothing was reported, hatching says someone still has to report it. The templates use
+ * it on the signatory block and on the particulars a bank writes in itself.
+ */
+export function hatchFill(): ExcelJS.Fill {
+  return { type: 'pattern', pattern: 'lightUp', fgColor: { argb: 'FF808080' }, bgColor: { argb: 'FFFFFFFF' } };
+}
+
 /** Dark-blue full-width banner that heads every sheet in the RBI templates. */
 export function addBanner(sheet: ExcelJS.Worksheet, title: string, lastCol: string): void {
   const row = sheet.addRow([title]);

src/app/rbi-circulars/rbi-circulars.service.ts

@@ -177,7 +177,9 @@ export class RbiCircularsService {
     reportingDate?: string,
     firstColumnDate?: string,
     secondColumnDate?: string,
-    officeId?: number
+    officeId?: number,
+    firstBaseDate?: string,
+    secondBaseDate?: string
   ): Observable<any> {
     let params = new HttpParams();
     if (reportingDate) {
@@ -192,6 +194,15 @@ export class RbiCircularsService {
     if (secondColumnDate) {
       params = params.set('secondColumnDate', secondColumnDate);
     }
+    // The base each column's ratios are charged on. Left blank the rules fix it — the last Friday
+    // of that column's second preceding fortnight — so a filer only names one where the rule
+    // produces a date their ledger cannot answer, such as a period before the bank migrated.
+    if (firstBaseDate) {
+      params = params.set('firstBaseDate', firstBaseDate);
+    }
+    if (secondBaseDate) {
+      params = params.set('secondBaseDate', secondBaseDate);
+    }
     if (officeId != null) {
       params = params.set('officeId', String(officeId));
     }

src/app/rbi-circulars/reserve-return/form1-crr.component.ts

@@ -68,7 +68,10 @@ export class Form1CrrComponent extends ReserveReturnBase implements OnInit {
     return this.rbiService.getForm1Statutory(
       this.statutoryDate,
       this.statutoryFirstColumn || undefined,
-      this.statutorySecondColumn || undefined
+      this.statutorySecondColumn || undefined,
+      undefined,
+      this.statutoryFirstBase || undefined,
+      this.statutorySecondBase || undefined
     );
   }
 
@@ -112,12 +115,18 @@ export class Form1CrrComponent extends ReserveReturnBase implements OnInit {
     const filled = this.asDate(year, month, monthEnd);
     this.statutorySecondColumn = filled > this.today ? this.today : filled;
     this.statutoryDate = this.statutorySecondColumn;
+    // The bases follow the closes, so a quick fill leaves a complete form rather than two dates
+    // and two empty boxes the filer has to work out for themselves.
+    this.onStatutoryColumnChange('first');
+    this.onStatutoryColumnChange('second');
   }
 
-  /** Clears both columns, so they are derived from the reporting date instead. */
+  /** Clears both columns and the bases that follow from them. */
   clearStatutoryColumns(): void {
     this.statutoryFirstColumn = '';
     this.statutorySecondColumn = '';
+    this.statutoryFirstBase = '';
+    this.statutorySecondBase = '';
   }
 
   private asDate(year: number, month: number, day: number): string {

src/app/rbi-circulars/reserve-return/form1-statutory.component.scss

@@ -78,18 +78,38 @@ $red: #c5221f;
     line-height: 1.7;
   }
 
+  // The date pairs. Each row holds two, and the rows stack — so the closes sit directly above the
+  // bases they produce, and a filer reads down a column rather than across a wrapped line.
   &__row {
     display: flex;
     align-items: center;
     justify-content: center;
     gap: 12px;
     flex-wrap: wrap;
+
+    & + & {
+      margin-top: 10px;
+    }
+
+    // The bases are filled from the closes above rather than typed, so they are set back a shade -
+    // enough to read as "these follow from those" without looking disabled, since they can be
+    // changed and sometimes must be.
+    &--derived {
+      opacity: 0.85;
+    }
   }
 
   &__date {
     width: 220px;
   }
 
+  // The button on its own line under the pairs, centred on them rather than trailing the last one.
+  &__go {
+    margin-top: 16px;
+    display: flex;
+    justify-content: center;
+  }
+
   &__hint {
     margin: 14px 0 0;
     font-size: 12.5px;
@@ -248,6 +268,18 @@ $red: #c5221f;
     text-transform: uppercase;
     color: $gray-500;
   }
+
+  // The date the column's ratios are charged on. In the heading rather than in a column of its own,
+  // so a reader sees which base produced the required amounts below without the base's balances
+  // sitting beside the closes' as though they were a third period.
+  &__colbase {
+    display: block;
+    margin-top: 1px;
+    font-weight: 400;
+    font-size: 9px;
+    letter-spacing: 0.02em;
+    color: $primary;
+  }
 }
 
 // Part banner — PART A / PART B / PART C.
@@ -307,6 +339,107 @@ $red: #c5221f;
   white-space: nowrap;
 }
 
+// ── Day by day ──
+//
+// Outside the form's own sheet, because it is not part of what gets filed: the form reports two
+// closes, and this is the working behind them.
+.f1s-daily {
+  margin-top: 24px;
+  background: #fff;
+  border: 1px solid $border;
+  border-radius: 10px;
+  padding: 18px 20px;
+
+  &__title {
+    margin: 0 0 4px;
+    font-size: 14px;
+    font-weight: 700;
+    color: $gray-900;
+  }
+
+  // A day short is a breach, and on thirty rows it is exactly what the eye skips. Said in the
+  // heading so it is read before the table rather than found in it.
+  &__flag {
+    display: inline-block;
+    margin-left: 10px;
+    padding: 2px 8px;
+    font-size: 10.5px;
+    font-weight: 700;
+    color: $red;
+    background: #fce8e6;
+    border-radius: 4px;
+  }
+
+  &__hint {
+    margin: 0 0 14px;
+    font-size: 11.5px;
+    color: $gray-500;
+  }
+
+  &__stats {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 12px;
+    margin-bottom: 16px;
+  }
+
+  // The base a day was charged on. Set back because it repeats for every day of a fortnight and
+  // would otherwise compete with the figures it qualifies.
+  &__base {
+    color: $gray-500;
+    font-size: 11px;
+  }
+
+  // A day the bank's own liabilities moved. The whole point of carrying a daily figure is to find
+  // these, and on thirty rows of near-identical numbers they are invisible unless marked.
+  &__moved {
+    font-weight: 700;
+    color: $primary;
+    background: #f0f6ff;
+  }
+
+  &__table {
+    font-size: 11.5px;
+
+    th {
+      font-size: 10.5px;
+    }
+  }
+
+  &--short td {
+    background: #fff6f6;
+  }
+}
+
+.f1s-stat {
+  border: 1px solid $border;
+  border-radius: 8px;
+  padding: 10px 12px;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+
+  &__label {
+    font-size: 10px;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    color: $gray-500;
+    font-weight: 600;
+  }
+
+  &__value {
+    font-size: 17px;
+    font-weight: 600;
+    color: $gray-900;
+    font-variant-numeric: tabular-nums;
+  }
+
+  &__sub {
+    font-size: 10.5px;
+    color: $gray-500;
+  }
+}
+
 .f1s-sign {
   margin-top: 56px;
   text-align: right;

src/app/rbi-circulars/reserve-return/reserve-return.base.ts

@@ -10,7 +10,7 @@ import { inject } from '@angular/core';
 import { Observable, catchError, forkJoin, of } from 'rxjs';
 import * as ExcelJS from 'exceljs';
 import { RbiCircularsService } from '../rbi-circulars.service';
-import { addBanner, boxAllCells, downloadWorkbook, newWorkbook, solidFill, XL } from '../oss-workbook';
+import { addBanner, boxAllCells, downloadWorkbook, hatchFill, newWorkbook, solidFill, XL } from '../oss-workbook';
 
 /** One configured figure on the return, with the accounts it was derived from. */
 export interface ReserveLine {
@@ -97,13 +97,72 @@ export interface Form1Part {
   baseDateLiabilities?: number[];
 }
 
+/** One day of the period, with both ratios measured against the base in force that day. */
+export interface Form1DailyRow {
+  date: string;
+  /** The date this day's ratios were charged on — it moves at each fortnight boundary. */
+  baseDate: string;
+  /**
+   * The net liabilities that date held, which both requirements below are struck on.
+   *
+   * Absent on a return saved before the backend stated it, so readers treat it as optional rather
+   * than printing a zero where an older snapshot simply never carried the figure.
+   */
+  baseLiabilities?: number;
+  /**
+   * The day's own net liabilities, which move daily where the base holds still for a fortnight.
+   *
+   * Optional for the same reason as the base: a return saved before the backend stated it carries
+   * no figure, and a zero would read as a day with no liabilities rather than as one not recorded.
+   */
+  ownLiabilities?: number;
+  crrRequired: number;
+  crrMaintained: number;
+  /** Negative where the day fell short. */
+  crrSurplus: number;
+  slrRequired: number;
+  slrMaintained: number;
+  slrSurplus: number;
+}
+
+/**
+ * The day-by-day position behind the form's two columns.
+ *
+ * Both ratios are reckoned over the period, not on the closes alone, so a form whose columns pass
+ * can still sit on days that did not. The short-day counts say so outright rather than leaving them
+ * to be spotted in a table of thirty rows.
+ */
+export interface Form1Daily {
+  from: string;
+  to: string;
+  days: Form1DailyRow[];
+  dayCount: number;
+  crrAverage: number;
+  slrAverage: number;
+  crrLowest: number;
+  crrLowestOn: string | null;
+  slrLowest: number;
+  slrLowestOn: string | null;
+  crrShortDays: number;
+  slrShortDays: number;
+}
+
 export interface Form1Statutory {
   formCode: string;
   formName: string;
   statutoryReference: string;
   reportingDate: string;
-  /** The two fortnight closes and the reporting date, in time order. */
+  /** The fortnight closes the form reports, in time order. */
   columns: string[];
+  /**
+   * The date each column's ratios are charged on, in the same order.
+   *
+   * Absent on a return saved before the base stopped being a column of its own, so the screen reads
+   * it defensively rather than assuming every snapshot carries it.
+   */
+  baseColumns?: string[];
+  /** Every day of the period, with what each ratio required and what was held. */
+  daily?: Form1Daily;
   crrPercentage: number | null;
   slrPercentage: number | null;
   partA: Form1Part;
@@ -364,8 +423,8 @@ export abstract class ReserveReturnBase {
   readonly statutoryTitle: string = 'Form 1 — Sections 18(1) and 24(3)';
   readonly statutorySubtitle: string =
     'Banking Regulation (Co-operative Societies) Rules, 1966. The form reports two fortnight closes ' +
-    'side by side — for August that is 15/08 and 31/08 — and charges both ratios on the last Friday ' +
-    'of the second preceding fortnight.';
+    'side by side — for September that is 15/09 and 30/09 — and charges both ratios on the matching ' +
+    'close one month earlier.';
 
   // ── Statutory form state ──
   //
@@ -388,6 +447,75 @@ export abstract class ReserveReturnBase {
   statutoryFirstColumn = '';
   statutorySecondColumn = '';
 
+  /**
+   * The base date each column's ratios are charged on.
+   *
+   * Filled in from the rule as soon as a close is entered — the last Friday of that close's second
+   * preceding fortnight — and editable from there. Shown rather than hidden because every required
+   * amount on the form is a percentage of the liabilities on this date, and a reviewer cannot check
+   * a requirement whose base they cannot see. Editable because a bank that migrated part-way
+   * through a period has a base the rule produces and the ledger cannot answer.
+   */
+  statutoryFirstBase = '';
+  statutorySecondBase = '';
+
+  /**
+   * The base date a close is charged on: the previous month's matching fortnight close.
+   *
+   * Which fortnight the column falls in settles it, not the day it carries. A date in the first
+   * half — the 1st to the 15th — charges on the 15th of the previous month; anything later charges
+   * on the previous month's END, whatever day that is. So 30/09 charges on 31/08, and so does
+   * 20/09: both sit in the second fortnight, and the second fortnight's close is the month end.
+   *
+   * Keyed on the fortnight rather than on the day number because the two closes are not the same
+   * kind of date. The 15th is a fixed day; the month end moves between 28 and 31. Matching day for
+   * day would charge 30/09 on 30/08, a day that closes nothing.
+   *
+   * RBI's own wording is "the last Friday of the second preceding fortnight", and that rule was
+   * tried here. It was taken out again because the dates it produced did not match the returns this
+   * bank has already filed by hand — it puts the base on a weekday that moves and roughly six weeks
+   * back. The fortnight closes this bank actually files on are the 15th and the month end.
+   *
+   * Mirrors the backend, which computes the same date for the figures. Kept here so the prompt can
+   * fill the base in as the close is typed; a base entered by hand still overrides it.
+   */
+  baseDateFor(closeDate: string): string {
+    if (!closeDate) {
+      return '';
+    }
+    const d = new Date(closeDate + 'T00:00:00');
+    if (Number.isNaN(d.getTime())) {
+      return '';
+    }
+    // A date input hands over whatever has been typed so far, and a half-typed year parses as a
+    // real date: "0026-09-30" is year 26, which the Date constructor then reads as 1926, because
+    // it adds 1900 to any year from 0 to 99. The base silently came back a century out. Nothing
+    // before 1900 is a date this form has any use for, so it is treated as still being typed.
+    if (d.getFullYear() < 1900) {
+      return '';
+    }
+    // The previous month, reached by taking day 0 of this one: month is zero-based, so this lands
+    // on the last day of the month before.
+    const previousMonthEnd = new Date(d.getFullYear(), d.getMonth(), 0);
+    if (d.getDate() <= 15) {
+      return this.asIsoDate(new Date(previousMonthEnd.getFullYear(), previousMonthEnd.getMonth(), 15));
+    }
+    return this.asIsoDate(previousMonthEnd);
+  }
+
+  private asIsoDate(d: Date): string {
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+  }
+
+  /** Fills a column's base from the rule, leaving one the filer has already set alone. */
+  onStatutoryColumnChange(which: 'first' | 'second'): void {
+    if (which === 'first') {
+      this.statutoryFirstBase = this.baseDateFor(this.statutoryFirstColumn);
+    } else {
+      this.statutorySecondBase = this.baseDateFor(this.statutorySecondColumn);
+    }
+  }
+
   /** Fetches the statutory form. Overridden by each return that has one. */
   protected fetchStatutory(): Observable<any> {
     return of(null);
@@ -397,7 +525,16 @@ export abstract class ReserveReturnBase {
   generateStatutory(): void {
     if (this.statutoryTakesTwoColumns) {
       if (!this.statutoryFirstColumn || !this.statutorySecondColumn) {
-        this.statutoryError = 'Enter both fortnight closing dates — for August that is 15/08 and 31/08.';
+        this.statutoryError = 'Enter both fortnight closing dates — for September that is 15/09 and 30/09.';
+        return;
+      }
+      // A half-typed year parses as a real date — "30-09-0026" is year 26 — and then fails the
+      // ordering check below with a message about column order, which is not what went wrong.
+      // Caught first so the filer is told about the year rather than sent looking at the dates.
+      const halfTyped = [this.statutoryFirstColumn, this.statutorySecondColumn, this.statutoryFirstBase, this.statutorySecondBase]
+        .filter((d) => d && Number(d.slice(0, 4)) < 1900);
+      if (halfTyped.length) {
+        this.statutoryError = `The year in ${halfTyped[0]} looks incomplete — enter all four digits.`;
         return;
       }
       if (this.statutoryFirstColumn >= this.statutorySecondColumn) {
@@ -410,6 +547,16 @@ export abstract class ReserveReturnBase {
         this.statutoryError = `The second column (${this.statutorySecondColumn}) has not happened yet — today is ${this.today}.`;
         return;
       }
+      // A base dated after the close it serves would charge the ratio on liabilities the bank had
+      // not taken on yet — arithmetically fine, and meaningless.
+      if (this.statutoryFirstBase && this.statutoryFirstBase > this.statutoryFirstColumn) {
+        this.statutoryError = `The first column's base date (${this.statutoryFirstBase}) falls after the close it is charged on.`;
+        return;
+      }
+      if (this.statutorySecondBase && this.statutorySecondBase > this.statutorySecondColumn) {
+        this.statutoryError = `The second column's base date (${this.statutorySecondBase}) falls after the close it is charged on.`;
+        return;
+      }
       // The return is made up to the later of the two closes, so the reporting date follows from
       // them rather than being a third date a filer has to keep consistent with the first two.
       this.statutoryDate = this.statutorySecondColumn;
@@ -1166,12 +1313,11 @@ export abstract class ReserveReturnBase {
   `;
 
   /**
-   * The statutory form as a workbook, laid out as the form is printed.
+   * The statutory form as the workbook RBI files it in — the CIMS R377 template.
    *
-   * This is the form that gets filed, so it has to leave the screen in a shape a filer can hand on:
-   * the same three dated columns, the same Roman-numbered lines, the same parts in the same order.
-   * A workbook that reorganised the form would have to be read back against the screen line by line
-   * before anyone could trust it.
+   * Every figure comes from the return as generated, so the workbook follows whatever dates were
+   * asked for: change the closes and the whole of it moves with them. Nothing here is a figure
+   * typed into a template by hand.
    */
   async exportStatutory(): Promise<void> {
     if (!this.statutory) {
@@ -1180,94 +1326,584 @@ export abstract class ReserveReturnBase {
     this.generating = true;
     try {
       const wb = newWorkbook();
-      const sheet = wb.addWorksheet(this.statutoryTabLabel);
-      sheet.columns = [
-        { width: 64 },
-        { width: 20 },
-        { width: 20 },
-        { width: 20 }];
-
-      addBanner(sheet, this.statutory.formName, 'D');
-
-      const ref = sheet.addRow([this.statutory.statutoryReference]);
-      sheet.mergeCells(ref.number, 1, ref.number, 4);
-      ref.font = { size: 9, italic: true };
-      ref.alignment = { horizontal: 'center' };
-      sheet.addRow([]);
-
-      let start = sheet.rowCount + 1;
-      this.addKeyValue(sheet, 'Made up to', this.statutory.reportingDate);
-      this.addKeyValue(
-        sheet,
-        'CRR rate',
-        this.statutory.crrPercentage === null ? 'Not set' : `${this.statutory.crrPercentage}%`
-      );
-      this.addKeyValue(
-        sheet,
-        'SLR rate',
-        this.statutory.slrPercentage === null ? 'Not set' : `${this.statutory.slrPercentage}%`
-      );
-      boxAllCells(sheet, start, sheet.rowCount, 2);
-      sheet.addRow([]);
-
-      // Anything that would make the form wrong to file goes above the figures, not below them:
-      // a caveat under a full statement is read after the reader has already believed it.
-      if (this.statutory.unmetRequirements.length) {
-        const warn = sheet.addRow(['Check before filing:']);
-        warn.font = { bold: true, color: { argb: 'FFB06000' } };
-        for (const reason of this.statutory.unmetRequirements) {
-          const r = sheet.addRow([`    ${reason}`]);
-          r.font = { size: 9, color: { argb: 'FFB06000' } };
-        }
-        sheet.addRow([]);
-      }
-
-      start = sheet.rowCount + 1;
-      // The third column is the base the ratios are charged on, not a third close — said on the
-      // header so the workbook cannot be read as carrying three reporting dates.
-      const head = sheet.addRow([
-        'Particulars',
-        ...this.statutory.columns.map((col, i) => `${col}\n${i === 2 ? 'base for ratios' : 'fortnight close'}`)
-      ]);
-      head.font = { bold: true };
-      head.alignment = { wrapText: true, horizontal: 'center' };
-      head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
-
-      for (const part of this.statutoryParts) {
-        const banner = sheet.addRow([part.title]);
-        sheet.mergeCells(banner.number, 1, banner.number, 4);
-        banner.font = { bold: true, color: { argb: XL.bannerText } };
-        banner.eachCell((c) => (c.fill = solidFill(XL.banner)));
-
-        for (const line of part.lines) {
-          // The form's own indentation carries its numbering — (a), (i), (A) — so a flattened
-          // sheet would lose which line belongs under which head.
-          const row = sheet.addRow([
-            `${'    '.repeat(line.indent ?? 0)}${line.label}`,
-            ...(line.values ?? []).map((v) => v)
-          ]);
-          row.getCell(1).alignment = { wrapText: true };
-          if (line.heading || line.total) {
-            row.font = { bold: true };
-          }
-          for (let c = 2; c <= 4; c++) {
-            row.getCell(c).numFmt = '#,##0.00';
-            row.getCell(c).alignment = { horizontal: 'right' };
-          }
-        }
-
-        this.addStatutoryTotals(sheet, 'Required', part.required);
-        this.addStatutoryTotals(sheet, 'Maintained', part.maintained);
-        this.addStatutoryTotals(sheet, 'Surplus / (shortfall)', part.surplus);
-      }
-      boxAllCells(sheet, start, sheet.rowCount, 4);
-
-      await downloadWorkbook(wb, `${this.exportStem}_${this.statutory.reportingDate}`);
+      this.addCimsGeneralInformation(wb);
+      this.addCimsPartA(wb);
+      this.addCimsOthersSheet(wb);
+      this.addCimsPartBandC(wb);
+      this.addCimsPartD(wb);
+      this.addCimsSecuritiesSheet(wb, 'Part C.XII. c');
+      this.addCimsSecuritiesSheet(wb, 'Part D.XIV.e');
+      this.addCimsDailySheet(wb, 'CRR');
+      this.addCimsDailySheet(wb, 'SLR');
+      this.addCimsSignatory(wb);
+      // The working behind the two closes, after the template's own sheets. CIMS reads the sheets
+      // it knows by name and ignores the rest, so carrying it costs the filing nothing and saves
+      // producing it again when an inspector asks.
+      this.addDailySheet(wb);
+      await downloadWorkbook(wb, `R377_Form1_${this.statutory.reportingDate}`);
     } finally {
       this.generating = false;
     }
   }
 
+  // ── The CIMS R377 workbook ──
+  //
+  // RBI takes Form 1 through CIMS, which does not read a spreadsheet the way a person does: it
+  // looks for its own sheets, by its own names, carrying its own wording. A single sheet that read
+  // like the screen — which is what this used to export — is rejected before anyone looks at a
+  // figure in it. So the workbook below is the template's, line for line, and only the figures and
+  // the dates come from the return. Sheets this bank has nothing to put on (Part D is for scheduled
+  // banks) are still written, empty: CIMS checks that a sheet exists before it checks its rows.
+
+  /** The dated columns the return reports, which every sheet below is laid out across. */
+  private get cimsDates(): string[] {
+    return this.statutory?.columns ?? [];
+  }
+
+  private addCimsGeneralInformation(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('General Information');
+    sheet.columns = [{ width: 40 }, { width: 52 }];
+    addBanner(sheet, 'General Information', 'B');
+
+    const start = sheet.rowCount + 1;
+    // Return name, code and version are the template's own and are what CIMS matches on, so they
+    // are the one place in this workbook where a fixed string is the correct value.
+    this.addKeyValue(sheet, 'Return Name', 'New_Statement of Compliance with CRR and SLR (Form - I)');
+    this.addKeyValue(sheet, 'Return Code', 'R377');
+    // Blank where the bank's own particulars belong. They are filed-entity details this system does
+    // not hold, and a guess printed on a statutory return reads as a statement of fact.
+    this.addKeyValue(sheet, 'Bank Name', '');
+    this.addKeyValue(sheet, 'Bank Code', '');
+    this.addKeyValue(sheet, 'Address of Reporting Institution', '');
+    this.addKeyValue(sheet, 'RO Name', '');
+    this.addKeyValue(sheet, 'Reporting Frequency', 'Monthly');
+    this.addKeyValue(sheet, 'Month End Date', this.statutory?.reportingDate ?? '');
+    this.addKeyValue(sheet, 'Bank Type', '');
+    this.addKeyValue(sheet, 'Validation Status', '');
+    this.addKeyValue(sheet, 'Return Version', 'V1.0');
+    boxAllCells(sheet, start, sheet.rowCount, 2);
+
+    // Anything that would make the return wrong to file goes on the first sheet, where it is read
+    // before the figures rather than found after them.
+    if (this.statutory?.unmetRequirements?.length) {
+      sheet.addRow([]);
+      const head = sheet.addRow(['Check before filing:']);
+      head.font = { bold: true, color: { argb: 'FFB06000' } };
+      for (const reason of this.statutory.unmetRequirements) {
+        const row = sheet.addRow([reason]);
+        sheet.mergeCells(row.number, 1, row.number, 2);
+        row.alignment = { wrapText: true };
+        row.font = { size: 9, color: { argb: 'FFB06000' } };
+      }
+    }
+  }
+
+  /** Part A — the liabilities and assets, Roman-numbered I through VIII, across the dated columns. */
+  private addCimsPartA(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Part A');
+    sheet.columns = [{ width: 72 }, ...this.cimsDates.map(() => ({ width: 22 }))];
+    addBanner(sheet, 'Part A', this.cimsLastColumn());
+    sheet.addRow([]);
+    this.addCimsEndDates(sheet, 'End Date');
+
+    const start = sheet.rowCount + 1;
+    for (const line of this.statutory?.partA?.lines ?? []) {
+      // The form's own indentation carries its numbering — (a), then (i) — so a flattened sheet
+      // would lose which line sits under which head.
+      const row = sheet.addRow([`${'    '.repeat(line.indent ?? 0)}${line.label}`, ...(line.values ?? [])]);
+      row.getCell(1).alignment = { wrapText: true };
+      if (line.heading || line.total) {
+        row.font = { bold: true };
+      }
+      this.formatCimsFigures(row);
+      this.shadeCimsRow(sheet, row, line.heading === true, line.total === true || line.values !== undefined);
+    }
+    boxAllCells(sheet, start, sheet.rowCount, this.cimsDates.length + 1);
+  }
+
+  /**
+   * Part A.II.c — the break-up of "Liabilities in India to Others: c) Others".
+   *
+   * Written with its heading and a nil total: the return does not break that head down, and a sheet
+   * omitted fails the upload where a sheet carrying an honest nil does not.
+   */
+  private addCimsOthersSheet(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Part A.II.c');
+    sheet.columns = [{ width: 10 }, { width: 50 }, ...this.cimsDates.map(() => ({ width: 22 }))];
+    addBanner(sheet, 'Part A.II.c', this.columnLetter(this.cimsDates.length + 2));
+    sheet.addRow([]);
+
+    const start = sheet.rowCount + 1;
+    const last = this.cimsDates.length + 2;
+    // "As at the close of Business on" heads BOTH dated columns as one caption, as the template has
+    // it — written once and merged across them, not repeated over each.
+    const head = sheet.addRow(['Sr.No.', 'Particulars', 'As at the close of Business on']);
+    head.font = { bold: true };
+    head.alignment = { wrapText: true, horizontal: 'center' };
+    head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+    if (this.cimsDates.length > 1) {
+      sheet.mergeCells(head.number, 3, head.number, last);
+    }
+    for (let c = 3; c <= last; c++) {
+      head.getCell(c).fill = solidFill(XL.headerGrey);
+    }
+
+    const dates = sheet.addRow(['', '', ...this.cimsDates]);
+    dates.font = { bold: true };
+    dates.alignment = { horizontal: 'center' };
+    for (let c = 3; c <= last; c++) {
+      dates.getCell(c).fill = solidFill(XL.headerGrey);
+    }
+    // Sr.No. 1, hatched, as the template carries it: the break-up is written in by hand, so the row
+    // has to be there to be written in. An empty sheet with only a Total says the bank reported
+    // nothing; a hatched row says nobody has filled it in yet.
+    const entry = sheet.addRow([1, '', ...this.cimsDates.map((): null => null)]);
+    for (let c = 2; c <= last; c++) {
+      entry.getCell(c).fill = hatchFill();
+    }
+
+    const total = sheet.addRow(['', 'Total', ...this.cimsDates.map(() => 0)]);
+    total.font = { bold: true };
+    total.getCell(1).fill = solidFill(XL.headerGrey);
+    total.getCell(2).alignment = { horizontal: 'center' };
+    total.getCell(2).fill = solidFill(XL.headerGrey);
+    this.formatCimsFigures(total, 3);
+    for (let c = 3; c <= last; c++) {
+      total.getCell(c).fill = solidFill(XL.derivedBlue);
+    }
+    boxAllCells(sheet, start, sheet.rowCount, last);
+  }
+
+  /** Parts B and C on one sheet, as the template has them. */
+  private addCimsPartBandC(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Part B and C');
+    sheet.columns = [{ width: 72 }, ...this.cimsDates.map(() => ({ width: 22 }))];
+    addBanner(sheet, 'Part B and C', this.cimsLastColumn());
+    sheet.addRow([]);
+    this.addCimsEndDates(sheet, 'End Date');
+
+    const start = sheet.rowCount + 1;
+    const crr = this.statutory?.crrPercentage;
+    const slr = this.statutory?.slrPercentage;
+
+    this.addCimsSection(sheet, 'Part B: Compliance with section 18 (Applicable to only non-scheduled UCBs)');
+    this.addCimsFigures(
+      sheet,
+      `IX. CRR required to be maintained (prescribed ${this.cimsRate(crr)} of IV b) — ${this.cimsBaseDates()})`,
+      this.statutory?.partB?.required
+    );
+    this.addCimsFigures(sheet, 'X. Cash Reserve actually maintained', this.statutory?.partB?.maintained);
+
+    this.addCimsSection(sheet, 'Part C: Compliance with section 24 (Applicable to only non-scheduled UCBs)');
+    this.addCimsFigures(
+      sheet,
+      `XI. SLR required to be maintained (prescribed ${this.cimsRate(slr)} of IV b) — ${this.cimsBaseDates()})`,
+      this.statutory?.partC?.required
+    );
+    this.addCimsSection(sheet, 'XII. SLR Actually Maintained');
+    // Read off Part C's own lines rather than recomputed here, so this sheet and the screen cannot
+    // come to differ about what made the total up.
+    this.addCimsFigures(
+      sheet,
+      'a) Cash and Other balances maintained in India (Excess cash reserve maintained but the excess not from DCCBs and StCBs)',
+      this.cimsPartCLine('(a) Cash and other balances')
+    );
+    this.addCimsFigures(sheet, 'b) Gold', this.cimsPartCLine('(b) Gold'));
+    this.addCimsFigures(sheet, 'c) Unencumbered Approved Securities', this.cimsPartCLine('(c) Unencumbered'));
+    this.addCimsFigures(sheet, 'Total of (XII)', this.statutory?.partC?.maintained, true);
+
+    boxAllCells(sheet, start, sheet.rowCount, this.cimsDates.length + 1);
+  }
+
+  /**
+   * Part D — section 24 as scheduled banks file it.
+   *
+   * This is a non-scheduled co-operative bank, which files Parts B and C; Part D is not its return
+   * to make. It is written with the template's rows and nil figures rather than left out, because
+   * what CIMS rejects is a missing sheet, not an empty one.
+   */
+  private addCimsPartD(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Part D');
+    sheet.columns = [{ width: 72 }, ...this.cimsDates.map(() => ({ width: 22 }))];
+    addBanner(sheet, 'Part D', this.cimsLastColumn());
+    sheet.addRow([]);
+    this.addCimsEndDates(sheet, 'End Date');
+
+    const start = sheet.rowCount + 1;
+    // Nil throughout, because this bank does not file Part D — but shaded as the template shades
+    // it, so the sheet still reads the way a filer expects: blue where the form would compute a
+    // figure, white where a bank would write one in.
+    const nil = this.cimsDates.map(() => 0);
+    this.addCimsSection(sheet, 'Part D: Compliance with section 24 (Applicable to only scheduled UCBs)');
+    this.addCimsFigures(
+      sheet,
+      'XIII. SLR required to be maintained (prescribed % of IV as on Last Friday of the Second Preceding fortnight)',
+      nil
+    );
+    this.addCimsSection(sheet, 'XIV. Assets actually maintained');
+    this.addCimsFigures(sheet, 'a) Cash in hand', nil);
+    this.addCimsFigures(
+      sheet,
+      'b) Balance maintained with RBI in excess of the balance required to be maintained under section 42 of the RBI Act 1934'
+    );
+    this.addCimsFigures(sheet, 'c) Net Balance in Current Accounts (i.e. VIII)', nil);
+    this.addCimsFigures(sheet, 'd) Gold');
+    this.addCimsFigures(sheet, 'e) Unencumbered Approved Securities $$', nil);
+    this.addCimsFigures(sheet, 'f) State Co-op Bank of the State');
+    this.addCimsFigures(sheet, 'g) District Central Co-op Bank');
+    this.addCimsFigures(sheet, 'Total of (XIV) excluding f & g', nil, true);
+    boxAllCells(sheet, start, sheet.rowCount, this.cimsDates.length + 1);
+  }
+
+  /**
+   * The securities valuation sheets — Part C.XII.c and Part D.XIV.e.
+   *
+   * Four valuation columns per period, and the template repeats the whole block for each date. The
+   * rows are the movement of the holding over the fortnight; this return strikes a closing position
+   * and does not carry the movement that produced it, so the opening and the additions are written
+   * nil and the closing carries the figure. A reader then sees the holding that was counted, and
+   * sees that the movement was not reported rather than being told it was zero.
+   */
+  private addCimsSecuritiesSheet(wb: ExcelJS.Workbook, name: string): void {
+    const perDate = 4;
+    const dates = this.cimsDates;
+    const sheet = wb.addWorksheet(name);
+    sheet.columns = [{ width: 38 }, ...dates.flatMap(() => Array(perDate).fill({ width: 19 }))];
+    addBanner(sheet, name, this.columnLetter(dates.length * perDate + 1));
+    sheet.addRow([]);
+
+    const dateRow = sheet.addRow(['', ...dates.flatMap((d) => [d, '', '', ''])]);
+    dateRow.font = { bold: true };
+    dates.forEach((_, i) => {
+      const from = 2 + i * perDate;
+      sheet.mergeCells(dateRow.number, from, dateRow.number, from + perDate - 1);
+      dateRow.getCell(from).alignment = { horizontal: 'center' };
+      dateRow.getCell(from).fill = solidFill(XL.auditYellow);
+    });
+
+    const start = sheet.rowCount + 1;
+    const head = sheet.addRow([
+      '',
+      ...dates.flatMap(() => ['Face Value', 'Book Value', 'Depreciation', 'Net Value for SLR purpose (2-3)'])
+    ]);
+    head.font = { bold: true };
+    head.alignment = { wrapText: true, horizontal: 'center' };
+    head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+    const numbers = sheet.addRow(['', ...dates.flatMap(() => [1, 2, 3, 4])]);
+    numbers.font = { bold: true };
+    numbers.alignment = { horizontal: 'center' };
+
+    // Part C's own securities line, so the valuation sheet totals to the figure the compliance
+    // sheet claimed. Depreciation is nil because the return counts securities at the value the
+    // ledger holds, which is already net of it.
+    const held = this.cimsPartCLine('(c) Unencumbered') ?? dates.map(() => 0);
+    const movement = (label: string, carries: boolean, closing = false) => {
+      const cells: (string | number)[] = [label];
+      for (let i = 0; i < dates.length; i++) {
+        const value = carries ? held[i] ?? 0 : 0;
+        cells.push(value, value, 0, value);
+      }
+      const row = sheet.addRow(cells);
+      row.getCell(1).fill = solidFill(XL.headerGrey);
+      if (closing) {
+        row.font = { bold: true };
+      }
+      for (let c = 2; c <= dates.length * perDate + 1; c++) {
+        row.getCell(c).numFmt = '#,##0.00';
+        row.getCell(c).alignment = { horizontal: 'right' };
+        // The template shades the Net Value column on every row — it is the figure that counts for
+        // SLR — and the whole of a closing balance row, which is the line the return reads off.
+        const isNetValue = (c - 1) % perDate === 0;
+        if (closing || isNetValue) {
+          row.getCell(c).fill = solidFill(XL.derivedBlue);
+        }
+      }
+    };
+
+    this.addCimsSection(sheet, 'Part - I (Government Securities)');
+    movement('Opening Balance', false);
+    movement('Addition during the fortnights', false);
+    movement('Deduction during the fortnights', false);
+    movement('Closing Balance (a)', true, true);
+    this.addCimsSection(sheet, 'Part - II (Other Approved Securities)');
+    movement('Opening Balance', false);
+    movement('Addition during the fortnights', false);
+    movement('Deduction during the fortnights', false);
+    movement('Closing Balance (b)', false, true);
+    movement('Closing Balance (a+b)', true, true);
+    boxAllCells(sheet, start, sheet.rowCount, dates.length * perDate + 1);
+  }
+
+  /**
+   * The daily maintenance sheet the template carries one of per ratio.
+   *
+   * One row a day, under the template's own columns: the base liabilities, what was required, what
+   * was held, and the gap. The gap is split into a Deficit column and a Surplus column rather than
+   * carried as one signed figure, because that is how the template reads it and a filer copying
+   * between the two should not have to re-sign anything.
+   */
+  private addCimsDailySheet(wb: ExcelJS.Workbook, ratio: 'CRR' | 'SLR'): void {
+    const isCrr = ratio === 'CRR';
+    const sheet = wb.addWorksheet(isCrr ? 'Daily CRR maintd (NS)' : 'Daily SLR maintd (S and NS)');
+    sheet.columns = [
+      { width: 9 },
+      { width: 14 },
+      { width: 26 },
+      { width: 21 },
+      { width: 21 },
+      { width: 21 },
+      { width: 21 },
+      { width: 19 },
+      { width: 26 }
+    ];
+    addBanner(
+      sheet,
+      isCrr
+        ? 'Cash Reserve Ratio Amount [Applicable to only Non-Scheduled UCBs]'
+        : 'Statutory Liquidity Ratio Amount [Applicable to both Scheduled and Non-Scheduled UCBs]',
+      'I'
+    );
+    sheet.addRow([]);
+
+    const start = sheet.rowCount + 1;
+    // The template bands the ratio's name across the four columns it governs, above their own
+    // headings — the first three columns are the day and its base, and belong to neither ratio.
+    const title = isCrr
+      ? 'Cash Reserve Ratio Amount [Applicable to only Non-Scheduled UCBs]'
+      : 'Statutory Liquidity Ratio Amount [Applicable to both Scheduled and Non-Scheduled UCBs]';
+    const band = sheet.addRow(['', '', '', title]);
+    band.font = { bold: true };
+    band.alignment = { wrapText: true, horizontal: 'center' };
+    sheet.mergeCells(band.number, 4, band.number, 9);
+    for (let c = 1; c <= 9; c++) {
+      band.getCell(c).fill = solidFill(XL.headerGrey);
+    }
+
+    const head = sheet.addRow([
+      'Sr. No.',
+      'Date',
+      'Net Demand and Time Liabilities (As on the base date)',
+      'Required to be maintained',
+      'Actually maintained',
+      'Deficit (Required-Actual)',
+      'Surplus (Actual-Required)',
+      `${ratio} Interest (Actual Rs.)`,
+      'Remarks'
+    ]);
+    head.font = { bold: true };
+    head.alignment = { wrapText: true, horizontal: 'center' };
+    head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+    // The first three columns are one heading spanning both rows, as the template has them.
+    for (const c of [1, 2, 3]) {
+      sheet.mergeCells(band.number, c, head.number, c);
+    }
+
+    const days = this.statutory?.daily?.days ?? [];
+    days.forEach((day, i) => {
+      const required = isCrr ? day.crrRequired : day.slrRequired;
+      const held = isCrr ? day.crrMaintained : day.slrMaintained;
+      const gap = isCrr ? day.crrSurplus : day.slrSurplus;
+      const row = sheet.addRow([
+        i + 1,
+        day.date,
+        // Blank, not zero, where an older snapshot never carried the base: a nil in this column
+        // would read as a day with no liabilities, which is a different claim from not knowing.
+        day.baseLiabilities ?? '',
+        required,
+        held,
+        gap < 0 ? -gap : 0,
+        gap > 0 ? gap : 0,
+        '',
+        // The template gives NDTL one column, and it is the base's — so the day's own liabilities
+        // go in Remarks rather than in a column the template does not have. A reader can still see
+        // which days the bank's position moved without the sheet departing from the filed shape.
+        this.cimsDailyRemark(day, gap)
+      ]);
+      for (let c = 3; c <= 8; c++) {
+        row.getCell(c).numFmt = '#,##0.00';
+        row.getCell(c).alignment = { horizontal: 'right' };
+      }
+      // A day short is the thing this sheet exists to show, and in a column of near-identical
+      // figures it is exactly what the eye goes past.
+      if (gap < 0) {
+        row.font = { color: { argb: 'FFC5221F' } };
+      }
+    });
+
+    boxAllCells(sheet, start, sheet.rowCount, 9);
+  }
+
+  /**
+   * What a daily row's Remarks column says: the base the day was charged on, the day's own
+   * liabilities, and whether it fell short.
+   */
+  private cimsDailyRemark(day: Form1DailyRow, gap: number): string {
+    const parts = [`Charged on ${day.baseDate}`];
+    if (day.ownLiabilities !== undefined) {
+      parts.push(`NDTL on the day ${day.ownLiabilities.toFixed(2)}`);
+    }
+    if (gap < 0) {
+      parts.push('SHORT');
+    }
+    return parts.join('; ');
+  }
+
+  private addCimsSignatory(wb: ExcelJS.Workbook): void {
+    const sheet = wb.addWorksheet('Signatory Information');
+    sheet.columns = [{ width: 26 }, { width: 36 }, { width: 36 }];
+    addBanner(sheet, 'Signatory Information', 'C');
+    sheet.addRow([]);
+
+    const start = sheet.rowCount + 1;
+    const head = sheet.addRow(['', 'Authorised Reporting Official', 'Countersigned By']);
+    head.font = { bold: true };
+    head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+    // Left to be signed, and hatched the way the template hatches it so the blank reads as "fill
+    // this in" rather than as a field the return had nothing to say about. Who signs a filed return,
+    // and on what date, is settled when it is filed — a name pre-filled here would put a signature
+    // on a form nobody had agreed to sign.
+    for (const field of ['Name', 'Designation', 'e-mail ID', 'Tel. No. (O)', 'Tel. No. (R)', 'Place', 'Date']) {
+      const row = sheet.addRow([field, '', '']);
+      row.getCell(1).font = { bold: true };
+      row.getCell(1).fill = solidFill(XL.keyCell);
+      row.getCell(2).fill = hatchFill();
+      row.getCell(3).fill = hatchFill();
+    }
+    boxAllCells(sheet, start, sheet.rowCount, 3);
+  }
+
+  /**
+   * The header every CIMS data sheet opens with: the dates its columns report.
+   *
+   * Yellow, as the template has it — the one thing on the sheet a filer sets, so it is the one
+   * thing not shaded like the figures below it.
+   */
+  private addCimsEndDates(sheet: ExcelJS.Worksheet, label: string): void {
+    const row = sheet.addRow([label, ...this.cimsDates]);
+    row.font = { bold: true };
+    row.getCell(1).alignment = { horizontal: 'right' };
+    for (let c = 2; c <= this.cimsDates.length + 1; c++) {
+      row.getCell(c).alignment = { horizontal: 'center' };
+      row.getCell(c).fill = solidFill(XL.auditYellow);
+    }
+  }
+
+  /**
+   * The template's shading, which is what makes one of its sheets readable at a glance.
+   *
+   * Three states, and the colour is the only thing that tells them apart: every label cell is grey,
+   * a figure the form computes is blue, and a figure a bank writes in by hand is left white. On a
+   * sheet where most of the numbers are 0.00 that is the whole of the information — blue says "this
+   * is nil because the form worked it out", white says "nobody has filled this in". An all-white
+   * sheet makes those two look identical.
+   */
+  private shadeCimsRow(sheet: ExcelJS.Worksheet, row: ExcelJS.Row, heading: boolean, computed: boolean): void {
+    row.getCell(1).fill = solidFill(XL.headerGrey);
+    const last = this.cimsDates.length + 1;
+    for (let c = 2; c <= last; c++) {
+      if (heading) {
+        // A heading has no figures of its own; the template greys the whole band.
+        row.getCell(c).fill = solidFill(XL.headerGrey);
+      } else if (computed) {
+        row.getCell(c).fill = solidFill(XL.derivedBlue);
+      }
+    }
+  }
+
+  private addCimsSection(sheet: ExcelJS.Worksheet, label: string): void {
+    const row = sheet.addRow([label]);
+    row.font = { bold: true };
+    row.getCell(1).alignment = { wrapText: true };
+    row.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+  }
+
+  /**
+   * One figure line across the dated columns.
+   *
+   * A line the return computes is written and shaded blue. A line it does not carry is left white
+   * and empty rather than filled with zeros: on Part D, which this bank does not file, a column of
+   * 0.00 claims the bank worked the figure out and found nothing, when in truth it never reported
+   * that part at all.
+   */
+  private addCimsFigures(sheet: ExcelJS.Worksheet, label: string, values?: number[], bold = false): void {
+    const row = sheet.addRow([label, ...(values ?? this.cimsDates.map((): null => null))]);
+    row.getCell(1).alignment = { wrapText: true };
+    if (bold) {
+      row.font = { bold: true };
+    }
+    this.formatCimsFigures(row);
+    this.shadeCimsRow(sheet, row, false, values !== undefined);
+  }
+
+  private formatCimsFigures(row: ExcelJS.Row, from = 2): void {
+    for (let c = from; c < from + this.cimsDates.length; c++) {
+      row.getCell(c).numFmt = '#,##0.00';
+      row.getCell(c).alignment = { horizontal: 'right' };
+    }
+  }
+
+  /**
+   * The rate a requirement was struck at, as it is named on the form.
+   *
+   * "rate not set" rather than a blank or a zero: a requirement computed at no rate is not a
+   * requirement of nothing, and a statutory line that reads "0% of IV b)" states a rate the bank
+   * was never given.
+   */
+  private cimsRate(rate: number | null | undefined): string {
+    return rate === null || rate === undefined ? 'rate not set' : `${rate}%`;
+  }
+
+  /**
+   * The base dates the two columns are charged on, for the wording of the requirement lines.
+   *
+   * The template says "Last Friday of the Second Preceding fortnight". This bank's base rule is the
+   * previous month's matching fortnight close, so the dates themselves are printed instead — a
+   * filer can check them, where a Friday that was never used cannot be checked at all.
+   */
+  private cimsBaseDates(): string {
+    const bases = this.statutory?.baseColumns ?? [];
+    return bases.length ? bases.join(' / ') : 'base date not stated';
+  }
+
+  /**
+   * Whether the bank's own liabilities moved on this day from the day before.
+   *
+   * The daily table is thirty rows that mostly repeat, and the days worth looking at are the ones
+   * where something changed. Marked rather than left to be spotted: a reader scanning a column of
+   * near-identical figures will not find the row where the fourth digit differs.
+   *
+   * The first day has nothing before it in the table, so it is never marked — it is a starting
+   * position, not a movement.
+   */
+  dailyOwnMoved(day: Form1DailyRow, index: number): boolean {
+    if (index === 0 || day.ownLiabilities === undefined) {
+      return false;
+    }
+    const previous = this.statutory?.daily?.days?.[index - 1]?.ownLiabilities;
+    return previous !== undefined && previous !== day.ownLiabilities;
+  }
+
+  /** A part's line, found by the opening of its label, as its values across the dated columns. */
+  private cimsPartCLine(startsWith: string): number[] | undefined {
+    return this.statutory?.partC?.lines?.find((line) => (line.label ?? '').startsWith(startsWith))?.values;
+  }
+
+  private cimsLastColumn(): string {
+    return this.columnLetter(this.cimsDates.length + 1);
+  }
+
+  /** Spreadsheet column letter for a 1-based index — A, B, … Z, AA. */
+  private columnLetter(index: number): string {
+    let n = index;
+    let letters = '';
+    while (n > 0) {
+      const remainder = (n - 1) % 26;
+      letters = String.fromCharCode(65 + remainder) + letters;
+      n = Math.floor((n - 1) / 26);
+    }
+    return letters;
+  }
+
   /**
    * Form 1 saves the statutory form, because that is the only Form 1 this screen shows.
    *
@@ -1276,6 +1912,104 @@ export abstract class ReserveReturnBase {
    * the reader built for the other shape.
    */
 
+  /**
+   * The day-by-day position, as its own sheet in the workbook.
+   *
+   * Written only where the return carries it, so a saved snapshot taken before this existed still
+   * exports rather than failing on a sheet it has no rows for.
+   */
+  private addDailySheet(wb: ExcelJS.Workbook): void {
+    const daily = this.statutory?.daily;
+    if (!daily?.days?.length) {
+      return;
+    }
+    const sheet = wb.addWorksheet('Day by day');
+    sheet.columns = [
+      { width: 14 },
+      { width: 18 },
+      { width: 14 },
+      { width: 18 },
+      { width: 18 },
+      { width: 18 },
+      { width: 20 },
+      { width: 18 },
+      { width: 18 },
+      { width: 20 }
+    ];
+    addBanner(sheet, `Day by day — ${daily.from} to ${daily.to}`, 'J');
+
+    // A day short is a breach. It goes above the table, where it is read before the figures rather
+    // than hunted for among thirty rows.
+    if (daily.crrShortDays || daily.slrShortDays) {
+      const warn = sheet.addRow([
+        `CRR short on ${daily.crrShortDays} of ${daily.dayCount} days; SLR short on ${daily.slrShortDays}.`
+      ]);
+      warn.font = { bold: true, color: { argb: 'FFC5221F' } };
+      sheet.addRow([]);
+    }
+
+    const start = sheet.rowCount + 1;
+    const head = sheet.addRow([
+      'Date',
+      'NDTL on the day',
+      'Charged on',
+      'Base NDTL',
+      'CRR required',
+      'CRR maintained',
+      'CRR surplus / (short)',
+      'SLR required',
+      'SLR maintained',
+      'SLR surplus / (short)'
+    ]);
+    head.font = { bold: true };
+    head.alignment = { wrapText: true, horizontal: 'center' };
+    head.eachCell((c) => (c.fill = solidFill(XL.headerGrey)));
+
+    for (const day of daily.days) {
+      const row = sheet.addRow([
+        day.date,
+        day.ownLiabilities ?? '',
+        day.baseDate,
+        day.baseLiabilities ?? '',
+        day.crrRequired,
+        day.crrMaintained,
+        day.crrSurplus,
+        day.slrRequired,
+        day.slrMaintained,
+        day.slrSurplus
+      ]);
+      // Column 3 is a date, so the figures run 2, then 4 onward.
+      for (const c of [2, 4, 5, 6, 7, 8, 9, 10]) {
+        row.getCell(c).numFmt = '#,##0.00';
+        row.getCell(c).alignment = { horizontal: 'right' };
+      }
+      // A shortfall is marked on the row, not only by its sign: a minus in a column of figures is
+      // the easiest thing on a printed sheet to read past.
+      if (day.crrSurplus < 0 || day.slrSurplus < 0) {
+        row.font = { color: { argb: 'FFC5221F' } };
+      }
+    }
+
+    sheet.addRow([]);
+    // Under the Maintained columns the averages belong to — column 6 for CRR, column 9 for SLR.
+    const avg = sheet.addRow([
+      'Average held',
+      '',
+      '',
+      '',
+      '',
+      daily.crrAverage,
+      '',
+      '',
+      daily.slrAverage,
+      ''
+    ]);
+    avg.font = { bold: true };
+    avg.getCell(6).numFmt = '#,##0.00';
+    avg.getCell(9).numFmt = '#,##0.00';
+    boxAllCells(sheet, start, sheet.rowCount, 10);
+  }
+
   /** One of a part's computed rows, written only where the part carries it. */
   private addStatutoryTotals(sheet: ExcelJS.Worksheet, label: string, values?: number[]): void {
     if (!values?.length) {
@@ -1286,7 +2020,9 @@ export abstract class ReserveReturnBase {
       ...values
     ]);
     row.font = { bold: true };
-    for (let c = 2; c <= 4; c++) {
+    // The values themselves say how many columns there are, so this row formats what it wrote.
+    const lastColumn = values.length + 1;
+    for (let c = 2; c <= lastColumn; c++) {
       row.getCell(c).numFmt = '#,##0.00';
       row.getCell(c).alignment = { horizontal: 'right' };
     }

src/app/rbi-circulars/reserve-return/reserve-return.component.html

@@ -534,12 +534,51 @@
                  heading, so the picker does not offer one. -->
             <mat-form-field appearance="outline" subscriptSizing="dynamic" class="f1s-prompt__date">
               <mat-label>First column</mat-label>
-              <input matInput type="date" [max]="today" [(ngModel)]="statutoryFirstColumn" required />
+              <input
+                matInput
+                type="date"
+                [max]="today"
+                [(ngModel)]="statutoryFirstColumn"
+                (ngModelChange)="onStatutoryColumnChange('first')"
+                required
+              />
             </mat-form-field>
             <mat-form-field appearance="outline" subscriptSizing="dynamic" class="f1s-prompt__date">
               <mat-label>Second column</mat-label>
-              <input matInput type="date" [max]="today" [(ngModel)]="statutorySecondColumn" required />
+              <input
+                matInput
+                type="date"
+                [max]="today"
+                [(ngModel)]="statutorySecondColumn"
+                (ngModelChange)="onStatutoryColumnChange('second')"
+                required
+              />
             </mat-form-field>
+          </div>
+
+          <!--
+            The base each column's ratios are charged on. Filled from the rule as soon as a close is
+            entered — the matching close one month earlier — and editable from
+            there. Shown rather than hidden because every required amount on the form is a percentage
+            of the liabilities on this date, and a requirement whose base nobody can see cannot be
+            checked. Editable because a bank that migrated part-way through has a base the rule
+            produces and the ledger cannot answer, and the ratio then reads nil against real
+            liabilities.
+          -->
+          <div class="f1s-prompt__row f1s-prompt__row--derived">
+            <mat-form-field appearance="outline" subscriptSizing="dynamic" class="f1s-prompt__date">
+              <mat-label>Base for first column</mat-label>
+              <input matInput type="date" [max]="statutoryFirstColumn || today" [(ngModel)]="statutoryFirstBase" />
+            </mat-form-field>
+            <mat-form-field appearance="outline" subscriptSizing="dynamic" class="f1s-prompt__date">
+              <mat-label>Base for second column</mat-label>
+              <input matInput type="date" [max]="statutorySecondColumn || today" [(ngModel)]="statutorySecondBase" />
+            </mat-form-field>
+          </div>
+
+          <!-- On its own line, under both pairs. Sharing a row with the last pair left it hanging
+               off one corner of a 2×2 grid, reading as a field's own button rather than the form's. -->
+          <div class="f1s-prompt__go">
             <button
               mat-raised-button
               color="primary"
@@ -550,17 +589,14 @@
             </button>
           </div>
 
-          <!-- The base date follows from the dates entered rather than being asked for: it is fixed
-               by the rules at the last Friday of the second preceding fortnight, so letting anyone
-               type a different one would put a figure on a filed form that the rules do not allow. -->
           @if (statutoryFirstColumn && statutorySecondColumn) {
             <p class="f1s-prompt__hint">
               Made up to <strong>{{ statutorySecondColumn }}</strong
-              >. Both ratios are charged on the last Friday of the second preceding fortnight, stated on the form
-              itself.
+              >. The base dates above are the matching close one month earlier — change either
+              one if the bank files on a different base.
             </p>
           } @else {
-            <p class="f1s-prompt__hint">Enter both fortnight closing dates to run the form.</p>
+            <p class="f1s-prompt__hint">Enter both fortnight closing dates — the base dates fill in from them.</p>
           }
 
           <!-- A filed return almost always carries one month's two closes, so both fill in one click. -->
@@ -586,7 +622,7 @@
           @if (statutoryDate) {
             <p class="f1s-prompt__hint">
               The return reports the month ending on or before <strong>{{ statutoryDate }}</strong
-              >, and charges the ratio on the last Friday of the second preceding fortnight.
+              >, and charges the ratio on the matching close one month earlier.
             </p>
           }
         }
@@ -642,13 +678,17 @@
           <thead>
             <tr>
               <th class="f1s-table__particulars">Particulars</th>
-              <!-- The first two columns are fortnight closes; the third is the base both ratios are
-                   charged on. Dates alone made the third read as a third close, and a reviewer had
-                   no way to see which column the required amounts below were computed from. -->
+              <!-- Each column is a fortnight close, with the date its ratios are charged on named
+                   beneath it. The base used to be a column of its own, where its balances sat
+                   beside the closes' and read as a third period the bank was reporting rather than
+                   as the figures behind the requirement. -->
               @for (col of statutory.columns; track col; let i = $index) {
                 <th class="f1s-table__num">
                   {{ col }}
-                  <span class="f1s-table__colnote">{{ i === 2 ? 'base for ratios' : 'fortnight close' }}</span>
+                  <span class="f1s-table__colnote">fortnight close</span>
+                  @if (statutory.baseColumns?.[i]) {
+                    <span class="f1s-table__colbase">charged on {{ statutory.baseColumns[i] }}</span>
+                  }
                 </th>
               }
             </tr>
@@ -679,7 +719,7 @@
                        requirement hangs off those dates, so they are printed rather than inferred. -->
                   @if (line.baseDates?.length) {
                     <tr class="f1s-subnote">
-                      <td>Base dates — last Friday of the second preceding fortnight</td>
+                      <td>Base dates — the matching close one month earlier</td>
                       @for (d of line.baseDates; track $index) {
                         <td class="f1s-table__num">{{ d }}</td>
                       }
@@ -703,6 +743,104 @@
           <div class="f1s-sign__line">AUTHORISED SIGNATORY</div>
         </div>
       </div>
+
+      <!--
+        ═══ Day by day ═══
+        Both ratios are reckoned over the period, not on the two closes alone — a bank that held
+        nothing for a fortnight and topped up on the close has a form whose columns pass. This is
+        the position the compliance actually turns on, and the first thing an inspector asks for.
+      -->
+      @if (statutory.daily?.days?.length) {
+        <div class="f1s-daily">
+          <h3 class="f1s-daily__title">
+            Day by day — {{ statutory.daily!.from }} to {{ statutory.daily!.to }}
+            @if (statutory.daily!.crrShortDays || statutory.daily!.slrShortDays) {
+              <span class="f1s-daily__flag">
+                @if (statutory.daily!.crrShortDays) {
+                  CRR short on {{ statutory.daily!.crrShortDays }} of {{ statutory.daily!.dayCount }} days.
+                }
+                @if (statutory.daily!.slrShortDays) {
+                  SLR short on {{ statutory.daily!.slrShortDays }} of {{ statutory.daily!.dayCount }} days.
+                }
+              </span>
+            }
+          </h3>
+          <p class="f1s-daily__hint">
+            Each day is charged on its own base, which moves at the fortnight boundary. A shortfall shows as a negative.
+          </p>
+
+          <div class="f1s-daily__stats">
+            <div class="f1s-stat">
+              <span class="f1s-stat__label">CRR average held</span>
+              <span class="f1s-stat__value">{{ amount(statutory.daily!.crrAverage) }}</span>
+              <span class="f1s-stat__sub">
+                lowest {{ amount(statutory.daily!.crrLowest) }} on {{ statutory.daily!.crrLowestOn }}
+              </span>
+            </div>
+            <div class="f1s-stat">
+              <span class="f1s-stat__label">SLR average held</span>
+              <span class="f1s-stat__value">{{ amount(statutory.daily!.slrAverage) }}</span>
+              <span class="f1s-stat__sub">
+                lowest {{ amount(statutory.daily!.slrLowest) }} on {{ statutory.daily!.slrLowestOn }}
+              </span>
+            </div>
+            <div class="f1s-stat">
+              <span class="f1s-stat__label">Days counted</span>
+              <span class="f1s-stat__value">{{ statutory.daily!.dayCount }}</span>
+              <span class="f1s-stat__sub">to {{ statutory.daily!.to }}</span>
+            </div>
+          </div>
+
+          <table class="f1s-table f1s-daily__table">
+            <thead>
+              <tr>
+                <th rowspan="2" class="f1s-table__particulars">Date</th>
+                <!-- The liabilities, before the ratios. Two of them, because they are not the same
+                     figure: the day's own move daily, the base holds still for the whole fortnight,
+                     and it is the base the requirement is charged on. Without both, a table of
+                     identical rows gives no way to see a day the bank's liabilities moved. -->
+                <th colspan="3" class="f1s-table__num">Net demand &amp; time liabilities</th>
+                <th colspan="3" class="f1s-table__num">Section 18 — CRR</th>
+                <th colspan="3" class="f1s-table__num">Section 24 — SLR</th>
+              </tr>
+              <tr>
+                <th class="f1s-table__num">On the day</th>
+                <th class="f1s-table__num">Charged on</th>
+                <th class="f1s-table__num">Base amount</th>
+                <th class="f1s-table__num">Required</th>
+                <th class="f1s-table__num">Maintained</th>
+                <th class="f1s-table__num">Surplus / (short)</th>
+                <th class="f1s-table__num">Required</th>
+                <th class="f1s-table__num">Maintained</th>
+                <th class="f1s-table__num">Surplus / (short)</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (day of statutory.daily!.days; track day.date) {
+                <tr [class.f1s-daily--short]="day.crrSurplus < 0 || day.slrSurplus < 0">
+                  <td>{{ day.date }}</td>
+                  <!-- A day the bank's own liabilities moved is marked, because that is the thing
+                       this column exists to show and on thirty near-identical rows it is exactly
+                       what the eye goes past. -->
+                  <td class="f1s-table__num" [class.f1s-daily__moved]="dailyOwnMoved(day, $index)">
+                    {{ day.ownLiabilities === undefined ? '—' : amount(day.ownLiabilities) }}
+                  </td>
+                  <td class="f1s-table__num f1s-daily__base">{{ day.baseDate }}</td>
+                  <td class="f1s-table__num f1s-daily__base">
+                    {{ day.baseLiabilities === undefined ? '—' : amount(day.baseLiabilities) }}
+                  </td>
+                  <td class="f1s-table__num">{{ amount(day.crrRequired) }}</td>
+                  <td class="f1s-table__num">{{ amount(day.crrMaintained) }}</td>
+                  <td class="f1s-table__num" [class.f1s-neg]="day.crrSurplus < 0">{{ amount(day.crrSurplus) }}</td>
+                  <td class="f1s-table__num">{{ amount(day.slrRequired) }}</td>
+                  <td class="f1s-table__num">{{ amount(day.slrMaintained) }}</td>
+                  <td class="f1s-table__num" [class.f1s-neg]="day.slrSurplus < 0">{{ amount(day.slrSurplus) }}</td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      }
     }
   }
 
@@ -831,10 +969,18 @@
               <thead>
                 <tr>
                   <th class="f1s-table__particulars">Particulars</th>
+                  <!-- A snapshot saved before the base became a note rather than a column still
+                       carries three columns, so the heading is read from the snapshot itself: its
+                       third column was the base, and saying so keeps an old saved return readable. -->
                   @for (col of saved.columns; track col; let i = $index) {
                     <th class="f1s-table__num">
                       {{ col }}
-                      <span class="f1s-table__colnote">{{ i === 2 ? 'base for ratios' : 'fortnight close' }}</span>
+                      <span class="f1s-table__colnote">
+                        {{ saved.columns.length > 2 && i === 2 ? 'base for ratios' : 'fortnight close' }}
+                      </span>
+                      @if (saved.baseColumns?.[i]) {
+                        <span class="f1s-table__colbase">charged on {{ saved.baseColumns[i] }}</span>
+                      }
                     </th>
                   }
                 </tr>

src/app/system/system.service.ts

@@ -421,6 +421,14 @@ export class SystemService {
     return this.http.get(`/businessdate/${dateType}`);
   }
 
+  /**
+   * @returns {Observable<{ today: string }>} The bank's "today" (yyyy-MM-dd): the business date while
+   * enable-business-date is on, the server's date while it is off. Readable by any signed-in user.
+   */
+  getBusinessToday(): Observable<{ today: string }> {
+    return this.http.get<{ today: string }>('/branchday/today');
+  }
+
   /**
    * @param {any} dateData Business Date data to be updated.
    * @returns {Observable<any>}

src/app/tds-reports/tds-interest-export.spec.ts

@@ -0,0 +1,138 @@
+/**
+ * @jest-environment-options {"customExportConditions": ["node", "node-addons"]}
+ */
+/**
+ * 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 { installTdsConfigFixture } from '../letter-mgmt/certificates/form-15gh/tds-config.fixture';
+import { buildTdsInterestWorkbook } from './tds-interest-export';
+import { TdsDeductee, setTdsDeductees } from './tds-reports-data';
+import { tdsInterestRows, tdsInterestSummary } from './tds-reports.compute';
+
+installTdsConfigFixture();
+
+const FY = '2025-26';
+const Q = ['2025-06-30', '2025-09-30', '2025-12-31', '2026-03-31'];
+
+const BOOK: TdsDeductee[] = [
+  {
+    clientId: 1,
+    customerId: 'C1',
+    name: 'Ramesh',
+    pan: 'ABCPR1234K',
+    dob: '1980-05-01',
+    branchCode: 'Head Office',
+    declarations: {},
+    accounts: [
+      {
+        id: 11,
+        accountNo: 'FD11',
+        depositTypeCode: 'depositAccountType.fixedDeposit',
+        clientId: 1,
+        credits: Q.map((date) => ({ date, amount: 15_000 })),
+        deductions: [{ date: Q[3], amount: 6_000 }]
+      },
+      {
+        id: 12,
+        accountNo: 'SB12',
+        depositTypeCode: 'depositAccountType.savingsDeposit',
+        clientId: 1,
+        credits: [{ date: Q[1], amount: 1_200 }],
+        deductions: []
+      }
+    ]
+  },
+  {
+    clientId: 4,
+    customerId: 'C4',
+    name: 'Kamala',
+    pan: 'ABCPK9012M',
+    dob: '1979-07-07',
+    branchCode: 'bhopal',
+    declarations: { [FY]: { kind: '15G', acceptedOn: '2025-10-15', fy: FY, uin: 'UIN0001' } },
+    accounts: [
+      {
+        id: 41,
+        accountNo: 'FD41',
+        depositTypeCode: 'depositAccountType.fixedDeposit',
+        clientId: 4,
+        credits: Q.map((date) => ({ date, amount: 20_000 })),
+        deductions: []
+      }
+    ]
+  }
+];
+
+function build() {
+  setTdsDeductees(BOOK);
+  const filter = {
+    fy: FY,
+    branchCode: '',
+    quarter: 0 as const,
+    band: '' as const,
+    search: '',
+    crossedOnly: false,
+    nearThresholdOnly: false
+  };
+  const rows = tdsInterestRows(filter);
+  return buildTdsInterestWorkbook({
+    fy: FY,
+    scopeLabel: 'All branches',
+    rules: { general: 50_000, senior: 100_000, rate: 10, rateNoPan: 20 },
+    statement: 'Form 26Q',
+    rows,
+    declaredRows: rows.filter((r) => r.hasDeclaration),
+    summary: tdsInterestSummary(filter),
+    statusOf: () => ({ label: 'status' })
+  });
+}
+
+describe('TDS register workbook', () => {
+  it('has the four sheets a reader expects, in order', () => {
+    expect(build().worksheets.map((w) => w.name)).toEqual(['Summary', 'Customers', 'Accounts', 'Form 121 given']);
+  });
+
+  it('lists one row per customer, with the figures as numbers and a live total', () => {
+    const ws = build().getWorksheet('Customers')!;
+    expect(ws.getRow(3).getCell(2).value).toBe('Customer name');
+    const at = [4, 5].find((n) => ws.getRow(n).getCell(2).value === 'Ramesh')!;
+    const ramesh = ws.getRow(at);
+    expect(ramesh.getCell(2).value).toBe('Ramesh');
+    expect(ramesh.getCell(7).value).toBe(60_000);
+    expect(ramesh.getCell(7).numFmt).toContain('#,##0.00');
+    expect(ramesh.getCell(11).value).toBe(6_000);
+    expect(ramesh.getCell(12).value).toBe(6_000);
+    expect(ramesh.getCell(13).value).toEqual({ formula: `K${at}-L${at}` });
+    const total = ws.getRow(6);
+    expect(total.getCell(2).value).toBe('Total');
+    expect(total.getCell(7).value).toEqual({ formula: 'SUM(G4:G5)' });
+  });
+
+  it('lists every account behind the figures, saying which ones count', () => {
+    const ws = build().getWorksheet('Accounts')!;
+    const byAccount = new Map([4, 5, 6].map((n) => [ws.getRow(n).getCell(4).value, ws.getRow(n)]));
+    expect([...byAccount.keys()].sort()).toEqual(['FD11', 'FD41', 'SB12']);
+    expect(byAccount.get('SB12')!.getCell(6).value).toBe('No');
+    expect(byAccount.get('FD11')!.getCell(6).value).toBe('Yes');
+    expect(byAccount.get('FD11')!.getCell(10).value).toBeInstanceOf(Date);
+  });
+
+  it('puts the declarants on their own sheet with the TDS the form saved', () => {
+    const ws = build().getWorksheet('Form 121 given')!;
+    const kamala = ws.getRow(4);
+    expect(kamala.getCell(2).value).toBe('Kamala');
+    expect(kamala.getCell(7).value).toBe('UIN0001');
+    expect(kamala.getCell(10).value).toBe(40_000);
+    expect(kamala.getCell(11).value).toBe(4_000);
+  });
+
+  it('writes a file Excel can open', async () => {
+    const buffer = await build().xlsx.writeBuffer();
+    expect(buffer.byteLength).toBeGreaterThan(5_000);
+  });
+});

src/app/tds-reports/tds-interest-export.ts

@@ -0,0 +1,379 @@
+/**
+ * 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 * as ExcelJS from 'exceljs';
+
+import { TdsAccountLine, TdsInterestRow, TdsInterestSummary } from './tds-reports.compute';
+
+/** What the workbook needs from the screen, so it prints exactly what the user is looking at. */
+export interface TdsExportInput {
+  fy: string;
+  scopeLabel: string;
+  /** The financial-year rules, from Organization › TDS Configuration. */
+  rules: { general: number; senior: number; rate: number; rateNoPan: number } | null;
+  /** The quarterly return the declarants' gross-paid interest is reported in. */
+  statement: string;
+  rows: TdsInterestRow[];
+  declaredRows: TdsInterestRow[];
+  summary: TdsInterestSummary;
+  statusOf: (row: TdsInterestRow) => { label: string };
+}
+
+const MONEY = '"₹"#,##0.00';
+const DATE = 'dd-mmm-yyyy';
+const NAVY = 'FF1F4E79';
+const STRIPE = 'FFF3F6FA';
+const LINE = 'FFD0D7E2';
+const GREEN = 'FF15803D';
+const AMBER = 'FFB45309';
+
+const ACCOUNT_TYPE: Record<TdsAccountLine['type'], string> = {
+  FD: 'Fixed deposit',
+  RD: 'Recurring deposit',
+  SB: 'Savings',
+  OTHER: 'Other'
+};
+
+/** A column: its heading, width and, for figures, the cell format. */
+interface Col {
+  header: string;
+  width: number;
+  fmt?: string;
+  /** Totalled in the closing row. */
+  sum?: boolean;
+}
+
+/**
+ * The Deposit Interest & TDS register as a workbook a branch can read without the screen beside it:
+ * a one-page summary, one row per customer, one row per account, and the declarants on their own.
+ */
+export function buildTdsInterestWorkbook(input: TdsExportInput): ExcelJS.Workbook {
+  const wb = new ExcelJS.Workbook();
+  wb.creator = 'CBS Nexora';
+  wb.created = new Date();
+
+  summarySheet(wb, input);
+  customersSheet(wb, input);
+  accountsSheet(wb, input);
+  declarationsSheet(wb, input);
+  return wb;
+}
+
+// ─────────────────────────────── Sheets ───────────────────────────────
+
+function summarySheet(wb: ExcelJS.Workbook, input: TdsExportInput): void {
+  const ws = wb.addWorksheet('Summary', { views: [{ showGridLines: false }] });
+  ws.columns = [
+    { width: 46 },
+    { width: 22 }
+  ];
+  title(ws, `Deposit Interest & TDS — FY ${input.fy}`, 2);
+  ws.addRow([`Branch: ${input.scopeLabel}`]);
+  ws.addRow([`Prepared on: ${new Date().toLocaleDateString('en-IN', { day: '2-digit', month: 'short', year: 'numeric' })}`]);
+  ws.getRow(2).font = { color: { argb: 'FF555555' } };
+  ws.getRow(3).font = { color: { argb: 'FF555555' } };
+  ws.addRow([]);
+
+  const s = input.summary;
+  section(ws, 'Key figures');
+  const figures: [string, number, string?][] = [
+    ['Customers in this report', s.deductees],
+    ['  of whom have an FD / RD being tracked', s.trackedCustomers],
+    ['FD / RD interest received this year', s.applicableInterest, MONEY],
+    ['Savings interest (shown only — no TDS)', s.exemptInterest, MONEY],
+    ['Customers over the TDS limit', s.crossed],
+    ['TDS due by the rules', s.totalTds, MONEY],
+    ['TDS actually deducted from accounts', s.actualTds, MONEY],
+    ['Difference (due − deducted) — should be 0', s.totalTds - s.actualTds, MONEY],
+    ['Customers with Form 121 / 15G / 15H', s.declarations],
+    ['TDS not deducted because of those forms', s.tdsSaved, MONEY],
+    ['Interest paid without TDS (report in the return)', s.paidWithoutDeduction, MONEY]
+  ];
+  for (const [label, value, fmt] of figures) {
+    const r = ws.addRow([label, value]);
+    r.getCell(2).numFmt = fmt ?? '#,##0';
+    r.getCell(2).alignment = { horizontal: 'right' };
+    boxRow(r, 2);
+  }
+  // The control figure stands out when it is not zero.
+  const diffRow = ws.getRow(ws.rowCount - 3);
+  if (Math.round(s.totalTds - s.actualTds) !== 0) {
+    diffRow.font = { bold: true, color: { argb: AMBER } };
+  }
+  ws.addRow([]);
+
+  if (input.rules) {
+    section(ws, 'Rules for this year');
+    const rules: [string, string][] = [
+      ['TDS limit — below 60', rupees(input.rules.general)],
+      ['TDS limit — senior citizen (60+)', rupees(input.rules.senior)],
+      ['Rate with PAN', `${input.rules.rate}%`],
+      ['Rate without PAN', `${input.rules.rateNoPan}%`]
+    ];
+    for (const [label, value] of rules) {
+      const r = ws.addRow([label, value]);
+      r.getCell(2).alignment = { horizontal: 'right' };
+      boxRow(r, 2);
+    }
+    ws.addRow([]);
+  }
+
+  section(ws, 'How to read this workbook');
+  const notes = [
+    'Only interest from fixed and recurring deposits counts toward the limit — on the day it reaches savings, or when paid out at closure.',
+    "A savings account's own interest is shown for information and never attracts TDS.",
+    "Once a customer's interest for the year crosses the limit, TDS is due on the whole year's interest, not only the excess.",
+    'A Form 121 / 15G / 15H stops TDS on interest received after the form was accepted.',
+    'Sheet "Customers": one row per customer. Sheet "Accounts": every account behind those figures.',
+    'Sheet "Form 121 given": customers with a declaration, and the TDS the form saved them.'
+  ];
+  for (const n of notes) {
+    const r = ws.addRow([`•  ${n}`]);
+    ws.mergeCells(r.number, 1, r.number, 2);
+    r.alignment = { wrapText: true, vertical: 'top' };
+    r.height = 30;
+  }
+}
+
+function customersSheet(wb: ExcelJS.Workbook, input: TdsExportInput): void {
+  const cols: Col[] = [
+    { header: 'S.No', width: 6 },
+    { header: 'Customer name', width: 26 },
+    { header: 'Customer ID', width: 13 },
+    { header: 'PAN', width: 13 },
+    { header: 'Branch', width: 14 },
+    { header: 'Age group', width: 12 },
+    { header: 'FD/RD interest received (₹)', width: 16, fmt: MONEY, sum: true },
+    { header: 'TDS limit (₹)', width: 13, fmt: MONEY },
+    { header: 'Over the limit?', width: 10 },
+    { header: 'Rate', width: 7 },
+    { header: 'TDS due (₹)', width: 13, fmt: MONEY, sum: true },
+    { header: 'TDS deducted (₹)', width: 13, fmt: MONEY, sum: true },
+    { header: 'Difference (₹)', width: 13, fmt: MONEY, sum: true },
+    { header: 'Form 121 given?', width: 10 },
+    { header: 'Status', width: 42 }
+  ];
+  const ws = table(wb, 'Customers', `Customers — FY ${input.fy} · ${input.scopeLabel}`, cols);
+
+  input.rows.forEach((r, i) => {
+    const line = ws.addRow([
+      i + 1,
+      r.deductee.name,
+      r.deductee.customerId,
+      r.deductee.pan || 'Not on record',
+      r.branchCode,
+      r.band === 'SENIOR' ? 'Senior (60+)' : 'Below 60',
+      r.tdsApplicableInterest,
+      r.threshold,
+      r.crossed ? 'Yes' : 'No',
+      `${Math.round(r.rateApplied * 100)}%`,
+      r.schedule.totalTds,
+      r.actualTds,
+      null,
+      r.hasDeclaration ? 'Yes' : 'No',
+      input.statusOf(r).label
+    ]);
+    // Due − deducted as a formula, so an edited figure keeps the check honest.
+    line.getCell(13).value = { formula: `K${line.number}-L${line.number}` };
+    styleDataRow(line, cols, i);
+    if (!r.deductee.pan) {
+      line.getCell(4).font = { color: { argb: AMBER } };
+    }
+    if (r.crossed) {
+      line.getCell(9).font = { bold: true, color: { argb: AMBER } };
+    }
+    if (Math.round(r.schedule.totalTds - r.actualTds) !== 0) {
+      line.getCell(13).font = { bold: true, color: { argb: AMBER } };
+    }
+  });
+  totals(ws, cols, input.rows.length);
+}
+
+function accountsSheet(wb: ExcelJS.Workbook, input: TdsExportInput): void {
+  const cols: Col[] = [
+    { header: 'S.No', width: 6 },
+    { header: 'Customer name', width: 26 },
+    { header: 'Customer ID', width: 13 },
+    { header: 'Account no.', width: 19 },
+    { header: 'Account type', width: 17 },
+    { header: 'Counted for TDS?', width: 10 },
+    { header: 'Why', width: 46 },
+    { header: 'Interest this year (₹)', width: 15, fmt: MONEY, sum: true },
+    { header: 'Credits', width: 8 },
+    { header: 'Last credited', width: 13, fmt: DATE },
+    { header: 'TDS deducted (₹)', width: 13, fmt: MONEY, sum: true },
+    { header: 'Account held by', width: 22 }
+  ];
+  const ws = table(wb, 'Accounts', `Accounts — FY ${input.fy} · ${input.scopeLabel}`, cols);
+
+  let n = 0;
+  for (const r of input.rows) {
+    for (const a of r.accounts) {
+      const line = ws.addRow([
+        n + 1,
+        r.deductee.name,
+        r.deductee.customerId,
+        a.accountNo,
+        ACCOUNT_TYPE[a.type],
+        a.tracked ? 'Yes' : 'No',
+        a.reason,
+        a.interest,
+        a.postings,
+        a.lastPostedOn ? isoToDate(a.lastPostedOn) : '—',
+        a.tdsDeducted,
+        a.holderName ?? 'Same customer'
+      ]);
+      styleDataRow(line, cols, n);
+      if (a.tracked) {
+        line.getCell(6).font = { bold: true, color: { argb: GREEN } };
+      }
+      n++;
+    }
+  }
+  totals(ws, cols, n);
+}
+
+function declarationsSheet(wb: ExcelJS.Workbook, input: TdsExportInput): void {
+  const cols: Col[] = [
+    { header: 'S.No', width: 6 },
+    { header: 'Customer name', width: 26 },
+    { header: 'Customer ID', width: 13 },
+    { header: 'PAN', width: 13 },
+    { header: 'Branch', width: 14 },
+    { header: 'Form', width: 10 },
+    { header: 'UIN', width: 18 },
+    { header: 'Accepted on', width: 13, fmt: DATE },
+    { header: 'FD/RD interest received (₹)', width: 16, fmt: MONEY, sum: true },
+    { header: `Paid without TDS — report in ${input.statement} (₹)`, width: 20, fmt: MONEY, sum: true },
+    { header: 'TDS not deducted because of the form (₹)', width: 18, fmt: MONEY, sum: true },
+    { header: 'TDS deducted before the form (₹)', width: 16, fmt: MONEY, sum: true }
+  ];
+  const ws = table(wb, 'Form 121 given', `Customers with Form 121 / 15G / 15H — FY ${input.fy} · ${input.scopeLabel}`, cols);
+
+  input.declaredRows.forEach((r, i) => {
+    const line = ws.addRow([
+      i + 1,
+      r.deductee.name,
+      r.deductee.customerId,
+      r.deductee.pan || 'Not on record',
+      r.branchCode,
+      `Form ${r.form}`,
+      r.declarationUin ?? 'Not allotted',
+      r.declarationAcceptedOn ? isoToDate(r.declarationAcceptedOn) : '—',
+      r.tdsApplicableInterest,
+      r.paidWithoutDeduction,
+      r.tdsSaved,
+      r.actualTds
+    ]);
+    styleDataRow(line, cols, i);
+    if (!r.declarationUin) {
+      line.getCell(7).font = { color: { argb: AMBER } };
+    }
+  });
+  if (input.declaredRows.length === 0) {
+    const r = ws.addRow(['', 'No customer has a declaration on record for this year.']);
+    r.font = { italic: true, color: { argb: 'FF777777' } };
+  } else {
+    totals(ws, cols, input.declaredRows.length);
+  }
+}
+
+// ─────────────────────────────── Styling ───────────────────────────────
+
+/** A sheet with a title, a styled header row, frozen headings and a filter. */
+function table(wb: ExcelJS.Workbook, name: string, heading: string, cols: Col[]): ExcelJS.Worksheet {
+  const ws = wb.addWorksheet(name, { views: [{ state: 'frozen', ySplit: 3, showGridLines: false }] });
+  ws.columns = cols.map((c) => ({ width: c.width }));
+  title(ws, heading, cols.length);
+  ws.addRow([]);
+  const head = ws.addRow(cols.map((c) => c.header));
+  head.height = 34;
+  head.eachCell((cell) => {
+    cell.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+    cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: NAVY } };
+    cell.alignment = { vertical: 'middle', horizontal: 'center', wrapText: true };
+    cell.border = border();
+  });
+  ws.autoFilter = { from: { row: 3, column: 1 }, to: { row: 3, column: cols.length } };
+  return ws;
+}
+
+function title(ws: ExcelJS.Worksheet, text: string, span: number): void {
+  const r = ws.addRow([text]);
+  ws.mergeCells(r.number, 1, r.number, span);
+  r.font = { bold: true, size: 14, color: { argb: NAVY } };
+  r.height = 24;
+}
+
+function section(ws: ExcelJS.Worksheet, text: string): void {
+  const r = ws.addRow([text]);
+  r.font = { bold: true, color: { argb: 'FFFFFFFF' } };
+  r.getCell(1).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: NAVY } };
+  r.getCell(2).fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: NAVY } };
+}
+
+function styleDataRow(row: ExcelJS.Row, cols: Col[], index: number): void {
+  cols.forEach((c, i) => {
+    const cell = row.getCell(i + 1);
+    cell.border = border();
+    cell.alignment = { vertical: 'middle', wrapText: i === cols.length - 1 || c.width > 30 };
+    if (c.fmt) {
+      cell.numFmt = c.fmt;
+      cell.alignment = { ...cell.alignment, horizontal: 'right' };
+    }
+    if (index % 2 === 1) {
+      cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: STRIPE } };
+    }
+  });
+}
+
+/** A closing row that totals the money columns with live SUM formulas. */
+function totals(ws: ExcelJS.Worksheet, cols: Col[], count: number): void {
+  if (count === 0) {
+    return;
+  }
+  const first = 4;
+  const last = first + count - 1;
+  const r = ws.addRow(cols.map((c, i) => (i === 1 ? 'Total' : null)));
+  cols.forEach((c, i) => {
+    const cell = r.getCell(i + 1);
+    if (c.sum) {
+      const letter = ws.getColumn(i + 1).letter;
+      cell.value = { formula: `SUM(${letter}${first}:${letter}${last})` };
+      cell.numFmt = c.fmt ?? '#,##0';
+      cell.alignment = { horizontal: 'right' };
+    }
+    cell.font = { bold: true };
+    cell.border = { top: { style: 'medium', color: { argb: NAVY } }, bottom: { style: 'thin', color: { argb: LINE } } };
+  });
+}
+
+function boxRow(row: ExcelJS.Row, span: number): void {
+  for (let i = 1; i <= span; i++) {
+    row.getCell(i).border = border();
+  }
+}
+
+function border(): Partial<ExcelJS.Borders> {
+  const side = { style: 'thin' as const, color: { argb: LINE } };
+  return { top: side, left: side, bottom: side, right: side };
+}
+
+function rupees(n: number): string {
+  return `₹${Math.round(n).toLocaleString('en-IN')}`;
+}
+
+/** '2026-10-05' as a real date, so Excel sorts and filters it as one. */
+function isoToDate(iso: string): Date {
+  const [
+    y,
+    m,
+    d
+  ] = iso.slice(0, 10).split('-').map(Number);
+  return new Date(Date.UTC(y, m - 1, d));
+}

src/app/tds-reports/tds-interest-report.component.html

@@ -49,8 +49,11 @@
           account is which, and why.
         </li>
         <li>
-          Only <strong>fixed and recurring deposits</strong> are tracked. Savings interest is shown for information but
-          never attracts TDS.
+          Only the interest from <strong>fixed and recurring deposits that reaches the customer's savings account</strong>
+          is tracked — counted on the day it arrives. The savings account's own interest is shown for information but
+          never attracts TDS. Interest still inside an FD/RD counts when it is paid out at maturity or closure — to
+          savings, in cash or to a GL (then the TDS comes out of the payout). A full reinvestment into a new FD/RD is not
+          taxed.
         </li>
         @if (rules) {
           <li>
@@ -64,10 +67,14 @@
             record.
           </li>
         }
-        <li>A customer who has submitted Form 15G/15H is not deducted, even over the limit.</li>
         <li>
-          The TDS figures here are <strong>worked out by this report</strong> from the interest actually posted. They
-          are not debited from the customer's account automatically.
+          A customer who has submitted Form 15G/15H is not deducted on interest received after the form was accepted.
+        </li>
+        <li>
+          TDS is <strong>debited from the savings account</strong> at the moment the FD/RD interest that takes the
+          customer over the limit arrives, and credited to the TDS payable account. The FD/RD itself is never debited.
+          The <strong>TDS</strong> column shows what is due by these rules and what was actually deducted — the two
+          should match.
         </li>
       </ol>
     </div>
@@ -81,7 +88,7 @@
     </div>
     <div class="tdsr__kpi">
       <div class="tdsr__kpi-n">₹{{ summary.applicableInterest | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">FD / RD interest — counts toward the limit</div>
+      <div class="tdsr__kpi-l">FD / RD interest received in savings — counts toward the limit</div>
     </div>
     <div class="tdsr__kpi tdsr__kpi--muted">
       <div class="tdsr__kpi-n">₹{{ summary.exemptInterest | number: '1.0-0' }}</div>
@@ -93,7 +100,17 @@
     </div>
     <div class="tdsr__kpi tdsr__kpi--warn">
       <div class="tdsr__kpi-n">₹{{ summary.totalTds | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">TDS to be deducted</div>
+      <div class="tdsr__kpi-l">TDS due by the rules</div>
+    </div>
+    <div class="tdsr__kpi" [class.tdsr__kpi--ok]="summary.actualTds === summary.totalTds"
+      [class.tdsr__kpi--warn]="summary.actualTds !== summary.totalTds">
+      <div class="tdsr__kpi-n">₹{{ summary.actualTds | number: '1.0-0' }}</div>
+      <div class="tdsr__kpi-l">
+        Actually deducted from accounts
+        @if (summary.actualTds !== summary.totalTds) {
+          — ₹{{ summary.totalTds - summary.actualTds | number: '1.0-0' }} apart
+        }
+      </div>
     </div>
   </div>
 
@@ -194,7 +211,15 @@
       [class.tdsr__tab--active]="selectedTab === 'paying'"
       (click)="selectTab('paying')"
     >
-      TDS to deduct ({{ payingRows.length }})
+      TDS deducted / due ({{ payingRows.length }})
+    </button>
+    <button
+      type="button"
+      class="tdsr__tab"
+      [class.tdsr__tab--active]="selectedTab === 'declared'"
+      (click)="selectTab('declared')"
+    >
+      Form 121 / 15G / 15H given ({{ declaredRows.length }})
     </button>
     <button
       type="button"
@@ -206,6 +231,18 @@
     </button>
   </div>
 
+  @if (selectedTab === 'declared') {
+    <div class="tdsr__note">
+      <fa-icon icon="info-circle"></fa-icon>
+      <div>
+        Customers who gave a declaration for FY {{ filter.fy }}. <strong>TDS not deducted</strong> is the tax that would
+        have been taken without the form; <strong>Paid without TDS</strong> is the interest received after the form was
+        accepted — it must still be reported in the {{ statute.statement }} return. Interest received before the form
+        stays taxable, and any TDS taken on it is shown as <strong>deducted before the form</strong>.
+      </div>
+    </div>
+  }
+
   <!-- Table -->
   <div class="tdsr__card">
     <div class="tdsr__table-wrap">
@@ -214,11 +251,19 @@
           <tr>
             <th>Customer</th>
             <th>Branch</th>
-            <th>Accounts</th>
-            <th class="num">FD / RD interest this year</th>
-            <th class="num">Limit</th>
-            <th>Status</th>
-            <th class="num">TDS</th>
+            @if (selectedTab === 'declared') {
+              <th>Form · UIN · accepted on</th>
+              <th class="num">FD / RD interest received · paid without TDS</th>
+              <th class="num">Limit</th>
+              <th>Status</th>
+              <th class="num">TDS not deducted · deducted before the form</th>
+            } @else {
+              <th>Accounts</th>
+              <th class="num">FD / RD interest received this year</th>
+              <th class="num">Limit</th>
+              <th>Status</th>
+              <th class="num">TDS</th>
+            }
             <th class="col-actions"></th>
           </tr>
         </thead>
@@ -240,20 +285,32 @@
                 </div>
               </td>
               <td class="small">{{ row.branchCode || '—' }}</td>
-              <td class="small">
-                @if (row.trackedAccounts) {
-                  <span class="tdsr__pill tdsr__pill--ok">{{ row.trackedAccounts }} tracked</span>
-                }
-                @if (untrackedOf(row).length) {
-                  <span class="tdsr__pill">{{ untrackedOf(row).length }} not tracked</span>
-                }
-              </td>
-              <td class="num">
-                <strong>₹{{ row.tdsApplicableInterest | number: '1.0-0' }}</strong>
-                @if (row.exemptInterest) {
-                  <div class="small muted">+ ₹{{ row.exemptInterest | number: '1.0-0' }} savings (no TDS)</div>
-                }
-              </td>
+              @if (selectedTab === 'declared') {
+                <td class="small">
+                  <span class="tdsr__pill tdsr__pill--ok">Form {{ row.form }}</span>
+                  <div class="mono muted">{{ row.declarationUin || 'no UIN yet' }}</div>
+                  <div class="muted">accepted {{ row.declarationAcceptedOn | date: 'd MMM y' }}</div>
+                </td>
+                <td class="num">
+                  <strong>₹{{ row.tdsApplicableInterest | number: '1.0-0' }}</strong>
+                  <div class="small tdsr__ok">₹{{ row.paidWithoutDeduction | number: '1.0-0' }} paid without TDS</div>
+                </td>
+              } @else {
+                <td class="small">
+                  @if (row.trackedAccounts) {
+                    <span class="tdsr__pill tdsr__pill--ok">{{ row.trackedAccounts }} tracked</span>
+                  }
+                  @if (untrackedOf(row).length) {
+                    <span class="tdsr__pill">{{ untrackedOf(row).length }} not tracked</span>
+                  }
+                </td>
+                <td class="num">
+                  <strong>₹{{ row.tdsApplicableInterest | number: '1.0-0' }}</strong>
+                  @if (row.exemptInterest) {
+                    <div class="small muted">+ ₹{{ row.exemptInterest | number: '1.0-0' }} savings (no TDS)</div>
+                  }
+                </td>
+              }
               <td class="num small muted">₹{{ row.threshold | number: '1.0-0' }}</td>
               <td class="small">
                 <span
@@ -266,9 +323,19 @@
                 </span>
               </td>
               <td class="num">
-                @if (row.schedule.totalTds) {
+                @if (selectedTab === 'declared') {
+                  <strong class="tdsr__ok">₹{{ row.tdsSaved | number: '1.0-0' }}</strong>
+                  <div class="small muted">not deducted</div>
+                  @if (row.actualTds || row.schedule.totalTds) {
+                    <div class="small">₹{{ row.actualTds | number: '1.0-0' }} deducted before the form</div>
+                  }
+                } @else if (row.schedule.totalTds || row.actualTds) {
                   <strong>₹{{ row.schedule.totalTds | number: '1.0-0' }}</strong>
-                  <div class="small muted">@ {{ row.rateApplied * 100 | number: '1.0-0' }}%</div>
+                  <div class="small muted">due @ {{ row.rateApplied * 100 | number: '1.0-0' }}%</div>
+                  <div class="small" [class.tdsr__ok]="row.actualTds === row.schedule.totalTds"
+                    [class.tdsr__warn-text]="row.actualTds !== row.schedule.totalTds">
+                    ₹{{ row.actualTds | number: '1.0-0' }} deducted
+                  </div>
                 } @else if (row.tdsSaved) {
                   <span class="small tdsr__ok">₹{{ row.tdsSaved | number: '1.0-0' }} saved</span>
                 } @else {
@@ -298,15 +365,21 @@
                         <th>Account no.</th>
                         <th>Type</th>
                         <th>Tracked for TDS?</th>
-                        <th class="num">Interest this year</th>
-                        <th class="num">Postings</th>
-                        <th>Last posted</th>
+                        <th class="num">Interest this year (FD/RD: received in savings)</th>
+                        <th class="num">Credits</th>
+                        <th>Last credited</th>
+                        <th class="num">TDS deducted</th>
                       </tr>
                     </thead>
                     <tbody>
                       @for (a of row.accounts; track a.accountNo) {
                         <tr>
-                          <td class="mono small">{{ a.accountNo }}</td>
+                          <td class="mono small">
+                            {{ a.accountNo }}
+                            @if (a.holderName) {
+                              <div class="muted">held by {{ a.holderName }}</div>
+                            }
+                          </td>
                           <td class="small">{{ accountTypeLabel[a.type] }}</td>
                           <td class="small">
                             @if (a.tracked) {
@@ -319,7 +392,14 @@
                           <td class="num">₹{{ a.interest | number: '1.2-2' }}</td>
                           <td class="num small">{{ a.postings }}</td>
                           <td class="small muted">
-                            {{ a.lastPostedOn ? (a.lastPostedOn | date: 'd MMM y') : 'No interest posted yet' }}
+                            {{ a.lastPostedOn ? (a.lastPostedOn | date: 'd MMM y') : 'Nothing received yet' }}
+                          </td>
+                          <td class="num">
+                            @if (a.tdsDeducted) {
+                              ₹{{ a.tdsDeducted | number: '1.2-2' }}
+                            } @else {
+                              <span class="muted">—</span>
+                            }
                           </td>
                         </tr>
                       }
@@ -418,6 +498,9 @@
                   Loading…
                 } @else if (selectedTab === 'paying') {
                   No customer needs TDS deducted for these filters. Check the "No TDS" tab.
+                } @else if (selectedTab === 'declared') {
+                  No customer has a Form 121 / 15G / 15H on record for this year. Record one from the customer's
+                  Form 121 tab.
                 } @else {
                   No customers match these filters.
                 }

src/app/tds-reports/tds-interest-report.component.ts

@@ -10,11 +10,11 @@ import { Component, OnInit, inject } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import * as ExcelJS from 'exceljs';
 
 import { BranchScopeService } from '../core/branch-scope.service';
 import { FY_TAX_CONFIG, Quarter, QUARTER_LABEL } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
 import { TdsDeductee, setTdsDeductees, tdsFys } from './tds-reports-data';
+import { buildTdsInterestWorkbook } from './tds-interest-export';
 import { TdsReportsService } from './tds-reports.service';
 import {
   NEAR_THRESHOLD_BAND,
@@ -26,6 +26,9 @@ import {
   tdsInterestSummary
 } from './tds-reports.compute';
 
+/** The three answers the register gives: TDS taken, not taken because of a declaration, none due. */
+type TdsTab = 'paying' | 'declared' | 'not-paying';
+
 @Component({
   selector: 'mifosx-tds-interest-report',
   templateUrl: './tds-interest-report.component.html',
@@ -70,7 +73,7 @@ export class TdsInterestReportComponent implements OnInit {
   /** Which customer's quarter-wise detail is open. */
   expandedId: string | null = null;
   exporting = false;
-  selectedTab: 'paying' | 'not-paying' = 'paying';
+  selectedTab: TdsTab = 'paying';
 
   /** Rows per page; 0 shows the whole list. */
   readonly pageSizeOptions = [
@@ -92,6 +95,7 @@ export class TdsInterestReportComponent implements OnInit {
   private allRows: TdsInterestRow[] = [];
   private paying: TdsInterestRow[] = [];
   private notPaying: TdsInterestRow[] = [];
+  private declared: TdsInterestRow[] = [];
   private summaryCacheKey = '';
   private cachedSummary: TdsInterestSummary | null = null;
 
@@ -219,8 +223,28 @@ export class TdsInterestReportComponent implements OnInit {
     if (!row.trackedAccounts) {
       return { label: 'Not tracked — no FD/RD', tone: 'muted' };
     }
+    if (row.hasDeclaration) {
+      const beforeForm = Math.round(row.schedule.totalTds - row.actualTds);
+      if (beforeForm > 0) {
+        return { label: `Form ${row.form} — ₹${beforeForm.toLocaleString('en-IN')} due from before the form, not yet deducted`, tone: 'warn' };
+      }
+      if (row.tdsSaved > 0) {
+        return { label: `Form ${row.form} — TDS not deducted`, tone: 'ok' };
+      }
+      return { label: `Form ${row.form} on record — below the limit so far`, tone: 'ok' };
+    }
     if (row.schedule.totalTds > 0) {
-      return { label: 'Over the limit — TDS due', tone: 'warn' };
+      const gap = Math.round(row.schedule.totalTds - row.actualTds);
+      if (gap > 0) {
+        return { label: `Over the limit — ₹${gap.toLocaleString('en-IN')} not yet deducted`, tone: 'warn' };
+      }
+      if (gap < 0) {
+        return { label: `Deducted ₹${(-gap).toLocaleString('en-IN')} more than due — check`, tone: 'warn' };
+      }
+      return { label: 'Over the limit — TDS deducted', tone: 'ok' };
+    }
+    if (row.actualTds > 0) {
+      return { label: `₹${Math.round(row.actualTds).toLocaleString('en-IN')} deducted but none due — check`, tone: 'warn' };
     }
     if (row.hasDeclaration && row.crossed) {
       return { label: 'Over the limit — 15G/15H, no TDS', tone: 'ok' };
@@ -247,8 +271,12 @@ export class TdsInterestReportComponent implements OnInit {
     }
     this.rowsCacheKey = key;
     this.allRows = tdsInterestRows(this.filter);
-    this.paying = this.allRows.filter((r) => r.schedule.totalTds > 0);
-    this.notPaying = this.allRows.filter((r) => r.schedule.totalTds === 0);
+    // Three plain answers: whose TDS was taken, whose was not because they gave a declaration, and who
+    // owed none. A declarant whose tax was partly taken before the form is shown with the declarants,
+    // where both figures sit side by side.
+    this.declared = this.allRows.filter((r) => r.hasDeclaration);
+    this.paying = this.allRows.filter((r) => !r.hasDeclaration && (r.schedule.totalTds > 0 || r.actualTds > 0));
+    this.notPaying = this.allRows.filter((r) => !r.hasDeclaration && r.schedule.totalTds === 0 && r.actualTds === 0);
   }
 
   get rows(): TdsInterestRow[] {
@@ -266,6 +294,11 @@ export class TdsInterestReportComponent implements OnInit {
     return this.notPaying;
   }
 
+  get declaredRows(): TdsInterestRow[] {
+    this.ensureRows();
+    return this.declared;
+  }
+
   get summary(): TdsInterestSummary {
     const key = JSON.stringify(this.filter);
     if (key !== this.summaryCacheKey || !this.cachedSummary) {
@@ -277,6 +310,9 @@ export class TdsInterestReportComponent implements OnInit {
 
   /** Every row of the tab on screen, before paging. */
   get visibleRows(): TdsInterestRow[] {
+    if (this.selectedTab === 'declared') {
+      return this.declaredRows;
+    }
     return this.selectedTab === 'paying' ? this.payingRows : this.notPayingRows;
   }
 
@@ -337,7 +373,7 @@ export class TdsInterestReportComponent implements OnInit {
     this.expandedId = null;
   }
 
-  selectTab(tab: 'paying' | 'not-paying'): void {
+  selectTab(tab: TdsTab): void {
     this.selectedTab = tab;
     this.onFilterChanged();
   }
@@ -385,105 +421,17 @@ export class TdsInterestReportComponent implements OnInit {
   async exportWorkbook(): Promise<void> {
     this.exporting = true;
     try {
-      const wb = new ExcelJS.Workbook();
-      const ws = wb.addWorksheet(`TDS Interest FY ${this.filter.fy}`);
-
-      ws.addRow([`Deposit Interest & TDS — FY ${this.filter.fy}`]);
-      ws.addRow([`Scope: ${this.scopeLabel}`]);
-      ws.addRow([]);
-      ws.addRow([
-        'Customer',
-        'CIF',
-        'PAN',
-        'Branch',
-        'Accounts tracked for TDS',
-        'Accounts not tracked',
-        'Status',
-        'Form',
-        'Band',
-        'Age',
-        'Q1',
-        'Q2',
-        'Q3',
-        'Q4',
-        'Interest (FD/RD)',
-        'Savings interest (exempt)',
-        'Threshold',
-        'Crossed in',
-        'Rate %',
-        'TDS payable',
-        'Declaration',
-        'UIN',
-        'TDS saved',
-        'Paid without deduction'
-      ]);
-
-      for (const r of this.rows) {
-        ws.addRow([
-          r.deductee.name,
-          r.deductee.customerId,
-          r.deductee.pan || 'NOT ON RECORD',
-          r.branchCode,
-          this.trackedOf(r)
-            .map((a) => `${a.accountNo} (${a.type})`)
-            .join(', '),
-          this.untrackedOf(r)
-            .map((a) => `${a.accountNo} (${a.type})`)
-            .join(', '),
-          this.statusOf(r).label,
-          r.form === '121' ? 'Form 121' : `Form ${r.form}`,
-          r.band === 'SENIOR' ? 'Senior citizen' : 'General',
-          r.age,
-          r.quarters[1],
-          r.quarters[2],
-          r.quarters[3],
-          r.quarters[4],
-          r.tdsApplicableInterest,
-          r.exemptInterest,
-          r.threshold,
-          r.crossedInQuarter ? `Q${r.crossedInQuarter}` : '—',
-          r.rateApplied * 100,
-          r.schedule.totalTds,
-          r.hasDeclaration ? 'Yes' : 'No',
-          r.declarationUin ?? '',
-          r.tdsSaved,
-          r.paidWithoutDeduction
-        ]);
-      }
-
-      const s = this.summary;
-      ws.addRow([]);
-      ws.addRow([
-        'TOTAL',
-        `${s.deductees} deductees`,
-        '',
-        '',
-        `${s.trackedCustomers} tracked`,
-        '',
-        '',
-        '',
-        '',
-        '',
-        s.byQuarter[0].interest,
-        s.byQuarter[1].interest,
-        s.byQuarter[2].interest,
-        s.byQuarter[3].interest,
-        s.applicableInterest,
-        s.exemptInterest,
-        '',
-        '',
-        '',
-        s.totalTds,
-        `${s.declarations} filed`,
-        '',
-        s.tdsSaved,
-        s.paidWithoutDeduction
-      ]);
-
-      ws.getRow(1).font = { bold: true, size: 13 };
-      ws.getRow(4).font = { bold: true };
-      ws.columns.forEach((c) => (c.width = 18));
-
+      const wb = buildTdsInterestWorkbook({
+        fy: this.filter.fy,
+        scopeLabel: this.scopeLabel,
+        rules: this.rules,
+        statement: this.statute.statement,
+        // What the screen shows under the current filters, every tab included.
+        rows: this.rows,
+        declaredRows: this.declaredRows,
+        summary: this.summary,
+        statusOf: (row) => this.statusOf(row)
+      });
       const buffer = await wb.xlsx.writeBuffer();
       const blob = new Blob([buffer], {
         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
@@ -491,7 +439,7 @@ export class TdsInterestReportComponent implements OnInit {
       const url = URL.createObjectURL(blob);
       const a = document.createElement('a');
       a.href = url;
-      a.download = `TDS-Interest-FY${this.filter.fy}.xlsx`;
+      a.download = `TDS-Register-FY${this.filter.fy}.xlsx`;
       a.click();
       URL.revokeObjectURL(url);
     } finally {

src/app/tds-reports/tds-remittance-report.component.html

@@ -13,225 +13,329 @@
       <div>
         <h2 class="tdsr__title">TDS Remitted to Government</h2>
         <div class="tdsr__sub">
-          Challan-wise deposits and the {{ statute.statement }} year-end position · {{ scopeLabel }} · as at
-          {{ asAt | date: 'd MMM y' }}
+          TDS deducted from customers' deposits each month, and the challans Head Office paid it with · Bank as a whole
+          @if (asAt) {
+            · as at {{ asAt | date: 'd MMM y' }}
+          }
         </div>
       </div>
     </div>
-    <div class="tdsr__head-r">
-      <label class="tdsr__filter">
-        <span>Financial year</span>
-        <select [(ngModel)]="fy">
-          @for (year of financialYears; track year) {
-            <option [value]="year">FY {{ year }}</option>
-          }
-        </select>
-      </label>
-      <button type="button" class="tdsr__btn" (click)="exportWorkbook()" [disabled]="exporting">
-        <fa-icon icon="download"></fa-icon>
-        {{ exporting ? 'Preparing…' : 'Export' }}
-      </button>
-    </div>
+    @if (isHeadOffice) {
+      <div class="tdsr__head-r">
+        <label class="tdsr__filter">
+          <span>Financial year</span>
+          <select [(ngModel)]="fy" (ngModelChange)="onYearChanged()">
+            @for (year of financialYears; track year) {
+              <option [value]="year">FY {{ year }}</option>
+            }
+          </select>
+        </label>
+        <button type="button" class="tdsr__btn" (click)="openForm()">
+          <fa-icon icon="plus"></fa-icon> Record challan
+        </button>
+        <button type="button" class="tdsr__btn" (click)="exportWorkbook()" [disabled]="exporting || !summary">
+          <fa-icon icon="download"></fa-icon>
+          {{ exporting ? 'Preparing…' : 'Export' }}
+        </button>
+      </div>
+    }
   </div>
 
-  <!-- The control figure, first thing on the page -->
-  @if (reconciled) {
-    <div class="tdsr__banner tdsr__banner--ok">
-      <fa-icon icon="check-circle"></fa-icon>
+  @if (!isHeadOffice) {
+    <div class="tdsr__banner tdsr__banner--warn">
+      <fa-icon icon="info-circle"></fa-icon>
       <div>
-        <strong>Reconciled.</strong>
-        ₹{{ summary.totalDeducted | number: '1.0-0' }} deducted, ₹{{
-          summary.totalDeposited | number: '1.0-0'
-        }}
-        deposited, ₹{{ summary.pendingDeposit | number: '1.0-0' }} still within its due date.
+        <strong>This report is for Head Office.</strong> TDS is paid to the Government by Head Office for the whole bank,
+        under one TAN. Your branch's customers and the TDS deducted from them are on
+        <em>Reports › Deposit Interest &amp; TDS</em>.
       </div>
     </div>
   } @else {
-    <div class="tdsr__banner tdsr__banner--warn">
-      <fa-icon icon="exclamation-triangle"></fa-icon>
-      <div>
-        <strong>Does not reconcile — ₹{{ summary.difference | number: '1.0-0' }} unaccounted.</strong>
-        Tax deducted must equal tax deposited plus tax still within its due date. Find the difference before filing the
-        return.
+    @if (loadError) {
+      <div class="tdsr__banner tdsr__banner--warn">
+        <fa-icon icon="exclamation-triangle"></fa-icon>
+        <div>{{ loadError }}</div>
       </div>
-    </div>
-  }
+    }
 
-  @if (summary.overdueChallans > 0) {
-    <div class="tdsr__banner tdsr__banner--warn">
-      <fa-icon icon="exclamation-triangle"></fa-icon>
-      <div>
-        <strong>{{ summary.overdueChallans }} challan{{ summary.overdueChallans === 1 ? '' : 's' }} overdue.</strong>
-        Interest runs at 1.5% for every month or part of a month until the tax reaches the Government.
+    <!-- Challan form -->
+    @if (showForm) {
+      <div class="tdsr__card tdsr__form">
+        <div class="tdsr__card-head"><fa-icon icon="receipt"></fa-icon> Record a challan — FY {{ fy }}</div>
+        <div class="tdsr__filters tdsr__filters--flat">
+          <label class="tdsr__filter">
+            <span>Deduction month *</span>
+            <input type="month" [(ngModel)]="form.month" />
+          </label>
+          <label class="tdsr__filter">
+            <span>Amount (₹) *</span>
+            <input type="number" min="0" step="1" [(ngModel)]="form.amount" />
+          </label>
+          <label class="tdsr__filter">
+            <span>Challan no. *</span>
+            <input type="text" [(ngModel)]="form.challanNo" placeholder="e.g. 00123" />
+          </label>
+          <label class="tdsr__filter">
+            <span>BSR code *</span>
+            <input type="text" maxlength="7" [(ngModel)]="form.bsrCode" placeholder="7 digits" />
+          </label>
+          <label class="tdsr__filter">
+            <span>Paid on *</span>
+            <input type="date" [(ngModel)]="form.depositedOn" />
+          </label>
+          <label class="tdsr__filter tdsr__filter--wide">
+            <span>Paid from account *</span>
+            <select [(ngModel)]="form.paidFromGlAccountId">
+              <option [ngValue]="0" disabled>Choose bank / cash account</option>
+              @for (o of paidFromOptions; track o.id) {
+                <option [ngValue]="o.id">{{ o.glCode }} · {{ o.name }}</option>
+              }
+            </select>
+          </label>
+          <label class="tdsr__filter tdsr__filter--wide">
+            <span>Remarks</span>
+            <input type="text" [(ngModel)]="form.remarks" />
+          </label>
+        </div>
+        <div class="tdsr__foot">
+          Saving posts <strong>Dr TDS payable / Cr the account paid from</strong> at Head Office, dated the day it was
+          paid.
+        </div>
+        @if (formError) {
+          <div class="tdsr__banner tdsr__banner--warn">
+            <fa-icon icon="exclamation-triangle"></fa-icon>
+            <div>{{ formError }}</div>
+          </div>
+        }
+        <div class="tdsr__form-actions">
+          <button type="button" class="tdsr__btn" (click)="showForm = false" [disabled]="saving">Cancel</button>
+          <button type="button" class="tdsr__btn tdsr__btn--primary" (click)="saveChallan()" [disabled]="saving">
+            {{ saving ? 'Saving…' : 'Save challan' }}
+          </button>
+        </div>
       </div>
-    </div>
-  }
+    }
 
-  <!-- KPIs -->
-  <div class="tdsr__kpis">
-    <div class="tdsr__kpi tdsr__kpi--warn">
-      <div class="tdsr__kpi-n">₹{{ summary.totalDeducted | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">Total TDS deducted</div>
-    </div>
-    <div class="tdsr__kpi tdsr__kpi--ok">
-      <div class="tdsr__kpi-n">₹{{ summary.totalDeposited | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">Deposited with Government</div>
-    </div>
-    <div class="tdsr__kpi">
-      <div class="tdsr__kpi-n">₹{{ summary.pendingDeposit | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">Within due date</div>
-    </div>
-    <div class="tdsr__kpi" [class.tdsr__kpi--warn]="totalDefaultInterest > 0">
-      <div class="tdsr__kpi-n">₹{{ totalDefaultInterest | number: '1.0-0' }}</div>
-      <div class="tdsr__kpi-l">Interest on late deposit</div>
-    </div>
-    <div class="tdsr__kpi">
-      <div class="tdsr__kpi-n">{{ summary.deductees | number }}</div>
-      <div class="tdsr__kpi-l">Deductees in the return</div>
-    </div>
-  </div>
-
-  <!-- Part A: challans -->
-  <div class="tdsr__card">
-    <div class="tdsr__card-head"><fa-icon icon="receipt"></fa-icon> Part A — challan-wise remittance</div>
-    <div class="tdsr__table-wrap">
-      <table class="tdsr__table">
-        <thead>
-          <tr>
-            <th>Quarter</th>
-            <th>Deduction month</th>
-            <th class="num">Amount</th>
-            <th>Due date</th>
-            <th>Deposited on</th>
-            <th>Challan · BSR</th>
-            <th>Status</th>
-            <th class="num">Late-deposit interest</th>
-            <th>{{ statute.statement }} due</th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (row of rows; track trackRow($index, row)) {
-            <tr [class.tdsr__row--warn]="row.late || row.overdue">
-              <td>
-                <strong>{{ quarterLabel[row.quarter] }}</strong>
-              </td>
-              <td class="small">{{ row.month }}</td>
-              <td class="num">
-                <strong>₹{{ row.amount | number: '1.0-0' }}</strong>
-              </td>
-              <td class="small">{{ row.dueDate | date: 'd MMM y' }}</td>
-              <td class="small">
-                @if (row.depositedOn) {
-                  {{ row.depositedOn | date: 'd MMM y' }}
-                } @else {
-                  <span class="muted">—</span>
-                }
-              </td>
-              <td class="mono small">
-                @if (row.challanNo) {
-                  {{ row.challanNo }}
-                  <div class="muted">BSR {{ row.bsrCode }}</div>
-                } @else {
-                  <span class="muted">—</span>
-                }
-              </td>
-              <td>
-                @if (row.overdue) {
-                  <span class="tdsr__pill tdsr__pill--warn">Overdue</span>
-                } @else if (row.late) {
-                  <span class="tdsr__pill tdsr__pill--warn">Late by {{ row.delayMonths }}m</span>
-                } @else if (row.depositedOn) {
-                  <span class="tdsr__pill tdsr__pill--ok">On time</span>
-                } @else {
-                  <span class="tdsr__pill">Within due date</span>
-                }
-              </td>
-              <td class="num">
-                @if (row.defaultInterest) {
-                  <strong class="tdsr__warn-text">₹{{ row.defaultInterest | number: '1.0-0' }}</strong>
-                  <div class="small muted">1.5% × {{ row.delayMonths }}</div>
-                } @else {
-                  <span class="muted">—</span>
-                }
-              </td>
-              <td class="small muted">{{ row.returnDueDate }}</td>
-            </tr>
-          }
-          @if (rows.length === 0) {
-            <tr>
-              <td colspan="9" class="tdsr__empty">
-                <fa-icon icon="info-circle"></fa-icon> No tax was deducted in this financial year.
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
-    <div class="tdsr__foot">
-      Tax deducted in a month must reach the Government by the seventh of the following month; March runs to 30 April.
-    </div>
-  </div>
-
-  <!-- Part B: return summary -->
-  <div class="tdsr__card">
-    <div class="tdsr__card-head">
-      <fa-icon icon="file-alt"></fa-icon> Part B — {{ statute.statement }} year-end position
-    </div>
-    <div class="tdsr__ledger">
-      <div class="tdsr__ledger-row">
-        <span>Total interest paid on time deposits</span>
-        <span class="num">₹{{ summary.totalInterestPaid | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row tdsr__ledger-row--indent">
-        <span>with tax deducted</span>
-        <span class="num">₹{{ summary.interestWithDeduction | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row tdsr__ledger-row--indent">
-        <span>
-          without deduction — declaration on record
-          <em>mandatory disclosure in {{ statute.statement }}</em>
-        </span>
-        <span class="num">₹{{ summary.interestWithoutDeduction | number: '1.0-0' }}</span>
-      </div>
-
-      <div class="tdsr__ledger-row tdsr__ledger-row--sep">
-        <span>TDS at standard rate — PAN on record</span>
-        <span class="num">₹{{ summary.tdsAtStandardRate | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row">
-        <span>TDS at higher rate — no PAN on record</span>
-        <span class="num">₹{{ summary.tdsAtHigherRate | number: '1.0-0' }}</span>
-      </div>
-
-      <div class="tdsr__ledger-row tdsr__ledger-row--total">
-        <span>Total TDS deducted</span>
-        <span class="num">₹{{ summary.totalDeducted | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row">
-        <span>Deposited with Government</span>
-        <span class="num">₹{{ summary.totalDeposited | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row">
-        <span>Still within due date</span>
-        <span class="num">₹{{ summary.pendingDeposit | number: '1.0-0' }}</span>
-      </div>
-      <div class="tdsr__ledger-row tdsr__ledger-row--control" [class.tdsr__ledger-row--bad]="!reconciled">
-        <span>Difference — must be zero</span>
-        <span class="num">₹{{ summary.difference | number: '1.0-0' }}</span>
-      </div>
-
-      @if (summary.defaultInterest > 0) {
-        <div class="tdsr__ledger-row tdsr__ledger-row--sep">
-          <span>Interest payable by the bank for late deposit</span>
-          <span class="num">₹{{ summary.defaultInterest | number: '1.0-0' }}</span>
+    @if (summary) {
+      <!-- The control figure, first thing on the page -->
+      @if (reconciled) {
+        <div class="tdsr__banner tdsr__banner--ok">
+          <fa-icon icon="check-circle"></fa-icon>
+          <div>
+            <strong>Reconciled.</strong>
+            ₹{{ summary.totalDeducted | number: '1.0-0' }} deducted, ₹{{ summary.totalDeposited | number: '1.0-0' }}
+            paid to the Government, ₹{{ summary.pendingDeposit | number: '1.0-0' }} still within its due date.
+          </div>
+        </div>
+      } @else {
+        <div class="tdsr__banner tdsr__banner--warn">
+          <fa-icon icon="exclamation-triangle"></fa-icon>
+          <div>
+            <strong>Does not reconcile — ₹{{ summary.difference | number: '1.0-0' }} unaccounted.</strong>
+            Tax deducted must equal tax paid plus tax still within its due date.
+            @if (summary.overdueAmount > 0) {
+              ₹{{ summary.overdueAmount | number: '1.0-0' }} is past its due date and not yet paid.
+            }
+          </div>
         </div>
       }
+
+      @if (summary.calculatedTds !== summary.totalDeducted) {
+        <div class="tdsr__banner tdsr__banner--warn">
+          <fa-icon icon="exclamation-triangle"></fa-icon>
+          <div>
+            By the TDS rules ₹{{ summary.calculatedTds | number: '1.0-0' }} was due this year, but
+            ₹{{ summary.totalDeducted | number: '1.0-0' }} was actually deducted from accounts. Open
+            <em>Deposit Interest &amp; TDS</em> to see which customers differ.
+          </div>
+        </div>
+      }
+
+      <!-- KPIs -->
+      <div class="tdsr__kpis">
+        <div class="tdsr__kpi tdsr__kpi--warn">
+          <div class="tdsr__kpi-n">₹{{ summary.totalDeducted | number: '1.0-0' }}</div>
+          <div class="tdsr__kpi-l">TDS deducted from accounts</div>
+        </div>
+        <div class="tdsr__kpi tdsr__kpi--ok">
+          <div class="tdsr__kpi-n">₹{{ summary.totalDeposited | number: '1.0-0' }}</div>
+          <div class="tdsr__kpi-l">Paid to Government</div>
+        </div>
+        <div class="tdsr__kpi">
+          <div class="tdsr__kpi-n">₹{{ summary.pendingDeposit | number: '1.0-0' }}</div>
+          <div class="tdsr__kpi-l">To pay — still within due date</div>
+        </div>
+        <div class="tdsr__kpi" [class.tdsr__kpi--warn]="summary.overdueAmount > 0">
+          <div class="tdsr__kpi-n">₹{{ summary.overdueAmount | number: '1.0-0' }}</div>
+          <div class="tdsr__kpi-l">Overdue — pay now</div>
+        </div>
+        <div class="tdsr__kpi" [class.tdsr__kpi--warn]="summary.defaultInterest > 0">
+          <div class="tdsr__kpi-n">₹{{ summary.defaultInterest | number: '1.0-0' }}</div>
+          <div class="tdsr__kpi-l">Interest for paying late</div>
+        </div>
+      </div>
+    }
+
+    <!-- Part A: month by month -->
+    <div class="tdsr__card">
+      <div class="tdsr__card-head"><fa-icon icon="receipt"></fa-icon> Part A — month by month</div>
+      <div class="tdsr__table-wrap">
+        <table class="tdsr__table">
+          <thead>
+            <tr>
+              <th>Quarter</th>
+              <th>Deduction month</th>
+              <th class="num">Deducted</th>
+              <th>Pay by</th>
+              <th>Challans</th>
+              <th class="num">Paid</th>
+              <th class="num">Still to pay</th>
+              <th>Status</th>
+              <th class="num">Late interest</th>
+              <th class="col-actions"></th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (row of rows; track trackRow($index, row)) {
+              <tr [class.tdsr__row--warn]="row.late || row.overdue">
+                <td class="small"><strong>{{ quarterLabel[row.quarter] }}</strong></td>
+                <td class="small">
+                  {{ row.month + '-01' | date: 'MMM y' }}
+                  <div class="muted">{{ row.postings }} deduction{{ row.postings === 1 ? '' : 's' }}</div>
+                </td>
+                <td class="num"><strong>₹{{ row.deducted | number: '1.0-2' }}</strong></td>
+                <td class="small">{{ row.dueDate | date: 'd MMM y' }}</td>
+                <td class="mono small">
+                  @for (c of row.challans; track c.id) {
+                    <div>
+                      {{ c.challanNo }} · BSR {{ c.bsrCode }} · {{ c.depositedOn | date: 'd MMM y' }} · ₹{{
+                        c.amount | number: '1.0-2'
+                      }}
+                      <button type="button" class="tdsr__link" (click)="reverseChallan(c)">reverse</button>
+                    </div>
+                  } @empty {
+                    <span class="muted">—</span>
+                  }
+                </td>
+                <td class="num">₹{{ row.deposited | number: '1.0-2' }}</td>
+                <td class="num">
+                  @if (row.outstanding) {
+                    <strong>₹{{ row.outstanding | number: '1.0-2' }}</strong>
+                  } @else if (row.excess) {
+                    <span class="tdsr__warn-text small">₹{{ row.excess | number: '1.0-2' }} paid extra</span>
+                  } @else {
+                    <span class="muted">—</span>
+                  }
+                </td>
+                <td>
+                  @if (row.overdue) {
+                    <span class="tdsr__pill tdsr__pill--warn">Overdue</span>
+                  } @else if (row.late) {
+                    <span class="tdsr__pill tdsr__pill--warn">Paid late by {{ row.delayMonths }}m</span>
+                  } @else if (row.outstanding) {
+                    <span class="tdsr__pill">Within due date</span>
+                  } @else {
+                    <span class="tdsr__pill tdsr__pill--ok">Paid on time</span>
+                  }
+                </td>
+                <td class="num">
+                  @if (row.defaultInterest) {
+                    <strong class="tdsr__warn-text">₹{{ row.defaultInterest | number: '1.0-0' }}</strong>
+                  } @else {
+                    <span class="muted">—</span>
+                  }
+                </td>
+                <td class="col-actions">
+                  @if (row.outstanding) {
+                    <button type="button" class="tdsr__btn tdsr__btn--sm" (click)="openForm(row)">Pay</button>
+                  }
+                </td>
+              </tr>
+            }
+            @if (rows.length === 0) {
+              <tr>
+                <td colspan="10" class="tdsr__empty">
+                  <fa-icon icon="info-circle"></fa-icon>
+                  {{ loading ? 'Loading…' : 'No TDS was deducted from any account in this financial year.' }}
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+      <div class="tdsr__foot">
+        Tax deducted in a month must reach the Government by the seventh of the following month; March runs to 30 April.
+        Interest runs at 1.5% for every month or part of a month it is late.
+      </div>
     </div>
-    <div class="tdsr__foot">
-      The "without deduction" line is not optional — interest paid gross against a declaration must be reported in the
-      quarterly {{ statute.statement }} return with the appropriate remark code, and the consolidated statement of
-      declarations received is uploaded {{ statute.frequency }}. Confirm the remark code against the current
-      specification before generating the file.
-    </div>
-  </div>
+
+    <!-- Part B: return summary -->
+    @if (summary) {
+      <div class="tdsr__card">
+        <div class="tdsr__card-head">
+          <fa-icon icon="file-alt"></fa-icon> Part B — {{ statute.statement }} year-end position
+        </div>
+        <div class="tdsr__ledger">
+          <div class="tdsr__ledger-row">
+            <span>Deductees (customers with an FD/RD)</span>
+            <span class="num">{{ summary.deductees | number }}</span>
+          </div>
+          <div class="tdsr__ledger-row">
+            <span>Total interest paid on time deposits</span>
+            <span class="num">₹{{ summary.totalInterestPaid | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row tdsr__ledger-row--indent">
+            <span>with tax deducted</span>
+            <span class="num">₹{{ summary.interestWithDeduction | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row tdsr__ledger-row--indent">
+            <span>
+              without deduction — declaration on record
+              <em>mandatory disclosure in {{ statute.statement }}</em>
+            </span>
+            <span class="num">₹{{ summary.interestWithoutDeduction | number: '1.0-0' }}</span>
+          </div>
+
+          <div class="tdsr__ledger-row tdsr__ledger-row--sep">
+            <span>TDS at standard rate — PAN on record</span>
+            <span class="num">₹{{ summary.tdsAtStandardRate | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row">
+            <span>TDS at higher rate — no PAN on record</span>
+            <span class="num">₹{{ summary.tdsAtHigherRate | number: '1.0-0' }}</span>
+          </div>
+
+          <div class="tdsr__ledger-row tdsr__ledger-row--total">
+            <span>Total TDS deducted</span>
+            <span class="num">₹{{ summary.totalDeducted | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row">
+            <span>Paid to Government</span>
+            <span class="num">₹{{ summary.totalDeposited | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row">
+            <span>Still within due date</span>
+            <span class="num">₹{{ summary.pendingDeposit | number: '1.0-0' }}</span>
+          </div>
+          <div class="tdsr__ledger-row tdsr__ledger-row--control" [class.tdsr__ledger-row--bad]="!reconciled">
+            <span>Difference — must be zero</span>
+            <span class="num">₹{{ summary.difference | number: '1.0-0' }}</span>
+          </div>
+
+          @if (summary.defaultInterest > 0) {
+            <div class="tdsr__ledger-row tdsr__ledger-row--sep">
+              <span>Interest payable by the bank for late deposit</span>
+              <span class="num">₹{{ summary.defaultInterest | number: '1.0-0' }}</span>
+            </div>
+          }
+        </div>
+        <div class="tdsr__foot">
+          The "without deduction" line is not optional — interest paid gross against a declaration must be reported in the
+          quarterly {{ statute.statement }} return with the appropriate remark code, and the consolidated statement of
+          declarations received is uploaded {{ statute.frequency }}. Confirm the remark code against the current
+          specification before generating the file.
+        </div>
+      </div>
+    }
+  }
 </div>

src/app/tds-reports/tds-remittance-report.component.ts

@@ -6,17 +6,25 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import * as ExcelJS from 'exceljs';
+import { forkJoin } from 'rxjs';
 
 import { BranchScopeService } from '../core/branch-scope.service';
 import { FY_TAX_CONFIG, QUARTER_LABEL } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
-import { TDS_AS_AT, tdsFys } from './tds-reports-data';
+import { TdsChallan, TdsDeductedMonth, setTdsDeductees, tdsFys } from './tds-reports-data';
+import { NewTdsChallan, TdsReportsService } from './tds-reports.service';
 import { Tds26qSummary, TdsRemittanceRow, tds26qSummary, tdsRemittanceRows } from './tds-reports.compute';
 
+/**
+ * Tax deducted against tax remitted, month by month, for Head Office.
+ *
+ * The deducted side is the withhold-tax postings on deposits; the remitted side is the challans
+ * entered here. Both are records — nothing on this page is worked out from a rate.
+ */
 @Component({
   selector: 'mifosx-tds-remittance-report',
   templateUrl: './tds-remittance-report.component.html',
@@ -27,22 +35,83 @@ import { Tds26qSummary, TdsRemittanceRow, tds26qSummary, tdsRemittanceRows } fro
     FormsModule
   ]
 })
-export class TdsRemittanceReportComponent {
+export class TdsRemittanceReportComponent implements OnInit {
   private scope = inject(BranchScopeService);
+  private tdsService = inject(TdsReportsService);
 
   /** Filled by the route resolver from Organization › TDS Configuration. */
   readonly financialYears = tdsFys();
   readonly quarterLabel = QUARTER_LABEL;
-  readonly asAt = TDS_AS_AT;
 
   fy = tdsFys()[0] ?? '';
   exporting = false;
+  loading = false;
+  loadError = '';
+
+  /** The business date the platform is on — what "overdue" is judged against. */
+  asAt = '';
+  private deducted: TdsDeductedMonth[] = [];
+  challans: TdsChallan[] = [];
+  rows: TdsRemittanceRow[] = [];
+  summary: Tds26qSummary | null = null;
+
+  paidFromOptions: { id: number; glCode: string; name: string }[] = [];
+  showForm = false;
+  saving = false;
+  formError = '';
+  form: NewTdsChallan = this.blankForm();
+
+  /** Challans are remitted by Head Office under the bank's one TAN; a branch has nothing to enter here. */
+  get isHeadOffice(): boolean {
+    return this.scope.isHeadOffice;
+  }
+
+  ngOnInit(): void {
+    if (!this.isHeadOffice || !this.fy) {
+      return;
+    }
+    this.load();
+    this.tdsService.getChallanTemplate().subscribe({
+      next: (t) => (this.paidFromOptions = t?.paidFromOptions || []),
+      error: () => (this.paidFromOptions = [])
+    });
+  }
+
+  load(): void {
+    this.loading = true;
+    this.loadError = '';
+    const openingYear = Number(this.fy.slice(0, 4));
+    forkJoin({
+      deducted: this.tdsService.getDeducted(this.fy),
+      challans: this.tdsService.getChallans(this.fy),
+      // Part B summarises the year per customer, so the interest register is loaded too.
+      deductees: this.tdsService.getDepositInterest(openingYear)
+    }).subscribe({
+      next: ({ deducted, challans, deductees }) => {
+        this.loading = false;
+        this.asAt = deducted.asAt;
+        this.deducted = deducted.months;
+        this.challans = challans;
+        setTdsDeductees(deductees);
+        this.recompute();
+      },
+      error: (err: any) => {
+        this.loading = false;
+        this.loadError = err?.error?.defaultUserMessage || 'Could not load the remittance position.';
+      }
+    });
+  }
+
+  private recompute(): void {
+    this.rows = tdsRemittanceRows(this.fy, this.deducted, this.challans, this.asAt);
+    this.summary = tds26qSummary(this.fy, this.rows, this.asAt);
+  }
+
+  onYearChanged(): void {
+    this.showForm = false;
+    this.load();
+  }
 
-  /**
-   * Provision and return references for the selected year. The quarterly return
-   * became Form 140 under the 2025 Act, so the labels are read from the config
-   * rather than written into the template.
-   */
   get statute(): { section: string; statement: string; frequency: string } {
     const cfg = FY_TAX_CONFIG[this.fy];
     return {
@@ -52,53 +121,85 @@ export class TdsRemittanceReportComponent {
     };
   }
 
-  get scopeLabel(): string {
-    return this.scope.isHeadOffice ? 'Bank as a whole' : this.scope.officeName;
-  }
-
-  get rows(): TdsRemittanceRow[] {
-    return tdsRemittanceRows(this.fy, this.asAt);
-  }
-
-  get summary(): Tds26qSummary {
-    return tds26qSummary(this.fy, this.asAt);
-  }
-
-  /**
-   * The control that matters. Tax deducted must equal tax deposited plus tax
-   * still within its due date. Anything else means something has gone missing
-   * and must be found before the return is filed.
-   */
   get reconciled(): boolean {
-    return this.summary.difference === 0;
+    return !!this.summary && Math.abs(this.summary.difference) < 1;
   }
 
-  get totalDefaultInterest(): number {
-    return this.summary.defaultInterest;
+  /** Opens the challan form, pre-filled for a month that still has tax outstanding. */
+  openForm(row?: TdsRemittanceRow): void {
+    this.form = this.blankForm();
+    if (row) {
+      this.form.month = row.month;
+      this.form.amount = row.outstanding;
+    }
+    this.formError = '';
+    this.showForm = true;
+  }
+
+  saveChallan(): void {
+    this.formError = '';
+    const f = this.form;
+    if (!f.month || !f.amount || !f.challanNo || !f.bsrCode || !f.depositedOn || !f.paidFromGlAccountId) {
+      this.formError = 'Fill in every field marked *.';
+      return;
+    }
+    this.saving = true;
+    this.tdsService.createChallan({ ...f, fy: this.fy, amount: Number(f.amount) }).subscribe({
+      next: (challans) => {
+        this.saving = false;
+        this.showForm = false;
+        this.challans = challans;
+        this.recompute();
+      },
+      error: (err: any) => {
+        this.saving = false;
+        this.formError = err?.error?.errors?.[0]?.defaultUserMessage || err?.error?.defaultUserMessage || 'Could not save.';
+      }
+    });
+  }
+
+  reverseChallan(c: TdsChallan): void {
+    if (!confirm(`Reverse challan ${c.challanNo} for ₹${c.amount}? Its accounting entry will be undone.`)) {
+      return;
+    }
+    this.tdsService.reverseChallan(c.id).subscribe({
+      next: (challans) => {
+        this.challans = challans;
+        this.recompute();
+      },
+      error: (err: any) => alert(err?.error?.defaultUserMessage || 'Could not reverse the challan.')
+    });
+  }
+
+  private blankForm(): NewTdsChallan {
+    return { fy: this.fy, month: '', amount: 0, challanNo: '', bsrCode: '', depositedOn: '', paidFromGlAccountId: 0, remarks: '' };
   }
 
   trackRow(_: number, row: TdsRemittanceRow): string {
-    return `${row.fy}-${row.quarter}`;
+    return row.month;
   }
 
   async exportWorkbook(): Promise<void> {
+    const s = this.summary;
+    if (!s) {
+      return;
+    }
     this.exporting = true;
     try {
-      const s = this.summary;
       const wb = new ExcelJS.Workbook();
 
       const challan = wb.addWorksheet('Challans');
       challan.addRow([`TDS remitted to Government — FY ${this.fy}`]);
-      challan.addRow([`Scope: ${this.scopeLabel} · as at ${this.asAt}`]);
+      challan.addRow([`Bank as a whole · as at ${this.asAt}`]);
       challan.addRow([]);
       challan.addRow([
         'Quarter',
         'Deduction month',
-        'Amount deducted',
+        'Deducted',
         'Due date',
-        'Deposited on',
-        'Challan no.',
-        'BSR code',
+        'Deposited',
+        'Challans',
+        'Outstanding',
         'Status',
         'Delay (months)',
         'Late-deposit interest',
@@ -108,12 +209,12 @@ export class TdsRemittanceReportComponent {
         challan.addRow([
           `Q${r.quarter}`,
           r.month,
-          r.amount,
+          r.deducted,
           r.dueDate,
-          r.depositedOn ?? 'PENDING',
-          r.challanNo ?? '',
-          r.bsrCode ?? '',
-          r.overdue ? 'OVERDUE' : r.late ? 'LATE' : r.depositedOn ? 'On time' : 'Within due date',
+          r.deposited,
+          r.challans.map((c) => `${c.challanNo} / BSR ${c.bsrCode} / ${c.depositedOn}`).join('; '),
+          r.outstanding,
+          r.overdue ? 'OVERDUE' : r.late ? 'LATE' : r.outstanding ? 'Within due date' : 'Deposited',
           r.delayMonths || '',
           r.defaultInterest || '',
           r.returnDueDate
@@ -127,58 +228,19 @@ export class TdsRemittanceReportComponent {
       recon.addRow([`${this.statute.statement} year-end position — FY ${this.fy}`]);
       recon.addRow([]);
       const lines: [string, number | string][] = [
-        [
-          'Deductees',
-          s.deductees
-        ],
-        [
-          'Total interest paid on time deposits',
-          s.totalInterestPaid
-        ],
-        [
-          '  — with tax deducted',
-          s.interestWithDeduction
-        ],
-        [
-          '  — without deduction (declaration on record)',
-          s.interestWithoutDeduction
-        ],
-        [
-          'TDS at standard rate (PAN on record)',
-          s.tdsAtStandardRate
-        ],
-        [
-          'TDS at higher rate (no PAN)',
-          s.tdsAtHigherRate
-        ],
-        [
-          'Total TDS deducted',
-          s.totalDeducted
-        ],
-        [
-          'Total deposited with Government',
-          s.totalDeposited
-        ],
-        [
-          'Still within due date',
-          s.pendingDeposit
-        ],
-        [
-          'DIFFERENCE (must be zero)',
-          s.difference
-        ],
-        [
-          'Interest payable for late deposit',
-          s.defaultInterest
-        ],
-        [
-          'Challans deposited late',
-          s.lateChallans
-        ],
-        [
-          'Challans overdue',
-          s.overdueChallans
-        ]
+        ['Deductees', s.deductees],
+        ['Total interest paid on time deposits', s.totalInterestPaid],
+        ['  — with tax deducted', s.interestWithDeduction],
+        ['  — without deduction (declaration on record)', s.interestWithoutDeduction],
+        ['TDS at standard rate (PAN on record)', s.tdsAtStandardRate],
+        ['TDS at higher rate (no PAN)', s.tdsAtHigherRate],
+        ['TDS due by the rules', s.calculatedTds],
+        ['Total TDS actually deducted', s.totalDeducted],
+        ['Total deposited with Government', s.totalDeposited],
+        ['Still within due date', s.pendingDeposit],
+        ['Overdue', s.overdueAmount],
+        ['DIFFERENCE (must be zero)', s.difference],
+        ['Interest payable for late deposit', s.defaultInterest]
       ];
       for (const line of lines) {
         recon.addRow(line);

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

@@ -7,22 +7,16 @@
  */
 
 /**
- * Deductees and their deposit interest, for the two TDS reports.
+ * Deductees, their deposit interest and the challans, for the two TDS reports.
  *
- * The bank's deduction obligation runs on time deposits, so the seed
- * gives each customer a mix of fixed and recurring deposits — and some savings
- * accounts, which are outside the section and must stay out of the aggregate.
- *
- * Everything is generated from a fixed seed so the figures do not move between
- * loads, and the challan schedule is deliberately imperfect: one quarter is
- * deposited late so the default-interest column has something to show.
+ * Everything here is what the platform returned. The challans used to be generated from the
+ * computed deductions - challan numbers, BSR codes and deposit dates made up, one quarter
+ * deliberately late - so the remittance report reconciled against figures nobody had entered.
  */
 
-import { GL_BRANCHES } from '../gl-reports/gl-reports-data';
 import {
   configuredFys,
   Declaration,
-  Form15Kind,
   InterestCredit,
   TdsAccountInput
 } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
@@ -32,8 +26,14 @@ export function tdsFys(): string[] {
   return configuredFys();
 }
 
-/** Business date the book is drawn to — Q1 of 2026-27 is closed, Q2 is running. */
-export const TDS_AS_AT = '2026-08-01';
+/** A deposit as the platform reports it: the interest credited and the TDS actually withheld. */
+export interface TdsReportAccount extends TdsAccountInput {
+  /** TDS the platform actually deducted from this account in the year. */
+  deductions: InterestCredit[];
+  /** The account's own holder, when the tax is deducted against somebody else (minor, joint). */
+  holderClientId?: number;
+  holderName?: string;
+}
 
 export interface TdsDeductee {
   clientId: number;
@@ -44,115 +44,35 @@ export interface TdsDeductee {
   branchCode: string;
   /** Declarations on record, keyed by financial year. */
   declarations: Record<string, Declaration>;
-  accounts: TdsAccountInput[];
+  accounts: TdsReportAccount[];
 }
 
-/** One month's remittance of deducted tax to the Government. */
+/** One challan Head Office entered: tax remitted to the Government. */
 export interface TdsChallan {
+  id: number;
   fy: string;
-  /** Quarter the deduction belongs to. */
-  quarter: 1 | 2 | 3 | 4;
   /** Month the tax was deducted in, e.g. '2026-06'. */
   month: string;
   amount: number;
-  /** Statutory date by which it had to be deposited. */
-  dueDate: string;
-  /** When it actually reached the Government — null while still pending. */
-  depositedOn: string | null;
-  challanNo: string | null;
-  bsrCode: string | null;
+  challanNo: string;
+  bsrCode: string;
+  depositedOn: string;
+  paidFrom: string;
+  remarks: string | null;
+  reversed: boolean;
 }
 
-/** 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)];
-}
-
-const FIRST_NAMES = [
-  'Ramesh',
-  'Sunita',
-  'Vitthal',
-  'Kamala',
-  'Ganpat',
-  'Shobha',
-  'Dnyaneshwar',
-  'Mangala',
-  'Bhaskar',
-  'Anita',
-  'Tukaram',
-  'Sarika',
-  'Nivrutti',
-  'Rekha',
-  'Popat',
-  'Chhaya',
-  'Ashok',
-  'Vaishali',
-  'Sitaram',
-  'Jayshree',
-  'Madhukar',
-  'Pushpa',
-  'Eknath',
-  'Sulochana',
-  'Hanumant',
-  'Kalpana'
-];
-
-const SURNAMES = [
-  'Jadhav',
-  'Pawar',
-  'Shinde',
-  'Gaikwad',
-  'More',
-  'Kadam',
-  'Bhosale',
-  'Patil',
-  'Sawant',
-  'Chavan',
-  'Salunkhe',
-  'Mane',
-  'Deshmukh',
-  'Thorat',
-  'Nikam',
-  'Wagh'
-];
-
-/**
- * Quarter-end dates for a financial year. Interest is credited on these, which
- * is what makes the deduction fall due.
- */
-function quarterEnds(fy: string): string[] {
-  const y = Number(fy.slice(0, 4));
-  return [
-    `${y}-06-30`,
-    `${y}-09-30`,
-    `${y}-12-31`,
-    `${y + 1}-03-31`
-  ];
-}
-
-/** A well-formed individual PAN — fourth character 'P'. */
-function makePan(rand: () => number, surname: string): string {
-  const letter = () => String.fromCharCode(65 + Math.floor(rand() * 26));
-  const digits = `${1000 + Math.floor(rand() * 9000)}`;
-  return `${letter()}${letter()}${letter()}P${surname[0].toUpperCase()}${digits}${letter()}`;
+/** Tax the platform withheld in one month. */
+export interface TdsDeductedMonth {
+  month: string;
+  amount: number;
+  postings: number;
 }
 
 /**
  * The deductees the reports run on, loaded from the platform.
  *
- * This used to be sixty-four customers generated from a fixed seed — names, PANs, deposits and all.
- * The computation over them is the real section 194A calculation, so the figures looked like a
- * filing and were not one: not a rupee of it came from the bank's own books.
- *
- * It is set once by whoever loads the screen and read by the pure computation below, which is why
+ * It is set once by whoever loads the screen and read by the pure computation, which is why
  * this is a module-level holder rather than a service the compute would have to inject.
  */
 let liveDeductees: TdsDeductee[] = [];
@@ -188,63 +108,3 @@ export function depositDueDate(month: string): string {
   const nextM = m === 12 ? 1 : m + 1;
   return `${nextY}-${`${nextM}`.padStart(2, '0')}-07`;
 }
-
-let challanCache: Record<string, TdsChallan[]> | null = null;
-
-/**
- * The remittance schedule, derived from what the engine says was deducted.
- *
- * Deductions land at each quarter end, so there is one challan per quarter. The
- * Q2 challan of the prior year is deliberately deposited a month and a bit late
- * so the late-deposit interest column is exercised, and the current year's latest
- * quarter is left pending, which is the ordinary state of a live book.
- */
-export function tdsChallans(deductedByQuarter: Record<string, Record<number, number>>): Record<string, TdsChallan[]> {
-  if (challanCache) {
-    return challanCache;
-  }
-  const out: Record<string, TdsChallan[]> = {};
-
-  for (const fy of Object.keys(deductedByQuarter)) {
-    const y = Number(fy.slice(0, 4));
-    const months: Record<number, string> = {
-      1: `${y}-06`,
-      2: `${y}-09`,
-      3: `${y}-12`,
-      4: `${y + 1}-03`
-    };
-    const rows: TdsChallan[] = [];
-
-    for (const q of [
-      1,
-      2,
-      3,
-      4
-    ] as (1 | 2 | 3 | 4)[]) {
-      const amount = Math.round(deductedByQuarter[fy]?.[q] ?? 0);
-      if (amount <= 0) {
-        continue;
-      }
-      const month = months[q];
-      const dueDate = depositDueDate(month);
-      // Anything falling after the business date has not been deposited yet.
-      const pending = dueDate > TDS_AS_AT;
-      const late = fy === '2025-26' && q === 2;
-
-      rows.push({
-        fy,
-        quarter: q,
-        month,
-        amount,
-        dueDate,
-        depositedOn: pending ? null : late ? `${y}-11-14` : dueDate,
-        challanNo: pending ? null : `${y}${q}${`${amount % 10000}`.padStart(4, '0')}`,
-        bsrCode: pending ? null : '0510308'
-      });
-    }
-    out[fy] = rows;
-  }
-
-  challanCache = out;
-  return out;
-}

src/app/tds-reports/tds-reports.compute.spec.ts

@@ -6,13 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { isTdsApplicable, tdsDeducteeOf } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
 import { installTdsConfigFixture } from '../letter-mgmt/certificates/form-15gh/tds-config.fixture';
-import { TDS_AS_AT, depositDueDate, tdsDeductees, tdsFys } from './tds-reports-data';
+import { TdsChallan, TdsDeductee, depositDueDate, setTdsDeductees } from './tds-reports-data';
 import {
-  NEAR_THRESHOLD_BAND,
   TdsReportFilter,
-  deductedByQuarter,
   tds26qSummary,
   tdsInterestRows,
   tdsInterestRowsForFy,
@@ -22,12 +19,81 @@ import {
 
 installTdsConfigFixture();
 
-/** The complete year in the seed — the one a return would be filed for. */
-const CLOSED_FY = '2025-26';
+/**
+ * A small book with every case the reports must handle once, so each figure below can be worked
+ * out by hand. The reports used to run on sixty-four generated customers; the tests asserted
+ * shapes ("some row crossed") because nobody could know the numbers.
+ */
+const FY = '2025-26';
+const Q = ['2025-06-30', '2025-09-30', '2025-12-31', '2026-03-31'];
+
+const fd = (id: number, amounts: number[], extra: object = {}) => ({
+  id,
+  accountNo: `FD${id}`,
+  depositTypeCode: 'depositAccountType.fixedDeposit',
+  credits: amounts.map((amount, i) => ({ date: Q[i], amount, accountNo: `FD${id}` })),
+  deductions: [] as { date: string; amount: number }[],
+  ...extra
+});
+
+const sb = (id: number, amount: number) => ({
+  id,
+  accountNo: `SB${id}`,
+  depositTypeCode: 'depositAccountType.savingsDeposit',
+  credits: [{ date: '2025-09-30', amount, accountNo: `SB${id}` }],
+  deductions: [] as { date: string; amount: number }[]
+});
+
+function person(
+  clientId: number,
+  name: string,
+  dob: string,
+  pan: string,
+  branch: string,
+  accounts: any[],
+  declarations = {}
+): TdsDeductee {
+  return {
+    clientId,
+    customerId: `C${clientId}`,
+    name,
+    pan,
+    dob,
+    branchCode: branch,
+    declarations,
+    accounts: accounts.map((a) => ({ clientId, ...a }))
+  };
+}
+
+const BOOK: TdsDeductee[] = [
+  // Over the limit in Q4, plus a savings account that must stay outside the figure.
+  person(1, 'Ramesh', '1980-05-01', 'ABCPR1234K', 'Head Office', [
+    { ...fd(11, [15_000, 15_000, 15_000, 15_000]), deductions: [{ date: Q[3], amount: 6_000 }] },
+    sb(12, 1_200)
+  ]),
+  // Senior citizen, no PAN: higher threshold, higher rate - and the platform deducted too little.
+  person(2, 'Sunita', '1955-01-01', '', 'bhopal', [
+    { ...fd(21, [30_000, 30_000, 30_000, 30_000]), deductions: [{ date: Q[3], amount: 20_000 }] }
+  ]),
+  // ₹6,000 short of the limit: the customer to ask for a declaration.
+  person(3, 'Vitthal', '1985-03-03', 'ABCPV5678L', 'bhopal', [fd(31, [22_000, 22_000])]),
+  // Declaration accepted mid-year: interest before it stays liable, interest after it is paid gross.
+  person(4, 'Kamala', '1979-07-07', 'ABCPK9012M', 'Head Office', [fd(41, [20_000, 20_000, 20_000, 20_000])], {
+    [FY]: { kind: '15G', acceptedOn: '2025-10-15', fy: FY, uin: 'UIN0001' }
+  }),
+  // A minor's deposit, already listed under the guardian by the platform.
+  person(5, 'Ganpat', '1975-02-02', 'ABCPG3456N', 'Head Office', [
+    { ...fd(51, [5_000]), holderClientId: 99, holderName: 'Baby Ganpat' }
+  ]),
+  // Savings only, no PAN: never deducted, so never counted as a no-PAN problem.
+  person(6, 'Shobha', '1990-09-09', '', 'Head Office', [sb(61, 900)])
+];
+
+setTdsDeductees(BOOK);
 
 function filter(overrides: Partial<TdsReportFilter> = {}): TdsReportFilter {
   return {
-    fy: CLOSED_FY,
+    fy: FY,
     branchCode: '',
     quarter: 0,
     band: '',
@@ -38,115 +104,94 @@ function filter(overrides: Partial<TdsReportFilter> = {}): TdsReportFilter {
   };
 }
 
-describe('the seed has every case the reports need to show', () => {
-  it('produces deductees on both sides of the threshold', () => {
-    const rows = tdsInterestRowsForFy(CLOSED_FY);
-    expect(rows.length).toBeGreaterThan(20);
-    expect(rows.some((r) => r.crossed)).toBe(true);
-    expect(rows.some((r) => !r.crossed)).toBe(true);
-    expect(rows.some((r) => r.nearThreshold)).toBe(true);
-    expect(rows.some((r) => r.band === 'GENERAL')).toBe(true);
-    expect(rows.some((r) => r.band === 'SENIOR')).toBe(true);
-    expect(rows.some((r) => !r.panOnRecord)).toBe(true);
-    expect(rows.some((r) => r.hasDeclaration)).toBe(true);
+const row = (name: string) => tdsInterestRowsForFy(FY).find((r) => r.deductee.name === name)!;
+
+describe('which accounts are tracked', () => {
+  it('counts the FD and leaves the savings account out, saying why', () => {
+    const r = row('Ramesh');
+    expect(r.tdsApplicableInterest).toBe(60_000);
+    expect(r.exemptInterest).toBe(1_200);
+    expect(r.trackedAccounts).toBe(1);
+    const savings = r.accounts.find((a) => a.type === 'SB')!;
+    expect(savings.tracked).toBe(false);
+    expect(savings.reason).toContain('Savings');
+    expect(r.accounts[0].type).toBe('FD');
   });
 
-  it('gives senior citizens the higher threshold', () => {
-    const rows = tdsInterestRowsForFy(CLOSED_FY);
-    for (const row of rows) {
-      expect(row.threshold).toBe(row.band === 'SENIOR' ? 100_000 : 50_000);
-    }
+  it('shows whose account a deposit is when the tax falls on the guardian', () => {
+    const line = row('Ganpat').accounts[0];
+    expect(line.tracked).toBe(true);
+    expect(line.holderName).toBe('Baby Ganpat');
   });
 
-  it('deducts at the higher rate wherever PAN is missing', () => {
-    for (const row of tdsInterestRowsForFy(CLOSED_FY)) {
-      expect(row.rateApplied).toBe(row.panOnRecord ? 0.1 : 0.2);
-    }
+  it('marks a savings-only customer as not tracked', () => {
+    expect(row('Shobha').trackedAccounts).toBe(0);
   });
 });
 
-describe('the reports follow the Act that governed each year', () => {
-  it('shows 15G / 15H for FY 2025-26 and Form 121 for FY 2026-27', () => {
-    const old = tdsInterestRowsForFy('2025-26');
-    expect(old.some((r) => r.form === '15G')).toBe(true);
-    expect(old.some((r) => r.form === '15H')).toBe(true);
-    expect(old.some((r) => r.form === '121')).toBe(false);
-
-    // The two forms merged on 01 April 2026.
-    const current = tdsInterestRowsForFy('2026-27');
-    expect(current.every((r) => r.form === '121')).toBe(true);
+describe('the threshold and the rate', () => {
+  it('deducts on the whole year once the general limit is crossed', () => {
+    const r = row('Ramesh');
+    expect(r.threshold).toBe(50_000);
+    expect(r.crossedInQuarter).toBe(4);
+    expect(r.schedule.totalTds).toBe(6_000);
   });
 
-  it('keeps the age-based threshold band in both years', () => {
-    for (const fy of tdsFys()) {
-      const rows = tdsInterestRowsForFy(fy);
-      expect(rows.some((r) => r.band === 'SENIOR')).toBe(true);
-      expect(rows.some((r) => r.band === 'GENERAL')).toBe(true);
-      for (const row of rows) {
-        expect(row.threshold).toBe(row.band === 'SENIOR' ? 100_000 : 50_000);
-      }
-    }
+  it('gives a senior the higher limit, and a missing PAN the higher rate', () => {
+    const r = row('Sunita');
+    expect(r.band).toBe('SENIOR');
+    expect(r.threshold).toBe(100_000);
+    expect(r.rateApplied).toBe(0.2);
+    expect(r.schedule.totalTds).toBe(24_000);
+  });
+
+  it('flags a customer just under the limit', () => {
+    const r = row('Vitthal');
+    expect(r.crossed).toBe(false);
+    expect(r.nearThreshold).toBe(true);
+    expect(r.headroom).toBe(6_000);
+    expect(r.schedule.totalTds).toBe(0);
   });
 });
 
-describe('savings interest stays out of the 194A aggregate', () => {
-  it('reports it separately and never inside the applicable interest', () => {
-    const rows = tdsInterestRowsForFy(CLOSED_FY);
-    const withSavings = rows.filter((r) => r.exemptInterest > 0);
-    expect(withSavings.length).toBeGreaterThan(0);
+describe('a mid-year declaration', () => {
+  it('taxes only the interest credited before it was accepted', () => {
+    const r = row('Kamala');
+    expect(r.hasDeclaration).toBe(true);
+    // ₹40,000 credited before 15 Oct is liable once the year's ₹80,000 crosses the limit.
+    expect(r.schedule.totalTds).toBe(4_000);
+    expect(r.tdsSaved).toBe(4_000);
+    expect(r.paidWithoutDeduction).toBe(40_000);
+  });
+});
 
-    for (const row of withSavings) {
-      // The applicable figure must equal only the time-deposit interest where
-      // this customer is the deductee.
-      const expected = row.deductee.accounts
-        .filter((a) => isTdsApplicable(a) && tdsDeducteeOf(a) === row.deductee.clientId)
-        .flatMap((a) => a.credits)
-        .filter((c) => c.date >= '2025-04-01' && c.date <= '2026-03-31')
-        .reduce((s, c) => s + c.amount, 0);
-      expect(row.tdsApplicableInterest).toBe(expected);
-    }
+describe('due against actually deducted', () => {
+  it('agrees where the platform deducted the right amount', () => {
+    expect(row('Ramesh').actualTds).toBe(6_000);
   });
 
-  it('leaves the savings totals out of the summary base', () => {
+  it('shows the gap where it did not', () => {
+    const r = row('Sunita');
+    expect(r.actualTds).toBe(20_000);
+    expect(r.schedule.totalTds - r.actualTds).toBe(4_000);
+  });
+
+  it('totals both in the summary', () => {
     const s = tdsInterestSummary(filter());
-    expect(s.exemptInterest).toBeGreaterThan(0);
-    expect(s.applicableInterest).toBe(tdsInterestRows(filter()).reduce((acc, r) => acc + r.tdsApplicableInterest, 0));
+    expect(s.totalTds).toBe(6_000 + 24_000 + 4_000);
+    expect(s.actualTds).toBe(26_000);
   });
 });
 
-describe('joint deposits are attributed to the first-named holder only', () => {
-  it('excludes second-holder interest from the aggregate and shows it apart', () => {
-    const rows = tdsInterestRowsForFy(CLOSED_FY);
-    const secondHolders = rows.filter((r) => r.jointHeldInterest > 0);
-    expect(secondHolders.length).toBeGreaterThan(0);
-
-    for (const row of secondHolders) {
-      const jointAccounts = row.deductee.accounts.filter(
-        (a) => isTdsApplicable(a) && tdsDeducteeOf(a) !== row.deductee.clientId
-      );
-      expect(jointAccounts.length).toBeGreaterThan(0);
-      // None of that interest may appear in the figure the threshold is tested
-      // against, or one deposit would be taxed against two people.
-      const jointTotal = jointAccounts
-        .flatMap((a) => a.credits)
-        .filter((c) => c.date >= '2025-04-01' && c.date <= '2026-03-31')
-        .reduce((s, c) => s + c.amount, 0);
-      expect(row.jointHeldInterest).toBe(jointTotal);
-      expect(row.tdsApplicableInterest).toBeLessThan(row.tdsApplicableInterest + jointTotal);
-    }
-  });
-});
-
-describe('quarter figures add up to the year', () => {
-  it('per row', () => {
-    for (const row of tdsInterestRowsForFy(CLOSED_FY)) {
-      const quarterInterest = row.quarters[1] + row.quarters[2] + row.quarters[3] + row.quarters[4];
-      expect(quarterInterest).toBe(row.tdsApplicableInterest);
-      expect(row.schedule.lines.reduce((s, l) => s + l.tds, 0)).toBe(row.schedule.totalTds);
-    }
+describe('the summary', () => {
+  it('counts a missing PAN only where a deposit is being tracked', () => {
+    const s = tdsInterestSummary(filter());
+    expect(s.noPan).toBe(1);
+    expect(s.trackedCustomers).toBe(5);
+    expect(s.exemptInterest).toBe(2_100);
   });
 
-  it('and across the summary', () => {
+  it('adds the quarters up to the year', () => {
     const s = tdsInterestSummary(filter());
     expect(s.byQuarter.reduce((acc, q) => acc + q.interest, 0)).toBe(s.applicableInterest);
     expect(s.byQuarter.reduce((acc, q) => acc + q.tds, 0)).toBe(s.totalTds);
@@ -154,151 +199,116 @@ describe('quarter figures add up to the year', () => {
 });
 
 describe('filters', () => {
-  it("narrows to a branch without changing anyone's figures", () => {
-    const all = tdsInterestRows(filter());
-    const branch = all[0].branchCode;
-    const scoped = tdsInterestRows(filter({ branchCode: branch }));
-    expect(scoped.length).toBeGreaterThan(0);
-    expect(scoped.every((r) => r.branchCode === branch)).toBe(true);
-    // A branch view must not re-aggregate — the threshold is computed bank-wide.
-    const sample = scoped[0];
-    const sameRow = all.find((r) => r.deductee.customerId === sample.deductee.customerId);
-    expect(sample.tdsApplicableInterest).toBe(sameRow?.tdsApplicableInterest);
+  it('narrows to a branch by office name, whatever its case, without re-aggregating', () => {
+    const scoped = tdsInterestRows(filter({ branchCode: 'BHOPAL' }));
+    expect(scoped.map((r) => r.deductee.name).sort()).toEqual(['Sunita', 'Vitthal']);
+    expect(scoped.find((r) => r.deductee.name === 'Sunita')!.schedule.totalTds).toBe(24_000);
   });
 
-  it('finds the customers worth chasing a declaration from', () => {
-    const near = tdsInterestRows(filter({ nearThresholdOnly: true }));
-    expect(near.length).toBeGreaterThan(0);
-    for (const row of near) {
-      expect(row.crossed).toBe(false);
-      expect(row.headroom).toBeGreaterThan(0);
-      expect(row.headroom).toBeLessThanOrEqual(NEAR_THRESHOLD_BAND);
-    }
+  it('finds the customers near the limit and those over it', () => {
+    expect(tdsInterestRows(filter({ nearThresholdOnly: true })).map((r) => r.deductee.name)).toEqual(['Vitthal']);
+    expect(
+      tdsInterestRows(filter({ crossedOnly: true }))
+        .map((r) => r.deductee.name)
+        .sort()
+    ).toEqual(['Kamala', 'Ramesh', 'Sunita']);
   });
 
-  it('narrows to customers who crossed', () => {
-    const crossed = tdsInterestRows(filter({ crossedOnly: true }));
-    expect(crossed.length).toBeGreaterThan(0);
-    expect(crossed.every((r) => r.crossed && r.tdsApplicableInterest > r.threshold)).toBe(true);
-  });
-
-  it('searches on name, CIF and PAN', () => {
-    const target = tdsInterestRowsForFy(CLOSED_FY).find((r) => r.panOnRecord)!;
-    expect(tdsInterestRows(filter({ search: target.deductee.customerId })).length).toBe(1);
-    expect(tdsInterestRows(filter({ search: target.deductee.pan })).length).toBeGreaterThanOrEqual(1);
+  it('searches on name, customer ID and PAN', () => {
+    expect(tdsInterestRows(filter({ search: 'C3' })).length).toBe(1);
+    expect(tdsInterestRows(filter({ search: 'abcpk9012m' }))[0].deductee.name).toBe('Kamala');
   });
 });
 
-describe('declarations', () => {
-  it('save tax and record the interest paid gross', () => {
-    const declared = tdsInterestRowsForFy(CLOSED_FY).filter((r) => r.hasDeclaration);
-    expect(declared.length).toBeGreaterThan(0);
-    expect(declared.some((r) => r.tdsSaved > 0)).toBe(true);
-    // Interest paid without deduction is a mandatory 26Q disclosure, so it must
-    // be carried even though no tax came off it.
-    expect(declared.some((r) => r.paidWithoutDeduction > 0)).toBe(true);
-    for (const row of declared) {
-      expect(row.declarationUin).toBeTruthy();
-    }
+describe('remittance', () => {
+  const challan = (over: Partial<TdsChallan>): TdsChallan => ({
+    id: 1,
+    fy: FY,
+    month: '2026-03',
+    amount: 0,
+    challanNo: '00001',
+    bsrCode: '0510308',
+    depositedOn: '2026-04-20',
+    paidFrom: '',
+    remarks: null,
+    reversed: false,
+    ...over
   });
 
-  it('leaves tax deducted before a mid-year declaration in place', () => {
-    // Some declarations in the seed were accepted in October. Tax already taken
-    // in Q1/Q2 cannot be reversed, so those rows still carry a deduction.
-    const midYear = tdsInterestRowsForFy(CLOSED_FY).filter(
-      (r) => r.hasDeclaration && r.declarationAcceptedOn && r.declarationAcceptedOn.slice(5, 7) === '10'
-    );
-    expect(midYear.length).toBeGreaterThan(0);
-    expect(midYear.some((r) => r.schedule.totalTds > 0)).toBe(true);
-  });
-});
-
-describe('remittance schedule', () => {
-  it('deposits by the seventh of the following month, and 30 April for March', () => {
+  it('pays by the seventh of the following month, and 30 April for March', () => {
     expect(depositDueDate('2025-06')).toBe('2025-07-07');
     expect(depositDueDate('2025-12')).toBe('2026-01-07');
     expect(depositDueDate('2026-03')).toBe('2026-04-30');
   });
 
-  it('remits exactly what the engine says was deducted', () => {
-    const deducted = deductedByQuarter(CLOSED_FY);
-    const rows = tdsRemittanceRows(CLOSED_FY, TDS_AS_AT);
-    for (const row of rows) {
-      expect(row.amount).toBe(Math.round(deducted[row.quarter]));
-    }
+  it('marks a month paid in full and on time', () => {
+    const [r] = tdsRemittanceRows(FY, [{ month: '2026-03', amount: 26_000, postings: 2 }], [challan({ amount: 26_000 })], '2026-06-01');
+    expect(r.quarter).toBe(4);
+    expect(r.outstanding).toBe(0);
+    expect(r.late).toBe(false);
+    expect(r.overdue).toBe(false);
+    expect(r.defaultInterest).toBe(0);
   });
 
-  it('charges section 201(1A) interest on a late deposit and nothing on a timely one', () => {
-    const rows = tdsRemittanceRows(CLOSED_FY, TDS_AS_AT);
-    const late = rows.filter((r) => r.late);
-    expect(late.length).toBeGreaterThan(0);
-    for (const row of late) {
-      expect(row.delayMonths).toBeGreaterThan(0);
-      expect(row.defaultInterest).toBe(Math.round(row.amount * 0.015 * row.delayMonths));
-    }
-    for (const row of rows.filter((r) => !r.late && !r.overdue)) {
-      expect(row.defaultInterest).toBe(0);
-    }
+  it('charges interest on a late challan', () => {
+    const [r] = tdsRemittanceRows(
+      FY,
+      [{ month: '2026-03', amount: 26_000, postings: 2 }],
+      [challan({ amount: 26_000, depositedOn: '2026-05-02' })],
+      '2026-06-01'
+    );
+    expect(r.late).toBe(true);
+    expect(r.delayMonths).toBeGreaterThan(0);
+    expect(r.defaultInterest).toBeGreaterThan(0);
   });
-});
 
-describe('the 26Q reconciliation control', () => {
-  it.each(tdsFys())('balances for FY %s', (fy) => {
-    const s = tds26qSummary(fy, TDS_AS_AT);
-    // Deducted must equal deposited plus what is still within its due date.
-    // Anything else means tax has gone missing between the ledger and the
-    // Government, and the return must not be filed until it is found.
+  it('flags an unpaid month past its due date, and not one still within it', () => {
+    const rows = tdsRemittanceRows(
+      FY,
+      [
+        { month: '2025-12', amount: 5_000, postings: 1 },
+        { month: '2026-03', amount: 7_000, postings: 1 }
+      ],
+      [],
+      '2026-04-10'
+    );
+    const dec = rows.find((r) => r.month === '2025-12')!;
+    const mar = rows.find((r) => r.month === '2026-03')!;
+    expect(dec.overdue).toBe(true);
+    expect(dec.defaultInterest).toBeGreaterThan(0);
+    expect(mar.overdue).toBe(false);
+    expect(mar.outstanding).toBe(7_000);
+  });
+
+  it('ignores a reversed challan', () => {
+    const [r] = tdsRemittanceRows(
+      FY,
+      [{ month: '2026-03', amount: 26_000, postings: 2 }],
+      [challan({ amount: 26_000, reversed: true })],
+      '2026-04-10'
+    );
+    expect(r.deposited).toBe(0);
+    expect(r.outstanding).toBe(26_000);
+  });
+
+  it('reconciles deducted against paid plus still-within-due', () => {
+    const asAt = '2026-04-10';
+    const rows = tdsRemittanceRows(
+      FY,
+      [
+        { month: '2025-12', amount: 5_000, postings: 1 },
+        { month: '2026-03', amount: 21_000, postings: 1 }
+      ],
+      [challan({ month: '2025-12', amount: 5_000, depositedOn: '2026-01-05' })],
+      asAt
+    );
+    const s = tds26qSummary(FY, rows, asAt);
+    expect(s.totalDeducted).toBe(26_000);
+    expect(s.totalDeposited).toBe(5_000);
+    expect(s.pendingDeposit).toBe(21_000);
     expect(s.difference).toBe(0);
-    expect(s.totalDeducted).toBe(s.totalDeposited + s.pendingDeposit);
-  });
-
-  it('splits the tax between the standard and the no-PAN rate without loss', () => {
-    const s = tds26qSummary(CLOSED_FY, TDS_AS_AT);
-    expect(s.tdsAtStandardRate + s.tdsAtHigherRate).toBe(s.totalDeducted);
-    expect(s.tdsAtHigherRate).toBeGreaterThan(0);
-  });
-
-  it('splits interest into the deducted and the paid-gross halves', () => {
-    const s = tds26qSummary(CLOSED_FY, TDS_AS_AT);
-    expect(s.interestWithDeduction + s.interestWithoutDeduction).toBe(s.totalInterestPaid);
-    // The gross-paid half is the Form 121 disclosure and must not be zero here,
-    // or the report would never exercise that line.
-    expect(s.interestWithoutDeduction).toBeGreaterThan(0);
-  });
-
-  it('agrees with the interest report on the same year', () => {
-    const summary = tdsInterestSummary(filter());
-    expect(tds26qSummary(CLOSED_FY, TDS_AS_AT).totalDeducted).toBe(summary.totalTds);
-  });
-});
-
-describe('the part-run current year', () => {
-  it('has postings only up to the business date', () => {
-    for (const deductee of tdsDeductees()) {
-      for (const account of deductee.accounts) {
-        for (const credit of account.credits) {
-          expect(credit.date <= TDS_AS_AT).toBe(true);
-        }
-      }
-    }
-  });
-
-  it('shows the closed quarter as settled and future obligations as not yet due', () => {
-    const rows = tdsRemittanceRows('2026-27', TDS_AS_AT);
-
-    // Q1 (Apr–Jun) has closed, so its tax was deducted and is due by 07 Jul.
-    expect(rows.some((r) => r.quarter === 1)).toBe(true);
-
-    // Q3 cannot appear: no interest has posted there and nothing settles there.
-    expect(rows.some((r) => r.quarter === 3)).toBe(false);
-
-    // Q4 *can* appear even in a part-run year — deposits on annual interest
-    // posting settle once, at year end — but that is a future obligation, so it
-    // must read as pending and must never be flagged overdue.
-    for (const row of rows.filter((r) => r.quarter === 4)) {
-      expect(row.depositedOn).toBeNull();
-      expect(row.overdue).toBe(false);
-      expect(row.defaultInterest).toBe(0);
-    }
+    // The year's figures come from the same book as the interest report.
+    expect(s.calculatedTds).toBe(34_000);
+    expect(s.tdsAtStandardRate + s.tdsAtHigherRate).toBe(26_000);
   });
 });

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

@@ -17,7 +17,6 @@
 
 import {
   DeclarationForm,
-  FY_TAX_CONFIG,
   Quarter,
   TdsMode,
   TdsSchedule,
@@ -36,7 +35,15 @@ import {
   tdsDeducteeOf,
   tdsModeFor
 } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
-import { TdsChallan, TdsDeductee, tdsChallans, tdsDeductees, tdsDeducteesVersion } from './tds-reports-data';
+import {
+  TdsChallan,
+  TdsDeductedMonth,
+  TdsDeductee,
+  TdsReportAccount,
+  depositDueDate,
+  tdsDeductees,
+  tdsDeducteesVersion
+} from './tds-reports-data';
 
 // ─────────────────────────────── Filtering ───────────────────────────────
 
@@ -73,6 +80,10 @@ export interface TdsAccountLine {
   /** How many interest postings made up that figure. */
   postings: number;
   lastPostedOn: string | null;
+  /** TDS the platform actually withheld from this account in the year. */
+  tdsDeducted: number;
+  /** Set when the tax is deducted against someone other than the account's own holder. */
+  holderName: string | null;
 }
 
 /** How close to the trigger counts as "worth chasing a declaration for". */
@@ -124,6 +135,11 @@ export interface TdsInterestRow {
   accounts: TdsAccountLine[];
   /** How many of them count toward the deduction. */
   trackedAccounts: number;
+  /**
+   * TDS the platform actually withheld this year. `schedule.totalTds` is what this report works
+   * out is due; the two should agree, and a difference is the first thing to investigate.
+   */
+  actualTds: number;
 }
 
 function emptyQuarters(): Record<Quarter, number> {
@@ -192,8 +208,9 @@ export function tdsInterestRowsForFy(fy: string): TdsInterestRow[] {
         reason = 'Joint deposit — counted under the first-named holder';
       } else {
         tracked = true;
-        reason = 'Counted toward the TDS limit';
+        reason = 'Its interest received in savings counts toward the TDS limit';
       }
+      const report = account as TdsReportAccount;
       accountLines.push({
         accountNo: account.accountNo || '',
         type,
@@ -201,7 +218,10 @@ export function tdsInterestRowsForFy(fy: string): TdsInterestRow[] {
         reason,
         interest: inYear,
         postings: yearCredits.length,
-        lastPostedOn: yearCredits.reduce<string | null>((last, c) => (!last || c.date > last ? c.date : last), null)
+        lastPostedOn: yearCredits.reduce<string | null>((last, c) => (!last || c.date > last ? c.date : last), null),
+        tdsDeducted: (report.deductions || []).filter((c) => fyOf(c.date) === fy).reduce((s, c) => s + c.amount, 0),
+        holderName:
+          report.holderClientId && report.holderClientId !== deductee.clientId ? (report.holderName ?? null) : null
       });
     }
     // Tracked accounts first, so the deposits that drive the figure lead the list.
@@ -236,7 +256,8 @@ export function tdsInterestRowsForFy(fy: string): TdsInterestRow[] {
       panOnRecord: isWellFormedPan(deductee.pan),
       rateApplied: schedule.rateApplied,
       accounts: accountLines,
-      trackedAccounts: accountLines.filter((a) => a.tracked).length
+      trackedAccounts: accountLines.filter((a) => a.tracked).length,
+      actualTds: accountLines.reduce((s, a) => s + a.tdsDeducted, 0)
     });
   }
 
@@ -313,6 +334,8 @@ export interface TdsInterestSummary {
   /** Savings interest, outside the section. */
   exemptInterest: number;
   totalTds: number;
+  /** TDS the platform actually withheld — set against `totalTds`, which is what is due. */
+  actualTds: number;
   crossed: number;
   nearThreshold: number;
   declarations: number;
@@ -342,6 +365,7 @@ export function tdsInterestSummary(filter: TdsReportFilter): TdsInterestSummary
     applicableInterest: rows.reduce((s, r) => s + r.tdsApplicableInterest, 0),
     exemptInterest: rows.reduce((s, r) => s + r.exemptInterest, 0),
     totalTds: rows.reduce((s, r) => s + r.schedule.totalTds, 0),
+    actualTds: rows.reduce((s, r) => s + r.actualTds, 0),
     crossed: rows.filter((r) => r.crossed).length,
     nearThreshold: rows.filter((r) => r.nearThreshold).length,
     declarations: rows.filter((r) => r.hasDeclaration).length,
@@ -357,14 +381,34 @@ export function tdsInterestSummary(filter: TdsReportFilter): TdsInterestSummary
 
 // ─────────────────────── Report 2: remittance ───────────────────────
 
-export interface TdsRemittanceRow extends TdsChallan {
-  /** Statutory due date has passed with nothing deposited. */
+/**
+ * One deduction month: what the platform withheld, and what Head Office remitted against it.
+ *
+ * Driven by the withhold-tax postings and the challans entered, never by this report's own
+ * computation — a return reconciles what was deducted, not what should have been.
+ */
+export interface TdsRemittanceRow {
+  fy: string;
+  quarter: Quarter;
+  /** Month the tax was deducted in, e.g. '2026-06'. */
+  month: string;
+  deducted: number;
+  postings: number;
+  /** Live challans entered against this month. */
+  challans: TdsChallan[];
+  deposited: number;
+  lastDepositedOn: string | null;
+  dueDate: string;
+  /** Deducted but not yet remitted. */
+  outstanding: number;
+  /** Remitted beyond what was deducted — a challan entered against the wrong month, usually. */
+  excess: number;
+  /** Something is still outstanding and the due date has passed. */
   overdue: boolean;
-  /** Deposited, but after the due date. */
+  /** A challan reached the Government after the due date. */
   late: boolean;
-  /** Months or part months of delay. */
   delayMonths: number;
-  /** Interest charged for depositing late. */
+  /** Interest the bank owes for depositing late. */
   defaultInterest: number;
   /** Return the quarter's deduction is reported in. */
   returnDueDate: string;
@@ -377,41 +421,78 @@ const RETURN_DUE: Record<Quarter, string> = {
   4: '31 May'
 };
 
-/** Tax deducted per quarter, from the engine, for one year. */
-export function deductedByQuarter(fy: string): Record<number, number> {
-  const out: Record<number, number> = { 1: 0, 2: 0, 3: 0, 4: 0 };
-  for (const row of tdsInterestRowsForFy(fy)) {
-    for (const line of row.schedule.lines) {
-      out[line.quarter] += line.tds;
-    }
+export function quarterOfMonth(month: string): Quarter {
+  const m = Number(month.slice(5, 7));
+  if (m >= 4 && m <= 6) {
+    return 1;
   }
-  return out;
+  if (m >= 7 && m <= 9) {
+    return 2;
+  }
+  if (m >= 10) {
+    return 3;
+  }
+  return 4;
 }
 
-export function tdsRemittanceRows(fy: string, asAt: string): TdsRemittanceRow[] {
-  const deducted: Record<string, Record<number, number>> = {};
-  for (const year of Object.keys(FY_TAX_CONFIG)) {
-    deducted[year] = deductedByQuarter(year);
-  }
-  const challans = tdsChallans(deducted)[fy] ?? [];
+function round2(n: number): number {
+  return Math.round(n * 100) / 100;
+}
 
-  return challans.map((c) => {
-    const overdue = !c.depositedOn && c.dueDate < asAt;
-    const late = !!c.depositedOn && c.depositedOn > c.dueDate;
-    // While a payment is overdue the clock runs to today; once paid it stops on
-    // the payment date.
-    const settledOn = c.depositedOn ?? asAt;
-    const delayMonths = late || overdue ? monthsOrPartBetween(c.dueDate, settledOn) : 0;
-    const defaultInterest =
-      late || overdue ? lateDeductionInterest(c.amount, c.dueDate, settledOn, 'DEPOSIT', fy).interest : 0;
+export function tdsRemittanceRows(
+  fy: string,
+  deducted: TdsDeductedMonth[],
+  challans: TdsChallan[],
+  asAt: string
+): TdsRemittanceRow[] {
+  const live = challans.filter((c) => !c.reversed && c.fy === fy);
+  const months = [...new Set([...deducted.map((d) => d.month), ...live.map((c) => c.month)])].sort();
+
+  return months.map((month) => {
+    const d = deducted.find((x) => x.month === month);
+    const amount = d?.amount ?? 0;
+    const forMonth = live.filter((c) => c.month === month);
+    const deposited = round2(forMonth.reduce((s, c) => s + c.amount, 0));
+    const lastDepositedOn = forMonth.reduce<string | null>(
+      (last, c) => (!last || c.depositedOn > last ? c.depositedOn : last),
+      null
+    );
+    const dueDate = depositDueDate(month);
+    const outstanding = Math.max(0, round2(amount - deposited));
+    const excess = Math.max(0, round2(deposited - amount));
+    const overdue = outstanding > 0 && dueDate < asAt;
+    const lateChallans = forMonth.filter((c) => c.depositedOn > dueDate);
+    const late = lateChallans.length > 0;
+
+    // Interest runs per challan from the due date to the day it was paid, and on whatever is still
+    // outstanding from the due date to today.
+    let defaultInterest = lateChallans.reduce(
+      (s, c) => s + lateDeductionInterest(c.amount, dueDate, c.depositedOn, 'DEPOSIT', fy).interest,
+      0
+    );
+    if (overdue) {
+      defaultInterest += lateDeductionInterest(outstanding, dueDate, asAt, 'DEPOSIT', fy).interest;
+    }
+    const settledOn = overdue ? asAt : lastDepositedOn;
+    const delayMonths = (late || overdue) && settledOn ? monthsOrPartBetween(dueDate, settledOn) : 0;
 
     return {
-      ...c,
+      fy,
+      quarter: quarterOfMonth(month),
+      month,
+      deducted: amount,
+      postings: d?.postings ?? 0,
+      challans: forMonth,
+      deposited,
+      lastDepositedOn,
+      dueDate,
+      outstanding,
+      excess,
       overdue,
       late,
       delayMonths,
       defaultInterest,
-      returnDueDate: RETURN_DUE[c.quarter]
+      returnDueDate: RETURN_DUE[quarterOfMonth(month)]
     };
   });
 }
@@ -419,9 +500,9 @@ export function tdsRemittanceRows(fy: string, asAt: string): TdsRemittanceRow[]
 /**
  * The year-end position — what the quarterly TDS return has to reconcile to.
  *
- * `difference` is the control figure: tax the engine says was deducted, less what
- * actually reached the Government. Anything other than zero, once the pending
- * challans are settled, means something is wrong and must be found before filing.
+ * `difference` is the control figure: tax actually deducted, less what reached the Government,
+ * less what is still within its due date. Anything other than zero means a month is overdue or
+ * a challan sits against the wrong month.
  */
 export interface Tds26qSummary {
   fy: string;
@@ -432,9 +513,13 @@ export interface Tds26qSummary {
   interestWithoutDeduction: number;
   tdsAtStandardRate: number;
   tdsAtHigherRate: number;
+  /** What this report works out was due. */
+  calculatedTds: number;
+  /** What the platform actually withheld from accounts. */
   totalDeducted: number;
   totalDeposited: number;
   pendingDeposit: number;
+  overdueAmount: number;
   /** Deducted less deposited less still-pending. Must be zero. */
   difference: number;
   defaultInterest: number;
@@ -442,29 +527,33 @@ export interface Tds26qSummary {
   overdueChallans: number;
 }
 
-export function tds26qSummary(fy: string, asAt: string): Tds26qSummary {
+export function tds26qSummary(fy: string, remittance: TdsRemittanceRow[], asAt: string): Tds26qSummary {
   const rows = tdsInterestRowsForFy(fy);
-  const challans = tdsRemittanceRows(fy, asAt);
   const standard = rows.filter((r) => r.panOnRecord);
   const higher = rows.filter((r) => !r.panOnRecord);
-  const totalDeducted = rows.reduce((s, r) => s + r.schedule.totalTds, 0);
-  const totalDeposited = challans.filter((c) => c.depositedOn).reduce((s, c) => s + c.amount, 0);
-  const pendingDeposit = challans.filter((c) => !c.depositedOn).reduce((s, c) => s + c.amount, 0);
+  const totalDeducted = round2(remittance.reduce((s, r) => s + r.deducted, 0));
+  const totalDeposited = round2(remittance.reduce((s, r) => s + r.deposited, 0));
+  const pendingDeposit = round2(
+    remittance.filter((r) => r.dueDate >= asAt).reduce((s, r) => s + r.outstanding, 0)
+  );
+  const overdueAmount = round2(remittance.filter((r) => r.overdue).reduce((s, r) => s + r.outstanding, 0));
 
   return {
     fy,
-    deductees: rows.length,
+    deductees: rows.filter((r) => r.trackedAccounts > 0).length,
     totalInterestPaid: rows.reduce((s, r) => s + r.tdsApplicableInterest, 0),
     interestWithDeduction: rows.reduce((s, r) => s + r.schedule.liableInterest, 0),
     interestWithoutDeduction: rows.reduce((s, r) => s + r.paidWithoutDeduction, 0),
-    tdsAtStandardRate: standard.reduce((s, r) => s + r.schedule.totalTds, 0),
-    tdsAtHigherRate: higher.reduce((s, r) => s + r.schedule.totalTds, 0),
+    tdsAtStandardRate: standard.reduce((s, r) => s + r.actualTds, 0),
+    tdsAtHigherRate: higher.reduce((s, r) => s + r.actualTds, 0),
+    calculatedTds: rows.reduce((s, r) => s + r.schedule.totalTds, 0),
     totalDeducted,
     totalDeposited,
     pendingDeposit,
-    difference: Math.round(totalDeducted - totalDeposited - pendingDeposit),
-    defaultInterest: challans.reduce((s, c) => s + c.defaultInterest, 0),
-    lateChallans: challans.filter((c) => c.late).length,
-    overdueChallans: challans.filter((c) => c.overdue).length
+    overdueAmount,
+    difference: round2(totalDeducted - totalDeposited - pendingDeposit),
+    defaultInterest: remittance.reduce((s, r) => s + r.defaultInterest, 0),
+    lateChallans: remittance.filter((r) => r.late).length,
+    overdueChallans: remittance.filter((r) => r.overdue).length
   };
 }

src/app/tds-reports/tds-reports.service.ts

@@ -13,16 +13,52 @@ import { Observable, map } from 'rxjs';
 
 /** Custom Helpers */
 import { toIsoDate } from '../core/utils/api-date';
-import { configuredFys } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
-import { TdsDeductee } from './tds-reports-data';
+import { Declaration, formKindFor } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
+import { TdsChallan, TdsDeductedMonth, TdsDeductee } from './tds-reports-data';
+
+/** A declaration as recorded on the platform. */
+export interface TdsDeclarationRecord {
+  id: number;
+  clientId: number;
+  clientName?: string;
+  fy: string;
+  formType: '15G' | '15H' | '121';
+  uin: string | null;
+  acceptedOn: string;
+  estimatedIncome: number | null;
+  revoked: boolean;
+  revokedOn: string | null;
+  revokeReason: string | null;
+}
+
+export interface NewTdsDeclaration {
+  clientId: number;
+  fy: string;
+  formType: string;
+  acceptedOn: string;
+  uin?: string;
+  estimatedIncome?: number | null;
+}
+
+export interface NewTdsChallan {
+  fy: string;
+  month: string;
+  amount: number;
+  challanNo: string;
+  bsrCode: string;
+  depositedOn: string;
+  paidFromGlAccountId: number;
+  remarks?: string;
+}
 
 /**
- * Deposit interest for the TDS reports.
+ * Deposit interest, declarations and challans for the TDS screens.
  *
- * The platform returns the interest it actually credited — nothing else. A deposit is the
- * customer's own money arriving and a fee is a charge, so neither is income and neither is sent.
- * Working the figure out here from a balance and a rate would produce a number the passbook does
- * not show.
+ * On an FD or RD the platform returns the interest that reached the customer's savings account and
+ * the TDS debited there for it — TDS is tracked and taken where the interest is received. A deposit
+ * is the customer's own money arriving and a fee is a charge, so neither is income and neither is
+ * sent. Working the figure out here from a balance and a rate would produce a number the passbook
+ * does not show.
  */
 @Injectable({ providedIn: 'root' })
 export class TdsReportsService {
@@ -32,57 +68,129 @@ export class TdsReportsService {
    * @param financialYear the opening calendar year — 2026 means 1 Apr 2026 to 31 Mar 2027.
    *        Omit to let the platform use the year the business date falls in.
    */
-  getDepositInterest(financialYear?: number): Observable<TdsDeductee[]> {
-    const params = financialYear ? new HttpParams().set('financialYear', String(financialYear)) : undefined;
+  getDepositInterest(financialYear?: number, clientId?: number): Observable<TdsDeductee[]> {
+    let params = new HttpParams();
+    if (financialYear) {
+      params = params.set('financialYear', String(financialYear));
+    }
+    if (clientId) {
+      params = params.set('clientId', String(clientId));
+    }
     return this.http
       .get<any[]>('/tds/deposit-interest', { params })
       .pipe(map((rows) => (rows || []).map((r) => this.toDeductee(r))));
   }
 
+  getDeclarations(clientId: number): Observable<TdsDeclarationRecord[]> {
+    return this.http.get<TdsDeclarationRecord[]>('/tds/declarations', {
+      params: new HttpParams().set('clientId', String(clientId))
+    });
+  }
+
+  createDeclaration(declaration: NewTdsDeclaration): Observable<TdsDeclarationRecord[]> {
+    return this.http.post<TdsDeclarationRecord[]>('/tds/declarations', declaration);
+  }
+
+  revokeDeclaration(id: number, reason: string): Observable<TdsDeclarationRecord[]> {
+    return this.http.post<TdsDeclarationRecord[]>(`/tds/declarations/${id}/revoke`, { reason });
+  }
+
+  /** Tax actually withheld per month, and the business date the books are on. */
+  getDeducted(fy: string): Observable<{ asAt: string; months: TdsDeductedMonth[] }> {
+    return this.http.get<any>('/tds/deducted', { params: new HttpParams().set('fy', fy) }).pipe(
+      map((res) => ({
+        asAt: res?.asAt ?? '',
+        months: (res?.months || []).map((m: any) => ({
+          month: m.month,
+          amount: Number(m.amount) || 0,
+          postings: Number(m.postings) || 0
+        }))
+      }))
+    );
+  }
+
+  getChallans(fy: string): Observable<TdsChallan[]> {
+    return this.http
+      .get<any[]>('/tds/challans', { params: new HttpParams().set('fy', fy) })
+      .pipe(map((rows) => (rows || []).map((r) => this.toChallan(r))));
+  }
+
+  getChallanTemplate(): Observable<{ paidFromOptions: { id: number; glCode: string; name: string }[] }> {
+    return this.http.get<any>('/tds/challans/template');
+  }
+
+  createChallan(challan: NewTdsChallan): Observable<TdsChallan[]> {
+    return this.http.post<any[]>('/tds/challans', challan).pipe(map((rows) => (rows || []).map((r) => this.toChallan(r))));
+  }
+
+  reverseChallan(id: number): Observable<TdsChallan[]> {
+    return this.http
+      .post<any[]>(`/tds/challans/${id}/reverse`, {})
+      .pipe(map((rows) => (rows || []).map((r) => this.toChallan(r))));
+  }
+
+  private toChallan(r: any): TdsChallan {
+    return {
+      id: r.id,
+      fy: r.fy,
+      month: r.month,
+      amount: Number(r.amount) || 0,
+      challanNo: r.challanNo,
+      bsrCode: r.bsrCode,
+      depositedOn: (r.depositedOn || '').slice(0, 10),
+      paidFrom: r.paidFrom || '',
+      remarks: r.remarks ?? null,
+      reversed: !!r.reversed
+    };
+  }
+
   /**
-   * Shapes one platform row into what the section 194A computation expects.
+   * Shapes one platform row into what the TDS computation expects.
    *
    * Dates arrive as [y, M, d] arrays and are flattened to ISO here, because the computation
-   * compares them as strings when deciding which financial year a credit falls in.
+   * compares them as strings when deciding which financial year a credit falls in. The platform
+   * has already grouped a minor's deposit under the guardian and a joint deposit under its primary
+   * holder, so every account here belongs to the deductee it is listed under.
    */
   private toDeductee(row: any): TdsDeductee {
+    const dob = toIsoDate(row.dateOfBirth);
+    const credit = (a: any) => (c: any) => ({
+      date: toIsoDate(c.date),
+      amount: Number(c.amount) || 0,
+      accountNo: c.accountNo || a.accountNo || ''
+    });
     return {
       clientId: row.clientId,
       customerId: row.customerId || '',
       name: row.name || '',
       pan: row.pan || '',
-      dob: toIsoDate(row.dateOfBirth),
+      dob,
       branchCode: row.branchName || '',
-      // A 15G/15H on the customer's KYC record covers the year it was accepted for. The platform
-      // carries the kind but not the acceptance date, so the year's start stands in — a
-      // declaration is operative for the year it was given, which is what the computation needs.
-      declarations: this.declarationsOf(row),
+      declarations: this.declarationsOf(row.declarations || [], dob),
       accounts: (row.accounts || []).map((a: any) => ({
         id: a.id,
         accountNo: a.accountNo || '',
         depositTypeCode: a.depositTypeCode || '',
-        accountStatus: a.accountStatus || undefined,
+        // The deductee, not the holder: the grouping above already resolved whose PAN it is.
         clientId: a.clientId ?? row.clientId,
-        credits: (a.credits || []).map((c: any) => ({
-          date: toIsoDate(c.date),
-          amount: Number(c.amount) || 0,
-          accountNo: c.accountNo || a.accountNo || ''
-        }))
+        holderClientId: a.holderClientId ?? undefined,
+        holderName: a.holderName ?? undefined,
+        credits: (a.credits || []).map(credit(a)),
+        deductions: (a.deductions || []).map(credit(a))
       }))
     };
   }
 
-  private declarationsOf(row: any): Record<string, any> {
-    const kind = (row.form15Type || '').trim().toUpperCase();
-    if (kind !== '15G' && kind !== '15H') {
-      return {};
-    }
-    const out: Record<string, any> = {};
-    // Applied to every configured year. Without an acceptance date on the record the declaration is
-    // treated as operative from the start of each year rather than mid-year. Keyed '2026-27', the
-    // form the computation looks it up by - an 'FY 2026-27' key was never found.
-    for (const fy of configuredFys()) {
-      out[fy] = { kind, acceptedOn: `${fy.slice(0, 4)}-04-01`, fy };
+  /**
+   * Declarations keyed by year, the form the computation looks them up by ('2026-27'). A Form 121
+   * carries no G/H split, so the band follows the customer's age in that year.
+   */
+  private declarationsOf(rows: any[], dob: string): Record<string, Declaration> {
+    const out: Record<string, Declaration> = {};
+    for (const d of rows) {
+      const fy = d.fy;
+      const kind = d.formType === '15H' ? '15H' : d.formType === '15G' ? '15G' : formKindFor(dob, fy);
+      out[fy] = { kind, acceptedOn: toIsoDate(d.acceptedOn), fy, uin: d.uin || undefined };
     }
     return out;
   }

src/app/tds-reports/tds-reports.shared.scss

@@ -726,3 +726,43 @@
     margin-top: 16px;
   }
 }
+
+/* ── Challan form (remittance report) ── */
+.tdsr__form {
+  padding-bottom: 14px;
+}
+
+.tdsr__filters--flat {
+  margin: 0;
+  border: 0;
+  box-shadow: none;
+}
+
+.tdsr__form-actions {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+  padding: 0 16px;
+}
+
+.tdsr__btn--primary {
+  border-color: var(--tdsr-blue);
+  background: var(--tdsr-blue);
+  color: #fff;
+}
+
+.tdsr__btn--sm {
+  padding: 3px 10px;
+  font-size: 11.5px;
+}
+
+.tdsr__link {
+  margin-left: 6px;
+  padding: 0;
+  border: 0;
+  background: none;
+  color: var(--tdsr-amber);
+  font: inherit;
+  text-decoration: underline;
+  cursor: pointer;
+}

src/app/tds-reports/tds-statutory.compute.ts

@@ -32,7 +32,6 @@ import {
   quarterEnd,
   quarterOf
 } from '../letter-mgmt/certificates/form-15gh/tds-15gh.compute';
-import { TDS_AS_AT } from './tds-reports-data';
 import { TdsInterestRow, tdsInterestRowsForFy } from './tds-reports.compute';
 
 /** The bank's own deductor particulars, which head every filing. */
@@ -131,7 +130,7 @@ function monthLabel(key: string): string {
  * the portal rejects the line, and a silently dropped row is how a bank ends up
  * reporting fewer declarations than it holds.
  */
-export function declarationStatement(fy: string, asAt: string = TDS_AS_AT): DeclarationStatement {
+export function declarationStatement(fy: string, asAt: string): DeclarationStatement {
   const year = normaliseFy(fy);
   const cfg = FY_TAX_CONFIG[year];
   if (!cfg) {

src/app/web-app.component.ts

@@ -8,7 +8,7 @@
 
 /* eslint-disable @angular-eslint/prefer-inject */
 /** Angular Imports */
-import { Component, OnInit, HostListener, HostBinding, OnDestroy } from '@angular/core';
+import { Component, OnInit, HostListener, HostBinding, OnDestroy, inject } from '@angular/core';
 import { Router, NavigationEnd, ActivatedRoute } from '@angular/router';
 import { Title } from '@angular/platform-browser';
 import { MatSnackBar } from '@angular/material/snack-bar';
@@ -30,6 +30,7 @@ import { ThemeStorageService } from './shared/theme-picker/theme-storage.service
 import { AlertService } from './core/alert/alert.service';
 import { AuthenticationService } from './core/authentication/authentication.service';
 import { SettingsService } from './settings/settings.service';
+import { SystemService } from './system/system.service';
 import { DocumentationLinksService } from 'app/shared/services/documentation-links.service';
 import { IdleTimeoutService } from './home/timeout-dialog/idle-timeout.service';
 import { SessionTimeoutDialogComponent } from './home/timeout-dialog/session-timeout-dialog.component';
@@ -102,6 +103,7 @@ export class WebAppComponent implements OnInit, OnDestroy {
 
   private authSubscription: Subscription;
   private destroy$ = new Subject<void>();
+  private systemService = inject(SystemService);
 
   /**
    * @param {Router} router Router for navigation.
@@ -254,6 +256,27 @@ export class WebAppComponent implements OnInit, OnDestroy {
     }
     // Set default max date picker as Today
     this.settingsService.setBusinessDate(this.dateUtils.formatDate(new Date(), SettingsService.businessDateFormat));
+    // ...then replace it with the bank's own "today" (business date when enabled, server date when
+    // not) once signed in, and again whenever the business date or its on/off switch changes.
+    // isAuthenticated$ fires at the start of a fresh login, before the auth header is set - a call
+    // then gets a 401 Basic challenge and the browser's own sign-in box. So it only covers a restored
+    // session (credentials already saved); a fresh login is caught by 'Authentication Success'.
+    this.authenticationService.isAuthenticated$.pipe(takeUntil(this.destroy$)).subscribe((loggedIn) => {
+      if (loggedIn && this.authenticationService.isAuthenticated()) {
+        this.refreshBusinessToday();
+      }
+    });
+    this.alertService.alertEvent
+      .pipe(
+        filter(
+          (alertEvent: Alert) =>
+            alertEvent.type === 'Authentication Success' ||
+            alertEvent.type === SettingsService.businessDateType + ' Set' ||
+            alertEvent.type === SettingsService.businessDateType + ' Set Config'
+        ),
+        takeUntil(this.destroy$)
+      )
+      .subscribe(() => this.refreshBusinessToday());
     // Set the server list from the env var FINERACT_API_URLS, but avoid overwriting "Add new server" user choice
     if (!this.settingsService.servers) {
       this.settingsService.setServers(environment.baseApiUrls.split(','));
@@ -298,6 +321,19 @@ export class WebAppComponent implements OnInit, OnDestroy {
     }
   }
 
+  /** Stores the server's "today" where every date default reads it (see core/utils/business-today). */
+  private refreshBusinessToday(): void {
+    this.systemService.getBusinessToday().subscribe({
+      next: (res) => {
+        if (res?.today) {
+          this.settingsService.setBusinessDate(res.today);
+        }
+      },
+      // Unreachable server or older backend: keep whatever date is already stored.
+      error: () => {}
+    });
+  }
+
   ngOnDestroy() {
     this.destroy$.next();
     this.destroy$.complete();

src/environments/.env.ts

@@ -9,8 +9,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '261005',
-    'hash': '1ffac4b1'
+    'version': '261006',
+    'hash': '5ab4e9ea'
   },
   'allow_switching_backend_instance': true
 };