Merge branch 'dev-latest' of https://git.lincpay.tech/CBSNexora/cbsnexora into dev-latest

The Clerk Dashboard's standalone Share Withdrawal Request form never offered a
GL settlement destination -- it always submitted SAVINGS, silently, while the
Cashier's Transaction Entry screen already let a clerk pick any postable GL
account on its CR row. Added the same "Settlement Destination" choice (Savings
/ GL Account) with a searchable GL selector here too, so both entry points to
the same backend endpoint behave the same way.

Both share-withdrawal confirm dialogs (savings settlement and GL settlement, in
transaction-entry.component.ts) now call the backend's new preview-validate
endpoint before showing the confirm dialog, so a clerk sees the same checklist
a manager will see on approval -- a missing GL mapping, an unverified KYC, an
open AML alert -- before committing to the request, not after a manager has
already spent time reviewing it. A failing check is shown, not blocked: real
hard rules are still enforced server-side at approve(). Guarded with a 5s
timeout and a fallback message so a slow or unavailable check can never leave
the dialog looking stuck.

error-handler.interceptor.ts: a document/signature attachment whose row
survives but whose file is missing from the content store now resolves to a
silent 404 (matching the existing image-fetch handling) instead of surfacing a
raw error. Background GET failures (500/501/503) on calls a component already
recovers from (photo, attachment, notes, standing instructions, ...) now
surface as a corner toast instead of a blocking modal that has to be dismissed
-- a write action's failure (POST/PUT/DELETE) still gets the centred,
must-acknowledge dialog, since that is the one thing the user was waiting on.
Also surfaces the backend's real message on a 500 instead of a hardcoded
generic sentence.

Backend counterpart: ClerkShareWithdrawalRequestApiResource (preview-validate
endpoint, shared buildShareWithdrawalChecks()) and
DocumentReadPlatformServiceImpl (missing-file 404) land separately.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

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

@@ -279,7 +279,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> From Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [max]="maxDate" [formControl]="transactionDateFrom" />
+        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [formControl]="transactionDateFrom" />
         <mat-datepicker-toggle matSuffix [for]="dpFrom"></mat-datepicker-toggle>
         <mat-datepicker #dpFrom></mat-datepicker>
       </mat-form-field>
@@ -288,7 +288,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> To Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpTo" [min]="minDate" [max]="maxDate" [formControl]="transactionDateTo" />
+        <input matInput [matDatepicker]="dpTo" [min]="minDate" [formControl]="transactionDateTo" />
         <mat-datepicker-toggle matSuffix [for]="dpTo"></mat-datepicker-toggle>
         <mat-datepicker #dpTo></mat-datepicker>
       </mat-form-field>
@@ -353,13 +353,7 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted From</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input
+          <input matInput [matDatepicker]="dpSubFrom" [min]="minDate" [formControl]="submittedOnDateFrom" />
-            matInput
-            [matDatepicker]="dpSubFrom"
-            [min]="minDate"
-            [max]="maxDate"
-            [formControl]="submittedOnDateFrom"
-          />
           <mat-datepicker-toggle matSuffix [for]="dpSubFrom"></mat-datepicker-toggle>
           <mat-datepicker #dpSubFrom></mat-datepicker>
         </mat-form-field>
@@ -368,7 +362,7 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted To</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [max]="maxDate" [formControl]="submittedOnDateTo" />
+          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [formControl]="submittedOnDateTo" />
           <mat-datepicker-toggle matSuffix [for]="dpSubTo"></mat-datepicker-toggle>
           <mat-datepicker #dpSubTo></mat-datepicker>
         </mat-form-field>

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

@@ -90,7 +90,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
 
   // ── Misc ──────────────────────────────────────────────────────────────────
   minDate = new Date(2000, 0, 1);
-  maxDate = new Date();
+  maxDate: Date = null;
   /** Accounting features switched off for this installation — see disabled-features.ts. */
   disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
 
@@ -208,7 +208,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   }
 
   ngOnInit() {
-    this.maxDate = this.settingsService.businessDate;
+    this.maxDate = null;
     this.paginator.pageSize = 10;
     this.restoreState();
     this.setFilteredOffices();

src/app/accounts/accounts.service.ts

@@ -85,6 +85,11 @@ export class AccountsService {
     return this.http.get('/fixeddepositaccounts/maturity-dashboard');
   }
 
+  /** RD Dashboard: running RDs with their installment position, closures and penalty income for the month. */
+  getRecurringDepositDashboard(): Observable<any> {
+    return this.http.get('/recurringdepositaccounts/dashboard');
+  }
+
   getRecurringDepositAccounts(params: AccountListParams = {}): Observable<any> {
     let httpParams = new HttpParams()
       .set('paged', 'true')

src/app/app.module.ts

@@ -64,6 +64,7 @@ import { BankCalendarModule } from './bank-calendar/bank-calendar.module';
 import { DeafModule } from './deaf/deaf.module';
 import { SavingsDailyInterestModule } from './savings-daily-interest/savings-daily-interest.module';
 import { FdDashboardModule } from './fd-dashboard/fd-dashboard.module';
+import { RdDashboardModule } from './rd-dashboard/rd-dashboard.module';
 import { DicgcModule } from './dicgc/dicgc.module';
 import { FiuModule } from './fiu/fiu.module';
 import { GlReportsModule } from './gl-reports/gl-reports.module';
@@ -178,6 +179,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     DeafModule,
     SavingsDailyInterestModule,
     FdDashboardModule,
+    RdDashboardModule,
     DicgcModule,
     FiuModule,
     GlReportsModule,

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);
@@ -5195,7 +5246,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         this.showAlert('error', 'Invalid Account Type', [
           `Account type(s) not allowed in Bank Transfer: ${invalidAccounts.map((r) => r.acTyp + ' (' + r.acNo + ')').join(', ')}`,
           'Only Savings (SD) and Current (CA) accounts are permitted.',
-          'GL, FD, RD, SHR accounts are not allowed — use Disbursement/Collection instead.'
+          'GL, FD and SHR accounts are not allowed — use Disbursement/Collection instead.',
+          'RD installments are paid through a cashier Receipt or Auto Debit.'
         ]);
         return;
       }
