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/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`
       },
-      {
-        label: 'Linked savings account confirmed',
-        pass: !!this.account?.savingsAccountNumber,
-        detail: this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
-      },
+      this.settlementMode === 'GL'
+        ? {
+            label: 'Settlement GL Account selected',
+            pass: !!this.settlementGlAccountId,
+            detail: this.settlementGlAccountId ? this.selectedSettlementGlName : 'Missing'
+          }
+        : {
+            label: 'Linked savings account confirmed',
+            pass: !!this.account?.savingsAccountNumber,
+            detail:
+              this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
+          },
       {
         label: 'Settlement Payment Type selected (non-cash)',
         pass: this.settlementPaymentTypeName !== '—',
@@ -214,11 +249,37 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       .pipe(catchError(() => of([])))
       .subscribe((types: any[]) => (this.paymentTypes = types ?? []));
 
+    this.toGlAccountControl.valueChanges.subscribe((id: any) => {
+      this.settlementGlAccountId = id ? Number(id) : null;
+    });
+
     if (this.requestId && this.mode === 'review') {
       this.loadReviewRequest(this.requestId);
     }
   }
 
+  /** Flips the settlement destination. Switching away from GL clears whatever was picked so a
+   *  stale GL id can never ride along on a SAVINGS submission. */
+  onSettlementModeChange(mode: 'SAVINGS' | 'GL'): void {
+    this.settlementMode = mode;
+    if (mode === 'GL') {
+      this.loadGlAccounts();
+    } else {
+      this.settlementGlAccountId = null;
+      this.toGlAccountControl.setValue('');
+    }
+  }
+
+  /** Fetched on first use rather than with the page, since most withdrawals settle to savings. */
+  private loadGlAccounts(): void {
+    if (this.glAccountsData.length) {
+      return;
+    }
+    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
+      this.glAccountsData = accounts ?? [];
+    });
+  }
+
   onAccountSelected(accountId: string): void {
     this.selectedAccountId = accountId;
     if (!accountId) {
@@ -246,6 +307,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         this.resolutionNumber = req.resolution_number ?? '';
         this.meetingDate = req.meeting_date ? String(req.meeting_date).split('T')[0].split(' ')[0] : this.meetingDate;
         this.description = req.description ?? '';
+        this.settlementMode = req.settlement_mode === 'GL' ? 'GL' : 'SAVINGS';
+        this.settlementGlAccountId = req.settlement_gl_account_id ? Number(req.settlement_gl_account_id) : null;
+        if (this.settlementMode === 'GL') {
+          this.loadGlAccounts();
+        }
 
         if (req.activity_log) {
           try {
@@ -289,7 +355,9 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       resolutionNumber: this.resolutionNumber.trim(),
       meetingDate: this.meetingDate,
       description: this.description,
-      settlementPaymentTypeId: this.settlementPaymentTypeId
+      settlementPaymentTypeId: this.settlementPaymentTypeId,
+      settlementMode: this.settlementMode,
+      ...(this.settlementMode === 'GL' ? { settlementGlAccountId: this.settlementGlAccountId } : {})
     };
     this.wdService.submit(payload).subscribe({
       next: () => {

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

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

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

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

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

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

src/app/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'] : []
-            "
-          ></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'] : []
+              (savingAccounts | accountsFilter: 'saving' : 'all' : '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,6 +36,10 @@ export class CacheInterceptor implements HttpInterceptor {
     '/rbireserveconfig',
     '/tdsconfig',
     '/tds/deposit-interest',
+    // Declarations and challans are entered on the very screens that read them back.
+    '/tds/declarations',
+    '/tds/challans',
+    '/tds/deducted',
     '/savingsinterestpostingreports',
     // Cash in vaults and drawers changes with every transaction; a cached teller list or position
     // kept showing a branch's old tellers and figures at day close.
@@ -44,7 +48,12 @@ export class CacheInterceptor implements HttpInterceptor {
     '/cashreconciliation',
     '/cashsettlement',
     '/cashtransfer',
-    '/branchday'
+    '/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
-    // as an error and therefore surfaces as a centred modal rather than a corner toast.
+    // Resolved once and emitted in one place below — see the severity decision there for which of
+    // these surfaces as a centred modal versus a corner toast.
     let alert: { type: string; message: string } | null = null;
     if (status === 401 || (environment.oauth.enabled && status === 400)) {
       alert = { type: 'Authentication Error', message: 'Invalid User Details. Please try again!' };
@@ -119,7 +125,13 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
         message: errorMessage || 'This action is not allowed in the current state.'
       };
     } else if (status === 500) {
-      alert = { type: 'Internal Server Error', message: 'Internal Server Error. Please try again later.' };
+      // errorMessage carries the backend's actual explanation (defaultUserMessage/developerMessage)
+      // when one is present; the generic sentence is only a last resort for a response with no body
+      // at all (a proxy timeout, a stack trace the server never wrapped into JSON).
+      alert = {
+        type: 'Internal Server Error',
+        message: errorMessage || 'Internal Server Error. Please try again later.'
+      };
     } else if (status === 501) {
       alert = {
         type: this.translate.instant('error.resource.notImplemented.type'),
@@ -133,7 +145,17 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     }
 
     if (alert) {
-      this.alertService.alert({ ...alert, severity: 'error' });
+      // A GET is the page reading data it did not ask the user for, in the background — a photo,
+      // an attachment, a notes list, a standing-instructions panel. Every one of those already has
+      // its own catchError fallback at the call site (see transaction-entry.component.ts and
+      // similar account-overview loaders), so the page keeps working regardless. Blocking the whole
+      // screen on a dialog the user has to click "OK" on, for data that was never more than a
+      // secondary panel, is the "irritate na ho" complaint this guards against — it goes to the
+      // corner toast instead, same place a non-error alert already goes. A write (POST/PUT/PATCH/
+      // DELETE) is different: that is the one action the user was waiting on, so its failure still
+      // needs the centred, must-acknowledge dialog.
+      const isBackgroundRead = request.method === 'GET' && (status === 500 || status === 501 || status === 503);
+      this.alertService.alert({ ...alert, severity: isBackgroundRead ? undefined : 'error' });
     }
 
     throw response;

src/app/core/shell/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 */
-  today = new Date();
+  /** The bank's "today" for the top bar — the business date when enabled, else the server date. */
+  get today(): Date {
+    return businessToday();
+  }
 
   /** Last login time display */
   lastLoginTime = this.formatLastLogin();

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

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

src/app/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,
-      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false
+      // Money paid ahead of a due date counts towards the next installments. Without this an advance cash
+      // 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,
-      autoDebitFacility: currencyStep?.autoDebitFacility ?? pt?.autoDebitFacility ?? false
+      // See create-recurring-deposits-account: advance payments must count towards the next installments.
+      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">
-          {{ 'labels.buttons.Confirm' | translate }}
+        <button mat-raised-button color="primary" [disabled]="!canConfirm">
+          {{ 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 { ActivatedRoute, Router, RouterLink } from '@angular/router';
+import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+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();
-  }
-
-  /**
-   * Creates the premature close recurring deposits account form.
-   */
-  createprematureCloseRecurringDepositsAccountForm() {
-    this.prematureCloseRecurringDepositsAccountForm = this.formBuilder.group({
-      closedOnDate: [
-        '',
-        Validators.required
-      ]
+    this.recurringDepositsService.getRecurringDepositsAccountData(this.accountId).subscribe((account: any) => {
+      this.account = account;
+      const activatedOn = this.toDate(account?.timeline?.activatedOnDate);
+      if (activatedOn) {
+        this.minDate = activatedOn;
+      }
+      const maturity = this.toDate(account?.maturityDate);
+      if (maturity) {
+        const dayBeforeMaturity = new Date(maturity);
+        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();
+      }
     });
   }
 
-  /**
-   * Submits the form and premature closes the recurring deposit account,
-   * if successful redirects to the recurring deposit account.
-   */
-  submit() {
-    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
-      );
+  /** Reasons this deposit's product allows; Normal is always there. */
+  get reasonOptions(): Array<{ id: number; label: string; hint: string }> {
+    const options = [{ id: REASON_NORMAL, label: 'Normal', hint: "Pre-closure penalty as per the deposit's terms." }];
+    if (this.account?.noPenaltyNomineeHeirClosure) {
+      options.push({ id: REASON_NOMINEE_HEIR, label: 'Nominee / legal heir claim', hint: 'No pre-closure penalty.' });
     }
-    const data = {
-      ...prematureCloseRecurringDepositsAccountFormData,
-      dateFormat,
-      locale
-    };
-    this.recurringDepositsService
-      .executeRecurringDepositsAccountCommand(this.accountId, 'prematureClose', data)
-      .subscribe(() => {
-        this.router.navigate(['../../'], { relativeTo: this.route });
+    if (this.account?.deceasedSettlement) {
+      options.push({
+        id: REASON_DECEASED,
+        label: 'Account holder deceased',
+        hint: "No penalty, allowed inside lock-in; may be paid to a nominee's savings account."
       });
+    }
+    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) {
-      return this.normalizeCbsSlabs(this.activeBase.slabs);
-    }
+    const cbsSlabs: any[] = this.activeBase?.slabs || [];
     const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    if (!template) return [];
-    return (
-      template.accountChart?.chartSlabs ??
-      template.activeChart?.chartSlabs ??
-      template.interestRateCharts?.[0]?.chartSlabs ??
-      template.interestRateChart?.chartSlabs ??
-      template.chartSlabs ??
-      []
-    );
+    const productSlabs: any[] =
+      template?.accountChart?.chartSlabs ??
+      template?.activeChart?.chartSlabs ??
+      template?.interestRateCharts?.[0]?.chartSlabs ??
+      template?.interestRateChart?.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';
-      const fromDays = this.slabPeriodToDays(slab.fromPeriod ?? 0, periodTypeValue);
-      const toDays = slab.toPeriod != null ? this.slabPeriodToDays(slab.toPeriod, periodTypeValue) : Infinity;
-
-      if (enteredDays >= fromDays && enteredDays <= toDays) {
+      if (this.isTenureInSlab(slab, enteredMonths, enteredDays)) {
         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) {
-      return this.activeBase.versionLabel || 'CBS Base Interest Rate';
-    }
+  /**
+   * The RD product's own chart - the one the deposit is actually priced on. The CBS base chart (an FD master the
+   * 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?.activeChart?.name ||
-      template?.interestRateCharts?.[0]?.name ||
-      template?.interestRateChart?.name ||
-      template?.name ||
-      ''
+      template?.accountChart ||
+      template?.activeChart ||
+      template?.interestRateCharts?.[0] ||
+      template?.interestRateChart ||
+      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) {
-      return this.activeBase.effectiveFromDate;
+    if (this.productChart) {
+      return this.productChart.fromDate;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    return (
-      template?.accountChart?.fromDate ||
-      template?.activeChart?.fromDate ||
-      template?.interestRateCharts?.[0]?.fromDate ||
-      template?.interestRateChart?.fromDate ||
-      template?.fromDate
-    );
+    return this.activeBase?.effectiveFromDate;
   }
 
   get chartEndDate(): any {
-    if (this.activeBase) {
-      return null;
+    if (this.productChart) {
+      return this.productChart.endDate;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    return (
-      template?.accountChart?.endDate ||
-      template?.activeChart?.endDate ||
-      template?.interestRateCharts?.[0]?.endDate ||
-      template?.interestRateChart?.endDate ||
-      template?.endDate
-    );
+    return null;
   }
 
   get chartDescription(): string {
-    if (this.activeBase) {
-      return this.activeBase.remarks || '';
+    if (this.productChart) {
+      return this.productChart.description || '';
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    return (
-      template?.accountChart?.description ||
-      template?.activeChart?.description ||
-      template?.interestRateCharts?.[0]?.description ||
-      template?.interestRateChart?.description ||
-      template?.description ||
-      ''
-    );
+    return this.activeBase?.remarks || '';
   }
 
   get isActive(): boolean {
-    if (this.activeBase) {
-      return this.activeBase.isActive;
+    if (this.productChart) {
+      return this.productChart.isActive ?? true;
     }
-    const template = this.recurringDepositsAccountProductTemplate || this.recurringDepositsAccountTemplate;
-    return (
-      template?.accountChart?.isActive ??
-      template?.activeChart?.isActive ??
-      template?.interestRateCharts?.[0]?.isActive ??
-      template?.interestRateChart?.isActive ??
-      true
-    );
+    return this.activeBase?.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">
-    {{ 'labels.inputs.Apply Penal Interest (less)' | translate }}
-  </mat-checkbox>
-
-  @if (closureSettingsForm.value.preClosurePenalApplicable) {
-    <mat-form-field class="flex-48">
-      <mat-label>{{ 'labels.inputs.Penal Interest' | translate }} (%)</mat-label>
-      <input type="number" matInput formControlName="preClosurePenalInterest" min="0" step="0.01" />
-    </mat-form-field>
-
-    <mat-form-field class="flex-48">
-      <mat-label>{{ 'labels.inputs.Period' | translate }}</mat-label>
-      <mat-select formControlName="preClosurePenalInterestOnTypeId">
-        @for (preClosurePenalInterestOnType of preClosurePenalInterestOnTypeData; track preClosurePenalInterestOnType) {
-          <mat-option [value]="preClosurePenalInterestOnType.id">
-            {{ preClosurePenalInterestOnType.value | translateKey: 'catalogs' }}
-          </mat-option>
-        }
-      </mat-select>
-    </mat-form-field>
-  }
+  <!-- The premature-closure penalty is the product's, shown here and never changed per account. -->
+  <div class="flex-98 margin-v rdmt-penal">
+    <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) {
+      <div class="rdmt-penal__row">
+        <span>Penal Interest: <strong>{{ closureSettingsForm.value.preClosurePenalInterest }}%</strong></span>
+        <span>Period: <strong>{{ penalPeriodLabel }}</strong></span>
+      </div>
+      <div class="rdmt-penal__hint">On premature closure the rate is reduced by this much.</div>
+    } @else {
+      <div class="rdmt-penal__row"><strong>No</strong> - no penal interest is charged on premature closure of this product.</div>
+    }
+  </div>
 </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>
-        <span>Reporting Fortnight (45-day lag)</span>
+        <strong>{{ reportingDateStr || '—' }}</strong>
+        <span>
+          Fortnight close
+          @if (baseDateStr) {
+            &middot; charged on {{ baseDateStr }}
+          }
+        </span>
       </div>
       <a
         class="rbi-circular-btn"
@@ -42,31 +49,44 @@
   <div class="summary-row">
     <div class="summary-card sc-demand">
       <div class="sc-label">Total Demand Liabilities</div>
-      <div class="sc-value">&#8377;12,843<span class="cr">Cr</span></div>
-      <div class="sc-change up">&#8593; 3.2% vs prev fortnight</div>
+      <div class="sc-value">{{ crore(totalDemand) }}<span class="cr" *ngIf="totalDemand !== null">Cr</span></div>
+      <div class="sc-sub">Payable on demand</div>
     </div>
     <div class="summary-card sc-time">
       <div class="sc-label">Total Time Liabilities</div>
-      <div class="sc-value">&#8377;64,618<span class="cr">Cr</span></div>
-      <div class="sc-change up">&#8593; 1.8% vs prev fortnight</div>
+      <div class="sc-value">{{ crore(totalTime) }}<span class="cr" *ngIf="totalTime !== null">Cr</span></div>
+      <div class="sc-sub">Payable on maturity</div>
     </div>
     <div class="summary-card sc-asset">
       <div class="sc-label">Assets with Banking System</div>
-      <div class="sc-value">&#8377;8,240<span class="cr">Cr</span></div>
+      <div class="sc-value">
+        {{ crore(totalBankingAssets) }}<span class="cr" *ngIf="totalBankingAssets !== null">Cr</span>
+      </div>
       <div class="sc-change dn">&#8595; Deducted from NDTL</div>
     </div>
     <div class="summary-card sc-ndtl">
       <div class="sc-label">Net Demand &amp; Time Liabilities (NDTL)</div>
-      <div class="sc-value">&#8377;69,221<span class="cr">Cr</span></div>
+      <div class="sc-value">{{ crore(ndtl) }}<span class="cr" *ngIf="ndtl !== null">Cr</span></div>
       <div class="sc-sub">After deducting banking assets</div>
     </div>
     <div class="summary-card sc-crr">
-      <div class="sc-label">CRR Required ({{ crrRate }}%)</div>
-      <div class="sc-value">&#8377;{{ crrRequired | number: '1.0-0' }}<span class="cr">Cr</span></div>
-      <div class="sc-sub">SLR Req: &#8377;{{ slrRequired | number: '1.0-0' }} Cr ({{ slrRate }}%)</div>
+      <!-- The rate is named from the configuration, not fixed here: a card headed "CRR Required
+           (3%)" while Admin holds 4% states a rate the bank is not on. -->
+      <div class="sc-label">CRR Required{{ crrRate === null ? '' : ' (' + crrRate + '%)' }}</div>
+      <div class="sc-value">{{ crore(crrRequired) }}<span class="cr" *ngIf="crrRequired !== null">Cr</span></div>
+      <div class="sc-sub">
+        SLR Req: {{ crore(slrRequired) }}{{ slrRate === null ? '' : ' Cr (' + slrRate + '%)' }}
+      </div>
     </div>
   </div>
 
+  <!-- Why the figures are not there, in the return's own words. A dashboard that simply shows
+       dashes sends an administrator looking for a fault in the dashboard. -->
+  <div class="unavailable-note" *ngIf="unavailable">
+    <fa-icon icon="exclamation-triangle"></fa-icon>
+    {{ unavailable }}
+  </div>
+
   <!-- Tab Navigation -->
   <div class="tab-nav">
     <button class="tab-btn" [class.active]="activeTab === 'demand'" (click)="activeTab = 'demand'">
@@ -124,13 +144,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3"><strong>Total Demand Liabilities (All 16 Items)</strong></td>
-            <td class="right foot-demand">12,114.75</td>
-            <td class="right foot-demand">12,843.50</td>
-            <td class="right up">+728.75</td>
+            <td colspan="3"><strong>Total Demand Liabilities ({{ demandLiabilities.length }} accounts)</strong></td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "openingValue") }}</td>
+            <td class="right foot-demand">{{ totalOf(demandLiabilities, "currentValue") }}</td>
+            <td class="right">{{ totalChange(demandLiabilities) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -179,13 +207,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="3"><strong>Total Time Liabilities (All 13 Items)</strong></td>
-            <td class="right foot-time">62,613.10</td>
-            <td class="right foot-time">64,618.00</td>
-            <td class="right up">+2,004.90</td>
+            <td colspan="3"><strong>Total Time Liabilities ({{ timeLiabilities.length }} accounts)</strong></td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "openingValue") }}</td>
+            <td class="right foot-time">{{ totalOf(timeLiabilities, "currentValue") }}</td>
+            <td class="right">{{ totalChange(timeLiabilities) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -228,15 +264,23 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
             <td colspan="3">
               <strong>Total Assets with Banking System</strong> <span class="deduct-tag">( Deducted from NDTL )</span>
             </td>
-            <td class="right foot-asset">7,600.70</td>
-            <td class="right foot-asset">8,240.20</td>
-            <td class="right up">+639.50</td>
+            <td class="right foot-asset">{{ totalOf(bankingAssets, "openingValue") }}</td>
+            <td class="right foot-asset">{{ totalOf(bankingAssets, "currentValue") }}</td>
+            <td class="right">{{ totalChange(bankingAssets) }}</td>
             <td></td>
           </tr>
         </tfoot>
@@ -285,13 +329,21 @@
               </td>
             </tr>
           }
+          @empty {
+            <tr class="empty-row">
+              <td colspan="7">
+                No accounts are mapped to this head, so the return reports nothing under it. Map them in
+                Admin &rarr; RBI Reserve Configuration.
+              </td>
+            </tr>
+          }
         </tbody>
         <tfoot>
           <tr>
             <td colspan="4"><strong>Total Liquid Assets (SLR Eligible)</strong></td>
-            <td class="right foot-slr">12,511.70</td>
-            <td class="right foot-slr">13,238.80</td>
-            <td class="right up">+727.10</td>
+            <td class="right foot-slr">{{ totalOf(liquidAssets, "openingValue") }}</td>
+            <td class="right foot-slr">{{ totalOf(liquidAssets, "currentValue") }}</td>
+            <td class="right">{{ totalChange(liquidAssets) }}</td>
             <td></td>
           </tr>
         </tfoot>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6,11 +6,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, OnInit, inject } from '@angular/core';
+import { Component } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { DateDdmmyyyyPickerComponent } from '../date-ddmmyyyy-picker/date-ddmmyyyy-picker.component';
 import {
+  GOVT_SECURITY_HOLDINGS,
+  NON_SLR_HOLDINGS,
+  BOND_HOLDINGS,
+  MUTUAL_FUND_HOLDINGS,
+  ALL_TXNS,
   SCRIPT_MASTER,
   PARTY_MASTER,
   SUBTYPE_MASTER,
@@ -26,20 +31,16 @@ import {
   BOND_RATING_OPTIONS,
   INT_TYPE_OPTIONS,
   AUTHORITY_OPTIONS,
-  INVESTMENT_GL_BY_TYPE,
-  INVESTMENT_GL_LOOKUP,
-  INTEREST_RECEIVABLE_GL,
-  SETTLEMENT_BANK_GL_OPTIONS,
-  periodBetween,
-  parseDDMMYYYY,
-  days360,
-  lastHalfYearlyCouponDate,
+  INTEREST_INCOME_GL_MASTER,
+  INTEREST_INCOME_GL_BY_TYPE,
   InvestmentHolding,
   InvestmentTxn,
   InstrumentType,
   InterestFreq,
   INSTRUMENT_LABELS,
   accruedInterest,
+  accruedInterestBetween,
+  canAccrueInterest,
   daysToMaturity,
   maturityAmount,
   addPeriod,
@@ -48,13 +49,6 @@ import {
   todayDDMMYYYY
 } from '../investment-data';
 import { exportWorkbook } from '../investment-export';
-import {
-  InvestmentInterestScheduleDto,
-  InvestmentPurchaseDto,
-  InvestmentService,
-  apiErrorMessage,
-  toHolding
-} from '../investment.service';
 
 type BondType = 'GOVT_SECURITY' | 'NON_SLR' | 'BOND' | 'MUTUAL_FUND';
 type BondTab =
@@ -137,13 +131,6 @@ interface BondPurchaseForm {
   stampDutyAc: string;
 }
 
-interface AccountingPreviewLine {
-  side: 'Dr' | 'Cr';
-  glCode: string;
-  glName: string;
-  amount: number;
-}
-
 interface BondSellForm {
   /** Legacy screen has SELL / REDEEM / MUTUAL FUND SELL radio at the top. */
   mode: 'SELL' | 'REDEEM' | 'MUTUAL_FUND_SELL';
@@ -195,67 +182,23 @@ interface BondSellForm {
     DateDdmmyyyyPickerComponent
   ]
 })
-export class BondInvestmentComponent implements OnInit {
-  private readonly investmentService = inject(InvestmentService);
-
-  /** Script and party dropdowns offer the masters saved in the backend. */
-  ngOnInit(): void {
-    this.investmentService.syncSharedMasters().subscribe({
-      error: (err) => this.toast(`Could not load Script / Party masters: ${apiErrorMessage(err)}`)
-    });
-    this.investmentService.getAssetGlAccounts().subscribe({
-      next: (gls) =>
-        (this.glIdByCode = new Map(
-          gls.map((g) => [
-            g.glCode,
-            g.id
-          ])
-        )),
-      error: (err) => this.toast(`Could not load GL accounts: ${apiErrorMessage(err)}`)
-    });
-    this.loadPurchases();
-  }
-
-  /** GL id for a GL code — the purchase API takes ids, the form works with codes. */
-  private glIdByCode = new Map<string, number>();
-
-  /** The Holdings register and transaction log are the purchases saved in the backend. */
-  private loadPurchases(): void {
-    this.investmentService.getPurchases().subscribe({
-      next: (purchases) => {
-        this.holdings = purchases.map(toHolding);
-        this.txns = purchases.map((d) => this.purchaseTxn(d));
-        this.purchaseForm = this.blankPurchaseForm();
-      },
-      error: (err) => this.toast(`Could not load purchases: ${apiErrorMessage(err)}`)
-    });
-  }
-
-  private purchaseTxn(d: InvestmentPurchaseDto): InvestmentTxn {
-    return {
-      certNo: d.certNo,
-      instrumentType: d.bondType,
-      txnType: 'PURCHASE',
-      voucherNo: `INV/PUR/${d.dealNo}`,
-      txnDate: d.dealDate,
-      amount: d.settlementAmount,
-      particulars: `Purchase Deal ${d.dealNo} - ${d.scriptDesc} - ${d.partyName} [${d.category}]`,
-      glCode: d.investmentGlCode,
-      glName: d.investmentGlName
-    };
-  }
-
+export class BondInvestmentComponent {
   activeTab: BondTab = 'holdings';
-  /** Purchase Entry shows only the mandatory fields; the rest sit under "More Details". */
-  showMoreDetails = false;
-  /** Cert No typed in the Retrieve box (Cert No itself is system-generated and read-only). */
-  retrieveCertNo = '';
   bondType: BondType = 'GOVT_SECURITY';
   asOnDate = todayDDMMYYYY();
 
-  /** Loaded from the backend (saved purchases) in ngOnInit. */
-  holdings: InvestmentHolding[] = [];
-  txns: InvestmentTxn[] = [];
+  holdings: InvestmentHolding[] = [
+    ...GOVT_SECURITY_HOLDINGS,
+    ...NON_SLR_HOLDINGS,
+    ...BOND_HOLDINGS,
+    ...MUTUAL_FUND_HOLDINGS
+  ];
+  txns: InvestmentTxn[] = ALL_TXNS.filter((t) => ([
+        'GOVT_SECURITY',
+        'NON_SLR',
+        'BOND',
+        'MUTUAL_FUND'
+      ] as InstrumentType[]).includes(t.instrumentType));
 
   // Master-driven dropdown sources
   readonly scriptOptions = SCRIPT_MASTER;
@@ -281,23 +224,23 @@ export class BondInvestmentComponent implements OnInit {
 
   purchaseForm: BondPurchaseForm = this.blankPurchaseForm();
   sellForm: BondSellForm = this.blankSellForm();
-  readonly settlementBankOptions = SETTLEMENT_BANK_GL_OPTIONS;
 
   // Redemption Entry
   redeemCertNo = '';
   redeemDate = this.asOnDate;
   redeemRemarks = '';
 
-  // 03 Interest Entry (legacy: Type / Script / Deal No + Retrieve) — the backend works out every
-  // half-yearly coupon and 31 Mar / 30 Sep closing provision of the holding. Display only:
-  // nothing is posted to GL until the posting rules are approved.
-  intType: BondType | '' = '';
-  intScript = '';
-  intPurchaseId: number | null = null;
-  intAsOnDate = this.asOnDate;
-  intSchedule: InvestmentInterestScheduleDto | null = null;
-  intLoading = false;
-  readonly interestReceivableGl = INTEREST_RECEIVABLE_GL;
+  // Interest Calculation (legacy: From/To Date / Type / Script / Deal No / ALL + Process) —
+  // posts interest accrued strictly within [intCalcFromDate, intCalcToDate], same period-based
+  // basis as the Investment Interest module's Govt./Bond Interest Calculation.
+  intCalcFromDate = addPeriod(this.asOnDate, 0, -3);
+  intCalcToDate = this.asOnDate;
+  intCalcType: BondType | '' = '';
+  intCalcScript = '';
+  intCalcDealNo = '';
+  intCalcAll = false;
+  intCalcGlCode = INTEREST_INCOME_GL_BY_TYPE.GOVT_SECURITY;
+  readonly interestIncomeGlOptions = INTEREST_INCOME_GL_MASTER;
 
   // Write-off
   writeoffCertNo = '';
@@ -362,37 +305,20 @@ export class BondInvestmentComponent implements OnInit {
     return INSTRUMENT_LABELS[type];
   }
 
-  /** Preview of the deal number the backend will assign: FY prefix (e.g. 202627) + running number. */
   private nextDealNo(): string {
-    const d = parseDDMMYYYY(this.asOnDate);
-    const fyStart = d.getMonth() >= 3 ? d.getFullYear() : d.getFullYear() - 1;
-    const prefix = `${fyStart}${String((fyStart + 1) % 100).padStart(2, '0')}`;
-    const nums = (this.holdings ?? [])
-      .map((h) => h.dealNo)
-      .filter((n): n is string => !!n && n.startsWith(prefix))
-      .map((n) => parseInt(n.slice(prefix.length), 10));
-    return `${prefix}${String((nums.length ? Math.max(...nums) : 0) + 1).padStart(6, '0')}`;
-  }
-
-  /** Certificate No is system-generated, as in the existing CBS (greyed there). */
-  /** Preview of the certificate number the backend will assign (running number). */
-  private nextCertNo(): string {
-    const nums = (this.holdings ?? []).map((h) => parseInt(h.certNo, 10)).filter((n) => !isNaN(n));
-    return String((nums.length ? Math.max(...nums) : 0) + 1);
+    return `2026${String(27000039 + this.holdings.length).padStart(9, '0')}`;
   }
 
   private blankPurchaseForm(): BondPurchaseForm {
     const type = this.bondType ?? 'GOVT_SECURITY';
-    this.showMoreDetails = false;
-    this.retrieveCertNo = '';
     return {
       bondType: type,
       dealNo: this.nextDealNo(),
       dealDate: this.asOnDate,
-      dealTime: new Date().toTimeString().slice(0, 8),
+      dealTime: '',
       isin: '',
       scriptCode: '',
-      certNo: this.nextCertNo(),
+      certNo: '',
       settlementType: 'T+0',
       settlementDt: this.asOnDate,
       faceValue: null,
@@ -400,7 +326,7 @@ export class BondInvestmentComponent implements OnInit {
       partyCode: '',
       subType: type === 'GOVT_SECURITY' ? 'SLR' : type === 'NON_SLR' ? 'NON SLR' : 'CORPORATE BOND',
       tbillGlAc: '',
-      crToAc: SETTLEMENT_BANK_GL_OPTIONS[0]?.glCode ?? '',
+      crToAc: '310070',
       premiumAmt: null,
       brokerage: null,
       brokerName: '',
@@ -537,41 +463,13 @@ export class BondInvestmentComponent implements OnInit {
   }
 
   /** Accrued Interest at purchase — interest earned by the seller since the last coupon date. */
-  /** Interest owed to the seller from the last coupon date up to the deal date, on a 30/360 basis —
-   *  interest is counted to the event date, not the date the money moves (Jitendra Sir). */
   get purchaseAccruedInterest(): number {
     const f = this.purchaseForm;
     if (!f.intRate || !f.lastIntDt || !f.dealDate) {
       return 0;
     }
-    return Math.round((this.purchaseBaseAmount * (f.intRate / 100) * days360(f.lastIntDt, f.dealDate)) / 360);
-  }
-
-  get purchaseAccruedDays(): number {
-    const f = this.purchaseForm;
-    return f.lastIntDt && f.dealDate ? days360(f.lastIntDt, f.dealDate) : 0;
-  }
-
-  /** Premium (+) or discount (−) paid over face value. */
-  get purchasePremiumDiscount(): number {
-    const f = this.purchaseForm;
-    if (this.isMutualFund || !f.faceValue || !f.purchaseRate) {
-      return 0;
-    }
-    return Math.round((f.faceValue * (f.purchaseRate - 100)) / 100);
-  }
-
-  /** Re-suggests the last coupon date when the deal date changes. */
-  onDealDateChange(): void {
-    this.suggestLastIntDate();
-  }
-
-  private suggestLastIntDate(): void {
-    const f = this.purchaseForm;
-    const s = this.purchaseScript;
-    if (!this.isMutualFund && s?.maturityDate && f.dealDate) {
-      f.lastIntDt = lastHalfYearlyCouponDate(s.maturityDate, f.dealDate) || f.lastIntDt;
-    }
+    const yrs = Math.max(0, yearsBetween(f.lastIntDt, f.dealDate));
+    return Math.round(this.purchaseBaseAmount * (f.intRate / 100) * yrs);
   }
 
   /** Settlement Amt of Purchase — book value plus accrued interest payable to the seller. */
@@ -606,196 +504,69 @@ export class BondInvestmentComponent implements OnInit {
     });
   }
 
-  get purchaseScript(): (typeof SCRIPT_MASTER)[number] | undefined {
-    return this.scriptOptions.find((x) => x.scriptCode === this.purchaseForm.scriptCode);
-  }
-
-  /** Picking a script pulls its master details into the deal, as the existing CBS does. */
+  /** Fills ISIN + interest rate when a script is picked, mirroring the legacy form's lookup. */
   onScriptChange(): void {
-    const s = this.purchaseScript;
-    if (!s) {
-      return;
+    const s = this.scriptOptions.find((x) => x.scriptCode === this.purchaseForm.scriptCode);
+    if (s) {
+      this.purchaseForm.isin = s.isin;
     }
-    const f = this.purchaseForm;
-    f.isin = s.isin;
-    if (s.couponRate != null) {
-      f.intRate = s.couponRate;
-    }
-    if (s.issueDate) {
-      f.issueDate = s.issueDate;
-    }
-    if (s.maturityDate) {
-      f.redumMatDt = s.maturityDate;
-      const p = periodBetween(s.issueDate, s.maturityDate);
-      f.periodYear = p.years;
-      f.periodMonth = p.months;
-      f.periodDays = p.days;
-    }
-    if (s.slrType) {
-      f.subType = s.slrType === 'NON_SLR' ? 'NON SLR' : 'SLR';
-    }
-    if (this.isMutualFund) {
-      f.productName = s.scriptName;
-    }
-    this.suggestLastIntDate();
-  }
-
-  /** Settlement Date = Deal Date + T+n days (greyed / auto in the existing CBS). */
-  get purchaseSettlementDate(): string {
-    const f = this.purchaseForm;
-    if (!f.dealDate) {
-      return '';
-    }
-    const n = parseInt(f.settlementType.replace('T+', ''), 10) || 0;
-    return addPeriod(f.dealDate, 0, 0, n);
-  }
-
-  /** Parties offered for a new deal — inactive parties are hidden. */
-  get activePartyOptions(): typeof PARTY_MASTER {
-    return this.partyOptions.filter((p) => p.status !== 'INACTIVE');
-  }
-
-  get purchaseInvestmentGlCode(): string {
-    return this.purchaseScript?.glCode || INVESTMENT_GL_BY_TYPE[this.purchaseForm.bondType];
-  }
-
-  glNameOf(glCode: string): string {
-    return INVESTMENT_GL_LOOKUP.find((g) => g.glCode === glCode)?.glName ?? '';
-  }
-
-  /** The journal entry this purchase will post once the checker approves it. */
-  get purchaseAccountingPreview(): AccountingPreviewLine[] {
-    const book = this.purchaseBookValue;
-    const accrued = this.purchaseAccruedInterest;
-    const total = this.purchaseSettlementAmount;
-    const crGl = this.purchaseForm.crToAc;
-    if (!book || !crGl) {
-      return [];
-    }
-    const invGl = this.purchaseInvestmentGlCode;
-    const lines: AccountingPreviewLine[] = [
-      { side: 'Dr', glCode: invGl, glName: this.glNameOf(invGl), amount: book }];
-    if (accrued > 0) {
-      lines.push({
-        side: 'Dr',
-        glCode: INTEREST_RECEIVABLE_GL.glCode,
-        glName: INTEREST_RECEIVABLE_GL.glName,
-        amount: accrued
-      });
-    }
-    lines.push({ side: 'Cr', glCode: crGl, glName: this.glNameOf(crGl), amount: total });
-    return lines;
   }
 
   savePurchase(): void {
     const f = this.purchaseForm;
-    const missing: string[] = [];
-    if (!f.scriptCode) missing.push('Script Code');
-    if (!f.partyCode) missing.push('Party Code');
-    if (!f.dealDate) missing.push('Deal Date');
-    if (this.isMutualFund) {
-      if (!f.considerAmt) missing.push('Consider Amt');
-      if (!f.nav) missing.push('NAV');
-    } else {
-      if (!f.faceValue) missing.push('Face Value');
-      if (!f.purchaseRate) missing.push('Purchase Rate');
-      if (!f.lastIntDt) missing.push('Last Interest Date');
-    }
-    if (!f.category) missing.push('Category');
-    if (!f.crToAc) missing.push('CR. To A/c');
-    if (missing.length) {
-      this.toast(`Please fill: ${missing.join(', ')}.`);
+    if (!f.certNo || !this.purchaseBaseAmount || !f.partyCode) {
+      this.toast('Please fill Cert No, Face Value / Consider Amt and Party Code.');
       return;
     }
-    const script = this.purchaseScript;
-    const party = this.partyOptions.find((p) => p.partyCode === f.partyCode);
-    const crGlAccountId = this.glIdByCode.get(f.crToAc);
-    if (!script?.id || !party?.id) {
-      this.toast('Script and Party must be saved in Investment Masters first.');
-      return;
-    }
-    if (!crGlAccountId) {
-      this.toast(`GL ${f.crToAc} was not found in the chart of accounts.`);
-      return;
-    }
-    const body = {
-      bondType: f.bondType,
-      scriptId: script.id,
-      partyId: party.id,
-      dealDate: f.dealDate,
-      dealTime: f.dealTime || '',
-      settlementType: f.settlementType,
-      ...(this.isMutualFund
-        ? { considerAmt: f.considerAmt, nav: f.nav, stampDuty: f.stampDuty ?? null }
-        : { faceValue: f.faceValue, purchaseRate: f.purchaseRate, lastIntDate: f.lastIntDt }),
-      brokerage: f.brokerage ?? null,
-      category: f.category,
-      crGlAccountId,
-      subType: f.subType || '',
-      otherDetails: this.purchaseOtherDetails(),
-      dateFormat: 'dd-MM-yyyy',
-      locale: 'en'
-    };
-    this.investmentService.createPurchase(body).subscribe({
-      next: (res) => {
-        this.toast(`Deal ${res.resourceIdentifier} saved. GL posting will follow once accounting is approved.`);
-        this.activeTab = 'holdings';
-        this.loadPurchases();
-      },
-      error: (err) => this.toast(apiErrorMessage(err))
-    });
-  }
-
-  /** The optional "More Details" fields, kept with the deal as they were entered. */
-  private purchaseOtherDetails(): Record<string, string | number> {
-    const f = this.purchaseForm;
-    const fields: Record<string, string | number | null> = {
-      tradeNo: f.tradeNo,
-      orderNo: f.orderNo,
+    const holding: InvestmentHolding = {
+      certNo: f.certNo,
+      instrumentType: f.bondType,
+      scriptCode: f.scriptCode || f.isin || f.productName,
+      scriptName: this.isMutualFund
+        ? f.productName
+        : this.scriptOptions.find((s) => s.scriptCode === f.scriptCode)?.scriptName || f.scriptCode || f.isin,
+      party: f.partyCode,
+      subType: f.subType,
+      faceValue: this.purchaseBaseAmount,
+      purchaseRate: this.isMutualFund ? f.nav || 0 : f.purchaseRate || 100,
+      units: this.purchaseUnits,
+      purchaseDate: f.issueDate,
+      maturityDate: this.purchaseMaturityDate || f.issueDate,
+      interestRate: f.intRate || 0,
+      interestFreq: this.isMutualFund ? 'CUMULATIVE' : f.intType,
+      glCode:
+        '31' +
+        (f.bondType === 'GOVT_SECURITY'
+          ? '0020'
+          : f.bondType === 'NON_SLR'
+            ? '0030'
+            : f.bondType === 'BOND'
+              ? '0040'
+              : '0050'),
+      glName: `INVESTMENT IN ${INSTRUMENT_LABELS[f.bondType].toUpperCase()}`,
+      crToAc: f.crToAc,
       brokerCode: f.brokerName,
-      recommAuthority: f.recommAuthority,
-      sanctionAuthority: f.sanctionAuthority,
-      meetDate: f.meetDt,
-      resoNo: f.resoNo,
-      dealType: f.dealType,
-      market: f.market,
-      markCblo: f.markCblo,
-      paymentMode: f.paymentMode,
-      deliveryMode: f.deliveryMode,
-      lien: f.lien,
-      lienAmount: f.lienAmount,
-      lienReason: f.lienReason,
-      bondRating: f.bondRating,
-      corpBond: f.corpBond,
-      sglWithBank: f.sglWithBank,
-      tbillGlAc: f.tbillGlAc,
-      intType: f.intType,
-      intDate: f.intDate,
-      folioNo: f.folioNo,
-      callOption: f.callOption,
-      descInv: f.descInv,
-      fromDist: f.fromDist,
-      toDist: f.toDist,
-      amortizeAmt: f.amortizeAmt,
-      registerAddress: f.registerAdd,
-      registerCity: f.regiCity,
-      registerPin: f.regiPin,
-      remarks: f.remarks,
-      description: f.description,
-      tradeAmt: f.tradeAmt,
-      holdingDays: f.holdingDays,
-      stampDutyAc: f.stampDutyAc
+      status: 'ACTIVE'
     };
-    const out: Record<string, string | number> = {};
-    for (const [
-      k,
-      v
-    ] of Object.entries(fields)) {
-      if (v !== null && v !== undefined && v !== '') {
-        out[k] = v;
-      }
-    }
-    return out;
+    this.holdings = [
+      holding,
+      ...this.holdings
+    ];
+    this.txns = [
+      {
+        certNo: holding.certNo,
+        instrumentType: f.bondType,
+        txnType: 'PURCHASE',
+        voucherNo: `INV/PUR/${f.dealNo}`,
+        txnDate: f.dealDate,
+        amount: this.purchaseSettlementAmount,
+        particulars: `Purchase Deal ${f.dealNo} - ${holding.scriptName} - ${holding.party}${f.category ? ' [' + f.category + ']' : ''}`
+      },
+      ...this.txns
+    ];
+    this.toast(`${INSTRUMENT_LABELS[f.bondType]} Certificate ${holding.certNo} saved successfully.`);
+    this.purchaseForm = this.blankPurchaseForm();
+    this.activeTab = 'holdings';
   }
 
   cancelPurchase(): void {
@@ -805,10 +576,9 @@ export class BondInvestmentComponent implements OnInit {
 
   /** Legacy "Retrieve" button — loads an existing deal back into the form by Cert No. */
   retrievePurchase(): void {
-    const certNo = this.retrieveCertNo.trim();
-    const h = this.holdings.find((x) => x.certNo === certNo);
+    const h = this.holdings.find((x) => x.certNo === this.purchaseForm.certNo.trim());
     if (!h) {
-      this.toast(`Cert No ${certNo || '(blank)'} not found.`);
+      this.toast(`Cert No ${this.purchaseForm.certNo} not found.`);
       return;
     }
     this.purchaseForm = {
@@ -817,8 +587,7 @@ export class BondInvestmentComponent implements OnInit {
       certNo: h.certNo,
       scriptCode: h.scriptCode,
       isin: this.scriptOptions.find((s) => s.scriptCode === h.scriptCode)?.isin || '',
-      dealNo: h.dealNo ?? '',
-      partyCode: h.partyCode ?? '',
+      partyCode: h.party,
       subType: h.subType,
       faceValue: h.faceValue,
       considerAmt: h.faceValue,
@@ -830,26 +599,22 @@ export class BondInvestmentComponent implements OnInit {
       intType: h.interestFreq,
       brokerName: h.brokerCode,
       crToAc: h.crToAc,
-      productName: h.scriptName,
-      category: h.category ?? ''
+      productName: h.scriptName
     };
     this.bondType = h.instrumentType as BondType;
     this.toast(`Deal for Cert No ${h.certNo} retrieved.`);
   }
 
   dropPurchase(): void {
-    const h = this.holdings.find((x) => x.certNo === this.purchaseForm.certNo);
-    if (!h?.id) {
-      this.toast('Retrieve a saved deal first, then Drop.');
+    const certNo = this.purchaseForm.certNo;
+    if (!this.holdings.some((h) => h.certNo === certNo)) {
+      this.toast('Nothing to drop — this deal is not yet saved.');
       return;
     }
-    this.investmentService.deletePurchase(h.id).subscribe({
-      next: () => {
-        this.toast(`Deal ${h.dealNo} (Cert No ${h.certNo}) dropped.`);
-        this.loadPurchases();
-      },
-      error: (err) => this.toast(apiErrorMessage(err))
-    });
+    this.holdings = this.holdings.filter((h) => h.certNo !== certNo);
+    this.txns = this.txns.filter((t) => t.certNo !== certNo);
+    this.purchaseForm = this.blankPurchaseForm();
+    this.toast(`Cert No ${certNo} dropped.`);
   }
 
   exitPurchase(): void {
@@ -893,53 +658,78 @@ export class BondInvestmentComponent implements OnInit {
   }
 
   // -------------------- Interest calculation --------------------
-  /** Saved holdings for the Deal No dropdown, narrowed by Type and Script. */
-  get intDealOptions(): InvestmentHolding[] {
-    return this.holdings.filter(
-      (h) =>
-        h.id != null &&
-        h.status === 'ACTIVE' &&
-        (!this.intType || h.instrumentType === this.intType) &&
-        (!this.intScript || h.scriptCode === this.intScript)
-    );
-  }
-
-  get intScriptOptions(): typeof SCRIPT_MASTER {
-    return this.scriptOptions.filter((s) => !this.intType || s.instrumentType === this.intType);
-  }
-
-  onIntFilterChange(): void {
-    if (this.intScript && !this.intScriptOptions.some((s) => s.scriptCode === this.intScript)) {
-      this.intScript = '';
+  /** Holdings the Interest Calculation "Process" run would cover, given the filters. A
+   *  Non-Performing holding is always excluded — same accrual-basis rule as the Investment
+   *  Interest module (it's still collectible on cash basis via Interest Receive there). */
+  get intCalcTargets(): InvestmentHolding[] {
+    const base = this.holdings.filter((h) => h.status === 'ACTIVE' && canAccrueInterest(h));
+    if (this.intCalcAll) {
+      return base;
     }
-    if (this.intPurchaseId != null && !this.intDealOptions.some((h) => h.id === this.intPurchaseId)) {
-      this.intPurchaseId = null;
-    }
-    this.intSchedule = null;
-  }
-
-  retrieveInterestSchedule(): void {
-    if (this.intPurchaseId == null) {
-      this.toast('Select a Deal No first.');
-      return;
-    }
-    this.intLoading = true;
-    this.investmentService.getInterestSchedule(this.intPurchaseId, this.intAsOnDate || undefined).subscribe({
-      next: (schedule) => {
-        this.intSchedule = schedule;
-        this.intLoading = false;
-      },
-      error: (err) => {
-        this.intSchedule = null;
-        this.intLoading = false;
-        this.toast(apiErrorMessage(err));
-      }
+    return base.filter((h) => {
+      if (this.intCalcType && h.instrumentType !== this.intCalcType) return false;
+      if (this.intCalcScript && h.scriptCode !== this.intCalcScript) return false;
+      if (this.intCalcDealNo && h.certNo !== this.intCalcDealNo.trim()) return false;
+      return true;
     });
   }
 
-  /** Total of the lines falling due up to the as-on date. */
-  get intDueTotal(): number {
-    return (this.intSchedule?.rows ?? []).filter((r) => r.due).reduce((sum, r) => sum + r.amount, 0);
+  get intCalcExcludedNpi(): InvestmentHolding[] {
+    return this.holdings.filter((h) => h.status === 'ACTIVE' && !canAccrueInterest(h));
+  }
+
+  /** Re-suggests the Interest Income GL when the Type filter changes — still overridable. */
+  onIntCalcTypeChange(): void {
+    if (this.intCalcType) {
+      this.intCalcGlCode = INTEREST_INCOME_GL_BY_TYPE[this.intCalcType];
+    }
+  }
+
+  glName(glCode: string): string {
+    return this.interestIncomeGlOptions.find((g) => g.glCode === glCode)?.glName ?? glCode;
+  }
+
+  /** Interest accrued strictly within [intCalcFromDate, intCalcToDate] — a period-based
+   *  Interest Calculation & Post run, same basis as the Investment Interest module. */
+  interestAccrued(h: InvestmentHolding): number {
+    return accruedInterestBetween(h, this.intCalcFromDate || h.purchaseDate, this.intCalcToDate || this.asOnDate);
+  }
+
+  processInterest(): void {
+    const targets = this.intCalcTargets.filter((h) => this.interestAccrued(h) > 0);
+    if (targets.length === 0) {
+      this.toast('No holdings have interest due to be posted for this period.');
+      return;
+    }
+    const toDate = this.intCalcToDate || this.asOnDate;
+    const fromDate = this.intCalcFromDate || toDate;
+    const glCode = this.intCalcGlCode;
+    const glName = this.glName(glCode);
+    const newTxns: InvestmentTxn[] = targets.map((h, i) => {
+      const amt = this.interestAccrued(h);
+      h.interestPosted = (h.interestPosted ?? 0) + amt;
+      h.interestPostedTillDate = toDate;
+      return {
+        certNo: h.certNo,
+        instrumentType: h.instrumentType,
+        txnType: 'INTEREST',
+        voucherNo: `INV/INT/${h.certNo}-${this.txns.length + i + 1}`,
+        txnDate: toDate,
+        amount: amt,
+        particulars: `Interest calculated (accrual) for period ${fromDate} to ${toDate} - ${h.scriptName}`,
+        glCode,
+        glName
+      };
+    });
+    this.txns = [
+      ...newTxns,
+      ...this.txns
+    ];
+    this.intCalcFromDate = toDate;
+    const total = newTxns.reduce((s, t) => s + t.amount, 0);
+    this.toast(
+      `Interest processed for ${targets.length} holding(s) to ${glCode} - ${glName}. Total ₹${total.toLocaleString('en-IN')}.`
+    );
   }
 
   // -------------------- Sell / Redeem Entry --------------------

src/app/investment/investment-data.ts

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

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

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

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

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

src/app/investment/investment.service.ts

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

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

@@ -52,7 +52,7 @@
                 }
               } @else {
                 <span class="rrc-rate-now__value rrc-rate-now__value--none">Not set</span>
-                <span class="rrc-rate-now__since">{{ type === 'CRR' ? 'Form 1' : 'Form 9' }} cannot compute</span>
+                <span class="rrc-rate-now__since">{{ type === 'CRR' ? 'Form 1 Part B' : 'Form 1 Part C' }} cannot compute</span>
               }
             </div>
           }
@@ -62,8 +62,10 @@
           <mat-form-field appearance="outline" subscriptSizing="dynamic" class="rrc-rate-form__type">
             <mat-label>Rate</mat-label>
             <mat-select [(ngModel)]="newRate.rateType">
-              <mat-option value="CRR">CRR — Form 1</mat-option>
-              <mat-option value="SLR">SLR — Form 9</mat-option>
+              <!-- Both ratios are Form 1's. Part B charges section 18 on the base, Part C section
+                 24 on the same base - one form, two parts, not two returns. -->
+              <mat-option value="CRR">CRR — Form 1 Part B</mat-option>
+              <mat-option value="SLR">SLR — Form 1 Part C</mat-option>
               <!-- Not a reserve ratio, but set by RBI and effective-dated the same way: the share of
                  savings balances that counts as a demand liability, the rest being time. -->
               <mat-option value="SAVINGS_DEMAND">Savings — demand share</mat-option>
@@ -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
- * accounts the returns read their figures from.
+ * Configuration behind RBI Form 1: the percentages RBI sets, and which GL accounts the return reads
+ * its figures from.
+ *
+ * One form settles both ratios. Part B is section 18 (the cash reserve) and Part C is section 24
+ * (the liquid assets), charged on the same base, so CRR and SLR are configured together here.
  *
  * Both halves sit on one screen because they are one decision. A percentage applies to a base, and
  * an administrator who sets the rate but never maps the accounts produces a return that looks
@@ -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
-   * and Form 9, 'OSS1', 'OSS2'. Null shows every role.
+   * Which return's roles this screen configures, as the backend groups them: 'RESERVE' for Form 1,
+   * 'FORM9' for Form IX, 'OSS1', 'OSS2'. Null shows every role.
    *
    * A screen per return rather than one screen for all of them: the four roles that drive CRR and
    * the thirty that do not are separate decisions, made by different people at different times,
@@ -65,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
-   * administrator setting one up is looking at a different set of heads than one setting up the
-   * other. Showing all twenty-six at once buries the four that matter for the task in hand.
+   * The two returns have nothing in common - Form 1 charges ratios on a liability base, Form IX
+   * reports a balance sheet - so an administrator setting one up is looking at a different set of
+   * heads than one setting up the other. Showing all of them at once buries the handful that matter
+   * for the task in hand.
    */
-  formFilter: 'ALL' | 'FORM_1' | 'FORM_9' | 'FORM_IX' = 'ALL';
+  formFilter: 'ALL' | 'FORM_1' | 'FORM_IX' = 'ALL';
 
   /** Every reserve role the backend returned, before the form filter narrows it. */
   private allRoles: any[] = [];
 
-  /** 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_9', label: 'Form 9 — SLR (monthly)' },
+    { value: 'FORM_1', label: 'Form 1 — CRR & SLR' },
     { value: 'FORM_IX', label: 'Form IX — Assets & Liabilities (R408)' }
   ];
 
   /**
    * Whether a head belongs to the return currently selected.
    *
-   * Decided from how the return consumes the head rather than from its name: MAINTAINED is met in
-   * cash and balances and so is Form 1's, SLR_ASSET is met in securities and gold and so is Form
-   * 9's, and a head that builds or nets the DTL base belongs to both because both charge their rate
-   * on that same base. A memo head is stated on either return and so shows on both.
+   * Form 1 takes every head that is not Form IX's. It reports both ratios: MAINTAINED heads are met
+   * in cash and balances and settle Part B, SLR_ASSET heads are met in securities and gold and
+   * settle Part C, and the heads that build or net the DTL base feed the IV(b) both rates are
+   * charged on. Splitting them across two filters only hid half of one form.
    */
   private belongsToSelectedForm(role: any): boolean {
     if (this.formFilter === 'ALL') {
@@ -125,19 +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,
-    // so it is placed by name; every other head is placed by how the return consumes it.
-    if (role.configKey === 'SLR_INVESTMENTS') {
-      return this.formFilter === 'FORM_9';
-    }
-    const usage = role.usage || role.roleUsage;
-    if (usage === 'MAINTAINED') {
-      return this.formFilter === 'FORM_1';
-    }
-    if (usage === 'SLR_ASSET') {
-      return this.formFilter === 'FORM_9';
-    }
-    // LIABILITY, ASSET_NET and MEMO all appear on both returns.
+    // Everything left belongs to Form 1, whichever of its two parts it settles.
     return true;
   }
 
@@ -171,15 +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
-   * met in cash and balances with banks, SLR in cash, gold and approved securities. One option for
-   * both would let a head meant for Form 1 quietly satisfy Form 9.
+   * MAINTAINED and SLR_ASSET are separate because the two parts admit different assets: CRR is met
+   * in cash and balances with banks, SLR in cash, gold and approved securities. One option for both
+   * would let a head meant for Part B quietly satisfy Part C.
    */
   readonly roleUsages = [
-    { value: 'LIABILITY', label: 'Liability — adds to the DTL base (Form 1 & 9)' },
-    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1 & 9)' },
-    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1)' },
-    { value: 'SLR_ASSET', label: 'Counts toward SLR maintained (Form 9)' },
+    { value: 'LIABILITY', label: 'Liability — adds to the DTL base (Form 1)' },
+    { value: 'ASSET_NET', label: 'Asset — netted off the base to give NDTL (Form 1)' },
+    { value: 'MAINTAINED', label: 'Counts toward CRR maintained (Form 1 Part B)' },
+    { value: 'SLR_ASSET', label: 'Counts toward SLR maintained (Form 1 Part C)' },
     // Form IX has no ratio and no base: its usages say which side of the balance sheet a head sits
     // on. LIABILITY above serves its liability side, and this its asset side.
     { value: 'ASSET', label: 'Asset — enters Total Assets (Form IX)' },
@@ -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) => ({
-        glAccountId: a.glAccountId,
-        weightPercentage: a.weightPercentage === null || a.weightPercentage === undefined ? 100 : +a.weightPercentage,
-        liabilityClass: a.liabilityClass ?? (role.classified ? 'TIME' : null)
-      }));
+      this.reloadSelection(role);
     }
     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) ' +
-      'read their figures from. A rate applies to a base — so a role left unmapped stops its return computing rather ' +
-      'than reporting a nil figure that looks real.'
+      'The CRR and SLR percentages, and the GL accounts RBI Form 1 reads its figures from — Part B settles the cash ' +
+      'reserve, Part C the liquid assets, both charged on the same base. A rate applies to a base — so a role left ' +
+      'unmapped stops the return computing rather than reporting a nil figure that looks real.'
     );
   }
 
-  /** 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/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.router.navigate(
-        [
-          '../',
-          response.resourceId
-        ],
-        { relativeTo: this.route }
-      );
+    this.productsService.createRecurringDepositProduct(recurringDepositProduct).subscribe({
+      next: (response: any) => {
+        if (response?.rollbackTransaction) {
+          this.alertService.alert({
+            type: 'Success',
+            message: 'Recurring deposit product creation request submitted successfully for approval.'
+          });
+          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

@@ -95,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
-    // the product's own current accounting rule when editing - previously this was hardcoded to 2
-    // unconditionally, which silently forced every edited product onto Cash-based accounting (and
-    // its required GL mappings) even for products that were and should remain "None".
-    const accountingRuleId = this.recurringDepositProductsTemplate?.accountingRule?.id ?? 2;
+    // Cash (2) for a brand-new product, but the product's own current accounting rule when editing -
+    // previously this was hardcoded to 2 unconditionally, which silently forced every edited product
+    // onto Cash-based accounting (and its required GL mappings) even for products that were and
+    // should remain "None". Only an existing product (one with an id) has a rule of its own: the
+    // 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 || [];
@@ -172,11 +175,20 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
     if (this.isCashOrAccrualAccounting()) {
       const glMappings = mappings.otherGlMappingsMap || mappings.otherGlMappings;
       this.setOtherGlMappings('assetsOtherGlMappings', glMappings?.assets || [], this.assetAccountOptions);
-      this.setOtherGlMappings(
-        'liabilitiesOtherGlMappings',
-        glMappings?.liabilities || [],
+      // Interest Paid is a liability clearing account (Dr Payable / Cr Paid, then Dr Paid / Cr RD), saved under
+      // liabilities. Products saved before that kept it under expenses, so both groups are read.
+      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('liabilitiesOtherGlMappings', fromLiabilities, this.liabilityAccountOptions);
       const fromExpenses = this.extractNamedGlMapping(
         this.extractNamedGlMapping(
           glMappings?.expenses || [],
@@ -265,15 +277,15 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
 
     const otherGlMappings = {
       assets: map('assetsOtherGlMappings', this.assetAccountOptions),
-      liabilities: map('liabilitiesOtherGlMappings', this.liabilityAccountOptions),
-      expenses: [
+      liabilities: [
         ...namedAsOtherGlMapping(
           'savingsInterestPaidAccountId',
           RECURRING_DEPOSIT_INTEREST_PAID_ACCOUNT_NAME,
-          this.expenseAccountOptions
+          this.liabilityAccountOptions
         ),
-        ...map('expensesOtherGlMappings', this.expenseAccountOptions)
+        ...map('liabilitiesOtherGlMappings', this.liabilityAccountOptions)
       ],
+      expenses: map('expensesOtherGlMappings', this.expenseAccountOptions),
       income: map('incomeOtherGlMappings', this.incomeAccountOptions)
     };
     return Object.values(otherGlMappings).some((v) => v.length) ? otherGlMappings : null;
@@ -312,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());
 
@@ -330,8 +343,8 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         rows: [
           {
             key: 'savingsReferenceAccountId',
-            label: 'Savings Reference Account',
-            inputLabel: 'Savings reference account',
+            label: 'Recurring Deposit Reference Account',
+            inputLabel: 'Recurring deposit reference account',
             controlName: 'savingsReferenceAccountId',
             options: this.assetAccountOptions,
             required: true
@@ -364,8 +377,8 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
         rows: [
           {
             key: 'savingsControlAccountId',
-            label: 'Savings Control Account',
-            inputLabel: 'Savings control account',
+            label: 'Recurring Deposit Control Account',
+            inputLabel: 'Recurring deposit control account',
             controlName: 'savingsControlAccountId',
             options: this.liabilityAccountOptions,
             required: true
@@ -378,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,
-            accrualOnly: true
+            options: this.liabilityAccountOptions
+          },
+          {
+            key: 'savingsInterestPaidAccountId',
+            label: 'Recurring Deposit Interest Paid',
+            inputLabel: 'Recurring deposit interest paid',
+            controlName: 'savingsInterestPaidAccountId',
+            options: this.liabilityAccountOptions
           },
           {
             key: 'escheatLiabilityId',
@@ -411,13 +433,6 @@ export class RecurringDepositProductAccountingStepComponent implements OnInit {
             controlName: 'interestOnSavingsAccountId',
             options: this.expenseAccountOptions,
             required: true
-          },
-          {
-            key: 'savingsInterestPaidAccountId',
-            label: 'Recurring Deposit Interest Paid',
-            inputLabel: 'Recurring deposit interest paid',
-            controlName: 'savingsInterestPaidAccountId',
-            options: this.expenseAccountOptions
           }
         ],
         otherMappingsControlName: 'expensesOtherGlMappings',

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">
-    <span class="flex-40">{{ 'labels.inputs.Apply Withdrawal Fee for Transfers' | translate }}:</span>
-    <span class="flex-60">{{ recurringDepositProduct.withdrawalFeeForTransfers | yesNo }}</span>
-  </div>
+  @if (recurringDepositProduct.lienMarked && recurringDepositProduct.lienPercentage) {
+    <div class="flex-100 layout-row">
+      <span class="flex-40">Max loan against RD:</span>
+      <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-60">{{ recurringDepositProduct.creditMaturityProceeds | yesNo }}</span>
-  </div>
-
-  <div class="flex-100 layout-row">
-    <span class="flex-40">Penalty Grace Period (Missed Installments):</span>
-    <span class="flex-60">{{ recurringDepositProduct.penaltyGracePeriodMissedInstallments | yesNo }}</span>
-  </div>
-
-  <div class="flex-100 layout-row">
-    <span class="flex-40">Panel Request Applicable:</span>
-    <span class="flex-60">{{ recurringDepositProduct.panelRequestApplicable | yesNo }}</span>
+    <span class="flex-40">Missed Installment Penalty:</span>
+    <span class="flex-60">
+      @if (recurringDepositProduct.penaltyGracePeriodMissedInstallments) {
+        {{
+          recurringDepositProduct.missedInstallmentPenaltyType === 2
+            ? recurringDepositProduct.missedInstallmentPenaltyAmount + '% of installment'
+            : recurringDepositProduct.missedInstallmentPenaltyAmount + ' per installment'
+        }}
+        after {{ recurringDepositProduct.missedInstallmentGraceDays ?? 0 }} grace day(s)
+      } @else {
+        No
+      }
+    </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,

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

@@ -18,10 +18,34 @@
         <mat-checkbox formControlName="loanFacility">Loan Facility</mat-checkbox>
         <mat-checkbox formControlName="prematureWithdrawalOption">Premature Withdrawal option</mat-checkbox>
         <mat-checkbox formControlName="tenureFlexibility">Tenure Flexibility</mat-checkbox>
-        <mat-checkbox formControlName="lienMarked">Lien Marked</mat-checkbox>
-        <mat-checkbox formControlName="withdrawalFeeForTransfers">Apply Withdrawal Fee for Transfers</mat-checkbox>
+        <mat-checkbox
+          formControlName="lienMarked"
+          title="RDs of this product can be pledged as loan security (guarantor account). A pledged RD cannot be closed until the loan is repaid."
+          >Lien Marked (can be pledged for a loan)</mat-checkbox
+        >
       </div>
 
+      @if (recurringDepositProductSettingsForm.value.lienMarked) {
+        <div class="rdps-lockin-fields">
+          <mat-form-field appearance="outline" class="rdps-field" subscriptSizing="dynamic">
+            <mat-label>Max loan against RD (% of balance)</mat-label>
+            <input type="number" matInput formControlName="lienPercentage" min="1" max="100" step="0.01" required />
+            <mat-hint>
+              e.g. 90 = loan up to 90% of the RD balance. Lien is checked when the RD is added as a loan guarantor.
+            </mat-hint>
+            @if (recurringDepositProductSettingsForm.get('lienPercentage').hasError('required')) {
+              <mat-error>Enter the percentage of the RD balance that can be given as loan</mat-error>
+            }
+            @if (
+              recurringDepositProductSettingsForm.get('lienPercentage').hasError('min') ||
+              recurringDepositProductSettingsForm.get('lienPercentage').hasError('max')
+            ) {
+              <mat-error>Must be between 1 and 100</mat-error>
+            }
+          </mat-form-field>
+        </div>
+      }
+
       <mat-checkbox class="rdps-preclosure-toggle" formControlName="preClosurePenalApplicable">
         {{ 'labels.inputs.Apply Penal Interest (less)' | translate }}
       </mat-checkbox>
@@ -93,34 +117,85 @@
     </div>
     <div class="rdps-body rdps-body--list">
       <div class="rdps-list-row">
-        <span>Maturity Instructions</span>
+        <span>
+          Execute maturity instruction automatically
+          <small class="rdps-row-hint">
+            On maturity day the instruction chosen when the RD was opened runs by itself - Transfer to Savings (to
+            the chosen or linked savings account) or Reinvest. Off: the RD stays Matured, earning the post-maturity
+            rate, until staff close it. Never runs while the RD has a lien.
+          </small>
+        </span>
         <mat-checkbox formControlName="maturityInstructions"></mat-checkbox>
       </div>
       <div class="rdps-list-row">
-        <span
-          >Option to credit maturity proceeds directly to the linked account or reinvest in another product (like
-          FD).</span
-        >
-        <mat-checkbox formControlName="creditMaturityProceeds"></mat-checkbox>
-      </div>
-      <div class="rdps-list-row">
-        <span>Penalty / Grace Period for Missed Installments</span>
+        <span>
+          Penalty / Grace Period for Missed Installments
+          <small class="rdps-row-hint">
+            An installment still unpaid after the grace days is charged a penalty once, collected from the RD
+            balance (Income From Penalties).
+          </small>
+        </span>
         <mat-checkbox formControlName="penaltyGracePeriodMissedInstallments"></mat-checkbox>
       </div>
+      @if (recurringDepositProductSettingsForm.value.penaltyGracePeriodMissedInstallments) {
+        <div class="rdps-lockin-fields rdps-penalty-fields">
+          <mat-form-field appearance="outline" class="rdps-field" subscriptSizing="dynamic">
+            <mat-label>Grace days</mat-label>
+            <input type="number" matInput formControlName="missedInstallmentGraceDays" min="0" step="1" required />
+            <mat-hint>Due 10th + 5 grace days = penalty from the 16th</mat-hint>
+            @if (recurringDepositProductSettingsForm.get('missedInstallmentGraceDays').invalid) {
+              <mat-error>Whole days, 0 or more</mat-error>
+            }
+          </mat-form-field>
+          <mat-form-field appearance="outline" class="rdps-field" subscriptSizing="dynamic">
+            <mat-label>Penalty type</mat-label>
+            <mat-select formControlName="missedInstallmentPenaltyType" required>
+              <mat-option [value]="1">Flat amount per installment</mat-option>
+              <mat-option [value]="2">% of the installment</mat-option>
+            </mat-select>
+          </mat-form-field>
+          <mat-form-field appearance="outline" class="rdps-field" subscriptSizing="dynamic">
+            <mat-label>{{
+              recurringDepositProductSettingsForm.value.missedInstallmentPenaltyType === 2 ? 'Penalty (%)' : 'Penalty amount'
+            }}</mat-label>
+            <input type="number" matInput formControlName="missedInstallmentPenaltyAmount" min="0.01" step="0.01" required />
+            @if (recurringDepositProductSettingsForm.get('missedInstallmentPenaltyAmount').invalid) {
+              <mat-error>{{
+                recurringDepositProductSettingsForm.value.missedInstallmentPenaltyType === 2
+                  ? 'Between 0.01 and 100'
+                  : 'Must be more than 0'
+              }}</mat-error>
+            }
+          </mat-form-field>
+        </div>
+      }
       <div class="rdps-list-row">
-        <span>Panel Request Applicable</span>
-        <mat-checkbox formControlName="panelRequestApplicable"></mat-checkbox>
-      </div>
-      <div class="rdps-list-row">
-        <span>No penalty for nominee / legal heir closure</span>
+        <span>
+          No penalty for nominee / legal heir closure
+          <small class="rdps-row-hint">
+            Premature close with reason "Nominee / legal heir claim" pays the full slab rate - no pre-closure penalty.
+          </small>
+        </span>
         <mat-checkbox formControlName="noPenaltyNomineeHeirClosure"></mat-checkbox>
       </div>
       <div class="rdps-list-row">
-        <span>Deceased Settlement</span>
+        <span>
+          Deceased Settlement
+          <small class="rdps-row-hint">
+            Premature close with reason "Account holder deceased": no penalty, allowed even inside lock-in, and the
+            proceeds may go to a nominee's savings account.
+          </small>
+        </span>
         <mat-checkbox formControlName="deceasedSettlement"></mat-checkbox>
       </div>
       <div class="rdps-list-row">
-        <span>Allow Debit Txn after due date</span>
+        <span>
+          Allow Debit Txn after due date
+          <small class="rdps-row-hint">
+            For RDs on Auto Debit. On: a missed installment keeps being collected on later days. Off: it is debited
+            only on its due date; a missed one stays overdue.
+          </small>
+        </span>
         <mat-checkbox formControlName="allowDebitTxnAfterDueDate"></mat-checkbox>
       </div>
     </div>

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

@@ -112,6 +112,17 @@ $gray-900: #202124;
   padding: 0 24px;
 }
 
+.rdps-row-hint {
+  display: block;
+  margin-top: 2px;
+  font-size: 12px;
+  opacity: 0.7;
+}
+
+.rdps-penalty-fields {
+  padding: 12px 0 4px;
+}
+
 .rdps-list-row {
   display: flex;
   align-items: center;

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

@@ -7,7 +7,7 @@
  */
 
 import { Component, OnInit, Input, inject } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { UntypedFormGroup, UntypedFormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
@@ -44,7 +44,9 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
         prematureWithdrawalOption: this.recurringDepositProductsTemplate.prematureWithdrawalOption ?? false,
         tenureFlexibility: this.recurringDepositProductsTemplate.tenureFlexibility ?? false,
         lienMarked: this.recurringDepositProductsTemplate.lienMarked ?? false,
-        withdrawalFeeForTransfers: this.recurringDepositProductsTemplate.withdrawalFeeForTransfers ?? false,
+        lienPercentage: this.recurringDepositProductsTemplate.lienPercentage ?? '',
+        // Not offered for recurring deposits - no withdrawal fee is ever charged on one - so it is always off.
+        withdrawalFeeForTransfers: false,
         enableLockinPeriod: this.recurringDepositProductsTemplate.enableLockinPeriod ?? false,
         lockinPeriodFrequency: this.recurringDepositProductsTemplate.lockinPeriodFrequency ?? '',
         lockinPeriodFrequencyType: this.recurringDepositProductsTemplate.lockinPeriodFrequencyType?.id ?? '',
@@ -52,10 +54,11 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
         preClosurePenalInterest: this.recurringDepositProductsTemplate.preClosurePenalInterest ?? '',
         preClosurePenalInterestOnTypeId: this.recurringDepositProductsTemplate.preClosurePenalInterestOnType?.id ?? '',
         maturityInstructions: this.recurringDepositProductsTemplate.maturityInstructions ?? false,
-        creditMaturityProceeds: this.recurringDepositProductsTemplate.creditMaturityProceeds ?? false,
         penaltyGracePeriodMissedInstallments:
           this.recurringDepositProductsTemplate.penaltyGracePeriodMissedInstallments ?? false,
-        panelRequestApplicable: this.recurringDepositProductsTemplate.panelRequestApplicable ?? false,
+        missedInstallmentGraceDays: this.recurringDepositProductsTemplate.missedInstallmentGraceDays ?? 0,
+        missedInstallmentPenaltyType: this.recurringDepositProductsTemplate.missedInstallmentPenaltyType ?? 1,
+        missedInstallmentPenaltyAmount: this.recurringDepositProductsTemplate.missedInstallmentPenaltyAmount ?? '',
         noPenaltyNomineeHeirClosure: this.recurringDepositProductsTemplate.noPenaltyNomineeHeirClosure ?? false,
         deceasedSettlement: this.recurringDepositProductsTemplate.deceasedSettlement ?? false,
         allowDebitTxnAfterDueDate: this.recurringDepositProductsTemplate.allowDebitTxnAfterDueDate ?? false,
@@ -72,6 +75,7 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
       prematureWithdrawalOption: [false],
       tenureFlexibility: [false],
       lienMarked: [false],
+      lienPercentage: [''],
       withdrawalFeeForTransfers: [false],
       enableLockinPeriod: [false],
       lockinPeriodFrequency: [''],
@@ -80,21 +84,71 @@ export class RecurringDepositProductSettingsStepComponent implements OnInit {
       preClosurePenalInterest: [''],
       preClosurePenalInterestOnTypeId: [''],
       maturityInstructions: [false],
-      creditMaturityProceeds: [false],
       penaltyGracePeriodMissedInstallments: [false],
-      panelRequestApplicable: [false],
+      missedInstallmentGraceDays: [0],
+      missedInstallmentPenaltyType: [1],
+      missedInstallmentPenaltyAmount: [''],
       noPenaltyNomineeHeirClosure: [false],
       deceasedSettlement: [false],
       allowDebitTxnAfterDueDate: [false],
       accountClosedZeroBalanceInDayClosing: [false],
       minBalanceForInterestCalculation: ['']
     });
+    // The loan limit only means something - and is only required - while the product allows a lien.
+    const lienMarked = this.recurringDepositProductSettingsForm.get('lienMarked');
+    const lienPercentage = this.recurringDepositProductSettingsForm.get('lienPercentage');
+    lienMarked.valueChanges.subscribe((marked: boolean) => {
+      if (marked) {
+        lienPercentage.setValidators([
+          Validators.required,
+          Validators.min(1),
+          Validators.max(100)
+        ]);
+      } else {
+        lienPercentage.clearValidators();
+      }
+      lienPercentage.updateValueAndValidity();
+    });
+    // Missed-installment penalty: its three fields are only required - and only sent - while it is switched on.
+    const penaltyOn = this.recurringDepositProductSettingsForm.get('penaltyGracePeriodMissedInstallments');
+    const graceDays = this.recurringDepositProductSettingsForm.get('missedInstallmentGraceDays');
+    const penaltyType = this.recurringDepositProductSettingsForm.get('missedInstallmentPenaltyType');
+    const penaltyAmount = this.recurringDepositProductSettingsForm.get('missedInstallmentPenaltyAmount');
+    const syncPenaltyValidators = () => {
+      if (penaltyOn.value) {
+        graceDays.setValidators([
+          Validators.required,
+          Validators.min(0),
+          Validators.pattern(/^\d+$/)
+        ]);
+        penaltyType.setValidators([Validators.required]);
+        penaltyAmount.setValidators([
+          Validators.required,
+          Validators.min(0.01),
+          ...(penaltyType.value === 2 ? [Validators.max(100)] : [])
+        ]);
+      } else {
+        graceDays.clearValidators();
+        penaltyType.clearValidators();
+        penaltyAmount.clearValidators();
+      }
+      graceDays.updateValueAndValidity({ emitEvent: false });
+      penaltyType.updateValueAndValidity({ emitEvent: false });
+      penaltyAmount.updateValueAndValidity({ emitEvent: false });
+    };
+    penaltyOn.valueChanges.subscribe(syncPenaltyValidators);
+    penaltyType.valueChanges.subscribe(syncPenaltyValidators);
   }
 
   get recurringDepositProductSettings() {
     const settings = { ...this.recurringDepositProductSettingsForm.value };
+    if (!settings.penaltyGracePeriodMissedInstallments) {
+      delete settings.missedInstallmentGraceDays;
+      delete settings.missedInstallmentPenaltyType;
+      delete settings.missedInstallmentPenaltyAmount;
+    }
     for (const key in settings) {
-      if (settings[key] === '') {
+      if (settings[key] === '' || settings[key] === null) {
         delete settings[key];
       }
     }

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

@@ -10,18 +10,62 @@
   <div class="rdpt-section">
     <div class="rdpt-section__header">
       <span class="rdpt-section__badge"><i class="fas fa-coins"></i></span>
-      <span>Deposit Amount</span>
+      <span>Installment Amount (per period)</span>
     </div>
     <div class="rdpt-body">
       <div class="rdpt-grid rdpt-grid--three">
-        <mat-form-field appearance="outline" class="rdpt-field">
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
           <mat-label>Minimum</mat-label>
           <input type="number" matInput formControlName="minDepositAmount" min="0" step="0.01" />
+          <mat-hint>Smallest installment an account may commit to. Blank = no limit.</mat-hint>
+          @if (recurringDepositProductTermsForm.get('minDepositAmount').hasError('min')) {
+            <mat-error>Minimum must be zero or greater</mat-error>
+          }
         </mat-form-field>
 
-        <mat-form-field appearance="outline" class="rdpt-field">
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
           <mat-label>Maximum</mat-label>
           <input type="number" matInput formControlName="maxDepositAmount" min="0" step="0.01" />
+          <mat-hint>Largest installment an account may commit to. Blank = no limit.</mat-hint>
+          @if (recurringDepositProductTermsForm.get('maxDepositAmount').hasError('min')) {
+            <mat-error>Maximum must be zero or greater</mat-error>
+          }
+        </mat-form-field>
+      </div>
+      @if (recurringDepositProductTermsForm.hasError('maxBelowMin')) {
+        <div class="rdpt-note">
+          <span>⚠️</span>
+          <span>Maximum installment cannot be less than the minimum.</span>
+        </div>
+      }
+    </div>
+  </div>
+  <div class="rdpt-section">
+    <div class="rdpt-section__header">
+      <span class="rdpt-section__badge"><i class="fas fa-hourglass-half"></i></span>
+      <span>Tenure</span>
+    </div>
+    <div class="rdpt-body">
+      <div class="rdpt-grid rdpt-grid--three">
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
+          <mat-label>Minimum Tenure</mat-label>
+          <input type="number" matInput formControlName="minDepositTerm" min="1" step="1" required />
+          <mat-hint>Shortest RD this product opens. The rate chart starts here.</mat-hint>
+          @if (recurringDepositProductTermsForm.get('minDepositTerm').hasError('required')) {
+            <mat-error>Minimum Tenure <strong>is required</strong></mat-error>
+          }
+          @if (recurringDepositProductTermsForm.get('minDepositTerm').hasError('min')) {
+            <mat-error>Minimum Tenure must be at least 1</mat-error>
+          }
+        </mat-form-field>
+
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
+          <mat-label>Minimum Tenure In</mat-label>
+          <mat-select formControlName="minDepositTermTypeId" required>
+            @for (unit of tenureUnitOptions; track unit.id) {
+              <mat-option [value]="unit.id">{{ unit.value }}</mat-option>
+            }
+          </mat-select>
         </mat-form-field>
       </div>
     </div>
@@ -35,51 +79,54 @@
       <div class="rdpt-banner">
         <span class="rdpt-banner__icon">ℹ️</span>
         <span>
-          Recurring Deposit base rate:
-          <b>{{ recurringDepositProductTermsForm.get('nominalAnnualInterestRate').value }}%</b>
+          The rate an RD earns during its term always comes from the <b>CBS Base Chart</b> slab for its tenure. The
+          rate below applies only after maturity.
         </span>
       </div>
 
       <div class="rdpt-grid rdpt-grid--three">
-        <mat-form-field appearance="outline" class="rdpt-field">
-          <mat-label>{{ 'labels.inputs.Nominal Annual Interest' | translate }}</mat-label>
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
+          <mat-label>Post-Maturity Interest Rate (%)</mat-label>
           <input
             type="number"
             matInput
-            matTooltip="{{ 'tooltips.The default interest rate set' | translate }}"
+            matTooltip="Simple interest a matured RD earns from its maturity date until the customer actually collects it"
             formControlName="nominalAnnualInterestRate"
             required
             min="0"
             step="0.01"
           />
+          <mat-hint>Paid from maturity date to closure date if collected late. 0 = nothing extra.</mat-hint>
           @if (recurringDepositProductTermsForm.get('nominalAnnualInterestRate').hasError('required')) {
             <mat-error>
-              {{ 'labels.inputs.Nominal Annual Interest' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
+              Post-Maturity Interest Rate {{ 'labels.commons.is' | translate }}
+              <strong>{{ 'labels.commons.required' | translate }}</strong> (enter 0 for none)
             </mat-error>
           }
           @if (recurringDepositProductTermsForm.get('nominalAnnualInterestRate').hasError('min')) {
-            <mat-error>{{ 'labels.inputs.Nominal Annual Interest' | translate }} must be zero or greater</mat-error>
+            <mat-error>Post-Maturity Interest Rate must be zero or greater</mat-error>
           }
         </mat-form-field>
 
-        <mat-form-field appearance="outline" class="rdpt-field">
-          <mat-label>Effective Date</mat-label>
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
+          <mat-label>Product Effective From</mat-label>
           <input matInput [matDatepicker]="effectiveDatePicker" formControlName="effectiveDate" />
           <mat-datepicker-toggle matSuffix [for]="effectiveDatePicker"></mat-datepicker-toggle>
           <mat-datepicker #effectiveDatePicker></mat-datepicker>
+          <mat-hint>No RD can be opened under this product before this date. Blank = from today.</mat-hint>
         </mat-form-field>
 
-        <mat-form-field appearance="outline" class="rdpt-field">
+        <mat-form-field appearance="outline" class="rdpt-field" subscriptSizing="dynamic">
           <mat-label>{{ 'labels.inputs.Interest Calculation Type' | translate }}</mat-label>
           <mat-select
             formControlName="interestCalculateSelector"
-            matTooltip="{{ 'tooltips.The method used to calculate interest' | translate }}"
+            matTooltip="Compounding: interest also earns interest. Simple: interest is earned on installments only."
           >
             @for (opt of interestCalculationTypeOptionData; track opt.id) {
               <mat-option [value]="opt.id">{{ opt.value }}</mat-option>
             }
           </mat-select>
+          <mat-hint>{{ interestCalculationTypeHint }}</mat-hint>
         </mat-form-field>
       </div>
 
@@ -117,17 +164,6 @@
           <mat-error>Days in Year <strong>is required</strong></mat-error>
         </mat-form-field>
 
-        @if (recurringDepositProductTermsForm.value.interestCalculationType === 2) {
-          <mat-form-field appearance="outline" class="rdpt-field">
-            <mat-label>Average Period</mat-label>
-            <mat-select formControlName="averagePeriod">
-              @for (period of periodFrequencyData; track period.id) {
-                <mat-option [value]="period.value">{{ period.value }}</mat-option>
-              }
-            </mat-select>
-          </mat-form-field>
-        }
-
         <mat-form-field appearance="outline" class="rdpt-field">
           <mat-label>{{ 'labels.inputs.Interest Posting Period' | translate }}</mat-label>
           <mat-select
@@ -149,35 +185,6 @@
       </div>
 
       <div class="rdpt-footer">
-        <div class="rdpt-footer__grid">
-          <div class="rdpt-toggle-card">
-            <div>
-              <h4>Auto Interest Post</h4>
-            </div>
-            <div class="rdpt-toggle-card__choices">
-              @for (option of yesNoOptions; track option.value) {
-                <label class="inline-flex items-center cursor-pointer">
-                  <input type="radio" class="w-4 h-4" formControlName="autoPost" [value]="option.value" />
-                  <span class="ml-2 text-sm">{{ option.label }}</span>
-                </label>
-              }
-            </div>
-          </div>
-
-          <mat-form-field appearance="outline" class="rdpt-field">
-            <mat-label>Frequency (Fix Day)</mat-label>
-            <input type="number" matInput formControlName="frequencyFixDay" />
-            <mat-hint>Days</mat-hint>
-          </mat-form-field>
-
-          <mat-form-field appearance="outline" class="rdpt-field">
-            <mat-label>Last Interest Date</mat-label>
-            <input matInput [matDatepicker]="lastInterestDatePicker" formControlName="lastInterestDate" />
-            <mat-datepicker-toggle matSuffix [for]="lastInterestDatePicker"></mat-datepicker-toggle>
-            <mat-datepicker #lastInterestDatePicker></mat-datepicker>
-          </mat-form-field>
-        </div>
-
         @if (recurringDepositProductTermsForm.value.interestCalculationType === 1) {
           <div class="rdpt-note">
             <span>⚠️</span>

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

@@ -7,12 +7,32 @@
  */
 
 import { Component, OnInit, Input, inject } from '@angular/core';
-import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
+import { AbstractControl, UntypedFormGroup, UntypedFormBuilder, ValidationErrors, Validators } from '@angular/forms';
 import { MatTooltip } from '@angular/material/tooltip';
 import { Dates } from 'app/core/utils/dates';
 import { SettingsService } from 'app/settings/settings.service';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
+/** Interest Calculation Type options a recurring deposit actually honours (matched by label, as the server does). */
+const RD_INTEREST_CALCULATION_OPTIONS = [
+  'compounding',
+  'simple'
+];
+
+/** SavingsPeriodFrequencyType ids an RD tenure is counted in. */
+const RD_TENURE_MONTHS = 2;
+const RD_TENURE_YEARS = 3;
+
+/** Max installment below min installment would make every account impossible to open. */
+function maxNotBelowMin(group: AbstractControl): ValidationErrors | null {
+  const min = group.get('minDepositAmount')?.value;
+  const max = group.get('maxDepositAmount')?.value;
+  if (min === '' || min === null || max === '' || max === null) {
+    return null;
+  }
+  return Number(max) < Number(min) ? { maxBelowMin: true } : null;
+}
+
 @Component({
   selector: 'mifosx-recurring-deposit-product-terms-step',
   templateUrl: './recurring-deposit-product-terms-step.component.html',
@@ -33,14 +53,13 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
 
   interestCompoundingPeriodTypeData: any;
   interestPostingPeriodTypeData: any;
+  readonly tenureUnitOptions = [
+    { id: RD_TENURE_MONTHS, value: 'Months' },
+    { id: RD_TENURE_YEARS, value: 'Years' }
+  ];
   interestCalculationTypeData: any;
   interestCalculationTypeOptionData: any;
   interestCalculationDaysInYearTypeData: any;
-  periodFrequencyData: any[] = [];
-  yesNoOptions: Array<{ value: boolean; label: string }> = [
-    { value: true, label: 'Yes' },
-    { value: false, label: 'No' }
-  ];
 
   constructor() {
     this.createrecurringDepositProductTermsForm();
@@ -51,28 +70,31 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
     this.interestPostingPeriodTypeData = this.recurringDepositProductsTemplate.interestPostingPeriodTypeOptions;
     // Standard enum (1=Daily, 2=Average) → "Interest Calculate" dropdown → interestCalculationType form control
     this.interestCalculationTypeData = this.recurringDepositProductsTemplate.interestCalculationTypeOptions;
-    // CBS code values → "Interest Calculation Type" dropdown → interestCalculateSelector form control
-    this.interestCalculationTypeOptionData = this.recurringDepositProductsTemplate.interestCalculationTypeOption || [];
+    // CBS code values → "Interest Calculation Type" dropdown → interestCalculateSelector form control. The code is
+    // shared with savings/current products, so values an RD ignores (e.g. "Accrual") are left out here.
+    this.interestCalculationTypeOptionData = (this.recurringDepositProductsTemplate.interestCalculationTypeOption || []).filter(
+      (opt: any) => RD_INTEREST_CALCULATION_OPTIONS.includes(this.optionLabel(opt))
+    );
     this.interestCalculationDaysInYearTypeData =
       this.recurringDepositProductsTemplate.interestCalculationDaysInYearTypeOptions;
-    this.periodFrequencyData = this.recurringDepositProductsTemplate.periodFrequencyOptions || [];
-    this.setYesNoOptions(this.recurringDepositProductsTemplate?.yesNoOptions);
 
     const isEditing = !!this.recurringDepositProductsTemplate.id;
-    const defaultPeriod = this.periodFrequencyData[0]?.value || 'Monthly';
     const savedEnumTypeId =
       this.recurringDepositProductsTemplate.interestCalculationType?.id ||
       this.interestCalculationTypeData?.[0]?.id ||
       1;
+    const compoundingId =
+      this.interestCalculationTypeOptionData.find((opt: any) => this.optionLabel(opt) === 'compounding')?.id ?? null;
     const savedSelectorId = isEditing
-      ? (this.recurringDepositProductsTemplate.interestCalculateSelector ??
-        this.interestCalculationTypeOptionData?.[0]?.id ??
-        null)
-      : (this.interestCalculationTypeOptionData?.[0]?.id ?? null);
+      ? (this.recurringDepositProductsTemplate.interestCalculateSelector ?? compoundingId)
+      : compoundingId;
 
     this.recurringDepositProductTermsForm.patchValue({
       nominalAnnualInterestRate: this.recurringDepositProductsTemplate.nominalAnnualInterestRate ?? 0,
       interestCompoundingPeriodType: this.recurringDepositProductsTemplate.interestCompoundingPeriodType?.id,
+      // RD interest is never posted period by period - the server credits it once, at maturity or premature
+      // closure - so the period is not offered. The field is still required by the server and must be no shorter
+      // than the compounding period, which Annually always satisfies.
       interestPostingPeriodType: this.recurringDepositProductsTemplate.interestPostingPeriodType?.id,
       interestCalculationType: savedEnumTypeId,
       interestCalculationDaysInYearType: this.recurringDepositProductsTemplate.interestCalculationDaysInYearType?.id,
@@ -80,17 +102,29 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
         ? this.parseDate(this.recurringDepositProductsTemplate.effectiveDate)
         : '',
       interestCalculateSelector: savedSelectorId,
-      averagePeriod: isEditing ? this.recurringDepositProductsTemplate.averagePeriod || defaultPeriod : defaultPeriod,
-      autoPost: isEditing ? (this.recurringDepositProductsTemplate.autoPost ?? true) : true,
-      frequencyFixDay: isEditing ? (this.recurringDepositProductsTemplate.frequencyFixDay ?? 30) : 30,
-      lastInterestDate: this.recurringDepositProductsTemplate.lastInterestDate
-        ? this.parseDate(this.recurringDepositProductsTemplate.lastInterestDate)
-        : '',
       minDepositAmount: this.recurringDepositProductsTemplate.minDepositAmount ?? '',
-      maxDepositAmount: this.recurringDepositProductsTemplate.maxDepositAmount ?? ''
+      maxDepositAmount: this.recurringDepositProductsTemplate.maxDepositAmount ?? '',
+      minDepositTerm: this.recurringDepositProductsTemplate.minDepositTerm ?? '',
+      minDepositTermTypeId: this.recurringDepositProductsTemplate.minDepositTermType?.id ?? RD_TENURE_MONTHS
     });
   }
 
+  /** What the chosen Interest Calculation Type does to an account's interest. */
+  get interestCalculationTypeHint(): string {
+    const selected = (this.interestCalculationTypeOptionData || []).find(
+      (opt: any) => opt.id === this.recurringDepositProductTermsForm.value.interestCalculateSelector
+    );
+    return this.optionLabel(selected) === 'simple'
+      ? 'Interest is earned on installments only - it never earns interest itself.'
+      : 'Interest earns interest every compounding period; all of it is credited at maturity.';
+  }
+
+  private optionLabel(opt: any): string {
+    return String(opt?.value ?? opt?.name ?? '')
+      .trim()
+      .toLowerCase();
+  }
+
   private parseDate(dateValue: any): Date | null {
     if (!dateValue) return null;
     if (Array.isArray(dateValue)) {
@@ -100,57 +134,56 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
     return new Date(dateValue);
   }
 
-  private setYesNoOptions(options: any[]) {
-    if (!Array.isArray(options)) return;
-    const mapped = options
-      .map((opt: any) => {
-        const raw = opt?.name ?? opt?.value ?? opt;
-        const norm = typeof raw === 'string' ? raw.trim().toUpperCase() : raw;
-        if (norm === 'YES') return { value: true, label: 'Yes' };
-        if (norm === 'NO') return { value: false, label: 'No' };
-        return null;
-      })
-      .filter(Boolean);
-    if (mapped.length) this.yesNoOptions = mapped;
-  }
-
   createrecurringDepositProductTermsForm() {
-    this.recurringDepositProductTermsForm = this.formBuilder.group({
-      nominalAnnualInterestRate: [
-        '',
-        [
-          Validators.required,
+    this.recurringDepositProductTermsForm = this.formBuilder.group(
+      {
+        nominalAnnualInterestRate: [
+          '',
+          [
+            Validators.required,
+            Validators.min(0)
+          ]
+        ],
+        interestCompoundingPeriodType: [
+          '',
+          Validators.required
+        ],
+        interestPostingPeriodType: [
+          '',
+          Validators.required
+        ],
+        interestCalculationType: [
+          '',
+          Validators.required
+        ],
+        interestCalculationDaysInYearType: [
+          '',
+          Validators.required
+        ],
+        effectiveDate: [''],
+        interestCalculateSelector: [null],
+        minDepositAmount: [
+          '',
           Validators.min(0)
+        ],
+        maxDepositAmount: [
+          '',
+          Validators.min(0)
+        ],
+        minDepositTerm: [
+          '',
+          [
+            Validators.required,
+            Validators.min(1)
+          ]
+        ],
+        minDepositTermTypeId: [
+          RD_TENURE_MONTHS,
+          Validators.required
         ]
-      ],
-      interestCompoundingPeriodType: [
-        '',
-        Validators.required
-      ],
-      interestPostingPeriodType: [
-        '',
-        Validators.required
-      ],
-      interestCalculationType: [
-        '',
-        Validators.required
-      ],
-      interestCalculationDaysInYearType: [
-        '',
-        Validators.required
-      ],
-      effectiveDate: [''],
-      interestCalculateSelector: [1],
-      averagePeriod: ['Monthly'],
-      autoPost: [true],
-      frequencyFixDay: [
-        30,
-        [Validators.min(0)]
-      ],
-      lastInterestDate: [''],
-      minDepositAmount: [''],
-      maxDepositAmount: ['']
-    });
+      },
+      { validators: maxNotBelowMin }
+    );
   }
 
   get recurringDepositProductTerms() {
@@ -160,8 +193,6 @@ export class RecurringDepositProductTermsStepComponent implements OnInit {
     if (formValue.effectiveDate instanceof Date) {
       formValue.effectiveDate = this.dateUtils.formatDate(formValue.effectiveDate, dateFormat) || '';
     }
-    formValue.minDepositAmount = formValue.minDepositAmount;
-    formValue.maxDepositAmount = formValue.maxDepositAmount;
     return formValue;
   }
 }

src/app/products/recurring-deposit-products/view-recurring-deposit-product/recurring-deposit-general-tab/recurring-deposit-general-tab.component.html

@@ -190,14 +190,14 @@
         </span>
       </div>
       <div class="vsp-kv">
-        <span class="vsp-k">{{ 'labels.inputs.Nominal Annual Interest' | translate }}</span>
+        <span class="vsp-k">Post-Maturity Interest Rate</span>
         <span class="vsp-v vsp-v--accent"
           >{{ recurringDepositProduct.nominalAnnualInterestRate | formatNumber }}<span class="vsp-suffix">%</span></span
         >
       </div>
       @if (recurringDepositProduct.effectiveDate) {
         <div class="vsp-kv">
-          <span class="vsp-k">Effective Date</span>
+          <span class="vsp-k">Product Effective From</span>
           <span class="vsp-v">{{ recurringDepositProduct.effectiveDate | dateFormat }}</span>
         </div>
       }
@@ -211,12 +211,6 @@
         <span class="vsp-k">Interest Calculate</span>
         <span class="vsp-v">{{ recurringDepositProduct.interestCalculationType?.value }}</span>
       </div>
-      @if (recurringDepositProduct.averagePeriod) {
-        <div class="vsp-kv">
-          <span class="vsp-k">Average Period</span>
-          <span class="vsp-v">{{ recurringDepositProduct.averagePeriod }}</span>
-        </div>
-      }
       <div class="vsp-kv">
         <span class="vsp-k">{{ 'labels.inputs.Interest Posting Period' | translate }}</span>
         <span class="vsp-v">{{ recurringDepositProduct.interestPostingPeriodType.value }}</span>
@@ -229,30 +223,6 @@
         <span class="vsp-k">{{ 'labels.inputs.Days in Year' | translate }}</span>
         <span class="vsp-v">{{ recurringDepositProduct.interestCalculationDaysInYearType.value }}</span>
       </div>
-      <div class="vsp-kv">
-        <span class="vsp-k">Auto Post</span>
-        <span class="vsp-v">
-          <span
-            class="vsp-pill"
-            [class.vsp-pill--green]="recurringDepositProduct.autoPost"
-            [class.vsp-pill--gray]="!recurringDepositProduct.autoPost"
-          >
-            {{ recurringDepositProduct.autoPost | yesNo }}
-          </span>
-        </span>
-      </div>
-      @if (recurringDepositProduct.frequencyFixDay) {
-        <div class="vsp-kv">
-          <span class="vsp-k">Frequency (Fix Day)</span>
-          <span class="vsp-v">{{ recurringDepositProduct.frequencyFixDay }}</span>
-        </div>
-      }
-      @if (recurringDepositProduct.lastInterestDate) {
-        <div class="vsp-kv">
-          <span class="vsp-k">Last Interest Date</span>
-          <span class="vsp-v">{{ recurringDepositProduct.lastInterestDate | dateFormat }}</span>
-        </div>
-      }
     </div>
   </section>
 
@@ -313,18 +283,12 @@
           </span>
         </span>
       </div>
-      <div class="vsp-kv">
-        <span class="vsp-k">{{ 'labels.inputs.Apply Withdrawal Fee for Transfers' | translate }}</span>
-        <span class="vsp-v">
-          <span
-            class="vsp-pill"
-            [class.vsp-pill--green]="recurringDepositProduct.withdrawalFeeForTransfers"
-            [class.vsp-pill--gray]="!recurringDepositProduct.withdrawalFeeForTransfers"
-          >
-            {{ recurringDepositProduct.withdrawalFeeForTransfers | yesNo }}
-          </span>
-        </span>
-      </div>
+      @if (recurringDepositProduct.lienMarked && recurringDepositProduct.lienPercentage) {
+        <div class="vsp-kv">
+          <span class="vsp-k">Max loan against RD</span>
+          <span class="vsp-v">{{ recurringDepositProduct.lienPercentage }}% of balance</span>
+        </div>
+      }
     </div>
 
     <h4 class="vsp-sub-h">{{ 'labels.inputs.Lock-in Period' | translate }}</h4>
@@ -355,7 +319,7 @@
     <h4 class="vsp-sub-h">Maturity Instructions</h4>
     <div class="vsp-grid">
       <div class="vsp-kv">
-        <span class="vsp-k">Maturity Instructions</span>
+        <span class="vsp-k">Execute Maturity Instruction Automatically</span>
         <span class="vsp-v">
           <span
             class="vsp-pill"
@@ -367,39 +331,18 @@
         </span>
       </div>
       <div class="vsp-kv">
-        <span class="vsp-k">Credit Maturity Proceeds</span>
+        <span class="vsp-k">Missed Installment Penalty</span>
         <span class="vsp-v">
-          <span
-            class="vsp-pill"
-            [class.vsp-pill--green]="recurringDepositProduct.creditMaturityProceeds"
-            [class.vsp-pill--gray]="!recurringDepositProduct.creditMaturityProceeds"
-          >
-            {{ recurringDepositProduct.creditMaturityProceeds | yesNo }}
-          </span>
-        </span>
-      </div>
-      <div class="vsp-kv">
-        <span class="vsp-k">Penalty Grace Period (Missed Installments)</span>
-        <span class="vsp-v">
-          <span
-            class="vsp-pill"
-            [class.vsp-pill--green]="recurringDepositProduct.penaltyGracePeriodMissedInstallments"
-            [class.vsp-pill--gray]="!recurringDepositProduct.penaltyGracePeriodMissedInstallments"
-          >
-            {{ recurringDepositProduct.penaltyGracePeriodMissedInstallments | yesNo }}
-          </span>
-        </span>
-      </div>
-      <div class="vsp-kv">
-        <span class="vsp-k">Panel Request Applicable</span>
-        <span class="vsp-v">
-          <span
-            class="vsp-pill"
-            [class.vsp-pill--green]="recurringDepositProduct.panelRequestApplicable"
-            [class.vsp-pill--gray]="!recurringDepositProduct.panelRequestApplicable"
-          >
-            {{ recurringDepositProduct.panelRequestApplicable | yesNo }}
-          </span>
+          @if (recurringDepositProduct.penaltyGracePeriodMissedInstallments) {
+            {{
+              recurringDepositProduct.missedInstallmentPenaltyType === 2
+                ? recurringDepositProduct.missedInstallmentPenaltyAmount + '% of installment'
+                : recurringDepositProduct.missedInstallmentPenaltyAmount + ' per installment'
+            }}
+            after {{ recurringDepositProduct.missedInstallmentGraceDays ?? 0 }} grace day(s)
+          } @else {
+            <span class="vsp-pill vsp-pill--gray">{{ false | yesNo }}</span>
+          }
         </span>
       </div>
       <div class="vsp-kv">
@@ -752,6 +695,7 @@
     <mifosx-view-savings-accounting-details
       [accountingRule]="recurringDepositProduct.accountingRule"
       [accountingMappings]="recurringDepositProduct.accountingMappings"
+      productLabel="Recurring deposit"
     ></mifosx-view-savings-accounting-details>
   </section>
 

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

@@ -144,7 +144,7 @@
         </button>
       }
       @if (savingProductFormValid && selectedTabIndex === totalTabs - 1) {
-        <button mat-raised-button color="primary" (click)="submit()">
+        <button mat-raised-button color="primary" [disabled]="submitting" (click)="submit()">
           <i class="fas fa-check" style="margin-right: 8px"></i>
           {{ 'labels.buttons.Submit' | translate }}
         </button>

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

@@ -70,6 +70,10 @@ export class CreateSavingProductComponent {
   savingProductsTemplate: any;
   accountingRuleData: string[] = [];
   selectedTabIndex = 0;
+  /** Guards against repeat clicks on Submit: the product name is unique in the database, so a
+   * second request for the same form fails with a duplicate key error even though the first one
+   * created the product. */
+  submitting = false;
 
   /**
    * @param {ActivatedRoute} route Activated Route.
@@ -162,8 +166,11 @@ export class CreateSavingProductComponent {
   }
 
   submit() {
+    if (this.submitting) {
+      return;
+    }
+    this.submitting = true;
     const savingProduct = this.prepareSavingProductPayload();
-    console.log('Saving product submit payload:', savingProduct);
     this.productsService.createSavingProduct(savingProduct).subscribe({
       next: (response: any) => {
         if (response?.rollbackTransaction) {
@@ -181,6 +188,11 @@ export class CreateSavingProductComponent {
             { relativeTo: this.route }
           );
         }
+      },
+      error: () => {
+        // the error itself is reported by the global error handler; just let the user correct the
+        // form and try again
+        this.submitting = false;
       }
     });
   }

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

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

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

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

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

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

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

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