Add CC accounts tracking, AML rule trial and branch approval fixes

CIBIL, Experian, Equifax and CRIF are vendors under API Management (active =
whitelisted) and the Credit Bureau dashboard reads them from there; the
separate CIC whitelist and API mapping screens are removed. Mapping tables show
the value each row finds in the sample payload, and bureau cards link to their
set-up.

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

Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1
 ###############
 ### STAGE 1: Build app
 ###############
@@ -9,10 +10,13 @@ ARG NPM_REGISTRY_URL=https://registry.npmjs.org/
 ARG BUILD_ENVIRONMENT_OPTIONS="--configuration production"
 ARG PUPPETEER_DOWNLOAD_HOST_ARG=https://storage.googleapis.com
 ARG PUPPETEER_CHROMIUM_REVISION_ARG=1011831
-ARG PUPPETEER_SKIP_DOWNLOAD_ARG
+# Build ko Chromium nahi chahiye — skip (warna npm ci Chromium download par atak jata hai).
+ARG PUPPETEER_SKIP_DOWNLOAD_ARG=true
 
 # Set the environment variable to increase Node.js memory limit
-ENV NODE_OPTIONS="--max-old-space-size=4096"
+# (Mifos web-app ka production build memory-heavy hai; upstream build:prod
+#  16384 use karta hai. 4096 par 'ng build' OOM ho jata hai.)
+ENV NODE_OPTIONS="--max-old-space-size=8192"
 
 RUN apk add --no-cache git
 
@@ -25,14 +29,22 @@ ENV PUPPETEER_DOWNLOAD_HOST=$PUPPETEER_DOWNLOAD_HOST_ARG
 ENV PUPPETEER_CHROMIUM_REVISION=$PUPPETEER_CHROMIUM_REVISION_ARG
 ENV PUPPETEER_SKIP_DOWNLOAD=$PUPPETEER_SKIP_DOWNLOAD_ARG
 
+# Test/e2e tooling ke bhaari binary downloads skip karo — build inhe use nahi
+# karta, aur inke bina npm ci turant complete ho jata hai.
+#   Cypress   -> ~250MB binary (CI me sabse zyada atakta hai)
+#   Playwright-> browser binaries
+ENV CYPRESS_INSTALL_BINARY=0
+ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
+
 COPY ./ /usr/src/app/
 
-RUN npm cache clear --force
+RUN npm config set fetch-retry-maxtimeout 120000 \
+ && npm config set registry $NPM_REGISTRY_URL --location=global
 
-RUN npm config set fetch-retry-maxtimeout 120000
-RUN npm config set registry $NPM_REGISTRY_URL --location=global
-
-RUN npm ci
+# BuildKit cache mount: npm ka download cache builds ke beech persist hota hai,
+# isliye har build par saare packages dobara download nahi hote (bahut fast).
+# 'npm cache clear --force' hata diya — wo har build par cache wipe kar deta tha.
+RUN --mount=type=cache,target=/root/.npm npm ci --no-audit --no-fund
 
 RUN sh -c "ng build --output-path=/dist $BUILD_ENVIRONMENT_OPTIONS"
 
@@ -41,6 +53,14 @@ RUN sh -c "ng build --output-path=/dist $BUILD_ENVIRONMENT_OPTIONS"
 ###############
 FROM $NGINX_IMAGE
 
+# envsubst (gettext) alpine-slim me nahi hota — runtime env.js generation ke
+# liye zaroori hai, isliye explicitly install kar rahe hain.
+RUN apk add --no-cache gettext
+
+# Static-only nginx config (SPA fallback, no API proxy). Stock default.conf
+# ko replace karta hai taaki deep-link refresh par 404 na aaye.
+COPY nginx.spa.conf /etc/nginx/conf.d/default.conf
+
 COPY --from=builder /dist/browser /usr/share/nginx/html
 
 EXPOSE 80

angular.json

@@ -31,6 +31,8 @@
               "@angular/localize/init"
             ],
             "assets": [
+              "src/favicon.ico",
+              "src/apple-touch-icon.png",
               "src/assets/images/cbsnexora-favicon.svg",
               "src/robots.txt",
               "src/manifest.json",
@@ -39,6 +41,11 @@
                 "glob": "**/*",
                 "input": "node_modules/tinymce",
                 "output": "assets/tinymce"
+              },
+              {
+                "glob": "lottie.min.js",
+                "input": "node_modules/lottie-web/build/player",
+                "output": "assets/js"
               }
             ],
             "styles": [
@@ -69,8 +76,8 @@
               "budgets": [
                 {
                   "type": "initial",
-                  "maximumWarning": "15mb",
-                  "maximumError": "17mb"
+                  "maximumWarning": "18mb",
+                  "maximumError": "20mb"
                 },
                 {
                   "type": "anyComponentStyle",

nginx.spa.conf

@@ -0,0 +1,45 @@
+# Static-only nginx config for the CBSNexora Angular UI.
+# NOTE: No API reverse-proxy here by design — the browser calls the Fineract
+# backend directly via FINERACT_API_URL (env.js). nginx sirf static files
+# serve karta hai + Angular SPA routing handle karta hai.
+
+server {
+    listen       80;
+    server_name  _;
+
+    root   /usr/share/nginx/html;
+    index  index.html;
+
+    # ---- Compression ----
+    gzip              on;
+    gzip_comp_level   6;
+    gzip_min_length   1024;
+    gzip_proxied      any;
+    gzip_types        text/plain text/css application/javascript application/json
+                      application/xml image/svg+xml font/woff font/woff2;
+
+    # ---- Runtime env: env.js aur index.html kabhi cache na ho ----
+    # (env.js har container start par envsubst se regenerate hoti hai;
+    #  index.html hashed asset filenames point karti hai)
+    location = /assets/env.js {
+        add_header Cache-Control "no-store, no-cache, must-revalidate";
+        expires -1;
+    }
+
+    location = /index.html {
+        add_header Cache-Control "no-store, no-cache, must-revalidate";
+        expires -1;
+    }
+
+    # ---- Hashed static assets: lambe time cache ----
+    location ~* \.(?:js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        expires 7d;
+        add_header Cache-Control "public";
+        try_files $uri =404;
+    }
+
+    # ---- Angular SPA fallback: har route index.html par ----
+    location / {
+        try_files $uri $uri/ /index.html;
+    }
+}

package-lock.json

@@ -41,6 +41,7 @@
         "jspdf-autotable": "^5.0.2",
         "lightgallery": "^2.9.0",
         "lodash": "4.17.23",
+        "lottie-web": "^5.13.0",
         "moment": "^2.29.4",
         "ngx-image-cropper": "^9.1.6",
         "ngx-mat-select-search": "^8.0.2",
@@ -18380,6 +18381,12 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/lottie-web": {
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/lottie-web/-/lottie-web-5.13.0.tgz",
+      "integrity": "sha512-+gfBXl6sxXMPe8tKQm7qzLnUy5DUPJPKIyRHwtpCpyUEYjHYRJC/5gjUvdkuO2c3JllrPtHXH5UJJK8LRYl5yQ==",
+      "license": "MIT"
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",

package.json

@@ -15,7 +15,7 @@
     "ng": "ng",
     "build": "node version.js && npm run env -s && ng build --configuration production --output-hashing=none",
     "build:prod": "node version.js && node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --configuration production --output-hashing=none --base-href=/web-app/",
-    "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.localhost.conf.js",
+    "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" ng serve --proxy-config proxy.localhost.conf.js",
     "start:share": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --host 0.0.0.0 --proxy-config proxy.localhost.conf.js",
     "start:demo": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.conf.js",
     "serve:dev": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --source-map --proxy-config proxy.localhost.conf.js",
@@ -71,6 +71,7 @@
     "jspdf-autotable": "^5.0.2",
     "lightgallery": "^2.9.0",
     "lodash": "4.17.23",
+    "lottie-web": "^5.13.0",
     "moment": "^2.29.4",
     "ngx-image-cropper": "^9.1.6",
     "ngx-mat-select-search": "^8.0.2",

src/app/account-transfers/view-account-transfer/view-account-transfer.component.html

@@ -7,16 +7,6 @@
 -->
 
 <div class="container">
-  <div class="container m-b-20 align-end gap-2px">
-    @if (!viewAccountTransferData.reversed) {
-      <span>
-        <button mat-raised-button color="warn" *mifosxHasPermission="'ADJUST_ACCOUNTTRANSFER'">
-          <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'labels.buttons.Undo' | translate }}
-        </button>
-      </span>
-    }
-  </div>
-
   <mat-card>
     <mat-card-content>
       <div class="transfer-container">

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

@@ -72,6 +72,7 @@ import { ViewJournalEntryTransactionComponent } from 'app/shared/accounting/view
 import { JournalEntryTransactionResolver } from './common-resolvers/journal-entry-transaction.resolver';
 import { ExternalAssetOwnerJournalEntryResolver } from 'app/loans/common-resolvers/external-asset-owner-journal-entry.resolver';
 import { ExternalAssetConfigurationResolver } from './common-resolvers/external-asset-configuration.resolver';
+import { accountingFeatureEnabledGuard } from './disabled-features';
 
 /** Accounting Routes */
 const routes: Routes = [
@@ -99,7 +100,8 @@ const routes: Routes = [
             {
               path: 'frequent-postings',
               component: FrequentPostingsComponent,
-              data: { title: 'Frequent Postings', breadcrumb: 'Frequent Postings' },
+              canActivate: [accountingFeatureEnabledGuard],
+              data: { title: 'Frequent Postings', breadcrumb: 'Frequent Postings', feature: 'frequentPostings' },
               resolve: {
                 offices: OfficesResolver,
                 accountingRules: AccountingRulesAssociationsResolver,
@@ -110,7 +112,8 @@ const routes: Routes = [
             {
               path: 'create',
               component: CreateJournalEntryComponent,
-              data: { title: 'Create Journal Entry', breadcrumb: 'Create' },
+              canActivate: [accountingFeatureEnabledGuard],
+              data: { title: 'Create Journal Entry', breadcrumb: 'Create', feature: 'createJournalEntries' },
               resolve: {
                 offices: OfficesResolver,
                 currencies: CurrenciesResolver,
@@ -194,6 +197,11 @@ const routes: Routes = [
             offices: OfficesResolver
           }
         },
+        {
+          path: 'balance-sheet',
+          loadComponent: () => import('./balance-sheet/balance-sheet.component').then((c) => c.BalanceSheetComponent),
+          data: { title: 'Balance Sheet', breadcrumb: 'Balance Sheet' }
+        },
         {
           path: 'chart-of-accounts',
           data: { title: 'Chart of Accounts', breadcrumb: 'Chart of Accounts' },
@@ -244,7 +252,8 @@ const routes: Routes = [
         },
         {
           path: 'closing-entries',
-          data: { title: 'Accounting Closures', breadcrumb: 'Closing Entries' },
+          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Accounting Closures', breadcrumb: 'Closing Entries', feature: 'closingEntries' },
           children: [
             {
               path: '',
@@ -285,7 +294,8 @@ const routes: Routes = [
         },
         {
           path: 'accounting-rules',
-          data: { title: 'Accounting Rules', breadcrumb: 'Accounting Rules' },
+          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Accounting Rules', breadcrumb: 'Accounting Rules', feature: 'accountingRules' },
           children: [
             {
               path: '',
@@ -332,11 +342,17 @@ const routes: Routes = [
         {
           path: 'periodic-accruals',
           component: PeriodicAccrualsComponent,
-          data: { title: 'Periodic Accrual Accounting', breadcrumb: 'Execute Periodic Accrual Accounting' }
+          canActivate: [accountingFeatureEnabledGuard],
+          data: {
+            title: 'Periodic Accrual Accounting',
+            breadcrumb: 'Execute Periodic Accrual Accounting',
+            feature: 'accruals'
+          }
         },
         {
           path: 'provisioning-entries',
-          data: { title: 'Provisioning Entries', breadcrumb: 'Provisioning Entries' },
+          canActivate: [accountingFeatureEnabledGuard],
+          data: { title: 'Provisioning Entries', breadcrumb: 'Provisioning Entries', feature: 'provisioningEntries' },
           children: [
             {
               path: '',

src/app/accounting/accounting.component.html

@@ -17,35 +17,39 @@
 
   <!-- Cards Grid -->
   <div class="acc-grid">
-    <!-- Frequent Postings -->
-    <a
-      class="acc-card"
-      [routerLink]="['journal-entries/frequent-postings']"
-      *mifosxHasPermission="'CREATE_JOURNALENTRY'"
-      #frequentPostings
-    >
-      <div class="acc-card__icon blue"><i class="fas fa-sync-alt"></i></div>
-      <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Frequent Postings' | translate }}</span>
-        <span class="acc-card__desc">{{ 'labels.text.These are predefined postings' | translate }}</span>
-      </div>
-    </a>
+    <!-- Frequent Postings — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.frequentPostings) {
+      <a
+        class="acc-card"
+        [routerLink]="['journal-entries/frequent-postings']"
+        *mifosxHasPermission="'CREATE_JOURNALENTRY'"
+        #frequentPostings
+      >
+        <div class="acc-card__icon blue"><i class="fas fa-sync-alt"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Frequent Postings' | translate }}</span>
+          <span class="acc-card__desc">{{ 'labels.text.These are predefined postings' | translate }}</span>
+        </div>
+      </a>
+    }
 
-    <!-- Create Journal Entries -->
-    <a
-      class="acc-card"
-      [routerLink]="['journal-entries/create']"
-      *mifosxHasPermission="'CREATE_JOURNALENTRY'"
-      #createJournalEntries
-    >
-      <div class="acc-card__icon green"><i class="fas fa-plus-circle"></i></div>
-      <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Create Journal Entries' | translate }}</span>
-        <span class="acc-card__desc">{{
-          'labels.text.Manual journal entry transactions recorded in a journal' | translate
-        }}</span>
-      </div>
-    </a>
+    <!-- Create Journal Entries — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.createJournalEntries) {
+      <a
+        class="acc-card"
+        [routerLink]="['journal-entries/create']"
+        *mifosxHasPermission="'CREATE_JOURNALENTRY'"
+        #createJournalEntries
+      >
+        <div class="acc-card__icon green"><i class="fas fa-plus-circle"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Create Journal Entries' | translate }}</span>
+          <span class="acc-card__desc">{{
+            'labels.text.Manual journal entry transactions recorded in a journal' | translate
+          }}</span>
+        </div>
+      </a>
+    }
 
     <!-- Search Journal Entries -->
     <a class="acc-card" [routerLink]="['journal-entries']" *mifosxHasPermission="'READ_JOURNALENTRY'">
@@ -113,43 +117,64 @@
       </div>
     </a>
 
-    <!-- Closing Entries -->
-    <a class="acc-card" [routerLink]="['closing-entries']" *mifosxHasPermission="'READ_GLCLOSURE'" #closingEntries>
-      <div class="acc-card__icon red"><i class="fas fa-archive"></i></div>
+    <!-- Balance Sheet -->
+    <a class="acc-card" [routerLink]="['balance-sheet']" *mifosxHasPermission="'READ_GLACCOUNT'" #balanceSheet>
+      <div class="acc-card__icon teal"><i class="fas fa-balance-scale"></i></div>
       <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Closing Entries' | translate }}</span>
-        <span class="acc-card__desc">{{
-          'labels.text.Journal entries made at the end of accounting period' | translate
-        }}</span>
+        <span class="acc-card__title">Balance Sheet</span>
+        <span class="acc-card__desc">Header/Detail balances as on any date</span>
       </div>
     </a>
 
-    <!-- Accounting Rules -->
-    <a class="acc-card" [routerLink]="['accounting-rules']" *mifosxHasPermission="'READ_ACCOUNTINGRULE'">
-      <div class="acc-card__icon purple"><i class="fas fa-list-ul"></i></div>
-      <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Accounting Rules' | translate }}</span>
-        <span class="acc-card__desc">{{ 'labels.text.List of all accounting rules' | translate }}</span>
-      </div>
-    </a>
+    <!-- Closing Entries — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.closingEntries) {
+      <a class="acc-card" [routerLink]="['closing-entries']" *mifosxHasPermission="'READ_GLCLOSURE'" #closingEntries>
+        <div class="acc-card__icon red"><i class="fas fa-archive"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Closing Entries' | translate }}</span>
+          <span class="acc-card__desc">{{
+            'labels.text.Journal entries made at the end of accounting period' | translate
+          }}</span>
+        </div>
+      </a>
+    }
 
-    <!-- Accruals -->
-    <a class="acc-card" [routerLink]="['periodic-accruals']" *mifosxHasPermission="'EXECUTE_PERIODICACCRUALACCOUNTING'">
-      <div class="acc-card__icon green"><i class="fas fa-calendar-check"></i></div>
-      <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Accruals' | translate }}</span>
-        <span class="acc-card__desc">{{ 'labels.text.Accrues income, expenses and liabilities' | translate }}</span>
-      </div>
-    </a>
+    <!-- Accounting Rules — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.accountingRules) {
+      <a class="acc-card" [routerLink]="['accounting-rules']" *mifosxHasPermission="'READ_ACCOUNTINGRULE'">
+        <div class="acc-card__icon purple"><i class="fas fa-list-ul"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Accounting Rules' | translate }}</span>
+          <span class="acc-card__desc">{{ 'labels.text.List of all accounting rules' | translate }}</span>
+        </div>
+      </a>
+    }
 
-    <!-- Provisioning Entries -->
-    <a class="acc-card" [routerLink]="['provisioning-entries']" *mifosxHasPermission="'VIEW_PROVISIONING_ENTRIES'">
-      <div class="acc-card__icon amber"><i class="fas fa-cogs"></i></div>
-      <div class="acc-card__info">
-        <span class="acc-card__title">{{ 'labels.heading.Provisioning Entries' | translate }}</span>
-        <span class="acc-card__desc">{{ 'labels.text.Create provisioning entries' | translate }}</span>
-      </div>
-    </a>
+    <!-- Accruals — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.accruals) {
+      <a
+        class="acc-card"
+        [routerLink]="['periodic-accruals']"
+        *mifosxHasPermission="'EXECUTE_PERIODICACCRUALACCOUNTING'"
+      >
+        <div class="acc-card__icon green"><i class="fas fa-calendar-check"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Accruals' | translate }}</span>
+          <span class="acc-card__desc">{{ 'labels.text.Accrues income, expenses and liabilities' | translate }}</span>
+        </div>
+      </a>
+    }
+
+    <!-- Provisioning Entries — hidden while disabled, see disabled-features.ts -->
+    @if (!disabledFeatures.provisioningEntries) {
+      <a class="acc-card" [routerLink]="['provisioning-entries']" *mifosxHasPermission="'VIEW_PROVISIONING_ENTRIES'">
+        <div class="acc-card__icon amber"><i class="fas fa-cogs"></i></div>
+        <div class="acc-card__info">
+          <span class="acc-card__title">{{ 'labels.heading.Provisioning Entries' | translate }}</span>
+          <span class="acc-card__desc">{{ 'labels.text.Create provisioning entries' | translate }}</span>
+        </div>
+      </a>
+    }
   </div>
 </div>
 

src/app/accounting/accounting.component.ts

@@ -18,6 +18,7 @@ import { MatIcon } from '@angular/material/icon';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatLine } from '@angular/material/grid-list';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { DISABLED_ACCOUNTING_FEATURES } from './disabled-features';
 
 /**
  * Accounting component.
@@ -63,6 +64,9 @@ export class AccountingComponent implements AfterViewInit {
   // Initialize an array of 10 boolean values, all set to false
   arrowBooleans: boolean[] = new Array(10).fill(false);
 
+  /** Which accounting tiles are switched off for this installation — see disabled-features.ts. */
+  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
+
   /**
    * Popover function
    * @param template TemplateRef<any>.
@@ -104,12 +108,15 @@ export class AccountingComponent implements AfterViewInit {
         );
       });
     }
-    if (this.configurationWizardService.showClosingEntries) {
+    // Closing Entries and Create Journal Entries can be switched off (see disabled-features.ts), in
+    // which case their tiles never render and these refs stay undefined — the wizard simply has no
+    // step to point at, rather than throwing on a missing element.
+    if (this.configurationWizardService.showClosingEntries && this.closingEntries) {
       setTimeout(() => {
         this.showPopover(this.templateClosingEntries, this.closingEntries.nativeElement, 'bottom', true);
       });
     }
-    if (this.configurationWizardService.showCreateJournalEntries) {
+    if (this.configurationWizardService.showCreateJournalEntries && this.createJournalEntries) {
       setTimeout(() => {
         this.showPopover(this.templateCreateJournalEntries, this.createJournalEntries.nativeElement, 'bottom', true);
       });

src/app/accounting/accounting.service.ts

@@ -10,7 +10,8 @@
 
 /** Angular Imports */
 import { Injectable, inject } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
+import { HttpClient, HttpContext, HttpParams } from '@angular/common/http';
+import { SILENT_HTTP_ERROR } from 'app/core/http/silent-error.token';
 
 /** rxjs Imports */
 import { Observable } from 'rxjs';
@@ -116,6 +117,22 @@ export class AccountingService {
     return this.http.get(`/glaccounts`, { params: httpParams });
   }
 
+  /**
+   * As-on-date balance sheet, grouped by Header/Detail hierarchy — see BalanceSheetApiResource.
+   * @param asOnDate yyyy-MM-dd. Defaults to today on the backend when omitted.
+   * @param officeId Optional — scopes every balance to one office instead of the whole organization.
+   */
+  getBalanceSheet(asOnDate?: string, officeId?: number): Observable<any> {
+    let httpParams = new HttpParams();
+    if (asOnDate) {
+      httpParams = httpParams.set('asOnDate', asOnDate);
+    }
+    if (officeId != null) {
+      httpParams = httpParams.set('officeId', officeId.toString());
+    }
+    return this.http.get('/accounting/balancesheet', { params: httpParams });
+  }
+
   /**
    * @param transactionId Transaction ID of journal entries.
    * @returns {Observable<any>} Journal Entries.
@@ -182,6 +199,16 @@ export class AccountingService {
     return this.http.get('/journalentries/ledger', { params: httpParams });
   }
 
+  /**
+   * The whole transfer a ledger transaction belongs to, when it is one branch's part of a transfer between branches.
+   * An extra, informational lookup: if it fails the screen simply shows no banner, so a failure raises no error popup.
+   */
+  getInterBranchTransfer(transactionId: string): Observable<any> {
+    return this.http.get(`/accounting/interbranchtransfers/${transactionId}`, {
+      context: new HttpContext().set(SILENT_HTTP_ERROR, true)
+    });
+  }
+
   /**
    * @param {string} transactionId Transaction ID to be reverted.
    * @param {string} comments Any comments.

src/app/accounting/balance-sheet/balance-sheet-pdf.ts

@@ -0,0 +1,363 @@
+/**
+ * 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 the Consolidated Balance Sheet PDF, laid out like the bank's printed report: liabilities
+ * on the left, assets on the right, each top-level group a named block with its accounts listed
+ * under it and a subtotal in the TOTAL column.
+ *
+ * Drawn directly with jsPDF rather than printed from the DOM: window.print() carries the whole app
+ * shell (sidenav, toolbar, ticker) into the output and gives no control over where a page breaks,
+ * which is what made the printed sheet unreadable. Here each column is paginated on its own, the
+ * way the printed report does it — the left side can run onto page 2 while the right side is still
+ * on page 1 — and every page repeats the heading.
+ */
+
+import { jsPDF } from 'jspdf';
+
+export interface BalanceSheetPdfNode {
+  name: string;
+  glCode: string;
+  usage: 'HEADER' | 'DETAIL';
+  balance: number;
+  children: BalanceSheetPdfNode[];
+}
+
+export interface BalanceSheetPdfSide {
+  label: string;
+  total: number;
+  groups: { classification: string; total: number; nodes: BalanceSheetPdfNode[] }[];
+}
+
+export interface BalanceSheetPdfInput {
+  bankName: string;
+  officeLabel: string;
+  /** yyyy-MM-dd */
+  asOnDate: string;
+  creditSide: BalanceSheetPdfSide;
+  debitSide: BalanceSheetPdfSide;
+}
+
+// ── Page geometry, in mm on A4 portrait ─────────────────────────────────────
+const PAGE_W = 210;
+const PAGE_H = 297;
+const MARGIN = 8;
+const COL_W = (PAGE_W - MARGIN * 2) / 2;
+const COL_X = [
+  MARGIN,
+  MARGIN + COL_W
+];
+/** Right edges of the BALANCE and TOTAL columns, relative to a column's left edge. */
+const BALANCE_R = COL_W - 26;
+const TOTAL_R = COL_W - 2;
+/** Name text wraps within this width so it never runs under the BALANCE column. */
+const NAME_W = COL_W - 30;
+
+const BODY_TOP = 36;
+/** Leaves room under the body for the sign-off row and the print-date footer. */
+const BODY_BOTTOM = PAGE_H - 21;
+const LINE_H = 3.1;
+
+const INK: [number, number, number] = [
+  20,
+  20,
+  20
+];
+const MUTED: [number, number, number] = [
+  90,
+  90,
+  90
+];
+
+type Line =
+  | { kind: 'block'; text: string }
+  | { kind: 'subhead'; text: string; depth: number }
+  | { kind: 'detail'; lines: string[]; amount: string; depth: number }
+  | { kind: 'subsubtotal'; amount: string }
+  | { kind: 'subtotal'; amount: string }
+  | { kind: 'standalone'; lines: string[]; amount: string }
+  | { kind: 'grand'; amount: string }
+  | { kind: 'gap' };
+
+function money(value: number): string {
+  return new Intl.NumberFormat('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value ?? 0);
+}
+
+function ddmmyyyy(iso: string): string {
+  if (!iso) {
+    return '';
+  }
+  const [
+    y,
+    m,
+    d
+  ] = iso.split('-');
+  return `${d}/${m}/${y}`;
+}
+
+function heightOf(line: Line): number {
+  switch (line.kind) {
+    case 'block':
+      // Heading plus the short dashed rule beneath it.
+      return LINE_H + 1.8;
+    case 'detail':
+    case 'standalone':
+      return LINE_H * line.lines.length;
+    case 'gap':
+      return 2.4;
+    case 'grand':
+      // Rule above, the figure, and the double rule beneath it.
+      return LINE_H + 6;
+    default:
+      return LINE_H;
+  }
+}
+
+/**
+ * Flattens one side into the exact sequence of printed lines. Done up front so pagination is a
+ * matter of measuring heights, with no recursion happening mid-page.
+ */
+function flatten(doc: jsPDF, side: BalanceSheetPdfSide): Line[] {
+  const out: Line[] = [];
+  // splitTextToSize measures with whatever font is currently set, so it has to match the font the
+  // detail lines are actually drawn in — otherwise names wrap at the wrong width.
+  doc.setFont('helvetica', 'normal').setFontSize(6.8);
+
+  const pushNode = (node: BalanceSheetPdfNode, depth: number): void => {
+    if (node.usage === 'DETAIL') {
+      const indent = depth * 2;
+      const wrapped: string[] = doc.splitTextToSize(node.name, NAME_W - indent);
+      out.push({ kind: 'detail', lines: wrapped, amount: money(node.balance), depth });
+      return;
+    }
+    out.push({ kind: 'subhead', text: node.name, depth });
+    node.children.forEach((child) => pushNode(child, depth + 1));
+    out.push({ kind: 'subsubtotal', amount: money(node.balance) });
+  };
+
+  for (const group of side.groups) {
+    for (const root of group.nodes) {
+      if (root.usage === 'DETAIL') {
+        // A Detail account sitting under no group at all: a group of one, printed on a single line
+        // carrying both its balance and its total, rather than a heading and a figure on separate
+        // rows with the BALANCE column left empty.
+        out.push({
+          kind: 'standalone',
+          lines: doc.splitTextToSize(root.name.toUpperCase(), NAME_W),
+          amount: money(root.balance)
+        });
+        out.push({ kind: 'gap' });
+        continue;
+      }
+      out.push({ kind: 'block', text: root.name });
+      root.children.forEach((child) => pushNode(child, 0));
+      out.push({ kind: 'subtotal', amount: money(root.balance) });
+      out.push({ kind: 'gap' });
+    }
+  }
+  // Carried as a line of its own so pagination reserves room for it, rather than squeezing it
+  // against the bottom margin under the last block.
+  out.push({ kind: 'grand', amount: money(side.total) });
+  return out;
+}
+
+function dottedLine(doc: jsPDF, x1: number, y: number, x2: number): void {
+  doc.setLineDashPattern(
+    [
+      0.4,
+      0.6
+    ],
+    0
+  );
+  doc.setLineWidth(0.15);
+  doc.line(x1, y, x2, y);
+  doc.setLineDashPattern([], 0);
+}
+
+function drawPageFrame(doc: jsPDF, input: BalanceSheetPdfInput, page: number, pageCount: number): void {
+  doc.setTextColor(...INK);
+
+  doc.setFont('helvetica', 'bold').setFontSize(9.5);
+  doc.text(`${input.bankName.toUpperCase()} , HEAD OFFICE`, PAGE_W / 2, 11, { align: 'center' });
+
+  doc.setFontSize(8);
+  doc.text(`CONSOLIDATED BALANCE SHEET (SUB GROUP WISE) AS ON : ${ddmmyyyy(input.asOnDate)}`, PAGE_W / 2, 16, {
+    align: 'center'
+  });
+  doc.setFont('helvetica', 'normal').setFontSize(7);
+  doc.text(`Page ${page} of ${pageCount}`, PAGE_W - MARGIN, 16, { align: 'right' });
+  doc.text(`FOR BRANCHES : ${input.officeLabel}`, PAGE_W / 2, 20, { align: 'center' });
+
+  dottedLine(doc, MARGIN, 23, PAGE_W - MARGIN);
+
+  // Side titles and column headings, drawn per column.
+  const titles = [
+    'LIABILITIES ( CREDIT )',
+    'ASSETS ( DEBIT )'
+  ];
+  for (let c = 0; c < 2; c++) {
+    const x = COL_X[c];
+    doc.setFont('helvetica', 'bold').setFontSize(7.5);
+    doc.text(titles[c], x + 1, 27.5);
+    doc.setFontSize(6.5);
+    doc.text('ACCOUNT NAME', x + 1, 32);
+    doc.text('BALANCE', x + BALANCE_R, 32, { align: 'right' });
+    doc.text('TOTAL', x + TOTAL_R, 32, { align: 'right' });
+    dottedLine(doc, x + 1, 33.4, x + COL_W - 2);
+  }
+
+  // The divider between the two sides.
+  doc.setLineWidth(0.15);
+  doc.setDrawColor(150, 150, 150);
+  doc.line(COL_X[1], 24, COL_X[1], BODY_BOTTOM + 2);
+  doc.setDrawColor(0, 0, 0);
+
+  // Footer.
+  dottedLine(doc, MARGIN, BODY_BOTTOM + 6, PAGE_W - MARGIN);
+  doc
+    .setFont('helvetica', 'normal')
+    .setFontSize(6.5)
+    .setTextColor(...MUTED);
+  const now = new Date();
+  const stamp =
+    `${`${now.getDate()}`.padStart(2, '0')}/${`${now.getMonth() + 1}`.padStart(2, '0')}/${now.getFullYear()} ` +
+    `${`${now.getHours()}`.padStart(2, '0')}:${`${now.getMinutes()}`.padStart(2, '0')}:${`${now.getSeconds()}`.padStart(2, '0')}`;
+  doc.text(`Print Date : ${stamp}`, MARGIN, BODY_BOTTOM + 10);
+  doc.text('Consolidated Balance Sheet (Sub Group Wise)', PAGE_W - MARGIN, BODY_BOTTOM + 10, { align: 'right' });
+  doc.setTextColor(...INK);
+}
+
+/** Draws one line into a column at y, and returns the y the next line starts at. */
+function drawLine(doc: jsPDF, line: Line, x: number, y: number): number {
+  switch (line.kind) {
+    case 'block': {
+      doc.setFont('helvetica', 'bold').setFontSize(7);
+      doc.text(line.text.toUpperCase(), x + 1, y);
+      dottedLine(doc, x + 1, y + 1.1, x + 34);
+      return y + heightOf(line);
+    }
+    case 'subhead': {
+      doc.setFont('helvetica', 'bold').setFontSize(6.8);
+      doc.text(line.text, x + 1 + line.depth * 2, y);
+      return y + heightOf(line);
+    }
+    case 'detail': {
+      doc.setFont('helvetica', 'normal').setFontSize(6.8);
+      const indent = x + 2 + line.depth * 2;
+      line.lines.forEach((text, i) => doc.text(text, indent, y + i * LINE_H));
+      // The amount sits on the first line of a wrapped name, as the printed report has it.
+      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
+      return y + heightOf(line);
+    }
+    case 'subsubtotal': {
+      doc.setFont('helvetica', 'bold').setFontSize(6.8);
+      dottedLine(doc, x + BALANCE_R - 22, y - 2.2, x + BALANCE_R);
+      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
+      return y + heightOf(line);
+    }
+    case 'subtotal': {
+      doc.setFont('helvetica', 'bold').setFontSize(7);
+      doc.text(line.amount, x + TOTAL_R, y, { align: 'right' });
+      return y + heightOf(line);
+    }
+    case 'standalone': {
+      doc.setFont('helvetica', 'bold').setFontSize(7);
+      line.lines.forEach((text, i) => doc.text(text, x + 1, y + i * LINE_H));
+      doc.text(line.amount, x + BALANCE_R, y, { align: 'right' });
+      doc.text(line.amount, x + TOTAL_R, y, { align: 'right' });
+      return y + heightOf(line);
+    }
+    case 'grand': {
+      const top = y + 1.5;
+      doc.setLineWidth(0.3);
+      doc.line(x + 1, top, x + COL_W - 2, top);
+      doc.setFont('helvetica', 'bold').setFontSize(7.5);
+      doc.text(line.amount, x + TOTAL_R, top + 3.6, { align: 'right' });
+      doc.setLineWidth(0.2);
+      doc.line(x + 1, top + 5, x + COL_W - 2, top + 5);
+      doc.line(x + 1, top + 5.7, x + COL_W - 2, top + 5.7);
+      return y + heightOf(line);
+    }
+    default:
+      return y + heightOf(line);
+  }
+}
+
+/** Splits one side's lines into per-page chunks that fit between BODY_TOP and BODY_BOTTOM. */
+function paginate(lines: Line[]): Line[][] {
+  const pages: Line[][] = [];
+  let current: Line[] = [];
+  let y = BODY_TOP;
+
+  for (const line of lines) {
+    const h = heightOf(line);
+    if (y + h > BODY_BOTTOM) {
+      pages.push(current);
+      current = [];
+      y = BODY_TOP;
+    }
+    current.push(line);
+    y += h;
+  }
+  // Keep the trailing chunk only if it has something on it, but always return at least one page so
+  // a side with no balances still gets its heading and a zero total.
+  if (current.length > 0 || pages.length === 0) {
+    pages.push(current);
+  }
+  return pages;
+}
+
+export function buildBalanceSheetPdf(input: BalanceSheetPdfInput): jsPDF {
+  const doc = new jsPDF({ orientation: 'p', unit: 'mm', format: 'a4', compress: true });
+
+  const creditPages = paginate(flatten(doc, input.creditSide));
+  const debitPages = paginate(flatten(doc, input.debitSide));
+  // Both sides print side by side, so the sheet runs as long as the longer of the two, plus a
+  // final page for the grand totals when they would not fit under the last block.
+  const pageCount = Math.max(creditPages.length, debitPages.length);
+
+  for (let p = 0; p < pageCount; p++) {
+    if (p > 0) {
+      doc.addPage();
+    }
+    drawPageFrame(doc, input, p + 1, pageCount);
+
+    const sides = [
+      creditPages[p] ?? [],
+      debitPages[p] ?? []
+    ];
+
+    for (let c = 0; c < 2; c++) {
+      const x = COL_X[c];
+      let y = BODY_TOP;
+      for (const line of sides[c]) {
+        y = drawLine(doc, line, x, y);
+      }
+    }
+
+    // Sign-off row, on the closing page only.
+    if (p === pageCount - 1) {
+      doc
+        .setFont('helvetica', 'normal')
+        .setFontSize(6.5)
+        .setTextColor(...MUTED);
+      const roles = [
+        'CLERK',
+        'ACCOUNTANT / OFFICER',
+        'ASST. GEN MANAGER',
+        'GENERAL MANAGER',
+        'CHAIRMAN'
+      ];
+      const step = (PAGE_W - MARGIN * 2) / roles.length;
+      roles.forEach((role, i) => doc.text(role, MARGIN + step * i + step / 2, BODY_BOTTOM + 2, { align: 'center' }));
+      doc.setTextColor(...INK);
+    }
+  }
+
+  return doc;
+}

src/app/accounting/balance-sheet/balance-sheet.component.html

@@ -0,0 +1,182 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="bs-page">
+  <!-- Controls — not part of the printed sheet. -->
+  <div class="bs-controls">
+    <label class="bs-field">
+      <span>As on date</span>
+      <input type="date" [(ngModel)]="asOnDate" (change)="load()" />
+    </label>
+    <label class="bs-field">
+      <span>Branch</span>
+      <select [(ngModel)]="officeId" (ngModelChange)="load()">
+        <option [ngValue]="null">All branches</option>
+        @for (office of offices; track office.id) {
+          <option [ngValue]="office.id">{{ office.name }}</option>
+        }
+      </select>
+    </label>
+    <label class="bs-check">
+      <input type="checkbox" [(ngModel)]="hideZeroBalances" (ngModelChange)="applyZeroFilter()" />
+      <span>Hide nil balances</span>
+    </label>
+    <span class="bs-controls__spacer"></span>
+    @if (!loading && debitSide && creditSide) {
+      <span class="bs-tally" [class.bs-tally--off]="!tallied">
+        {{ tallied ? 'Balanced' : 'Out of balance by ' + fmt(difference) }}
+      </span>
+    }
+    <button type="button" class="bs-btn" (click)="load()" [disabled]="loading">
+      {{ loading ? 'Loading…' : 'Refresh' }}
+    </button>
+    <button type="button" class="bs-btn bs-btn--primary" (click)="downloadPdf()" [disabled]="loading || !debitSide">
+      Download PDF
+    </button>
+  </div>
+
+  @if (error) {
+    <div class="bs-alert">{{ error }}</div>
+  }
+
+  @if (loading) {
+    <div class="bs-loading">Loading balance sheet…</div>
+  }
+
+  @if (!loading && debitSide && creditSide) {
+    <!-- The sheet itself — this block is what prints. -->
+    <div class="bs-sheet">
+      <header class="bs-sheet__head">
+        <h2>CONSOLIDATED BALANCE SHEET (SUB GROUP WISE)</h2>
+        <p>AS ON : {{ displayDate(asOnDateLoaded) }}</p>
+        <p class="bs-sheet__branches">FOR BRANCHES : {{ officeLabel }}</p>
+      </header>
+
+      <div class="bs-sheet__body">
+        <!-- Liabilities (credit) on the left, assets (debit) on the right — as the printed sheet reads. -->
+        <section class="bs-col">
+          <div class="bs-col__title">LIABILITIES ( CREDIT )</div>
+          <div class="bs-row bs-row--colhead">
+            <span>ACCOUNT NAME</span>
+            <span>BALANCE</span>
+            <span>TOTAL</span>
+          </div>
+          @for (group of creditSide.groups; track group.classification) {
+            @for (root of group.nodes; track root.id) {
+              <ng-container *ngTemplateOutlet="block; context: { $implicit: root }"></ng-container>
+            }
+          }
+          @if (creditSide.groups.length === 0) {
+            <div class="bs-empty">No liability, equity or income balances as on this date.</div>
+          }
+          <div class="bs-row bs-row--grand">
+            <span></span>
+            <span></span>
+            <span>{{ fmt(creditSide.total) }}</span>
+          </div>
+        </section>
+
+        <section class="bs-col">
+          <div class="bs-col__title">ASSETS ( DEBIT )</div>
+          <div class="bs-row bs-row--colhead">
+            <span>ACCOUNT NAME</span>
+            <span>BALANCE</span>
+            <span>TOTAL</span>
+          </div>
+          @for (group of debitSide.groups; track group.classification) {
+            @for (root of group.nodes; track root.id) {
+              <ng-container *ngTemplateOutlet="block; context: { $implicit: root }"></ng-container>
+            }
+          }
+          @if (debitSide.groups.length === 0) {
+            <div class="bs-empty">No asset or expense balances as on this date.</div>
+          }
+          <div class="bs-row bs-row--grand">
+            <span></span>
+            <span></span>
+            <span>{{ fmt(debitSide.total) }}</span>
+          </div>
+        </section>
+      </div>
+
+      <footer class="bs-sheet__foot">
+        <span>CLERK</span>
+        <span>ACCOUNTANT / OFFICER</span>
+        <span>ASST. GEN MANAGER</span>
+        <span>GENERAL MANAGER</span>
+        <span>CHAIRMAN</span>
+      </footer>
+    </div>
+  }
+</div>
+
+<!--
+  One top-level block: the Header account's name, a rule, its lines, then its subtotal in the TOTAL
+  column.
+-->
+<ng-template #block let-root>
+  @if (root.usage === 'DETAIL') {
+    <!-- A Detail account with no Header of its own: a group of one, so it gets a single line
+         carrying both its balance and its total rather than a heading repeating its own name. -->
+    <div class="bs-block bs-block--single">
+      <div class="bs-row bs-row--standalone">
+        <span class="bs-name" [title]="root.glCode">{{ root.name }}</span>
+        <span class="bs-amt">{{ fmt(root.balance) }}</span>
+        <span class="bs-amt">{{ fmt(root.balance) }}</span>
+      </div>
+    </div>
+  } @else {
+    <div class="bs-block">
+      <div class="bs-block__name" [title]="root.glCode">{{ root.name }}</div>
+      <div class="bs-block__rule"></div>
+      @for (child of root.children; track child.id) {
+        <ng-container *ngTemplateOutlet="lines; context: { $implicit: child, depth: 0 }"></ng-container>
+      }
+      @if (root.children.length === 0) {
+        <div class="bs-row bs-row--line">
+          <span class="bs-name bs-name--muted">No accounts under this group</span>
+          <span></span>
+          <span></span>
+        </div>
+      }
+      <div class="bs-row bs-row--subtotal">
+        <span></span>
+        <span></span>
+        <span>{{ fmt(root.balance) }}</span>
+      </div>
+    </div>
+  }
+</ng-template>
+
+<!--
+  Everything below a top-level block. A nested Header keeps its own name and its own subtotal, so a
+  Header inside a Header still reads as its own sub-group rather than flattening into the parent.
+-->
+<ng-template #lines let-node let-depth="depth">
+  @if (node.usage === 'DETAIL') {
+    <div class="bs-row bs-row--line">
+      <span class="bs-name" [style.paddingLeft.px]="depth * 14" [title]="node.glCode">{{ node.name }}</span>
+      <span class="bs-amt">{{ fmt(node.balance) }}</span>
+      <span></span>
+    </div>
+  } @else {
+    <div class="bs-row bs-row--subhead">
+      <span class="bs-name" [style.paddingLeft.px]="depth * 14" [title]="node.glCode">{{ node.name }}</span>
+      <span></span>
+      <span></span>
+    </div>
+    @for (child of node.children; track child.id) {
+      <ng-container *ngTemplateOutlet="lines; context: { $implicit: child, depth: depth + 1 }"></ng-container>
+    }
+    <div class="bs-row bs-row--subsubtotal">
+      <span></span>
+      <span class="bs-amt">{{ fmt(node.balance) }}</span>
+      <span></span>
+    </div>
+  }
+</ng-template>

src/app/accounting/balance-sheet/balance-sheet.component.scss

@@ -0,0 +1,372 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+$ink: #111827;
+$ink-soft: #374151;
+$ink-faint: #9ca3af;
+$rule: #cbd5e1;
+$border: #e2e8f0;
+$accent: #1d4ed8;
+$ok: #15803d;
+$ok-soft: #f0fdf4;
+$danger: #b91c1c;
+$danger-soft: #fef2f2;
+
+// Amount columns share one width so BALANCE and TOTAL line up down the whole sheet.
+$amt-col: 128px;
+
+.bs-page {
+  padding: 20px 24px 40px;
+  background: #f1f5f9;
+  min-height: 100%;
+}
+
+// ── Controls (screen only) ────────────────────────────────────────────────
+.bs-controls {
+  display: flex;
+  align-items: flex-end;
+  gap: 14px;
+  flex-wrap: wrap;
+  margin-bottom: 18px;
+
+  &__spacer {
+    flex: 1 1 auto;
+  }
+}
+
+.bs-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  font-size: 10.5px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.06em;
+  color: $ink-soft;
+
+  input,
+  select {
+    height: 36px;
+    padding: 0 10px;
+    border: 1px solid $border;
+    border-radius: 6px;
+    background: #fff;
+    font-size: 13px;
+    font-weight: 500;
+    text-transform: none;
+    letter-spacing: normal;
+    color: $ink;
+  }
+}
+
+.bs-check {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  height: 36px;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: $ink-soft;
+  cursor: pointer;
+  user-select: none;
+
+  input {
+    width: 15px;
+    height: 15px;
+    cursor: pointer;
+    accent-color: $accent;
+  }
+}
+
+.bs-btn {
+  height: 36px;
+  padding: 0 16px;
+  border: 1px solid $border;
+  border-radius: 6px;
+  background: #fff;
+  color: $ink-soft;
+  font-size: 12.5px;
+  font-weight: 700;
+  cursor: pointer;
+
+  &--primary {
+    background: $ink;
+    border-color: $ink;
+    color: #fff;
+  }
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+}
+
+.bs-tally {
+  padding: 6px 12px;
+  border-radius: 999px;
+  background: $ok-soft;
+  color: $ok;
+  font-size: 12px;
+  font-weight: 700;
+
+  &--off {
+    background: $danger-soft;
+    color: $danger;
+  }
+}
+
+.bs-alert {
+  padding: 10px 14px;
+  border-radius: 6px;
+  background: $danger-soft;
+  color: $danger;
+  border: 1px solid #fecaca;
+  font-size: 13px;
+  margin-bottom: 14px;
+}
+
+.bs-loading {
+  padding: 48px 0;
+  text-align: center;
+  color: $ink-faint;
+  font-size: 13.5px;
+}
+
+// ── The printed sheet ─────────────────────────────────────────────────────
+.bs-sheet {
+  background: #fff;
+  border: 1px solid $border;
+  padding: 22px 26px 18px;
+  // The ledger reads as a printed report, so the whole sheet is set in a mono face with
+  // figures on tabular numerals — columns stay aligned however long the names run.
+  font-family: 'DejaVu Sans Mono', 'Liberation Mono', Consolas, 'Courier New', monospace;
+  font-variant-numeric: tabular-nums;
+  color: $ink;
+
+  &__head {
+    text-align: center;
+    border-bottom: 1px dotted $rule;
+    padding-bottom: 10px;
+    margin-bottom: 12px;
+
+    h2 {
+      margin: 0;
+      font-size: 13.5px;
+      font-weight: 700;
+      letter-spacing: 0.04em;
+    }
+
+    p {
+      margin: 4px 0 0;
+      font-size: 11.5px;
+      color: $ink-soft;
+    }
+  }
+
+  &__branches {
+    letter-spacing: 0.05em;
+  }
+
+  &__body {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 0;
+  }
+
+  &__foot {
+    display: flex;
+    justify-content: space-between;
+    gap: 8px;
+    margin-top: 26px;
+    padding-top: 10px;
+    border-top: 1px dotted $rule;
+    font-size: 10px;
+    letter-spacing: 0.05em;
+    color: $ink-soft;
+  }
+}
+
+.bs-col {
+  padding: 0 16px;
+  min-width: 0;
+
+  &:first-child {
+    border-right: 1px dotted $rule;
+    padding-left: 0;
+  }
+
+  &:last-child {
+    padding-right: 0;
+  }
+
+  &__title {
+    font-size: 12px;
+    font-weight: 700;
+    letter-spacing: 0.05em;
+    padding-bottom: 6px;
+  }
+}
+
+// ── Rows: one grid so name / BALANCE / TOTAL align across every block ──────
+.bs-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) $amt-col $amt-col;
+  gap: 8px;
+  align-items: baseline;
+  font-size: 11.5px;
+  line-height: 1.55;
+
+  > span:nth-child(2),
+  > span:nth-child(3) {
+    text-align: right;
+    white-space: nowrap;
+  }
+
+  &--colhead {
+    font-weight: 700;
+    font-size: 10.5px;
+    letter-spacing: 0.05em;
+    border-bottom: 1px dotted $rule;
+    padding-bottom: 4px;
+    margin-bottom: 6px;
+    color: $ink-soft;
+  }
+
+  &--line {
+    color: $ink-soft;
+  }
+
+  // A nested Header inside a block: its own named sub-group.
+  &--subhead {
+    font-weight: 700;
+    color: $ink;
+    padding-top: 3px;
+  }
+
+  // Sub-group subtotal sits in the BALANCE column, so it never collides with the
+  // block's own figure in TOTAL.
+  &--subsubtotal {
+    border-top: 1px dotted $rule;
+    font-weight: 700;
+    color: $accent;
+  }
+
+  // Top-level block subtotal, in the TOTAL column.
+  &--subtotal {
+    font-weight: 700;
+    color: $ink;
+    padding-top: 2px;
+  }
+
+  // A Header-less Detail account: its own one-line group.
+  &--standalone {
+    font-weight: 700;
+    color: $ink;
+
+    .bs-name {
+      text-transform: uppercase;
+      letter-spacing: 0.03em;
+    }
+  }
+
+  &--grand {
+    margin-top: 14px;
+    padding-top: 8px;
+    border-top: 1px solid $ink;
+    border-bottom: 3px double $ink;
+    font-weight: 700;
+    font-size: 12.5px;
+  }
+}
+
+.bs-name {
+  overflow-wrap: anywhere;
+
+  &--muted {
+    color: $ink-faint;
+    font-style: italic;
+  }
+}
+
+.bs-amt {
+  font-variant-numeric: tabular-nums;
+}
+
+.bs-block {
+  margin-bottom: 14px;
+
+  &--single {
+    margin-bottom: 10px;
+  }
+
+  &__name {
+    font-size: 11.5px;
+    font-weight: 700;
+    letter-spacing: 0.03em;
+    text-transform: uppercase;
+  }
+
+  // The short dashed rule the printed sheet puts under every group heading.
+  &__rule {
+    width: 130px;
+    border-top: 1px dotted $ink-faint;
+    margin: 2px 0 4px;
+  }
+}
+
+.bs-empty {
+  padding: 14px 0;
+  font-size: 11.5px;
+  color: $ink-faint;
+}
+
+// ── Narrow screens: stack the two sides instead of squeezing the columns ───
+@media (width <= 1100px) {
+  .bs-sheet__body {
+    grid-template-columns: 1fr;
+  }
+
+  .bs-col {
+    padding: 0;
+
+    &:first-child {
+      border-right: none;
+      border-bottom: 1px dotted $rule;
+      padding-bottom: 16px;
+      margin-bottom: 16px;
+    }
+  }
+}
+
+// ── Print: only the sheet, at report proportions ───────────────────────────
+@media print {
+  .bs-controls,
+  .bs-alert,
+  .bs-loading {
+    display: none !important;
+  }
+
+  .bs-page {
+    padding: 0;
+    background: #fff;
+  }
+
+  .bs-sheet {
+    border: none;
+    padding: 0;
+    font-size: 10px;
+  }
+
+  .bs-sheet__body {
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .bs-block {
+    break-inside: avoid;
+  }
+}

src/app/accounting/balance-sheet/balance-sheet.component.ts

@@ -0,0 +1,218 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { AccountingService } from '../accounting.service';
+import { OrganizationService } from '../../organization/organization.service';
+import { buildBalanceSheetPdf } from './balance-sheet-pdf';
+
+interface BalanceSheetNode {
+  id: number;
+  name: string;
+  glCode: string;
+  usage: 'HEADER' | 'DETAIL';
+  balance: number;
+  children: BalanceSheetNode[];
+}
+
+interface BalanceSheetGroup {
+  classification: string;
+  total: number;
+  nodes: BalanceSheetNode[];
+}
+
+interface BalanceSheetSide {
+  label: string;
+  total: number;
+  groups: BalanceSheetGroup[];
+}
+
+/**
+ * Consolidated Balance Sheet (sub-group wise), laid out the way the bank's own printed balance
+ * sheet reads: liabilities on the left, assets on the right, each top-level Header account a named
+ * block whose Detail accounts are listed under it and subtotalled in the TOTAL column.
+ *
+ * Balances come from BalanceSheetApiResource, which reads the live ledger - a Detail account's own
+ * postings, and a Header's as the recursive sum of its children (a Header never carries a posting
+ * of its own). A Detail account that sits under no Header at all is shown as its own one-line block
+ * rather than being dropped.
+ */
+@Component({
+  selector: 'mifosx-balance-sheet',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule
+  ],
+  templateUrl: './balance-sheet.component.html',
+  styleUrl: './balance-sheet.component.scss'
+})
+export class BalanceSheetComponent implements OnInit {
+  private accountingService = inject(AccountingService);
+  private organizationService = inject(OrganizationService);
+
+  /** Printed at the head of the PDF. Falls back to a neutral title if the profile is not set up. */
+  bankName = 'Bank';
+
+  asOnDate: string = new Date().toISOString().slice(0, 10);
+  officeId: number | null = null;
+  offices: { id: number; name: string }[] = [];
+
+  loading = false;
+  error = '';
+  asOnDateLoaded = '';
+
+  /** What the server returned, kept whole so the zero-balance toggle never needs a refetch. */
+  private rawDebitSide: BalanceSheetSide | null = null;
+  private rawCreditSide: BalanceSheetSide | null = null;
+
+  debitSide: BalanceSheetSide | null = null;
+  creditSide: BalanceSheetSide | null = null;
+
+  /**
+   * A working chart of accounts carries far more accounts than a bank actually operates, and a
+   * printed balance sheet lists only the ones carrying a balance — leaving every nil line in makes
+   * the sheet unreadable. On by default for that reason; switch it off to audit the full chart.
+   */
+  hideZeroBalances = true;
+
+  /** Both sides are derived from the same double-entry ledger, so they can only disagree if a
+   *  posting is missing a leg — worth surfacing rather than hiding. */
+  get tallied(): boolean {
+    if (!this.debitSide || !this.creditSide) {
+      return true;
+    }
+    return Math.abs(this.debitSide.total - this.creditSide.total) < 0.01;
+  }
+
+  get difference(): number {
+    if (!this.debitSide || !this.creditSide) {
+      return 0;
+    }
+    return Math.abs(this.debitSide.total - this.creditSide.total);
+  }
+
+  get officeLabel(): string {
+    if (this.officeId == null) {
+      return 'ALL BRANCHES';
+    }
+    return (this.offices.find((o) => o.id === this.officeId)?.name ?? '').toUpperCase();
+  }
+
+  ngOnInit(): void {
+    this.accountingService.getOffices().subscribe({
+      next: (offices) => (this.offices = offices || []),
+      error: () => (this.offices = [])
+    });
+    this.organizationService.getInstitutionProfile().subscribe({
+      next: (profile: any) => {
+        this.bankName = profile?.statementHeaderName || profile?.bankName || this.bankName;
+      },
+      // A missing institution profile must not stop the sheet from loading — the PDF just carries
+      // the fallback title.
+      error: () => undefined
+    });
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.error = '';
+    this.accountingService.getBalanceSheet(this.asOnDate, this.officeId ?? undefined).subscribe({
+      next: (res: any) => {
+        this.rawDebitSide = res.debitSide;
+        this.rawCreditSide = res.creditSide;
+        this.asOnDateLoaded = res.asOnDate;
+        this.applyZeroFilter();
+        this.loading = false;
+      },
+      error: () => {
+        this.error = 'Could not load the balance sheet for this date.';
+        this.loading = false;
+      }
+    });
+  }
+
+  /**
+   * Rebuilds the displayed sides from what the server sent, dropping nil lines when asked. The
+   * totals are deliberately left as the server computed them — hiding a nil line must never change
+   * a figure, and a group total is unaffected by removing children that summed to nothing.
+   */
+  applyZeroFilter(): void {
+    this.debitSide = this.filterSide(this.rawDebitSide);
+    this.creditSide = this.filterSide(this.rawCreditSide);
+  }
+
+  private filterSide(side: BalanceSheetSide | null): BalanceSheetSide | null {
+    if (!side) {
+      return null;
+    }
+    if (!this.hideZeroBalances) {
+      return side;
+    }
+    const groups = side.groups
+      .map((group) => ({
+        ...group,
+        nodes: group.nodes
+          .map((node) => this.pruneZeros(node))
+          .filter((node): node is BalanceSheetNode => node !== null)
+      }))
+      .filter((group) => group.nodes.length > 0);
+    return { ...side, groups };
+  }
+
+  /** Drops a node whose balance is nil, and any Header left with nothing under it. */
+  private pruneZeros(node: BalanceSheetNode): BalanceSheetNode | null {
+    if (Math.abs(node.balance) < 0.005) {
+      return null;
+    }
+    const children = node.children
+      .map((child) => this.pruneZeros(child))
+      .filter((child): child is BalanceSheetNode => child !== null);
+    return { ...node, children };
+  }
+
+  /** Indian grouping with two decimals, matching the printed report (2,76,92,608.00). */
+  fmt(value: number): string {
+    return new Intl.NumberFormat('en-IN', { minimumFractionDigits: 2, maximumFractionDigits: 2 }).format(value ?? 0);
+  }
+
+  /** dd/MM/yyyy, as the printed report dates it. */
+  displayDate(iso: string): string {
+    if (!iso) {
+      return '';
+    }
+    const [
+      y,
+      m,
+      d
+    ] = iso.split('-');
+    return `${d}/${m}/${y}`;
+  }
+
+  /**
+   * Builds the report as a real PDF rather than printing the page: window.print() takes the whole
+   * app shell with it and breaks pages wherever they happen to fall, which is what made the earlier
+   * output unusable.
+   */
+  downloadPdf(): void {
+    if (!this.debitSide || !this.creditSide) {
+      return;
+    }
+    const doc = buildBalanceSheetPdf({
+      bankName: this.bankName,
+      officeLabel: this.officeLabel,
+      asOnDate: this.asOnDateLoaded || this.asOnDate,
+      creditSide: this.creditSide,
+      debitSide: this.debitSide
+    });
+    doc.save(`balance-sheet-${this.asOnDateLoaded || this.asOnDate}.pdf`);
+  }
+}

src/app/accounting/disabled-features.ts

@@ -0,0 +1,43 @@
+/**
+ * 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 { inject } from '@angular/core';
+import { Router, CanActivateFn } from '@angular/router';
+
+/**
+ * Accounting features switched off for this installation.
+ *
+ * Nothing is deleted — the components, routes and services all stay in place, and flipping a flag
+ * back to `false` brings the feature back with its tile and its route. The matching API block lives
+ * in DisabledFeatureApiFilter on the backend, so a hidden feature cannot be reached by calling the
+ * endpoint directly either.
+ */
+export const DISABLED_ACCOUNTING_FEATURES = {
+  createJournalEntries: true,
+  frequentPostings: true,
+  closingEntries: true,
+  accruals: true,
+  provisioningEntries: true,
+  accountingRules: true
+};
+
+/**
+ * Blocks a route belonging to a disabled feature, for anyone who reaches it by typing the URL
+ * rather than through a tile. `data.feature` names the flag to check.
+ */
+export const accountingFeatureEnabledGuard: CanActivateFn = (route) => {
+  const router = inject(Router);
+  const feature = route.data?.['feature'] as keyof typeof DISABLED_ACCOUNTING_FEATURES | undefined;
+
+  if (!feature || !DISABLED_ACCOUNTING_FEATURES[feature]) {
+    return true;
+  }
+
+  router.navigate(['/accounting'], { replaceUrl: true });
+  return false;
+};

src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts

@@ -16,6 +16,7 @@ import { AccountingService } from '../../accounting.service';
 import { GLAccount } from 'app/shared/models/general.model';
 import { GlAccountSelectorComponent } from '../../../shared/accounting/gl-account-selector/gl-account-selector.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { accountOptionsForActivity } from '../financial-activity-account-options';
 
 /**
  * Create financial activity mapping component.
@@ -87,21 +88,11 @@ export class CreateFinancialActivityMappingComponent implements OnInit {
    */
   setGlAccountData() {
     this.financialActivityMappingForm.get('financialActivityId').valueChanges.subscribe((financialActivityId) => {
-      switch (financialActivityId) {
-        case 100:
-        case 101:
-        case 102:
-        case 103:
-          this.glAccountData = this.glAccountOptions.assetAccountOptions;
-          break;
-        case 200:
-        case 201:
-          this.glAccountData = this.glAccountOptions.liabilityAccountOptions;
-          break;
-        case 300:
-          this.glAccountData = this.glAccountOptions.equityAccountOptions;
-          break;
-      }
+      this.glAccountData = accountOptionsForActivity(
+        this.financialActivityData,
+        financialActivityId,
+        this.glAccountOptions
+      );
     });
   }
 

src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts

@@ -16,6 +16,7 @@ import { AccountingService } from '../../accounting.service';
 import { GLAccount } from 'app/shared/models/general.model';
 import { GlAccountSelectorComponent } from '../../../shared/accounting/gl-account-selector/gl-account-selector.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { accountOptionsForActivity } from '../financial-activity-account-options';
 
 /**
  * Edit financial activity mapping component.
@@ -98,21 +99,11 @@ export class EditFinancialActivityMappingComponent implements OnInit {
    */
   setGLAccountData() {
     this.financialActivityMappingForm.get('financialActivityId').valueChanges.subscribe((financialActivityId) => {
-      switch (financialActivityId) {
-        case 100:
-        case 101:
-        case 102:
-        case 103:
-          this.glAccountData = this.glAccountOptions.assetAccountOptions;
-          break;
-        case 200:
-        case 201:
-          this.glAccountData = this.glAccountOptions.liabilityAccountOptions;
-          break;
-        case 300:
-          this.glAccountData = this.glAccountOptions.equityAccountOptions;
-          break;
-      }
+      this.glAccountData = accountOptionsForActivity(
+        this.financialActivityData,
+        financialActivityId,
+        this.glAccountOptions
+      );
     });
   }
 

src/app/accounting/financial-activity-mappings/financial-activity-account-options.ts

@@ -0,0 +1,38 @@
+/**
+ * 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 GL accounts a financial activity may be mapped to.
+ *
+ * The activity itself says which kind of account it needs — the template returns `mappedGLAccountType` on every
+ * option — so the answer is read from the activity rather than worked out from its id. The screens used to switch on
+ * the id instead, listing the ones they knew:
+ *
+ *     case 100, 101, 102, 103 → asset
+ *     case 200, 201           → liability
+ *     case 300                → equity
+ *
+ * Every activity added since fell through that switch and left the account dropdown empty, which is how dividendPaid
+ * (202), reserveForDividend (301), distributableProfit (302), retainedProfit (303) and dividendRoundOff (304) became
+ * unmappable — the screen offered no accounts and gave no reason. A list keyed on ids has to be extended by hand for
+ * each new activity, and is silently wrong until someone notices; asking the activity what it needs cannot fall out
+ * of step with the backend.
+ *
+ * @param activities the template's financialActivityOptions
+ * @param activityId the activity the user picked
+ * @param glAccountOptions the template's glAccountOptions, keyed assetAccountOptions / liabilityAccountOptions / …
+ */
+export function accountOptionsForActivity(activities: any[], activityId: number, glAccountOptions: any): any[] {
+  const activity = (activities || []).find((a) => a?.id === activityId);
+  const accountType = activity?.mappedGLAccountType;
+  if (!accountType || !glAccountOptions) {
+    return [];
+  }
+  // ASSET → assetAccountOptions, and so on for LIABILITY, EQUITY, INCOME and EXPENSE.
+  return glAccountOptions[`${accountType.toLowerCase()}AccountOptions`] ?? [];
+}

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.html

@@ -49,119 +49,144 @@
   }
 
   @if (glStatus && !glError) {
-    <!-- Step 2: what the ledger already says, so the count is counted against something concrete. -->
-    <div class="mcd-gl" [class.mcd-gl--fresh]="!glHasBalance">
-      <mat-icon>account_balance</mat-icon>
-      <div>
-        <div class="mcd-gl__label">Cash GL Account</div>
-        <div class="mcd-gl__value">({{ glStatus.glCode }}) {{ glStatus.glAccountName }}</div>
-        @if (glHasBalance) {
+    @if (todayAlreadyOpen) {
+      <!-- This screen is a one-time "day 1" tool - today's business day already exists, so counting
+           a drawer here would only be rejected at submit (BranchDayRegisterApiResource rejects
+           reopening an already-open day). Day Register is where every day after the first belongs. -->
+      <div class="mcd-gl mcd-gl--error">
+        <mat-icon>lock</mat-icon>
+        <div>
+          <div class="mcd-gl__label">Business Day Already Open</div>
+          <div class="mcd-gl__value">
+            {{ todayOpenInfo.businessDate }} — opened by {{ todayOpenInfo.openedByName }}, opening cash ₹{{
+              todayOpenInfo.openingCash | number: '1.2-2'
+            }}
+          </div>
           <div class="mcd-gl__hint">
-            Already holds
-            <strong>₹{{ glTarget.toLocaleString('en-IN') }}</strong>
-            — count the drawer to exactly this amount.
+            This branch has already opened today's business day — counting the drawer again here would only be rejected
+            on submit. Deposits, withdrawals and closing today's day happen from Day Register instead.
           </div>
-        } @else {
-          <div class="mcd-gl__hint">
-            No opening balance posted yet — whatever you count below becomes this account's opening balance.
-          </div>
-        }
-      </div>
-    </div>
-
-    <!-- Step 3: the actual count. -->
-    <mat-card class="mcd-card mcd-card--flush">
-      <mat-card-content>
-        <div class="mcd-grid mcd-grid--head">
-          <div class="mcd-grid__denom">Denomination</div>
-          <div class="mcd-grid__count">Count</div>
-          <div class="mcd-grid__amt">Amount</div>
+          <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
         </div>
-        @for (d of allDenoms; track d.id) {
-          <div class="mcd-grid mcd-grid--row">
-            <div class="mcd-grid__denom">
-              {{ d.label }} <span class="mcd-grid__kind">{{ d.kind }}</span>
-            </div>
-            <div class="mcd-grid__count">
-              <button type="button" mat-icon-button (click)="bumpCount(d, -1)"><mat-icon>remove</mat-icon></button>
-              <input
-                type="number"
-                min="0"
-                class="mcd-grid__input"
-                [ngModel]="countFor(d)"
-                (ngModelChange)="onCountChange(d, $event)"
-              />
-              <button type="button" mat-icon-button (click)="bumpCount(d, 1)"><mat-icon>add</mat-icon></button>
-            </div>
-            <div class="mcd-grid__amt">₹{{ subtotalFor(d).toLocaleString('en-IN') }}</div>
-          </div>
-        }
-      </mat-card-content>
-    </mat-card>
-
-    <!-- The one number that matters. -->
-    <div class="mcd-balance" [class.mcd-balance--ok]="isReconciled">
-      <div class="mcd-balance__figure">
-        <span class="mcd-balance__label">Counted Total</span>
-        <span class="mcd-balance__amt">₹{{ countedTotal.toLocaleString('en-IN') }}</span>
       </div>
-      @if (glHasBalance) {
-        <div class="mcd-balance__figure">
-          <span class="mcd-balance__label">GL Target</span>
-          <span class="mcd-balance__amt">₹{{ glTarget.toLocaleString('en-IN') }}</span>
+    } @else {
+      <!-- Step 2: what the ledger already says, so the count is counted against something concrete. -->
+      <div class="mcd-gl" [class.mcd-gl--fresh]="!glHasBalance">
+        <mat-icon>account_balance</mat-icon>
+        <div>
+          <div class="mcd-gl__label">Cash GL Account</div>
+          <div class="mcd-gl__value">({{ glStatus.glCode }}) {{ glStatus.glAccountName }}</div>
+          @if (glHasBalance) {
+            <div class="mcd-gl__hint">
+              Already holds
+              <strong>₹{{ glTarget.toLocaleString('en-IN') }}</strong>
+              — count the drawer to exactly this amount.
+            </div>
+          } @else {
+            <div class="mcd-gl__hint">
+              No opening balance posted yet — whatever you count below becomes this account's opening balance.
+            </div>
+          }
         </div>
-      }
-      <div class="mcd-balance__status">
-        @if (countedTotal <= 0) {
-          <mat-icon>edit_note</mat-icon>
-          <span>Count each denomination above</span>
-        } @else if (isReconciled) {
-          <mat-icon>check_circle</mat-icon>
-          <span>{{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}</span>
-        } @else {
-          <mat-icon>error</mat-icon>
-          <span
-            >Off by ₹{{
-              (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString('en-IN')
-            }}</span
-          >
-        }
       </div>
-    </div>
 
-    @if (needsDifferenceReason) {
-      <mat-card class="mcd-card">
+      <!-- Step 3: the actual count. -->
+      <mat-card class="mcd-card mcd-card--flush">
         <mat-card-content>
-          <mat-form-field class="mcd-reason">
-            <mat-label>Why does the count differ from the GL balance?</mat-label>
-            <input matInput [(ngModel)]="differenceReason" />
-          </mat-form-field>
+          <div class="mcd-grid mcd-grid--head">
+            <div class="mcd-grid__denom">Denomination</div>
+            <div class="mcd-grid__count">Count</div>
+            <div class="mcd-grid__amt">Amount</div>
+          </div>
+          @for (d of allDenoms; track d.id) {
+            <div class="mcd-grid mcd-grid--row">
+              <div class="mcd-grid__denom">
+                {{ d.label }} <span class="mcd-grid__kind">{{ d.kind }}</span>
+              </div>
+              <div class="mcd-grid__count">
+                <button type="button" mat-icon-button (click)="bumpCount(d, -1)"><mat-icon>remove</mat-icon></button>
+                <input
+                  type="number"
+                  min="0"
+                  class="mcd-grid__input"
+                  [style.width.ch]="countInputWidthCh(d)"
+                  [ngModel]="countFor(d)"
+                  (ngModelChange)="onCountChange(d, $event)"
+                />
+                <button type="button" mat-icon-button (click)="bumpCount(d, 1)"><mat-icon>add</mat-icon></button>
+              </div>
+              <div class="mcd-grid__amt">₹{{ subtotalFor(d).toLocaleString('en-IN') }}</div>
+            </div>
+          }
         </mat-card-content>
       </mat-card>
-    }
 
-    @if (errorMsg) {
-      <div class="mcd-error">{{ errorMsg }}</div>
-    }
-
-    @if (successMsg) {
-      <div class="mcd-success">
-        <mat-icon>check_circle</mat-icon>
-        <div>
-          {{ successMsg }}
-          <div class="mcd-success__actions">
-            <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
+      <!-- The one number that matters. -->
+      <div class="mcd-balance" [class.mcd-balance--ok]="isReconciled">
+        <div class="mcd-balance__figure">
+          <span class="mcd-balance__label">Counted Total</span>
+          <span class="mcd-balance__amt">₹{{ countedTotal.toLocaleString('en-IN') }}</span>
+        </div>
+        @if (glHasBalance) {
+          <div class="mcd-balance__figure">
+            <span class="mcd-balance__label">GL Target</span>
+            <span class="mcd-balance__amt">₹{{ glTarget.toLocaleString('en-IN') }}</span>
           </div>
+        }
+        <div class="mcd-balance__status">
+          @if (countedTotal <= 0) {
+            <mat-icon>edit_note</mat-icon>
+            <span>Count each denomination above</span>
+          } @else if (isReconciled) {
+            <mat-icon>check_circle</mat-icon>
+            <span>{{ glHasBalance ? 'Matches the GL balance' : 'Will define the GL opening balance' }}</span>
+          } @else {
+            <mat-icon>error</mat-icon>
+            <span
+              >Off by ₹{{
+                (countedTotal - glTarget < 0 ? glTarget - countedTotal : countedTotal - glTarget).toLocaleString(
+                  'en-IN'
+                )
+              }}</span
+            >
+          }
         </div>
       </div>
-    }
 
-    @if (!successMsg) {
-      <div class="mcd-actions">
-        <button mat-raised-button color="primary" [disabled]="!canSubmit" (click)="submit()">
-          {{ submitting ? 'Submitting…' : 'Migrate & Open Business Day' }}
-        </button>
-      </div>
+      @if (needsDifferenceReason) {
+        <mat-card class="mcd-card">
+          <mat-card-content>
+            <mat-form-field class="mcd-reason">
+              <mat-label>Why does the count differ from the GL balance?</mat-label>
+              <input matInput [(ngModel)]="differenceReason" />
+            </mat-form-field>
+          </mat-card-content>
+        </mat-card>
+      }
+
+      @if (errorMsg) {
+        <div class="mcd-error">{{ errorMsg }}</div>
+      }
+
+      @if (successMsg) {
+        <div class="mcd-success">
+          <mat-icon>check_circle</mat-icon>
+          <div>
+            {{ successMsg }}
+            <div class="mcd-success__actions">
+              <button type="button" mat-stroked-button (click)="goToBranchDay()">Go to Day Register</button>
+            </div>
+          </div>
+        </div>
+      }
+
+      @if (!successMsg) {
+        <div class="mcd-actions">
+          <button mat-raised-button color="primary" [disabled]="!canSubmit" (click)="submit()">
+            {{ submitting ? 'Submitting…' : 'Migrate & Open Business Day' }}
+          </button>
+        </div>
+      }
     }
   }
 </div>

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.scss

@@ -115,6 +115,10 @@
     color: #64748b;
     line-height: 1.4;
   }
+
+  button {
+    margin-top: 10px;
+  }
 }
 
 .mcd-grid {
@@ -171,7 +175,11 @@
   }
 
   &__input {
-    width: 48px;
+    /* Width is set inline per row (see countInputWidthCh()), growing with the digit count typed —
+       min-width here only covers the fallback before Angular has bound anything. */
+    min-width: 48px;
+    max-width: 96px;
+    transition: width 0.1s ease-out;
     text-align: center;
     font-variant-numeric: tabular-nums;
     border: 1px solid #e2e8f0;

src/app/accounting/migrate-cash-denomination/migrate-cash-denomination.component.ts

@@ -66,6 +66,14 @@ export class MigrateCashDenominationComponent implements OnInit {
   glStatus: any = null;
   glError = '';
 
+  /** Set once per office change: whether TODAY's business day is already open for this office. This
+   *  screen is a one-time "day 1" tool (see the class doc) - once a day has actually been opened,
+   *  reopening the same one is exactly what BranchDayRegisterApiResource#migrateCashDenomination
+   *  itself refuses (its own openDayInternal call rejects a day that is already open), so this is
+   *  checked here too, before the user counts an entire drawer only to have the submit rejected. */
+  todayAlreadyOpen = false;
+  todayOpenInfo: any = null;
+
   notes: Denom[] = [];
   coins: Denom[] = [];
   counts: Record<number, number> = {};
@@ -118,6 +126,8 @@ export class MigrateCashDenominationComponent implements OnInit {
     this.result = null;
     this.successMsg = '';
     this.errorMsg = '';
+    this.todayAlreadyOpen = false;
+    this.todayOpenInfo = null;
     if (!this.officeId) return;
 
     this.glLoading = true;
@@ -131,6 +141,15 @@ export class MigrateCashDenominationComponent implements OnInit {
           this.glError = res.message || 'No cash GL account is configured for this tenant yet.';
         }
       });
+
+    this.service
+      .branchDayRegister(this.officeId)
+      .pipe(catchError(() => of(null)))
+      .subscribe((res: any) => {
+        const openDay = res?.openDay;
+        this.todayAlreadyOpen = !!openDay && openDay.businessDate === res?.today;
+        this.todayOpenInfo = this.todayAlreadyOpen ? openDay : null;
+      });
   }
 
   countFor(d: Denom): number {
@@ -149,6 +168,12 @@ export class MigrateCashDenominationComponent implements OnInit {
     this.counts[d.id] = Math.max(0, (this.counts[d.id] || 0) + delta);
   }
 
+  /** Widens the count box as the typed count grows more digits, so a large count (hundreds,
+   *  thousands) is never clipped or hard to read inside a field sized for one or two digits. */
+  countInputWidthCh(d: Denom): number {
+    return Math.max(3, String(this.countFor(d)).length + 2);
+  }
+
   get countedTotal(): number {
     return this.allDenoms.reduce((s, d) => s + this.subtotalFor(d), 0);
   }

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.html

@@ -162,7 +162,18 @@
             <div class="mob-grid mob-grid--data" formArrayName="glAccountEntries">
               <div class="mob-grid__row" [formGroupName]="i">
                 <div class="mob-grid__code">{{ openingBalancesData.glAccounts[i].glAccountCode }}</div>
-                <div class="mob-grid__name">{{ openingBalancesData.glAccounts[i].glAccountName }}</div>
+                <div class="mob-grid__name">
+                  {{ openingBalancesData.glAccounts[i].glAccountName }}
+                  @if (isDenominationManaged(openingBalancesData.glAccounts[i].glAccountId)) {
+                    <span
+                      class="mob-grid__lock"
+                      matTooltip="Set by Migrate Cash Denomination — use that screen to change it"
+                    >
+                      <mat-icon inline="true">lock</mat-icon>
+                      <a [routerLink]="['/accounting/migrate-cash-denomination']">Migrate Cash Denomination</a>
+                    </span>
+                  }
+                </div>
                 <div class="mob-grid__amt">
                   <mat-form-field class="mob-grid__input">
                     <input matInput type="number" min="0" formControlName="debit" placeholder="0.00" />

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.scss

@@ -219,6 +219,33 @@
     word-break: break-word;
   }
 
+  /* Cash at Vault / Cash at Teller — locked, see MigrateOpeningBalancesComponent.isDenominationManaged. */
+  &__lock {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    margin-left: 8px;
+    padding: 1px 8px 1px 6px;
+    border-radius: 999px;
+    background: #fff7ed;
+    color: #9a3412;
+    font-size: 11px;
+    font-weight: 600;
+    white-space: nowrap;
+    vertical-align: middle;
+
+    mat-icon {
+      font-size: 13px;
+      width: 13px;
+      height: 13px;
+    }
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+    }
+  }
+
   &__amt {
     text-align: right;
   }

src/app/accounting/migrate-opening-balances/migrate-opening-balances.component.ts

@@ -17,6 +17,7 @@ import {
 } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 /** Custom Services */
 import { AccountingService } from '../accounting.service';
@@ -43,7 +44,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
     ...STANDALONE_SHARED_IMPORTS,
     GlAccountDisplayComponent,
     CurrencyPipe,
-    MatIconModule
+    MatIconModule,
+    MatTooltipModule
   ]
 })
 export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
@@ -74,6 +76,13 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
   debitsSum = 0;
   /** Sum total of credits. */
   creditsSum = 0;
+  /** GL account ids mapped to Financial Activity 101 (Cash at Vault) / 102 (Cash at Teller) — the
+   *  account(s) Migrate Cash Denomination owns. Their opening balance is shown here for visibility
+   *  but locked against editing: redefining it as a bare number here, instead of through a counted
+   *  denomination breakdown, would let the GL figure drift away from what is physically in the till.
+   *  The backend enforces the same rule independently (see defineOpeningBalance's
+   *  validateNoDenominationManagedCashAccounts) — this is a convenience, not the source of truth. */
+  denominationManagedGlAccountIds: number[] = [];
 
   /* Reference of search form */
   @ViewChild('searchFormRef') searchFormRef: ElementRef<any>;
@@ -95,6 +104,22 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
       this.officeData = data.offices;
       this.currencyData = data.currencies.selectedCurrencyOptions;
     });
+    // Office-independent: which GL account(s) this tenant has mapped to Cash at Vault / Cash at
+    // Teller, so their row can be locked the moment the office's accounts are drawn.
+    this.accountingService.getFinancialActivityAccounts().subscribe((mappings: any[]) => {
+      this.denominationManagedGlAccountIds = (mappings || [])
+        .filter((mapping) => mapping.financialActivityData?.id === 101 || mapping.financialActivityData?.id === 102)
+        .map((mapping) => mapping.glAccountData?.id)
+        .filter((id) => id != null);
+      // Retrieve may already have run before this (fast) request came back — lock any row it
+      // missed rather than leaving it editable for the rest of this visit.
+      this.glAccountEntries?.controls.forEach((control) => {
+        const glAccountId = control.get('glAccountId')?.value;
+        if (this.isDenominationManaged(glAccountId) && control.enabled) {
+          control.disable();
+        }
+      });
+    });
   }
 
   /**
@@ -136,14 +161,31 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
    * @returns {FormGroup} GL Account entry form.
    */
   createGLAccountEntryForm(glAccount: any): UntypedFormGroup {
-    return this.formBuilder.group(
+    // A never-touched account arrives as a placeholder row (amount/entryType both null); one that
+    // already carries an opening balance arrives with its real, committed figure — show that
+    // instead of leaving the field looking blank.
+    const existingDebit = glAccount.entryType?.value === 'DEBIT' ? glAccount.amount : null;
+    const existingCredit = glAccount.entryType?.value === 'CREDIT' ? glAccount.amount : null;
+    const group = this.formBuilder.group(
       {
         glAccountId: [glAccount.glAccountId],
-        debit: [null],
-        credit: [null]
+        debit: [existingDebit],
+        credit: [existingCredit]
       },
       { validator: onlyOneOfTheFieldsIsRequiredValidator }
     );
+    if (this.isDenominationManaged(glAccount.glAccountId)) {
+      // Disabling excludes this row from the form's own .value, so it is never resubmitted here —
+      // the account keeps whatever Migrate Cash Denomination last set it to.
+      group.disable();
+    }
+    return group;
+  }
+
+  /** Whether this GL account is Cash at Vault / Cash at Teller — locked here, see
+   *  denominationManagedGlAccountIds. */
+  isDenominationManaged(glAccountId: number): boolean {
+    return this.denominationManagedGlAccountIds.includes(glAccountId);
   }
 
   /**
@@ -176,17 +218,30 @@ export class MigrateOpeningBalancesComponent implements OnInit, AfterViewInit {
 
         this.openingBalancesData = openingBalancesData;
 
-        entry.valueChanges.subscribe(() => {
-          this.debitsSum = 0;
-          this.creditsSum = 0;
-          entry.controls.forEach((value) => {
-            this.debitsSum += value.value.debit;
-            this.creditsSum += value.value.credit;
-          });
-        });
+        entry.valueChanges.subscribe(() => this.recomputeSums());
+        // Runs once immediately too: valueChanges only fires on a later edit, and the locked cash
+        // row's own prefilled figure (set once, above, never through a further value change) would
+        // otherwise never be reflected in the banner at all.
+        this.recomputeSums();
       });
   }
 
+  /** Total Debit / Total Credit shown in the balance banner. A locked (denomination-managed) row is
+   *  excluded here exactly as it is excluded from the form's own .value used at submit time — this
+   *  screen only needs to balance the accounts it is itself about to (re)define, not the one
+   *  Migrate Cash Denomination already settled and this form can never touch. */
+  private recomputeSums(): void {
+    this.debitsSum = 0;
+    this.creditsSum = 0;
+    this.glAccountEntries.controls.forEach((control) => {
+      if (control.disabled) {
+        return;
+      }
+      this.debitsSum += control.value.debit || 0;
+      this.creditsSum += control.value.credit || 0;
+    });
+  }
+
   /**
    * Submits the opening balances form and defines opening balances,
    * if successful redirects to view created transaction.

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

@@ -53,10 +53,13 @@
         <fa-icon icon="sync" [class.fa-spin]="ledgerLoading"></fa-icon>
         Refresh
       </button>
-      <button class="gl-hero-btn gl-hero-btn--primary" [routerLink]="['/accounting/journal-entries/create']">
-        <fa-icon icon="plus"></fa-icon>
-        New Entry
-      </button>
+      <!-- New Entry — hidden while Create Journal Entries is disabled, see disabled-features.ts -->
+      @if (!disabledFeatures.createJournalEntries) {
+        <button class="gl-hero-btn gl-hero-btn--primary" [routerLink]="['/accounting/journal-entries/create']">
+          <fa-icon icon="plus"></fa-icon>
+          New Entry
+        </button>
+      }
     </div>
   </div>
 </div>
@@ -276,7 +279,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> From Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [max]="maxDate" [formControl]="transactionDateFrom" />
+        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [formControl]="transactionDateFrom" />
         <mat-datepicker-toggle matSuffix [for]="dpFrom"></mat-datepicker-toggle>
         <mat-datepicker #dpFrom></mat-datepicker>
       </mat-form-field>
@@ -285,7 +288,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> To Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpTo" [min]="minDate" [max]="maxDate" [formControl]="transactionDateTo" />
+        <input matInput [matDatepicker]="dpTo" [min]="minDate" [formControl]="transactionDateTo" />
         <mat-datepicker-toggle matSuffix [for]="dpTo"></mat-datepicker-toggle>
         <mat-datepicker #dpTo></mat-datepicker>
       </mat-form-field>
@@ -350,13 +353,7 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted From</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input
-            matInput
-            [matDatepicker]="dpSubFrom"
-            [min]="minDate"
-            [max]="maxDate"
-            [formControl]="submittedOnDateFrom"
-          />
+          <input matInput [matDatepicker]="dpSubFrom" [min]="minDate" [formControl]="submittedOnDateFrom" />
           <mat-datepicker-toggle matSuffix [for]="dpSubFrom"></mat-datepicker-toggle>
           <mat-datepicker #dpSubFrom></mat-datepicker>
         </mat-form-field>
@@ -365,7 +362,7 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted To</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [max]="maxDate" [formControl]="submittedOnDateTo" />
+          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [formControl]="submittedOnDateTo" />
           <mat-datepicker-toggle matSuffix [for]="dpSubTo"></mat-datepicker-toggle>
           <mat-datepicker #dpSubTo></mat-datepicker>
         </mat-form-field>
@@ -536,7 +533,7 @@
   </div>
 
   <div class="gl-table-shell">
-    <mat-table [dataSource]="dataSource" matSort class="gl-mat-table">
+    <mat-table [dataSource]="dataSource" matSort matSortActive="id" matSortDirection="desc" class="gl-mat-table">
       <!-- #ID -->
       <ng-container matColumnDef="id">
         <mat-header-cell *matHeaderCellDef mat-sort-header class="gl-th">#</mat-header-cell>
@@ -715,7 +712,10 @@
       ></mat-row>
     </mat-table>
 
-    @if (totalEntries === 0) {
+    <!-- Keyed off the rows actually rendered, not totalEntries: that count comes from the ledger
+         summary, which only reports a figure once a GL account is chosen, so the search view would
+         otherwise show "No entries found" above a full table. -->
+    @if (((dataSource?.entries$ | async) || []).length === 0) {
       <div class="gl-empty">
         <div class="gl-empty__icon"><fa-icon icon="search"></fa-icon></div>
         <div class="gl-empty__title">No entries found</div>
@@ -724,7 +724,11 @@
     }
 
     <div class="gl-pager-wrap">
-      <mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
+      <mat-paginator
+        [length]="(dataSource?.records$ | async) || 0"
+        [pageSizeOptions]="[10, 25, 50, 100]"
+        showFirstLastButtons
+      ></mat-paginator>
     </div>
   </div>
 </div>

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

@@ -14,6 +14,7 @@ import { ActivatedRoute, RouterLink } from '@angular/router';
 import { merge } from 'rxjs';
 import { tap, startWith, map, distinctUntilChanged, debounceTime } from 'rxjs/operators';
 import { AccountingService } from '../accounting.service';
+import { DISABLED_ACCOUNTING_FEATURES } from '../disabled-features';
 import { SettingsService } from 'app/settings/settings.service';
 import { JournalEntriesDataSource } from './journal-entry.datasource';
 import { Dates } from 'app/core/utils/dates';
@@ -89,7 +90,9 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
 
   // ── Misc ──────────────────────────────────────────────────────────────────
   minDate = new Date(2000, 0, 1);
-  maxDate = new Date();
+  maxDate: Date = null;
+  /** Accounting features switched off for this installation — see disabled-features.ts. */
+  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
 
   // ── Filter controls ───────────────────────────────────────────────────────
   officeName = new UntypedFormControl();
@@ -205,7 +208,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   }
 
   ngOnInit() {
-    this.maxDate = this.settingsService.businessDate;
+    this.maxDate = null;
     this.paginator.pageSize = 10;
     this.restoreState();
     this.setFilteredOffices();

src/app/accounts/accounts-list/accounts-list.component.html

@@ -139,6 +139,13 @@
             </td>
           </ng-container>
 
+          <ng-container matColumnDef="limit">
+            <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--right">Sanctioned Limit</th>
+            <td mat-cell *matCellDef="let row" class="acl-td acl-td--right">
+              {{ getCurrencySymbol(row) }} {{ row.overdraftLimit | formatNumber }}
+            </td>
+          </ng-container>
+
           <ng-container matColumnDef="balance">
             <th mat-header-cell *matHeaderCellDef class="acl-th acl-th--right">Balance</th>
             <td mat-cell *matCellDef="let row" class="acl-td acl-td--right">

src/app/accounts/accounts-list/accounts-list.component.ts

@@ -34,7 +34,7 @@ import { FormatNumberPipe } from '../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { AccountsService } from '../accounts.service';
 
-export type AccountType = 'savings' | 'current' | 'fixed-deposits' | 'recurring-deposits';
+export type AccountType = 'savings' | 'current' | 'cc' | 'fixed-deposits' | 'recurring-deposits';
 
 interface AccountConfig {
   label: string;
@@ -119,6 +119,13 @@ export class AccountsListComponent implements OnInit, OnDestroy {
       typeLabel: 'CA',
       typeBadgeClass: 'dtype--ca'
     },
+    cc: {
+      label: 'CC Accounts',
+      icon: 'hand-holding-usd',
+      accentClass: 'accent--current',
+      typeLabel: 'CC',
+      typeBadgeClass: 'dtype--ca'
+    },
     'fixed-deposits': {
       label: 'Fixed Deposit Accounts',
       icon: 'lock',
@@ -142,6 +149,24 @@ export class AccountsListComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.route.data.pipe(takeUntil(this.destroy$)).subscribe((data) => {
       this.accountType = data['accountType'] as AccountType;
+      this.displayedColumns = this.accountType === 'cc' ? [
+              'accountNo',
+              'depositType',
+              'clientName',
+              'productName',
+              'limit',
+              'balance',
+              'status',
+              'actions'
+            ] : [
+              'accountNo',
+              'depositType',
+              'clientName',
+              'productName',
+              'balance',
+              'status',
+              'actions'
+            ];
       this.pageIndex = 0;
       this.searchControl.setValue('', { emitEvent: false });
       this.loadAccounts();
@@ -183,9 +208,12 @@ export class AccountsListComponent implements OnInit, OnDestroy {
     const toVal = this.toDateControl.value;
     const bothDatesSet = !!(fromVal && toVal);
 
+    // CC accounts come from the server already narrowed to those that allow an overdraft; nothing else is read.
+    const isCc = this.accountType === 'cc';
     const params: import('../accounts.service').AccountListParams = {
-      offset: this.pageIndex * this.pageSize,
-      limit: this.pageSize,
+      offset: isCc ? 0 : this.pageIndex * this.pageSize,
+      limit: isCc ? 500 : this.pageSize,
+      ...(isCc && { overdraftOnly: true }),
       accountNo: this.searchType === 'accountNo' ? search || undefined : undefined,
       clientName: this.searchType === 'clientName' ? search || undefined : undefined,
       orderBy: 'id',
@@ -199,7 +227,7 @@ export class AccountsListComponent implements OnInit, OnDestroy {
     const obs$ =
       this.accountType === 'savings'
         ? this.accountsService.getSavingsAccounts(params)
-        : this.accountType === 'current'
+        : this.accountType === 'current' || this.accountType === 'cc'
           ? this.accountsService.getCurrentAccounts(params)
           : this.accountType === 'fixed-deposits'
             ? this.accountsService.getFixedDepositAccounts(params)
@@ -239,7 +267,7 @@ export class AccountsListComponent implements OnInit, OnDestroy {
           });
         }
 
-        this.totalRecords = Array.isArray(res) ? items.length : (res?.totalFilteredRecords ?? items.length);
+        this.totalRecords = isCc || Array.isArray(res) ? items.length : (res?.totalFilteredRecords ?? items.length);
         this.dataSource.data = items;
         this.isLoading = false;
       },
@@ -307,6 +335,13 @@ export class AccountsListComponent implements OnInit, OnDestroy {
         id,
         'general'
       ],
+      cc: [
+        '/clients',
+        account.clientId,
+        'current-accounts',
+        id,
+        'general'
+      ],
       'fixed-deposits': [
         '/clients',
         account.clientId,

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

@@ -11,6 +11,14 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { Route } from '../core/route/route.service';
 import { AccountsListComponent } from './accounts-list/accounts-list.component';
+import { PartyMasterComponent } from '../deposits/party-master/party-master.component';
+import { CreatePartyComponent } from '../deposits/party-master/create-party/create-party.component';
+import { DueForClosureComponent } from '../deposits/party-master/due-for-closure/due-for-closure.component';
+import { DailyTransactionEntryComponent } from '../deposits/daily-transaction-entry/daily-transaction-entry.component';
+import { DdsReportsComponent } from '../deposits/dds-reports/dds-reports.component';
+import { ReportViewerComponent } from '../deposits/dds-reports/report-viewer/report-viewer.component';
+import { DdsAccountsComponent } from '../deposits/dds-accounts/dds-accounts.component';
+import { DdsAccountViewComponent } from '../deposits/dds-accounts/dds-account-view/dds-account-view.component';
 
 const routes: Routes = [
   Route.withShell([
@@ -28,6 +36,12 @@ const routes: Routes = [
           component: AccountsListComponent,
           data: { accountType: 'current', title: 'Current Accounts', breadcrumb: 'Current Accounts' }
         },
+        {
+          // Cash Credit: current accounts opened on a product that allows an overdraft.
+          path: 'cc',
+          component: AccountsListComponent,
+          data: { accountType: 'cc', title: 'CC Accounts', breadcrumb: 'CC Accounts' }
+        },
         {
           path: 'fixed-deposits',
           component: AccountsListComponent,
@@ -41,6 +55,59 @@ const routes: Routes = [
             title: 'Recurring Deposit Accounts',
             breadcrumb: 'Recurring Deposit Accounts'
           }
+        },
+        {
+          path: 'dds',
+          data: { title: 'Daily Deposit Scheme — Party Master', breadcrumb: 'Party Master' },
+          children: [
+            { path: '', component: PartyMasterComponent },
+            {
+              path: 'create',
+              component: CreatePartyComponent,
+              data: { title: 'Create Party', breadcrumb: 'Create' }
+            },
+            {
+              // Ahead of the :partyId routes, so "dueforclosure" is not read as a party id.
+              path: 'dueforclosure',
+              component: DueForClosureComponent,
+              data: { title: 'Accounts Due for Closure', breadcrumb: 'Due for Closure' }
+            },
+            {
+              path: ':partyId/edit',
+              component: CreatePartyComponent,
+              data: { title: 'Edit Party', breadcrumb: 'Edit' }
+            }
+          ]
+        },
+        {
+          // The DDS accounts listed like Savings Accounts, each opening onto its transactions.
+          path: 'dds-accounts',
+          data: { title: 'DDS Accounts', breadcrumb: 'DDS Accounts' },
+          children: [
+            { path: '', component: DdsAccountsComponent },
+            {
+              path: ':partyId',
+              component: DdsAccountViewComponent,
+              data: { title: 'DDS Account', breadcrumb: 'Account', routeParamBreadcrumb: false }
+            }
+          ]
+        },
+        {
+          path: 'dds-collection',
+          component: DailyTransactionEntryComponent,
+          data: { title: 'Daily Transaction Entry', breadcrumb: 'Daily Transaction Entry' }
+        },
+        {
+          path: 'dds-reports',
+          data: { title: 'DDS Reports', breadcrumb: 'DDS Reports' },
+          children: [
+            { path: '', component: DdsReportsComponent },
+            {
+              path: 'view/:reportName',
+              component: ReportViewerComponent,
+              data: { title: 'DDS Report', breadcrumb: 'reportName', routeParamBreadcrumb: 'reportName' }
+            }
+          ]
         }
       ]
     }

src/app/accounts/accounts.service.ts

@@ -21,6 +21,8 @@ export interface AccountListParams {
   fromDate?: string;
   toDate?: string;
   asOnDate?: string;
+  /** Current accounts only: just the Cash Credit (overdraft) accounts, filtered by the server. */
+  overdraftOnly?: boolean;
 }
 
 @Injectable({ providedIn: 'root' })
@@ -55,6 +57,7 @@ export class AccountsService {
     if (params.fromDate) httpParams = httpParams.set('fromDate', params.fromDate);
     if (params.toDate) httpParams = httpParams.set('toDate', params.toDate);
     if (params.asOnDate) httpParams = httpParams.set('asOnDate', params.asOnDate);
+    if (params.overdraftOnly) httpParams = httpParams.set('overdraftOnly', 'true');
     return this.http.get('/currentaccounts', { params: httpParams });
   }
 
@@ -74,6 +77,22 @@ export class AccountsService {
     return this.http.get('/fixeddepositaccounts', { params: httpParams });
   }
 
+  /**
+   * FD Dashboard's data source: every ACTIVE FD, id/account/client/product identity, maturity date
+   * and deposit/maturity amounts only. Deliberately a separate, narrow endpoint rather than
+   * getFixedDepositAccounts() above -- that one's backend query joins in six more tables (audit
+   * who-did-what-when, currency, tax group) an unbounded dashboard fetch does not need, over columns
+   * that had no index until this feature added one (see backend migration 0571).
+   */
+  getFixedDepositMaturityDashboard(): Observable<any> {
+    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/aml/aml.service.ts

@@ -34,6 +34,17 @@ export class AmlService {
     return this.http.post(`/aml/alerts/${alertId}/review`, { disposition, notes });
   }
 
+  /**
+   * Decides named rules within one alert, leaving its other rules open.
+   *
+   * <p>
+   * The alert's own status follows from what is left undecided, so it is not sent: whitelisting five of six rules
+   * leaves the alert open on the sixth.
+   */
+  reviewAlertRules(alertId: number, ruleCodes: string[], disposition: string, notes: string): Observable<any> {
+    return this.http.post(`/aml/alerts/${alertId}/review`, { disposition, notes, ruleCodes });
+  }
+
   // ═══ Recurring-alert review queue ═══
 
   /**
@@ -122,6 +133,41 @@ export class AmlService {
     return this.http.get<any[]>('/aml/ctr-reports');
   }
 
+  /**
+   * The reportable lines behind the generated CTRs, each resolved to the account, customer, branch
+   * and date a FIU-IND filing names. Omit `reportId` for every generated month.
+   */
+  getCtrReportLines(reportId?: number): Observable<any[]> {
+    const params = reportId ? new HttpParams().set('reportId', String(reportId)) : undefined;
+    return this.http.get<any[]>('/aml/ctr-reports/lines', { params });
+  }
+
+  /**
+   * Cash transactions of the threshold or more that no generated report contains yet, shaped like the lines above.
+   * They show on the FIU screen as soon as they are posted; generating the month is what files them.
+   */
+  getCtrPendingLines(): Observable<any[]> {
+    return this.http.get<any[]>('/aml/ctr-reports/pending-lines');
+  }
+
+  /**
+   * How much came into and went out of each current / Cash Credit account over the last `days` days, with the
+   * customer's declared turnover and the sanctioned limit alongside.
+   */
+  getCcTracking(days = 30): Observable<any> {
+    return this.http.get<any>('/aml/cc-tracking', { params: new HttpParams().set('days', String(days)) });
+  }
+
+  /**
+   * Every credit and debit on one CC account over the last `days` days, with the mode and counterparty each payment
+   * recorded, totalled by mode and by counterparty.
+   */
+  getCcAccountTrail(accountId: number, days = 30): Observable<any> {
+    return this.http.get<any>(`/aml/cc-tracking/${accountId}/trail`, {
+      params: new HttpParams().set('days', String(days))
+    });
+  }
+
   /** month format: yyyy-MM */
   generateCtrReport(month: string): Observable<any> {
     return this.http.post('/aml/ctr-reports/generate', { month });
@@ -132,4 +178,38 @@ export class AmlService {
   getRiskCategoryHistory(clientId: number): Observable<any[]> {
     return this.http.get<any[]>(`/clients/${clientId}/risk-category-history`);
   }
+
+  // ═══ Risk-category changes (maker-checker) ═══
+  //
+  // The rating decides how often a customer is re-KYC'd and what AML thresholds apply to them, so
+  // it moves only once a checker agrees rather than on one officer's say-so.
+
+  /** @param requestedCategory 1 Low, 2 Medium, 3 High */
+  requestRiskChange(clientId: number, requestedCategory: number, reason: string): Observable<any> {
+    return this.http.post('/aml/risk-change-requests', { clientId, requestedCategory, reason });
+  }
+
+  getRiskChangeRequests(status?: string): Observable<any[]> {
+    const params = status ? new HttpParams().set('status', status) : undefined;
+    return this.http.get<any[]>('/aml/risk-change-requests', { params });
+  }
+
+  approveRiskChange(requestId: number): Observable<any> {
+    return this.http.post(`/aml/risk-change-requests/${requestId}/approve`, {});
+  }
+
+  rejectRiskChange(requestId: number, rejectionReason: string): Observable<any> {
+    return this.http.post(`/aml/risk-change-requests/${requestId}/reject`, { rejectionReason });
+  }
+
+  /**
+   * The latest behaviour window for each customer, as the nightly job computed it.
+   *
+   * One row per customer carrying the review period's figures and the rating they suggest. The Risk Review report
+   * prefers these over its own per-alert reckoning, because a rating describes a period rather than the handful of
+   * transactions that happened to trip a rule.
+   */
+  getBehaviourWindows(): Observable<any[]> {
+    return this.http.get<any[]>('/risk-review/behaviour-windows');
+  }
 }

src/app/api-management/api-import.util.ts

@@ -0,0 +1,778 @@
+/**
+ * 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 { ApiMappingRow, KeyValue, kv } from './api-management.service';
+
+/**
+ * Reads what a vendor's documentation or a Postman / browser / cURL capture gives - in any of these shapes - and turns
+ * it into the pieces of an API: method, URL, path, query parameters, headers, content type, payload, response status,
+ * response headers, response body, and a first guess at the CBS field mapping. Nothing is sent anywhere.
+ *
+ * Understood:
+ *   - a cURL command
+ *   - a Postman collection or a single Postman request / item (with its saved responses)
+ *   - a HAR capture
+ *   - an "API definition" object: { method, url | path, query, headers, body, status, ... }
+ *   - a bare JSON payload (treated as the request body, or the response body on the response side)
+ *   - form text (a=1&b=2) and other raw text
+ *
+ * Credentials found in headers or query strings are never kept: the value is replaced by {{secret}} and the row is
+ * flagged as secret, so a key pasted from a sample cannot end up stored.
+ */
+
+export interface ImportedRequest {
+  source: string;
+  method?: string;
+  /** The full URL when the file had one. */
+  url?: string;
+  /** Scheme and host of the URL, when present. */
+  baseUrl?: string;
+  path?: string;
+  queryParams: KeyValue[];
+  headers: KeyValue[];
+  contentType?: string;
+  body?: string;
+  /** A response found in the same file (Postman saved response, HAR entry, definition object). */
+  response?: ImportedResponse;
+  notes: string[];
+}
+
+export interface ImportedResponse {
+  source: string;
+  status?: number;
+  headers: KeyValue[];
+  body?: string;
+  errorBody?: string;
+  notes: string[];
+}
+
+const SECRET_HEADERS =
+  /^(authorization|proxy-authorization|x-api-key|api-key|apikey|authkey|x-auth-token|auth-token|token|x-access-token|cookie|set-cookie|x-hub-signature(-256)?)$/i;
+const SECRET_QUERY = /^(key|api[-_]?key|apikey|token|access[-_]?token|auth[-_]?key|secret|password|signature)$/i;
+const SECRET = '{{secret}}';
+
+// ── small helpers ───────────────────────────────────────────────────────────
+
+function isObject(v: unknown): v is Record<string, any> {
+  return typeof v === 'object' && v !== null && !Array.isArray(v);
+}
+
+function tryJson(text: string): any {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return undefined;
+  }
+}
+
+function prettyJsonOrText(text: string): string {
+  const parsed = tryJson(text);
+  return parsed !== undefined && typeof parsed === 'object' ? JSON.stringify(parsed, null, 2) : text;
+}
+
+function bodyToText(body: unknown): string | undefined {
+  if (body === undefined || body === null) return undefined;
+  if (typeof body === 'string') return prettyJsonOrText(body);
+  return JSON.stringify(body, null, 2);
+}
+
+function toKeyValues(source: unknown, kind: 'header' | 'query' | 'plain'): KeyValue[] {
+  const out: KeyValue[] = [];
+  const add = (key: unknown, value: unknown, description = '', disabled = false) => {
+    const k = String(key ?? '').trim();
+    if (!k) return;
+    const secret = (kind === 'header' && SECRET_HEADERS.test(k)) || (kind === 'query' && SECRET_QUERY.test(k));
+    out.push({
+      key: k,
+      value: secret ? SECRET : value === undefined || value === null ? '' : String(value),
+      description,
+      enabled: !disabled,
+      secret
+    });
+  };
+  if (Array.isArray(source)) {
+    for (const item of source) {
+      if (isObject(item))
+        add(item.key ?? item.name, item.value, String(item.description ?? ''), item.disabled === true);
+    }
+  } else if (isObject(source)) {
+    for (const [
+      k,
+      v
+    ] of Object.entries(source)) add(k, v);
+  }
+  return out;
+}
+
+/** Splits a URL into its base, path and query without failing on {{placeholders}} or {path} parameters. */
+function splitUrl(raw: string): { baseUrl?: string; path: string; query: KeyValue[] } {
+  let rest = raw.trim();
+  let baseUrl: string | undefined;
+  const m = /^([a-zA-Z][a-zA-Z0-9+.-]*:\/\/[^/?#]+)(.*)$/.exec(rest);
+  if (m) {
+    baseUrl = m[1];
+    rest = m[2];
+  }
+  const hash = rest.indexOf('#');
+  if (hash >= 0) rest = rest.slice(0, hash);
+  let queryText = '';
+  const q = rest.indexOf('?');
+  if (q >= 0) {
+    queryText = rest.slice(q + 1);
+    rest = rest.slice(0, q);
+  }
+  const query: KeyValue[] = [];
+  for (const part of queryText.split('&')) {
+    if (!part) continue;
+    const eq = part.indexOf('=');
+    const key = safeDecode(eq >= 0 ? part.slice(0, eq) : part);
+    const value = eq >= 0 ? safeDecode(part.slice(eq + 1)) : '';
+    query.push(...toKeyValues([{ key, value }], 'query'));
+  }
+  return { baseUrl, path: rest || '/', query };
+}
+
+function safeDecode(s: string): string {
+  try {
+    return decodeURIComponent(s.replace(/\+/g, ' '));
+  } catch {
+    return s;
+  }
+}
+
+function detectContentType(
+  headers: KeyValue[],
+  body: string | undefined
+): { contentType?: string; headers: KeyValue[] } {
+  const ct = headers.find((h) => h.key.toLowerCase() === 'content-type');
+  const rest = headers.filter((h) => h.key.toLowerCase() !== 'content-type');
+  if (ct) return { contentType: ct.value.split(';')[0].trim(), headers: rest };
+  if (!body) return { headers: rest };
+  if (tryJson(body) !== undefined) return { contentType: 'application/json', headers: rest };
+  if (/^\s*</.test(body)) return { contentType: 'application/xml', headers: rest };
+  if (/^[^\s=&]+=[^&]*(&[^\s=&]+=[^&]*)*$/.test(body.trim()))
+    return { contentType: 'application/x-www-form-urlencoded', headers: rest };
+  return { contentType: 'text/plain', headers: rest };
+}
+
+/** Everything about a request is derived the same way once method / url / headers / body are known. */
+function finishRequest(
+  source: string,
+  method: string | undefined,
+  url: string | undefined,
+  pathOnly: string | undefined,
+  query: unknown,
+  headers: KeyValue[],
+  body: string | undefined,
+  contentTypeHint: string | undefined,
+  notes: string[]
+): ImportedRequest {
+  const parts = url ? splitUrl(url) : pathOnly ? splitUrl(pathOnly) : undefined;
+  const queryParams = [
+    ...(parts?.query ?? []),
+    ...toKeyValues(query, 'query')
+  ];
+  const detected = detectContentType(headers, body);
+  if (queryParams.some((q) => q.secret))
+    notes.push('A credential in the query string was replaced by {{secret}} - set it on the Connection tab.');
+  if (headers.some((h) => h.secret))
+    notes.push('Credentials in the headers were replaced by {{secret}} - set them on the Connection tab.');
+  return {
+    source,
+    method: method ? method.toUpperCase() : body ? 'POST' : undefined,
+    url,
+    baseUrl: parts?.baseUrl,
+    path: parts?.path,
+    queryParams,
+    headers: detected.headers,
+    contentType: contentTypeHint ?? detected.contentType,
+    body,
+    notes
+  };
+}
+
+// ── cURL ────────────────────────────────────────────────────────────────────
+
+/** Splits a shell command into words, honouring '…' "…" quotes and \ line continuations. */
+function shellWords(command: string): string[] {
+  const words: string[] = [];
+  let cur = '';
+  let quote: '"' | "'" | null = null;
+  let started = false;
+  const text = command.replace(/\\\r?\n/g, ' ').trim();
+  for (let i = 0; i < text.length; i++) {
+    const c = text[i];
+    if (quote) {
+      if (c === quote) quote = null;
+      else if (c === '\\' && quote === '"' && i + 1 < text.length) cur += text[++i];
+      else cur += c;
+    } else if (c === '"' || c === "'") {
+      quote = c;
+      started = true;
+    } else if (/\s/.test(c)) {
+      if (started || cur) words.push(cur);
+      cur = '';
+      started = false;
+    } else if (c === '\\' && i + 1 < text.length) {
+      cur += text[++i];
+    } else {
+      cur += c;
+    }
+  }
+  if (started || cur) words.push(cur);
+  return words;
+}
+
+function parseCurl(text: string): ImportedRequest {
+  const words = shellWords(text);
+  const notes: string[] = [];
+  let method: string | undefined;
+  let url: string | undefined;
+  const headers: KeyValue[] = [];
+  const data: string[] = [];
+  let form = false;
+  let getMode = false;
+  for (let i = 0; i < words.length; i++) {
+    const w = words[i];
+    const next = () => words[++i] ?? '';
+    if (w === 'curl') continue;
+    if (w === '-X' || w === '--request') method = next();
+    else if (w === '-H' || w === '--header') {
+      const h = next();
+      const c = h.indexOf(':');
+      if (c > 0) headers.push(...toKeyValues([{ key: h.slice(0, c), value: h.slice(c + 1).trim() }], 'header'));
+    } else if ([
+        '-d',
+        '--data',
+        '--data-raw',
+        '--data-binary',
+        '--data-ascii'
+      ].includes(w)) data.push(next());
+    else if (w === '--data-urlencode') {
+      data.push(next());
+      form = true;
+    } else if (w === '-F' || w === '--form') {
+      data.push(next());
+      form = true;
+      notes.push('Multipart form fields were read as name=value pairs.');
+    } else if (w === '--url') url = next();
+    else if (w === '-G' || w === '--get') getMode = true;
+    else if (w === '-u' || w === '--user') {
+      next();
+      headers.push({
+        key: 'Authorization',
+        value: SECRET,
+        description: 'Basic authentication from the cURL -u option',
+        enabled: true,
+        secret: true
+      });
+    } else if (w.startsWith('-')) {
+      // Flags that take a value we do not need.
+      if ([
+          '-o',
+          '--output',
+          '-A',
+          '--user-agent',
+          '-e',
+          '--referer',
+          '--connect-timeout',
+          '-m',
+          '--max-time',
+          '--proxy',
+          '-x'
+        ].includes(w)) next();
+    } else if (!url && /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(w)) url = w;
+    else if (!url && /^[\w.-]+(:\d+)?\//.test(w)) url = w;
+  }
+  let body = data.length ? data.join('&') : undefined;
+  if (body && getMode) {
+    url = url + (url?.includes('?') ? '&' : '?') + body;
+    body = undefined;
+  }
+  return finishRequest(
+    'cURL command',
+    method ?? (getMode ? 'GET' : body ? 'POST' : 'GET'),
+    url,
+    undefined,
+    undefined,
+    headers,
+    body ? prettyJsonOrText(body) : undefined,
+    form && !headers.some((h) => h.key.toLowerCase() === 'content-type')
+      ? 'application/x-www-form-urlencoded'
+      : undefined,
+    notes
+  );
+}
+
+// ── Postman / HAR / definition object ───────────────────────────────────────
+
+function findPostmanItem(node: any): any {
+  if (!node) return undefined;
+  if (node.request) return node;
+  if (Array.isArray(node.item)) {
+    for (const child of node.item) {
+      const found = findPostmanItem(child);
+      if (found) return found;
+    }
+  }
+  return undefined;
+}
+
+function postmanUrl(url: any): string | undefined {
+  if (!url) return undefined;
+  if (typeof url === 'string') return url;
+  if (typeof url.raw === 'string') return url.raw;
+  const host = Array.isArray(url.host) ? url.host.join('.') : url.host;
+  const path = Array.isArray(url.path) ? url.path.join('/') : url.path;
+  return `${url.protocol ? url.protocol + '://' : ''}${host ?? ''}/${path ?? ''}`;
+}
+
+function postmanResponse(r: any): ImportedResponse {
+  return {
+    source: 'Postman saved response',
+    status: typeof r?.code === 'number' ? r.code : undefined,
+    headers: toKeyValues(r?.header, 'header'),
+    body: bodyToText(r?.body),
+    notes: []
+  };
+}
+
+function fromPostman(item: any): ImportedRequest {
+  const req = item.request;
+  const notes: string[] = [];
+  let body: string | undefined;
+  let contentType: string | undefined;
+  const b = req?.body;
+  if (b?.mode === 'raw') {
+    body = bodyToText(b.raw);
+    const lang = b.options?.raw?.language;
+    if (lang === 'json') contentType = 'application/json';
+  } else if (b?.mode === 'urlencoded') {
+    body = (b.urlencoded ?? [])
+      .filter((p: any) => !p.disabled)
+      .map((p: any) => `${encodeURIComponent(p.key)}=${encodeURIComponent(p.value ?? '')}`)
+      .join('&');
+    contentType = 'application/x-www-form-urlencoded';
+  } else if (b?.mode === 'formdata') {
+    body = (b.formdata ?? []).map((p: any) => `${p.key}=${p.value ?? ''}`).join('&');
+    contentType = 'multipart/form-data';
+  }
+  const request = finishRequest(
+    'Postman request',
+    typeof req?.method === 'string' ? req.method : undefined,
+    postmanUrl(req?.url),
+    undefined,
+    undefined,
+    toKeyValues(req?.header, 'header'),
+    body,
+    contentType,
+    notes
+  );
+  if (Array.isArray(item.response) && item.response.length) request.response = postmanResponse(item.response[0]);
+  if (req?.auth)
+    notes.push('The request had an auth section; it was not read. Set authentication on the Connection tab.');
+  return request;
+}
+
+function fromHar(har: any): ImportedRequest {
+  const entry = har.log.entries[0];
+  const r = entry.request ?? {};
+  const body = r.postData?.text ? prettyJsonOrText(r.postData.text) : undefined;
+  const request = finishRequest(
+    'HAR capture',
+    r.method,
+    r.url,
+    undefined,
+    undefined,
+    toKeyValues(r.headers, 'header'),
+    body,
+    typeof r.postData?.mimeType === 'string' ? r.postData.mimeType.split(';')[0] : undefined,
+    []
+  );
+  const res = entry.response;
+  if (res) {
+    request.response = {
+      source: 'HAR capture',
+      status: typeof res.status === 'number' ? res.status : undefined,
+      headers: toKeyValues(res.headers, 'header'),
+      body: res.content?.text ? prettyJsonOrText(res.content.text) : undefined,
+      notes: []
+    };
+  }
+  return request;
+}
+
+function definitionResponse(def: any): ImportedResponse | undefined {
+  const r = def.response ?? def.responseDefinition;
+  const status = def.status ?? def.statusCode ?? def.successCode ?? r?.status ?? r?.statusCode ?? r?.code;
+  const headers = def.responseHeaders ?? r?.headers;
+  const body = def.responseBody ?? (isObject(r) ? (r.body ?? r.data) : r);
+  const errorBody = def.errorBody ?? def.errorResponse ?? r?.errorBody;
+  if (status === undefined && headers === undefined && body === undefined && errorBody === undefined) return undefined;
+  return {
+    source: 'API definition',
+    status: typeof status === 'number' ? status : status ? Number(status) || undefined : undefined,
+    headers: toKeyValues(headers, 'header'),
+    body: bodyToText(body),
+    errorBody: bodyToText(errorBody),
+    notes: []
+  };
+}
+
+function fromDefinition(def: any): ImportedRequest {
+  const body = def.body ?? def.payload ?? def.data ?? def.requestBody ?? def.request;
+  const bodyText = isObject(body) && ('method' in body || 'url' in body) ? undefined : bodyToText(body);
+  const url = def.url ?? def.endpoint ?? def.uri;
+  const request = finishRequest(
+    'API definition',
+    def.method ?? def.httpMethod,
+    typeof url === 'string' ? url : undefined,
+    typeof def.path === 'string' ? def.path : undefined,
+    def.query ?? def.queryParams ?? def.params,
+    toKeyValues(def.headers, 'header'),
+    bodyText,
+    typeof def.contentType === 'string' ? def.contentType : undefined,
+    []
+  );
+  request.response = definitionResponse(def);
+  return request;
+}
+
+// ── public: request side ────────────────────────────────────────────────────
+
+export function parseRequestText(text: string): ImportedRequest {
+  const t = (text ?? '').trim();
+  if (!t) throw new Error('Nothing to read - paste the request or choose a file.');
+  if (/^curl\b/i.test(t)) return parseCurl(t);
+
+  const parsed = tryJson(t);
+  if (parsed === undefined) {
+    // Not JSON: a cURL command in the middle of text, form data, or other raw text.
+    const curl = /curl\b[\s\S]*/i.exec(t);
+    if (curl && /https?:\/\//.test(curl[0])) return parseCurl(curl[0]);
+    const detected = detectContentType([], t);
+    return finishRequest('Raw text', undefined, undefined, undefined, undefined, [], t, detected.contentType, [
+      'The text is not JSON; it was kept as the request payload.'
+    ]);
+  }
+  if (isObject(parsed) && isObject(parsed.log) && Array.isArray(parsed.log.entries) && parsed.log.entries.length)
+    return fromHar(parsed);
+  if (isObject(parsed) && (parsed.item || parsed.info?.schema)) {
+    const item = findPostmanItem(parsed);
+    if (!item) throw new Error('The Postman collection has no request in it.');
+    return fromPostman(item);
+  }
+  if (
+    isObject(parsed) &&
+    isObject(parsed.request) &&
+    (parsed.request.url || parsed.request.method || parsed.request.header)
+  )
+    return fromPostman(parsed);
+  if (isObject(parsed) && [
+      'method',
+      'httpMethod',
+      'url',
+      'endpoint',
+      'uri',
+      'headers',
+      'queryParams',
+      'requestBody',
+      'payload'
+    ].some((k) => k in parsed) && !('statuses' in parsed)) {
+    return fromDefinition(parsed);
+  }
+  // A bare JSON payload.
+  return finishRequest(
+    'JSON payload',
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    [],
+    JSON.stringify(parsed, null, 2),
+    'application/json',
+    []
+  );
+}
+
+// ── public: response side ───────────────────────────────────────────────────
+
+export function parseResponseText(text: string): ImportedResponse {
+  const t = (text ?? '').trim();
+  if (!t) throw new Error('Nothing to read - paste the response or choose a file.');
+  const parsed = tryJson(t);
+  if (parsed === undefined) {
+    return {
+      source: 'Raw text',
+      headers: [],
+      body: t,
+      notes: ['The text is not JSON; it was kept as the response body.']
+    };
+  }
+  if (isObject(parsed) && isObject(parsed.log) && Array.isArray(parsed.log.entries) && parsed.log.entries.length) {
+    return (
+      fromHar(parsed).response ?? { source: 'HAR capture', headers: [], notes: ['The HAR entry has no response.'] }
+    );
+  }
+  if (isObject(parsed) && (parsed.item || parsed.info?.schema)) {
+    const item = findPostmanItem(parsed);
+    const res = item ? fromPostman(item).response : undefined;
+    if (!res) throw new Error('The Postman collection has no saved response.');
+    return res;
+  }
+  if (isObject(parsed) && Array.isArray(parsed.response) && parsed.response.length && (parsed.request || parsed.name)) {
+    return postmanResponse(parsed.response[0]);
+  }
+  if (isObject(parsed) && [
+      'status',
+      'statusCode',
+      'headers',
+      'responseHeaders',
+      'responseBody',
+      'errorBody'
+    ].some(
+      (k) => k in parsed
+    ) && ('body' in parsed || 'responseBody' in parsed || 'headers' in parsed || 'responseHeaders' in parsed || 'errorBody' in parsed || 'data' in parsed)) {
+    const r = definitionResponse({
+      status: parsed.status ?? parsed.statusCode,
+      responseHeaders: parsed.responseHeaders ?? parsed.headers,
+      responseBody: parsed.responseBody ?? parsed.body ?? parsed.data,
+      errorBody: parsed.errorBody
+    });
+    if (r) return r;
+  }
+  return { source: 'JSON body', headers: [], body: JSON.stringify(parsed, null, 2), notes: [] };
+}
+
+// ── JSON → mapping rows ─────────────────────────────────────────────────────
+
+export interface JsonLeaf {
+  path: string;
+  value: unknown;
+}
+
+/** Every value in a JSON document with its path: `a.b[0].c`. Only the first item of an array is walked. */
+export function flatten(json: unknown, prefix = ''): JsonLeaf[] {
+  const out: JsonLeaf[] = [];
+  if (Array.isArray(json)) {
+    if (json.length) out.push(...flatten(json[0], `${prefix}[0]`));
+  } else if (isObject(json)) {
+    for (const [
+      k,
+      v
+    ] of Object.entries(json)) {
+      out.push(...flatten(v, prefix ? `${prefix}.${k}` : k));
+    }
+  } else if (prefix) {
+    out.push({ path: prefix, value: json });
+  }
+  return out;
+}
+
+function lastKey(path: string): string {
+  const m = /([A-Za-z0-9_$-]+)(\[\d+\])*$/.exec(path);
+  return m ? m[1] : path;
+}
+
+const norm = (s: string) => s.toLowerCase().replace(/[^a-z0-9]/g, '');
+
+const REQUEST_GUESS: [RegExp, string, boolean][] = [
+  [
+    /^(mobile|mobiles|mobileno|mobilenumber|msisdn|phone|phoneno|phonenumber|to|destination|recipient|recipients|number|contact)$/,
+    'customer.mobile',
+    true
+  ],
+  [
+    /^(templateid|template|templatename|dlttemplateid|flowid)$/,
+    'message.templateId',
+    true
+  ],
+  [
+    /^(message|text|body|content|sms|msg|smstext|var1|messagetext)$/,
+    'message.text',
+    true
+  ],
+  [
+    /^(sender|senderid|from|source|shortcode)$/,
+    'bank.senderId',
+    false
+  ],
+  [
+    /^(email|emailid|mail|emailaddress)$/,
+    'customer.email',
+    false
+  ],
+  [
+    /^(customername|fullname|firstname|name)$/,
+    'customer.name',
+    false
+  ],
+  [
+    /^(otp|code|pin)$/,
+    'message.otp',
+    false
+  ],
+  [
+    /^(pan|pannumber)$/,
+    'customer.pan',
+    false
+  ],
+  [
+    /^(aadhaar|aadhar|aadhaarnumber)$/,
+    'customer.aadhaar',
+    false
+  ],
+  [
+    /^(dob|dateofbirth|birthdate)$/,
+    'customer.dob',
+    false
+  ],
+  [
+    /^(membercode|memberid|memberreference)$/,
+    'bank.memberCode',
+    false
+  ],
+  [
+    /^(accountno|accountnumber|acno|account)$/,
+    'account.number',
+    false
+  ],
+  [
+    /^(cif|customerid|clientid|cifno)$/,
+    'customer.cif',
+    false
+  ],
+  [
+    /^(amount|amt|txnamount|transactionamount)$/,
+    'txn.amount',
+    false
+  ],
+  [
+    /^(txnid|transactionid|transactionreference|txnref)$/,
+    'txn.reference',
+    false
+  ],
+  [
+    /^(txndate|transactiondate)$/,
+    'txn.date',
+    false
+  ],
+  [
+    /^(fromdate|startdate|datefrom)$/,
+    'request.fromDate',
+    false
+  ],
+  [
+    /^(todate|enddate|dateto)$/,
+    'request.toDate',
+    false
+  ],
+  [
+    /^(reference|referenceno|referencenumber|ref|requestid|clientreference|correlationid)$/,
+    'request.reference',
+    false
+  ],
+  [
+    /^(tenantidentifier|tenantid)$/,
+    'tenant.identifier',
+    false
+  ],
+  [
+    /^(providerid)$/,
+    'sms.providerId',
+    false
+  ]
+];
+
+function guessTransform(cbsField: string, value: unknown): string {
+  if (cbsField === 'customer.mobile') return 'DIGITS_ONLY';
+  if (cbsField === 'customer.email') return 'LOWER';
+  if (cbsField === 'bank.senderId') return 'UPPER';
+  if (cbsField === 'txn.amount') return 'NUMBER';
+  if (typeof value === 'boolean') return 'BOOLEAN';
+  if (typeof value === 'number') return 'NUMBER';
+  if (typeof value === 'string') {
+    if (/^\d{8}$/.test(value) && cbsField.includes('Date')) return 'DATE_DDMMYYYY';
+    if (/^\d{4}-\d{2}-\d{2}/.test(value)) return 'DATE_YYYY_MM_DD';
+  }
+  return 'NONE';
+}
+
+/**
+ * A first mapping for a request payload: each value that looks like a known CBS field (mobile, message, template,
+ * sender ...) becomes "CBS field → path"; every other value becomes a fixed value at its path, so the whole payload is
+ * reproduced. Review and adjust.
+ */
+export function guessRequestRows(bodyText: string): ApiMappingRow[] {
+  const parsed = tryJson(bodyText);
+  if (parsed === undefined || typeof parsed !== 'object' || parsed === null) return [];
+  const rows: ApiMappingRow[] = [];
+  const used = new Set<string>();
+  for (const leaf of flatten(parsed)) {
+    const key = norm(lastKey(leaf.path));
+    const hit = REQUEST_GUESS.find(([re]) => re.test(key));
+    if (hit && !used.has(hit[1])) {
+      used.add(hit[1]);
+      rows.push({
+        from: hit[1],
+        to: leaf.path,
+        transform: guessTransform(hit[1], leaf.value),
+        defaultValue: '',
+        mandatory: hit[2]
+      });
+    } else {
+      rows.push({
+        from: '',
+        to: leaf.path,
+        transform: guessTransform('', leaf.value),
+        defaultValue: leaf.value === null ? '' : String(leaf.value),
+        mandatory: false
+      });
+    }
+  }
+  return rows.filter((r) => r.from || r.defaultValue);
+}
+
+/**
+ * A first mapping for a response body: every value at its path → a CBS field named after the vendor and the key
+ * (`sms.messageId`). Ids / references are marked required.
+ */
+export function guessResponseRows(bodyText: string, vendorCode: string): ApiMappingRow[] {
+  const parsed = tryJson(bodyText);
+  if (parsed === undefined || typeof parsed !== 'object' || parsed === null) return [];
+  const prefix = vendorCode.toLowerCase().split('_')[0] || 'vendor';
+  const rows: ApiMappingRow[] = [];
+  const used = new Set<string>();
+  for (const leaf of flatten(parsed)) {
+    const key = lastKey(leaf.path);
+    const n = norm(key);
+    let target: string;
+    if (/^(messageid|msgid|id|reference|requestid|referenceid|messageid)$/.test(n)) target = 'reference';
+    else if (/^(status|state|result|type)$/.test(n)) target = 'status';
+    else if (/^(error|errormessage|errormsg|reason|detail|description)$/.test(n)) target = 'error';
+    else target = key.replace(/[^A-Za-z0-9]+(.)?/g, (_m, c: string) => (c ? c.toUpperCase() : ''));
+    let to = `${prefix}.${target}`;
+    for (let i = 2; used.has(to); i++) to = `${prefix}.${target}${i}`;
+    used.add(to);
+    rows.push({
+      from: leaf.path,
+      to,
+      transform: target === 'status' ? 'UPPER' : guessTransform('', leaf.value),
+      defaultValue: '',
+      mandatory: target === 'reference'
+    });
+  }
+  return rows;
+}
+
+export function secretNote(rows: KeyValue[]): string | null {
+  const n = rows.filter((r) => r.secret).length;
+  return n ? `${n} credential value(s) were hidden.` : null;
+}
+
+export { kv };

src/app/api-management/api-key-value-editor/api-key-value-editor.component.html

@@ -0,0 +1,61 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+@if (!rows.length) {
+  <div class="muted" style="font-size: 12px; margin-bottom: 6px">{{ emptyText }}</div>
+} @else {
+  <div class="cic-table-wrap">
+    <table class="cic-table">
+      <thead>
+        <tr>
+          <th style="width: 34px">On</th>
+          <th>{{ keyLabel }}</th>
+          <th>{{ valueLabel }}</th>
+          <th>Note</th>
+          <th style="width: 60px">Secret</th>
+          @if (!fixedKeys) {
+            <th style="width: 40px"></th>
+          }
+        </tr>
+      </thead>
+      <tbody>
+        @for (r of rows; track $index; let i = $index) {
+          <tr>
+            <td style="text-align: center">
+              <input type="checkbox" [(ngModel)]="r.enabled" style="width: auto" />
+            </td>
+            <td>
+              <input class="cic-mono" [(ngModel)]="r.key" [placeholder]="keyPlaceholder" [readonly]="fixedKeys" />
+            </td>
+            <td>
+              <input
+                class="cic-mono"
+                [type]="r.secret ? 'password' : 'text'"
+                [(ngModel)]="r.value"
+                [placeholder]="valuePlaceholder"
+                autocomplete="off"
+              />
+            </td>
+            <td><input [(ngModel)]="r.description" /></td>
+            <td style="text-align: center">
+              <input type="checkbox" [(ngModel)]="r.secret" style="width: auto" title="Show the value masked" />
+            </td>
+            @if (!fixedKeys) {
+              <td>
+                <button class="cic-btn sm danger" (click)="remove(i)">✕</button>
+              </td>
+            }
+          </tr>
+        }
+      </tbody>
+    </table>
+  </div>
+}
+@if (!fixedKeys) {
+  <button class="cic-btn sm" style="margin-top: 8px" (click)="add()">{{ addLabel }}</button>
+}

src/app/api-management/api-key-value-editor/api-key-value-editor.component.ts

@@ -0,0 +1,44 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { Component, Input } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+
+import { KeyValue } from '../api-management.service';
+
+/** An editable table of name / value pairs: headers, query parameters, path parameters. Edits the array in place. */
+@Component({
+  selector: 'mifosx-api-key-value-editor',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule
+  ],
+  templateUrl: './api-key-value-editor.component.html',
+  styleUrls: ['../../credit-bureau/cic-shared.scss']
+})
+export class ApiKeyValueEditorComponent {
+  @Input() rows: KeyValue[] = [];
+  @Input() keyLabel = 'Name';
+  @Input() valueLabel = 'Value';
+  @Input() keyPlaceholder = '';
+  @Input() valuePlaceholder = '';
+  @Input() addLabel = '+ Add';
+  /** Path parameters come from the path itself; the names cannot be edited or removed. */
+  @Input() fixedKeys = false;
+  @Input() emptyText = 'None.';
+
+  add(): void {
+    this.rows.push({ key: '', value: '', description: '', enabled: true, secret: false });
+  }
+
+  remove(i: number): void {
+    this.rows.splice(i, 1);
+  }
+}

src/app/api-management/api-log-detail/api-log-detail.component.html

@@ -0,0 +1,55 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+@if (log) {
+  <div class="cic-modal-backdrop" (click)="closed.emit()">
+    <div class="cic-modal" style="width: min(1100px, 100%)" (click)="$event.stopPropagation()">
+      <h3>
+        {{ log.vendorName }} · {{ log.apiName }}
+        <span class="cic-badge" [class.brand]="log.direction === 'IN'" [class.ok]="log.direction === 'OUT'">{{
+          log.direction
+        }}</span>
+        <span class="cic-badge" [class.good]="log.result === 'SUCCESS'" [class.bad]="log.result === 'FAILED'">{{
+          log.result
+        }}</span>
+      </h3>
+      <dl class="cic-kv" style="grid-template-columns: 120px minmax(0, 1fr); margin-bottom: 12px">
+        <dt>Reference</dt>
+        <dd class="cic-mono">{{ log.reference }}</dd>
+        <dt>Call</dt>
+        <dd class="cic-mono">{{ log.method }} {{ log.url }}</dd>
+        <dt>Result</dt>
+        <dd>HTTP {{ log.httpStatus }} in {{ log.durationMs }} ms · {{ log.time | slice: 0 : 16 }}</dd>
+        @if (log.error) {
+          <dt>Error</dt>
+          <dd class="tone-bad">{{ log.error }}</dd>
+        }
+      </dl>
+      <div class="cic-split">
+        <div>
+          <h4 style="margin: 0 0 6px; font-size: 13px">
+            {{ log.direction === 'OUT' ? 'Request headers' : 'Headers received / sent' }}
+            <span class="muted" style="font-weight: 400">(credentials masked)</span>
+          </h4>
+          <pre class="cic-code" style="max-height: 160px">{{ log.requestHeaders }}</pre>
+          <h4 style="margin: 12px 0 6px; font-size: 13px">Request payload</h4>
+          <pre class="cic-code">{{ log.request || '(empty)' }}</pre>
+        </div>
+        <div>
+          <h4 style="margin: 0 0 6px; font-size: 13px">Response headers</h4>
+          <pre class="cic-code" style="max-height: 160px">{{ log.responseHeaders }}</pre>
+          <h4 style="margin: 12px 0 6px; font-size: 13px">Response body</h4>
+          <pre class="cic-code">{{ log.response || '(empty)' }}</pre>
+        </div>
+      </div>
+      <div class="foot">
+        <button class="cic-btn" (click)="closed.emit()">Close</button>
+      </div>
+    </div>
+  </div>
+}

src/app/api-management/api-log-detail/api-log-detail.component.ts

@@ -0,0 +1,25 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import { ApiLog } from '../api-management.service';
+
+/** One API call: what was sent and what came back. */
+@Component({
+  selector: 'mifosx-api-log-detail',
+  standalone: true,
+  imports: [CommonModule],
+  templateUrl: './api-log-detail.component.html',
+  styleUrls: ['../../credit-bureau/cic-shared.scss']
+})
+export class ApiLogDetailComponent {
+  @Input() log: ApiLog | null = null;
+  @Output() closed = new EventEmitter<void>();
+}

src/app/api-management/api-logs/api-logs.component.html

@@ -0,0 +1,122 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="cic-page">
+  <div class="cic-head">
+    <div>
+      <h1>API Call Logs</h1>
+      <p>Every API call the CBS made (OUT) or received (IN), across all vendors, with its request and response.</p>
+    </div>
+    <div class="cic-actions">
+      <a class="cic-btn" routerLink="/api-management/vendors">← All vendors</a>
+    </div>
+  </div>
+
+  <div class="cic-card">
+    <div class="cic-grid cols-4" style="align-items: end">
+      <div class="cic-field">
+        <label>Vendor</label>
+        <select [(ngModel)]="filter.vendorId">
+          <option value="">All vendors</option>
+          @for (v of vendors; track v.id) {
+            <option [value]="v.id">{{ v.name }}</option>
+          }
+        </select>
+      </div>
+      <div class="cic-field">
+        <label>Direction</label>
+        <select [(ngModel)]="filter.direction">
+          <option value="">IN and OUT</option>
+          <option value="IN">IN — received</option>
+          <option value="OUT">OUT — sent</option>
+        </select>
+      </div>
+      <div class="cic-field">
+        <label>Result</label>
+        <select [(ngModel)]="filter.result">
+          <option value="">All</option>
+          <option value="SUCCESS">Success</option>
+          <option value="FAILED">Failed</option>
+        </select>
+      </div>
+      <div class="cic-field">
+        <label>Search</label>
+        <input [(ngModel)]="filter.search" (keyup.enter)="apply()" placeholder="Reference, API, path" />
+      </div>
+    </div>
+    <div class="cic-actions" style="margin-top: 12px; justify-content: flex-end">
+      <button class="cic-btn" (click)="reset()">Reset</button>
+      <button class="cic-btn primary" (click)="apply()">Apply</button>
+    </div>
+  </div>
+
+  <div class="cic-card">
+    <h2>
+      {{ total }} call(s)
+      <span class="cic-card-sub">
+        <span class="tone-good">{{ success }} success</span> ·
+        <span [class.tone-bad]="failed > 0">{{ failed }} failed</span>
+      </span>
+    </h2>
+    @if (loading && !items.length) {
+      <div class="cic-empty">Loading…</div>
+    } @else if (!items.length) {
+      <div class="cic-empty">No call matches the filter.</div>
+    } @else {
+      <div class="cic-table-wrap">
+        <table class="cic-table">
+          <thead>
+            <tr>
+              <th>Time</th>
+              <th>Vendor</th>
+              <th>API</th>
+              <th>Direction</th>
+              <th>Call</th>
+              <th>HTTP</th>
+              <th class="num">ms</th>
+              <th>Result</th>
+              <th>Reference</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (l of items; track l.id) {
+              <tr class="clickable" (click)="openLog = l">
+                <td>{{ l.time | slice: 0 : 16 }}</td>
+                <td>{{ l.vendorName }}</td>
+                <td>{{ l.apiName }}</td>
+                <td>
+                  <span class="cic-badge" [class.brand]="l.direction === 'IN'" [class.ok]="l.direction === 'OUT'">{{
+                    l.direction
+                  }}</span>
+                </td>
+                <td class="cic-mono" style="font-size: 12px">{{ l.method }} {{ l.path }}</td>
+                <td>{{ l.httpStatus }}</td>
+                <td class="num">{{ l.durationMs }}</td>
+                <td>
+                  <span class="cic-badge" [class.good]="l.result === 'SUCCESS'" [class.bad]="l.result === 'FAILED'">{{
+                    l.result
+                  }}</span>
+                </td>
+                <td class="cic-mono" style="font-size: 12px">{{ l.reference }}</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+      <div class="cic-pager">
+        <span>{{ offset + 1 }}–{{ offset + items.length }} of {{ total }}</span>
+        <span class="cic-actions">
+          <button class="cic-btn sm" (click)="page(-1)" [disabled]="offset === 0">Previous</button>
+          <button class="cic-btn sm" (click)="page(1)" [disabled]="offset + limit >= total">Next</button>
+        </span>
+      </div>
+    }
+  </div>
+</div>
+
+<mifosx-api-log-detail [log]="openLog" (closed)="openLog = null"></mifosx-api-log-detail>

src/app/api-management/api-logs/api-logs.component.ts

@@ -0,0 +1,77 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { CommonModule } from '@angular/common';
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { ActivatedRoute, RouterModule } from '@angular/router';
+
+import { ApiLogDetailComponent } from '../api-log-detail/api-log-detail.component';
+import { ApiLog, ApiManagementService, ApiVendor } from '../api-management.service';
+
+/** Every API call, IN and OUT, across all vendors, with its request and response. */
+@Component({
+  selector: 'mifosx-api-logs',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    ApiLogDetailComponent
+  ],
+  templateUrl: './api-logs.component.html',
+  styleUrls: ['../../credit-bureau/cic-shared.scss']
+})
+export class ApiLogsComponent implements OnInit {
+  private service = inject(ApiManagementService);
+  private route = inject(ActivatedRoute);
+
+  vendors: ApiVendor[] = [];
+  filter = { vendorId: '', direction: '', result: '', search: '' };
+  items: ApiLog[] = [];
+  total = 0;
+  success = 0;
+  failed = 0;
+  offset = 0;
+  readonly limit = 15;
+  loading = false;
+  openLog: ApiLog | null = null;
+
+  ngOnInit(): void {
+    const vendorId = this.route.snapshot.queryParamMap.get('vendorId');
+    if (vendorId) this.filter.vendorId = vendorId;
+    this.service.vendors().subscribe((v) => (this.vendors = v));
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service.logs({ ...this.filter, offset: this.offset, limit: this.limit }).subscribe((r) => {
+      this.items = r.items;
+      this.total = r.total;
+      this.success = r.success;
+      this.failed = r.failed;
+      this.loading = false;
+    });
+  }
+
+  apply(): void {
+    this.offset = 0;
+    this.load();
+  }
+
+  reset(): void {
+    this.filter = { vendorId: '', direction: '', result: '', search: '' };
+    this.apply();
+  }
+
+  page(delta: number): void {
+    this.offset = Math.max(0, this.offset + delta * this.limit);
+    this.load();
+  }
+}

src/app/api-management/api-management-routing.module.ts

@@ -0,0 +1,58 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { Route } from '../core/route/route.service';
+import { ApiVendorsComponent } from './api-vendors/api-vendors.component';
+import { ApiVendorSetupComponent } from './api-vendor-setup/api-vendor-setup.component';
+import { ApiLogsComponent } from './api-logs/api-logs.component';
+
+const routes: Routes = [
+  Route.withShell([
+    {
+      path: 'api-management',
+      data: { title: 'API Management', breadcrumb: 'API Management' },
+      children: [
+        {
+          path: '',
+          redirectTo: 'vendors',
+          pathMatch: 'full'
+        },
+        {
+          path: 'vendors',
+          data: { breadcrumb: 'Vendors' },
+          children: [
+            {
+              path: '',
+              component: ApiVendorsComponent,
+              data: { title: 'API Vendors & Setup' }
+            },
+            {
+              path: ':id',
+              component: ApiVendorSetupComponent,
+              data: { title: 'Vendor Setup', breadcrumb: 'Setup' }
+            }
+          ]
+        },
+        {
+          path: 'logs',
+          component: ApiLogsComponent,
+          data: { title: 'API Call Logs', breadcrumb: 'Call Logs' }
+        }
+      ]
+    }
+  ])
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class ApiManagementRoutingModule {}

src/app/api-management/api-management.module.ts

@@ -0,0 +1,29 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+import { ApiManagementRoutingModule } from './api-management-routing.module';
+import { ApiVendorsComponent } from './api-vendors/api-vendors.component';
+import { ApiVendorSetupComponent } from './api-vendor-setup/api-vendor-setup.component';
+import { ApiLogsComponent } from './api-logs/api-logs.component';
+import { ApiLogDetailComponent } from './api-log-detail/api-log-detail.component';
+
+/** API Management: connect any outside API service (CIC, SMS, WhatsApp ...) - vendor, work, API set, IN / OUT. */
+@NgModule({
+  imports: [
+    SharedModule,
+    ApiManagementRoutingModule,
+    ApiVendorsComponent,
+    ApiVendorSetupComponent,
+    ApiLogsComponent,
+    ApiLogDetailComponent
+  ]
+})
+export class ApiManagementModule {}

src/app/api-management/api-vendor-setup/api-vendor-setup.component.html

@@ -0,0 +1,777 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="cic-page">
+  <div class="cic-head">
+    <div>
+      <h1>{{ vendor?.name || 'Vendor setup' }}</h1>
+      <p>{{ vendor?.work }}</p>
+    </div>
+    <div class="cic-actions">
+      @if (vendor) {
+        <span class="cic-badge" [class.good]="vendor.active">{{ vendor.active ? 'Active' : 'Switched off' }}</span>
+        <span
+          class="cic-badge"
+          [class.warn]="vendor.environment === 'SIMULATOR'"
+          [class.good]="vendor.environment === 'PRODUCTION'"
+          >{{ vendor.environment }}</span
+        >
+      }
+      <a class="cic-btn" routerLink="/api-management/vendors">← All vendors</a>
+    </div>
+  </div>
+
+  @if (error && !editing && !importOpen) {
+    <div class="cic-alert error">{{ error }}</div>
+  }
+  @if (info && !editing) {
+    <div class="cic-alert success">{{ info }}</div>
+  }
+  @if (loading && !vendor) {
+    <div class="cic-card cic-empty">Loading…</div>
+  }
+
+  @if (vendor) {
+    @if (vendor.configNote) {
+      <div class="cic-alert info">{{ vendor.configNote }}</div>
+    }
+    @if (vendor.links.length) {
+      <div class="cic-alert info">
+        {{ vendor.code }} also has its own screens:
+        @for (l of vendor.links; track l.route) {
+          <a class="cic-btn sm" style="margin-left: 6px" [routerLink]="l.route">{{ l.label }}</a>
+        }
+      </div>
+    }
+
+    <div class="cic-tabs">
+      <button [class.active]="tab === 'connection'" (click)="tab = 'connection'">1 · Connection</button>
+      <button [class.active]="tab === 'apis'" (click)="tab = 'apis'">2 · API set ({{ vendor.apis.length }})</button>
+      <button [class.active]="tab === 'test'" (click)="tab = 'test'">3 · Test</button>
+      <button [class.active]="tab === 'calls'" (click)="tab = 'calls'; loadCalls()">Recent calls</button>
+    </div>
+
+    <!-- CONNECTION -->
+    @if (tab === 'connection') {
+      <div class="cic-card">
+        <h2>Vendor and connection</h2>
+        <div class="cic-grid cols-2">
+          <div class="cic-field">
+            <label>Vendor name</label>
+            <input [(ngModel)]="form.name" />
+          </div>
+          <div class="cic-field">
+            <label>Environment</label>
+            <select [(ngModel)]="form.environment">
+              <option value="SIMULATOR">SIMULATOR — no network call</option>
+              <option value="UAT">UAT — vendor's test environment</option>
+              <option value="PRODUCTION">PRODUCTION — live</option>
+            </select>
+          </div>
+          <div class="cic-field" style="grid-column: 1 / -1">
+            <label>Work — what this vendor is used for</label>
+            <input [(ngModel)]="form.work" />
+          </div>
+          <div class="cic-field" style="grid-column: 1 / -1">
+            <label>Base URL</label>
+            <input class="cic-mono" [(ngModel)]="form.baseUrl" placeholder="https://api.vendor.example/v1" />
+            <span class="hint">Every OUT / pull API path is added to this. PRODUCTION needs https://.</span>
+          </div>
+          <div class="cic-field">
+            <label>Authentication</label>
+            <select [(ngModel)]="form.authType">
+              @for (a of authTypes; track a.key) {
+                <option [value]="a.key">{{ a.label }}</option>
+              }
+            </select>
+          </div>
+          @if (form.authType === 'BASIC') {
+            <div class="cic-field">
+              <label>User id</label>
+              <input [(ngModel)]="form.username" autocomplete="off" />
+            </div>
+          }
+          @if (form.authType === 'API_KEY') {
+            <div class="cic-field">
+              <label>API key header name</label>
+              <input class="cic-mono" [(ngModel)]="form.apiKeyHeader" />
+            </div>
+          }
+          @if (needsSecret()) {
+            <div class="cic-field">
+              <label>{{ secretLabel() }}</label>
+              <input
+                type="password"
+                [(ngModel)]="form.secret"
+                autocomplete="new-password"
+                [placeholder]="vendor.hasSecret ? '•••••• stored — leave blank to keep' : 'Enter to store (encrypted)'"
+              />
+              @if (vendor.hasSecret) {
+                <label style="display: flex; gap: 6px; align-items: center; font-weight: 500; font-size: 12px">
+                  <input type="checkbox" [(ngModel)]="form.clearSecret" style="width: auto" /> Remove the stored
+                  credential
+                </label>
+              }
+            </div>
+          }
+          <div class="cic-field">
+            <label>Sender / member id</label>
+            <input [(ngModel)]="form.senderId" />
+            <span class="hint"
+              >The bank's id at this vendor (SMS sender id, WhatsApp number id, CIC member code …).</span
+            >
+          </div>
+          <div class="cic-field">
+            <label>Timeout (ms)</label>
+            <input type="number" min="1000" max="300000" [(ngModel)]="form.timeoutMs" />
+          </div>
+          <div class="cic-field">
+            <label>Retries on failure</label>
+            <input type="number" min="0" max="5" [(ngModel)]="form.retries" />
+          </div>
+          <label style="display: flex; gap: 8px; align-items: center; font-size: 13px">
+            <input type="checkbox" [(ngModel)]="form.active" /> Vendor active
+          </label>
+        </div>
+
+        <h4 style="margin: 18px 0 6px; font-size: 13px">
+          Default headers
+          <span class="muted" style="font-weight: 400"
+            >— sent on every API of this vendor (an API can override one)</span
+          >
+        </h4>
+        <mifosx-api-key-value-editor
+          [rows]="form.defaultHeaders"
+          keyLabel="Header"
+          keyPlaceholder="Accept"
+          addLabel="+ Add header"
+          emptyText="No default header."
+        ></mifosx-api-key-value-editor>
+
+        <div class="cic-actions" style="margin-top: 16px">
+          <button class="cic-btn primary" (click)="saveConnection()" [disabled]="saving">
+            {{ saving ? 'Saving…' : 'Save connection' }}
+          </button>
+          <button class="cic-btn" (click)="tab = 'apis'">Next: API set →</button>
+        </div>
+      </div>
+    }
+
+    <!-- API SET -->
+    @if (tab === 'apis') {
+      <div class="cic-card">
+        <h2>
+          API set
+          <span class="cic-actions">
+            <button class="cic-btn sm" (click)="newApi('OUT')">+ OUT API (CBS calls vendor)</button>
+            <button class="cic-btn sm" (click)="newApi('IN')">+ IN API (data comes into CBS)</button>
+          </span>
+        </h2>
+        @if (!vendor.apis.length) {
+          <div class="cic-empty">
+            No API yet. Add one, then fill it in by hand or read it from a JSON / cURL / Postman file.
+          </div>
+        } @else {
+          <div class="cic-table-wrap">
+            <table class="cic-table">
+              <thead>
+                <tr>
+                  <th>API</th>
+                  <th>Direction</th>
+                  <th>Call</th>
+                  <th>Used for</th>
+                  <th>Headers / query</th>
+                  <th>Mapping</th>
+                  <th>Active</th>
+                  <th></th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (a of vendor.apis; track a.id) {
+                  <tr>
+                    <td>
+                      <b>{{ a.name }}</b>
+                    </td>
+                    <td>
+                      <span class="cic-badge" [class.brand]="a.direction === 'IN'" [class.ok]="a.direction === 'OUT'">{{
+                        a.direction
+                      }}</span>
+                      @if (a.mode) {
+                        <span class="muted" style="font-size: 11px"> {{ a.mode === 'PULL' ? 'pull' : 'push' }}</span>
+                      }
+                    </td>
+                    <td class="cic-mono" style="font-size: 12px">{{ a.method }} {{ a.path }}</td>
+                    <td style="max-width: 260px; white-space: normal">{{ a.usedFor }}</td>
+                    <td>{{ a.headers.length }} / {{ a.queryParams.length }}</td>
+                    <td>{{ a.requestRows.length }} / {{ a.responseRows.length }}</td>
+                    <td>
+                      <span class="cic-badge" [class.good]="a.active">{{ a.active ? 'Yes' : 'Off' }}</span>
+                    </td>
+                    <td style="white-space: nowrap">
+                      <button class="cic-btn sm" (click)="editApi(a)">Edit</button>
+                      <button class="cic-btn sm danger" (click)="deleteApi(a)">✕</button>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        }
+      </div>
+    }
+
+    <!-- TEST -->
+    @if (tab === 'test') {
+      <div class="cic-card">
+        <h2>
+          Test an API
+          <span class="cic-card-sub">simulated — nothing is sent to the vendor; the result is added to the logs</span>
+        </h2>
+        @if (!vendor.apis.length) {
+          <div class="cic-empty">Add an API first.</div>
+        } @else {
+          <div class="cic-field" style="max-width: 420px">
+            <label>API</label>
+            <select [(ngModel)]="testApiId" (ngModelChange)="fillTestBody()">
+              @for (a of vendor.apis; track a.id) {
+                <option [ngValue]="a.id">{{ a.direction }} · {{ a.name }}</option>
+              }
+            </select>
+          </div>
+          @if (testPreview; as p) {
+            <h4 style="margin: 14px 0 6px; font-size: 13px">The request</h4>
+            <pre class="cic-code" style="max-height: 200px">{{ p.method }} {{ p.url }}
+@for (h of p.headers; track h.key) {
+{{ h.key }}: {{ h.value }}
+}</pre>
+          }
+          <div class="cic-field" style="margin-top: 12px">
+            <label>Request body</label>
+            <textarea class="cic-mono" rows="9" [(ngModel)]="testBody"></textarea>
+          </div>
+          <button class="cic-btn primary" style="margin-top: 12px" (click)="runTest()" [disabled]="testing">
+            {{ testing ? 'Sending…' : 'Send test' }}
+          </button>
+        }
+      </div>
+      @if (testResult) {
+        <div class="cic-alert success">
+          {{ testResult.reference }} — HTTP {{ testResult.httpStatus }} in {{ testResult.durationMs }} ms
+        </div>
+        <div class="cic-split">
+          <div class="cic-card">
+            <h2>Response headers</h2>
+            <pre class="cic-code">{{ testResult.responseHeaders }}</pre>
+          </div>
+          <div class="cic-card">
+            <h2>Response body</h2>
+            <pre class="cic-code">{{ testResult.response || '(empty)' }}</pre>
+          </div>
+        </div>
+      }
+    }
+
+    <!-- RECENT CALLS -->
+    @if (tab === 'calls') {
+      <div class="cic-card">
+        <h2>
+          Recent calls
+          <a class="cic-btn sm" routerLink="/api-management/logs" [queryParams]="{ vendorId: vendor.id }">All logs</a>
+        </h2>
+        @if (!calls.length) {
+          <div class="cic-empty">No call yet.</div>
+        } @else {
+          <div class="cic-table-wrap">
+            <table class="cic-table">
+              <thead>
+                <tr>
+                  <th>Time</th>
+                  <th>API</th>
+                  <th>Direction</th>
+                  <th>HTTP</th>
+                  <th class="num">ms</th>
+                  <th>Result</th>
+                  <th>Reference</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (l of calls; track l.id) {
+                  <tr class="clickable" (click)="openLog = l">
+                    <td>{{ l.time | slice: 0 : 16 }}</td>
+                    <td>{{ l.apiName }}</td>
+                    <td>
+                      <span class="cic-badge" [class.brand]="l.direction === 'IN'" [class.ok]="l.direction === 'OUT'">{{
+                        l.direction
+                      }}</span>
+                    </td>
+                    <td>{{ l.httpStatus }}</td>
+                    <td class="num">{{ l.durationMs }}</td>
+                    <td>
+                      <span
+                        class="cic-badge"
+                        [class.good]="l.result === 'SUCCESS'"
+                        [class.bad]="l.result === 'FAILED'"
+                        >{{ l.result }}</span
+                      >
+                    </td>
+                    <td class="cic-mono" style="font-size: 12px">{{ l.reference }}</td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        }
+      </div>
+    }
+  }
+</div>
+
+<!-- API editor -->
+@if (editing) {
+  <div class="cic-modal-backdrop" (click)="editing = null">
+    <div class="cic-modal" style="width: min(1100px, 100%)" (click)="$event.stopPropagation()">
+      <div style="display: flex; justify-content: space-between; gap: 12px; align-items: flex-start">
+        <h3 style="margin: 0">
+          {{ isNewApi ? 'New' : 'Edit' }} API
+          <span class="cic-badge" [class.brand]="editing.direction === 'IN'" [class.ok]="editing.direction === 'OUT'">{{
+            editing.direction
+          }}</span>
+          @if (editing.mode) {
+            <span class="muted" style="font-size: 12px; font-weight: 500">
+              {{ editing.mode === 'PULL' ? 'pull' : 'push' }}</span
+            >
+          }
+        </h3>
+        <button class="cic-btn sm primary" (click)="openImport()">⬆ Import from JSON / cURL / Postman</button>
+      </div>
+      <p class="muted" style="font-size: 12px; margin: 6px 0 10px">
+        @if (editing.direction === 'OUT') {
+          OUT — the CBS calls the vendor: fill the request it sends and the response it expects.
+        } @else if (editing.mode === 'PULL') {
+          IN (pull) — the CBS asks the vendor for data on a schedule: fill the request it sends and the response it
+          reads.
+        } @else {
+          IN (push) — the vendor calls a CBS path: fill what the vendor sends us and what we answer.
+        }
+        Type everything in, or read it from a file with the import button — then check each tab.
+      </p>
+
+      @if (info) {
+        <div class="cic-alert success">{{ info }}</div>
+      }
+      @if (error) {
+        <div class="cic-alert error">{{ error }}</div>
+      }
+
+      <div class="cic-tabs">
+        <button [class.active]="editorTab === 'basics'" (click)="editorTab = 'basics'">1 · Basics</button>
+        <button [class.active]="editorTab === 'request'" (click)="editorTab = 'request'">
+          2 · {{ outbound ? 'Request' : 'What the vendor sends' }}
+        </button>
+        <button [class.active]="editorTab === 'response'" (click)="editorTab = 'response'">
+          3 · {{ outbound ? 'Response' : 'Our answer' }}
+        </button>
+      </div>
+
+      <!-- BASICS -->
+      @if (editorTab === 'basics') {
+        <div class="cic-grid cols-4">
+          <div class="cic-field" style="grid-column: span 2">
+            <label>API name</label>
+            <input [(ngModel)]="editing.name" placeholder="e.g. Send SMS" />
+          </div>
+          <div class="cic-field">
+            <label>Direction</label>
+            <select [(ngModel)]="editing.direction" (ngModelChange)="directionChanged()">
+              <option value="OUT">OUT — CBS calls vendor</option>
+              <option value="IN">IN — data comes into CBS</option>
+            </select>
+          </div>
+          @if (editing.direction === 'IN') {
+            <div class="cic-field">
+              <label>How data arrives</label>
+              <select [(ngModel)]="editing.mode">
+                <option value="PULL">PULL — CBS asks on a schedule</option>
+                <option value="PUSH">PUSH — vendor calls a CBS path</option>
+              </select>
+            </div>
+          } @else {
+            <div></div>
+          }
+          <div class="cic-field">
+            <label>HTTP method</label>
+            <select [(ngModel)]="editing.method">
+              @for (m of methods; track m) {
+                <option [value]="m">{{ m }}</option>
+              }
+            </select>
+          </div>
+          <div class="cic-field" style="grid-column: span 3">
+            <label>{{ outbound ? "Vendor's API path (after the base URL)" : 'CBS path the vendor calls' }}</label>
+            <input
+              class="cic-mono"
+              [(ngModel)]="editing.path"
+              (ngModelChange)="pathChanged()"
+              placeholder="/messages/send"
+            />
+            <span class="hint"
+              >Use {{ '{' }}name{{ '}' }} for a value that changes, e.g. /v21.0/{{ '{' }}senderId{{
+                '}'
+              }}/messages.</span
+            >
+          </div>
+          <div class="cic-field" style="grid-column: span 3">
+            <label>When is it used</label>
+            <input [(ngModel)]="editing.usedFor" placeholder="e.g. OTP and transaction alerts" />
+          </div>
+          <div class="cic-field">
+            <label>Timeout for this API (ms)</label>
+            <input type="number" min="1000" max="300000" [(ngModel)]="editing.timeoutMs" placeholder="vendor's" />
+          </div>
+          <div class="cic-field">
+            <label>Retries for this API</label>
+            <input type="number" min="0" max="5" [(ngModel)]="editing.retries" placeholder="vendor's" />
+          </div>
+        </div>
+        <label style="display: flex; gap: 8px; align-items: center; font-size: 13px; margin: 12px 0">
+          <input type="checkbox" [(ngModel)]="editing.active" /> API active
+        </label>
+
+        @if (preview(editing); as p) {
+          <h4 style="margin: 14px 0 6px; font-size: 13px">
+            {{ outbound ? 'The call as it will go out' : 'The call the vendor will make to us' }}
+            <span class="muted" style="font-weight: 400"> (credentials masked)</span>
+          </h4>
+          <pre class="cic-code" style="max-height: 220px">{{ p.method }} {{ p.url }}
+@for (h of p.headers; track h.key) {
+{{ h.key }}: {{ h.value }}
+}
+{{ p.body }}</pre>
+        }
+      }
+
+      <!-- REQUEST -->
+      @if (editorTab === 'request') {
+        <h4 style="margin: 4px 0 6px; font-size: 13px">Path parameters</h4>
+        <mifosx-api-key-value-editor
+          [rows]="editing.pathParams"
+          keyLabel="Parameter"
+          valueLabel="Value (a CBS placeholder or fixed value)"
+          [fixedKeys]="true"
+          emptyText="The path has no {name} placeholder."
+        ></mifosx-api-key-value-editor>
+
+        <h4 style="margin: 16px 0 6px; font-size: 13px">Query parameters</h4>
+        <mifosx-api-key-value-editor
+          [rows]="editing.queryParams"
+          keyLabel="Parameter"
+          keyPlaceholder="version"
+          addLabel="+ Add query parameter"
+          emptyText="No query parameter."
+        ></mifosx-api-key-value-editor>
+
+        <h4 style="margin: 16px 0 6px; font-size: 13px">
+          Headers
+          <span class="muted" style="font-weight: 400"
+            >— this API's own; the vendor's default headers and its authentication are added automatically</span
+          >
+        </h4>
+        <mifosx-api-key-value-editor
+          [rows]="editing.headers"
+          keyLabel="Header"
+          keyPlaceholder="X-Request-Id"
+          valuePlaceholder="{{ '{{' }}request.reference{{ '}}' }}"
+          addLabel="+ Add header"
+          emptyText="No header of its own."
+        ></mifosx-api-key-value-editor>
+
+        <div class="cic-grid cols-4" style="margin-top: 16px">
+          <div class="cic-field" style="grid-column: span 2">
+            <label>Content type</label>
+            <select [(ngModel)]="editing.contentType">
+              @for (c of contentTypes; track c.key) {
+                <option [value]="c.key">{{ c.label }}</option>
+              }
+            </select>
+          </div>
+        </div>
+
+        <div class="cic-field" style="margin-top: 12px">
+          <label>{{ outbound ? 'Request payload' : 'Payload the vendor sends us' }}</label>
+          <textarea class="cic-mono" rows="10" [(ngModel)]="editing.requestBody"></textarea>
+          <span class="hint">
+            {{
+              outbound
+                ? 'The constant parts of the payload; the mapping below puts CBS values into it.'
+                : 'A sample of what arrives; the mapping reads values out of it.'
+            }}
+          </span>
+        </div>
+
+        <h4 style="margin: 16px 0 6px; font-size: 13px">
+          {{ mappingTitle('request') }}
+          <span class="muted" style="font-weight: 400; font-size: 12px">
+            · {{ matchedCount('request') }} of {{ editing.requestRows.length }} rows found in the sample
+            {{ 'request' === 'request' ? 'payload' : 'body' }}
+          </span>
+          <button class="cic-btn sm" style="margin-left: 8px" (click)="generateRows('request')">
+            Build rows from the payload
+          </button>
+        </h4>
+        <div class="cic-table-wrap">
+          <table class="cic-table">
+            <thead>
+              <tr>
+                <th>{{ fromLabel('request') }}</th>
+                <th>{{ toLabel('request') }}</th>
+                <th>Transform</th>
+                <th>Fixed / default value</th>
+                <th>In the sample payload</th>
+                <th>Required</th>
+                <th style="width: 40px"></th>
+              </tr>
+            </thead>
+            <tbody>
+              @let requestMatch = sampleMatches('request');
+              @for (r of editing.requestRows; track $index; let i = $index) {
+                <tr>
+                  <td>
+                    @if (fromIsCbs('request')) {
+                      <select [(ngModel)]="r.from">
+                        <option value="">— fixed value (set it on the right) —</option>
+                        @for (f of cbsFields; track f.key) {
+                          <option [value]="f.key">{{ f.label }}</option>
+                        }
+                      </select>
+                    } @else {
+                      <input class="cic-mono" [(ngModel)]="r.from" />
+                    }
+                  </td>
+                  <td><input class="cic-mono" [(ngModel)]="r.to" /></td>
+                  <td>
+                    <select [(ngModel)]="r.transform">
+                      @for (t of transforms; track t.key) {
+                        <option [value]="t.key">{{ t.label }}</option>
+                      }
+                    </select>
+                  </td>
+                  <td><input [(ngModel)]="r.defaultValue" /></td>
+                  <td class="cic-mono" style="font-size: 12px; white-space: nowrap">
+                    @if (requestMatch[i].found) {
+                      <span class="tone-good">✓ {{ requestMatch[i].value }}</span>
+                    } @else if (r.defaultValue) {
+                      <span class="muted">fixed: {{ r.defaultValue }}</span>
+                    } @else {
+                      <span class="tone-bad">✗ {{ requestMatch[i].value || 'no path' }}</span>
+                    }
+                  </td>
+                  <td style="text-align: center">
+                    <input type="checkbox" [(ngModel)]="r.mandatory" style="width: auto" />
+                  </td>
+                  <td><button class="cic-btn sm danger" (click)="removeRow('request', i)">✕</button></td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+        <button class="cic-btn sm" style="margin-top: 8px" (click)="addRow('request')">+ Add field</button>
+      }
+
+      <!-- RESPONSE -->
+      @if (editorTab === 'response') {
+        <div class="cic-grid cols-4">
+          <div class="cic-field">
+            <label>Success status code(s)</label>
+            <input class="cic-mono" [(ngModel)]="editing.successCodes" placeholder="200, 202" />
+            <span class="hint">{{
+              outbound ? 'Codes the vendor answers with when it worked.' : 'Codes the CBS answers with.'
+            }}</span>
+          </div>
+        </div>
+
+        <h4 style="margin: 16px 0 6px; font-size: 13px">
+          {{ outbound ? 'Response headers' : 'Headers of our answer' }}
+        </h4>
+        <mifosx-api-key-value-editor
+          [rows]="editing.responseHeaders"
+          keyLabel="Header"
+          keyPlaceholder="Content-Type"
+          addLabel="+ Add header"
+          emptyText="No response header noted."
+        ></mifosx-api-key-value-editor>
+
+        <div class="cic-grid cols-2" style="margin-top: 16px">
+          <div class="cic-field">
+            <label>{{ outbound ? 'Success response body' : 'Our answer body' }}</label>
+            <textarea class="cic-mono" rows="10" [(ngModel)]="editing.responseBody"></textarea>
+          </div>
+          <div class="cic-field">
+            <label>Error response body</label>
+            <textarea class="cic-mono" rows="10" [(ngModel)]="editing.errorBody"></textarea>
+            <span class="hint"
+              >What comes back when it fails (wrong key, rate limit …) — shown in the logs for a failed call.</span
+            >
+          </div>
+        </div>
+
+        <h4 style="margin: 16px 0 6px; font-size: 13px">
+          {{ mappingTitle('response') }}
+          <span class="muted" style="font-weight: 400; font-size: 12px">
+            · {{ matchedCount('response') }} of {{ editing.responseRows.length }} rows found in the sample
+            {{ 'response' === 'request' ? 'payload' : 'body' }}
+          </span>
+          <button class="cic-btn sm" style="margin-left: 8px" (click)="generateRows('response')">
+            Build rows from the body
+          </button>
+        </h4>
+        <div class="cic-table-wrap">
+          <table class="cic-table">
+            <thead>
+              <tr>
+                <th>{{ fromLabel('response') }}</th>
+                <th>{{ toLabel('response') }}</th>
+                <th>Transform</th>
+                <th>Fixed / default value</th>
+                <th>In the sample payload</th>
+                <th>Required</th>
+                <th style="width: 40px"></th>
+              </tr>
+            </thead>
+            <tbody>
+              @let responseMatch = sampleMatches('response');
+              @for (r of editing.responseRows; track $index; let i = $index) {
+                <tr>
+                  <td>
+                    @if (fromIsCbs('response')) {
+                      <select [(ngModel)]="r.from">
+                        <option value="">— fixed value (set it on the right) —</option>
+                        @for (f of cbsFields; track f.key) {
+                          <option [value]="f.key">{{ f.label }}</option>
+                        }
+                      </select>
+                    } @else {
+                      <input class="cic-mono" [(ngModel)]="r.from" />
+                    }
+                  </td>
+                  <td><input class="cic-mono" [(ngModel)]="r.to" /></td>
+                  <td>
+                    <select [(ngModel)]="r.transform">
+                      @for (t of transforms; track t.key) {
+                        <option [value]="t.key">{{ t.label }}</option>
+                      }
+                    </select>
+                  </td>
+                  <td><input [(ngModel)]="r.defaultValue" /></td>
+                  <td class="cic-mono" style="font-size: 12px; white-space: nowrap">
+                    @if (responseMatch[i].found) {
+                      <span class="tone-good">✓ {{ responseMatch[i].value }}</span>
+                    } @else if (r.defaultValue) {
+                      <span class="muted">fixed: {{ r.defaultValue }}</span>
+                    } @else {
+                      <span class="tone-bad">✗ {{ responseMatch[i].value || 'no path' }}</span>
+                    }
+                  </td>
+                  <td style="text-align: center">
+                    <input type="checkbox" [(ngModel)]="r.mandatory" style="width: auto" />
+                  </td>
+                  <td><button class="cic-btn sm danger" (click)="removeRow('response', i)">✕</button></td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+        <button class="cic-btn sm" style="margin-top: 8px" (click)="addRow('response')">+ Add field</button>
+      }
+
+      <div class="foot">
+        <button class="cic-btn" (click)="editing = null">Cancel</button>
+        <button class="cic-btn primary" (click)="saveApi()" [disabled]="savingApi">
+          {{ savingApi ? 'Saving…' : 'Save API' }}
+        </button>
+      </div>
+    </div>
+  </div>
+}
+
+<!-- Import from JSON / cURL / Postman / HAR -->
+@if (importOpen && editing) {
+  <div class="cic-modal-backdrop" style="z-index: 1100" (click)="importOpen = false">
+    <div class="cic-modal" style="width: min(1000px, 100%)" (click)="$event.stopPropagation()">
+      <h3>Import from JSON / cURL / Postman</h3>
+      <p class="muted" style="font-size: 12px; margin: 0 0 10px">
+        Paste it or choose a file —
+        {{ outbound ? 'the request and the response' : 'what the vendor sends us and what we answer' }}. Any of these
+        works: a <b>cURL</b> command, a <b>Postman</b> collection or request, a <b>HAR</b> capture, an API definition
+        (<code>{{ '{' }} method, url, headers, query, body, status … {{ '}' }}</code
+        >), or just the <b>JSON payload</b>. The method, URL / path, query parameters, headers, content type, payload,
+        status code, response headers, bodies and a first CBS mapping are filled in for you. Passwords, keys and tokens
+        are never kept.
+      </p>
+      @if (importError) {
+        <div class="cic-alert error">{{ importError }}</div>
+      }
+      <div class="cic-grid cols-2">
+        <div class="cic-field">
+          <label
+            >{{ outbound ? 'Request' : 'What the vendor sends us' }} — cURL, Postman, HAR, definition or payload</label
+          >
+          <textarea
+            class="cic-mono"
+            rows="12"
+            [(ngModel)]="importRequestText"
+            placeholder="curl -X POST 'https://api.vendor.in/v1/send' -H 'Content-Type: application/json' -d '{ ... }'"
+          ></textarea>
+          <div style="display: flex; gap: 8px; align-items: center">
+            <input
+              type="file"
+              accept=".json,.txt,.curl,.har,.sh,application/json,text/plain"
+              (change)="onFile($event, 'request')"
+            />
+            @if (importRequestFile) {
+              <span class="muted" style="font-size: 12px">{{ importRequestFile }}</span>
+            }
+          </div>
+        </div>
+        <div class="cic-field">
+          <label>{{ outbound ? 'Response' : 'Our answer' }} — JSON body, or with status and headers (optional)</label>
+          <textarea
+            class="cic-mono"
+            rows="12"
+            [(ngModel)]="importResponseText"
+            placeholder='{ "status": 200, "headers": { "Content-Type": "application/json" }, "body": { ... } }'
+          ></textarea>
+          <div style="display: flex; gap: 8px; align-items: center">
+            <input
+              type="file"
+              accept=".json,.txt,.har,application/json,text/plain"
+              (change)="onFile($event, 'response')"
+            />
+            @if (importResponseFile) {
+              <span class="muted" style="font-size: 12px">{{ importResponseFile }}</span>
+            }
+          </div>
+        </div>
+      </div>
+      <div style="display: flex; gap: 20px; flex-wrap: wrap; margin-top: 12px; font-size: 13px">
+        <label style="display: flex; gap: 6px; align-items: center">
+          <input type="checkbox" [(ngModel)]="importReplace" /> Replace what is there now (headers, query, mapping rows)
+          — untick to add to it
+        </label>
+        <label style="display: flex; gap: 6px; align-items: center">
+          <input type="checkbox" [(ngModel)]="importGenerate" /> Build the CBS field mapping from the payloads
+        </label>
+      </div>
+      <div class="foot">
+        <button class="cic-btn" (click)="importOpen = false">Cancel</button>
+        <button class="cic-btn primary" (click)="applyImport()">Read and fill in</button>
+      </div>
+    </div>
+  </div>
+}
+
+<mifosx-api-log-detail [log]="openLog" (closed)="openLog = null"></mifosx-api-log-detail>

src/app/api-management/api-vendor-setup/api-vendor-setup.component.ts

@@ -0,0 +1,600 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { ActivatedRoute, RouterModule } from '@angular/router';
+
+import { ApiKeyValueEditorComponent } from '../api-key-value-editor/api-key-value-editor.component';
+import { ApiLogDetailComponent } from '../api-log-detail/api-log-detail.component';
+import {
+  guessRequestRows,
+  guessResponseRows,
+  ImportedRequest,
+  ImportedResponse,
+  parseRequestText,
+  parseResponseText
+} from '../api-import.util';
+import {
+  API_AUTH_TYPES,
+  API_CBS_FIELDS,
+  API_CONTENT_TYPES,
+  API_METHODS,
+  API_TRANSFORMS,
+  ApiLog,
+  ApiManagementService,
+  ApiMappingRow,
+  ApiVendor,
+  blankApi,
+  buildRequestPreview,
+  callsVendor,
+  KeyValue,
+  pathParamNames,
+  RequestPreview,
+  VendorApi
+} from '../api-management.service';
+
+/**
+ * One vendor's setup: its connection (URL, authentication, default headers, credentials), its API set - each API IN or
+ * OUT with the full HTTP detail and the field mapping, typed in or read from a JSON / cURL / Postman / HAR file - a
+ * test call, and its recent calls.
+ */
+@Component({
+  selector: 'mifosx-api-vendor-setup',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule,
+    ApiLogDetailComponent,
+    ApiKeyValueEditorComponent
+  ],
+  templateUrl: './api-vendor-setup.component.html',
+  styleUrls: ['../../credit-bureau/cic-shared.scss']
+})
+export class ApiVendorSetupComponent implements OnInit {
+  private service = inject(ApiManagementService);
+  private route = inject(ActivatedRoute);
+
+  vendor: ApiVendor | null = null;
+  tab: 'connection' | 'apis' | 'test' | 'calls' = 'connection';
+  loading = false;
+  error: string | null = null;
+  info: string | null = null;
+
+  // connection
+  form: any = {};
+  saving = false;
+
+  // API set
+  editing: VendorApi | null = null;
+  isNewApi = false;
+  savingApi = false;
+  editorTab: 'basics' | 'request' | 'response' = 'basics';
+
+  // import from JSON / cURL / Postman / HAR
+  importOpen = false;
+  importRequestText = '';
+  importResponseText = '';
+  importRequestFile = '';
+  importResponseFile = '';
+  importReplace = true;
+  importGenerate = true;
+  importError: string | null = null;
+
+  // test
+  testApiId: number | null = null;
+  testBody = '';
+  testing = false;
+  testResult: ApiLog | null = null;
+
+  // calls
+  calls: ApiLog[] = [];
+  openLog: ApiLog | null = null;
+
+  readonly authTypes = Object.entries(API_AUTH_TYPES).map(
+    ([
+      key,
+      label
+    ]) => ({ key, label })
+  );
+  readonly contentTypes = Object.entries(API_CONTENT_TYPES).map(
+    ([
+      key,
+      label
+    ]) => ({ key, label })
+  );
+  readonly transforms = Object.entries(API_TRANSFORMS).map(
+    ([
+      key,
+      label
+    ]) => ({ key, label })
+  );
+  readonly cbsFields = Object.entries(API_CBS_FIELDS).map(
+    ([
+      key,
+      label
+    ]) => ({ key, label })
+  );
+  readonly methods = API_METHODS;
+
+  ngOnInit(): void {
+    this.load(Number(this.route.snapshot.paramMap.get('id')));
+  }
+
+  load(id: number): void {
+    this.loading = true;
+    this.service.vendor(id).subscribe({
+      next: (v) => {
+        this.vendor = v;
+        this.loading = false;
+        this.resetForm(v);
+        if (!this.testApiId || !v.apis.some((a) => a.id === this.testApiId)) this.testApiId = v.apis[0]?.id ?? null;
+        this.fillTestBody();
+        this.loadCalls();
+      },
+      error: (e) => {
+        this.loading = false;
+        this.error = e?.error?.defaultUserMessage ?? 'Could not load the vendor.';
+      }
+    });
+  }
+
+  private resetForm(v: ApiVendor): void {
+    this.form = {
+      name: v.name,
+      work: v.work,
+      environment: v.environment,
+      baseUrl: v.baseUrl,
+      authType: v.authType,
+      username: v.username,
+      apiKeyHeader: v.apiKeyHeader,
+      secret: '',
+      clearSecret: false,
+      senderId: v.senderId,
+      timeoutMs: v.timeoutMs,
+      retries: v.retries,
+      defaultHeaders: JSON.parse(JSON.stringify(v.defaultHeaders)),
+      active: v.active
+    };
+  }
+
+  loadCalls(): void {
+    if (!this.vendor) return;
+    this.service.logs({ vendorId: String(this.vendor.id), limit: 12 }).subscribe((r) => (this.calls = r.items));
+  }
+
+  // ── connection ──
+
+  needsSecret(): boolean {
+    return this.form.authType !== 'NONE';
+  }
+
+  secretLabel(): string {
+    const a = this.form.authType;
+    return a === 'BASIC'
+      ? 'Password'
+      : a === 'API_KEY'
+        ? 'API key'
+        : a === 'BEARER_TOKEN'
+          ? 'Bearer token'
+          : 'Client secret';
+  }
+
+  saveConnection(): void {
+    if (!this.vendor) return;
+    this.saving = true;
+    this.error = null;
+    this.info = null;
+    const body = { ...this.form };
+    if (!body.secret) delete body.secret;
+    this.service.saveVendor(this.vendor.id, body).subscribe({
+      next: (v) => {
+        this.saving = false;
+        this.vendor = v;
+        this.resetForm(v);
+        this.info = `${v.name} connection saved.`;
+      },
+      error: (e) => {
+        this.saving = false;
+        this.error = e?.error?.defaultUserMessage ?? 'Could not save the connection.';
+      }
+    });
+  }
+
+  // ── API set ──
+
+  newApi(direction: 'IN' | 'OUT'): void {
+    this.isNewApi = true;
+    this.error = null;
+    this.info = null;
+    this.editorTab = 'basics';
+    this.editing = blankApi(direction);
+  }
+
+  editApi(a: VendorApi): void {
+    this.isNewApi = false;
+    this.error = null;
+    this.info = null;
+    this.editorTab = 'basics';
+    this.editing = JSON.parse(JSON.stringify(a));
+  }
+
+  /** True when the CBS makes the HTTP call (OUT, or IN pull); false for an IN push webhook. */
+  get outbound(): boolean {
+    return !!this.editing && callsVendor(this.editing);
+  }
+
+  directionChanged(): void {
+    if (!this.editing) return;
+    this.editing.mode = this.editing.direction === 'IN' ? (this.editing.mode ?? 'PUSH') : undefined;
+  }
+
+  /** Keeps the path-parameter table in step with the {names} typed in the path. */
+  pathChanged(): void {
+    if (!this.editing) return;
+    const names = pathParamNames(this.editing.path);
+    const kept = this.editing.pathParams.filter((p) => names.includes(p.key));
+    for (const n of names) {
+      if (!kept.some((p) => p.key === n))
+        kept.push({ key: n, value: '', description: '', enabled: true, secret: false });
+    }
+    this.editing.pathParams = kept;
+  }
+
+  rowsOf(side: 'request' | 'response'): ApiMappingRow[] {
+    if (!this.editing) return [];
+    return side === 'request' ? this.editing.requestRows : this.editing.responseRows;
+  }
+
+  /** Whether the left column of a mapping table holds a CBS value (a pick list) or a path in the vendor's JSON. */
+  fromIsCbs(side: 'request' | 'response'): boolean {
+    return this.outbound ? side === 'request' : side === 'response';
+  }
+
+  mappingTitle(side: 'request' | 'response'): string {
+    if (this.outbound) return side === 'request' ? 'Request mapping (CBS → vendor)' : 'Response mapping (vendor → CBS)';
+    return side === 'request' ? 'Incoming data mapping (vendor → CBS)' : 'Answer mapping (CBS → vendor)';
+  }
+
+  fromLabel(side: 'request' | 'response'): string {
+    return this.fromIsCbs(side) ? 'CBS value' : "Vendor's JSON path";
+  }
+
+  toLabel(side: 'request' | 'response'): string {
+    if (this.fromIsCbs(side)) return side === 'request' ? "Vendor's request path" : 'Answer path';
+    return 'CBS field';
+  }
+
+  private parsedCache = new Map<string, unknown>();
+
+  private parsed(text: string): unknown {
+    if (!this.parsedCache.has(text)) {
+      let v: unknown = undefined;
+      try {
+        v = JSON.parse(text);
+      } catch {
+        v = undefined;
+      }
+      if (this.parsedCache.size > 20) this.parsedCache.clear();
+      this.parsedCache.set(text, v);
+    }
+    return this.parsedCache.get(text);
+  }
+
+  /** Reads a.b[0].c out of a parsed payload; undefined when it is not there. */
+  private readPath(root: unknown, path: string): unknown {
+    let cur: any = root;
+    for (const part of path.match(/[^.[\]]+/g) ?? []) {
+      if (cur === null || cur === undefined) return undefined;
+      cur = cur[/^\d+$/.test(part) ? Number(part) : part];
+    }
+    return cur;
+  }
+
+  /**
+   * How a mapping row matches the sample payload on its side: the value found at the row's JSON path. Rows after a
+   * list (e.g. data.alerts) are read from the first item of that list, as the CBS does for each item.
+   */
+  sampleMatches(side: 'request' | 'response'): { found: boolean; value: string }[] {
+    if (!this.editing) return [];
+    const body = this.parsed(side === 'request' ? this.editing.requestBody : this.editing.responseBody);
+    const pathIsTo = this.fromIsCbs(side);
+    let item: unknown = undefined;
+    return this.rowsOf(side).map((r) => {
+      const path = (pathIsTo ? r.to : r.from).trim();
+      if (!path || body === undefined) return { found: false, value: body === undefined ? 'payload is not JSON' : '' };
+      let v = this.readPath(body, path);
+      if (v === undefined && item !== undefined) v = this.readPath(item, path);
+      if (Array.isArray(v)) {
+        if (item === undefined && v.length) item = v[0];
+        return { found: true, value: `list of ${v.length}` };
+      }
+      if (v === undefined) return { found: false, value: 'not in the sample payload' };
+      const text = typeof v === 'object' ? JSON.stringify(v) : String(v);
+      return { found: true, value: text.length > 40 ? text.slice(0, 40) + '…' : text };
+    });
+  }
+
+  matchedCount(side: 'request' | 'response'): number {
+    return this.sampleMatches(side).filter((m) => m.found).length;
+  }
+
+  addRow(side: 'request' | 'response'): void {
+    this.rowsOf(side).push({ from: '', to: '', transform: 'NONE', defaultValue: '', mandatory: false });
+  }
+
+  removeRow(side: 'request' | 'response', i: number): void {
+    this.rowsOf(side).splice(i, 1);
+  }
+
+  /** Builds mapping rows from the payload typed or imported for that side. */
+  generateRows(side: 'request' | 'response'): void {
+    if (!this.editing || !this.vendor) return;
+    const body = side === 'request' ? this.editing.requestBody : this.editing.responseBody;
+    // Reading values OUT of a payload (vendor → CBS) vs putting values INTO one (CBS → vendor).
+    const reading = !this.fromIsCbs(side);
+    const rows = reading ? guessResponseRows(body, this.vendor.code) : guessRequestRows(body);
+    if (!rows.length) {
+      this.error = 'That payload has no JSON values to build a mapping from.';
+      return;
+    }
+    this.error = null;
+    const target = this.rowsOf(side);
+    const have = new Set(target.map((r) => r.to));
+    target.push(...rows.filter((r) => !have.has(r.to)));
+    this.info = `${rows.length} mapping row(s) read from the payload. Review the CBS fields and adjust.`;
+  }
+
+  saveApi(): void {
+    if (!this.vendor || !this.editing) return;
+    this.savingApi = true;
+    this.error = null;
+    this.service.saveApi(this.vendor.id, this.editing).subscribe({
+      next: (a) => {
+        this.savingApi = false;
+        this.info = `${a.name} saved.`;
+        this.editing = null;
+        this.load(this.vendor!.id);
+      },
+      error: (e) => {
+        this.savingApi = false;
+        this.error = e?.error?.defaultUserMessage ?? 'Could not save the API.';
+      }
+    });
+  }
+
+  deleteApi(a: VendorApi): void {
+    if (!this.vendor || !confirm(`Delete the API "${a.name}"?`)) return;
+    this.service.deleteApi(this.vendor.id, a.id).subscribe(() => {
+      this.editing = null;
+      this.info = `${a.name} deleted.`;
+      this.load(this.vendor!.id);
+    });
+  }
+
+  /** The request this API would send (or receive), as the Test tab and the editor show it. */
+  preview(a: VendorApi | null): RequestPreview | null {
+    return this.vendor && a ? buildRequestPreview(this.vendor, a) : null;
+  }
+
+  // ── import ──
+
+  openImport(): void {
+    this.importOpen = true;
+    this.importError = null;
+    this.importReplace = this.isNewApi;
+    this.importRequestText = '';
+    this.importResponseText = '';
+    this.importRequestFile = '';
+    this.importResponseFile = '';
+  }
+
+  onFile(event: Event, which: 'request' | 'response'): void {
+    const input = event.target as HTMLInputElement;
+    const file = input.files?.[0];
+    if (!file) return;
+    if (file.size > 5 * 1024 * 1024) {
+      this.importError = 'The file is larger than 5 MB.';
+      return;
+    }
+    const reader = new FileReader();
+    reader.onload = () => {
+      const text = String(reader.result ?? '');
+      if (which === 'request') {
+        this.importRequestText = text;
+        this.importRequestFile = file.name;
+      } else {
+        this.importResponseText = text;
+        this.importResponseFile = file.name;
+      }
+    };
+    reader.readAsText(file);
+    input.value = '';
+  }
+
+  applyImport(): void {
+    if (!this.editing || !this.vendor) return;
+    this.importError = null;
+    let req: ImportedRequest | null = null;
+    let res: ImportedResponse | null = null;
+    try {
+      if (this.importRequestText.trim()) req = parseRequestText(this.importRequestText);
+      if (this.importResponseText.trim()) res = parseResponseText(this.importResponseText);
+      else if (req?.response) res = req.response;
+    } catch (e: any) {
+      this.importError = e?.message ?? 'Could not read the file.';
+      return;
+    }
+    if (!req && !res) {
+      this.importError = 'Paste or choose a request, a response, or both.';
+      return;
+    }
+
+    const a = this.editing;
+    const done: string[] = [];
+    const notes: string[] = [
+      ...(req?.notes ?? []),
+      ...(res?.notes ?? [])
+    ];
+    const replace = this.importReplace;
+
+    const mergePairs = (target: KeyValue[], incoming: KeyValue[]): KeyValue[] => {
+      if (replace) return incoming;
+      const out = [...target];
+      for (const p of incoming) {
+        const i = out.findIndex((x) => x.key.toLowerCase() === p.key.toLowerCase());
+        if (i >= 0) out[i] = p;
+        else out.push(p);
+      }
+      return out;
+    };
+
+    if (req) {
+      if (req.method && this.methods.includes(req.method)) {
+        a.method = req.method as VendorApi['method'];
+        done.push(`method ${req.method}`);
+      }
+      if (req.path && req.path !== '/') {
+        a.path = this.stripVendorBasePath(req.path);
+        done.push(`path ${a.path}`);
+      }
+      if (req.baseUrl) {
+        if (!this.form.baseUrl) {
+          this.form.baseUrl = req.baseUrl;
+          notes.push(`Base URL ${req.baseUrl} was put on the Connection tab - save it there.`);
+        } else if (this.form.baseUrl.replace(/\/+$/, '') !== req.baseUrl) {
+          notes.push(
+            `The file's host (${req.baseUrl}) is not this vendor's base URL (${this.form.baseUrl}); only the path was used.`
+          );
+        }
+      }
+      if (req.queryParams.length) {
+        a.queryParams = mergePairs(a.queryParams, req.queryParams);
+        done.push(`${req.queryParams.length} query parameter(s)`);
+      }
+      if (req.headers.length) {
+        a.headers = mergePairs(a.headers, req.headers);
+        done.push(`${req.headers.length} header(s)`);
+      }
+      if (req.contentType) {
+        a.contentType = Object.keys(API_CONTENT_TYPES).includes(req.contentType) ? req.contentType : a.contentType;
+        done.push(`content type ${a.contentType}`);
+      }
+      if (req.body !== undefined) {
+        a.requestBody = req.body;
+        done.push('request payload');
+      }
+      if (!a.name.trim() && a.path) {
+        const last =
+          a.path
+            .split('/')
+            .filter((s) => s && !s.includes('{'))
+            .pop() ?? 'API';
+        a.name = last.charAt(0).toUpperCase() + last.slice(1).replace(/[-_]+/g, ' ');
+      }
+      this.pathChanged();
+    }
+
+    if (res) {
+      const failure = res.status !== undefined && (res.status < 200 || res.status > 299);
+      if (res.status !== undefined && !failure) {
+        a.successCodes = String(res.status);
+        done.push(`success code ${res.status}`);
+      }
+      if (res.headers.length) {
+        a.responseHeaders = mergePairs(a.responseHeaders, res.headers);
+        done.push(`${res.headers.length} response header(s)`);
+      }
+      if (res.body !== undefined) {
+        if (failure) {
+          a.errorBody = res.body;
+          done.push(`error body (HTTP ${res.status})`);
+        } else {
+          a.responseBody = res.body;
+          done.push('response body');
+        }
+      }
+      if (res.errorBody !== undefined) {
+        a.errorBody = res.errorBody;
+        done.push('error body');
+      }
+    }
+
+    if (this.importGenerate) {
+      const addRows = (side: 'request' | 'response', body: string) => {
+        const reading = !this.fromIsCbs(side);
+        const rows = reading ? guessResponseRows(body, this.vendor!.code) : guessRequestRows(body);
+        if (!rows.length) return;
+        const target = replace ? [] : this.rowsOf(side);
+        const have = new Set(target.map((r) => r.to));
+        const merged = [
+          ...target,
+          ...rows.filter((r) => !have.has(r.to))
+        ];
+        if (side === 'request') a.requestRows = merged;
+        else a.responseRows = merged;
+        done.push(`${rows.length} ${side === 'request' ? 'request' : 'response'} mapping row(s)`);
+      };
+      if (req?.body !== undefined) addRows('request', a.requestBody);
+      if (res?.body !== undefined && !(res.status !== undefined && (res.status < 200 || res.status > 299)))
+        addRows('response', a.responseBody);
+    }
+
+    this.importOpen = false;
+    this.error = null;
+    this.info = `Read from ${[
+      req?.source,
+      res?.source
+    ]
+      .filter(Boolean)
+      .join(' + ')}: ${done.join(', ') || 'nothing new'}. ${notes.join(' ')} Review each tab, then Save API.`;
+  }
+
+  /** A path read from a full URL may repeat the path already in the vendor's base URL. */
+  private stripVendorBasePath(path: string): string {
+    const base = String(this.form.baseUrl ?? '');
+    const m = /^[a-zA-Z][a-zA-Z0-9+.-]*:\/\/[^/]+(\/.+)$/.exec(base.replace(/\/+$/, ''));
+    if (m && path.startsWith(m[1] + '/')) return path.slice(m[1].length);
+    return path;
+  }
+
+  // ── test ──
+
+  get testApi(): VendorApi | null {
+    return this.vendor?.apis.find((x) => x.id === this.testApiId) ?? null;
+  }
+
+  fillTestBody(): void {
+    this.testBody = this.testApi?.requestBody ?? '{}';
+    this.testResult = null;
+  }
+
+  get testPreview(): RequestPreview | null {
+    const a = this.testApi;
+    return this.vendor && a ? buildRequestPreview(this.vendor, { ...a, requestBody: this.testBody }) : null;
+  }
+
+  runTest(): void {
+    if (!this.vendor || !this.testApiId) return;
+    this.testing = true;
+    this.error = null;
+    this.service.testApi(this.vendor.id, this.testApiId, this.testBody).subscribe({
+      next: (log) => {
+        this.testing = false;
+        this.testResult = log;
+        this.loadCalls();
+      },
+      error: (e) => {
+        this.testing = false;
+        this.error = e?.error?.defaultUserMessage ?? 'Test failed.';
+      }
+    });
+  }
+}

src/app/api-management/api-vendors/api-vendors.component.html

@@ -0,0 +1,172 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="cic-page">
+  <div class="cic-head">
+    <div>
+      <h1>API Management</h1>
+      <p>
+        Connect any API service to the CBS the same way: <b>Vendor → Work → API set</b>. <b>IN</b> = data comes into the
+        CBS from the vendor (CIC alerts, delivery reports, replies). <b>OUT</b> = the CBS calls the vendor (send an SMS
+        or WhatsApp message).
+      </p>
+    </div>
+    <div class="cic-actions">
+      <a class="cic-btn" routerLink="/api-management/logs">API call logs</a>
+      <button class="cic-btn primary" (click)="startAdd()">+ Add vendor</button>
+    </div>
+  </div>
+
+  @if (error && !adding) {
+    <div class="cic-alert error">{{ error }}</div>
+  }
+  @if (info) {
+    <div class="cic-alert success">{{ info }}</div>
+  }
+
+  <div class="cic-grid cols-4" style="margin-bottom: 16px">
+    <div class="cic-stat">
+      <div class="k">Vendors</div>
+      <div class="v">{{ vendors.length }}</div>
+      <div class="s">{{ activeVendors }} active</div>
+    </div>
+    <div class="cic-stat">
+      <div class="k">APIs</div>
+      <div class="v">{{ totalIn + totalOut }}</div>
+      <div class="s">{{ totalIn }} IN · {{ totalOut }} OUT</div>
+    </div>
+    <div class="cic-stat">
+      <div class="k">Calls in 24 hours</div>
+      <div class="v">{{ summary.callsToday }}</div>
+      <div class="s">both directions</div>
+    </div>
+    <div class="cic-stat">
+      <div class="k">Failed in 24 hours</div>
+      <div class="v" [class.tone-bad]="summary.failedToday > 0">{{ summary.failedToday }}</div>
+      <div class="s">see the call logs</div>
+    </div>
+  </div>
+
+  <div class="cic-card">
+    <h2>Vendors</h2>
+    @if (loading && !vendors.length) {
+      <div class="cic-empty">Loading…</div>
+    } @else {
+      <div class="cic-table-wrap">
+        <table class="cic-table">
+          <thead>
+            <tr>
+              <th>Vendor</th>
+              <th>Work</th>
+              <th>APIs</th>
+              <th>Environment</th>
+              <th>24 h calls</th>
+              <th>Last call</th>
+              <th>Active</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (v of vendors; track v.id) {
+              <tr>
+                <td>
+                  <b>{{ v.name }}</b>
+                  <div class="muted cic-mono" style="font-size: 11px">{{ v.code }}</div>
+                </td>
+                <td style="max-width: 340px; white-space: normal">{{ v.work }}</td>
+                <td>
+                  @if (count(v, 'IN')) {
+                    <span class="cic-badge brand">IN × {{ count(v, 'IN') }}</span>
+                  }
+                  @if (count(v, 'OUT')) {
+                    <span class="cic-badge ok">OUT × {{ count(v, 'OUT') }}</span>
+                  }
+                  @if (!v.apis.length) {
+                    <span class="muted">none yet</span>
+                  }
+                </td>
+                <td>
+                  <span
+                    class="cic-badge"
+                    [class.warn]="v.environment === 'SIMULATOR'"
+                    [class.good]="v.environment === 'PRODUCTION'"
+                    >{{ v.environment }}</span
+                  >
+                </td>
+                <td>
+                  {{ calls(v).calls }}
+                  @if (calls(v).failed) {
+                    <span class="tone-bad" style="font-size: 12px"> · {{ calls(v).failed }} failed</span>
+                  }
+                </td>
+                <td>{{ v.lastCallOn ? (v.lastCallOn | slice: 0 : 16) : '—' }}</td>
+                <td>
+                  <span class="cic-switch">
+                    <input type="checkbox" [checked]="v.active" (change)="toggle(v, $event)" />
+                    <span></span>
+                  </span>
+                </td>
+                <td style="white-space: nowrap">
+                  <a class="cic-btn sm primary" [routerLink]="['/api-management/vendors', v.id]">Set up</a>
+                </td>
+              </tr>
+              @if (v.links.length) {
+                <tr>
+                  <td colspan="8" style="background: var(--cic-soft); padding: 6px 12px">
+                    <span class="muted" style="font-size: 12px">{{ v.code }} also has:</span>
+                    @for (l of v.links; track l.route) {
+                      <a class="cic-btn sm" style="margin-left: 6px" [routerLink]="l.route">{{ l.label }}</a>
+                    }
+                  </td>
+                </tr>
+              }
+            }
+          </tbody>
+        </table>
+      </div>
+    }
+  </div>
+
+  @if (adding) {
+    <div class="cic-modal-backdrop" (click)="adding = false">
+      <div class="cic-modal" (click)="$event.stopPropagation()">
+        <h3>Add an API vendor</h3>
+        @if (error) {
+          <div class="cic-alert error">{{ error }}</div>
+        }
+        <div class="cic-grid cols-1" style="gap: 12px">
+          <div class="cic-field">
+            <label>Vendor name</label>
+            <input [(ngModel)]="form.name" placeholder="e.g. Aadhaar eKYC, Payment gateway, E-mail" />
+          </div>
+          <div class="cic-field">
+            <label>Work — what is this vendor used for?</label>
+            <textarea rows="3" [(ngModel)]="form.work" placeholder="e.g. Verify customer Aadhaar during KYC"></textarea>
+          </div>
+          <div class="cic-field">
+            <label>Environment</label>
+            <select [(ngModel)]="form.environment">
+              <option value="SIMULATOR">SIMULATOR — no network call</option>
+              <option value="UAT">UAT — vendor's test environment</option>
+              <option value="PRODUCTION">PRODUCTION — live</option>
+            </select>
+          </div>
+        </div>
+        <p class="muted" style="font-size: 12px; margin: 12px 0 0">
+          Next you set up the connection and add its APIs, each marked IN or OUT.
+        </p>
+        <div class="foot">
+          <button class="cic-btn" (click)="adding = false">Cancel</button>
+          <button class="cic-btn primary" (click)="saveNew()" [disabled]="saving">
+            {{ saving ? 'Adding…' : 'Add and set up' }}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
+</div>

src/app/api-management/api-vendors/api-vendors.component.ts

@@ -0,0 +1,121 @@
+/**
+ * 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 { CommonModule } from '@angular/common';
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { Router, RouterModule } from '@angular/router';
+
+import { ApiManagementService, ApiVendor } from '../api-management.service';
+
+/** Every outside API service the CBS uses: vendor, its work, its APIs (IN / OUT) and whether it is switched on. */
+@Component({
+  selector: 'mifosx-api-vendors',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    RouterModule
+  ],
+  templateUrl: './api-vendors.component.html',
+  styleUrls: ['../../credit-bureau/cic-shared.scss']
+})
+export class ApiVendorsComponent implements OnInit {
+  private service = inject(ApiManagementService);
+  private router = inject(Router);
+
+  vendors: ApiVendor[] = [];
+  summary: { callsToday: number; failedToday: number; perVendor: Record<number, { calls: number; failed: number }> } = {
+    callsToday: 0,
+    failedToday: 0,
+    perVendor: {}
+  };
+  loading = false;
+  error: string | null = null;
+  info: string | null = null;
+
+  adding = false;
+  saving = false;
+  form: { name: string; work: string; environment: ApiVendor['environment'] } = this.blankForm();
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  private blankForm() {
+    return { name: '', work: '', environment: 'SIMULATOR' as ApiVendor['environment'] };
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service.vendors().subscribe((v) => {
+      this.vendors = v;
+      this.loading = false;
+    });
+    this.service.summary().subscribe((s) => (this.summary = s));
+  }
+
+  count(v: ApiVendor, direction: 'IN' | 'OUT'): number {
+    return v.apis.filter((a) => a.direction === direction).length;
+  }
+
+  get totalIn(): number {
+    return this.vendors.reduce((s, v) => s + this.count(v, 'IN'), 0);
+  }
+
+  get totalOut(): number {
+    return this.vendors.reduce((s, v) => s + this.count(v, 'OUT'), 0);
+  }
+
+  get activeVendors(): number {
+    return this.vendors.filter((v) => v.active).length;
+  }
+
+  calls(v: ApiVendor): { calls: number; failed: number } {
+    return this.summary.perVendor[v.id] ?? { calls: 0, failed: 0 };
+  }
+
+  toggle(v: ApiVendor, event: Event): void {
+    const want = (event.target as HTMLInputElement).checked;
+    (event.target as HTMLInputElement).checked = v.active;
+    this.error = null;
+    this.info = null;
+    this.service.saveVendor(v.id, { active: want }).subscribe({
+      next: (u) => {
+        v.active = u.active;
+        this.info = `${u.name} is now ${u.active ? 'active' : 'switched off'}.`;
+      },
+      error: (e) => (this.error = e?.error?.defaultUserMessage ?? 'Could not change the vendor.')
+    });
+  }
+
+  startAdd(): void {
+    this.adding = true;
+    this.form = this.blankForm();
+    this.error = null;
+  }
+
+  saveNew(): void {
+    this.saving = true;
+    this.error = null;
+    this.service.addVendor(this.form).subscribe({
+      next: (v) => {
+        this.saving = false;
+        this.adding = false;
+        this.router.navigate([
+          '/api-management/vendors',
+          v.id
+        ]);
+      },
+      error: (e) => {
+        this.saving = false;
+        this.error = e?.error?.defaultUserMessage ?? 'Could not add the vendor.';
+      }
+    });
+  }
+}

src/app/app.module.ts

@@ -63,6 +63,8 @@ import { CfcfrmsModule } from './cfcfrms/cfcfrms.module';
 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';
@@ -71,10 +73,13 @@ import { InvestmentModule } from './investment/investment.module';
 import { NpaModule } from './npa/npa.module';
 import { ReconciliationModule } from './reconciliation/reconciliation.module';
 import { LoanOriginationModule } from './loan-origination/loan-origination.module';
+import { CreditBureauModule } from './credit-bureau/credit-bureau.module';
+import { ApiManagementModule } from './api-management/api-management.module';
 import { DigitalModule } from './digital/digital.module';
 import { LetterMgmtModule } from './letter-mgmt/letter-mgmt.module';
 import { AccountsModule } from './accounts/accounts.module';
 import { ElectionModule } from './election/election.module';
+import { LoanEligibilityModule } from './loan-eligibility/loan-eligibility.module';
 import { SponsorDDModule } from './sponsor-dd/sponsor-dd.module';
 import { SponsorDDReconciliationModule } from './sponsor-dd-reconciliation/sponsor-dd-reconciliation.module';
 import { PortalModule } from '@angular/cdk/portal';
@@ -95,6 +100,7 @@ import { TokenInterceptor as ZitadelTokenInterceptor } from './zitadel/token.int
 import { AuthService } from './zitadel/auth.service';
 import { environment } from '../environments/environment';
 import { CallbackComponent } from './zitadel/callback/callback.component';
+import { LoadingScreenComponent } from './shared/loading-screen/loading-screen.component';
 import { OAuthModule } from 'angular-oauth2-oidc';
 
 export class CustomMissingTranslationHandler implements MissingTranslationHandler {
@@ -176,6 +182,8 @@ export function HttpLoaderFactory(http: HttpClient) {
     BankCalendarModule,
     DeafModule,
     SavingsDailyInterestModule,
+    FdDashboardModule,
+    RdDashboardModule,
     DicgcModule,
     FiuModule,
     GlReportsModule,
@@ -184,15 +192,19 @@ export function HttpLoaderFactory(http: HttpClient) {
     NpaModule,
     ReconciliationModule,
     LoanOriginationModule,
+    CreditBureauModule,
+    ApiManagementModule,
     DigitalModule,
     LetterMgmtModule,
     AccountsModule,
     ElectionModule,
+    LoanEligibilityModule,
     SponsorDDModule,
     SponsorDDReconciliationModule,
     AppRoutingModule,
     NotFoundComponent,
     CallbackComponent,
+    LoadingScreenComponent,
     OAuthModule.forRoot()
   ],
   providers: [

src/app/bank-calendar/bank-calendar.component.html

@@ -44,8 +44,11 @@
     <div class="cal-stat sat2nd4th">
       <fa-icon icon="calendar-times" class="cal-stat__icon"></fa-icon>
       <div class="cal-stat__info">
-        <div class="cal-stat__value">{{ overallStats.sat2nd4th }}</div>
-        <div class="cal-stat__label">2nd &amp; 4th Sat</div>
+        <div class="cal-stat__value">{{ overallStats.sat2nd4th + overallStats.weeklyOff }}</div>
+        <div class="cal-stat__label">
+          {{ saturdayIsWorkingDay ? '2nd & 4th Sat' : 'Saturdays'
+          }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
+        </div>
       </div>
     </div>
     <div class="cal-stat holidays">
@@ -69,7 +72,11 @@
     <div class="cal-legend__items">
       <div class="cal-legend__item"><span class="cal-legend__dot working"></span> Working Day</div>
       <div class="cal-legend__item"><span class="cal-legend__dot sunday"></span> Sunday</div>
-      <div class="cal-legend__item"><span class="cal-legend__dot sat2nd4th"></span> 2nd / 4th Saturday</div>
+      <div class="cal-legend__item">
+        <span class="cal-legend__dot sat2nd4th"></span>
+        {{ saturdayIsWorkingDay ? '2nd / 4th Saturday' : 'Saturday'
+        }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
+      </div>
       <div class="cal-legend__item"><span class="cal-legend__dot holiday"></span> Holiday</div>
       <div class="cal-legend__item"><span class="cal-legend__dot today"></span> Today</div>
     </div>
@@ -319,7 +326,9 @@
               [class.cal-grid__day--other]="!day.isCurrentMonth"
               [class.cal-grid__day--today]="day.isToday"
               [class.cal-grid__day--sunday]="day.isSunday && day.isCurrentMonth"
-              [class.cal-grid__day--sat2nd4th]="(day.is2ndSaturday || day.is4thSaturday) && day.isCurrentMonth"
+              [class.cal-grid__day--sat2nd4th]="
+                (day.is2ndSaturday || day.is4thSaturday || day.isWeeklyOff) && day.isCurrentMonth
+              "
               [class.cal-grid__day--holiday]="day.isHoliday && day.isCurrentMonth"
               [class.cal-grid__day--working]="day.isWorking && day.isCurrentMonth"
               [matTooltip]="
@@ -328,9 +337,11 @@
                   ? '2nd Saturday Off'
                   : day.is4thSaturday
                     ? '4th Saturday Off'
-                    : day.isSunday && day.isCurrentMonth
-                      ? 'Sunday'
-                      : '')
+                    : day.isWeeklyOff && day.isCurrentMonth
+                      ? weekDays[day.dayOfWeek] + ' Off (Working Days)'
+                      : day.isSunday && day.isCurrentMonth
+                        ? 'Sunday'
+                        : '')
               "
             >
               {{ day.isCurrentMonth ? day.date : '' }}
@@ -343,10 +354,15 @@
           @if (month.holidays > 0) {
             <span class="summary-tag holiday">{{ month.holidays }} Holiday{{ month.holidays > 1 ? 's' : '' }}</span>
           }
-          <span class="summary-tag sun">{{ month.sundays }} Sun</span>
+          @if (month.sundays > 0) {
+            <span class="summary-tag sun">{{ month.sundays }} Sun</span>
+          }
           @if (month.secondFourthSat > 0) {
             <span class="summary-tag sat">{{ month.secondFourthSat }} Sat Off</span>
           }
+          @if (month.weeklyOff > 0) {
+            <span class="summary-tag sat">{{ month.weeklyOff }} Weekly Off</span>
+          }
         </div>
       </div>
     }

src/app/bank-calendar/bank-calendar.component.ts

@@ -63,6 +63,8 @@ interface CalendarDay {
   isSunday: boolean;
   is2ndSaturday: boolean;
   is4thSaturday: boolean;
+  /** Off every week because Admin > Working Days leaves this weekday out (Sunday aside). */
+  isWeeklyOff: boolean;
   holidayName?: string;
   dayOfWeek: number; // 0=Sun, 6=Sat
 }
@@ -76,9 +78,23 @@ interface MonthData {
   nonWorkingDays: number;
   holidays: number;
   sundays: number;
+  /** Saturdays off: the 2nd and 4th when Saturday is a working day, every one when it is not. */
   secondFourthSat: number;
+  /** Other weekdays off every week because Working Days leaves them out. */
+  weeklyOff: number;
 }
 
+/** Weekday codes in Date#getDay() order, as used by the /workingdays recurrence (BYDAY=MO,TU,...). */
+const DAY_CODES = [
+  'SU',
+  'MO',
+  'TU',
+  'WE',
+  'TH',
+  'FR',
+  'SA'
+];
+
 @Component({
   selector: 'mifosx-bank-calendar',
   templateUrl: './bank-calendar.component.html',
@@ -118,7 +134,7 @@ export class BankCalendarComponent implements OnInit {
   ];
   workingDaysConfig: string[] = [];
   holidays: any[] = [];
-  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
+  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, weeklyOff: 0, totalDays: 0 };
 
   // ───── Holiday list (office-wise) ─────
   offices: OfficeLite[] = [];
@@ -202,7 +218,8 @@ export class BankCalendarComponent implements OnInit {
   }
 
   private loadWorkingDays() {
-    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off)
+    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off), used until
+    // Admin > Working Days answers, or if it cannot be read.
     this.workingDaysConfig = [
       'MO',
       'TU',
@@ -215,6 +232,19 @@ export class BankCalendarComponent implements OnInit {
     this.buildCalendar();
     this.rebuildHolidayRows();
 
+    // The calendar has to agree with Admin > Working Days: a weekday unticked there is off every
+    // week here too.
+    this.organizationService.getWorkingDays().subscribe({
+      next: (data: any) => {
+        const configured = this.parseWorkingDays(data?.recurrence);
+        if (configured.length > 0) {
+          this.workingDaysConfig = configured;
+          this.buildCalendar();
+        }
+      },
+      error: () => {}
+    });
+
     // Pull offices then fan-out a per-office holiday fetch so each office's
     // calendar entries are surfaced in the list panel (calendar grid still
     // unions everything for the year-at-a-glance view).
@@ -273,6 +303,23 @@ export class BankCalendarComponent implements OnInit {
     });
   }
 
+  /** Weekday codes out of a recurrence such as "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR". */
+  private parseWorkingDays(recurrence: string | undefined): string[] {
+    const byDay = /BYDAY=([^;]*)/.exec(recurrence || '');
+    if (!byDay) {
+      return [];
+    }
+    return byDay[1]
+      .split(',')
+      .map((d) => d.trim().toUpperCase())
+      .filter((d) => DAY_CODES.includes(d));
+  }
+
+  /** True when Admin > Working Days counts Saturday as a working day (so only the 2nd and 4th are off). */
+  get saturdayIsWorkingDay(): boolean {
+    return this.workingDaysConfig.includes('SA');
+  }
+
   /** Flatten the holidays array into a presentable list with office labels. */
   private rebuildHolidayRows(): void {
     this.holidayRows = this.holidays.map((h: any) => {
@@ -511,7 +558,15 @@ export class BankCalendarComponent implements OnInit {
 
   buildCalendar() {
     this.months = [];
-    this.overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
+    this.overallStats = {
+      working: 0,
+      nonWorking: 0,
+      holidays: 0,
+      sundays: 0,
+      sat2nd4th: 0,
+      weeklyOff: 0,
+      totalDays: 0
+    };
 
     for (let m = 0; m < 12; m++) {
       const monthData = this.buildMonth(m, this.currentYear);
@@ -521,6 +576,7 @@ export class BankCalendarComponent implements OnInit {
       this.overallStats.holidays += monthData.holidays;
       this.overallStats.sundays += monthData.sundays;
       this.overallStats.sat2nd4th += monthData.secondFourthSat;
+      this.overallStats.weeklyOff += monthData.weeklyOff;
     }
     this.overallStats.totalDays = this.overallStats.working + this.overallStats.nonWorking;
   }
@@ -552,6 +608,7 @@ export class BankCalendarComponent implements OnInit {
     let holidayCount = 0;
     let sundayCount = 0;
     let sat2nd4thCount = 0;
+    let weeklyOffCount = 0;
 
     // Previous month padding
     const prevMonthDays = new Date(year, month, 0).getDate();
@@ -567,6 +624,7 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
+        isWeeklyOff: false,
         dayOfWeek: (startDayOfWeek - i - 1 + 7) % 7
       });
     }
@@ -576,24 +634,29 @@ export class BankCalendarComponent implements OnInit {
     for (let d = 1; d <= daysInMonth; d++) {
       const date = new Date(year, month, d);
       const dow = date.getDay();
-      const isSunday = dow === 0;
       const isSaturday = dow === 6;
+      const isWorkingWeekday = this.workingDaysConfig.includes(DAY_CODES[dow]);
+      const isSunday = dow === 0 && !isWorkingWeekday;
 
       if (isSaturday) saturdayCount++;
 
-      const is2ndSat = isSaturday && saturdayCount === 2;
-      const is4thSat = isSaturday && saturdayCount === 4;
+      // RBI: when Saturday is a working day the 2nd and 4th are still off. When Working Days leaves
+      // Saturday out, every Saturday is a weekly off instead.
+      const is2ndSat = isSaturday && isWorkingWeekday && saturdayCount === 2;
+      const is4thSat = isSaturday && isWorkingWeekday && saturdayCount === 4;
+      const isWeeklyOff = dow !== 0 && !isWorkingWeekday;
       const isToday = date.toDateString() === today.toDateString();
 
       // Check if holiday
       const holiday = this.getHolidayForDate(year, month, d);
       const isHoliday = !!holiday;
 
-      // Non-working: Sunday, 2nd Sat, 4th Sat, or holiday
-      const isNonWorking = isSunday || is2ndSat || is4thSat || isHoliday;
+      // Non-working: Sunday, 2nd Sat, 4th Sat, a weekly off from Working Days, or holiday
+      const isNonWorking = isSunday || is2ndSat || is4thSat || isWeeklyOff || isHoliday;
 
       if (isSunday) sundayCount++;
-      if (is2ndSat || is4thSat) sat2nd4thCount++;
+      if (is2ndSat || is4thSat || (isSaturday && isWeeklyOff)) sat2nd4thCount++;
+      if (isWeeklyOff && !isSaturday) weeklyOffCount++;
       if (isHoliday) holidayCount++;
 
       if (isNonWorking) {
@@ -613,6 +676,7 @@ export class BankCalendarComponent implements OnInit {
         isSunday,
         is2ndSaturday: is2ndSat,
         is4thSaturday: is4thSat,
+        isWeeklyOff,
         holidayName: holiday?.name,
         dayOfWeek: dow
       });
@@ -632,6 +696,7 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
+        isWeeklyOff: false,
         dayOfWeek: days.length % 7
       });
     }
@@ -645,7 +710,8 @@ export class BankCalendarComponent implements OnInit {
       nonWorkingDays: nonWorkingCount,
       holidays: holidayCount,
       sundays: sundayCount,
-      secondFourthSat: sat2nd4thCount
+      secondFourthSat: sat2nd4thCount,
+      weeklyOff: weeklyOffCount
     };
   }
 

src/app/board-resolution/bor-report.component.html

@@ -0,0 +1,154 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+<div class="bor-root">
+  <div class="bor-head">
+    <div class="bor-head-left">
+      <fa-icon icon="gavel" class="bor-head-ic"></fa-icon>
+      <div>
+        <h2 class="bor-head-t">Board of Resolution Register — Share Capital</h2>
+        <p class="bor-head-s">
+          Every share account with the board resolution that authorised the allotment. Accounts with no resolution on
+          record sort to the top.
+        </p>
+      </div>
+    </div>
+    <button
+      class="bor-btn bor-btn--xls"
+      type="button"
+      [disabled]="exporting || !filtered.length"
+      (click)="exportExcel()"
+    >
+      <fa-icon icon="file-excel"></fa-icon>
+      {{ exporting ? 'Exporting…' : 'Export' }}
+    </button>
+  </div>
+
+  @if (loading) {
+    <div class="bor-note">Loading the register…</div>
+  } @else if (loadError) {
+    <div class="bor-note bor-note--warn"><fa-icon icon="exclamation-triangle"></fa-icon> {{ loadError }}</div>
+  }
+
+  @if (!loading && !loadError) {
+    <!-- Counted over the whole register, not the filtered view: it is a standing figure the
+         secretary acts on, and hiding it behind a filter would hide the problem. -->
+    @if (missingResolutionCount > 0) {
+      <div class="bor-note bor-note--warn">
+        <fa-icon icon="exclamation-triangle"></fa-icon>
+        {{ missingResolutionCount }} share account{{ missingResolutionCount === 1 ? '' : 's' }} carr{{
+          missingResolutionCount === 1 ? 'ies' : 'y'
+        }}
+        no resolution number. Share capital allotted without a board resolution cannot be evidenced to the Registrar.
+      </div>
+    }
+
+    <div class="bor-kpis">
+      <div class="bor-kpi">
+        <div class="bor-kpi-n">{{ filtered.length | number }}</div>
+        <div class="bor-kpi-l">Share Accounts</div>
+      </div>
+      <div class="bor-kpi bor-kpi--blue">
+        <div class="bor-kpi-n">{{ distinctResolutions | number }}</div>
+        <div class="bor-kpi-l">Resolutions</div>
+      </div>
+      <div class="bor-kpi bor-kpi--green">
+        <div class="bor-kpi-n">{{ totalShares | number }}</div>
+        <div class="bor-kpi-l">Shares Allotted</div>
+      </div>
+      <div class="bor-kpi bor-kpi--amber">
+        <div class="bor-kpi-n">&#8377;{{ totalValue | number: '1.0-0' }}</div>
+        <div class="bor-kpi-l">Share Value</div>
+      </div>
+    </div>
+
+    <div class="bor-filters">
+      <div class="bor-filter">
+        <label>Resolution No.</label>
+        <input class="bor-inp" type="text" [(ngModel)]="filterResolution" placeholder="e.g. BOR/2026-27/001" />
+      </div>
+      <div class="bor-filter">
+        <label>Branch</label>
+        <select class="bor-inp" [(ngModel)]="filterBranch">
+          <option value="">All branches</option>
+          @for (b of branches; track b) {
+            <option [value]="b">{{ b }}</option>
+          }
+        </select>
+      </div>
+      <div class="bor-filter">
+        <label>Status</label>
+        <select class="bor-inp" [(ngModel)]="filterStatus">
+          <option [ngValue]="''">Any status</option>
+          @for (s of statuses; track s) {
+            <option [ngValue]="s">{{ statusText(s) }}</option>
+          }
+        </select>
+      </div>
+      <div class="bor-filter bor-filter--grow">
+        <label>Search</label>
+        <input class="bor-inp" type="text" [(ngModel)]="search" placeholder="Member name, share A/c or CIF…" />
+      </div>
+      <label class="bor-check">
+        <input type="checkbox" [(ngModel)]="missingOnly" />
+        No resolution only
+      </label>
+      <button class="bor-btn" type="button" (click)="resetFilters()"><fa-icon icon="undo"></fa-icon> Reset</button>
+    </div>
+
+    <div class="bor-table-wrap">
+      <table class="bor-table">
+        <thead>
+          <tr>
+            <th>Resolution No.</th>
+            <th>Resolution Date</th>
+            <th>Share A/c No.</th>
+            <th>CIF No.</th>
+            <th>Member Name</th>
+            <th>Branch</th>
+            <th>Product</th>
+            <th class="num">Shares</th>
+            <th class="num">Share Value</th>
+            <th class="num">Tranches</th>
+            <th>Status</th>
+            <th>Activated On</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (r of filtered; track r.shareAccountId) {
+            <tr [class.bor-row--missing]="!r.resolutionNumber">
+              <td>
+                @if (r.resolutionNumber) {
+                  <strong class="bor-res">{{ r.resolutionNumber }}</strong>
+                } @else {
+                  <span class="bor-missing">Not recorded</span>
+                }
+              </td>
+              <td class="mono">{{ r.resolutionDate || '—' }}</td>
+              <td class="mono">{{ r.accountNo }}</td>
+              <td class="mono">{{ r.cifNumber || '—' }}</td>
+              <td>{{ r.clientName }}</td>
+              <td>{{ r.officeName || '—' }}</td>
+              <td>{{ r.productName || '—' }}</td>
+              <td class="num">{{ r.approvedShares | number }}</td>
+              <td class="num strong">{{ r.shareValue | number: '1.2-2' }}</td>
+              <td class="num">{{ r.trancheCount }}</td>
+              <td>
+                <span [class]="statusClass(r.statusEnum)">{{ statusText(r.statusEnum) }}</span>
+              </td>
+              <td class="mono">{{ r.activatedDate || '—' }}</td>
+            </tr>
+          } @empty {
+            <tr>
+              <td colspan="12" class="bor-empty">No share account matches the filters.</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+</div>

src/app/board-resolution/bor-report.component.scss

@@ -0,0 +1,313 @@
+/**
+ * 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/.
+ */
+
+.bor-root {
+  padding: 20px 24px 40px;
+  background: #f8fafc;
+  min-height: 100%;
+}
+
+.bor-head {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 18px;
+}
+
+.bor-head-left {
+  display: flex;
+  align-items: flex-start;
+  gap: 12px;
+}
+
+.bor-head-ic {
+  font-size: 26px;
+  color: #0f4f3c;
+  margin-top: 2px;
+}
+
+.bor-head-t {
+  margin: 0 0 3px;
+  font-size: 20px;
+  font-weight: 700;
+  color: #1e293b;
+}
+
+.bor-head-s {
+  margin: 0;
+  max-width: 780px;
+  font-size: 13px;
+  line-height: 1.5;
+  color: #64748b;
+}
+
+.bor-note {
+  display: flex;
+  align-items: flex-start;
+  gap: 9px;
+  padding: 11px 14px;
+  margin-bottom: 14px;
+  border: 1px solid #bfdbfe;
+  border-radius: 9px;
+  background: #eff6ff;
+  color: #1e3a8a;
+  font-size: 12.5px;
+  line-height: 1.55;
+
+  fa-icon {
+    flex: 0 0 auto;
+    margin-top: 1px;
+  }
+
+  /* An allotment with no resolution behind it is the finding, not a detail. */
+  &--warn {
+    border-color: #fde68a;
+    background: #fffbeb;
+    color: #92400e;
+
+    fa-icon {
+      color: #d97706;
+    }
+  }
+}
+
+.bor-kpis {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
+  gap: 12px;
+  margin-bottom: 16px;
+}
+
+.bor-kpi {
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-left: 4px solid #0f4f3c;
+  border-radius: 11px;
+  padding: 12px 16px;
+
+  &--blue {
+    border-left-color: #2563eb;
+  }
+
+  &--green {
+    border-left-color: #15803d;
+  }
+
+  &--amber {
+    border-left-color: #d97706;
+  }
+}
+
+.bor-kpi-n {
+  font-size: 22px;
+  font-weight: 700;
+  color: #1e293b;
+  line-height: 1.2;
+}
+
+.bor-kpi-l {
+  font-size: 12px;
+  color: #64748b;
+  margin-top: 2px;
+}
+
+.bor-filters {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-end;
+  gap: 12px;
+  padding: 14px 16px;
+  margin-bottom: 14px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 11px;
+}
+
+.bor-filter {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  label {
+    font-size: 10.5px;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: #64748b;
+  }
+
+  &--grow {
+    flex: 1 1 240px;
+  }
+}
+
+.bor-inp {
+  height: 34px;
+  min-width: 170px;
+  padding: 0 10px;
+  border: 1px solid #cbd5e1;
+  border-radius: 7px;
+  font: inherit;
+  font-size: 13px;
+  color: #1e293b;
+  background: #fff;
+
+  &:focus {
+    outline: 2px solid #2563eb;
+    outline-offset: -1px;
+  }
+}
+
+.bor-check {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  height: 34px;
+  font-size: 12.5px;
+  color: #334155;
+  cursor: pointer;
+}
+
+.bor-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 7px;
+  height: 34px;
+  padding: 0 14px;
+  border: 1px solid #cbd5e1;
+  border-radius: 7px;
+  background: #fff;
+  font: inherit;
+  font-size: 12.5px;
+  font-weight: 600;
+  color: #334155;
+  cursor: pointer;
+
+  &:hover:not(:disabled) {
+    background: #f1f5f9;
+  }
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: default;
+  }
+
+  &--xls {
+    border-color: #15803d;
+    background: #16a34a;
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #15803d;
+    }
+  }
+}
+
+.bor-table-wrap {
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 11px;
+  overflow-x: auto;
+}
+
+.bor-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 12.5px;
+
+  th {
+    text-align: left;
+    padding: 10px;
+    background: #f1f5f9;
+    font-size: 10.5px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: #475569;
+    white-space: nowrap;
+    border-bottom: 1px solid #e2e8f0;
+  }
+
+  td {
+    padding: 11px 10px;
+    border-bottom: 1px solid #f1f5f9;
+    vertical-align: middle;
+    color: #334155;
+  }
+
+  .num {
+    text-align: right;
+    font-family: 'DM Mono', monospace;
+  }
+
+  .mono {
+    font-family: 'DM Mono', monospace;
+  }
+
+  .strong {
+    font-weight: 700;
+  }
+
+  tbody tr:hover {
+    background: #f8fafc;
+  }
+}
+
+/* The row an auditor is looking for, marked in the table as well as counted above it. */
+.bor-row--missing {
+  background: #fffbeb;
+}
+
+.bor-res {
+  color: #0f4f3c;
+  font-family: 'DM Mono', monospace;
+}
+
+.bor-missing {
+  display: inline-block;
+  padding: 2px 8px;
+  border-radius: 999px;
+  background: #fef3c7;
+  color: #92400e;
+  font-size: 11px;
+  font-weight: 700;
+}
+
+.bor-status {
+  display: inline-block;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+  background: #f1f5f9;
+  color: #475569;
+
+  &--active {
+    background: #dcfce7;
+    color: #15803d;
+  }
+
+  &--submitted,
+  &--approved {
+    background: #fef3c7;
+    color: #b45309;
+  }
+
+  &--rejected,
+  &--closed {
+    background: #fee2e2;
+    color: #b91c1c;
+  }
+}
+
+.bor-empty {
+  padding: 30px;
+  text-align: center;
+  color: #94a3b8;
+}

src/app/board-resolution/bor-report.component.ts

@@ -0,0 +1,221 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+import { exportWorkbook } from '../cashier/cashier-export';
+import { BorRegisterRow, BorReportService } from './bor-report.service';
+
+/** m_share_account.status_enum, as the register labels it. */
+const STATUS_LABEL: Record<number, string> = {
+  100: 'Submitted',
+  200: 'Approved',
+  300: 'Active',
+  400: 'Rejected',
+  500: 'Closed',
+  600: 'Inactive'
+};
+
+/**
+ * The Board of Resolution register for share capital.
+ *
+ * A co-operative allots shares only under a board resolution, and this is the list the Registrar or
+ * an auditor asks for: every member's holding against the resolution that authorised it. The
+ * account with no resolution recorded is the point of the register, so it sorts to the top and is
+ * counted on its own rather than being left to be noticed.
+ */
+@Component({
+  selector: 'mifosx-bor-report',
+  templateUrl: './bor-report.component.html',
+  styleUrls: ['./bor-report.component.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FaIconComponent,
+    FormsModule
+  ]
+})
+export class BorReportComponent implements OnInit {
+  private borService = inject(BorReportService);
+
+  readonly statusLabel = STATUS_LABEL;
+
+  rows: BorRegisterRow[] = [];
+  loading = false;
+  loadError = '';
+
+  /** '' = every status. */
+  filterStatus: number | '' = '';
+  filterBranch = '';
+  filterResolution = '';
+  search = '';
+  /** Only the accounts with no resolution on file — the ones that need chasing. */
+  missingOnly = false;
+
+  exporting = false;
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.loadError = '';
+    this.borService.getRegister().subscribe({
+      next: (rows) => {
+        this.loading = false;
+        this.rows = rows;
+      },
+      error: (err: any) => {
+        this.loading = false;
+        this.rows = [];
+        this.loadError = err?.error?.defaultUserMessage || 'Could not load the BOR register.';
+      }
+    });
+  }
+
+  /** Branches present in the data, so the filter offers only what can actually be selected. */
+  get branches(): string[] {
+    return [...new Set(this.rows.map((r) => r.officeName).filter(Boolean))].sort();
+  }
+
+  get statuses(): number[] {
+    return [...new Set(this.rows.map((r) => r.statusEnum))].sort((a, b) => a - b);
+  }
+
+  get filtered(): BorRegisterRow[] {
+    const needle = this.search.trim().toLowerCase();
+    const resolutionNeedle = this.filterResolution.trim().toLowerCase();
+    return this.rows.filter((r) => {
+      if (this.filterStatus !== '' && r.statusEnum !== this.filterStatus) {
+        return false;
+      }
+      if (this.filterBranch && r.officeName !== this.filterBranch) {
+        return false;
+      }
+      if (this.missingOnly && r.resolutionNumber) {
+        return false;
+      }
+      if (resolutionNeedle && !r.resolutionNumber.toLowerCase().includes(resolutionNeedle)) {
+        return false;
+      }
+      if (
+        needle &&
+        !(
+          r.clientName.toLowerCase().includes(needle) ||
+          r.accountNo.toLowerCase().includes(needle) ||
+          r.cifNumber.toLowerCase().includes(needle)
+        )
+      ) {
+        return false;
+      }
+      return true;
+    });
+  }
+
+  get totalShares(): number {
+    return this.filtered.reduce((s, r) => s + r.approvedShares, 0);
+  }
+
+  get totalValue(): number {
+    return this.filtered.reduce((s, r) => s + r.shareValue, 0);
+  }
+
+  /** How many resolutions the filtered holdings were authorised under. */
+  get distinctResolutions(): number {
+    return new Set(this.filtered.map((r) => r.resolutionNumber).filter(Boolean)).size;
+  }
+
+  get missingResolutionCount(): number {
+    return this.rows.filter((r) => !r.resolutionNumber).length;
+  }
+
+  statusText(statusEnum: number): string {
+    return STATUS_LABEL[statusEnum] || '—';
+  }
+
+  statusClass(statusEnum: number): string {
+    return 'bor-status bor-status--' + (STATUS_LABEL[statusEnum] || 'unknown').toLowerCase();
+  }
+
+  resetFilters(): void {
+    this.filterStatus = '';
+    this.filterBranch = '';
+    this.filterResolution = '';
+    this.search = '';
+    this.missingOnly = false;
+  }
+
+  async exportExcel(): Promise<void> {
+    this.exporting = true;
+    try {
+      const rows = this.filtered;
+      await exportWorkbook(
+        [
+          {
+            sheetName: 'BOR Register',
+            title: 'Board of Resolution Register — Share Capital',
+            subtitle: `${rows.length} share account(s) · ${this.distinctResolutions} resolution(s) · ${this.totalShares} shares`,
+            headers: [
+              'Resolution No.',
+              'Resolution Date',
+              'Share A/c No.',
+              'CIF No.',
+              'Member Name',
+              'Branch',
+              'Product',
+              'Shares',
+              'Unit Price',
+              'Share Value',
+              'Tranches',
+              'Status',
+              'Activated On'
+            ],
+            widths: [
+              20,
+              16,
+              18,
+              16,
+              30,
+              18,
+              18,
+              10,
+              12,
+              14,
+              10,
+              12,
+              14
+            ],
+            rows: rows.map((r) => [
+              // Named rather than left blank, because an empty cell in a filing reads as an
+              // oversight in the export rather than a gap in the register.
+              r.resolutionNumber || 'NOT RECORDED',
+              r.resolutionDate || '—',
+              r.accountNo,
+              r.cifNumber,
+              r.clientName,
+              r.officeName,
+              r.productName,
+              r.approvedShares,
+              r.unitPrice,
+              r.shareValue,
+              r.trancheCount,
+              this.statusText(r.statusEnum),
+              r.activatedDate || '—'
+            ])
+          }
+        ],
+        'BOR-Register'
+      );
+    } finally {
+      this.exporting = false;
+    }
+  }
+}

src/app/board-resolution/bor-report.service.ts

@@ -0,0 +1,94 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Angular Imports */
+import { Injectable, inject } from '@angular/core';
+import { HttpClient, HttpParams } from '@angular/common/http';
+import { Observable, map } from 'rxjs';
+
+/** Custom Helpers */
+import { toIsoDate } from '../core/utils/api-date';
+
+/** One share account and the board resolution that authorised it. */
+export interface BorRegisterRow {
+  shareAccountId: number;
+  accountNo: string;
+  clientId: number;
+  cifNumber: string;
+  clientName: string;
+  officeId: number | null;
+  officeName: string;
+  productName: string;
+  currencyCode: string;
+  statusEnum: number;
+  approvedShares: number;
+  pendingShares: number;
+  unitPrice: number;
+  shareValue: number;
+  resolutionNumber: string;
+  /** ISO date, or '' where no meeting date was ever recorded against the allotment. */
+  resolutionDate: string;
+  /** How many purchase tranches make up the holding. */
+  trancheCount: number;
+  submittedDate: string;
+  approvedDate: string;
+  activatedDate: string;
+  closedDate: string;
+}
+
+/**
+ * The BOR register.
+ *
+ * One call returns every account with its resolution. The share allotment report next door fetches
+ * each account separately and stops at two hundred, which is a limit on a register rather than on a
+ * page of one.
+ */
+@Injectable({ providedIn: 'root' })
+export class BorReportService {
+  private http = inject(HttpClient);
+
+  getRegister(status?: number, officeId?: number): Observable<BorRegisterRow[]> {
+    let params = new HttpParams();
+    if (status != null) {
+      params = params.set('status', String(status));
+    }
+    if (officeId != null) {
+      params = params.set('officeId', String(officeId));
+    }
+    return this.http
+      .get<any[]>('/shareaccounts/bor-register', { params })
+      .pipe(map((rows) => (rows || []).map((r) => this.toRow(r))));
+  }
+
+  /** Dates arrive as [y, M, d] arrays; flattened to ISO so they sort and filter as strings. */
+  private toRow(r: any): BorRegisterRow {
+    return {
+      shareAccountId: r.shareAccountId,
+      accountNo: r.accountNo || '',
+      clientId: r.clientId,
+      cifNumber: r.cifNumber || '',
+      clientName: r.clientName || '',
+      officeId: r.officeId ?? null,
+      officeName: r.officeName || '',
+      productName: r.productName || '',
+      currencyCode: r.currencyCode || 'INR',
+      statusEnum: Number(r.statusEnum) || 0,
+      approvedShares: Number(r.approvedShares) || 0,
+      pendingShares: Number(r.pendingShares) || 0,
+      unitPrice: Number(r.unitPrice) || 0,
+      shareValue: Number(r.shareValue) || 0,
+      resolutionNumber: (r.resolutionNumber || '').trim(),
+      resolutionDate: toIsoDate(r.resolutionDate),
+      trancheCount: Number(r.trancheCount) || 0,
+      submittedDate: toIsoDate(r.submittedDate),
+      approvedDate: toIsoDate(r.approvedDate),
+      activatedDate: toIsoDate(r.activatedDate),
+      closedDate: toIsoDate(r.closedDate)
+    };
+  }
+}

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/branch-cash-position/branch-cash-position.component.html

@@ -0,0 +1,114 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="pg">
+  <header class="pg-head">
+    <div>
+      <div class="pg-eyebrow">BRANCH OPERATIONS · BRANCH CASH POSITION</div>
+      <h1 class="pg-title">Branch Cash Position</h1>
+      <p class="pg-sub">
+        The notes and coins the branch holds, denomination by denomination: the vault plus every cashier's drawer. Cash
+        moving between the vault and a cashier nets out; deposits, withdrawals and exchanges change it.
+      </p>
+    </div>
+  </header>
+
+  <div class="pg-toolbar pg-toolbar--mat">
+    <mat-form-field appearance="outline" subscriptSizing="dynamic">
+      <mat-label>As of Date</mat-label>
+      <input matInput type="date" [value]="asOfDate" (change)="onDateChange($any($event.target).value)" />
+    </mat-form-field>
+    <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
+      <mat-icon>refresh</mat-icon> Refresh
+    </button>
+  </div>
+
+  @if (errorMsg) {
+    <div class="pg-empty bcp-error">{{ errorMsg }}</div>
+  }
+  @if (loading) {
+    <div class="pg-empty">Loading…</div>
+  }
+
+  @if (position; as p) {
+    <div class="bcp-totals">
+      <div class="bcp-total">
+        <span>Branch</span><strong>{{ p.officeName }}</strong>
+      </div>
+      <div class="bcp-total">
+        <span>Vault</span><strong>₹{{ p.vaultAmount | number: '1.2-2' }}</strong>
+      </div>
+      <div class="bcp-total">
+        <span>Cashiers' drawers</span><strong>₹{{ p.cashiersAmount | number: '1.2-2' }}</strong>
+      </div>
+      <div class="bcp-total bcp-total--main">
+        <span>Bank total</span><strong>₹{{ p.totalAmount | number: '1.2-2' }}</strong>
+      </div>
+    </div>
+
+    @if (!p.vaultHasBreakdown) {
+      <div class="pg-empty bcp-note">
+        No vault denomination breakdown was recorded on or before {{ p.asOfDate }}, so the vault column reads 0. Open
+        the business day with a note/coin count to start tracking it.
+      </div>
+    }
+
+    <ng-template #table let-rows let-label="label" let-coin="coin">
+      @if (rows.length > 0) {
+        <div class="pos-section-label" [class.pos-section-label--coin]="coin">{{ label }}</div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Denomination</th>
+              <th class="num">Vault</th>
+              <th class="num">Cashiers</th>
+              <th class="num">Bank total (count)</th>
+              <th class="num">Bank total (₹)</th>
+              <th class="num">Exchange today</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (d of rows; track d.denominationId) {
+              <tr>
+                <td>
+                  <span class="pg-chip" [class.pg-chip--coin]="coin">₹{{ d.denominationValue }}</span>
+                </td>
+                <td class="num">{{ d.vaultCount }}</td>
+                <td class="num">{{ d.cashierCount }}</td>
+                <td class="num bcp-strong">{{ d.totalCount }}</td>
+                <td class="num">₹{{ d.totalAmount | number: '1.2-2' }}</td>
+                <td
+                  class="num bcp-move"
+                  [class.bcp-move--in]="d.exchangeNet > 0"
+                  [class.bcp-move--out]="d.exchangeNet < 0"
+                >
+                  {{ movement(d.exchangeNet) }}
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      }
+    </ng-template>
+
+    <div class="pg-card bcp-card">
+      <ng-container
+        *ngTemplateOutlet="table; context: { $implicit: notes(), label: 'Notes', coin: false }"
+      ></ng-container>
+      <ng-container
+        *ngTemplateOutlet="table; context: { $implicit: coins(), label: 'Coins', coin: true }"
+      ></ng-container>
+    </div>
+
+    <p class="bcp-foot">
+      <strong>Exchange today</strong> is the notes taken in less the notes given out by cash exchanges on
+      {{ p.asOfDate }}. It is already part of the Cashiers column; it is shown beside the total so a change in the mix
+      can be seen.
+    </p>
+  }
+</div>

src/app/cashier/branch-cash-position/branch-cash-position.component.scss

@@ -0,0 +1,82 @@
+/**
+ * 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/.
+ */
+
+.bcp-error {
+  color: #dc2626;
+}
+
+.bcp-note {
+  margin-bottom: 12px;
+  text-align: left;
+}
+
+.bcp-totals {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 14px;
+}
+
+.bcp-total {
+  flex: 1 1 180px;
+  padding: 12px 14px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 12px;
+
+  span {
+    display: block;
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: #64748b;
+  }
+
+  strong {
+    font-size: 18px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &--main {
+    background: #e6f4ee;
+    border-color: #1f7a4d;
+
+    strong {
+      color: #0f4f3c;
+    }
+  }
+}
+
+.bcp-card {
+  margin-bottom: 14px;
+}
+
+.bcp-strong {
+  font-weight: 700;
+}
+
+.bcp-move {
+  font-weight: 700;
+  color: #94a3b8;
+
+  &--in {
+    color: #16a34a;
+  }
+
+  &--out {
+    color: #dc2626;
+  }
+}
+
+.bcp-foot {
+  margin: 0;
+  font-size: 12px;
+  color: #64748b;
+}

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

@@ -0,0 +1,112 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatIconModule } from '@angular/material/icon';
+import { MatFormFieldModule } from '@angular/material/form-field';
+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 BranchDenomRow {
+  denominationId: number;
+  denominationValue: number;
+  kind: string;
+  vaultCount: number;
+  cashierCount: number;
+  totalCount: number;
+  totalAmount: number;
+  /** Notes taken in less notes given out by exchanges on the day. */
+  exchangeNet: number;
+}
+
+interface BranchPosition {
+  officeId: number;
+  officeName: string;
+  asOfDate: string;
+  vaultHasBreakdown: boolean;
+  vaultAmount: number;
+  cashiersAmount: number;
+  totalAmount: number;
+  denominations: BranchDenomRow[];
+}
+
+/**
+ * What the branch holds, denomination by denomination: the vault plus every cashier's drawer. An exchange
+ * (a customer hands in 10 x ₹500 and leaves with 50 x ₹100) leaves the vault alone and changes a drawer, so
+ * it only shows up in this total -- +10 on ₹500, -50 on ₹100.
+ */
+@Component({
+  selector: 'mifosx-branch-cash-position',
+  templateUrl: './branch-cash-position.component.html',
+  styleUrls: [
+    '../cashier-shared.scss',
+    '../cashier-position/cashier-position.component.scss',
+    './branch-cash-position.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatIconModule,
+    MatFormFieldModule,
+    MatInputModule
+  ]
+})
+export class BranchCashPositionComponent implements OnInit {
+  private service = inject(CashierService);
+
+  asOfDate = '';
+  loading = false;
+  errorMsg = '';
+  position: BranchPosition | null = null;
+
+  ngOnInit(): void {
+    const d = businessToday();
+    this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.errorMsg = '';
+    this.position = null;
+    this.service
+      .branchCashPosition(this.asOfDate)
+      .pipe(catchError(() => of(null)))
+      .subscribe((data: BranchPosition | null) => {
+        this.loading = false;
+        if (!data) {
+          this.errorMsg = 'Could not load the branch cash position.';
+          return;
+        }
+        this.position = data;
+      });
+  }
+
+  onDateChange(value: string): void {
+    this.asOfDate = value;
+    this.load();
+  }
+
+  notes(): BranchDenomRow[] {
+    return (this.position?.denominations || []).filter((d) => d.kind !== 'coin');
+  }
+
+  coins(): BranchDenomRow[] {
+    return (this.position?.denominations || []).filter((d) => d.kind === 'coin');
+  }
+
+  /** "+10", "-50", or a dash when the day's exchanges did not touch the denomination. */
+  movement(net: number): string {
+    if (!net) return '—';
+    return net > 0 ? `+${net}` : `${net}`;
+  }
+}

src/app/cashier/branch-day/branch-day.component.html

@@ -49,6 +49,18 @@
     </div>
   }
 
+  @if (firstOpenNeedsCashMigration && !missedOnly) {
+    <div class="bd-locked">
+      <mat-icon>lock</mat-icon>
+      <span>
+        This branch has never opened a business day, and its Cash at Vault GL account has no opening balance yet. Count
+        the vault and open the first business day together from
+        <a [routerLink]="['/accounting/migrate-cash-denomination']">Migrate Cash Denomination</a> — Open Day here is
+        locked until that is done, so today's cash tracking never starts out of step with the ledger.
+      </span>
+    </div>
+  }
+
   <!-- Missed closes first: these are the ones that need action. -->
   @if (missed.length > 0) {
     <div class="db-exceptions">
@@ -95,11 +107,26 @@
         </span>
       </div>
       @if (canOperate) {
-        <button type="button" class="pg-btn pg-btn--primary" (click)="startClose(openDay)">
+        <button
+          type="button"
+          class="pg-btn pg-btn--primary"
+          (click)="startClose(openDay)"
+          [disabled]="interestPending.length > 0"
+        >
           <mat-icon>lock</mat-icon> Close Day
         </button>
       }
     </div>
+    @if (interestPending.length > 0) {
+      <div class="bd-interest-alert">
+        <mat-icon>warning</mat-icon>
+        <span>
+          Savings interest posting report is not approved for <strong>{{ interestPending.join(', ') }}</strong
+          >. Approve it in <a routerLink="/reports/interest-posting">Reports → Interest Posting Reports</a> before
+          closing the day.
+        </span>
+      </div>
+    }
   } @else if (loaded && canOperate) {
     <div class="bd-current bd-current--shut">
       <div class="bd-current__main">
@@ -325,6 +352,51 @@
         </div>
       }
 
+      <!-- Interest waiting to be posted as this branch closes. Posting runs as part of the close, so
+           anything unapproved stops it: the branch sees here what it has to approve and where, rather
+           than finding out from a refusal after filling in the whole count. -->
+      @if (preview?.fdInterestDue?.length) {
+        <div class="bd-calc bd-calc--fd">
+          <div class="bd-calc__head">
+            <mat-icon>savings</mat-icon>
+            <strong>Fixed deposit interest due today</strong>
+          </div>
+          @for (d of preview.fdInterestDue; track d.productId) {
+            <div class="bd-calc__row">
+              <span>
+                {{ d.productName }} · {{ d.fdType }} · {{ d.accountCount }} deposit(s)
+                @if (d.reportStatus === 'APPROVED' || d.reportStatus === 'POSTED') {
+                  <span class="bd-fd-ok">{{ d.reportStatus }}</span>
+                } @else {
+                  <span class="bd-fd-pending">{{ d.reportStatus === 'NONE' ? 'NO REPORT' : d.reportStatus }}</span>
+                }
+              </span>
+              <span class="bd-calc__amt">₹{{ d.totalInterest | number: '1.2-2' }}</span>
+            </div>
+          }
+        </div>
+      }
+      @if (preview?.fdInterestPending?.length) {
+        <div class="bd-warn">
+          <mat-icon>warning</mat-icon>
+          <div>
+            <strong>The day cannot be closed yet.</strong> Fixed deposit interest is not approved for:
+            {{ preview.fdInterestPending.join(', ') }}. Approve it under Reports → FD Interest Posting Reports, then
+            close the day. The user who generated a report cannot approve it.
+          </div>
+        </div>
+      }
+      @if (preview?.savingsInterestPending?.length) {
+        <div class="bd-warn">
+          <mat-icon>warning</mat-icon>
+          <div>
+            <strong>The day cannot be closed yet.</strong> Savings interest is not approved for:
+            {{ preview.savingsInterestPending.join(', ') }}. Approve it under Reports → Interest Posting Reports, then
+            close the day.
+          </div>
+        </div>
+      }
+
       <!-- What every cash point under this branch is actually holding right now, fetched
            automatically — so closing the day doesn't mean separately checking Vault Position and
            every cashier's own Cashier Position screen by hand. -->
@@ -703,10 +775,10 @@
                   <span class="db-muted">· {{ timeOnly(d.closedAt) }}</span>
                 }
               </td>
-              <td class="num">{{ d.closingCash != null ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}</td>
-              <td class="num">{{ d.bookCash != null ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}</td>
+              <td class="num">{{ hasValue(d.closingCash) ? '₹' + (d.closingCash | number: '1.2-2') : '—' }}</td>
+              <td class="num">{{ hasValue(d.bookCash) ? '₹' + (d.bookCash | number: '1.2-2') : '—' }}</td>
               <td>
-                @if (d.cashDifference == null) {
+                @if (!hasValue(d.cashDifference)) {
                   —
                 } @else if (d.cashDifference === 0) {
                   <span class="db-badge db-badge--ok">Tallied</span>

src/app/cashier/branch-day/branch-day.component.scss

@@ -30,6 +30,36 @@
   }
 }
 
+/* Blocks Open Day until the branch's first-ever open has gone through Migrate Cash Denomination —
+   see BranchDayComponent.checkFirstOpenCashMigration(). Same shape as .ve-note, in the error palette
+   the rest of this screen already uses for a missed close (.bd-missed). */
+.bd-locked {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  padding: 10px 14px;
+  margin-bottom: 14px;
+  background: #fef2f2;
+  border: 1px solid #fecaca;
+  border-radius: 8px;
+  color: #b91c1c;
+  font-size: 12px;
+  line-height: 1.5;
+
+  mat-icon {
+    flex: none;
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+  }
+
+  a {
+    color: inherit;
+    font-weight: 600;
+    text-decoration: underline;
+  }
+}
+
 .bd-success {
   padding: 10px 14px;
   margin-bottom: 14px;
@@ -165,6 +195,75 @@
     font-size: 11px;
     color: #94a3b8;
   }
+
+  /* Names the block, for the interest panels that sit beside the cash arithmetic. */
+  &__head {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    margin-bottom: 6px;
+    padding-bottom: 6px;
+    border-bottom: 1px solid #e2e8f0;
+    font-size: 13px;
+    color: #0d1b2a;
+
+    mat-icon {
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+      color: #1d4ed8;
+    }
+  }
+}
+
+/* Interest is money leaving as the day closes, not cash counted in the drawer. */
+.bd-calc--fd {
+  border-left: 3px solid #1d4ed8;
+}
+
+.bd-fd-ok,
+.bd-fd-pending {
+  display: inline-block;
+  margin-left: 6px;
+  padding: 1px 7px;
+  border-radius: 999px;
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+}
+
+.bd-fd-ok {
+  background: #dcfce7;
+  color: #15803d;
+}
+
+.bd-fd-pending {
+  background: #fef3c7;
+  color: #b45309;
+}
+
+/* Why the close will be refused, said before the count is filled in rather than after. */
+.bd-warn {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  max-width: 640px;
+  margin-bottom: 14px;
+  padding: 10px 14px;
+  background: #fffbeb;
+  border: 1px solid #fcd34d;
+  border-radius: 8px;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #78350f;
+
+  mat-icon {
+    flex-shrink: 0;
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+    color: #b45309;
+  }
 }
 
 .bd-hint {
@@ -342,3 +441,30 @@
     color: #d97706;
   }
 }
+
+// Shown under the open day while a savings interest posting report due today is unapproved.
+.bd-interest-alert {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  margin: 8px 0 12px;
+  padding: 10px 14px;
+  border: 1px solid #f59e0b;
+  border-radius: 8px;
+  background: #fef3c7;
+  color: #92400e;
+  font-size: 13px;
+
+  mat-icon {
+    flex-shrink: 0;
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+  }
+
+  a {
+    color: inherit;
+    font-weight: 600;
+    text-decoration: underline;
+  }
+}

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

@@ -10,7 +10,7 @@ import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, RouterLink } from '@angular/router';
 import { catchError, forkJoin, map, of, switchMap } from 'rxjs';
 import { CashierService } from '../cashier.service';
 
@@ -61,7 +61,8 @@ interface BranchDay {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule
+    MatIconModule,
+    RouterLink
   ]
 })
 export class BranchDayComponent implements OnInit {
@@ -85,6 +86,12 @@ export class BranchDayComponent implements OnInit {
   loaded = false;
   errorMsg = '';
   successMsg = '';
+  /** True only for a branch that has never opened a business day and whose Cash at Vault / Cash at
+   *  Teller GL account has never had anything posted to it — Open Day here would let day-to-day cash
+   *  tracking begin while the ledger silently stays wherever it already was. The backend enforces
+   *  this independently too (see BranchDayRegisterApiResource#requireCashMigrationBeforeFirstEverOpen);
+   *  this flag only steers the user to the right screen before they hit that rejection. */
+  firstOpenNeedsCashMigration = false;
 
   // Open-day form
   showOpenForm = false;
@@ -182,6 +189,23 @@ export class BranchDayComponent implements OnInit {
     return this.totalOf(this.closeCounts);
   }
 
+  /**
+   * Savings products whose interest posting report is due today and not yet approved. The close is
+   * refused by the backend while any is pending; this only says so before the user tries.
+   */
+  interestPending: string[] = [];
+
+  private checkInterestReports(): void {
+    if (!this.openDay?.businessDate) {
+      this.interestPending = [];
+      return;
+    }
+    this.service
+      .interestDayCloseCheck(this.openDay.businessDate, this.openDay.officeId)
+      .pipe(catchError(() => of(null)))
+      .subscribe((res) => (this.interestPending = res?.pendingProducts ?? []));
+  }
+
   load(): void {
     this.loading = true;
     this.errorMsg = '';
@@ -202,6 +226,8 @@ export class BranchDayComponent implements OnInit {
         this.today = res?.today ?? '';
         this.canOperate = !!res?.canOperate;
         this.openDate = this.today;
+        this.checkFirstOpenCashMigration();
+        this.checkInterestReports();
       });
 
     this.service
@@ -212,9 +238,42 @@ export class BranchDayComponent implements OnInit {
       });
   }
 
+  /**
+   * Only relevant the moment this branch has never opened a business day before — every later
+   * open/close on this screen is untouched, so there is nothing to re-check once history exists.
+   */
+  private checkFirstOpenCashMigration(): void {
+    if (this.days.length > 0 || this.openDay) {
+      this.firstOpenNeedsCashMigration = false;
+      return;
+    }
+    this.service.cashGlStatus().subscribe({
+      next: (status: any) => {
+        // configured === false means this tenant has no Cash at Vault / Cash at Teller account
+        // mapped at all — nothing for this check to reconcile against, so it does not block.
+        this.firstOpenNeedsCashMigration = status?.configured !== false && !status?.hasBalance;
+      },
+      error: () => {
+        this.firstOpenNeedsCashMigration = false;
+      }
+    });
+  }
+
   /** True when the branch has no open day at all, so today can be opened. */
   get canOpenToday(): boolean {
-    return this.canOperate && !this.openDay;
+    return this.canOperate && !this.openDay && !this.firstOpenNeedsCashMigration;
+  }
+
+  /**
+   * A still-open day's closing/book figures are dropped from the API response entirely (the
+   * backend's Gson instance omits a null map value rather than sending it as JSON null), so the
+   * field arrives as undefined, not null. Checking only `!== null` against that — which a stricter
+   * pass of this file made the mistake of doing — leaves undefined on the "has a value" branch,
+   * which then renders `'₹' + null` (the number pipe's own null output, string-concatenated) as the
+   * literal text "₹null". This checks for either, the way an open day actually shows up.
+   */
+  hasValue(value: number | null | undefined): boolean {
+    return value !== null && value !== undefined;
   }
 
   startOpen(): void {

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

@@ -22,50 +22,255 @@
     </div>
   </header>
 
-  <!-- ── Customer Info Bar ── -->
-  <div class="cx-customer-bar">
-    <div
-      class="cx-customer-toggle"
-      [class.cx-customer-toggle--active]="isAccountHolder"
-      (click)="toggleAccountHolder()"
-    >
-      <mat-icon>{{ isAccountHolder ? 'check_box' : 'check_box_outline_blank' }}</mat-icon>
-      <span>Account Holder</span>
-    </div>
-
-    @if (isAccountHolder) {
-      <label class="cx-field cx-field--inline">
-        <span>Account No.</span>
-        <input
-          type="text"
-          [value]="accountNo"
-          (input)="accountNo = $any($event.target).value"
-          placeholder="e.g. 000101234567"
-        />
-      </label>
-    } @else {
-      <span class="cx-walk-in"><mat-icon>person_outline</mat-icon> Walk-in Customer</span>
-    }
-
-    @if (needsIdProof) {
-      <div class="cx-pan-required">
-        <mat-icon>warning</mat-icon>
-        <span>Amount ≥ ₹50,000 — Customer PAN / Aadhaar required (RBI)</span>
+  <!-- ── Cashier: whose drawer takes the customer's notes and gives the change ── -->
+  @if (cashier) {
+    <section class="cx-cashier">
+      <div class="cx-avatar cx-avatar--sm">{{ cashierInitials }}</div>
+      <div class="cx-cashier__id">
+        <div class="cx-cashier__label">Cashier at the counter</div>
+        <div class="cx-cashier__name">{{ cashier.name || '—' }}</div>
+        <div class="cx-cashier__flow">
+          <span><mat-icon>south</mat-icon> Receives from customer</span>
+          <span><mat-icon>north</mat-icon> Gives to customer</span>
+        </div>
       </div>
-      <label class="cx-field cx-field--inline cx-field--pan">
-        <span>PAN / Aadhaar *</span>
-        <input
-          type="text"
-          [value]="customerIdProof"
-          (input)="customerIdProof = $any($event.target).value"
-          placeholder="ABCDE1234F"
-          maxlength="20"
-        />
-      </label>
-    }
-  </div>
+      <div class="cx-cashier__stats">
+        <div>
+          <span>Counter</span><strong>{{ cashier.tellerName || '—' }}</strong>
+        </div>
+        <div>
+          <span>Branch</span><strong>{{ cashier.officeName || '—' }}</strong>
+        </div>
+        <div>
+          <span>Allocated today</span
+          ><strong>{{
+            cashier.allocatedAmount === null ? '—' : '₹' + (cashier.allocatedAmount | number: '1.2-2')
+          }}</strong>
+        </div>
+        <div>
+          <span>Cash in hand</span><strong>₹{{ cashier.totalAmount | number: '1.2-2' }}</strong>
+        </div>
+      </div>
+    </section>
+  } @else if (noCashier) {
+    <section class="cx-cashier cx-cashier--none">
+      <mat-icon>person_off</mat-icon>
+      <div>
+        <div class="cx-cashier__name">Your login is not linked to a cashier</div>
+        <div class="cx-cashier__label">
+          A cash exchange moves notes in and out of a cashier's drawer, so it can only be recorded by a cashier. Log in
+          as a cashier to continue.
+        </div>
+      </div>
+    </section>
+  }
+
+  <!-- ── Customer: an existing client (details from their record) or a walk-in identified at the counter ── -->
+  <section class="cx-cust">
+    <header class="cx-cust__head">
+      <div class="cx-cust__title">
+        <span class="cx-cust__title-icon"><mat-icon>groups</mat-icon></span>
+        <div>
+          <div class="cx-cust__title-text">Customer</div>
+          <div class="cx-cust__title-sub">Who is exchanging cash at the counter</div>
+        </div>
+      </div>
+      <div class="cx-cust__modes" role="tablist" aria-label="Customer type">
+        <button
+          type="button"
+          role="tab"
+          class="cx-cust__mode"
+          [class.cx-cust__mode--active]="customerMode === 'existing'"
+          [attr.aria-selected]="customerMode === 'existing'"
+          (click)="setCustomerMode('existing')"
+        >
+          <mat-icon>badge</mat-icon> Existing Customer
+        </button>
+        <button
+          type="button"
+          role="tab"
+          class="cx-cust__mode"
+          [class.cx-cust__mode--active]="customerMode === 'walkin'"
+          [attr.aria-selected]="customerMode === 'walkin'"
+          (click)="setCustomerMode('walkin')"
+        >
+          <mat-icon>person_outline</mat-icon> Walk-in Customer
+        </button>
+      </div>
+    </header>
+
+    <div class="cx-cust__body">
+      <!-- Who -->
+      <div class="cx-cust__who">
+        @if (customerMode === 'existing') {
+          @if (loadingCustomer) {
+            <div class="cx-cust__empty">
+              <mat-icon class="cx-cust__empty-icon cx-spin">autorenew</mat-icon>
+              <div class="cx-cust__empty-title">Loading customer details…</div>
+            </div>
+          } @else if (!selectedCustomer) {
+            <div class="cx-cust__empty">
+              <mat-icon class="cx-cust__empty-icon">person_search</mat-icon>
+              <div class="cx-cust__empty-title">No customer selected</div>
+              <div class="cx-cust__empty-sub">Search by name, account no., PAN or Aadhaar</div>
+              <button type="button" class="cx-btn cx-btn--primary" (click)="openCustomerSearch()">
+                <mat-icon>search</mat-icon> Search Customer
+              </button>
+            </div>
+          } @else {
+            <div class="cx-cust__card">
+              <div class="cx-cust__card-top">
+                <div class="cx-avatar">{{ customerInitials }}</div>
+                <div class="cx-cust__card-id">
+                  <div class="cx-cust__name">{{ selectedCustomer.displayName }}</div>
+                  <div class="cx-cust__badges">
+                    <span
+                      class="cx-kyc"
+                      [class.cx-kyc--ok]="selectedCustomer.kycStatus === 'Verified'"
+                      [class.cx-kyc--warn]="selectedCustomer.kycStatus !== 'Verified'"
+                    >
+                      <mat-icon>{{
+                        selectedCustomer.kycStatus === 'Verified' ? 'verified_user' : 'gpp_maybe'
+                      }}</mat-icon>
+                      KYC: {{ selectedCustomer.kycStatus }}
+                    </span>
+                    @if (selectedCustomer.accountType) {
+                      <span class="cx-chip-tag">{{ selectedCustomer.accountType }}</span>
+                    }
+                  </div>
+                </div>
+                <div class="cx-cust__card-actions">
+                  <button type="button" class="cx-link-btn" (click)="openCustomerSearch()">
+                    <mat-icon>swap_horiz</mat-icon> Change
+                  </button>
+                  <button type="button" class="cx-link-btn cx-link-btn--danger" (click)="clearCustomer()">
+                    <mat-icon>close</mat-icon> Remove
+                  </button>
+                </div>
+              </div>
+              <div class="cx-cust__grid">
+                <div>
+                  <span>CIF No.</span><strong>{{ selectedCustomer.cifNumber || '—' }}</strong>
+                </div>
+                <div>
+                  <span>Client ID</span><strong>{{ selectedCustomer.clientId }}</strong>
+                </div>
+                <div>
+                  <span>Mobile</span><strong>{{ selectedCustomer.mobileNo || '—' }}</strong>
+                </div>
+                <div>
+                  <span>Branch</span><strong>{{ selectedCustomer.officeName || '—' }}</strong>
+                </div>
+                <div>
+                  <span>Account</span><strong>{{ selectedCustomer.accountNo || 'No account' }}</strong>
+                </div>
+                <div>
+                  <span>PAN on record</span>
+                  <strong>
+                    {{ selectedCustomer.kycPan || 'Not on record' }}
+                    @if (selectedCustomer.kycPan) {
+                      <span
+                        class="cx-kyc cx-kyc--sm"
+                        [class.cx-kyc--ok]="selectedCustomer.panVerified"
+                        [class.cx-kyc--warn]="!selectedCustomer.panVerified"
+                        >{{ selectedCustomer.panVerified ? 'Verified' : 'Not verified' }}</span
+                      >
+                    }
+                  </strong>
+                </div>
+              </div>
+            </div>
+          }
+        } @else {
+          <div class="cx-cust__walkin">
+            <label class="cx-field">
+              <span>Customer Name{{ needsPan ? ' *' : '' }}</span>
+              <input
+                type="text"
+                [value]="walkInName"
+                (input)="walkInName = $any($event.target).value"
+                placeholder="Full name as on ID"
+                maxlength="150"
+                autocomplete="off"
+              />
+            </label>
+            <label class="cx-field">
+              <span>Mobile</span>
+              <input
+                type="tel"
+                inputmode="numeric"
+                [value]="walkInMobile"
+                (input)="walkInMobile = $any($event.target).value"
+                placeholder="10-digit mobile number"
+                maxlength="15"
+                autocomplete="off"
+              />
+            </label>
+          </div>
+        }
+      </div>
+
+      <!-- PAN -->
+      <div
+        class="cx-pan"
+        [class.cx-pan--required]="panMissing"
+        [class.cx-pan--invalid]="panFormatInvalid"
+        [class.cx-pan--valid]="panValue && !panFormatInvalid"
+      >
+        <div class="cx-pan__head">
+          <mat-icon>credit_card</mat-icon>
+          <span class="cx-pan__label">PAN Card</span>
+          <span class="cx-pan__tag" [class.cx-pan__tag--on]="needsPan">{{ needsPan ? 'Mandatory' : 'Optional' }}</span>
+        </div>
+        <div class="cx-pan__input">
+          <input
+            type="text"
+            [value]="panNumber"
+            (input)="panNumber = $any($event.target).value.toUpperCase()"
+            placeholder="ABCDE1234F"
+            maxlength="10"
+            autocomplete="off"
+            spellcheck="false"
+            aria-label="PAN number"
+          />
+          @if (panValue && !panFormatInvalid) {
+            <mat-icon class="cx-pan__state cx-pan__state--ok">check_circle</mat-icon>
+          } @else if (panFormatInvalid) {
+            <mat-icon class="cx-pan__state cx-pan__state--bad">error</mat-icon>
+          }
+        </div>
+        <div class="cx-pan__hint">
+          @if (panFormatInvalid) {
+            PAN is 5 letters, 4 digits, 1 letter (e.g. ABCDE1234F).
+          } @else if (panFromKyc) {
+            <mat-icon>link</mat-icon> Fetched from the customer's KYC record.
+          } @else if (panMissing) {
+            Required: this exchange is above ₹50,000 (Income Tax Rule 114B / RBI).
+          } @else {
+            Mandatory for exchanges above ₹50,000.
+          }
+        </div>
+      </div>
+    </div>
+  </section>
 
   <div class="cx-cols">
+    <!-- The cashier's count of a denomination and what this exchange does to it, updated as counts are typed. -->
+    <ng-template #drawerCell let-d="d">
+      @if (availableFor(d) === null) {
+        —
+      } @else {
+        In drawer <strong>{{ availableFor(d) }}</strong>
+        @if (netFor(d) !== 0) {
+          <span class="cx-after">
+            <mat-icon>{{ netFor(d) > 0 ? 'trending_up' : 'trending_down' }}</mat-icon>
+            <strong>{{ drawerAfter(d) }}</strong>
+            <small>({{ netFor(d) > 0 ? '+' : '' }}{{ netFor(d) }})</small>
+          </span>
+        }
+      }
+    </ng-template>
+
     <!-- RECEIVED -->
     <section class="cx-col cx-col--received">
       <header class="cx-col-head">
@@ -78,7 +283,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row">
+          <div class="cx-row cx-row--stock">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -90,6 +295,9 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
+            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
+              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
+            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -99,7 +307,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row">
+          <div class="cx-row cx-row--stock">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -111,6 +319,9 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
+            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
+              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
+            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -131,7 +342,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row">
+          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -141,8 +352,16 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)">+</button>
+              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
             </div>
+            <span
+              class="cx-avail"
+              [class.cx-avail--up]="netFor(d) > 0"
+              [class.cx-avail--down]="netFor(d) < 0"
+              [class.cx-avail--over]="exceedsAvailable(d)"
+            >
+              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
+            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -152,7 +371,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row">
+          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -162,8 +381,16 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)">+</button>
+              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
             </div>
+            <span
+              class="cx-avail"
+              [class.cx-avail--up]="netFor(d) > 0"
+              [class.cx-avail--down]="netFor(d) < 0"
+              [class.cx-avail--over]="exceedsAvailable(d)"
+            >
+              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
+            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -173,6 +400,30 @@
     </section>
   </div>
 
+  <!-- What this exchange does to the cashier's drawer, denomination by denomination. -->
+  @if (impactRows.length) {
+    <div class="cx-impact">
+      <div class="cx-impact__title"><mat-icon>inventory_2</mat-icon> Drawer after this exchange</div>
+      <div class="cx-impact__chips">
+        @for (r of impactRows; track r.id) {
+          <span
+            class="cx-impact__chip"
+            [class.cx-impact__chip--up]="r.net > 0"
+            [class.cx-impact__chip--down]="r.net < 0"
+          >
+            <b>{{ r.label }}</b>
+            {{ r.before }} → {{ r.after }}
+            <em>({{ r.net > 0 ? '+' : '' }}{{ r.net }})</em>
+          </span>
+        }
+      </div>
+      <div class="cx-impact__note">
+        The branch's total for each denomination moves by the same amount; the vault is not touched (Branch Ops → Branch
+        Cash Position).
+      </div>
+    </div>
+  }
+
   <div class="cx-summary">
     <div class="cx-sum">
       <span>Received</span><strong>₹{{ receivedTotal | number: '1.2-2' }}</strong>
@@ -213,9 +464,15 @@
       </div>
     </div>
   }
-  @if (needsIdProof && !customerIdProof.trim()) {
+  @if (panMissing) {
     <div class="cx-warn cx-warn--pan">
-      <mat-icon>badge</mat-icon> Enter customer PAN / Aadhaar to proceed (amount ≥ ₹50,000).
+      <mat-icon>badge</mat-icon> Enter the customer's PAN to proceed (amount above ₹50,000).
+    </div>
+  }
+  @if (!customerIdentified && !loadingCustomer) {
+    <div class="cx-warn cx-warn--pan">
+      <mat-icon>person_search</mat-icon>
+      {{ customerMode === 'existing' ? 'Search and select the customer.' : "Enter the walk-in customer's name." }}
     </div>
   }
 

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

@@ -73,99 +73,584 @@
   }
 }
 
-/* ── Customer info bar ── */
-.cx-customer-bar {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 10px 14px;
-  background: #f8fafc;
+/* ── Customer: existing client or walk-in, plus PAN ── */
+.cx-cust {
+  background: #fff;
   border: 1px solid #e2e8f0;
-  border-radius: 10px;
-  flex-wrap: wrap;
-}
+  border-radius: 14px;
+  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
+  overflow: hidden;
 
-.cx-customer-toggle {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-size: 13px;
-  font-weight: 600;
-  color: #475569;
-  cursor: pointer;
-  user-select: none;
+  &__head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    gap: 12px;
+    padding: 12px 16px;
+    background: linear-gradient(180deg, #f8fafc, #f1f5f9);
+    border-bottom: 1px solid #e2e8f0;
+  }
 
-  mat-icon {
-    font-size: 20px;
-    height: 20px;
-    width: 20px;
+  &__title {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+
+  &__title-icon {
+    display: grid;
+    place-items: center;
+    width: 36px;
+    height: 36px;
+    border-radius: 10px;
+    background: #e6f4ee;
+    color: #0f4f3c;
+
+    mat-icon {
+      font-size: 20px;
+      width: 20px;
+      height: 20px;
+    }
+  }
+
+  &__title-text {
+    font-size: 14px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__title-sub {
+    font-size: 12px;
+    color: #64748b;
+  }
+
+  &__modes {
+    display: inline-flex;
+    padding: 3px;
+    background: #e2e8f0;
+    border-radius: 10px;
+  }
+
+  &__mode {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    height: 32px;
+    padding: 0 14px;
+    border: 0;
+    border-radius: 8px;
+    background: transparent;
+    font-size: 13px;
+    font-weight: 600;
+    color: #475569;
+    cursor: pointer;
+    transition:
+      background 0.15s ease,
+      color 0.15s ease;
+
+    mat-icon {
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+    }
+
+    &:hover {
+      color: #0f172a;
+    }
+
+    &--active,
+    &--active:hover {
+      background: #fff;
+      color: #0f4f3c;
+      box-shadow: 0 1px 3px rgb(15 23 42 / 15%);
+    }
+  }
+
+  &__body {
+    display: grid;
+    grid-template-columns: minmax(0, 1.7fr) minmax(260px, 1fr);
+    gap: 16px;
+    padding: 16px;
+  }
+
+  &__who {
+    min-width: 0;
+  }
+
+  /* Nothing picked yet, or loading */
+  &__empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    gap: 4px;
+    min-height: 150px;
+    padding: 20px;
+    text-align: center;
+    background: #f8fafc;
+    border: 1.5px dashed #cbd5e1;
+    border-radius: 12px;
+  }
+
+  &__empty-icon {
+    font-size: 36px;
+    width: 36px;
+    height: 36px;
     color: #94a3b8;
   }
 
-  &--active {
-    color: #1e40af;
+  &__empty-title {
+    font-size: 14px;
+    font-weight: 600;
+    color: #334155;
+  }
+
+  &__empty-sub {
+    margin-bottom: 8px;
+    font-size: 12px;
+    color: #64748b;
+  }
+
+  /* A picked client */
+  &__card {
+    padding: 14px;
+    background: #fff;
+    border: 1px solid #e2e8f0;
+    border-radius: 12px;
+  }
+
+  &__card-top {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+  }
+
+  &__card-id {
+    flex: 1 1 180px;
+    min-width: 0;
+  }
+
+  &__name {
+    font-size: 16px;
+    font-weight: 700;
+    color: #0f172a;
+    overflow-wrap: anywhere;
+  }
+
+  &__badges {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 6px;
+    margin-top: 4px;
+  }
+
+  &__card-actions {
+    display: flex;
+    gap: 4px;
+  }
+
+  &__grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 12px 16px;
+    margin-top: 12px;
+    padding-top: 12px;
+    border-top: 1px dashed #e2e8f0;
+
+    span {
+      display: block;
+      margin-bottom: 2px;
+      font-size: 11px;
+      color: #64748b;
+    }
+
+    strong {
+      font-size: 13px;
+      font-weight: 600;
+      color: #0f172a;
+    }
+  }
+
+  /* A walk-in, identified at the counter */
+  &__walkin {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 12px;
+
+    .cx-field {
+      font-size: 12px;
+    }
+
+    .cx-field input {
+      width: 100%;
+      height: 40px;
+      box-sizing: border-box;
+    }
+  }
+
+  .cx-field input:focus {
+    outline: none;
+    border-color: #1f7a4d;
+    box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
+  }
+}
+
+.cx-avatar {
+  display: grid;
+  place-items: center;
+  flex: 0 0 auto;
+  width: 44px;
+  height: 44px;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #1f7a4d, #0f4f3c);
+  font-size: 15px;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+  color: #fff;
+
+  &--sm {
+    width: 40px;
+    height: 40px;
+    font-size: 14px;
+  }
+}
+
+/* The cashier at the counter, or why there is none */
+.cx-cashier {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 14px 20px;
+  padding: 12px 16px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-left: 4px solid #1f7a4d;
+  border-radius: 14px;
+  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
+
+  &__id {
+    flex: 1 1 220px;
+    min-width: 0;
+  }
+
+  &__label {
+    font-size: 11px;
+    font-weight: 600;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: #64748b;
+  }
+
+  &__name {
+    font-size: 16px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__flow {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 4px 14px;
+    margin-top: 2px;
+    font-size: 12px;
+    color: #475569;
+
+    span {
+      display: inline-flex;
+      align-items: center;
+      gap: 2px;
+    }
 
     mat-icon {
-      color: #1e40af;
+      font-size: 14px;
+      width: 14px;
+      height: 14px;
+      color: #94a3b8;
+    }
+  }
+
+  &__stats {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 10px 28px;
+
+    span {
+      display: block;
+      font-size: 11px;
+      color: #64748b;
+    }
+
+    strong {
+      font-size: 14px;
+      font-weight: 600;
+      color: #0f172a;
+    }
+  }
+
+  &--none {
+    background: #fffbeb;
+    border-color: #fcd34d;
+    border-left-color: #d97706;
+
+    mat-icon {
+      color: #d97706;
+    }
+
+    .cx-cashier__label {
+      font-weight: 500;
+      letter-spacing: 0;
+      text-transform: none;
+      color: #92400e;
     }
   }
 }
 
-.cx-walk-in {
-  display: flex;
+.cx-kyc {
+  display: inline-flex;
   align-items: center;
   gap: 4px;
-  font-size: 12px;
-  color: #64748b;
+  padding: 2px 8px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 600;
 
   mat-icon {
-    font-size: 16px;
-    height: 16px;
-    width: 16px;
+    font-size: 14px;
+    width: 14px;
+    height: 14px;
+  }
+
+  &--ok {
+    background: #dcfce7;
+    color: #166534;
+  }
+
+  &--warn {
+    background: #fef3c7;
+    color: #92400e;
+  }
+
+  &--sm {
+    margin-left: 6px;
+    padding: 1px 6px;
+    font-size: 10px;
   }
 }
 
-.cx-pan-required {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  padding: 4px 10px;
-  background: #fffbeb;
-  border: 1px solid #fcd34d;
+.cx-chip-tag {
+  padding: 2px 8px;
   border-radius: 6px;
+  background: #eef2ff;
+  font-size: 11px;
+  font-weight: 600;
+  color: #3730a3;
+}
+
+.cx-link-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  height: 30px;
+  padding: 0 10px;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
   font-size: 12px;
   font-weight: 600;
-  color: #92400e;
+  color: #1e40af;
+  cursor: pointer;
 
   mat-icon {
     font-size: 16px;
-    height: 16px;
     width: 16px;
-    color: #d97706;
+    height: 16px;
+  }
+
+  &:hover {
+    background: #eff6ff;
+  }
+
+  &--danger {
+    color: #b91c1c;
+
+    &:hover {
+      background: #fef2f2;
+    }
   }
 }
 
-.cx-field--inline {
-  flex-direction: row;
-  align-items: center;
+/* PAN: neutral until needed, amber when required and missing, red when malformed, green when valid */
+.cx-pan {
+  display: flex;
+  flex-direction: column;
+  align-self: start;
   gap: 8px;
+  padding: 14px;
+  background: #f8fafc;
+  border: 1px solid #e2e8f0;
+  border-radius: 12px;
 
-  span {
-    white-space: nowrap;
+  &__head {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    mat-icon {
+      font-size: 20px;
+      width: 20px;
+      height: 20px;
+      color: #475569;
+    }
   }
 
-  input {
-    width: 180px;
+  &__label {
+    font-size: 13px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__tag {
+    margin-left: auto;
+    padding: 2px 8px;
+    border-radius: 999px;
+    background: #e2e8f0;
+    font-size: 11px;
+    font-weight: 600;
+    color: #475569;
+
+    &--on {
+      background: #fef3c7;
+      color: #92400e;
+    }
+  }
+
+  &__input {
+    position: relative;
+
+    input {
+      width: 100%;
+      height: 44px;
+      box-sizing: border-box;
+      padding: 0 40px 0 12px;
+      background: #fff;
+      border: 1.5px solid #cbd5e1;
+      border-radius: 10px;
+      font-family: ui-monospace, sfmono-regular, menlo, consolas, monospace;
+      font-size: 18px;
+      font-weight: 600;
+      letter-spacing: 0.18em;
+      text-transform: uppercase;
+      color: #0f172a;
+
+      &::placeholder {
+        font-weight: 500;
+        color: #cbd5e1;
+      }
+
+      &:focus {
+        outline: none;
+        border-color: #1f7a4d;
+        box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
+      }
+    }
+  }
+
+  &__state {
+    position: absolute;
+    top: 50%;
+    right: 10px;
+    transform: translateY(-50%);
+    font-size: 22px;
+    width: 22px;
+    height: 22px;
+
+    &--ok {
+      color: #16a34a;
+    }
+
+    &--bad {
+      color: #dc2626;
+    }
+  }
+
+  &__hint {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+    font-size: 12px;
+    color: #64748b;
+
+    mat-icon {
+      font-size: 14px;
+      width: 14px;
+      height: 14px;
+    }
+  }
+
+  &--required {
+    background: #fffbeb;
+    border-color: #fcd34d;
+
+    .cx-pan__input input {
+      border-color: #f59e0b;
+    }
+
+    .cx-pan__hint {
+      font-weight: 600;
+      color: #92400e;
+    }
+  }
+
+  &--invalid {
+    background: #fef2f2;
+    border-color: #fecaca;
+
+    .cx-pan__input input {
+      border-color: #ef4444;
+    }
+
+    .cx-pan__hint {
+      font-weight: 600;
+      color: #b91c1c;
+    }
+  }
+
+  &--valid {
+    background: #f0fdf4;
+    border-color: #bbf7d0;
+
+    .cx-pan__input input {
+      border-color: #22c55e;
+    }
+
+    .cx-pan__hint {
+      color: #166534;
+    }
   }
 }
 
-.cx-field--pan input {
-  width: 160px;
-  border-color: #fcd34d;
+.cx-spin {
+  animation: cx-spin 1s linear infinite;
+}
 
-  &:focus {
-    outline: none;
-    border-color: #d97706;
+@keyframes cx-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (width <= 900px) {
+  .cx-cust__body {
+    grid-template-columns: 1fr;
+  }
+}
+
+@media (width <= 600px) {
+  .cx-cust__walkin {
+    grid-template-columns: 1fr;
   }
 }
 
@@ -345,6 +830,129 @@
   border-bottom: 1px dotted #eef2f7;
 }
 
+/* Both sides: the cashier's count of each denomination sits between the counter and the amount. */
+.cx-row--stock {
+  grid-template-columns: 64px 120px 1fr 96px;
+}
+
+.cx-row--over {
+  background: #fef2f2;
+}
+
+.cx-avail {
+  padding-left: 6px;
+  font-size: 12px;
+  color: #64748b;
+
+  strong {
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  /* the count after this exchange: green when it goes up, red when it goes down */
+  .cx-after {
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+    margin-left: 6px;
+    font-weight: 600;
+
+    mat-icon {
+      font-size: 16px;
+      width: 16px;
+      height: 16px;
+    }
+
+    small {
+      font-size: 11px;
+    }
+  }
+
+  &--up .cx-after,
+  &--up .cx-after strong {
+    color: #15803d;
+  }
+
+  &--down .cx-after,
+  &--down .cx-after strong {
+    color: #b45309;
+  }
+
+  &--over,
+  &--over strong,
+  &--over .cx-after,
+  &--over .cx-after strong {
+    color: #b91c1c;
+  }
+}
+
+/* The drawer after the whole exchange, one chip per denomination it changes */
+.cx-impact {
+  padding: 12px 14px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 12px;
+
+  &__title {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    margin-bottom: 8px;
+    font-size: 13px;
+    font-weight: 700;
+    color: #0f172a;
+
+    mat-icon {
+      font-size: 18px;
+      width: 18px;
+      height: 18px;
+      color: #475569;
+    }
+  }
+
+  &__chips {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+  }
+
+  &__chip {
+    display: inline-flex;
+    align-items: center;
+    gap: 6px;
+    padding: 5px 10px;
+    border-radius: 8px;
+    background: #f1f5f9;
+    font-size: 12px;
+    color: #334155;
+
+    b {
+      font-weight: 700;
+    }
+
+    em {
+      font-style: normal;
+      font-weight: 700;
+    }
+
+    &--up {
+      background: #dcfce7;
+      color: #166534;
+    }
+
+    &--down {
+      background: #fef3c7;
+      color: #92400e;
+    }
+  }
+
+  &__note {
+    margin-top: 8px;
+    font-size: 11px;
+    color: #64748b;
+  }
+}
+
 .cx-chip {
   display: inline-flex;
   align-items: center;

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

@@ -11,7 +11,16 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
+import { MatDialog, MatDialogModule } from '@angular/material/dialog';
+import { forkJoin, of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
+import { ClientsService } from 'app/clients/clients.service';
+import {
+  CustomerSearchDialogComponent,
+  CustomerSearchResult
+} from 'app/shared/customer-search-dialog/customer-search-dialog.component';
+import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -20,6 +29,47 @@ interface Denom {
   label: string;
 }
 
+/** An existing client picked through Customer Search, with what the counter needs to identify them. */
+interface SelectedCustomer {
+  clientId: number;
+  displayName: string;
+  cifNumber: string | null;
+  mobileNo: string | null;
+  officeName: string | null;
+  accountNo: string | null;
+  accountType: string | null;
+  /** PAN on the client's KYC record, if any. */
+  kycPan: string | null;
+  panVerified: boolean;
+  kycStatus: string;
+}
+
+/** The cashier at the counter: the one who takes the customer's notes and hands over the change. */
+interface CashierInfo {
+  cashierId: number;
+  name: string;
+  tellerName: string | null;
+  officeName: string | null;
+  /** Cash the vault allocated to them for the day, once known. */
+  allocatedAmount: number | null;
+  /** Cash they hold now. */
+  totalAmount: number;
+}
+
+/** Same rule as ClientKycApiConstants.PAN_REGEX on the server: 5 letters, 4 digits, 1 letter. */
+const PAN_PATTERN = /^[A-Z]{5}[0-9]{4}[A-Z]$/;
+
+/** Income Tax Rule 114B / RBI: a cash exchange above this needs the customer's PAN. */
+const PAN_MANDATORY_ABOVE = 50000;
+
+const KYC_STATUS: Record<number, string> = {
+  100: 'Pending',
+  200: 'In Progress',
+  300: 'Verified',
+  400: 'Rejected',
+  500: 'Expired'
+};
+
 /** Cashier cash-exchange entry: customer gives some denominations and takes equal-value change (net 0). */
 @Component({
   selector: 'mifosx-cash-exchange-entry',
@@ -30,11 +80,14 @@ interface Denom {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatSnackBarModule
+    MatSnackBarModule,
+    MatDialogModule
   ]
 })
 export class CashExchangeEntryComponent implements OnInit {
   private service = inject(CashierService);
+  private clientsService = inject(ClientsService);
+  private dialog = inject(MatDialog);
   private snackBar = inject(MatSnackBar);
 
   notes: Denom[] = [];
@@ -46,11 +99,17 @@ export class CashExchangeEntryComponent implements OnInit {
   saving = false;
 
   // ── Customer info ──
-  isAccountHolder = false;
-  accountNo = '';
-  customerIdProof = '';
+  /** An existing client found through Customer Search, or a walk-in identified at the counter. */
+  customerMode: 'existing' | 'walkin' = 'walkin';
+  selectedCustomer: SelectedCustomer | null = null;
+  loadingCustomer = false;
+  walkInName = '';
+  walkInMobile = '';
+  panNumber = '';
 
-  // ── Cashier position (for denomination overdraft check) ──
+  // ── Cashier at the counter, and their position (for the denomination overdraft check) ──
+  /** The cashier linked to the logged-in user; null when the login is not a cashier's. */
+  cashier: CashierInfo | null = null;
   private availableMap = new Map<number, number>();
   positionLoaded = false;
 
@@ -63,7 +122,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) => {
@@ -87,7 +146,19 @@ export class CashExchangeEntryComponent implements OnInit {
         ((res?.denominations || []) as any[]).forEach((d: any) => {
           if (d.denominationId) this.availableMap.set(Number(d.denominationId), Number(d.count ?? 0));
         });
+        const cashierId = res?.cashierId ? Number(res.cashierId) : null;
+        this.cashier = cashierId
+          ? {
+              cashierId,
+              name: res.cashierName || '',
+              tellerName: null,
+              officeName: null,
+              allocatedAmount: null,
+              totalAmount: Number(res.totalAmount ?? 0)
+            }
+          : null;
         this.positionLoaded = true;
+        if (cashierId) this.loadCashierDetails(cashierId);
       },
       error: () => {
         this.positionLoaded = true;
@@ -95,6 +166,31 @@ export class CashExchangeEntryComponent implements OnInit {
     });
   }
 
+  /** The counter, branch and today's allocation; the card still shows name and cash in hand without them. */
+  private loadCashierDetails(cashierId: number): void {
+    this.service
+      .getInterCashierCashierSummary(cashierId, this.exchangeDate)
+      .pipe(catchError(() => of(null)))
+      .subscribe((r: any) => {
+        if (!r || this.cashier?.cashierId !== cashierId) return;
+        this.cashier = {
+          ...this.cashier,
+          tellerName: r.tellerName || null,
+          officeName: r.officeName || null,
+          allocatedAmount: Number(r.allocatedAmount ?? 0)
+        };
+      });
+  }
+
+  /** Up to two letters for the cashier's avatar. */
+  get cashierInitials(): string {
+    const words = (this.cashier?.name || '').trim().split(/\s+/).filter(Boolean);
+    if (words.length === 0) return '?';
+    const first = words[0].charAt(0);
+    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
+    return (first + last).toUpperCase();
+  }
+
   countFor(side: 'r' | 'g', d: Denom): number {
     return (side === 'r' ? this.receivedCounts : this.givenCounts)[d.id] || 0;
   }
@@ -128,14 +224,102 @@ export class CashExchangeEntryComponent implements OnInit {
     return this.receivedTotal > 0 && this.receivedTotal === this.givenTotal;
   }
 
-  /** Above ₹50,000 PAN/ID is mandatory per RBI guideline */
-  get needsIdProof(): boolean {
-    return this.receivedTotal >= 50000;
+  /** Above ₹50,000 the customer's PAN is mandatory (Income Tax Rule 114B, followed under RBI guidelines). */
+  get needsPan(): boolean {
+    return this.receivedTotal > PAN_MANDATORY_ABOVE;
+  }
+
+  /** Up to two letters for the avatar: first and last word of the customer's name. */
+  get customerInitials(): string {
+    const words = (this.selectedCustomer?.displayName || '').trim().split(/\s+/).filter(Boolean);
+    if (words.length === 0) return '?';
+    const first = words[0].charAt(0);
+    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
+    return (first + last).toUpperCase();
+  }
+
+  get panValue(): string {
+    return this.panNumber.trim().toUpperCase();
+  }
+
+  /** A PAN that is entered must be well-formed, required or not. */
+  get panFormatInvalid(): boolean {
+    return !!this.panValue && !PAN_PATTERN.test(this.panValue);
+  }
+
+  get panMissing(): boolean {
+    return this.needsPan && !this.panValue;
+  }
+
+  /** The PAN comes from the client's KYC record, so the cashier confirms it rather than types it. */
+  get panFromKyc(): boolean {
+    return !!this.selectedCustomer?.kycPan && this.panValue === this.selectedCustomer.kycPan.toUpperCase();
+  }
+
+  /** Who the customer is has to be known: a picked client, or a walk-in's name once PAN is required. */
+  get customerIdentified(): boolean {
+    if (this.customerMode === 'existing') return !!this.selectedCustomer;
+    return !this.needsPan || this.walkInName.trim().length > 0;
+  }
+
+  /** A login with no cashier behind it has no drawer to take notes into or give change from. */
+  get noCashier(): boolean {
+    return this.positionLoaded && !this.cashier;
+  }
+
+  /** How many of the denomination the cashier holds, or null while that is not known (loading, or no cashier). */
+  availableFor(d: Denom): number | null {
+    if (!this.positionLoaded || !this.cashier) return null;
+    return this.availableMap.get(d.id) ?? 0;
+  }
+
+  /** The cashier is giving more of this denomination than they hold. */
+  exceedsAvailable(d: Denom): boolean {
+    const available = this.availableFor(d);
+    return available !== null && this.countFor('g', d) > available;
+  }
+
+  /** The + on the given side stops at what the cashier holds; a larger typed number is still caught and shown. */
+  canGiveMore(d: Denom): boolean {
+    const available = this.availableFor(d);
+    return available === null || this.countFor('g', d) < available;
+  }
+
+  /** What this exchange does to the cashier's count of the denomination: notes taken in less notes given out. */
+  netFor(d: Denom): number {
+    return this.countFor('r', d) - this.countFor('g', d);
+  }
+
+  /** The cashier's count of the denomination once this exchange is recorded, or null while it is not known. */
+  drawerAfter(d: Denom): number | null {
+    const available = this.availableFor(d);
+    return available === null ? null : available + this.netFor(d);
+  }
+
+  /**
+   * The denominations this exchange changes, with the drawer's count before and after, so the effect shows
+   * while the counts are being typed. The branch's total for each denomination moves by the same amount, as
+   * the customer's notes go into the drawer and the change comes out of it; the vault is not involved.
+   */
+  get impactRows(): Array<{ id: number; label: string; kind: string; net: number; before: number; after: number }> {
+    if (!this.positionLoaded || !this.cashier) return [];
+    return this.denoms
+      .filter((d) => this.netFor(d) !== 0)
+      .map((d) => ({
+        id: d.id,
+        label: d.label,
+        kind: d.kind,
+        net: this.netFor(d),
+        before: this.availableFor(d) ?? 0,
+        after: this.drawerAfter(d) ?? 0
+      }));
   }
 
   /** Denominations where cashier is giving more than currently available. */
   get givenOverdraftItems(): Array<{ label: string; available: number; requested: number }> {
-    if (!this.positionLoaded) return [];
+    // Without a cashier every denomination would read as "0 available"; the missing cashier is the
+    // thing to tell the user, not a stock shortage.
+    if (!this.positionLoaded || !this.cashier) return [];
     return this.denoms
       .map((d) => ({ label: d.label, available: this.availableMap.get(d.id) ?? 0, requested: this.countFor('g', d) }))
       .filter((item) => item.requested > 0 && item.requested > item.available);
@@ -146,21 +330,77 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   get valid(): boolean {
-    return this.matches && (!this.needsIdProof || this.customerIdProof.trim().length > 0) && !this.hasGivenOverdraft;
+    return (
+      this.matches &&
+      !!this.cashier &&
+      !this.hasGivenOverdraft &&
+      !this.panFormatInvalid &&
+      !this.panMissing &&
+      this.customerIdentified &&
+      !this.loadingCustomer
+    );
   }
 
-  toggleAccountHolder(): void {
-    this.isAccountHolder = !this.isAccountHolder;
-    if (!this.isAccountHolder) this.accountNo = '';
+  setCustomerMode(mode: 'existing' | 'walkin'): void {
+    if (this.customerMode === mode) return;
+    this.customerMode = mode;
+    this.selectedCustomer = null;
+    this.walkInName = '';
+    this.walkInMobile = '';
+    this.panNumber = '';
+  }
+
+  /** Pick an existing client through Customer Search, then load their details and KYC (PAN). */
+  openCustomerSearch(): void {
+    this.dialog
+      // An existing customer without an account is still a known customer, so the account is not required.
+      .open(CustomerSearchDialogComponent, { width: '960px', maxWidth: '95vw', data: { requireAccount: false } })
+      .afterClosed()
+      .subscribe((result: CustomerSearchResult | undefined) => {
+        if (!result?.clientId) return;
+        this.loadCustomer(result);
+      });
+  }
+
+  private loadCustomer(result: CustomerSearchResult): void {
+    this.loadingCustomer = true;
+    const id = String(result.clientId);
+    forkJoin({
+      client: this.clientsService.getClientData(id, true).pipe(catchError(() => of(null))),
+      kyc: this.clientsService.getClientKyc(id, true).pipe(catchError(() => of(null)))
+    }).subscribe(({ client, kyc }: { client: any; kyc: any }) => {
+      const kycPan: string | null = kyc?.panNumber || result.panNumber || null;
+      this.selectedCustomer = {
+        clientId: result.clientId,
+        displayName: client?.displayName || result.displayName,
+        cifNumber: client?.cifNumber || null,
+        mobileNo: client?.mobileNo || result.mobileNo || null,
+        officeName: client?.officeName || result.officeName || null,
+        accountNo: result.accountNo || null,
+        accountType: result.accountType || null,
+        kycPan,
+        panVerified: !!kyc?.panVerified,
+        kycStatus: KYC_STATUS[Number(kyc?.kycStatus?.id ?? kyc?.kycStatus)] || 'Not on record'
+      };
+      this.panNumber = kycPan ? kycPan.toUpperCase() : '';
+      this.loadingCustomer = false;
+    });
+  }
+
+  clearCustomer(): void {
+    this.selectedCustomer = null;
+    this.panNumber = '';
   }
 
   clear(): void {
     this.receivedCounts = {};
     this.givenCounts = {};
     this.note = '';
-    this.accountNo = '';
-    this.customerIdProof = '';
-    this.isAccountHolder = false;
+    this.customerMode = 'walkin';
+    this.selectedCustomer = null;
+    this.walkInName = '';
+    this.walkInMobile = '';
+    this.panNumber = '';
   }
 
   submit(): void {
@@ -170,11 +410,17 @@ export class CashExchangeEntryComponent implements OnInit {
       this.denoms
         .filter((d) => this.countFor(side, d) > 0)
         .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(side, d) }));
+    const customer = this.customerMode === 'existing' ? this.selectedCustomer : null;
+    const pan = this.panValue || null;
     const payload: any = {
       exchangeDate: this.exchangeDate,
       note: this.note || null,
-      customerIdProof: this.customerIdProof.trim() || null,
-      accountNo: this.isAccountHolder && this.accountNo.trim() ? this.accountNo.trim() : null,
+      clientId: customer?.clientId ?? null,
+      accountNo: customer?.accountNo ?? null,
+      customerName: customer ? customer.displayName : this.walkInName.trim() || null,
+      customerMobile: customer ? customer.mobileNo : this.walkInMobile.trim() || null,
+      panNumber: pan,
+      customerIdProof: pan,
       received: build('r'),
       given: build('g')
     };

src/app/cashier/cash-history/cash-history.component.html

@@ -11,25 +11,11 @@
     <div>
       <div class="pg-eyebrow">CASHIER · HISTORY</div>
       <h1 class="pg-title">Cash Movement History</h1>
-      <p class="pg-sub">All transfers, settlements, and inter-cashier movements. Reverse any active transaction.</p>
+      <p class="pg-sub">All transfers, settlements, inter-cashier movements and cash exchanges.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="load()"><mat-icon>refresh</mat-icon> Refresh</button>
   </header>
 
-  <!-- Reversal confirm panel -->
-  @if (reversingId !== null) {
-    <div class="reverse-panel">
-      <mat-icon class="reverse-icon">warning</mat-icon>
-      <span
-        >Reverse <strong>#{{ reversingId }}</strong
-        >? This cannot be undone.</span
-      >
-      <input class="reverse-reason" type="text" [(ngModel)]="reverseReason" placeholder="Reason (optional)" />
-      <button type="button" class="pg-btn pg-btn--danger" (click)="confirmReverse()">Confirm Reversal</button>
-      <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelReverse()">Cancel</button>
-    </div>
-  }
-
   @if (loading) {
     <div class="pg-empty">Loading…</div>
   }
@@ -134,11 +120,6 @@
                   >
                     <mat-icon>visibility</mat-icon>
                   </button>
-                  @if (!r.isReversed) {
-                    <button type="button" class="pg-btn pg-btn--ghost btn-sm" title="Reverse" (click)="startReverse(r)">
-                      <mat-icon>undo</mat-icon>
-                    </button>
-                  }
                 </div>
               </td>
             </tr>
@@ -187,6 +168,12 @@
           <span class="detail-meta__label">Date</span>
           <span class="detail-meta__val">{{ detail.row.date }}</span>
         </div>
+        @if (detail.row.type === 'exchange') {
+          <div class="detail-meta__item">
+            <span class="detail-meta__label">Customer PAN</span>
+            <span class="detail-meta__val">{{ detail.row.panNumber || '—' }}</span>
+          </div>
+        }
         <div class="detail-meta__item">
           <span class="detail-meta__label">Total Amount</span>
           <span class="detail-meta__val detail-meta__val--amount">₹{{ detail.row.amount | number: '1.2-2' }}</span>

src/app/cashier/cash-history/cash-history.component.scss

@@ -47,38 +47,6 @@
   }
 }
 
-.reverse-panel {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 12px 16px;
-  background: #fffbeb;
-  border: 1px solid #fcd34d;
-  border-radius: 10px;
-  flex-wrap: wrap;
-  font-size: 13px;
-  color: #92400e;
-
-  .reverse-icon {
-    color: #f59e0b;
-    font-size: 20px;
-    height: 20px;
-    width: 20px;
-  }
-
-  .reverse-reason {
-    flex: 1 1 200px;
-    height: 34px;
-    padding: 0 10px;
-    border: 1px solid #fcd34d;
-    border-radius: 7px;
-    font-size: 13px;
-    font-family: inherit;
-    background: #fff;
-    color: #1a1a1a;
-  }
-}
-
 /* ── Action buttons cell ── */
 .action-btns {
   display: flex;

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

@@ -8,9 +8,7 @@
 
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { forkJoin, of } from 'rxjs';
@@ -31,6 +29,8 @@ interface TxnRow {
   reversedBy: number | null;
   reversedAt: string | null;
   reverseReason: string | null;
+  /** Customer PAN recorded on a cash exchange. */
+  panNumber?: string | null;
   type: 'transfer' | 'settlement' | 'inter' | 'exchange';
 }
 
@@ -52,7 +52,10 @@ interface DetailView {
   loading: boolean;
 }
 
-/** Unified history of all cash movements with reversal and detail view support. */
+/**
+ * Unified history of all cash movements with a detail view. Read-only: cash movements cannot be reversed
+ * from here (an earlier reversal still shows as Reversed, with who, when and why).
+ */
 @Component({
   selector: 'mifosx-cash-history',
   templateUrl: './cash-history.component.html',
@@ -63,16 +66,13 @@ interface DetailView {
   standalone: true,
   imports: [
     CommonModule,
-    FormsModule,
     MatIconModule,
-    MatSnackBarModule,
     MatTabsModule,
     MatPaginatorModule
   ]
 })
 export class CashHistoryComponent implements OnInit {
   private service = inject(CashierService);
-  private snackBar = inject(MatSnackBar);
 
   transfers: TxnRow[] = [];
   settlements: TxnRow[] = [];
@@ -99,10 +99,6 @@ export class CashHistoryComponent implements OnInit {
 
   private denomKindMap = new Map<number, 'note' | 'coin'>();
 
-  reversingId: number | null = null;
-  reversingType: string | null = null;
-  reverseReason = '';
-
   detail: DetailView | null = null;
 
   ngOnInit(): void {
@@ -212,7 +208,8 @@ export class CashHistoryComponent implements OnInit {
       this.exchanges = (exchangeItems as any[]).map((e) => ({
         id: e.id,
         date: e.exchangeDate,
-        fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
+        fromParty: this.exchangeParty(e),
+        panNumber: e.panNumber ?? null,
         toParty: e.performedByUsername || '—',
         amount: e.exchangeAmount,
         note: e.note,
@@ -310,7 +307,8 @@ export class CashHistoryComponent implements OnInit {
         this.exchanges = (res.pageItems ?? []).map((e: any) => ({
           id: e.id,
           date: e.exchangeDate,
-          fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
+          fromParty: this.exchangeParty(e),
+          panNumber: e.panNumber ?? null,
           toParty: e.performedByUsername || '—',
           amount: e.exchangeAmount,
           note: e.note,
@@ -392,39 +390,12 @@ export class CashHistoryComponent implements OnInit {
     this.detail = null;
   }
 
-  startReverse(row: TxnRow): void {
-    this.reversingId = row.id;
-    this.reversingType = row.type;
-    this.reverseReason = '';
-  }
-
-  cancelReverse(): void {
-    this.reversingId = null;
-    this.reversingType = null;
-    this.reverseReason = '';
-  }
-
-  confirmReverse(): void {
-    if (!this.reversingId || !this.reversingType) return;
-    const id = this.reversingId;
-    const type = this.reversingType;
-    const reason = this.reverseReason;
-    this.cancelReverse();
-
-    let obs$;
-    if (type === 'transfer') obs$ = this.service.reverseCashTransfer(id, reason);
-    else if (type === 'settlement') obs$ = this.service.reverseCashSettlement(id, reason);
-    else if (type === 'exchange') obs$ = this.service.reverseCashExchange(id, reason);
-    else obs$ = this.service.reverseInterCashierTransfer(id, reason);
-
-    obs$.pipe(catchError(() => of(null))).subscribe((res: any) => {
-      if (res?.reversed) {
-        this.snackBar.open('Transaction reversed successfully', 'Close', { duration: 3000 });
-        this.load();
-      } else {
-        this.snackBar.open('Reversal failed', 'Close', { duration: 3000 });
-      }
-    });
+  /** Who the exchange was with: the customer's name (and account, if one), else the account, else a walk-in. */
+  private exchangeParty(e: any): string {
+    if (e.customerName) {
+      return e.accountNo ? `${e.customerName} (A/C ${e.accountNo})` : e.customerName;
+    }
+    return e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer';
   }
 
   typeLabel(type: string): string {

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-approvals/cash-transfer-approvals.component.html

@@ -0,0 +1,229 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="cv-tab-content cta-tab">
+  <!-- ── TITLE BAR ── -->
+  <div class="cta-action-bar">
+    <div class="cta-action-bar__left">
+      <mat-icon class="cta-action-bar__icon">swap_horiz</mat-icon>
+      <div>
+        <div class="cta-action-bar__title">Cash Transfers</div>
+        <div class="cta-action-bar__sub">
+          Approve or reject an allocation of cash from the vault to a cashier. The cash leaves the vault only when it is
+          approved.
+        </div>
+      </div>
+    </div>
+    <div class="cta-counts">
+      <span class="cta-count"
+        ><strong>{{ all.length }}</strong> waiting</span
+      >
+    </div>
+  </div>
+
+  <!-- ── FILTER BAR ── -->
+  <div class="cta-filter-bar">
+    <div class="cta-search-box">
+      <mat-icon>search</mat-icon>
+      <input type="text" placeholder="Search by cashier, vault, user or note" [(ngModel)]="searchTerm" />
+      @if (searchTerm) {
+        <button type="button" class="cta-search-box__clear" (click)="searchTerm = ''">
+          <mat-icon>close</mat-icon>
+        </button>
+      }
+    </div>
+    <button type="button" class="cta-btn cta-btn--refresh" (click)="load()" [disabled]="loading">
+      <mat-icon>refresh</mat-icon>
+    </button>
+  </div>
+
+  <!-- ── TABLE ── -->
+  @if (loading && !loaded) {
+    <div class="cta-empty"><p class="cta-empty__title">Loading…</p></div>
+  } @else if (rows.length === 0) {
+    <div class="cta-empty">
+      <mat-icon class="cta-empty__icon">inbox</mat-icon>
+      <p class="cta-empty__title">No cash transfer waiting</p>
+      <p class="cta-empty__text">There is no cash allocation waiting for approval.</p>
+    </div>
+  } @else {
+    <div class="cta-table-wrap">
+      <table class="cta-table">
+        <thead>
+          <tr>
+            <th>Date</th>
+            <th>From</th>
+            <th>To (Cashier)</th>
+            <th class="num">Amount</th>
+            <th>Note</th>
+            <th>Raised By</th>
+            <th>Raised At</th>
+            <th class="cta-th-action">Action</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (r of rows; track r.id) {
+            <tr class="cta-row">
+              <td class="cta-dt">{{ r.transfer_date || '—' }}</td>
+              <td>{{ r.from_party || '—' }}</td>
+              <td class="cta-strong">{{ r.to_party || '—' }}</td>
+              <td class="num cta-amount">₹{{ r.total_amount | number: '1.2-2' }}</td>
+              <td class="cta-reason" [title]="r.note || ''">{{ r.note || '—' }}</td>
+              <td>{{ r.maker_name || '—' }}</td>
+              <td class="cta-dt">{{ formatDateTime(r.maker_at) }}</td>
+              <td class="cta-action-cell">
+                <button type="button" class="cta-btn cta-btn--approve" (click)="review(r)">
+                  <mat-icon>rate_review</mat-icon> Review
+                </button>
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+</div>
+
+<!-- ─── Popup: review a request, every note and coin it asks for ───────────── -->
+<ng-template #reviewDialog>
+  @if (reviewing) {
+    <div class="cta-dlg">
+      <header class="cta-dlg__head">
+        <mat-icon class="cta-dlg__ico cta-dlg__ico--ok">swap_horiz</mat-icon>
+        <div class="cta-dlg__titles">
+          <div class="cta-dlg__title">Review cash transfer</div>
+          <div class="cta-dlg__sub">
+            Raised by {{ reviewing.maker_name || '—' }} · {{ formatDateTime(reviewing.maker_at) }}
+          </div>
+        </div>
+        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="closeReview()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </header>
+
+      <div class="cta-dlg__body">
+        <div class="cta-total">
+          <span>Amount to release</span>
+          <strong>₹{{ reviewing.total_amount | number: '1.2-2' }}</strong>
+        </div>
+
+        <div class="cta-grid">
+          <div class="cta-cell">
+            <div class="cta-label">Transfer date</div>
+            <div class="cta-value">{{ reviewing.transfer_date || '—' }}</div>
+          </div>
+          <div class="cta-cell">
+            <div class="cta-label">From</div>
+            <div class="cta-value">{{ reviewing.from_party || '—' }}</div>
+          </div>
+          <div class="cta-cell">
+            <div class="cta-label">To (cashier)</div>
+            <div class="cta-value">{{ reviewing.to_party || '—' }}</div>
+          </div>
+          <div class="cta-cell">
+            <div class="cta-label">Notes and coins</div>
+            <div class="cta-value">
+              {{ piecesOf(reviewing) }} pieces · {{ linesOf(reviewing).length }} denominations
+            </div>
+          </div>
+          @if (reviewing.note) {
+            <div class="cta-cell cta-cell--wide">
+              <div class="cta-label">Note</div>
+              <div class="cta-value">{{ reviewing.note }}</div>
+            </div>
+          }
+        </div>
+
+        <div class="cta-label">Denomination breakdown</div>
+        <table class="cta-mini">
+          <thead>
+            <tr>
+              <th>Denomination</th>
+              <th class="num">Count</th>
+              <th class="num">Amount</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (l of linesOf(reviewing); track l.value) {
+              <tr>
+                <td>₹{{ l.value }}</td>
+                <td class="num">{{ l.count }}</td>
+                <td class="num">₹{{ l.amount | number: '1.2-2' }}</td>
+              </tr>
+            }
+          </tbody>
+          <tfoot>
+            <tr>
+              <td>Total</td>
+              <td class="num">{{ piecesOf(reviewing) }}</td>
+              <td class="num">₹{{ reviewing.total_amount | number: '1.2-2' }}</td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+
+      <footer class="cta-dlg__foot">
+        <button type="button" class="cta-btn cta-btn--ghost" (click)="closeReview()">Close</button>
+        <button
+          type="button"
+          class="cta-btn cta-btn--reject"
+          [disabled]="busyId === reviewing.id"
+          (click)="rejectFromReview(reviewing)"
+        >
+          <mat-icon>close</mat-icon> Reject
+        </button>
+        <button
+          type="button"
+          class="cta-btn cta-btn--approve"
+          [disabled]="busyId === reviewing.id"
+          (click)="approve(reviewing)"
+        >
+          <mat-icon>check</mat-icon> Approve
+        </button>
+      </footer>
+    </div>
+  }
+</ng-template>
+
+<!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
+<ng-template #rejectDialog>
+  @if (rejecting) {
+    <div class="cta-dlg">
+      <header class="cta-dlg__head">
+        <mat-icon class="cta-dlg__ico">block</mat-icon>
+        <div class="cta-dlg__titles">
+          <div class="cta-dlg__title">Reject cash transfer</div>
+          <div class="cta-dlg__sub">₹{{ rejecting.total_amount | number: '1.2-2' }} to {{ rejecting.to_party }}</div>
+        </div>
+        <button type="button" class="cta-dlg__x" aria-label="Close" (click)="cancelReject()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </header>
+      <div class="cta-dlg__body">
+        <label class="cta-label" for="cta-reason">Reason (required)</label>
+        <textarea
+          id="cta-reason"
+          rows="3"
+          placeholder="Why is this being rejected?"
+          [(ngModel)]="rejectReason"
+        ></textarea>
+      </div>
+      <footer class="cta-dlg__foot">
+        <button type="button" class="cta-btn cta-btn--ghost" (click)="cancelReject()">Cancel</button>
+        <button
+          type="button"
+          class="cta-btn cta-btn--reject-solid"
+          [disabled]="!rejectReason.trim() || busyId === rejecting.id"
+          (click)="confirmReject()"
+        >
+          Confirm reject
+        </button>
+      </footer>
+    </div>
+  }
+</ng-template>

src/app/cashier/cash-transfer-approvals/cash-transfer-approvals.component.scss

@@ -0,0 +1,573 @@
+/**
+ * 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/.
+ */
+
+// Laid out like the other approval tabs (Withdrawal Requests): title bar, filter bar, one table.
+:host {
+  display: block;
+}
+
+.cta-tab {
+  padding: 0;
+}
+
+.cta-action-bar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 10px 16px;
+  background: #fff;
+  border-bottom: 1px solid #e2e8f0;
+
+  &__left {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+  }
+
+  &__icon {
+    font-size: 22px;
+    width: 22px;
+    height: 22px;
+    color: #0f4f3c;
+  }
+
+  &__title {
+    font-size: 13px;
+    font-weight: 700;
+    color: #0d1b2a;
+  }
+
+  &__sub {
+    max-width: 640px;
+    margin-top: 1px;
+    font-size: 11px;
+    color: #64748b;
+  }
+}
+
+.cta-counts {
+  display: flex;
+  gap: 8px;
+}
+
+.cta-count {
+  padding: 2px 10px;
+  border-radius: 999px;
+  background: #f1f5f9;
+  font-size: 11px;
+  color: #475569;
+
+  strong {
+    color: #0f4f3c;
+  }
+}
+
+.cta-filter-bar {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
+  padding: 6px 16px;
+  background: #f8fafc;
+  border-bottom: 1px solid #e2e8f0;
+}
+
+.cta-fb-sep {
+  flex-shrink: 0;
+  width: 1px;
+  height: 22px;
+  margin: 0 4px;
+  background: #e2e8f0;
+}
+
+.cta-search-box {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  height: 30px;
+  min-width: 240px;
+  padding: 0 10px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #fff;
+
+  mat-icon {
+    flex-shrink: 0;
+    font-size: 17px;
+    width: 17px;
+    height: 17px;
+    color: #94a3b8;
+  }
+
+  &:hover {
+    border-color: #cbd5e1;
+  }
+
+  &:focus-within {
+    border-color: #0f4f3c;
+    box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
+  }
+
+  input {
+    flex: 1;
+    border: none;
+    outline: none;
+    background: transparent;
+    font-family: inherit;
+    font-size: 12px;
+    color: #0d1b2a;
+
+    &::placeholder {
+      color: #94a3b8;
+    }
+  }
+
+  &__clear {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    flex-shrink: 0;
+    width: 20px;
+    height: 20px;
+    padding: 0;
+    border: none;
+    border-radius: 50%;
+    background: none;
+    color: #94a3b8;
+    cursor: pointer;
+
+    mat-icon {
+      font-size: 15px;
+      width: 15px;
+      height: 15px;
+      color: inherit;
+    }
+
+    &:hover {
+      color: #dc2626;
+      background: #fef2f2;
+    }
+  }
+}
+
+.cta-filter-select {
+  height: 30px;
+  min-width: 140px;
+  padding: 0 10px;
+  border: 1px solid #e2e8f0;
+  border-radius: 7px;
+  background: #fff;
+  font-family: inherit;
+  font-size: 12px;
+  color: #0d1b2a;
+  cursor: pointer;
+
+  &:focus {
+    outline: none;
+    border-color: #0f4f3c;
+  }
+}
+
+// ── Buttons ─────────────────────────────────────────────────────────────────
+.cta-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  height: 26px;
+  padding: 0 10px;
+  border: 1px solid transparent;
+  border-radius: 7px;
+  font-family: inherit;
+  font-size: 11px;
+  font-weight: 600;
+  white-space: nowrap;
+  cursor: pointer;
+
+  mat-icon {
+    font-size: 14px;
+    width: 14px;
+    height: 14px;
+  }
+
+  &:disabled {
+    opacity: 0.45;
+    cursor: not-allowed;
+  }
+
+  &--refresh {
+    height: 30px;
+    width: 30px;
+    justify-content: center;
+    padding: 0;
+    margin-left: auto;
+    border-color: #e2e8f0;
+    background: #fff;
+    color: #475569;
+  }
+
+  &--approve {
+    background: #0f4f3c;
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #0a3d2e;
+    }
+  }
+
+  &--reject {
+    border-color: #fecaca;
+    background: #fff;
+    color: #dc2626;
+
+    &:hover:not(:disabled) {
+      background: #fef2f2;
+    }
+  }
+
+  &--reject-solid {
+    background: #dc2626;
+    color: #fff;
+  }
+
+  &--ghost {
+    border-color: #e2e8f0;
+    background: #fff;
+    color: #475569;
+  }
+}
+
+// ── Table ───────────────────────────────────────────────────────────────────
+.cta-table-wrap {
+  overflow-x: auto;
+  background: #fff;
+}
+
+.cta-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 11px;
+
+  th {
+    padding: 7px 10px;
+    border-bottom: 1px solid #e2e8f0;
+    background: #f8fafc;
+    font-size: 9.5px;
+    font-weight: 800;
+    letter-spacing: 0.06em;
+    text-align: left;
+    text-transform: uppercase;
+    color: #94a3b8;
+    white-space: nowrap;
+  }
+
+  td {
+    padding: 5px 10px;
+    border-bottom: 1px solid #eef2f7;
+    vertical-align: middle;
+    color: #0d1b2a;
+  }
+
+  .num {
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+  }
+
+  .cta-th-action {
+    text-align: right;
+  }
+}
+
+.cta-row:hover td {
+  background: #f8fafc;
+}
+
+.cta-mono {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  letter-spacing: 0.02em;
+}
+
+.cta-voucher {
+  font-weight: 700;
+  color: #0f4f3c;
+}
+
+.cta-strong {
+  font-weight: 700;
+}
+
+.cta-sub {
+  margin-top: 1px;
+  font-size: 11px;
+  color: #64748b;
+}
+
+.cta-none {
+  color: #cbd5e1;
+}
+
+.cta-amount {
+  font-weight: 700;
+}
+
+.cta-reason {
+  max-width: 220px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.cta-dt {
+  white-space: nowrap;
+  color: #475569;
+}
+
+.cta-kind {
+  display: inline-block;
+  padding: 2px 10px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 700;
+
+  &--unpass {
+    background: #fef3c7;
+    color: #92400e;
+  }
+
+  &--correction {
+    background: #dbeafe;
+    color: #1e40af;
+  }
+}
+
+.cta-action-cell {
+  display: flex;
+  justify-content: flex-end;
+  gap: 6px;
+  white-space: nowrap;
+}
+
+// ── Empty ───────────────────────────────────────────────────────────────────
+.cta-empty {
+  padding: 28px 16px;
+  text-align: center;
+  color: #94a3b8;
+
+  &__icon {
+    display: block;
+    margin: 0 auto 6px;
+    font-size: 30px;
+    width: 30px;
+    height: 30px;
+    opacity: 0.6;
+  }
+
+  &__title {
+    margin: 0;
+    font-size: 12px;
+    font-weight: 700;
+    color: #64748b;
+  }
+
+  &__text {
+    margin: 3px 0 0;
+    font-size: 11px;
+  }
+}
+
+// ── Reject popup ────────────────────────────────────────────────────────────
+.cta-dlg {
+  font-size: 12px;
+
+  &__head {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 10px 14px;
+    border-bottom: 1px solid #e2e8f0;
+    background: #f8fafc;
+  }
+
+  &__ico {
+    flex: 0 0 32px;
+    height: 32px;
+    width: 32px;
+    border-radius: 9px;
+    background: #fef2f2;
+    color: #dc2626;
+    font-size: 18px;
+    line-height: 32px;
+    text-align: center;
+  }
+
+  &__titles {
+    flex: 1;
+    min-width: 0;
+  }
+
+  &__title {
+    font-size: 14px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__sub {
+    font-size: 11px;
+    color: #64748b;
+  }
+
+  &__x {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    height: 28px;
+    width: 28px;
+    border: 0;
+    border-radius: 50%;
+    background: transparent;
+    color: #64748b;
+    cursor: pointer;
+
+    &:hover {
+      background: #e2e8f0;
+    }
+
+    mat-icon {
+      font-size: 18px;
+      height: 18px;
+      width: 18px;
+    }
+  }
+
+  &__body {
+    padding: 12px 14px;
+    max-height: 64vh;
+    overflow-y: auto;
+
+    textarea {
+      width: 100%;
+      padding: 7px 10px;
+      border: 1px solid #cbd5e1;
+      border-radius: 8px;
+      font: inherit;
+      font-size: 12px;
+      resize: vertical;
+
+      &:focus {
+        outline: 0;
+        border-color: #0f4f3c;
+        box-shadow: 0 0 0 3px rgb(15 79 60 / 8%);
+      }
+    }
+  }
+
+  &__foot {
+    display: flex;
+    justify-content: flex-end;
+    gap: 8px;
+    padding: 10px 14px;
+    border-top: 1px solid #e2e8f0;
+    background: #f8fafc;
+  }
+}
+
+.cta-label {
+  display: block;
+  margin-bottom: 4px;
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: #94a3b8;
+}
+
+.cta-dlg__ico--ok {
+  background: #f0fdf4;
+  color: #1f7a4d;
+}
+
+.cta-total {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  margin-bottom: 10px;
+  padding: 8px 12px;
+  border-radius: 10px;
+  background: #ecfdf5;
+  border: 1px solid #a7f3d0;
+  color: #065f46;
+  font-size: 12px;
+  font-weight: 600;
+
+  strong {
+    font-size: 18px;
+    font-weight: 800;
+    font-variant-numeric: tabular-nums;
+  }
+}
+
+.cta-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
+  gap: 6px;
+  margin-bottom: 12px;
+}
+
+.cta-cell {
+  padding: 6px 10px;
+  border-radius: 8px;
+  background: #f8fafc;
+  border: 1px solid #eef2f7;
+
+  &--wide {
+    grid-column: 1 / -1;
+  }
+}
+
+.cta-value {
+  font-size: 12px;
+  font-weight: 600;
+  color: #0f172a;
+  word-break: break-word;
+}
+
+.cta-mini {
+  width: 100%;
+  margin-top: 4px;
+  border-collapse: collapse;
+  font-size: 12px;
+
+  th {
+    padding: 6px 10px;
+    border-bottom: 1px solid #e2e8f0;
+    background: #f8fafc;
+    font-size: 10px;
+    font-weight: 800;
+    letter-spacing: 0.05em;
+    text-align: left;
+    text-transform: uppercase;
+    color: #94a3b8;
+  }
+
+  td {
+    padding: 5px 10px;
+    border-bottom: 1px solid #eef2f7;
+  }
+
+  .num {
+    text-align: right;
+    font-variant-numeric: tabular-nums;
+  }
+
+  tfoot td {
+    border-top: 2px solid #e2e8f0;
+    border-bottom: 0;
+    font-weight: 800;
+    background: #f8fafc;
+  }
+}

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

@@ -0,0 +1,190 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
+import { of } from 'rxjs';
+import { catchError } from 'rxjs/operators';
+import { CashierService } from '../cashier.service';
+
+/** A cash transfer request waiting for a checker, as the server keeps it (snake_case columns). */
+interface CashTransferRequest {
+  id: number;
+  transfer_date: string | null;
+  from_party: string | null;
+  to_party: string | null;
+  note: string | null;
+  total_amount: number;
+  maker_name: string | null;
+  maker_at: string | null;
+  denominations: { denominationValue: number; count: number }[];
+}
+
+/**
+ * Checker side of Cash Transfer: approves or rejects an allocation of cash from the vault to a cashier. The cash
+ * leaves the vault only when it is approved, by someone other than the person who raised it.
+ */
+@Component({
+  selector: 'mifosx-cash-transfer-approvals',
+  templateUrl: './cash-transfer-approvals.component.html',
+  styleUrls: ['./cash-transfer-approvals.component.scss'],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatDialogModule,
+    MatIconModule,
+    MatSnackBarModule
+  ]
+})
+export class CashTransferApprovalsComponent implements OnInit {
+  private service = inject(CashierService);
+  private snackBar = inject(MatSnackBar);
+  private dialog = inject(MatDialog);
+
+  @ViewChild('rejectDialog') rejectDialog!: TemplateRef<unknown>;
+  @ViewChild('reviewDialog') reviewDialog!: TemplateRef<unknown>;
+  private dialogRef: MatDialogRef<unknown> | null = null;
+  private reviewRef: MatDialogRef<unknown> | null = null;
+
+  /** The request open in the review popup, with every note and coin it asks for. */
+  reviewing: CashTransferRequest | null = null;
+
+  all: CashTransferRequest[] = [];
+  loading = false;
+  loaded = false;
+  busyId: number | null = null;
+  searchTerm = '';
+
+  rejecting: CashTransferRequest | null = null;
+  rejectReason = '';
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.service
+      .getCashTransferRequests('PENDING')
+      .pipe(catchError(() => of([] as CashTransferRequest[])))
+      .subscribe((rows) => {
+        this.all = rows as CashTransferRequest[];
+        this.loading = false;
+        this.loaded = true;
+      });
+  }
+
+  get rows(): CashTransferRequest[] {
+    const term = this.searchTerm.trim().toLowerCase();
+    if (!term) return this.all;
+    return this.all.filter((r) => [
+        r.from_party,
+        r.to_party,
+        r.maker_name,
+        r.note
+      ].some((v) => (v ?? '').toLowerCase().includes(term)));
+  }
+
+  /** One line per denomination asked for, largest first, with what each line adds up to. */
+  linesOf(r: CashTransferRequest): { value: number; count: number; amount: number }[] {
+    return [...(r.denominations ?? [])]
+      .filter((d) => d.count > 0)
+      .sort((a, b) => b.denominationValue - a.denominationValue)
+      .map((d) => ({ value: d.denominationValue, count: d.count, amount: d.denominationValue * d.count }));
+  }
+
+  /** How many notes and coins the request asks for in all. */
+  piecesOf(r: CashTransferRequest): number {
+    return this.linesOf(r).reduce((sum, l) => sum + l.count, 0);
+  }
+
+  review(r: CashTransferRequest): void {
+    this.reviewing = r;
+    this.reviewRef?.close();
+    this.reviewRef = this.dialog.open(this.reviewDialog, { width: '560px', maxWidth: '95vw', autoFocus: false });
+    this.reviewRef.afterClosed().subscribe(() => (this.reviewing = null));
+  }
+
+  closeReview(): void {
+    this.reviewRef?.close();
+  }
+
+  /** Rejecting from the review popup: the review closes, the reason popup opens for the same request. */
+  rejectFromReview(r: CashTransferRequest): void {
+    this.reviewRef?.close();
+    this.startReject(r);
+  }
+
+  formatDateTime(value: string | null): string {
+    if (!value) return '—';
+    const d = new Date(value);
+    return isNaN(d.getTime())
+      ? value
+      : d.toLocaleString('en-IN', { day: '2-digit', month: 'short', hour: '2-digit', minute: '2-digit' });
+  }
+
+  approve(r: CashTransferRequest): void {
+    if (this.busyId) return;
+    this.busyId = r.id;
+    this.service.approveCashTransferRequest(r.id).subscribe({
+      next: (res: any) => {
+        this.busyId = null;
+        this.reviewRef?.close();
+        this.snackBar.open(
+          res?.glWarning ? `Approved (GL warning: ${res.glWarning})` : 'Approved — cash allocated to the cashier',
+          'Close',
+          { duration: 6000 }
+        );
+        this.load();
+      },
+      error: (err) => {
+        this.busyId = null;
+        this.fail(err, 'Could not approve');
+      }
+    });
+  }
+
+  startReject(r: CashTransferRequest): void {
+    this.rejecting = r;
+    this.rejectReason = '';
+    this.dialogRef = this.dialog.open(this.rejectDialog, { width: '440px', maxWidth: '95vw', autoFocus: false });
+    this.dialogRef.afterClosed().subscribe(() => (this.rejecting = null));
+  }
+
+  cancelReject(): void {
+    this.dialogRef?.close();
+  }
+
+  confirmReject(): void {
+    if (!this.rejecting || !this.rejectReason.trim() || this.busyId) return;
+    const id = this.rejecting.id;
+    this.busyId = id;
+    this.service.rejectCashTransferRequest(id, this.rejectReason.trim()).subscribe({
+      next: () => {
+        this.busyId = null;
+        this.dialogRef?.close();
+        this.snackBar.open('Rejected', 'Close', { duration: 4000 });
+        this.load();
+      },
+      error: (err) => {
+        this.busyId = null;
+        this.fail(err, 'Could not reject');
+      }
+    });
+  }
+
+  private fail(err: any, fallback: string): void {
+    const msg = err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.defaultUserMessage ?? fallback;
+    this.snackBar.open(msg, 'Close', { duration: 8000 });
+  }
+}

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

@@ -13,7 +13,15 @@
       <h1 class="pg-title">Cash Transfer</h1>
       <p class="pg-sub">Move cash denomination-wise from one party to another (e.g. Vault → Cashier for opening).</p>
     </div>
-    <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
+    <div class="ct-head-actions">
+      <button type="button" class="pg-btn pg-btn--ghost" (click)="openRequests()">
+        <mat-icon>pending_actions</mat-icon> My Requests
+        @if (pendingCount) {
+          <span class="ct-badge">{{ pendingCount }}</span>
+        }
+      </button>
+      <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
+    </div>
   </header>
 
   <div class="pg-toolbar pg-toolbar--mat">
@@ -155,7 +163,56 @@
   <div class="pg-total-bar">
     Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
     <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">
-      <mat-icon>swap_horiz</mat-icon> Record Transfer
+      <mat-icon>send</mat-icon> Send for approval
     </button>
   </div>
 </div>
+
+<!-- Popup: this person's own cash transfer requests, and where each stands. The cash moves only once a manager approves. -->
+<ng-template #requestsDialog>
+  <div class="ct-dlg">
+    <header class="ct-dlg__head">
+      <mat-icon class="ct-dlg__ico">pending_actions</mat-icon>
+      <div class="ct-dlg__titles">
+        <div class="ct-dlg__title">My transfer requests</div>
+        <div class="ct-dlg__sub">Cash leaves the vault only after a manager approves</div>
+      </div>
+      <button type="button" class="ct-dlg__x" aria-label="Close" (click)="closeRequests()">
+        <mat-icon>close</mat-icon>
+      </button>
+    </header>
+    <div class="ct-dlg__body">
+      @if (myRequests.length) {
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Date</th>
+              <th>To</th>
+              <th class="num">Amount</th>
+              <th>Status</th>
+              <th>Approved by</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (r of myRequests; track r.id) {
+              <tr>
+                <td>{{ r.transfer_date || '—' }}</td>
+                <td>{{ r.to_party || '—' }}</td>
+                <td class="num">₹{{ r.total_amount | number: '1.2-2' }}</td>
+                <td>
+                  <span class="ct-status" [class]="'ct-status ct-status--' + r.status">{{ r.status }}</span>
+                  @if (r.rejection_reason) {
+                    <div class="ct-requests__note">{{ r.rejection_reason }}</div>
+                  }
+                </td>
+                <td>{{ r.checker_name || '—' }}</td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      } @else {
+        <div class="pg-empty">You have not raised any cash transfer request yet.</div>
+      }
+    </div>
+  </div>
+</ng-template>

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

@@ -49,3 +49,131 @@
   font-size: 12px;
   color: #991b1b;
 }
+
+.ct-requests {
+  padding: 0;
+
+  &__title {
+    padding: 10px 14px;
+    border-bottom: 1px solid #e2e8f0;
+    font-size: 13px;
+    font-weight: 700;
+    color: #0d1b2a;
+  }
+
+  &__note {
+    margin-top: 2px;
+    font-size: 11px;
+    color: #64748b;
+  }
+}
+
+.ct-status {
+  display: inline-block;
+  padding: 2px 10px;
+  border-radius: 999px;
+  background: #e2e8f0;
+  font-size: 11px;
+  font-weight: 700;
+
+  &--PENDING {
+    background: #fef3c7;
+    color: #92400e;
+  }
+
+  &--APPROVED {
+    background: #d1fae5;
+    color: #065f46;
+  }
+
+  &--REJECTED {
+    background: #fee2e2;
+    color: #991b1b;
+  }
+}
+
+.ct-head-actions {
+  display: flex;
+  gap: 8px;
+  flex-wrap: wrap;
+}
+
+.ct-badge {
+  min-width: 18px;
+  padding: 0 6px;
+  border-radius: 999px;
+  background: #f59e0b;
+  color: #fff;
+  font-size: 11px;
+  font-weight: 700;
+  text-align: center;
+}
+
+.ct-dlg {
+  font-size: 12px;
+
+  &__head {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    padding: 10px 14px;
+    border-bottom: 1px solid #e2e8f0;
+    background: #f8fafc;
+  }
+
+  &__ico {
+    flex: 0 0 32px;
+    height: 32px;
+    width: 32px;
+    border-radius: 9px;
+    background: #f0fdf4;
+    color: #1f7a4d;
+    font-size: 18px;
+    line-height: 32px;
+    text-align: center;
+  }
+
+  &__titles {
+    flex: 1;
+    min-width: 0;
+  }
+
+  &__title {
+    font-size: 14px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__sub {
+    font-size: 11px;
+    color: #64748b;
+  }
+
+  &__x {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    height: 28px;
+    width: 28px;
+    border: 0;
+    border-radius: 50%;
+    background: transparent;
+    color: #64748b;
+    cursor: pointer;
+
+    &:hover {
+      background: #e2e8f0;
+    }
+
+    mat-icon {
+      font-size: 18px;
+      height: 18px;
+      width: 18px;
+    }
+  }
+
+  &__body {
+    max-height: 60vh;
+    overflow-y: auto;
+  }
+}

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

@@ -6,9 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
+import { MatDialog, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -17,6 +18,8 @@ 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';
+import { AuthenticationService } from '../../core/authentication/authentication.service';
 
 interface Denom {
   id: number;
@@ -38,6 +41,7 @@ interface Denom {
     CommonModule,
     FormsModule,
     MatIconModule,
+    MatDialogModule,
     MatSnackBarModule,
     MatFormFieldModule,
     MatSelectModule,
@@ -47,6 +51,11 @@ interface Denom {
 export class CashTransferComponent implements OnInit {
   private service = inject(CashierService);
   private snackBar = inject(MatSnackBar);
+  private dialog = inject(MatDialog);
+
+  @ViewChild('requestsDialog') requestsDialog!: TemplateRef<unknown>;
+  private requestsRef: MatDialogRef<unknown> | null = null;
+  private authenticationService = inject(AuthenticationService);
 
   notes: Denom[] = [];
   coins: Denom[] = [];
@@ -81,8 +90,35 @@ export class CashTransferComponent implements OnInit {
   vaultHasBreakdown = true;
   loadingVault = false;
 
+  /** The caller's own transfer requests, newest first, so a request can be followed to its approval. */
+  myRequests: any[] = [];
+
+  loadMyRequests(): void {
+    this.service
+      .getCashTransferRequests(undefined, true)
+      .pipe(catchError(() => of([] as any[])))
+      .subscribe((rows) => (this.myRequests = rows.slice(0, 20)));
+  }
+
+  /** How many of this person's requests are still waiting for a manager. */
+  get pendingCount(): number {
+    return this.myRequests.filter((r) => r.status === 'PENDING').length;
+  }
+
+  /** Opens the list of this person's requests, freshly read, so a request can be followed to its approval. */
+  openRequests(): void {
+    this.loadMyRequests();
+    this.requestsRef?.close();
+    this.requestsRef = this.dialog.open(this.requestsDialog, { width: '720px', maxWidth: '95vw', autoFocus: false });
+  }
+
+  closeRequests(): void {
+    this.requestsRef?.close();
+  }
+
   ngOnInit(): void {
-    const d = new Date();
+    this.loadMyRequests();
+    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) => {
@@ -105,7 +141,14 @@ export class CashTransferComponent implements OnInit {
       .getTellers()
       .pipe(catchError(() => of([] as any[])))
       .subscribe((list) => {
-        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
+        // The vault and its cash are physical, so a branch moves cash only from its own tellers. The
+        // backend lists every teller below the user's office (Head Office sees all branches), which is
+        // right for reports but wrong here.
+        const myOfficeId = this.authenticationService.getCredentials()?.officeId;
+        const own = (list || []).filter(
+          (t: any) => !myOfficeId || t.officeId == null || Number(t.officeId) === Number(myOfficeId)
+        );
+        this.tellers = own.map((t: any) => ({ id: t.id, name: t.name }));
         if (this.tellers.length === 1) {
           this.onTellerSelect(this.tellers[0].id);
         }
@@ -244,16 +287,11 @@ export class CashTransferComponent implements OnInit {
         .filter((d) => this.countFor(d) > 0)
         .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(d) }))
     };
-    this.service.createCashTransfer(payload).subscribe({
-      next: (res: any) => {
-        if (res?.glWarning) {
-          this.snackBar.open(`Transfer saved (GL warning: ${res.glWarning})`, 'Close', {
-            duration: 8000,
-            panelClass: ['snack-warn']
-          });
-        } else {
-          this.snackBar.open('Cash transfer recorded', 'Close', { duration: 3000 });
-        }
+    this.service.createCashTransferRequest(payload).subscribe({
+      next: () => {
+        // Nothing has moved yet: a manager approves the allocation first, and only then does the cash leave the vault.
+        this.snackBar.open('Cash transfer sent for manager approval', 'Close', { duration: 5000 });
+        this.loadMyRequests();
         this.clear();
         this.note = '';
         this.fromParty = '';

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/cashier-routing.module.ts

@@ -23,10 +23,10 @@ import { DayBookComponent } from './day-book/day-book.component';
 import { VoucherReportComponent } from './voucher-report/voucher-report.component';
 import { BranchDayComponent } from './branch-day/branch-day.component';
 import { VaultPositionComponent } from './vault-position/vault-position.component';
+import { BranchCashPositionComponent } from './branch-cash-position/branch-cash-position.component';
 import { AccountRegisterComponent } from './account-register/account-register.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
-import { ShareCollectionComponent } from './share-collection/share-collection.component';
 
 const routes: Routes = [
   Route.withShell([
@@ -83,6 +83,13 @@ const routes: Routes = [
             ),
           data: { title: 'My Share Requests', breadcrumb: 'My Share Requests' }
         },
+        {
+          // The same page as the cashier's, reached from the clerk dashboard: a clerk unpasses vouchers here.
+          path: 'voucher-correction',
+          loadComponent: () =>
+            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
+          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
+        },
         {
           path: 'closure-requests',
           loadComponent: () =>
@@ -226,6 +233,13 @@ const routes: Routes = [
           component: VaultPositionComponent,
           data: { title: 'Vault Position', breadcrumb: 'Vault Position' }
         },
+        {
+          // What the whole branch holds per denomination: the vault plus every cashier's drawer, so an
+          // exchange (which leaves the vault alone) is visible in the bank's total.
+          path: 'branch-position',
+          component: BranchCashPositionComponent,
+          data: { title: 'Branch Cash Position', breadcrumb: 'Branch Cash Position' }
+        },
         {
           // The same day book the clerk and cashier read, reached from where a principal officer
           // signing the day off actually looks. It carries the Officer Verification Sheet — each
@@ -284,6 +298,12 @@ const routes: Routes = [
           component: ReconciliationComponent,
           data: { title: 'Reconciliation', breadcrumb: 'Reconciliation' }
         },
+        {
+          path: 'voucher-correction',
+          loadComponent: () =>
+            import('./voucher-correction/voucher-correction.component').then((m) => m.VoucherCorrectionComponent),
+          data: { title: 'Voucher Correction', breadcrumb: 'Voucher Correction' }
+        },
         {
           path: 'cash-history',
           component: CashHistoryComponent,
@@ -345,11 +365,6 @@ const routes: Routes = [
           component: ExcessTransactionReportComponent,
           data: { title: 'Excess Transaction Report', breadcrumb: 'Excess Transaction Report' }
         },
-        {
-          path: 'share-collection',
-          component: ShareCollectionComponent,
-          data: { title: 'Share Collection', breadcrumb: 'Share Collection' }
-        },
         {
           path: 'transaction-entry',
           canActivate: [CashierOnlyGuard],

src/app/cashier/cashier.module.ts

@@ -20,7 +20,6 @@ import { ReconciliationComponent } from './reconciliation/reconciliation.compone
 import { CashHistoryComponent } from './cash-history/cash-history.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
-import { ShareCollectionComponent } from './share-collection/share-collection.component';
 
 @NgModule({
   imports: [
@@ -35,8 +34,7 @@ import { ShareCollectionComponent } from './share-collection/share-collection.co
     ReconciliationComponent,
     CashHistoryComponent,
     ClosingCashReportComponent,
-    ExcessTransactionReportComponent,
-    ShareCollectionComponent
+    ExcessTransactionReportComponent
   ]
 })
 export class CashierModule {}

src/app/cashier/cashier.service.ts

@@ -32,9 +32,6 @@ export class CashierService {
   getCashExchange(id: number): Observable<any> {
     return this.http.get(`/cashexchange/${id}`);
   }
-  reverseCashExchange(id: number, reason: string): Observable<any> {
-    return this.http.post(`/cashexchange/${id}/reverse`, { reason });
-  }
 
   // ── Tellers / Cashiers ──
   getTellers(officeId?: number): Observable<any[]> {
@@ -50,8 +47,21 @@ export class CashierService {
   }
 
   // ── Cash Transfer ──
-  createCashTransfer(data: any): Observable<any> {
-    return this.http.post('/cashtransfer', data);
+  /** Cash leaves the vault only when a different person approves, so the screen raises a request, not a transfer. */
+  createCashTransferRequest(data: any): Observable<any> {
+    return this.http.post('/cashtransfer/requests', data);
+  }
+  /** Requests by status (comma separated); mine narrows them to the ones the caller raised. */
+  getCashTransferRequests(status?: string, mine = false): Observable<any[]> {
+    let params = new HttpParams().set('mine', String(mine));
+    if (status) params = params.set('status', status);
+    return this.http.get<any[]>('/cashtransfer/requests', { params });
+  }
+  approveCashTransferRequest(id: number): Observable<any> {
+    return this.http.post(`/cashtransfer/requests/${id}/approve`, {});
+  }
+  rejectCashTransferRequest(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashtransfer/requests/${id}/reject`, { reason });
   }
   getCashTransfers(offset = 0, limit = 20): Observable<any> {
     const params = new HttpParams().set('offset', offset).set('limit', limit);
@@ -60,9 +70,6 @@ export class CashierService {
   getCashTransferById(id: number): Observable<any> {
     return this.http.get(`/cashtransfer/${id}`);
   }
-  reverseCashTransfer(id: number, reason: string): Observable<any> {
-    return this.http.post(`/cashtransfer/${id}/reverse`, { reason });
-  }
 
   // ── Cash Settlement ──
   createCashSettlement(data: any): Observable<any> {
@@ -75,9 +82,6 @@ export class CashierService {
   getCashSettlementById(id: number): Observable<any> {
     return this.http.get(`/cashsettlement/${id}`);
   }
-  reverseCashSettlement(id: number, reason: string): Observable<any> {
-    return this.http.post(`/cashsettlement/${id}/reverse`, { reason });
-  }
 
   // ── Inter-cashier Transfer ──
   createInterCashierTransfer(data: any): Observable<any> {
@@ -90,8 +94,10 @@ export class CashierService {
   getInterCashierById(id: number): Observable<any> {
     return this.http.get(`/cashintercashier/${id}`);
   }
-  reverseInterCashierTransfer(id: number, reason: string): Observable<any> {
-    return this.http.post(`/cashintercashier/${id}/reverse`, { reason });
+  /** One cashier's details, today's vault allocation and denomination-wise cash, for either side of a transfer. */
+  getInterCashierCashierSummary(cashierId: number, date: string): Observable<any> {
+    const params = new HttpParams().set('cashierId', cashierId).set('date', date);
+    return this.http.get<any>('/cashintercashier/cashier-summary', { params });
   }
 
   // ── Reconciliation ──
@@ -178,6 +184,13 @@ export class CashierService {
     return this.http.get('/vouchers/my-work', { params });
   }
 
+  /** One voucher and every debit/credit line it is made of — the full slip behind a summarised
+   *  row (a "+2 more" badge in a register only ever shows the first side of each). */
+  voucherDetail(voucherNo: string): Observable<any> {
+    const params = new HttpParams().set('voucherNo', voucherNo);
+    return this.http.get('/vouchers/detail', { params });
+  }
+
   /**
    * Account register for one date: what opened and closed that day, each account's balance as it
    * stood then, and what it holds now.
@@ -198,6 +211,23 @@ export class CashierService {
     return this.http.get('/branchday', { params });
   }
 
+  /**
+   * The savings products whose interest posting report is due for the date and not yet approved —
+   * the backend refuses to close any branch's day while one is pending.
+   */
+  interestDayCloseCheck(
+    date?: string,
+    officeId?: number
+  ): Observable<{ businessDate: string; canClose: boolean; pendingProducts: string[] }> {
+    let params = new HttpParams();
+    if (date) params = params.set('date', date);
+    if (officeId) params = params.set('officeId', String(officeId));
+    return this.http.get<{ businessDate: string; canClose: boolean; pendingProducts: string[] }>(
+      '/savingsinterestpostingreports/day-close-check',
+      { params }
+    );
+  }
+
   /** Days opened and never closed — today's own open day excluded. */
   branchDayMissed(officeId?: number): Observable<any> {
     let params = new HttpParams();
@@ -294,6 +324,16 @@ export class CashierService {
     if (asOfDate) params = params.set('asOfDate', asOfDate);
     return this.http.get('/cashreports/vault-position', { params });
   }
+  /**
+   * Denomination-wise cash the whole branch holds: its vault(s) plus every cashier's drawer, with the day's
+   * exchange movement beside it. Not for a cashier -- the server refuses it.
+   */
+  branchCashPosition(asOfDate?: string, officeId?: number): Observable<any> {
+    let params = new HttpParams();
+    if (asOfDate) params = params.set('asOfDate', asOfDate);
+    if (officeId) params = params.set('officeId', String(officeId));
+    return this.http.get('/cashreports/branch-position', { params });
+  }
   excessTransactionReport(threshold: number, fromDate?: string, toDate?: string): Observable<any[]> {
     let params = new HttpParams().set('threshold', String(threshold));
     if (fromDate) params = params.set('fromDate', fromDate);
@@ -357,19 +397,6 @@ export class CashierService {
     return this.http.get<any[]>('/paymenttypes');
   }
 
-  // ── Share Collection ──
-  getShareAccountForCollection(accountId: string): Observable<any> {
-    return this.http.get(`/accounts/share/${accountId}`);
-  }
-
-  collectSharePayment(data: any): Observable<any> {
-    return this.http.post('/cashier/sharecollection', data);
-  }
-
-  getShareCollectionStatus(shareAccountId: number): Observable<any> {
-    return this.http.get(`/cashier/sharecollection/${shareAccountId}`);
-  }
-
   /** One unapplied Share Sundry receipt, found by the voucher number the member quotes. */
   getShareAdvanceByVoucher(voucherNo: string, glAccountNo: string, clientId?: number): Observable<any> {
     // The voucher travels as a query parameter, not a path segment: numbers are formatted
@@ -396,10 +423,18 @@ export class CashierService {
     return this.http.get('/shareadvancecollection/requirement', { params: { shareAccountId: String(shareAccountId) } });
   }
 
-  /** Receipts still sitting in Share Sundry, optionally for a single member. */
-  getUnappliedShareAdvances(clientId?: number): Observable<any> {
-    const suffix = clientId ? `?clientId=${clientId}` : '';
-    return this.http.get(`/shareadvancecollection${suffix}`);
+  /**
+   * Everything an Apply screen needs, in one call: `own` is this member's own unapplied receipts,
+   * ready to tick; `rows` is every other Share Collection receipt still available — unclaimed GL
+   * deposits and receipts linked to another member — which attach by voucher instead.
+   *
+   * One request rather than two: both lists come from the same table under the same filters, and
+   * splitting them across endpoints only meant the same rows were fetched twice and, where they
+   * overlapped, drawn twice on the same screen.
+   */
+  getShareCollectionReceipts(clientId?: number): Observable<any> {
+    const params = clientId ? new HttpParams().set('clientId', String(clientId)) : undefined;
+    return this.http.get('/shareadvancecollection/unattributed', { params });
   }
 
   /** Moves a receipt out of Sundry into share capital for an activated account. */
@@ -407,6 +442,12 @@ export class CashierService {
     return this.http.post(`/shareadvancecollection/${collectionId}/apply`, data);
   }
 
+  /** The receipt's own real Dr/Cr GL legs — never the GL account currently picked in a search box,
+   *  which is unrelated screen state that can name a different account than this receipt sits in. */
+  getShareAdvanceGlEntries(collectionId: number): Observable<any> {
+    return this.http.get(`/shareadvancecollection/${collectionId}/gl-entries`);
+  }
+
   /** Every additional-share tranche awaiting approval, across every share account. */
   getShareAdditionRequests(): Observable<any> {
     return this.http.get('/shareadditionrequests');
@@ -419,4 +460,14 @@ export class CashierService {
   getShareAdditionRequest(transactionId: number): Observable<any> {
     return this.http.get(`/shareadditionrequests/${transactionId}`);
   }
+
+  /**
+   * Entry Type options for a GL credit (General / Share Collection / DD Issue / …) — the
+   * "GLEntryType" code under Admin > System > Manage Codes, so an admin can add another type later
+   * without a deployment. Empty on failure rather than erroring, since a row missing this dropdown's
+   * options should still be usable for every other field.
+   */
+  getEntryTypeOptions(): Observable<any[]> {
+    return this.http.get<any[]>('/codes/name/GLEntryType/codevalues').pipe(catchError(() => of([])));
+  }
 }

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

@@ -303,8 +303,8 @@
             <tr>
               <th class="gl-th--voucher">Voucher No</th>
               <th class="gl-th--date">Date</th>
-              <th>A/C No</th>
-              <th>A/C Name</th>
+              <th>Debit</th>
+              <th>Credit</th>
               <th class="gl-th--pt">Payment Type</th>
               <th class="gl-th--teller">Teller</th>
               <th class="num gl-th--dr">DR (₹)</th>
@@ -326,8 +326,25 @@
                     <div class="gl-time">{{ r.txnTime }}</div>
                   }
                 </td>
-                <td class="gl-acno">{{ r.acNo }}</td>
-                <td class="gl-acname">{{ r.acName }}</td>
+                <!-- Both legs of the voucher, the same pair My Vouchers shows — not just the one
+                     side this row's own denomination breakdown happens to know about. Falls back
+                     to that one side (acNo/acName) when the voucher predates m_voucher_line. -->
+                <td class="gl-acname">
+                  <div>{{ r.debitParty || r.acName }}</div>
+                  @if (r.debitAccount || r.acNo) {
+                    <div class="gl-acno">{{ r.debitAccount || r.acNo }}</div>
+                  }
+                </td>
+                <td class="gl-acname">
+                  @if (r.creditParty) {
+                    <div>{{ r.creditParty }}</div>
+                    @if (r.creditAccount) {
+                      <div class="gl-acno">{{ r.creditAccount }}</div>
+                    }
+                  } @else {
+                    <span class="gl-pt-none">—</span>
+                  }
+                </td>
                 <td class="gl-pt">
                   @if (r.paymentType) {
                     <span class="gl-pt-badge">{{ r.paymentType }}</span>

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({
@@ -174,19 +175,24 @@ export class ClosingCashReportComponent implements OnInit {
     return this.noteRows.reduce((s, r) => s + Number(r.settledOutAmount ?? 0), 0);
   }
 
+  /**
+   * Summed from each row's own `netCount`, not re-derived from today's legs — a row's `netCount`
+   * already carries forward what a cashier was holding from before today (`openingCount`), for the
+   * force-closed-day/late-settlement case. Recomputing here from only today's vaultIn/deposit/
+   * withdrawal/settledOut dropped that carry-forward and put the Total row back into negative
+   * numbers a cashier had already reconciled.
+   */
   get noteNetCount(): number {
-    return this.noteVaultInCount + this.noteDepositCount - this.noteWithdrawalCount - this.noteSettledOutCount;
+    return this.noteRows.reduce((s, r) => s + Number(r.netCount ?? 0), 0);
   }
 
   /**
-   * What is left in the drawer in notes: everything that came in, less everything that went out.
-   *
-   * Was deposits minus withdrawals, which is the counter's movement rather than the drawer's
-   * contents — it left out the cash drawn from the vault, so a teller holding a ₹500 note saw a net
-   * of zero and had nothing to count against.
+   * What is left in the drawer in notes: everything that came in, less everything that went out —
+   * including cash carried forward from before today. See `noteNetCount` for why this sums each
+   * row's own `netAmount` rather than re-deriving it from today's legs.
    */
   get noteNetAmount(): number {
-    return this.noteVaultInAmount + this.noteDepositAmount - this.noteWithdrawalAmount - this.noteSettledOutAmount;
+    return this.noteRows.reduce((s, r) => s + Number(r.netAmount ?? 0), 0);
   }
   get coinRows(): any[] {
     return this.rows.filter((r) => r.kind === 'coin');
@@ -199,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.html

@@ -202,6 +202,7 @@
               <th class="num">Amount</th>
               <th>Payment</th>
               <th>Status</th>
+              <th>Correction</th>
               <th>By</th>
               <th>Approved By</th>
               <th>Time</th>
@@ -231,6 +232,18 @@
                 <td>
                   <span [class]="statusClass(r.status)">{{ r.status }}</span>
                 </td>
+                <td>
+                  <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
+                  <mifosx-voucher-status
+                    [status]="r.voucherStatus"
+                    [revokedBy]="r.revokedByVoucherNo"
+                    [replaces]="r.replacesVoucherNo"
+                    [note]="r.correctionNote"
+                  ></mifosx-voucher-status>
+                  @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
+                    <span class="db-muted">—</span>
+                  }
+                </td>
                 <td>{{ r.handledBy ?? '—' }}</td>
                 <td>
                   {{ r.approvedBy ?? '—' }}
@@ -256,7 +269,7 @@
                   —
                 }
               </td>
-              <td colspan="5"></td>
+              <td colspan="6"></td>
             </tr>
           </tfoot>
         </table>

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

@@ -13,6 +13,8 @@ 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';
+import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 /**
  * Which part of the day's work a row came from. Set by the server, one per source register.
@@ -25,6 +27,11 @@ type DayBookSection = 'CASHIER' | 'CLERK' | 'SYSTEM';
 
 interface DayBookRow {
   voucherNo: string | null;
+  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
+  voucherStatus?: VoucherStatus;
+  revokedByVoucherNo?: string | null;
+  replacesVoucherNo?: string | null;
+  correctionNote?: string | null;
   section: DayBookSection;
   side: 'CR' | 'DR';
   kind: string;
@@ -57,7 +64,8 @@ interface DayBookRow {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule
+    MatIconModule,
+    VoucherStatusComponent
   ]
 })
 export class DayBookComponent implements OnInit {
@@ -95,7 +103,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.html

@@ -11,41 +11,29 @@
     <div>
       <div class="pg-eyebrow">CASHIER · INTER-CASHIER TRANSFER</div>
       <h1 class="pg-title">Inter-Cashier Transfer</h1>
-      <p class="pg-sub">Move denomination-wise cash between two cashiers within the same teller.</p>
+      <p class="pg-sub">Hand over denomination-wise cash from your drawer to another cashier at your counter.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
   </header>
 
-  <div class="pg-toolbar pg-toolbar--mat">
-    @if (tellers.length === 1) {
-      <mat-form-field appearance="outline" subscriptSizing="dynamic">
-        <mat-label>Teller</mat-label>
-        <input matInput type="text" [value]="tellers[0].name" readonly />
-      </mat-form-field>
-    } @else {
-      <mat-form-field appearance="outline" subscriptSizing="dynamic">
-        <mat-label>Teller</mat-label>
-        <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
-          @for (t of tellers; track t.id) {
-            <mat-option [value]="t.id">{{ t.name }}</mat-option>
-          }
-          @if (tellers.length === 0) {
-            <mat-option [value]="null" disabled>No tellers configured</mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-    }
+  @if (ownCashierMissing) {
+    <div class="ict-alert">
+      <mat-icon>person_off</mat-icon>
+      Your login is not linked to a cashier. An inter-cashier transfer is made by the cashier handing the cash over, so
+      log in as that cashier.
+    </div>
+  }
 
+  <div class="pg-toolbar pg-toolbar--mat">
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>From (Cashier)</mat-label>
-      <mat-select [value]="fromCashierId" (selectionChange)="onFromSelect($event.value)" [disabled]="!selectedTellerId">
-        @for (c of availableFrom; track c.id) {
-          <mat-option [value]="c.id">{{ c.label }}</mat-option>
-        }
-        @if (selectedTellerId && allCashiers.length === 0 && !loadingCashiers) {
-          <mat-option [value]="null" disabled>No cashiers</mat-option>
-        }
-      </mat-select>
+      <mat-label>Teller</mat-label>
+      <input matInput type="text" [value]="tellerName || '—'" readonly />
+    </mat-form-field>
+
+    <!-- The sender is always the cashier who is logged in; nothing to pick. -->
+    <mat-form-field appearance="outline" subscriptSizing="dynamic">
+      <mat-label>From (You)</mat-label>
+      <input matInput type="text" [value]="fromParty || '—'" readonly />
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
@@ -54,7 +42,7 @@
         @for (c of availableTo; track c.id) {
           <mat-option [value]="c.id">{{ c.label }}</mat-option>
         }
-        @if (fromCashierId && availableTo.length === 0) {
+        @if (fromCashierId && !loadingCashiers && availableTo.length === 0) {
           <mat-option [value]="null" disabled>No other cashiers</mat-option>
         }
       </mat-select>
@@ -62,7 +50,7 @@
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
       <mat-label>Date</mat-label>
-      <input matInput type="date" [value]="transferDate" (change)="transferDate = $any($event.target).value" />
+      <input matInput type="date" [value]="transferDate" (change)="onDateChange($any($event.target).value)" />
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic" class="pg-note-field">
@@ -71,26 +59,102 @@
     </mat-form-field>
   </div>
 
+  <!-- Both sides of the transfer: who they are, whether the vault has allocated them cash today,
+       and what they hold now. -->
+  @if (fromCashierId || toCashierId) {
+    <div class="ict-parties">
+      <ng-container
+        *ngTemplateOutlet="
+          partyCard;
+          context: { title: 'From (Sending Cashier)', s: fromSummary, loading: loadingFrom, picked: !!fromCashierId }
+        "
+      ></ng-container>
+      <mat-icon class="ict-parties__arrow">arrow_forward</mat-icon>
+      <ng-container
+        *ngTemplateOutlet="
+          partyCard;
+          context: { title: 'To (Receiving Cashier)', s: toSummary, loading: loadingTo, picked: !!toCashierId }
+        "
+      ></ng-container>
+    </div>
+  }
+
+  <ng-template #partyCard let-title="title" let-s="s" let-loading="loading" let-picked="picked">
+    <div class="ict-party" [class.ict-party--blocked]="s && !s.cashAllocated">
+      <div class="ict-party__title">{{ title }}</div>
+      @if (!picked) {
+        <div class="ict-party__empty">Select a cashier</div>
+      } @else if (loading) {
+        <div class="ict-party__empty">Loading…</div>
+      } @else if (!s) {
+        <div class="ict-party__empty">Could not load this cashier's details.</div>
+      } @else {
+        <div class="ict-party__name">{{ s.cashierName || '—' }}</div>
+        <div class="ict-party__meta">
+          <span><mat-icon>point_of_sale</mat-icon> {{ s.tellerName || '—' }}</span>
+          <span><mat-icon>account_balance</mat-icon> {{ s.officeName || '—' }}</span>
+        </div>
+        <div class="ict-party__figures">
+          <div>
+            <div class="ict-party__label">Allocated today</div>
+            <div class="ict-party__value">₹{{ s.allocatedAmount | number: '1.2-2' }}</div>
+          </div>
+          <div>
+            <div class="ict-party__label">Cash in hand</div>
+            <div class="ict-party__value">₹{{ s.totalAmount | number: '1.2-2' }}</div>
+          </div>
+        </div>
+        @if (!s.cashAllocated) {
+          <div class="ict-party__warn">
+            <mat-icon>block</mat-icon> No cash allocated from the vault for this date — inter-cashier transfer is not
+            allowed.
+          </div>
+        }
+      }
+    </div>
+  </ng-template>
+
+  @if (fromSummary && toSummary && !bothAllocated) {
+    <div class="ict-alert">
+      <mat-icon>block</mat-icon>
+      Both cashiers must first be allocated cash from the vault (Cash Transfer) for {{ transferDate }} before an
+      inter-cashier transfer.
+    </div>
+  }
+  @if (anyExceedsHeld) {
+    <div class="ict-alert">
+      <mat-icon>error_outline</mat-icon>
+      The sending cashier does not hold enough of the highlighted denominations.
+    </div>
+  }
+
   <div class="pg-card">
     <table class="pg-table">
       <thead>
         <tr>
           <th>Denomination</th>
+          <th class="num">From holds</th>
           <th style="text-align: center">Count</th>
           <th class="num">Amount</th>
+          <th class="num">To holds</th>
         </tr>
       </thead>
       <tbody>
         @if (notes.length) {
           <tr class="pg-section">
-            <td colspan="3">Bank Notes</td>
+            <td colspan="5">Bank Notes</td>
           </tr>
         }
         @for (d of notes; track d.id) {
-          <tr>
+          <tr [class.ict-row--over]="exceedsHeld(d)">
             <td>
               <span class="pg-chip">{{ d.label }}</span>
             </td>
+            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
+              <ng-container
+                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
+              ></ng-container>
+            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -99,18 +163,28 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
+            <td class="num">
+              <ng-container
+                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
+              ></ng-container>
+            </td>
           </tr>
         }
         @if (coins.length) {
           <tr class="pg-section">
-            <td colspan="3">Coins</td>
+            <td colspan="5">Coins</td>
           </tr>
         }
         @for (d of coins; track d.id) {
-          <tr>
+          <tr [class.ict-row--over]="exceedsHeld(d)">
             <td>
               <span class="pg-chip pg-chip--coin">{{ d.label }}</span>
             </td>
+            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
+              <ng-container
+                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
+              ></ng-container>
+            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -119,17 +193,34 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
+            <td class="num">
+              <ng-container
+                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
+              ></ng-container>
+            </td>
           </tr>
         }
         @if (denoms.length === 0) {
           <tr>
-            <td colspan="3" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
+            <td colspan="5" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
           </tr>
         }
       </tbody>
     </table>
   </div>
 
+  <!-- A held count, with what it becomes once this transfer is recorded. -->
+  <ng-template #heldCell let-n="n" let-delta="delta">
+    @if (n === null) {
+      —
+    } @else {
+      {{ n }}
+      @if (delta !== 0) {
+        <span class="ict-after">→ {{ n + delta }}</span>
+      }
+    }
+  </ng-template>
+
   <div class="pg-total-bar">
     Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
     <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">

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

@@ -0,0 +1,150 @@
+/**
+ * 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/.
+ */
+
+.ict-parties {
+  display: grid;
+  grid-template-columns: 1fr auto 1fr;
+  align-items: stretch;
+  gap: 12px;
+  margin-bottom: 12px;
+
+  &__arrow {
+    align-self: center;
+    color: #64748b;
+  }
+
+  @media (width <= 760px) {
+    grid-template-columns: 1fr;
+
+    &__arrow {
+      justify-self: center;
+      transform: rotate(90deg);
+    }
+  }
+}
+
+.ict-party {
+  padding: 12px 14px;
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 10px;
+
+  &--blocked {
+    background: #fef2f2;
+    border-color: #fecaca;
+  }
+
+  &__title {
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    color: #64748b;
+  }
+
+  &__empty {
+    margin-top: 8px;
+    font-size: 13px;
+    color: #94a3b8;
+  }
+
+  &__name {
+    margin-top: 4px;
+    font-size: 16px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__meta {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 14px;
+    margin-top: 4px;
+    font-size: 12px;
+    color: #475569;
+
+    span {
+      display: inline-flex;
+      align-items: center;
+      gap: 4px;
+    }
+
+    mat-icon {
+      font-size: 14px;
+      width: 14px;
+      height: 14px;
+    }
+  }
+
+  &__figures {
+    display: flex;
+    gap: 24px;
+    margin-top: 10px;
+  }
+
+  &__label {
+    font-size: 11px;
+    color: #64748b;
+  }
+
+  &__value {
+    font-size: 15px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+
+  &__warn {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    margin-top: 10px;
+    font-size: 12px;
+    font-weight: 600;
+    color: #991b1b;
+
+    mat-icon {
+      font-size: 16px;
+      width: 16px;
+      height: 16px;
+    }
+  }
+}
+
+.ict-alert {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 10px;
+  padding: 8px 14px;
+  background: #fef2f2;
+  border: 1px solid #fecaca;
+  border-radius: 8px;
+  font-size: 12px;
+  color: #991b1b;
+
+  mat-icon {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+  }
+}
+
+.ict-row--over {
+  background: #fef2f2;
+}
+
+.ict-held--over {
+  color: #b91c1c;
+  font-weight: 700;
+}
+
+.ict-after {
+  margin-left: 4px;
+  font-size: 11px;
+  color: #64748b;
+}

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;
@@ -28,12 +29,27 @@ interface Cashier {
   id: number;
   label: string;
 }
+/** One side of the transfer, from GET /cashintercashier/cashier-summary. */
+interface CashierSummary {
+  cashierId: number;
+  cashierName: string;
+  tellerName: string;
+  officeName: string;
+  cashAllocated: boolean;
+  allocatedAmount: number;
+  totalAmount: number;
+  /** Count held per denomination id. */
+  held: Record<number, number>;
+}
 
 /** Move cash denomination-wise between two cashiers under the same teller. */
 @Component({
   selector: 'mifosx-inter-cashier-transfer',
   templateUrl: './inter-cashier-transfer.component.html',
-  styleUrls: ['../cashier-shared.scss'],
+  styleUrls: [
+    '../cashier-shared.scss',
+    './inter-cashier-transfer.component.scss'
+  ],
   standalone: true,
   imports: [
     CommonModule,
@@ -56,7 +72,12 @@ export class InterCashierTransferComponent implements OnInit {
   note = '';
   saving = false;
 
-  tellers: { id: number; name: string }[] = [];
+  /**
+   * The sending cashier is always the one logged in: cash is handed over from their own drawer, so there is
+   * no one else to pick on that side. Only the receiving cashier is chosen.
+   */
+  ownCashierMissing = false;
+  tellerName = '';
   allCashiers: Cashier[] = [];
   selectedTellerId: number | null = null;
   fromCashierId: number | null = null;
@@ -65,21 +86,25 @@ export class InterCashierTransferComponent implements OnInit {
   toParty = '';
   loadingCashiers = false;
 
+  /** Details and denomination-wise cash of each side, so both are seen before the transfer is recorded. */
+  fromSummary: CashierSummary | null = null;
+  toSummary: CashierSummary | null = null;
+  loadingFrom = false;
+  loadingTo = false;
+
   get denoms(): Denom[] {
     return [
       ...this.notes,
       ...this.coins
     ];
   }
-  get availableFrom(): Cashier[] {
-    return this.allCashiers;
-  }
+  /** Everyone under the same teller except the sender. */
   get availableTo(): Cashier[] {
     return this.allCashiers.filter((c) => c.id !== this.fromCashierId);
   }
 
   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) => {
@@ -97,25 +122,20 @@ export class InterCashierTransferComponent implements OnInit {
         this.coins = [];
       }
     });
-    this.service
-      .getTellers()
-      .pipe(catchError(() => of([] as any[])))
-      .subscribe((list) => {
-        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
-        if (this.tellers.length === 1) {
-          this.onTellerSelect(this.tellers[0].id);
-        }
-      });
+    // The sender is the cashier behind this login; their counter then gives the receivers to pick from.
+    this.service.getCurrentCashierInfo().subscribe((info) => {
+      if (!info) {
+        this.ownCashierMissing = true;
+        return;
+      }
+      this.fromCashierId = info.cashierId;
+      this.fromParty = info.cashierName;
+      this.loadSummary('from');
+    });
   }
 
-  onTellerSelect(tellerId: number): void {
-    this.selectedTellerId = tellerId;
-    this.fromCashierId = null;
-    this.toCashierId = null;
-    this.fromParty = '';
-    this.toParty = '';
-    this.allCashiers = [];
-    if (!tellerId) return;
+  /** The other cashiers at this counter, one of whom receives the cash. */
+  private loadReceivers(tellerId: number): void {
     this.loadingCashiers = true;
     this.service
       .getCashiersForTeller(tellerId)
@@ -126,20 +146,90 @@ export class InterCashierTransferComponent implements OnInit {
       });
   }
 
-  onFromSelect(cashierId: number): void {
-    this.fromCashierId = cashierId;
-    const c = this.allCashiers.find((x) => x.id === cashierId);
-    this.fromParty = c ? c.label : '';
-    if (this.toCashierId === cashierId) {
-      this.toCashierId = null;
-      this.toParty = '';
-    }
-  }
-
   onToSelect(cashierId: number): void {
     this.toCashierId = cashierId;
     const c = this.allCashiers.find((x) => x.id === cashierId);
     this.toParty = c ? c.label : '';
+    this.loadSummary('to');
+  }
+
+  onDateChange(value: string): void {
+    this.transferDate = value;
+    this.loadSummary('from');
+    this.loadSummary('to');
+  }
+
+  /** Fetch one side's details, vault allocation and denomination-wise cash for the transfer date. */
+  private loadSummary(side: 'from' | 'to'): void {
+    const cashierId = side === 'from' ? this.fromCashierId : this.toCashierId;
+    if (side === 'from') {
+      this.fromSummary = null;
+    } else {
+      this.toSummary = null;
+    }
+    if (!cashierId || !this.transferDate) return;
+    this.setLoading(side, true);
+    this.service
+      .getInterCashierCashierSummary(cashierId, this.transferDate)
+      .pipe(catchError(() => of(null)))
+      .subscribe((r: any) => {
+        this.setLoading(side, false);
+        // A late answer for a cashier no longer selected on that side is dropped.
+        const current = side === 'from' ? this.fromCashierId : this.toCashierId;
+        if (!r || current !== cashierId) return;
+        // The sender's summary also tells which counter they are at, hence who they can hand cash to.
+        if (side === 'from' && r.tellerId && this.selectedTellerId !== Number(r.tellerId)) {
+          this.selectedTellerId = Number(r.tellerId);
+          this.tellerName = r.tellerName || '';
+          this.loadReceivers(this.selectedTellerId);
+        }
+        const held: Record<number, number> = {};
+        for (const d of r.denominations || []) {
+          held[d.denominationId] = (held[d.denominationId] || 0) + Number(d.count || 0);
+        }
+        const summary: CashierSummary = {
+          cashierId: r.cashierId,
+          cashierName: r.cashierName,
+          tellerName: r.tellerName,
+          officeName: r.officeName,
+          cashAllocated: !!r.cashAllocated,
+          allocatedAmount: Number(r.allocatedAmount || 0),
+          totalAmount: Number(r.totalAmount || 0),
+          held
+        };
+        if (side === 'from') {
+          this.fromSummary = summary;
+        } else {
+          this.toSummary = summary;
+        }
+      });
+  }
+
+  private setLoading(side: 'from' | 'to', loading: boolean): void {
+    if (side === 'from') {
+      this.loadingFrom = loading;
+    } else {
+      this.loadingTo = loading;
+    }
+  }
+
+  /** Count of the denomination the cashier holds, or null while their figures are not loaded. */
+  heldBy(summary: CashierSummary | null, d: Denom): number | null {
+    return summary ? summary.held[d.id] || 0 : null;
+  }
+
+  /** The sending cashier is asked to hand on more of this denomination than they hold. */
+  exceedsHeld(d: Denom): boolean {
+    return !!this.fromSummary && this.countFor(d) > (this.fromSummary.held[d.id] || 0);
+  }
+
+  get anyExceedsHeld(): boolean {
+    return this.denoms.some((d) => this.exceedsHeld(d));
+  }
+
+  /** Both sides must have been allocated cash from the vault for the day before they can transfer. */
+  get bothAllocated(): boolean {
+    return !!this.fromSummary?.cashAllocated && !!this.toSummary?.cashAllocated;
   }
 
   countFor(d: Denom): number {
@@ -159,7 +249,14 @@ export class InterCashierTransferComponent implements OnInit {
     return this.denoms.reduce((s, d) => s + this.subtotal(d), 0);
   }
   get valid(): boolean {
-    return this.total > 0 && !!this.selectedTellerId && !!this.fromCashierId && !!this.toCashierId;
+    return (
+      this.total > 0 &&
+      !!this.selectedTellerId &&
+      !!this.fromCashierId &&
+      !!this.toCashierId &&
+      this.bothAllocated &&
+      !this.anyExceedsHeld
+    );
   }
 
   clear(): void {
@@ -186,10 +283,12 @@ export class InterCashierTransferComponent implements OnInit {
         this.snackBar.open('Inter-cashier transfer recorded', 'Close', { duration: 3000 });
         this.clear();
         this.note = '';
-        this.fromCashierId = null;
+        // The sender stays the logged-in cashier; the receiver is picked afresh, and the sender's holdings
+        // are read again now that part of them has gone.
         this.toCashierId = null;
-        this.fromParty = '';
         this.toParty = '';
+        this.toSummary = null;
+        this.loadSummary('from');
         this.saving = false;
       },
       error: () => {

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

@@ -146,15 +146,28 @@
                   <th class="num">Amount</th>
                   <th>My part</th>
                   <th>Status</th>
+                  <th>Correction</th>
                   <th>Time</th>
                 </tr>
               </thead>
               <tbody>
                 @for (r of g.rows; track r.voucherNo) {
                   <!-- The left edge repeats the section's own colour, so a row still says which part it
-                   is when the heading has scrolled away. -->
-                  <tr [class]="'mw-row mw-row--' + r.myRole">
-                    <td class="mw-vno">{{ r.voucherNo }}</td>
+                   is when the heading has scrolled away. Clicking anywhere on the row opens the full
+                   slip -- every line, not just the first debit and first credit this table has room
+                   to show. -->
+                  <tr
+                    [class]="'mw-row mw-row--' + r.myRole"
+                    class="mw-row--clickable"
+                    (click)="openDetail(r.voucherNo)"
+                    [attr.aria-busy]="loadingDetailFor === r.voucherNo"
+                  >
+                    <td class="mw-vno">
+                      {{ r.voucherNo }}
+                      @if (loadingDetailFor === r.voucherNo) {
+                        <mat-icon class="mw-vno__spinner" inline>hourglass_empty</mat-icon>
+                      }
+                    </td>
                     <td>
                       <span class="mw-badge" [class]="'mw-badge--' + (r.side || 'JV')">{{ sideLabel(r.side) }}</span>
                     </td>
@@ -171,7 +184,7 @@
                         <span class="mw-acct">{{ r.creditAccount }}</span>
                       }
                       @if (r.extraLines > 0) {
-                        <span class="mw-more">+{{ r.extraLines }} more</span>
+                        <span class="mw-more" title="Click the row to see every line">+{{ r.extraLines }} more</span>
                       }
                     </td>
                     <td class="num">₹{{ r.amount | number: '1.2-2' }}</td>
@@ -191,6 +204,18 @@
                         {{ statusLabel(r.verificationStatus) }}
                       </span>
                     </td>
+                    <td>
+                      <!-- Where the voucher stands after a correction: unpassed, revoked, closed or corrected. -->
+                      <mifosx-voucher-status
+                        [status]="r.voucherStatus"
+                        [revokedBy]="r.revokedByVoucherNo"
+                        [replaces]="r.replacesVoucherNo"
+                        [note]="r.correctionNote"
+                      ></mifosx-voucher-status>
+                      @if (!r.voucherStatus || r.voucherStatus === 'ACTIVE') {
+                        <span class="mw-acct">—</span>
+                      }
+                    </td>
                     <td class="mw-time">{{ r.createdAt | date: 'HH:mm' }}</td>
                   </tr>
                 }

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

@@ -178,6 +178,21 @@
   }
 }
 
+.mw-row--clickable {
+  cursor: pointer;
+
+  &:hover {
+    background: #f8fafc;
+  }
+}
+
+.mw-vno__spinner {
+  margin-left: 4px;
+  font-size: 14px;
+  vertical-align: middle;
+  color: #94a3b8;
+}
+
 /* One section per part played. The heading carries the section's own count and total, so a maker's
    tally and a checker's are each readable without adding rows up. */
 .mw-group {

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

@@ -10,8 +10,12 @@ import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
-import { catchError, of } from 'rxjs';
+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';
+import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
 
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -21,6 +25,11 @@ export type VoucherSide = 'CR' | 'DR' | 'JV';
 
 interface MyWorkRow {
   voucherNo: string;
+  /** Where the voucher stands after a correction: active, revoked, under correction, or corrected. */
+  voucherStatus?: VoucherStatus;
+  revokedByVoucherNo?: string | null;
+  replacesVoucherNo?: string | null;
+  correctionNote?: string | null;
   side: VoucherSide | null;
   voucherType: string | null;
   amount: number | null;
@@ -72,11 +81,18 @@ interface MyWorkReport {
   imports: [
     CommonModule,
     FormsModule,
-    MatIconModule
+    MatIconModule,
+    MatDialogModule,
+    VoucherStatusComponent
   ]
 })
 export class MyWorkComponent implements OnInit {
   private service = inject(CashierService);
+  private dialog = inject(MatDialog);
+
+  /** Which voucher's detail is currently being fetched, so the row that was clicked can show its
+   *  own spinner instead of a page-wide one for what is a small, single-row lookup. */
+  loadingDetailFor: string | null = null;
 
   /** Day is the working default; a month is what a close or an audit asks for. */
   period: 'DAY' | 'MONTH' = 'DAY';
@@ -323,8 +339,33 @@ export class MyWorkComponent implements OnInit {
     return { from: first, to: lastIso };
   }
 
+  /** Opens the full slip for one voucher — every debit and credit line, not just the first side of
+   *  each a table row has room to show. */
+  openDetail(voucherNo: string): void {
+    if (this.loadingDetailFor) {
+      return;
+    }
+    this.loadingDetailFor = voucherNo;
+    this.service
+      .voucherDetail(voucherNo)
+      .pipe(
+        catchError(() => of(null)),
+        finalize(() => (this.loadingDetailFor = null))
+      )
+      .subscribe((detail: any) => {
+        if (!detail) {
+          return;
+        }
+        this.dialog.open(VoucherDetailDialogComponent, {
+          data: { detail },
+          width: '600px',
+          autoFocus: false
+        });
+      });
+  }
+
   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/my-work/voucher-detail-dialog.component.ts

@@ -0,0 +1,334 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+import { VoucherStatusComponent, VoucherStatus } from '../voucher-status/voucher-status.component';
+
+export interface VoucherDetailDialogData {
+  /** Already-loaded detail from CashierService.voucherDetail() — the caller fetches, this dialog
+   *  only renders, so one loading state lives in the row's own click handler rather than being
+   *  duplicated inside every dialog that could ever show a voucher. */
+  detail: {
+    voucherNo: string;
+    voucherStatus?: VoucherStatus;
+    revokedByVoucherNo?: string | null;
+    replacesVoucherNo?: string | null;
+    correctionNote?: string | null;
+    voucherType: string | null;
+    amount: number | null;
+    branchName: string | null;
+    createdBy: string | null;
+    createdAt: string | null;
+    totalDebit: number;
+    totalCredit: number;
+    balanced: boolean;
+    lines: {
+      lineNo: number;
+      entryType: 'DR' | 'CR';
+      partyName: string | null;
+      accountNo: string | null;
+      amount: number;
+      description: string | null;
+    }[];
+    /** GL entries a native platform command posted for the same underlying event, outside this
+     *  voucher entirely — a share redemption's Dr Share Capital / Cr Share Sundry pair, posted at
+     *  manager approval, before this voucher's own Dr Sundry / Cr Cash at Vault settlement leg even
+     *  exists. Empty for every voucher that already is the whole transaction on its own. */
+    relatedLines: {
+      stage: string;
+      entryType: 'DR' | 'CR';
+      partyName: string | null;
+      accountNo: string | null;
+      amount: number;
+      description: string | null;
+    }[];
+  };
+}
+
+/** The full slip behind a summarised register row — every debit and credit line a voucher is
+ *  made of, not just the first side of each that a table row has room for. */
+@Component({
+  selector: 'mifosx-voucher-detail-dialog',
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatDialogModule,
+    MatButtonModule,
+    MatIconModule,
+    VoucherStatusComponent
+  ],
+  template: `
+    <div class="vd-shell">
+      <div class="vd-header">
+        <div class="vd-header__title">
+          <mat-icon class="vd-icon">receipt_long</mat-icon>
+          <div>
+            <h2>
+              {{ detail.voucherNo }}
+              <mifosx-voucher-status
+                [status]="detail.voucherStatus"
+                [revokedBy]="detail.revokedByVoucherNo"
+                [replaces]="detail.replacesVoucherNo"
+                [note]="detail.correctionNote"
+              ></mifosx-voucher-status>
+            </h2>
+            <p>{{ detail.voucherType || 'Voucher' }} &middot; {{ detail.branchName || 'Head Office' }}</p>
+          </div>
+        </div>
+        <button mat-icon-button mat-dialog-close aria-label="Close">
+          <mat-icon>close</mat-icon>
+        </button>
+      </div>
+
+      <div class="vd-meta">
+        <span
+          >Raised by <strong>{{ detail.createdBy || '—' }}</strong></span
+        >
+        @if (detail.createdAt) {
+          <span>{{ detail.createdAt | date: 'dd MMM yyyy, h:mm a' }}</span>
+        }
+        @if (!detail.balanced) {
+          <span class="vd-unbalanced">
+            <mat-icon inline>warning</mat-icon>
+            Debit and credit do not balance
+          </span>
+        }
+      </div>
+
+      <table class="vd-table">
+        <thead>
+          <tr>
+            <th>Side</th>
+            <th>Party</th>
+            <th>Account No.</th>
+            <th class="num">Amount</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (line of detail.lines; track line.lineNo) {
+            <tr>
+              <td>
+                <span
+                  class="vd-side"
+                  [class.vd-side--dr]="line.entryType === 'DR'"
+                  [class.vd-side--cr]="line.entryType === 'CR'"
+                >
+                  {{ line.entryType === 'DR' ? 'Debit' : 'Credit' }}
+                </span>
+              </td>
+              <td>{{ line.partyName || '—' }}</td>
+              <td class="vd-acct">{{ line.accountNo || '—' }}</td>
+              <td class="num">₹{{ line.amount | number: '1.2-2' }}</td>
+            </tr>
+            @if (line.description) {
+              <tr class="vd-desc-row">
+                <td></td>
+                <td colspan="3" class="vd-desc">{{ line.description }}</td>
+              </tr>
+            }
+          } @empty {
+            <tr>
+              <td colspan="4" class="vd-empty">This voucher's individual lines were not recorded.</td>
+            </tr>
+          }
+        </tbody>
+        @if (detail.lines.length > 0) {
+          <tfoot>
+            <tr>
+              <td colspan="3">Total</td>
+              <td class="num">
+                ₹{{ detail.totalDebit | number: '1.2-2' }} / ₹{{ detail.totalCredit | number: '1.2-2' }}
+              </td>
+            </tr>
+          </tfoot>
+        }
+      </table>
+
+      @if (detail.relatedLines.length > 0) {
+        <div class="vd-related">
+          <div class="vd-related__title">
+            <mat-icon inline>link</mat-icon>
+            Also posted for this transaction — not part of this voucher
+          </div>
+          <table class="vd-table vd-table--related">
+            <tbody>
+              @for (line of detail.relatedLines; track $index) {
+                <tr>
+                  <td>
+                    <span
+                      class="vd-side"
+                      [class.vd-side--dr]="line.entryType === 'DR'"
+                      [class.vd-side--cr]="line.entryType === 'CR'"
+                    >
+                      {{ line.entryType === 'DR' ? 'Debit' : 'Credit' }}
+                    </span>
+                  </td>
+                  <td>{{ line.partyName || '—' }}</td>
+                  <td class="vd-acct">{{ line.accountNo || '—' }}</td>
+                  <td class="num">₹{{ line.amount | number: '1.2-2' }}</td>
+                </tr>
+              }
+            </tbody>
+          </table>
+          <p class="vd-related__hint">
+            {{ detail.relatedLines[0].stage }} — this and the lines above are the same transaction's full accounting.
+          </p>
+        </div>
+      }
+
+      <div class="vd-actions">
+        <button mat-flat-button color="primary" mat-dialog-close>Close</button>
+      </div>
+    </div>
+  `,
+  styles: [
+    `
+      .vd-shell {
+        display: flex;
+        flex-direction: column;
+        gap: 16px;
+        padding: 20px 24px 16px;
+        min-width: 420px;
+        max-width: 560px;
+      }
+      .vd-header {
+        display: flex;
+        align-items: flex-start;
+        justify-content: space-between;
+      }
+      .vd-header__title {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+      }
+      .vd-header__title h2 {
+        margin: 0;
+        font-size: 18px;
+        font-weight: 600;
+      }
+      .vd-header__title p {
+        margin: 2px 0 0;
+        font-size: 13px;
+        color: rgba(0, 0, 0, 0.6);
+      }
+      .vd-icon {
+        color: #1976d2;
+      }
+      .vd-meta {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 6px 16px;
+        font-size: 13px;
+        color: rgba(0, 0, 0, 0.65);
+      }
+      .vd-unbalanced {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px;
+        color: #b91c1c;
+        font-weight: 600;
+      }
+      .vd-table {
+        width: 100%;
+        border-collapse: collapse;
+        font-size: 13px;
+      }
+      .vd-table th {
+        text-align: left;
+        text-transform: uppercase;
+        font-size: 11px;
+        letter-spacing: 0.03em;
+        color: rgba(0, 0, 0, 0.5);
+        padding: 6px 8px;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+      }
+      .vd-table td {
+        padding: 8px;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+      }
+      .vd-table .num {
+        text-align: right;
+        font-variant-numeric: tabular-nums;
+      }
+      .vd-acct {
+        color: rgba(0, 0, 0, 0.55);
+      }
+      .vd-side {
+        display: inline-block;
+        padding: 2px 8px;
+        border-radius: 4px;
+        font-size: 11px;
+        font-weight: 600;
+      }
+      .vd-side--dr {
+        background: #fee2e2;
+        color: #b91c1c;
+      }
+      .vd-side--cr {
+        background: #dcfce7;
+        color: #15803d;
+      }
+      .vd-desc-row td {
+        padding-top: 0;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+      }
+      .vd-desc {
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.5);
+        font-style: italic;
+      }
+      .vd-empty {
+        text-align: center;
+        color: rgba(0, 0, 0, 0.5);
+        padding: 16px 8px;
+      }
+      .vd-table tfoot td {
+        font-weight: 600;
+        border-bottom: none;
+        border-top: 1px solid rgba(0, 0, 0, 0.1);
+      }
+      .vd-related {
+        border-top: 1px dashed rgba(0, 0, 0, 0.15);
+        padding-top: 12px;
+      }
+      .vd-related__title {
+        display: flex;
+        align-items: center;
+        gap: 6px;
+        font-size: 12px;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.03em;
+        color: #6d28d9;
+        margin-bottom: 8px;
+      }
+      .vd-table--related td {
+        background: #faf5ff;
+      }
+      .vd-related__hint {
+        margin: 6px 0 0;
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.5);
+      }
+      .vd-actions {
+        display: flex;
+        justify-content: flex-end;
+      }
+    `
+  ]
+})
+export class VoucherDetailDialogComponent {
+  dialogRef = inject(MatDialogRef<VoucherDetailDialogComponent>);
+  private data = inject<VoucherDetailDialogData>(MAT_DIALOG_DATA);
+
+  detail = this.data.detail;
+}

src/app/cashier/reconciliation/reconciliation.component.html

@@ -19,34 +19,21 @@
     <!-- ── Entry Tab ── -->
     <mat-tab label="New Reconciliation">
       <div class="pg-tab-body">
+        @if (ownCashierMissing) {
+          <div class="pg-empty">
+            Your login is not linked to a cashier, so there is no cash drawer to reconcile. Ask an administrator to link
+            your user to a cashier.
+          </div>
+        }
         <div class="pg-toolbar pg-toolbar--mat">
-          @if (tellers.length === 1) {
-            <mat-form-field appearance="outline" subscriptSizing="dynamic">
-              <mat-label>Teller</mat-label>
-              <input matInput type="text" [value]="tellers[0].name" readonly />
-            </mat-form-field>
-          } @else {
-            <mat-form-field appearance="outline" subscriptSizing="dynamic">
-              <mat-label>Teller</mat-label>
-              <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
-                @for (t of tellers; track t.id) {
-                  <mat-option [value]="t.id">{{ t.name }}</mat-option>
-                }
-              </mat-select>
-            </mat-form-field>
-          }
-
+          <!-- A reconciliation is the cashier's own count of their own drawer: nothing to pick. -->
           <mat-form-field appearance="outline" subscriptSizing="dynamic">
-            <mat-label>Cashier</mat-label>
-            <mat-select
-              [value]="selectedCashierId"
-              (selectionChange)="onCashierSelect($event.value)"
-              [disabled]="!selectedTellerId"
-            >
-              @for (c of cashiers; track c.id) {
-                <mat-option [value]="c.id">{{ c.label }}</mat-option>
-              }
-            </mat-select>
+            <mat-label>Teller</mat-label>
+            <input matInput type="text" [value]="ownTellerName || '—'" readonly />
+          </mat-form-field>
+          <mat-form-field appearance="outline" subscriptSizing="dynamic">
+            <mat-label>Cashier (You)</mat-label>
+            <input matInput type="text" [value]="cashierName || '—'" readonly />
           </mat-form-field>
 
           <mat-form-field appearance="outline" subscriptSizing="dynamic">

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

@@ -12,12 +12,12 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 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;
@@ -57,7 +57,6 @@ interface ReconRecord {
     MatIconModule,
     MatSnackBarModule,
     MatFormFieldModule,
-    MatSelectModule,
     MatInputModule,
     MatTabsModule
   ]
@@ -66,9 +65,14 @@ export class ReconciliationComponent implements OnInit {
   private service = inject(CashierService);
   private snackBar = inject(MatSnackBar);
 
+  /**
+   * A reconciliation is the cashier's own count of their own drawer, so nobody else makes one and there is
+   * no cashier to pick: the screen is fixed to the logged-in cashier. The server refuses anything else.
+   */
+  ownCashierMissing = false;
+  ownTellerName = '';
+
   // ── Entry form ──
-  tellers: { id: number; name: string }[] = [];
-  cashiers: { id: number; label: string }[] = [];
   selectedTellerId: number | null = null;
   selectedCashierId: number | null = null;
   cashierName = '';
@@ -85,44 +89,30 @@ 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()
-      .pipe(catchError(() => of([] as any[])))
-      .subscribe((list) => {
-        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
-        if (this.tellers.length === 1) {
-          this.onTellerSelect(this.tellers[0].id);
-        }
-      });
+    this.lockToOwnCashier();
     this.loadHistory();
   }
 
-  onTellerSelect(tellerId: number): void {
-    this.selectedTellerId = tellerId;
-    this.selectedCashierId = null;
-    this.cashierName = '';
-    this.cashiers = [];
-    this.rows = [];
-    if (!tellerId) return;
-    this.service
-      .getCashiersForTeller(tellerId)
-      .pipe(catchError(() => of({ cashiers: [] })))
-      .subscribe((r: any) => {
-        this.cashiers = (r?.cashiers || []).map((c: any) => ({ id: c.id, label: c.staffName }));
-        if (this.cashiers.length === 1) {
-          this.onCashierSelect(this.cashiers[0].id);
-        }
-      });
-  }
-
-  onCashierSelect(cashierId: number): void {
-    this.selectedCashierId = cashierId;
-    const c = this.cashiers.find((x) => x.id === cashierId);
-    this.cashierName = c ? c.label : '';
-    this.rows = [];
-    this.fetchExpected();
+  /** Take the logged-in cashier as the one being reconciled, with their counter for the record. */
+  private lockToOwnCashier(): void {
+    this.service.getCurrentCashierInfo().subscribe((info) => {
+      if (!info) {
+        this.ownCashierMissing = true;
+        return;
+      }
+      this.selectedCashierId = info.cashierId;
+      this.cashierName = info.cashierName;
+      this.service
+        .getInterCashierCashierSummary(info.cashierId, this.reconDate)
+        .pipe(catchError(() => of(null)))
+        .subscribe((r: any) => {
+          this.selectedTellerId = r?.tellerId ?? null;
+          this.ownTellerName = r?.tellerName || '';
+        });
+      this.fetchExpected();
+    });
   }
 
   fetchExpected(): void {

src/app/cashier/share-collection/share-collection.component.html

@@ -1,375 +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/.
--->
-
-<div class="pg">
-  <!-- ── HEADER ── -->
-  <header class="pg-head">
-    <div>
-      <div class="pg-eyebrow">CASHIER · SHARE COLLECTION</div>
-      <h1 class="pg-title">Share Collection</h1>
-      <p class="pg-sub">
-        Collect cash from member for share purchase — amounts are held in Sundry GL until the account is activated.
-      </p>
-    </div>
-  </header>
-
-  <!-- ── SEARCH BAR ── -->
-  @if (pageState !== 'success') {
-    <div class="sc-search-bar">
-      <div class="sc-search-bar__input-wrap">
-        <mat-icon class="sc-search-bar__icon">search</mat-icon>
-        <input
-          class="sc-search-bar__input"
-          type="text"
-          placeholder="Enter Share Account ID or Account No."
-          [(ngModel)]="accountInput"
-          (keyup.enter)="searchAccount()"
-        />
-      </div>
-      <button
-        type="button"
-        class="pg-btn pg-btn--primary"
-        [disabled]="pageState === 'searching' || !accountInput.trim()"
-        (click)="searchAccount()"
-      >
-        <mat-icon>manage_search</mat-icon>
-        {{ pageState === 'searching' ? 'Searching…' : 'Search' }}
-      </button>
-    </div>
-  }
-
-  <!-- ── ERROR ── -->
-  @if (errorMsg) {
-    <div class="sc-alert sc-alert--error">
-      <mat-icon>error_outline</mat-icon>
-      <span>{{ errorMsg }}</span>
-    </div>
-  }
-
-  <!-- ── SEARCHING SPINNER ── -->
-  @if (pageState === 'searching') {
-    <div class="pg-empty">
-      <mat-icon class="sc-spin">hourglass_empty</mat-icon>
-      <p>Looking up account…</p>
-    </div>
-  }
-
-  <!-- ── ACCOUNT LOADED ── -->
-  @if (pageState === 'loaded') {
-    <!-- Member Card -->
-    <div class="sc-member-card">
-      <div class="sc-member-card__avatar">
-        <mat-icon>person</mat-icon>
-      </div>
-      <div class="sc-member-card__info">
-        <div class="sc-member-card__name">{{ account.clientName }}</div>
-        <div class="sc-member-card__meta">
-          <span class="sc-badge sc-badge--account">{{ account.accountNo }}</span>
-          <span class="sc-badge sc-badge--product">{{ account.productName }}</span>
-          <span
-            class="sc-badge"
-            [class.sc-badge--pending]="account.status?.code?.includes('pending')"
-            [class.sc-badge--active]="account.status?.code?.includes('active')"
-            >{{ account.status?.value }}</span
-          >
-        </div>
-      </div>
-
-      <!-- Editable Shares + Price -->
-      <div class="sc-member-card__shares">
-        <div class="sc-shares-inputs">
-          <div class="sc-shares-field">
-            <label class="sc-shares-label">No. of Shares</label>
-            <input
-              class="sc-shares-input"
-              type="number"
-              min="0"
-              [(ngModel)]="requestedSharesInput"
-              (input)="recalc()"
-              placeholder="0"
-            />
-          </div>
-          <div class="sc-shares-sep">×</div>
-          <div class="sc-shares-field">
-            <label class="sc-shares-label">Price / Share (₹)</label>
-            <input
-              class="sc-shares-input"
-              type="number"
-              min="0"
-              [(ngModel)]="pricePerShare"
-              (input)="recalc()"
-              placeholder="0.00"
-            />
-          </div>
-          <div class="sc-shares-sep">=</div>
-          <div class="sc-shares-result">
-            <div class="sc-shares-label">Share Amount</div>
-            <div class="sc-shares-total">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- Amount Breakdown + GL Preview -->
-    <div class="sc-split">
-      <!-- LEFT: Amount Breakdown -->
-      <div class="pg-card sc-breakdown">
-        <div class="sc-breakdown__header">
-          <mat-icon>receipt_long</mat-icon>
-          <span>Amount Breakdown</span>
-        </div>
-        <table class="pg-table">
-          <thead>
-            <tr>
-              <th>Description</th>
-              <th class="num">Amount</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                Share Amount
-                <span class="sc-dim">
-                  ({{ requestedSharesInput }} shares × {{ currencySymbol }}{{ pricePerShare | number: '1.2-2' }})
-                </span>
-              </td>
-              <td class="num">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</td>
-            </tr>
-            @for (charge of charges; track charge.id) {
-              <tr>
-                <td>{{ charge.name }}</td>
-                <td class="num sc-charge-amount">
-                  <input class="sc-charge-input" type="number" min="0" [(ngModel)]="charge.amount" (input)="recalc()" />
-                </td>
-              </tr>
-            }
-            @if (charges.length === 0) {
-              <tr>
-                <td colspan="2">
-                  <span class="sc-dim">No charges applicable</span>
-                </td>
-              </tr>
-            }
-          </tbody>
-          <tfoot>
-            <tr class="sc-total-row">
-              <td><strong>Total Payable</strong></td>
-              <td class="num sc-total-amount">
-                <strong>{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</strong>
-              </td>
-            </tr>
-          </tfoot>
-        </table>
-      </div>
-
-      <!-- RIGHT: GL Preview -->
-      <div class="pg-card sc-gl-preview">
-        <div class="sc-breakdown__header">
-          <mat-icon>account_tree</mat-icon>
-          <span>GL Entries Preview</span>
-        </div>
-        <table class="pg-table">
-          <thead>
-            <tr>
-              <th>Account</th>
-              <th>Dr / Cr</th>
-              <th class="num">Amount</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr class="gl-row--dr">
-              <td class="gl-acname">Cash Vault GL</td>
-              <td><span class="sc-dr-badge">Dr</span></td>
-              <td class="num gl-amt--dr">{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</td>
-            </tr>
-            <tr class="gl-row--cr">
-              <td class="gl-acname">Share Sundry GL</td>
-              <td><span class="sc-cr-badge">Cr</span></td>
-              <td class="num gl-amt--cr">{{ currencySymbol }}{{ shareAmount | number: '1.2-2' }}</td>
-            </tr>
-            @if (totalChargeAmount > 0) {
-              <tr class="gl-row--cr">
-                <td class="gl-acname">Charge Receivable GL</td>
-                <td><span class="sc-cr-badge">Cr</span></td>
-                <td class="num gl-amt--cr">{{ currencySymbol }}{{ totalChargeAmount | number: '1.2-2' }}</td>
-              </tr>
-            }
-          </tbody>
-        </table>
-        <div class="sc-gl-note">
-          <mat-icon>info_outline</mat-icon>
-          Funds move to Share GL &amp; Income GL when account is <strong>activated</strong>.
-        </div>
-      </div>
-    </div>
-
-    <!-- ── DENOMINATION (Cash Only) ── -->
-    @if (isCashPayment && allDenominations.length > 0) {
-      <div class="pg-card sc-denom">
-        <div class="sc-breakdown__header">
-          <mat-icon>payments</mat-icon>
-          <span>Denomination Entry</span>
-          @if (denominationTotal > 0) {
-            <span
-              class="sc-denom-badge"
-              [class.sc-denom-badge--match]="denomMatchesTotal"
-              [class.sc-denom-badge--mismatch]="!denomMatchesTotal"
-            >
-              ₹{{ denominationTotal | number: '1.2-2' }}
-              {{ denomMatchesTotal ? '✓ Matches' : '≠ Mismatch' }}
-            </span>
-          }
-          @if (denominationTotal === 0) {
-            <span class="sc-denom-required">⚠ Required for Cash</span>
-          }
-        </div>
-        <div class="sc-denom-body">
-          <table class="pg-table sc-denom-table">
-            <thead>
-              <tr>
-                <th>Denomination</th>
-                <th class="num">Count</th>
-                <th class="num">Amount</th>
-              </tr>
-            </thead>
-            <tbody>
-              @for (d of allDenominations; track d.id) {
-                <tr>
-                  <td>
-                    <span class="sc-denom-chip" [class.sc-denom-chip--coin]="d.kind === 'coin'">{{ d.label }}</span>
-                  </td>
-                  <td class="num">
-                    <div class="sc-denom-stepper">
-                      <button type="button" (click)="bumpDenom(d, -1)" [disabled]="countFor(d) === 0">−</button>
-                      <input
-                        type="number"
-                        min="0"
-                        [value]="countFor(d) || ''"
-                        placeholder="0"
-                        (input)="onDenomChange(d, $any($event.target).value)"
-                      />
-                      <button type="button" (click)="bumpDenom(d, 1)">+</button>
-                    </div>
-                  </td>
-                  <td class="num">{{ subtotalFor(d) > 0 ? (subtotalFor(d) | number: '1.2-2') : '—' }}</td>
-                </tr>
-              }
-            </tbody>
-            <tfoot>
-              <tr>
-                <td><strong>Total</strong></td>
-                <td></td>
-                <td class="num">
-                  <strong>₹{{ denominationTotal | number: '1.2-2' }}</strong>
-                </td>
-              </tr>
-            </tfoot>
-          </table>
-          @if (!denomMatchesTotal && denominationTotal > 0) {
-            <div class="sc-denom-mismatch">
-              <mat-icon>warning</mat-icon>
-              Denomination ₹{{ denominationTotal | number: '1.2-2' }} must equal Total Payable ₹{{
-                totalAmount | number: '1.2-2'
-              }}.
-            </div>
-          }
-          @if (denominationTotal > 0) {
-            <div class="sc-denom-actions">
-              <button type="button" class="pg-btn pg-btn--ghost" (click)="clearDenominations()">
-                <mat-icon>clear</mat-icon> Clear
-              </button>
-            </div>
-          }
-        </div>
-      </div>
-    }
-
-    <!-- Transaction Details -->
-    <div class="pg-toolbar pg-toolbar--mat">
-      <mat-form-field appearance="outline" subscriptSizing="dynamic">
-        <mat-label>Transaction Date *</mat-label>
-        <input matInput type="date" [(ngModel)]="transactionDate" />
-      </mat-form-field>
-
-      <mat-form-field appearance="outline" subscriptSizing="dynamic">
-        <mat-label>Payment Mode</mat-label>
-        <mat-select [(ngModel)]="paymentTypeId">
-          <mat-option [value]="null">— Cash (Default) —</mat-option>
-          @for (pt of paymentTypes; track pt.id) {
-            <mat-option [value]="pt.id">{{ pt.name }}</mat-option>
-          }
-        </mat-select>
-      </mat-form-field>
-
-      <mat-form-field appearance="outline" subscriptSizing="dynamic" class="pg-note-field">
-        <mat-label>Note (Optional)</mat-label>
-        <input matInput type="text" [(ngModel)]="note" placeholder="e.g. Share purchase for 100 shares" />
-      </mat-form-field>
-    </div>
-
-    <!-- Footer Submit Bar -->
-    <div class="pg-total-bar sc-footer">
-      <div class="sc-footer__summary">
-        <span class="sc-footer__label">Total to Collect</span>
-        <span class="sc-footer__amount">{{ currencySymbol }}{{ totalAmount | number: '1.2-2' }}</span>
-      </div>
-      <div class="sc-footer__actions">
-        <button type="button" class="pg-btn pg-btn--ghost" (click)="reset()"><mat-icon>close</mat-icon> Cancel</button>
-        <button type="button" class="pg-btn pg-btn--primary" [disabled]="!isValid || saving" (click)="submit()">
-          <mat-icon>payments</mat-icon>
-          {{ saving ? 'Posting…' : 'Collect & Post' }}
-        </button>
-      </div>
-    </div>
-  }
-
-  <!-- ── SUCCESS ── -->
-  @if (pageState === 'success' && collectionResult) {
-    <div class="sc-success">
-      <div class="sc-success__icon-wrap">
-        <mat-icon>check_circle</mat-icon>
-      </div>
-      <h2 class="sc-success__title">Collection Posted Successfully</h2>
-      <p class="sc-success__sub">
-        Cash of
-        <strong>{{ collectionResult.currencyCode }} {{ collectionResult.totalAmount | number: '1.2-2' }}</strong>
-        collected from <strong>{{ collectionResult.clientName }}</strong> on
-        <strong>{{ collectionResult.collectionDate }}</strong> by <strong>{{ collectionResult.collectedBy }}</strong
-        >.
-      </p>
-
-      <!-- Transaction reference -->
-      <div class="sc-success__ref">
-        <span class="sc-success__ref-label">Transaction ID</span>
-        <span class="sc-success__ref-val">{{ collectionResult.transactionId }}</span>
-      </div>
-
-      <!-- GL entries from backend -->
-      <div class="sc-success__gl">
-        @for (entry of collectionResult.glEntries; track entry.account) {
-          <div
-            class="sc-success__gl-row"
-            [class.sc-success__gl-row--dr]="entry.type === 'Dr'"
-            [class.sc-success__gl-row--cr]="entry.type === 'Cr'"
-          >
-            <span>{{ entry.type }}. {{ entry.account }}</span>
-            <span>{{ entry.currency }} {{ entry.amount | number: '1.2-2' }}</span>
-          </div>
-        }
-      </div>
-
-      <p class="sc-success__note">
-        Funds are held in Sundry GL. They will move to Share Equity GL when the account is activated.
-      </p>
-
-      <button type="button" class="pg-btn pg-btn--primary" (click)="reset()">
-        <mat-icon>add</mat-icon> New Collection
-      </button>
-    </div>
-  }
-</div>

src/app/cashier/share-collection/share-collection.component.scss

@@ -1,701 +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/.
- */
-
-// ── Search Bar ───────────────────────────────────────────────────────────────
-
-.sc-search-bar {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-  padding: 10px 14px;
-
-  &__input-wrap {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex: 1 1 auto;
-  }
-
-  &__icon {
-    color: #94a3b8;
-    font-size: 20px;
-    width: 20px;
-    height: 20px;
-    flex-shrink: 0;
-  }
-
-  &__input {
-    flex: 1 1 auto;
-    border: none;
-    outline: none;
-    font-size: 14px;
-    font-family: inherit;
-    color: #0d1b2a;
-    background: transparent;
-
-    &::placeholder {
-      color: #94a3b8;
-    }
-  }
-}
-
-// ── Alert ────────────────────────────────────────────────────────────────────
-
-.sc-alert {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  padding: 12px 16px;
-  border-radius: 10px;
-  font-size: 13px;
-  font-weight: 500;
-
-  mat-icon {
-    font-size: 20px;
-    width: 20px;
-    height: 20px;
-    flex-shrink: 0;
-  }
-
-  &--error {
-    background: #fef2f2;
-    border: 1px solid #fecaca;
-    color: #dc2626;
-  }
-}
-
-// ── Spinner ──────────────────────────────────────────────────────────────────
-
-.sc-spin {
-  animation: sc-spin 1.2s linear infinite;
-  display: block;
-  margin: 0 auto 8px;
-  font-size: 32px !important;
-  width: 32px !important;
-  height: 32px !important;
-  color: #94a3b8;
-}
-
-@keyframes sc-spin {
-  from {
-    transform: rotate(0deg);
-  }
-
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-// ── Member Card ──────────────────────────────────────────────────────────────
-
-.sc-member-card {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-  padding: 16px 20px;
-
-  &__avatar {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 48px;
-    height: 48px;
-    border-radius: 50%;
-    background: #eff6ff;
-    flex-shrink: 0;
-
-    mat-icon {
-      color: #2563eb;
-      font-size: 24px;
-      width: 24px;
-      height: 24px;
-    }
-  }
-
-  &__info {
-    flex: 1 1 auto;
-    min-width: 0;
-  }
-
-  &__name {
-    font-size: 16px;
-    font-weight: 700;
-    color: #1e293b;
-    margin-bottom: 6px;
-  }
-
-  &__meta {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 6px;
-  }
-
-  &__shares {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-  }
-}
-
-// ── Badges ───────────────────────────────────────────────────────────────────
-
-.sc-badge {
-  display: inline-flex;
-  align-items: center;
-  height: 22px;
-  padding: 0 8px;
-  border-radius: 5px;
-  font-size: 11px;
-  font-weight: 700;
-  background: #f1f5f9;
-  color: #475569;
-  border: 1px solid #e2e8f0;
-
-  &--account {
-    background: #eff6ff;
-    color: #1d4ed8;
-    border-color: #bfdbfe;
-    font-family: 'Roboto Mono', monospace;
-  }
-
-  &--product {
-    background: #f0fdf4;
-    color: #15803d;
-    border-color: #bbf7d0;
-  }
-
-  &--pending {
-    background: #fffbeb;
-    color: #d97706;
-    border-color: #fde68a;
-  }
-
-  &--active {
-    background: #f0fdf4;
-    color: #15803d;
-    border-color: #bbf7d0;
-  }
-}
-
-// ── Editable Share Inputs ────────────────────────────────────────────────────
-
-.sc-shares-inputs {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  flex-wrap: wrap;
-  justify-content: flex-end;
-}
-
-.sc-shares-field {
-  display: flex;
-  flex-direction: column;
-  gap: 3px;
-}
-
-.sc-shares-label {
-  font-size: 10px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.07em;
-  color: #94a3b8;
-}
-
-.sc-shares-input {
-  width: 110px;
-  height: 38px;
-  border: 1.5px solid #e2e8f0;
-  border-radius: 8px;
-  padding: 0 10px;
-  font-size: 14px;
-  font-weight: 700;
-  font-family: inherit;
-  color: #1353a0;
-  text-align: right;
-  outline: none;
-  background: #f8fafc;
-  transition: border-color 0.15s;
-
-  &:focus {
-    border-color: #1353a0;
-    background: #fff;
-  }
-
-  &::-webkit-outer-spin-button,
-  &::-webkit-inner-spin-button {
-    appearance: none;
-  }
-}
-
-.sc-shares-sep {
-  font-size: 20px;
-  font-weight: 300;
-  color: #94a3b8;
-  padding-top: 16px;
-}
-
-.sc-shares-result {
-  text-align: right;
-}
-
-.sc-shares-total {
-  font-size: 20px;
-  font-weight: 800;
-  color: #0f4f3c;
-  font-variant-numeric: tabular-nums;
-}
-
-// ── Editable Charge Amount ───────────────────────────────────────────────────
-
-.sc-charge-amount {
-  padding: 4px 14px !important;
-}
-
-.sc-charge-input {
-  width: 100px;
-  height: 32px;
-  border: 1.5px solid #e2e8f0;
-  border-radius: 6px;
-  padding: 0 8px;
-  font-size: 13px;
-  font-weight: 700;
-  font-family: inherit;
-  color: #1353a0;
-  text-align: right;
-  outline: none;
-  background: #f8fafc;
-  transition: border-color 0.15s;
-
-  &:focus {
-    border-color: #1353a0;
-    background: #fff;
-  }
-
-  &::-webkit-outer-spin-button,
-  &::-webkit-inner-spin-button {
-    appearance: none;
-  }
-}
-
-// ── Split Layout ─────────────────────────────────────────────────────────────
-
-.sc-split {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 16px;
-
-  @media (width <= 900px) {
-    grid-template-columns: 1fr;
-  }
-}
-
-// ── Breakdown Card ───────────────────────────────────────────────────────────
-
-.sc-breakdown {
-  &__header {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    padding: 12px 16px;
-    background: #f8fafc;
-    border-bottom: 1px solid #e2e8f0;
-    font-size: 13px;
-    font-weight: 700;
-    color: #334155;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-      color: #0f4f3c;
-    }
-  }
-}
-
-.sc-gl-preview {
-  .sc-breakdown__header {
-    mat-icon {
-      color: #1d4ed8;
-    }
-  }
-}
-
-.sc-gl-note {
-  display: flex;
-  align-items: flex-start;
-  gap: 6px;
-  padding: 10px 14px;
-  font-size: 12px;
-  color: #64748b;
-  background: #f8fafc;
-  border-top: 1px solid #e2e8f0;
-
-  mat-icon {
-    font-size: 16px;
-    width: 16px;
-    height: 16px;
-    flex-shrink: 0;
-    margin-top: 1px;
-    color: #94a3b8;
-  }
-}
-
-// ── Table helpers ────────────────────────────────────────────────────────────
-
-.sc-dim {
-  color: #94a3b8;
-  font-size: 12px;
-}
-
-.sc-total-row td {
-  background: #f8fafc;
-  border-top: 2px solid #e2e8f0;
-  font-size: 14px;
-}
-
-.sc-total-amount {
-  color: #0f4f3c;
-}
-
-// ── Dr / Cr badges ───────────────────────────────────────────────────────────
-
-.sc-dr-badge,
-.sc-cr-badge {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 32px;
-  height: 20px;
-  border-radius: 4px;
-  font-size: 11px;
-  font-weight: 800;
-  letter-spacing: 0.04em;
-}
-
-.sc-dr-badge {
-  background: #fef2f2;
-  color: #dc2626;
-  border: 1px solid #fecaca;
-}
-
-.sc-cr-badge {
-  background: #f0fdf4;
-  color: #15803d;
-  border: 1px solid #bbf7d0;
-}
-
-// ── Footer ───────────────────────────────────────────────────────────────────
-
-.sc-footer {
-  justify-content: space-between !important;
-
-  &__summary {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-  }
-
-  &__label {
-    font-size: 11px;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.07em;
-    color: #64748b;
-  }
-
-  &__amount {
-    font-size: 22px;
-    font-weight: 800;
-    color: #0f4f3c;
-    font-variant-numeric: tabular-nums;
-  }
-
-  &__actions {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-  }
-}
-
-// ── Denomination Panel ────────────────────────────────────────────────────────
-
-.sc-denom {
-  padding: 0;
-  overflow: hidden;
-}
-
-.sc-denom-body {
-  padding: 14px 16px;
-}
-
-.sc-denom-table {
-  width: 100%;
-
-  th,
-  td {
-    padding: 7px 10px;
-    font-size: 13px;
-  }
-
-  tfoot td {
-    border-top: 2px solid #e2e8f0;
-    background: #f8fafc;
-    font-size: 14px;
-  }
-}
-
-.sc-denom-chip {
-  display: inline-flex;
-  align-items: center;
-  height: 24px;
-  padding: 0 10px;
-  border-radius: 5px;
-  font-size: 12px;
-  font-weight: 700;
-  background: #eff6ff;
-  color: #1d4ed8;
-  border: 1px solid #bfdbfe;
-
-  &--coin {
-    background: #fffbeb;
-    color: #d97706;
-    border-color: #fde68a;
-  }
-}
-
-.sc-denom-stepper {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  justify-content: flex-end;
-
-  button {
-    width: 26px;
-    height: 26px;
-    border: 1.5px solid #e2e8f0;
-    border-radius: 5px;
-    background: #f8fafc;
-    color: #475569;
-    font-size: 16px;
-    line-height: 1;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0;
-
-    &:hover:not(:disabled) {
-      background: #e0f2fe;
-      border-color: #7dd3fc;
-      color: #0369a1;
-    }
-
-    &:disabled {
-      opacity: 0.35;
-      cursor: not-allowed;
-    }
-  }
-
-  input {
-    width: 62px;
-    height: 28px;
-    border: 1.5px solid #e2e8f0;
-    border-radius: 6px;
-    padding: 0 6px;
-    font-size: 13px;
-    font-weight: 600;
-    font-family: inherit;
-    text-align: right;
-    outline: none;
-    background: #fff;
-
-    &:focus {
-      border-color: #1353a0;
-    }
-
-    &::-webkit-outer-spin-button,
-    &::-webkit-inner-spin-button {
-      appearance: none;
-    }
-  }
-}
-
-.sc-denom-badge {
-  margin-left: auto;
-  display: inline-flex;
-  align-items: center;
-  height: 22px;
-  padding: 0 10px;
-  border-radius: 5px;
-  font-size: 12px;
-  font-weight: 700;
-
-  &--match {
-    background: #f0fdf4;
-    color: #15803d;
-    border: 1px solid #bbf7d0;
-  }
-
-  &--mismatch {
-    background: #fef2f2;
-    color: #dc2626;
-    border: 1px solid #fecaca;
-  }
-}
-
-.sc-denom-required {
-  margin-left: auto;
-  font-size: 12px;
-  font-weight: 700;
-  color: #d97706;
-}
-
-.sc-denom-mismatch {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  margin-top: 10px;
-  padding: 9px 12px;
-  background: #fef2f2;
-  border: 1px solid #fecaca;
-  border-radius: 8px;
-  font-size: 12px;
-  font-weight: 600;
-  color: #dc2626;
-
-  mat-icon {
-    font-size: 16px;
-    width: 16px;
-    height: 16px;
-    flex-shrink: 0;
-  }
-}
-
-.sc-denom-actions {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 10px;
-}
-
-// ── Success ──────────────────────────────────────────────────────────────────
-
-.sc-success {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  text-align: center;
-  padding: 40px 24px;
-  gap: 16px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 16px;
-
-  &__icon-wrap {
-    width: 72px;
-    height: 72px;
-    border-radius: 50%;
-    background: #f0fdf4;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    mat-icon {
-      font-size: 40px;
-      width: 40px;
-      height: 40px;
-      color: #16a34a;
-    }
-  }
-
-  &__title {
-    font-size: 22px;
-    font-weight: 700;
-    color: #1e293b;
-    margin: 0;
-  }
-
-  &__sub {
-    font-size: 14px;
-    color: #64748b;
-    max-width: 480px;
-    margin: 0;
-  }
-
-  &__ref {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    background: #f1f5f9;
-    border: 1px solid #e2e8f0;
-    border-radius: 8px;
-    padding: 8px 16px;
-  }
-
-  &__ref-label {
-    font-size: 11px;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.07em;
-    color: #94a3b8;
-    white-space: nowrap;
-  }
-
-  &__ref-val {
-    font-family: 'Roboto Mono', 'Courier New', monospace;
-    font-size: 13px;
-    font-weight: 600;
-    color: #1353a0;
-  }
-
-  &__note {
-    font-size: 12px;
-    color: #94a3b8;
-    max-width: 420px;
-    margin: 0;
-    text-align: center;
-  }
-
-  &__gl {
-    display: flex;
-    flex-direction: column;
-    gap: 6px;
-    width: 100%;
-    max-width: 400px;
-    background: #f8fafc;
-    border: 1px solid #e2e8f0;
-    border-radius: 10px;
-    padding: 14px 16px;
-  }
-
-  &__gl-row {
-    display: flex;
-    justify-content: space-between;
-    font-size: 13px;
-    font-weight: 600;
-    padding: 4px 0;
-    border-bottom: 1px dotted #e2e8f0;
-
-    &:last-child {
-      border-bottom: none;
-    }
-
-    &--dr {
-      color: #dc2626;
-    }
-
-    &--cr {
-      color: #15803d;
-    }
-  }
-}

src/app/cashier/share-collection/share-collection.component.ts

@@ -1,282 +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 { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
-import { MatIconModule } from '@angular/material/icon';
-import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatSelectModule } from '@angular/material/select';
-import { MatInputModule } from '@angular/material/input';
-import { catchError } from 'rxjs/operators';
-import { of } from 'rxjs';
-import { CashierService } from '../cashier.service';
-
-type PageState = 'idle' | 'searching' | 'loaded' | 'submitting' | 'success';
-
-interface Denomination {
-  id: number;
-  value: number;
-  kind: 'note' | 'coin';
-  label: string;
-}
-
-interface ShareCharge {
-  id: number;
-  name: string;
-  amount: number;
-  currencySymbol: string;
-}
-
-@Component({
-  selector: 'mifosx-share-collection',
-  templateUrl: './share-collection.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    './share-collection.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    RouterModule,
-    MatIconModule,
-    MatSnackBarModule,
-    MatFormFieldModule,
-    MatSelectModule,
-    MatInputModule
-  ]
-})
-export class ShareCollectionComponent implements OnInit {
-  private service = inject(CashierService);
-  private snackBar = inject(MatSnackBar);
-
-  pageState: PageState = 'idle';
-  accountInput = '';
-  transactionDate = '';
-  paymentTypeId: number | null = null;
-  paymentTypes: any[] = [];
-  note = '';
-  errorMsg = '';
-  saving = false;
-
-  account: any = null;
-  charges: ShareCharge[] = [];
-  collectionResult: any = null; // filled after successful POST
-
-  // Editable fields — cashier can override if API returns 0
-  requestedSharesInput = 0;
-  pricePerShare = 0;
-
-  // ── Denomination ────────────────────────────────────────────────────────────
-  notes: Denomination[] = [];
-  coins: Denomination[] = [];
-  denominationCounts: Record<string, number> = {};
-
-  get shareAmount(): number {
-    return this.requestedSharesInput * this.pricePerShare;
-  }
-
-  get totalChargeAmount(): number {
-    return this.charges.reduce((s, c) => s + c.amount, 0);
-  }
-
-  get totalAmount(): number {
-    return this.shareAmount + this.totalChargeAmount;
-  }
-
-  get currencySymbol(): string {
-    return this.account?.currency?.displaySymbol ?? '₹';
-  }
-
-  get isCashPayment(): boolean {
-    if (this.paymentTypeId === null) return true;
-    const pt = this.paymentTypes.find((p: any) => p.id === this.paymentTypeId);
-    return !!pt?.isCashPayment;
-  }
-
-  get allDenominations(): Denomination[] {
-    const desc = (a: Denomination, b: Denomination) => b.value - a.value;
-    return [
-      ...[...this.notes].sort(desc),
-      ...[...this.coins].sort(desc)
-    ];
-  }
-
-  get denominationTotal(): number {
-    return this.allDenominations.reduce((s, d) => s + this.subtotalFor(d), 0);
-  }
-
-  get denomMatchesTotal(): boolean {
-    return this.denominationTotal === this.totalAmount;
-  }
-
-  get isValid(): boolean {
-    if (!this.account || this.totalAmount <= 0 || !this.transactionDate) return false;
-    if (this.isCashPayment && this.allDenominations.length > 0) {
-      return this.denomMatchesTotal;
-    }
-    return true;
-  }
-
-  ngOnInit(): void {
-    const d = new Date();
-    this.transactionDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-    this.service
-      .getPaymentTypes()
-      .pipe(catchError(() => of([])))
-      .subscribe((types: any[]) => (this.paymentTypes = types || []));
-    this.loadDenominations();
-  }
-
-  private loadDenominations(): void {
-    this.service
-      .getActiveDenominations()
-      .pipe(catchError(() => of([])))
-      .subscribe((list: any[]) => {
-        const rows: Denomination[] = (list || []).map((d: any) => ({
-          id: d.id,
-          value: d.denomination ?? d.value,
-          kind: d.type === 'coin' ? 'coin' : 'note',
-          label: '₹' + (d.denomination ?? d.value)
-        }));
-        const order = (a: Denomination, b: Denomination) => b.value - a.value;
-        this.notes = rows.filter((r) => r.kind === 'note').sort(order);
-        this.coins = rows.filter((r) => r.kind === 'coin').sort(order);
-      });
-  }
-
-  // ── Denomination helpers ──────────────────────────────────────────────────
-
-  denomKey(d: Denomination): string {
-    return `${d.kind}:${d.value}`;
-  }
-
-  countFor(d: Denomination): number {
-    return this.denominationCounts[this.denomKey(d)] || 0;
-  }
-
-  subtotalFor(d: Denomination): number {
-    return this.countFor(d) * d.value;
-  }
-
-  onDenomChange(d: Denomination, raw: any): void {
-    this.denominationCounts[this.denomKey(d)] = Math.max(0, Math.floor(Number(raw) || 0));
-  }
-
-  bumpDenom(d: Denomination, delta: number): void {
-    this.denominationCounts[this.denomKey(d)] = Math.max(0, this.countFor(d) + delta);
-  }
-
-  clearDenominations(): void {
-    this.denominationCounts = {};
-  }
-
-  searchAccount(): void {
-    const query = this.accountInput.trim();
-    if (!query) return;
-    this.pageState = 'searching';
-    this.account = null;
-    this.charges = [];
-    this.errorMsg = '';
-
-    this.service
-      .getShareAccountForCollection(query)
-      .pipe(
-        catchError((err) => {
-          this.errorMsg =
-            err?.error?.errors?.[0]?.defaultUserMessage ||
-            err?.error?.developerMessage ||
-            'Account not found. Please check the account ID and try again.';
-          this.pageState = 'idle';
-          return of(null);
-        })
-      )
-      .subscribe((acc: any) => {
-        if (!acc) return;
-        this.account = acc;
-
-        // Auto-detect shares from summary or first pending purchasedShares entry
-        const pendingTx = (acc.purchasedShares || []).find(
-          (t: any) =>
-            t.status?.code === 'purchasedSharesStatusType.applied' && t.type?.code === 'purchasedSharesType.purchased'
-        );
-        this.requestedSharesInput = Number(
-          acc.summary?.totalPendingForApprovalShares || pendingTx?.numberOfShares || acc.requestedShares || 0
-        );
-        this.pricePerShare = Number(pendingTx?.purchasedPrice || acc.currentMarketPrice || acc.unitPrice || 0);
-
-        // Show ALL charges on the account — no type filtering
-        this.charges = (acc.charges || []).map((c: any) => ({
-          id: c.chargeId ?? c.id,
-          name: c.name,
-          amount: Number(c.amount ?? c.amountOutstanding ?? 0),
-          currencySymbol: c.currency?.displaySymbol ?? '₹'
-        }));
-
-        this.pageState = 'loaded';
-      });
-  }
-
-  recalc(): void {
-    // triggered by input changes — nothing extra needed, getters auto-recalculate
-  }
-
-  submit(): void {
-    if (!this.isValid || this.saving) return;
-    this.saving = true;
-    const payload = {
-      shareAccountId: this.account.id,
-      accountNo: this.account.accountNo,
-      clientName: this.account.clientName,
-      transactionDate: this.transactionDate,
-      requestedShares: this.requestedSharesInput,
-      pricePerShare: this.pricePerShare,
-      shareAmount: this.shareAmount,
-      chargeAmount: this.totalChargeAmount,
-      totalAmount: this.totalAmount,
-      paymentTypeId: this.paymentTypeId || null,
-      note: this.note || null
-    };
-
-    this.service.collectSharePayment(payload).subscribe({
-      next: (result: any) => {
-        this.collectionResult = result;
-        this.snackBar.open('Share collection posted successfully.', 'Close', { duration: 3000 });
-        this.pageState = 'success';
-        this.saving = false;
-      },
-      error: (err: any) => {
-        const msg =
-          err?.error?.errors?.[0]?.defaultUserMessage ||
-          err?.error?.developerMessage ||
-          err?.error?.defaultUserMessage ||
-          'Collection failed. Please try again.';
-        this.snackBar.open(msg, 'Close', { duration: 8000 });
-        this.saving = false;
-      }
-    });
-  }
-
-  reset(): void {
-    this.pageState = 'idle';
-    this.accountInput = '';
-    this.account = null;
-    this.charges = [];
-    this.errorMsg = '';
-    this.note = '';
-    this.paymentTypeId = null;
-    this.requestedSharesInput = 0;
-    this.pricePerShare = 0;
-    this.collectionResult = null;
-    this.saving = false;
-    this.clearDenominations();
-  }
-}

src/app/cashier/transaction-entry/cashier-issue-dd-dialog.component.ts

@@ -8,7 +8,7 @@
 
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup, FormArray, Validators } from '@angular/forms';
 import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';
@@ -35,6 +35,35 @@ export interface CashierIssueDdDialogData {
   accountNo?: string;
   /** The account holder, for the same reason. */
   accountHolderName?: string;
+  /**
+   * How many drafts this slip raises. Absent or 1 is the ordinary single draft and the dialog is
+   * unchanged; 2 or more turns it into a slip, asking for a face value, charge and beneficiary per
+   * draft and reporting the combined total the account will be debited for.
+   */
+  ddCount?: number;
+  /**
+   * Whether the funding account is a GL account rather than a member's. Only affects wording: a GL
+   * account has no passbook, so it is not promised one.
+   */
+  glFunded?: boolean;
+  /**
+   * The leaflets provisionally shown against each line of a slip.
+   *
+   * Only ever indicative. The server allocates the real numbers inside the locked transaction that
+   * submits the slip, so what is shown here is the next-available run at the moment the dialog was
+   * opened — accurate unless another clerk submits first, which is precisely why the numbers cannot
+   * be promised until submit returns them.
+   */
+  previewDdNumbers?: string[];
+}
+
+/** One captured draft on a multi-DD slip. */
+export interface DdSlipLineResult {
+  beneficiaryName: string;
+  payableAtBranch: string;
+  payableAtCity: string;
+  faceValue: number;
+  chargesAmount: number;
 }
 
 @Component({
@@ -56,10 +85,20 @@ export interface CashierIssueDdDialogData {
         <div class="dd-dialog-header__title">
           <mat-icon class="dd-icon">receipt_long</mat-icon>
           <div>
-            <h2>{{ isAccountDebit ? 'Account-Debit Demand Draft (DD)' : 'Walk-in Cash Demand Draft (DD)' }}</h2>
+            <h2>
+              @if (isSlip) {
+                Multi-DD Slip · {{ lineCount }} Demand Drafts
+              } @else {
+                {{ isAccountDebit ? 'Account-Debit Demand Draft (DD)' : 'Walk-in Cash Demand Draft (DD)' }}
+              }
+            </h2>
             <p>
-              Next available DD leaflet auto-selected ·
-              {{ isAccountDebit ? 'Enter beneficiary details' : 'Enter purchaser &amp; beneficiary details' }}
+              @if (isSlip) {
+                One debit funds all {{ lineCount }} drafts · Enter each draft's beneficiary and amount
+              } @else {
+                Next available DD leaflet auto-selected ·
+                {{ isAccountDebit ? 'Enter beneficiary details' : 'Enter purchaser &amp; beneficiary details' }}
+              }
             </p>
           </div>
         </div>
@@ -69,38 +108,91 @@ export interface CashierIssueDdDialogData {
       </div>
 
       <mat-dialog-content class="dd-dialog-body">
-        <!-- Draft & Financials Summary Card -->
-        <div class="dd-summary-card">
-          <div class="summary-col">
-            <span class="label">Auto-Selected Leaflet</span>
-            <strong class="dd-number-highlight">{{ data.leaflet.ddNumber }}</strong>
-            <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
+        <!--
+          Slip running total.
+
+          A slip's figures are not known until every line is typed — different drafts carry different
+          face values and different charges — so the total the account will be debited for is built
+          up here as the clerk works, rather than shown as a fixed figure up front. Answering "what
+          is this going to cost my member" without it would mean adding the lines by hand.
+        -->
+        @if (isSlip) {
+          <div class="dd-summary-card">
+            <div class="summary-col">
+              <span class="label">Drafts On This Slip</span>
+              <strong class="dd-number-highlight">{{ lineCount }}</strong>
+              <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col">
+              <span class="label">Total Face Value</span>
+              <strong class="amount">₹{{ slipFaceValue | number: '1.2-2' }}</strong>
+              <span class="sublabel">+ Charges ₹{{ slipCharges | number: '1.2-2' }}</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col">
+              <span class="label">GST ({{ data.gstPercentage }}%)</span>
+              <strong class="amount">₹{{ slipGst | number: '1.2-2' }}</strong>
+              <span class="sublabel">on charges only</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col highlight-col">
+              <span class="label">Total To Debit</span>
+              <strong class="total-amount">₹{{ slipTotal | number: '1.2-2' }}</strong>
+              <span class="sublabel">{{ data.accountNo || 'Account' }} · one debit</span>
+            </div>
           </div>
-          <div class="summary-divider"></div>
-          <div class="summary-col">
-            <span class="label">Face Value</span>
-            <strong class="amount">₹{{ data.faceValue | number: '1.2-2' }}</strong>
-            <span class="sublabel">+ Charges ₹{{ data.chargesAmount | number: '1.2-2' }}</span>
+
+          <!--
+            Said plainly because the numbers on screen are the one thing in this dialog the clerk
+            cannot rely on. They are the next-available run as it stood when the dialog opened; the
+            binding allocation happens inside the submit transaction, so a slip filed after another
+            clerk's gets the following numbers instead.
+          -->
+          <div class="dd-preview-note">
+            <mat-icon>info</mat-icon>
+            <div>
+              DD numbers below are <strong>provisional</strong>. The final numbers are allocated when the slip is
+              submitted and will be confirmed on the receipt.
+            </div>
           </div>
-          <div class="summary-divider"></div>
-          <div class="summary-col">
-            <span class="label">GST ({{ data.gstPercentage }}%)</span>
-            <strong class="amount">₹{{ data.gstAmount | number: '1.2-2' }}</strong>
-            <span class="sublabel">on charges only</span>
+        } @else {
+          <!-- Draft & Financials Summary Card -->
+          <div class="dd-summary-card">
+            <!-- The number the customer will actually see printed on the instrument. "Auto-Selected
+               Leaflet" named the stock item rather than the draft, so it was not obvious that this
+               is the DD number being issued. -->
+            <div class="summary-col">
+              <span class="label">DD Number Being Issued</span>
+              <strong class="dd-number-highlight">{{ data.leaflet.ddNumber }}</strong>
+              <span class="sublabel">{{ data.sponsorBankName || 'Sponsor Bank' }} · {{ data.branchName }}</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col">
+              <span class="label">Face Value</span>
+              <strong class="amount">₹{{ data.faceValue | number: '1.2-2' }}</strong>
+              <span class="sublabel">+ Charges ₹{{ data.chargesAmount | number: '1.2-2' }}</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col">
+              <span class="label">GST ({{ data.gstPercentage }}%)</span>
+              <strong class="amount">₹{{ data.gstAmount | number: '1.2-2' }}</strong>
+              <span class="sublabel">on charges only</span>
+            </div>
+            <div class="summary-divider"></div>
+            <div class="summary-col highlight-col">
+              <span class="label">{{ isAccountDebit ? 'Total Debited' : 'Total Cash Collected' }}</span>
+              <strong class="total-amount">₹{{ data.totalCashPayable | number: '1.2-2' }}</strong>
+              <span class="sublabel">
+                @if (isAccountDebit) {
+                  {{ data.accountNo || 'Account' }}
+                } @else {
+                  Denominations verified
+                }
+              </span>
+            </div>
           </div>
-          <div class="summary-divider"></div>
-          <div class="summary-col highlight-col">
-            <span class="label">{{ isAccountDebit ? 'Total Debited' : 'Total Cash Collected' }}</span>
-            <strong class="total-amount">₹{{ data.totalCashPayable | number: '1.2-2' }}</strong>
-            <span class="sublabel">
-              @if (isAccountDebit) {
-                {{ data.accountNo || 'Account' }}
-              } @else {
-                Denominations verified
-              }
-            </span>
-          </div>
-        </div>
+        }
 
         <!--
           The account funding the draft, stated before the form.
@@ -118,123 +210,237 @@ export interface CashierIssueDdDialogData {
                 · {{ data.accountHolderName }}
               }
               <div class="dd-funding-sub">
-                ₹{{ data.totalCashPayable | number: '1.2-2' }} will be debited from this account when a checker
-                approves. No cash is taken at the counter.
+                @if (isSlip) {
+                  ₹{{ slipTotal | number: '1.2-2' }} will be debited from this account as a
+                  <strong>single transaction</strong> covering all {{ lineCount }} drafts, when a checker approves the
+                  slip —
+                  <!-- A GL account has no passbook, so the reassurance a member gets is phrased for
+                       the ledger instead of promising a statement line that does not exist. -->
+                  @if (isGlFunded) {
+                    one journal entry against this GL account, not {{ lineCount }}.
+                  } @else {
+                    the member's passbook shows one entry, not {{ lineCount }}.
+                  }
+                } @else {
+                  ₹{{ data.totalCashPayable | number: '1.2-2' }} will be debited from this account when a checker
+                  approves. No cash is taken at the counter.
+                }
               </div>
             </div>
           </div>
         }
 
-        <form [formGroup]="form" class="dd-form">
-          <!--
+        <!--
+          A slip's drafts, one card each.
+
+          Face value and charge sit on the line rather than on the slip because that is how the bank
+          actually uses this: three drafts to three institutions are three different amounts, and the
+          charge is levied per draft. The server stores and posts them per line for the same reason.
+        -->
+        @if (isSlip) {
+          <form [formGroup]="slipForm" class="dd-form">
+            <div formArrayName="lines">
+              @for (lineCtrl of slipLines.controls; track $index) {
+                <div class="dd-line-card" [formGroupName]="$index">
+                  <div class="dd-line-head">
+                    <span class="dd-line-badge">DD {{ $index + 1 }} of {{ lineCount }}</span>
+                    @if (previewNumberAt($index)) {
+                      <span class="dd-line-number">No. {{ previewNumberAt($index) }} <em>(provisional)</em></span>
+                    }
+                    <span class="dd-line-total"> Debit ₹{{ lineTotalAt($index) | number: '1.2-2' }} </span>
+                  </div>
+
+                  <mat-form-field appearance="outline" class="full-width">
+                    <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
+                    <input
+                      matInput
+                      formControlName="beneficiaryName"
+                      placeholder="e.g. UNIVERSITY OF MUMBAI"
+                      maxlength="120"
+                      style="text-transform: uppercase;"
+                    />
+                    <mat-error *ngIf="lineCtrl.get('beneficiaryName')?.hasError('required')"
+                      >Beneficiary name is required</mat-error
+                    >
+                    <mat-error *ngIf="lineCtrl.get('beneficiaryName')?.hasError('maxlength')"
+                      >Max 120 characters</mat-error
+                    >
+                  </mat-form-field>
+
+                  <div class="form-row">
+                    <mat-form-field appearance="outline" class="form-field-flex">
+                      <mat-label>Payable At - Branch *</mat-label>
+                      <input
+                        matInput
+                        formControlName="payableAtBranch"
+                        placeholder="e.g. FORT BRANCH"
+                        maxlength="150"
+                        style="text-transform: uppercase;"
+                      />
+                      <mat-error *ngIf="lineCtrl.get('payableAtBranch')?.hasError('required')"
+                        >Payable Branch is required</mat-error
+                      >
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="form-field-flex">
+                      <mat-label>Payable At - City *</mat-label>
+                      <input
+                        matInput
+                        formControlName="payableAtCity"
+                        placeholder="e.g. MUMBAI"
+                        maxlength="100"
+                        style="text-transform: uppercase;"
+                      />
+                      <mat-error *ngIf="lineCtrl.get('payableAtCity')?.hasError('required')"
+                        >Payable City is required</mat-error
+                      >
+                    </mat-form-field>
+                  </div>
+
+                  <div class="form-row">
+                    <mat-form-field appearance="outline" class="form-field-flex">
+                      <mat-label>Face Value *</mat-label>
+                      <input matInput type="number" formControlName="faceValue" placeholder="0.00" />
+                      <span matPrefix>₹&nbsp;</span>
+                      <mat-error *ngIf="lineCtrl.get('faceValue')?.hasError('required')"
+                        >Face value is required</mat-error
+                      >
+                      <mat-error *ngIf="lineCtrl.get('faceValue')?.hasError('min')"
+                        >Face value must be greater than zero</mat-error
+                      >
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline" class="form-field-flex">
+                      <mat-label>Charges</mat-label>
+                      <input matInput type="number" formControlName="chargesAmount" placeholder="0.00" />
+                      <span matPrefix>₹&nbsp;</span>
+                      <mat-hint>GST ₹{{ lineGstAt($index) | number: '1.2-2' }} at {{ data.gstPercentage }}%</mat-hint>
+                      <mat-error *ngIf="lineCtrl.get('chargesAmount')?.hasError('min')"
+                        >Charges cannot be negative</mat-error
+                      >
+                    </mat-form-field>
+                  </div>
+                </div>
+              }
+            </div>
+          </form>
+        } @else {
+          <form [formGroup]="form" class="dd-form">
+            <!--
             Purchaser identity is asked for only when the bank has none: a walk-in paying cash. On an
             account debit the purchaser IS the account holder, already identified and KYC'd, and
             re-capturing a name and Aadhaar here would invite a mismatch against the account on record.
           -->
-          @if (!isAccountDebit) {
-            <div class="form-section-title">Walk-in Purchaser Details</div>
+            @if (!isAccountDebit) {
+              <div class="form-section-title">Walk-in Purchaser Details</div>
+
+              <div class="form-row">
+                <mat-form-field appearance="outline" class="form-field-flex">
+                  <mat-label>Walk-in Purchaser Name *</mat-label>
+                  <input
+                    matInput
+                    formControlName="walkinPurchaserName"
+                    placeholder="e.g. RAMESH CHANDRA"
+                    style="text-transform: uppercase;"
+                  />
+                  <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('required')"
+                    >Purchaser name is required</mat-error
+                  >
+                  <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('minlength')"
+                    >Must be at least 3 characters</mat-error
+                  >
+                </mat-form-field>
+
+                <mat-form-field appearance="outline" class="form-field-flex">
+                  <mat-label>12-Digit Aadhaar Number *</mat-label>
+                  <input
+                    matInput
+                    formControlName="walkinPurchaserAadhaar"
+                    placeholder="12-digit Aadhaar"
+                    maxlength="12"
+                  />
+                  <mat-hint>Masked to last 4 digits before storage</mat-hint>
+                  <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('required')"
+                    >Aadhaar number is required</mat-error
+                  >
+                  <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('pattern')"
+                    >Must be exactly 12 numeric digits</mat-error
+                  >
+                </mat-form-field>
+              </div>
+
+              <mat-form-field appearance="outline" class="full-width">
+                <mat-label>Purchaser Address / Location *</mat-label>
+                <input
+                  matInput
+                  formControlName="walkinPurchaserAddress"
+                  placeholder="e.g. 14, SECTOR 5, MAIN ROAD, MUMBAI"
+                  style="text-transform: uppercase;"
+                />
+                <mat-error *ngIf="form.get('walkinPurchaserAddress')?.hasError('required')"
+                  >Address is required</mat-error
+                >
+              </mat-form-field>
+            }
+
+            <!-- Beneficiary Section -->
+            <div class="form-section-title">Beneficiary & Payment Details</div>
+
+            <mat-form-field appearance="outline" class="full-width">
+              <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
+              <input
+                matInput
+                formControlName="beneficiaryName"
+                placeholder="e.g. UNIVERSITY OF MUMBAI"
+                maxlength="120"
+                style="text-transform: uppercase;"
+              />
+              <mat-error *ngIf="form.get('beneficiaryName')?.hasError('required')"
+                >Beneficiary name is required</mat-error
+              >
+              <mat-error *ngIf="form.get('beneficiaryName')?.hasError('maxlength')">Max 120 characters</mat-error>
+            </mat-form-field>
 
             <div class="form-row">
               <mat-form-field appearance="outline" class="form-field-flex">
-                <mat-label>Walk-in Purchaser Name *</mat-label>
+                <mat-label>Payable At - Branch *</mat-label>
                 <input
                   matInput
-                  formControlName="walkinPurchaserName"
-                  placeholder="e.g. RAMESH CHANDRA"
+                  formControlName="payableAtBranch"
+                  placeholder="e.g. FORT BRANCH"
+                  maxlength="150"
                   style="text-transform: uppercase;"
                 />
-                <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('required')"
-                  >Purchaser name is required</mat-error
-                >
-                <mat-error *ngIf="form.get('walkinPurchaserName')?.hasError('minlength')"
-                  >Must be at least 3 characters</mat-error
+                <mat-error *ngIf="form.get('payableAtBranch')?.hasError('required')"
+                  >Payable Branch is required</mat-error
                 >
               </mat-form-field>
 
               <mat-form-field appearance="outline" class="form-field-flex">
-                <mat-label>12-Digit Aadhaar Number *</mat-label>
+                <mat-label>Payable At - City *</mat-label>
                 <input
                   matInput
-                  formControlName="walkinPurchaserAadhaar"
-                  placeholder="12-digit Aadhaar"
-                  maxlength="12"
+                  formControlName="payableAtCity"
+                  placeholder="e.g. MUMBAI"
+                  maxlength="100"
+                  style="text-transform: uppercase;"
                 />
-                <mat-hint>Masked to last 4 digits before storage</mat-hint>
-                <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('required')"
-                  >Aadhaar number is required</mat-error
-                >
-                <mat-error *ngIf="form.get('walkinPurchaserAadhaar')?.hasError('pattern')"
-                  >Must be exactly 12 numeric digits</mat-error
-                >
+                <mat-error *ngIf="form.get('payableAtCity')?.hasError('required')">Payable City is required</mat-error>
               </mat-form-field>
             </div>
-
-            <mat-form-field appearance="outline" class="full-width">
-              <mat-label>Purchaser Address / Location *</mat-label>
-              <input
-                matInput
-                formControlName="walkinPurchaserAddress"
-                placeholder="e.g. 14, SECTOR 5, MAIN ROAD, MUMBAI"
-                style="text-transform: uppercase;"
-              />
-              <mat-error *ngIf="form.get('walkinPurchaserAddress')?.hasError('required')"
-                >Address is required</mat-error
-              >
-            </mat-form-field>
-          }
-
-          <!-- Beneficiary Section -->
-          <div class="form-section-title">Beneficiary & Payment Details</div>
-
-          <mat-form-field appearance="outline" class="full-width">
-            <mat-label>Beneficiary Name (In Favour Of) *</mat-label>
-            <input
-              matInput
-              formControlName="beneficiaryName"
-              placeholder="e.g. UNIVERSITY OF MUMBAI"
-              maxlength="120"
-              style="text-transform: uppercase;"
-            />
-            <mat-error *ngIf="form.get('beneficiaryName')?.hasError('required')"
-              >Beneficiary name is required</mat-error
-            >
-            <mat-error *ngIf="form.get('beneficiaryName')?.hasError('maxlength')">Max 120 characters</mat-error>
-          </mat-form-field>
-
-          <div class="form-row">
-            <mat-form-field appearance="outline" class="form-field-flex">
-              <mat-label>Payable At - Branch *</mat-label>
-              <input
-                matInput
-                formControlName="payableAtBranch"
-                placeholder="e.g. FORT BRANCH"
-                maxlength="150"
-                style="text-transform: uppercase;"
-              />
-              <mat-error *ngIf="form.get('payableAtBranch')?.hasError('required')"
-                >Payable Branch is required</mat-error
-              >
-            </mat-form-field>
-
-            <mat-form-field appearance="outline" class="form-field-flex">
-              <mat-label>Payable At - City *</mat-label>
-              <input
-                matInput
-                formControlName="payableAtCity"
-                placeholder="e.g. MUMBAI"
-                maxlength="100"
-                style="text-transform: uppercase;"
-              />
-              <mat-error *ngIf="form.get('payableAtCity')?.hasError('required')">Payable City is required</mat-error>
-            </mat-form-field>
-          </div>
-        </form>
+          </form>
+        }
       </mat-dialog-content>
 
       <mat-dialog-actions class="dd-dialog-actions" align="end">
+        @if (isSlip) {
+          <span class="dd-actions-total">
+            {{ lineCount }} drafts · <strong>₹{{ slipTotal | number: '1.2-2' }}</strong> to debit
+          </span>
+        }
         <button mat-button type="button" (click)="onClose()">Cancel</button>
-        <button mat-flat-button color="primary" [disabled]="form.invalid" (click)="onSubmit()">
-          Submit for Manager Approval
+        <button mat-flat-button color="primary" [disabled]="activeForm.invalid" (click)="onSubmit()">
+          {{ isSlip ? 'Save Slip Details' : 'Save DD Details' }}
         </button>
       </mat-dialog-actions>
     </div>
@@ -392,6 +598,81 @@ export interface CashierIssueDdDialogData {
         line-height: 1.5;
         color: #64748b;
       }
+      /* One card per draft on a slip — the boundary is what stops a clerk typing line 2's
+         beneficiary against line 1's amount. */
+      .dd-line-card {
+        border: 1px solid #e2e8f0;
+        border-left: 3px solid #0369a1;
+        border-radius: 8px;
+        padding: 14px 16px 4px;
+        margin-bottom: 14px;
+        background: #fcfdff;
+      }
+      .dd-line-head {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        flex-wrap: wrap;
+        margin-bottom: 12px;
+      }
+      .dd-line-badge {
+        font-size: 11px;
+        font-weight: 700;
+        text-transform: uppercase;
+        letter-spacing: 0.4px;
+        color: #ffffff;
+        background: #0369a1;
+        padding: 3px 9px;
+        border-radius: 999px;
+      }
+      .dd-line-number {
+        font-family: monospace;
+        font-size: 12px;
+        color: #475569;
+      }
+      .dd-line-number em {
+        font-style: normal;
+        color: #94a3b8;
+        font-size: 11px;
+      }
+      .dd-line-total {
+        margin-left: auto;
+        font-size: 12px;
+        font-weight: 600;
+        color: #065f46;
+        background: #ecfdf5;
+        border: 1px solid #a7f3d0;
+        padding: 3px 10px;
+        border-radius: 6px;
+      }
+      .dd-preview-note {
+        display: flex;
+        gap: 8px;
+        align-items: flex-start;
+        margin: 0 0 16px;
+        padding: 9px 12px;
+        background: #fffbeb;
+        border: 1px solid #fde68a;
+        border-radius: 6px;
+        font-size: 12px;
+        line-height: 1.5;
+        color: #78350f;
+      }
+      .dd-preview-note mat-icon {
+        color: #b45309;
+        font-size: 18px;
+        width: 18px;
+        height: 18px;
+        flex-shrink: 0;
+      }
+      .dd-actions-total {
+        margin-right: auto;
+        font-size: 13px;
+        color: #475569;
+      }
+      .dd-actions-total strong {
+        color: #065f46;
+      }
     `
   ]
 })
@@ -401,13 +682,127 @@ export class CashierIssueDdDialogComponent implements OnInit {
   public data: CashierIssueDdDialogData = inject(MAT_DIALOG_DATA);
 
   form!: FormGroup;
+  /** Built only in slip mode; `form` stays untouched so the single-draft path is unchanged. */
+  slipForm!: FormGroup;
 
   /** Whether the draft is funded by debiting a member's account rather than by cash at the counter. */
   get isAccountDebit(): boolean {
     return this.data.paymentMethod === 'ACCOUNT_DEBIT';
   }
 
+  /** How many drafts this dialog is capturing — 1 unless the clerk asked for a slip. */
+  get lineCount(): number {
+    const n = Number(this.data.ddCount) || 1;
+    return n > 1 ? n : 1;
+  }
+
+  /** Whether this dialog is capturing a multi-DD slip rather than a single draft. */
+  get isSlip(): boolean {
+    return this.lineCount > 1;
+  }
+
+  /** Whether the debit lands on a GL account rather than a member's — wording only. */
+  get isGlFunded(): boolean {
+    return !!this.data.glFunded;
+  }
+
+  /** The form the Save button validates against — whichever of the two was built. */
+  get activeForm(): FormGroup {
+    return this.isSlip ? this.slipForm : this.form;
+  }
+
+  get slipLines(): FormArray {
+    return this.slipForm.get('lines') as FormArray;
+  }
+
+  /** The provisional leaflet number shown against a line, if the caller supplied a run of them. */
+  previewNumberAt(index: number): string | null {
+    return this.data.previewDdNumbers?.[index] ?? null;
+  }
+
+  private lineValueAt(index: number, field: string): number {
+    return Number(this.slipLines.at(index)?.get(field)?.value) || 0;
+  }
+
+  /**
+   * GST on one line's charge.
+   *
+   * Rounded per line, matching the server, which computes and stores GST against each draft rather
+   * than once for the slip. Summing rounded lines and rounding a summed charge can differ by a
+   * paisa, and it is the per-line figure that ends up on the draft.
+   */
+  lineGstAt(index: number): number {
+    const charges = this.lineValueAt(index, 'chargesAmount');
+    if (charges <= 0) return 0;
+    return Math.round(charges * (Number(this.data.gstPercentage) || 0)) / 100;
+  }
+
+  /** What one line adds to the debit — its face value, its charge and the GST on that charge. */
+  lineTotalAt(index: number): number {
+    return this.lineValueAt(index, 'faceValue') + this.lineValueAt(index, 'chargesAmount') + this.lineGstAt(index);
+  }
+
+  get slipFaceValue(): number {
+    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineValueAt(i, 'faceValue'), 0);
+  }
+
+  get slipCharges(): number {
+    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineValueAt(i, 'chargesAmount'), 0);
+  }
+
+  get slipGst(): number {
+    return this.slipLines.controls.reduce((sum, _c, i) => sum + this.lineGstAt(i), 0);
+  }
+
+  /** The figure the account is debited for — rounded up to the whole rupee, as the single flow does. */
+  get slipTotal(): number {
+    return Math.ceil(this.slipFaceValue + this.slipCharges + this.slipGst - 1e-9);
+  }
+
   ngOnInit(): void {
+    if (this.isSlip) {
+      this.slipForm = this.fb.group({
+        lines: this.fb.array(
+          Array.from({ length: this.lineCount }, () =>
+            this.fb.group({
+              beneficiaryName: [
+                '',
+                [
+                  Validators.required,
+                  Validators.maxLength(120)
+                ]
+              ],
+              payableAtBranch: [
+                '',
+                [Validators.required]
+              ],
+              payableAtCity: [
+                '',
+                [Validators.required]
+              ],
+              // Zero is rejected rather than merely warned about: the server refuses a line with a
+              // face value at or below zero, and a slip that fails there has already cost the clerk
+              // every other line they typed.
+              faceValue: [
+                null as
+                  | number
+                  | null,
+                [
+                  Validators.required,
+                  Validators.min(0.01)
+                ]
+              ],
+              chargesAmount: [
+                0,
+                [Validators.min(0)]
+              ]
+            })
+          )
+        )
+      });
+      return;
+    }
+
     // Walk-in identity is required for cash and rejected outright for an account debit — the server
     // refuses a walk-in name alongside an account — so the controls are only built when they apply.
     // Registering them unconditionally and merely hiding them would hold the form invalid on a
@@ -474,7 +869,25 @@ export class CashierIssueDdDialogComponent implements OnInit {
   }
 
   onSubmit(): void {
-    if (this.form.invalid) return;
+    if (this.activeForm.invalid) return;
+
+    // A slip closes with its lines. There is no walk-in branch here: a slip is only ever offered on
+    // a member-account debit, where the purchaser is the account holder already on record.
+    if (this.isSlip) {
+      const lines: DdSlipLineResult[] = this.slipLines.controls.map((c) => {
+        const v = c.value;
+        return {
+          beneficiaryName: (v.beneficiaryName || '').trim().toUpperCase(),
+          payableAtBranch: (v.payableAtBranch || '').trim().toUpperCase(),
+          payableAtCity: (v.payableAtCity || '').trim().toUpperCase(),
+          faceValue: Number(v.faceValue) || 0,
+          chargesAmount: Number(v.chargesAmount) || 0
+        };
+      });
+      this.dialogRef.close({ lines });
+      return;
+    }
+
     const val = this.form.value;
     const beneficiary = {
       beneficiaryName: (val.beneficiaryName || '').trim().toUpperCase(),

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

@@ -117,6 +117,8 @@
                       <select
                         class="ws-f__ctl"
                         [(ngModel)]="row.typ"
+                        [disabled]="isTypLocked(row)"
+                        [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                         (click)="$event.stopPropagation()"
                         (change)="onTypChange(row)"
                       >
@@ -127,11 +129,16 @@
                     </div>
                     <div class="ws-f ws-f--branch">
                       <label class="ws-f__lbl" title="Branch">BRANCH</label>
-                      <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                        <option [ngValue]="1">001 · Main</option>
-                        <option [ngValue]="2">002 · M.G. Road</option>
-                        <option [ngValue]="14">014 · Station Rd</option>
-                        <option [ngValue]="27">027 · Industrial</option>
+                      <select
+                        class="ws-f__ctl"
+                        [(ngModel)]="row.br"
+                        [disabled]="branches.length <= 1 && branchSelectOptions.length <= 1"
+                        [title]="branches.length <= 1 && branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
+                        (click)="$event.stopPropagation()"
+                      >
+                        @for (b of branchSelectOptions; track b.id) {
+                          <option [ngValue]="b.id">{{ b.name }}</option>
+                        }
                       </select>
                     </div>
                     @if (row.typ === 'DD') {
@@ -166,23 +173,44 @@
                     </div>
                     <div class="ws-f ws-f--actyp">
                       <label class="ws-f__lbl" title="Account Type">AC. TP.</label>
-                      <select
-                        class="ws-f__ctl"
-                        [(ngModel)]="row.acTyp"
-                        (click)="$event.stopPropagation()"
-                        (change)="
-                          row.acTyp === 'GL' &&
-                            row.typ !== 'Disbursement' &&
-                            row.typ !== 'Fund Transfer' &&
-                            row.typ !== 'Enter Bank Transfer' &&
-                            (row.dbCr = 'Cr')
-                        "
-                      >
-                        @for (a of acTypOptions; track a) {
-                          <option [value]="a">{{ a }}</option>
-                        }
-                      </select>
+                      @if (acTypLockedByToken && row === selectedRow) {
+                        <span
+                          class="ws-f__ctl ws-f__ctl--locked"
+                          title="Locked — filled from a token-driven request, not a normal account entry"
+                          >{{ acTypLockedLabel }}</span
+                        >
+                      } @else {
+                        <select
+                          class="ws-f__ctl"
+                          [(ngModel)]="row.acTyp"
+                          (click)="$event.stopPropagation()"
+                          (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
+                        >
+                          @for (a of acTypOptionsFor(row); track a) {
+                            <option [value]="a">{{ a }}</option>
+                          }
+                        </select>
+                      }
                     </div>
+                    @if (showsEntryType(row)) {
+                      <div class="ws-f ws-f--paytype">
+                        <label
+                          class="ws-f__lbl ws-f__lbl--accent"
+                          title="What this money was actually collected for — checked before a share application or DD issuance can adopt this voucher"
+                          >ENTRY TYPE</label
+                        >
+                        <select
+                          class="ws-f__ctl ws-f__ctl--accent"
+                          [(ngModel)]="row.entryTypeCvId"
+                          (click)="$event.stopPropagation()"
+                        >
+                          <option [ngValue]="null">Select…</option>
+                          @for (t of entryTypeOptions; track t.id) {
+                            <option [ngValue]="t.id">{{ t.name }}</option>
+                          }
+                        </select>
+                      </div>
+                    }
                   </div>
                 </div>
 
@@ -206,14 +234,20 @@
                               ? ddGlMapping?.ddPayableGlCode || 'Auto GL'
                               : 'Account number'
                         "
-                        [readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
-                        [class.ws-f__ctl--readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
+                        [readonly]="
+                          (row.typ === 'DD' && !isDdAccountDebitRow(row)) || (acTypLockedByToken && row === selectedRow)
+                        "
+                        [class.ws-f__ctl--readonly]="
+                          (row.typ === 'DD' && !isDdAccountDebitRow(row)) || (acTypLockedByToken && row === selectedRow)
+                        "
                         [title]="
-                          isDdAccountDebitRow(row)
-                            ? 'Member account the draft is funded from'
-                            : row.typ === 'DD'
-                              ? 'Configured Sponsor DD Payable GL (Auto-selected)'
-                              : 'Account number'
+                          acTypLockedByToken && row === selectedRow
+                            ? 'Locked — filled from a token-driven request, not a normal account entry'
+                            : isDdAccountDebitRow(row)
+                              ? 'Member account the draft is funded from'
+                              : row.typ === 'DD'
+                                ? 'Configured Sponsor DD Payable GL (Auto-selected)'
+                                : 'Account number'
                         "
                       />
                     </div>
@@ -233,12 +267,7 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--dr"
                           [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                          [disabled]="
-                            row.acTyp === 'GL' &&
-                            row.typ !== 'Disbursement' &&
-                            row.typ !== 'Fund Transfer' &&
-                            row.typ !== 'Enter Bank Transfer'
-                          "
+                          [disabled]="isCreditOnly(row)"
                           (click)="row.dbCr = 'Dr'"
                         >
                           DR
@@ -247,6 +276,7 @@
                           type="button"
                           class="ws-seg__btn ws-seg__btn--cr"
                           [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
+                          [disabled]="row.typ === 'Withdrawal Slip'"
                           (click)="row.dbCr = 'Cr'"
                         >
                           CR
@@ -286,9 +316,13 @@
                           [value]="row.amount ?? ''"
                           (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                           (click)="$event.stopPropagation()"
-                          [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
-                          [readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
-                          [class.ws-amt-input--locked]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
+                          [placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
+                          [readonly]="
+                            isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
+                          "
+                          [class.ws-amt-input--locked]="
+                            isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
+                          "
                         />
                       </div>
                       @if (row.acTyp === 'SHR' && rowSharePrices[row.acNo]) {
@@ -298,6 +332,19 @@
                           }}/share</span
                         >
                       }
+                      <!-- On a slip the face value belongs to each draft, so the row total is the sum of
+                           them and is filled in by the dialog rather than typed here. A clerk-typed
+                           figure could disagree with the drafts, and the account would be debited for
+                           a total the drafts do not add up to. -->
+                      @if (isMultiDdRow(row)) {
+                        <span class="ws-f__hint">
+                          {{
+                            row.ddLines?.length
+                              ? 'Total of ' + row.ddLines?.length + ' drafts'
+                              : 'Set per draft in Fill DD Details'
+                          }}
+                        </span>
+                      }
                     </div>
                     @if (row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')) {
                       <div class="ws-f ws-f--cheqno">
@@ -377,9 +424,36 @@
                   <div class="ws-group ws-group--flex">
                     <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
                     <div class="ws-group__fields">
+                      <!-- How many drafts this one debit funds. Typed before the details are filled in,
+                           because it is what decides how many beneficiary forms the dialog presents.
+                           Offered only where the server can honour it: a member savings/current
+                           account debit, never a GL or cash draft. -->
+                      @if (canRowBeMultiDd(row)) {
+                        <div class="ws-f ws-f--amt">
+                          <label class="ws-f__lbl" title="Number of demand drafts to raise against this single debit"
+                            >NO. OF DD</label
+                          >
+                          <div class="ws-amt-wrap">
+                            <input
+                              class="ws-f__ctl ws-amt-input"
+                              type="number"
+                              min="1"
+                              [max]="maxDdSlipLines"
+                              step="1"
+                              [value]="ddCountFor(row)"
+                              (input)="onDdCountChange(row, +$any($event.target).value)"
+                              (click)="$event.stopPropagation()"
+                              placeholder="1"
+                            />
+                          </div>
+                          @if (isMultiDdRow(row)) {
+                            <span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
+                          }
+                        </div>
+                      }
                       <div class="ws-f ws-f--amt">
                         <label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
-                        <div class="ws-amt-wrap">
+                        <div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
                           <span class="ws-amt-prefix">₹</span>
                           <input
                             class="ws-f__ctl ws-amt-input"
@@ -388,8 +462,15 @@
                             (input)="row.ddCharges = +$any($event.target).value"
                             (click)="$event.stopPropagation()"
                             placeholder="0.00"
+                            [readonly]="isMultiDdRow(row)"
+                            [class.ws-amt-input--locked]="isMultiDdRow(row)"
                           />
                         </div>
+                        <!-- Charges are levied per draft and can differ between them, so on a slip they
+                             are entered against each draft and totalled here. -->
+                        @if (isMultiDdRow(row)) {
+                          <span class="ws-f__hint">Set per draft</span>
+                        }
                       </div>
                       <div class="ws-f ws-f--amt">
                         <label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
@@ -400,7 +481,7 @@
                           <input
                             class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                             type="text"
-                            [value]="ddGstAmountFor(row) | number: '1.2-2'"
+                            [value]="ddGstDisplayFor(row)"
                             readonly
                           />
                         </div>
@@ -414,7 +495,7 @@
                           <input
                             class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                             type="text"
-                            [value]="ddTotalPayableFor(row)"
+                            [value]="ddTotalDisplayFor(row)"
                             readonly
                           />
                         </div>
@@ -427,13 +508,28 @@
                           [disabled]="saving"
                           (click)="openIssueWalkinDd(row); $event.stopPropagation()"
                           [title]="
-                            isDdAccountDebitRow(row)
-                              ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                              : 'Auto-selects next available leaflet and opens walk-in purchaser form'
+                            isMultiDdRow(row)
+                              ? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
+                              : isDdAccountDebitRow(row)
+                                ? 'Auto-selects next available leaflet and opens the beneficiary form'
+                                : 'Auto-selects next available leaflet and opens walk-in purchaser form'
                           "
                         >
-                          <mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
-                          <span>Fill DD Details &amp; Send for Approval</span>
+                          <mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
+                            row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
+                          }}</mat-icon>
+                          <!-- Names the leaflet once details are captured, so the clerk can see at a
+                               glance which rows are ready before pressing Save. A slip names the count
+                               instead: its numbers are not allocated until it is submitted. -->
+                          <span>{{
+                            row.ddLines?.length
+                              ? row.ddLines?.length + ' Drafts Captured · Edit Slip'
+                              : row.ddDetails
+                                ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
+                                : isMultiDdRow(row)
+                                  ? 'Fill ' + ddCountFor(row) + ' DD Details'
+                                  : 'Fill DD Details'
+                          }}</span>
                         </button>
                       </div>
                     </div>
@@ -612,70 +708,98 @@
                 <circle cx="12" cy="8" r="4" />
                 <path d="M4 20c0-4 3.6-7 8-7s8 3 8 7" />
               </svg>
-              Personal Information
+              {{ isGlAccount ? 'GL Account Information' : 'Personal Information' }}
             </div>
-            <div class="te-panel__body">
-              <div class="te-field">
-                <span class="te-label">Branch</span><span class="te-value">{{ officeName }}</span>
+            @if (isGlAccount) {
+              <div class="te-panel__body">
+                @for (f of glInfo; track f.label) {
+                  <div class="te-field">
+                    <span class="te-label">{{ f.label }}</span
+                    ><span class="te-value te-value-wrap" [class.te-mono]="f.mono">{{ f.value }}</span>
+                  </div>
+                }
               </div>
-              <div class="te-field">
-                <span class="te-label">A/c No.</span
-                ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
-              </div>
-              <div class="te-field-row">
+            } @else {
+              <div class="te-panel__body">
                 <div class="te-field">
-                  <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
+                  <span class="te-label">Branch</span
+                  ><span class="te-value">
+                    @if (isOwnBranchAccount !== null) {
+                      <span
+                        class="te-branch-chip"
+                        [class.te-branch-chip--mine]="isOwnBranchAccount"
+                        [class.te-branch-chip--other]="!isOwnBranchAccount"
+                        [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
+                      >
+                        <i class="fas fa-map-marker-alt"></i>{{ officeName }}
+                        @if (!isOwnBranchAccount) {
+                          <span class="te-branch-chip__tag">Other branch</span>
+                        }
+                      </span>
+                    } @else {
+                      {{ officeName }}
+                    }
+                  </span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Type</span
-                  ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
+                  <span class="te-label">A/c No.</span
+                  ><span class="te-value te-mono">{{ accountDetails.accountNo }}</span>
                 </div>
+                <div class="te-field">
+                  <span class="te-label">Name</span><span class="te-value te-value-name">{{ clientName }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">S/D/W/H/O</span><span class="te-value">{{ guardianName }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Address</span><span class="te-value te-value-wrap">{{ clientAddress }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Email</span><span class="te-value">{{ clientEmail }}</span>
+                </div>
+                <div class="te-field-row">
+                  <div class="te-field">
+                    <span class="te-label">Last Txn</span><span class="te-value">{{ lastTransactionDate }}</span>
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Type</span
+                    ><span class="te-value">{{ accountDetails.depositType?.value ?? selectedRow?.acTyp ?? '—' }}</span>
+                  </div>
+                </div>
+                <div class="te-field-row">
+                  <div class="te-field">
+                    <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Status</span
+                    ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
+                  </div>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
+                </div>
+                @if (isNonIndividual) {
+                  <div class="te-field">
+                    <span class="te-label">Constitution</span>
+                    <span class="te-value">{{
+                      nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
+                    }}</span>
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Incorp. No.</span>
+                    <span class="te-value te-mono">{{
+                      nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
+                    }}</span>
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Main Business</span>
+                    <span class="te-value">{{
+                      nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
+                    }}</span>
+                  </div>
+                }
               </div>
-              <div class="te-field-row">
-                <div class="te-field">
-                  <span class="te-label">Opening Dt</span><span class="te-value">{{ openingDate }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Status</span
-                  ><span class="te-value">{{ accountDetails.status?.value ?? '—' }}</span>
-                </div>
-              </div>
-              <div class="te-field">
-                <span class="te-label">CIF No.</span><span class="te-value te-mono">{{ cifNumber }}</span>
-              </div>
-              @if (isNonIndividual) {
-                <div class="te-field">
-                  <span class="te-label">Constitution</span>
-                  <span class="te-value">{{
-                    nonPersonDetails?.constitution?.name ?? nonPersonDetails?.constitutionType?.name ?? '—'
-                  }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Incorp. No.</span>
-                  <span class="te-value te-mono">{{
-                    nonPersonDetails?.incorpNo ?? nonPersonDetails?.incorporationNo ?? '—'
-                  }}</span>
-                </div>
-                <div class="te-field">
-                  <span class="te-label">Main Business</span>
-                  <span class="te-value">{{
-                    nonPersonDetails?.mainBusinessLine?.name ?? nonPersonDetails?.mainBusinessLineType?.name ?? '—'
-                  }}</span>
-                </div>
-              }
-            </div>
+            }
           </div>
 
           <!-- Joint Holders + Nominees -->
@@ -830,76 +954,78 @@
 
           <!-- Other Info + KYC + Account Balances -->
           <div class="te-panel">
-            <div class="te-panel__header">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                <rect x="3" y="4" width="18" height="18" rx="2" />
-                <line x1="16" y1="2" x2="16" y2="6" />
-                <line x1="8" y1="2" x2="8" y2="6" />
-                <line x1="3" y1="10" x2="21" y2="10" />
-              </svg>
-              Other Information
-            </div>
-            <div class="te-panel__body">
-              <div class="te-field">
-                <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
+            @if (!isGlAccount) {
+              <div class="te-panel__header">
+                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                  <rect x="3" y="4" width="18" height="18" rx="2" />
+                  <line x1="16" y1="2" x2="16" y2="6" />
+                  <line x1="8" y1="2" x2="8" y2="6" />
+                  <line x1="3" y1="10" x2="21" y2="10" />
+                </svg>
+                Other Information
               </div>
-              <div class="te-field">
-                <span class="te-label">Client ID</span
-                ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">KYC Status</span>
-                <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
-                  kycStatus
-                }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
-              </div>
-              <div class="te-field">
-                <span class="te-label">Product</span>
-                <span class="te-value">{{
-                  accountDetails.savingsProductName ||
-                    accountDetails.depositProductName ||
-                    accountDetails.productName ||
-                    '—'
-                }}</span>
-              </div>
-              @if (selectedRow?.acTyp === 'SHR') {
+              <div class="te-panel__body">
                 <div class="te-field">
-                  <span class="te-label">No. of Shares Held</span
-                  ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
+                  <span class="te-label">Phone No.</span><span class="te-value">{{ clientPhone }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Market Price / Share</span
-                  ><span class="te-value te-mono"
-                    >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
-                  >
+                  <span class="te-label">Client ID</span
+                  ><span class="te-value te-mono">{{ accountDetails.clientId }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Resolution No.</span
-                  ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
+                  <span class="te-label">PAN</span><span class="te-value te-mono">{{ panNumber }}</span>
                 </div>
                 <div class="te-field">
-                  <span class="te-label">Linked Savings A/C No.</span
-                  ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
+                  <span class="te-label">KYC Status</span>
+                  <span class="te-value" [style.color]="kycDetails?.kycStatus === 300 ? '#059669' : '#f59e0b'">{{
+                    kycStatus
+                  }}</span>
                 </div>
-                @if (accountDetails.linkedLoanAccountNo) {
+                <div class="te-field">
+                  <span class="te-label">CKYC No.</span><span class="te-value te-mono">{{ ckycNumber }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Aadhaar</span><span class="te-value te-mono">{{ aadhaarNumber }}</span>
+                </div>
+                <div class="te-field">
+                  <span class="te-label">Product</span>
+                  <span class="te-value">{{
+                    accountDetails.savingsProductName ||
+                      accountDetails.depositProductName ||
+                      accountDetails.productName ||
+                      '—'
+                  }}</span>
+                </div>
+                @if (selectedRow?.acTyp === 'SHR') {
                   <div class="te-field">
-                    <span class="te-label">Linked Loan A/C No.</span
-                    ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
+                    <span class="te-label">No. of Shares Held</span
+                    ><span class="te-value te-mono">{{ accountDetails.summary?.totalApprovedShares ?? 0 }}</span>
                   </div>
+                  <div class="te-field">
+                    <span class="te-label">Market Price / Share</span
+                    ><span class="te-value te-mono"
+                      >{{ currencySymbol }}{{ accountDetails.currentMarketPrice | number: '1.2-2' }}</span
+                    >
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Resolution No.</span
+                    ><span class="te-value te-mono">{{ accountDetails.resolutionNumber || '—' }}</span>
+                  </div>
+                  <div class="te-field">
+                    <span class="te-label">Linked Savings A/C No.</span
+                    ><span class="te-value te-mono">{{ accountDetails.savingsAccountNumber || '—' }}</span>
+                  </div>
+                  @if (accountDetails.linkedLoanAccountNo) {
+                    <div class="te-field">
+                      <span class="te-label">Linked Loan A/C No.</span
+                      ><span class="te-value te-mono">{{ accountDetails.linkedLoanAccountNo }}</span>
+                    </div>
+                  }
                 }
-              }
-            </div>
+              </div>
+            }
 
-            <div class="te-panel__header te-panel__header--mt">
+            <div class="te-panel__header" [class.te-panel__header--mt]="!isGlAccount">
               <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
                 <line x1="12" y1="1" x2="12" y2="23" />
                 <path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6" />
@@ -1092,7 +1218,24 @@
                                   : '—')
               }}</span
             >
-            <span class="te-acs-kv"><b>Branch</b> {{ officeName ?? '—' }}</span>
+            <span class="te-acs-kv"
+              ><b>Branch</b>
+              @if (isOwnBranchAccount !== null) {
+                <span
+                  class="te-branch-chip"
+                  [class.te-branch-chip--mine]="isOwnBranchAccount"
+                  [class.te-branch-chip--other]="!isOwnBranchAccount"
+                  [title]="isOwnBranchAccount ? 'Held at your branch' : 'Held at another branch'"
+                >
+                  <i class="fas fa-map-marker-alt"></i>{{ officeName }}
+                  @if (!isOwnBranchAccount) {
+                    <span class="te-branch-chip__tag">Other branch</span>
+                  }
+                </span>
+              } @else {
+                {{ officeName }}
+              }
+            </span>
             <span class="te-acs-kv"
               ><b>Product</b>
               {{
@@ -1468,6 +1611,8 @@
                           <select
                             class="ws-f__ctl"
                             [(ngModel)]="row.typ"
+                            [disabled]="isTypLocked(row)"
+                            [title]="isTypLocked(row) ? 'Token withdrawal - TYPE is fixed to Payment' : ''"
                             (click)="$event.stopPropagation()"
                             (change)="onTypChange(row)"
                           >
@@ -1478,11 +1623,16 @@
                         </div>
                         <div class="ws-f ws-f--branch">
                           <label class="ws-f__lbl">BRANCH</label>
-                          <select class="ws-f__ctl" [(ngModel)]="row.br" (click)="$event.stopPropagation()">
-                            <option [ngValue]="1">001 · Main</option>
-                            <option [ngValue]="2">002 · M.G. Road</option>
-                            <option [ngValue]="14">014 · Station Rd</option>
-                            <option [ngValue]="27">027 · Industrial</option>
+                          <select
+                            class="ws-f__ctl"
+                            [(ngModel)]="row.br"
+                            [disabled]="branches.length <= 1 && branchSelectOptions.length <= 1"
+                            [title]="branches.length <= 1 && branchSelectOptions.length <= 1 ? 'Your branch' : 'Branch'"
+                            (click)="$event.stopPropagation()"
+                          >
+                            @for (b of branchSelectOptions; track b.id) {
+                              <option [ngValue]="b.id">{{ b.name }}</option>
+                            }
                           </select>
                         </div>
                         @if (row.typ === 'DD') {
@@ -1517,23 +1667,44 @@
                         </div>
                         <div class="ws-f ws-f--actyp">
                           <label class="ws-f__lbl">AC. TP.</label>
-                          <select
-                            class="ws-f__ctl"
-                            [(ngModel)]="row.acTyp"
-                            (click)="$event.stopPropagation()"
-                            (change)="
-                              row.acTyp === 'GL' &&
-                                row.typ !== 'Disbursement' &&
-                                row.typ !== 'Fund Transfer' &&
-                                row.typ !== 'Enter Bank Transfer' &&
-                                (row.dbCr = 'Cr')
-                            "
-                          >
-                            @for (a of acTypOptions; track a) {
-                              <option [value]="a">{{ a }}</option>
-                            }
-                          </select>
+                          @if (acTypLockedByToken && row === selectedRow) {
+                            <span
+                              class="ws-f__ctl ws-f__ctl--locked"
+                              title="Locked — filled from a token-driven request, not a normal account entry"
+                              >{{ acTypLockedLabel }}</span
+                            >
+                          } @else {
+                            <select
+                              class="ws-f__ctl"
+                              [(ngModel)]="row.acTyp"
+                              (click)="$event.stopPropagation()"
+                              (change)="isCreditOnly(row) && (row.dbCr = 'Cr')"
+                            >
+                              @for (a of acTypOptionsFor(row); track a) {
+                                <option [value]="a">{{ a }}</option>
+                              }
+                            </select>
+                          }
                         </div>
+                        @if (showsEntryType(row)) {
+                          <div class="ws-f ws-f--paytype">
+                            <label
+                              class="ws-f__lbl ws-f__lbl--accent"
+                              title="What this money was actually collected for — checked before a share application or DD issuance can adopt this voucher"
+                              >ENTRY TYPE</label
+                            >
+                            <select
+                              class="ws-f__ctl ws-f__ctl--accent"
+                              [(ngModel)]="row.entryTypeCvId"
+                              (click)="$event.stopPropagation()"
+                            >
+                              <option [ngValue]="null">Select…</option>
+                              @for (t of entryTypeOptions; track t.id) {
+                                <option [ngValue]="t.id">{{ t.name }}</option>
+                              }
+                            </select>
+                          </div>
+                        }
                       </div>
                     </div>
                     <div class="ws-vdivider"></div>
@@ -1550,10 +1721,16 @@
                             [placeholder]="
                               row.typ === 'DD' ? ddGlMapping?.ddPayableGlCode || 'Auto GL' : 'Account number'
                             "
-                            [readonly]="row.typ === 'DD'"
-                            [class.ws-f__ctl--readonly]="row.typ === 'DD'"
+                            [readonly]="row.typ === 'DD' || (acTypLockedByToken && row === selectedRow)"
+                            [class.ws-f__ctl--readonly]="
+                              row.typ === 'DD' || (acTypLockedByToken && row === selectedRow)
+                            "
                             [title]="
-                              row.typ === 'DD' ? 'Configured Sponsor DD Payable GL (Auto-selected)' : 'Account number'
+                              acTypLockedByToken && row === selectedRow
+                                ? 'Locked — filled from a token-driven request, not a normal account entry'
+                                : row.typ === 'DD'
+                                  ? 'Configured Sponsor DD Payable GL (Auto-selected)'
+                                  : 'Account number'
                             "
                           />
                         </div>
@@ -1572,12 +1749,7 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--dr"
                               [class.ws-seg__btn--active-dr]="row.dbCr === 'Dr'"
-                              [disabled]="
-                                row.acTyp === 'GL' &&
-                                row.typ !== 'Disbursement' &&
-                                row.typ !== 'Fund Transfer' &&
-                                row.typ !== 'Enter Bank Transfer'
-                              "
+                              [disabled]="isCreditOnly(row)"
                               (click)="$event.stopPropagation(); row.dbCr = 'Dr'"
                             >
                               DR
@@ -1586,6 +1758,7 @@
                               type="button"
                               class="ws-seg__btn ws-seg__btn--cr"
                               [class.ws-seg__btn--active-cr]="row.dbCr === 'Cr'"
+                              [disabled]="row.typ === 'Withdrawal Slip'"
                               (click)="$event.stopPropagation(); row.dbCr = 'Cr'"
                             >
                               CR
@@ -1622,10 +1795,12 @@
                               [value]="row.amount ?? ''"
                               (input)="row.amount = +$any($event.target).value; syncShareLinkedAmounts()"
                               (click)="$event.stopPropagation()"
-                              [placeholder]="row.acTyp === 'SHR' ? '0' : '0.00'"
-                              [readonly]="!isClerk && !!(activeWithdrawalRequest || activeClosureRequest)"
+                              [placeholder]="isMultiDdRow(row) ? 'Per draft' : row.acTyp === 'SHR' ? '0' : '0.00'"
+                              [readonly]="
+                                isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
+                              "
                               [class.ws-amt-input--locked]="
-                                !isClerk && !!(activeWithdrawalRequest || activeClosureRequest)
+                                isMultiDdRow(row) || (!isClerk && !!(activeWithdrawalRequest || activeClosureRequest))
                               "
                             />
                           </div>
@@ -1636,6 +1811,19 @@
                               }}/share</span
                             >
                           }
+                          <!-- On a slip the face value belongs to each draft, so the row total is the
+                               sum of them and is filled in by the dialog rather than typed here. A
+                               clerk-typed figure could disagree with the drafts, and the account would
+                               be debited for a total the drafts do not add up to. -->
+                          @if (isMultiDdRow(row)) {
+                            <span class="ws-f__hint">
+                              {{
+                                row.ddLines?.length
+                                  ? 'Total of ' + row.ddLines?.length + ' drafts'
+                                  : 'Set per draft in Fill DD Details'
+                              }}
+                            </span>
+                          }
                         </div>
                         @if (
                           row.acTyp === 'SHR' && (row.typ === 'Enter Bank Transfer' || row.typ === 'Fund Transfer')
@@ -1700,9 +1888,38 @@
                       <div class="ws-group ws-group--flex">
                         <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
                         <div class="ws-group__fields">
+                          <!-- How many drafts this one debit funds. Typed before the details are filled
+                               in, because it is what decides how many beneficiary forms the dialog
+                               presents. Offered only where the server can honour it: a member
+                               savings/current account debit, never a GL or cash draft. -->
+                          @if (canRowBeMultiDd(row)) {
+                            <div class="ws-f ws-f--amt">
+                              <label
+                                class="ws-f__lbl"
+                                title="Number of demand drafts to raise against this single debit"
+                                >NO. OF DD</label
+                              >
+                              <div class="ws-amt-wrap">
+                                <input
+                                  class="ws-f__ctl ws-amt-input"
+                                  type="number"
+                                  min="1"
+                                  [max]="maxDdSlipLines"
+                                  step="1"
+                                  [value]="ddCountFor(row)"
+                                  (input)="onDdCountChange(row, +$any($event.target).value)"
+                                  (click)="$event.stopPropagation()"
+                                  placeholder="1"
+                                />
+                              </div>
+                              @if (isMultiDdRow(row)) {
+                                <span class="ws-f__hint">One debit · {{ ddCountFor(row) }} drafts</span>
+                              }
+                            </div>
+                          }
                           <div class="ws-f ws-f--amt">
                             <label class="ws-f__lbl" title="DD issuance charges / commission">CHARGES</label>
-                            <div class="ws-amt-wrap">
+                            <div class="ws-amt-wrap" [class.ws-amt-wrap--locked]="isMultiDdRow(row)">
                               <span class="ws-amt-prefix">₹</span>
                               <input
                                 class="ws-f__ctl ws-amt-input"
@@ -1711,8 +1928,15 @@
                                 (input)="row.ddCharges = +$any($event.target).value"
                                 (click)="$event.stopPropagation()"
                                 placeholder="0.00"
+                                [readonly]="isMultiDdRow(row)"
+                                [class.ws-amt-input--locked]="isMultiDdRow(row)"
                               />
                             </div>
+                            <!-- Charges are levied per draft and can differ between them, so on a slip
+                                 they are entered against each draft and totalled here. -->
+                            @if (isMultiDdRow(row)) {
+                              <span class="ws-f__hint">Set per draft</span>
+                            }
                           </div>
                           <div class="ws-f ws-f--amt">
                             <label class="ws-f__lbl" title="GST on charges, at the admin-configured rate">
@@ -1723,7 +1947,7 @@
                               <input
                                 class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                                 type="text"
-                                [value]="ddGstAmountFor(row) | number: '1.2-2'"
+                                [value]="ddGstDisplayFor(row)"
                                 readonly
                               />
                             </div>
@@ -1737,7 +1961,7 @@
                               <input
                                 class="ws-f__ctl ws-amt-input ws-amt-input--locked"
                                 type="text"
-                                [value]="ddTotalPayableFor(row)"
+                                [value]="ddTotalDisplayFor(row)"
                                 readonly
                               />
                             </div>
@@ -1750,13 +1974,28 @@
                               [disabled]="saving"
                               (click)="openIssueWalkinDd(row); $event.stopPropagation()"
                               [title]="
-                                isDdAccountDebitRow(row)
-                                  ? 'Auto-selects next available leaflet and opens the beneficiary form'
-                                  : 'Auto-selects next available leaflet and opens walk-in purchaser form'
+                                isMultiDdRow(row)
+                                  ? 'Opens one beneficiary form per draft; DD numbers are allocated on submission'
+                                  : isDdAccountDebitRow(row)
+                                    ? 'Auto-selects next available leaflet and opens the beneficiary form'
+                                    : 'Auto-selects next available leaflet and opens walk-in purchaser form'
                               "
                             >
-                              <mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
-                              <span>Fill DD Details &amp; Send for Approval</span>
+                              <mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
+                                row.ddDetails || row.ddLines?.length ? 'edit_note' : 'post_add'
+                              }}</mat-icon>
+                              <!-- Names what has been captured, so the clerk can see at a glance which
+                                   rows are ready before pressing Save. A slip names its count instead:
+                                   its numbers are not allocated until it is submitted. -->
+                              <span>{{
+                                row.ddLines?.length
+                                  ? row.ddLines?.length + ' Drafts Captured · Edit Slip'
+                                  : row.ddDetails
+                                    ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details'
+                                    : isMultiDdRow(row)
+                                      ? 'Fill ' + ddCountFor(row) + ' DD Details'
+                                      : 'Fill DD Details'
+                              }}</span>
                             </button>
                           </div>
                         </div>
@@ -1845,7 +2084,13 @@
               <button class="ws-btn ws-btn--ghost" type="button" (click)="onSearch()">Search</button>
               <button class="ws-btn ws-btn--mode" type="button">Change Tr.Mode</button>
               @if (isClerk) {
-                <button class="ws-btn ws-btn--add" type="button" (click)="addRow()" title="Add another transaction row">
+                <button
+                  class="ws-btn ws-btn--add"
+                  type="button"
+                  [disabled]="selectedRow?.typ === 'Withdrawal Slip'"
+                  (click)="addRow()"
+                  title="Add another transaction row"
+                >
                   <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5">
                     <line x1="12" y1="5" x2="12" y2="19" />
                     <line x1="5" y1="12" x2="19" y2="12" />

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

@@ -916,6 +916,20 @@ input.ws-f__ctl--readonly {
   font-size: 11px;
 }
 
+/* AC.TP shown as a locked label instead of the normal editable select, while the row is filled
+   from a token-driven request whose real account type row.acTyp cannot show (see
+   acTypLockedByToken in the component). */
+span.ws-f__ctl--locked {
+  display: inline-flex;
+  align-items: center;
+  background: #f1f5f9;
+  color: #475569;
+  cursor: not-allowed;
+  user-select: none;
+  font-size: 11px;
+  font-weight: 600;
+}
+
 input.ws-amt-input--locked {
   background: #fef9c3;
   color: #713f12;
@@ -3448,3 +3462,39 @@ select.te-cell {
     box-shadow: none;
   }
 }
+
+/* The branch an account is held at, coloured by where the signed-in user works: green for their own branch, red for any other. */
+.te-branch-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 2px 10px;
+  border: 1px solid transparent;
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 700;
+  white-space: nowrap;
+
+  &--mine {
+    background: #dcfce7;
+    border-color: #4ade80;
+    color: #166534;
+  }
+
+  &--other {
+    background: #fca5a5;
+    border-color: #f87171;
+    color: #7f1d1d;
+  }
+}
+
+.te-branch-chip__tag {
+  padding: 0 6px;
+  border-radius: 8px;
+  background: rgb(255 255 255 / 80%);
+  color: #7f1d1d;
+  font-size: 10px;
+  font-weight: 800;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+}

src/app/cashier/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-correction-approvals/voucher-correction-approvals.component.html

@@ -0,0 +1,170 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<div class="cv-tab-content vca-tab">
+  <!-- ── TITLE BAR ── -->
+  <div class="vca-action-bar">
+    <div class="vca-action-bar__left">
+      <mat-icon class="vca-action-bar__icon">undo</mat-icon>
+      <div>
+        <div class="vca-action-bar__title">Voucher Corrections</div>
+        <div class="vca-action-bar__sub">
+          Approve or reject a voucher unpass, and the correction entry that follows it. Only the correction approval
+          moves money.
+        </div>
+      </div>
+    </div>
+    <div class="vca-counts">
+      <span class="vca-count"
+        ><strong>{{ unpassCount }}</strong> unpass</span
+      >
+      <span class="vca-count"
+        ><strong>{{ correctionCount }}</strong> correction</span
+      >
+    </div>
+  </div>
+
+  <!-- ── FILTER BAR ── -->
+  <div class="vca-filter-bar">
+    <div class="vca-search-box">
+      <mat-icon>search</mat-icon>
+      <input type="text" placeholder="Search by voucher, account, customer or user" [(ngModel)]="searchTerm" />
+      @if (searchTerm) {
+        <button type="button" class="vca-search-box__clear" (click)="searchTerm = ''">
+          <mat-icon>close</mat-icon>
+        </button>
+      }
+    </div>
+
+    <span class="vca-fb-sep"></span>
+
+    <select class="vca-filter-select" [(ngModel)]="kindFilter">
+      @for (opt of kindOptions; track opt.value) {
+        <option [value]="opt.value">{{ opt.label }}</option>
+      }
+    </select>
+
+    <button type="button" class="vca-btn vca-btn--refresh" (click)="load()" [disabled]="loading">
+      <mat-icon>refresh</mat-icon>
+    </button>
+  </div>
+
+  <!-- ── TABLE ── -->
+  @if (loading && !loaded) {
+    <div class="vca-empty"><p class="vca-empty__title">Loading…</p></div>
+  } @else if (rows.length === 0) {
+    <div class="vca-empty">
+      <mat-icon class="vca-empty__icon">inbox</mat-icon>
+      <p class="vca-empty__title">No voucher correction waiting</p>
+      <p class="vca-empty__text">There is no unpass request or correction entry waiting for review.</p>
+    </div>
+  } @else {
+    <div class="vca-table-wrap">
+      <table class="vca-table">
+        <thead>
+          <tr>
+            <th>Voucher No</th>
+            <th>Request</th>
+            <th>Posted To (Wrong)</th>
+            <th>Correct Account</th>
+            <th class="num">Amount</th>
+            <th>Reason</th>
+            <th>Raised By</th>
+            <th>Raised At</th>
+            <th class="vca-th-action">Action</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (r of rows; track r.request.id) {
+            <tr class="vca-row">
+              <td class="vca-mono vca-voucher">{{ r.request.original_voucher_no }}</td>
+              <td>
+                <span class="vca-kind" [class]="'vca-kind vca-kind--' + r.kind">{{ kindLabel(r.kind) }}</span>
+              </td>
+              <td>
+                <div class="vca-mono">{{ r.request.wrong_account_no }}</div>
+                <div class="vca-sub">{{ r.request.wrong_client_name || '—' }}</div>
+              </td>
+              <td>
+                @if (r.kind === 'correction') {
+                  <div class="vca-mono vca-strong">{{ r.request.correct_account_no }}</div>
+                  <div class="vca-sub">{{ r.request.correct_client_name || '—' }}</div>
+                } @else {
+                  <span class="vca-none">—</span>
+                }
+              </td>
+              <td class="num vca-amount">₹{{ r.request.amount | number: '1.2-2' }}</td>
+              <td class="vca-reason" [title]="r.request.reason || ''">{{ r.request.reason || '—' }}</td>
+              <td>{{ r.raisedBy || '—' }}</td>
+              <td class="vca-dt">{{ formatDateTime(r.raisedAt) }}</td>
+              <td class="vca-action-cell">
+                <button
+                  type="button"
+                  class="vca-btn vca-btn--reject"
+                  [disabled]="busyId === r.request.id"
+                  (click)="startReject(r)"
+                >
+                  <mat-icon>close</mat-icon> Reject
+                </button>
+                <button
+                  type="button"
+                  class="vca-btn vca-btn--approve"
+                  [disabled]="busyId === r.request.id"
+                  (click)="approve(r)"
+                >
+                  <mat-icon>check</mat-icon>
+                  {{ r.kind === 'unpass' ? 'Approve unpass' : 'Approve correction' }}
+                </button>
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+</div>
+
+<!-- ─── Popup: reject with a reason ───────────────────────────────────────── -->
+<ng-template #rejectDialog>
+  @if (rejecting) {
+    <div class="vca-dlg">
+      <header class="vca-dlg__head">
+        <mat-icon class="vca-dlg__ico">block</mat-icon>
+        <div class="vca-dlg__titles">
+          <div class="vca-dlg__title">
+            Reject {{ rejecting.kind === 'unpass' ? 'unpass request' : 'correction entry' }}
+          </div>
+          <div class="vca-dlg__sub vca-mono">{{ rejecting.request.original_voucher_no }}</div>
+        </div>
+        <button type="button" class="vca-dlg__x" aria-label="Close" (click)="cancelReject()">
+          <mat-icon>close</mat-icon>
+        </button>
+      </header>
+      <div class="vca-dlg__body">
+        <label class="vca-label" for="vca-reason">Reason (required)</label>
+        <textarea
+          id="vca-reason"
+          rows="3"
+          placeholder="Why is this being rejected?"
+          [(ngModel)]="rejectReason"
+        ></textarea>
+      </div>
+      <footer class="vca-dlg__foot">
+        <button type="button" class="vca-btn vca-btn--ghost" (click)="cancelReject()">Cancel</button>
+        <button
+          type="button"
+          class="vca-btn vca-btn--reject-solid"
+          [disabled]="!rejectReason.trim() || busyId === rejecting.request.id"
+          (click)="confirmReject()"
+        >
+          Confirm reject
+        </button>
+      </footer>
+    </div>
+  }
+</ng-template>