@@ -5249,6 +5301,19 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.rows.length >= 2 &&
       this.rows.every((r) => r.typ === 'Disbursement' || r.typ === 'Fund Transfer')
     ) {
+      // A Recurring Deposit is never paid this way: these requests post straight into the account, so the
+      // installment schedule never hears of the money -- installments stay unpaid, Auto Debit collects them
+      // again and the maturity amount comes out wrong. RD installments come in through the cashier's
+      // Receipt or the RD's own Auto Debit.
+      const rdRows = this.rows.filter((r) => r.acTyp === 'RD');
+      if (rdRows.length > 0) {
+        this.showAlert('error', 'Recurring Deposit Not Allowed', [
+          `RD account(s) ${rdRows.map((r) => r.acNo).join(', ')} cannot be used in a Disbursement, Collection or Fund Transfer.`,
+          'Pay RD installments through a cashier Receipt, or by Auto Debit from the linked savings account.'
+        ]);
+        return;
+      }
+
       const drRows = this.rows.filter((r) => r.dbCr === 'Dr');
       const crRows = this.rows.filter((r) => r.dbCr === 'Cr');
 
@@ -5959,7 +6024,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 +6219,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 +6324,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 +6435,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`
       },
-      {
+      this.settlementMode === 'GL'
-        label: 'Linked savings account confirmed',
+        ? {
-        pass: !!this.account?.savingsAccountNumber,
+            label: 'Settlement GL Account selected',
-        detail: this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
+            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/client-stepper/client-kyc-step/client-kyc-step.component.html

@@ -1321,6 +1321,11 @@
           kycForm.get('kycDocumentNumber')?.hasError('pattern') && kycForm.get('kycDocumentNumber')?.touched
         ) {
           <mat-error>Only letters, numbers, hyphens and slashes allowed</mat-error>
+        } @else if (
+          kycForm.get('kycDocumentNumber')?.hasError('aadhaarLast4Mismatch') &&
+          kycForm.get('kycDocumentNumber')?.touched
+        ) {
+          <mat-error>Last 4 digits do not match the Aadhaar number entered above</mat-error>
         }
       </mat-form-field>
 

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

@@ -8,7 +8,14 @@
 
 import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, inject } from '@angular/core';
 import { forkJoin, catchError, of } from 'rxjs';
-import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+  FormsModule,
+  AbstractControl,
+  ValidationErrors
+} from '@angular/forms';
 import {
   MatDialog,
   MAT_DIALOG_DATA,
@@ -567,6 +574,28 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
   /** Existing signature document ID (for re-upload/delete) */
   existingSignatureDocId: string = '';
 
+  /**
+   * Cross-field check for the OVD "Document Number" field (kycDocumentNumber): when Aadhaar Card
+   * is the selected KYC document, its value must identify the same Aadhaar as the aadhaarNumber
+   * field captured earlier in this step - the last 4 digits are what's compared, since
+   * aadhaarNumber may hold either the raw 12-digit number or a masked value (masking only ever
+   * obscures the first 8 digits - see aadhaarMasked in the kycData getter below - so the last 4
+   * characters are always the real digits either way). Not applicable to any other document type,
+   * where kycDocumentNumber is unrelated to Aadhaar entirely.
+   */
+  private aadhaarLast4MatchValidator = (control: AbstractControl): ValidationErrors | null => {
+    if (this.selectedKycDoc?.code !== 'AADHAAR') {
+      return null;
+    }
+    const docNumber = (control.value || '').toString().trim();
+    const aadhaarValue = (control.parent?.get('aadhaarNumber')?.value || '').toString().trim();
+    if (docNumber.length < 4 || aadhaarValue.length < 4) {
+      // Required/pattern validators already flag an empty or too-short value on their own.
+      return null;
+    }
+    return docNumber.slice(-4) === aadhaarValue.slice(-4) ? null : { aadhaarLast4Mismatch: true };
+  };
+
   /** KYC Form */
   kycForm: UntypedFormGroup = this.formBuilder.group({
     hasPan: [true],
@@ -616,7 +645,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       [
         Validators.required,
         Validators.pattern(/^[A-Za-z0-9\-\/\s]+$/),
-        Validators.maxLength(30)
+        Validators.maxLength(30),
+        this.aadhaarLast4MatchValidator
       ]
     ],
     kycDocIssueDate: [''],
@@ -739,6 +769,14 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       this.kycForm.get('ecgcSalFlag')?.disable();
       this.kycForm.get('dormantFlag')?.disable();
     }
+
+    // aadhaarLast4MatchValidator (on kycDocumentNumber) reads this control's value directly rather
+    // than through its own valueChanges, so a re-check has to be triggered explicitly whenever the
+    // Aadhaar field itself changes - otherwise fixing aadhaarNumber after kycDocumentNumber was
+    // already entered would leave a stale mismatch error in place.
+    this.kycForm.get('aadhaarNumber')?.valueChanges.subscribe(() => {
+      this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
+    });
   }
 
   /** Seed the document-type picker from defaults (entity RBI docs vs. individual OVDs,
@@ -1009,6 +1047,9 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     // Reset uploads + merged preview when document type changes
     this.kycDocFiles = { front: null, back: null };
     this.kycDocMergedPreview = null;
+    // aadhaarLast4MatchValidator only applies while Aadhaar Card is selected - re-check so switching
+    // to/away from it immediately picks up (or clears) the mismatch error.
+    this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
   }
 
   isKycDocSelected(proof: ProofType): boolean {
@@ -1189,6 +1230,9 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
           // Sync chip-picker selection with the prefilled document name
           if (data.kycDocumentName) {
             this.selectedKycDoc = this.findKycDocProofByName(data.kycDocumentName);
+            // patchValue above ran kycDocumentNumber's validators before selectedKycDoc was known,
+            // so aadhaarLast4MatchValidator needs a fresh check now that it is.
+            this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
           }
           // Set verification statuses from existing data
           if (data.panVerified) {

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
+            A declaration is on record for this year, but one or more deposits still carry a tax group. Those accounts
-            deposits. Turn it off on those accounts, or tax will keep being deducted.
+            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>
-          }
+            <div class="f121__kv-row">
-          @if (declarationOnRecord && !acceptanceDateKnown) {
+              <span>Accepted on</span>
-            <div class="f121__kv-row f121__kv-row--muted">
-              <span>Acceptance date</span>
               <span>
-                Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
+                {{ d.acceptedOn | date: 'd MMM y' }} — no TDS on interest credited from this day to 31 March. Interest
-                the figures below.
+                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 ──
+  // ── Declarations on record ──
-  declarationOnRecord = false;
+  /**
+   * 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';
+  // ── Recording a declaration ──
-  declarationFy = '';
+  showDeclarationForm = false;
-  /**
+  savingDeclaration = false;
-   * The KYC step records only the year, not the date the branch accepted the
+  declarationError = '';
-   * declaration, so it has to be treated as covering the whole year. Surfaced on
+  newDeclaration = { acceptedOn: '', uin: '', estimatedIncome: null as number | null };
-   * screen rather than hidden — a mid-year acceptance would change the figures.
-   */
-  acceptanceDateKnown = false;
 
   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 })[] = [];
+  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow; taxLines: InterestCredit[] })[] = [];
-  /** Withheld-tax postings by FY, from the ledger. */
+  /** This customer's FD/RD interest received in savings, and TDS taken there, per year. */
-  private actualTdsByFy = new Map<string, number>();
+  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);
+          taxLines.push({ date: iso, amount, accountNo: ref.accountNo });
-          this.actualTdsByFy.set(txnFy, (this.actualTdsByFy.get(txnFy) ?? 0) + amount);
         }
       }
 
@@ -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 loadPlatformYear(year: string): void {
-  private declarationForSelectedFy(): Declaration | null {
+    this.tdsService
-    if (!this.declarationOnRecord || !this.fy) {
+      .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 {
+    const kind = d.formType === '15H' ? '15H' : d.formType === '15G' ? '15G' : formKindFor(this.dateOfBirth, d.fy);
-      kind: this.declarationKind,
+    return { kind, acceptedOn: d.acceptedOn, fy: d.fy, uin: d.uin || undefined };
-      // No acceptance date on record — treated as covering the whole year.
+  }
-      acceptedOn: `${year.slice(0, 4)}-04-01`,
+
-      fy: year
+  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 —
+   * A declaration is on record but a deposit still carries a stock Fineract tax group. Those
-   * the branch has not switched them off.
+   * 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/clients/clients-view/general-tab/general-tab.component.html

@@ -591,16 +591,13 @@
         <i class="fa fa-calendar section-header__icon"></i>
         <h3 class="section-header__title">{{ 'labels.heading.Recurring Deposit Accounts' | translate }}</h3>
       </div>
-      <div class="section-header__right">
-        <button mat-raised-button color="primary" (click)="toggleRecurringAccountsOverview()">
-          {{ viewAccountsLabel(showClosedRecurringAccounts) | translate }}
-        </button>
-      </div>
     </div>
 
-    @if (!showClosedRecurringAccounts) {
+    <!-- Active and ended recurring deposits share one table; the Status column says how each one ended (matured or
+         closed early), so the client's RD history stays visible without switching views. -->
+    @if (savingAccounts) {
       <div class="table-wrapper">
-        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring'">
+        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring'">
           <ng-container matColumnDef="Account No">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
             <td mat-cell *matCellDef="let element">
@@ -614,6 +611,15 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
+          <ng-container matColumnDef="Status">
+            <th mat-header-cell *matHeaderCellDef>Status</th>
+            <td mat-cell *matCellDef="let element">
+              <span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{ rdStatusLabel(element) }}</span>
+              @if (element.timeline?.closedOnDate) {
+                <div class="rd-status__date">on {{ element.timeline.closedOnDate | dateFormat }}</div>
+              }
+            </td>
+          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -638,7 +644,7 @@
                   <i class="fa fa-check"></i>
                 </button>
               }
-              @if (!element.status.submittedAndPendingApproval && !element.status.active) {
+              @if (element.status.approved) {
                 <button
                   class="account-action-button"
                   mat-raised-button
@@ -664,7 +670,7 @@
           </ng-container>
 
           <ng-container matColumnDef="no-data">
-            <td mat-footer-cell *matFooterCellDef [attr.colspan]="openSavingsColumns.length">
+            <td mat-footer-cell *matFooterCellDef [attr.colspan]="recurringColumns.length">
               <div class="table-empty-state">
                 <i class="fa fa-folder-open-o table-empty-state__icon"></i>
                 <p class="table-empty-state__text">
@@ -674,67 +680,17 @@
             </td>
           </ng-container>
 
-          <tr mat-header-row *matHeaderRowDef="openSavingsColumns"></tr>
+          <tr mat-header-row *matHeaderRowDef="recurringColumns"></tr>
           <tr
             mat-row
-            *matRowDef="let row; columns: openSavingsColumns"
+            *matRowDef="let row; columns: recurringColumns"
             [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
             class="select-row"
           ></tr>
           <tr
             mat-footer-row
             *matFooterRowDef="
-              (savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring')?.length === 0 ? ['no-data'] : []
+              (savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring')?.length === 0 ? ['no-data'] : []
-            "
-          ></tr>
-        </table>
-      </div>
-    }
-
-    <!-- Closed Recurring Deposit Accounts -->
-    @if (showClosedRecurringAccounts) {
-      <div class="table-wrapper">
-        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring'">
-          <ng-container matColumnDef="Account No">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              <i class="fa fa-stop" [ngClass]="element.status.code | statusLookup"></i>
-              <mifosx-account-number accountNo="{{ element.accountNo }}"></mifosx-account-number>
-            </td>
-          </ng-container>
-          <ng-container matColumnDef="Saving Account">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Recurring Deposit Product' | translate }}</th>
-            <td mat-cell *matCellDef="let element">
-              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
-            </td>
-          </ng-container>
-          <ng-container matColumnDef="Closed Date">
-            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
-            <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
-          </ng-container>
-
-          <ng-container matColumnDef="no-data">
-            <td mat-footer-cell *matFooterCellDef [attr.colspan]="closedSavingsColumns.length">
-              <div class="table-empty-state">
-                <i class="fa fa-folder-open-o table-empty-state__icon"></i>
-                <p class="table-empty-state__text">
-                  {{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }}
-                </p>
-              </div>
-            </td>
-          </ng-container>
-
-          <tr mat-header-row *matHeaderRowDef="closedSavingsColumns"></tr>
-          <tr
-            mat-row
-            *matRowDef="let row; columns: closedSavingsColumns"
-            [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
-            class="select-row"
-          ></tr>
-          <tr
-            mat-footer-row
-            *matFooterRowDef="
-              (savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring')?.length === 0 ? ['no-data'] : []
             "
           ></tr>
         </table>

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

@@ -419,3 +419,24 @@ table[mat-table] {
   font-size: 24px;
   z-index: 1;
 }
+
+.rd-status {
+  display: inline-block;
+  padding: 2px 8px;
+  border-radius: 10px;
+  font-size: 12px;
+  font-weight: 600;
+  background: #dcfce7;
+  color: #166534;
+
+  &--ended {
+    background: #e2e8f0;
+    color: #475569;
+  }
+}
+
+.rd-status__date {
+  margin-top: 2px;
+  font-size: 11px;
+  color: #64748b;
+}

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

@@ -187,6 +187,15 @@ export class GeneralTabComponent implements OnDestroy {
     'Saving Account',
     'Closed Date'
   ];
+  /** Closed Recurring Deposit Accounts Columns - with how each one ended, for tracking. */
+  recurringColumns: string[] = [
+    'Account No',
+    'Saving Account',
+    'Status',
+    'Last Active',
+    'Balance',
+    'Actions'
+  ];
   /** Open Shares Accounts Columns */
   openSharesColumns: string[] = [
     'Account No',
@@ -475,6 +484,30 @@ export class GeneralTabComponent implements OnDestroy {
     );
   }
 
+  /** Where a recurring deposit stands - for one that has ended, how it ended. */
+  rdStatusLabel(account: any): string {
+    switch (account?.status?.code) {
+      case 'savingsAccountStatusType.active':
+        return 'Active';
+      case 'savingsAccountStatusType.matured':
+        return 'Matured (not closed)';
+      case 'savingsAccountStatusType.submitted.and.pending.approval':
+        return 'Pending Approval';
+      case 'savingsAccountStatusType.approved':
+        return 'Approved';
+      case 'savingsAccountStatusType.closed':
+        return 'Matured & Closed';
+      case 'savingsAccountStatusType.pre.mature.closure':
+        return 'Premature Closed';
+      case 'savingsAccountStatusType.rejected':
+        return 'Rejected';
+      case 'savingsAccountStatusType.withdrawn.by.applicant':
+        return 'Withdrawn by Client';
+      default:
+        return account?.status?.value ?? '';
+    }
+  }
+
   viewAccountsLabel(closed: boolean): string {
     if (closed) {
       return 'labels.buttons.View Active Accounts';

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

@@ -377,6 +377,8 @@
         </button>
       }
       @if (selectedTabIndex < totalTabs - 1) {
+        <!-- Tooltip sits on a wrapper: a disabled button fires no mouse events, so it can't host it. -->
+        <span [matTooltip]="currentStepBlockerMessage" [matTooltipDisabled]="!currentStepBlockerMessage">
         <button mat-raised-button color="primary" (click)="onNext()" [disabled]="savingClient || !currentStepValid">
           @if (savingClient) {
             <mat-progress-spinner diameter="18" mode="indeterminate" class="m-r-10"></mat-progress-spinner>
@@ -390,6 +392,7 @@
             <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
           }
         </button>
+        </span>
       }
       @if (selectedTabIndex === totalTabs - 1) {
         <button mat-raised-button color="primary" [routerLink]="['../']">

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

@@ -393,6 +393,12 @@ export class EditClientComponent {
     if (this.selectedTabIndex === 0 && this.clientGeneralForm?.valid && !this.contactVerificationComplete) {
       return 'Verify the OTP sent to both the old and new mobile number/email before saving.';
     }
+    if (this.selectedTabIndex === 0 && this.clientGeneralForm && !this.clientGeneralForm.valid) {
+      const labels = this.invalidGeneralFieldLabels();
+      if (labels.length) {
+        return `Please fill/correct: ${labels.join(', ')}.`;
+      }
+    }
     if (this.selectedTabIndex === 1) {
       const labels = this.clientKycStep?.invalidFieldLabels || [];
       if (labels.length) {
@@ -408,6 +414,42 @@ export class EditClientComponent {
     return 'Please fill all mandatory fields on this tab to continue.';
   }
 
+  /**
+   * Readable names of the General-tab controls that are invalid. Older clients can be missing
+   * fields that are now mandatory (e.g. mobile/email), which leaves Save disabled with nothing
+   * on screen saying why — this feeds the button tooltip.
+   */
+  private invalidGeneralFieldLabels(): string[] {
+    const labels: Record<string, string> = {
+      officeId: 'Office',
+      legalFormId: 'Legal Form',
+      genderId: 'Gender',
+      mobileNo: 'Mobile No',
+      alternateMobileNo: 'Alternate Mobile No',
+      emailAddress: 'Email',
+      dateOfBirth: 'Date of Birth',
+      submittedOnDate: 'Submitted On',
+      activationDate: 'Activation Date',
+      savingsProductId: 'Savings Product',
+      firstname: 'First Name',
+      middlename: 'Middle Name',
+      lastname: 'Last Name',
+      fullname: 'Name',
+      monthlyIncome: 'Monthly Income',
+      annualIncome: 'Annual Income',
+      monthlyTurnover: 'Monthly Turnover',
+      annualTurnover: 'Yearly Turnover',
+      agricultureIncome: 'Agriculture Income',
+      nonAgricultureIncome: 'Non-Agriculture Income',
+      guardianDetails: 'Guardian',
+      clientNonPersonDetails: 'Entity Details'
+    };
+    const controls = this.clientGeneralForm?.controls || {};
+    return Object.keys(controls)
+      .filter((name) => controls[name].invalid)
+      .map((name) => labels[name] || name);
+  }
+
   /** Whether the current tab has unsaved edits */
   isCurrentTabEdited(): boolean {
     return this.tabEditMode[this.selectedTabIndex] === true;

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

@@ -36,7 +36,24 @@ export class CacheInterceptor implements HttpInterceptor {
     '/rbireserveconfig',
     '/tdsconfig',
     '/tds/deposit-interest',
-    '/savingsinterestpostingreports'
+    // 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.
+    '/tellers',
+    '/cashreports',
+    '/cashreconciliation',
+    '/cashsettlement',
+    '/cashtransfer',
+    '/branchday',
+    // A deposit's lien moves with every repayment of the loan it secures, and decides whether the
+    // deposit may be closed at all - a stale copy would show a released lien as still blocking.
+    '/liens',
+    // The RD Dashboard counts late installments as of today; a cached copy would hide a payment just taken.
+    '/recurringdepositaccounts/dashboard'
   ];
 
   private isCacheable(url: string): boolean {

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
+    // Resolved once and emitted in one place below — see the severity decision there for which of
-    // as an error and therefore surfaces as a centred modal rather than a corner toast.
+    // 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/shell.component.html

@@ -1220,6 +1220,9 @@
           <button mat-menu-item tabindex="0" [routerLink]="['/fd-dashboard']">
             <fa-icon icon="calendar-check" class="menu-item-icon"></fa-icon> FD Dashboard
           </button>
+          <button mat-menu-item tabindex="0" [routerLink]="['/rd-dashboard']">
+            <fa-icon icon="piggy-bank" class="menu-item-icon"></fa-icon> RD Dashboard
+          </button>
           <button mat-menu-item tabindex="0">
             <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> FD Interest Report
           </button>

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 */
+  /** The bank's "today" for the top bar — the business date when enabled, else the server date. */
-  today = new 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/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts

@@ -24,6 +24,7 @@ import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, ValidatorFn,
 /** Custom Services */
 import { FixedDepositsService } from '../../../fixed-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { AlertService } from 'app/core/alert/alert.service';
 import { Dates } from 'app/core/utils/dates';
 import { FormatNumberPipe } from '../../../../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -97,6 +98,7 @@ export class PaymentDialogComponent implements OnInit {
   private fixedDepositsService = inject(FixedDepositsService);
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
+  private alertService = inject(AlertService);
 
   paymentForm: UntypedFormGroup;
   /** Loaded once, on open, from the same closure template the existing Close action already uses. */
@@ -375,7 +377,16 @@ export class PaymentDialogComponent implements OnInit {
     this.fixedDepositsService
       .executeFixedDepositsAccountCommand(this.data.accountId as string, 'payment', data)
       .subscribe({
-        next: () => {
+        next: (response: any) => {
+          // Parked in the Checker Inbox rather than executed -- see the same handling in
+          // PrematureCloseDialogComponent for why an HTTP 200 here can still mean "not applied yet".
+          if (response?.rollbackTransaction) {
+            this.alertService.alert({
+              type: 'Success',
+              message:
+                'This payment has been submitted for approval. The deposit is unchanged until a checker approves it.'
+            });
+          }
           this.dialogRef.close({ confirm: true });
         },
         // Keep the dialog open with the entered values and say what went wrong, rather than leaving a

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html

@@ -140,7 +140,9 @@
                   <span class="pcd__preview-label"
                     >Interest Earned (to {{ 'labels.inputs.Premature Close Date' | translate }})</span
                   >
-                  <span class="pcd__preview-value">+ {{ interestEarned | formatNumber }}</span>
+                  <span class="pcd__preview-value"
+                    >{{ interestEarned >= 0 ? '+' : '' }} {{ interestEarned | formatNumber }}</span
+                  >
                 </div>
               }
               <div class="pcd__preview-row pcd__preview-row--total">
@@ -205,8 +207,8 @@
           @if (noDestinationAccounts) {
             <p class="pcd__hint pcd__hint--warn" role="alert">
               <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-              This customer has no active savings account to transfer into. Open one first, or choose an action that
+              This customer has no active savings account to transfer into. Premature closure has to be paid into a
-              pays out in cash instead.
+              savings account, so open one for this customer before closing this deposit.
             </p>
           }
 
@@ -229,6 +231,16 @@
             </mat-form-field>
           }
 
+          @if (prematureCloseForm.contains('toGlAccountId')) {
+            <mifosx-gl-account-selector
+              [inputFormControl]="toGlAccountControl"
+              [glAccountList]="glAccountsData"
+              [required]="true"
+              [inputLabel]="'Transfer to GL Account'"
+            >
+            </mifosx-gl-account-selector>
+          }
+
           @if (prematureCloseForm.contains('transferDescription')) {
             <mat-form-field appearance="outline">
               <mat-label>{{ 'labels.inputs.Transfer Description' | translate }}</mat-label>

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.ts

@@ -23,13 +23,19 @@ import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, Validators }
 /** Custom Services */
 import { FixedDepositsService } from '../../../fixed-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
+import { AccountingService } from 'app/accounting/accounting.service';
+import { AlertService } from 'app/core/alert/alert.service';
 import { Dates } from 'app/core/utils/dates';
 import { FormatNumberPipe } from '../../../../../pipes/format-number.pipe';
+import { GlAccountSelectorComponent } from 'app/shared/accounting/gl-account-selector/gl-account-selector.component';
+import { GLAccount } from 'app/shared/models/general.model';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
 /**
  * "Premature Close" dialog -- Active-only, no reinvest option (the deposit hasn't matured, so there's
- * nothing to renew): pay out in cash, or transfer the pre-maturity balance to a savings account. Same
+ * nothing to renew): transfer the pre-maturity balance to a savings account, or post it to a GL account.
+ * There is deliberately no cash payout -- the backend does not offer or accept one for a premature
+ * closure, so the proceeds always stay traceable to an account. Same
  * `.pcd__*` visual language as the Payment dialog ({@link PaymentDialogComponent}), in this Danger Zone
  * action's own red accent rather than Payment's blue, since it's an irreversible, usually
  * penalty-bearing action rather than a routine one.
@@ -49,22 +55,26 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     MatDialogClose,
     CdkTextareaAutosize,
     FaIconComponent,
-    FormatNumberPipe
+    FormatNumberPipe,
+    GlAccountSelectorComponent
   ]
 })
 export class PrematureCloseDialogComponent implements OnInit {
   /** The `onAccountClosureId` codes Premature Close can offer -- same codes Payment/Close use. */
   private static readonly WITHDRAW_DEPOSIT_ID = 100;
   private static readonly TRANSFER_TO_SAVINGS_ID = 200;
+  private static readonly TRANSFER_TO_GL_ID = 600;
 
   private static readonly ACTION_ICONS: Record<number, string> = {
     [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'money-bill-wave',
-    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'wallet'
+    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'wallet',
+    [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'book'
   };
 
   private static readonly ACTION_DESCRIPTIONS: Record<number, string> = {
     [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'Pay out the full balance in cash',
-    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'Move the full balance to another savings account'
+    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'Move the full balance to another savings account',
+    [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'Post the full balance to a GL account'
   };
 
   /**
@@ -108,11 +118,15 @@ export class PrematureCloseDialogComponent implements OnInit {
   private formBuilder = inject(UntypedFormBuilder);
   private fixedDepositsService = inject(FixedDepositsService);
   private settingsService = inject(SettingsService);
+  private accountingService = inject(AccountingService);
+  private alertService = inject(AlertService);
   private dateUtils = inject(Dates);
 
   prematureCloseForm: UntypedFormGroup;
   onAccountClosureOptions: any[] = [];
   savingsAccountsData: any[] = [];
+  /** Postable GL accounts, loaded once -- only read when the GL action is chosen. */
+  glAccountsData: GLAccount[] = [];
   maturityAmount: number = null;
   /** The rate actually resolved for THIS preview by the backend (actual-period vs contracted,
    *  penalty-deducted or not) -- distinct from data.nominalAnnualInterestRate, which is always the
@@ -228,19 +242,50 @@ export class PrematureCloseDialogComponent implements OnInit {
       });
   }
 
-  /** Adds/removes the destination-account control to match what the chosen type needs. */
+  /** Adds/removes the destination control to match what the chosen type needs. */
   private onClosureTypeChange(id: number): void {
-    if (id === PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID) {
+    const toSavings = id === PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID;
-      if (!this.prematureCloseForm.contains('toSavingsAccountId')) {
+    const toGl = id === PrematureCloseDialogComponent.TRANSFER_TO_GL_ID;
-        this.prematureCloseForm.addControl('toSavingsAccountId', new UntypedFormControl('', Validators.required));
+
-        this.prematureCloseForm.addControl('transferDescription', new UntypedFormControl(''));
+    if (toSavings && !this.prematureCloseForm.contains('toSavingsAccountId')) {
-      }
+      this.prematureCloseForm.addControl('toSavingsAccountId', new UntypedFormControl('', Validators.required));
-    } else {
+    } else if (!toSavings) {
       this.prematureCloseForm.removeControl('toSavingsAccountId');
+    }
+
+    if (toGl) {
+      if (!this.prematureCloseForm.contains('toGlAccountId')) {
+        this.prematureCloseForm.addControl('toGlAccountId', new UntypedFormControl('', Validators.required));
+      }
+      this.loadGlAccounts();
+    } else {
+      this.prematureCloseForm.removeControl('toGlAccountId');
+    }
+
+    // Both destinations carry the description through -- to the account transfer, or to the narration on
+    // the journal entry that credits the GL account.
+    if ((toSavings || toGl) && !this.prematureCloseForm.contains('transferDescription')) {
+      this.prematureCloseForm.addControl('transferDescription', new UntypedFormControl(''));
+    } else if (!toSavings && !toGl) {
       this.prematureCloseForm.removeControl('transferDescription');
     }
   }
 
+  /** Fetched on first use rather than with the dialog, since most closures never pick the GL action. */
+  private loadGlAccounts(): void {
+    if (this.glAccountsData.length) {
+      return;
+    }
+    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
+      this.glAccountsData = accounts ?? [];
+    });
+  }
+
+  /** The GL selector takes a control instance, not a control name. */
+  get toGlAccountControl(): UntypedFormControl {
+    return this.prematureCloseForm.get('toGlAccountId') as UntypedFormControl;
+  }
+
   /** The gap between the deposit and the computed maturity amount -- the actual interest this premature
    *  closure earns, at whatever rate (contracted, or the lower pre-closure-penalty one below) applied. */
   get interestEarned(): number | null {
@@ -373,7 +418,18 @@ export class PrematureCloseDialogComponent implements OnInit {
     this.fixedDepositsService
       .executeFixedDepositsAccountCommand(this.data.accountId as string, 'prematureClose', data)
       .subscribe({
-        next: () => {
+        next: (response: any) => {
+          // A command on a maker-checker permission is parked in the Checker Inbox, not executed:
+          // the platform rolls its transaction back and still answers HTTP 200 with
+          // rollbackTransaction: true. Without saying so, the dialog closes and the account reloads
+          // unchanged -- which reads as "nothing happened" rather than "waiting for approval".
+          if (response?.rollbackTransaction) {
+            this.alertService.alert({
+              type: 'Success',
+              message:
+                'Premature closure has been submitted for approval. The deposit is unchanged until a checker approves it.'
+            });
+          }
           this.dialogRef.close({ confirm: true });
         },
         // Keep the dialog open with the entered values and say what went wrong, rather than leaving a

src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts

@@ -30,6 +30,7 @@ import { AccountsService } from 'app/accounts/accounts.service';
 import { Currency } from 'app/shared/models/general.model';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
 import { AuthenticationService } from '../../../core/authentication/authentication.service';
 import { MatTooltip } from '@angular/material/tooltip';
 import { NgClass, CurrencyPipe } from '@angular/common';
@@ -74,6 +75,7 @@ import { DormancyAlertPanelComponent } from 'app/shared/dormancy-alert-panel/dor
 export class FixedDepositAccountViewComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
+  private alertService = inject(AlertService);
   private fixedDepositsService = inject(FixedDepositsService);
   private savingsService = inject(SavingsService);
   private accountsService = inject(AccountsService);
@@ -419,7 +421,16 @@ export class FixedDepositAccountViewComponent implements OnInit {
       if (response.confirm) {
         this.fixedDepositsService
           .executeFixedDepositsAccountCommand(this.fixedDepositsAccountData.id, 'postInterest', {})
-          .subscribe(() => {
+          .subscribe((commandResponse: any) => {
+            // Parked in the Checker Inbox rather than executed (HTTP 200 with
+            // rollbackTransaction: true), so the reload below shows no new interest posting.
+            if (commandResponse?.rollbackTransaction) {
+              this.alertService.alert({
+                type: 'Success',
+                message:
+                  'Interest posting has been sent for checker approval. No interest is posted until a checker approves it.'
+              });
+            }
             this.reload();
           });
       }

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts

@@ -11,6 +11,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
 
 /** Custom Services */
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
@@ -37,6 +38,7 @@ export class ApproveFixedDepositsAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
+  private alertService = inject(AlertService);
 
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
@@ -98,17 +100,31 @@ export class ApproveFixedDepositsAccountComponent implements OnInit {
       dateFormat,
       locale
     };
-    this.fixedDepositsService.executeFixedDepositsAccountCommand(this.accountId, 'approve', data).subscribe(() => {
+    this.fixedDepositsService
-      const activationData = {
+      .executeFixedDepositsAccountCommand(this.accountId, 'approve', data)
-        activatedOnDate: approveFixedDepositsAccountFormData.approvedOnDate,
+      .subscribe((response: any) => {
-        dateFormat,
+        // Parked in the Checker Inbox rather than executed (HTTP 200 with rollbackTransaction: true).
-        locale
+        // The account is therefore still pending, so chaining activation onto it would be applied to an
-      };
+        // unapproved account -- stop here and say what is actually waiting.
-      this.fixedDepositsService
+        if (response?.rollbackTransaction) {
-        .executeFixedDepositsAccountCommand(this.accountId, 'activate', activationData)
+          this.alertService.alert({
-        .subscribe(() => {
+            type: 'Success',
+            message:
+              'This approval has been sent for checker approval. The account stays pending until a checker approves it.'
+          });
           this.router.navigate(['../../'], { relativeTo: this.route });
-        });
+          return;
-    });
+        }
+        const activationData = {
+          activatedOnDate: approveFixedDepositsAccountFormData.approvedOnDate,
+          dateFormat,
+          locale
+        };
+        this.fixedDepositsService
+          .executeFixedDepositsAccountCommand(this.accountId, 'activate', activationData)
+          .subscribe(() => {
+            this.router.navigate(['../../'], { relativeTo: this.route });
+          });
+      });
   }
 }

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/close-fixed-deposits-account/close-fixed-deposits-account.component.ts

@@ -21,6 +21,7 @@ import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { FixedDepositsService } from '../../fixed-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
@@ -43,6 +44,7 @@ export class CloseFixedDepositsAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
+  private alertService = inject(AlertService);
 
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
@@ -139,8 +141,18 @@ export class CloseFixedDepositsAccountComponent implements OnInit {
       dateFormat,
       locale
     };
-    this.fixedDepositsService.executeFixedDepositsAccountCommand(this.accountId, 'close', data).subscribe(() => {
+    this.fixedDepositsService
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      .executeFixedDepositsAccountCommand(this.accountId, 'close', data)
-    });
+      .subscribe((response: any) => {
+        // Parked in the Checker Inbox rather than executed (HTTP 200 with rollbackTransaction: true),
+        // so the deposit reloads unchanged -- say so instead of letting that read as "nothing happened".
+        if (response?.rollbackTransaction) {
+          this.alertService.alert({
+            type: 'Success',
+            message: 'Closure has been sent for checker approval. The deposit is unchanged until a checker approves it.'
+          });
+        }
+        this.router.navigate(['../../'], { relativeTo: this.route });
+      });
   }
 }

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/reject-fixed-deposits-account/reject-fixed-deposits-account.component.ts

@@ -11,6 +11,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
 
 /** Custom Services */
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
@@ -37,6 +38,7 @@ export class RejectFixedDepositsAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
+  private alertService = inject(AlertService);
 
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
@@ -97,8 +99,19 @@ export class RejectFixedDepositsAccountComponent implements OnInit {
       dateFormat,
       locale
     };
-    this.fixedDepositsService.executeFixedDepositsAccountCommand(this.accountId, 'reject', data).subscribe(() => {
+    this.fixedDepositsService
-      this.router.navigate(['../../'], { relativeTo: this.route });
+      .executeFixedDepositsAccountCommand(this.accountId, 'reject', data)
-    });
+      .subscribe((response: any) => {
+        // Parked in the Checker Inbox rather than executed (HTTP 200 with rollbackTransaction: true),
+        // so the application is still open -- say so instead of letting that read as "nothing happened".
+        if (response?.rollbackTransaction) {
+          this.alertService.alert({
+            type: 'Success',
+            message:
+              'Rejection has been sent for checker approval. The application is unchanged until a checker approves it.'
+          });
+        }
+        this.router.navigate(['../../'], { relativeTo: this.route });
+      });
   }
 }

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/undo-approval-fixed-deposits-account/undo-approval-fixed-deposits-account.component.ts

@@ -12,6 +12,7 @@ import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angu
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
 /** Custom Services */
+import { AlertService } from 'app/core/alert/alert.service';
 import { SavingsService } from 'app/savings/savings.service';
 import { FixedDepositsService } from '../../fixed-deposits.service';
 import { CdkTextareaAutosize } from '@angular/cdk/text-field';
@@ -35,6 +36,7 @@ export class UndoApprovalFixedDepositsAccountComponent implements OnInit {
   private fixedDepositsService = inject(FixedDepositsService);
   private route = inject(ActivatedRoute);
   private router = inject(Router);
+  private alertService = inject(AlertService);
 
   /** Undo Approval Fixed Deposits Account form. */
   undoApprovalFixedDepositsAccountForm: UntypedFormGroup;
@@ -87,12 +89,30 @@ export class UndoApprovalFixedDepositsAccountComponent implements OnInit {
     if (this.undoAction === 'Undo Activation') {
       this.fixedDepositsService
         .executeFixedDepositsAccountCommand(this.accountId, this.undoCommand, data)
-        .subscribe(() => {
+        .subscribe((response: any) => {
+          this.notifyIfSentForApproval(response);
           this.router.navigate(['../../'], { relativeTo: this.route });
         });
     } else {
-      this.savingsService.executeSavingsAccountCommand(this.accountId, this.undoCommand, data).subscribe(() => {
+      this.savingsService
-        this.router.navigate(['../../'], { relativeTo: this.route });
+        .executeSavingsAccountCommand(this.accountId, this.undoCommand, data)
+        .subscribe((response: any) => {
+          this.notifyIfSentForApproval(response);
+          this.router.navigate(['../../'], { relativeTo: this.route });
+        });
+    }
+  }
+
+  /**
+   * Both undo commands sit on maker-checker permissions, so either can come back parked in the
+   * Checker Inbox rather than executed -- HTTP 200 with rollbackTransaction: true, and the account
+   * reloaded unchanged. Without this the navigation away reads as "it worked".
+   */
+  private notifyIfSentForApproval(response: any): void {
+    if (response?.rollbackTransaction) {
+      this.alertService.alert({
+        type: 'Success',
+        message: `${this.undoAction} has been sent for checker approval. The account is unchanged until a checker approves it.`
       });
     }
   }

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/withdraw-by-client-fixed-deposits-account/withdraw-by-client-fixed-deposits-account.component.ts

@@ -11,6 +11,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
 
 /** Custom Services */
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
@@ -37,6 +38,7 @@ export class WithdrawByClientFixedDepositsAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
+  private alertService = inject(AlertService);
 
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
@@ -99,7 +101,16 @@ export class WithdrawByClientFixedDepositsAccountComponent implements OnInit {
     };
     this.fixedDepositsService
       .executeFixedDepositsAccountCommand(this.accountId, 'withdrawnByApplicant', data)
-      .subscribe(() => {
+      .subscribe((response: any) => {
+        // Parked in the Checker Inbox rather than executed (HTTP 200 with rollbackTransaction: true),
+        // so the application is still open -- say so instead of letting that read as "nothing happened".
+        if (response?.rollbackTransaction) {
+          this.alertService.alert({
+            type: 'Success',
+            message:
+              'Withdrawal has been sent for checker approval. The application is unchanged until a checker approves it.'
+          });
+        }
         this.router.navigate(['../../'], { relativeTo: this.route });
       });
   }

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

@@ -195,6 +195,13 @@ export class CreateRecurringDepositsAccountComponent {
       });
       return;
     }
+    if (this.recurringDepositsAccountProductTemplate?.introducerRequired && !detailsStep?.introducerId) {
+      this.alertService.alert({
+        type: 'Error',
+        message: 'This product requires an introducer. Please choose an existing customer as introducer before submitting.'
+      });
+      return;
+    }
     if (!this.selectedTenureValue || this.selectedTenureFrequencyId === null) {
       this.alertService.alert({
         type: 'Error',
@@ -209,6 +216,39 @@ export class CreateRecurringDepositsAccountComponent {
       });
       return;
     }
+    // Same limits the server enforces - checked here so the message names the numbers before anything is sent.
+    const minInstallment = Number(this.recurringDepositsAccountProductTemplate?.minDepositAmount) || 0;
+    const maxInstallment = Number(this.recurringDepositsAccountProductTemplate?.maxDepositAmount) || 0;
+    if (minInstallment > 0 && this.selectedDepositAmount < minInstallment) {
+      this.alertService.alert({
+        type: 'Error',
+        message: `Installment ${this.selectedDepositAmount} is below this product's minimum of ${minInstallment}.`
+      });
+      return;
+    }
+    if (maxInstallment > 0 && this.selectedDepositAmount > maxInstallment) {
+      this.alertService.alert({
+        type: 'Error',
+        message: `Installment ${this.selectedDepositAmount} is above this product's maximum of ${maxInstallment}.`
+      });
+      return;
+    }
+    if (
+      this.recurringDepositsAccountCurrencyStep?.autoDebitFacility &&
+      detailsStep?.selectedLinkedAccount?.accountType !== 'SAVINGS'
+    ) {
+      this.alertService.alert({
+        type: 'Error',
+        message:
+          'Auto Debit collects each installment from the linked account. Link a Savings account under Deposit Account Link, or turn Auto Debit off.'
+      });
+      return;
+    }
+    const lienError = this.recurringDepositsAccountCurrencyStep?.lienPercentageError;
+    if (lienError) {
+      this.alertService.alert({ type: 'Error', message: `Loan against this RD: ${lienError}` });
+      return;
+    }
     if (!detailsStep?.selectedCustomerSegment) {
       this.alertService.alert({ type: 'Error', message: 'Please select a Customer Segment before submitting.' });
       return;
@@ -255,8 +295,16 @@ export class CreateRecurringDepositsAccountComponent {
       isCalendarInherited: pt?.isCalendarInherited ?? false,
       isMandatoryDeposit: pt?.isMandatoryDeposit ?? false,
       allowWithdrawal: pt?.allowWithdrawal ?? false,
-      adjustAdvanceTowardsFuturePayments: pt?.adjustAdvanceTowardsFuturePayments ?? false,
+      // Money paid ahead of a due date counts towards the next installments. Without this an advance cash
-      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false
+      // payment stayed unallocated: the schedule kept showing the installment unpaid, so Auto Debit collected it
+      // a second time and the missed-installment penalty charged it. The RD product form has no such option, so
+      // the product's value was always false.
+      adjustAdvanceTowardsFuturePayments: true,
+      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false,
+      // Lien Marked products only - the server ignores it otherwise and caps it at the product's limit.
+      ...(currencyStep?.lienAllowed && currencyStep?.lienPercentage != null
+        ? { lienPercentage: Number(currencyStep.lienPercentage) }
+        : {})
     };
 
     // Charges from product template

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

@@ -233,6 +233,11 @@ export class EditRecurringDepositAccountComponent {
       });
       return;
     }
+    const lienError = this.recurringDepositsAccountCurrencyStep?.lienPercentageError;
+    if (lienError) {
+      this.alertService.alert({ type: 'Error', message: `Loan against this RD: ${lienError}` });
+      return;
+    }
     if (!detailsStep?.selectedCustomerSegment) {
       this.alertService.alert({ type: 'Error', message: 'Please select a Customer Segment before submitting.' });
       return;
@@ -275,8 +280,13 @@ export class EditRecurringDepositAccountComponent {
       isCalendarInherited: pt?.isCalendarInherited ?? false,
       isMandatoryDeposit: pt?.isMandatoryDeposit ?? false,
       allowWithdrawal: pt?.allowWithdrawal ?? false,
-      adjustAdvanceTowardsFuturePayments: pt?.adjustAdvanceTowardsFuturePayments ?? false,
+      // See create-recurring-deposits-account: advance payments must count towards the next installments.
-      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false
+      adjustAdvanceTowardsFuturePayments: true,
+      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false,
+      // Lien Marked products only - the server ignores it otherwise and caps it at the product's limit.
+      ...(currencyStep?.lienAllowed && currencyStep?.lienPercentage != null
+        ? { lienPercentage: Number(currencyStep.lienPercentage) }
+        : {})
     };
 
     const rawCharges: any[] = pt?.charges ?? [];

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/activate-recurring-deposits-account/activate-recurring-deposits-account.component.ts

@@ -70,8 +70,9 @@ export class ActivateRecurringDepositsAccountComponent implements OnInit {
    */
   createActivateRecurringDepositsAccountForm() {
     this.activateRecurringDepositsAccountForm = this.formBuilder.group({
+      // Defaults to the business date (the branch's working day), which is what the account is normally activated on.
       activatedOnDate: [
-        '',
+        this.settingsService.businessDate,
         Validators.required
       ]
     });

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/approve-recurring-deposits-account/approve-recurring-deposits-account.component.ts

@@ -72,8 +72,9 @@ export class ApproveRecurringDepositsAccountComponent implements OnInit {
    */
   createApproveRecurringDepositsAccountForm() {
     this.approveRecurringDepositsAccountForm = this.formBuilder.group({
+      // Defaults to the business date (the branch's working day), which is what the account is normally approved on.
       approvedOnDate: [
-        '',
+        this.settingsService.businessDate,
         Validators.required
       ],
       note: ['']

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.html

@@ -13,6 +13,16 @@
         <div class="layout-column">
           <h3 class="mat-h3 flex-fill">{{ title }}</h3>
 
+          @if (totalLienAmount > 0) {
+            <p class="lien-warn">
+              This deposit is pledged as loan security (lien {{ totalLienAmount | number: '1.2-2' }} -
+              @for (lien of liens; track lien.loanId; let last = $last) {
+                loan {{ lien.loanAccountNo }}{{ last ? '' : ', ' }}
+              }
+              ). It cannot be closed until the loan is repaid or the guarantee is released.
+            </p>
+          }
+
           <mat-form-field (click)="closedOnDatePicker.open()">
             <mat-label>{{ 'labels.inputs.Closed On' | translate }}</mat-label>
             <input
@@ -154,7 +164,7 @@
         <button type="button" mat-raised-button [routerLink]="['../general']">
           {{ 'labels.buttons.Cancel' | translate }}
         </button>
-        <button mat-raised-button color="primary" [disabled]="!closeRecurringDepositForm.valid">
+        <button mat-raised-button color="primary" [disabled]="!closeRecurringDepositForm.valid || totalLienAmount > 0">
           {{ 'labels.buttons.Submit' | translate }}
         </button>
       </mat-card-actions>

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.scss

@@ -10,6 +10,12 @@
   max-width: 37rem;
 }
 
+.lien-warn {
+  margin: 0 0 16px;
+  font-size: 13px;
+  color: #c62828;
+}
+
 .expandcollapsebutton {
   margin-top: -7px;
   margin-left: 2%;

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/close-recurring-deposits-account/close-recurring-deposits-account.component.ts

@@ -64,6 +64,9 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
   maxDate = new Date();
   /** Close Recurring Deposit Account form. */
   closeRecurringDepositForm: UntypedFormGroup;
+  /** Loans this deposit secures. While any remain, the server refuses to close it. */
+  liens: any[] = [];
+  totalLienAmount = 0;
 
   /**
    * Retrieves action details template data from `resolve`
@@ -79,6 +82,11 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
       this.maturityAmount = data.recurringDepositsAccountActionData.maturityAmount;
       this.onAccountClosureOptions = data.recurringDepositsAccountActionData.onAccountClosureOptions;
       this.paymentTypes = data.recurringDepositsAccountActionData.paymentTypeOptions;
+      // A matured deposit closes on or after its maturity date - the server refuses anything earlier.
+      const maturityDate = data.recurringDepositsAccountActionData.maturityDate;
+      if (Array.isArray(maturityDate) && maturityDate.length >= 3) {
+        this.minDate = new Date(maturityDate[0], maturityDate[1] - 1, maturityDate[2]);
+      }
       if (data.recurringDepositsAccountActionData.maturityAmount) {
         this.title = 'Recurring Deposit Closure on Maturity';
       } else {
@@ -92,6 +100,10 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
     this.maxDate = this.settingsService.businessDate;
     this.createcloseRecurringDepositForm();
     this.addTransferDetails();
+    this.recurringDepositsService.getRecurringDepositLiens(this.accountId).subscribe((response: any) => {
+      this.liens = response?.liens ?? [];
+      this.totalLienAmount = Number(response?.totalLienAmount) || 0;
+    });
   }
 
   /**
@@ -99,8 +111,10 @@ export class CloseRecurringDepositsAccountComponent implements OnInit {
    */
   createcloseRecurringDepositForm() {
     this.closeRecurringDepositForm = this.formBuilder.group({
+      // The business date, not the computer's clock: the branch's working day can differ from the calendar day,
+      // and closing on the clock's date (before maturity, or before the deposit's last installment) fails.
       closedOnDate: [
-        new Date(),
+        this.settingsService.businessDate,
         Validators.required
       ],
       maturityAmount: [{ value: this.maturityAmount, disabled: true }],

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.html

@@ -11,6 +11,51 @@
     <form [formGroup]="prematureCloseRecurringDepositsAccountForm" (ngSubmit)="submit()">
       <mat-card-content>
         <div class="layout-column">
+          @if (account) {
+            <div class="pc-context">
+              <div class="pc-row">
+                <span>Account</span><b>{{ account.accountNo }}</b>
+              </div>
+              <div class="pc-row">
+                <span>Current balance</span><b>{{ currencySymbol }} {{ balance | number: '1.2-2' }}</b>
+              </div>
+              @if (account.maturityDate) {
+                <div class="pc-row">
+                  <span>Maturity date</span><b>{{ account.maturityDate | dateFormat }}</b>
+                </div>
+              }
+              @if (account.maturityAmount != null) {
+                <div class="pc-row">
+                  <span>Amount at maturity</span><b>{{ currencySymbol }} {{ account.maturityAmount | number: '1.2-2' }}</b>
+                </div>
+              }
+              <div class="pc-row">
+                <span>Pre-closure penalty</span>
+                <b>
+                  @if (account.preClosurePenalApplicable) {
+                    {{ account.preClosurePenalInterest }}% less interest
+                    @if (account.preClosurePenalInterestOnType?.value) {
+                      ({{ account.preClosurePenalInterestOnType.value }})
+                    }
+                  } @else {
+                    None
+                  }
+                </b>
+              </div>
+            </div>
+          }
+
+          @if (totalLienAmount > 0) {
+            <p class="pc-warn">
+              This deposit is pledged as loan security (lien {{ currencySymbol }}
+              {{ totalLienAmount | number: '1.2-2' }} -
+              @for (lien of liens; track lien.loanId; let last = $last) {
+                loan {{ lien.loanAccountNo }}{{ last ? '' : ', ' }}
+              }
+              ). It cannot be closed until the loan is repaid or the guarantee is released.
+            </p>
+          }
+
           <mat-form-field (click)="closedOnDatePicker.open()">
             <mat-label>{{ 'labels.inputs.Closed On' | translate }}</mat-label>
             <input
@@ -23,6 +68,7 @@
             />
             <mat-datepicker-toggle matSuffix [for]="closedOnDatePicker"></mat-datepicker-toggle>
             <mat-datepicker #closedOnDatePicker></mat-datepicker>
+            <mat-hint>Must be before the maturity date - on or after it, use Close instead.</mat-hint>
             @if (prematureCloseRecurringDepositsAccountForm.controls.closedOnDate.hasError('required')) {
               <mat-error>
                 {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
@@ -30,6 +76,89 @@
               </mat-error>
             }
           </mat-form-field>
+
+          @if (reasonOptions.length > 1) {
+            <mat-form-field subscriptSizing="dynamic">
+              <mat-label>Closure reason</mat-label>
+              <mat-select formControlName="prematureClosureReasonId">
+                @for (reason of reasonOptions; track reason.id) {
+                  <mat-option [value]="reason.id">{{ reason.label }}</mat-option>
+                }
+              </mat-select>
+              <mat-hint>{{ selectedReasonHint }}</mat-hint>
+            </mat-form-field>
+          }
+
+          <div class="pc-calc">
+            <button
+              type="button"
+              mat-stroked-button
+              color="primary"
+              (click)="calculate()"
+              [disabled]="
+                calculating || totalLienAmount > 0 || !prematureCloseRecurringDepositsAccountForm.value.closedOnDate
+              "
+            >
+              {{ calculating ? 'Calculating…' : 'Calculate Payout' }}
+            </button>
+          </div>
+
+          @if (preview) {
+            <div class="pc-result">
+              <div class="pc-row pc-row--total">
+                <span>Payable on premature closure</span>
+                <b>{{ currencySymbol }} {{ preview.payoutAmount | number: '1.2-2' }}</b>
+              </div>
+              @if (shortfallVsMaturity != null && shortfallVsMaturity > 0) {
+                <div class="pc-row pc-row--muted">
+                  <span>Less than at maturity by</span>
+                  <b>{{ currencySymbol }} {{ shortfallVsMaturity | number: '1.2-2' }}</b>
+                </div>
+              }
+              <p class="pc-note">
+                Paid by transfer to the client's savings account - a recurring deposit cannot be broken for cash.
+              </p>
+            </div>
+
+            @if (destinationAccounts.length === 0) {
+              <p class="pc-warn">
+                This client has no active savings account to receive the proceeds. Open one first, then close this
+                deposit.
+              </p>
+            } @else {
+              <mat-form-field>
+                <mat-label>{{ 'labels.inputs.Transfer to Savings' | translate }}</mat-label>
+                <mat-select required formControlName="toSavingsAccountId">
+                  @for (savings of destinationAccounts; track savings.id) {
+                    <mat-option [value]="savings.id">
+                      {{ savings.accountNo }} - {{ savings.productName }}
+                      @if (savings.owner) {
+                        (nominee: {{ savings.owner }})
+                      } @else if (savings.id === account?.linkedAccountId) {
+                        (linked)
+                      }
+                    </mat-option>
+                  }
+                </mat-select>
+                @if (prematureCloseRecurringDepositsAccountForm.controls.toSavingsAccountId.hasError('required')) {
+                  <mat-error>
+                    {{ 'labels.inputs.Transfer to savings account' | translate }} {{ 'labels.commons.is' | translate }}
+                    <strong>{{ 'labels.commons.required' | translate }}</strong>
+                  </mat-error>
+                }
+              </mat-form-field>
+
+              <mat-form-field>
+                <mat-label>{{ 'labels.inputs.Transfer Description' | translate }}</mat-label>
+                <input matInput formControlName="transferDescription" />
+              </mat-form-field>
+
+              <mat-form-field>
+                <mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
+                <textarea matInput cdkTextareaAutosize formControlName="note"></textarea>
+              </mat-form-field>
+            }
+          }
         </div>
       </mat-card-content>
 
@@ -37,8 +166,8 @@
         <button type="button" mat-raised-button [routerLink]="['../../']">
           {{ 'labels.buttons.Cancel' | translate }}
         </button>
-        <button mat-raised-button color="primary" [disabled]="!prematureCloseRecurringDepositsAccountForm">
+        <button mat-raised-button color="primary" [disabled]="!canConfirm">
-          {{ 'labels.buttons.Confirm' | translate }}
+          {{ submitting ? 'Closing…' : ('labels.buttons.Confirm' | translate) }}
         </button>
       </mat-card-actions>
     </form>

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.scss

@@ -9,3 +9,45 @@
 .container {
   max-width: 37rem;
 }
+
+.pc-context,
+.pc-result {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding: 12px 14px;
+  margin-bottom: 16px;
+  border: 1px solid rgb(128 128 128 / 30%);
+  border-radius: 6px;
+}
+
+.pc-row {
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  font-size: 13px;
+
+  &--total {
+    font-size: 15px;
+  }
+
+  &--muted {
+    opacity: 0.75;
+  }
+}
+
+.pc-calc {
+  margin: 4px 0 16px;
+}
+
+.pc-note {
+  margin: 4px 0 0;
+  font-size: 12px;
+  opacity: 0.75;
+}
+
+.pc-warn {
+  margin: 0 0 16px;
+  font-size: 13px;
+  color: #c62828;
+}

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/premature-close-recurring-deposit-account/premature-close-recurring-deposit-account.component.ts

@@ -8,25 +8,41 @@
 
 /** Angular Imports */
 import { Component, OnInit, inject } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
-import { ActivatedRoute, Router, RouterLink } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CdkTextareaAutosize } from '@angular/cdk/text-field';
 
 /** Custom Services */
 import { RecurringDepositsService } from '../../recurring-deposits.service';
+import { ClientsService } from 'app/clients/clients.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
+/** DepositAccountOnClosureType.TRANSFER_TO_SAVINGS - the only way a broken RD may be paid out. */
+const TRANSFER_TO_SAVINGS = 200;
+
+/** PrematureClosureReasonType values the RD closure understands. */
+const REASON_NORMAL = 100;
+const REASON_DECEASED = 400;
+const REASON_NOMINEE_HEIR = 500;
+
 /**
  * Premature Close Recurring Deposits Account Component
+ *
+ * The server will only break a recurring deposit early by transferring the proceeds to one of the client's savings
+ * accounts (no cash payout, no reinvest), and it needs to be told so: onAccountClosureId and toSavingsAccountId are
+ * mandatory. This screen used to send only the closure date, so every premature closure was rejected. It now asks the
+ * server what the deposit would pay on the chosen date (calculatePrematureAmount, which applies the product's
+ * pre-closure penalty) and only lets the closure be confirmed against that exact figure.
  */
-
 @Component({
   selector: 'mifosx-premature-close-recurring-deposit-account',
   templateUrl: './premature-close-recurring-deposit-account.component.html',
   styleUrls: ['./premature-close-recurring-deposit-account.component.scss'],
   imports: [
-    ...STANDALONE_SHARED_IMPORTS
+    ...STANDALONE_SHARED_IMPORTS,
+    CdkTextareaAutosize
   ]
 })
 export class PrematureCloseRecurringDepositAccountComponent implements OnInit {
@@ -36,72 +52,263 @@ export class PrematureCloseRecurringDepositAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
+  private clientsService = inject(ClientsService);
 
-  /** Minimum date allowed. */
+  /** Savings accounts of this deposit's nominees - offered as destinations only for a deceased holder. */
+  nomineeSavingsAccounts: any[] = [];
+
+  /** Minimum date allowed: the deposit's activation date once loaded. */
   minDate = new Date(2000, 0, 1);
-  /** Maximum date allowed. */
+  /** Maximum date allowed: the business date, and never the maturity date or later (that is a normal Close). */
   maxDate = new Date();
   /** premature close Recurring Deposits Account form. */
   prematureCloseRecurringDepositsAccountForm: UntypedFormGroup;
   /** Recurring Deposits Account Id */
   accountId: any;
+  /** The deposit being closed, for the context panel and the default destination account. */
+  account: any;
+
+  /** Result of the last calculatePrematureAmount call, and the date it was calculated for. */
+  preview: { payoutAmount: number; savingsAccounts: any[]; closureOptionId: number } | null = null;
+  previewedFor: string | null = null;
+  calculating = false;
+  submitting = false;
+  /** Loans this deposit secures. While any remain, the server refuses to close it. */
+  liens: any[] = [];
+  totalLienAmount = 0;
 
-  /**
-   * @param {FormBuilder} formBuilder Form Builder
-   * @param {RecurringDepositsService} recurringDepositsService Recurring Deposits Service
-   * @param {Dates} dateUtils Date Utils
-   * @param {ActivatedRoute} route Activated Route
-   * @param {Router} router Router
-   * @param {SettingsService} settingsService Settings Service
-   */
   constructor() {
     this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
   }
 
-  /**
-   * Creates the premature close recurring deposits form.
-   */
   ngOnInit() {
     this.maxDate = this.settingsService.businessDate;
     this.createprematureCloseRecurringDepositsAccountForm();
-  }
+    this.recurringDepositsService.getRecurringDepositsAccountData(this.accountId).subscribe((account: any) => {
-
+      this.account = account;
-  /**
+      const activatedOn = this.toDate(account?.timeline?.activatedOnDate);
-   * Creates the premature close recurring deposits account form.
+      if (activatedOn) {
-   */
+        this.minDate = activatedOn;
-  createprematureCloseRecurringDepositsAccountForm() {
+      }
-    this.prematureCloseRecurringDepositsAccountForm = this.formBuilder.group({
+      const maturity = this.toDate(account?.maturityDate);
-      closedOnDate: [
+      if (maturity) {
-        '',
+        const dayBeforeMaturity = new Date(maturity);
-        Validators.required
+        dayBeforeMaturity.setDate(dayBeforeMaturity.getDate() - 1);
-      ]
+        if (dayBeforeMaturity < this.maxDate) {
+          this.maxDate = dayBeforeMaturity;
+        }
+      }
+    });
+    this.recurringDepositsService.getRecurringDepositLiens(this.accountId).subscribe((response: any) => {
+      this.liens = response?.liens ?? [];
+      this.totalLienAmount = Number(response?.totalLienAmount) || 0;
+    });
+    // A different date or reason is a different payout - the old preview no longer describes what would happen.
+    this.prematureCloseRecurringDepositsAccountForm.get('closedOnDate').valueChanges.subscribe(() => {
+      this.preview = null;
+      this.previewedFor = null;
+    });
+    this.prematureCloseRecurringDepositsAccountForm.get('prematureClosureReasonId').valueChanges.subscribe((reason: number) => {
+      this.preview = null;
+      this.previewedFor = null;
+      if (reason === REASON_DECEASED) {
+        this.loadNomineeSavingsAccounts();
+      }
     });
   }
 
-  /**
+  /** Reasons this deposit's product allows; Normal is always there. */
-   * Submits the form and premature closes the recurring deposit account,
+  get reasonOptions(): Array<{ id: number; label: string; hint: string }> {
-   * if successful redirects to the recurring deposit account.
+    const options = [{ id: REASON_NORMAL, label: 'Normal', hint: "Pre-closure penalty as per the deposit's terms." }];
-   */
+    if (this.account?.noPenaltyNomineeHeirClosure) {
-  submit() {
+      options.push({ id: REASON_NOMINEE_HEIR, label: 'Nominee / legal heir claim', hint: 'No pre-closure penalty.' });
-    const prematureCloseRecurringDepositsAccountFormData = this.prematureCloseRecurringDepositsAccountForm.value;
-    const locale = this.settingsService.language.code;
-    const dateFormat = this.settingsService.dateFormat;
-    const prevClosedOnDate: Date = this.prematureCloseRecurringDepositsAccountForm.value.closedOnDate;
-    if (prematureCloseRecurringDepositsAccountFormData.closedOnDate instanceof Date) {
-      prematureCloseRecurringDepositsAccountFormData.closedOnDate = this.dateUtils.formatDate(
-        prevClosedOnDate,
-        dateFormat
-      );
     }
-    const data = {
+    if (this.account?.deceasedSettlement) {
-      ...prematureCloseRecurringDepositsAccountFormData,
+      options.push({
-      dateFormat,
+        id: REASON_DECEASED,
-      locale
+        label: 'Account holder deceased',
-    };
+        hint: "No penalty, allowed inside lock-in; may be paid to a nominee's savings account."
-    this.recurringDepositsService
-      .executeRecurringDepositsAccountCommand(this.accountId, 'prematureClose', data)
-      .subscribe(() => {
-        this.router.navigate(['../../'], { relativeTo: this.route });
       });
+    }
+    return options;
+  }
+
+  get selectedReasonHint(): string {
+    const reason = this.prematureCloseRecurringDepositsAccountForm.value.prematureClosureReasonId;
+    return this.reasonOptions.find((option) => option.id === reason)?.hint ?? '';
+  }
+
+  /** The client's own savings accounts, plus - for a deceased holder - the nominees' savings accounts. */
+  get destinationAccounts(): any[] {
+    const own = (this.preview?.savingsAccounts ?? []).map((acc: any) => ({ ...acc, owner: null }));
+    if (this.prematureCloseRecurringDepositsAccountForm.value.prematureClosureReasonId !== REASON_DECEASED) {
+      return own;
+    }
+    const ownIds = new Set(own.map((acc: any) => acc.id));
+    return [
+      ...own,
+      ...this.nomineeSavingsAccounts.filter((acc: any) => !ownIds.has(acc.id))
+    ];
+  }
+
+  private loadNomineeSavingsAccounts() {
+    this.nomineeSavingsAccounts = [];
+    const clientId = this.account?.clientId;
+    if (!clientId || !this.account?.accountNo) {
+      return;
+    }
+    this.clientsService.getClientNominees(clientId, this.account.accountNo, 'RD').subscribe((nominees: any) => {
+      const list: any[] = Array.isArray(nominees) ? nominees : (nominees?.pageItems ?? []);
+      list
+        .filter((nominee: any) => nominee?.nomineeClientId && nominee.isActive !== false)
+        .forEach((nominee: any) => {
+          this.clientsService.getClientAccountData(nominee.nomineeClientId).subscribe((accounts: any) => {
+            const savings = (accounts?.savingsAccounts ?? []).filter(
+              (acc: any) => acc?.depositType?.id === 100 && acc?.status?.active
+            );
+            this.nomineeSavingsAccounts = [
+              ...this.nomineeSavingsAccounts,
+              ...savings.map((acc: any) => ({
+                id: acc.id,
+                accountNo: acc.accountNo,
+                productName: acc.productName,
+                owner: nominee.nomineeDisplayName
+              }))
+            ];
+          });
+        });
+    });
+  }
+
+  createprematureCloseRecurringDepositsAccountForm() {
+    this.prematureCloseRecurringDepositsAccountForm = this.formBuilder.group({
+      closedOnDate: [
+        this.settingsService.businessDate,
+        Validators.required
+      ],
+      prematureClosureReasonId: [REASON_NORMAL],
+      toSavingsAccountId: [
+        null,
+        Validators.required
+      ],
+      transferDescription: ['Premature closure of recurring deposit'],
+      note: ['']
+    });
+  }
+
+  get balance(): number | null {
+    return this.account?.summary?.accountBalance ?? null;
+  }
+
+  get currencySymbol(): string {
+    return this.account?.currency?.displaySymbol || this.account?.currency?.code || '';
+  }
+
+  /** What breaking early costs compared with letting the deposit run to maturity, when both are known. */
+  get shortfallVsMaturity(): number | null {
+    const maturityAmount = this.account?.maturityAmount;
+    if (!this.preview || maturityAmount == null) {
+      return null;
+    }
+    return Number(maturityAmount) - Number(this.preview.payoutAmount);
+  }
+
+  get canConfirm(): boolean {
+    return (
+      this.totalLienAmount <= 0 &&
+      !!this.preview &&
+      this.previewedFor === this.formattedClosedOnDate &&
+      this.prematureCloseRecurringDepositsAccountForm.valid &&
+      !this.submitting
+    );
+  }
+
+  private get formattedClosedOnDate(): string | null {
+    const value = this.prematureCloseRecurringDepositsAccountForm.value.closedOnDate;
+    if (!value) {
+      return null;
+    }
+    return value instanceof Date ? this.dateUtils.formatDate(value, this.settingsService.dateFormat) : value;
+  }
+
+  /** Asks the server what the deposit pays if broken on the chosen date. */
+  calculate() {
+    const closedOnDate = this.formattedClosedOnDate;
+    if (!closedOnDate) {
+      return;
+    }
+    this.calculating = true;
+    const data = {
+      closedOnDate,
+      prematureClosureReasonId: this.prematureCloseRecurringDepositsAccountForm.value.prematureClosureReasonId,
+      dateFormat: this.settingsService.dateFormat,
+      locale: this.settingsService.language.code
+    };
+    this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'calculatePrematureAmount', data).subscribe({
+      next: (response: any) => {
+        const savingsAccounts = response?.savingsAccounts ?? [];
+        const closureOptionId =
+          (response?.onAccountClosureOptions ?? []).find((option: any) => option.id === TRANSFER_TO_SAVINGS)?.id ??
+          TRANSFER_TO_SAVINGS;
+        this.preview = { payoutAmount: response?.maturityAmount, savingsAccounts, closureOptionId };
+        this.previewedFor = closedOnDate;
+        this.calculating = false;
+        this.selectDefaultDestination(savingsAccounts);
+      },
+      error: () => {
+        this.calculating = false;
+      }
+    });
+  }
+
+  /** The deposit's own linked savings account, when it has one the client can still receive into. */
+  private selectDefaultDestination(savingsAccounts: any[]) {
+    const control = this.prematureCloseRecurringDepositsAccountForm.get('toSavingsAccountId');
+    if (control.value && savingsAccounts.some((acc: any) => acc.id === control.value)) {
+      return;
+    }
+    const linkedId = this.account?.linkedAccountId;
+    const linked = savingsAccounts.find((acc: any) => acc.id === linkedId);
+    control.setValue(linked?.id ?? (savingsAccounts.length === 1 ? savingsAccounts[0].id : null));
+  }
+
+  submit() {
+    if (!this.canConfirm) {
+      return;
+    }
+    const formValue = this.prematureCloseRecurringDepositsAccountForm.value;
+    const data: any = {
+      closedOnDate: this.formattedClosedOnDate,
+      onAccountClosureId: this.preview.closureOptionId,
+      prematureClosureReasonId: formValue.prematureClosureReasonId,
+      toSavingsAccountId: formValue.toSavingsAccountId,
+      transferDescription: formValue.transferDescription,
+      dateFormat: this.settingsService.dateFormat,
+      locale: this.settingsService.language.code
+    };
+    if (formValue.note) {
+      data.note = formValue.note;
+    }
+    this.submitting = true;
+    this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'prematureClose', data).subscribe({
+      next: () => {
+        this.router.navigate(['../../'], { relativeTo: this.route });
+      },
+      error: () => {
+        this.submitting = false;
+      }
+    });
+  }
+
+  /** API dates arrive as [yyyy, m, d] arrays or ISO strings. */
+  private toDate(value: any): Date | null {
+    if (!value) {
+      return null;
+    }
+    if (Array.isArray(value)) {
+      return new Date(value[0], value[1] - 1, value[2]);
+    }
+    const parsed = new Date(value);
+    return isNaN(parsed.getTime()) ? null : parsed;
   }
 }

src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html

@@ -30,6 +30,14 @@
 @if (actions['Close']) {
   <mifosx-close-recurring-deposits-account></mifosx-close-recurring-deposits-account>
 }
-@if (actions['Deposit'] || actions['Withdrawal']) {
+<!-- A direct deposit from the account screen skips the manager's approval; RD installments come in through the
+     cashier's Receipt or Auto Debit instead, so the Deposit action is not offered here even by URL. -->
+@if (actions['Deposit']) {
+  <p>
+    RD installments cannot be deposited from the account screen. Use a cashier Receipt, or Auto Debit from the linked
+    savings account.
+  </p>
+}
+@if (actions['Withdrawal']) {
   <mifosx-deposit-recurring-deposits-account [currency]="currency"></mifosx-deposit-recurring-deposits-account>
 }

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-currency-step/recurring-deposits-account-currency-step.component.html

@@ -30,11 +30,50 @@
     <div class="racc-alert racc-alert--editable">
       <div class="racc-alert__content">
         <h4>Auto Debit Facility</h4>
-        <p>Enable automatic deduction of funds for recurring payments, utility bills, or EMI obligations.</p>
+        @if (recurringDepositsAccountProductTemplate?.autoDebitFacility) {
+          <p>
+            Collect each installment automatically on its due date from the linked Savings account (Deposit Account
+            Link, Details tab). A short balance leaves it overdue and it is retried on the next run.
+          </p>
+        } @else {
+          <p>This product does not offer Auto Debit.</p>
+        }
       </div>
-      <mat-slide-toggle [(ngModel)]="autoDebitFacility" color="primary"></mat-slide-toggle>
+      <mat-slide-toggle
+        [(ngModel)]="autoDebitFacility"
+        [disabled]="!recurringDepositsAccountProductTemplate?.autoDebitFacility"
+        color="primary"
+      ></mat-slide-toggle>
     </div>
 
+    @if (lienAllowed) {
+      <div class="racc-alert racc-alert--editable">
+        <div class="racc-alert__content">
+          <h4>Loan against this RD (Lien)</h4>
+          <p>
+            How much of the RD balance can be given as loan, checked on the balance at the time the loan is taken.
+            Product limit: {{ productLienLimit }}%.
+          </p>
+          @if (lienPercentageError) {
+            <p class="racc-lien-error">{{ lienPercentageError }}</p>
+          }
+        </div>
+        <mat-form-field appearance="outline" class="racc-lien-field" subscriptSizing="dynamic">
+          <mat-label>Max loan (%)</mat-label>
+          <input
+            matInput
+            type="number"
+            min="1"
+            [max]="productLienLimit"
+            step="0.01"
+            [(ngModel)]="lienPercentage"
+            [ngModelOptions]="{ standalone: true }"
+          />
+          <span matTextSuffix>%</span>
+        </mat-form-field>
+      </div>
+    }
+
     <div class="racc-alert">
       <div class="racc-alert__content">
         <h4>Dormancy Alert</h4>

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-currency-step/recurring-deposits-account-currency-step.component.scss

@@ -126,6 +126,15 @@ $gray-900: #202124;
   }
 }
 
+.racc-lien-field {
+  width: 140px;
+  flex-shrink: 0;
+}
+
+.racc-lien-error {
+  color: #c62828;
+}
+
 .racc-alert--editable {
   border-color: #bae6fd;
   background: #f0f9ff;

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-currency-step/recurring-deposits-account-currency-step.component.ts

@@ -6,8 +6,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
+import { Component, Input, OnChanges, SimpleChanges, ViewChild, inject } from '@angular/core';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RecurringDepositsService } from '../../recurring-deposits.service';
 import { NomineeFormComponent } from 'app/shared/nominee-form/nominee-form.component';
 import { DormancyAlertPanelComponent } from 'app/shared/dormancy-alert-panel/dormancy-alert-panel.component';
 import { MatSlideToggle } from '@angular/material/slide-toggle';
@@ -36,7 +37,14 @@ export class RecurringDepositsAccountCurrencyStepComponent implements OnChanges
   showNomineeForm = false;
   nomineeError = '';
 
+  private recurringDepositsService = inject(RecurringDepositsService);
+
   autoDebitFacility = false;
+  /**
+   * Lien Marked products only: how much of this RD may be given as loan, as % of its balance when the loan is taken.
+   * Starts at the product's percentage; may be lowered, never raised above it.
+   */
+  lienPercentage: number | null = null;
 
   private existingAccountApplied = false;
 
@@ -50,13 +58,44 @@ export class RecurringDepositsAccountCurrencyStepComponent implements OnChanges
       if (Array.isArray(ea.nominees) && ea.nominees.length > 0) {
         this.nominees = [...ea.nominees];
       }
+      // The account response does not carry the deposit's own lien percentage; the lien endpoint does.
+      if (ea.id) {
+        this.recurringDepositsService.getRecurringDepositLiens(ea.id).subscribe((response: any) => {
+          this.lienPercentage = response?.lienPercentage ?? response?.productLienPercentage ?? null;
+        });
+      }
     }
     if (changes['recurringDepositsAccountProductTemplate']?.currentValue && !this.existingAccountApplied) {
       const pt = changes['recurringDepositsAccountProductTemplate'].currentValue;
       this.autoDebitFacility = !!pt.autoDebitFacility;
+      this.lienPercentage = pt.lienMarked ? (pt.lienPercentage ?? 100) : null;
     }
   }
 
+  get lienAllowed(): boolean {
+    return !!this.recurringDepositsAccountProductTemplate?.lienMarked;
+  }
+
+  /** The product's ceiling; a product with no percentage allows the whole balance. */
+  get productLienLimit(): number {
+    return Number(this.recurringDepositsAccountProductTemplate?.lienPercentage) || 100;
+  }
+
+  /** Why the entered percentage would be refused, or null when it is fine. */
+  get lienPercentageError(): string | null {
+    if (!this.lienAllowed) {
+      return null;
+    }
+    if (this.lienPercentage === null || this.lienPercentage === undefined || `${this.lienPercentage}` === '') {
+      return 'Enter how much of the RD balance can be given as loan.';
+    }
+    const value = Number(this.lienPercentage);
+    if (!(value > 0) || value > this.productLienLimit) {
+      return `Must be more than 0% and at most ${this.productLienLimit}% (product limit).`;
+    }
+    return null;
+  }
+
   get totalShare(): number {
     return this.nominees.reduce((sum, n) => sum + (+n.percentageShare || 0), 0);
   }
@@ -112,7 +151,8 @@ export class RecurringDepositsAccountCurrencyStepComponent implements OnChanges
 
   get currencyStepData() {
     return {
-      autoDebitFacility: this.autoDebitFacility
+      autoDebitFacility: this.autoDebitFacility,
+      ...(this.lienAllowed && this.lienPercentage != null ? { lienPercentage: Number(this.lienPercentage) } : {})
     };
   }
 }

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-details-step/recurring-deposits-account-details-step.component.html

@@ -121,11 +121,30 @@
             {{ productTemplate.shareLinkingEnabled ? 'Yes' : 'No' }}
           </span>
         </div>
+
+        <div class="rad-field rad-info-row">
+          <span class="rad-info-label">Introducer Required</span>
+          <span class="rad-badge" [class.rad-badge--yes]="productTemplate.introducerRequired">
+            {{ productTemplate.introducerRequired ? 'Yes' : 'No' }}
+          </span>
+        </div>
       </div>
     </div>
 
+    <!-- The product requires an introducer: an existing customer, never the depositor themselves. -->
+    @if (productTemplate?.introducerRequired) {
+      <mifosx-introducer-search
+        [excludedClientIds]="primaryClientId ? [primaryClientId] : []"
+        [preselectedIntroducer]="
+          introducerId ? { clientId: introducerId, displayName: introducerName, cifNumber: introducerCif } : null
+        "
+        (introducerChange)="onIntroducerChange($event)"
+      ></mifosx-introducer-search>
+    }
+
     <!-- ══ Deposit Account Link ══════════════════════════════════════════ -->
-    @if (productTemplate?.shareLinkingEnabled) {
+    <!-- Also offered when the product allows Auto Debit: that is the account installments are collected from. -->
+    @if (productTemplate?.shareLinkingEnabled || productTemplate?.autoDebitFacility) {
       <div class="dal-card">
         <div class="dal-card__header">
           <div class="dal-card__header-left">

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-details-step/recurring-deposits-account-details-step.component.ts

@@ -24,6 +24,7 @@ import { Dates } from 'app/core/utils/dates';
 import { MatDialog } from '@angular/material/dialog';
 
 /** Custom Services */
+import { ProductsService } from 'app/products/products.service';
 import { RecurringDepositsService } from '../../recurring-deposits.service';
 import { ClientsService } from 'app/clients/clients.service';
 import {
@@ -62,6 +63,7 @@ import { IntroducerSearchComponent } from 'app/shared/introducer-search/introduc
 export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnChanges {
   private formBuilder = inject(UntypedFormBuilder);
   private recurringDepositsService = inject(RecurringDepositsService);
+  private productsService = inject(ProductsService);
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
   private cdr = inject(ChangeDetectorRef);
@@ -117,6 +119,10 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnC
   primaryClientName = '';
   primaryClientCif = '';
   primaryClientId: number | null = null;
+  /** Introducer - asked for only when the product has "Introducer Required" on. */
+  introducerId: number | null = null;
+  introducerName: string | null = null;
+  introducerCif: string | null = null;
   primaryHolderShare = 50;
 
   // ── Status of Account (RBI) ────────────────────────────────────────────
@@ -453,6 +459,14 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnC
             }
           }
           this.productTemplate = response;
+          // The account template leaves out the product's installment limits; the calculator and the submit check
+          // read them from this template, so they are taken from the product itself.
+          if (response.minDepositAmount == null && response.maxDepositAmount == null) {
+            this.productsService.getRecurringDepositProduct(String(productId)).subscribe((product: any) => {
+              response.minDepositAmount = product?.minDepositAmount ?? null;
+              response.maxDepositAmount = product?.maxDepositAmount ?? null;
+            });
+          }
           this.accountTypeOptions = this.extractOptions(response.accountTypeOptions, response.accountType);
           this.customerSegmentOptions = this.extractOptions(response.customerSegmentOptions, response.customerSegment);
           this.selectedAccountType = response.accountType ?? null;
@@ -463,7 +477,7 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnC
           this.recurringDepositsAccountProductTemplate.emit(response);
           this.fieldOfficerData = response.fieldOfficerOptions;
           this.isProductSelected = true;
-          if (response.shareLinkingEnabled) {
+          if (response.shareLinkingEnabled || response.autoDebitFacility) {
             this.loadClientAccounts();
           }
           this.recurringDepositAccountDetailsForm.patchValue({
@@ -610,6 +624,12 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnC
     return this.dateUtils.formatDate(dateValue, 'M/d/yyyy') || '';
   }
 
+  onIntroducerChange(event: { clientId: number; displayName: string; cifNumber?: string } | null): void {
+    this.introducerId = event?.clientId ?? null;
+    this.introducerName = event?.displayName ?? null;
+    this.introducerCif = event?.cifNumber ?? null;
+  }
+
   onGuardianChange(event: { clientId: number; displayName: string; cifNumber?: string } | null): void {
     this.guardianClientId = event?.clientId ?? null;
     this.guardianName = event?.displayName ?? '';
@@ -795,6 +815,12 @@ export class RecurringDepositsAccountDetailsStepComponent implements OnInit, OnC
       value.minorDateOfBirth = this.minorDob ? this.dateUtils.formatDate(this.minorDob, 'dd MMMM yyyy') : null;
     }
 
+    if (this.productTemplate?.introducerRequired && this.introducerId) {
+      value.introducerId = this.introducerId;
+      value.introducerName = this.introducerName;
+      value.introducerCifNumber = this.introducerCif;
+    }
+
     if (this.selectedLinkedAccount) {
       value.linkedAccountId = this.selectedLinkedAccount.id;
       value.linkedAccountType = this.selectedLinkedAccount.accountType;

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

@@ -93,7 +93,13 @@
         <div class="fdrc-calc-field">
           <label class="fdrc-calc-label">
             Monthly Installment
-            <span class="fdrc-calc-optional">(optional — for maturity estimation)</span>
+            <span class="fdrc-calc-optional"
+              >(required@if (minInstallment > 0) {
+                — min ₹{{ minInstallment }}
+              }@if (maxInstallment > 0) {
+                , max ₹{{ maxInstallment }}
+              })</span
+            >
           </label>
           <div class="fdrc-amount-row">
             <span class="fdrc-amount-prefix">₹</span>
@@ -257,6 +263,21 @@
                     </span>
                     <span class="fdrc-maturity-row__value">{{ matchResult.appliedRate | number: '1.2-2' }}% p.a.</span>
                   </div>
+                  @if (matchResult.interestCalculation) {
+                    <div class="fdrc-maturity-row">
+                      <span class="fdrc-maturity-row__label">Interest Type</span>
+                      <span class="fdrc-maturity-row__value">
+                        {{ matchResult.interestCalculation }}
+                        @if (matchResult.interestCalculation === 'Compounding') {
+                          ({{ interestPeriodLabel(matchResult.compoundingPeriod) }})
+                        }
+                      </span>
+                    </div>
+                    <div class="fdrc-maturity-row">
+                      <span class="fdrc-maturity-row__label">Interest Credited</span>
+                      <span class="fdrc-maturity-row__value">{{ interestPeriodLabel(matchResult.postingPeriod) }}</span>
+                    </div>
+                  }
                   <div class="fdrc-maturity-row fdrc-maturity-row--interest">
                     <span class="fdrc-maturity-row__label">Estimated Interest Earned</span>
                     <span class="fdrc-maturity-row__value">₹ {{ matchResult.interestEarned | number: '1.2-2' }}</span>
@@ -267,6 +288,23 @@
                       >₹ {{ matchResult.maturityAmount | number: '1.2-2' }}</span
                     >
                   </div>
+                  @if (matchResult.postingSchedule?.length) {
+                    <details class="fdrc-credits">
+                      <summary>Interest credits to the RD ({{ matchResult.postingSchedule.length }})</summary>
+                      <table class="fdrc-credits__table">
+                        <tr>
+                          <th>Credited on</th>
+                          <th class="text-right">Interest</th>
+                        </tr>
+                        @for (p of matchResult.postingSchedule; track p.date) {
+                          <tr>
+                            <td>{{ p.date }}</td>
+                            <td class="text-right">₹ {{ p.interest | number: '1.2-2' }}</td>
+                          </tr>
+                        }
+                      </table>
+                    </details>
+                  }
                 </div>
               </div>
             }

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

@@ -1127,3 +1127,31 @@ $red-light: #fee2e2;
     font-size: 14px;
   }
 }
+
+.fdrc-credits {
+  margin-top: 8px;
+  font-size: 12px;
+
+  summary {
+    cursor: pointer;
+    font-weight: 600;
+    color: #2563eb;
+  }
+
+  &__table {
+    width: 100%;
+    margin-top: 6px;
+    border-collapse: collapse;
+
+    th,
+    td {
+      padding: 3px 6px;
+      border-bottom: 1px solid #e2e8f0;
+      text-align: left;
+    }
+
+    .text-right {
+      text-align: right;
+    }
+  }
+}

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

@@ -42,6 +42,7 @@ import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
 import { YesnoPipe } from '../../../../pipes/yesno.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { FormsModule } from '@angular/forms';
+import { buildRdChart, tenureInMonths } from 'app/products/recurring-deposit-products/rd-product-chart';
 
 export type RdPeriodUnit = 'Days' | 'Months' | 'Years';
 
@@ -53,6 +54,12 @@ export interface SlabMatchResult {
   interestEarned?: number;
   tenureDays?: number;
   daysInYear?: number;
+  /** From the product, as the server calculated it: Simple / Compounding, and the period names. */
+  interestCalculation?: string;
+  compoundingPeriod?: string;
+  postingPeriod?: string;
+  /** Each interest credit the deposit will receive, if every installment is paid on time. */
+  postingSchedule?: { date: string; interest: number }[];
 }
 
 /**
@@ -123,20 +130,62 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     return (this.cbsBaseRates || []).find((r) => r.fdType === 'DOUBLE' && r.isActive);
   }
 
+  /**
+   * The product's own chart - the one the server prices the RD from - with each slab's senior-citizen rate taken
+   * from the CBS base chart it was built from. Falls back to the base chart only when the product has no chart.
+   */
   get interestRateChartData(): any[] {
-    if (this.activeBase?.slabs?.length) {
+    const cbsSlabs: any[] = this.activeBase?.slabs || [];
-      return this.normalizeCbsSlabs(this.activeBase.slabs);
-    }
     const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    if (!template) return [];
+    const productSlabs: any[] =
-    return (
+      template?.accountChart?.chartSlabs ??
-      template.accountChart?.chartSlabs ??
+      template?.activeChart?.chartSlabs ??
-      template.activeChart?.chartSlabs ??
+      template?.interestRateCharts?.[0]?.chartSlabs ??
-      template.interestRateCharts?.[0]?.chartSlabs ??
+      template?.interestRateChart?.chartSlabs ??
-      template.interestRateChart?.chartSlabs ??
+      template?.chartSlabs ??
-      template.chartSlabs ??
+      [];
-      []
+    if (this.chartCache?.cbsSlabs !== cbsSlabs || this.chartCache?.productSlabs !== productSlabs) {
-    );
+      this.chartCache = { cbsSlabs, productSlabs, slabs: this.mergeChart(cbsSlabs, productSlabs) };
+    }
+    return this.chartCache.slabs;
+  }
+
+  private chartCache: { cbsSlabs: any[]; productSlabs: any[]; slabs: any[] } | null = null;
+
+  /** The product's minimum deposit term in months - the server refuses anything shorter. Null when it sets none. */
+  /** The product's installment limits (0 = no limit). */
+  get minInstallment(): number {
+    return Number(this.recurringDepositsAccountProductTemplate?.minDepositAmount) || 0;
+  }
+
+  get maxInstallment(): number {
+    return Number(this.recurringDepositsAccountProductTemplate?.maxDepositAmount) || 0;
+  }
+
+  get productMinTenureMonths(): number | null {
+    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return tenureInMonths(template?.minDepositTerm, template?.minDepositTermType?.id);
+  }
+
+  private mergeChart(cbsSlabs: any[], productSlabs: any[]): any[] {
+    const baseSlabs = this.normalizeCbsSlabs(buildRdChart(cbsSlabs, [], null).slabs);
+    if (!productSlabs.length) {
+      return baseSlabs;
+    }
+    // Products made before RD charts moved to months still hold the base chart's own year slabs
+    const candidates = [...baseSlabs, ...this.normalizeCbsSlabs(cbsSlabs)];
+    return productSlabs.map((slab: any) => {
+      if (slab.seniorCitizenRate != null) {
+        return slab;
+      }
+      const base = candidates.find(
+        (candidate: any) =>
+          candidate.fromPeriod === slab.fromPeriod &&
+          (candidate.toPeriod ?? null) === (slab.toPeriod ?? null) &&
+          this.periodLabel(candidate) === this.periodLabel(slab)
+      );
+      return base?.seniorCitizenRate != null ? { ...slab, seniorCitizenRate: base.seniorCitizenRate } : slab;
+    });
   }
 
   private normalizeCbsSlabs(slabs: any[]): any[] {
@@ -146,6 +195,10 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     }));
   }
 
+  private periodLabel(slab: any): string {
+    return String(slab.periodType?.value ?? slab.periodTypeLabel ?? '').toLowerCase();
+  }
+
   chartSlabsDisplayedColumns: string[] = [
     'period',
     'amountRange',
@@ -253,6 +306,28 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     return period; // days
   }
 
+  /**
+   * Whether the tenure falls in the slab, counted the way the server counts it: in whole units of the slab's own
+   * period type, so a 30-month RD is "2 years" against a year slab and lands in "1-2 Years" rather than between
+   * slabs. Day and week slabs keep the day comparison.
+   */
+  private isTenureInSlab(slab: any, tenureMonths: number, tenureDays: number): boolean {
+    const label = this.periodLabel(slab) || 'days';
+    let tenure: number;
+    let from = slab.fromPeriod ?? 0;
+    let to = slab.toPeriod ?? Infinity;
+    if (label.includes('month')) {
+      tenure = tenureMonths;
+    } else if (label.includes('year')) {
+      tenure = Math.floor(tenureMonths / 12);
+    } else {
+      tenure = tenureDays;
+      from = this.slabPeriodToDays(from, label);
+      to = to === Infinity ? Infinity : this.slabPeriodToDays(to, label);
+    }
+    return tenure >= from && tenure <= to;
+  }
+
   calculateRate() {
     this.validationWarning = null;
     this.matchResult = null;
@@ -263,6 +338,26 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     }
 
     const enteredDays = this.toDays(this.tenureValue, this.tenurePeriodUnit);
+    const enteredMonths = this.tenurePeriodUnit === 'Years' ? this.tenureValue * 12 : this.tenureValue;
+    const minimumMonths = this.productMinTenureMonths;
+    if (minimumMonths != null && enteredMonths < minimumMonths) {
+      this.validationWarning = `Minimum RD tenure for this product is ${minimumMonths} months.`;
+      return;
+    }
+    // The installment must be within the product's limits - the same check the submit and the server make, shown
+    // here so a wrong amount is caught before the rest of the form is filled.
+    if (!this.principalAmount || this.principalAmount <= 0) {
+      this.validationWarning = 'Please enter the monthly installment amount.';
+      return;
+    }
+    if (this.minInstallment > 0 && this.principalAmount < this.minInstallment) {
+      this.validationWarning = `Minimum monthly installment for this product is ₹${this.minInstallment}.`;
+      return;
+    }
+    if (this.maxInstallment > 0 && this.principalAmount > this.maxInstallment) {
+      this.validationWarning = `Maximum monthly installment for this product is ₹${this.maxInstallment}.`;
+      return;
+    }
     const slabs: any[] = this.interestRateChartData || [];
 
     if (!slabs.length) {
@@ -275,11 +370,7 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
 
     for (let i = 0; i < slabs.length; i++) {
       const slab = slabs[i];
-      const periodTypeValue = slab.periodType?.value || 'Days';
+      if (this.isTenureInSlab(slab, enteredMonths, enteredDays)) {
-      const fromDays = this.slabPeriodToDays(slab.fromPeriod ?? 0, periodTypeValue);
-      const toDays = slab.toPeriod != null ? this.slabPeriodToDays(slab.toPeriod, periodTypeValue) : Infinity;
-
-      if (enteredDays >= fromDays && enteredDays <= toDays) {
         matchedSlab = slab;
         matchedIndex = i;
         break;
@@ -329,10 +420,20 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
         tenureInMonths: tenureInMonths,
         interestCompoundingPeriodInMonths: compoundingMonths
       };
+      // With the product named, the server calculates with the product's own interest settings (simple/compounding,
+      // compounding and posting periods, days in year) - the same figure the opened account will carry.
+      const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+      const productId = template?.depositProductId ?? template?.productId;
+      if (productId) {
+        calculationData.productId = productId;
+      }
 
       if (this.submittedOnDate) {
         const date = new Date(this.submittedOnDate);
-        calculationData.submittedOnDate = date.toISOString().split('T')[0];
+        // The local calendar date - toISOString() is UTC, which in IST turns midnight of the 9th into the 8th and
+        // starts the projection a day early (a different maturity amount from the one the account gets).
+        const pad = (n: number) => String(n).padStart(2, '0');
+        calculationData.submittedOnDate = `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
         calculationData.dateFormat = 'yyyy-MM-dd'; // Standard ISO for API
         calculationData.locale = 'en';
       }
@@ -341,6 +442,10 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
         result.maturityAmount = apiResult.maturityAmount;
         result.interestEarned = apiResult.totalInterest;
         result.daysInYear = apiResult.daysInYear;
+        result.interestCalculation = apiResult.interestCalculation;
+        result.compoundingPeriod = apiResult.compoundingPeriod;
+        result.postingPeriod = apiResult.postingPeriod;
+        result.postingSchedule = apiResult.postingSchedule;
         this.matchResult = { ...result };
         this.emitTenureSelection();
       });
@@ -350,6 +455,18 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
     }
   }
 
+  /** "QUATERLY" / "BIANNUAL" / "MONTHLY" (server enum names) as a person would say them. */
+  interestPeriodLabel(name?: string): string {
+    const labels: Record<string, string> = {
+      DAILY: 'Daily',
+      MONTHLY: 'Monthly',
+      QUATERLY: 'Quarterly',
+      BIANNUAL: 'Half-yearly',
+      ANNUAL: 'Yearly'
+    };
+    return name ? (labels[name] ?? name) : '';
+  }
+
   private emitTenureSelection() {
     const frequencyId = this.resolveFrequencyId(this.tenurePeriodUnit);
     if (frequencyId !== null && this.matchResult) {
@@ -441,76 +558,54 @@ export class RecurringDepositsAccountInterestRateChartStepComponent implements O
 
   // ── Header Getters ──────────────────────────────────────────────────────
 
-  get chartName(): string {
+  /**
-    if (this.activeBase) {
+   * The RD product's own chart - the one the deposit is actually priced on. The CBS base chart (an FD master the
-      return this.activeBase.versionLabel || 'CBS Base Interest Rate';
+   * product's chart was built from) is shown only when the product has no chart of its own.
-    }
+   */
+  private get productChart(): any {
     const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
     return (
-      template?.accountChart?.name ||
+      template?.accountChart ||
-      template?.activeChart?.name ||
+      template?.activeChart ||
-      template?.interestRateCharts?.[0]?.name ||
+      template?.interestRateCharts?.[0] ||
-      template?.interestRateChart?.name ||
+      template?.interestRateChart ||
-      template?.name ||
+      null
-      ''
     );
   }
 
+  get chartName(): string {
+    if (this.productChart) {
+      return this.productChart.name || '';
+    }
+    return this.activeBase?.versionLabel || 'CBS Base Interest Rate';
+  }
+
   get chartFromDate(): any {
-    if (this.activeBase) {
+    if (this.productChart) {
-      return this.activeBase.effectiveFromDate;
+      return this.productChart.fromDate;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return this.activeBase?.effectiveFromDate;
-    return (
-      template?.accountChart?.fromDate ||
-      template?.activeChart?.fromDate ||
-      template?.interestRateCharts?.[0]?.fromDate ||
-      template?.interestRateChart?.fromDate ||
-      template?.fromDate
-    );
   }
 
   get chartEndDate(): any {
-    if (this.activeBase) {
+    if (this.productChart) {
-      return null;
+      return this.productChart.endDate;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return null;
-    return (
-      template?.accountChart?.endDate ||
-      template?.activeChart?.endDate ||
-      template?.interestRateCharts?.[0]?.endDate ||
-      template?.interestRateChart?.endDate ||
-      template?.endDate
-    );
   }
 
   get chartDescription(): string {
-    if (this.activeBase) {
+    if (this.productChart) {
-      return this.activeBase.remarks || '';
+      return this.productChart.description || '';
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return this.activeBase?.remarks || '';
-    return (
-      template?.accountChart?.description ||
-      template?.activeChart?.description ||
-      template?.interestRateCharts?.[0]?.description ||
-      template?.interestRateChart?.description ||
-      template?.description ||
-      ''
-    );
   }
 
   get isActive(): boolean {
-    if (this.activeBase) {
+    if (this.productChart) {
-      return this.activeBase.isActive;
+      return this.productChart.isActive ?? true;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return this.activeBase?.isActive ?? true;
-    return (
-      template?.accountChart?.isActive ??
-      template?.activeChart?.isActive ??
-      template?.interestRateCharts?.[0]?.isActive ??
-      template?.interestRateChart?.isActive ??
-      true
-    );
   }
 
   get isPrimaryGroupingByAmount(): boolean {

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-maturity-terms-step/recurring-deposits-account-maturity-terms-step.component.html

@@ -84,25 +84,17 @@
     </div>
   }
 
-  <mat-checkbox class="flex-98 margin-v" labelPosition="before" formControlName="preClosurePenalApplicable">
+  <!-- The premature-closure penalty is the product's, shown here and never changed per account. -->
-    {{ 'labels.inputs.Apply Penal Interest (less)' | translate }}
+  <div class="flex-98 margin-v rdmt-penal">
-  </mat-checkbox>
+    <div class="rdmt-penal__title">{{ 'labels.inputs.Apply Penal Interest (less)' | translate }} <span class="rdmt-penal__tag">From Product</span></div>
-
+    @if (closureSettingsForm.value.preClosurePenalApplicable) {
-  @if (closureSettingsForm.value.preClosurePenalApplicable) {
+      <div class="rdmt-penal__row">
-    <mat-form-field class="flex-48">
+        <span>Penal Interest: <strong>{{ closureSettingsForm.value.preClosurePenalInterest }}%</strong></span>
-      <mat-label>{{ 'labels.inputs.Penal Interest' | translate }} (%)</mat-label>
+        <span>Period: <strong>{{ penalPeriodLabel }}</strong></span>
-      <input type="number" matInput formControlName="preClosurePenalInterest" min="0" step="0.01" />
+      </div>
-    </mat-form-field>
+      <div class="rdmt-penal__hint">On premature closure the rate is reduced by this much.</div>
-
+    } @else {
-    <mat-form-field class="flex-48">
+      <div class="rdmt-penal__row"><strong>No</strong> - no penal interest is charged on premature closure of this product.</div>
-      <mat-label>{{ 'labels.inputs.Period' | translate }}</mat-label>
+    }
-      <mat-select formControlName="preClosurePenalInterestOnTypeId">
+  </div>
-        @for (preClosurePenalInterestOnType of preClosurePenalInterestOnTypeData; track preClosurePenalInterestOnType) {
-          <mat-option [value]="preClosurePenalInterestOnType.id">
-            {{ preClosurePenalInterestOnType.value | translateKey: 'catalogs' }}
-          </mat-option>
-        }
-      </mat-select>
-    </mat-form-field>
-  }
 </form>

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-maturity-terms-step/recurring-deposits-account-maturity-terms-step.component.scss

@@ -150,3 +150,37 @@
     }
   }
 }
+
+.rdmt-penal {
+  padding: 10px 12px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #f8fafc;
+  font-size: 13px;
+
+  &__title {
+    font-weight: 600;
+    margin-bottom: 6px;
+  }
+
+  &__tag {
+    margin-left: 6px;
+    padding: 1px 6px;
+    border-radius: 8px;
+    background: #e0f2fe;
+    color: #0369a1;
+    font-size: 10px;
+    font-weight: 700;
+  }
+
+  &__row {
+    display: flex;
+    gap: 24px;
+  }
+
+  &__hint {
+    margin-top: 4px;
+    font-size: 11px;
+    color: #64748b;
+  }
+}

src/app/deposits/recurring-deposits/recurring-deposits-account-stepper/recurring-deposits-account-maturity-terms-step/recurring-deposits-account-maturity-terms-step.component.ts

@@ -82,7 +82,7 @@ export class RecurringDepositsAccountMaturityTermsStepComponent implements OnCha
       );
       this.savingsAccountsData = template.savingsAccounts ?? [];
       this.preClosurePenalInterestOnTypeData = template.preClosurePenalInterestOnTypeOptions ?? [];
-      if (!this.closureSettingsForm.get('preClosurePenalApplicable').dirty) {
+      {
         this.closureSettingsForm.patchValue({
           preClosurePenalApplicable: template.preClosurePenalApplicable ?? false,
           preClosurePenalInterest: template.preClosurePenalInterest ?? '',
@@ -103,9 +103,21 @@ export class RecurringDepositsAccountMaturityTermsStepComponent implements OnCha
     this.closureSettingsForm.get('transferToSavingsId')?.setValue('');
   }
 
-  /** Chosen maturity/closure settings, ready to merge into the submit payload. */
+  /** "Whole Term" / "Till Premature Withdrawal", as the product has it. */
+  get penalPeriodLabel(): string {
+    const id = this.closureSettingsForm.value.preClosurePenalInterestOnTypeId;
+    return this.preClosurePenalInterestOnTypeData.find((option: any) => option.id === id)?.value ?? '-';
+  }
+
+  /**
+   * Chosen maturity/closure settings, ready to merge into the submit payload. The premature-closure penalty is left
+   * out: it is the product's, which the submit already carries and the server applies regardless.
+   */
   get closureSettings() {
     const settings = this.closureSettingsForm.getRawValue();
+    delete settings.preClosurePenalApplicable;
+    delete settings.preClosurePenalInterest;
+    delete settings.preClosurePenalInterestOnTypeId;
     for (const key in settings) {
       if (settings[key] === '') {
         delete settings[key];

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

@@ -878,12 +878,12 @@
       }
       <div class="preview-field">
         <span class="preview-label">{{ 'labels.inputs.Apply Penal Interest (less)' | translate }}</span>
-        <span class="preview-value">{{ closureSettings?.preClosurePenalApplicable | yesNo }}</span>
+        <span class="preview-value">{{ productPenal.applicable | yesNo }}</span>
       </div>
-      @if (closureSettings?.preClosurePenalApplicable) {
+      @if (productPenal.applicable) {
         <div class="preview-field">
           <span class="preview-label">{{ 'labels.inputs.Penal Interest' | translate }} (%)</span>
-          <span class="preview-value">{{ closureSettings?.preClosurePenalInterest }}%</span>
+          <span class="preview-value">{{ productPenal.interest }}%</span>
         </div>
         <div class="preview-field">
           <span class="preview-label">{{ 'labels.inputs.Period' | translate }}</span>

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

@@ -218,10 +218,20 @@ export class RecurringDepositsAccountPreviewStepComponent implements OnChanges {
     return match ? `(${match.accountNo}) ${match.savingsProductName}` : '—';
   }
 
+  /** The premature-closure penalty is the product's (the account cannot change it), so it is shown from the product. */
+  get productPenal(): { applicable: boolean; interest: any; typeId: any } {
+    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
+    return {
+      applicable: !!template?.preClosurePenalApplicable,
+      interest: template?.preClosurePenalInterest,
+      typeId: template?.preClosurePenalInterestOnType?.id
+    };
+  }
+
   get closurePenalInterestOnTypeLabel(): string {
     const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
     const options = template?.preClosurePenalInterestOnTypeOptions ?? [];
-    const match = options.find((o: any) => o.id === this.closureSettings?.preClosurePenalInterestOnTypeId);
+    const match = options.find((o: any) => o.id === this.productPenal.typeId);
     return match?.value ?? '—';
   }
 

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

@@ -200,6 +200,27 @@
               }}
             </span>
           </div>
+          @if (lienLimit) {
+            <div class="nx-row">
+              <span class="nx-row__label">Loan against RD ({{ lienLimit.percentage }}% of balance)</span>
+              <span class="nx-row__value nx-row__value--amount">
+                up to {{ lienLimit.maxLoanAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }}, available
+                {{ lienLimit.availableForLoan | currency: currency.code : 'symbol-narrow' : '1.2-2' }}
+              </span>
+            </div>
+          }
+          @if (totalLienAmount > 0) {
+            <div class="nx-row">
+              <span class="nx-row__label">Lien Marked (loan security)</span>
+              <span class="nx-row__value nx-row__value--amount">
+                {{ totalLienAmount | currency: currency.code : 'symbol-narrow' : '1.2-2' }}
+                -
+                @for (lien of liens; track lien.loanId; let last = $last) {
+                  Loan {{ lien.loanAccountNo }}{{ last ? '' : ', ' }}
+                }
+              </span>
+            </div>
+          }
           <div class="nx-row">
             <span class="nx-row__label">{{ 'labels.inputs.Recurring Deposit Amount' | translate }}</span>
             <span class="nx-row__value nx-row__value--amount">

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

@@ -15,6 +15,7 @@ import { DateFormatPipe } from '../../../../pipes/date-format.pipe';
 import { FormatNumberPipe } from '../../../../pipes/format-number.pipe';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { RecurringDepositsService } from '../../recurring-deposits.service';
 
 @Component({
   selector: 'mifosx-general-tab',
@@ -34,14 +35,22 @@ export class GeneralTabComponent {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
 
+  private recurringDepositsService = inject(RecurringDepositsService);
+
   recurringDepositsAccountData: any;
   isprematureAllowed = false;
   entityType: string;
   currency: Currency;
+  /** Loans this deposit secures; empty when it is free of lien. */
+  liens: any[] = [];
+  totalLienAmount = 0;
+  /** Loan limit today (Lien Marked products only): % that applies, what it comes to, and what is left. */
+  lienLimit: { percentage: number; maxLoanAmount: number; availableForLoan: number } | null = null;
 
   constructor() {
     this.route.parent.data.subscribe((data: { recurringDepositsAccountData: any }) => {
       this.recurringDepositsAccountData = data.recurringDepositsAccountData;
+      this.loadLiens(this.recurringDepositsAccountData?.id);
       this.currency = this.recurringDepositsAccountData.currency;
       this.isprematureAllowed = data.recurringDepositsAccountData.maturityDate != null;
       if (this.router.url.includes('clients')) {
@@ -53,4 +62,24 @@ export class GeneralTabComponent {
       }
     });
   }
+
+  private loadLiens(accountId: any) {
+    this.liens = [];
+    this.totalLienAmount = 0;
+    this.lienLimit = null;
+    if (!accountId) {
+      return;
+    }
+    this.recurringDepositsService.getRecurringDepositLiens(accountId).subscribe((response: any) => {
+      this.liens = response?.liens ?? [];
+      this.totalLienAmount = Number(response?.totalLienAmount) || 0;
+      this.lienLimit = response?.lienAllowed
+        ? {
+            percentage: Number(response.effectiveLienPercentage) || 0,
+            maxLoanAmount: Number(response.maxLoanAmount) || 0,
+            availableForLoan: Number(response.availableForLoan) || 0
+          }
+        : null;
+    });
+  }
 }

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

@@ -82,6 +82,20 @@
           <span class="rd-kpi__label">{{ 'labels.inputs.Deposit Period' | translate }}</span>
           <span class="rd-kpi__value">{{ recurringDepositsAccountData.depositPeriod | number }}</span>
         </div>
+        <!-- Interest credited to the deposit so far - by its product's posting period (monthly, quarterly...), plus the
+             remainder on the maturity date. -->
+        <div class="rd-kpi rd-kpi--interest">
+          <span class="rd-kpi__label">Interest Posted</span>
+          <span class="rd-kpi__value">
+            {{
+              (recurringDepositsAccountData.summary.totalInterestPosted || 0)
+                | currency: currency.code : 'symbol-narrow' : '1.2-2'
+            }}
+          </span>
+          @if (recurringDepositsAccountData.interestPostingPeriodType?.value) {
+            <span class="rd-kpi__sub">Credited {{ recurringDepositsAccountData.interestPostingPeriodType.value }}</span>
+          }
+        </div>
       </div>
     }
 

src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.scss

@@ -212,6 +212,17 @@ $border: #e2e8f0;
     background: rgb(139 92 246 / 22%);
     border-color: rgb(139 92 246 / 35%);
   }
+
+  &--interest {
+    background: rgb(16 185 129 / 22%);
+    border-color: rgb(16 185 129 / 35%);
+  }
+
+  &__sub {
+    margin-top: 1px;
+    font-size: 9.5px;
+    color: rgb(255 255 255 / 75%);
+  }
 }
 
 /* Status pill */

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

@@ -40,6 +40,10 @@ import { MatTabNav, MatTabLink, MatTabNavPanel } from '@angular/material/tabs';
 import { StatusLookupPipe } from '../../../pipes/status-lookup.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { DormancyAlertPanelComponent } from 'app/shared/dormancy-alert-panel/dormancy-alert-panel.component';
+import { ProductsService } from 'app/products/products.service';
+import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component';
+import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { AlertService } from 'app/core/alert/alert.service';
 
 /**
  * RecurringDeposits Account View Component
@@ -79,6 +83,8 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
   private authenticationService = inject(AuthenticationService);
+  private productsService = inject(ProductsService);
+  private alertService = inject(AlertService);
   dialog = inject(MatDialog);
   private translateService = inject(TranslateService);
 
@@ -105,6 +111,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
     'Enable Withhold Tax': 'interest',
     'Disable Withhold Tax': 'interest',
     'Premature Close': 'danger',
+    'Extend Tenure': 'admin',
     'Undo Activation': 'admin',
     Close: 'danger',
     'Modify Application': 'admin',
@@ -128,6 +135,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
     'Enable Withhold Tax': 'percentage',
     'Disable Withhold Tax': 'percentage',
     'Premature Close': 'times-circle',
+    'Extend Tenure': 'calendar-alt',
     'Undo Activation': 'undo',
     Close: 'times-circle',
     'Modify Application': 'edit',
@@ -184,6 +192,30 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
 
   ngOnInit() {
     this.setConditionalButtons();
+    this.applyProductRules();
+  }
+
+  /**
+   * Buttons the deposit's product decides: no Premature Close unless the product has "Premature Withdrawal option" on,
+   * and an Extend Tenure action when it has "Tenure Flexibility" on. The server enforces both as well.
+   */
+  private applyProductRules() {
+    const productId = this.recurringDepositsAccountData.depositProductId;
+    if (!productId) {
+      return;
+    }
+    this.productsService.getRecurringDepositProduct(String(productId)).subscribe((product: any) => {
+      if (!product?.prematureWithdrawalOption) {
+        this.buttonConfig.buttonsArray = this.buttonConfig.buttonsArray.filter((btn) => btn.name !== 'Premature Close');
+        this.buttonConfig.optionArray = this.buttonConfig.optionArray.filter((opt) => opt.name !== 'Premature Close');
+      }
+      if (product?.tenureFlexibility && this.recurringDepositsAccountData.status?.value === 'Active') {
+        this.buttonConfig.addOption({
+          name: 'Extend Tenure',
+          taskPermissionName: 'EXTENDTENURE_RECURRINGDEPOSITACCOUNT'
+        });
+      }
+    });
   }
 
   /**
@@ -312,9 +344,61 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
       case 'Terminate':
         this.terminateRecurringDepositsAccount();
         break;
+      case 'Extend Tenure':
+        this.extendTenure();
+        break;
     }
   }
 
+  /**
+   * Lengthens the deposit's tenure (product has Tenure Flexibility on). New installments are added after the current
+   * last one, so Auto Debit keeps collecting through the added months; the rate becomes the chart's rate for the new
+   * tenure and the maturity date and amount are worked out again.
+   */
+  private extendTenure() {
+    const current = Number(this.recurringDepositsAccountData.depositPeriod) || 0;
+    const unit = this.recurringDepositsAccountData.depositPeriodFrequency?.value || 'Months';
+    const data = {
+      title: 'Extend Tenure',
+      layout: { addButtonText: 'Extend' },
+      formfields: [
+        new InputBase({
+          controlName: 'depositPeriod',
+          label: `New tenure in ${unit} (now ${current})`,
+          value: current + 1,
+          type: 'number',
+          required: true,
+          min: current + 1,
+          order: 1
+        })
+      ]
+    };
+    this.dialog
+      .open(FormDialogComponent, { data })
+      .afterClosed()
+      .subscribe((response: any) => {
+        const newPeriod = Number(response?.data?.value?.depositPeriod);
+        if (!response?.data) {
+          return;
+        }
+        if (!newPeriod || newPeriod <= current) {
+          this.alertService.alert({ type: 'Extend Tenure', message: `The new tenure must be more than ${current} ${unit}.` });
+          return;
+        }
+        this.recurringDepositsService
+          .executeRecurringDepositsAccountCommand(this.recurringDepositsAccountData.id, 'extendTenure', {
+            depositPeriod: newPeriod,
+            locale: this.settingsService.language.code
+          })
+          .subscribe((result: any) => {
+            if (result?.commandId && !result?.changes) {
+              this.alertService.alert({ type: 'Extend Tenure', message: 'Tenure extension submitted for approval.' });
+            }
+            this.reload();
+          });
+      });
+  }
+
   /**
    * Deletes Recurring Deposits Account.
    */

src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts

@@ -36,12 +36,9 @@ export class RecurringDepositsButtonsConfiguration {
   setButtons(status: string) {
     switch (status) {
       case 'Active':
+        // No Deposit button: a direct deposit here skips the manager's approval. RD installments come in
+        // through the cashier's Receipt (maker-checker) or Auto Debit.
         this.buttonsArray = [
-          {
-            name: 'Deposit',
-            icon: 'fa fa-arrow-up',
-            taskPermissionName: 'DEPOSIT_RECURRINGDEPOSITACCOUNT'
-          },
           {
             name: 'Withdrawal',
             icon: 'fa fa-arrow-down',
@@ -103,12 +100,9 @@ export class RecurringDepositsButtonsConfiguration {
             name: 'Calculate Interest',
             icon: 'fa fa-calculator',
             taskPermissionName: 'CALCULATEINTEREST_RECURRINGDEPOSITACCOUNT'
-          },
-          {
-            name: 'Post Interest',
-            icon: 'fa fa-money',
-            taskPermissionName: 'POSTINTEREST_RECURRINGDEPOSITACCOUNT'
           }
+          // No Post Interest: the term's interest is credited by the server on the maturity date, and again only at
+          // closure for any days after it.
         ];
         break;
       case 'Rejected':

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

@@ -31,6 +31,14 @@ export class RecurringDepositsService {
     return this.http.get(`/recurringdepositaccounts/${recurringDepositAccountId}`, { params: httpParams });
   }
 
+  /**
+   * Loans this recurring deposit currently secures (lien), with the amount each one holds.
+   * Returns { totalLienAmount, liens: [{ loanId, loanAccountNo, loanStatus, amount }] }.
+   */
+  getRecurringDepositLiens(recurringDepositAccountId: any): Observable<any> {
+    return this.http.get(`/recurringdepositaccounts/${recurringDepositAccountId}/liens`);
+  }
+
   /**
    * @param clientId Client Id
    * @param clientName Client Name

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>
+        <strong>{{ reportingDateStr || '—' }}</strong>
-        <span>Reporting Fortnight (45-day lag)</span>
+        <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-value">{{ crore(totalDemand) }}<span class="cr" *ngIf="totalDemand !== null">Cr</span></div>
-      <div class="sc-change up">&#8593; 3.2% vs prev fortnight</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-value">{{ crore(totalTime) }}<span class="cr" *ngIf="totalTime !== null">Cr</span></div>
-      <div class="sc-change up">&#8593; 1.8% vs prev fortnight</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>
+      <!-- The rate is named from the configuration, not fixed here: a card headed "CRR Required
-      <div class="sc-value">&#8377;{{ crrRequired | number: '1.0-0' }}<span class="cr">Cr</span></div>
+           (3%)" while Admin holds 4% states a rate the bank is not on. -->
-      <div class="sc-sub">SLR Req: &#8377;{{ slrRequired | number: '1.0-0' }} Cr ({{ slrRate }}%)</div>
+      <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 colspan="3"><strong>Total Demand Liabilities ({{ demandLiabilities.length }} accounts)</strong></td>
-            <td class="right foot-demand">12,114.75</td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "openingValue") }}</td>
-            <td class="right foot-demand">12,843.50</td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "currentValue") }}</td>
-            <td class="right up">+728.75</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 colspan="3"><strong>Total Time Liabilities ({{ timeLiabilities.length }} accounts)</strong></td>
-            <td class="right foot-time">62,613.10</td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "openingValue") }}</td>
-            <td class="right foot-time">64,618.00</td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "currentValue") }}</td>
-            <td class="right up">+2,004.90</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">{{ totalOf(bankingAssets, "openingValue") }}</td>
-            <td class="right foot-asset">8,240.20</td>
+            <td class="right foot-asset">{{ totalOf(bankingAssets, "currentValue") }}</td>
-            <td class="right up">+639.50</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">{{ totalOf(liquidAssets, "openingValue") }}</td>
-            <td class="right foot-slr">13,238.80</td>
+            <td class="right foot-slr">{{ totalOf(liquidAssets, "currentValue") }}</td>
-            <td class="right up">+727.10</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 */
+  /** The date the figures were struck at, as the return itself reports it. */
-  today = new Date();
+  reportingDateStr = '';
-  reportingDate: Date;
-  reportingDateStr: string;
 
-  /** NDTL & Reserve computations */
+  /**
-  readonly totalDemand = 12843.5;
+   * The close the ratios are charged on — the second preceding fortnight, not the one reported.
-  readonly totalTime = 64618.0;
+   *
-  readonly totalBankingAssets = 8240.2;
+   * Named on screen because the gap between the two is the whole of how the rules work: a bank
-  readonly ndtl = 69221.3; // Demand + Time - Banking Assets
+   * cannot hold a reserve against liabilities it does not yet know, so the requirement is fixed on
-  readonly crrRate = 3; // Current RBI CRR rate (%)
+   * a position already struck and reported. A screen showing one date invites a reader to think the
-  readonly slrRate = 18; // Current RBI SLR rate (%)
+   * requirement was worked out on the day it is shown against.
-  readonly crrRequired = 69221.3 * 0.03; // ₹2,076.64 Cr
+   */
-  readonly slrRequired = 69221.3 * 0.18; // ₹12,459.83 Cr
+  baseDateStr = '';
-  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
 
-  constructor() {
+  loading = true;
-    // CRR/SLR uses data from 45 days ago
+  /** Set when the return could not be computed — and why, in the return's own words. */
-    const lagDays = 45;
+  unavailable = '';
-    this.reportingDate = new Date(this.today);
+
-    this.reportingDate.setDate(this.reportingDate.getDate() - lagDays);
+  /**
-    this.reportingDateStr = this.reportingDate.toLocaleDateString('en-IN', {
+   * The NDTL computation, read from the return rather than stated here.
-      day: '2-digit',
+   *
-      month: 'short',
+   * These were fixed numbers until now — a demonstration screen that showed ₹69,221 Cr whatever the
-      year: 'numeric'
+   * 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 = [
+  /**
-    {
+   * The four tabs, filled from the return's own lines.
-      sl: '01',
+   *
-      name: 'Fixed Deposits (FD)',
+   * These were four fixed lists until now — 435 lines of invented accounts with invented balances,
-      sub: '7 days to 10 years · 6.5–7.2%',
+   * which a reader had no way to tell apart from the bank's real position. They are now built from
-      code: '3001-FD',
+   * the accounts the return actually read, so a tab is empty exactly when the bank has nothing
-      opening: '28,420.50',
+   * mapped under that head, and says so.
-      current: '29,184.30',
+   */
-      change: '+763.80',
+  demandLiabilities: CrrSlrRow[] = [];
-      changeDir: 'up',
+  timeLiabilities: CrrSlrRow[] = [];
-      status: 'Active'
+  bankingAssets: CrrSlrRow[] = [];
-    },
+  liquidAssets: CrrSlrRow[] = [];
-    {
+  /**
-      sl: '02',
+   * Turns Part A's lines into the rows a tab shows.
-      name: 'Recurring Deposits (RD)',
+   *
-      sub: 'Monthly instalment · 6.0–6.8%',
+   * The form reports each head at both of the closes it carries, so the earlier column is the
-      code: '3002-RD',
+   * opening and the later one the current — the same pair these tables have always shown, now taken
-      opening: '4,218.60',
+   * from the form rather than invented. Headings and totals are skipped: a heading carries no
-      current: '4,412.80',
+   * figure, and a total would be added a second time by the footer below.
-      change: '+194.20',
+   */
-      changeDir: 'up',
+  private rowsFrom(lines: any[], latest: number, match: (label: string) => boolean): CrrSlrRow[] {
-      status: 'Active'
+    const rows: CrrSlrRow[] = [];
-    },
+    for (const line of lines ?? []) {
-    {
+      const label = String(line?.label ?? '');
-      sl: '03',
+      if (line?.heading || line?.total || !line?.values || !match(label)) {
-      name: 'Time Liability Portion of Savings',
+        continue;
-      sub: '90% of SB balance treated as time',
+      }
-      code: '3003-SBT',
+      const opening = latest > 0 ? (line.values[latest - 1] ?? null) : null;
-      opening: '10,840.20',
+      const current = line.values[latest] ?? null;
-      current: '11,204.60',
+      const change = opening === null || current === null ? null : current - opening;
-      change: '+364.40',
+      rows.push({
-      changeDir: 'up',
+        sl: String(rows.length + 1).padStart(2, '0'),
-      status: 'Active'
+        // 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(),
-      sl: '04',
+        sub: line.configKey ? String(line.configKey).replace(/_/g, ' ') : 'Derived from the form',
-      name: 'Reinvestment Deposits',
+        code: line.configKey ?? '—',
-      sub: 'Cumulative interest plans · 7.0%',
+        opening: this.crore(opening),
-      code: '3004-RID',
+        current: this.crore(current),
-      opening: '1,842.40',
+        openingValue: opening,
-      current: '1,918.70',
+        currentValue: current,
-      change: '+76.30',
+        change: change === null ? '—' : `${change >= 0 ? '+' : ''}${this.crore(change).replace('₹', '')}`,
-      changeDir: 'up',
+        changeDir: change === null ? 'flat' : change >= 0 ? 'up' : 'dn',
-      status: 'Active'
+        // A head with no GL mapped reports nothing, and the form says so rather than reporting nil.
-    },
+        status: line.configured === false ? 'Not mapped' : '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'
     }
-  ];
+    return rows;
+  }
 
-  bankingAssets = [
+  /**
-    {
+   * A tab's column total, added from the rows on screen.
-      sl: '01',
+   *
-      name: 'Balances with Other Banks',
+   * Added from the rows rather than stated separately, so the foot of a table always agrees with
-      sub: 'Nostro / Vostro balances — SBI, PNB, BOB',
+   * what is above it. The footers used to be fixed text and agreed with nothing.
-      code: '4001-BWB',
+   *
-      opening: '3,840.20',
+   * Summed from each row's own figure, not from the text it displays: a total parsed back out of
-      current: '4,112.40',
+   * formatted strings would quietly lose the paise the display rounds away.
-      change: '+272.20',
+   */
-      changeDir: 'up',
+  totalOf(rows: CrrSlrRow[], column: 'openingValue' | 'currentValue'): string {
-      status: 'Active'
+    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)) : '—';
-    {
+  }
-      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'
-    }
-  ];
 
-  liquidAssets = [
+  /** The movement across a tab, between the two closes the form reports. */
-    {
+  totalChange(rows: CrrSlrRow[]): string {
-      sl: '01',
+    const opening = rows.map((r) => r.openingValue).filter((v): v is number => v !== null);
-      name: 'Central Government Securities',
+    const current = rows.map((r) => r.currentValue).filter((v): v is number => v !== null);
-      sub: 'G-Secs held in HTM, AFS & HFT portfolios',
+    if (!opening.length || !current.length) {
-      code: '5001-CGS',
+      return '—';
-      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'
     }
-  ];
+    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-label">CRR Required{{ crrSlr.crrRate === null ? '' : ' (' + crrSlr.crrRate + '%)' }}</span>
-            <span class="metric-value">&#8377;2,077 Cr</span>
+            <span class="metric-value">{{ crrSlr.crrRequired }}</span>
           </div>
           <div class="metric-row">
-            <span class="metric-label">SLR Required (18%)</span>
+            <span class="metric-label">SLR Required{{ crrSlr.slrRate === null ? '' : ' (' + crrSlr.slrRate + '%)' }}</span>
-            <span class="metric-value">&#8377;12,460 Cr</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/interest-posting-report/interest-posting-report.component.html

@@ -22,9 +22,134 @@
         <input type="date" [(ngModel)]="postingDate" (change)="load()" />
       </label>
       <button class="ipr-btn" (click)="load()" [disabled]="loading"><fa-icon icon="undo"></fa-icon> Reload</button>
+      <button class="ipr-btn ipr-btn--primary" (click)="openPreview()" [disabled]="previewLoading">
+        <fa-icon icon="eye"></fa-icon> Preview interest (today)
+      </button>
     </div>
   </div>
 
+  @if (isHeadOffice) {
+    <div class="ipr-tabs">
+      <button class="ipr-tab" [class.is-active]="tab === 'own'" (click)="switchTab('own')">
+        <fa-icon icon="building"></fa-icon> My branch{{ myBranch ? ' — ' + myBranch : '' }}
+      </button>
+      <button class="ipr-tab" [class.is-active]="tab === 'others'" (click)="switchTab('others')">
+        <fa-icon icon="sitemap"></fa-icon> Other branches
+      </button>
+    </div>
+    @if (tab === 'others') {
+      <div class="ipr-alert ipr-alert--info">
+        <fa-icon icon="info-circle"></fa-icon>
+        <div>
+          Each branch generates and approves its own reports. The head office can act here only for a branch that has
+          not opened the day, and only once every other open branch has closed. Anything it approves is marked (HO).
+        </div>
+      </div>
+    }
+  }
+
+  @if (showPreview) {
+    <div class="ipr-card">
+      <div class="ipr-detail-head">
+        <div>
+          <h3>Interest preview — earned up to {{ previewAsOf }}</h3>
+          <div class="muted">
+            What each account would be paid if interest were posted today. View only — nothing is saved, approved or
+            posted.
+          </div>
+        </div>
+        <div class="ipr-total">
+          <span>Total so far</span>
+          <strong>₹{{ previewTotal | number: '1.2-2' }}</strong>
+          <span class="muted">{{ previewRows.length }} account(s)</span>
+        </div>
+      </div>
+      <div class="ipr-preview-actions">
+        <button class="ipr-btn ipr-btn--slim" (click)="openPreview()" [disabled]="previewLoading">
+          <fa-icon icon="undo"></fa-icon> Refresh
+        </button>
+        <button
+          class="ipr-btn ipr-btn--slim"
+          (click)="exportPreview()"
+          [disabled]="previewLoading || previewRows.length === 0"
+        >
+          <fa-icon icon="file-excel"></fa-icon> Export Excel
+        </button>
+        <button class="ipr-btn ipr-btn--slim" (click)="closePreview()"><fa-icon icon="times"></fa-icon> Close</button>
+      </div>
+      @if (previewLoading) {
+        <div class="ipr-empty">Calculating interest up to today…</div>
+      } @else {
+        <table class="ipr-table">
+          <thead>
+            <tr>
+              <th>Branch</th>
+              <th>Product</th>
+              <th>Posting date</th>
+              <th class="num">Accounts</th>
+              <th class="num">Interest so far</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (g of previewGroups; track g.officeName + g.productName) {
+              <tr>
+                <td>{{ g.officeName }}</td>
+                <td>
+                  <strong>{{ g.productName }}</strong>
+                </td>
+                <td>{{ g.postingDate }}</td>
+                <td class="num">{{ g.accounts }}</td>
+                <td class="num">₹{{ g.interest | number: '1.2-2' }}</td>
+              </tr>
+            } @empty {
+              <tr>
+                <td colspan="5" class="ipr-empty">No savings account has interest accrued in its current cycle.</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+        @if (previewRows.length > 0) {
+          <table class="ipr-table">
+            <thead>
+              <tr>
+                <th>Branch</th>
+                <th>Product</th>
+                <th>Account no</th>
+                <th>Account holder</th>
+                <th class="num">Balance</th>
+                <th class="num">Rate %</th>
+                <th>Cycle</th>
+                <th class="num">Interest so far</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (r of previewRows; track r.savingsAccountId) {
+                <tr>
+                  <td>{{ r.officeName }}</td>
+                  <td>{{ r.productName }}</td>
+                  <td>{{ r.accountNo }}</td>
+                  <td>{{ r.clientName }}</td>
+                  <td class="num">₹{{ r.balance | number: '1.2-2' }}</td>
+                  <td class="num">{{ r.rate | number: '1.2-2' }}</td>
+                  <td class="muted">{{ r.cycleStart }} → {{ r.postingDate }}</td>
+                  <td class="num">₹{{ r.interest | number: '1.2-2' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td colspan="7"><strong>Total</strong></td>
+                <td class="num">
+                  <strong>₹{{ previewTotal | number: '1.2-2' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        }
+      }
+    </div>
+  }
+
   @if (errorMessage) {
     <div class="ipr-alert ipr-alert--error">
       <fa-icon icon="exclamation-triangle"></fa-icon>
@@ -52,9 +177,13 @@
         @for (d of due; track d.productId + '-' + d.officeId) {
           <div class="ipr-due-row">
             <strong>{{ d.productName }}</strong> <span>· {{ d.officeName }} · {{ d.postingDate }}</span>
-            <button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="generate(d)" [disabled]="busy">
+            @if (d.canAct) {
-              <fa-icon icon="sync"></fa-icon> Generate report
+              <button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="generate(d)" [disabled]="busy">
-            </button>
+                <fa-icon icon="sync"></fa-icon> {{ tab === 'others' ? 'Generate on behalf' : 'Generate report' }}
+              </button>
+            } @else if (d.blockedReason) {
+              <span class="ipr-blocked">{{ d.blockedReason }}</span>
+            }
           </div>
         }
       </div>
@@ -114,9 +243,12 @@
               }
               @if (canApprove(r)) {
                 <button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="approve(r)" [disabled]="busy">
-                  <fa-icon icon="check"></fa-icon> Approve
+                  <fa-icon icon="check"></fa-icon> {{ tab === 'others' ? 'Approve on behalf' : 'Approve' }}
                 </button>
               }
+              @if (!r.canAct && r.blockedReason && (r.status === 'GENERATED' || r.status === 'APPROVED')) {
+                <span class="ipr-blocked">{{ r.blockedReason }}</span>
+              }
             </td>
           </tr>
         } @empty {

src/app/interest-posting-report/interest-posting-report.component.scss

@@ -274,3 +274,54 @@
   font-weight: 600;
   color: var(--i-amber);
 }
+
+// Preview: refresh / export / close, above the totals.
+.ipr-preview-actions {
+  display: flex;
+  gap: 6px;
+  justify-content: flex-end;
+  padding: 0 16px 10px;
+}
+
+.ipr-tabs {
+  display: flex;
+  gap: 4px;
+  margin-bottom: 12px;
+  border-bottom: 1px solid var(--i-g200);
+}
+
+.ipr-tab {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 8px 14px;
+  margin-bottom: -1px;
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--i-g500);
+  cursor: pointer;
+  background: transparent;
+  border: 1px solid transparent;
+  border-radius: 6px 6px 0 0;
+
+  &.is-active {
+    color: var(--i-navy);
+    background: #fff;
+    border-color: var(--i-g200);
+    border-bottom-color: #fff;
+  }
+}
+
+.ipr-alert--info {
+  background: var(--i-blue-l);
+  color: var(--i-blue);
+}
+
+.ipr-blocked {
+  display: inline-block;
+  max-width: 320px;
+  font-size: 11px;
+  line-height: 1.35;
+  color: var(--i-g500);
+  white-space: normal;
+}

src/app/interest-posting-report/interest-posting-report.component.ts

@@ -11,11 +11,14 @@ import { FormsModule } from '@angular/forms';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { SettingsService } from 'app/settings/settings.service';
+import { exportWorkbook } from '../cashier/cashier-export';
 import {
   InterestPostingDue,
   InterestPostingReport,
   InterestPostingReportDetail,
-  InterestPostingReportService
+  InterestPostingReportService,
+  InterestPreviewRow,
+  ReportScope
 } from './interest-posting-report.service';
 
 /**
@@ -51,15 +54,48 @@ export class InterestPostingReportComponent implements OnInit {
   /** Products with interest due and no report yet — the noon job ran before they had anything due, or failed. */
   due: InterestPostingDue[] = [];
 
+  /** 'own' — the user's own branch; 'others' — every other branch, a head-office-only tab. */
+  tab: ReportScope = 'own';
+  isHeadOffice = false;
+  myBranch = '';
+
   ngOnInit(): void {
     this.postingDate = this.businessDateIso();
+    this.reportService.context().subscribe({
+      next: (ctx) => {
+        this.isHeadOffice = !!ctx?.headOffice;
+        this.myBranch = ctx?.officeName ?? '';
+      },
+      error: () => (this.isHeadOffice = false)
+    });
     this.load();
   }
 
+  switchTab(tab: ReportScope): void {
+    if (this.tab === tab) {
+      return;
+    }
+    this.tab = tab;
+    this.selected = null;
+    this.notice = '';
+    this.load();
+  }
+
+  /** Acting for another branch is the head office's exception, so it is spelt out before it happens. */
+  private confirmOnBehalf(officeName: string, action: string): boolean {
+    if (this.tab !== 'others') {
+      return true;
+    }
+    return confirm(
+      `${officeName} has not opened today. You are about to ${action} its interest posting report on its behalf, ` +
+        'from the head office. Continue?'
+    );
+  }
+
   load(): void {
     this.loading = true;
     this.errorMessage = '';
-    this.reportService.list(this.postingDate || undefined).subscribe({
+    this.reportService.list(this.postingDate || undefined, undefined, undefined, this.tab).subscribe({
       next: (reports) => {
         this.reports = reports ?? [];
         this.loading = false;
@@ -75,13 +111,16 @@ export class InterestPostingReportComponent implements OnInit {
         this.errorMessage = this.messageOf(err, 'Could not load the interest posting reports.');
       }
     });
-    this.reportService.dueWithoutReport(this.postingDate || undefined).subscribe({
+    this.reportService.dueWithoutReport(this.postingDate || undefined, this.tab).subscribe({
       next: (due) => (this.due = due ?? []),
       error: () => (this.due = [])
     });
   }
 
   generate(item: InterestPostingDue): void {
+    if (!this.confirmOnBehalf(item.officeName, 'generate')) {
+      return;
+    }
     this.busy = true;
     this.notice = '';
     this.errorMessage = '';
@@ -111,7 +150,8 @@ export class InterestPostingReportComponent implements OnInit {
     if (
       !confirm(
         `Regenerate the interest posting report for ${report.productName} — ${report.officeName}? It will need approving again.`
-      )
+      ) ||
+      !this.confirmOnBehalf(report.officeName, 'regenerate')
     ) {
       return;
     }
@@ -138,7 +178,8 @@ export class InterestPostingReportComponent implements OnInit {
       !confirm(
         `Approve interest of ₹${report.totalInterest} across ${report.accountCount} account(s) for ${report.productName}? ` +
           'It will be posted when the branch closes the day.'
-      )
+      ) ||
+      !this.confirmOnBehalf(report.officeName, 'approve')
     ) {
       return;
     }
@@ -177,8 +218,165 @@ export class InterestPostingReportComponent implements OnInit {
     );
   }
 
+  /** Pending reports that block this user's own day close; another branch's pending reports block only that branch. */
   get pendingCount(): number {
-    return this.reports.filter((r) => r.status === 'GENERATED').length;
+    return this.tab === 'own' ? this.reports.filter((r) => r.status === 'GENERATED').length : 0;
+  }
+
+  // ── Preview: what each account has earned so far, as if posted today. View only. ──
+
+  showPreview = false;
+  previewLoading = false;
+  previewRows: InterestPreviewRow[] = [];
+  previewAsOf = '';
+
+  openPreview(): void {
+    this.showPreview = true;
+    this.previewLoading = true;
+    this.errorMessage = '';
+    this.reportService.preview().subscribe({
+      next: (rows) => {
+        this.previewRows = rows ?? [];
+        this.previewAsOf = this.previewRows[0]?.asOf ?? this.businessDateIso();
+        this.previewLoading = false;
+      },
+      error: (err) => {
+        this.previewLoading = false;
+        this.previewRows = [];
+        this.errorMessage = this.messageOf(err, 'Could not load the interest preview.');
+      }
+    });
+  }
+
+  closePreview(): void {
+    this.showPreview = false;
+  }
+
+  get previewTotal(): number {
+    return this.previewRows.reduce((sum, r) => sum + Number(r.interest || 0), 0);
+  }
+
+  /** Totals by branch and product, for the summary above the account list and the export. */
+  get previewGroups(): {
+    officeName: string;
+    productName: string;
+    postingDate: string;
+    accounts: number;
+    interest: number;
+  }[] {
+    const map = new Map<
+      string,
+      { officeName: string; productName: string; postingDate: string; accounts: number; interest: number }
+    >();
+    this.previewRows.forEach((r) => {
+      const key = `${r.officeName}|${r.productName}`;
+      const g = map.get(key) ?? {
+        officeName: r.officeName,
+        productName: r.productName,
+        postingDate: r.postingDate,
+        accounts: 0,
+        interest: 0
+      };
+      g.accounts += 1;
+      g.interest += Number(r.interest || 0);
+      map.set(key, g);
+    });
+    return [...map.values()];
+  }
+
+  exportPreview(): void {
+    const stamp = `Interest earned to ${this.previewAsOf} — preview, not posted`;
+    exportWorkbook(
+      [
+        {
+          sheetName: 'By account',
+          title: 'Savings Interest Preview',
+          subtitle: stamp,
+          headers: [
+            'Branch',
+            'Product',
+            'Account No',
+            'Customer',
+            'Balance',
+            'Rate %',
+            'Cycle Start',
+            'Posting Date',
+            'Interest So Far'
+          ],
+          widths: [
+            18,
+            22,
+            20,
+            26,
+            16,
+            8,
+            12,
+            12,
+            16
+          ],
+          rows: [
+            ...this.previewRows.map((r) => [
+              r.officeName,
+              r.productName,
+              r.accountNo,
+              r.clientName,
+              Number(r.balance || 0),
+              Number(r.rate || 0),
+              r.cycleStart,
+              r.postingDate,
+              Number(r.interest || 0)
+            ]),
+            [
+              'TOTAL',
+              '',
+              '',
+              '',
+              '',
+              '',
+              '',
+              '',
+              this.previewTotal
+            ]
+          ]
+        },
+        {
+          sheetName: 'By branch & product',
+          title: 'Savings Interest Preview — Totals',
+          subtitle: stamp,
+          headers: [
+            'Branch',
+            'Product',
+            'Posting Date',
+            'Accounts',
+            'Interest So Far'
+          ],
+          widths: [
+            18,
+            22,
+            12,
+            10,
+            16
+          ],
+          rows: [
+            ...this.previewGroups.map((g) => [
+              g.officeName,
+              g.productName,
+              g.postingDate,
+              g.accounts,
+              g.interest
+            ]),
+            [
+              'TOTAL',
+              '',
+              '',
+              this.previewRows.length,
+              this.previewTotal
+            ]
+          ]
+        }
+      ],
+      `savings-interest-preview-${this.previewAsOf}`
+    );
   }
 
   private businessDateIso(): string {

src/app/interest-posting-report/interest-posting-report.service.ts

@@ -12,6 +12,9 @@ import { Observable } from 'rxjs';
 
 export type InterestPostingReportStatus = 'GENERATED' | 'APPROVED' | 'POSTED' | 'SUPERSEDED';
 
+/** Which branches a list covers: the user's own, or (head office only) every other branch. */
+export type ReportScope = 'own' | 'others';
+
 export interface InterestPostingReport {
   id: number;
   productId: number;
@@ -32,6 +35,8 @@ export interface InterestPostingReport {
   failureReason: string | null;
   /** Whether the signed-in user may regenerate or approve it: their own branch, or the head office for a branch that did not open. */
   canAct: boolean;
+  /** Why not, where canAct is false. */
+  blockedReason: string | null;
 }
 
 export interface InterestPostingReportLine {
@@ -60,6 +65,8 @@ export interface InterestPostingDue {
   officeId: number;
   officeName: string;
   postingDate: string;
+  canAct: boolean;
+  blockedReason: string | null;
 }
 
 export interface InterestPostingSummaryRow {
@@ -78,6 +85,22 @@ export interface InterestPostingSummaryRow {
   postedAt: string | null;
 }
 
+export interface InterestPreviewRow {
+  officeId: number;
+  officeName: string;
+  productId: number;
+  productName: string;
+  savingsAccountId: number;
+  accountNo: string;
+  clientName: string;
+  balance: number;
+  rate: number;
+  cycleStart: string;
+  postingDate: string;
+  asOf: string;
+  interest: number;
+}
+
 /**
  * The savings interest posting reports, one per branch and product: generated at noon on a posting
  * date, approved by the branch, posted when the branch closes the day.
@@ -87,8 +110,15 @@ export class InterestPostingReportService {
   private http = inject(HttpClient);
   private readonly base = '/savingsinterestpostingreports';
 
-  list(postingDate?: string, status?: string, officeId?: number): Observable<InterestPostingReport[]> {
+  /** scope 'own' is the user's own branch; 'others' (head office only) every other branch. */
+  list(
+    postingDate?: string,
+    status?: string,
+    officeId?: number,
+    scope?: ReportScope
+  ): Observable<InterestPostingReport[]> {
     let params = new HttpParams();
+    if (scope) params = params.set('scope', scope);
     if (postingDate) params = params.set('postingDate', postingDate);
     if (status) params = params.set('status', status);
     if (officeId) params = params.set('officeId', String(officeId));
@@ -96,12 +126,18 @@ export class InterestPostingReportService {
   }
 
   /** Branch and product pairs with interest due by the date and no report yet, that this user may generate. */
-  dueWithoutReport(postingDate?: string): Observable<InterestPostingDue[]> {
+  dueWithoutReport(postingDate?: string, scope?: ReportScope): Observable<InterestPostingDue[]> {
     let params = new HttpParams();
+    if (scope) params = params.set('scope', scope);
     if (postingDate) params = params.set('postingDate', postingDate);
     return this.http.get<InterestPostingDue[]>(`${this.base}/due-without-report`, { params });
   }
 
+  /** The signed-in user's branch, and whether it is the head office. */
+  context(): Observable<{ officeId: number; officeName: string; headOffice: boolean }> {
+    return this.http.get<{ officeId: number; officeName: string; headOffice: boolean }>(`${this.base}/context`);
+  }
+
   detail(reportId: number): Observable<InterestPostingReportDetail> {
     return this.http.get<InterestPostingReportDetail>(`${this.base}/${reportId}`);
   }
@@ -126,6 +162,13 @@ export class InterestPostingReportService {
     );
   }
 
+  /** Interest each account has earned so far this cycle, as if posted today. View only. */
+  preview(officeId?: number): Observable<InterestPreviewRow[]> {
+    let params = new HttpParams();
+    if (officeId) params = params.set('officeId', String(officeId));
+    return this.http.get<InterestPreviewRow[]>(`${this.base}/preview`, { params });
+  }
+
   /** The head office's branch-wise view over a date range. */
   summary(fromDate?: string, toDate?: string, productId?: number): Observable<InterestPostingSummaryRow[]> {
     let params = new HttpParams();

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>
+              <!-- Both ratios are Form 1's. Part B charges section 18 on the base, Part C section
-              <mat-option value="SLR">SLR — Form 9</mat-option>
+                 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>
@@ -228,11 +230,29 @@
                 </tr>
               </thead>
               <tbody>
-                @for (mapping of selection[role.configKey]; track $index; let i = $index) {
+<!-- Tracked by the row's own id, never by position. With $index, deleting a row shifted every
+                     row after it up one, Angular reused the inputs bound to the old positions, and
+                     ngModel wrote their values back into the shortened array - the row reappeared and
+                     Save stayed grey. -->
+                @for (mapping of selection[role.configKey]; track mapping.rowId; let i = $index) {
                   <tr [class.rrc-map__row--invalid]="isRowInvalid(mapping)">
                     <td>
                       <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-map__field">
-                        <mat-select [(ngModel)]="mapping.glAccountId" [disabled]="savingKey === role.configKey">
+                        <!-- The chart runs to a hundred accounts, so the list is typed into rather
+                             than scrolled. Cleared as the dropdown opens, so each one opens whole. -->
+                        <mat-select
+                          [(ngModel)]="mapping.glAccountId"
+                          [disabled]="savingKey === role.configKey"
+                          (openedChange)="accountSearch = ''"
+                        >
+                          <mat-option>
+                            <ngx-mat-select-search
+                              [(ngModel)]="accountSearch"
+                              [ngModelOptions]="{ standalone: true }"
+                              placeholderLabel="Search by GL code or name"
+                              noEntriesFoundLabel="No account matches"
+                            ></ngx-mat-select-search>
+                          </mat-option>
                           @for (o of availableAccounts(role, i); track o.id) {
                             <mat-option [value]="o.id">{{ o.glCode }} · {{ o.name }}</mat-option>
                           }

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

@@ -7,8 +7,9 @@
  */
 
 import { Component, OnInit, inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { catchError, forkJoin, of } from 'rxjs';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { OrganizationService } from '../organization.service';
 
@@ -20,11 +21,23 @@ export interface ReserveMapping {
   glAccountId: number;
   weightPercentage: number;
   liabilityClass: string | null;
+  /**
+   * Identity for the row, so the template can track rows by it rather than by position.
+   *
+   * Tracking by index made deletion impossible: removing a row shifts every row after it up one, so
+   * Angular reused the inputs that were bound to the old positions and ngModel wrote their values
+   * straight back into the shortened array. The row reappeared, the draft matched what was stored
+   * again, and Save stayed grey. Never sent to the backend.
+   */
+  rowId: number;
 }
 
 /**
- * Configuration behind RBI Form 1 (CRR) and Form 9 (SLR): the percentages RBI sets, and which GL
+ * Configuration behind RBI Form 1: the percentages RBI sets, and which GL accounts the return reads
- * accounts the returns read their figures from.
+ * 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
@@ -40,15 +53,17 @@ export interface ReserveMapping {
   styleUrls: ['./rbi-reserve-config.component.scss'],
   imports: [
     ...STANDALONE_SHARED_IMPORTS,
-    FormsModule
+    FormsModule,
+    ReactiveFormsModule,
+    NgxMatSelectSearchModule
   ]
 })
 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
+   * 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.
+   * '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,20 +80,45 @@ 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
+   * The two returns have nothing in common - Form 1 charges ratios on a liability base, Form IX
-   * administrator setting one up is looking at a different set of heads than one setting up the
+   * reports a balance sheet - so an administrator setting one up is looking at a different set of
-   * other. Showing all twenty-six at once buries the four that matter for the task in hand.
+   * 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[] = [];
 
-  /** Re-slices what is on screen. No round trip - the full set is already held. */
+  /** Hands each mapping row an identity the template can track it by. See ReserveMapping.rowId. */
+  private nextRowId = 1;
+
+  /**
+   * What is typed into the search box inside an open account dropdown.
+   *
+   * One field for the whole screen rather than one per row: only one dropdown is open at a time, and
+   * it is cleared as each one opens, so a term left behind cannot narrow the next list a user opens
+   * without them seeing why it is short.
+   */
+  accountSearch = '';
+
+  /**
+   * Re-slices what is on screen. No round trip - the full set is already held.
+   *
+   * The rows are rebuilt for whatever the new slice brings in. They used not to be: selection was
+   * filled once, for the heads the first slice happened to contain, so switching the filter showed
+   * the newly admitted heads with no rows at all - a card with a name and an empty body, reading as
+   * a head that had nothing mapped when it was simply never read.
+   */
   onFormFilterChange(): void {
     this.glRoles = this.rolesForScreen();
+    for (const role of this.glRoles) {
+      if (!this.selection[role.configKey]) {
+        this.reloadSelection(role);
+      }
+    }
     this.rebuildGroups();
   }
 
@@ -95,20 +135,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_1', label: 'Form 1 — CRR & SLR' },
-    { value: 'FORM_9', label: 'Form 9 — SLR (monthly)' },
     { 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
+   * Form 1 takes every head that is not Form IX's. It reports both ratios: MAINTAINED heads are met
-   * cash and balances and so is Form 1's, SLR_ASSET is met in securities and gold and so is Form
+   * in cash and balances and settle Part B, SLR_ASSET heads are met in securities and gold and
-   * 9's, and a head that builds or nets the DTL base belongs to both because both charge their rate
+   * settle Part C, and the heads that build or net the DTL base feed the IV(b) both rates are
-   * on that same base. A memo head is stated on either return and so shows on both.
+   * charged on. Splitting them across two filters only hid half of one form.
    */
   private belongsToSelectedForm(role: any): boolean {
     if (this.formFilter === 'ALL') {
@@ -125,19 +173,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,
+    // Everything left belongs to Form 1, whichever of its two parts it settles.
-    // 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.
     return true;
   }
 
@@ -171,15 +207,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
+   * MAINTAINED and SLR_ASSET are separate because the two parts admit different assets: CRR is met
-   * met in cash and balances with banks, SLR in cash, gold and approved securities. One option for
+   * in cash and balances with banks, SLR in cash, gold and approved securities. One option for both
-   * both would let a head meant for Form 1 quietly satisfy Form 9.
+   * 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: 'LIABILITY', label: 'Liability — adds to the DTL base (Form 1)' },
-    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1 & 9)' },
+    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1)' },
-    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1)' },
+    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1 Part B)' },
-    { value: 'SLR_ASSET', label: 'Counts toward SLR maintained (Form 9)' },
+    { 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)' },
@@ -230,11 +266,7 @@ export class RbiReserveConfigComponent implements OnInit {
     for (const role of this.glRoles) {
       // Read back what is stored rather than re-derived: a weight or a class the administrator set
       // deliberately would otherwise be replaced by a default on the next save.
-      this.selection[role.configKey] = (role.accounts || []).map((a: any) => ({
+      this.reloadSelection(role);
-        glAccountId: a.glAccountId,
-        weightPercentage: a.weightPercentage === null || a.weightPercentage === undefined ? 100 : +a.weightPercentage,
-        liabilityClass: a.liabilityClass ?? (role.classified ? 'TIME' : null)
-      }));
     }
     this.rebuildGroups();
   }
@@ -282,15 +314,22 @@ 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) ' +
+      'The CRR and SLR percentages, and the GL accounts RBI Form 1 reads its figures from — Part B settles the cash ' +
-      'read their figures from. A rate applies to a base — so a role left unmapped stops its return computing rather ' +
+      'reserve, Part C the liquid assets, both charged on the same base. A rate applies to a base — so a role left ' +
-      'than reporting a nil figure that looks real.'
+      'unmapped stops the return computing rather than reporting a nil figure that looks real.'
     );
   }
 
-  /** A role with nothing mapped makes its return refuse to compute — surfaced, not hidden. */
+  /**
+   * A role with nothing mapped makes its return refuse to compute — surfaced, not hidden.
+   *
+   * Read from what is STORED, not from the draft on screen. The returns run off the saved mapping,
+   * so a row cleared but not yet saved changes nothing for them; counting it as unmapped made the
+   * banner announce that returns could not compute while they were still computing perfectly well.
+   * The unsaved edit is already shown by Save turning active.
+   */
   isUnmapped(role: any): boolean {
-    return !(this.selection[role.configKey] || []).length;
+    return !(role.accounts || []).length;
   }
 
   get unmappedCount(): number {
@@ -327,11 +366,29 @@ export class RbiReserveConfigComponent implements OnInit {
     // a bank look compliant when it is not.
     this.selection[role.configKey] = [
       ...(this.selection[role.configKey] || []),
-      { glAccountId: null as any, weightPercentage: 100, liabilityClass: role.classified ? 'TIME' : null }];
+      {
+        glAccountId: null as any,
+        weightPercentage: 100,
+        liabilityClass: role.classified ? 'TIME' : null,
+        rowId: this.nextRowId++
+      }];
   }
 
+  /**
+   * Drops a row and saves the head straight away.
+   *
+   * The bin used to clear the row on screen and leave it to Save, which read as the mapping having
+   * been removed when nothing had reached the server - the row came back on the next refresh. A bin
+   * is understood to delete, so it deletes: a row with nothing chosen in it never existed on the
+   * server and only has to go from the screen, and anything else is written through at once.
+   */
   removeMapping(role: any, index: number): void {
-    this.selection[role.configKey] = (this.selection[role.configKey] || []).filter((_, i) => i !== index);
+    const rows = this.selection[role.configKey] || [];
+    const removed = rows[index];
+    this.selection[role.configKey] = rows.filter((_, i) => i !== index);
+    if (removed?.glAccountId) {
+      this.saveRole(role);
+    }
   }
 
   /**
@@ -343,7 +400,23 @@ export class RbiReserveConfigComponent implements OnInit {
     const rows = this.selection[role.configKey] || [];
     const taken = new Set(rows.filter((_, i) => i !== index).map((m) => `${m.glAccountId}/${m.liabilityClass ?? ''}`));
     const current = rows[index];
-    return this.glAccountOptions.filter((o) => !taken.has(`${o.id}/${current?.liabilityClass ?? ''}`));
+    const free = this.glAccountOptions.filter((o) => !taken.has(`${o.id}/${current?.liabilityClass ?? ''}`));
+
+    // Typed into the search box above the list. Matched on code AND name, because an administrator
+    // looking for a head knows one or the other - the GL code off a trial balance, or the name off
+    // the balance sheet - and should not have to know which this list is sorted by.
+    const term = (this.accountSearch || '').trim().toLowerCase();
+    if (!term) {
+      return free;
+    }
+    // The chosen account stays in the list whatever is typed. Dropping it would leave mat-select
+    // with a value that matches no option, and the row would read as empty.
+    return free.filter(
+      (o) =>
+        o.id === current?.glAccountId ||
+        `${o.glCode}`.toLowerCase().includes(term) ||
+        `${o.name}`.toLowerCase().includes(term)
+    );
   }
 
   /** A row that cannot be saved - no account chosen, or a portion outside 0-100. */
@@ -379,6 +452,16 @@ export class RbiReserveConfigComponent implements OnInit {
       .filter((e) => Math.abs(e.total - 100) > 0.0001);
   }
 
+  /** Rebuilds one head's rows from what the server last returned, discarding the draft. */
+  private reloadSelection(role: any): void {
+    this.selection[role.configKey] = (role.accounts || []).map((a: any) => ({
+      glAccountId: a.glAccountId,
+      weightPercentage: a.weightPercentage === null || a.weightPercentage === undefined ? 100 : +a.weightPercentage,
+      liabilityClass: a.liabilityClass ?? (role.classified ? 'TIME' : null),
+      rowId: this.nextRowId++
+    }));
+  }
+
   saveRole(role: any): void {
     this.savingKey = role.configKey;
     this.errorMsg = '';
@@ -398,6 +481,11 @@ export class RbiReserveConfigComponent implements OnInit {
         catchError((err: any) => {
           this.savingKey = null;
           this.errorMsg = err?.error?.errors?.[0]?.defaultUserMessage ?? 'Could not save this mapping.';
+          // Put the screen back to what the server holds. A failed save that left the draft showing
+          // would say the change had gone through while the server still had the old mapping - and
+          // the bin deletes immediately, so this is the only thing between a rejected delete and a
+          // row that looks gone but is not.
+          this.reloadSelection(role);
           return of(null);
         })
       )

src/app/pipes/accounts-filter.pipe.ts

@@ -62,7 +62,7 @@ export class AccountsFilterPipe implements PipeTransform {
               account.status.code === 'savingsAccountStatusType.rejected'
             );
           });
-        } else {
+        } else if (status !== 'all') {
           accounts = accounts.filter((account: any) => {
             return (
               account.status.code !== 'savingsAccountStatusType.withdrawn.by.applicant' &&

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

@@ -24,6 +24,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
 type AccountingSectionKey = 'assets' | 'liabilities' | 'expenses' | 'income';
 
+const SAVINGS_INTEREST_PAYABLE_ACCOUNT_NAME = 'Savings Interest Payable';
+const FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME = 'Fixed Deposit Interest Paid';
+const SAVINGS_INTEREST_PAID_ACCOUNT_NAME = 'Savings Interest Paid';
+
 type AccountingRowConfig = {
   key: string;
   label: string;
@@ -128,6 +132,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
       feesReceivableAccountId: [''],
       penaltiesReceivableAccountId: [''],
       interestPayableAccountId: [''],
+      savingsInterestPaidAccountId: [''],
       escheatLiabilityId: [''],
       assetsOtherGlMappings: this.formBuilder.array([]),
       liabilitiesOtherGlMappings: this.formBuilder.array([]),
@@ -158,6 +163,20 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
     return '';
   }
 
+  private extractNamedGlMapping(
+    otherGlMappings: any[],
+    accountName: string,
+    controlName: string,
+    options: GLAccount[]
+  ): any[] {
+    const match = (otherGlMappings || []).find((mapping) => mapping?.accountName === accountName);
+    if (match) {
+      const glAccountId = match.glAccountId || options.find((option) => option.glCode === match.glCode)?.id || '';
+      this.fixedDepositProductAccountingForm.get(controlName)?.patchValue(glAccountId);
+    }
+    return (otherGlMappings || []).filter((mapping) => mapping?.accountName !== accountName);
+  }
+
   private patchAccountingValues(mappings: any) {
     this.fixedDepositProductAccountingForm.patchValue({
       savingsReferenceAccountId: this.extractAccountId(
@@ -200,7 +219,18 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
         glMappings?.liabilities || [],
         this.liabilityAccountOptions
       );
-      this.setOtherGlMappings('expensesOtherGlMappings', glMappings?.expenses || [], this.expenseAccountOptions);
+      const fromExpenses = this.extractNamedGlMapping(
+        this.extractNamedGlMapping(
+          glMappings?.expenses || [],
+          FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+          'savingsInterestPaidAccountId',
+          this.expenseAccountOptions
+        ),
+        SAVINGS_INTEREST_PAID_ACCOUNT_NAME,
+        'savingsInterestPaidAccountId',
+        this.expenseAccountOptions
+      );
+      this.setOtherGlMappings('expensesOtherGlMappings', fromExpenses, this.expenseAccountOptions);
       this.setOtherGlMappings('incomeOtherGlMappings', glMappings?.income || [], this.incomeAccountOptions);
     }
   }
@@ -266,10 +296,26 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
         }))
         .filter((item: { accountName: string; glCode: string }) => !!item.accountName || !!item.glCode);
 
+    const namedAsOtherGlMapping = (controlName: string, accountName: string, options: GLAccount[]) => {
+      const glAccountId = this.fixedDepositProductAccountingForm.get(controlName)?.value;
+      if (!glAccountId) {
+        return [];
+      }
+      const glCode = options.find((o) => o.id === glAccountId)?.glCode || '';
+      return glCode ? [{ accountName, glCode }] : [];
+    };
+
     const otherGlMappings = {
       assets: map('assetsOtherGlMappings', this.assetAccountOptions),
       liabilities: map('liabilitiesOtherGlMappings', this.liabilityAccountOptions),
-      expenses: map('expensesOtherGlMappings', this.expenseAccountOptions),
+      expenses: [
+        ...namedAsOtherGlMapping(
+          'savingsInterestPaidAccountId',
+          FIXED_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+          this.expenseAccountOptions
+        ),
+        ...map('expensesOtherGlMappings', this.expenseAccountOptions)
+      ],
       income: map('incomeOtherGlMappings', this.incomeAccountOptions)
     };
     return Object.values(otherGlMappings).some((v) => v.length) ? otherGlMappings : null;
@@ -416,6 +462,13 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
             controlName: 'interestOnSavingsAccountId',
             options: this.expenseAccountOptions,
             required: true
+          },
+          {
+            key: 'savingsInterestPaidAccountId',
+            label: 'Fixed Deposit Interest Paid',
+            inputLabel: 'Fixed deposit interest paid',
+            controlName: 'savingsInterestPaidAccountId',
+            options: this.expenseAccountOptions
           }
         ],
         otherMappingsControlName: 'expensesOtherGlMappings',
@@ -456,6 +509,7 @@ export class FixedDepositProductAccountingStepComponent implements OnInit, OnCha
       liabilitiesOtherGlMappings,
       expensesOtherGlMappings,
       incomeOtherGlMappings,
+      savingsInterestPaidAccountId,
       ...accounting
     } = this.fixedDepositProductAccountingForm.value;
     const otherGlMappings = this.getOtherGlMappings();

src/app/products/recurring-deposit-products/create-recurring-deposit-product/create-recurring-deposit-product.component.html

@@ -89,7 +89,18 @@
               <p class="base-rate-remarks">{{ activeBaseVersion.remarks }}</p>
             }
 
-            <table class="base-rate-table" mat-table [dataSource]="activeBaseVersion.slabs">
+            <p class="base-rate-remarks">
+              RD tenure is counted in months, from {{ rdChart.minTenureMonths ?? '-' }} months (the Minimum Tenure on the
+              Terms tab). A rate below the first slab comes from the RD CBS base chart; the rest from this chart.
+            </p>
+            @if (rdChart.shortTermRateMissing) {
+              <p class="base-rate-remarks">
+                The RD CBS base chart has no rate for {{ configuredMinTenureMonths }} months, so this product can only be
+                opened from {{ rdChart.minTenureMonths }} months.
+              </p>
+            }
+
+            <table class="base-rate-table" mat-table [dataSource]="activeBaseSlabs">
               <ng-container matColumnDef="srNo">
                 <th mat-header-cell *matHeaderCellDef>Sr.</th>
                 <td mat-cell *matCellDef="let slab">{{ slab.srNo }}</td>

src/app/products/recurring-deposit-products/create-recurring-deposit-product/create-recurring-deposit-product.component.ts

@@ -35,6 +35,8 @@ import { ProductsService } from 'app/products/products.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Accounting } from 'app/core/utils/accounting';
 import { Dates } from 'app/core/utils/dates';
+import { AlertService } from 'app/core/alert/alert.service';
+import { buildRdChart, RdChart, tenureInMonths } from '../rd-product-chart';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { RecurringDepositProductPreviewStepComponent } from '../recurring-deposit-product-stepper/recurring-deposit-product-preview-step/recurring-deposit-product-preview-step.component';
 import { MatTabsModule } from '@angular/material/tabs';
@@ -74,6 +76,7 @@ export class CreateRecurringDepositProductComponent {
   private settingsService = inject(SettingsService);
   private accounting = inject(Accounting);
   private dateUtils = inject(Dates);
+  private alertService = inject(AlertService);
 
   @ViewChild(RecurringDepositProductDetailsStepComponent, { static: true })
   recurringDepositProductDetailsStep: RecurringDepositProductDetailsStepComponent;
@@ -92,6 +95,9 @@ export class CreateRecurringDepositProductComponent {
   accountingRuleData: string[] = [];
   selectedTabIndex = 0;
   rdInterestRates: any[] = [];
+  rdBaseSlabs: any[] = [];
+  private rdChartCache: { baseSlabs: any[]; rdBaseSlabs: any[]; minTenureMonths: number | null; chart: RdChart } | null =
+    null;
   readonly rdSlabColumns = [
     'srNo',
     'description',
@@ -122,6 +128,17 @@ export class CreateRecurringDepositProductComponent {
         this.rdInterestRates = [];
       }
     });
+    // The RD base chart supplies the rate for 6 months to below 1 year, which the FD chart does not cover
+    this.productsService.getRdBaseInterestRates().subscribe({
+      next: (rates: any) => {
+        const versions: any[] = Array.isArray(rates) ? rates : rates ? [rates] : [];
+        const active = versions.find((version: any) => version.isActive) ?? versions[0];
+        this.rdBaseSlabs = active?.slabs || [];
+      },
+      error: () => {
+        this.rdBaseSlabs = [];
+      }
+    });
   }
 
   get recurringDepositProductDetailsForm() {
@@ -167,11 +184,37 @@ export class CreateRecurringDepositProductComponent {
     return null;
   }
 
+  /** The product's chart in months, from 6 months up - see rd-product-chart.ts. */
+  /** The minimum tenure entered on the Terms tab, in months. */
+  get configuredMinTenureMonths(): number | null {
+    const terms = this.recurringDepositProductTermsForm?.value;
+    return tenureInMonths(terms?.minDepositTerm, terms?.minDepositTermTypeId);
+  }
+
+  get rdChart(): RdChart {
+    const baseSlabs = this.activeBaseVersion?.slabs || [];
+    const minTenureMonths = this.configuredMinTenureMonths;
+    if (
+      this.rdChartCache?.baseSlabs !== baseSlabs ||
+      this.rdChartCache?.rdBaseSlabs !== this.rdBaseSlabs ||
+      this.rdChartCache?.minTenureMonths !== minTenureMonths
+    ) {
+      this.rdChartCache = {
+        baseSlabs,
+        rdBaseSlabs: this.rdBaseSlabs,
+        minTenureMonths,
+        chart: buildRdChart(baseSlabs, this.rdBaseSlabs, minTenureMonths)
+      };
+    }
+    return this.rdChartCache.chart;
+  }
+
   get activeBaseSlabs() {
-    return this.activeBaseVersion?.slabs || [];
+    return this.rdChart.slabs;
   }
 
   get recurringDepositProduct() {
+    const rdChart = this.rdChart;
     return {
       ...this.recurringDepositProductDetailsStep.recurringDepositProductDetails,
       ...this.recurringDepositProductCurrencyStep.recurringDepositProductCurrency,
@@ -179,14 +222,20 @@ export class CreateRecurringDepositProductComponent {
       ...this.recurringDepositProductSettingsStep.recurringDepositProductSettings,
       ...this.recurringDepositProductChargesStep.recurringDepositProductCharges,
       ...this.recurringDepositProductAccountingStep.recurringDepositProductAccounting,
+      // The minimum comes from the Terms tab. Only when the chart has no rate that short is it raised to where the
+      // chart's rates begin, so no account can be opened for a tenure the chart cannot price.
+      ...(rdChart.minTenureMonths != null && rdChart.minTenureMonths !== this.configuredMinTenureMonths
+        ? { minDepositTerm: rdChart.minTenureMonths, minDepositTermTypeId: 2 }
+        : {}),
       charts: this.recurringDepositProductCharts,
-      rdSlabs: this.activeBaseSlabs
+      rdSlabs: rdChart.slabs
     };
   }
 
   get recurringDepositProductCharts() {
     const activeBaseVersion = this.activeBaseVersion;
-    if (!activeBaseVersion?.slabs?.length) {
+    const slabs = this.rdChart.slabs;
+    if (!activeBaseVersion || !slabs.length) {
       return [];
     }
     const dateFormat = this.settingsService.dateFormat;
@@ -208,7 +257,7 @@ export class CreateRecurringDepositProductComponent {
         isPrimaryGroupingByAmount: false,
         locale: this.settingsService.language.code,
         dateFormat,
-        chartSlabs: activeBaseVersion.slabs.map((slab: any) => {
+        chartSlabs: slabs.map((slab: any) => {
           const chartSlab: any = {
             periodType: slab.periodTypeEnum,
             fromPeriod: slab.fromPeriod,
@@ -232,7 +281,28 @@ export class CreateRecurringDepositProductComponent {
     ] as any[];
   }
 
+  /**
+   * Terms (min/max installment) and Settings (lien percentage) have rules of their own that the Next buttons do not
+   * enforce. Opens the first tab that breaks one, with its errors shown, instead of submitting.
+   */
+  private focusFirstInvalidStep(): boolean {
+    const steps = [
+      { form: this.recurringDepositProductTermsForm, tab: 2 },
+      { form: this.recurringDepositProductSettingsForm, tab: 3 }
+    ];
+    const invalid = steps.find((step) => step.form?.invalid);
+    if (!invalid) {
+      return false;
+    }
+    invalid.form.markAllAsTouched();
+    this.selectedTabIndex = invalid.tab;
+    return true;
+  }
+
   submit() {
+    if (this.focusFirstInvalidStep()) {
+      return;
+    }
     const recurringDepositProduct: any = this.pruneEmptyValues({
       ...this.recurringDepositProduct,
       charts: this.recurringDepositProductCharts,
@@ -243,14 +313,24 @@ export class CreateRecurringDepositProductComponent {
       recurringDepositProduct.description = '';
     }
     delete recurringDepositProduct.advancedAccountingRules;
-    this.productsService.createRecurringDepositProduct(recurringDepositProduct).subscribe((response: any) => {
+    this.productsService.createRecurringDepositProduct(recurringDepositProduct).subscribe({
-      this.router.navigate(
+      next: (response: any) => {
-        [
+        if (response?.rollbackTransaction) {
-          '../',
+          this.alertService.alert({
-          response.resourceId
+            type: 'Success',
-        ],
+            message: 'Recurring deposit product creation request submitted successfully for approval.'
-        { relativeTo: this.route }
+          });
-      );
+          this.router.navigate(['../'], { relativeTo: this.route });
+        } else {
+          this.router.navigate(
+            [
+              '../',
+              response.resourceId
+            ],
+            { relativeTo: this.route }
+          );
+        }
+      }
     });
   }
 

src/app/products/recurring-deposit-products/edit-recurring-deposit-product/edit-recurring-deposit-product.component.ts

@@ -241,7 +241,28 @@ export class EditRecurringDepositProductComponent {
     ] as any[];
   }
 
+  /**
+   * Terms (min/max installment) and Settings (lien percentage) have rules of their own that the Next buttons do not
+   * enforce. Opens the first tab that breaks one, with its errors shown, instead of submitting.
+   */
+  private focusFirstInvalidStep(): boolean {
+    const steps = [
+      { form: this.recurringDepositProductTermsForm, tab: 2 },
+      { form: this.recurringDepositProductSettingsForm, tab: 3 }
+    ];
+    const invalid = steps.find((step) => step.form?.invalid);
+    if (!invalid) {
+      return false;
+    }
+    invalid.form.markAllAsTouched();
+    this.selectedTabIndex = invalid.tab;
+    return true;
+  }
+
   submit() {
+    if (this.focusFirstInvalidStep()) {
+      return;
+    }
     const recurringDepositProduct: any = this.pruneEmptyValues({
       ...this.recurringDepositProduct,
       charges: (this.recurringDepositProduct.charges ?? []).map((charge: any) => ({ id: charge.id })),

src/app/products/recurring-deposit-products/rd-product-chart.ts

@@ -0,0 +1,207 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Builds a recurring deposit product's interest chart in months.
+ *
+ * RD products take their rates from the FD "DOUBLE" CBS base chart, which is kept in years and starts at 1 year, so
+ * on its own it leaves every tenure under 12 months without a rate. When the product's minimum tenure is shorter than
+ * that, the band from the minimum up to just below the first slab takes its rate from the RD CBS base chart - the slab
+ * covering the shortest possible span of that many months.
+ *
+ * Every slab is expressed in months because the backend matches a tenure to a slab by counting whole units of the
+ * slab's own period type: a 30-month RD is "2 years" against a year slab, so "1-2 Years" really covers 12-35 months.
+ * Writing that out as months keeps the chart identical in meaning while letting a single chart hold the sub-year band.
+ */
+
+/** SavingsPeriodFrequencyType ids. */
+const MONTHS_PERIOD_TYPE = 2;
+const YEARS_PERIOD_TYPE = 3;
+
+export interface RdChartSlab {
+  srNo: number;
+  description: string;
+  periodTypeEnum: number;
+  periodTypeLabel: string;
+  fromPeriod: number;
+  toPeriod: number | null;
+  annualInterestRate: number;
+  seniorCitizenRate?: number;
+  amountRangeFrom?: number;
+  amountRangeTo?: number;
+}
+
+export interface RdChart {
+  slabs: RdChartSlab[];
+  /** Shortest tenure, in months, the product opens - its minimum deposit term. */
+  minTenureMonths: number | null;
+  /** Set when the RD base chart has no rate for the minimum tenure, so the product can only start at its first slab. */
+  shortTermRateMissing: boolean;
+}
+
+/** A tenure given as a count of months or years (SavingsPeriodFrequencyType id), in months. */
+export function tenureInMonths(term: number | string | null | undefined, termTypeId: number | null | undefined): number | null {
+  const value = Number(term);
+  if (term === null || term === undefined || term === '' || !Number.isFinite(value) || value <= 0) {
+    return null;
+  }
+  return termTypeId === YEARS_PERIOD_TYPE ? value * 12 : value;
+}
+
+function unitInMonths(slab: any): number | null {
+  const label = String(slab.periodTypeLabel ?? slab.periodType?.value ?? '').toLowerCase();
+  if (label.startsWith('year')) {
+    return 12;
+  }
+  if (label.startsWith('month')) {
+    return 1;
+  }
+  return null;
+}
+
+function inDays(slab: any, period: number): number | null {
+  const label = String(slab.periodTypeLabel ?? slab.periodType?.value ?? '').toLowerCase();
+  if (label.startsWith('day')) {
+    return period;
+  }
+  if (label.startsWith('week')) {
+    return period * 7;
+  }
+  if (label.startsWith('month')) {
+    return period * 30;
+  }
+  if (label.startsWith('year')) {
+    return period * 365;
+  }
+  return null;
+}
+
+/** The fewest calendar days any run of {@code months} months can span (6 months -> 181, January to July). */
+function shortestSpanInDays(months: number): number {
+  let shortest = Infinity;
+  for (let start = 0; start < 12; start++) {
+    const from = Date.UTC(2025, start, 1);
+    const to = Date.UTC(2025, start + months, 1);
+    shortest = Math.min(shortest, Math.round((to - from) / 86400000));
+  }
+  return shortest;
+}
+
+/** The RD base chart rate for an RD of {@code months} months, or null when that chart has no slab covering it. */
+function shortTermRate(rdBaseSlabs: any[], months: number): number | null {
+  const days = shortestSpanInDays(months);
+  const slab = (rdBaseSlabs || []).find((candidate: any) => {
+    const from = inDays(candidate, candidate.fromPeriod ?? 0);
+    const to = candidate.toPeriod == null ? Infinity : inDays(candidate, candidate.toPeriod);
+    return from != null && to != null && from <= days && days <= to;
+  });
+  return slab?.annualInterestRate ?? null;
+}
+
+/**
+ * Month-wise slabs from {@code fromMonths} to {@code toMonths}, each month priced from the RD base chart and runs of
+ * months at the same rate merged into one slab - so a 3-month minimum against a chart with day bands for 46-90,
+ * 91-180 and 181-364 days becomes 3, 4-5 and 6-11 months rather than one rate for the lot. Empty when the base chart
+ * has no rate for the first month; a later month without one carries the previous month's rate.
+ */
+function shortTermBands(rdBaseSlabs: any[], fromMonths: number, toMonths: number): RdChartSlab[] {
+  const bands: RdChartSlab[] = [];
+  let previousRate: number | null = null;
+  let bandStart = fromMonths;
+  for (let month = fromMonths; month <= toMonths; month++) {
+    const rate = shortTermRate(rdBaseSlabs, month) ?? previousRate;
+    if (rate == null) {
+      return [];
+    }
+    const last = bands[bands.length - 1];
+    if (last && last.annualInterestRate === rate) {
+      last.toPeriod = month;
+      last.description = monthsLabel(bandStart, month);
+    } else {
+      bandStart = month;
+      bands.push({
+        srNo: 0,
+        description: monthsLabel(month, month),
+        periodTypeEnum: MONTHS_PERIOD_TYPE,
+        periodTypeLabel: 'Months',
+        fromPeriod: month,
+        toPeriod: month,
+        annualInterestRate: rate
+      });
+    }
+    previousRate = rate;
+  }
+  return bands;
+}
+
+function monthsLabel(from: number, to: number | null): string {
+  return to == null ? `${from}+ Months` : `${from} to ${to} Months`;
+}
+
+/**
+ * @param minTenureMonths the product's minimum tenure in months; null when not yet entered, in which case the chart
+ *                        simply starts at its first slab
+ */
+export function buildRdChart(baseSlabs: any[], rdBaseSlabs: any[], minTenureMonths: number | null): RdChart {
+  const slabs: RdChartSlab[] = [];
+  const sorted = [...(baseSlabs || [])].sort((a: any, b: any) => (a.fromPeriod ?? 0) - (b.fromPeriod ?? 0));
+  for (const slab of sorted) {
+    const unit = unitInMonths(slab);
+    if (unit == null) {
+      continue;
+    }
+    const from = (slab.fromPeriod ?? 0) * unit;
+    const to = slab.toPeriod == null ? null : (slab.toPeriod + 1) * unit - 1;
+    const converted: RdChartSlab = {
+      srNo: 0,
+      description: monthsLabel(from, to),
+      periodTypeEnum: MONTHS_PERIOD_TYPE,
+      periodTypeLabel: 'Months',
+      fromPeriod: from,
+      toPeriod: to,
+      annualInterestRate: slab.annualInterestRate
+    };
+    if (slab.seniorCitizenRate != null) {
+      converted.seniorCitizenRate = slab.seniorCitizenRate;
+    }
+    if (slab.amountRangeFrom != null && slab.amountRangeFrom !== '') {
+      converted.amountRangeFrom = slab.amountRangeFrom;
+    }
+    if (slab.amountRangeTo != null && slab.amountRangeTo !== '') {
+      converted.amountRangeTo = slab.amountRangeTo;
+    }
+    slabs.push(converted);
+  }
+
+  // The server only accepts a chart whose first slab starts at 0 or 1, so the chart always opens at 1 month and the
+  // product's minimum deposit term - not the chart - is what keeps an RD from being opened below the minimum.
+  let shortTermRateMissing = false;
+  let effectiveMinimum: number | null = null;
+  const firstFrom = slabs.length ? slabs[0].fromPeriod : null;
+  if (firstFrom != null) {
+    effectiveMinimum = minTenureMonths == null ? firstFrom : Math.max(minTenureMonths, 1);
+    if (firstFrom > 1) {
+      const needsShortTermBand = minTenureMonths != null && minTenureMonths < firstFrom;
+      const shortTermSlabs = needsShortTermBand ? shortTermBands(rdBaseSlabs, minTenureMonths, firstFrom - 1) : [];
+      if (shortTermSlabs.length) {
+        // The first band is opened down to 1 month for the server; its label still names the real minimum.
+        shortTermSlabs[0].fromPeriod = 1;
+        slabs.unshift(...shortTermSlabs);
+      } else {
+        // No rate below the first slab: stretch it down to 1 month to satisfy the server, but keep the minimum at
+        // where that slab really starts so nothing shorter can be opened at its rate.
+        shortTermRateMissing = needsShortTermBand;
+        slabs[0].fromPeriod = 1;
+        effectiveMinimum = Math.max(effectiveMinimum, firstFrom);
+      }
+    }
+  }
+
+  slabs.forEach((slab, index) => (slab.srNo = index + 1));
+  return { slabs, minTenureMonths: effectiveMinimum, shortTermRateMissing };
+}

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

@@ -24,6 +24,10 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
 type AccountingSectionKey = 'assets' | 'liabilities' | 'expenses' | 'income';
 
+const SAVINGS_INTEREST_PAYABLE_ACCOUNT_NAME = 'Savings Interest Payable';
+const RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME = 'Recurring Deposit Interest Paid';
+const SAVINGS_INTEREST_PAID_ACCOUNT_NAME = 'Savings Interest Paid';
+
 type AccountingRowConfig = {
   key: string;
   label: string;
@@ -91,11 +95,14 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
       otherGlMappingsMap: this.recurringDepositProductsTemplate?.otherGlMappingsMap
     };
     const accountingMappingOptions = this.recurringDepositProductsTemplate?.accountingMappingOptions || {};
-    // Defaults to Cash (2) for a brand-new product (no existing accountingRule yet), but preserves
+    // Cash (2) for a brand-new product, but the product's own current accounting rule when editing -
-    // the product's own current accounting rule when editing - previously this was hardcoded to 2
+    // previously this was hardcoded to 2 unconditionally, which silently forced every edited product
-    // unconditionally, which silently forced every edited product onto Cash-based accounting (and
+    // onto Cash-based accounting (and its required GL mappings) even for products that were and
-    // its required GL mappings) even for products that were and should remain "None".
+    // should remain "None". Only an existing product (one with an id) has a rule of its own: the
-    const accountingRuleId = this.recurringDepositProductsTemplate?.accountingRule?.id ?? 2;
+    // create template always reports accountingRule = None, so reading it there submitted every new
+    // product as None while this screen showed "Cash", and hid the GL mappings it needs.
+    const isEditing = !!this.recurringDepositProductsTemplate?.id;
+    const accountingRuleId = isEditing ? (this.recurringDepositProductsTemplate?.accountingRule?.id ?? 2) : 2;
 
     this.assetAccountOptions = accountingMappingOptions.assetAccountOptions || [];
     this.liabilityAccountOptions = accountingMappingOptions.liabilityAccountOptions || [];
@@ -122,6 +129,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
       feesReceivableAccountId: [''],
       penaltiesReceivableAccountId: [''],
       interestPayableAccountId: [''],
+      savingsInterestPaidAccountId: [''],
       escheatLiabilityId: [''],
       assetsOtherGlMappings: this.formBuilder.array([]),
       liabilitiesOtherGlMappings: this.formBuilder.array([]),
@@ -136,6 +144,20 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     });
   }
 
+  private extractNamedGlMapping(
+    otherGlMappings: any[],
+    accountName: string,
+    controlName: string,
+    options: GLAccount[]
+  ): any[] {
+    const match = (otherGlMappings || []).find((mapping) => mapping?.accountName === accountName);
+    if (match) {
+      const glAccountId = match.glAccountId || options.find((option) => option.glCode === match.glCode)?.id || '';
+      this.recurringDepositProductAccountingForm.get(controlName)?.patchValue(glAccountId);
+    }
+    return (otherGlMappings || []).filter((mapping) => mapping?.accountName !== accountName);
+  }
+
   private patchAccountingValues(mappings: any) {
     this.recurringDepositProductAccountingForm.patchValue({
       savingsReferenceAccountId: mappings.savingsReferenceAccount?.id || '',
@@ -153,12 +175,32 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     if (this.isCashOrAccrualAccounting()) {
       const glMappings = mappings.otherGlMappingsMap || mappings.otherGlMappings;
       this.setOtherGlMappings('assetsOtherGlMappings', glMappings?.assets || [], this.assetAccountOptions);
-      this.setOtherGlMappings(
+      // Interest Paid is a liability clearing account (Dr Payable / Cr Paid, then Dr Paid / Cr RD), saved under
-        'liabilitiesOtherGlMappings',
+      // liabilities. Products saved before that kept it under expenses, so both groups are read.
-        glMappings?.liabilities || [],
+      const fromLiabilities = this.extractNamedGlMapping(
+        this.extractNamedGlMapping(
+          glMappings?.liabilities || [],
+          RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+          'savingsInterestPaidAccountId',
+          this.liabilityAccountOptions
+        ),
+        SAVINGS_INTEREST_PAID_ACCOUNT_NAME,
+        'savingsInterestPaidAccountId',
         this.liabilityAccountOptions
       );
-      this.setOtherGlMappings('expensesOtherGlMappings', glMappings?.expenses || [], this.expenseAccountOptions);
+      this.setOtherGlMappings('liabilitiesOtherGlMappings', fromLiabilities, this.liabilityAccountOptions);
+      const fromExpenses = this.extractNamedGlMapping(
+        this.extractNamedGlMapping(
+          glMappings?.expenses || [],
+          RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+          'savingsInterestPaidAccountId',
+          this.expenseAccountOptions
+        ),
+        SAVINGS_INTEREST_PAID_ACCOUNT_NAME,
+        'savingsInterestPaidAccountId',
+        this.expenseAccountOptions
+      );
+      this.setOtherGlMappings('expensesOtherGlMappings', fromExpenses, this.expenseAccountOptions);
       this.setOtherGlMappings('incomeOtherGlMappings', glMappings?.income || [], this.incomeAccountOptions);
     }
   }
@@ -224,9 +266,25 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         }))
         .filter((item: { accountName: string; glCode: string }) => !!item.accountName || !!item.glCode);
 
+    const namedAsOtherGlMapping = (controlName: string, accountName: string, options: GLAccount[]) => {
+      const glAccountId = this.recurringDepositProductAccountingForm.get(controlName)?.value;
+      if (!glAccountId) {
+        return [];
+      }
+      const glCode = options.find((o) => o.id === glAccountId)?.glCode || '';
+      return glCode ? [{ accountName, glCode }] : [];
+    };
+
     const otherGlMappings = {
       assets: map('assetsOtherGlMappings', this.assetAccountOptions),
-      liabilities: map('liabilitiesOtherGlMappings', this.liabilityAccountOptions),
+      liabilities: [
+        ...namedAsOtherGlMapping(
+          'savingsInterestPaidAccountId',
+          RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
+          this.liabilityAccountOptions
+        ),
+        ...map('liabilitiesOtherGlMappings', this.liabilityAccountOptions)
+      ],
       expenses: map('expensesOtherGlMappings', this.expenseAccountOptions),
       income: map('incomeOtherGlMappings', this.incomeAccountOptions)
     };
@@ -266,6 +324,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     setRequired('incomeFromPenaltyAccountId', cashOrAccrual);
     setRequired('feesReceivableAccountId', accrualOnly);
     setRequired('penaltiesReceivableAccountId', accrualOnly);
+    // Required on accrual (the accrual job credits it); optional on cash, where it only routes the closure posting.
     setRequired('interestPayableAccountId', accrualOnly);
     setRequired('escheatLiabilityId', cashOrAccrual && this.isDormancyTrackingEnabled());
 
@@ -284,8 +343,8 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         rows: [
           {
             key: 'savingsReferenceAccountId',
-            label: 'Savings Reference Account',
+            label: 'Recurring Deposit Reference Account',
-            inputLabel: 'Savings reference account',
+            inputLabel: 'Recurring deposit reference account',
             controlName: 'savingsReferenceAccountId',
             options: this.assetAccountOptions,
             required: true
@@ -318,8 +377,8 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         rows: [
           {
             key: 'savingsControlAccountId',
-            label: 'Savings Control Account',
+            label: 'Recurring Deposit Control Account',
-            inputLabel: 'Savings control account',
+            inputLabel: 'Recurring deposit control account',
             controlName: 'savingsControlAccountId',
             options: this.liabilityAccountOptions,
             required: true
@@ -332,13 +391,22 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
             options: this.liabilityAccountOptions,
             required: true
           },
+          // Offered on cash as well as accrual: the interest credited at maturity or premature closure is routed
+          // Dr Interest On Recurring Deposits / Cr Payable, Dr Payable / Cr Interest Paid, Dr Interest Paid / Cr
+          // the RD. Optional - a product naming neither posts straight to the control account as before.
           {
             key: 'interestPayableAccountId',
             label: 'Interest Payable Account',
             inputLabel: 'Interest payable account',
             controlName: 'interestPayableAccountId',
-            options: this.liabilityAccountOptions,
+            options: this.liabilityAccountOptions
-            accrualOnly: true
+          },
+          {
+            key: 'savingsInterestPaidAccountId',
+            label: 'Recurring Deposit Interest Paid',
+            inputLabel: 'Recurring deposit interest paid',
+            controlName: 'savingsInterestPaidAccountId',
+            options: this.liabilityAccountOptions
           },
           {
             key: 'escheatLiabilityId',
@@ -360,8 +428,8 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         rows: [
           {
             key: 'interestOnSavingsAccountId',
-            label: 'Interest On Savings Account',
+            label: 'Interest On Recurring Deposits',
-            inputLabel: 'Interest on savings account',
+            inputLabel: 'Interest on recurring deposits',
             controlName: 'interestOnSavingsAccountId',
             options: this.expenseAccountOptions,
             required: true
@@ -405,6 +473,7 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
       liabilitiesOtherGlMappings,
       expensesOtherGlMappings,
       incomeOtherGlMappings,
+      savingsInterestPaidAccountId,
       ...accounting
     } = this.recurringDepositProductAccountingForm.value;
     const otherGlMappings = this.getOtherGlMappings();

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-currency-step/recurring-deposit-product-currency-step.component.html

@@ -66,7 +66,10 @@
       <div class="rdpc-alert">
         <div class="rdpc-alert__content">
           <h4>Nomination Facility</h4>
-          <p>Allow account holders to designate individuals to receive funds in the event of account holder's death.</p>
+          <p>
+            Yes: every RD under this product must have at least one nominee (100% share) before it can be opened. No:
+            nominees cannot be recorded on its RDs.
+          </p>
         </div>
         <mat-radio-group class="rdpc-alert__choices" formControlName="nominationFacility">
           <mat-radio-button [value]="true">yes</mat-radio-button>
@@ -77,7 +80,11 @@
       <div class="rdpc-alert">
         <div class="rdpc-alert__content">
           <h4>Auto Debit Facility</h4>
-          <p>Enable automatic deduction of funds for recurring payments, utility bills, or EMI obligations.</p>
+          <p>
+            Yes: an RD can opt in to having each installment collected automatically on its due date from its linked
+            Savings account (needs Deposit Account Link). If the balance is short, the installment stays overdue and is
+            retried on the next run.
+          </p>
         </div>
         <mat-radio-group class="rdpc-alert__choices" formControlName="autoDebitFacility">
           <mat-radio-button [value]="true">yes</mat-radio-button>

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.html

@@ -68,37 +68,41 @@
     </div>
 
     <div class="rdpd-grid rdpd-grid--classification">
-      <mat-form-field appearance="outline" class="rdpd-field">
+      <mat-form-field appearance="outline" class="rdpd-field" subscriptSizing="dynamic">
         <mat-label>Account Type</mat-label>
         <mat-select formControlName="accountType" required>
           @for (accountType of accountTypeData; track accountType) {
             <mat-option [value]="accountType">{{ accountType }}</mat-option>
           }
         </mat-select>
+        <mat-hint>Default account type pre-selected when an RD is opened under this product.</mat-hint>
         <mat-error>Account Type <strong>is required</strong></mat-error>
       </mat-form-field>
 
-      <mat-form-field appearance="outline" class="rdpd-field">
+      <mat-form-field appearance="outline" class="rdpd-field" subscriptSizing="dynamic">
         <mat-label>GL Account (Liability)</mat-label>
         <mat-select formControlName="glAccountId" [compareWith]="compareById">
           @for (account of liabilityAccountOptions; track account.id) {
             <mat-option [value]="account.id">{{ account.name }} ({{ account.glCode }})</mat-option>
           }
         </mat-select>
+        <mat-hint>Its GL code forms part of every new RD account number. Postings use the Accounting tab.</mat-hint>
       </mat-form-field>
 
-      <mat-form-field appearance="outline" class="rdpd-field" (click)="effectiveToPicker.open()">
+      <mat-form-field appearance="outline" class="rdpd-field" subscriptSizing="dynamic" (click)="effectiveToPicker.open()">
         <mat-label>Effective To</mat-label>
         <input matInput [matDatepicker]="effectiveToPicker" formControlName="effectiveTo" />
         <mat-datepicker-toggle matSuffix [for]="effectiveToPicker"></mat-datepicker-toggle>
         <mat-datepicker #effectiveToPicker></mat-datepicker>
+        <mat-hint>Last day new RDs can be opened. Existing RDs run to maturity.</mat-hint>
       </mat-form-field>
 
-      <mat-form-field appearance="outline" class="rdpd-field" (click)="endDatePicker.open()">
+      <mat-form-field appearance="outline" class="rdpd-field" subscriptSizing="dynamic" (click)="endDatePicker.open()">
         <mat-label>End Date</mat-label>
         <input matInput [matDatepicker]="endDatePicker" formControlName="endDate" [min]="minEndDate" />
         <mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
         <mat-datepicker #endDatePicker></mat-datepicker>
+        <mat-hint>Product wind-up date. No RD may mature after it.</mat-hint>
         @if (recurringDepositProductDetailsForm.get('endDate')?.hasError('matDatepickerMin')) {
           <mat-error>End Date must be after Effective To date</mat-error>
         }
@@ -115,6 +119,10 @@
 
       <div class="rdpd-field rdpd-field--full rdpd-checkbox-row">
         <mat-checkbox formControlName="shareLinkingEnabled">Deposit Account Link</mat-checkbox>
+        <span class="rdpd-checkbox-hint">
+          Every RD must be linked to the customer's Savings/Current account - the default account for maturity payout
+          and the account Auto Debit collects installments from.
+        </span>
       </div>
     </div>
   </div>

src/app/products/recurring-deposit-products/recurring-deposit-product-stepper/recurring-deposit-product-details-step/recurring-deposit-product-details-step.component.scss

@@ -76,6 +76,13 @@ $gray-900: #202124;
 
 .rdpd-checkbox-row {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
+  gap: 4px 12px;
   min-height: 56px;
 }
+
+.rdpd-checkbox-hint {
+  font-size: 12px;
+  opacity: 0.7;
+}

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

@@ -150,7 +150,7 @@
   <mat-divider class="flex-100"></mat-divider>
 
   <div class="flex-100 layout-row">
-    <span class="flex-40">{{ 'labels.inputs.Nominal Annual Interest Rate' | translate }} (%):</span>
+    <span class="flex-40">Post-Maturity Interest Rate (%):</span>
     <span class="flex-60">{{ recurringDepositProduct.nominalAnnualInterestRate | formatNumber }} %</span>
   </div>
 
@@ -199,41 +199,11 @@
 
   @if (recurringDepositProduct.effectiveDate) {
     <div class="flex-100 layout-row">
-      <span class="flex-40">Effective Date:</span>
+      <span class="flex-40">Product Effective From:</span>
       <span class="flex-60">{{ recurringDepositProduct.effectiveDate | dateFormat }}</span>
     </div>
   }
 
-  @if (recurringDepositProduct.averagePeriod) {
-    <div class="flex-100 layout-row">
-      <span class="flex-40">Average Period:</span>
-      <span class="flex-60">{{ recurringDepositProduct.averagePeriod }}</span>
-    </div>
-  }
-
-  <div class="flex-100 layout-row">
-    <span class="flex-40">Auto Interest Post:</span>
-    <span class="flex-60">{{ recurringDepositProduct.autoPost | yesNo }}</span>
-  </div>
-
-  @if (
-    recurringDepositProduct.frequencyFixDay !== undefined &&
-    recurringDepositProduct.frequencyFixDay !== null &&
-    recurringDepositProduct.frequencyFixDay !== ''
-  ) {
-    <div class="flex-100 layout-row">
-      <span class="flex-40">Frequency (Fix Day):</span>
-      <span class="flex-60">{{ recurringDepositProduct.frequencyFixDay }}</span>
-    </div>
-  }
-
-  @if (recurringDepositProduct.lastInterestDate) {
-    <div class="flex-100 layout-row">
-      <span class="flex-40">Last Interest Date:</span>
-      <span class="flex-60">{{ recurringDepositProduct.lastInterestDate | dateFormat }}</span>
-    </div>
-  }
-
   <!-- ── Settings ── -->
   <h3 class="mat-h3 flex-100">{{ 'labels.heading.Settings' | translate }}</h3>
   <mat-divider class="flex-100"></mat-divider>
@@ -258,10 +228,13 @@
     <span class="flex-60">{{ recurringDepositProduct.lienMarked | yesNo }}</span>
   </div>
 
-  <div class="flex-100 layout-row">
+  @if (recurringDepositProduct.lienMarked && recurringDepositProduct.lienPercentage) {
-    <span class="flex-40">{{ 'labels.inputs.Apply Withdrawal Fee for Transfers' | translate }}:</span>
+    <div class="flex-100 layout-row">
-    <span class="flex-60">{{ recurringDepositProduct.withdrawalFeeForTransfers | yesNo }}</span>
+      <span class="flex-40">Max loan against RD:</span>
-  </div>
+      <span class="flex-60">{{ recurringDepositProduct.lienPercentage }}% of balance</span>
+    </div>
+  }
+
 
   <div class="flex-100 layout-row">
     <span class="flex-40">Enable Lock-in Period:</span>
@@ -279,23 +252,24 @@
   }
 
   <div class="flex-100 layout-row">
-    <span class="flex-40">Maturity Instructions:</span>
+    <span class="flex-40">Execute Maturity Instruction Automatically:</span>
     <span class="flex-60">{{ recurringDepositProduct.maturityInstructions | yesNo }}</span>
   </div>
 
   <div class="flex-100 layout-row">
-    <span class="flex-40">Credit Maturity Proceeds:</span>
+    <span class="flex-40">Missed Installment Penalty:</span>
-    <span class="flex-60">{{ recurringDepositProduct.creditMaturityProceeds | yesNo }}</span>
+    <span class="flex-60">
-  </div>
+      @if (recurringDepositProduct.penaltyGracePeriodMissedInstallments) {
-
+        {{
-  <div class="flex-100 layout-row">
+          recurringDepositProduct.missedInstallmentPenaltyType === 2
-    <span class="flex-40">Penalty Grace Period (Missed Installments):</span>
+            ? recurringDepositProduct.missedInstallmentPenaltyAmount + '% of installment'
-    <span class="flex-60">{{ recurringDepositProduct.penaltyGracePeriodMissedInstallments | yesNo }}</span>
+            : recurringDepositProduct.missedInstallmentPenaltyAmount + ' per installment'
-  </div>
+        }}
-
+        after {{ recurringDepositProduct.missedInstallmentGraceDays ?? 0 }} grace day(s)
-  <div class="flex-100 layout-row">
+      } @else {
-    <span class="flex-40">Panel Request Applicable:</span>
+        No
-    <span class="flex-60">{{ recurringDepositProduct.panelRequestApplicable | yesNo }}</span>
+      }
+    </span>
   </div>
 
   <div class="flex-100 layout-row">
@@ -347,7 +321,7 @@
         </ng-container>
         <ng-container matColumnDef="toPeriod">
           <th mat-header-cell *matHeaderCellDef>To</th>
-          <td mat-cell *matCellDef="let slab">{{ slab.toPeriod ?? '—' }}</td>
+          <td mat-cell *matCellDef="let slab">{{ slab.toPeriod ?? '—' }}</td>
         </ng-container>
         <ng-container matColumnDef="periodTypeLabel">
           <th mat-header-cell *matHeaderCellDef>Period</th>
@@ -406,7 +380,7 @@
       <div class="spa-gl-section">
         <h5 class="mat-h5">Assets</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Savings Reference Account</span>
+          <span class="spa-gl-row__label">Recurring Deposit Reference Account</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               recurringDepositProduct.savingsReferenceAccountId,
@@ -439,7 +413,7 @@
       <div class="spa-gl-section">
         <h5 class="mat-h5">Liabilities</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Savings Control Account</span>
+          <span class="spa-gl-row__label">Recurring Deposit Control Account</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               recurringDepositProduct.savingsControlAccountId,
@@ -472,7 +446,7 @@
       <div class="spa-gl-section">
         <h5 class="mat-h5">Expenses</h5>
         <div class="spa-gl-row">
-          <span class="spa-gl-row__label">Interest on Savings Account</span>
+          <span class="spa-gl-row__label">Interest on Recurring Deposits</span>
           <span class="spa-gl-row__value">{{
             formatGlAccountById(
               recurringDepositProduct.interestOnSavingsAccountId,