Add Harbor login to deploy step so cross-node pull auth propagates to dev2

Deploy cbsnexora UI to dev2 node (environment==dev2 constraint)
Merge branch 'dev' of https://git.lincpay.tech/CBSNexora/cbsnexora into dev
2026-09-14 18:41:34 +05:30 · 2026-09-14 18:22:00 +05:30 · 2026-09-14 17:06:06 +05:30 · 2026-09-14 16:58:18 +05:30 · 2026-09-14 16:16:54 +05:30 · 2026-09-14 16:05:28 +05:30
247 changed files with 21585 additions and 5390 deletions
@@ -0,0 +1,302 @@
+kind: pipeline
+type: docker
+name: auto-deploy
+
+trigger:
+  branch:
+    - dev
+  event:
+    - push
+
+steps:
+
+  # ============================================================
+  # DOCKER BUILD & PUSH
+  #
+  # Angular build (npm ci + ng build) Dockerfile ke andar
+  # multi-stage me hota hai, isliye alag build step nahi chahiye.
+  # ============================================================
+  - name: docker-build-push
+    image: docker
+
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
+
+    commands:
+      - |
+        set -e
+
+        # --------------------------------------------------------
+        # Repository name comes from Drone
+        # --------------------------------------------------------
+        REPO="$${DRONE_REPO_NAME}"
+        REPO="$$(echo "$$REPO" | tr '[:upper:]' '[:lower:]')"
+
+        IMAGE="harbor.lincpay:8082/lincpay/$$REPO:$${DRONE_BUILD_NUMBER}"
+
+        echo "=========================================="
+        echo "DOCKER BUILD & PUSH"
+        echo "=========================================="
+        echo "Repository : $$REPO"
+        echo "Build      : $${DRONE_BUILD_NUMBER}"
+        echo "Image      : $$IMAGE"
+        echo "=========================================="
+
+        # --------------------------------------------------------
+        # Harbor login
+        # --------------------------------------------------------
+        echo 'QVgW5QbqlKKtBU2dYApTY28Dd6J36GK3' | \
+          docker login harbor.lincpay:8082 \
+          -u 'robot$lincpay+drone' \
+          --password-stdin
+
+        # --------------------------------------------------------
+        # Build
+        # --------------------------------------------------------
+        echo "Building Docker image..."
+
+        docker build \
+          -t "$$IMAGE" \
+          .
+
+        # --------------------------------------------------------
+        # Push
+        # --------------------------------------------------------
+        echo "Pushing Docker image..."
+
+        docker push "$$IMAGE"
+
+        echo "Docker image pushed successfully."
+
+
+  # ============================================================
+  # DEPLOY
+  # ============================================================
+  - name: deploy
+    image: docker
+
+    volumes:
+      - name: dockersock
+        path: /var/run/docker.sock
+
+      - name: envfiles
+        path: /platform-env
+
+    commands:
+      - |
+        set -e
+
+        # ========================================================
+        # REPOSITORY / SERVICE / IMAGE
+        # ========================================================
+
+        REPO="$${DRONE_REPO_NAME}"
+        REPO="$$(echo "$$REPO" | tr '[:upper:]' '[:lower:]')"
+
+        SERVICE_NAME="$${REPO}_app"
+
+        IMAGE="harbor.lincpay:8082/lincpay/$$REPO:$${DRONE_BUILD_NUMBER}"
+
+        echo "=========================================="
+        echo "DEPLOYMENT"
+        echo "=========================================="
+        echo "Repository : $$REPO"
+        echo "Service    : $$SERVICE_NAME"
+        echo "Image      : $$IMAGE"
+        echo "Placement  : node.labels.environment == dev2"
+        echo "=========================================="
+
+
+        # ========================================================
+        # VALIDATION
+        # ========================================================
+
+        if [ -z "$$REPO" ]; then
+          echo "ERROR: DRONE_REPO_NAME is empty."
+          exit 1
+        fi
+
+        if [ -z "$$SERVICE_NAME" ]; then
+          echo "ERROR: Service name is empty."
+          exit 1
+        fi
+
+        if [ -z "$$IMAGE" ]; then
+          echo "ERROR: Docker image is empty."
+          exit 1
+        fi
+
+        echo "Repository verified : $$REPO"
+        echo "Service verified    : $$SERVICE_NAME"
+        echo "Image verified      : $$IMAGE"
+
+
+        # ========================================================
+        # HARBOR LOGIN
+        #
+        # Zaroori hai taaki --with-registry-auth worker node (dev2) ko
+        # valid Harbor credentials propagate kare — warna cross-node pull
+        # "No such image" / "no basic auth credentials" se fail hota hai.
+        # ========================================================
+
+        echo 'QVgW5QbqlKKtBU2dYApTY28Dd6J36GK3' | \
+          docker login harbor.lincpay:8082 \
+          -u 'robot$lincpay+drone' \
+          --password-stdin
+
+
+        # ========================================================
+        # EXISTING SERVICE
+        # ========================================================
+
+        if docker service ls --format '{{.Name}}' | grep -Fxq "$$SERVICE_NAME"; then
+
+          echo ""
+          echo "=========================================="
+          echo "EXISTING SERVICE"
+          echo "=========================================="
+          echo "Service: $$SERVICE_NAME"
+
+
+          # ------------------------------------------------------
+          # Check whether dev constraint already exists
+          # ------------------------------------------------------
+
+          CONSTRAINT_EXISTS=$$(docker service inspect "$$SERVICE_NAME" \
+            --format '{{range .Spec.TaskTemplate.Placement.Constraints}}{{println .}}{{end}}' \
+            | grep -Fx 'node.labels.environment == dev2' || true)
+
+
+          # ------------------------------------------------------
+          # Add constraint if missing
+          # ------------------------------------------------------
+
+          if [ -z "$$CONSTRAINT_EXISTS" ]; then
+
+            echo "Constraint missing."
+            echo "Adding: node.labels.environment == dev2"
+
+            docker service update \
+              --constraint-add 'node.labels.environment == dev2' \
+              "$$SERVICE_NAME"
+
+          else
+
+            echo "Constraint already exists."
+
+          fi
+
+
+          # ------------------------------------------------------
+          # Update image
+          # ------------------------------------------------------
+
+          echo "Updating service image..."
+
+          docker service update \
+            --image "$$IMAGE" \
+            --replicas 1 \
+            --with-registry-auth \
+            "$$SERVICE_NAME"
+
+
+        # ========================================================
+        # NEW SERVICE
+        # ========================================================
+
+        else
+
+          echo ""
+          echo "=========================================="
+          echo "NEW SERVICE"
+          echo "=========================================="
+          echo "Creating: $$SERVICE_NAME"
+
+
+          # ------------------------------------------------------
+          # Traefik rule
+          #
+          # Construct it without allowing Drone to consume
+          # the shell backticks.
+          # ------------------------------------------------------
+
+          TRAEFIK_RULE='Host(`'$$REPO'.lincpay`)'
+
+          echo "Traefik rule: $$TRAEFIK_RULE"
+
+
+          # ------------------------------------------------------
+          # Create service
+          # ------------------------------------------------------
+
+          docker service create \
+            --name "$$SERVICE_NAME" \
+            --network edge-network \
+            --replicas 1 \
+            --constraint 'node.labels.environment == dev2' \
+            --with-registry-auth \
+            --env-file /platform-env/global.env \
+            --env-file /platform-env/dev.env \
+            --label traefik.enable=true \
+            --label "traefik.docker.network=edge-network" \
+            --label "traefik.http.routers.$$REPO.rule=$$TRAEFIK_RULE" \
+            --label "traefik.http.services.$$REPO.loadbalancer.server.port=80" \
+            "$$IMAGE"
+
+        fi
+
+
+        # ========================================================
+        # FINAL STATUS
+        # ========================================================
+
+        echo ""
+        echo "=========================================="
+        echo "FINAL SERVICE STATUS"
+        echo "=========================================="
+
+        docker service ls \
+          --filter "name=$$SERVICE_NAME"
+
+
+        echo ""
+        echo "=========================================="
+        echo "PLACEMENT CONSTRAINT"
+        echo "=========================================="
+
+        docker service inspect "$$SERVICE_NAME" \
+          --format '{{json .Spec.TaskTemplate.Placement}}'
+
+
+        echo ""
+        echo "=========================================="
+        echo "SERVICE TASKS"
+        echo "=========================================="
+
+        docker service ps "$$SERVICE_NAME" --no-trunc
+
+
+        echo ""
+        echo "=========================================="
+        echo "DEPLOYMENT COMPLETE"
+        echo "=========================================="
+
+
+volumes:
+
+  # ============================================================
+  # DOCKER SOCKET
+  # ============================================================
+  - name: dockersock
+    host:
+      path: /var/run/docker.sock
+
+
+  # ============================================================
+  # ENVIRONMENT FILES
+  # ============================================================
+  - name: envfiles
+    host:
+      path: /opt/platform/env
+
@@ -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
@@ -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;
+    }
+}
@@ -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: '',
@@ -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>

@@ -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);
      });
@@ -116,6 +116,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.
@@ -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;
+}
@@ -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>
@@ -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;
+  }
+}
@@ -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`);
+  }
+}
@@ -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;
+};
@@ -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>
@@ -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;
@@ -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);
  }
@@ -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" />
@@ -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;
  }
@@ -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.
@@ -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>
@@ -715,7 +718,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 +730,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>
@@ -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';
@@ -90,6 +91,8 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
  // ── Misc ──────────────────────────────────────────────────────────────────
  minDate = new Date(2000, 0, 1);
  maxDate = new Date();
+  /** Accounting features switched off for this installation — see disabled-features.ts. */
+  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;

  // ── Filter controls ───────────────────────────────────────────────────────
  officeName = new UntypedFormControl();
@@ -122,6 +122,15 @@ 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 });
+  }
+
  /** month format: yyyy-MM */
  generateCtrReport(month: string): Observable<any> {
    return this.http.post('/aml/ctr-reports/generate', { month });
@@ -13,6 +13,7 @@ import { Routes, RouterModule } from '@angular/router';
 // Not Found Component
 import { NotFoundComponent } from './not-found/not-found.component';
 import { CallbackComponent } from './zitadel/callback/callback.component';
+import { PlatformMenuAccessComponent } from './platform-admin/menu-access/menu-access.component';

 /**
 * Fallback to this route when no prior route is matched.
@@ -22,6 +23,12 @@ const routes: Routes = [
    path: 'callback',
    component: CallbackComponent
  },
+  {
+    // Platform-operator only — outside the normal login/tenant flow on purpose, see
+    // PlatformMenuAccessComponent's own doc comment for why that is safe.
+    path: 'platform-admin/menu-access',
+    component: PlatformMenuAccessComponent
+  },
  {
    path: '**',
    component: NotFoundComponent
@@ -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">
@@ -283,7 +295,7 @@
        </button>
      </div>

-      @if (isLateClose) {
+      @if (needsForceReason) {
        <p class="db-panel__warn">
          This day is being closed after its own date. It will be recorded as a
          <strong>force close</strong>, with the reason below kept permanently against it.
@@ -559,9 +571,20 @@
        </p>
      }

-      @if (isLateClose) {
+      <!-- Shown for an unreconciled cashier too, not only a late close. The backend blocks a close
+           over a cashier who took cash on this date and never reconciled it, and accepts a reason as
+           the override — but this field only appeared for a late close, so a same-day close in that
+           state had nowhere to type the reason and could not be completed at all until the date had
+           passed. -->
+      @if (isLateClose || hasUnreconciledOrUnsettledCashiers) {
        <label class="pg-field bd-panel__wide">
-          <span>Why was this day left open? (required)</span>
+          <span>
+            @if (isLateClose) {
+              Why was this day left open? (required)
+            } @else {
+              Why close over a cashier who has not reconciled? (required)
+            }
+          </span>
          <input
            type="text"
            [(ngModel)]="forceReason"
@@ -580,9 +603,58 @@
        reversed afterwards.
      </p>

+      @if (hasUnreconciledOrUnsettledCashiers) {
+        <!-- A wall on the day itself, a warning on a past one. Today the cashier is still here and
+             the cash can be counted, so nothing excuses closing over it. On a past date it cannot be
+             counted for that date at all, and blocking would leave a day nobody could ever close —
+             so it goes through on the reason a late close already requires, with the names recorded
+             against the day. -->
+        <div
+          class="pg-alert bd-reconcile-block"
+          [class.pg-alert--error]="blocksSameDayClose"
+          [class.bd-reconcile-block--warn]="!blocksSameDayClose"
+        >
+          <mat-icon>{{ blocksSameDayClose ? 'block' : 'warning' }}</mat-icon>
+          <div>
+            @if (blocksSameDayClose) {
+              <strong
+                >Cannot close today &mdash; cashiers still holding cash have not been reconciled or settled.</strong
+              >
+            } @else {
+              <strong>This day's cash was never reconciled or settled.</strong>
+            }
+            <ul class="bd-reconcile-block__list">
+              @for (detail of unreconciledOrUnsettledCashierDetails; track detail.name) {
+                <li>
+                  <strong>{{ detail.name }}</strong> —
+                  @if (detail.notReconciled && detail.notSettled) {
+                    Not Reconciled, Not Settled
+                  } @else if (detail.notReconciled) {
+                    Not Reconciled
+                  } @else {
+                    Not Settled
+                  }
+                </li>
+              }
+            </ul>
+            @if (blocksSameDayClose) {
+              <span class="db-muted"
+                >Each cashier must count their drawer, reconcile it, and settle the cash back to the vault. Then this
+                day can be closed.</span
+              >
+            } @else {
+              <span class="db-muted"
+                >The cash cannot be counted for a date that has passed. Record why above &mdash; their names are kept
+                against the record.</span
+              >
+            }
+          </div>
+        </div>
+      }
+
      <div class="db-panel__actions">
        <button type="button" class="pg-btn pg-btn--primary" (click)="submitClose()" [disabled]="!canSubmitClose">
-          {{ isLateClose ? 'Force Close Day' : 'Close Day' }}
+          {{ needsForceReason ? 'Force Close Day' : 'Close Day' }}
        </button>
        <button type="button" class="pg-btn" (click)="cancelClose()">Cancel</button>
      </div>
@@ -643,10 +715,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>
@@ -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;
@@ -295,3 +325,50 @@
    }
  }
 }
+
+/* Alert shown when cashiers holding cash have not been reconciled or settled — blocks day close. */
+.bd-reconcile-block {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  margin: 14px 0;
+  padding: 12px 16px;
+  background: #fef2f2;
+  border: 1px solid #fecaca;
+  border-left: 4px solid #dc2626;
+  border-radius: 8px;
+  color: #991b1b;
+  font-size: 12px;
+
+  mat-icon {
+    font-size: 20px;
+    width: 20px;
+    height: 20px;
+    color: #dc2626;
+    flex-shrink: 0;
+    margin-top: 1px;
+  }
+
+  &__list {
+    margin: 6px 0 6px 16px;
+    padding: 0;
+    list-style: disc;
+    font-size: 12px;
+    color: #b91c1c;
+    line-height: 1.6;
+  }
+}
+
+/* Amber, not red: an unreconciled cashier is now a reason to record why the day is being closed
+   rather than a refusal to close it at all. Red said "you cannot", which was true when the button
+   was disabled and misleading once a force close became possible. */
+.bd-reconcile-block--warn {
+  background: #fffbeb;
+  border-color: #fde68a;
+  border-left-color: #d97706;
+  color: #92400e;
+
+  mat-icon {
+    color: #d97706;
+  }
+}
@@ -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;
@@ -202,6 +209,7 @@ export class BranchDayComponent implements OnInit {
        this.today = res?.today ?? '';
        this.canOperate = !!res?.canOperate;
        this.openDate = this.today;
+        this.checkFirstOpenCashMigration();
      });

    this.service
@@ -212,9 +220,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 {
@@ -539,13 +580,74 @@ export class BranchDayComponent implements OnInit {
    return !!this.closeTarget && this.closeTarget.businessDate < this.today;
  }

+  /**
+   * True when any cashier who was given cash (currentTotal > 0) is still NOT reconciled
+   * or NOT settled — meaning outstanding cash hasn't been accounted for yet.
+   */
+  get hasUnreconciledOrUnsettledCashiers(): boolean {
+    for (const t of this.eodTellers) {
+      for (const c of t.cashiers) {
+        if (c.currentTotal > 0 && (c.reconciled === false || c.alreadySettled === false)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  /** Names of cashiers blocking the close, for the error message. */
+  get unreconciledOrUnsettledCashierDetails(): { name: string; notReconciled: boolean; notSettled: boolean }[] {
+    const result: { name: string; notReconciled: boolean; notSettled: boolean }[] = [];
+    for (const t of this.eodTellers) {
+      for (const c of t.cashiers) {
+        if (c.currentTotal > 0 && (c.reconciled === false || c.alreadySettled === false)) {
+          result.push({
+            name: c.cashierName,
+            notReconciled: c.reconciled === false,
+            notSettled: c.alreadySettled === false
+          });
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Whether a reason has to be given before the day can close.
+   *
+   * Only for a late close. Cash still sitting with a cashier is not something a reason excuses —
+   * see canSubmitClose.
+   */
+  get needsForceReason(): boolean {
+    return this.isLateClose;
+  }
+
  get canSubmitClose(): boolean {
    const hasFigure = this.closingCash != null || this.closeDenomTotal > 0;
    if (!this.closeTarget || !hasFigure || this.closing) return false;
-    return !this.isLateClose || !!this.forceReason.trim();
+    // Block while cashier/vault data is still loading — the reconciliation check can't run yet.
+    if (this.eodLoading || this.previewLoading) return false;
+    // An unreconciled cashier is a reason-required condition, not an absolute block: the backend
+    // accepts the close once a reason is recorded (and appends the cashiers' names to it), and
+    // refusing outright left a day that could never be closed at all — a cashier who reconciled on
+    // the wrong date, went on leave, or left mid-shift would strand that day and every day after it.
+    if (this.isLateClose || this.hasUnreconciledOrUnsettledCashiers) {
+      return !!this.forceReason.trim();
+    }
+    return true;
  }

  submitClose(): void {
+    if (this.eodLoading || this.previewLoading) {
+      this.errorMsg = 'Still loading the cashier and vault positions — try again in a moment.';
+      return;
+    }
+    // Safety net mirroring canSubmitClose: never send a close that the backend will refuse for a
+    // missing override reason.
+    if ((this.isLateClose || this.hasUnreconciledOrUnsettledCashiers) && !this.forceReason.trim()) {
+      this.errorMsg = 'Record why this day is being closed before submitting.';
+      return;
+    }
    const day = this.closeTarget;
    const denominations = this.denominationPayload(this.closeCounts);
    const figure = denominations.length ? this.closeDenomTotal : this.closingCash;
@@ -558,7 +660,10 @@ export class BranchDayComponent implements OnInit {
        day.businessDate,
        Number(figure),
        this.closeRemarks.trim() || undefined,
-        this.isLateClose ? this.forceReason.trim() : undefined,
+        // Sent whenever one was typed, not only on a late close: it is also the override the backend
+        // needs for a same-day close over an unreconciled cashier, and gating it on isLateClose
+        // dropped it on exactly the request that could not succeed without it.
+        this.forceReason.trim() || undefined,
        undefined,
        denominations
      )
@@ -20,8 +20,6 @@ import { CashierPositionComponent } from './cashier-position/cashier-position.co
 import { ReconciliationComponent } from './reconciliation/reconciliation.component';
 import { CashHistoryComponent } from './cash-history/cash-history.component';
 import { DayBookComponent } from './day-book/day-book.component';
-import { VoucherExceptionsComponent } from './voucher-exceptions/voucher-exceptions.component';
-import { VoucherViewComponent } from './voucher-view/voucher-view.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';
@@ -67,7 +65,7 @@ const routes: Routes = [
            import('../clerk/my-disbursement-requests/my-disbursement-requests.component').then(
              (m) => m.MyDisbursementRequestsComponent
            ),
-          data: { title: 'My Disbursement Requests', breadcrumb: 'My Disbursement Requests' }
+          data: { title: 'Disbursements & Transfer', breadcrumb: 'Disbursements & Transfer' }
        },
        {
          path: 'share-withdrawal-request',
@@ -119,6 +117,59 @@ const routes: Routes = [
            import('../clerk/photo-signature/photo-signature.component').then((m) => m.PhotoSignatureComponent),
          data: { title: 'Photo & Signature', breadcrumb: 'Photo & Signature' }
        },
+        // The same register the cashier screens use, without their cash-only filter: a clerk raises
+        // book entries — a closure settled to savings, a share redemption, an interest posting the
+        // system made on their approval — and cash-only would hide exactly those.
+        {
+          path: 'received-report',
+          component: VoucherReportComponent,
+          data: {
+            title: 'Received Vouchers',
+            breadcrumb: 'Received Vouchers',
+            side: 'CR',
+            cashOnly: false,
+            cashiersOnly: true
+          }
+        },
+        {
+          path: 'payment-report',
+          component: VoucherReportComponent,
+          data: {
+            title: 'Payment Vouchers',
+            breadcrumb: 'Payment Vouchers',
+            side: 'DR',
+            cashOnly: false,
+            cashiersOnly: true
+          }
+        },
+        // Both sides in one list, scoped to whoever is signed in — the "what did I do today"
+        // question the two registers above cannot answer, because an approval raises no voucher.
+        {
+          path: 'my-work',
+          loadComponent: () => import('../cashier/my-work/my-work.component').then((m) => m.MyWorkComponent),
+          data: { title: 'My Vouchers', breadcrumb: 'My Vouchers' }
+        },
+        {
+          path: 'end-of-day',
+          loadComponent: () =>
+            import('../cashier/end-of-day-report/end-of-day-report.component').then((m) => m.EndOfDayReportComponent),
+          data: { title: 'End of the Day Report', breadcrumb: 'End of the Day Report' }
+        },
+        // The system's own postings — interest, charges, escheats, journals. Both sides in one
+        // list: a night's run credits and debits, and splitting it across two screens would hide
+        // half of it from whichever one you opened.
+        {
+          path: 'system-vouchers',
+          component: VoucherReportComponent,
+          data: {
+            title: 'System Vouchers',
+            breadcrumb: 'System Vouchers',
+            side: 'ALL',
+            cashOnly: false,
+            cashiersOnly: false,
+            systemOnly: true
+          }
+        },
        {
          path: 'standing-instructions',
          loadComponent: () =>
@@ -174,6 +225,23 @@ const routes: Routes = [
          path: 'vault-position',
          component: VaultPositionComponent,
          data: { title: 'Vault Position', breadcrumb: 'Vault 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
+          // person's own credit, debit and net — which is the branch-level reading of the day, not
+          // a counter one.
+          path: 'day-book',
+          component: DayBookComponent,
+          data: { title: 'Day Book & Verification', breadcrumb: 'Day Book' }
+        },
+        // The one sheet the day is signed off on: the transaction summary, the drawer counted
+        // against the books, and the notes that say why it cannot be closed yet.
+        {
+          path: 'end-of-day',
+          loadComponent: () =>
+            import('./end-of-day-report/end-of-day-report.component').then((m) => m.EndOfDayReportComponent),
+          data: { title: 'End of the Day Report', breadcrumb: 'End of the Day Report' }
        }
      ]
    },
@@ -226,26 +294,52 @@ const routes: Routes = [
          component: DayBookComponent,
          data: { title: 'Day Book', breadcrumb: 'Day Book' }
        },
+        // The register is read one side at a time: Received is the CR side, Payment the DR side.
+        // Same component both times — the side it shows comes from `data.side`.
+        //
+        // `cashOnly` is what makes these the cashier's own registers rather than the whole voucher
+        // book: a cashier deals in notes and coins, so only vouchers that actually moved cash
+        // belong here, and the two reports then reconcile against the drawer and the closing
+        // report. A back-office screen wanting every voucher points at the same component without
+        // the flag.
        {
-          path: 'voucher-exceptions',
-          component: VoucherExceptionsComponent,
-          data: { title: 'Voucher Exceptions', breadcrumb: 'Voucher Exceptions' }
-        },
-        {
-          path: 'voucher',
-          component: VoucherViewComponent,
-          data: { title: 'Voucher', breadcrumb: 'Voucher' }
-        },
-        {
-          path: 'voucher-report',
+          path: 'received-report',
          component: VoucherReportComponent,
-          data: { title: 'Voucher Report', breadcrumb: 'Voucher Report' }
+          data: {
+            title: 'Received Report',
+            breadcrumb: 'Received Report',
+            side: 'CR',
+            cashOnly: true,
+            cashiersOnly: true
+          }
+        },
+        {
+          path: 'payment-report',
+          component: VoucherReportComponent,
+          data: {
+            title: 'Payment Report',
+            breadcrumb: 'Payment Report',
+            side: 'DR',
+            cashOnly: true,
+            cashiersOnly: true
+          }
+        },
+        {
+          path: 'my-work',
+          loadComponent: () => import('./my-work/my-work.component').then((m) => m.MyWorkComponent),
+          data: { title: 'My Vouchers', breadcrumb: 'My Vouchers' }
        },
        {
          path: 'closing-report',
          component: ClosingCashReportComponent,
          data: { title: 'Closing Cash Report', breadcrumb: 'Closing Cash Report' }
        },
+        {
+          path: 'end-of-day',
+          loadComponent: () =>
+            import('./end-of-day-report/end-of-day-report.component').then((m) => m.EndOfDayReportComponent),
+          data: { title: 'End of the Day Report', breadcrumb: 'End of the Day Report' }
+        },
        {
          path: 'excess-report',
          component: ExcessTransactionReportComponent,
@@ -312,6 +312,47 @@
    font-variant-numeric: tabular-nums;
    color: #0f172a;
  }
+
+  // Names the part of a total that has no row in the table below, so the figures do not read as
+  // failing to add up.
+  &__note {
+    margin-top: 2px;
+    font-size: 10px;
+    line-height: 1.4;
+    color: #64748b;
+  }
+
+  // The drawer strip sits under the counter totals and is the figure a physical count is checked
+  // against, so it is marked out as the one to read rather than a second row of the same thing.
+  &--balance {
+    margin-top: 10px;
+    border-color: #cbd5e1;
+    box-shadow: 0 1px 3px rgb(15 23 42 / 8%);
+  }
+}
+
+.closing-note {
+  margin: 8px 0 0;
+  font-size: 11px;
+  line-height: 1.5;
+  color: #64748b;
+}
+
+// Says what a row without a denomination is, next to its chip.
+.closing-row__hint {
+  margin-left: 6px;
+  font-size: 11px;
+  color: #64748b;
+}
+
+// A totals row, marked off from the rows it sums. Defined here rather than only in the day book's
+// own stylesheet, which the other cashier screens do not load.
+.pg-table tfoot td {
+  background: #f8fafc;
+  font-weight: 800;
+  font-size: 12px;
+  color: #334155;
+  border-top: 1px solid #e2e8f0;
 }

 .pg-step {
@@ -673,3 +714,15 @@
    }
  }
 }
+
+/* Names a figure strip before the reader meets it. A run of tiles ending in a total reads as
+   arithmetic to somebody who already knows the screen and as five unrelated numbers to somebody
+   who does not. */
+.closing-lede {
+  margin: 0 0 -4px;
+  font-size: 12px;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: #475569;
+}
@@ -126,66 +126,6 @@ export class CashierService {
    return this.http.get('/cashreports/day-book', { params });
  }

-  // ── Voucher physical verification & attachments ──
-  // The voucher number always travels in the body or a query parameter, never as a path segment:
-  // numbers are formatted CR/001/2108/0001 and Spring Security's strict firewall rejects the
-  // encoded slashes with a 400 before the request reaches the resource.
-
-  /** Records the outcome of checking a voucher against the paper slip. */
-  verifyVoucher(
-    voucherNo: string,
-    status: 'VERIFIED' | 'EXCEPTION',
-    slipAmount?: number,
-    remarks?: string
-  ): Observable<any> {
-    return this.http.post('/vouchers/verify', {
-      voucherNo,
-      status,
-      slipAmount: slipAmount != null ? String(slipAmount) : null,
-      remarks: remarks ?? null,
-      locale: 'en'
-    });
-  }
-
-  uploadVoucherAttachment(
-    voucherNo: string,
-    fileName: string,
-    contentType: string,
-    fileData: string,
-    description?: string
-  ): Observable<any> {
-    return this.http.post('/vouchers/attachments', {
-      voucherNo,
-      fileName,
-      contentType,
-      fileData,
-      description: description ?? null
-    });
-  }
-
-  listVoucherAttachments(voucherNo: string): Observable<any> {
-    const params = new HttpParams().set('voucherNo', voucherNo);
-    return this.http.get('/vouchers/attachments', { params });
-  }
-
-  deleteVoucherAttachment(id: number): Observable<any> {
-    return this.http.delete(`/vouchers/attachments/${id}`);
-  }
-
-  /** Fetched as a blob through HttpClient so the interceptor's auth header travels with it. */
-  downloadVoucherAttachment(id: number): Observable<Blob> {
-    return this.http.get(`/vouchers/attachments/${id}/download`, { responseType: 'blob' });
-  }
-
-  /**
-   * Flagged vouchers awaiting (or carrying) a conclusion. Not scoped to a date — an exception
-   * raised on Friday still needs answering on Monday.
-   */
-  voucherExceptions(status: 'OPEN' | 'RESOLVED' | 'ALL' = 'OPEN'): Observable<any> {
-    const params = new HttpParams().set('status', status);
-    return this.http.get('/vouchers/exceptions', { params });
-  }
-
  /**
   * The vouchers raised over a period, one row each, with what was debited and what credited.
   *
@@ -193,7 +133,15 @@ export class CashierService {
   * own work whatever they ask for — so `username` is a filter for those allowed to use it, not a
   * way to choose whose report this is.
   */
-  voucherReport(from: string, to: string, username?: string, voucherType?: string): Observable<any> {
+  voucherReport(
+    from: string,
+    to: string,
+    username?: string,
+    voucherType?: string,
+    cashOnly?: boolean,
+    cashiersOnly?: boolean,
+    systemOnly?: boolean
+  ): Observable<any> {
    let params = new HttpParams().set('from', from).set('to', to);
    if (username) {
      params = params.set('username', username);
@@ -201,23 +149,33 @@ export class CashierService {
    if (voucherType) {
      params = params.set('voucherType', voucherType);
    }
+    // Only sent when asked for: the server treats a missing flag as the full register, so the
+    // cashier screens opt in to cash and the back-office ones keep seeing everything.
+    if (cashOnly) {
+      params = params.set('cashOnly', 'true');
+    }
+    // Opt-in the same way: the counter registers ask for the drawer-holders only, the back-office
+    // ones keep seeing whoever raised a voucher.
+    if (cashiersOnly) {
+      params = params.set('cashiersOnly', 'true');
+    }
+    // The postings nobody filed a request for: interest a nightly run credited, a charge taken from
+    // a balance, an escheat, a journal keyed to the ledger. Nowhere else shows them — My Vouchers is
+    // the reader's own work and a scheduled job is nobody's.
+    if (systemOnly) {
+      params = params.set('systemOnly', 'true');
+    }
    return this.http.get('/vouchers/report', { params });
  }

  /**
-   * One voucher and the debit and credit sides it is made of — what a printed voucher shows.
-   *
-   * The voucher number travels as a query parameter, not a path segment: numbers are formatted
-   * CR/2708/0001 and the server rejects the encoded slashes in a path.
+   * The signed-in user's own day: every voucher they raised and every one they verified, receipts
+   * and payments in one list. Always scoped to the caller by the server — there is no username
+   * parameter, because "my work" for somebody else is the register's job, not this screen's.
   */
-  voucherDetail(voucherNo: string): Observable<any> {
-    const params = new HttpParams().set('voucherNo', voucherNo);
-    return this.http.get('/vouchers/detail', { params });
-  }
-
-  /** Closes an exception. Manager / head cashier only, and a supporting document must exist. */
-  resolveVoucherException(voucherNo: string, resolutionStatus: string, resolutionNotes: string): Observable<any> {
-    return this.http.post('/vouchers/exceptions/resolve', { voucherNo, resolutionStatus, resolutionNotes });
+  myVoucherWork(from: string, to: string): Observable<any> {
+    const params = new HttpParams().set('from', from).set('to', to);
+    return this.http.get('/vouchers/my-work', { params });
  }

  /**
@@ -48,11 +48,11 @@ export class ClerkClosureRequestService {
    return this.http.get(`/clerk/closure-requests/${id}`);
  }

-  /** Preview of what the member would receive on closure. The backend dry-runs the very same
-   *  interest posting that closing the account will perform, then rolls it back — so the figure
-   *  matches the real payout to the paisa. Nothing is persisted. */
-  preview(savingsAccountId: number): Observable<any> {
-    return this.http.get(`/clerk/closure-requests/preview/${savingsAccountId}`);
+  /** Posts every rupee of interest the member has earned up to today straight onto the account —
+   *  the same posting close() itself performs — and returns the resulting real balance. Not a dry
+   *  run: ticking "Close this account" is meant to credit the interest immediately, not estimate it. */
+  postClosureInterest(savingsAccountId: number): Observable<any> {
+    return this.http.post(`/clerk/closure-requests/post-interest/${savingsAccountId}`, {});
  }

  approve(id: number): Observable<any> {
@@ -9,9 +9,8 @@
 <div class="pg">
  <header class="pg-head">
    <div>
-      <div class="pg-eyebrow">CASHIER · REPORT</div>
      <h1 class="pg-title">Closing Cash Report</h1>
-      <p class="pg-sub">Denomination-wise deposit, withdrawal and net cash position for the selected day.</p>
+      <p class="pg-sub">How much cash you started with, what came in and went out, and how much you must hand back.</p>
    </div>
    <div class="pg-toolbar">
      <label class="pg-field">
@@ -27,44 +26,92 @@
    </div>
  </header>

-  @if (!showGl && rows.length > 0) {
-    <!-- Summary totals bar -->
-    <div class="closing-summary">
+  <!-- The day's own cash, leg by leg, ending in what should physically be in the drawer.
+       A cashier carries no balance: they draw from the vault in the morning and hand back at close,
+       so this is the figure a physical count is checked against.
+
+       This used to sit under a second strip reading Deposits − Withdrawals = Net Counter Movement.
+       That strip stated the same two figures again and then a net the cashier has no use for: it
+       excludes the vault legs, so on a day the vault gave ₹600 and customer business cancelled out
+       it read ₹0 while the drawer held ₹600. Two panels, four repeated figures, and the one that
+       came first was the one to ignore. -->
+  @if (!showGl && scopedToCashier && hasTodayLegs) {
+    <!-- Says what the strip is before the reader meets five figures and a running sum. Somebody
+         opening this screen for the first time has no way to know that the last tile is the one
+         that matters. -->
+    <p class="closing-lede">Your cash for the day, step by step</p>
+    <div class="closing-summary closing-summary--balance">
      <div class="closing-summary__item closing-summary__item--in">
-        <span class="closing-summary__label">Total Deposits (IN)</span>
-        <span class="closing-summary__value">₹{{ depositTotal | number: '1.2-2' }}</span>
+        <span class="closing-summary__label">Cash you got this morning</span>
+        <span class="closing-summary__value">₹{{ todayVaultIn | number: '1.2-2' }}</span>
+      </div>
+      <div class="closing-summary__sep">+</div>
+      <div class="closing-summary__item closing-summary__item--in">
+        <span class="closing-summary__label">Cash customers gave you</span>
+        <span class="closing-summary__value">₹{{ depositTotalWithDd | number: '1.2-2' }}</span>
+        @if (ddCashTotal > 0) {
+          <!-- Named on the tile as well as in the table: this part of the total carries no
+               denomination, so without saying so the figures read as failing to add up. -->
+          <span class="closing-summary__note">
+            ₹{{ ddCashTotal | number: '1.2-2' }} of this was for {{ ddCashCount }} draft{{
+              ddCashCount === 1 ? '' : 's'
+            }}, notes not listed
+          </span>
+        }
      </div>
      <div class="closing-summary__sep">−</div>
      <div class="closing-summary__item closing-summary__item--out">
-        <span class="closing-summary__label">Total Withdrawals (OUT)</span>
+        <span class="closing-summary__label">Cash you gave customers</span>
        <span class="closing-summary__value">₹{{ withdrawalTotal | number: '1.2-2' }}</span>
      </div>
+      <div class="closing-summary__sep">−</div>
+      <div class="closing-summary__item closing-summary__item--out">
+        <span class="closing-summary__label">Cash already returned</span>
+        <span class="closing-summary__value">₹{{ todaySettledOut | number: '1.2-2' }}</span>
+      </div>
      <div class="closing-summary__sep">=</div>
+      <!-- The figure the day ends on. Named for what the cashier does with it — hand this back to
+           the vault — rather than "closing balance", which reads as something they keep. -->
      <div
        class="closing-summary__item"
-        [class.closing-summary__item--net-pos]="netTotal >= 0"
-        [class.closing-summary__item--net-neg]="netTotal < 0"
+        [class.closing-summary__item--net-pos]="expectedInDrawer >= 0"
+        [class.closing-summary__item--net-neg]="expectedInDrawer < 0"
      >
-        <span class="closing-summary__label">Net Closing Cash</span>
-        <span class="closing-summary__value">₹{{ netTotal | number: '1.2-2' }}</span>
+        <span class="closing-summary__label">Cash left with you now</span>
+        <span class="closing-summary__value">₹{{ expectedInDrawer | number: '1.2-2' }}</span>
      </div>
    </div>
+    <p class="closing-note">
+      Count your cash now &mdash; it should come to ₹{{ expectedInDrawer | number: '1.2-2' }}. Hand that amount back and
+      your day is done.
+    </p>
+    <!-- Cashier-to-cashier hand-overs are left out of the row above to keep it to the four legs a
+         teller sees, and stated here when they happened rather than silently folded in. -->
+    @if ((todayInterCashierIn ?? 0) > 0 || (todayInterCashierOut ?? 0) > 0) {
+      <p class="closing-note">
+        This already counts cash swapped with another cashier &mdash; ₹{{ todayInterCashierIn | number: '1.2-2' }} taken
+        from them, ₹{{ todayInterCashierOut | number: '1.2-2' }} given to them.
+      </p>
+    }
  }

  @if (!showGl) {
    <div class="pg-card">
-      @if (noteRows.length > 0) {
+      @if (noteRows.length > 0 || ddCashTotal > 0) {
        <div class="pos-section-label">Notes</div>
        <table class="pg-table">
          <thead>
            <tr>
-              <th>Denomination</th>
-              <th class="num col-in">Deposit Pcs</th>
-              <th class="num col-in">Deposit Amt</th>
-              <th class="num col-out">Withdrawal Pcs</th>
-              <th class="num col-out">Withdrawal Amt</th>
-              <th class="num col-net">Net Pcs</th>
-              <th class="num col-net">Net Amount</th>
+              <th>Note</th>
+              <!-- Counted in pieces, because that is what a teller does with notes. Nine columns of
+                   pieces-and-amount for every leg was a reconciliation nobody could read at a
+                   counter; these five are the sentence the day actually makes: this many came in
+                   from the vault, this many over the counter, this many went out, this many are
+                   left, and that is worth this much. -->
+              <th class="num col-in">Came in</th>
+              <th class="num col-out">Went out</th>
+              <th class="num col-net">Left with you</th>
+              <th class="num col-net">Worth</th>
            </tr>
          </thead>
          <tbody>
@@ -73,15 +120,16 @@
                <td>
                  <span class="pg-chip">₹{{ r.denominationValue }}</span>
                </td>
-                <td class="num col-in">{{ r.depositCount }}</td>
-                <td class="num col-in">₹{{ r.depositAmount | number: '1.2-2' }}</td>
-                <td class="num col-out">{{ r.withdrawalCount }}</td>
-                <td class="num col-out">₹{{ r.withdrawalAmount | number: '1.2-2' }}</td>
+                <!-- Vault and counter added together: to a teller both are notes arriving, and
+                     splitting them made the reader do the sum. A dash rather than a zero where
+                     nothing happened, so the eye passes over it. -->
+                <td class="num col-in">{{ r.vaultInCount + r.depositCount || '—' }}</td>
+                <td class="num col-out">{{ r.withdrawalCount + r.settledOutCount || '—' }}</td>
                <td
                  class="num col-net"
                  [style.color]="r.netCount > 0 ? '#16a34a' : r.netCount < 0 ? '#dc2626' : '#94a3b8'"
                >
-                  {{ r.netCount > 0 ? '+' : '' }}{{ r.netCount }}
+                  {{ r.netCount }}
                </td>
                <td
                  class="num col-net"
@@ -93,7 +141,38 @@
                </td>
              </tr>
            }
+
+            <!-- Cash taken for a Demand Draft, on the deposit side where it belongs. It has no
+                 denomination to sit against -- the notes were never itemised -- so the piece
+                 counts show a dash rather than a zero, which would read as "no notes". -->
+            @if (ddCashTotal > 0) {
+              <tr>
+                <td>
+                  <span class="pg-chip">Notes not listed</span>
+                  <span class="closing-row__hint"> {{ ddCashCount }} cash DD{{ ddCashCount === 1 ? '' : 's' }} </span>
+                </td>
+                <td class="num col-in">—</td>
+                <td class="num col-out">—</td>
+                <td class="num col-net">—</td>
+                <td class="num col-net" style="color: #16a34a">₹{{ ddCashTotal | number: '1.2-2' }}</td>
+              </tr>
+            }
          </tbody>
+          <!-- Totals, so the table reconciles against the summary above rather than having to be
+               added up by hand — and so the deposit column visibly accounts for the DD row. -->
+          <tfoot>
+            <tr>
+              <td>Total</td>
+              <td class="num col-in">{{ noteVaultInCount + noteDepositCount || '—' }}</td>
+              <td class="num col-out">{{ noteWithdrawalCount + noteSettledOutCount || '—' }}</td>
+              <td class="num col-net">{{ noteNetCount }}</td>
+              <td class="num col-net">
+                {{ noteNetAmount >= 0 ? '' : '−' }}₹{{
+                  (noteNetAmount < 0 ? -noteNetAmount : noteNetAmount) | number: '1.2-2'
+                }}
+              </td>
+            </tr>
+          </tfoot>
        </table>
      }

@@ -102,13 +181,11 @@
        <table class="pg-table">
          <thead>
            <tr>
-              <th>Denomination</th>
-              <th class="num col-in">Deposit Pcs</th>
-              <th class="num col-in">Deposit Amt</th>
-              <th class="num col-out">Withdrawal Pcs</th>
-              <th class="num col-out">Withdrawal Amt</th>
-              <th class="num col-net">Net Pcs</th>
-              <th class="num col-net">Net Amount</th>
+              <th>Coin</th>
+              <th class="num col-in">Came in</th>
+              <th class="num col-out">Went out</th>
+              <th class="num col-net">Left with you</th>
+              <th class="num col-net">Worth</th>
            </tr>
          </thead>
          <tbody>
@@ -117,15 +194,16 @@
                <td>
                  <span class="pg-chip pg-chip--coin">₹{{ r.denominationValue }}</span>
                </td>
-                <td class="num col-in">{{ r.depositCount }}</td>
-                <td class="num col-in">₹{{ r.depositAmount | number: '1.2-2' }}</td>
-                <td class="num col-out">{{ r.withdrawalCount }}</td>
-                <td class="num col-out">₹{{ r.withdrawalAmount | number: '1.2-2' }}</td>
+                <!-- Vault and counter added together: to a teller both are notes arriving, and
+                     splitting them made the reader do the sum. A dash rather than a zero where
+                     nothing happened, so the eye passes over it. -->
+                <td class="num col-in">{{ r.vaultInCount + r.depositCount || '—' }}</td>
+                <td class="num col-out">{{ r.withdrawalCount + r.settledOutCount || '—' }}</td>
                <td
                  class="num col-net"
                  [style.color]="r.netCount > 0 ? '#16a34a' : r.netCount < 0 ? '#dc2626' : '#94a3b8'"
                >
-                  {{ r.netCount > 0 ? '+' : '' }}{{ r.netCount }}
+                  {{ r.netCount }}
                </td>
                <td
                  class="num col-net"
@@ -141,8 +219,20 @@
        </table>
      }

-      @if (loaded && rows.length === 0 && exchangeRows.length === 0) {
-        <div class="pg-empty">No cash denomination data for this date.</div>
+      <!-- Not shown when a Demand Draft row is on the table: there is something to read then, and
+           an "empty" notice under it contradicts it. -->
+      @if (loaded && rows.length === 0 && exchangeRows.length === 0 && ddCashTotal === 0) {
+        <!-- A day with no counter work is not an empty report: the cashier is still holding
+             whatever they held yesterday, and that balance is shown in the strip above. Saying
+             only "no data" here read as though the drawer were empty. -->
+        <div class="pg-empty">
+          @if (scopedToCashier && hasTodayLegs && expectedInDrawer !== 0) {
+            No cash crossed the counter on this date. The drawer should hold ₹{{ expectedInDrawer | number: '1.2-2' }}
+            from the day's vault and settlement legs.
+          } @else {
+            No cash denomination data for this date.
+          }
+        </div>
      }
    </div>
  }
@@ -213,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>
@@ -236,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>
@@ -38,6 +38,51 @@ export class ClosingCashReportComponent implements OnInit {
  loading = false;
  loaded = false;

+  /**
+   * Cash taken at the counter for a Demand Draft.
+   *
+   * A cash DD asks for a denomination breakdown but does not require one, and this report is built
+   * entirely from breakdowns — so that cash was missing from the drawer figure even though the
+   * ledger held it and the cashier held the notes. It is counted from the request itself and shown
+   * on its own line, because the denomination rows below cannot account for it.
+   */
+  ddCashTotal = 0;
+  ddCashCount = 0;
+  /** Deposits including the DD cash — the figure the drawer is actually checked against. */
+  depositTotalWithDd = 0;
+
+  /**
+   * The drawer, opening to closing.
+   *
+   * `netTotal` above is only the day's counter movement — deposits less withdrawals. It is not what
+   * the cashier is holding, because it carries nothing forward from yesterday and ignores vault
+   * allocations and inter-cashier legs. The closing balance is the figure that has to match a
+   * physical count at the end of the day, so it is reported separately rather than inferred from
+   * the counter totals.
+   *
+   * Null when the server did not scope the report to one cashier: a branch-wide opening balance is
+   * the branch day register's business, not this report's.
+   */
+  openingBalance: number | null = null;
+  closingBalance: number | null = null;
+
+  /**
+   * The day's own cash legs, which is what a cashier reconciles against the drawer.
+   *
+   * A cashier carries no balance: they draw from the vault in the morning and hand back at close.
+   * The cumulative opening/closing figures answer a question nobody at the counter asks, and one
+   * carrying years of history answers it with a number that cannot be counted against anything on
+   * the desk.
+   */
+  todayVaultIn: number | null = null;
+  todaySettledOut: number | null = null;
+  todayInterCashierIn: number | null = null;
+  todayInterCashierOut: number | null = null;
+  /** Every leg of the day's cash movement, which is wider than deposits less withdrawals. */
+  cashMovement: number | null = null;
+  /** Whether the figures above are one cashier's drawer or the whole branch's counter work. */
+  scopedToCashier = false;
+
  // GL View
  showGl = false;
  glRows: any[] = [];
@@ -63,9 +108,86 @@ export class ClosingCashReportComponent implements OnInit {
  selectedTellerId: number | null = null;
  selectedCashierId: number | null = null;

+  /**
+   * What should be in the drawer at the end of the day, from the day's own legs.
+   *
+   * Drawn from the vault, plus anything taken over the counter and from another cashier, less what
+   * went back out. This is the figure a cashier counts against — it does not carry a balance
+   * forward, because a cashier does not.
+   */
+  get expectedInDrawer(): number {
+    return (
+      Number(this.todayVaultIn ?? 0) +
+      Number(this.todayInterCashierIn ?? 0) +
+      Number(this.depositTotalWithDd ?? 0) -
+      Number(this.withdrawalTotal ?? 0) -
+      Number(this.todaySettledOut ?? 0) -
+      Number(this.todayInterCashierOut ?? 0)
+    );
+  }
+
+  /** True when any of the day's own legs carries a figure, so the panel is worth showing. */
+  get hasTodayLegs(): boolean {
+    return this.todayVaultIn !== null;
+  }
+
  get noteRows(): any[] {
    return this.rows.filter((r) => r.kind !== 'coin');
  }
+
+  /**
+   * Totals for the notes table, including the un-itemised Demand Draft cash.
+   *
+   * The DD row carries an amount but no piece count, so pieces and amounts are summed separately
+   * rather than one being derived from the other — a denomination times a count would not reach the
+   * DD's figure, and adding a fictional count to make it balance would misstate the drawer.
+   */
+  get noteDepositCount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.depositCount ?? 0), 0);
+  }
+
+  get noteDepositAmount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.depositAmount ?? 0), 0) + this.ddCashTotal;
+  }
+
+  get noteWithdrawalCount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.withdrawalCount ?? 0), 0);
+  }
+
+  get noteWithdrawalAmount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.withdrawalAmount ?? 0), 0);
+  }
+
+  get noteVaultInCount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.vaultInCount ?? 0), 0);
+  }
+
+  get noteVaultInAmount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.vaultInAmount ?? 0), 0);
+  }
+
+  get noteSettledOutCount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.settledOutCount ?? 0), 0);
+  }
+
+  get noteSettledOutAmount(): number {
+    return this.noteRows.reduce((s, r) => s + Number(r.settledOutAmount ?? 0), 0);
+  }
+
+  get noteNetCount(): number {
+    return this.noteVaultInCount + this.noteDepositCount - this.noteWithdrawalCount - this.noteSettledOutCount;
+  }
+
+  /**
+   * 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.
+   */
+  get noteNetAmount(): number {
+    return this.noteVaultInAmount + this.noteDepositAmount - this.noteWithdrawalAmount - this.noteSettledOutAmount;
+  }
  get coinRows(): any[] {
    return this.rows.filter((r) => r.kind === 'coin');
  }
@@ -92,6 +214,19 @@ export class ClosingCashReportComponent implements OnInit {
        this.depositTotal = Number(res?.depositTotal || 0);
        this.withdrawalTotal = Number(res?.withdrawalTotal || 0);
        this.netTotal = Number(res?.netTotal || 0);
+        this.ddCashTotal = Number(res?.ddCashTotal || 0);
+        this.ddCashCount = Number(res?.ddCashCount || 0);
+        this.depositTotalWithDd = Number(res?.depositTotalWithDd ?? res?.depositTotal ?? 0);
+        this.scopedToCashier = res?.scopedToCashier === true;
+        // Sent only for a cashier-scoped call, and read as absent rather than zero when missing —
+        // a zero opening balance and no opening balance at all are different statements.
+        this.openingBalance = res?.openingBalance == null ? null : Number(res.openingBalance);
+        this.closingBalance = res?.closingBalance == null ? null : Number(res.closingBalance);
+        this.cashMovement = res?.cashMovement == null ? null : Number(res.cashMovement);
+        this.todayVaultIn = res?.todayVaultIn == null ? null : Number(res.todayVaultIn);
+        this.todaySettledOut = res?.todaySettledOut == null ? null : Number(res.todaySettledOut);
+        this.todayInterCashierIn = res?.todayInterCashierIn == null ? null : Number(res.todayInterCashierIn);
+        this.todayInterCashierOut = res?.todayInterCashierOut == null ? null : Number(res.todayInterCashierOut);
        this.loading = false;
        this.loaded = true;
      },
@@ -101,6 +236,17 @@ export class ClosingCashReportComponent implements OnInit {
        this.depositTotal = 0;
        this.withdrawalTotal = 0;
        this.netTotal = 0;
+        this.ddCashTotal = 0;
+        this.ddCashCount = 0;
+        this.depositTotalWithDd = 0;
+        this.scopedToCashier = false;
+        this.openingBalance = null;
+        this.closingBalance = null;
+        this.cashMovement = null;
+        this.todayVaultIn = null;
+        this.todaySettledOut = null;
+        this.todayInterCashierIn = null;
+        this.todayInterCashierOut = null;
        this.loading = false;
        this.loaded = true;
      }
@@ -9,11 +9,10 @@
 <div class="pg">
  <header class="pg-head">
    <div>
-      <div class="pg-eyebrow">CASHIER · DAY BOOK</div>
-      <h1 class="pg-title">Day Book</h1>
+      <h1 class="pg-title">{{ title }}</h1>
      <p class="pg-sub">
-        Every voucher raised on the selected date — cash deposits, withdrawals, disbursements, collections and bank
-        transfers, with credit and debit totals.
+        Every voucher raised on the selected date — cash deposits, withdrawals, disbursements, collections, interest and
+        journals, with each person's own credit, debit and net.
      </p>
    </div>
    <div class="pg-toolbar">
@@ -65,42 +64,6 @@
  @if (errorMsg) {
    <div class="pg-alert pg-alert--error">{{ errorMsg }}</div>
  }
-
-  <!-- Exceptions surface at the top of the day, not only as a badge buried in their own row: a
-       flag raised for investigation is useless if someone has to scroll to find it. -->
-  @if (!loading && exceptionRows.length > 0) {
-    <div class="db-exceptions">
-      <div class="db-exceptions__head">
-        <mat-icon>warning</mat-icon>
-        <strong>
-          {{ exceptionRows.length }} voucher{{ exceptionRows.length === 1 ? '' : 's' }} awaiting investigation
-        </strong>
-        @if (resolvedExceptionCount > 0) {
-          <span class="db-muted">({{ resolvedExceptionCount }} already closed)</span>
-        }
-        <button type="button" class="pg-btn pg-btn--warn" (click)="toggleExceptionsOnly()">
-          {{ exceptionsOnly ? 'Show all vouchers' : 'Show only these' }}
-        </button>
-      </div>
-      @for (e of exceptionRows; track e.voucherNo) {
-        <div class="db-exceptions__item">
-          <span class="pg-chip">{{ e.voucherNo }}</span>
-          <span class="db-exceptions__amt">
-            System ₹{{ e.amount | number: '1.2-2' }}
-            @if (e.slipAmount != null && e.slipAmount !== e.amount) {
-              · Slip ₹{{ e.slipAmount | number: '1.2-2' }}
-              <strong class="db-exceptions__diff"
-                >(diff ₹{{ e.slipAmount - (e.amount ?? 0) | number: '1.2-2' }})</strong
-              >
-            }
-          </span>
-          <span class="db-exceptions__why">{{ e.verifyRemarks }}</span>
-          <span class="db-muted">— {{ e.verifiedByName }}, {{ timeOf(e.verifiedAt) }}</span>
-        </div>
-      }
-    </div>
-  }
-
  @if (loading) {
    <div class="pg-empty">Loading…</div>
  }
@@ -139,252 +102,166 @@
      Totals count approved vouchers only — pending and rejected rows are listed but never move the money.
    </p>

-    <div class="pg-card">
-      <table class="pg-table">
-        <thead>
-          <tr>
-            <th>Voucher No</th>
-            <th>Dr/Cr</th>
-            <th>Type</th>
-            <th>Account</th>
-            <th>Party</th>
-            <th class="num">Amount</th>
-            <th>Payment</th>
-            <th>Status</th>
-            <th>By</th>
-            <th>Approved By</th>
-            <th>Slip Check</th>
-            <th>Time</th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          @for (r of filteredRows; track r.voucherNo ?? r.submittedAt) {
-            <tr [class.db-row--cr]="r.side === 'CR'" [class.db-row--dr]="r.side === 'DR'">
-              <td>
-                <span class="pg-chip">{{ r.voucherNo ?? '—' }}</span>
-              </td>
-              <td>
-                <span class="db-side" [class.db-side--cr]="r.side === 'CR'" [class.db-side--dr]="r.side === 'DR'">
-                  {{ r.side }}
-                </span>
-              </td>
-              <td>{{ r.kind }}</td>
-              <td>
-                {{ r.accountNo ?? '—' }}
-                @if (r.accountType) {
-                  <span class="db-muted">· {{ r.accountType }}</span>
-                }
-              </td>
-              <td>{{ r.party ?? '—' }}</td>
-              <td class="num">₹{{ r.amount | number: '1.2-2' }}</td>
-              <td>{{ r.paymentTypeName ?? '—' }}</td>
-              <td>
-                <span [class]="statusClass(r.status)">{{ r.status }}</span>
-              </td>
-              <td>{{ r.handledBy ?? '—' }}</td>
-              <td>
-                {{ r.approvedBy ?? '—' }}
-                @if (r.approvedBy && r.actionedAt) {
-                  <span class="db-muted">· {{ timeOf(r.actionedAt) }}</span>
-                }
-              </td>
-              <td>
-                @if (r.verifyStatus === 'VERIFIED') {
-                  <span class="db-badge db-badge--ok" [title]="'Verified by ' + (r.verifiedByName ?? '')"
-                    >✓ MATCHED</span
+    <!-- The day per person, for the officer who signs the book off. The sections below trace one
+         voucher at a time; this is the other reading a branch needs — what each member of staff
+         handled, and whether their column adds up. Built from whoever appears in the day's rows, so
+         one person working alone gets one line and five people get five. -->
+    @if (byUser.length > 0) {
+      <div class="pg-card db-section db-byuser">
+        <div class="db-section__head">
+          <strong>Officer Verification Sheet</strong>
+          <span class="db-muted">Each person's own credit, debit and net for the day</span>
+          <span class="db-section__count"> {{ byUser.length }} {{ byUser.length === 1 ? 'person' : 'people' }} </span>
+        </div>
+        <div class="pg-table-wrap">
+          <table class="pg-table db-table">
+            <thead>
+              <tr>
+                <th>Handled by</th>
+                <th class="num">Items</th>
+                <th class="num">Credit (CR)</th>
+                <th class="num">Debit (DR)</th>
+                <th class="num">Net</th>
+                <th class="num">Pending</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (u of byUser; track u.name) {
+                <tr>
+                  <td class="db-byuser__name">{{ u.name }}</td>
+                  <td class="num">{{ u.items }}</td>
+                  <td class="num db-byuser__cr">₹{{ u.credit | number: '1.2-2' }}</td>
+                  <td class="num db-byuser__dr">₹{{ u.debit | number: '1.2-2' }}</td>
+                  <td
+                    class="num db-byuser__net"
+                    [class.db-byuser__net--pos]="u.net >= 0"
+                    [class.db-byuser__net--neg]="u.net < 0"
                  >
-                } @else if (r.verifyStatus === 'EXCEPTION' && r.resolutionStatus) {
-                  <!-- Closed: the flag is history now, so it reads as settled rather than pending. -->
-                  <span
-                    class="db-badge db-badge--ok"
-                    [title]="resolutionLabel(r.resolutionStatus) + ' — ' + (r.resolutionNotes ?? '')"
-                  >
-                    ✓ RESOLVED
-                  </span>
-                } @else if (r.verifyStatus === 'EXCEPTION') {
-                  <span
-                    class="db-badge db-badge--rejected"
-                    [title]="'Slip ₹' + r.slipAmount + ' vs system ₹' + r.amount + ' — ' + (r.verifyRemarks ?? '')"
-                  >
-                    ⚠ EXCEPTION
-                  </span>
-                } @else {
-                  <span class="db-muted">Not checked</span>
-                }
-              </td>
-              <td>{{ timeOf(r.submittedAt) }}</td>
-              <td class="db-actions">
-                <button type="button" class="db-icon-btn" (click)="openVerify(r)" title="Check against the paper slip">
-                  <mat-icon>fact_check</mat-icon>
-                </button>
-                <button type="button" class="db-icon-btn" (click)="openAttach(r)" title="Attach or view scanned slip">
-                  <mat-icon>attach_file</mat-icon>
-                  @if (r.attachmentCount > 0) {
-                    <span class="db-icon-btn__count">{{ r.attachmentCount }}</span>
+                    ₹{{ u.net | number: '1.2-2' }}
+                  </td>
+                  <td class="num">
+                    @if (u.pending > 0) {
+                      <span class="db-badge db-badge--pending">{{ u.pending }}</span>
+                    } @else {
+                      —
+                    }
+                  </td>
+                </tr>
+              }
+            </tbody>
+            <!-- The sheet's own total, which must equal the day's totals above. That equality is
+                 what makes the sheet verifiable rather than just informative. -->
+            <tfoot>
+              <tr class="db-byuser__total">
+                <td>All staff</td>
+                <td class="num">{{ byUserTotals.items }}</td>
+                <td class="num db-byuser__cr">₹{{ byUserTotals.credit | number: '1.2-2' }}</td>
+                <td class="num db-byuser__dr">₹{{ byUserTotals.debit | number: '1.2-2' }}</td>
+                <td
+                  class="num db-byuser__net"
+                  [class.db-byuser__net--pos]="byUserTotals.net >= 0"
+                  [class.db-byuser__net--neg]="byUserTotals.net < 0"
+                >
+                  ₹{{ byUserTotals.net | number: '1.2-2' }}
+                </td>
+                <td class="num">
+                  @if (byUserTotals.pending > 0) {
+                    {{ byUserTotals.pending }}
+                  } @else {
+                    —
                  }
-                </button>
-              </td>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        </div>
+      </div>
+    }
+
+    <!-- One table per source register rather than one long list. The two read differently: the
+         cashier's rows are cash that actually crossed the counter, the clerk's are requests nobody
+         has actioned yet. Mixed together they invited the wrong sum. -->
+    @for (s of sections; track s.key) {
+      <!-- The section's own colour on the left edge: cash that actually crossed the counter, work
+           still waiting to be actioned, and postings the system made are three different things to
+           a person closing the day. -->
+      <div [class]="'pg-card db-section db-section--' + s.key">
+        <div class="db-section__head">
+          <strong>{{ s.label }}</strong>
+          <span class="db-muted">{{ s.hint }}</span>
+          <span class="db-section__count">{{ s.rows.length }} row{{ s.rows.length === 1 ? '' : 's' }}</span>
+        </div>
+        <table class="pg-table">
+          <thead>
+            <tr>
+              <th>Voucher No</th>
+              <th>Dr/Cr</th>
+              <th>Type</th>
+              <th>Account</th>
+              <th>Party</th>
+              <th class="num">Amount</th>
+              <th>Payment</th>
+              <th>Status</th>
+              <th>By</th>
+              <th>Approved By</th>
+              <th>Time</th>
            </tr>
-
-            <!-- A flagged voucher spells out its reason in the table itself. A tooltip is not
-                 enough: it cannot be printed, exported, or read without a mouse. -->
-            @if (r.verifyStatus === 'EXCEPTION' && verifyRow !== r) {
-              <tr class="db-exc-row" [class.db-exc-row--resolved]="r.resolutionStatus">
-                <td colspan="13">
-                  <mat-icon>{{ r.resolutionStatus ? 'task_alt' : 'warning' }}</mat-icon>
-                  <strong>Exception</strong>
-                  @if (r.slipAmount != null && r.slipAmount !== r.amount) {
-                    — slip ₹{{ r.slipAmount | number: '1.2-2' }} vs system ₹{{ r.amount | number: '1.2-2' }} (difference
-                    ₹{{ r.slipAmount - (r.amount ?? 0) | number: '1.2-2' }})
-                  }
-                  — {{ r.verifyRemarks }}
-                  <span class="db-muted">· raised by {{ r.verifiedByName }} at {{ timeOf(r.verifiedAt) }}</span>
-                  <!-- Both halves of the record: what the cashier found, and how it was settled. -->
-                  @if (r.resolutionStatus) {
-                    <div class="db-exc-row__resolution">
-                      <strong>Closed — {{ resolutionLabel(r.resolutionStatus) }}:</strong>
-                      {{ r.resolutionNotes }}
-                      <span class="db-muted">· by {{ r.resolvedByName }} at {{ timeOf(r.resolvedAt) }}</span>
-                    </div>
+          </thead>
+          <tbody>
+            @for (r of s.rows; track r.voucherNo ?? r.section + r.txnId) {
+              <tr [class.db-row--cr]="r.side === 'CR'" [class.db-row--dr]="r.side === 'DR'">
+                <td>
+                  <span class="pg-chip">{{ r.voucherNo ?? '—' }}</span>
+                </td>
+                <td>
+                  <span class="db-side" [class.db-side--cr]="r.side === 'CR'" [class.db-side--dr]="r.side === 'DR'">
+                    {{ r.side }}
+                  </span>
+                </td>
+                <td>{{ r.kind }}</td>
+                <td>
+                  {{ r.accountNo ?? '—' }}
+                  @if (r.accountType) {
+                    <span class="db-muted">· {{ r.accountType }}</span>
                  }
                </td>
-              </tr>
-            }
-
-            <!-- Verification panel, opened inline under its own voucher so the two amounts sit
-                 next to the row they describe. -->
-            @if (verifyRow === r) {
-              <tr class="db-panel-row">
-                <td colspan="13">
-                  <div class="db-panel">
-                    <div class="db-panel__head">
-                      <strong>Slip check — {{ r.voucherNo }}</strong>
-                      <button type="button" class="db-icon-btn" (click)="closeVerify()" title="Close">
-                        <mat-icon>close</mat-icon>
-                      </button>
-                    </div>
-                    <div class="db-panel__body">
-                      <div class="db-cmp">
-                        <span class="db-cmp__label">System recorded</span>
-                        <span class="db-cmp__value">₹{{ r.amount | number: '1.2-2' }}</span>
-                      </div>
-                      <label class="pg-field">
-                        <span>Amount written on slip</span>
-                        <input type="number" step="0.01" [(ngModel)]="verifySlipAmount" />
-                      </label>
-                      @if (verifySlipBlank) {
-                        <div class="db-cmp">
-                          <span class="db-cmp__label">Difference</span>
-                          <span class="db-cmp__value">—</span>
-                        </div>
-                      } @else if (verifyMismatch) {
-                        <div class="db-cmp db-cmp--bad">
-                          <span class="db-cmp__label">Difference</span>
-                          <span class="db-cmp__value">₹{{ verifyDifference | number: '1.2-2' }}</span>
-                        </div>
-                      } @else {
-                        <div class="db-cmp db-cmp--good">
-                          <span class="db-cmp__label">Match</span>
-                          <span class="db-cmp__value">Amounts agree</span>
-                        </div>
-                      }
-                    </div>
-                    <label class="pg-field db-panel__remarks">
-                      <span>{{ verifyMismatch ? 'What did you find? (required)' : 'Remarks (optional)' }}</span>
-                      <input
-                        type="text"
-                        [(ngModel)]="verifyRemarks"
-                        placeholder="e.g. slip written as 500, system posted 400 — teller keyed it wrong"
-                      />
-                    </label>
-                    @if (verifyMismatch) {
-                      <p class="db-panel__warn">
-                        Saving this marks the voucher as an <strong>exception</strong> for investigation — it does not
-                        change the posted amount.
-                      </p>
-                    }
-                    <div class="db-panel__actions">
-                      <button
-                        type="button"
-                        class="pg-btn pg-btn--primary"
-                        (click)="saveVerify()"
-                        [disabled]="verifySaving || verifySlipBlank"
-                      >
-                        {{ verifyMismatch ? 'Mark Exception' : 'Mark Verified' }}
-                      </button>
-                      <!-- Raising an exception on an already-matched voucher stays available: a
-                           slip cleared in haste, or a difference noticed later, has to be
-                           recordable without erasing the earlier verdict. -->
-                      @if (!verifyMismatch) {
-                        <button
-                          type="button"
-                          class="pg-btn pg-btn--warn"
-                          (click)="raiseException()"
-                          [disabled]="verifySaving"
-                        >
-                          Raise Exception
-                        </button>
-                      }
-                      <button type="button" class="pg-btn" (click)="closeVerify()">Cancel</button>
-                    </div>
-                  </div>
+                <td>{{ r.party ?? '—' }}</td>
+                <td class="num">₹{{ r.amount | number: '1.2-2' }}</td>
+                <td>{{ r.paymentTypeName ?? '—' }}</td>
+                <td>
+                  <span [class]="statusClass(r.status)">{{ r.status }}</span>
                </td>
-              </tr>
-            }
-
-            <!-- Attachment panel for this voucher. -->
-            @if (attachRow === r) {
-              <tr class="db-panel-row">
-                <td colspan="13">
-                  <div class="db-panel">
-                    <div class="db-panel__head">
-                      <strong>Attachments — {{ r.voucherNo }}</strong>
-                      <button type="button" class="db-icon-btn" (click)="closeAttach()" title="Close">
-                        <mat-icon>close</mat-icon>
-                      </button>
-                    </div>
-                    <label class="db-upload">
-                      <input type="file" (change)="onFileSelected($event)" [disabled]="attachUploading" />
-                      <span class="db-muted">Scanned slip, cheque image or ID proof · max 10 MB</span>
-                    </label>
-                    @if (attachUploading) {
-                      <p class="db-muted">Uploading…</p>
-                    }
-                    @if (attachLoading) {
-                      <p class="db-muted">Loading…</p>
-                    }
-                    @if (!attachLoading && attachments.length === 0) {
-                      <p class="db-muted">Nothing attached to this voucher yet.</p>
-                    }
-                    @for (a of attachments; track a.id) {
-                      <div class="db-file">
-                        <mat-icon>description</mat-icon>
-                        <span class="db-file__name">{{ a.fileName }}</span>
-                        <span class="db-muted">{{ a.fileSize }} bytes · {{ a.uploadedByName }}</span>
-                        <button type="button" class="db-icon-btn" (click)="downloadAttachment(a)" title="Download">
-                          <mat-icon>download</mat-icon>
-                        </button>
-                        <button type="button" class="db-icon-btn" (click)="deleteAttachment(a)" title="Delete">
-                          <mat-icon>delete</mat-icon>
-                        </button>
-                      </div>
-                    }
-                  </div>
+                <td>{{ r.handledBy ?? '—' }}</td>
+                <td>
+                  {{ r.approvedBy ?? '—' }}
+                  @if (r.approvedBy && r.actionedAt) {
+                    <span class="db-muted">· {{ timeOf(r.actionedAt) }}</span>
+                  }
                </td>
+                <td>{{ timeOf(r.submittedAt) }}</td>
              </tr>
            }
-          }
-        </tbody>
-        <tfoot>
-          <tr>
-            <td colspan="5">Showing {{ filteredRows.length }} of {{ rows.length }} voucher(s)</td>
-            <td class="num">₹{{ shownCredit - shownDebit | number: '1.2-2' }}</td>
-            <td colspan="7"></td>
-          </tr>
-        </tfoot>
-      </table>
-    </div>
+          </tbody>
+          <tfoot>
+            <tr>
+              <td colspan="5">{{ s.label }} subtotal</td>
+              <td class="num">
+                @if (s.credit > 0 && s.debit > 0) {
+                  ₹{{ s.credit | number: '1.2-2' }} CR · ₹{{ s.debit | number: '1.2-2' }} DR
+                } @else if (s.credit > 0) {
+                  ₹{{ s.credit | number: '1.2-2' }} CR
+                } @else if (s.debit > 0) {
+                  ₹{{ s.debit | number: '1.2-2' }} DR
+                } @else {
+                  —
+                }
+              </td>
+              <td colspan="5"></td>
+            </tr>
+          </tfoot>
+        </table>
+      </div>
+    }
  }

  @if (!loading && loaded && rows.length > 0 && filteredRows.length === 0) {
@@ -32,6 +32,64 @@
  color: #94a3b8;
 }

+/* One card per source register. The heading says which register, and why its rows read differently
+   from the others, so the three are not added up as though they were one list. */
+.db-section {
+  margin-bottom: 14px;
+  border-left: 3px solid #cbd5e1;
+
+  /* Cash that actually crossed the counter — the section a drawer is checked against, so it
+     carries the darker green. */
+  &--CASHIER {
+    border-left-color: #15803d;
+
+    .db-section__head {
+      background: #f0fdf4;
+    }
+  }
+
+  /* Raised but not actioned: no cash has moved yet, so the lighter shade of the same green. */
+  &--CLERK {
+    border-left-color: #86efac;
+
+    .db-section__head {
+      background: #f7fef9;
+    }
+  }
+
+  /* Postings with no counter behind them — interest, charges, journals. Not the branch's cash at
+     all, so a different colour rather than a third green that would read as a third cash state. */
+  &--SYSTEM {
+    border-left-color: #6366f1;
+
+    .db-section__head {
+      background: #f5f5ff;
+    }
+  }
+
+  &__head {
+    display: flex;
+    align-items: baseline;
+    gap: 10px;
+    padding: 10px 14px;
+    background: #f8fafc;
+    border-bottom: 1px solid #e2e8f0;
+    font-size: 12px;
+
+    strong {
+      font-size: 13px;
+      color: #0d1b2a;
+    }
+  }
+
+  &__count {
+    margin-left: auto;
+    font-size: 11px;
+    font-weight: 700;
+    color: #64748b;
+  }
+}
+
 /* Dr/Cr marker — the one thing the eye should catch when scanning a day's vouchers. */
 .db-side {
  display: inline-block;
@@ -82,11 +140,19 @@
  background: #f1f5f9;
  color: #475569;

+  /* Passed, but nothing handed over yet — the lighter green. */
  &--ok {
    background: #dcfce7;
    color: #15803d;
  }

+  /* Cash has actually left the counter. Filled and dark, so the final state is the one the eye
+     lands on: on this page the difference between "approved" and "paid out" is the whole question. */
+  &--done {
+    background: #15803d;
+    color: #fff;
+  }
+
  &--pending {
    background: #fef3c7;
    color: #b45309;
@@ -169,41 +235,6 @@
  }
 }

-/* The reason spelled out under its own flagged row. */
-.db-exc-row td {
-  background: #fef2f2 !important;
-  border-bottom: 1px solid #fecaca !important;
-  color: #7f1d1d;
-  font-size: 12px;
-  padding: 8px 14px !important;
-
-  mat-icon {
-    font-size: 15px;
-    width: 15px;
-    height: 15px;
-    vertical-align: -3px;
-    margin-right: 4px;
-  }
-}
-
-/* A closed exception stays on the row as history, but drops the alarm colouring — it is no longer
-   something anyone has to act on. */
-.db-exc-row--resolved td {
-  background: #f0fdf4 !important;
-  border-bottom: 1px solid #bbf7d0 !important;
-  color: #14532d;
-}
-
-.db-exc-row__resolution {
-  margin-top: 4px;
-  padding-top: 4px;
-  border-top: 1px dotted #bbf7d0;
-}
-
-.db-actions {
-  white-space: nowrap;
-}
-
 /* Raising an exception is a deliberate, consequential act — styled to read that way without
   looking destructive, since nothing is deleted. */
 .pg-btn--warn {
@@ -352,38 +383,6 @@
  }
 }

-.db-upload {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  flex-wrap: wrap;
-  margin-bottom: 12px;
-}
-
-.db-file {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  padding: 8px 12px;
-  margin-bottom: 6px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 6px;
-  font-size: 12px;
-
-  mat-icon {
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-    color: #64748b;
-  }
-
-  &__name {
-    font-weight: 700;
-    color: #0d1b2a;
-  }
-}
-
 .pg-table tfoot td {
  background: #f8fafc;
  font-weight: 800;
@@ -391,3 +390,52 @@
  color: #334155;
  border-top: 1px solid #e2e8f0;
 }
+
+/* Officer Verification Sheet — the day totalled per person, for whoever signs the book off.
+   Numeric cells use the shared `.num` from cashier-shared.scss rather than a class of their own:
+   that one already right-aligns and tabular-figures both the heading and the cell, which is what
+   lines a money column up. A local class only styled the cells, leaving every heading left-aligned
+   over right-aligned figures. */
+.db-byuser {
+  /* Not one of the three sections below, so no section colour: this is the whole day summed by
+     person, and giving it one of their edges would read as a fourth section. */
+  border-left-color: #94a3b8;
+
+  &__name {
+    font-weight: 600;
+    color: #0f172a;
+  }
+
+  /* Received green, paid-out red — the convention a passbook already uses, so the two columns are
+     told apart without reading the headings. */
+  &__cr {
+    color: #15803d;
+  }
+
+  &__dr {
+    color: #b91c1c;
+  }
+
+  &__net {
+    font-weight: 600;
+
+    &--pos {
+      color: #15803d;
+    }
+
+    &--neg {
+      color: #b91c1c;
+    }
+  }
+
+  /* The sheet's own total sits against a tinted band so the eye lands on the line that has to
+     agree with the day's figures above. */
+  &__total {
+    background: #f8fafc;
+    font-weight: 600;
+
+    td {
+      border-top: 2px solid #cbd5e1;
+    }
+  }
+}
@@ -10,11 +10,22 @@ import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
+import { Router } from '@angular/router';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';

+/**
+ * Which part of the day's work a row came from. Set by the server, one per source register.
+ *
+ * Only counter business appears in the day book. Cash moved between the vault and the drawers is
+ * the bank shifting its own money, not a customer transaction, and it is read on the Cashier
+ * Position and Closing Cash Report where the drawer itself is the subject.
+ */
+type DayBookSection = 'CASHIER' | 'CLERK' | 'SYSTEM';
+
 interface DayBookRow {
  voucherNo: string | null;
+  section: DayBookSection;
  side: 'CR' | 'DR';
  kind: string;
  accountNo: string | null;
@@ -29,18 +40,6 @@ interface DayBookRow {
  txnId: string | null;
  submittedAt: string | null;
  actionedAt: string | null;
-  /** null until someone has physically checked the slip. */
-  verifyStatus: 'VERIFIED' | 'EXCEPTION' | null;
-  slipAmount: number | null;
-  verifyRemarks: string | null;
-  verifiedByName: string | null;
-  verifiedAt: string | null;
-  /** Set once a clerk or manager has closed the exception; null while it is still open. */
-  resolutionStatus: string | null;
-  resolutionNotes: string | null;
-  resolvedByName: string | null;
-  resolvedAt: string | null;
-  attachmentCount: number;
 }

 /**
@@ -63,6 +62,18 @@ interface DayBookRow {
 })
 export class DayBookComponent implements OnInit {
  private service = inject(CashierService);
+  private router = inject(Router);
+
+  /**
+   * The heading, taken from the route the screen was opened by.
+   *
+   * One screen serves three menus, and only the Branch Ops reading is a different thing: there it
+   * is the branch's book with the verification sheet an officer signs off, rather than one desk's
+   * view of the day.
+   */
+  get title(): string {
+    return this.router.url.includes('/branch-ops/') ? 'Day Book & Officer Verification' : 'Day Book';
+  }

  date = '';
  side: '' | 'CR' | 'DR' = '';
@@ -128,48 +139,55 @@ export class DayBookComponent implements OnInit {
    this.load();
  }

-  /** Show only the flagged vouchers — set from the exception banner. */
-  exceptionsOnly = false;
-
  /**
-   * Vouchers still awaiting a conclusion. A closed exception drops out of the banner — it stays
-   * visible on its own row as history, but it is no longer something anyone has to act on.
+   * The day's rows split by where they came from, in the order they are read.
+   *
+   * Cashier work first — that is the counter — then the clerk's outstanding requests. An empty
+   * section is dropped rather than shown as a heading over nothing.
+   *
+   * A section is not "who typed it": a clerk raises a withdrawal that a cashier pays out, so the
+   * heading says which register the entry belongs to, and the By column still names the person.
   */
-  get exceptionRows(): DayBookRow[] {
-    return this.rows.filter((r) => r.verifyStatus === 'EXCEPTION' && !r.resolutionStatus);
-  }
-
-  /** Closed exceptions, kept for the record rather than for action. */
-  get resolvedExceptionCount(): number {
-    return this.rows.filter((r) => r.verifyStatus === 'EXCEPTION' && r.resolutionStatus).length;
-  }
-
-  /** Human label for a resolution code. */
-  resolutionLabel(status: string | null): string {
-    switch (status) {
-      case 'RESOLVED_SYSTEM_ERROR':
-        return 'System entry was wrong';
-      case 'RESOLVED_SLIP_ERROR':
-        return 'Slip was written wrong';
-      case 'RESOLVED_NO_ACTION':
-        return 'No action needed';
-      default:
-        return status ?? '';
-    }
-  }
-
-  /** Vouchers nobody has checked against a slip yet. */
-  get uncheckedCount(): number {
-    return this.rows.filter((r) => !r.verifyStatus).length;
-  }
-
-  toggleExceptionsOnly(): void {
-    this.exceptionsOnly = !this.exceptionsOnly;
+  get sections(): {
+    key: DayBookSection;
+    label: string;
+    hint: string;
+    rows: DayBookRow[];
+    credit: number;
+    debit: number;
+  }[] {
+    const order: { key: DayBookSection; label: string; hint: string }[] = [
+      { key: 'CASHIER', label: 'Cashier', hint: 'Cash actually taken in and paid out over the counter' },
+      { key: 'CLERK', label: 'Clerk', hint: 'Requests raised but not yet actioned — no cash has moved' },
+      // Postings that reached the ledger without a request behind them: interest the nightly run
+      // credited, a charge taken from a balance, a manual journal. These are the day's work too,
+      // and an officer accounting for the day cannot do it from the counter registers alone.
+      {
+        key: 'SYSTEM',
+        label: 'System & Journal',
+        hint: 'Interest, charges and journals posted without a counter request'
+      }
+    ];
+    return order
+      .map((s) => {
+        const rows = this.filteredRows.filter((r) => r.section === s.key);
+        return {
+          ...s,
+          rows,
+          credit: rows
+            .filter((r) => r.side === 'CR' && this.countsAsMoney(r))
+            .reduce((t, r) => t + Number(r.amount ?? 0), 0),
+          debit: rows
+            .filter((r) => r.side === 'DR' && this.countsAsMoney(r))
+            .reduce((t, r) => t + Number(r.amount ?? 0), 0)
+        };
+      })
+      .filter((s) => s.rows.length > 0);
  }

  /** Free-text narrowing over the rows already fetched — no extra round trip per keystroke. */
  get filteredRows(): DayBookRow[] {
-    const base = this.exceptionsOnly ? this.exceptionRows : this.rows;
+    const base = this.rows;
    const q = this.search.trim().toLowerCase();
    if (!q) return base;
    return base.filter((r) =>
@@ -209,11 +227,90 @@ export class DayBookComponent implements OnInit {
    return s === 'APPROVED' || s === 'COMPLETED' || s === 'WITHDRAWN';
  }

+  /**
+   * The day totalled per person, for the officer who signs the book off.
+   *
+   * A branch's day book is read two ways. Entry by entry, to trace one voucher — which the sections
+   * below already give. And person by person, to ask what each member of staff handled and whether
+   * their column adds up: that is the reconciliation a principal officer actually performs, and
+   * without it they are adding a day of rows in their head.
+   *
+   * Built from whoever appears in the day's own rows rather than from a list of staff, so it needs
+   * no configuring: one person working alone gets one line, five people get five, and somebody who
+   * handled nothing today is simply absent instead of showing as a row of zeros.
+   *
+   * Only approved money counts, the same rule the section totals use — a pending request is not
+   * cash anybody is answerable for yet. Pending and rejected rows are still counted as ITEMS, so a
+   * person whose work is all awaiting approval does not vanish from the sheet.
+   *
+   * Ordered by the largest turnover first: the columns worth checking hardest are the ones that
+   * moved the most money.
+   */
+  get byUser(): {
+    name: string;
+    credit: number;
+    debit: number;
+    net: number;
+    items: number;
+    pending: number;
+  }[] {
+    const map = new Map<string, { name: string; credit: number; debit: number; items: number; pending: number }>();
+
+    for (const r of this.filteredRows) {
+      // Rows the registers could not attribute are grouped rather than dropped: an unattributed
+      // amount is exactly what an officer needs to see, and hiding it would leave the sheet's own
+      // total disagreeing with the day's.
+      const name = (r.handledBy ?? '').trim() || 'Unattributed';
+      const entry = map.get(name) ?? { name, credit: 0, debit: 0, items: 0, pending: 0 };
+
+      entry.items++;
+      if (this.countsAsMoney(r)) {
+        const amount = Number(r.amount ?? 0);
+        if (r.side === 'CR') {
+          entry.credit += amount;
+        } else {
+          entry.debit += amount;
+        }
+      } else {
+        entry.pending++;
+      }
+      map.set(name, entry);
+    }
+
+    return Array.from(map.values())
+      .map((e) => ({ ...e, net: e.credit - e.debit }))
+      .sort((a, b) => b.credit + b.debit - (a.credit + a.debit));
+  }
+
+  /** The sheet's own totals, which must equal the day's — that is what makes it verifiable. */
+  get byUserTotals(): { credit: number; debit: number; net: number; items: number; pending: number } {
+    return this.byUser.reduce(
+      (t, u) => ({
+        credit: t.credit + u.credit,
+        debit: t.debit + u.debit,
+        net: t.net + u.net,
+        items: t.items + u.items,
+        pending: t.pending + u.pending
+      }),
+      { credit: 0, debit: 0, net: 0, items: 0, pending: 0 }
+    );
+  }
+
+  /**
+   * Approved and paid out are not the same state, and the day book is where the difference matters:
+   * an approved withdrawal is a promise, a withdrawn one is money gone. Both used to render in the
+   * same green, so a reader could not tell from the badge whether the customer had actually been
+   * handed the cash — the one thing this page is read to find out.
+   */
  statusClass(status: string): string {
    switch ((status ?? '').toUpperCase()) {
-      case 'APPROVED':
-      case 'COMPLETED':
      case 'WITHDRAWN':
+      case 'COMPLETED':
+      case 'CLOSED':
+        // Cash has left the counter. The darker, filled badge — the final state.
+        return 'db-badge db-badge--done';
+      case 'APPROVED':
+        // Passed, but nobody has handed anything over yet.
        return 'db-badge db-badge--ok';
      case 'PENDING':
        return 'db-badge db-badge--pending';
@@ -231,236 +328,9 @@ export class DayBookComponent implements OnInit {
    return t ? t.slice(0, 5) : '—';
  }

-  // ── Physical slip verification ────────────────────────────────────────────
-
-  /** Row whose verification panel is open, or null when none is. */
-  verifyRow: DayBookRow | null = null;
-  verifySlipAmount: number | null = null;
-  verifyRemarks = '';
-  verifySaving = false;
-
-  openVerify(r: DayBookRow): void {
-    this.verifyRow = r;
-    // Pre-filled with the system's own figure: the common case is that the two agree, and when
-    // they don't the cashier only has to change the digits that actually differ.
-    this.verifySlipAmount = Number(r.amount ?? 0);
-    this.verifyRemarks = r.verifyRemarks ?? '';
-    this.attachRow = null;
-  }
-
-  closeVerify(): void {
-    this.verifyRow = null;
-    this.verifySlipAmount = null;
-    this.verifyRemarks = '';
-  }
-
-  /** True when the amount typed off the slip differs from what the system recorded. */
-  get verifyMismatch(): boolean {
-    if (!this.verifyRow || this.verifySlipAmount == null) return false;
-    return Number(this.verifySlipAmount) !== Number(this.verifyRow.amount ?? 0);
-  }
-
-  /**
-   * True while the slip box is empty. Clearing the field must not read as "amounts agree" — an
-   * unanswered question is not a match, so the panel shows neither verdict until a figure is typed.
-   */
-  get verifySlipBlank(): boolean {
-    return this.verifySlipAmount == null || String(this.verifySlipAmount).trim() === '';
-  }
-
-  get verifyDifference(): number {
-    if (!this.verifyRow || this.verifySlipAmount == null) return 0;
-    return Number(this.verifySlipAmount) - Number(this.verifyRow.amount ?? 0);
-  }
-
-  /**
-   * Saves the verdict. The status is derived from the figures rather than picked by the user —
-   * if the slip and the system disagree it is an exception, whatever anyone intended to click.
-   */
-  saveVerify(): void {
-    const row = this.verifyRow;
-    if (!row?.voucherNo) return;
-
-    const isException = this.verifyMismatch;
-    if (isException && !this.verifyRemarks.trim()) {
-      this.errorMsg = 'The amounts differ — add a remark saying what you found before saving.';
-      return;
-    }
-
-    this.verifySaving = true;
-    this.errorMsg = '';
-    this.service
-      .verifyVoucher(
-        row.voucherNo,
-        isException ? 'EXCEPTION' : 'VERIFIED',
-        isException ? Number(this.verifySlipAmount) : undefined,
-        this.verifyRemarks.trim() || undefined
-      )
-      .pipe(
-        catchError((err: any) => {
-          this.errorMsg =
-            err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Could not save the verification.';
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        this.verifySaving = false;
-        if (res) {
-          this.closeVerify();
-          this.load();
-        }
-      });
-  }
-
-  /**
-   * Flags a voucher whose amounts agree — the problem is something other than the figure: a
-   * missing signature, a wrong account, a slip the member disputes. Deliberately not a "clear the
-   * check" action: erasing a verdict would erase the evidence that anything was ever wrong, which
-   * is exactly what an investigation needs.
-   */
-  raiseException(): void {
-    const row = this.verifyRow;
-    if (!row?.voucherNo) return;
-
-    if (!this.verifyRemarks.trim()) {
-      this.errorMsg = 'Say what the problem is before raising an exception.';
-      return;
-    }
-
-    this.verifySaving = true;
-    this.errorMsg = '';
-    this.service
-      // The slip amount is sent as-is: the figures match, so it doubles as the record of what
-      // both the slip and the system said at the time the exception was raised.
-      .verifyVoucher(
-        row.voucherNo,
-        'EXCEPTION',
-        Number(this.verifySlipAmount ?? row.amount ?? 0),
-        this.verifyRemarks.trim()
-      )
-      .pipe(
-        catchError((err: any) => {
-          this.errorMsg =
-            err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Could not raise the exception.';
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        this.verifySaving = false;
-        if (res) {
-          this.closeVerify();
-          this.load();
-        }
-      });
-  }
-
-  // ── Attachments ───────────────────────────────────────────────────────────
-
-  attachRow: DayBookRow | null = null;
-  attachments: any[] = [];
-  attachLoading = false;
-  attachUploading = false;
-
-  openAttach(r: DayBookRow): void {
-    this.attachRow = r;
-    this.verifyRow = null;
-    this.attachments = [];
-    if (!r.voucherNo) return;
-    this.attachLoading = true;
-    this.service
-      .listVoucherAttachments(r.voucherNo)
-      .pipe(catchError(() => of(null)))
-      .subscribe((res: any) => {
-        this.attachLoading = false;
-        this.attachments = res?.attachments ?? [];
-      });
-  }
-
-  closeAttach(): void {
-    this.attachRow = null;
-    this.attachments = [];
-  }
-
-  onFileSelected(event: Event): void {
-    const input = event.target as HTMLInputElement;
-    const file = input.files?.[0];
-    const row = this.attachRow;
-    if (!file || !row?.voucherNo) return;
-
-    // 10 MB, matching the backend's own ceiling — rejecting here saves uploading the whole file
-    // only to have it refused.
-    if (file.size > 10 * 1024 * 1024) {
-      this.errorMsg = 'That file is larger than 10 MB. Please scan it at a lower resolution.';
-      input.value = '';
-      return;
-    }
-
-    const reader = new FileReader();
-    reader.onload = () => {
-      this.attachUploading = true;
-      this.errorMsg = '';
-      this.service
-        .uploadVoucherAttachment(
-          row.voucherNo!,
-          file.name,
-          file.type || 'application/octet-stream',
-          String(reader.result)
-        )
-        .pipe(
-          catchError((err: any) => {
-            this.errorMsg =
-              err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Upload failed. Please try again.';
-            return of(null);
-          })
-        )
-        .subscribe((res: any) => {
-          this.attachUploading = false;
-          input.value = '';
-          if (res) {
-            this.openAttach(row);
-            this.load();
-          }
-        });
-    };
-    reader.readAsDataURL(file);
-  }
-
-  /**
-   * Fetched through HttpClient rather than window.open: the download endpoint needs the auth
-   * header the interceptor adds, which a bare browser navigation would not carry. The blob is
-   * then handed to the browser as a normal save.
-   */
-  downloadAttachment(a: any): void {
-    this.service
-      .downloadVoucherAttachment(a.id)
-      .pipe(catchError(() => of(null)))
-      .subscribe((blob: Blob | null) => {
-        if (!blob) {
-          this.errorMsg = 'Could not download that file.';
-          return;
-        }
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        link.download = a.fileName ?? 'attachment';
-        link.click();
-        URL.revokeObjectURL(url);
-      });
-  }
-
-  deleteAttachment(a: any): void {
-    const row = this.attachRow;
-    this.service
-      .deleteVoucherAttachment(a.id)
-      .pipe(catchError(() => of(null)))
-      .subscribe(() => {
-        if (row) this.openAttach(row);
-        this.load();
-      });
-  }
-
  exportCsv(): void {
    const header = [
+      'Section',
      'Voucher No',
      'Side',
      'Type',
@@ -471,18 +341,11 @@ export class DayBookComponent implements OnInit {
      'Status',
      'Handled By',
      'Approved By',
-      'Slip Check',
-      'Slip Amount',
-      'Remarks',
-      'Checked By',
-      'Resolution',
-      'Resolution Notes',
-      'Closed By',
-      'Attachments',
      'Time'
    ];
    const lines = this.filteredRows.map((r) =>
      [
+        r.section,
        r.voucherNo ?? '',
        r.side,
        r.kind,
@@ -493,14 +356,6 @@ export class DayBookComponent implements OnInit {
        r.status,
        r.handledBy ?? '',
        r.approvedBy ?? '',
-        r.verifyStatus ?? 'NOT CHECKED',
-        r.slipAmount != null ? String(r.slipAmount) : '',
-        r.verifyRemarks ?? '',
-        r.verifiedByName ?? '',
-        r.resolutionStatus ? this.resolutionLabel(r.resolutionStatus) : '',
-        r.resolutionNotes ?? '',
-        r.resolvedByName ?? '',
-        String(r.attachmentCount ?? 0),
        this.timeOf(r.submittedAt)
      ]
        // Quote every field and double any embedded quote: names and narrations routinely
@@ -0,0 +1,606 @@
+<!--
+  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 eod">
+  <!-- Toolbar: never printed, because a printed sheet has nothing to click. -->
+  <div class="pg-head no-print">
+    <div>
+      <h1 class="pg-title">End of the Day Report</h1>
+      <p class="pg-sub">What moved today, whether the cash agrees with the books, and who signs off.</p>
+    </div>
+    <div class="pg-toolbar">
+      <label class="pg-field">
+        <span>Business date</span>
+        <input type="date" [(ngModel)]="date" (change)="reload()" />
+      </label>
+      <button class="pg-btn pg-btn--ghost" (click)="reload()" [disabled]="loading">
+        <mat-icon>refresh</mat-icon>
+        Reload
+      </button>
+      <button class="pg-btn pg-btn--primary" (click)="print()" [disabled]="!loaded">
+        <mat-icon>print</mat-icon>
+        Print / Save as PDF
+      </button>
+    </div>
+  </div>
+
+  @if (loading) {
+    <div class="pg-empty">Loading the day&rsquo;s figures&hellip;</div>
+  }
+
+  @if (loaded) {
+    <div class="eod-sheet">
+      <!-- ── Header ── -->
+      <div class="eod-sheet__head">
+        <h2 class="eod-sheet__title">Daily EOD &amp; Transaction Report</h2>
+        <div class="eod-sheet__meta">
+          <div class="eod-meta">
+            <span class="eod-meta__label">Date</span>
+            <span class="eod-meta__value">{{ date | date: 'dd MMM yyyy' }}</span>
+          </div>
+          <div class="eod-meta">
+            <span class="eod-meta__label">Branch</span>
+            <span class="eod-meta__value">{{ branchName || '—' }}</span>
+          </div>
+          <div class="eod-meta">
+            <span class="eod-meta__label">Prepared by</span>
+            <span class="eod-meta__value">{{ preparedBy || '—' }}</span>
+          </div>
+          <div class="eod-meta">
+            <span class="eod-meta__label">Scope</span>
+            <span class="eod-meta__value">{{ scopedToCashier ? 'My counter' : 'Branch counter' }}</span>
+          </div>
+        </div>
+      </div>
+
+      <!-- ── 1. Transaction summary ── -->
+      <section class="eod-section">
+        <h3 class="eod-section__title"><span class="eod-section__no">1</span> Transaction Summary</h3>
+
+        @if (sectionLines.length) {
+          <p class="eod-caption">Where the money came from</p>
+          <table class="pg-table">
+            <thead>
+              <tr>
+                <th>Source</th>
+                <th class="num">Entries</th>
+                <th class="num col-in">Money in</th>
+                <th class="num col-out">Money out</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (l of sectionLines; track l.label) {
+                <tr>
+                  <td>{{ l.label }}</td>
+                  <td class="num">{{ l.count }}</td>
+                  <td class="num col-in">{{ l.credit ? (l.credit | currency: 'INR') : '—' }}</td>
+                  <td class="num col-out">{{ l.debit ? (l.debit | currency: 'INR') : '—' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td><strong>Total</strong></td>
+                <td class="num">
+                  <strong>{{ txnCount }}</strong>
+                </td>
+                <td class="num col-in">
+                  <strong>{{ summaryCreditTotal | currency: 'INR' }}</strong>
+                </td>
+                <td class="num col-out">
+                  <strong>{{ summaryDebitTotal | currency: 'INR' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+
+          <p class="eod-caption eod-caption--spaced">What kind of entries</p>
+          <table class="pg-table">
+            <thead>
+              <tr>
+                <th>Kind</th>
+                <th class="num">Entries</th>
+                <th class="num col-in">Money in</th>
+                <th class="num col-out">Money out</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (l of kindLines; track l.label) {
+                <tr>
+                  <td>{{ l.label }}</td>
+                  <td class="num">{{ l.count }}</td>
+                  <td class="num col-in">{{ l.credit ? (l.credit | currency: 'INR') : '—' }}</td>
+                  <td class="num col-out">{{ l.debit ? (l.debit | currency: 'INR') : '—' }}</td>
+                </tr>
+              }
+            </tbody>
+          </table>
+
+          <p class="eod-note">
+            Only entries that actually moved money. Anything still pending is listed at the bottom. These figures match
+            the Day Book for the same date.
+          </p>
+        } @else {
+          <div class="pg-empty">No transactions on this date.</div>
+        }
+      </section>
+
+      <!-- ── 2. Cash ──
+           Movement first, because that is the part every figure here agrees on. A comparison
+           against what is held is only offered where both sides describe the same period. -->
+      <section class="eod-section">
+        <h3 class="eod-section__title"><span class="eod-section__no">2</span> Cash</h3>
+
+        @if (scopedToCashier) {
+          <p class="eod-caption">Your drawer today</p>
+          <table class="pg-table eod-recon">
+            <tbody>
+              <tr>
+                <td>Cash you took from the vault this morning</td>
+                <td class="num">{{ openingFloat | currency: 'INR' }}</td>
+              </tr>
+              <tr>
+                <td>Cash you took from members <span class="eod-hint">deposits, including DD cash</span></td>
+                <td class="num col-in">+{{ cashDeposits | currency: 'INR' }}</td>
+              </tr>
+              @if (interCashierIn) {
+                <tr>
+                  <td>Cash another cashier gave you</td>
+                  <td class="num col-in">+{{ interCashierIn | currency: 'INR' }}</td>
+                </tr>
+              }
+              <tr>
+                <td>Cash you paid to members <span class="eod-hint">withdrawals</span></td>
+                <td class="num col-out">−{{ cashWithdrawals | currency: 'INR' }}</td>
+              </tr>
+              @if (settledOut) {
+                <tr>
+                  <td>Cash you handed back to the vault</td>
+                  <td class="num col-out">−{{ settledOut | currency: 'INR' }}</td>
+                </tr>
+              }
+              @if (interCashierOut) {
+                <tr>
+                  <td>Cash you gave another cashier</td>
+                  <td class="num col-out">−{{ interCashierOut | currency: 'INR' }}</td>
+                </tr>
+              }
+              <tr class="eod-recon__expected">
+                <td><strong>So your drawer should hold</strong></td>
+                <td class="num">
+                  @if (expectedCash !== null) {
+                    <strong>{{ expectedCash | currency: 'INR' }}</strong>
+                  } @else {
+                    <span class="eod-blank">&mdash;</span>
+                  }
+                </td>
+              </tr>
+              <tr>
+                <td><strong>System says you hold</strong></td>
+                <td class="num">
+                  @if (actualCash !== null) {
+                    <strong>{{ actualCash | currency: 'INR' }}</strong>
+                  } @else {
+                    <span class="eod-blank">nothing recorded</span>
+                  }
+                </td>
+              </tr>
+              @if (variance !== null) {
+                <tr class="eod-recon__variance" [class]="varianceClass">
+                  <td><strong>Difference</strong></td>
+                  <td class="num">
+                    <strong>{{ variance | currency: 'INR' }}</strong>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+
+          @if (variance !== null) {
+            @if (varianceOk) {
+              <p class="eod-verdict eod-verdict--ok">
+                <mat-icon>check_circle</mat-icon>
+                Your cash agrees. Nothing short, nothing over.
+              </p>
+            } @else {
+              <p class="eod-verdict eod-verdict--bad">
+                <mat-icon>error</mat-icon>
+                {{ variance! > 0 ? 'Extra' : 'Short' }} by
+                {{ (variance! > 0 ? variance : -variance!) | currency: 'INR' }}. Explain this before closing.
+              </p>
+            }
+          } @else {
+            <p class="eod-note">Today&rsquo;s cash legs were not sent for this login, so nothing is compared.</p>
+          }
+        } @else {
+          <p class="eod-caption">Cash that moved across the branch today</p>
+          <table class="pg-table eod-recon">
+            <tbody>
+              <tr>
+                <td>Cash taken from members <span class="eod-hint">deposits</span></td>
+                <td class="num col-in">+{{ branchDeposits ?? 0 | currency: 'INR' }}</td>
+              </tr>
+              <tr>
+                <td>Cash paid to members <span class="eod-hint">withdrawals and closures</span></td>
+                <td class="num col-out">−{{ branchWithdrawals ?? 0 | currency: 'INR' }}</td>
+              </tr>
+              <tr class="eod-recon__expected">
+                <td><strong>Net change today</strong></td>
+                <td class="num col-net">
+                  <strong>{{ branchNetMovement | currency: 'INR' }}</strong>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+          <p class="eod-caption eod-caption--spaced">Cash the branch is holding right now</p>
+          <table class="pg-table eod-recon">
+            <tbody>
+              <tr>
+                <td>In the vaults</td>
+                <td class="num">{{ vaultTotal ?? 0 | currency: 'INR' }}</td>
+              </tr>
+              <tr>
+                <td>With the cashiers</td>
+                <td class="num">{{ drawersTotal ?? 0 | currency: 'INR' }}</td>
+              </tr>
+              <tr class="eod-recon__expected">
+                <td><strong>Total cash in the branch</strong></td>
+                <td class="num">
+                  @if (branchHeldTotal !== null) {
+                    <strong>{{ branchHeldTotal | currency: 'INR' }}</strong>
+                  } @else {
+                    <span class="eod-blank">nothing recorded</span>
+                  }
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+          <p class="eod-note">
+            These are two different things and are not subtracted from each other. The first is today&rsquo;s movement;
+            the second is everything the branch has accumulated to date. Each cashier&rsquo;s own drawer is checked
+            against their own day on their login, and the branch figure is signed off on the Day Open / Day Close
+            screen.
+          </p>
+        }
+      </section>
+
+      <!-- ── 3. Who handled the day, and what each drawer holds ──
+           A clerk signs off other people's work, so the sheet has to name them. On a cashier's own
+           login this collapses to one row, which is still the right thing to print. -->
+      <section class="eod-section">
+        <h3 class="eod-section__title"><span class="eod-section__no">3</span> Handled By</h3>
+
+        @if (byUser.length) {
+          <p class="eod-caption">What each person handled</p>
+          <table class="pg-table">
+            <thead>
+              <tr>
+                <th>Handled by</th>
+                <th class="num">Entries</th>
+                <th class="num col-in">Money in</th>
+                <th class="num col-out">Money out</th>
+                <th class="num col-net">Net</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (u of byUser; track u.label) {
+                <tr>
+                  <td>{{ u.label }}</td>
+                  <td class="num">{{ u.count }}</td>
+                  <td class="num col-in">{{ u.credit ? (u.credit | currency: 'INR') : '—' }}</td>
+                  <td class="num col-out">{{ u.debit ? (u.debit | currency: 'INR') : '—' }}</td>
+                  <td class="num col-net">{{ u.credit - u.debit | currency: 'INR' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td><strong>Total</strong></td>
+                <td class="num">
+                  <strong>{{ txnCount }}</strong>
+                </td>
+                <td class="num col-in">
+                  <strong>{{ summaryCreditTotal | currency: 'INR' }}</strong>
+                </td>
+                <td class="num col-out">
+                  <strong>{{ summaryDebitTotal | currency: 'INR' }}</strong>
+                </td>
+                <td class="num col-net">
+                  <strong>{{ summaryCreditTotal - summaryDebitTotal | currency: 'INR' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        } @else {
+          <div class="pg-empty">Nobody moved money on this date.</div>
+        }
+
+        @if (cashierPositions.length) {
+          <p class="eod-caption eod-caption--spaced">What each cashier is holding</p>
+          <table class="pg-table">
+            <thead>
+              <tr>
+                <th>Cashier</th>
+                <th class="num">Cash held</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (p of cashierPositions; track p.cashierId) {
+                <tr>
+                  <td>{{ p.cashierName }}</td>
+                  <td class="num">{{ p.totalAmount | currency: 'INR' }}</td>
+                </tr>
+              }
+            </tbody>
+            @if (cashierPositions.length > 1) {
+              <tfoot>
+                <tr>
+                  <td><strong>Total</strong></td>
+                  <td class="num">
+                    <strong>{{ cashierPositionTotal | currency: 'INR' }}</strong>
+                  </td>
+                </tr>
+              </tfoot>
+            }
+          </table>
+          <p class="eod-note">
+            This is what each drawer should contain right now &mdash; a running total, not just today. Count against it
+            before settling to the vault.
+          </p>
+        }
+      </section>
+
+      <!-- ── 4. Every transaction ──
+           The sections above are totals, and a total nobody can break down is a total nobody can
+           check. This is the day itself, line by line, so a figure above can be traced to the
+           entries that made it. -->
+      <section class="eod-section eod-section--wide">
+        <h3 class="eod-section__title"><span class="eod-section__no">4</span> Every Transaction</h3>
+
+        @if (approvedRows.length) {
+          <table class="pg-table eod-txns">
+            <thead>
+              <tr>
+                <th>Voucher</th>
+                <th>Kind</th>
+                <th>Account</th>
+                <th>Party</th>
+                <th>Handled by</th>
+                <th class="num col-in">Money in</th>
+                <th class="num col-out">Money out</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (r of approvedRows; track r.voucherNo + '|' + r.txnId) {
+                <tr>
+                  <td class="eod-mono">{{ r.voucherNo || '—' }}</td>
+                  <td>{{ kindLabel(r.kind) }}</td>
+                  <td class="eod-mono">{{ r.accountNo || '—' }}</td>
+                  <td>{{ r.party || '—' }}</td>
+                  <td>{{ r.handledBy || '—' }}</td>
+                  <td class="num col-in">{{ r.side === 'CR' ? (r.amount | currency: 'INR') : '—' }}</td>
+                  <td class="num col-out">{{ r.side === 'DR' ? (r.amount | currency: 'INR') : '—' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td colspan="5">
+                  <strong>Total &mdash; {{ txnCount }} entries</strong>
+                </td>
+                <td class="num col-in">
+                  <strong>{{ summaryCreditTotal | currency: 'INR' }}</strong>
+                </td>
+                <td class="num col-out">
+                  <strong>{{ summaryDebitTotal | currency: 'INR' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        } @else {
+          <div class="pg-empty">No transactions on this date.</div>
+        }
+
+        @if (pendingRows.length) {
+          <p class="eod-caption eod-caption--spaced">Still pending &mdash; no money has moved on these</p>
+          <table class="pg-table eod-txns">
+            <thead>
+              <tr>
+                <th>Voucher</th>
+                <th>Kind</th>
+                <th>Account</th>
+                <th>Party</th>
+                <th>Raised by</th>
+                <th class="num">Amount</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (r of pendingRows; track r.voucherNo + '|' + r.txnId) {
+                <tr>
+                  <td class="eod-mono">{{ r.voucherNo || '—' }}</td>
+                  <td>{{ kindLabel(r.kind) }}</td>
+                  <td class="eod-mono">{{ r.accountNo || '—' }}</td>
+                  <td>{{ r.party || '—' }}</td>
+                  <td>{{ r.handledBy || '—' }}</td>
+                  <td class="num">{{ r.amount | currency: 'INR' }}</td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        }
+      </section>
+
+      <!-- ── Last night's batch ──
+           Yesterday's work, posted after that day had already been counted and signed. Shown here
+           so it is not lost, kept out of every total above so today's figures still tie to the
+           ledger. Only appears when there is such a batch. -->
+      @if (priorDayRows.length) {
+        <section class="eod-section eod-section--wide eod-section--prior">
+          <h3 class="eod-section__title">
+            <mat-icon class="eod-section__icon">nights_stay</mat-icon>
+            Posted Overnight &mdash; work of
+            {{ priorDayDate ? (priorDayDate | date: 'dd MMM yyyy') : 'the previous day' }}
+          </h3>
+
+          <!-- Both dates side by side, because the whole point of this block is that they differ.
+               A reader who only sees one of them cannot tell whether the entry is being counted
+               today or merely reported today. -->
+          <div class="eod-datepair">
+            <div class="eod-datepair__item">
+              <span class="eod-datepair__label">These belong to</span>
+              <span class="eod-datepair__value">{{
+                priorDayDate ? (priorDayDate | date: 'dd MMM yyyy') : 'the previous day'
+              }}</span>
+              <span class="eod-datepair__hint">the day the system posted them against &mdash; already closed</span>
+            </div>
+            <div class="eod-datepair__arrow">→</div>
+            <div class="eod-datepair__item">
+              <span class="eod-datepair__label">Showing on</span>
+              <span class="eod-datepair__value">{{ date | date: 'dd MMM yyyy' }}</span>
+              <span class="eod-datepair__hint">today&rsquo;s report, because the run finished after midnight</span>
+            </div>
+          </div>
+
+          <p class="eod-note eod-note--lead">
+            The nightly run posted these after
+            {{ priorDayDate ? (priorDayDate | date: 'dd MMM') : 'the previous day' }} had already closed and been signed
+            off, so they surface on today&rsquo;s report instead. In the ledger they sit on
+            {{ priorDayDate ? (priorDayDate | date: 'dd MMM') : 'that date' }}, and they are
+            <strong>not counted</strong> in any figure above.
+          </p>
+
+          <table class="pg-table eod-txns">
+            <thead>
+              <tr>
+                <th>Voucher</th>
+                <th>Kind</th>
+                <th>Account</th>
+                <th>Party</th>
+                <th>Ledger date</th>
+                <th class="num col-in">Money in</th>
+                <th class="num col-out">Money out</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (r of priorDayRows; track r.voucherNo + '|' + r.txnId) {
+                <tr>
+                  <td class="eod-mono">{{ r.voucherNo || '—' }}</td>
+                  <td>{{ kindLabel(r.kind) }}</td>
+                  <td class="eod-mono">{{ r.accountNo || '—' }}</td>
+                  <td>{{ r.party || '—' }}</td>
+                  <!-- Per row, not just in the heading: one run can span a date boundary, and a
+                       reader checking a single figure against the ledger needs the date on the line
+                       they are looking at. -->
+                  <td class="eod-datecell">{{ r.effectiveDate ? (r.effectiveDate | date: 'dd MMM yyyy') : '—' }}</td>
+                  <td class="num col-in">{{ r.side === 'CR' ? (r.amount | currency: 'INR') : '—' }}</td>
+                  <td class="num col-out">{{ r.side === 'DR' ? (r.amount | currency: 'INR') : '—' }}</td>
+                </tr>
+              }
+            </tbody>
+            <tfoot>
+              <tr>
+                <td colspan="5">
+                  <strong>Total &mdash; {{ priorDayRows.length }} entries</strong>
+                </td>
+                <td class="num col-in">
+                  <strong>{{ priorDayCredit | currency: 'INR' }}</strong>
+                </td>
+                <td class="num col-out">
+                  <strong>{{ priorDayDebit | currency: 'INR' }}</strong>
+                </td>
+              </tr>
+            </tfoot>
+          </table>
+        </section>
+      }
+
+      <!-- ── 5. Operational notes ── -->
+      <section class="eod-section">
+        <h3 class="eod-section__title"><span class="eod-section__no">5</span> Anything Outstanding</h3>
+
+        <ul class="eod-notes">
+          <li>
+            <span class="eod-notes__label">Entries handled</span>
+            <span class="eod-notes__value">{{ txnCount }} entries &middot; {{ kindLines.length }} kind(s)</span>
+          </li>
+          <li [class.eod-notes--warn]="pendingRows.length > 0">
+            <span class="eod-notes__label">Waiting for approval</span>
+            <span class="eod-notes__value">
+              @if (pendingRows.length) {
+                {{ pendingRows.length }} entry(ies) &mdash; the day cannot close until these are done
+              } @else {
+                None
+              }
+            </span>
+          </li>
+          <li [class.eod-notes--warn]="mismatchRows.length > 0">
+            <span class="eod-notes__label">Slips that did not match</span>
+            <span class="eod-notes__value">
+              @if (mismatchRows.length) {
+                {{ mismatchRows.length }} slip(s) do not agree with the system
+              } @else {
+                None
+              }
+            </span>
+          </li>
+          <li>
+            <span class="eod-notes__label">Slips not checked yet</span>
+            <span class="eod-notes__value">
+              {{
+                unverifiedRows.length
+                  ? unverifiedRows.length + ' entry(ies) still to be checked against paper'
+                  : 'All checked'
+              }}
+            </span>
+          </li>
+          @if (priorDayRows.length) {
+            <li>
+              <span class="eod-notes__label">Posted overnight</span>
+              <span class="eod-notes__value">
+                {{ priorDayRows.length }} entry(ies) for
+                {{ priorDayDate ? (priorDayDate | date: 'dd MMM') : 'the previous day' }} &mdash; listed in their own
+                section, not in today&rsquo;s figures
+              </span>
+            </li>
+          }
+          <li [class.eod-notes--ok]="allClear">
+            <span class="eod-notes__label">Status</span>
+            <span class="eod-notes__value">
+              {{
+                allClear
+                  ? 'Everything is clear — the day is ready to close.'
+                  : 'Sort out the items above before closing the day.'
+              }}
+            </span>
+          </li>
+        </ul>
+      </section>
+
+      <!-- ── Signatures ── -->
+      <section class="eod-sign">
+        <div class="eod-sign__block">
+          <div class="eod-sign__line"></div>
+          <div class="eod-sign__role">{{ supervising ? 'Prepared by' : 'Cashier' }}</div>
+          <div class="eod-sign__name">{{ preparedBy || '' }}</div>
+        </div>
+        <div class="eod-sign__block">
+          <div class="eod-sign__line"></div>
+          <div class="eod-sign__role">Manager / Principal Officer</div>
+          <div class="eod-sign__name">&nbsp;</div>
+        </div>
+      </section>
+
+      <p class="eod-foot">
+        Generated from the day book and the closing cash report for {{ date | date: 'dd MMM yyyy' }}. Figures move with
+        the underlying vouchers &mdash; reprint after any reversal.
+      </p>
+    </div>
+  }
+</div>
@@ -0,0 +1,448 @@
+/**
+ * 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 sheet itself, which is what gets signed. Bordered on screen so it reads as one document
+   rather than three panels, and the same borders carry into print. */
+
+/* Centred in the page, because it is a document rather than a screen: a signed sheet pinned to the
+   left edge of a wide monitor reads as a panel that failed to fill its space. */
+.eod-sheet {
+  background: #fff;
+  border: 1px solid #cbd5e1;
+  border-radius: 8px;
+  padding: 28px 32px 24px;
+  max-width: 900px;
+  margin: 0 auto;
+  width: 100%;
+}
+
+/* The toolbar and the loading line above it share the sheet's own edges, not the viewport's. */
+.eod .pg-head,
+.eod > .pg-empty {
+  max-width: 900px;
+  margin: 0 auto;
+  width: 100%;
+}
+
+.eod-sheet__head {
+  border-bottom: 2px solid #0f172a;
+  padding-bottom: 14px;
+  margin-bottom: 22px;
+}
+
+.eod-sheet__title {
+  margin: 0 0 14px;
+  font-size: 19px;
+  font-weight: 700;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+  color: #0f172a;
+  text-align: center;
+}
+
+.eod-sheet__meta {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 10px 18px;
+}
+
+.eod-meta {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.eod-meta__label {
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: #64748b;
+}
+
+.eod-meta__value {
+  font-size: 13px;
+  font-weight: 600;
+  color: #0f172a;
+}
+
+/* ── Sections ── */
+.eod-section {
+  margin-bottom: 26px;
+
+  /* A section must not be split across two printed pages: a reconciliation whose expected line is
+     on page one and whose variance is on page two is not a document anybody can sign. */
+  break-inside: avoid;
+  page-break-inside: avoid;
+}
+
+.eod-section__title {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  margin: 0 0 12px;
+  font-size: 13px;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: #0f172a;
+  border-bottom: 1px solid #e2e8f0;
+  padding-bottom: 7px;
+}
+
+.eod-section__no {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  border-radius: 4px;
+  background: #0f172a;
+  color: #fff;
+  font-size: 11px;
+  font-weight: 700;
+  flex: 0 0 auto;
+}
+
+.eod-note {
+  margin: 8px 0 0;
+  font-size: 11.5px;
+  color: #64748b;
+  line-height: 1.5;
+}
+
+/* Names the table below it, so two tables in one section do not read as one long list. */
+.eod-caption {
+  margin: 0 0 6px;
+  font-size: 11px;
+  font-weight: 700;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: #475569;
+}
+
+.eod-caption--spaced {
+  margin-top: 18px;
+}
+
+/* The line-by-line list is wider than the rest of the sheet, so it scrolls in its own box rather
+   than making the whole page scroll sideways. */
+.eod-section--wide {
+  .pg-table {
+    min-width: 100%;
+  }
+}
+
+.eod-txns {
+  font-size: 12px;
+
+  td,
+  th {
+    white-space: nowrap;
+  }
+}
+
+/* Voucher numbers and account numbers are read digit by digit, so they get a fixed pitch. */
+.eod-mono {
+  font-family: 'Roboto Mono', ui-monospace, 'Courier New', monospace;
+  font-size: 11.5px;
+}
+
+/* Last night's batch. Set apart on purpose: these figures belong to a day that has already been
+   signed off, so the block has to read as an appendix rather than as part of the day being counted.
+   Indigo, because that is already the day book's colour for system postings. */
+.eod-section--prior {
+  background: #f5f3ff;
+  border: 1px solid #ddd6fe;
+  border-radius: 8px;
+  padding: 16px 18px 14px;
+  margin-top: 30px;
+
+  .eod-section__title {
+    color: #5b21b6;
+    border-bottom-color: #ddd6fe;
+  }
+
+  .pg-table th {
+    background: #ede9fe;
+    color: #5b21b6;
+  }
+}
+
+/* Sits in the title row in place of the numbered chip: this block is outside the numbered sequence,
+   because it is not a step in counting today. */
+.eod-section__icon {
+  font-size: 18px;
+  width: 18px;
+  height: 18px;
+  color: #7c3aed;
+  flex: 0 0 auto;
+}
+
+.eod-note--lead {
+  margin: 0 0 12px;
+  color: #5b21b6;
+}
+
+/* The two dates, stated as a pair with an arrow between them. Spelling out "belongs to X, showing
+   on Y" is the only way a reader can be sure which of the two a figure is counted under — a single
+   date in a heading leaves exactly the ambiguity this block exists to remove. */
+.eod-datepair {
+  display: flex;
+  align-items: center;
+  gap: 14px;
+  margin: 0 0 14px;
+  padding: 12px 14px;
+  background: #fff;
+  border: 1px solid #ddd6fe;
+  border-radius: 6px;
+  flex-wrap: wrap;
+}
+
+.eod-datepair__item {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  flex: 1 1 200px;
+}
+
+.eod-datepair__label {
+  font-size: 10px;
+  font-weight: 700;
+  letter-spacing: 0.06em;
+  text-transform: uppercase;
+  color: #7c3aed;
+}
+
+.eod-datepair__value {
+  font-size: 15px;
+  font-weight: 700;
+  color: #0f172a;
+}
+
+.eod-datepair__hint {
+  font-size: 10.5px;
+  color: #64748b;
+  line-height: 1.4;
+}
+
+.eod-datepair__arrow {
+  font-size: 20px;
+  color: #a78bfa;
+  flex: 0 0 auto;
+}
+
+/* Dates in the row are read against the ledger, so they do not shrink into the grey the way a
+   secondary column normally would. */
+.eod-datecell {
+  font-size: 11.5px;
+  font-weight: 600;
+  color: #5b21b6;
+  white-space: nowrap;
+}
+
+.eod-hint {
+  display: block;
+  font-size: 10.5px;
+  font-weight: 400;
+  color: #94a3b8;
+}
+
+.eod-blank {
+  color: #94a3b8;
+  font-style: italic;
+}
+
+/* ── Reconciliation table ── */
+
+/* Two columns only, so the label takes the room and the figure sits in a fixed money column. */
+.eod-recon {
+  td:first-child {
+    width: auto;
+  }
+
+  td:last-child {
+    width: 190px;
+  }
+}
+
+.eod-recon__expected td {
+  border-top: 1px solid #94a3b8;
+  background: #f8fafc;
+}
+
+.eod-recon__variance td {
+  border-top: 2px solid #0f172a;
+}
+
+.eod-recon__variance.eod-ok td {
+  background: #f0fdf4;
+  color: #15803d;
+}
+
+.eod-recon__variance.eod-bad td {
+  background: #fef2f2;
+  color: #b91c1c;
+}
+
+/* ── Verdict line ── */
+.eod-verdict {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  margin: 12px 0 0;
+  padding: 9px 12px;
+  border-radius: 6px;
+  font-size: 12.5px;
+  font-weight: 600;
+  line-height: 1.45;
+
+  mat-icon {
+    font-size: 17px;
+    width: 17px;
+    height: 17px;
+    flex: 0 0 auto;
+  }
+}
+
+.eod-verdict--ok {
+  background: #f0fdf4;
+  border: 1px solid #86efac;
+  color: #15803d;
+}
+
+.eod-verdict--bad {
+  background: #fef2f2;
+  border: 1px solid #fca5a5;
+  color: #b91c1c;
+}
+
+/* ── Operational notes ── */
+.eod-notes {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  li {
+    display: flex;
+    gap: 14px;
+    padding: 8px 10px;
+    border-bottom: 1px solid #f1f5f9;
+    font-size: 12.5px;
+
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+}
+
+.eod-notes__label {
+  flex: 0 0 190px;
+  font-weight: 600;
+  color: #475569;
+}
+
+.eod-notes__value {
+  color: #0f172a;
+}
+
+.eod-notes--warn {
+  background: #fffbeb;
+
+  .eod-notes__value {
+    color: #b45309;
+    font-weight: 600;
+  }
+}
+
+.eod-notes--ok {
+  background: #f0fdf4;
+
+  .eod-notes__value {
+    color: #15803d;
+    font-weight: 600;
+  }
+}
+
+/* ── Signatures ── */
+.eod-sign {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 40px;
+  margin-top: 46px;
+  break-inside: avoid;
+  page-break-inside: avoid;
+}
+
+.eod-sign__block {
+  text-align: center;
+}
+
+.eod-sign__line {
+  border-bottom: 1px solid #0f172a;
+  height: 34px;
+  margin-bottom: 7px;
+}
+
+.eod-sign__role {
+  font-size: 11px;
+  font-weight: 700;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
+  color: #475569;
+}
+
+.eod-sign__name {
+  font-size: 12px;
+  color: #64748b;
+  margin-top: 2px;
+}
+
+.eod-foot {
+  margin: 26px 0 0;
+  padding-top: 12px;
+  border-top: 1px dashed #cbd5e1;
+  font-size: 10.5px;
+  color: #94a3b8;
+  text-align: center;
+  line-height: 1.5;
+}
+
+/* ── Print ──
+   The sheet is the document; the shell, the toolbar and the app chrome are not. Colours are forced
+   so the variance verdict survives a printer that would otherwise drop backgrounds. */
+@media print {
+  .no-print,
+  .pg-head {
+    display: none !important;
+  }
+
+  .eod-sheet {
+    border: 0;
+    border-radius: 0;
+    padding: 0;
+    max-width: none;
+  }
+
+  .eod-sheet,
+  .eod-recon__variance td,
+  .eod-verdict,
+  .eod-notes--warn,
+  .eod-notes--ok {
+    -webkit-print-color-adjust: exact;
+    print-color-adjust: exact;
+  }
+
+  .eod-sheet__title {
+    font-size: 16px;
+  }
+
+  .pg-table {
+    font-size: 11px;
+  }
+}
@@ -0,0 +1,536 @@
+/**
+ * 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 { MatIconModule } from '@angular/material/icon';
+import { CashierService } from '../cashier.service';
+import { SettingsService } from 'app/settings/settings.service';
+import { AuthenticationService } from 'app/core/authentication/authentication.service';
+
+/** One part of the day's work — a section of the day book, or a kind of entry within it. */
+interface SummaryLine {
+  label: string;
+  credit: number;
+  debit: number;
+  count: number;
+}
+
+/**
+ * The single sheet a cashier signs the day off with.
+ *
+ * Every other cashier screen answers one question — what is in the drawer, which vouchers are
+ * unverified, what did each person handle. At close of day somebody has to sign one piece of paper
+ * saying the money was counted and it agreed, and until now that meant reading four screens and
+ * copying figures onto a form by hand.
+ *
+ * Nothing here is computed on the server that was not already being computed: the closing report
+ * supplies the drawer legs, the day book supplies the transactions, and the cashier position
+ * supplies what the system believes is held. This screen assembles them in the order a person
+ * verifying the day reads them in, and prints.
+ */
+@Component({
+  selector: 'mifosx-end-of-day-report',
+  templateUrl: './end-of-day-report.component.html',
+  styleUrls: [
+    '../cashier-shared.scss',
+    './end-of-day-report.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatIconModule
+  ]
+})
+export class EndOfDayReportComponent implements OnInit {
+  private service = inject(CashierService);
+  private settings = inject(SettingsService);
+  private auth = inject(AuthenticationService);
+
+  date = '';
+  loading = false;
+  loaded = false;
+
+  /** Who is signing, and for which branch — read from the session, never typed in. */
+  preparedBy = '';
+  branchName = '';
+
+  // ── Section 1: transaction summary ──
+  rows: any[] = [];
+  creditTotal = 0;
+  debitTotal = 0;
+
+  // ── Section 2: cash drawer ──
+  /** Drawn from the vault in the morning: a cashier's opening float. */
+  openingFloat = 0;
+  cashDeposits = 0;
+  interCashierIn = 0;
+  cashWithdrawals = 0;
+  settledOut = 0;
+  interCashierOut = 0;
+  /** Whether the server sent this day's own cash legs, which only a cashier-scoped call gets. */
+  hasDayLegs = false;
+  /** Whether the drawer figures are one cashier's or the whole branch's counter work. */
+  scopedToCashier = false;
+
+  /** What the drawers hold between them, per the system. */
+  drawersTotal: number | null = null;
+
+  /**
+   * Each cashier and what their drawer holds.
+   *
+   * A clerk holds no drawer of their own — they supervise the counter — so a single "actual cash"
+   * figure says nothing to them. The position endpoint already answers for whoever is asking: one
+   * drawer for a cashier, every drawer for a clerk or officer, so the same call serves both and the
+   * screen reads differently depending on who opened it.
+   */
+  cashierPositions: { cashierId: number | null; cashierName: string; totalAmount: number }[] = [];
+
+  /**
+   * The branch's own expected cash, from the day register.
+   *
+   * A branch-wide reading cannot be assembled from the per-cashier day legs: those are only
+   * returned when the call is scoped to one cashier. The branch day register already keeps this
+   * arithmetic for the close-day gate — opening cash, plus approved deposits, less what was
+   * withdrawn — so the sheet reads it rather than inventing a second version of the same sum.
+   *
+   * Null when no day has been opened for this date, which is a real state: there is nothing to
+   * reconcile against on a day the branch never opened.
+   */
+  branchOpeningCash: number | null = null;
+  branchDeposits: number | null = null;
+  branchWithdrawals: number | null = null;
+  branchExpectedCash: number | null = null;
+
+  /**
+   * What the vaults hold, which a branch-wide count must include.
+   *
+   * The branch register's expected cash covers the whole branch — vault and every drawer together —
+   * because cash moved from the vault to a cashier has not left the branch. Counting only the
+   * drawers against it would report the entire vault as a shortage.
+   */
+  vaultTotal: number | null = null;
+
+  ngOnInit(): void {
+    this.date = this.businessDate();
+    this.preparedBy = this.currentUserName();
+    this.branchName = this.currentOfficeName();
+    this.load();
+  }
+
+  /**
+   * The date the books are open on, not the wall clock.
+   *
+   * An EOD sheet dated by the browser would be filed against the wrong day whenever the branch is
+   * still working yesterday's business date, which is exactly when a day is being closed.
+   */
+  private businessDate(): string {
+    const d = this.settings.businessDate;
+    const safe = d instanceof Date && !isNaN(d.getTime()) ? d : new Date();
+    return `${safe.getFullYear()}-${String(safe.getMonth() + 1).padStart(2, '0')}-${String(safe.getDate()).padStart(2, '0')}`;
+  }
+
+  /** The member of staff behind the login, falling back to the username when no staff is linked. */
+  private currentUserName(): string {
+    const c = this.auth.getCredentials();
+    return c ? c.staffDisplayName || c.username || '' : '';
+  }
+
+  private currentOfficeName(): string {
+    return this.auth.getCredentials()?.officeName || '';
+  }
+
+  load(): void {
+    this.loading = true;
+    this.loaded = false;
+
+    this.service.dayBook(this.date).subscribe({
+      next: (res: any) => {
+        this.rows = res?.rows || [];
+        this.creditTotal = Number(res?.creditTotal || 0);
+        this.debitTotal = Number(res?.debitTotal || 0);
+        this.loading = false;
+        this.loaded = true;
+      },
+      error: () => {
+        this.rows = [];
+        this.creditTotal = 0;
+        this.debitTotal = 0;
+        this.loading = false;
+        this.loaded = true;
+      }
+    });
+
+    this.service.closingCashReport(this.date).subscribe({
+      next: (res: any) => {
+        // The four day legs are only sent for a cashier-scoped call. Read as absent rather than
+        // zero: a leg that is missing and a leg that is genuinely nil mean different things, and
+        // treating the first as the second is what let the sheet claim an expected balance of zero
+        // for a whole branch.
+        this.hasDayLegs = res?.todayVaultIn != null;
+        this.openingFloat = Number(res?.todayVaultIn || 0);
+        this.cashDeposits = Number(res?.depositTotalWithDd ?? res?.depositTotal ?? 0);
+        this.cashWithdrawals = Number(res?.withdrawalTotal || 0);
+        this.settledOut = Number(res?.todaySettledOut || 0);
+        this.interCashierIn = Number(res?.todayInterCashierIn || 0);
+        this.interCashierOut = Number(res?.todayInterCashierOut || 0);
+        this.scopedToCashier = res?.scopedToCashier === true;
+      },
+      error: () => {
+        this.openingFloat = 0;
+        this.cashDeposits = 0;
+        this.cashWithdrawals = 0;
+        this.settledOut = 0;
+        this.interCashierIn = 0;
+        this.interCashierOut = 0;
+        this.scopedToCashier = false;
+        this.hasDayLegs = false;
+      }
+    });
+
+    // The branch's expected cash for the date, which is the only basis a branch-wide reading can
+    // reconcile on. Fails quietly for a plain cashier, who is not allowed to operate the day.
+    this.service.branchDayClosePreview(this.date).subscribe({
+      next: (res: any) => {
+        this.branchOpeningCash = res?.openingCash == null ? null : Number(res.openingCash);
+        this.branchDeposits = res?.deposits == null ? null : Number(res.deposits);
+        this.branchWithdrawals = res?.withdrawals == null ? null : Number(res.withdrawals);
+        this.branchExpectedCash = res?.expectedCash == null ? null : Number(res.expectedCash);
+      },
+      error: () => {
+        this.branchOpeningCash = null;
+        this.branchDeposits = null;
+        this.branchWithdrawals = null;
+        this.branchExpectedCash = null;
+      }
+    });
+
+    // One object for a cashier, an array of every cashier for a clerk or officer — the server
+    // decides from the caller's own roles, so this screen does not have to ask who is reading it.
+    this.service.cashierPositionReport(undefined, this.date).subscribe({
+      next: (res: any) => {
+        const list = Array.isArray(res) ? res : res ? [res] : [];
+        this.cashierPositions = list
+          .filter((p: any) => p && p.cashierId != null)
+          .map((p: any) => ({
+            cashierId: p.cashierId == null ? null : Number(p.cashierId),
+            cashierName: p.cashierName || `Cashier ${p.cashierId}`,
+            totalAmount: Number(p.totalAmount || 0)
+          }))
+          .sort((a: any, b: any) => b.totalAmount - a.totalAmount);
+        this.drawersTotal = this.cashierPositions.length
+          ? this.cashierPositions.reduce((s, p) => s + p.totalAmount, 0)
+          : null;
+      },
+      error: () => {
+        // Nothing to count against, so the variance line stays blank rather than reading zero — a
+        // variance of zero is a claim that somebody counted and it agreed.
+        this.cashierPositions = [];
+        this.drawersTotal = null;
+      }
+    });
+
+    // Vault stock, so a branch-wide count is of the whole branch and not just the counters.
+    this.service.vaultPosition(undefined, this.date).subscribe({
+      next: (res: any) => {
+        const list = Array.isArray(res) ? res : res ? [res] : [];
+        this.vaultTotal = list.reduce((s: number, v: any) => s + Number(v?.totalAmount || 0), 0);
+      },
+      error: () => {
+        this.vaultTotal = null;
+      }
+    });
+  }
+
+  // ── Section 1 ──
+
+  /**
+   * Only the entries that actually moved money.
+   *
+   * A pending request is listed on the day book so nobody loses sight of it, but it has taken no
+   * cash — counting it into an EOD summary would make the sheet disagree with the drawer.
+   */
+  /**
+   * Last night's batch: posted against yesterday, surfacing on this report.
+   *
+   * A voucher's timestamp is the minute the job ran, while the transaction and the journal entry
+   * behind it carry the business date. So the interest run that fires just after midnight stamps
+   * itself with today although the ledger says yesterday — and yesterday was counted, reported and
+   * signed off hours before. Re-opening that day would invalidate a signed sheet, so the work is
+   * listed here instead, under its own heading, saying which day it belongs to. It is excluded from
+   * every total on this page: it is not today's money.
+   */
+  get priorDayRows(): any[] {
+    return this.rows.filter((r) => r.section === 'SYSTEM_PRIOR');
+  }
+
+  get priorDayCredit(): number {
+    return this.priorDayRows.reduce((s, r) => s + (r.side === 'CR' ? Number(r.amount || 0) : 0), 0);
+  }
+
+  get priorDayDebit(): number {
+    return this.priorDayRows.reduce((s, r) => s + (r.side === 'DR' ? Number(r.amount || 0) : 0), 0);
+  }
+
+  /** The business date last night's batch worked on, for the heading. */
+  get priorDayDate(): string | null {
+    const withDate = this.priorDayRows.find((r) => r.effectiveDate);
+    return withDate ? withDate.effectiveDate : null;
+  }
+
+  get approvedRows(): any[] {
+    return this.rows.filter(
+      (r) =>
+        r.section !== 'SYSTEM_PRIOR' &&
+        (r.status === 'APPROVED' || r.status === 'COMPLETED' || r.status === 'WITHDRAWN')
+    );
+  }
+
+  /**
+   * The day split the way this system actually records it: where the entry came from.
+   *
+   * Not split by payment mode, which is the obvious shape for a retail till but the wrong one here.
+   * A payment type is only recorded against a denomination breakdown, and a breakdown is only
+   * written for physical cash — so a UPI or transfer deposit carries no payment type at all, and a
+   * mode-wise table would file every non-cash entry under "not specified" while claiming to be a
+   * breakdown by mode. The day book's own sections are recorded on every row, so this agrees with
+   * the day book for the same date instead of quietly disagreeing with it.
+   */
+  get sectionLines(): SummaryLine[] {
+    const order = [
+      'CASHIER',
+      'CLERK',
+      'SYSTEM'
+    ];
+    const labels: Record<string, string> = {
+      CASHIER: 'Cash counter',
+      CLERK: 'Clerk desk',
+      SYSTEM: 'System — interest, charges, journals'
+    };
+    const map = new Map<string, SummaryLine>();
+    for (const r of this.approvedRows) {
+      const key = order.includes(r.section) ? r.section : 'SYSTEM';
+      let line = map.get(key);
+      if (!line) {
+        line = { label: labels[key] || key, credit: 0, debit: 0, count: 0 };
+        map.set(key, line);
+      }
+      this.addTo(line, r);
+    }
+    return order.filter((k) => map.has(k)).map((k) => map.get(k)!);
+  }
+
+  /**
+   * What kind of entry it was — deposit, withdrawal, interest posting, charge.
+   *
+   * The sections above say where the day's work came from; this says what the work was, which is
+   * the question somebody checking a figure against a register actually asks.
+   */
+  get kindLines(): SummaryLine[] {
+    const map = new Map<string, SummaryLine>();
+    for (const r of this.approvedRows) {
+      const key = (r.kind || 'OTHER').toString();
+      let line = map.get(key);
+      if (!line) {
+        line = { label: this.titleCase(key), credit: 0, debit: 0, count: 0 };
+        map.set(key, line);
+      }
+      this.addTo(line, r);
+    }
+    return Array.from(map.values()).sort((a, b) => b.credit + b.debit - (a.credit + a.debit));
+  }
+
+  /** Adds one day-book row onto a summary line, on the side the row belongs to. */
+  private addTo(line: SummaryLine, row: any): void {
+    const amt = Number(row.amount || 0);
+    if (row.side === 'CR') {
+      line.credit += amt;
+    } else {
+      line.debit += amt;
+    }
+    line.count += 1;
+  }
+
+  /** DD CASH, INTEREST_POSTING and the like, as a person would read them. */
+  kindLabel(raw: string | null | undefined): string {
+    if (!raw) {
+      return '—';
+    }
+    return raw
+      .toString()
+      .replace(/_/g, ' ')
+      .toLowerCase()
+      .replace(/\b\w/g, (c) => c.toUpperCase());
+  }
+
+  private titleCase(raw: string): string {
+    return this.kindLabel(raw);
+  }
+
+  get txnCount(): number {
+    return this.approvedRows.length;
+  }
+
+  /** More than one drawer in view means a supervisor is reading, not a cashier. */
+  get supervising(): boolean {
+    return this.cashierPositions.length > 1 || (!this.scopedToCashier && this.cashierPositions.length > 0);
+  }
+
+  get cashierPositionTotal(): number {
+    return this.cashierPositions.reduce((s, p) => s + p.totalAmount, 0);
+  }
+
+  /**
+   * Each person who handled the day's work, with their own credit, debit and net.
+   *
+   * The clerk signing the day off is verifying other people's work, so the sheet has to say whose.
+   * Read off the day book's own handledBy, which every register stamps.
+   */
+  get byUser(): SummaryLine[] {
+    const map = new Map<string, SummaryLine>();
+    for (const r of this.approvedRows) {
+      const key = (r.handledBy || 'Unattributed').toString();
+      let line = map.get(key);
+      if (!line) {
+        line = { label: key, credit: 0, debit: 0, count: 0 };
+        map.set(key, line);
+      }
+      this.addTo(line, r);
+    }
+    return Array.from(map.values()).sort((a, b) => b.credit + b.debit - (a.credit + a.debit));
+  }
+
+  get summaryCreditTotal(): number {
+    return this.sectionLines.reduce((s, l) => s + l.credit, 0);
+  }
+
+  get summaryDebitTotal(): number {
+    return this.sectionLines.reduce((s, l) => s + l.debit, 0);
+  }
+
+  // ── Section 2 ──
+
+  /** Everything that came into the drawer today, over the counter and from another cashier. */
+  get totalReceived(): number {
+    return this.cashDeposits + this.interCashierIn;
+  }
+
+  /** Everything that left it: paid to members, handed to the vault, passed to another cashier. */
+  get totalPaidOut(): number {
+    return this.cashWithdrawals + this.settledOut + this.interCashierOut;
+  }
+
+  /** What should be on the desk: the float, plus what came in, less what went out. */
+  get expectedClosing(): number {
+    return this.openingFloat + this.totalReceived - this.totalPaidOut;
+  }
+
+  /**
+   * Whether an expected-against-held comparison can honestly be made.
+   *
+   * Only for a single cashier, and only when the server sent that cashier's day legs. Both halves
+   * then describe the same thing: today's legs, against a drawer that carries nothing forward
+   * because a cashier draws in the morning and hands back at close.
+   *
+   * Never branch-wide. The branch register's expected cash is *today's* arithmetic — yesterday's
+   * closing, plus today's deposits, less today's withdrawals — while the vault and drawer positions
+   * are running totals accumulated since the system went live. Subtracting one from the other
+   * compares an afternoon against a lifetime: it reported ₹2,11,932 extra on a day when ₹100 came
+   * in and ₹100 went out. There is no branch-wide running total to compare against, so the sheet
+   * shows the branch its movement and each drawer's position, and states no difference at all
+   * rather than a confident wrong one.
+   */
+  get canReconcile(): boolean {
+    return this.scopedToCashier && this.hasDayLegs;
+  }
+
+  /** The cash the system believes this cashier is holding. */
+  get actualCash(): number | null {
+    return this.scopedToCashier ? this.drawersTotal : null;
+  }
+
+  /** What today's legs say should be in the drawer. */
+  get expectedCash(): number | null {
+    return this.canReconcile ? this.expectedClosing : null;
+  }
+
+  /** Held less expected, for one cashier's own day. Null wherever that comparison is not honest. */
+  get variance(): number | null {
+    const expected = this.expectedCash;
+    if (expected === null || this.actualCash === null) {
+      return null;
+    }
+    return this.actualCash - expected;
+  }
+
+  /** Vaults and drawers together — what the branch is holding, per the system. */
+  get branchHeldTotal(): number | null {
+    if (this.drawersTotal === null && this.vaultTotal === null) {
+      return null;
+    }
+    return Number(this.drawersTotal ?? 0) + Number(this.vaultTotal ?? 0);
+  }
+
+  /** Today's net cash movement across the branch: what came in less what went out. */
+  get branchNetMovement(): number {
+    return Number(this.branchDeposits ?? 0) - Number(this.branchWithdrawals ?? 0);
+  }
+
+  /** True only when a count exists and it agrees to the paisa. */
+  get varianceOk(): boolean {
+    return this.variance !== null && Math.abs(this.variance) < 0.005;
+  }
+
+  get varianceClass(): string {
+    if (this.variance === null) {
+      return '';
+    }
+    return this.varianceOk ? 'eod-ok' : 'eod-bad';
+  }
+
+  // ── Section 3 ──
+
+  /** Entries still waiting on somebody, which is what a day cannot be closed over. */
+  get pendingRows(): any[] {
+    return this.rows.filter((r) => r.status === 'PENDING' || r.status === 'SUBMITTED');
+  }
+
+  /** Cash entries whose paper slip nobody has checked against the screen. */
+  get unverifiedRows(): any[] {
+    return this.approvedRows.filter((r) => !r.verifyStatus);
+  }
+
+  /** A slip that was checked and did not agree with what was keyed in. */
+  get mismatchRows(): any[] {
+    return this.rows.filter((r) => r.verifyStatus === 'MISMATCH' || r.verifyStatus === 'DISPUTED');
+  }
+
+  /**
+   * Whether the day is ready to close.
+   *
+   * Nothing pending, no slip disagreeing, and — where a cash comparison was actually made — the
+   * cash agreeing. A branch-wide reading makes no comparison, so it is not held to one: requiring
+   * `varianceOk` there meant the sheet could never say a day was clear however clean it was.
+   */
+  get allClear(): boolean {
+    if (this.pendingRows.length > 0 || this.mismatchRows.length > 0) {
+      return false;
+    }
+    return this.variance === null || this.varianceOk;
+  }
+
+  reload(): void {
+    this.load();
+  }
+
+  print(): void {
+    window.print();
+  }
+}
@@ -0,0 +1,204 @@
+<!--
+  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">MY WORK</div>
+      <h1 class="pg-title">My Vouchers</h1>
+      <p class="pg-sub">
+        Everything you entered and everything you approved — receipts, payments and journals in one list.
+      </p>
+    </div>
+    <div class="pg-toolbar">
+      <label class="pg-field">
+        <span>Period</span>
+        <select [(ngModel)]="period" (change)="load()">
+          <option value="DAY">Day</option>
+          <option value="MONTH">Month</option>
+        </select>
+      </label>
+      <label class="pg-field">
+        <span>{{ period === 'DAY' ? 'Date' : 'Month of' }}</span>
+        <input type="date" [(ngModel)]="anchor" (change)="load()" />
+      </label>
+      <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
+        <mat-icon>refresh</mat-icon> Run
+      </button>
+    </div>
+  </header>
+
+  @if (error) {
+    <div class="pg-alert pg-alert--error">{{ error }}</div>
+  }
+
+  @if (loading) {
+    <div class="pg-empty">Loading…</div>
+  }
+
+  @if (report && !loading) {
+    <div class="mw-who">
+      <strong>{{ report.displayName || report.username }}</strong>
+      <span class="mw-who__sep">·</span>
+      {{ report.from | date: 'dd MMM yyyy' }}
+      @if (report.from !== report.to) {
+        <span> to {{ report.to | date: 'dd MMM yyyy' }}</span>
+      }
+    </div>
+
+    <!-- The day at a glance, read off the same rows the table below shows: narrow "My part" to
+         Entered or Approved and these five follow, instead of staying pinned to the combined
+         day total regardless of the filter. -->
+    <div class="mw-tiles">
+      <div class="mw-tile">
+        <div class="mw-tile__label">Received</div>
+        <div class="mw-tile__value mw-tile__value--cr">₹{{ receivedTotal | number: '1.2-2' }}</div>
+      </div>
+      <div class="mw-tile">
+        <div class="mw-tile__label">Payments</div>
+        <div class="mw-tile__value mw-tile__value--dr">₹{{ paymentTotal | number: '1.2-2' }}</div>
+      </div>
+      <div class="mw-tile">
+        <div class="mw-tile__label">Journal</div>
+        <div class="mw-tile__value">₹{{ journalTotal | number: '1.2-2' }}</div>
+      </div>
+      <div class="mw-tile">
+        <div class="mw-tile__label">Entered</div>
+        <div class="mw-tile__value">{{ raisedCount }}</div>
+      </div>
+      <div class="mw-tile">
+        <div class="mw-tile__label">Approved</div>
+        <div class="mw-tile__value">{{ verifiedCount }}</div>
+      </div>
+    </div>
+
+    @if (report.count > 0) {
+      <div class="mw-filters">
+        <label class="pg-field">
+          <span>Side</span>
+          <select [(ngModel)]="sideFilter">
+            <option value="">All</option>
+            <option value="CR">Received</option>
+            <option value="DR">Payment</option>
+            <option value="JV">Journal</option>
+          </select>
+        </label>
+        <label class="pg-field">
+          <span>My part</span>
+          <select [(ngModel)]="roleFilter">
+            <option value="">All</option>
+            <option value="RAISED">Entered</option>
+            <option value="VERIFIED">Approved</option>
+            <option value="RAISED_AND_VERIFIED">Entered &amp; approved</option>
+          </select>
+        </label>
+        @if (isFiltered) {
+          <button type="button" class="pg-btn" (click)="clearFilters()"><mat-icon>clear</mat-icon> Clear</button>
+        }
+      </div>
+    }
+
+    @if (rows.length === 0) {
+      <div class="pg-empty">
+        @if (report.count === 0) {
+          Nothing recorded against you for this period.
+        } @else {
+          No vouchers match these filters — {{ report.count }} hidden.
+        }
+      </div>
+    } @else {
+      <div class="mw-count">
+        Showing {{ rows.length }}
+        @if (isFiltered) {
+          <span>of {{ report.count }}</span>
+        }
+        {{ rows.length === 1 ? 'voucher' : 'vouchers' }}
+        <span class="mw-count__total">Total ₹{{ filteredTotal | number: '1.2-2' }}</span>
+      </div>
+
+      <!-- One table per part played, not one long list. Entering a request and passing somebody
+           else's are different jobs answerable to different people, and each carries its own total
+           so a maker's tally and a checker's can both be read off the page. -->
+      @for (g of groups; track g.key) {
+        <div class="pg-card mw-group" [class]="'mw-group--' + g.key">
+          <div class="mw-group__head">
+            <strong>{{ g.label }}</strong>
+            <span class="mw-group__hint">{{ g.hint }}</span>
+            <span class="mw-group__count">
+              {{ g.rows.length }} {{ g.rows.length === 1 ? 'voucher' : 'vouchers' }}
+              <span class="mw-group__total">₹{{ g.total | number: '1.2-2' }}</span>
+            </span>
+          </div>
+          <div class="pg-table-wrap">
+            <table class="pg-table mw-table">
+              <thead>
+                <tr>
+                  <th>Voucher</th>
+                  <th>Side</th>
+                  <th>Type</th>
+                  <th>Debit</th>
+                  <th>Credit</th>
+                  <th class="num">Amount</th>
+                  <th>My part</th>
+                  <th>Status</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>
+                    <td>
+                      <span class="mw-badge" [class]="'mw-badge--' + (r.side || 'JV')">{{ sideLabel(r.side) }}</span>
+                    </td>
+                    <td class="mw-type">{{ r.voucherType }}</td>
+                    <td>
+                      {{ r.debitParty || '—' }}
+                      @if (r.debitAccount) {
+                        <span class="mw-acct">{{ r.debitAccount }}</span>
+                      }
+                    </td>
+                    <td>
+                      {{ r.creditParty || '—' }}
+                      @if (r.creditAccount) {
+                        <span class="mw-acct">{{ r.creditAccount }}</span>
+                      }
+                      @if (r.extraLines > 0) {
+                        <span class="mw-more">+{{ r.extraLines }} more</span>
+                      }
+                    </td>
+                    <td class="num">₹{{ r.amount | number: '1.2-2' }}</td>
+                    <td>
+                      <span class="mw-part" [class]="'mw-part--' + r.myRole">
+                        <mat-icon class="mw-part__icon">{{ roleIcon(r.myRole) }}</mat-icon>
+                        {{ roleLabel(r.myRole) }}
+                      </span>
+                      <!-- Whose entry it was, when it was not this user's — that is the whole point of
+                       an approval row appearing here at all. -->
+                      @if (r.myRole === 'VERIFIED' && r.raisedBy) {
+                        <span class="mw-acct">by {{ r.raisedBy }}</span>
+                      }
+                    </td>
+                    <td>
+                      <span class="mw-status" [class]="'mw-status--' + statusClass(r.verificationStatus)">
+                        {{ statusLabel(r.verificationStatus) }}
+                      </span>
+                    </td>
+                    <td class="mw-time">{{ r.createdAt | date: 'HH:mm' }}</td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </div>
+      }
+    }
+  }
+</div>
@@ -0,0 +1,294 @@
+/**
+ * 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/.
+ */
+
+/* Who and when, above the day's figures. */
+.mw-who {
+  font-size: 13px;
+  color: #475569;
+  margin: 0 0 12px;
+
+  strong {
+    color: #0f172a;
+  }
+
+  &__sep {
+    margin: 0 6px;
+    color: #cbd5e1;
+  }
+}
+
+/* The day at a glance: the two sides a branch balances, then what the user's part was. */
+.mw-tiles {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+  gap: 10px;
+  margin-bottom: 16px;
+}
+
+.mw-tile {
+  background: #fff;
+  border: 1px solid #e2e8f0;
+  border-radius: 6px;
+  padding: 10px 12px;
+
+  &__label {
+    font-size: 11px;
+    text-transform: uppercase;
+    letter-spacing: 0.04em;
+    color: #64748b;
+    margin-bottom: 4px;
+  }
+
+  &__value {
+    font-size: 18px;
+    font-weight: 600;
+    color: #0f172a;
+
+    /* Received green, paid-out red — the convention a passbook already uses, so the two totals
+       are told apart without reading the labels. */
+    &--cr {
+      color: #15803d;
+    }
+
+    &--dr {
+      color: #b91c1c;
+    }
+  }
+}
+
+.mw-filters {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-end;
+  gap: 10px;
+  margin-bottom: 12px;
+}
+
+.mw-count {
+  font-size: 12px;
+  color: #64748b;
+  margin-bottom: 8px;
+
+  &__total {
+    float: right;
+    font-weight: 600;
+    color: #0f172a;
+  }
+}
+
+.mw-table {
+  font-size: 13px;
+}
+
+/* Money cells use the shared `.num` from cashier-shared.scss, which right-aligns and
+   tabular-figures the heading as well as the cell. A local class only reached the cells, leaving
+   every heading left-aligned over right-aligned figures. */
+
+.mw-vno {
+  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+  font-size: 12px;
+  white-space: nowrap;
+}
+
+.mw-type {
+  font-size: 11px;
+  text-transform: uppercase;
+  letter-spacing: 0.03em;
+  color: #64748b;
+  white-space: nowrap;
+}
+
+.mw-time {
+  white-space: nowrap;
+  color: #64748b;
+}
+
+/* The account number or the maker's name, under the party it belongs to. */
+.mw-acct {
+  display: block;
+  font-size: 11px;
+  color: #94a3b8;
+  font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
+}
+
+.mw-more {
+  display: inline-block;
+  margin-left: 6px;
+  font-size: 10px;
+  padding: 1px 5px;
+  border-radius: 8px;
+  background: #f1f5f9;
+  color: #64748b;
+}
+
+.mw-badge {
+  display: inline-block;
+  font-size: 10px;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  padding: 2px 7px;
+  border-radius: 10px;
+  white-space: nowrap;
+
+  &--CR {
+    background: #dcfce7;
+    color: #15803d;
+  }
+
+  &--DR {
+    background: #fee2e2;
+    color: #b91c1c;
+  }
+
+  &--JV {
+    background: #e0e7ff;
+    color: #4338ca;
+  }
+}
+
+/* Whose work the row is, marked on the row itself.
+   A coloured left edge and a faint tint, rather than a different text colour: the eye finds the
+   edge while scanning a column of figures, which is how a day's list is actually read. Kept faint
+   so the amounts stay the thing being read. */
+.mw-row {
+  border-left: 3px solid transparent;
+
+  &--RAISED {
+    border-left-color: #86efac;
+  }
+
+  /* Somebody else's entry that this person passed. The row a reviewer came looking for, so it
+     carries the darker of the two greens. */
+  &--VERIFIED {
+    border-left-color: #15803d;
+    background: #f0fdf4;
+  }
+
+  /* Entered and approved by the same person. Legitimate in a small branch, but the one combination
+     an auditor stops on, so it is the only row given a warm tint. */
+  &--RAISED_AND_VERIFIED {
+    border-left-color: #d97706;
+    background: #fffbf3;
+  }
+}
+
+/* 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 {
+  margin-bottom: 16px;
+
+  /* Two shades of one colour rather than two colours: entering and approving are stages of the
+     same piece of work, and the darker edge reads as the later one. */
+  border-left: 3px solid #86efac;
+
+  /* Same shades the row edges use, so a section and its rows read as one thing. */
+  &--VERIFIED {
+    border-left-color: #15803d;
+  }
+
+  &--RAISED_AND_VERIFIED {
+    border-left-color: #d97706;
+  }
+
+  &__head {
+    display: flex;
+    align-items: baseline;
+    gap: 10px;
+    padding: 10px 14px;
+    border-bottom: 1px solid #e2e8f0;
+    background: #f8fafc;
+
+    strong {
+      font-size: 13px;
+      color: #0f172a;
+    }
+  }
+
+  &__hint {
+    font-size: 11px;
+    color: #64748b;
+  }
+
+  &__count {
+    margin-left: auto;
+    font-size: 11px;
+    color: #64748b;
+    white-space: nowrap;
+  }
+
+  &__total {
+    margin-left: 8px;
+    font-weight: 700;
+    color: #0f172a;
+  }
+}
+
+/* Where the voucher stands. Three states, because there are three things a reader does: nothing
+   (done), chase it (pending), or look into it (bad). */
+.mw-status {
+  font-size: 11px;
+  font-weight: 600;
+  white-space: nowrap;
+
+  /* Approved, posted — settled but nothing handed over. Lighter than 'paid' but still dark enough
+     to read as body text; a pale green on white fails at this size. */
+  &--done {
+    color: #16a34a;
+  }
+
+  /* Cash actually gone. Darker and filled, the same way the day book marks it. */
+  &--paid {
+    background: #15803d;
+    color: #fff;
+    padding: 2px 8px;
+    border-radius: 999px;
+  }
+
+  &--pending {
+    color: #b45309;
+  }
+
+  &--bad {
+    color: #b91c1c;
+  }
+}
+
+/* The part played, as a small pill with its own glyph. */
+.mw-part {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  font-size: 11px;
+  font-weight: 600;
+  padding: 2px 8px 2px 6px;
+  border-radius: 10px;
+  white-space: nowrap;
+
+  &__icon {
+    font-size: 13px;
+    width: 13px;
+    height: 13px;
+    line-height: 13px;
+  }
+
+  &--RAISED {
+    background: #dcfce7;
+    color: #166534;
+  }
+
+  &--VERIFIED {
+    background: #15803d;
+    color: #fff;
+  }
+
+  &--RAISED_AND_VERIFIED {
+    background: #fef3c7;
+    color: #b45309;
+  }
+}
@@ -0,0 +1,330 @@
+/**
+ * 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 { MatIconModule } from '@angular/material/icon';
+import { catchError, of } from 'rxjs';
+import { CashierService } from '../cashier.service';
+
+/** What the signed-in user's part in a voucher was. */
+export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
+
+/** Which register the voucher was numbered in: receipt, payment, or journal. */
+export type VoucherSide = 'CR' | 'DR' | 'JV';
+
+interface MyWorkRow {
+  voucherNo: string;
+  side: VoucherSide | null;
+  voucherType: string | null;
+  amount: number | null;
+  createdAt: string | null;
+  raisedBy: string | null;
+  branchName: string | null;
+  verificationStatus: string | null;
+  verifiedByName: string | null;
+  verifiedAt: string | null;
+  debitParty: string | null;
+  debitAccount: string | null;
+  creditParty: string | null;
+  creditAccount: string | null;
+  /** Sides beyond the one debit and one credit shown — a deposit that also took a charge. */
+  extraLines: number;
+  myRole: MyRole;
+}
+
+interface MyWorkReport {
+  from: string;
+  to: string;
+  username: string;
+  displayName: string;
+  vouchers: MyWorkRow[];
+  count: number;
+  raisedCount: number;
+  verifiedCount: number;
+  receivedTotal: number;
+  paymentTotal: number;
+  journalTotal: number;
+}
+
+/**
+ * One person's day at the branch: what they entered and what they approved, in one list.
+ *
+ * The Received and Payment registers answer "what moved today" across everyone. This answers the
+ * question each member of staff asks at a close — "what did I do today" — which those two cannot,
+ * because a checker's approval raises no voucher of its own and leaves its only trace on the
+ * verification row.
+ */
+@Component({
+  selector: 'mifosx-my-work',
+  templateUrl: './my-work.component.html',
+  styleUrls: [
+    '../cashier-shared.scss',
+    './my-work.component.scss'
+  ],
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatIconModule
+  ]
+})
+export class MyWorkComponent implements OnInit {
+  private service = inject(CashierService);
+
+  /** Day is the working default; a month is what a close or an audit asks for. */
+  period: 'DAY' | 'MONTH' = 'DAY';
+  anchor = this.todayIso();
+
+  /**
+   * Narrow to one side, or to the part the user played. Both applied in the browser, and only to
+   * the table below — the five summary tiles are pinned to Entered work regardless (see
+   * enteredRows), so this can default to showing everything without muddying them.
+   */
+  sideFilter: '' | VoucherSide = '';
+  roleFilter: '' | MyRole = '';
+
+  report: MyWorkReport | null = null;
+  loading = false;
+  error: string | null = null;
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  load(): void {
+    this.loading = true;
+    this.error = null;
+
+    const { from, to } = this.range();
+    this.service
+      .myVoucherWork(from, to)
+      .pipe(
+        catchError((err: any) => {
+          this.error =
+            err?.error?.errors?.[0]?.defaultUserMessage ??
+            err?.error?.developerMessage ??
+            'Your work for this period could not be loaded.';
+          return of(null);
+        })
+      )
+      .subscribe((res: MyWorkReport | null) => {
+        this.loading = false;
+        this.report = res;
+      });
+  }
+
+  /**
+   * The rows after the two on-screen filters.
+   *
+   * Filtered here rather than at the server: the day's own work is a small list, and narrowing it
+   * without a round trip is what makes the filters feel like part of reading the page.
+   */
+  get rows(): MyWorkRow[] {
+    const all = this.report?.vouchers ?? [];
+    return all.filter(
+      (r) => (!this.sideFilter || r.side === this.sideFilter) && (!this.roleFilter || r.myRole === this.roleFilter)
+    );
+  }
+
+  /**
+   * The rows split by the part the user played, each group with its own total.
+   *
+   * Entering a request and passing somebody else's are different jobs answerable to different
+   * people, and a branch reads them separately: "what did I put through" is a maker's own tally,
+   * "what did I let through" is a checker's. One list mixed them, so neither total could be read
+   * off the page — a manager who entered one voucher and approved twenty saw twenty-one rows and
+   * had to sort them by eye.
+   *
+   * An empty group is dropped rather than shown as a heading over nothing, so a clerk who never
+   * approves anything sees one section and not a permanently empty second one.
+   */
+  get groups(): { key: MyRole; label: string; hint: string; rows: MyWorkRow[]; total: number }[] {
+    const order: { key: MyRole; label: string; hint: string }[] = [
+      { key: 'RAISED', label: 'Entered by me', hint: 'Requests and postings you put through' },
+      { key: 'VERIFIED', label: 'Approved by me', hint: "Other people's work you passed" },
+      {
+        key: 'RAISED_AND_VERIFIED',
+        label: 'Entered & approved by me',
+        hint: 'Both roles on the same voucher — kept separate for the record'
+      }
+    ];
+    return order
+      .map((g) => {
+        const rows = this.rows.filter((r) => r.myRole === g.key);
+        return { ...g, rows, total: rows.reduce((sum, r) => sum + Number(r.amount ?? 0), 0) };
+      })
+      .filter((g) => g.rows.length > 0);
+  }
+
+  /** True when a filter is hiding part of what was loaded, so the count can say so. */
+  get isFiltered(): boolean {
+    return !!this.sideFilter || !!this.roleFilter;
+  }
+
+  clearFilters(): void {
+    this.sideFilter = '';
+    this.roleFilter = '';
+  }
+
+  /** The total of the rows on screen, which is not the day's total once a filter is on. */
+  get filteredTotal(): number {
+    return this.rows.reduce((sum, r) => sum + Number(r.amount ?? 0), 0);
+  }
+
+  /**
+   * What this person themselves put through today — never narrowed by the Side or My part
+   * filters, which exist only to browse the table below.
+   *
+   * The five summary tiles are pinned to this set on purpose. They answer one question, "what did
+   * I personally do today", and that answer cannot depend on which slice of the list a person
+   * happens to have the table filtered to at the moment — a Received figure that changed whenever
+   * someone picked "Approved" to go look at what they'd passed would not be their own total any
+   * more, it would be whatever the table was showing.
+   */
+  get enteredRows(): MyWorkRow[] {
+    const all = this.report?.vouchers ?? [];
+    return all.filter((r) => r.myRole === 'RAISED' || r.myRole === 'RAISED_AND_VERIFIED');
+  }
+
+  get receivedTotal(): number {
+    return this.enteredRows.filter((r) => r.side === 'CR').reduce((sum, r) => sum + Number(r.amount ?? 0), 0);
+  }
+
+  get paymentTotal(): number {
+    return this.enteredRows.filter((r) => r.side === 'DR').reduce((sum, r) => sum + Number(r.amount ?? 0), 0);
+  }
+
+  get journalTotal(): number {
+    return this.enteredRows
+      .filter((r) => r.side !== 'CR' && r.side !== 'DR')
+      .reduce((sum, r) => sum + Number(r.amount ?? 0), 0);
+  }
+
+  get raisedCount(): number {
+    return this.enteredRows.length;
+  }
+
+  get verifiedCount(): number {
+    const all = this.report?.vouchers ?? [];
+    return all.filter((r) => r.myRole === 'VERIFIED' || r.myRole === 'RAISED_AND_VERIFIED').length;
+  }
+
+  sideLabel(side: VoucherSide | null): string {
+    if (side === 'CR') {
+      return 'Received';
+    }
+    if (side === 'DR') {
+      return 'Payment';
+    }
+    return 'Journal';
+  }
+
+  roleLabel(role: MyRole): string {
+    if (role === 'RAISED') {
+      return 'Entered';
+    }
+    if (role === 'VERIFIED') {
+      return 'Approved';
+    }
+    return 'Entered & approved';
+  }
+
+  /**
+   * Where the voucher stands, in words a branch uses.
+   *
+   * A voucher with no status at all is not unknown — it is a posting that never went through a
+   * request: interest the nightly run credited, a charge taken from a balance. Those are done the
+   * moment they exist, so they read as Posted rather than as a blank a reader has to interpret.
+   */
+  statusLabel(status: string | null): string {
+    const s = (status ?? '').toUpperCase();
+    if (!s) {
+      return 'Posted';
+    }
+    if (s === 'WITHDRAWN') {
+      return 'Paid out';
+    }
+    if (s === 'APPROVED') {
+      return 'Approved';
+    }
+    if (s === 'PENDING') {
+      return 'Pending';
+    }
+    if (s === 'REJECTED') {
+      return 'Rejected';
+    }
+    if (s === 'CLOSED') {
+      return 'Closed';
+    }
+    // OK / MISMATCH come from a physical cash verification rather than a request.
+    return s.charAt(0) + s.slice(1).toLowerCase();
+  }
+
+  /**
+   * Groups the statuses by what a reader does about them.
+   *
+   * 'paid' is kept apart from 'done' because approved and paid out are different facts: one is a
+   * promise, the other is money gone. Sharing a colour hid exactly the thing somebody opens this
+   * page to check.
+   */
+  statusClass(status: string | null): string {
+    const s = (status ?? '').toUpperCase();
+    if (s === 'PENDING') {
+      return 'pending';
+    }
+    if (s === 'REJECTED' || s === 'MISMATCH') {
+      return 'bad';
+    }
+    if (s === 'WITHDRAWN' || s === 'COMPLETED' || s === 'CLOSED') {
+      return 'paid';
+    }
+    return 'done';
+  }
+
+  /**
+   * A glyph per role, so the part played reads before the words do.
+   *
+   * A pen for an entry the user made, a tick for one they approved, and a warning for both on the
+   * same voucher — which a small branch does legitimately, and an auditor should still see marked.
+   */
+  roleIcon(role: MyRole): string {
+    if (role === 'RAISED') {
+      return 'edit';
+    }
+    if (role === 'VERIFIED') {
+      return 'check_circle';
+    }
+    return 'warning';
+  }
+
+  /** The period the anchor date names: that day, or the whole calendar month around it. */
+  private range(): { from: string; to: string } {
+    if (this.period === 'DAY') {
+      return { from: this.anchor, to: this.anchor };
+    }
+    const [
+      y,
+      m
+    ] = this.anchor.split('-').map(Number);
+    const first = `${y}-${String(m).padStart(2, '0')}-01`;
+    // Day 0 of the next month is the last day of this one, which avoids a table of month lengths
+    // and gets February right in a leap year.
+    const last = new Date(y, m, 0);
+    const lastIso = `${last.getFullYear()}-${String(last.getMonth() + 1).padStart(2, '0')}-${String(
+      last.getDate()
+    ).padStart(2, '0')}`;
+    return { from: first, to: lastIso };
+  }
+
+  private todayIso(): string {
+    const d = new Date();
+    return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+  }
+}
@@ -0,0 +1,500 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, OnInit, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule, FormBuilder, FormGroup, 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';
+import { MatButtonModule } from '@angular/material/button';
+import { MatIconModule } from '@angular/material/icon';
+
+export interface CashierIssueDdDialogData {
+  leaflet: any;
+  branchName: string;
+  sponsorBankName: string;
+  faceValue: number;
+  chargesAmount: number;
+  gstPercentage: number;
+  gstAmount: number;
+  totalCashPayable: number;
+  /**
+   * How the draft is being paid for. Cash is a walk-in purchaser the bank may know nothing about,
+   * so their name, address and Aadhaar have to be captured here. An account debit is a member whose
+   * account is already on screen — those fields are not asked for, and must not be sent, because
+   * the identity is the account holder's rather than a walk-in's.
+   */
+  paymentMethod?: 'CASH' | 'ACCOUNT_DEBIT';
+  /** The account being debited, shown so the clerk can see what is funding the draft. */
+  accountNo?: string;
+  /** The account holder, for the same reason. */
+  accountHolderName?: string;
+}
+
+@Component({
+  selector: 'mifosx-cashier-issue-dd-dialog',
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    ReactiveFormsModule,
+    MatDialogModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MatButtonModule,
+    MatIconModule
+  ],
+  template: `
+    <div class="dd-dialog-shell">
+      <div class="dd-dialog-header">
+        <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>
+            <p>
+              Next available DD leaflet auto-selected ·
+              {{ isAccountDebit ? 'Enter beneficiary details' : 'Enter purchaser &amp; beneficiary details' }}
+            </p>
+          </div>
+        </div>
+        <button mat-icon-button type="button" (click)="onClose()" class="close-btn">
+          <mat-icon>close</mat-icon>
+        </button>
+      </div>
+
+      <mat-dialog-content class="dd-dialog-body">
+        <!-- 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>
+
+        <!--
+          The account funding the draft, stated before the form.
+
+          A clerk reaching this dialog has an account loaded on the workstation behind it, and the
+          debit is irreversible once a checker approves. Naming the account and its holder here is
+          what makes a wrong account visible while it can still be cancelled.
+        -->
+        @if (isAccountDebit) {
+          <div class="dd-funding-note">
+            <mat-icon>account_balance_wallet</mat-icon>
+            <div>
+              <strong>Debiting {{ data.accountNo }}</strong>
+              @if (data.accountHolderName) {
+                · {{ 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.
+              </div>
+            </div>
+          </div>
+        }
+
+        <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>
+
+            <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>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>
+      </mat-dialog-content>
+
+      <mat-dialog-actions class="dd-dialog-actions" align="end">
+        <button mat-button type="button" (click)="onClose()">Cancel</button>
+        <button mat-flat-button color="primary" [disabled]="form.invalid" (click)="onSubmit()">
+          Save DD Details
+        </button>
+      </mat-dialog-actions>
+    </div>
+  `,
+  styles: [
+    `
+      .dd-dialog-shell {
+        display: flex;
+        flex-direction: column;
+        max-height: 90vh;
+      }
+      .dd-dialog-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 16px 24px;
+        background: #0f172a;
+        color: #ffffff;
+        border-top-left-radius: 8px;
+        border-top-right-radius: 8px;
+      }
+      .dd-dialog-header__title {
+        display: flex;
+        align-items: center;
+        gap: 12px;
+      }
+      .dd-dialog-header__title h2 {
+        margin: 0;
+        font-size: 18px;
+        font-weight: 600;
+        color: #ffffff;
+      }
+      .dd-dialog-header__title p {
+        margin: 2px 0 0 0;
+        font-size: 12px;
+        color: #94a3b8;
+      }
+      .dd-icon {
+        color: #38bdf8;
+        font-size: 28px;
+        width: 28px;
+        height: 28px;
+      }
+      .close-btn {
+        color: #94a3b8;
+      }
+      .close-btn:hover {
+        color: #ffffff;
+      }
+      .dd-dialog-body {
+        padding: 20px 24px;
+        overflow-y: auto;
+      }
+      .dd-summary-card {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        background: #f8fafc;
+        border: 1px solid #e2e8f0;
+        border-radius: 8px;
+        padding: 14px 18px;
+        margin-bottom: 20px;
+      }
+      .summary-col {
+        display: flex;
+        flex-direction: column;
+        gap: 2px;
+      }
+      .summary-col.highlight-col {
+        background: #ecfdf5;
+        padding: 6px 12px;
+        border-radius: 6px;
+        border: 1px solid #a7f3d0;
+      }
+      .summary-divider {
+        width: 1px;
+        height: 36px;
+        background: #e2e8f0;
+      }
+      .summary-col .label {
+        font-size: 11px;
+        text-transform: uppercase;
+        color: #64748b;
+        font-weight: 600;
+      }
+      .dd-number-highlight {
+        font-size: 16px;
+        color: #0369a1;
+        font-family: monospace;
+      }
+      .summary-col .amount {
+        font-size: 15px;
+        color: #1e293b;
+      }
+      .summary-col .total-amount {
+        font-size: 16px;
+        color: #065f46;
+      }
+      .summary-col .sublabel {
+        font-size: 11px;
+        color: #94a3b8;
+      }
+      .form-section-title {
+        font-size: 13px;
+        font-weight: 600;
+        text-transform: uppercase;
+        color: #475569;
+        margin: 16px 0 10px 0;
+        border-bottom: 1px solid #f1f5f9;
+        padding-bottom: 4px;
+      }
+      .form-section-title:first-child {
+        margin-top: 0;
+      }
+      .dd-form {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+      }
+      .full-width {
+        width: 100%;
+      }
+      .form-row {
+        display: flex;
+        gap: 16px;
+      }
+      .form-field-flex {
+        flex: 1;
+      }
+      .dd-dialog-actions {
+        padding: 12px 24px;
+        border-top: 1px solid #e2e8f0;
+      }
+      /* The account about to be debited — read before the form, so a wrong one is caught here. */
+      .dd-funding-note {
+        display: flex;
+        gap: 10px;
+        align-items: flex-start;
+        margin: 14px 0 4px;
+        padding: 11px 14px;
+        background: #eff6ff;
+        border: 1px solid #bfdbfe;
+        border-left: 3px solid #1d4ed8;
+        border-radius: 6px;
+        font-size: 13px;
+        color: #334155;
+      }
+      .dd-funding-note mat-icon {
+        color: #1d4ed8;
+        flex-shrink: 0;
+      }
+      .dd-funding-sub {
+        margin-top: 3px;
+        font-size: 11.5px;
+        line-height: 1.5;
+        color: #64748b;
+      }
+    `
+  ]
+})
+export class CashierIssueDdDialogComponent implements OnInit {
+  private fb = inject(FormBuilder);
+  private dialogRef = inject(MatDialogRef<CashierIssueDdDialogComponent>);
+  public data: CashierIssueDdDialogData = inject(MAT_DIALOG_DATA);
+
+  form!: 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';
+  }
+
+  ngOnInit(): void {
+    // 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
+    // required field the clerk cannot see.
+    this.form = this.fb.group(
+      this.isAccountDebit
+        ? {
+            beneficiaryName: [
+              '',
+              [
+                Validators.required,
+                Validators.maxLength(120)
+              ]
+            ],
+            payableAtBranch: [
+              '',
+              [Validators.required]
+            ],
+            payableAtCity: [
+              '',
+              [Validators.required]
+            ]
+          }
+        : {
+            walkinPurchaserName: [
+              '',
+              [
+                Validators.required,
+                Validators.minLength(3)
+              ]
+            ],
+            walkinPurchaserAddress: [
+              '',
+              [Validators.required]
+            ],
+            walkinPurchaserAadhaar: [
+              '',
+              [
+                Validators.required,
+                Validators.pattern(/^[0-9]{12}$/)
+              ]
+            ],
+            beneficiaryName: [
+              '',
+              [
+                Validators.required,
+                Validators.maxLength(120)
+              ]
+            ],
+            payableAtBranch: [
+              '',
+              [Validators.required]
+            ],
+            payableAtCity: [
+              '',
+              [Validators.required]
+            ]
+          }
+    );
+  }
+
+  onClose(): void {
+    this.dialogRef.close();
+  }
+
+  onSubmit(): void {
+    if (this.form.invalid) return;
+    const val = this.form.value;
+    const beneficiary = {
+      beneficiaryName: (val.beneficiaryName || '').trim().toUpperCase(),
+      payableAtBranch: (val.payableAtBranch || '').trim().toUpperCase(),
+      payableAtCity: (val.payableAtCity || '').trim().toUpperCase()
+    };
+    // Walk-in fields are left off entirely on an account debit rather than sent empty: the server
+    // rejects a purchaser name arriving alongside an account, and '' would be sent as one.
+    this.dialogRef.close(
+      this.isAccountDebit
+        ? beneficiary
+        : {
+            walkinPurchaserName: (val.walkinPurchaserName || '').trim().toUpperCase(),
+            walkinPurchaserAddress: (val.walkinPurchaserAddress || '').trim().toUpperCase(),
+            walkinPurchaserAadhaar: (val.walkinPurchaserAadhaar || '').trim(),
+            ...beneficiary
+          }
+    );
+  }
+}
@@ -134,6 +134,23 @@
                        <option [ngValue]="27">027 · Industrial</option>
                      </select>
                    </div>
+                    @if (row.typ === 'DD') {
+                      <div class="ws-f ws-f--branch">
+                        <label class="ws-f__lbl ws-f__lbl--accent" title="Sponsor Bank">SPONSOR BANK</label>
+                        <select
+                          class="ws-f__ctl ws-f__ctl--accent"
+                          [(ngModel)]="row.sponsorBankId"
+                          (click)="$event.stopPropagation()"
+                        >
+                          @if (sponsorBanks.length === 0) {
+                            <option [ngValue]="null">-- Select Bank --</option>
+                          }
+                          @for (sb of sponsorBanks; track sb.id) {
+                            <option [ngValue]="sb.id">{{ sb.name }}</option>
+                          }
+                        </select>
+                      </div>
+                    }
                    <div class="ws-f ws-f--paytype">
                      <label class="ws-f__lbl ws-f__lbl--accent" title="Transaction Type">TXN TP.</label>
                      <select
@@ -161,7 +178,7 @@
                            (row.dbCr = 'Cr')
                        "
                      >
-                        @for (a of acTypOptions; track a) {
+                        @for (a of acTypOptionsFor(row); track a) {
                          <option [value]="a">{{ a }}</option>
                        }
                      </select>
@@ -182,7 +199,22 @@
                        (input)="onAcNoInput(row, i, $any($event.target).value)"
                        (click)="$event.stopPropagation()"
                        (blur)="onAcNoBlur(row, i)"
-                        placeholder="Account number"
+                        [placeholder]="
+                          isDdAccountDebitRow(row)
+                            ? 'Account to debit'
+                            : row.typ === 'DD'
+                              ? ddGlMapping?.ddPayableGlCode || 'Auto GL'
+                              : 'Account number'
+                        "
+                        [readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
+                        [class.ws-f__ctl--readonly]="row.typ === 'DD' && !isDdAccountDebitRow(row)"
+                        [title]="
+                          isDdAccountDebitRow(row)
+                            ? 'Member account the draft is funded from'
+                            : row.typ === 'DD'
+                              ? 'Configured Sponsor DD Payable GL (Auto-selected)'
+                              : 'Account number'
+                        "
                      />
                    </div>
                    <div class="ws-f ws-f--ecsno">
@@ -340,7 +372,7 @@
              </div>

              <!-- ── Row 3: DD Charges & GST — only for TYPE=DD, TXN TP=Cash, AC.TP=GL ── -->
-              @if (isDdCashGlRow(row)) {
+              @if (isDdRow(row)) {
                <div class="ws-group-row ws-group-row--mt">
                  <div class="ws-group ws-group--flex">
                    <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
@@ -375,7 +407,7 @@
                      </div>
                      <div class="ws-f ws-f--amt">
                        <label class="ws-f__lbl" title="Amount + Charges + GST, rounded up to the next rupee">
-                          TOTAL TO COLLECT
+                          {{ isDdAccountDebitRow(row) ? 'TOTAL TO DEBIT' : 'TOTAL TO COLLECT' }}
                        </label>
                        <div class="ws-amt-wrap ws-amt-wrap--locked">
                          <span class="ws-amt-prefix">₹</span>
@@ -387,6 +419,29 @@
                          />
                        </div>
                      </div>
+
+                      <div class="ws-f" style="margin-left: auto; align-self: flex-end">
+                        <button
+                          type="button"
+                          class="te-dd-issue-btn"
+                          [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'
+                          "
+                        >
+                          <mat-icon style="font-size: 18px; width: 18px; height: 18px">{{
+                            row.ddDetails ? '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. -->
+                          <span>{{
+                            row.ddDetails ? 'DD ' + row.ddDetails.ddNumber + ' · Edit Details' : 'Fill DD Details'
+                          }}</span>
+                        </button>
+                      </div>
                    </div>
                  </div>
                </div>
@@ -398,6 +453,18 @@
    </div>
  }

+  <!-- ── DD GL UNCONFIGURED WARNING BANNER ────────────────────────── -->
+  @if (selectedRow?.typ === 'DD' && !isDdGlMappingConfigured) {
+    <div class="ws-dd-unconfigured-banner">
+      <mat-icon>warning</mat-icon>
+      <div class="ws-dd-unconfigured-banner__text">
+        <strong>DD GL Mapping Required:</strong> Demand Draft GL accounts have not been configured yet. Please ask an
+        administrator to set up the mapping under <em>Admin &gt; Sponsor DD GST / GL Settings</em> before issuing
+        drafts.
+      </div>
+    </div>
+  }
+
  <!-- ── APPROVED WITHDRAWAL BANNER (cashier disburse flow) ─────────── -->
  @if (!isClerk && loadingWithdrawal) {
    <div class="ws-withdrawal-banner ws-withdrawal-banner--loading">
@@ -1404,7 +1471,12 @@
                      <div class="ws-group__fields">
                        <div class="ws-f ws-f--type">
                          <label class="ws-f__lbl">TYPE</label>
-                          <select class="ws-f__ctl" [(ngModel)]="row.typ">
+                          <select
+                            class="ws-f__ctl"
+                            [(ngModel)]="row.typ"
+                            (click)="$event.stopPropagation()"
+                            (change)="onTypChange(row)"
+                          >
                            @for (t of typOptions; track t.value) {
                              <option [value]="t.value">{{ t.label }}</option>
                            }
@@ -1412,18 +1484,36 @@
                        </div>
                        <div class="ws-f ws-f--branch">
                          <label class="ws-f__lbl">BRANCH</label>
-                          <select class="ws-f__ctl" [(ngModel)]="row.br">
+                          <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>
                        </div>
+                        @if (row.typ === 'DD') {
+                          <div class="ws-f ws-f--branch">
+                            <label class="ws-f__lbl ws-f__lbl--accent" title="Sponsor Bank">SPONSOR BANK</label>
+                            <select
+                              class="ws-f__ctl ws-f__ctl--accent"
+                              [(ngModel)]="row.sponsorBankId"
+                              (click)="$event.stopPropagation()"
+                            >
+                              @if (sponsorBanks.length === 0) {
+                                <option [ngValue]="null">-- Select Bank --</option>
+                              }
+                              @for (sb of sponsorBanks; track sb.id) {
+                                <option [ngValue]="sb.id">{{ sb.name }}</option>
+                              }
+                            </select>
+                          </div>
+                        }
                        <div class="ws-f ws-f--paytype">
                          <label class="ws-f__lbl ws-f__lbl--accent">TXN TP.</label>
                          <select
                            class="ws-f__ctl ws-f__ctl--accent"
                            [(ngModel)]="row.paymentTypeId"
+                            (click)="$event.stopPropagation()"
                            [class.ws-f__ctl--req]="!row.paymentTypeId"
                          >
                            @for (pt of paymentTypesForRow(row); track pt.id) {
@@ -1436,6 +1526,7 @@
                          <select
                            class="ws-f__ctl"
                            [(ngModel)]="row.acTyp"
+                            (click)="$event.stopPropagation()"
                            (change)="
                              row.acTyp === 'GL' &&
                                row.typ !== 'Disbursement' &&
@@ -1444,7 +1535,7 @@
                                (row.dbCr = 'Cr')
                            "
                          >
-                            @for (a of acTypOptions; track a) {
+                            @for (a of acTypOptionsFor(row); track a) {
                              <option [value]="a">{{ a }}</option>
                            }
                          </select>
@@ -1462,7 +1553,14 @@
                            [value]="row.acNo"
                            (input)="onAcNoInput(row, i, $any($event.target).value)"
                            (blur)="onAcNoBlur(row, i)"
-                            placeholder="Account number"
+                            [placeholder]="
+                              row.typ === 'DD' ? ddGlMapping?.ddPayableGlCode || 'Auto GL' : 'Account number'
+                            "
+                            [readonly]="row.typ === 'DD'"
+                            [class.ws-f__ctl--readonly]="row.typ === 'DD'"
+                            [title]="
+                              row.typ === 'DD' ? 'Configured Sponsor DD Payable GL (Auto-selected)' : 'Account number'
+                            "
                          />
                        </div>
                        <div class="ws-f ws-f--ecsno">
@@ -1591,14 +1689,19 @@
                      <div class="ws-group__fields">
                        <div class="ws-f ws-f--desc">
                          <label class="ws-f__lbl">DESCRIPTION</label>
-                          <input class="ws-f__ctl" [(ngModel)]="row.description" placeholder="Narration / remarks" />
+                          <input
+                            class="ws-f__ctl"
+                            [(ngModel)]="row.description"
+                            (click)="$event.stopPropagation()"
+                            placeholder="Narration / remarks"
+                          />
                        </div>
                      </div>
                    </div>
                  </div>

                  <!-- ── Row 3: DD Charges & GST — only for TYPE=DD, TXN TP=Cash, AC.TP=GL ── -->
-                  @if (isDdCashGlRow(row)) {
+                  @if (isDdRow(row)) {
                    <div class="ws-group-row ws-group-row--mt">
                      <div class="ws-group ws-group--flex">
                        <span class="ws-caption">DD Charges &amp; GST — Admin Rate {{ ddGstPercentage }}%</span>
@@ -1612,6 +1715,7 @@
                                type="number"
                                [value]="row.ddCharges ?? ''"
                                (input)="row.ddCharges = +$any($event.target).value"
+                                (click)="$event.stopPropagation()"
                                placeholder="0.00"
                              />
                            </div>
@@ -1632,7 +1736,7 @@
                          </div>
                          <div class="ws-f ws-f--amt">
                            <label class="ws-f__lbl" title="Amount + Charges + GST, rounded up to the next rupee">
-                              TOTAL TO COLLECT
+                              {{ isDdAccountDebitRow(row) ? 'TOTAL TO DEBIT' : 'TOTAL TO COLLECT' }}
                            </label>
                            <div class="ws-amt-wrap ws-amt-wrap--locked">
                              <span class="ws-amt-prefix">₹</span>
@@ -1644,6 +1748,23 @@
                              />
                            </div>
                          </div>
+
+                          <div class="ws-f" style="margin-left: auto; align-self: flex-end">
+                            <button
+                              type="button"
+                              class="te-dd-issue-btn"
+                              [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'
+                              "
+                            >
+                              <mat-icon style="font-size: 18px; width: 18px; height: 18px">post_add</mat-icon>
+                              <span>Fill DD Details</span>
+                            </button>
+                          </div>
                        </div>
                      </div>
                    </div>
@@ -1741,9 +1862,9 @@
                  class="ws-btn ws-btn--ghost"
                  type="button"
                  (click)="router.navigate(['/clerk/my-disbursement-requests'])"
-                  title="View my disbursement requests"
+                  title="View my fund requests — Disbursement, Collection, Fund Transfer and Bank Transfer"
                >
-                  My Disbursements
+                  Disbursements &amp; Transfer
                </button>
              }
              @if (canShowAccountActions) {
@@ -1804,7 +1925,7 @@

        @if (closeAccountChecked) {
          @if (closurePreviewLoading) {
-            <div class="te-aa-calc te-aa-calc--loading">Calculating interest to date…</div>
+            <div class="te-aa-calc te-aa-calc--loading">Posting interest to the account…</div>
          } @else if (closurePreviewError) {
            <div class="te-aa-calc te-aa-calc--error">{{ closurePreviewError }}</div>
          } @else if (closurePreview) {
@@ -1813,10 +1934,20 @@
                <span>Current Balance</span>
                <span>₹{{ closurePreview.balance | number: '1.2-2' }}</span>
              </div>
-              <div class="te-aa-calc__row">
-                <span>Interest to date</span>
-                <span>+ ₹{{ closurePreview.interest | number: '1.2-2' }}</span>
-              </div>
+              @if (closurePreview.interest < 0) {
+                <!-- Negative only when this run corrects interest that was over-posted earlier: the
+                     delta is against the stored balance, so calling it "interest" would read as the
+                     member being charged. The Payable figure below is the authoritative one either way. -->
+                <div class="te-aa-calc__row">
+                  <span>Interest correction</span>
+                  <span>− ₹{{ -closurePreview.interest | number: '1.2-2' }}</span>
+                </div>
+              } @else {
+                <div class="te-aa-calc__row">
+                  <span>Interest to date</span>
+                  <span>+ ₹{{ closurePreview.interest | number: '1.2-2' }}</span>
+                </div>
+              }
              <div class="te-aa-calc__row te-aa-calc__row--total">
                <span>Payable on Closure</span>
                <span>₹{{ closurePreview.total | number: '1.2-2' }}</span>
@@ -1828,8 +1959,8 @@
                </div>
              }
              <div class="te-aa-calc__note">
-                Interest calculated to {{ closurePreview.asOfDate }} using the same calculation the closure itself
-                performs. Cash is handed over rounded to whole rupees.
+                Interest has been posted to the account as of {{ closurePreview.asOfDate }} — this is the account's real
+                balance now, not an estimate. Cash is handed over rounded to whole rupees.
              </div>
            </div>

@@ -3384,3 +3384,67 @@ select.te-cell {
    transform: rotate(360deg);
  }
 }
+
+.ws-dd-unconfigured-banner {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin: 10px 16px;
+  padding: 12px 16px;
+  background: #fffbeb;
+  border: 1.5px solid #fcd34d;
+  border-radius: 8px;
+  color: #92400e;
+  font-size: 13px;
+
+  mat-icon {
+    color: #d97706;
+    font-size: 24px;
+    width: 24px;
+    height: 24px;
+    flex-shrink: 0;
+  }
+
+  &__text {
+    flex: 1;
+    line-height: 1.4;
+
+    strong {
+      color: #78350f;
+    }
+  }
+}
+
+.te-dd-issue-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  background: linear-gradient(135deg, #0284c7, #0ea5e9);
+  color: #fff;
+  border: none;
+  border-radius: 6px;
+  padding: 7px 16px;
+  font-size: 13px;
+  font-weight: 600;
+  cursor: pointer;
+  box-shadow: 0 2px 4px rgb(2 132 199 / 35%);
+  transition: all 0.15s ease-in-out;
+  letter-spacing: 0.2px;
+
+  &:hover:not(:disabled) {
+    background: linear-gradient(135deg, #0369a1, #0284c7);
+    box-shadow: 0 3px 8px rgb(2 132 199 / 50%);
+    transform: translateY(-1px);
+  }
+
+  &:active:not(:disabled) {
+    transform: translateY(0);
+  }
+
+  &:disabled {
+    background: #cbd5e1;
+    color: #64748b;
+    cursor: not-allowed;
+    box-shadow: none;
+  }
+}
@@ -32,6 +32,7 @@ import {
 } from '../../shared/customer-search-dialog/customer-search-dialog.component';
 import { SponsorDDService } from '../../sponsor-dd/sponsor-dd.service';
 import { OrganizationService } from '../../organization/organization.service';
+import { CashierIssueDdDialogComponent } from './cashier-issue-dd-dialog.component';

 interface TxnRow {
  typ: string;
@@ -51,10 +52,32 @@ interface TxnRow {
  routingCode: string;
  /** DD issuance charges/commission — only used when TYPE=DD, TXN TP=Cash, AC.TP=GL */
  ddCharges: number | null;
+  sponsorBankId?: number | null;
  /** Only used when this row is AC.TP=SHR inside an Enter Bank Transfer to its linked savings
   *  account — governs the share redemption (see submitShareRedemptionTransfer()). */
  resolutionNumber?: string;
  meetingDate?: string;
+  /**
+   * Beneficiary and leaflet captured in the DD dialog, held on the row until Save.
+   *
+   * The dialog used to submit the request itself, which left the worksheet's own Save button doing
+   * nothing for a DD row — the clerk filled the dialog, the request was already gone, and pressing
+   * Save afterwards had no effect. Filling in details and committing them are two different
+   * actions, so the dialog now only records what was entered and Save is what sends it.
+   */
+  ddDetails?: {
+    leafletId: number;
+    ddNumber: string;
+    beneficiaryName: string;
+    payableAtBranch: string;
+    payableAtCity: string;
+    /** Present only for a walk-in cash draft. */
+    purchaser?: { name: string; address: string; aadhaar: string };
+    /** Note-and-coin breakdown, cash drafts only. */
+    denominations?: { [key: string]: number };
+    fundingAccountId?: number;
+    fundingClientId?: number;
+  };
 }

 interface Denomination {
@@ -1523,7 +1546,14 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   * the one that actually governs how the settlement credit posts (see submitShareRedemptionTransfer()).
   */
  paymentTypesForRow(row: TxnRow): any[] {
-    const tellerFacing = this.paymentTypes.filter((pt: any) => !pt.isSystemDefined);
+    // Sponsor-bank payment types are excluded. They were added for the Demand Draft module, which
+    // picks its bank from m_sponsor_bank on the DD row itself, and they are not counter instruments
+    // — a clerk choosing "SBI" as the TXN TP. of a withdrawal says nothing about how the money
+    // moves. They are recognised by their description rather than by name so that adding another
+    // sponsor bank does not put it back on this list.
+    const tellerFacing = this.paymentTypes.filter(
+      (pt: any) => !pt.isSystemDefined && !/sponsor bank/i.test(pt.description ?? '')
+    );
    if (!this.isClerk) {
      // Cashier counter takes cash only — cheque/transfer/DD instruments go through their own
      // clerk/back-office approval flows, never straight through the cash drawer.
@@ -1541,6 +1571,23 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    if (isShareSettlementCredit) {
      return tellerFacing.filter((pt: any) => !pt.isCashPayment);
    }
+    // A withdrawal slip is a cash instruction and nothing else: the clerk raises it, the cashier
+    // counts the notes out against the token. There is no non-cash way to settle one, so cash is
+    // the only choice offered rather than the default among several.
+    if (row.typ === 'Withdrawal Slip') {
+      return tellerFacing.filter((pt: any) => !!pt.isCashPayment);
+    }
+    // A clerk's Demand Draft is never funded by cash they take themselves. Cash for a draft is
+    // counted at the counter, so it comes either from the cashier's own DD screen or from an
+    // approved cashier deposit request the clerk points the draft at; the clerk's own route is to
+    // debit the member's account. Offering cash here let a draft be raised against notes no drawer
+    // had counted, which is exactly how the six cash DDs with no denomination breakdown arose.
+    if (row.typ === 'DD') {
+      return tellerFacing.filter((pt: any) => !pt.isCashPayment);
+    }
+    // Everything else can go either way, so both are offered and the clerk says which. A cheque or
+    // a bank transfer normally settles through the instrument, a disbursement or fund transfer
+    // between accounts — the type alone does not fix it to one or the other.
    return tellerFacing;
  }

@@ -1591,6 +1638,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  private lastLoadedAcNo = '';
  private acNoInput$ = new Subject<{ row: TxnRow; index: number; value: string }>();
  cashVaultGlId: number | null = null;
+  /** The Cash Vault GL account's own code and name — the denomination breakdown for a manual GL
+   *  entry has to be filed against THIS account, not whichever account the teller typed in, since
+   *  that account is never the one physical notes actually moved through (see submitGlJournalEntry).
+   *  Both resolved dynamically off whatever this tenant's own financial-activity mapping names as
+   *  its cash/vault account (see loadCashVaultGl) — never a literal account name or code. */
+  cashVaultGlCode: string | null = null;
+  cashVaultGlName: string | null = null;

  // Joint holder expanded details (keyed by index)
  expandedHolder: number | null = null;
@@ -1645,6 +1699,33 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    'GL',
    'LA'
  ];
+
+  /**
+   * Account types a clerk may fund a demand draft from.
+   *
+   * A clerk raises a draft against a member's own balance, so the only sensible sources are the
+   * accounts a member actually holds money in. GL was offered here too, and picking it quietly
+   * switched the row onto the cash path — the one that asks for a walk-in purchaser's name and a
+   * note-and-coin count, neither of which a clerk debiting an account has. The option is removed
+   * rather than validated afterwards, so the wrong path cannot be reached at all.
+   */
+  private static readonly DD_CLERK_ACTYPS = [
+    'SD',
+    'CA'
+  ];
+
+  /**
+   * The account types this particular row may use.
+   *
+   * Every other row keeps the full list; only a clerk's DD row is narrowed, because that is the
+   * only row where the account type silently decides which funding flow runs.
+   */
+  acTypOptionsFor(row: TxnRow): string[] {
+    if (this.isClerk && row.typ === 'DD') {
+      return TransactionEntryComponent.DD_CLERK_ACTYPS;
+    }
+    return this.acTypOptions;
+  }
  dbCrOptions = [
    'Dr',
    'Cr'
@@ -1664,9 +1745,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    // wrong for crediting a GL amount into a savings/current account for any other reason (e.g.
    // funding a newly-activated account's opening balance from a GL source).
    { value: 'Fund Transfer', label: 'Fund Transfer' },
-    // NOTE: the exact same TxnRow.typ string is used at every dispatch/default-setting site below —
-    // search for 'Disbursement' whenever this needs to change again, since 'Fund Transfer' always
-    // rides alongside it in every one of those checks rather than having its own separate case.
    { value: 'Enter Bank Transfer', label: 'Enter Bank Transfer' },
    { value: 'DD', label: 'DD (Demand Draft)' }
  ];
@@ -1692,6 +1770,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return this.isClerk ? this.clerkTypOptions : this.cashierTypOptions;
  }

+  sponsorBanks: any[] = [];
+  ddGlMapping: any = null;
+
  // ── Denomination ──────────────────────────────────────────────────────────
  notes: Denomination[] = [];
  coins: Denomination[] = [];
@@ -1752,6 +1833,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {

    this.loadCashVaultGl();
    this.loadDdGstPercentage();
+    this.loadSponsorBanks();

    if (this.reviewMode) {
      this.loadRequestIntoForm(this.reviewRequestId!, 'review');
@@ -1842,12 +1924,85 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
      .getGlMappings()
      .pipe(catchError(() => of([])))
      .subscribe((mappings: any[]) => {
-        const mapping = mappings && mappings.length ? mappings[0] : null;
-        this.ddGstPercentage = Number(mapping?.gstPercentage ?? 18);
-        this.ddLimitAmount = mapping?.ddLimitAmount != null ? Number(mapping.ddLimitAmount) : null;
+        this.ddGlMapping = mappings && mappings.length ? mappings[0] : null;
+        this.ddGstPercentage = Number(this.ddGlMapping?.gstPercentage ?? 18);
+        this.ddLimitAmount = this.ddGlMapping?.ddLimitAmount != null ? Number(this.ddGlMapping.ddLimitAmount) : null;
+        if (this.ddGlMapping?.ddPayableGlAccountId) {
+          if (this.ddGlMapping.ddPayableGlCode) {
+            this.applyDdGlMappingToDdRows();
+          } else {
+            this.http
+              .get<any>(`/glaccounts/${this.ddGlMapping.ddPayableGlAccountId}`)
+              .pipe(catchError(() => of(null)))
+              .subscribe((glAcc: any) => {
+                if (glAcc) {
+                  this.ddGlMapping.ddPayableGlCode = glAcc.glCode || String(glAcc.id);
+                  this.ddGlMapping.ddPayableGlAccountName = glAcc.name;
+                }
+                this.applyDdGlMappingToDdRows();
+              });
+          }
+        }
      });
  }

+  applyDdGlMappingToRow(row: TxnRow): void {
+    if (row.typ !== 'DD' || !this.ddGlMapping) return;
+    // Leaves an account-funded DD alone: its A/C NO. is the member's account the clerk typed, and
+    // overwriting it with the DD Payable GL would silently turn the row back into a cash draft.
+    if (this.isDdAccountDebitRow(row)) return;
+    row.acTyp = 'GL';
+    row.dbCr = 'Cr';
+
+    if (this.ddGlMapping.ddPayableGlCode) {
+      row.acNo = this.ddGlMapping.ddPayableGlCode;
+      this.selectedRow = row;
+      this.loadAccountDetails(row.acNo, 'GL');
+      return;
+    }
+
+    if (this.ddGlMapping.ddPayableGlAccountId) {
+      this.http
+        .get<any>(`/glaccounts/${this.ddGlMapping.ddPayableGlAccountId}`)
+        .pipe(catchError(() => of(null)))
+        .subscribe((glAcc: any) => {
+          if (glAcc) {
+            this.ddGlMapping.ddPayableGlCode = glAcc.glCode || String(glAcc.id);
+            this.ddGlMapping.ddPayableGlAccountName = glAcc.name;
+            row.acNo = this.ddGlMapping.ddPayableGlCode;
+            this.selectedRow = row;
+            this.loadAccountDetails(row.acNo, 'GL');
+          }
+        });
+    }
+  }
+
+  private applyDdGlMappingToDdRows(): void {
+    for (const row of this.rows) {
+      if (row.typ === 'DD') {
+        this.applyDdGlMappingToRow(row);
+      }
+    }
+  }
+
+  private loadSponsorBanks(): void {
+    this.sponsorDDService
+      .getSponsorBanks()
+      .pipe(catchError(() => of([])))
+      .subscribe((banks: any[]) => {
+        this.sponsorBanks = banks || [];
+        for (const row of this.rows) {
+          if (row.typ === 'DD' && !row.sponsorBankId && this.sponsorBanks.length > 0) {
+            row.sponsorBankId = this.sponsorBanks[0].id;
+          }
+        }
+      });
+  }
+
+  get isDdGlMappingConfigured(): boolean {
+    return !!(this.ddGlMapping && this.ddGlMapping.ddPayableGlAccountId && this.ddGlMapping.cashGlAccountId);
+  }
+
  private loadDayStatus(): void {
    this.cashierService
      .getCashierDayStatus()
@@ -2093,9 +2248,12 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        row.chequeNo = '';
        row.cheqDate = '';
        break;
+      // A cheque clears through the bank rather than the drawer, so it opens on the transfer
+      // instrument. Cash is still on its dropdown — a cheque can be cashed over the counter — but
+      // it is the exception, not what the field should start on.
      case 'Cheque':
        row.dbCr = 'Dr';
-        row.paymentTypeId = this.findCashPaymentTypeId();
+        row.paymentTypeId = this.findTransferPaymentTypeId();
        break;
      case 'Disbursement':
      case 'Fund Transfer':
@@ -2121,16 +2279,26 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        row.chequeNo = '';
        row.cheqDate = '';
        break;
-      // A DD is bought with cash: the customer hands over Face Value + Charges + GST, so it is money
-      // coming IN (Cr) against the GL the draft is drawn on. All three of Cr, a cash payment type and
-      // AC.TP = GL are what isDdCashGlRow() looks for -- without them the DD Charges & GST panel never
-      // appears and the row would post as an ordinary entry with the charges silently dropped.
+      // A DD is bought with cash: the purchaser hands over Face Value + Charges + GST, so it is
+      // money coming IN (Cr) against the GL the draft is drawn on. All three of Cr, a cash payment
+      // type and AC.TP = GL are what isDdCashGlRow() looks for -- without them the DD Charges & GST
+      // panel never appears and the row would post as an ordinary entry with the charges silently
+      // dropped.
+      //
+      // A clerk funds a draft by debiting a member's own account, so their row opens on savings and
+      // is debited, and GL is not on their AC.TP list at all (see acTypOptionsFor). Opening them on
+      // GL put the row on the cash path, which asks for a walk-in purchaser and a note-and-coin
+      // count that a clerk debiting an account does not have.
      case 'DD':
-        row.dbCr = 'Cr';
-        row.paymentTypeId = this.findCashPaymentTypeId();
-        row.acTyp = 'GL';
+        row.dbCr = this.isClerk ? 'Dr' : 'Cr';
+        row.acTyp = this.isClerk ? 'SD' : 'GL';
+        row.paymentTypeId = this.isClerk ? this.findTransferPaymentTypeId() : this.findCashPaymentTypeId();
        row.chequeNo = '';
        row.cheqDate = '';
+        if (this.sponsorBanks.length > 0 && !row.sponsorBankId) {
+          row.sponsorBankId = this.sponsorBanks[0].id;
+        }
+        this.applyDdGlMappingToRow(row);
        break;
    }
  }
@@ -2145,10 +2313,33 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return pt?.id ?? null;
  }

-  /** TYPE=DD + TXN TP=Cash + AC.TP=GL — the only combination that collects DD charges + GST from the customer. */
+  /** TYPE=DD + TXN TP=Cash */
  isDdCashGlRow(row: TxnRow): boolean {
+    if (this.isDdAccountDebitRow(row)) return false;
    const pt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
-    return row.typ === 'DD' && !!pt?.isCashPayment && row.acTyp === 'GL';
+    return row.typ === 'DD' && (row.acTyp === 'GL' || !row.acTyp || !!pt?.isCashPayment);
+  }
+
+  /**
+   * TYPE=DD funded by debiting a member's savings/current account rather than by cash.
+   *
+   * Clerk-only. A cashier's counter takes cash and nothing else, so offering them an account debit
+   * would let a draft be raised against an account with no cash to reconcile it against — and the
+   * clerk flow is the one that carries a maker-checker step over the member's balance.
+   */
+  isDdAccountDebitRow(row: TxnRow): boolean {
+    return this.isClerk && row.typ === 'DD' && (row.acTyp === 'SD' || row.acTyp === 'CA' || row.acTyp === 'CB');
+  }
+
+  /**
+   * Any DD row the charges/GST panel applies to.
+   *
+   * Charges and GST come from the admin's DD configuration and are collected whichever way the
+   * draft is paid for — the difference is only where the money comes from, so the panel is the same
+   * for both and the label on the total changes rather than the arithmetic.
+   */
+  isDdRow(row: TxnRow): boolean {
+    return this.isDdCashGlRow(row) || this.isDdAccountDebitRow(row);
  }

  /** GST on DD charges only (never on the DD face value), at the admin-configured rate. */
@@ -2179,6 +2370,331 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    return !!this.selectedRow && Math.abs(this.denominationTotal - this.ddTargetTotal) < 0.005;
  }

+  branchNameFor(branchId: number): string {
+    const map: Record<number, string> = {
+      1: '001 · Main',
+      2: '002 · M.G. Road',
+      14: '014 · Station Rd',
+      27: '027 · Industrial'
+    };
+    return map[branchId] || `Branch ${branchId}`;
+  }
+
+  /**
+   * Cashier Walk-in DD creation flow:
+   * 1. Validates one-time persistent GL configuration
+   * 2. Auto-selects next available leaflet
+   * 3. Opens dialog to capture purchaser/beneficiary details
+   * 4. Submits issue request directly with physical denominations for manager approval
+   */
+  openIssueWalkinDd(row: TxnRow): void {
+    if (!this.isDdGlMappingConfigured) {
+      this.showAlert('error', 'DD GL Mapping Not Configured', [
+        'DD GL mapping is not configured.',
+        'Please ask an administrator to set up the GL accounts in Admin > Sponsor DD GST / GL Settings before creating Demand Drafts.'
+      ]);
+      return;
+    }
+    const faceValue = Number(row.amount);
+    if (!faceValue || faceValue <= 0) {
+      this.showAlert('error', 'Invalid Amount', ['Please enter the DD Face Value amount before proceeding.']);
+      return;
+    }
+    const chargesAmount = Number(row.ddCharges) || 0;
+    const gstAmount = this.ddGstAmountFor(row);
+    const totalCashPayable = this.ddTotalPayableFor(row);
+    const accountDebit = this.isDdAccountDebitRow(row);
+
+    // An account-funded draft needs the account resolved to a Fineract id before it can be sent:
+    // the server takes a savings/current account id and a client id, not the typed number. Both are
+    // filled in by the A/C NO. lookup, so an unresolved account means the number was never found.
+    let fundingAccountId: number | null = null;
+    let fundingClientId: number | null = null;
+    if (accountDebit) {
+      const acNo = (row.acNo || '').trim();
+      if (!acNo) {
+        this.showAlert('error', 'Account Required', [
+          'Enter the account number the Demand Draft is funded from.'
+        ]);
+        return;
+      }
+      fundingAccountId = this.rowAccountIds[acNo] ?? null;
+      fundingClientId = this.rowClientIds[acNo] ?? null;
+      if (!fundingAccountId || !fundingClientId) {
+        this.showAlert('error', 'Account Not Found', [
+          `Account ${acNo} could not be resolved.`,
+          'Check the account number and wait for its details to load before raising the draft.'
+        ]);
+        return;
+      }
+    }
+
+    // Only a cash draft has notes to reconcile. An account debit takes no cash at the counter, so a
+    // denomination count left over from an earlier row must not be checked against it.
+    if (!accountDebit && this.denominationTotal > 0 && Math.abs(this.denominationTotal - totalCashPayable) > 0.005) {
+      this.showAlert('error', 'Denomination Mismatch', [
+        `Cash denomination counted (₹${this.denominationTotal}) does not match total payable cash (₹${totalCashPayable}).`,
+        'Please verify and match the physical cash denomination count.'
+      ]);
+      return;
+    }
+
+    this.saving = true;
+    this.sponsorDDService.getNextAvailableLeaflet(row.br, row.sponsorBankId ?? undefined).subscribe({
+      next: (leaflet) => {
+        this.saving = false;
+        if (!leaflet) {
+          this.showAlert('error', 'No Available Leaflets', [
+            'No available Demand Draft leaflets found for this branch and sponsor bank.',
+            'Please register a DD inventory series first.'
+          ]);
+          return;
+        }
+
+        const selectedBank = this.sponsorBanks.find((b: any) => b.id === row.sponsorBankId);
+        const branchName = this.branchNameFor(row.br) || 'Branch ' + row.br;
+
+        const dialogRef = this.dialog.open(CashierIssueDdDialogComponent, {
+          width: '600px',
+          disableClose: true,
+          data: {
+            leaflet,
+            branchName,
+            sponsorBankName: selectedBank?.name || 'Sponsor Bank',
+            faceValue,
+            chargesAmount,
+            gstPercentage: this.ddGstPercentage,
+            gstAmount,
+            totalCashPayable,
+            paymentMethod: accountDebit ? ('ACCOUNT_DEBIT' as const) : ('CASH' as const),
+            accountNo: accountDebit ? row.acNo : undefined,
+            accountHolderName: accountDebit ? this.rowAccountNames[(row.acNo || '').trim()] : undefined
+          }
+        });
+
+        // Recorded on the row, not sent. Save is what commits the worksheet, and a DD row that
+        // submitted itself here left that button with nothing to do — so the clerk had no way to
+        // review the entered details, and no way to abandon them either.
+        dialogRef.afterClosed().subscribe((result) => {
+          if (!result) return;
+          row.ddDetails = {
+            leafletId: leaflet.id,
+            ddNumber: leaflet.ddNumber,
+            beneficiaryName: result.beneficiaryName,
+            payableAtBranch: result.payableAtBranch,
+            payableAtCity: result.payableAtCity,
+            purchaser: accountDebit
+              ? undefined
+              : {
+                  name: result.walkinPurchaserName,
+                  address: result.walkinPurchaserAddress,
+                  aadhaar: result.walkinPurchaserAadhaar
+                },
+            fundingAccountId: accountDebit ? fundingAccountId! : undefined,
+            fundingClientId: accountDebit ? fundingClientId! : undefined
+          };
+          this.showAlert('success', 'DD Details Captured', [
+            `DD No. ${leaflet.ddNumber} · in favour of ${result.beneficiaryName}.`,
+            accountDebit
+              ? `₹${this.ddTotalPayableFor(row)} will be debited from ${row.acNo} once a checker approves.`
+              : `₹${this.ddTotalPayableFor(row)} to be collected at the counter.`,
+            'Press Save to send this draft for approval.'
+          ]);
+        });
+      },
+      error: (err) => {
+        this.saving = false;
+        this.showAlert('error', 'Error Auto-Selecting DD Leaflet', [err.error?.message || err.message]);
+      }
+    });
+  }
+
+  /**
+   * Raises a Demand Draft funded by debiting a member's savings or current account.
+   *
+   * Clerk-only, and a maker-checker request like the cash flow: nothing is debited here. The member's
+   * account is only touched when a checker approves, which is also when the balance is re-checked —
+   * so a draft raised against a sufficient balance can still be refused if the balance has since
+   * gone. No denominations are sent, because no cash is taken.
+   *
+   * The account goes in savingsAccountId or currentAccountId, never both: the server insists on
+   * exactly one, since which table the account lives in decides which control GL is debited.
+   */
+  private submitAccountDebitDd(
+    row: TxnRow,
+    leaflet: any,
+    beneficiaryData: any,
+    fundingAccountId: number,
+    fundingClientId: number
+  ): void {
+    const d = new Date();
+    const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+    const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
+
+    const payload = {
+      clientId: fundingClientId,
+      beneficiaryName: beneficiaryData.beneficiaryName,
+      payableAtBranch: beneficiaryData.payableAtBranch,
+      payableAtCity: beneficiaryData.payableAtCity,
+      faceValue: Number(row.amount),
+      chargesAmount: Number(row.ddCharges) || 0,
+      issuingBranchId: row.br,
+      issuedDate,
+      paymentMethod: 'ACCOUNT_DEBIT' as const,
+      savingsAccountId: isCurrent ? undefined : fundingAccountId,
+      currentAccountId: isCurrent ? fundingAccountId : undefined
+    };
+
+    this.saving = true;
+    this.sponsorDDService.submitIssueRequest(leaflet.id, payload).subscribe({
+      next: () => {
+        this.saving = false;
+        this.showAlert('success', 'DD Issuance Request Submitted', [
+          `Demand Draft request for DD No. ${leaflet.ddNumber} (Face Value: ₹${row.amount}) submitted successfully!`,
+          `₹${this.ddTotalPayableFor(row)} will be debited from ${row.acNo} on approval.`,
+          'Sent to Manager / Head Cashier for maker-checker approval.'
+        ]);
+        row.amount = null;
+        row.ddCharges = null;
+        row.description = '';
+        // Cleared with the row: leaving the captured details behind would let a second Save raise
+        // the same draft again against a leaflet that has already been used.
+        row.ddDetails = undefined;
+      },
+      error: (err) => {
+        this.saving = false;
+        this.showAlert('error', 'DD Submission Failed', [err.error?.message || err.message]);
+      }
+    });
+  }
+
+  /**
+   * Sends the drafts on the worksheet for approval.
+   *
+   * Each row carries the beneficiary details the dialog captured; a row that was never filled in is
+   * refused by name rather than skipped, because a clerk who pressed Save expecting one draft and
+   * got none has no way of telling which row was missing.
+   */
+  private saveDdRows(ddRows: TxnRow[]): void {
+    const unfilled = ddRows.filter((r) => !r.ddDetails);
+    if (unfilled.length > 0) {
+      this.showAlert('error', 'DD Details Not Entered', [
+        unfilled.length === 1
+          ? 'One DD row has no beneficiary details yet.'
+          : `${unfilled.length} DD rows have no beneficiary details yet.`,
+        'Use "Fill DD Details & Send for Approval" on each DD row first, then press Save.'
+      ]);
+      return;
+    }
+
+    for (const row of ddRows) {
+      const details = row.ddDetails!;
+      const leaflet = { id: details.leafletId, ddNumber: details.ddNumber };
+      if (this.isDdAccountDebitRow(row)) {
+        this.submitAccountDebitDd(
+          row,
+          leaflet,
+          {
+            beneficiaryName: details.beneficiaryName,
+            payableAtBranch: details.payableAtBranch,
+            payableAtCity: details.payableAtCity
+          },
+          details.fundingAccountId!,
+          details.fundingClientId!
+        );
+      } else {
+        this.submitWalkinCashDd(row, leaflet, {
+          beneficiaryName: details.beneficiaryName,
+          payableAtBranch: details.payableAtBranch,
+          payableAtCity: details.payableAtCity,
+          walkinPurchaserName: details.purchaser?.name,
+          walkinPurchaserAddress: details.purchaser?.address,
+          walkinPurchaserAadhaar: details.purchaser?.aadhaar
+        });
+      }
+    }
+  }
+
+  private submitWalkinCashDd(row: TxnRow, leaflet: any, purchaserData: any): void {
+    // Read through countFor, which knows the map is keyed by kind:value. Indexing by d.id looked
+    // right but matched nothing, so every cash DD went in with no breakdown at all and its money
+    // vanished from the closing report -- the notes were counted on screen and then dropped.
+    const denominationMap: { [key: string]: number } = {};
+    for (const d of [
+      ...this.notes,
+      ...this.coins
+    ]) {
+      const count = this.countFor(d);
+      if (count > 0) {
+        denominationMap[this.denomKey(d)] = count;
+      }
+    }
+
+    // The breakdown is the only record of which notes were taken, and the server insists it add up
+    // to the cash collected. Checked here so the cashier is told which figure is wrong while the
+    // counts are still on screen, rather than getting a rejection after the fact.
+    //
+    // ddTotalPayableFor rounds up to the whole rupee actually collected, which is what the notes
+    // can add to; the exact figure with paise is accepted too, for a draft that lands on a rupee.
+    const totalCollected = Number(this.ddTotalPayableFor(row));
+    const exactPayable = Number(row.amount || 0) + (Number(row.ddCharges) || 0) + this.ddGstAmountFor(row);
+    const countedTotal = Object.entries(denominationMap).reduce(
+      (sum, [
+          key,
+          count
+        ]) => sum + Number(key.split(':')[1]) * count,
+      0
+    );
+    if (countedTotal !== totalCollected && countedTotal !== exactPayable) {
+      this.showAlert('error', 'Denomination Entry Does Not Match', [
+        countedTotal === 0
+          ? 'Enter the notes and coins taken from the purchaser before submitting.'
+          : `The notes and coins entered come to ₹${countedTotal.toFixed(2)}, but ₹${totalCollected.toFixed(2)} is collected (face value + charges + GST).`,
+        'The breakdown must equal the cash taken — it is what the closing report and the drawer are checked against.'
+      ]);
+      return;
+    }
+
+    const d = new Date();
+    const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
+
+    const payload = {
+      walkinPurchaserName: purchaserData.walkinPurchaserName,
+      walkinPurchaserAddress: purchaserData.walkinPurchaserAddress,
+      walkinPurchaserAadhaar: purchaserData.walkinPurchaserAadhaar,
+      beneficiaryName: purchaserData.beneficiaryName,
+      payableAtBranch: purchaserData.payableAtBranch,
+      payableAtCity: purchaserData.payableAtCity,
+      faceValue: Number(row.amount),
+      chargesAmount: Number(row.ddCharges) || 0,
+      issuingBranchId: row.br,
+      issuedDate,
+      paymentMethod: 'CASH' as const,
+      denominationData: Object.keys(denominationMap).length > 0 ? JSON.stringify(denominationMap) : undefined
+    };
+
+    this.saving = true;
+    this.sponsorDDService.submitIssueRequest(leaflet.id, payload).subscribe({
+      next: () => {
+        this.saving = false;
+        this.showAlert('success', 'DD Issuance Request Submitted', [
+          `Demand Draft request for DD No. ${leaflet.ddNumber} (Face Value: ₹${row.amount}, Total Cash: ₹${this.ddTotalPayableFor(row)}) submitted successfully!`,
+          'Sent to Manager / Head Cashier for maker-checker approval.'
+        ]);
+        row.amount = null;
+        row.ddCharges = null;
+        row.description = '';
+        // See the account-debit path: a second Save must not re-raise a draft already issued.
+        row.ddDetails = undefined;
+        this.clearDenominations();
+      },
+      error: (err) => {
+        this.saving = false;
+        this.showAlert('error', 'DD Submission Failed', [err.error?.message || err.message]);
+      }
+    });
+  }
+
  /**
   * Submits a clerk double-entry request (maker-checker, PENDING until manager approves).
   * Disbursement: 1 DR [GL] source → N CR savings/current/GL destinations.
@@ -2376,7 +2892,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
          this.showAlert('success', 'Bank Transfer Submitted', [
            `Voucher No: ${res.voucherNo}`,
            `Total: ₹${totalDr.toLocaleString('en-IN', { minimumFractionDigits: 2 })}  ·  DR: ${drRows.length} account(s)  →  CR: ${crRows.length} account(s)`,
-            'Pending Manager approval. Track status in "My Disbursement Requests".'
+            'Pending Manager approval. Track status in "Disbursements & Transfer".'
          ]);
          this.rows = [];
          this.rowAccountIds = {};
@@ -2734,6 +3250,8 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
          byName(/vault/i) ?? byName(/cash/i) ?? items.find((a: any) => a.glAccountData?.type?.value === 'ASSET');
        if (found?.glAccountData?.id) {
          this.cashVaultGlId = found.glAccountData.id;
+          this.cashVaultGlCode = found.glAccountData.glCode ?? null;
+          this.cashVaultGlName = found.glAccountData.name ?? found.financialActivityData?.name ?? null;
        }
      });
  }
@@ -2802,7 +3320,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    // Step 1: search on the correct endpoint for this account type
    this.http
      .get<any>(
-        `${cfg.list}?${cfg.listQueryParam}=${encodeURIComponent(acNo)}${cfg.supportsPagination ? `&offset=0&limit=${cfg.maxLimit}` : ''}`
+        `${cfg.list}?${cfg.listQueryParam}=${encodeURIComponent(acNo)}${cfg.supportsPagination ? `&offset=0&limit=${cfg.maxLimit}` : ''}${cfg.extraListQueryParams ? `&${cfg.extraListQueryParams}` : ''}`
      )
      .pipe(catchError(() => of(null)))
      .subscribe((res: any) => {
@@ -2811,16 +3329,23 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        const f = cfg.matchField;
        // Exact match first, then suffix/partial match. Some account types (e.g. Share — its
        // list endpoint only accepts offset/limit, no accountNo filter at all) always return the
-        // FULL unfiltered list rather than a server-side-narrowed one, so a partial match can't be
-        // gated on "exactly one row came back" — it never would be for those types.
-        const exactMatch = allItems.find((x: any) => x[f] === acNo);
+        const exactMatch = allItems.find((x: any) => String(x[f] ?? '').trim() === String(acNo).trim());
        const partialMatch = !exactMatch
-          ? (allItems.find((x: any) => x[f]?.endsWith(acNo)) ?? allItems.find((x: any) => x[f]?.includes(acNo)))
+          ? (allItems.find((x: any) => String(x[f] ?? '').endsWith(acNo)) ??
+            allItems.find((x: any) => String(x[f] ?? '').includes(acNo)))
          : null;
-        const match = exactMatch ?? partialMatch ?? null;
+        const idMatch =
+          !exactMatch && !partialMatch && acTyp === 'GL'
+            ? allItems.find((x: any) => String(x.id) === String(acNo))
+            : null;
+        const match = exactMatch ?? partialMatch ?? idMatch ?? null;
        if (match?.id) {
+          const matchedGlCode = match[f] ?? acNo;
+          if (this.selectedRow && this.selectedRow.typ === 'DD' && match.glCode) {
+            this.selectedRow.acNo = match.glCode;
+          }
          const clientIdFromSearch = acTyp !== 'GL' && match.clientId != null ? String(match.clientId) : null;
-          this.fetchAllDetails(match.id, match[f] ?? acNo, cfg, token, acTyp, clientIdFromSearch);
+          this.fetchAllDetails(match.id, matchedGlCode, cfg, token, acTyp, clientIdFromSearch);
          return;
        }
        this.loadingAccount = false;
@@ -2884,6 +3409,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    matchField: string;
    detailParams: string;
    supportsPagination: boolean;
+    /** Extra fixed query params (e.g. "usage=1") appended to every list-search request for this
+     *  account type — used to keep Header GL accounts out of the results a clerk/cashier can pick
+     *  for a transaction; a Header can never receive a posting, so it should never be offered. */
+    extraListQueryParams?: string;
  } {
    const t = acTyp?.toUpperCase();
    if (t === 'LA') {
@@ -2937,7 +3466,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        listQueryParam: 'searchParam',
        matchField: 'glCode',
        detailParams: '?fetchRunningBalance=true',
-        supportsPagination: false
+        supportsPagination: false,
+        // Detail-only: a Header account is a pure grouping node and can never receive a
+        // transaction, so it must never be a selectable match here in the first place.
+        extraListQueryParams: 'usage=1'
      };
    }
    if (t === 'CA' || t === 'CB') {
@@ -3048,7 +3580,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        return false;
      }
      const returnedId = acc.glCode ?? acc.accountNo;
-      if (returnedId && returnedId !== acNo) {
+      if (returnedId && returnedId !== acNo && String(acc.id) !== acNo) {
        this.loadingAccount = false;
        this.accountError = 'Account mismatch. Please re-enter account number and try again.';
        return false;
@@ -3294,7 +3826,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        { label: 'NEFT Facility', active: !!f.neftFacility },
        { label: 'RTGS Facility', active: !!f.rtgsFacility },
        { label: 'Inter-Bank Cap', active: !!f.interBankTotalCapFacility },
-        { label: 'Withdrawal', active: !!f.withdrawalFacility },
        { label: 'Deposit (KYC)', active: !!f.depositFacilityKyc },
        { label: 'Virtual Debit Card', active: !!f.virtualDebitCard },
        { label: 'OD', active: !!this.accountDetails?.allowOverdraft }
@@ -3746,9 +4277,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    this.showAccountActions = false;
  }

-  /** Ticking "Close this account" immediately previews what the member would receive — the balance
-   *  plus interest accrued to date — so the clerk sees the real figure before submitting. Nothing
-   *  is posted; the binding amount is computed by Fineract's own close command at approval time. */
+  /** Ticking "Close this account" posts every rupee of interest the member has earned to date onto
+   *  the account for real — the same posting close() itself performs — and shows the resulting real
+   *  balance. This is not an estimate: the interest is credited the moment the box is ticked, exactly
+   *  as the user asked for ("jaise FD close/maturity ke time interest post hota tha"). Approval later
+   *  finds this same posting already sitting at the matching period end and adds nothing more. */
  onCloseAccountToggle(): void {
    if (!this.closeAccountChecked) {
      this.closurePreview = null;
@@ -3761,13 +4294,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
    this.closurePreviewLoading = true;
    this.closurePreviewError = '';
    this.closureRequestService
-      .preview(accountId)
+      .postClosureInterest(accountId)
      .pipe(
        catchError((err: any) => {
          this.closurePreviewError =
            err?.error?.message ??
            err?.error?.errors?.[0]?.defaultUserMessage ??
-            'Could not calculate the closing amount. Please try again.';
+            'Could not post interest to the account. Please try again.';
          return of(null);
        })
      )
@@ -3864,13 +4397,25 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
        if (!res) return;

        const preview = this.closurePreview;
+        // The server has now POSTED the interest and returns the account's real resulting balance.
+        // That, not the popup's estimate, is what the closure pays out — so report it, and say so
+        // outright if the two ever disagree rather than letting a paise drift pass unnoticed.
+        const posted = res.payableAmount != null ? Number(res.payableAmount) : null;
+        const rupees = (v: number) => `₹${v.toLocaleString('en-IN', { minimumFractionDigits: 2 })}`;
+        const drifted = posted != null && preview != null && Math.abs(posted - preview.total) >= 0.005;
+
        this.showAlert(
          'success',
          'Closure Request Submitted',
          [
            `Account ${this.accountDetails?.accountNo} has been sent to the Bank Manager for closure approval.`,
-            preview
-              ? `Payout: ₹${preview.total.toLocaleString('en-IN', { minimumFractionDigits: 2 })} (balance ₹${preview.balance.toLocaleString('en-IN', { minimumFractionDigits: 2 })} + interest ₹${preview.interest.toLocaleString('en-IN', { minimumFractionDigits: 2 })}).`
+            posted != null
+              ? `Interest has been posted to the account. Payout: ${rupees(posted)}.`
+              : preview
+                ? `Payout: ${rupees(preview.total)}.`
+                : '',
+            drifted && preview
+              ? `Note: the posted figure ${rupees(posted!)} differs from the ${rupees(preview.total)} shown a moment ago — the posted figure is the one that will be paid.`
              : '',
            `Token No: ${row.tokNo?.trim()} — the cashier will hand over the cash against this token once approved.`,
            'Cash is handed over rounded to whole rupees; the paise difference goes to the Round Off Account.'
@@ -3954,14 +4499,33 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  }

  onSave(): void {
+    // Demand drafts commit here like everything else on the worksheet. Checked first because a DD
+    // row shares its shape with the ordinary entries below — without this it would fall through and
+    // post as a plain transaction, with the draft never raised and the charges silently dropped.
+    const ddRows = this.rows.filter((r) => this.isDdRow(r));
+    if (ddRows.length > 0) {
+      this.saveDdRows(ddRows);
+      return;
+    }
+
    // Clerk bank transfer — N DR savings/CA + N CR savings/CA, immediate execution. 'Fund Transfer'
    // is the same flow under a second TYPE label — onTypChange() already defaults it identically to
    // 'Enter Bank Transfer', so submission has to recognise both or a share redemption or bank
    // transfer raised under this label silently falls through to the wrong branch below.
+    //
+    // But 'Fund Transfer' rows that include a GL leg are NOT this flow — they are the
+    // Disbursement/Collection double-entry shape (see the TYPE options comment), just under the
+    // friendlier 'Fund Transfer' label so a non-loan GL movement doesn't have to be called a
+    // "Disbursement". 'Enter Bank Transfer' never carries a GL leg, so it always stays in this
+    // branch; only skip out to the Disbursement/Collection branch below when every row is 'Fund
+    // Transfer' and at least one of them is GL.
+    const fundTransferRowsHaveGl =
+      this.rows.every((r) => r.typ === 'Fund Transfer') && this.rows.some((r) => r.acTyp === 'GL');
    if (
      this.isClerk &&
      this.rows.length >= 2 &&
-      this.rows.every((r) => r.typ === 'Enter Bank Transfer' || r.typ === 'Fund Transfer')
+      this.rows.every((r) => r.typ === 'Enter Bank Transfer' || r.typ === 'Fund Transfer') &&
+      !fundTransferRowsHaveGl
    ) {
      const drRows = this.rows.filter((r) => r.dbCr === 'Dr');
      const crRows = this.rows.filter((r) => r.dbCr === 'Cr');
@@ -4379,8 +4943,9 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {

    // Clerk raising a closure request: nothing moves yet, so the ordinary withdrawal gauntlet below
    // does not apply and actively rejects a valid closure —
-    //  · Balance: the payout is balance + interest accrued but NOT yet posted, so it is legitimately
-    //    MORE than today's withdrawable amount. close() posts that interest before withdrawing.
+    //  · Balance: the popup already posted the accrued interest onto the account before filling this
+    //    amount in (see onCloseAccountToggle -> postClosureInterest), so the account's own withdrawable
+    //    balance already covers it -- this bypass exists for the checks below it, not this one.
    //  · Min balance: meaningless for an account that is being closed to zero.
    //  · Withdrawal facility: a member closing their account is not making an ordinary withdrawal.
    //  · Denomination: counted by the cashier at hand-over, not by the clerk here.
@@ -4564,6 +5129,10 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
  confirmSubmit(): void {
    this.showConfirmDialog = false;
    const row = this.selectedRow!;
+    if (row.typ === 'DD') {
+      this.openIssueWalkinDd(row);
+      return;
+    }
    const amount = this.isDdCashGlRow(row) ? this.ddTotalPayableFor(row) : (row.amount ?? this.denominationTotal);
    const isDeposit = row.dbCr === 'Cr';
    const command = isDeposit ? 'deposit' : 'withdrawal';
@@ -5219,11 +5788,15 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
                count: this.countFor(d),
                subtotal: this.subtotalFor(d)
              }));
+            // Filed against the Cash Vault GL, not the account the teller selected on screen: that
+            // selected account (e.g. Sundry Creditors) is the other leg of the journal entry, and
+            // never the one whose physical notes actually changed hands. Tagging the breakdown to it
+            // instead of the vault is why this cash never reached the cashier/vault position.
            this.http
              .post('/cashier/gl-denomination', {
                txnId: res.transactionId ?? res.resourceId,
-                accountNo: this.accountDetails?.glCode ?? row.acNo,
-                accountName: this.accountDetails?.name ?? '',
+                accountNo: this.cashVaultGlCode ?? row.acNo,
+                accountName: this.cashVaultGlName ?? 'Cash at Vault',
                txnType: isDeposit ? 'DEPOSIT' : 'WITHDRAWAL',
                txnDate: txnDateIso,
                paymentTypeName: selectedPt?.name ?? 'Cash',
@@ -1,183 +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 class="pg-head">
-    <div>
-      <div class="pg-eyebrow">CASHIER · EXCEPTIONS</div>
-      <h1 class="pg-title">Voucher Exceptions</h1>
-      <p class="pg-sub">
-        Vouchers flagged at the counter — where the slip and the system disagree, or something else about the entry is
-        wrong. A clerk or manager reviews each one with the cashier, records what was found, and attaches the supporting
-        document.
-      </p>
-    </div>
-    <div class="pg-toolbar">
-      <label class="pg-field">
-        <span>Show</span>
-        <select [(ngModel)]="filter" (change)="load()">
-          <option value="OPEN">Open</option>
-          <option value="RESOLVED">Resolved</option>
-          <option value="ALL">All</option>
-        </select>
-      </label>
-      <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
-        <mat-icon>refresh</mat-icon> Reload
-      </button>
-    </div>
-  </header>
-
-  @if (errorMsg) {
-    <div class="pg-alert pg-alert--error">{{ errorMsg }}</div>
-  }
-
-  @if (!canResolve && loaded) {
-    <div class="ve-note">
-      <mat-icon>info</mat-icon>
-      You can see these exceptions but not close them — a Clerk, Head Cashier or Bank Manager records the conclusion, so
-      that whoever raised the flag is not the one who rules on it.
-    </div>
-  }
-
-  @if (loading) {
-    <div class="pg-empty">Loading…</div>
-  }
-
-  @if (!loading && loaded && exceptions.length === 0) {
-    <div class="pg-empty">
-      <mat-icon>check_circle</mat-icon>
-      <p>{{ filter === 'OPEN' ? 'No open exceptions. Everything checked so far agrees.' : 'Nothing to show.' }}</p>
-    </div>
-  }
-
-  @for (e of exceptions; track e.voucherNo) {
-    <div class="ve-card" [class.ve-card--resolved]="e.resolutionStatus">
-      <div class="ve-card__head">
-        <span class="pg-chip">{{ e.voucherNo }}</span>
-        @if (e.resolutionStatus) {
-          <span class="db-badge db-badge--ok">RESOLVED</span>
-        } @else {
-          <span class="db-badge db-badge--rejected">⚠ OPEN</span>
-        }
-        <span class="db-muted">
-          {{ e.accountNo }} · {{ e.party }} · raised by {{ e.raisedByName }} on {{ stamp(e.raisedAt) }}
-        </span>
-        @if (!e.resolutionStatus && canResolve) {
-          <button type="button" class="pg-btn pg-btn--primary ve-card__act" (click)="openResolve(e)">
-            Review &amp; Close
-          </button>
-        }
-      </div>
-
-      <div class="ve-card__amts">
-        <div class="db-cmp">
-          <span class="db-cmp__label">System recorded</span>
-          <span class="db-cmp__value">₹{{ e.systemAmount | number: '1.2-2' }}</span>
-        </div>
-        @if (!amountsAgree(e)) {
-          <div class="db-cmp db-cmp--bad">
-            <span class="db-cmp__label">Written on slip</span>
-            <span class="db-cmp__value">₹{{ e.slipAmount | number: '1.2-2' }}</span>
-          </div>
-          <div class="db-cmp db-cmp--bad">
-            <span class="db-cmp__label">Difference</span>
-            <span class="db-cmp__value">₹{{ difference(e) | number: '1.2-2' }}</span>
-          </div>
-        } @else {
-          <div class="db-cmp">
-            <span class="db-cmp__label">Amounts</span>
-            <span class="db-cmp__value">Agree — flagged for another reason</span>
-          </div>
-        }
-      </div>
-
-      <p class="ve-card__why"><strong>Cashier reported:</strong> {{ e.remarks }}</p>
-
-      @if (e.resolutionStatus) {
-        <div class="ve-card__resolution">
-          <strong>{{ resolutionLabel(e.resolutionStatus) }}</strong> — {{ e.resolutionNotes }}
-          <span class="db-muted">· closed by {{ e.resolvedByName }} on {{ stamp(e.resolvedAt) }}</span>
-        </div>
-      }
-
-      <!-- Resolution panel, opened under the exception it closes. -->
-      @if (resolveRow === e) {
-        <div class="db-panel ve-panel">
-          <div class="db-panel__head">
-            <strong>Close exception — {{ e.voucherNo }}</strong>
-            <button type="button" class="db-icon-btn" (click)="closeResolve()" title="Close">
-              <mat-icon>close</mat-icon>
-            </button>
-          </div>
-
-          <label class="pg-field ve-panel__field">
-            <span>What was wrong?</span>
-            <select [(ngModel)]="resolutionStatus">
-              <option value="">— Select —</option>
-              @for (o of resolutionOptions; track o.value) {
-                <option [value]="o.value">{{ o.label }}</option>
-              }
-            </select>
-          </label>
-
-          <label class="pg-field ve-panel__field">
-            <span>What was found, and what was done about it?</span>
-            <input
-              type="text"
-              [(ngModel)]="resolutionNotes"
-              placeholder="e.g. teller keyed 700 instead of 500 — reversing entry passed, member informed"
-            />
-          </label>
-
-          <div class="ve-panel__docs">
-            <strong>Supporting document</strong>
-            <p class="db-muted">
-              An exception cannot be closed on someone's word alone — attach the corrected slip, a signed note, or
-              whatever the decision rests on.
-            </p>
-            <label class="db-upload">
-              <input type="file" (change)="onFileSelected($event)" [disabled]="attachUploading" />
-              <span class="db-muted">Max 10 MB</span>
-            </label>
-            @if (attachUploading) {
-              <p class="db-muted">Uploading…</p>
-            }
-            @if (attachLoading) {
-              <p class="db-muted">Loading…</p>
-            }
-            @if (!attachLoading && attachments.length === 0) {
-              <p class="ve-panel__warn">No document attached yet — required before closing.</p>
-            }
-            @for (a of attachments; track a.id) {
-              <div class="db-file">
-                <mat-icon>description</mat-icon>
-                <span class="db-file__name">{{ a.fileName }}</span>
-                <span class="db-muted">{{ a.uploadedByName }}</span>
-                <button type="button" class="db-icon-btn" (click)="downloadAttachment(a)" title="Download">
-                  <mat-icon>download</mat-icon>
-                </button>
-              </div>
-            }
-          </div>
-
-          <div class="db-panel__actions">
-            <button
-              type="button"
-              class="pg-btn pg-btn--primary"
-              (click)="saveResolution()"
-              [disabled]="!canSubmitResolution"
-            >
-              Close Exception
-            </button>
-            <button type="button" class="pg-btn" (click)="closeResolve()">Cancel</button>
-          </div>
-        </div>
-      }
-    </div>
-  }
-</div>
@@ -1,120 +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/.
- */
-
-/* Page chrome comes from cashier-shared.scss, and the comparison tiles, panel and file rows are
-   shared with the day book. Only the exception card itself is defined here. */
-
-.ve-note {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 14px;
-  margin-bottom: 14px;
-  background: #eff6ff;
-  border: 1px solid #bfdbfe;
-  border-radius: 8px;
-  color: #1e40af;
-  font-size: 12px;
-
-  mat-icon {
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-  }
-}
-
-/* One card per flagged voucher. Open ones carry a red edge; closed ones go green, so a queue
-   reads at a glance without opening anything. */
-.ve-card {
-  padding: 14px 16px;
-  margin-bottom: 12px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-left: 4px solid #dc2626;
-  border-radius: 8px;
-
-  &--resolved {
-    border-left-color: #16a34a;
-    background: #fafffb;
-  }
-
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    flex-wrap: wrap;
-    margin-bottom: 12px;
-  }
-
-  /* Pushed right so the identity of the voucher reads first. */
-  &__act {
-    margin-left: auto;
-    height: 32px;
-    font-size: 12px;
-  }
-
-  &__amts {
-    display: flex;
-    align-items: flex-end;
-    gap: 12px;
-    flex-wrap: wrap;
-    margin-bottom: 12px;
-  }
-
-  &__why {
-    margin: 0;
-    padding: 8px 12px;
-    background: #f8fafc;
-    border-radius: 6px;
-    font-size: 12px;
-    color: #0d1b2a;
-  }
-
-  &__resolution {
-    margin-top: 10px;
-    padding: 8px 12px;
-    background: #f0fdf4;
-    border: 1px solid #bbf7d0;
-    border-radius: 6px;
-    font-size: 12px;
-    color: #14532d;
-  }
-}
-
-.ve-panel {
-  margin-top: 12px;
-  background: #f8fafc;
-  border: 1px solid #e2e8f0;
-  border-radius: 8px;
-
-  &__field {
-    display: block;
-    margin-bottom: 12px;
-    max-width: 640px;
-  }
-
-  &__docs {
-    padding: 12px;
-    background: #fff;
-    border: 1px solid #e2e8f0;
-    border-radius: 6px;
-    font-size: 12px;
-
-    p {
-      margin: 4px 0 10px;
-    }
-  }
-
-  &__warn {
-    padding: 6px 10px;
-    background: #fffbeb;
-    border: 1px solid #fde68a;
-    border-radius: 4px;
-    color: #92400e;
-  }
-}
@@ -1,248 +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 { MatIconModule } from '@angular/material/icon';
-import { catchError, of } from 'rxjs';
-import { CashierService } from '../cashier.service';
-
-interface VoucherException {
-  voucherNo: string;
-  systemAmount: number | null;
-  slipAmount: number | null;
-  remarks: string | null;
-  raisedByName: string | null;
-  raisedAt: string | null;
-  accountNo: string | null;
-  party: string | null;
-  raisedAgainst: string | null;
-  attachmentCount: number;
-  resolutionStatus: string | null;
-  resolutionNotes: string | null;
-  resolvedByName: string | null;
-  resolvedAt: string | null;
-}
-
-/**
- * Voucher exceptions raised at the counter, and the conclusion recorded on each.
- *
- * The cashier who spots a difference cannot close it — this screen is where a clerk, head cashier
- * or manager sits down with them, records what was actually wrong, and attaches the paper that
- * supports the decision.
- */
-@Component({
-  selector: 'mifosx-voucher-exceptions',
-  templateUrl: './voucher-exceptions.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    '../day-book/day-book.component.scss',
-    './voucher-exceptions.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatIconModule
-  ]
-})
-export class VoucherExceptionsComponent implements OnInit {
-  private service = inject(CashierService);
-
-  filter: 'OPEN' | 'RESOLVED' | 'ALL' = 'OPEN';
-  exceptions: VoucherException[] = [];
-  /** Set by the backend from the caller's own roles — the cashier who raised a flag cannot close it. */
-  canResolve = false;
-  loading = false;
-  loaded = false;
-  errorMsg = '';
-
-  // Resolution panel
-  resolveRow: VoucherException | null = null;
-  resolutionStatus = '';
-  resolutionNotes = '';
-  resolveSaving = false;
-
-  // Attachments for the voucher being resolved
-  attachments: any[] = [];
-  attachLoading = false;
-  attachUploading = false;
-
-  readonly resolutionOptions = [
-    { value: 'RESOLVED_SYSTEM_ERROR', label: 'System entry was wrong' },
-    { value: 'RESOLVED_SLIP_ERROR', label: 'Slip was written wrong' },
-    { value: 'RESOLVED_NO_ACTION', label: 'No action needed' }
-  ];
-
-  ngOnInit(): void {
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.errorMsg = '';
-    this.service
-      .voucherExceptions(this.filter)
-      .pipe(
-        catchError((err: any) => {
-          this.errorMsg =
-            err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Could not load voucher exceptions.';
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        this.loading = false;
-        this.loaded = true;
-        this.exceptions = res?.exceptions ?? [];
-        this.canResolve = !!res?.canResolve;
-      });
-  }
-
-  difference(e: VoucherException): number {
-    if (e.slipAmount == null) return 0;
-    return Number(e.slipAmount) - Number(e.systemAmount ?? 0);
-  }
-
-  /** True when the flag was about something other than the amount. */
-  amountsAgree(e: VoucherException): boolean {
-    return e.slipAmount == null || Number(e.slipAmount) === Number(e.systemAmount ?? 0);
-  }
-
-  openResolve(e: VoucherException): void {
-    this.resolveRow = e;
-    this.resolutionStatus = '';
-    this.resolutionNotes = '';
-    this.loadAttachments(e);
-  }
-
-  closeResolve(): void {
-    this.resolveRow = null;
-    this.attachments = [];
-  }
-
-  private loadAttachments(e: VoucherException): void {
-    this.attachments = [];
-    this.attachLoading = true;
-    this.service
-      .listVoucherAttachments(e.voucherNo)
-      .pipe(catchError(() => of(null)))
-      .subscribe((res: any) => {
-        this.attachLoading = false;
-        this.attachments = res?.attachments ?? [];
-      });
-  }
-
-  onFileSelected(event: Event): void {
-    const input = event.target as HTMLInputElement;
-    const file = input.files?.[0];
-    const row = this.resolveRow;
-    if (!file || !row) return;
-
-    // 10 MB, matching the backend — refusing here saves uploading the whole file to be rejected.
-    if (file.size > 10 * 1024 * 1024) {
-      this.errorMsg = 'That file is larger than 10 MB. Please scan it at a lower resolution.';
-      input.value = '';
-      return;
-    }
-
-    const reader = new FileReader();
-    reader.onload = () => {
-      this.attachUploading = true;
-      this.errorMsg = '';
-      this.service
-        .uploadVoucherAttachment(
-          row.voucherNo,
-          file.name,
-          file.type || 'application/octet-stream',
-          String(reader.result),
-          'Supporting document for exception resolution'
-        )
-        .pipe(
-          catchError((err: any) => {
-            this.errorMsg =
-              err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Upload failed. Please try again.';
-            return of(null);
-          })
-        )
-        .subscribe((res: any) => {
-          this.attachUploading = false;
-          input.value = '';
-          if (res) {
-            this.loadAttachments(row);
-            this.load();
-          }
-        });
-    };
-    reader.readAsDataURL(file);
-  }
-
-  downloadAttachment(a: any): void {
-    this.service
-      .downloadVoucherAttachment(a.id)
-      .pipe(catchError(() => of(null)))
-      .subscribe((blob: Blob | null) => {
-        if (!blob) {
-          this.errorMsg = 'Could not download that file.';
-          return;
-        }
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        link.download = a.fileName ?? 'attachment';
-        link.click();
-        URL.revokeObjectURL(url);
-      });
-  }
-
-  /** Mirrors the backend's own rule, so the button explains itself before it is pressed. */
-  get canSubmitResolution(): boolean {
-    return (
-      !!this.resolutionStatus && !!this.resolutionNotes.trim() && this.attachments.length > 0 && !this.resolveSaving
-    );
-  }
-
-  saveResolution(): void {
-    const row = this.resolveRow;
-    if (!row) return;
-
-    this.resolveSaving = true;
-    this.errorMsg = '';
-    this.service
-      .resolveVoucherException(row.voucherNo, this.resolutionStatus, this.resolutionNotes.trim())
-      .pipe(
-        catchError((err: any) => {
-          this.errorMsg =
-            err?.error?.errors?.[0]?.defaultUserMessage ?? err?.error?.message ?? 'Could not close the exception.';
-          return of(null);
-        })
-      )
-      .subscribe((res: any) => {
-        this.resolveSaving = false;
-        if (res) {
-          this.closeResolve();
-          this.load();
-        }
-      });
-  }
-
-  resolutionLabel(status: string | null): string {
-    if (!status) return '';
-    return this.resolutionOptions.find((o) => o.value === status)?.label ?? status;
-  }
-
-  /** Date and time — an exception queue spans days, so the day matters here. */
-  stamp(iso: string | null): string {
-    if (!iso) return '—';
-    const [
-      d,
-      t
-    ] = iso.split('T');
-    return t ? `${d} ${t.slice(0, 5)}` : d;
-  }
-}
@@ -10,10 +10,8 @@
  <header class="pg-head vr-no-print">
    <div>
      <div class="pg-eyebrow">CASHIER · REPORT</div>
-      <h1 class="pg-title">Voucher Report</h1>
-      <p class="pg-sub">
-        Every voucher raised over a day or a month — the number, what was debited, what was credited, and who raised it.
-      </p>
+      <h1 class="pg-title">{{ title }}</h1>
+      <p class="pg-sub">{{ subtitle }}</p>
    </div>
    <div class="pg-toolbar">
      <label class="pg-field">
@@ -42,10 +40,8 @@
      <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
        <mat-icon>refresh</mat-icon> Run
      </button>
-      @if (report && report.count > 0) {
-        <button type="button" class="pg-btn" (click)="print()">
-          <mat-icon>print</mat-icon> Print
-        </button>
+      @if (report && count > 0) {
+        <button type="button" class="pg-btn" (click)="print()"><mat-icon>print</mat-icon> Print</button>
      }
    </div>
  </header>
@@ -64,8 +60,7 @@
      @if (report.from !== report.to) {
        — {{ report.to | date: 'dd MMM yyyy' }}
      }
-      · {{ report.count }} voucher{{ report.count === 1 ? '' : 's' }}
-      · ₹{{ report.totalAmount | number: '1.2-2' }}
+      · {{ count }} {{ noun }}{{ count === 1 ? '' : 's' }} · ₹{{ totalAmount | number: '1.2-2' }}
      @if (report.username) {
        · {{ report.username }}
      }
@@ -74,10 +69,46 @@
      @if (!report.canSeeAllUsers) {
        <span class="vr-scope-note">Your own vouchers</span>
      }
+      <!-- The total on a cash register means something narrower than the whole voucher book, so the
+           screen says which one it is instead of leaving the figure ambiguous. -->
+      @if (cashOnly) {
+        <span class="vr-scope-note">Cash only</span>
+      }
    </div>

-    @if (report.count === 0) {
-      <div class="pg-empty">No vouchers were raised in this period.</div>
+    <!-- A voucher with no CR/DR prefix belongs to neither report. Say so, so the two reports not
+         adding up to the day's total is explained rather than left to be puzzled over. -->
+    @if (unclassifiedCount > 0) {
+      <div class="pg-alert vr-no-print">
+        {{ unclassifiedCount }} voucher{{ unclassifiedCount === 1 ? '' : 's' }} in this period
+        {{ unclassifiedCount === 1 ? 'carries' : 'carry' }} no CR or DR prefix, so
+        {{ unclassifiedCount === 1 ? 'it appears' : 'they appear' }} on neither the Received nor the Payment report.
+      </div>
+    }
+
+    <!-- Which part of the total has notes and coins counted behind it. Shown on the cash register
+         as well as the full one: a voucher with no breakdown is still real money, so it stays in
+         the total, and what the drawer can be checked against is stated instead of assumed. -->
+    @if (uncountedCount > 0) {
+      <div class="pg-alert vr-no-print">
+        {{ uncountedCount }} of these {{ noun }}s {{ uncountedCount === 1 ? 'has' : 'have' }} no denomination breakdown
+        recorded, totalling ₹{{ uncountedTotal | number: '1.2-2' }}. Some registers pay out without counting notes
+        against the voucher, so these are still cash — ₹{{ countedTotal | number: '1.2-2' }} of the total has a
+        breakdown behind it.
+      </div>
+    }
+
+    <!-- Explains the blank Debit/Credit cells instead of leaving them looking like lost data. -->
+    @if (missingSidesCount > 0) {
+      <div class="pg-alert vr-no-print">
+        {{ missingSidesCount }} of these {{ noun }}s {{ missingSidesCount === 1 ? 'has' : 'have' }} no debit or credit
+        recorded. The sides are attached when a request is approved, so vouchers raised before that step was added keep
+        their number and amount but show no accounts. Newly raised {{ noun }}s carry both sides.
+      </div>
+    }
+
+    @if (count === 0) {
+      <div class="pg-empty">No {{ noun }}s were raised in this period.</div>
    } @else {
      <div class="vr-summaries">
        <div class="pg-card">
@@ -129,7 +160,7 @@
      </div>

      <div class="pg-card">
-        <div class="pos-section-label">Vouchers</div>
+        <div class="pos-section-label">{{ isReceived ? 'Receipts' : 'Payments' }}</div>
        <table class="pg-table vr-rows">
          <thead>
            <tr>
@@ -139,39 +170,62 @@
              <th>Credit</th>
              <th class="num">Amount</th>
              <th>User</th>
+              <!-- Two dates, not one, on the system register.
+                   A voucher's timestamp is the minute it was written; the posting behind it carries
+                   the business date. A nightly run finishing after midnight writes today's voucher
+                   for yesterday's work, so a reader opening this screen today is looking at last
+                   night's postings — and without the ledger date they would take the timestamp for
+                   the day the money moved. -->
+              @if (systemOnly) {
+                <th>Ledger date</th>
+              }
              <th>Time</th>
            </tr>
          </thead>
          <tbody>
-            @for (row of report.vouchers; track row.voucherNo) {
+            @for (row of rows; track row.voucherNo) {
              <tr>
                <td>
-                  <a class="vr-link" [routerLink]="['/cashier/voucher']" [queryParams]="{ voucherNo: row.voucherNo }">
-                    {{ row.voucherNo }}
-                  </a>
+                  {{ row.voucherNo }}
                  @if (row.verificationStatus === 'EXCEPTION') {
-                    <mat-icon class="vr-flag" title="An exception was raised against this voucher">error_outline</mat-icon>
+                    <mat-icon class="vr-flag" title="An exception was raised against this voucher"
+                      >error_outline</mat-icon
+                    >
                  }
                </td>
                <td>{{ row.voucherType || '—' }}</td>
-                <td>
-                  <div class="vr-party">{{ row.debitParty || '—' }}</div>
-                  @if (row.debitAccount) {
-                    <div class="vr-acct">{{ row.debitAccount }}</div>
-                  }
-                </td>
-                <td>
-                  <div class="vr-party">{{ row.creditParty || '—' }}</div>
-                  @if (row.creditAccount) {
-                    <div class="vr-acct">{{ row.creditAccount }}</div>
-                  }
-                  <!-- A DD with charges, or a compound journal, has sides this row does not show. -->
-                  @if (row.extraLines > 0) {
-                    <div class="vr-more">+{{ row.extraLines }} more on voucher</div>
-                  }
-                </td>
+                <!-- A voucher raised before its sides were recorded has neither. Say that once,
+                     across both cells, rather than showing two dashes that read as "nowhere". -->
+                @if (!hasSides(row)) {
+                  <td colspan="2" class="vr-nosides">Sides not recorded</td>
+                } @else {
+                  <td>
+                    <div class="vr-party">{{ row.debitParty || '—' }}</div>
+                    @if (row.debitAccount) {
+                      <div class="vr-acct">{{ row.debitAccount }}</div>
+                    }
+                  </td>
+                  <td>
+                    <div class="vr-party">{{ row.creditParty || '—' }}</div>
+                    @if (row.creditAccount) {
+                      <div class="vr-acct">{{ row.creditAccount }}</div>
+                    }
+                    <!-- A DD with charges, or a compound journal, has sides this row does not show. -->
+                    @if (row.extraLines > 0) {
+                      <div class="vr-more">+{{ row.extraLines }} more on voucher</div>
+                    }
+                  </td>
+                }
                <td class="num">{{ row.amount | number: '1.2-2' }}</td>
                <td>{{ row.username || '—' }}</td>
+                @if (systemOnly) {
+                  <td class="vr-ledgerdate" [class.vr-ledgerdate--prior]="row.postedAfterClose">
+                    {{ row.ledgerDate ? (row.ledgerDate | date: 'dd MMM yyyy') : '—' }}
+                    @if (row.postedAfterClose) {
+                      <span class="vr-priorflag" title="Posted after that day had closed">after close</span>
+                    }
+                  </td>
+                }
                <td>{{ row.createdAt | date: 'dd MMM, HH:mm' }}</td>
              </tr>
            }
@@ -36,16 +36,6 @@
 }

 .vr-rows {
-  .vr-link {
-    color: #1d4ed8;
-    text-decoration: none;
-    font-weight: 500;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-
  .vr-flag {
    margin-left: 4px;
    font-size: 15px;
@@ -65,6 +55,13 @@
    font-size: 11px;
    color: #6b7280;
  }
+
+  // Spans the Debit and Credit cells for a voucher raised before its sides were recorded.
+  .vr-nosides {
+    font-size: 11px;
+    font-style: italic;
+    color: #9ca3af;
+  }
 }

 /* Printing a report should put the register on paper — the filters are how you reached it. */
@@ -72,9 +69,26 @@
  .vr-no-print {
    display: none !important;
  }
+}

-  .vr-link {
-    color: inherit;
-    text-decoration: none;
-  }
+/* The ledger date on the system register. Marked when it differs from the day the voucher was
+   written: that is the whole reason the column exists, and a date the reader has to compare against
+   the Time column by eye is a date they will misread. */
+.vr-ledgerdate {
+  font-size: 12px;
+  font-weight: 600;
+  white-space: nowrap;
+}
+
+.vr-ledgerdate--prior {
+  color: #5b21b6;
+}
+
+.vr-priorflag {
+  display: block;
+  font-size: 9.5px;
+  font-weight: 700;
+  letter-spacing: 0.04em;
+  text-transform: uppercase;
+  color: #7c3aed;
 }
@@ -9,17 +9,29 @@
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-import { RouterLink } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';

+/**
+ * Which side of the register a screen shows.
+ *
+ * 'CR' is the Received report (money in), 'DR' the Payment report (money out). Set from the route,
+ * so the two screens are the same component pointed at opposite sides.
+ */
+export type VoucherSide = 'CR' | 'DR' | 'ALL';
+
 /** One voucher as the register shows it: the number, the two sides, and who raised it. */
 interface VoucherRow {
  voucherNo: string;
  voucherType: string | null;
  amount: number | null;
  createdAt: string | null;
+  /** The business date the posting belongs to, which is not always the day it was written. */
+  ledgerDate?: string | null;
+  /** True when the voucher was written after the day it posts against had already closed. */
+  postedAfterClose?: boolean;
  userId: number | null;
  username: string | null;
  branchName: string | null;
@@ -30,6 +42,13 @@ interface VoucherRow {
  creditAccount: string | null;
  /** Sides beyond the one debit and one credit shown — a DD's charges, a compound journal. */
  extraLines: number;
+  /**
+   * Whether a denomination breakdown was recorded against this voucher.
+   *
+   * True proves cash was counted. False does not prove the opposite: several registers pay real
+   * money out without recording a breakdown, so this marks a row as unconfirmed, not as non-cash.
+   */
+  denominationCounted: boolean;
 }

 interface VoucherReport {
@@ -38,6 +57,8 @@ interface VoucherReport {
  username: string | null;
  /** Set by the server from the caller's roles; a cashier is never offered the user filter. */
  canSeeAllUsers: boolean;
+  /** Whether the server restricted the register to cash movements. */
+  cashOnly: boolean;
  vouchers: VoucherRow[];
  count: number;
  totalAmount: number;
@@ -60,12 +81,12 @@ interface VoucherReport {
  imports: [
    CommonModule,
    FormsModule,
-    RouterLink,
    MatIconModule
  ]
 })
 export class VoucherReportComponent implements OnInit {
  private service = inject(CashierService);
+  private route = inject(ActivatedRoute);

  /** Day is the working default; a month is what you ask for at a close. */
  period: 'DAY' | 'MONTH' = 'DAY';
@@ -74,21 +95,106 @@ export class VoucherReportComponent implements OnInit {
  usernameFilter = '';
  typeFilter = '';

+  /** Which side this screen is: Received (CR) or Payment (DR). Comes from the route's data. */
+  side: VoucherSide = 'CR';
+
+  /**
+   * Whether this screen is the cash register rather than the whole voucher register.
+   *
+   * A cashier handles notes and coins, so entries that cannot be cash — an interest posting, a
+   * clearing settlement, a cheque book fee — are left out, and everything that could have crossed
+   * the counter stays in. The filter errs towards keeping a row: a book entry on the register can
+   * be seen and recognised, whereas cash that never appears is invisible until it turns up as an
+   * unexplained difference at the end of the day.
+   */
+  cashOnly = false;
+
+  /**
+   * Whether this register is the counter's own — only the people who hold a drawer.
+   *
+   * These two screens reconcile the counter: what came in over it and what went out. Everyone
+   * else's work is their own to account for, and each person reads it on My Vouchers. Mixed in here
+   * it buried the cashier rows the registers exist for and left the totals matching no drawer.
+   */
+  cashiersOnly = false;
+
+  /**
+   * Whether this register is the system's own postings rather than anybody's work.
+   *
+   * Interest a nightly run credited, a charge taken from a balance, an escheat, a journal keyed
+   * straight to the ledger. These belong to no member of staff, so My Vouchers cannot show them —
+   * it is scoped to the reader — and the two counter registers deliberately exclude them. That left
+   * no screen answering "what did the system post last night".
+   */
+  systemOnly = false;
+
  report: VoucherReport | null = null;
  loading = false;
  error: string | null = null;

  ngOnInit(): void {
+    this.side = (this.route.snapshot.data['side'] as VoucherSide) ?? 'CR';
+    this.cashOnly = this.route.snapshot.data['cashOnly'] === true;
+    this.cashiersOnly = this.route.snapshot.data['cashiersOnly'] === true;
+    this.systemOnly = this.route.snapshot.data['systemOnly'] === true;
    this.load();
  }

+  get isReceived(): boolean {
+    return this.side === 'CR';
+  }
+
+  get title(): string {
+    if (this.systemOnly) {
+      return 'System Vouchers';
+    }
+    return this.isReceived ? 'Received Report' : 'Payment Report';
+  }
+
+  get subtitle(): string {
+    if (this.systemOnly) {
+      return 'What the system posted on its own — interest, charges, escheats and journals. Nobody raised these, so they appear on no one’s own list.';
+    }
+    // Said plainly, because a register that silently omits the reader's own entries is worse than
+    // one that explains why: their work is on My Vouchers, and the line points them there.
+    if (this.cashiersOnly) {
+      return this.isReceived
+        ? 'Cash taken in at the counter by each cashier. Other staff read their own work on My Vouchers.'
+        : 'Cash paid out at the counter by each cashier. Other staff read their own work on My Vouchers.';
+    }
+    if (this.cashOnly) {
+      return this.isReceived
+        ? 'Cash taken in over a day or a month, and who took it — book entries left out.'
+        : 'Cash paid out over a day or a month, and who paid it — book entries left out.';
+    }
+    return this.isReceived
+      ? 'Every receipt voucher raised over a day or a month — money taken in, and who took it.'
+      : 'Every payment voucher raised over a day or a month — money paid out, and who paid it.';
+  }
+
+  /** The word for one row on this side, for counts and the empty state. */
+  get noun(): string {
+    if (this.systemOnly) {
+      return 'posting';
+    }
+    return this.isReceived ? 'receipt' : 'payment';
+  }
+
  load(): void {
    this.loading = true;
    this.error = null;

    const { from, to } = this.range();
    this.service
-      .voucherReport(from, to, this.usernameFilter.trim() || undefined, this.typeFilter.trim() || undefined)
+      .voucherReport(
+        from,
+        to,
+        this.usernameFilter.trim() || undefined,
+        this.typeFilter.trim() || undefined,
+        this.cashOnly,
+        this.cashiersOnly,
+        this.systemOnly
+      )
      .pipe(
        catchError((err: any) => {
          this.error =
@@ -125,9 +231,95 @@ export class VoucherReportComponent implements OnInit {
    return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
  }

+  /**
+   * The rows belonging to this screen's side.
+   *
+   * The side is read off the first segment of the voucher number — `CR/001/2608/0003` — which the
+   * server stamps when it raises the voucher: a deposit credits the member and gets CR, everything
+   * that takes money out gets DR. That prefix is the authoritative record of the side, so it is
+   * matched directly rather than re-deriving the side from the voucher type here — a new type added
+   * on the server then lands on the correct report with no change needed on this screen.
+   */
+  get rows(): VoucherRow[] {
+    const all = this.report?.vouchers ?? [];
+    return this.side === 'ALL' ? all : all.filter((row) => this.sideOf(row) === this.side);
+  }
+
+  /**
+   * Whether a voucher has its two sides recorded against it.
+   *
+   * The registers raise a voucher when the request is made and only attach its sides once it is
+   * approved and posted, so a voucher raised before that step existed carries a number but no
+   * lines. Those rows are labelled rather than shown as an empty dash, which reads like the money
+   * went nowhere.
+   */
+  hasSides(row: VoucherRow): boolean {
+    return !!(row.debitParty || row.creditParty);
+  }
+
+  /** How many rows on this side are missing their debit/credit lines. */
+  get missingSidesCount(): number {
+    return this.rows.filter((row) => !this.hasSides(row)).length;
+  }
+
+  /** A voucher's side, from its number's prefix. Null when the number is missing or unrecognised. */
+  private sideOf(row: VoucherRow): VoucherSide | null {
+    const no = (row.voucherNo ?? '').toUpperCase();
+    if (no.startsWith('CR/')) {
+      return 'CR';
+    }
+    if (no.startsWith('DR/')) {
+      return 'DR';
+    }
+    return null;
+  }
+
+  /** How many rows on this side — not the server's count, which spans both. */
+  get count(): number {
+    return this.rows.length;
+  }
+
+  /** Total for this side only. */
+  get totalAmount(): number {
+    return this.rows.reduce((sum, row) => sum + (row.amount ?? 0), 0);
+  }
+
+  /**
+   * The part of this side's total whose notes and coins were actually counted.
+   *
+   * Always at most `totalAmount`: a voucher can be real cash and still be missing its breakdown,
+   * because the register that raised it records none. So this is the confirmed part of the cash,
+   * not the whole of it, and the gap is reported rather than treated as book entries.
+   */
+  get countedTotal(): number {
+    return this.rows.filter((row) => row.denominationCounted).reduce((sum, row) => sum + (row.amount ?? 0), 0);
+  }
+
+  /** Rows carrying no denomination breakdown — unconfirmed against the drawer, not non-cash. */
+  get uncountedCount(): number {
+    return this.rows.filter((row) => !row.denominationCounted).length;
+  }
+
+  /** How much of this side's total has no note-and-coin breakdown behind it. */
+  get uncountedTotal(): number {
+    return this.totalAmount - this.countedTotal;
+  }
+
+  /**
+   * Vouchers whose number carries neither prefix, so they appear on neither report.
+   *
+   * Counted and shown rather than silently dropped: a voucher that vanishes from both sides of the
+   * register is exactly the kind of thing a cashier must be told about, not left to discover when
+   * the two reports do not add up to the day.
+   */
+  get unclassifiedCount(): number {
+    const all = this.report?.vouchers ?? [];
+    return all.filter((row) => this.sideOf(row) === null).length;
+  }
+
  /** Totals per user, for the summary a manager reads before the rows. */
  get byUser(): { username: string; count: number; total: number }[] {
-    const rows = this.report?.vouchers ?? [];
+    const rows = this.rows;
    const tally = new Map<string, { username: string; count: number; total: number }>();
    for (const row of rows) {
      const key = row.username ?? '—';
@@ -141,7 +333,7 @@ export class VoucherReportComponent implements OnInit {

  /** Totals per voucher type — deposits against withdrawals against journals. */
  get byType(): { type: string; count: number; total: number }[] {
-    const rows = this.report?.vouchers ?? [];
+    const rows = this.rows;
    const tally = new Map<string, { type: string; count: number; total: number }>();
    for (const row of rows) {
      const key = row.voucherType ?? '—';
@@ -1,144 +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 class="pg-head vv-no-print">
-    <div>
-      <div class="pg-eyebrow">CASHIER · VOUCHER</div>
-      <h1 class="pg-title">Voucher</h1>
-      <p class="pg-sub">
-        Look up a voucher by its number to see the entry behind it — which accounts were debited, which were credited,
-        and for how much.
-      </p>
-    </div>
-    <div class="pg-toolbar">
-      <label class="pg-field">
-        <span>Voucher No</span>
-        <input
-          type="text"
-          [(ngModel)]="voucherNo"
-          (keyup.enter)="search()"
-          placeholder="CR/2708/0001"
-          autocomplete="off"
-        />
-      </label>
-      <button type="button" class="pg-btn pg-btn--primary" (click)="search()" [disabled]="loading">
-        <mat-icon>search</mat-icon> Find
-      </button>
-      @if (voucher) {
-        <button type="button" class="pg-btn" (click)="print()">
-          <mat-icon>print</mat-icon> Print
-        </button>
-      }
-    </div>
-  </header>
-
-  @if (error) {
-    <div class="pg-alert pg-alert--error vv-no-print">{{ error }}</div>
-  }
-
-  @if (loading) {
-    <div class="pg-empty vv-no-print">Loading…</div>
-  }
-
-  @if (voucher && !loading) {
-    <div class="pg-card vv-slip">
-      <div class="vv-slip-head">
-        <div>
-          <div class="vv-no">{{ voucher.voucherNo }}</div>
-          <div class="vv-meta">
-            {{ voucher.voucherType || '—' }}
-            @if (voucher.branchName) {
-              · {{ voucher.branchName }}
-            }
-          </div>
-        </div>
-        <div class="vv-slip-head-right">
-          <div class="vv-amount">₹{{ voucher.amount | number: '1.2-2' }}</div>
-          <div class="vv-meta">
-            @if (voucher.createdAt) {
-              {{ voucher.createdAt | date: 'dd MMM yyyy, HH:mm' }}
-            }
-            @if (voucher.createdBy) {
-              · {{ voucher.createdBy }}
-            }
-          </div>
-        </div>
-      </div>
-
-      @if (voucher.verificationStatus) {
-        <div class="vv-status" [class.vv-status--exception]="voucher.verificationStatus === 'EXCEPTION'">
-          <mat-icon>{{ voucher.verificationStatus === 'EXCEPTION' ? 'error_outline' : 'verified' }}</mat-icon>
-          {{ voucher.verificationStatus === 'EXCEPTION' ? 'Exception raised against this voucher' : 'Verified against the slip' }}
-        </div>
-      }
-
-      <!-- A voucher raised before its sides were recorded: the number is valid, the posting behind it
-           simply was never captured, so it is shown as an older record rather than as an error. -->
-      @if (hasNoLines) {
-        <div class="pg-empty">
-          No debit or credit detail was recorded for this voucher. It was raised before the entry sides were kept.
-        </div>
-      } @else {
-        <table class="pg-table vv-lines">
-          <thead>
-            <tr>
-              <th>Particulars</th>
-              <th>Account</th>
-              <th class="num">Debit</th>
-              <th class="num">Credit</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (line of debitLines; track line.lineNo) {
-              <tr>
-                <td>
-                  <div class="vv-party">{{ line.partyName || '—' }}</div>
-                  @if (line.description) {
-                    <div class="vv-desc">{{ line.description }}</div>
-                  }
-                </td>
-                <td>{{ line.accountNo || '—' }}</td>
-                <td class="num">{{ line.amount | number: '1.2-2' }}</td>
-                <td class="num">—</td>
-              </tr>
-            }
-            @for (line of creditLines; track line.lineNo) {
-              <tr>
-                <td class="vv-indent">
-                  <div class="vv-party">{{ line.partyName || '—' }}</div>
-                  @if (line.description) {
-                    <div class="vv-desc">{{ line.description }}</div>
-                  }
-                </td>
-                <td>{{ line.accountNo || '—' }}</td>
-                <td class="num">—</td>
-                <td class="num">{{ line.amount | number: '1.2-2' }}</td>
-              </tr>
-            }
-          </tbody>
-          <tfoot>
-            <tr>
-              <td colspan="2">Total</td>
-              <td class="num">{{ voucher.totalDebit | number: '1.2-2' }}</td>
-              <td class="num">{{ voucher.totalCredit | number: '1.2-2' }}</td>
-            </tr>
-          </tfoot>
-        </table>
-
-        <!-- Stated rather than assumed: a voucher whose sides were written before the balance check
-             existed, or repaired by hand, should read as unbalanced rather than pass as a valid slip. -->
-        @if (!voucher.balanced) {
-          <div class="pg-alert pg-alert--error">
-            This voucher does not balance — debits and credits differ. Refer it to accounts before relying on it.
-          </div>
-        }
-      }
-    </div>
-  }
-</div>
@@ -1,109 +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/.
- */
-
-/* Page chrome and the table come from cashier-shared.scss. Only the slip itself is defined here. */
-
-.vv-slip {
-  max-width: 860px;
-}
-
-.vv-slip-head {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
-  padding-bottom: 14px;
-  margin-bottom: 14px;
-  border-bottom: 1px solid #e5e7eb;
-}
-
-.vv-slip-head-right {
-  text-align: right;
-}
-
-.vv-no {
-  font-size: 18px;
-  font-weight: 600;
-  letter-spacing: 0.4px;
-  color: #111827;
-}
-
-.vv-amount {
-  font-size: 18px;
-  font-weight: 600;
-  color: #111827;
-}
-
-.vv-meta {
-  margin-top: 2px;
-  font-size: 12px;
-  color: #6b7280;
-}
-
-.vv-status {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 8px 12px;
-  margin-bottom: 14px;
-  background: #ecfdf5;
-  border: 1px solid #a7f3d0;
-  border-radius: 8px;
-  color: #065f46;
-  font-size: 12px;
-
-  mat-icon {
-    font-size: 18px;
-    width: 18px;
-    height: 18px;
-  }
-
-  /* An exception is a warning about this voucher, not a state of it — it has to stop the eye. */
-  &.vv-status--exception {
-    background: #fef2f2;
-    border-color: #fecaca;
-    color: #991b1b;
-  }
-}
-
-.vv-lines {
-  /* Credits sit under their debits the way they do on a written slip, so the indent carries the
-     relationship that the DR/CR columns alone would leave to the reader to work out. */
-  .vv-indent {
-    padding-left: 28px;
-  }
-
-  .vv-party {
-    color: #111827;
-  }
-
-  .vv-desc {
-    margin-top: 2px;
-    font-size: 11px;
-    color: #6b7280;
-  }
-
-  tfoot td {
-    font-weight: 600;
-    border-top: 2px solid #e5e7eb;
-  }
-}
-
-/* Printing a voucher should put the slip on paper and nothing else — the search box and buttons are
-   how you reached it, not part of it. */
-@media print {
-  .vv-no-print {
-    display: none !important;
-  }
-
-  .vv-slip {
-    max-width: none;
-    border: none;
-    box-shadow: none;
-  }
-}
@@ -1,143 +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, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MatIconModule } from '@angular/material/icon';
-import { catchError, of } from 'rxjs';
-import { CashierService } from '../cashier.service';
-
-/** One side of a voucher: a debit or a credit against a single account. */
-interface VoucherLine {
-  lineNo: number;
-  entryType: 'DR' | 'CR';
-  glAccountId: number | null;
-  savingsAccountId: number | null;
-  loanAccountId: number | null;
-  partyName: string | null;
-  accountNo: string | null;
-  amount: number;
-  description: string | null;
-}
-
-interface Voucher {
-  voucherNo: string;
-  voucherType: string | null;
-  referenceType: string | null;
-  referenceId: number | null;
-  amount: number | null;
-  branchOfficeId: number | null;
-  branchName: string | null;
-  createdBy: string | null;
-  createdAt: string | null;
-  verificationStatus: string | null;
-  lines: VoucherLine[];
-  totalDebit: number;
-  totalCredit: number;
-  balanced: boolean;
-}
-
-/**
- * One voucher, as a slip: which accounts were debited, which credited, and for how much.
- *
- * Looked up by voucher number rather than listed, because that is how a voucher is reached — from a
- * paper slip in someone's hand, or from a number quoted on a statement.
- */
-@Component({
-  selector: 'mifosx-voucher-view',
-  templateUrl: './voucher-view.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    './voucher-view.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatIconModule
-  ]
-})
-export class VoucherViewComponent {
-  private service = inject(CashierService);
-  private route = inject(ActivatedRoute);
-  private router = inject(Router);
-
-  voucherNo = '';
-  voucher: Voucher | null = null;
-  loading = false;
-  /** Shown in place of the slip — a bad number and a server error read differently to the user. */
-  error: string | null = null;
-
-  constructor() {
-    // A voucher number in the URL means someone arrived from a link or a statement rather than by
-    // typing, so the slip is fetched straight away instead of showing them an empty search box.
-    const fromUrl = this.route.snapshot.queryParamMap.get('voucherNo');
-    if (fromUrl) {
-      this.voucherNo = fromUrl;
-      this.search();
-    }
-  }
-
-  search(): void {
-    const trimmed = (this.voucherNo || '').trim();
-    if (!trimmed) {
-      this.error = 'Enter a voucher number.';
-      this.voucher = null;
-      return;
-    }
-
-    this.loading = true;
-    this.error = null;
-
-    // Kept in the URL so the slip can be linked to and survives a refresh.
-    this.router.navigate([], {
-      relativeTo: this.route,
-      queryParams: { voucherNo: trimmed },
-      replaceUrl: true
-    });
-
-    this.service
-      .voucherDetail(trimmed)
-      .pipe(
-        catchError((err: any) => {
-          this.error =
-            err?.error?.errors?.[0]?.defaultUserMessage ??
-            err?.error?.developerMessage ??
-            `Voucher ${trimmed} could not be loaded.`;
-          return of(null);
-        })
-      )
-      .subscribe((res: Voucher | null) => {
-        this.loading = false;
-        this.voucher = res;
-      });
-  }
-
-  /** Debits first, then credits — the order a slip is read in. */
-  get debitLines(): VoucherLine[] {
-    return (this.voucher?.lines ?? []).filter((l) => l.entryType === 'DR');
-  }
-
-  get creditLines(): VoucherLine[] {
-    return (this.voucher?.lines ?? []).filter((l) => l.entryType === 'CR');
-  }
-
-  /**
-   * A voucher raised before its sides were recorded. The voucher is real and its number valid — only
-   * the posting behind it was never captured — so this reads as an older record, not a broken one.
-   */
-  get hasNoLines(): boolean {
-    return !!this.voucher && this.voucher.lines.length === 0;
-  }
-
-  print(): void {
-    window.print();
-  }
-}
@@ -39,5 +39,4 @@ export class DividendDashboardService {
    const params = status && status !== 'ALL' ? { status } : {};
    return this.http.get('/clerk/dividend-dashboard/locks', { params });
  }
-
 }
@@ -350,6 +350,7 @@
  flex: 0 0 auto;
  padding: 9px 14px;
  border: 0;
+
  /* The active marker is this underline, so every tab reserves the space for it — otherwise the
     strip would shift by 2px each time the selection moved. */
  border-bottom: 2px solid transparent;
@@ -102,7 +102,6 @@ export class DividendDashboardComponent implements OnInit {
  lockYears: string[] = [];
  lockYearFilter = 'ALL';

-
  ngOnInit(): void {
    this.loadSummary();
    this.loadDeclarations();
@@ -12,13 +12,15 @@
    <div class="mdr-header__left">
      <mat-icon class="mdr-header__icon">swap_horiz</mat-icon>
      <div>
-        <div class="mdr-header__title">My Disbursement Requests</div>
-        <div class="mdr-header__sub">Track your submitted GL disbursement requests.</div>
+        <div class="mdr-header__title">Disbursements &amp; Transfer</div>
+        <div class="mdr-header__sub">
+          Disbursement, Collection, Fund Transfer and Bank Transfer requests you submitted.
+        </div>
      </div>
    </div>
    <button type="button" class="mdr-btn mdr-btn--new" (click)="newDisbursement()">
      <mat-icon>add</mat-icon>
-      New Disbursement
+      New Request
    </button>
  </div>

@@ -99,7 +101,7 @@
      <p class="mdr-empty__text">You have not submitted any disbursement requests yet.</p>
      <button type="button" class="mdr-btn mdr-btn--new" style="margin-top: 12px" (click)="newDisbursement()">
        <mat-icon>add</mat-icon>
-        New Disbursement
+        New Request
      </button>
    </div>
  } @else {
@@ -177,7 +177,29 @@ export class MyDisbursementRequestsComponent implements OnInit {
  getCreditEntries(req: any): any[] {
    try {
      const arr = typeof req.credit_entries === 'string' ? JSON.parse(req.credit_entries) : req.credit_entries;
-      return Array.isArray(arr) ? arr.map((e: any) => ({ ...e, amount: parseFloat(e.amount) || 0 })) : [];
+      const entries: any[] = Array.isArray(arr)
+        ? arr.map((e: any) => ({ ...e, amount: parseFloat(e.amount) || 0 }))
+        : [];
+      // Collection embeds its GL leg inside credit_entries (it can collect from several
+      // accounts into the one GL, so the GL has to be one row among them). Disbursement and
+      // Fund Transfer instead name their GL as the request's own top-level source — dr_amount
+      // is its amount — because there is exactly one, so it never needed a row of its own. That
+      // meant the DR/CR breakdown here only ever showed the credit side for those two types,
+      // looking like half the slip was missing. Adding it back as the first row here, rather
+      // than in credit_entries itself, keeps the stored JSON exactly what approve() posts from.
+      if ((req.request_type === 'DISBURSEMENT' || req.request_type === 'FUND_TRANSFER') && req.gl_account_no) {
+        return [
+          {
+            dbCr: 'Dr',
+            accountNo: req.gl_account_no,
+            accountName: req.gl_account_name,
+            accountType: 'GL',
+            amount: parseFloat(req.dr_amount) || 0
+          },
+          ...entries
+        ];
+      }
+      return entries;
    } catch {
      return [];
    }
@@ -969,6 +969,11 @@
          createClientForm.get('alternateMobileNo')?.touched
        ) {
          <mat-error>Enter valid 10-digit number (starts with 6-9)</mat-error>
+        } @else if (
+          createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile') &&
+          createClientForm.get('alternateMobileNo')?.touched
+        ) {
+          <mat-error>Alternate number can't be the same as Mobile No</mat-error>
        }
      </mat-form-field>

@@ -979,7 +984,11 @@
            color="primary"
            type="button"
            class="verify-btn"
-            [disabled]="readOnly || createClientForm.get('alternateMobileNo')?.value?.length !== 10"
+            [disabled]="
+              readOnly ||
+              createClientForm.get('alternateMobileNo')?.value?.length !== 10 ||
+              createClientForm.get('alternateMobileNo')?.hasError('sameAsMobile')
+            "
            (click)="verifyAlternateDIP()"
          >
            <fa-icon icon="shield-alt" class="m-r-10"></fa-icon>
@@ -25,7 +25,10 @@ import {
  UntypedFormGroup,
  Validators,
  UntypedFormControl,
-  ReactiveFormsModule
+  ReactiveFormsModule,
+  ValidatorFn,
+  AbstractControl,
+  ValidationErrors
 } from '@angular/forms';
 import { Subject, Subscription, merge } from 'rxjs';
 import { filter, switchMap, takeUntil } from 'rxjs/operators';
@@ -922,6 +925,16 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    }
  }

+  /** Alternate Mobile No must differ from Mobile No — the same number saved in both fields is
+   *  meaningless (there's no second contact route) and the DIP checks would just repeat. */
+  private notSameAsMobileNoValidator(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const value = control.value;
+      const mobileNo = control.parent?.get('mobileNo')?.value;
+      return value && mobileNo && value === mobileNo ? { sameAsMobile: true } : null;
+    };
+  }
+
  /**
   * Creates the client form.
   */
@@ -961,7 +974,8 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
        '',
        [
          Validators.pattern(/^[6-9]\d{9}$/),
-          Validators.maxLength(10)
+          Validators.maxLength(10),
+          this.notSameAsMobileNoValidator()
        ]
      ],
      emailAddress: [
@@ -1334,6 +1348,10 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
        // invalid) and its own reset never had a chance to run.
        this.mobileOtpVerified = false;
        this.mobileNewOtpId = null;
+        // Alternate Mobile No's "not same as Mobile No" validator reads mobileNo's current
+        // value, so re-run it here too — otherwise fixing mobileNo away from a clash leaves
+        // the alternate field's error stuck until the user also edits that field.
+        this.createClientForm.get('alternateMobileNo')?.updateValueAndValidity({ emitEvent: false });
      });

    this.createClientForm
@@ -2432,6 +2450,17 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    { upTo: null, category: 3, label: 'above ₹10 crore' }
  ];

+  /**
+   * A numeric rule bound counts as configured only when it is present and above zero.
+   *
+   * Migration 0448 replaced every unset income/turnover NULL with 0.0, so "absent" now arrives as
+   * either. Every comparison in calculatedRisk already pairs its check with `> 0` for that reason;
+   * this keeps the criteria-less test reading the columns the same way.
+   */
+  private static isConfigured(bound: number | string | null | undefined): boolean {
+    return bound != null && parseFloat(String(bound)) > 0;
+  }
+
  /** "Low Risk" / "Medium Risk" / "High Risk" for a category id. */
  riskCategoryLabel(category: number): string {
    if (category === 3) {
@@ -2518,17 +2547,32 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
    // Evaluate rules from DB (ordered by orderPosition ASC)
    if (this.riskRules && this.riskRules.length > 0) {
      for (const rule of this.riskRules) {
-        // Skip transaction/AML rules that have no KYC criteria
+        // Only KYC profile rules categorise a customer at onboarding. The same table also holds
+        // ~221 AML transaction-monitoring scenarios ("Large cash transaction", "Additional RFIs
+        // Rule - 91", ...) which describe behaviour and may only fire against posted transactions,
+        // as AML alerts — RBI Master Direction on KYC separates risk categorisation (Section 12)
+        // from transaction monitoring (Section 13). ruleKind, set on the row, is what tells them
+        // apart; it replaced an inference from "this rule has no criteria set", which migration
+        // 0448 silently broke by writing 0.0 over those NULLs. That let rule 91 match a salaried
+        // client on an income band it was never meant to carry and pre-flag them for AML.
+        if (rule.ruleKind === 'AML') {
+          continue;
+        }
+
+        // Backstop for a rule row predating rule_kind: a rule naming no occupation, no legal form
+        // and no income or turnover band constrains nothing, so it would match every customer.
+        // Treat 0 as unset — that is how the comparisons below read it, and what 0448 left behind.
        if (
+          rule.ruleKind == null &&
          rule.legalFormId == null &&
          rule.occupationCategoryCvId == null &&
          rule.occupationCvId == null &&
-          rule.minMonthlyIncome == null &&
-          rule.maxMonthlyIncome == null &&
-          rule.minAnnualIncome == null &&
-          rule.maxAnnualIncome == null &&
-          rule.minAnnualTurnover == null &&
-          rule.maxAnnualTurnover == null
+          !ClientGeneralStepComponent.isConfigured(rule.minMonthlyIncome) &&
+          !ClientGeneralStepComponent.isConfigured(rule.maxMonthlyIncome) &&
+          !ClientGeneralStepComponent.isConfigured(rule.minAnnualIncome) &&
+          !ClientGeneralStepComponent.isConfigured(rule.maxAnnualIncome) &&
+          !ClientGeneralStepComponent.isConfigured(rule.minAnnualTurnover) &&
+          !ClientGeneralStepComponent.isConfigured(rule.maxAnnualTurnover)
        ) {
          continue;
        }
@@ -2576,7 +2620,12 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
        return {
          category: rule.riskCategory,
          reason: rule.reason,
-          amlCheckStatus: rule.amlCheckStatus || (rule.riskCategory === 3 ? 'FLAGGED' : 'CLEAR'),
+          // A profile rule sets the risk category; it does not raise an AML flag. High Risk means
+          // enhanced due diligence and a 2-yearly KYC refresh (RBI MD Sections 12 and 38), not
+          // suspicion — an alert belongs to observed transaction behaviour (Section 13), so a
+          // customer who has transacted nothing yet stays CLEAR. A bank that genuinely wants a
+          // rule to flag on match can still say so explicitly via the rule's own amlCheckStatus.
+          amlCheckStatus: rule.amlCheckStatus || 'CLEAR',
          bannedEntityMatch: rule.bannedEntityMatch || 'NO',
          willfulDefaulter: rule.willfulDefaulter || 'NO',
          ecgcSalFlag: rule.ecgcSalFlag || 'NO',
@@ -221,6 +221,22 @@
                <mat-datepicker #addrIssueDatePicker></mat-datepicker>
              </mat-form-field>
            }
+            <mat-form-field appearance="outline" class="addr-ff">
+              <mat-label>Expiry date (optional)</mat-label>
+              <span matPrefix class="addr-prefix"><mat-icon>event_busy</mat-icon></span>
+              <input
+                matInput
+                [matDatepicker]="addrExpiryDatePicker"
+                formControlName="expiryDate"
+                [readonly]="readOnly || isAddressProofLinkedToKyc"
+              />
+              <mat-datepicker-toggle
+                matSuffix
+                [for]="addrExpiryDatePicker"
+                [disabled]="readOnly || isAddressProofLinkedToKyc"
+              ></mat-datepicker-toggle>
+              <mat-datepicker #addrExpiryDatePicker></mat-datepicker>
+            </mat-form-field>
          </div>

          <div class="addr-upload-grid" [class.addr-upload-grid--two]="selectedAddrProof.sides === 2">
@@ -238,14 +254,18 @@
              @if (existingAddressProofDocuments.length > 0 && !addrFiles.front && readOnly) {
                <div class="addr-dropzone addr-dropzone--has addr-dropzone--locked">
                  <div class="addr-dropzone__existing">
-                    @if (addrMergedPreview) {
-                      <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
+                    @if (existingAddrFrontSlotPreview) {
+                      <img
+                        [src]="existingAddrFrontSlotPreview"
+                        alt="Saved address proof"
+                        class="addr-dropzone__thumb"
+                      />
                    } @else {
                      <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                    }
                    <div class="addr-dropzone__existing-meta">
                      <span class="addr-dropzone__existing-name">
-                        {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
+                        {{ existingAddrFrontSlotName }}
                      </span>
                      <button type="button" class="addr-dropzone__view" (click)="viewExistingAddressProof()">
                        <mat-icon>visibility</mat-icon>
@@ -278,14 +298,18 @@
                    <!-- Edit mode WITH existing doc — let the user view it OR
                         click anywhere to replace. -->
                    <div class="addr-dropzone__existing">
-                      @if (addrMergedPreview) {
-                        <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
+                      @if (existingAddrFrontSlotPreview) {
+                        <img
+                          [src]="existingAddrFrontSlotPreview"
+                          alt="Saved address proof"
+                          class="addr-dropzone__thumb"
+                        />
                      } @else {
                        <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                      }
                      <div class="addr-dropzone__existing-meta">
                        <span class="addr-dropzone__existing-name">
-                          {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
+                          {{ existingAddrFrontSlotName }}
                        </span>
                        <div class="addr-dropzone__existing-actions">
                          <button
@@ -327,14 +351,18 @@
                @if (existingAddressProofDocuments.length > 0 && !addrFiles.back && readOnly) {
                  <div class="addr-dropzone addr-dropzone--has addr-dropzone--locked">
                    <div class="addr-dropzone__existing">
-                      @if (addrMergedPreview) {
-                        <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
+                      @if (existingAddrBackSlotPreview) {
+                        <img
+                          [src]="existingAddrBackSlotPreview"
+                          alt="Saved address proof"
+                          class="addr-dropzone__thumb"
+                        />
                      } @else {
                        <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                      }
                      <div class="addr-dropzone__existing-meta">
                        <span class="addr-dropzone__existing-name">
-                          {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
+                          {{ existingAddrBackSlotName }}
                        </span>
                        <button type="button" class="addr-dropzone__view" (click)="viewExistingAddressProof()">
                          <mat-icon>visibility</mat-icon>
@@ -367,14 +395,18 @@
                      <!-- Edit mode WITH existing combined doc — same view + replace
                           pattern as the front slot, anchored to the saved file. -->
                      <div class="addr-dropzone__existing">
-                        @if (addrMergedPreview) {
-                          <img [src]="addrMergedPreview" alt="Saved address proof" class="addr-dropzone__thumb" />
+                        @if (existingAddrBackSlotPreview) {
+                          <img
+                            [src]="existingAddrBackSlotPreview"
+                            alt="Saved address proof"
+                            class="addr-dropzone__thumb"
+                          />
                        } @else {
                          <mat-icon class="addr-dropzone__doc-ic">description</mat-icon>
                        }
                        <div class="addr-dropzone__existing-meta">
                          <span class="addr-dropzone__existing-name">
-                            {{ existingAddressProofDocuments[0].fileName || existingAddressProofDocuments[0].name }}
+                            {{ existingAddrBackSlotName }}
                          </span>
                          <div class="addr-dropzone__existing-actions">
                            <button
@@ -102,7 +102,8 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
      Validators.required
    ],
    documentKey: [''],
-    issueDate: ['']
+    issueDate: [''],
+    expiryDate: ['']
  });

  currentForm: UntypedFormGroup = this.fb.group({
@@ -222,6 +223,12 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
    size: number;
    previewUrl: string | null;
  }[] = [];
+  /** Set only when the saved documents are separately-uploaded "<Proof> — Front"/"— Back"
+   *  files (the CKYC tab / client-kyc-step convention) rather than this component's own single
+   *  merged-PNG upload — lets the two slots show their own file instead of both showing
+   *  whichever one happened to be first. */
+  private existingAddrFrontPreview: string | null = null;
+  private existingAddrBackPreview: string | null = null;

  residenceTypes = [
    'Owned',
@@ -307,11 +314,10 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
          this.existingAddressProofDocuments = [];
          if (this.existingKycDocSides.front) this.existingAddressProofDocuments.push(this.existingKycDocSides.front);
          if (this.existingKycDocSides.back) this.existingAddressProofDocuments.push(this.existingKycDocSides.back);
-          if (this.existingKycDocSides.front?.previewUrl) {
-            this.addrMergedPreview = this.existingKycDocSides.front.previewUrl;
-          } else if (this.existingKycDocSides.back?.previewUrl) {
-            this.addrMergedPreview = this.existingKycDocSides.back.previewUrl;
-          }
+          // These already carry their own per-side preview from the KYC step's own mapping —
+          // keep the two slots distinct rather than collapsing them into one shared preview.
+          this.existingAddrFrontPreview = this.existingKycDocSides.front?.previewUrl || null;
+          this.existingAddrBackPreview = this.existingKycDocSides.back?.previewUrl || null;
          this.existingAddressProofIdentifierId = this.existingKycIdentifierId;
        }
      } else if (this.isAddressProofLinkedToKyc) {
@@ -327,6 +333,8 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
    this.currentForm.patchValue({ documentKey: '', issueDate: null });
    this.addrFiles = { front: null, back: null };
    this.addrMergedPreview = null;
+    this.existingAddrFrontPreview = null;
+    this.existingAddrBackPreview = null;
  }

  /**
@@ -356,6 +364,8 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
    this.addrFiles = { front: null, back: null };
    this.addrMergedFile = null;
    this.addrMergedPreview = null;
+    this.existingAddrFrontPreview = null;
+    this.existingAddrBackPreview = null;
    this.existingAddressProofIdentifierId = null;
    this.existingAddressProofDocuments = [];
    this.addressLoaded = false;
@@ -488,6 +498,7 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
    proofId: any;
    documentKey: string;
    issueDate: string;
+    expiryDate: string;
    files: { slot: string; file: File }[];
  } {
    const files: { slot: string; file: File }[] = [];
@@ -500,11 +511,13 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
      }
    }
    const rawIssueDate = this.permanentForm.get('issueDate')?.value;
+    const rawExpiryDate = this.permanentForm.get('expiryDate')?.value;
    return {
      proof: this.selectedAddrProof,
      proofId: this.permanentForm.get('proofId')?.value || '',
      documentKey: this.permanentForm.get('documentKey')?.value || '',
      issueDate: rawIssueDate ? this.dates.getDate(rawIssueDate) : '',
+      expiryDate: rawExpiryDate ? this.dates.getDate(rawExpiryDate) : '',
      files
    };
  }
@@ -644,7 +657,14 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
          this.tryLinkKycData();
          return;
        }
-        const identifier = identifiers.find((i: any) => this.findMatchingProof(i?.documentType?.name));
+        // Aadhaar, Passport, Voter ID and Driving Licence are valid OVDs for both this slot and
+        // the separate identity-proof one (client-kyc-step) — when a client has two such
+        // dual-purpose identifiers, that step always runs first and picks the OLDEST match (the
+        // one on file first, historically the identity proof), so picking the NEWEST match here
+        // lands this step on the other row without the two steps needing to coordinate.
+        const identifier = [...identifiers]
+          .sort((a: any, b: any) => (b?.id ?? 0) - (a?.id ?? 0))
+          .find((i: any) => this.findMatchingProof(i?.documentType?.name));
        if (!identifier?.id) {
          this.existingAddressProofCheckComplete = true;
          this.tryLinkKycData();
@@ -664,14 +684,19 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
            proofId: matchedProof.id,
            documentKey: identifier.documentKey || ''
          });
-          // The description carries `Issue date: yyyy-MM-dd` when set on create (see
-          // create-client.saveAddressProof) — pull it out so the form's issueDate field
-          // shows what was previously entered.
+          // The description carries "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" when set on
+          // create (see create-client.saveAddressProof / CkycTabComponent) — pull both out so the
+          // form's date fields show what was previously entered. Each match stops at the next
+          // comma so adding expiry after issue doesn't get swallowed into the issue-date capture.
          const desc: string = identifier.description || '';
-          const issueMatch = desc.match(/Issue date:\s*(.+)$/i);
+          const issueMatch = desc.match(/Issue date:\s*([^,|]+)/i);
+          const expiryMatch = desc.match(/Expiry date:\s*([^,|]+)/i);
          if (issueMatch) {
            this.permanentForm.patchValue({ issueDate: this.dates.parseDate(issueMatch[1].trim()) });
          }
+          if (expiryMatch) {
+            this.permanentForm.patchValue({ expiryDate: this.dates.parseDate(expiryMatch[1].trim()) });
+          }
        }

        this.clientsService.getClientIdentificationDocuments(this.existingAddressProofIdentifierId).subscribe({
@@ -685,6 +710,29 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
              size: d.size || 0,
              previewUrl: null as string | null
            }));
+
+            const sideOf = (d: { name: string; fileName: string }): 'front' | 'back' | null => {
+              const text = `${d.name || ''} ${d.fileName || ''}`.toLowerCase();
+              if (text.includes('back')) return 'back';
+              if (text.includes('front')) return 'front';
+              return null;
+            };
+            // Changing the document type (e.g. Aadhaar -> Passport) keeps the old front/back
+            // files attached to this same identifier rather than removing them, so there can be
+            // more than one "— Front"/"— Back" pair on file — sort newest-first before matching
+            // or this would keep showing the very first scan ever uploaded here.
+            const byNewest = [...this.existingAddressProofDocuments].sort((a, b) => Number(b.id) - Number(a.id));
+            const frontDoc = byNewest.find((d) => sideOf(d) === 'front');
+            const backDoc = byNewest.find((d) => sideOf(d) === 'back');
+
+            if (frontDoc || backDoc) {
+              // Separately-uploaded front/back — each side gets its own preview.
+              if (frontDoc) this.downloadAddrSidePreview(frontDoc, 'front');
+              if (backDoc) this.downloadAddrSidePreview(backDoc, 'back');
+              return;
+            }
+
+            // Legacy/single-file case: one combined (or unlabelled) document covers both slots.
            const firstImage = this.existingAddressProofDocuments.find((d) =>
              (d.type || '').toLowerCase().startsWith('image/')
            );
@@ -715,6 +763,50 @@ export class ClientIndiaAddressStepComponent implements OnInit, OnChanges {
    });
  }

+  private downloadAddrSidePreview(doc: { id: string; fileName: string; name: string }, slot: 'front' | 'back'): void {
+    this.clientsService.downloadClientIdentificationDocument(this.existingAddressProofIdentifierId!, doc.id).subscribe({
+      next: async (blob: any) => {
+        const buffer = await blob.arrayBuffer();
+        const bytes = new Uint8Array(buffer);
+        let binary = '';
+        for (let i = 0; i < bytes.length; i++) {
+          binary += String.fromCharCode(bytes[i]);
+        }
+        const url = 'data:' + blob.type + ';base64,' + btoa(binary);
+        if (slot === 'front') this.existingAddrFrontPreview = url;
+        else this.existingAddrBackPreview = url;
+      },
+      error: () => {}
+    });
+  }
+
+  /** What the Front slot should show: its own saved file when front/back were uploaded
+   *  separately, falling back to the single combined preview for legacy/merged uploads. */
+  get existingAddrFrontSlotPreview(): string | null {
+    return this.existingAddrFrontPreview || this.addrMergedPreview;
+  }
+
+  get existingAddrFrontSlotName(): string {
+    const front = this.existingAddressProofDocuments.find((d) =>
+      `${d.name} ${d.fileName}`.toLowerCase().includes('front')
+    );
+    const doc = front || this.existingAddressProofDocuments[0];
+    return doc?.fileName || doc?.name || '';
+  }
+
+  /** Same as above, for the Back slot. */
+  get existingAddrBackSlotPreview(): string | null {
+    return this.existingAddrBackPreview || this.addrMergedPreview;
+  }
+
+  get existingAddrBackSlotName(): string {
+    const back = this.existingAddressProofDocuments.find((d) =>
+      `${d.name} ${d.fileName}`.toLowerCase().includes('back')
+    );
+    const doc = back || this.existingAddressProofDocuments[0];
+    return doc?.fileName || doc?.name || '';
+  }
+
  onPinInput(tab: string) {
    const form = this.getForm(tab);
    const pin = form.get('pinCode')?.value?.replace(/\D/g, '') || '';
@@ -7,6 +7,7 @@
 */

 import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, inject } from '@angular/core';
+import { forkJoin, catchError, of } from 'rxjs';
 import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
 import {
  MatDialog,
@@ -1266,8 +1267,14 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
        this.loadExistingKycIdentifier(data?.kycDocumentName);
      },
      error: () => {
-        // No existing KYC — that's fine for new clients
+        // No m_client_kyc row yet (e.g. CERSAI sync hasn't run) — that's fine, but the client
+        // can still have a KYC-type identifier already on file (uploaded via the CKYC tab,
+        // which writes straight to client_identifier and never touches this record). Look it
+        // up the same way the success branch does, just without a document-name hint.
        this.kycLoaded = true;
+        this.loadExistingPhoto();
+        this.loadExistingSignature();
+        this.loadExistingKycIdentifier(undefined);
      }
    });
  }
@@ -1283,8 +1290,13 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
   */
  private loadExistingKycIdentifier(kycDocumentName: string | undefined): void {
    if (!this.clientId) return;
-    this.clientsService.getClientIdentifiers(this.clientId).subscribe({
-      next: (identifiers: any[]) => {
+    forkJoin({
+      identifiers: this.clientsService.getClientIdentifiers(this.clientId),
+      // Only needed to spot the dual-purpose OVD types (Aadhaar/Passport/Voter ID/Driving
+      // Licence) below — a failure here just means that disambiguation step is skipped.
+      proofTypes: this.clientsService.getKycProofTypes().pipe(catchError(() => of({ addressProofs: [] })))
+    }).subscribe({
+      next: ({ identifiers, proofTypes }: { identifiers: any[]; proofTypes: any }) => {
        if (!identifiers || identifiers.length === 0) return;
        const cleanStr = (s: string) => (s || '').toLowerCase().replace(/[^a-z0-9]/g, '');
        const isKycType = (i: any) => {
@@ -1297,6 +1309,13 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
            })
          );
        };
+        // Aadhaar, Passport, Voter ID and Driving Licence are valid OVDs for BOTH this slot and
+        // the separate address-proof one (client-india-address-step) — a client with, say, a PAN
+        // identity proof and an Aadhaar address proof has two client_identifier rows that both
+        // pass isKycType. Without a name to go on, prefer whichever candidate is NOT also an
+        // address-proof type, so this slot doesn't grab the other step's file.
+        const addressTypeNames = new Set<string>((proofTypes?.addressProofs || []).map((p: any) => cleanStr(p?.name)));
+        const isAddressType = (i: any) => addressTypeNames.has(cleanStr(i?.documentType?.name));
        // Re-uploading a KYC document creates a new identifier row rather than updating the
        // old one in place (same pattern as OVD identifiers), so sort newest-first before
        // picking — otherwise a repeat upload of the same document type would keep showing
@@ -1311,7 +1330,15 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
              return name === kName || name.includes(kName) || kName.includes(name);
            })
          : null;
-        const identifier = match || sorted.find(isKycType);
+        // Last resort, when EVERY kyc-type candidate is also address-eligible (e.g. a client
+        // whose identity proof and address proof are both Aadhaar/Passport/Voter ID/Driving
+        // Licence): this stepper always runs before the address step in both the create and
+        // edit wizards, so the identity proof is the one that was on file first — pick the
+        // OLDEST match here, and the address step (client-india-address-step) picks the NEWEST
+        // among ITS own address-eligible candidates, so the two steps land on different rows
+        // without needing to coordinate at runtime.
+        const identifier =
+          match || sorted.find((i) => isKycType(i) && !isAddressType(i)) || [...sorted].reverse().find(isKycType);
        if (!identifier?.id) return;

        this.existingKycIdentifierId = identifier.id.toString();
@@ -1327,6 +1354,19 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
            kycDocumentNumber: identifier.documentKey || ''
          });
        }
+        // Same for issue/expiry date — the CKYC tab (and client-india-address-step, for address
+        // proof) write "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" into the identifier's
+        // description; read it back here only to fill in whatever the KYC record itself doesn't
+        // already have, same as the documentKey backfill above.
+        const desc: string = identifier?.description || '';
+        const issueMatch = desc.match(/Issue date:\s*([^,|]+)/i);
+        const expiryMatch = desc.match(/Expiry date:\s*([^,|]+)/i);
+        if (issueMatch && !this.kycForm.get('kycDocIssueDate')?.value) {
+          this.kycForm.patchValue({ kycDocIssueDate: this.parseApiDate(issueMatch[1].trim()) });
+        }
+        if (expiryMatch && !this.kycForm.get('kycDocExpiryDate')?.value) {
+          this.kycForm.patchValue({ kycDocExpiryDate: this.parseApiDate(expiryMatch[1].trim()) });
+        }

        this.clientsService.getClientIdentificationDocuments(this.existingKycIdentifierId).subscribe({
          next: (docs: any[]) => {
@@ -204,6 +204,24 @@
                  <span class="ckyc-existing__source">from {{ existing.ADDRESS_PROOF.source }}</span>
                </div>
              </div>
+              @if (existing.ADDRESS_PROOF.previewUrl || existing.ADDRESS_PROOF.previewUrlBack) {
+                <div class="ckyc-existing__thumbs">
+                  @if (existing.ADDRESS_PROOF.previewUrl) {
+                    <img
+                      [src]="existing.ADDRESS_PROOF.previewUrl"
+                      alt="Address proof scan - front"
+                      class="ckyc-existing__thumb"
+                    />
+                  }
+                  @if (existing.ADDRESS_PROOF.previewUrlBack) {
+                    <img
+                      [src]="existing.ADDRESS_PROOF.previewUrlBack"
+                      alt="Address proof scan - back"
+                      class="ckyc-existing__thumb"
+                    />
+                  }
+                </div>
+              }
              <div class="ckyc-existing__meta">
                <fa-icon icon="file-alt"></fa-icon>
                <span>{{ existing.ADDRESS_PROOF.name }}</span>
@@ -217,78 +235,51 @@
                  </span>
                }
              </div>
+              @if (cardDate('ADDRESS_PROOF', 'issue') || cardDate('ADDRESS_PROOF', 'expiry')) {
+                <div class="ckyc-existing__dates">
+                  @if (cardDate('ADDRESS_PROOF', 'issue')) {
+                    <span
+                      ><fa-icon icon="calendar-check"></fa-icon> Issued {{ cardDate('ADDRESS_PROOF', 'issue') }}</span
+                    >
+                  }
+                  @if (cardDate('ADDRESS_PROOF', 'expiry')) {
+                    <span
+                      ><fa-icon icon="calendar-check"></fa-icon> Expires {{ cardDate('ADDRESS_PROOF', 'expiry') }}</span
+                    >
+                  }
+                </div>
+              }
              <button
                mat-stroked-button
                type="button"
                class="ckyc-existing__replace"
-                (click)="toggleReplace('ADDRESS_PROOF')"
+                (click)="openUploadDialog('ADDRESS_PROOF')"
              >
-                <fa-icon [icon]="existing.ADDRESS_PROOF.expanded ? 'times' : 'upload'"></fa-icon>
-                {{ existing.ADDRESS_PROOF.expanded ? 'Cancel replace' : 'Upload new version' }}
+                <fa-icon icon="upload"></fa-icon>
+                Upload new version
+              </button>
+            </div>
+          } @else {
+            <div class="ckyc-missing">
+              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG, PDF</p>
+              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('ADDRESS_PROOF')">
+                <fa-icon icon="upload"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Upload' | translate }}
              </button>
            </div>
          }

-          @if (!existing.ADDRESS_PROOF.present || existing.ADDRESS_PROOF.expanded) {
-            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG, PDF</p>
-            <div class="ckyc-file-row">
-              <input
-                type="file"
-                #addressProofInput
-                accept=".png,.jpeg,.jpg,.pdf"
-                (change)="onFileSelect($event, 'ADDRESS_PROOF')"
-                [style.display]="'none'"
-              />
-              <mat-form-field appearance="outline" class="ckyc-file-name-field">
-                <input
-                  matInput
-                  [readonly]="true"
-                  [value]="addressProofFile?.name || ''"
-                  [placeholder]="'labels.text.NoFileSelected' | translate"
-                />
-              </mat-form-field>
-              <button mat-stroked-button type="button" (click)="addressProofInput.click()">
-                <fa-icon icon="folder-open" size="lg"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Browse' | translate }}
-              </button>
+          @if (uploading['ADDRESS_PROOF']) {
+            <div class="ckyc-uploading">
+              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              <span>Uploading…</span>
+            </div>
+          }
+          @if (uploadErrors['ADDRESS_PROOF']) {
+            <div class="ckyc-upload-error">
+              <mat-icon>error_outline</mat-icon>
+              <span>{{ uploadErrors['ADDRESS_PROOF'] }}</span>
            </div>
-            <button
-              mat-raised-button
-              color="primary"
-              type="button"
-              [disabled]="!addressProofFile || uploading['ADDRESS_PROOF']"
-              (click)="uploadDocument('ADDRESS_PROOF')"
-            >
-              @if (uploading['ADDRESS_PROOF']) {
-                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
-              } @else {
-                {{ 'labels.buttons.Upload' | translate }}
-              }
-            </button>
-            @if (uploadErrors['ADDRESS_PROOF']) {
-              <div class="ckyc-upload-error">
-                <mat-icon>error_outline</mat-icon>
-                <span>{{ uploadErrors['ADDRESS_PROOF'] }}</span>
-              </div>
-            }
-            @if (uploadResponses['ADDRESS_PROOF']) {
-              <div class="ckyc-upload-response">
-                <p>
-                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['ADDRESS_PROOF'].status }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['ADDRESS_PROOF'].requestId }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
-                  {{ uploadResponses['ADDRESS_PROOF'].acknowledgementNumber }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
-                  {{ uploadResponses['ADDRESS_PROOF'].processingStatus }}
-                </p>
-              </div>
-            }
          }
        </mat-card-content>
      </mat-card>
@@ -310,6 +301,24 @@
                  <span class="ckyc-existing__source">from {{ existing.PHOTO_PROOF.source }}</span>
                </div>
              </div>
+              @if (existing.PHOTO_PROOF.previewUrl || existing.PHOTO_PROOF.previewUrlBack) {
+                <div class="ckyc-existing__thumbs">
+                  @if (existing.PHOTO_PROOF.previewUrl) {
+                    <img
+                      [src]="existing.PHOTO_PROOF.previewUrl"
+                      alt="ID proof scan - front"
+                      class="ckyc-existing__thumb"
+                    />
+                  }
+                  @if (existing.PHOTO_PROOF.previewUrlBack) {
+                    <img
+                      [src]="existing.PHOTO_PROOF.previewUrlBack"
+                      alt="ID proof scan - back"
+                      class="ckyc-existing__thumb"
+                    />
+                  }
+                </div>
+              }
              <div class="ckyc-existing__meta">
                <fa-icon icon="id-card"></fa-icon>
                <span>{{ existing.PHOTO_PROOF.name }}</span>
@@ -322,78 +331,49 @@
                  </span>
                }
              </div>
+              @if (cardDate('PHOTO_PROOF', 'issue') || cardDate('PHOTO_PROOF', 'expiry')) {
+                <div class="ckyc-existing__dates">
+                  @if (cardDate('PHOTO_PROOF', 'issue')) {
+                    <span><fa-icon icon="calendar-check"></fa-icon> Issued {{ cardDate('PHOTO_PROOF', 'issue') }}</span>
+                  }
+                  @if (cardDate('PHOTO_PROOF', 'expiry')) {
+                    <span
+                      ><fa-icon icon="calendar-check"></fa-icon> Expires {{ cardDate('PHOTO_PROOF', 'expiry') }}</span
+                    >
+                  }
+                </div>
+              }
              <button
                mat-stroked-button
                type="button"
                class="ckyc-existing__replace"
-                (click)="toggleReplace('PHOTO_PROOF')"
+                (click)="openUploadDialog('PHOTO_PROOF')"
              >
-                <fa-icon [icon]="existing.PHOTO_PROOF.expanded ? 'times' : 'upload'"></fa-icon>
-                {{ existing.PHOTO_PROOF.expanded ? 'Cancel replace' : 'Upload new version' }}
+                <fa-icon icon="upload"></fa-icon>
+                Upload new version
+              </button>
+            </div>
+          } @else {
+            <div class="ckyc-missing">
+              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG, PDF</p>
+              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('PHOTO_PROOF')">
+                <fa-icon icon="upload"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Upload' | translate }}
              </button>
            </div>
          }

-          @if (!existing.PHOTO_PROOF.present || existing.PHOTO_PROOF.expanded) {
-            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG, PDF</p>
-            <div class="ckyc-file-row">
-              <input
-                type="file"
-                #photoProofInput
-                accept=".png,.jpeg,.jpg,.pdf"
-                (change)="onFileSelect($event, 'PHOTO_PROOF')"
-                [style.display]="'none'"
-              />
-              <mat-form-field appearance="outline" class="ckyc-file-name-field">
-                <input
-                  matInput
-                  [readonly]="true"
-                  [value]="photoProofFile?.name || ''"
-                  [placeholder]="'labels.text.NoFileSelected' | translate"
-                />
-              </mat-form-field>
-              <button mat-stroked-button type="button" (click)="photoProofInput.click()">
-                <fa-icon icon="folder-open" size="lg"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Browse' | translate }}
-              </button>
+          @if (uploading['PHOTO_PROOF']) {
+            <div class="ckyc-uploading">
+              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              <span>Uploading…</span>
+            </div>
+          }
+          @if (uploadErrors['PHOTO_PROOF']) {
+            <div class="ckyc-upload-error">
+              <mat-icon>error_outline</mat-icon>
+              <span>{{ uploadErrors['PHOTO_PROOF'] }}</span>
            </div>
-            <button
-              mat-raised-button
-              color="primary"
-              type="button"
-              [disabled]="!photoProofFile || uploading['PHOTO_PROOF']"
-              (click)="uploadDocument('PHOTO_PROOF')"
-            >
-              @if (uploading['PHOTO_PROOF']) {
-                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
-              } @else {
-                {{ 'labels.buttons.Upload' | translate }}
-              }
-            </button>
-            @if (uploadErrors['PHOTO_PROOF']) {
-              <div class="ckyc-upload-error">
-                <mat-icon>error_outline</mat-icon>
-                <span>{{ uploadErrors['PHOTO_PROOF'] }}</span>
-              </div>
-            }
-            @if (uploadResponses['PHOTO_PROOF']) {
-              <div class="ckyc-upload-response">
-                <p>
-                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['PHOTO_PROOF'].status }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['PHOTO_PROOF'].requestId }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
-                  {{ uploadResponses['PHOTO_PROOF'].acknowledgementNumber }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
-                  {{ uploadResponses['PHOTO_PROOF'].processingStatus }}
-                </p>
-              </div>
-            }
          }
        </mat-card-content>
      </mat-card>
@@ -422,74 +402,33 @@
                mat-stroked-button
                type="button"
                class="ckyc-existing__replace"
-                (click)="toggleReplace('CLIENT_IMAGE')"
+                (click)="openUploadDialog('CLIENT_IMAGE')"
              >
-                <fa-icon [icon]="existing.CLIENT_IMAGE.expanded ? 'times' : 'upload'"></fa-icon>
-                {{ existing.CLIENT_IMAGE.expanded ? 'Cancel replace' : 'Upload new version' }}
+                <fa-icon icon="upload"></fa-icon>
+                Upload new version
+              </button>
+            </div>
+          } @else {
+            <div class="ckyc-missing">
+              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG</p>
+              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('CLIENT_IMAGE')">
+                <fa-icon icon="upload"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Upload' | translate }}
              </button>
            </div>
          }

-          @if (!existing.CLIENT_IMAGE.present || existing.CLIENT_IMAGE.expanded) {
-            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG</p>
-            <div class="ckyc-file-row">
-              <input
-                type="file"
-                #clientImageInput
-                accept=".png,.jpeg,.jpg"
-                (change)="onFileSelect($event, 'CLIENT_IMAGE')"
-                [style.display]="'none'"
-              />
-              <mat-form-field appearance="outline" class="ckyc-file-name-field">
-                <input
-                  matInput
-                  [readonly]="true"
-                  [value]="clientImageFile?.name || ''"
-                  [placeholder]="'labels.text.NoFileSelected' | translate"
-                />
-              </mat-form-field>
-              <button mat-stroked-button type="button" (click)="clientImageInput.click()">
-                <fa-icon icon="folder-open" size="lg"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Browse' | translate }}
-              </button>
+          @if (uploading['CLIENT_IMAGE']) {
+            <div class="ckyc-uploading">
+              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              <span>Uploading…</span>
+            </div>
+          }
+          @if (uploadErrors['CLIENT_IMAGE']) {
+            <div class="ckyc-upload-error">
+              <mat-icon>error_outline</mat-icon>
+              <span>{{ uploadErrors['CLIENT_IMAGE'] }}</span>
            </div>
-            <button
-              mat-raised-button
-              color="primary"
-              type="button"
-              [disabled]="!clientImageFile || uploading['CLIENT_IMAGE']"
-              (click)="uploadDocument('CLIENT_IMAGE')"
-            >
-              @if (uploading['CLIENT_IMAGE']) {
-                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
-              } @else {
-                {{ 'labels.buttons.Upload' | translate }}
-              }
-            </button>
-            @if (uploadErrors['CLIENT_IMAGE']) {
-              <div class="ckyc-upload-error">
-                <mat-icon>error_outline</mat-icon>
-                <span>{{ uploadErrors['CLIENT_IMAGE'] }}</span>
-              </div>
-            }
-            @if (uploadResponses['CLIENT_IMAGE']) {
-              <div class="ckyc-upload-response">
-                <p>
-                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['CLIENT_IMAGE'].status }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b> {{ uploadResponses['CLIENT_IMAGE'].requestId }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
-                  {{ uploadResponses['CLIENT_IMAGE'].acknowledgementNumber }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
-                  {{ uploadResponses['CLIENT_IMAGE'].processingStatus }}
-                </p>
-              </div>
-            }
          }
        </mat-card-content>
      </mat-card>
@@ -526,75 +465,33 @@
                mat-stroked-button
                type="button"
                class="ckyc-existing__replace"
-                (click)="toggleReplace('CLIENT_SIGNATURE')"
+                (click)="openUploadDialog('CLIENT_SIGNATURE')"
              >
-                <fa-icon [icon]="existing.CLIENT_SIGNATURE.expanded ? 'times' : 'upload'"></fa-icon>
-                {{ existing.CLIENT_SIGNATURE.expanded ? 'Cancel replace' : 'Upload new version' }}
+                <fa-icon icon="upload"></fa-icon>
+                Upload new version
+              </button>
+            </div>
+          } @else {
+            <div class="ckyc-missing">
+              <p class="ckyc-upload-hint">Not uploaded yet. Accepted formats: PNG, JPEG, JPG</p>
+              <button mat-raised-button color="primary" type="button" (click)="openUploadDialog('CLIENT_SIGNATURE')">
+                <fa-icon icon="upload"></fa-icon>
+                &nbsp;{{ 'labels.buttons.Upload' | translate }}
              </button>
            </div>
          }

-          @if (!existing.CLIENT_SIGNATURE.present || existing.CLIENT_SIGNATURE.expanded) {
-            <p class="ckyc-upload-hint">{{ 'labels.inputs.Accepted formats' | translate }}: PNG, JPEG, JPG</p>
-            <div class="ckyc-file-row">
-              <input
-                type="file"
-                #clientSignatureInput
-                accept=".png,.jpeg,.jpg"
-                (change)="onFileSelect($event, 'CLIENT_SIGNATURE')"
-                [style.display]="'none'"
-              />
-              <mat-form-field appearance="outline" class="ckyc-file-name-field">
-                <input
-                  matInput
-                  [readonly]="true"
-                  [value]="clientSignatureFile?.name || ''"
-                  [placeholder]="'labels.text.NoFileSelected' | translate"
-                />
-              </mat-form-field>
-              <button mat-stroked-button type="button" (click)="clientSignatureInput.click()">
-                <fa-icon icon="folder-open" size="lg"></fa-icon>
-                &nbsp;{{ 'labels.buttons.Browse' | translate }}
-              </button>
+          @if (uploading['CLIENT_SIGNATURE']) {
+            <div class="ckyc-uploading">
+              <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
+              <span>Uploading…</span>
+            </div>
+          }
+          @if (uploadErrors['CLIENT_SIGNATURE']) {
+            <div class="ckyc-upload-error">
+              <mat-icon>error_outline</mat-icon>
+              <span>{{ uploadErrors['CLIENT_SIGNATURE'] }}</span>
            </div>
-            <button
-              mat-raised-button
-              color="primary"
-              type="button"
-              [disabled]="!clientSignatureFile || uploading['CLIENT_SIGNATURE']"
-              (click)="uploadDocument('CLIENT_SIGNATURE')"
-            >
-              @if (uploading['CLIENT_SIGNATURE']) {
-                <mat-progress-spinner diameter="18" mode="indeterminate"></mat-progress-spinner>
-              } @else {
-                {{ 'labels.buttons.Upload' | translate }}
-              }
-            </button>
-            @if (uploadErrors['CLIENT_SIGNATURE']) {
-              <div class="ckyc-upload-error">
-                <mat-icon>error_outline</mat-icon>
-                <span>{{ uploadErrors['CLIENT_SIGNATURE'] }}</span>
-              </div>
-            }
-            @if (uploadResponses['CLIENT_SIGNATURE']) {
-              <div class="ckyc-upload-response">
-                <p>
-                  <b>{{ 'labels.inputs.Status' | translate }}:</b> {{ uploadResponses['CLIENT_SIGNATURE'].status }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Request ID' | translate }}:</b>
-                  {{ uploadResponses['CLIENT_SIGNATURE'].requestId }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Acknowledgement Number' | translate }}:</b>
-                  {{ uploadResponses['CLIENT_SIGNATURE'].acknowledgementNumber }}
-                </p>
-                <p>
-                  <b>{{ 'labels.inputs.Processing Status' | translate }}:</b>
-                  {{ uploadResponses['CLIENT_SIGNATURE'].processingStatus }}
-                </p>
-              </div>
-            }
          }
        </mat-card-content>
      </mat-card>
@@ -553,15 +553,21 @@
  margin: 0 0 12px;
 }

-.ckyc-file-row {
+.ckyc-missing {
+  margin-top: 14px;
  display: flex;
+  flex-direction: column;
+  gap: 10px;
  align-items: flex-start;
-  gap: 8px;
-  margin-bottom: 12px;
 }

-.ckyc-file-name-field {
-  flex: 1;
+.ckyc-uploading {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 10px;
+  font-size: 12px;
+  color: #5f6368;
 }

 .ckyc-upload-error {
@@ -583,19 +589,6 @@
  }
 }

-.ckyc-upload-response {
-  margin-top: 12px;
-  padding: 10px 14px;
-  background-color: #e8f5e9;
-  border: 1px solid #a5d6a7;
-  border-radius: 8px;
-  font-size: 12px;
-
-  p {
-    margin: 4px 0;
-  }
-}
-
@media (width <= 900px) {
  .ckyc-upload-grid {
    grid-template-columns: 1fr;
@@ -610,14 +603,6 @@
  .ckyc-upload-grid {
    grid-template-columns: 1fr;
  }
-
-  .ckyc-file-row {
-    flex-direction: column;
-  }
-
-  .ckyc-file-name-field {
-    width: 100%;
-  }
 }

 /* ===================== Already-available banners ===================== */
@@ -731,6 +716,34 @@
    letter-spacing: 0.3px;
  }

+  &__thumbs {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+    flex-wrap: wrap;
+  }
+
+  &__dates {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    font-size: 11px;
+    color: #0f6e56;
+    flex-wrap: wrap;
+
+    span {
+      display: inline-flex;
+      align-items: center;
+      gap: 5px;
+    }
+
+    fa-icon {
+      color: #1d9e75;
+      font-size: 11px;
+    }
+  }
+
  &__thumb {
    width: 100px;
    height: 100px;
@@ -9,27 +9,38 @@
 /** Angular Imports */
 import { Component, OnInit, OnDestroy, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Subject, takeUntil, catchError, of, forkJoin } from 'rxjs';
+import { Subject, Observable, takeUntil, catchError, of, forkJoin } from 'rxjs';

 /** Custom Services */
 import { ClientsService } from '../../clients.service';
 import { AlertService } from 'app/core/alert/alert.service';
 import { MatIcon } from '@angular/material/icon';
 import { MatProgressSpinner } from '@angular/material/progress-spinner';
+import { MatDialog } from '@angular/material/dialog';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { Dates } from 'app/core/utils/dates';
+import { ProofType, normalizeProofType } from '../../shared/kyc-proof-types';
+import { CkycUploadDialogComponent, CkycUploadDialogResult } from './ckyc-upload-dialog/ckyc-upload-dialog.component';

 interface ExistingArtefact {
  present: boolean;
  name?: string;
  source?: string;
  previewUrl?: string;
+  previewUrlBack?: string;
  documentId?: string;
+  documentTypeId?: string;
  documentKey?: string;
+  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention client-india-address-step
+   *  already writes/reads for address proof; now shared by the photo/identity proof too. */
+  description?: string;
  fileCount?: number;
-  expanded?: boolean;
 }

+type ProofKind = 'ADDRESS_PROOF' | 'PHOTO_PROOF';
+type CkycDocKind = ProofKind | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
+
@Component({
  selector: 'mifosx-ckyc-tab',
  templateUrl: './ckyc-tab.component.html',
@@ -46,6 +57,8 @@ export class CkycTabComponent implements OnInit, OnDestroy {
  private route = inject(ActivatedRoute);
  private clientsService = inject(ClientsService);
  private alertService = inject(AlertService);
+  private dialog = inject(MatDialog);
+  private dates = inject(Dates);

  private destroy$ = new Subject<void>();

@@ -80,16 +93,41 @@ export class CkycTabComponent implements OnInit, OnDestroy {
  }

  /** Pre-existing artefacts detected from client data */
-  existing: Record<'ADDRESS_PROOF' | 'PHOTO_PROOF' | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE', ExistingArtefact> = {
+  existing: Record<CkycDocKind, ExistingArtefact> = {
    ADDRESS_PROOF: { present: false },
    PHOTO_PROOF: { present: false },
    CLIENT_IMAGE: { present: false },
    CLIENT_SIGNATURE: { present: false }
  };

+  /** Document-type options for the proof pickers, fetched once from /kyc/proof-types */
+  addressProofOptions: ProofType[] = [];
+  idProofOptions: ProofType[] = [];
+
+  /** Document type currently selected in each proof card's picker */
+  selectedProofType: Record<ProofKind, ProofType | null> = {
+    ADDRESS_PROOF: null,
+    PHOTO_PROOF: null
+  };
+
+  /** Front/back files staged for the two proof cards; other cards keep a single file each */
+  docFiles: Record<ProofKind, { front: File | null; back: File | null }> = {
+    ADDRESS_PROOF: { front: null, back: null },
+    PHOTO_PROOF: { front: null, back: null }
+  };
+
+  /** Document number + issue/expiry dates staged from the upload dialog, same fields client
+   *  creation collects for a KYC/address proof — persisted onto the identifier's documentKey
+   *  and description ("Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd"). */
+  private documentDetails: Record<
+    ProofKind,
+    { documentKey: string; issueDate: string | null; expiryDate: string | null }
+  > = {
+    ADDRESS_PROOF: { documentKey: '', issueDate: null, expiryDate: null },
+    PHOTO_PROOF: { documentKey: '', issueDate: null, expiryDate: null }
+  };
+
  /** File references */
-  addressProofFile: File | null = null;
-  photoProofFile: File | null = null;
  clientImageFile: File | null = null;
  clientSignatureFile: File | null = null;

@@ -101,9 +139,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
    CLIENT_SIGNATURE: false
  };

-  /** Per-document upload response */
-  uploadResponses: { [key: string]: any } = {};
-
  /** Per-document error messages */
  uploadErrors: { [key: string]: string | null } = {
    ADDRESS_PROOF: null,
@@ -262,6 +297,8 @@ export class CkycTabComponent implements OnInit, OnDestroy {
        }

        // 3 & 4. ID proof + Address proof — client identifiers classified via proof-types
+        this.idProofOptions = (proofTypes?.idProofs || []).map((p: any) => normalizeProofType(p));
+        this.addressProofOptions = (proofTypes?.addressProofs || []).map((p: any) => normalizeProofType(p));
        const idProofIds = new Set<string>((proofTypes?.idProofs || []).map((p: any) => String(p.id)));
        const addressProofIds = new Set<string>((proofTypes?.addressProofs || []).map((p: any) => String(p.id)));

@@ -287,21 +324,77 @@ export class CkycTabComponent implements OnInit, OnDestroy {
            name: proofName,
            documentKey: isSyntheticKey ? '' : rawKey,
            documentId: identity?.id,
+            documentTypeId: docTypeId,
+            description: identity?.description || '',
            fileCount: (identity?.documents || []).length
          };

          if (idProofIds.has(docTypeId) && !this.existing.PHOTO_PROOF.present) {
            this.existing.PHOTO_PROOF = common;
+            this.selectedProofType.PHOTO_PROOF = this.idProofOptions.find((p) => String(p.id) === docTypeId) || null;
+            this.loadIdentifierDocPreview('PHOTO_PROOF', identity.id);
          } else if (addressProofIds.has(docTypeId) && !this.existing.ADDRESS_PROOF.present) {
            this.existing.ADDRESS_PROOF = common;
+            this.selectedProofType.ADDRESS_PROOF =
+              this.addressProofOptions.find((p) => String(p.id) === docTypeId) || null;
+            this.loadIdentifierDocPreview('ADDRESS_PROOF', identity.id);
          }
        }
      });
  }

-  toggleReplace(documentType: string): void {
-    const entry = (this.existing as any)[documentType];
-    if (entry) entry.expanded = !entry.expanded;
+  /**
+   * The scanned ID/address-proof card only showed its file name and key — never the scan
+   * itself, unlike the photo and signature cards right beside it. Mirrors those two: fetch
+   * the identifier's own attached document(s) (m_client_identifier -> m_document, the same
+   * chain the Identities tab and the create-client stepper read) and download the latest for
+   * an inline preview. Two-sided proof types (Aadhaar, Passport, Voter ID, Driving Licence)
+   * store front/back as two separate documents named "<Proof> — Front"/"— Back" (the same
+   * convention the create-client stepper writes), so both are matched and previewed here;
+   * a legacy single upload with no such marker just shows as the one preview.
+   */
+  private loadIdentifierDocPreview(kind: ProofKind, identifierId: string): void {
+    this.clientsService
+      .getClientIdentificationDocuments(identifierId)
+      .pipe(
+        takeUntil(this.destroy$),
+        catchError(() => of([]))
+      )
+      .subscribe((docs: any) => {
+        const list = Array.isArray(docs) ? docs : [];
+        if (!list.length) return;
+        this.existing[kind].fileCount = list.length;
+
+        const byNewest = (a: any, b: any) => b.id - a.id;
+        const label = (d: any) => (d?.name || d?.fileName || '').toString();
+        const back = [...list].filter((d: any) => /back/i.test(label(d))).sort(byNewest)[0];
+        const front =
+          [...list].filter((d: any) => /front/i.test(label(d))).sort(byNewest)[0] ||
+          [...list].filter((d: any) => d.id !== back?.id).sort(byNewest)[0];
+
+        if (front) this.downloadIdentifierDocPreview(identifierId, front.id, kind, 'front');
+        if (back && back.id !== front?.id) this.downloadIdentifierDocPreview(identifierId, back.id, kind, 'back');
+      });
+  }
+
+  private downloadIdentifierDocPreview(
+    identifierId: string,
+    documentId: string,
+    kind: ProofKind,
+    slot: 'front' | 'back'
+  ): void {
+    this.clientsService
+      .downloadClientIdentificationDocument(identifierId, documentId)
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        next: (blob: any) => {
+          if (!blob) return;
+          const url = URL.createObjectURL(blob);
+          if (slot === 'front') this.existing[kind].previewUrl = url;
+          else this.existing[kind].previewUrlBack = url;
+        },
+        error: () => undefined
+      });
  }

  onAccountSelect(accountNo: string): void {
@@ -309,33 +402,8 @@ export class CkycTabComponent implements OnInit, OnDestroy {
    this.selectedAccountType = this.selectedAccount?.accountType || '';
  }

-  onFileSelect(event: any, documentType: string): void {
-    const file = event.target?.files?.[0];
-    if (!file) return;
-
-    switch (documentType) {
-      case 'ADDRESS_PROOF':
-        this.addressProofFile = file;
-        break;
-      case 'PHOTO_PROOF':
-        this.photoProofFile = file;
-        break;
-      case 'CLIENT_IMAGE':
-        this.clientImageFile = file;
-        break;
-      case 'CLIENT_SIGNATURE':
-        this.clientSignatureFile = file;
-        break;
-    }
-    this.uploadErrors[documentType] = null;
-  }
-
  getFile(documentType: string): File | null {
    switch (documentType) {
-      case 'ADDRESS_PROOF':
-        return this.addressProofFile;
-      case 'PHOTO_PROOF':
-        return this.photoProofFile;
      case 'CLIENT_IMAGE':
        return this.clientImageFile;
      case 'CLIENT_SIGNATURE':
@@ -345,38 +413,278 @@ export class CkycTabComponent implements OnInit, OnDestroy {
    }
  }

+  private static readonly CARD_TITLES: Record<CkycDocKind, string> = {
+    ADDRESS_PROOF: 'Address Proof Document',
+    PHOTO_PROOF: 'Photo Proof Document',
+    CLIENT_IMAGE: 'Image of Client',
+    CLIENT_SIGNATURE: 'Signature of Client'
+  };
+
+  /** Opens the picker/preview popup for one card and, once the user confirms a file there, feeds
+   *  the picked type/file(s) into the same upload path the card always used. Picking and preview
+   *  now live entirely in the dialog — this screen only stages the result and re-runs upload. */
+  openUploadDialog(kind: CkycDocKind): void {
+    const isProofKind = kind === 'ADDRESS_PROOF' || kind === 'PHOTO_PROOF';
+    const action = this.existing[kind].present ? 'Replace' : 'Upload';
+    const existingDates = isProofKind
+      ? this.parseDescriptionDates(this.existing[kind].description)
+      : { issueDate: null, expiryDate: null };
+
+    const ref = this.dialog.open(CkycUploadDialogComponent, {
+      width: '480px',
+      maxWidth: '95vw',
+      data: {
+        title: `${action} ${CkycTabComponent.CARD_TITLES[kind]}`,
+        isProofKind,
+        accept: isProofKind ? '.png,.jpeg,.jpg,.pdf' : '.png,.jpeg,.jpg',
+        proofOptions:
+          kind === 'PHOTO_PROOF'
+            ? this.idProofOptions
+            : kind === 'ADDRESS_PROOF'
+              ? this.addressProofOptions
+              : undefined,
+        initialProofType: isProofKind ? this.selectedProofType[kind as ProofKind] : undefined,
+        initialDocumentKey: isProofKind ? this.existing[kind].documentKey || '' : undefined,
+        initialIssueDate: existingDates.issueDate,
+        initialExpiryDate: existingDates.expiryDate
+      }
+    });
+
+    ref.afterClosed().subscribe((result: CkycUploadDialogResult | null) => {
+      if (!result) return;
+      if (isProofKind) {
+        const proofKind = kind as ProofKind;
+        this.selectedProofType[proofKind] = result.proofType || null;
+        this.docFiles[proofKind] = { front: result.front, back: result.back || null };
+        this.documentDetails[proofKind] = {
+          documentKey: result.documentKey || '',
+          issueDate: result.issueDate || null,
+          expiryDate: result.expiryDate || null
+        };
+      } else if (kind === 'CLIENT_IMAGE') {
+        this.clientImageFile = result.front;
+      } else {
+        this.clientSignatureFile = result.front;
+      }
+      this.uploadDocument(kind);
+    });
+  }
+
+  /** Reads back the "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" convention this tab (and
+   *  client-india-address-step, for address proof) writes into the identifier's description. */
+  private parseDescriptionDates(description: string | undefined): { issueDate: Date | null; expiryDate: Date | null } {
+    const issueMatch = (description || '').match(/Issue date:\s*([^,|]+)/i);
+    const expiryMatch = (description || '').match(/Expiry date:\s*([^,|]+)/i);
+    return {
+      issueDate: issueMatch ? this.dates.parseDate(issueMatch[1].trim()) : null,
+      expiryDate: expiryMatch ? this.dates.parseDate(expiryMatch[1].trim()) : null
+    };
+  }
+
+  private buildDescription(issueDate: string | null, expiryDate: string | null): string {
+    const parts: string[] = [];
+    if (issueDate) parts.push(`Issue date: ${issueDate}`);
+    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+    return parts.join(', ');
+  }
+
+  /** Issue/expiry date for display on the card, formatted dd-MM-yyyy — parsed from the same
+   *  description text the upload dialog writes. */
+  cardDate(kind: ProofKind, which: 'issue' | 'expiry'): string {
+    const parsed = this.parseDescriptionDates(this.existing[kind].description);
+    const value = which === 'issue' ? parsed.issueDate : parsed.expiryDate;
+    return value ? this.dates.formatDate(value, 'dd-MM-yyyy') : '';
+  }
+
+  /**
+   * Routes each card to whichever real endpoint that artefact is actually stored through — there
+   * is no single "/clients/{id}/ckyc/documents" resource on the backend, so posting every card to
+   * one made-up URL 404'd for all four. A photo goes to the image endpoint, a signature to the
+   * client's own documents, and an ID/address proof to the m_client_identifier it already belongs
+   * to (the same one the Identities tab and create-client stepper post to) — never a fresh,
+   * type-less upload, since which identifier a proof belongs to is exactly what makes it that
+   * proof rather than some other file on the client's record.
+   */
  uploadDocument(documentType: string): void {
+    if (documentType === 'PHOTO_PROOF' || documentType === 'ADDRESS_PROOF') {
+      this.uploadProofDocument(documentType);
+      return;
+    }
+
    const file = this.getFile(documentType);
    if (!file) return;

    this.uploading[documentType] = true;
    this.uploadErrors[documentType] = null;
+    const key = documentType as keyof typeof this.existing;

-    const formData = new FormData();
-    formData.append('file', file);
-    formData.append('documentType', documentType);
+    let request$: Observable<any>;
+    switch (documentType) {
+      case 'CLIENT_IMAGE':
+        request$ = this.clientsService.uploadClientProfileImage(this.clientId, file);
+        break;
+      case 'CLIENT_SIGNATURE':
+        request$ = this.clientsService.uploadClientSignatureImage(this.clientId, file);
+        break;
+      default:
+        return;
+    }

-    this.clientsService
-      .uploadCkycDocument(this.clientId, formData)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.uploading[documentType] = false;
-          this.uploadResponses[documentType] = response;
-          this.alertService.alert({
-            type: 'success',
-            message: response?.message || 'Document uploaded successfully.'
-          });
-        },
-        error: (err: any) => {
-          this.uploading[documentType] = false;
-          this.uploadErrors[documentType] =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'Failed to upload document.';
+    request$.pipe(takeUntil(this.destroy$)).subscribe({
+      next: () => {
+        this.uploading[documentType] = false;
+        this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
+        this.refreshPreview(documentType);
+      },
+      error: (err: any) => {
+        this.uploading[documentType] = false;
+        this.uploadErrors[documentType] = this.extractErrorMessage(err);
+      }
+    });
+  }
+
+  /**
+   * Proof cards work like the create-client KYC step: pick a document type first (its `sides`
+   * decides whether one image or a front+back pair is required), then upload. Reuses the same
+   * identifier the Identities tab manages — updates its documentTypeId if the picked type
+   * changed, or creates a fresh identifier when none exists yet, so this card never depends on
+   * a separate trip to the Identities tab.
+   */
+  private uploadProofDocument(kind: ProofKind): void {
+    const proof = this.selectedProofType[kind];
+    if (!proof) {
+      this.uploadErrors[kind] = 'Select a document type first.';
+      return;
+    }
+    const files = this.docFiles[kind];
+    if (!files.front || (proof.sides === 2 && !files.back)) {
+      this.uploadErrors[kind] =
+        proof.sides === 2
+          ? 'Both front and back images are required for this document type.'
+          : 'Select a file to upload.';
+      return;
+    }
+
+    this.uploading[kind] = true;
+    this.uploadErrors[kind] = null;
+
+    const existingId = this.existing[kind].documentId;
+    const details = this.documentDetails[kind];
+    const documentKey = details.documentKey || `${proof.name} - ${this.clientId}`;
+    const description = this.buildDescription(details.issueDate, details.expiryDate);
+
+    const identifier$: Observable<any> = !existingId
+      ? this.clientsService.addClientIdentifier(this.clientId, {
+          documentTypeId: proof.id,
+          status: 'ACTIVE',
+          documentKey,
+          description: description || 'KYC document'
+        })
+      : this.clientsService.updateClientIdentifier(this.clientId, existingId, {
+          documentTypeId: proof.id,
+          status: 'ACTIVE',
+          documentKey,
+          description
+        });
+
+    identifier$.pipe(takeUntil(this.destroy$)).subscribe({
+      next: (res: any) => {
+        const identifierId = existingId || res?.resourceId;
+        const uploads: Observable<any>[] = [];
+
+        const front = new FormData();
+        front.append('name', proof.sides === 2 ? `${proof.name} — Front` : proof.name);
+        front.append('file', files.front!);
+        uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, front));
+
+        if (proof.sides === 2 && files.back) {
+          const back = new FormData();
+          back.append('name', `${proof.name} — Back`);
+          back.append('file', files.back);
+          uploads.push(this.clientsService.uploadClientIdentifierDocument(identifierId, back));
        }
-      });
+
+        forkJoin(uploads)
+          .pipe(takeUntil(this.destroy$))
+          .subscribe({
+            next: () => {
+              this.uploading[kind] = false;
+              this.existing[kind].present = true;
+              this.existing[kind].documentId = identifierId;
+              this.existing[kind].documentTypeId = String(proof.id);
+              this.existing[kind].documentKey = details.documentKey || '';
+              this.existing[kind].description = description;
+              this.existing[kind].name = proof.name;
+              this.existing[kind].source = this.existing[kind].source || 'Identities section';
+              this.docFiles[kind] = { front: null, back: null };
+              this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
+              this.refreshPreview(kind);
+            },
+            error: (err: any) => {
+              this.uploading[kind] = false;
+              this.uploadErrors[kind] = this.extractErrorMessage(err);
+            }
+          });
+      },
+      error: (err: any) => {
+        this.uploading[kind] = false;
+        this.uploadErrors[kind] = this.extractErrorMessage(err);
+      }
+    });
+  }
+
+  private extractErrorMessage(err: any): string {
+    return (
+      err?.error?.errors?.[0]?.defaultUserMessage ||
+      err?.error?.developerMessage ||
+      err?.error?.defaultUserMessage ||
+      err?.message ||
+      'Failed to upload document.'
+    );
+  }
+
+  /** Re-fetches whichever artefact was just replaced, so its preview reflects the new file
+   *  immediately instead of the one this screen loaded on entry. */
+  private refreshPreview(documentType: string): void {
+    const staleKey = documentType as keyof typeof this.existing;
+    if (this.existing[staleKey].previewUrl?.startsWith('blob:')) {
+      URL.revokeObjectURL(this.existing[staleKey].previewUrl!);
+    }
+    if (this.existing[staleKey].previewUrlBack?.startsWith('blob:')) {
+      URL.revokeObjectURL(this.existing[staleKey].previewUrlBack!);
+    }
+    switch (documentType) {
+      case 'CLIENT_IMAGE':
+        this.clientsService
+          .getClientProfileImage(this.clientId)
+          .pipe(takeUntil(this.destroy$))
+          .subscribe((photo: any) => {
+            if (photo) this.existing.CLIENT_IMAGE.previewUrl = photo;
+          });
+        break;
+      case 'CLIENT_SIGNATURE':
+        this.clientsService
+          .getClientDocuments(this.clientId)
+          .pipe(takeUntil(this.destroy$))
+          .subscribe((documents: any) => {
+            const doc = (documents as any[])
+              ?.filter((d: any) => d?.name === 'clientSignature')
+              ?.sort((a: any, b: any) => b.id - a.id)?.[0];
+            if (!doc) return;
+            this.existing.CLIENT_SIGNATURE.documentId = doc.id;
+            this.clientsService
+              .getClientSignatureImage(this.clientId, doc.id)
+              .pipe(takeUntil(this.destroy$))
+              .subscribe((blob: any) => {
+                if (blob) this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
+              });
+          });
+        break;
+      case 'PHOTO_PROOF':
+      case 'ADDRESS_PROOF':
+        this.loadIdentifierDocPreview(documentType, this.existing[documentType].documentId!);
+        break;
+    }
  }

  ngOnDestroy(): void {
@@ -385,6 +693,7 @@ export class CkycTabComponent implements OnInit, OnDestroy {
    // Release object URLs
    Object.values(this.existing).forEach((e) => {
      if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
+      if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
    });
  }
 }
@@ -0,0 +1,167 @@
+<!--
+  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="cud-header">
+  <div class="cud-header__badge">
+    <fa-icon icon="folder-open"></fa-icon>
+  </div>
+  <div class="cud-header__text">
+    <h2 mat-dialog-title class="cud-title">{{ data.title }}</h2>
+    <p class="cud-subtitle">Fill in the document details, then attach the scan.</p>
+  </div>
+  <button mat-icon-button mat-dialog-close class="cud-close" aria-label="Close">
+    <fa-icon icon="times"></fa-icon>
+  </button>
+</div>
+
+<mat-dialog-content class="cud-body">
+  @if (data.isProofKind) {
+    <div class="cud-section">
+      <span class="cud-section__label"><fa-icon icon="id-card"></fa-icon> Document type</span>
+      <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
+        <mat-select
+          [value]="selectedProofType"
+          [compareWith]="compareProofType"
+          placeholder="Select document type"
+          (selectionChange)="onProofTypeChange($event.value)"
+        >
+          @for (p of data.proofOptions; track p.id) {
+            <mat-option [value]="p">{{ p.name }}</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+      <p class="cud-hint">Upload requirements will update automatically based on the type you pick.</p>
+    </div>
+
+    @if (selectedProofType) {
+      @if (selectedProofType.info) {
+        <div class="cud-banner">
+          <fa-icon icon="check-circle"></fa-icon>
+          <span>{{ selectedProofType.info }}</span>
+        </div>
+      }
+
+      <div class="cud-section">
+        <span class="cud-section__label">
+          <fa-icon icon="hashtag"></fa-icon>
+          {{ selectedProofType.documentKeyLabel || 'Document number' }}
+        </span>
+        <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
+          <input
+            matInput
+            [(ngModel)]="documentKey"
+            [ngModelOptions]="{ standalone: true }"
+            [placeholder]="selectedProofType.documentKeyPlaceholder || 'Enter document number'"
+          />
+        </mat-form-field>
+      </div>
+
+      <div class="cud-section cud-section--dates">
+        <div class="cud-date-field">
+          <span class="cud-section__label"><fa-icon icon="calendar-check"></fa-icon> Issue date</span>
+          <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
+            <input
+              matInput
+              readonly
+              [matDatepicker]="issuePicker"
+              [(ngModel)]="issueDate"
+              [ngModelOptions]="{ standalone: true }"
+              placeholder="Optional"
+              (click)="issuePicker.open()"
+            />
+            <mat-datepicker-toggle matSuffix [for]="issuePicker"></mat-datepicker-toggle>
+            <mat-datepicker #issuePicker></mat-datepicker>
+          </mat-form-field>
+        </div>
+        <div class="cud-date-field">
+          <span class="cud-section__label"><fa-icon icon="calendar-check"></fa-icon> Expiry date</span>
+          <mat-form-field appearance="outline" class="cud-field" subscriptSizing="dynamic">
+            <input
+              matInput
+              readonly
+              [matDatepicker]="expiryPicker"
+              [(ngModel)]="expiryDate"
+              [ngModelOptions]="{ standalone: true }"
+              placeholder="Optional"
+              (click)="expiryPicker.open()"
+            />
+            <mat-datepicker-toggle matSuffix [for]="expiryPicker"></mat-datepicker-toggle>
+            <mat-datepicker #expiryPicker></mat-datepicker>
+          </mat-form-field>
+        </div>
+      </div>
+
+      <div class="cud-divider"><span>Scan</span></div>
+
+      <div class="cud-grid" [class.cud-grid--two]="sides === 2">
+        <div class="cud-slot">
+          <span class="cud-slot__label">{{ sides === 2 ? 'Front side' : 'Document' }}</span>
+          <label class="cud-dropzone" [class.cud-dropzone--has]="front">
+            <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('front', $event)" />
+            @if (frontPreview) {
+              <img [src]="frontPreview" alt="Front side preview" class="cud-dropzone__img" />
+            } @else if (front) {
+              <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
+              <p class="cud-dropzone__name">{{ front.name }}</p>
+            } @else {
+              <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
+              <p class="cud-dropzone__text">Click to choose file</p>
+            }
+          </label>
+        </div>
+
+        @if (sides === 2) {
+          <div class="cud-slot">
+            <span class="cud-slot__label">Back side</span>
+            <label class="cud-dropzone" [class.cud-dropzone--has]="back">
+              <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('back', $event)" />
+              @if (backPreview) {
+                <img [src]="backPreview" alt="Back side preview" class="cud-dropzone__img" />
+              } @else if (back) {
+                <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
+                <p class="cud-dropzone__name">{{ back.name }}</p>
+              } @else {
+                <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
+                <p class="cud-dropzone__text">Click to choose file</p>
+              }
+            </label>
+          </div>
+        }
+      </div>
+    }
+  } @else {
+    <div class="cud-grid">
+      <div class="cud-slot">
+        <span class="cud-slot__label">Document</span>
+        <label class="cud-dropzone" [class.cud-dropzone--has]="front">
+          <input type="file" [attr.accept]="data.accept" hidden (change)="onFilePick('front', $event)" />
+          @if (frontPreview) {
+            <img [src]="frontPreview" alt="Preview" class="cud-dropzone__img" />
+          } @else if (front) {
+            <fa-icon icon="file-alt" class="cud-dropzone__icon"></fa-icon>
+            <p class="cud-dropzone__name">{{ front.name }}</p>
+          } @else {
+            <fa-icon icon="cloud-upload-alt" class="cud-dropzone__icon"></fa-icon>
+            <p class="cud-dropzone__text">Click to choose file</p>
+          }
+        </label>
+      </div>
+    </div>
+  }
+</mat-dialog-content>
+
+<mat-dialog-actions class="cud-actions" align="end">
+  <button mat-stroked-button type="button" (click)="cancel()">
+    <fa-icon icon="times"></fa-icon>
+    &nbsp;Cancel
+  </button>
+  <button mat-flat-button color="primary" type="button" [disabled]="!canSubmit" (click)="submit()">
+    <fa-icon icon="upload"></fa-icon>
+    &nbsp;Upload
+  </button>
+</mat-dialog-actions>
@@ -0,0 +1,270 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+:host {
+  display: block;
+  max-width: 100%;
+}
+
+/* ===================== Header ===================== */
+.cud-header {
+  display: flex;
+  align-items: flex-start;
+  gap: 12px;
+  padding: 20px 24px 16px;
+  border-bottom: 1px solid #eef1f4;
+
+  &__badge {
+    flex-shrink: 0;
+    width: 36px;
+    height: 36px;
+    border-radius: 9px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 15px;
+    color: #fff;
+    background: linear-gradient(135deg, #1a73e8, #4285f4);
+    box-shadow: 0 3px 10px rgb(26 115 232 / 28%);
+  }
+
+  &__text {
+    flex: 1;
+    min-width: 0;
+  }
+}
+
+.cud-title {
+  margin: 0 !important;
+  padding: 0;
+  font-size: 16px;
+  font-weight: 700;
+  color: #1a1d21;
+  line-height: 1.3;
+}
+
+.cud-subtitle {
+  margin: 2px 0 0;
+  font-size: 12px;
+  color: #6b7280;
+}
+
+.cud-close {
+  flex-shrink: 0;
+  width: 32px;
+  height: 32px;
+  margin: -4px -4px 0 0;
+  color: #9aa0a6;
+
+  &:hover {
+    color: #3c4043;
+  }
+}
+
+/* ===================== Body / sections ===================== */
+.cud-body.mat-mdc-dialog-content {
+  padding: 18px 24px !important;
+  max-height: 70vh;
+}
+
+.cud-section {
+  margin-bottom: 14px;
+
+  &--dates {
+    display: flex;
+    gap: 14px;
+
+    .cud-date-field {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  &__label {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    font-size: 11px;
+    font-weight: 700;
+    color: #475569;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+    margin-bottom: 6px;
+
+    fa-icon {
+      color: #1a73e8;
+      font-size: 10.5px;
+    }
+  }
+}
+
+.cud-field {
+  width: 100%;
+}
+
+.cud-hint {
+  font-size: 12px;
+  color: #6b7280;
+  margin: 6px 0 0;
+  line-height: 1.4;
+}
+
+.cud-banner {
+  display: flex;
+  align-items: flex-start;
+  gap: 9px;
+  padding: 10px 14px;
+  margin-bottom: 14px;
+  background: #f0fbf6;
+  border: 1px solid #cfecdd;
+  border-radius: 10px;
+  font-size: 12.5px;
+  color: #085041;
+  line-height: 1.45;
+
+  fa-icon {
+    margin-top: 2px;
+    color: #1d9e75;
+    flex-shrink: 0;
+  }
+}
+
+.cud-divider {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin: 16px 0 12px;
+  font-size: 10.5px;
+  font-weight: 700;
+  color: #9aa0a6;
+  text-transform: uppercase;
+  letter-spacing: 0.08em;
+
+  &::before,
+  &::after {
+    content: '';
+    flex: 1;
+    height: 1px;
+    background: #eef1f4;
+  }
+}
+
+/* ===================== Front/back scan grid ===================== */
+.cud-grid {
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: 12px;
+
+  &--two {
+    grid-template-columns: repeat(2, 1fr);
+  }
+}
+
+.cud-slot {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+
+  &__label {
+    font-size: 10.5px;
+    font-weight: 700;
+    color: #5f6368;
+    text-transform: uppercase;
+    letter-spacing: 0.05em;
+  }
+}
+
+.cud-dropzone {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  min-height: 130px;
+  padding: 16px;
+  border: 2px dashed #cbd5e1;
+  border-radius: 12px;
+  cursor: pointer;
+  text-align: center;
+  background: #fafbfc;
+  transition:
+    border-color 0.15s,
+    background 0.15s,
+    box-shadow 0.15s;
+
+  &:hover {
+    border-color: #1a73e8;
+    background: #f5f9ff;
+    box-shadow: 0 2px 10px rgb(26 115 232 / 10%);
+  }
+
+  &--has {
+    border-style: solid;
+    border-color: #1d9e75;
+    background: #f0fbf6;
+  }
+
+  &__icon {
+    font-size: 22px;
+    color: #9aa5b1;
+  }
+
+  &--has &__icon {
+    color: #1d9e75;
+  }
+
+  &__text {
+    font-size: 12px;
+    color: #64748b;
+    margin: 0;
+    font-weight: 500;
+  }
+
+  &__name {
+    font-size: 11.5px;
+    color: #085041;
+    font-weight: 600;
+    margin: 0;
+    word-break: break-all;
+    padding: 0 8px;
+  }
+
+  &__img {
+    max-width: 100%;
+    max-height: 150px;
+    border-radius: 8px;
+    object-fit: contain;
+    box-shadow: 0 2px 8px rgb(0 0 0 / 8%);
+  }
+}
+
+/* ===================== Actions ===================== */
+.cud-actions {
+  padding: 12px 24px !important;
+  margin: 0 !important;
+  border-top: 1px solid #eef1f4;
+
+  fa-icon {
+    font-size: 12px;
+  }
+}
+
+@media (width <= 560px) {
+  :host {
+    width: 100%;
+  }
+
+  .cud-section--dates {
+    flex-direction: column;
+    gap: 14px;
+  }
+
+  .cud-grid--two {
+    grid-template-columns: 1fr;
+  }
+}
@@ -0,0 +1,155 @@
+/**
+ * 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, OnDestroy, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import {
+  MatDialogRef,
+  MAT_DIALOG_DATA,
+  MatDialogTitle,
+  MatDialogContent,
+  MatDialogActions,
+  MatDialogClose
+} from '@angular/material/dialog';
+import { MatIconButton } from '@angular/material/button';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { Dates } from 'app/core/utils/dates';
+import { ProofType } from '../../../shared/kyc-proof-types';
+
+export interface CkycUploadDialogData {
+  title: string;
+  isProofKind: boolean;
+  accept: string;
+  proofOptions?: ProofType[];
+  initialProofType?: ProofType | null;
+  initialDocumentKey?: string;
+  initialIssueDate?: Date | null;
+  initialExpiryDate?: Date | null;
+}
+
+export interface CkycUploadDialogResult {
+  proofType?: ProofType | null;
+  front: File;
+  back?: File;
+  /** Document number (Aadhaar/PAN/Passport number, etc.) — same field client creation collects. */
+  documentKey?: string;
+  /** 'yyyy-MM-dd', same as the rest of this app's date fields. */
+  issueDate?: string | null;
+  expiryDate?: string | null;
+}
+
+/**
+ * A focused popup for replacing/uploading one CKYC artefact at a time — opened from each card on
+ * the CKYC tab instead of expanding a form inline underneath it. Collects the same details
+ * client creation does for an identity/address proof (document type, number, issue + expiry
+ * date) and shows a client-side preview of whatever image is picked before it's ever sent to the
+ * server; the actual upload still happens back in CkycTabComponent (this dialog only collects
+ * the type, number, dates and file(s), then hands them back).
+ */
+@Component({
+  selector: 'mifosx-ckyc-upload-dialog',
+  templateUrl: './ckyc-upload-dialog.component.html',
+  styleUrls: ['./ckyc-upload-dialog.component.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FormsModule,
+    MatDialogTitle,
+    MatDialogContent,
+    MatDialogActions,
+    MatDialogClose,
+    MatIconButton,
+    FaIconComponent
+  ]
+})
+export class CkycUploadDialogComponent implements OnDestroy {
+  private dates = inject(Dates);
+  dialogRef = inject<MatDialogRef<CkycUploadDialogComponent, CkycUploadDialogResult | null>>(MatDialogRef);
+  data = inject<CkycUploadDialogData>(MAT_DIALOG_DATA);
+
+  selectedProofType: ProofType | null = this.data.initialProofType || null;
+  documentKey = this.data.initialDocumentKey || '';
+  issueDate: Date | null = this.data.initialIssueDate || null;
+  expiryDate: Date | null = this.data.initialExpiryDate || null;
+
+  front: File | null = null;
+  back: File | null = null;
+  frontPreview: string | null = null;
+  backPreview: string | null = null;
+
+  get sides(): number {
+    return this.data.isProofKind ? (this.selectedProofType?.sides ?? 1) : 1;
+  }
+
+  get canSubmit(): boolean {
+    if (this.data.isProofKind) {
+      if (!this.selectedProofType) return false;
+      if (!this.documentKey.trim()) return false;
+    }
+    if (!this.front) return false;
+    if (this.sides === 2 && !this.back) return false;
+    return true;
+  }
+
+  compareProofType = (a: ProofType | null, b: ProofType | null): boolean => (a?.id ?? null) === (b?.id ?? null);
+
+  onProofTypeChange(proof: ProofType | null): void {
+    this.selectedProofType = proof;
+    this.clearSlot('front');
+    this.clearSlot('back');
+  }
+
+  onFilePick(slot: 'front' | 'back', event: any): void {
+    const file = event?.target?.files?.[0];
+    if (event?.target) event.target.value = '';
+    if (!file) return;
+
+    this.clearSlot(slot);
+    const preview = file.type?.startsWith('image/') ? URL.createObjectURL(file) : null;
+    if (slot === 'front') {
+      this.front = file;
+      this.frontPreview = preview;
+    } else {
+      this.back = file;
+      this.backPreview = preview;
+    }
+  }
+
+  private clearSlot(slot: 'front' | 'back'): void {
+    if (slot === 'front') {
+      if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
+      this.front = null;
+      this.frontPreview = null;
+    } else {
+      if (this.backPreview) URL.revokeObjectURL(this.backPreview);
+      this.back = null;
+      this.backPreview = null;
+    }
+  }
+
+  submit(): void {
+    if (!this.canSubmit) return;
+    this.dialogRef.close({
+      proofType: this.selectedProofType,
+      front: this.front!,
+      back: this.sides === 2 ? this.back! : undefined,
+      documentKey: this.data.isProofKind ? this.documentKey.trim() : undefined,
+      issueDate: this.issueDate ? this.dates.getDate(this.issueDate) : null,
+      expiryDate: this.expiryDate ? this.dates.getDate(this.expiryDate) : null
+    });
+  }
+
+  cancel(): void {
+    this.dialogRef.close(null);
+  }
+
+  ngOnDestroy(): void {
+    if (this.frontPreview) URL.revokeObjectURL(this.frontPreview);
+    if (this.backPreview) URL.revokeObjectURL(this.backPreview);
+  }
+}
@@ -229,7 +229,7 @@ export class IdentitiesTabComponent implements OnDestroy {
      }
      const identifierData = {
        documentTypeId,
-        status: 'Active',
+        status: 'ACTIVE',
        documentKey: kind === 'id' ? section.documentKey : `${proofName} - ${this.clientId}`,
        description: kind === 'address' && section.address ? section.address : description
      };
@@ -82,12 +82,13 @@
            <strong class="kyc-doc-alert__title">{{ kycDocumentAlertTitle }}</strong>
            <p class="kyc-doc-alert__text">{{ kycDocumentAlertMessage }}</p>
          </div>
+          <!-- Same dialog as the document's own row: the banner is asking for exactly that. -->
          <button
            mat-flat-button
            color="primary"
            type="button"
            class="kyc-doc-alert__action"
-            (click)="toggleEditMode()"
+            (click)="updateKycDocument()"
          >
            Update Document
          </button>
@@ -280,6 +281,82 @@
            </span>
          </div>

+          <!--
+          The OTP exchange, directly under the row that started it.
+
+          It used to sit at the very bottom of the tab, past the PAN-Aadhaar seeding panel: clicking
+          Re-Verify appeared to do nothing, because the input it opened was off-screen. Keeping it
+          against the Aadhaar row means the field is where the officer is already looking.
+        -->
+          @if (showAadhaarReVerify && !aadhaarOtpSent) {
+            <div class="kv-otp-bar kv-otp-bar--inline">
+              <mat-form-field appearance="outline" class="kv-otp-input">
+                <mat-label>Enter 12-digit Aadhaar</mat-label>
+                <input
+                  matInput
+                  [(ngModel)]="aadhaarFullNumber"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="12"
+                  type="password"
+                />
+              </mat-form-field>
+              <button
+                mat-raised-button
+                color="primary"
+                type="button"
+                class="kv-otp-btn"
+                [disabled]="!aadhaarFullNumber || aadhaarFullNumber.length !== 12 || verifying.aadhaar"
+                (click)="sendAadhaarOtp()"
+              >
+                @if (verifying.aadhaar) {
+                  <mat-progress-spinner diameter="14" mode="indeterminate"></mat-progress-spinner>
+                } @else {
+                  Send OTP
+                }
+              </button>
+              <button mat-button type="button" class="kv-otp-btn" (click)="cancelAadhaarReVerify()">Cancel</button>
+            </div>
+          }
+          @if (aadhaarOtpSent) {
+            <div class="kv-otp-bar kv-otp-bar--inline">
+              <span class="kv-otp-label"><mat-icon>sms</mat-icon> OTP sent</span>
+              <mat-form-field appearance="outline" class="kv-otp-input">
+                <mat-label>Enter OTP</mat-label>
+                <input
+                  matInput
+                  [(ngModel)]="aadhaarOtp"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="6"
+                  autocomplete="one-time-code"
+                />
+              </mat-form-field>
+              <button
+                mat-raised-button
+                color="primary"
+                type="button"
+                class="kv-otp-btn"
+                [disabled]="!aadhaarOtp || aadhaarOtp.length < 4 || aadhaarOtpVerifying"
+                (click)="verifyAadhaarOtp()"
+              >
+                @if (aadhaarOtpVerifying) {
+                  <mat-progress-spinner diameter="14" mode="indeterminate"></mat-progress-spinner>
+                } @else {
+                  Verify
+                }
+              </button>
+              <button
+                mat-stroked-button
+                type="button"
+                class="kv-otp-btn"
+                [disabled]="verifying.aadhaar"
+                (click)="sendAadhaarOtp()"
+              >
+                Resend
+              </button>
+              <button mat-button type="button" class="kv-otp-btn" (click)="cancelAadhaarReVerify()">Cancel</button>
+            </div>
+          }
+
          <!--
          Aadhaar is unverified but an enrolment receipt is on file. Shown in full because it is the
          only reason Aadhaar carries no KYC exception.
@@ -394,7 +471,11 @@
              }
            </span>
            <span class="kv-table__col kv-table__col--action">
-              <button mat-stroked-button class="kv-action-btn" type="button" (click)="toggleEditMode()">Update</button>
+              <!-- The document is re-collected in its own dialog, the way PAN and Aadhaar are dealt
+                   with on their rows, rather than by opening the whole KYC form for editing. -->
+              <button mat-stroked-button class="kv-action-btn" type="button" (click)="updateKycDocument()">
+                Update
+              </button>
            </span>
          </div>
        }
@@ -565,73 +646,6 @@
        </div>
      }

-      <!-- Aadhaar OTP inline (shown below table when re-verifying) -->
-      @if (showAadhaarReVerify && !aadhaarOtpSent) {
-        <div class="kv-otp-bar">
-          <mat-form-field appearance="outline" class="kv-otp-input">
-            <mat-label>Enter 12-digit Aadhaar</mat-label>
-            <input
-              matInput
-              [(ngModel)]="aadhaarFullNumber"
-              [ngModelOptions]="{ standalone: true }"
-              maxlength="12"
-              type="password"
-            />
-          </mat-form-field>
-          <button
-            mat-raised-button
-            color="primary"
-            type="button"
-            class="kv-otp-btn"
-            [disabled]="!aadhaarFullNumber || aadhaarFullNumber.length !== 12 || verifying.aadhaar"
-            (click)="sendAadhaarOtp()"
-          >
-            @if (verifying.aadhaar) {
-              <mat-progress-spinner diameter="14" mode="indeterminate"></mat-progress-spinner>
-            } @else {
-              Send OTP
-            }
-          </button>
-        </div>
-      }
-      @if (aadhaarOtpSent) {
-        <div class="kv-otp-bar">
-          <span class="kv-otp-label"><mat-icon>sms</mat-icon> OTP sent</span>
-          <mat-form-field appearance="outline" class="kv-otp-input">
-            <mat-label>Enter OTP</mat-label>
-            <input
-              matInput
-              [(ngModel)]="aadhaarOtp"
-              [ngModelOptions]="{ standalone: true }"
-              maxlength="6"
-              autocomplete="one-time-code"
-            />
-          </mat-form-field>
-          <button
-            mat-raised-button
-            color="primary"
-            type="button"
-            class="kv-otp-btn"
-            [disabled]="!aadhaarOtp || aadhaarOtp.length < 4 || aadhaarOtpVerifying"
-            (click)="verifyAadhaarOtp()"
-          >
-            @if (aadhaarOtpVerifying) {
-              <mat-progress-spinner diameter="14" mode="indeterminate"></mat-progress-spinner>
-            } @else {
-              Verify
-            }
-          </button>
-          <button
-            mat-stroked-button
-            type="button"
-            class="kv-otp-btn"
-            [disabled]="verifying.aadhaar"
-            (click)="sendAadhaarOtp()"
-          >
-            Resend
-          </button>
-        </div>
-      }
      @if (verificationError.aadhaar) {
        <div class="kyc-error-msg">
          <mat-icon class="kyc-error-icon">error_outline</mat-icon> {{ verificationError.aadhaar }}
@@ -1128,6 +1142,137 @@
                </mat-select>
              </mat-form-field>

+              <!-- Officially Valid Document. Shown when one is on file or the alert is asking for
+                   it, so re-collecting an expired document is done on this form rather than
+                   sending the officer somewhere else. -->
+              @if (kycData?.kycDocumentName || kycDocumentNeedsUpdate) {
+                <div class="full-span kyc-doc-fields">
+                  <div class="kyc-doc-fields__head">
+                    <h4 class="kyc-doc-fields__title">Officially Valid Document</h4>
+                    @if (kycDocumentNeedsUpdate) {
+                      <span class="kyc-doc-fields__flag">Re-collect from the customer</span>
+                    }
+                  </div>
+
+                  <div class="kyc-doc-fields__grid">
+                    <mat-form-field appearance="outline">
+                      <mat-label>Document</mat-label>
+                      <mat-select formControlName="kycDocumentName">
+                        <mat-option value="Aadhaar Card">Aadhaar Card</mat-option>
+                        <mat-option value="Passport">Passport</mat-option>
+                        <mat-option value="Driving Licence">Driving Licence</mat-option>
+                        <mat-option value="Voter ID">Voter ID</mat-option>
+                        <mat-option value="NREGA Job Card">NREGA Job Card</mat-option>
+                        <mat-option value="Letter from National Population Register">Letter from NPR</mat-option>
+                      </mat-select>
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline">
+                      <mat-label>Document Number</mat-label>
+                      <input matInput formControlName="kycDocumentNumber" />
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline">
+                      <mat-label>Issued On</mat-label>
+                      <input
+                        matInput
+                        [matDatepicker]="docIssuePicker"
+                        [max]="maxDate"
+                        formControlName="kycDocIssueDate"
+                      />
+                      <mat-datepicker-toggle matSuffix [for]="docIssuePicker"></mat-datepicker-toggle>
+                      <mat-datepicker #docIssuePicker></mat-datepicker>
+                    </mat-form-field>
+
+                    <mat-form-field appearance="outline">
+                      <mat-label>Valid Till</mat-label>
+                      <input matInput [matDatepicker]="docExpiryPicker" formControlName="kycDocExpiryDate" />
+                      <mat-datepicker-toggle matSuffix [for]="docExpiryPicker"></mat-datepicker-toggle>
+                      <mat-datepicker #docExpiryPicker></mat-datepicker>
+                      <mat-hint>Blank if it does not expire</mat-hint>
+                    </mat-form-field>
+                  </div>
+
+                  <!-- The scan, where the document it belongs to is. Re-collecting an expiring
+                       document is what this panel is for, so sending the officer to the client
+                       edit screen to change the image made them leave the record they were
+                       working on and find the same document again. -->
+                  <div class="kyc-doc-scans">
+                    <div class="kyc-doc-scans__head">
+                      <mat-icon>photo_library</mat-icon>
+                      <span>Scanned document</span>
+                      @if (docScansLoading) {
+                        <mat-progress-spinner diameter="16" mode="indeterminate"></mat-progress-spinner>
+                      }
+                    </div>
+
+                    @if (!docScansLoading && !docScans.front && !docScans.back) {
+                      <div class="kyc-doc-scans__empty">
+                        No scan is on file for this document. Upload one below.
+                      </div>
+                    }
+
+                    <div class="kyc-doc-scans__sides">
+                      @for (slot of docScanSlots; track slot) {
+                        <div class="kyc-doc-side">
+                          <div class="kyc-doc-side__label">{{ slot === 'front' ? 'Front' : 'Back' }}</div>
+
+                          <div class="kyc-doc-side__frame">
+                            @if (docScanOf(slot)?.previewUrl) {
+                              <img
+                                [src]="docScanOf(slot)!.previewUrl"
+                                [alt]="slot === 'front' ? 'Front of document' : 'Back of document'"
+                              />
+                            } @else if (docScanOf(slot)) {
+                              <!-- On file but not an image (a PDF, say) — named rather than shown. -->
+                              <div class="kyc-doc-side__file">
+                                <mat-icon>description</mat-icon>
+                                <span>{{ docScanOf(slot)!.fileName }}</span>
+                              </div>
+                            } @else {
+                              <div class="kyc-doc-side__none">Not on file</div>
+                            }
+                          </div>
+
+                          <button
+                            type="button"
+                            mat-stroked-button
+                            class="kyc-doc-side__btn"
+                            [disabled]="!!docScanUploading || docScansLoading"
+                            (click)="scanInput.click()"
+                          >
+                            @if (docScanUploading === slot) {
+                              <mat-progress-spinner diameter="16" mode="indeterminate"></mat-progress-spinner>
+                              Uploading…
+                            } @else {
+                              {{ docScanOf(slot) ? 'Replace' : 'Upload' }}
+                            }
+                          </button>
+                          <input
+                            #scanInput
+                            type="file"
+                            hidden
+                            accept="image/*,application/pdf"
+                            (change)="onDocScanSelected($event, slot)"
+                          />
+                        </div>
+                      }
+                    </div>
+
+                    @if (docScanError) {
+                      <div class="kyc-doc-scans__msg kyc-doc-scans__msg--err">
+                        <mat-icon>error_outline</mat-icon><span>{{ docScanError }}</span>
+                      </div>
+                    }
+                    @if (docScanSuccess) {
+                      <div class="kyc-doc-scans__msg kyc-doc-scans__msg--ok">
+                        <mat-icon>check_circle</mat-icon><span>{{ docScanSuccess }}</span>
+                      </div>
+                    }
+                  </div>
+                </div>
+              }
+
              <!-- KYC Exception Flag -->
              <div
                class="full-span exception-controls-row"
@@ -856,6 +856,18 @@
  margin-bottom: 12px;
 }

+// Sitting inside the table, directly under the Aadhaar row it belongs to. Indented and tinted so
+// it reads as that row opening up rather than as a new section, and the flat top edge joins it to
+// the row above.
+.kv-otp-bar--inline {
+  margin: 0 0 8px 28px;
+  background: #eff6ff;
+  border-color: #bfdbfe;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  flex-wrap: wrap;
+}
+
 .kv-otp-label {
  display: flex;
  align-items: center;
@@ -1576,3 +1588,222 @@
    }
  }
 }
+
+// ── Officially valid document, on the edit form ────────────────────────────
+// Set apart from the identity fields above it because it is one document with its own
+// provenance — a type, a number, and the two dates that decide whether it is still valid —
+// rather than four unrelated inputs.
+
+.kyc-doc-fields {
+  margin: 4px 0 20px;
+  padding: 16px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #f8fafc;
+}
+
+.kyc-doc-fields__head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  margin-bottom: 14px;
+  flex-wrap: wrap;
+}
+
+.kyc-doc-fields__title {
+  margin: 0;
+  font-size: 13px;
+  font-weight: 600;
+  letter-spacing: 0.02em;
+  text-transform: uppercase;
+  color: #475569;
+}
+
+.kyc-doc-fields__flag {
+  padding: 3px 10px;
+  border-radius: 999px;
+  font-size: 11px;
+  font-weight: 600;
+  color: #92400e;
+  background: #fef3c7;
+}
+
+// Four across on a wide screen, folding to two and then one. The dates sit next to each other
+// at every width, since it is the pair that has to be read together.
+.kyc-doc-fields__grid {
+  display: grid;
+  grid-template-columns: repeat(4, minmax(0, 1fr));
+  gap: 12px;
+
+  @media (width <= 1280px) {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+
+  @media (width <= 640px) {
+    grid-template-columns: minmax(0, 1fr);
+  }
+
+  mat-form-field {
+    width: 100%;
+  }
+}
+
+.kyc-doc-scans-link {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 4px;
+  padding: 10px 12px;
+  border: 1px dashed #cbd5e1;
+  border-radius: 6px;
+  font-size: 13px;
+  color: #334155;
+  text-decoration: none;
+  background: #fff;
+  transition:
+    border-color 0.15s,
+    background 0.15s;
+
+  &:hover {
+    border-color: #94a3b8;
+    background: #f1f5f9;
+  }
+
+  mat-icon {
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+    color: #64748b;
+  }
+}
+
+.kyc-doc-scans-link__go {
+  margin-left: auto;
+}
+
+/* The scan itself, beside the number and dates it belongs to. */
+.kyc-doc-scans {
+  margin-top: 10px;
+  padding: 12px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #fff;
+}
+
+.kyc-doc-scans__head {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 10px;
+  font-size: 12px;
+  font-weight: 700;
+  letter-spacing: 0.03em;
+  text-transform: uppercase;
+  color: #475569;
+
+  mat-icon {
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+    color: #64748b;
+  }
+}
+
+.kyc-doc-scans__empty {
+  margin-bottom: 10px;
+  font-size: 12.5px;
+  color: #64748b;
+}
+
+.kyc-doc-scans__sides {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 14px;
+}
+
+.kyc-doc-side {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  width: 190px;
+}
+
+.kyc-doc-side__label {
+  font-size: 11.5px;
+  font-weight: 700;
+  color: #334155;
+}
+
+/* Fixed height so front and back line up whatever the scan's aspect ratio is. */
+.kyc-doc-side__frame {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 118px;
+  padding: 6px;
+  border: 1px solid #e2e8f0;
+  border-radius: 6px;
+  background: #f8fafc;
+  overflow: hidden;
+
+  img {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+    border-radius: 3px;
+  }
+}
+
+.kyc-doc-side__none {
+  font-size: 12px;
+  color: #94a3b8;
+}
+
+.kyc-doc-side__file {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 0 6px;
+  font-size: 11px;
+  color: #475569;
+  text-align: center;
+  word-break: break-word;
+
+  mat-icon {
+    color: #64748b;
+  }
+}
+
+.kyc-doc-side__btn {
+  font-size: 12px;
+
+  mat-progress-spinner {
+    display: inline-block;
+    margin-right: 6px;
+    vertical-align: middle;
+  }
+}
+
+.kyc-doc-scans__msg {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  margin-top: 10px;
+  font-size: 12.5px;
+
+  mat-icon {
+    font-size: 17px;
+    width: 17px;
+    height: 17px;
+  }
+
+  &--err {
+    color: #b91c1c;
+  }
+
+  &--ok {
+    color: #15803d;
+  }
+}
@@ -11,7 +11,7 @@ import { Component, OnInit, OnDestroy, inject } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
-import { catchError, of, Subject, takeUntil } from 'rxjs';
+import { catchError, forkJoin, map, of, Subject, takeUntil } from 'rxjs';

 /** Custom Services */
 import { ClientsService } from '../../clients.service';
@@ -30,6 +30,11 @@ import {
  AadhaarReceiptDialogComponent,
  AadhaarReceiptResult
 } from '../../shared/aadhaar-receipt-dialog/aadhaar-receipt-dialog.component';
+import {
+  KycDocumentUpdateDialogComponent,
+  KycDocumentUpdateData,
+  KycDocumentUpdateResult
+} from '../../shared/kyc-document-update-dialog/kyc-document-update-dialog.component';
 import { Dates } from 'app/core/utils/dates';
 import { jsPDF } from 'jspdf';
 import { MatIcon } from '@angular/material/icon';
@@ -38,6 +43,15 @@ import { MatProgressSpinner } from '@angular/material/progress-spinner';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

+/** One side of the scanned KYC document, with the preview once it has been fetched. */
+interface DocScanSide {
+  documentId: string;
+  /** The identifier row this scan hangs off; the two sides can sit on different rows. */
+  identifierId: string;
+  fileName: string;
+  previewUrl: string | null;
+}
+
 /**
 * KYC Tab Component.
 * Displays and manages KYC (Know Your Customer) details for an existing client.
@@ -126,6 +140,12 @@ export class KycTabComponent implements OnInit, OnDestroy {
      1,
      [Validators.required]
    ],
+    // The officially valid document, so a lapsed one can be re-collected on this form. The
+    // backend has always accepted these four; only the fields were missing.
+    kycDocumentName: [''],
+    kycDocumentNumber: [''],
+    kycDocIssueDate: [null],
+    kycDocExpiryDate: [null],
    panNumber: [
      '',
      [Validators.pattern(/^[A-Z]{5}[0-9]{4}[A-Z]{1}$/)]
@@ -143,9 +163,39 @@ export class KycTabComponent implements OnInit, OnDestroy {
    exceptionReason: [[]]
  });

+  // ── Officially valid document scans ────────────────────────────────────────
+
+  /**
+   * The scans of the document named above, by side.
+   *
+   * The screen used to show the document's number and dates but not the image behind them, and
+   * sent the officer to the client edit screen to change it. Re-collecting an expiring document is
+   * the one thing this panel exists for, so the scan is shown and replaced here.
+   */
+  docScans: { front: DocScanSide | null; back: DocScanSide | null } = { front: null, back: null };
+
+  /** The two sides, in display order, so the template loops rather than repeating itself. */
+  readonly docScanSlots: ('front' | 'back')[] = ['front', 'back'];
+
+  docScanOf(slot: 'front' | 'back') {
+    return this.docScans[slot];
+  }
+
+  /** Identifier row replacements are filed against. Null when the document has no identifier. */
+  private docIdentifierId: string | null = null;
+  /** Every identifier row carrying this document, since the sides can be split across them. */
+  private docIdentifierIds: string[] = [];
+  docScansLoading = false;
+  /** Which side is mid-upload, so only that button shows a spinner. */
+  docScanUploading: 'front' | 'back' | null = null;
+  docScanError: string | null = null;
+  docScanSuccess: string | null = null;
+
  ngOnInit(): void {
    this.route.parent.params.subscribe((params: any) => {
      this.clientId = params['clientId'];
+      // Scans are matched against the document number on the KYC record, so they are loaded once
+      // that record has arrived rather than alongside it.
      this.loadKycData();
      this.loadClientDateOfBirth();
    });
@@ -176,10 +226,16 @@ export class KycTabComponent implements OnInit, OnDestroy {
            // the full 12-digit number to re-verify, so don't pre-fill.
            aadhaarNumber: '',
            gstinNumber: data.gstinNumber || '',
+            kycDocumentName: data.kycDocumentName || '',
+            kycDocumentNumber: data.kycDocumentNumber || '',
+            kycDocIssueDate: this.parseApiDate(data.kycDocIssueDate),
+            kycDocExpiryDate: this.parseApiDate(data.kycDocExpiryDate),
            remarks: data.remarks || '',
            isException: data.isException || false,
            exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
          });
+          // Now that the document number is known, the scans filed under it can be found.
+          this.loadDocumentScans();
        }
      });
  }
@@ -355,6 +411,41 @@ export class KycTabComponent implements OnInit, OnDestroy {
   * stored record; either way the customer has cleared that check. Verifying one of two
   * outstanding items narrows the exception to the remaining one rather than closing it.
   */
+  /**
+   * The officially valid document, for the update payload.
+   *
+   * Only sent when a document is named, so an officer editing the risk category on a client who
+   * never had an OVD recorded does not silently blank the other three columns.
+   */
+  private buildDocumentFields() {
+    const name = (this.kycForm.value.kycDocumentName || '').trim();
+    if (!name) {
+      return {};
+    }
+    const dateFormat = 'dd MMMM yyyy';
+    return {
+      kycDocumentName: name,
+      kycDocumentNumber: (this.kycForm.value.kycDocumentNumber || '').trim() || null,
+      kycDocIssueDate: this.kycForm.value.kycDocIssueDate
+        ? this.dateUtils.formatDate(this.kycForm.value.kycDocIssueDate, dateFormat)
+        : null,
+      // Blank is meaningful: a passport expires, a PAN card does not.
+      kycDocExpiryDate: this.kycForm.value.kycDocExpiryDate
+        ? this.dateUtils.formatDate(this.kycForm.value.kycDocExpiryDate, dateFormat)
+        : null
+    };
+  }
+
+  /** True while the banner is asking for a document, so the form shows the fields to supply it. */
+  get kycDocumentNeedsUpdate(): boolean {
+    return this.showKycDocumentAlert;
+  }
+
+  /** Today, as the latest an existing document can have been issued. */
+  get maxDate(): Date {
+    return new Date();
+  }
+
  private buildExceptionFields() {
    const panVerified = this.verificationStatus.pan === 'VERIFIED' || this.kycData?.panVerified === true;
    const aadhaarVerified = this.verificationStatus.aadhaar === 'VERIFIED' || this.kycData?.aadhaarVerified === true;
@@ -392,6 +483,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
      remarks: this.kycForm.value.remarks || null,
      // dateFormat is required so the backend can parse exceptionResolvedOn when an exception closes.
      dateFormat: 'dd MMMM yyyy',
+      ...this.buildDocumentFields(),
      ...this.buildExceptionFields()
    };

@@ -478,11 +570,12 @@ export class KycTabComponent implements OnInit, OnDestroy {
            if (response?.changes?.panVerified) {
              this.verificationStatus.pan = 'VERIFIED';
              this.verificationDetails.pan = response.changes;
-              // A PAN that now verifies makes any earlier declaration moot.
+              // A PAN that now verifies makes any earlier declaration moot. That write already
+              // re-derives the exception columns, so it settles the exception too.
              if (this.panDeclarationTaken) {
                this.writePanDeclaration(null);
              } else {
-                this.loadKycData();
+                this.syncExceptionAfterVerify();
              }
            } else {
              this.verificationStatus.pan = 'FAILED';
@@ -660,6 +753,60 @@ export class KycTabComponent implements OnInit, OnDestroy {
      });
  }

+  /**
+   * Re-derives the exception columns once a verification has actually passed.
+   *
+   * `saveKycBeforeVerify()` writes the exception state *before* the vendor is called, when the
+   * check is by definition still outstanding — so a check that then succeeds leaves the record
+   * carrying an exception nobody closes. The KYC tab reads `panVerified` and shows "Verified"
+   * while the exceptions register keeps reading `isException`, which is why a client could sit in
+   * the Pending tab with every document verified.
+   *
+   * Called on each verification success. `buildExceptionFields()` already prefers the in-session
+   * `verificationStatus` over the stored record, so the freshly passed check counts even though
+   * `kycData` has not been reloaded yet; `hadException` still reads the stored value, which is
+   * what tells it to close the entry rather than leave every flag off.
+   *
+   * Verifying one of two outstanding items narrows the exception instead of closing it — that
+   * falls out of the derivation, so this needs no special case for it.
+   */
+  private syncExceptionAfterVerify(): void {
+    if (!this.kycId) {
+      this.loadKycData();
+      return;
+    }
+
+    const exceptionFields = this.buildExceptionFields();
+
+    // Nothing recorded and nothing outstanding — no write would change anything.
+    if (this.kycData?.isException !== true && !exceptionFields.isException) {
+      this.loadKycData();
+      return;
+    }
+
+    this.clientsService
+      .updateClientKyc(this.clientId, this.kycId, {
+        locale: 'en',
+        dateFormat: 'dd MMMM yyyy',
+        riskCategory: this.kycForm.value.riskCategory || 1,
+        ...exceptionFields
+      })
+      .pipe(takeUntil(this.destroy$))
+      .subscribe({
+        // The verification itself succeeded either way, so a failure here must not read as a
+        // failed check — surface it as the save problem it is and still refresh.
+        next: () => this.loadKycData(),
+        error: (err: any) => {
+          this.errorMessage =
+            err?.error?.developerMessage ||
+            err?.error?.defaultUserMessage ||
+            err?.message ||
+            'Verification succeeded but the KYC exception could not be updated.';
+          this.loadKycData();
+        }
+      });
+  }
+
  /**
   * Records the UIDAI enrolment receipt accepted in place of a verified Aadhaar.
   *
@@ -786,6 +933,12 @@ export class KycTabComponent implements OnInit, OnDestroy {
    this.verificationError.aadhaar = null;
  }

+  /** Abandons the OTP exchange, so a mis-click can be backed out of without reloading the tab. */
+  cancelAadhaarReVerify(): void {
+    this.resetOtpState();
+    this.verificationError.aadhaar = null;
+  }
+
  /** Step 1: Send OTP to Aadhaar-linked mobile */
  sendAadhaarOtp(): void {
    const aadhaar = this.isEditMode ? this.kycForm?.get('aadhaarNumber')?.value : this.aadhaarFullNumber;
@@ -855,7 +1008,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
            if (this.aadhaarReceiptTaken) {
              this.writeAadhaarReceipt(null);
            } else {
-              this.loadKycData();
+              this.syncExceptionAfterVerify();
            }
          } else {
            this.verificationStatus.aadhaar = 'FAILED';
@@ -1200,6 +1353,297 @@ I further confirm that:
    doc.save(`Self_Declaration_${cifNumber}_${clientName.replace(/\s/g, '_')}.pdf`);
  }

+  // ── Document scans ─────────────────────────────────────────────────────────
+
+  /**
+   * Finds the identifier the KYC document was filed under and loads its scans.
+   *
+   * The KYC record keeps the document's name and number but not the identifier id, so the two are
+   * matched on the number — that is what makes them the same document, and it survives the client
+   * holding several identifiers of the same type.
+   */
+  private loadDocumentScans(): void {
+    if (!this.clientId) {
+      return;
+    }
+    this.docScansLoading = true;
+    this.clientsService
+      .getClientIdentifiers(this.clientId)
+      .pipe(catchError(() => of([] as any[])))
+      .subscribe((identifiers: any[]) => {
+        const wantedKey = (this.kycData?.kycDocumentNumber || '').toString().trim();
+        const wantedName = (this.kycData?.kycDocumentName || '').toString().trim().toLowerCase();
+        const norm = (s: any) => (s || '').toString().trim().toLowerCase();
+
+        // Every identifier carrying this document number, not just the first. The onboarding step
+        // files each side against its own identifier row, so this client's Aadhaar front sits on
+        // one row and the back on another under the same number - taking only the first match
+        // showed the front and reported the back as missing.
+        let matches = (identifiers || []).filter((i) => wantedKey && norm(i.documentKey) === norm(wantedKey));
+        if (!matches.length) {
+          matches = (identifiers || []).filter((i) => wantedName && norm(i.documentType?.name) === wantedName);
+        }
+
+        if (!matches.length) {
+          this.docScansLoading = false;
+          this.docIdentifierId = null;
+          this.docIdentifierIds = [];
+          this.docScans = { front: null, back: null };
+          return;
+        }
+        // Replacements are filed against the first row, so the sides stay together from here on.
+        this.docIdentifierId = String(matches[0].id);
+        this.docIdentifierIds = matches.map((m: any) => String(m.id));
+        this.fetchScansFor(this.docIdentifierIds);
+      });
+  }
+
+  /**
+   * Sides are read off the document name, which is how they were written at upload
+   * ("<Proof> — Front" / "— Back"). Where the name says nothing, upload order stands in, front
+   * first, rather than leaving a scan the officer cannot see.
+   */
+  private fetchScansFor(identifierIds: string[]): void {
+    forkJoin(
+      identifierIds.map((id) =>
+        this.clientsService.getClientIdentificationDocuments(id).pipe(
+          // Tagged with the row it came from, because the download call needs the parent id and
+          // the sides can be spread across more than one.
+          map((docs: any) => ((docs as any[]) || []).map((d) => ({ ...d, identifierId: id }))),
+          catchError(() => of([] as any[]))
+        )
+      )
+    ).subscribe((perIdentifier: any[][]) => {
+      this.docScansLoading = false;
+      // This runs again after every replace, so the previews being thrown away are revoked
+      // rather than left holding their blobs.
+      for (const old of [this.docScans.front, this.docScans.back]) {
+        if (old?.previewUrl) {
+          URL.revokeObjectURL(old.previewUrl);
+        }
+      }
+
+      // Oldest first by document id, so the newest upload for a side is the last one written and
+      // therefore the one that stands. Identifier order cannot do this job: a replacement is filed
+      // against the first row while the original sits on the second, so reading the rows in order
+      // let a document uploaded months ago overwrite the scan collected a moment ago - the officer
+      // pressed Replace, saw "replaced", and the old image came straight back.
+      const docs = perIdentifier.flat().sort((a, b) => Number(a.id) - Number(b.id));
+      const sides: typeof this.docScans = { front: null, back: null };
+      const unlabelled: any[] = [];
+
+      const entryOf = (d: any): DocScanSide => ({
+        documentId: String(d.id),
+        identifierId: String(d.identifierId),
+        fileName: d.fileName || d.name,
+        previewUrl: null
+      });
+
+      for (const d of docs) {
+        const text = `${d.name || ''} ${d.fileName || ''}`.toLowerCase();
+        // Later uploads win, so a replaced side shows the new scan rather than the original.
+        if (text.includes('back')) {
+          sides.back = entryOf(d);
+        } else if (text.includes('front')) {
+          sides.front = entryOf(d);
+        } else {
+          unlabelled.push(d);
+        }
+      }
+      for (const d of unlabelled) {
+        if (!sides.front) {
+          sides.front = entryOf(d);
+        } else if (!sides.back) {
+          sides.back = entryOf(d);
+        }
+      }
+
+      this.docScans = sides;
+      for (const key of ['front', 'back'] as const) {
+        if (sides[key]) {
+          this.loadScanPreview(sides[key]!);
+        }
+      }
+    });
+  }
+
+  private loadScanPreview(side: DocScanSide): void {
+    this.clientsService
+      .downloadClientIdentificationDocument(side.identifierId, side.documentId)
+      .pipe(catchError(() => of(null)))
+      .subscribe((blob: Blob | null) => {
+        if (!blob || !blob.type?.startsWith('image/')) {
+          return;
+        }
+        // Revoked in ngOnDestroy; a preview left behind holds the blob in memory for the life of
+        // the tab.
+        side.previewUrl = URL.createObjectURL(blob);
+      });
+  }
+
+  /**
+   * Replaces one side with a freshly collected scan.
+   *
+   * The new file is uploaded under the same side name, which is what the readers here and on the
+   * client screen key on, so the latest upload becomes the scan on show. The old file is left in
+   * place deliberately: a KYC document that has been re-collected is a record of what was held
+   * before and when it changed, and destroying it would leave the audit trail with a gap.
+   */
+  onDocScanSelected(event: Event, slot: 'front' | 'back'): void {
+    const input = event.target as HTMLInputElement;
+    const file = input.files?.[0];
+    // Cleared so choosing the same filename twice still fires a change event.
+    input.value = '';
+    if (!file || !this.docIdentifierId) {
+      return;
+    }
+
+    this.docScanError = null;
+    this.docScanSuccess = null;
+    this.docScanUploading = slot;
+
+    const label = slot === 'front' ? 'Front' : 'Back';
+    const docName = this.kycForm.get('kycDocumentName')?.value || this.kycData?.kycDocumentName || 'KYC document';
+
+    const formData = new FormData();
+    formData.append('file', file);
+    formData.append('name', `${docName} — ${label}`);
+    formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
+
+    this.clientsService.uploadClientIdentifierDocument(this.docIdentifierId, formData).subscribe({
+      next: () => {
+        this.docScanUploading = null;
+        this.docScanSuccess = `${label} side replaced.`;
+        // Re-read every row, not just the one written to: the other side still lives on its own.
+        this.fetchScansFor(this.docIdentifierIds);
+      },
+      error: (err: any) => {
+        this.docScanUploading = null;
+        this.docScanError =
+          err?.error?.defaultUserMessage || err?.error?.developerMessage || `Could not replace the ${label.toLowerCase()} side.`;
+      }
+    });
+  }
+
+  /**
+   * A verified record only accepts an amendment with a reason on it, so the dialog has to ask for
+   * one. 300 is VERIFIED; the code form is checked too, since either can arrive on the payload.
+   */
+  private get isKycVerified(): boolean {
+    return this.kycData?.kycStatus === 300 || this.kycData?.kycStatusCode === 'clientKycStatus.verified';
+  }
+
+  /**
+   * Re-collects the officially valid document from its own row.
+   *
+   * PAN and Aadhaar are each handled on their row; this one sent the officer into edit mode on the
+   * whole KYC form to do the same job. The dialog asks for the number, the dates and each side of
+   * the scan together, which is what re-collecting a document actually is.
+   */
+  updateKycDocument(): void {
+    if (!this.kycId) {
+      this.docScanError = 'KYC record not found. Save KYC details first.';
+      return;
+    }
+
+    this.dialog
+      .open(KycDocumentUpdateDialogComponent, {
+        width: '640px',
+        maxWidth: '95vw',
+        disableClose: true,
+        data: {
+          documentName: this.kycData?.kycDocumentName || 'KYC document',
+          documentNumber: this.kycData?.kycDocumentNumber || '',
+          issueDate: this.parseApiDate(this.kycData?.kycDocIssueDate),
+          expiryDate: this.parseApiDate(this.kycData?.kycDocExpiryDate),
+          reason: this.showKycDocumentAlert ? this.kycDocumentAlertMessage : '',
+          currentFront: this.docScans.front?.previewUrl || null,
+          currentBack: this.docScans.back?.previewUrl || null,
+          requiresRemarks: this.isKycVerified
+        } as KycDocumentUpdateData
+      })
+      .afterClosed()
+      .subscribe((result: KycDocumentUpdateResult | undefined) => {
+        if (result) {
+          this.persistKycDocument(result);
+        }
+      });
+  }
+
+  /**
+   * Saves the corrected details, then uploads whichever sides were re-scanned.
+   *
+   * The details go first: they are the record, and a scan attached to a document whose number was
+   * never corrected would file the new image under the old identity.
+   */
+  private persistKycDocument(result: KycDocumentUpdateResult): void {
+    this.saving = true;
+    this.docScanError = null;
+    this.docScanSuccess = null;
+
+    const dateFormat = 'dd MMMM yyyy';
+    const payload: any = {
+      locale: 'en',
+      dateFormat,
+      kycDocumentName: this.kycData?.kycDocumentName || null,
+      kycDocumentNumber: result.documentNumber || null,
+      kycDocIssueDate: result.issueDate ? this.dateUtils.formatDate(result.issueDate, dateFormat) : null,
+      kycDocExpiryDate: result.expiryDate ? this.dateUtils.formatDate(result.expiryDate, dateFormat) : null
+    };
+    // The server refuses an amendment to a verified record without one, and records it as the
+    // reason the document changed.
+    if (result.remarks) {
+      payload.remarks = result.remarks;
+    }
+
+    this.clientsService.updateClientKyc(this.clientId, this.kycId!, payload).subscribe({
+      next: () => {
+        this.saving = false;
+        this.docScanSuccess = 'Document updated.';
+        this.loadKycData();
+        this.uploadReplacedSides(result);
+      },
+      error: (err: any) => {
+        this.saving = false;
+        this.docScanError =
+          err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not update the document.';
+      }
+    });
+  }
+
+  /** Sends each re-scanned side through the same upload path the panel below uses. */
+  private uploadReplacedSides(result: KycDocumentUpdateResult): void {
+    if (!this.docIdentifierId) {
+      return;
+    }
+    const sides: { slot: 'front' | 'back'; file: File }[] = [];
+    if (result.front) {
+      sides.push({ slot: 'front', file: result.front });
+    }
+    if (result.back) {
+      sides.push({ slot: 'back', file: result.back });
+    }
+    if (!sides.length) {
+      return;
+    }
+
+    const docName = this.kycData?.kycDocumentName || 'KYC document';
+    forkJoin(
+      sides.map(({ slot, file }) => {
+        const formData = new FormData();
+        formData.append('file', file);
+        formData.append('name', `${docName} — ${slot === 'front' ? 'Front' : 'Back'}`);
+        formData.append('description', `Re-collected on ${new Date().toLocaleDateString('en-IN')}`);
+        return this.clientsService
+          .uploadClientIdentifierDocument(this.docIdentifierId!, formData)
+          .pipe(catchError(() => of(null)));
+      })
+    ).subscribe(() => {
+      this.docScanSuccess = 'Document and scan updated.';
+      this.fetchScansFor(this.docIdentifierIds);
+    });
+  }
+
  /** Handle file selection for signed declaration upload */
  onDeclarationFileSelected(event: Event): void {
    const input = event.target as HTMLInputElement;
@@ -1258,5 +1702,11 @@ I further confirm that:
  ngOnDestroy(): void {
    this.destroy$.next();
    this.destroy$.complete();
+    // Object URLs are held by the browser until revoked, so the scan blobs would outlive the tab.
+    for (const side of [this.docScans.front, this.docScans.back]) {
+      if (side?.previewUrl) {
+        URL.revokeObjectURL(side.previewUrl);
+      }
+    }
  }
 }
@@ -536,6 +536,17 @@ export class ClientsService {
    return this.http.post(`/clients/${clientId}/identifiers`, identifierData);
  }

+  /**
+   * Updates an identifier in place — the document number, its type, or the description.
+   *
+   * Without this the only way to record a re-collected document was to post a new identifier, so
+   * a customer whose Aadhaar was re-verified ended up with two rows carrying the same number and
+   * the same scans, and nothing saying which was current.
+   */
+  updateClientIdentifier(clientId: string, identifierId: string, identifierData: any) {
+    return this.http.put(`/clients/${clientId}/identifiers/${identifierId}`, identifierData);
+  }
+
  deleteClientIdentifier(clientId: string, identifierId: string) {
    return this.http.delete(`/clients/${clientId}/identifiers/${identifierId}`);
  }
@@ -1043,4 +1054,56 @@ export class ClientsService {
  getKycContactLog(clientId: string | number): Observable<any[]> {
    return this.http.get<any[]>(`/kyc/exceptions/${clientId}/contact-log`);
  }
+
+  /**
+   * Clients whose periodic re-KYC due date has passed, oldest first.
+   *
+   * Drives the expiry worklist. A client drops out of this list the moment their re-KYC is
+   * completed, because renewing pushes the expiry date into the future.
+   */
+  getLapsedKyc(): Observable<any[]> {
+    return this.http.get<any[]>('/kyc/exceptions/lapsed');
+  }
+
+  /**
+   * Savings accounts the dormancy job has marked.
+   *
+   * @param subStatus 100 inactive, 200 dormant, 300 escheat; omit for all three
+   */
+  getDormantAccounts(subStatus?: number): Observable<any[]> {
+    const params = subStatus ? new HttpParams().set('subStatus', String(subStatus)) : undefined;
+    return this.http.get<any[]>('/savingsaccounts/dormant', { params });
+  }
+
+  /**
+   * Records that the escheated balances of the given accounts were remitted to RBI's DEAF.
+   *
+   * The transfer itself happens outside this system; this only writes down that it was made, which
+   * is what lets the escheat report tell remitted money from money still sitting with the bank.
+   * Accounts that are not escheated, or already recorded, are skipped server-side — the result
+   * carries `recorded` and `skipped` counts.
+   */
+  recordDeafRemittance(data: {
+    savingsAccountIds: number[];
+    remittedOn: string;
+    deafReference?: string;
+    remarks?: string;
+    locale?: string;
+    dateFormat?: string;
+  }): Observable<any> {
+    return this.http.post('/savingsaccounts/deaf-remittance', {
+      locale: 'en',
+      dateFormat: 'yyyy-MM-dd',
+      ...data
+    });
+  }
+
+  /** Records that a customer claimed a remitted balance back and the bank recovered it from DEAF. */
+  refundDeafRemittance(savingsAccountId: number, refundedOn: string): Observable<any> {
+    return this.http.post(`/savingsaccounts/deaf-remittance/${savingsAccountId}/refund`, {
+      locale: 'en',
+      dateFormat: 'yyyy-MM-dd',
+      refundedOn
+    });
+  }
 }
@@ -840,6 +840,15 @@ export class CreateClientComponent {
    this.saveAddressProof(clientId);
  }

+  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
+   *  client-india-address-step's own "load existing" parsing both read back. */
+  private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
+    const parts: string[] = [];
+    if (issueDate) parts.push(`Issue date: ${issueDate}`);
+    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+    return parts.join(', ');
+  }
+
  /**
   * Save the address-proof picked on the permanent tab as a client identifier
   * + upload each selected file as a document attached to that identifier.
@@ -855,9 +864,9 @@ export class CreateClientComponent {
    const proofName = payload.proof?.name || 'Address Proof';
    const identifierData: any = {
      documentTypeId: payload.proofId,
-      status: 'Active',
+      status: 'ACTIVE',
      documentKey: payload.documentKey || `${proofName} - ${clientId}`,
-      description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
+      description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
    };

    this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -904,7 +913,7 @@ export class CreateClientComponent {
      }
      const identifierData: any = {
        documentTypeId,
-        status: 'Active',
+        status: 'ACTIVE',
        documentKey: payload.documentKey || `${proofName} - ${clientId}`,
        description: 'KYC document'
      };
@@ -164,6 +164,13 @@ export class ContactOtpBlockComponent implements OnChanges, OnDestroy {
    request$.subscribe({
      next: (res: any) => {
        this.sending = false;
+        // The backend reports failure to actually dispatch the OTP (gateway error, flagged
+        // number, SMTP failure...) as a 200 response with success:false and a real reason in
+        // `message` — never a thrown error. Surface that reason instead of treating it as sent.
+        if (res?.success === false) {
+          this.errorMessage = res?.message || 'Could not send OTP.';
+          return;
+        }
        this.otpId = res?.otpId ?? res?.resourceId ?? null;
        this.otpSent = true;
        this.clearAllDigits();
@@ -1035,6 +1035,15 @@ export class EditClientComponent {
    this.saveAddressProof(clientId);
  }

+  /** "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" — same convention the CKYC tab and
+   *  client-india-address-step's own "load existing" parsing both read back. */
+  private buildProofDescription(issueDate: string | null | undefined, expiryDate: string | null | undefined): string {
+    const parts: string[] = [];
+    if (issueDate) parts.push(`Issue date: ${issueDate}`);
+    if (expiryDate) parts.push(`Expiry date: ${expiryDate}`);
+    return parts.join(', ');
+  }
+
  /**
   * Save the address-proof picked on the permanent tab as a client identifier
   * + upload each selected file as a document attached to that identifier.
@@ -1050,9 +1059,9 @@ export class EditClientComponent {
    const proofName = payload.proof?.name || 'Address Proof';
    const identifierData: any = {
      documentTypeId: payload.proofId,
-      status: 'Active',
+      status: 'ACTIVE',
      documentKey: payload.documentKey || `${proofName} - ${clientId}`,
-      description: payload.issueDate ? `Issue date: ${payload.issueDate}` : ''
+      description: this.buildProofDescription(payload.issueDate, payload.expiryDate)
    };

    this.clientsService.addClientIdentifier(clientId, identifierData).subscribe({
@@ -1079,12 +1088,15 @@ export class EditClientComponent {
   */
  private saveKycDocProof(clientId: string) {
    const payload = this.clientKycStep?.kycDocPayload;
-    if (!payload?.proofId || !payload?.files?.length) return;
+    // A document number corrected without re-scanning the document is still a change worth
+    // saving, so this no longer requires files — it used to return here and the new number was
+    // silently dropped.
+    if (!payload?.proofId) return;

    const proofName = payload.proof?.name || 'KYC Document';

    const uploadFiles = (identifierId: string) => {
-      for (const entry of payload.files) {
+      for (const entry of payload.files || []) {
        const formData = new FormData();
        formData.append('name', `${proofName} — ${entry.slot}`);
        formData.append('file', entry.file);
@@ -1092,8 +1104,26 @@ export class EditClientComponent {
      }
    };

-    if (this.clientKycStep?.existingKycIdentifierId) {
-      uploadFiles(this.clientKycStep.existingKycIdentifierId);
+    // A document already on file is updated in place, not posted again.
+    //
+    // Re-collecting a document used to create a second identifier carrying the same number and
+    // the same scans, with nothing to say which of the two was current — the client in front of
+    // this was left with two identical Aadhaar rows. The document the customer renewed is the
+    // one already recorded, so its number and type are written back to that row and any new
+    // scans are attached to it.
+    const existingId = this.clientKycStep?.existingKycIdentifierId;
+    if (existingId) {
+      this.resolveDocumentTypeId(payload.proofId, proofName).subscribe((documentTypeId: number | null) => {
+        const update: any = { documentKey: payload.documentKey || `${proofName} - ${clientId}`, status: 'ACTIVE' };
+        if (documentTypeId != null) {
+          update.documentTypeId = documentTypeId;
+        }
+        this.clientsService.updateClientIdentifier(clientId, existingId, update).subscribe({
+          // The scans go up either way: failing to rewrite the number must not cost the images.
+          next: () => uploadFiles(existingId),
+          error: () => uploadFiles(existingId)
+        });
+      });
      return;
    }

@@ -1107,7 +1137,7 @@ export class EditClientComponent {
      }
      const identifierData: any = {
        documentTypeId,
-        status: 'Active',
+        status: 'ACTIVE',
        documentKey: payload.documentKey || `${proofName} - ${clientId}`,
        description: 'KYC document'
      };
@@ -230,6 +230,23 @@ describe('deriveKycExceptionFields', () => {
      const both = `${KYC_EXCEPTION_PAN}, ${KYC_EXCEPTION_AADHAAR}`;
      expect(deriveKycExceptionFields(existingException(false, true, both)).exceptionReason).toBe(KYC_EXCEPTION_PAN);
    });
+
+    it('closes a record left open by a verification that passed after the exception was written', () => {
+      // A verification writes the exception before calling the vendor, so a check that then passes
+      // leaves `isException` set with the stale reason still loaded into the form's reason list.
+      // Saving such a record has to close it, not re-raise it off its own stale reason.
+      expect(
+        deriveKycExceptionFields({
+          ...existingException(true, true, KYC_EXCEPTION_PAN),
+          manualReasons: [KYC_EXCEPTION_PAN]
+        })
+      ).toEqual({
+        isException: false,
+        exceptionReason: KYC_EXCEPTION_PAN,
+        exceptionResolved: true,
+        exceptionResolvedOn: TODAY
+      });
+    });
  });

  describe('re-opening', () => {
@@ -0,0 +1,137 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<h2 mat-dialog-title class="kdu-title">
+  <mat-icon>description</mat-icon>
+  Update {{ data.documentName }}
+</h2>
+
+<mat-dialog-content class="kdu-body">
+  <!-- Why this is being asked for, in the words the alert used. -->
+  @if (data.reason) {
+    <div class="kdu-reason">
+      <mat-icon>schedule</mat-icon>
+      <span>{{ data.reason }}</span>
+    </div>
+  }
+
+  <form [formGroup]="form" class="kdu-form">
+    <mat-form-field appearance="outline" class="kdu-field kdu-field--wide">
+      <mat-label>Document Number</mat-label>
+      <input matInput formControlName="documentNumber" autocomplete="off" />
+      @if (form.get('documentNumber')?.hasError('required') && form.get('documentNumber')?.touched) {
+        <mat-error>Document number is required</mat-error>
+      }
+    </mat-form-field>
+
+    <mat-form-field appearance="outline" class="kdu-field">
+      <mat-label>Issued On</mat-label>
+      <input matInput [matDatepicker]="issuePicker" formControlName="issueDate" />
+      <mat-datepicker-toggle matSuffix [for]="issuePicker"></mat-datepicker-toggle>
+      <mat-datepicker #issuePicker></mat-datepicker>
+    </mat-form-field>
+
+    <mat-form-field appearance="outline" class="kdu-field">
+      <mat-label>Valid Till</mat-label>
+      <input matInput [matDatepicker]="expiryPicker" formControlName="expiryDate" />
+      <mat-datepicker-toggle matSuffix [for]="expiryPicker"></mat-datepicker-toggle>
+      <mat-datepicker #expiryPicker></mat-datepicker>
+      <mat-hint>Blank if it does not expire</mat-hint>
+    </mat-form-field>
+
+    <!-- Only where the KYC record is already verified. Changing what a verified record holds is an
+         amendment, and the reason goes on the record with it. -->
+    @if (data.requiresRemarks) {
+      <mat-form-field appearance="outline" class="kdu-field kdu-field--wide">
+        <mat-label>Reason for update</mat-label>
+        <textarea
+          matInput
+          formControlName="remarks"
+          rows="2"
+          placeholder="e.g. Document expired — fresh copy collected from the customer"
+        ></textarea>
+        <mat-hint>Recorded against the verified KYC record</mat-hint>
+        @if (form.get('remarks')?.hasError('required') && form.get('remarks')?.touched) {
+          <mat-error>A reason is required to change a verified KYC record</mat-error>
+        }
+      </mat-form-field>
+    }
+  </form>
+
+  <div class="kdu-scans">
+    <div class="kdu-scans__head">Scanned copy</div>
+    <p class="kdu-scans__hint">
+      Leave a side untouched to keep the scan already on file. The previous copy is kept either way.
+    </p>
+
+    <div class="kdu-sides">
+      @for (slot of slots; track slot) {
+        <div class="kdu-side">
+          <div class="kdu-side__label">
+            {{ slot === 'front' ? 'Front' : 'Back' }}
+            @if (isReplaced(slot)) {
+              <span class="kdu-side__new">New</span>
+            }
+          </div>
+
+          <div class="kdu-side__frame" [class.kdu-side__frame--new]="isReplaced(slot)">
+            @if (previewOf(slot)) {
+              <img [src]="previewOf(slot)" [alt]="slot === 'front' ? 'Front of document' : 'Back of document'" />
+            } @else if (isReplaced(slot)) {
+              <!-- Picked, but not an image (a PDF, say) — named rather than shown. -->
+              <div class="kdu-side__file">
+                <mat-icon>insert_drive_file</mat-icon>
+                <span>{{ pickedName(slot) }}</span>
+              </div>
+            } @else {
+              <div class="kdu-side__none">Not on file</div>
+            }
+          </div>
+
+          <div class="kdu-side__actions">
+            <button type="button" mat-stroked-button class="kdu-side__btn" (click)="sideInput.click()">
+              {{ previewOf(slot) || isReplaced(slot) ? 'Choose new scan' : 'Upload scan' }}
+            </button>
+            @if (isReplaced(slot)) {
+              <button
+                type="button"
+                mat-icon-button
+                class="kdu-side__undo"
+                matTooltip="Keep the scan already on file"
+                (click)="clearPick(slot)"
+              >
+                <mat-icon>undo</mat-icon>
+              </button>
+            }
+          </div>
+          <input
+            #sideInput
+            type="file"
+            hidden
+            accept="image/*,application/pdf"
+            (change)="onFilePicked($event, slot)"
+          />
+        </div>
+      }
+    </div>
+  </div>
+</mat-dialog-content>
+
+<mat-dialog-actions align="end" class="kdu-actions">
+  <button mat-stroked-button type="button" (click)="cancel()">Cancel</button>
+  <button
+    mat-flat-button
+    color="primary"
+    type="button"
+    [disabled]="form.invalid || !hasChanges"
+    [matTooltip]="!hasChanges ? 'Change a detail or add a scan first' : ''"
+    (click)="submit()"
+  >
+    Save Document
+  </button>
+</mat-dialog-actions>
@@ -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/.
+ */
+
+.kdu-title {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+
+  mat-icon {
+    color: #64748b;
+  }
+}
+
+.kdu-body {
+  padding-top: 4px;
+}
+
+.kdu-reason {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  margin-bottom: 16px;
+  padding: 10px 12px;
+  border: 1px solid #fde68a;
+  border-radius: 6px;
+  background: #fffbeb;
+  color: #92400e;
+  font-size: 13px;
+  line-height: 1.5;
+
+  mat-icon {
+    flex: 0 0 auto;
+    font-size: 18px;
+    width: 18px;
+    height: 18px;
+    color: #d97706;
+  }
+}
+
+.kdu-form {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
+.kdu-field {
+  flex: 1 1 180px;
+}
+
+.kdu-field--wide {
+  flex: 1 1 100%;
+}
+
+.kdu-scans {
+  margin-top: 8px;
+  padding: 12px;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #f8fafc;
+}
+
+.kdu-scans__head {
+  font-size: 12px;
+  font-weight: 700;
+  letter-spacing: 0.03em;
+  text-transform: uppercase;
+  color: #475569;
+}
+
+.kdu-scans__hint {
+  margin: 4px 0 12px;
+  font-size: 12px;
+  color: #64748b;
+}
+
+.kdu-sides {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.kdu-side {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  width: 210px;
+}
+
+.kdu-side__label {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 12px;
+  font-weight: 700;
+  color: #334155;
+}
+
+/* Marks the side the officer has just re-scanned, so it is obvious what will change on save. */
+.kdu-side__new {
+  padding: 1px 7px;
+  border-radius: 999px;
+  background: #dcfce7;
+  color: #15803d;
+  font-size: 10.5px;
+  font-weight: 700;
+}
+
+.kdu-side__frame {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 132px;
+  padding: 6px;
+  border: 1px solid #e2e8f0;
+  border-radius: 6px;
+  background: #fff;
+  overflow: hidden;
+
+  img {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+    border-radius: 3px;
+  }
+
+  &--new {
+    border-color: #86efac;
+    box-shadow: 0 0 0 1px #86efac;
+  }
+}
+
+.kdu-side__none {
+  font-size: 12px;
+  color: #94a3b8;
+}
+
+.kdu-side__file {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 0 6px;
+  font-size: 11px;
+  color: #475569;
+  text-align: center;
+  word-break: break-word;
+
+  mat-icon {
+    color: #64748b;
+  }
+}
+
+.kdu-side__actions {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.kdu-side__btn {
+  flex: 1;
+  font-size: 12px;
+}
+
+.kdu-actions {
+  padding: 8px 24px 20px;
+  gap: 8px;
+}
@@ -0,0 +1,215 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Angular Imports */
+import { Component, OnDestroy, inject } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
+import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+
+/** What the caller hands in: the document as it stands, and the scans already on file. */
+export interface KycDocumentUpdateData {
+  documentName: string;
+  documentNumber: string;
+  issueDate: Date | string | null;
+  expiryDate: Date | string | null;
+  /** Why the document is being asked for, shown at the top so the officer sees the reason. */
+  reason: string;
+  /** Previews of what is currently held, so the officer can see what they are replacing. */
+  currentFront: string | null;
+  currentBack: string | null;
+  /**
+   * True when the KYC record is already verified. Changing data on one of those needs a reason on
+   * the record, which the server enforces - so the dialog asks for it rather than letting the
+   * officer fill the whole form in and be refused on submit.
+   */
+  requiresRemarks: boolean;
+}
+
+/** What the caller gets back: the corrected details, plus whichever sides were re-scanned. */
+export interface KycDocumentUpdateResult {
+  documentNumber: string;
+  issueDate: Date | null;
+  expiryDate: Date | null;
+  front: File | null;
+  back: File | null;
+  /** Why the document was re-collected. Blank unless the record was already verified. */
+  remarks: string;
+}
+
+/**
+ * Re-collects an officially valid document without leaving the KYC record.
+ *
+ * PAN and Aadhaar are each dealt with on their own row of the verification table. The OVD was the
+ * exception: its Update button put the whole KYC form into edit mode, so re-collecting one expiring
+ * document meant scrolling a form of unrelated fields and finding the same document again. The work
+ * is the same either way - a new number, new dates, a fresh scan of each side - so it is asked for
+ * in one place.
+ */
+@Component({
+  selector: 'mifosx-kyc-document-update-dialog',
+  templateUrl: './kyc-document-update-dialog.component.html',
+  styleUrls: ['./kyc-document-update-dialog.component.scss'],
+  standalone: true,
+  // The shared set carries the date adapter the two datepickers below need; the sibling dialogs
+  // pull it in the same way.
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    CommonModule,
+    ReactiveFormsModule,
+    MatDialogModule,
+    MatButtonModule,
+    MatDatepickerModule,
+    MatFormFieldModule,
+    MatIconModule,
+    MatInputModule,
+    MatProgressSpinnerModule,
+    MatTooltipModule
+  ]
+})
+export class KycDocumentUpdateDialogComponent implements OnDestroy {
+  private formBuilder = inject(UntypedFormBuilder);
+  private dialogRef = inject<MatDialogRef<KycDocumentUpdateDialogComponent>>(MatDialogRef);
+  data = inject<KycDocumentUpdateData>(MAT_DIALOG_DATA);
+
+  form: UntypedFormGroup;
+
+  /** Newly chosen files, with a local preview so the officer sees what they picked. */
+  picked: { front: File | null; back: File | null } = { front: null, back: null };
+  pickedPreview: { front: string | null; back: string | null } = { front: null, back: null };
+
+  readonly slots: ('front' | 'back')[] = [
+    'front',
+    'back'
+  ];
+
+  constructor() {
+    this.form = this.formBuilder.group({
+      documentNumber: [
+        this.data.documentNumber || '',
+        [Validators.required]
+      ],
+      issueDate: [this.toDate(this.data.issueDate)],
+      // Left free rather than required: a passport expires, a PAN card does not.
+      expiryDate: [this.toDate(this.data.expiryDate)],
+      // Required only where the server requires it, so completing a record that was never verified
+      // does not demand a justification for filling in blanks.
+      remarks: [
+        '',
+        this.data.requiresRemarks ? [Validators.required] : []
+      ]
+    });
+  }
+
+  private toDate(value: Date | string | null): Date | null {
+    if (!value) {
+      return null;
+    }
+    const d = value instanceof Date ? value : new Date(value);
+    return isNaN(d.getTime()) ? null : d;
+  }
+
+  previewOf(slot: 'front' | 'back'): string | null {
+    return this.pickedPreview[slot] || (slot === 'front' ? this.data.currentFront : this.data.currentBack);
+  }
+
+  /** True once this side has been re-scanned in this dialog, so the label can say so. */
+  isReplaced(slot: 'front' | 'back'): boolean {
+    return !!this.picked[slot];
+  }
+
+  pickedName(slot: 'front' | 'back'): string {
+    return this.picked[slot]?.name || '';
+  }
+
+  onFilePicked(event: Event, slot: 'front' | 'back'): void {
+    const input = event.target as HTMLInputElement;
+    const file = input.files?.[0] || null;
+    // Cleared so re-picking the same filename still fires a change event.
+    input.value = '';
+    if (!file) {
+      return;
+    }
+    if (this.pickedPreview[slot]) {
+      URL.revokeObjectURL(this.pickedPreview[slot]!);
+    }
+    this.picked[slot] = file;
+    this.pickedPreview[slot] = file.type.startsWith('image/') ? URL.createObjectURL(file) : null;
+  }
+
+  clearPick(slot: 'front' | 'back'): void {
+    if (this.pickedPreview[slot]) {
+      URL.revokeObjectURL(this.pickedPreview[slot]!);
+    }
+    this.picked[slot] = null;
+    this.pickedPreview[slot] = null;
+  }
+
+  /**
+   * Something has to change for the update to mean anything - either a corrected detail or a fresh
+   * scan. Submitting an untouched form would reopen a verified KYC record for no reason.
+   */
+  get hasChanges(): boolean {
+    if (this.picked.front || this.picked.back) {
+      return true;
+    }
+    const v = this.form.value;
+    const sameNumber = (v.documentNumber || '').trim() === (this.data.documentNumber || '').trim();
+    const sameIssue = this.sameDay(v.issueDate, this.toDate(this.data.issueDate));
+    const sameExpiry = this.sameDay(v.expiryDate, this.toDate(this.data.expiryDate));
+    return !(sameNumber && sameIssue && sameExpiry);
+  }
+
+  private sameDay(a: Date | null, b: Date | null): boolean {
+    if (!a && !b) {
+      return true;
+    }
+    if (!a || !b) {
+      return false;
+    }
+    return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
+  }
+
+  submit(): void {
+    if (this.form.invalid || !this.hasChanges) {
+      this.form.markAllAsTouched();
+      return;
+    }
+    const v = this.form.value;
+    const result: KycDocumentUpdateResult = {
+      documentNumber: (v.documentNumber || '').trim(),
+      issueDate: v.issueDate || null,
+      expiryDate: v.expiryDate || null,
+      front: this.picked.front,
+      back: this.picked.back,
+      remarks: (v.remarks || '').trim()
+    };
+    this.dialogRef.close(result);
+  }
+
+  cancel(): void {
+    this.dialogRef.close();
+  }
+
+  ngOnDestroy(): void {
+    // Only the previews this dialog created; the caller owns the ones it passed in.
+    for (const slot of this.slots) {
+      if (this.pickedPreview[slot]) {
+        URL.revokeObjectURL(this.pickedPreview[slot]!);
+      }
+    }
+  }
+}
@@ -86,7 +86,7 @@
              <line x1="9" y1="14" x2="15" y2="14" />
              <line x1="9" y1="18" x2="13" y2="18" />
            </svg>
-            My Requests
+            Withdrawal Request
          </a>
          <a
            class="cashier-nav__item cashier-nav__item--sec"
@@ -97,7 +97,7 @@
              <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" />
            </svg>
-            My Disbursements
+            Disbursements &amp; Transfer
          </a>
          <a
            class="cashier-nav__item cashier-nav__item--sec"
@@ -184,46 +184,43 @@
              Today's Activity
            </a>
          }
-          <!-- Outside the clerkAccountLoaded block on purpose: an open exception has to be
-               reachable whether or not the clerk currently has an account loaded. -->
+          <!-- Outside the clerkAccountLoaded guard: the voucher register is the day's work, not one
+               account's, so it must be reachable before any account has been pulled up. -->
          <a
            class="cashier-nav__item cashier-nav__item--sec"
-            [class.cashier-nav__item--active]="currentUrl.includes('/cashier/voucher-exceptions')"
-            [routerLink]="['/cashier/voucher-exceptions']"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/my-work')"
+            [routerLink]="['/clerk/my-work']"
          >
            <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-              <path d="M10.29 3.86 1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z" />
-              <line x1="12" y1="9" x2="12" y2="13" />
-              <line x1="12" y1="17" x2="12.01" y2="17" />
+              <path d="M9 11l3 3L22 4" />
+              <path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11" />
            </svg>
-            Exceptions
+            My Vouchers
          </a>
          <a
            class="cashier-nav__item cashier-nav__item--sec"
-            [class.cashier-nav__item--active]="currentUrl.split('?')[0] === '/cashier/voucher'"
-            [routerLink]="['/cashier/voucher']"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/received-report')"
+            [routerLink]="['/clerk/received-report']"
          >
            <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-              <path d="M4 2v20l2-1 2 1 2-1 2 1 2-1 2 1 2-1 2 1V2l-2 1-2-1-2 1-2-1-2 1-2-1-2 1z" />
+              <path d="M4 3h16v18l-3-2-2 2-3-2-3 2-2-2-3 2z" />
              <line x1="8" y1="9" x2="16" y2="9" />
              <line x1="8" y1="13" x2="14" y2="13" />
            </svg>
-            Voucher
+            Received Vouchers
          </a>
          <a
            class="cashier-nav__item cashier-nav__item--sec"
-            [class.cashier-nav__item--active]="currentUrl.includes('/cashier/voucher-report')"
-            [routerLink]="['/cashier/voucher-report']"
+            [class.cashier-nav__item--active]="currentUrl.includes('/clerk/payment-report')"
+            [routerLink]="['/clerk/payment-report']"
          >
            <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-              <line x1="8" y1="6" x2="21" y2="6" />
-              <line x1="8" y1="12" x2="21" y2="12" />
-              <line x1="8" y1="18" x2="21" y2="18" />
-              <line x1="3" y1="6" x2="3.01" y2="6" />
-              <line x1="3" y1="12" x2="3.01" y2="12" />
-              <line x1="3" y1="18" x2="3.01" y2="18" />
+              <path d="M4 3h16v18l-3-2-2 2-3-2-3 2-2-2-3 2z" />
+              <line x1="8" y1="9" x2="16" y2="9" />
+              <line x1="8" y1="13" x2="14" y2="13" />
+              <line x1="12" y1="5" x2="12" y2="7" />
            </svg>
-            Voucher Report
+            Payment Vouchers
          </a>
          <span class="cashier-nav__esc-hint" (click)="onEscapeKey()"> <kbd>ESC</kbd> Show Header </span>
        </nav>
@@ -286,29 +283,22 @@
          >
            <fa-icon icon="history"></fa-icon> Cash History
          </a>
-          <a
-            class="cashier-nav__item"
-            [routerLink]="['/cashier/day-book']"
-            routerLinkActive="cashier-nav__item--active"
-          >
-            <fa-icon icon="book"></fa-icon> Day Book
+          <a class="cashier-nav__item" [routerLink]="['/cashier/my-work']" routerLinkActive="cashier-nav__item--active">
+            <fa-icon icon="user-check"></fa-icon> My Vouchers
          </a>
          <a
            class="cashier-nav__item"
-            [routerLink]="['/cashier/voucher-exceptions']"
+            [routerLink]="['/cashier/received-report']"
            routerLinkActive="cashier-nav__item--active"
          >
-            <fa-icon icon="exclamation-triangle"></fa-icon> Exceptions
-          </a>
-          <a class="cashier-nav__item" [routerLink]="['/cashier/voucher']" routerLinkActive="cashier-nav__item--active">
-            <fa-icon icon="receipt"></fa-icon> Voucher
+            <fa-icon icon="list"></fa-icon> Received
          </a>
          <a
            class="cashier-nav__item"
-            [routerLink]="['/cashier/voucher-report']"
+            [routerLink]="['/cashier/payment-report']"
            routerLinkActive="cashier-nav__item--active"
          >
-            <fa-icon icon="list"></fa-icon> Voucher Report
+            <fa-icon icon="list"></fa-icon> Payment
          </a>
          <a
            class="cashier-nav__item"
@@ -483,7 +473,7 @@
    ════════ END OLD ORDER ════════
    -->

-    @if (!hideShellLayout) {
+    @if (!hideShellLayout && menuAccessReady) {
      <div class="main-header">
        <!-- Row 1 — Client Master · CFCFRMS · Approvals · Cashier · Clearing · Deposits · Advances · Share · NPA · General Ledger · Sub Ledger -->
        <div class="nav-row r1">
@@ -534,7 +524,12 @@
            <fa-icon icon="exclamation-triangle" class="ni-ico"></fa-icon>NPA
            <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
          </a>
-          <a class="ni" tabindex="0" [matMenuTriggerFor]="loanOriginationMenu" *mifosxHasPermission="'MENU_ADVANCES'">
+          <a
+            class="ni"
+            tabindex="0"
+            [matMenuTriggerFor]="loanOriginationMenu"
+            *mifosxHasPermission="'MENU_LOAN_ORIGINATION'"
+          >
            <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon>Loan Origination
            <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
          </a>
@@ -596,7 +591,7 @@
            class="ni"
            tabindex="0"
            (click)="investmentMenuOpen = !investmentMenuOpen; rbiMenuOpen = false; glMenuOpen = false"
-            *mifosxHasPermission="'MENU_RBI'"
+            *mifosxHasPermission="'MENU_INVESTMENT'"
          >
            <fa-icon icon="chart-line" class="ni-ico"></fa-icon>Investment
            <fa-icon [icon]="investmentMenuOpen ? 'caret-up' : 'caret-down'" class="ni-caret"></fa-icon>
@@ -679,12 +674,29 @@
        <i class="fa fa-calculator menu-item-icon"></i> Accounting
      </button>
      <mat-divider></mat-divider>
+      <!-- Listed here as well as under Branch Ops: an officer looking for the day's figures reaches
+           for Reports, and the same screen answers both. -->
+      <button mat-menu-item routerLink="/branch-ops/day-book" tabindex="0">
+        <i class="fa fa-book menu-item-icon"></i> Day Book &amp; Officer Verification
+      </button>
+      <button mat-menu-item routerLink="/branch-ops/end-of-day" tabindex="0">
+        <i class="fa fa-clipboard-check menu-item-icon"></i> End of the Day Report
+      </button>
      <button mat-menu-item routerLink="/reports/form-97-98" tabindex="0">
        <i class="fa fa-file-invoice menu-item-icon"></i> Form 97/98 Transaction Report
      </button>
      <button mat-menu-item routerLink="/reports/risk-review" tabindex="0">
        <i class="fa fa-user-shield menu-item-icon"></i> Risk Review Report
      </button>
+      <button mat-menu-item routerLink="/reports/kyc-expiry" tabindex="0">
+        <i class="fa fa-id-card menu-item-icon"></i> Re-KYC Expiry &amp; Outreach
+      </button>
+      <button mat-menu-item routerLink="/reports/dormancy" tabindex="0">
+        <i class="fa fa-hourglass-half menu-item-icon"></i> Inactive, Dormant &amp; DEAF
+      </button>
+      <button mat-menu-item routerLink="/reports/savings-interest" tabindex="0">
+        <i class="fa fa-percentage menu-item-icon"></i> Savings Interest Posted
+      </button>
      <!--
        The Principal Officer clears flagged UNSC screenings here. It is not a runnable report,
        so it never shows up under the report categories above and had no nav entry at all.
@@ -1083,6 +1095,17 @@
      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/vault-position']">
        <fa-icon icon="lock" class="menu-item-icon"></fa-icon> Vault Position
      </button>
+      <!-- The day book carries the Officer Verification Sheet — each person's credit, debit and net
+           for the day. It was reachable only from the Clerk and Cashier menus, which is the one
+           place a principal officer signing the day off does not look. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/day-book']">
+        <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book &amp; Verification
+      </button>
+      <!-- The signed sheet, as against the day book's working list: the day's modes, the drawer
+           against the books, and what is still open. This is what goes in the file. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/end-of-day']">
+        <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
+      </button>
    </mat-menu>

    <!-- Clerk was a bare link straight into the fullscreen dashboard, which left the clerk's other
@@ -1092,27 +1115,45 @@
      <button mat-menu-item tabindex="0" routerLink="/clerk/dashboard" (click)="hideShellLayout = true">
        <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> Clerk Dashboard
      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-exceptions']">
-        <fa-icon icon="exclamation-triangle" class="menu-item-icon"></fa-icon> Voucher Exceptions
-      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher']">
-        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Voucher Lookup
-      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-report']">
-        <fa-icon icon="list" class="menu-item-icon"></fa-icon> Voucher Report
-      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/day-book']">
-        <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book
+      <!-- The clerk reads the day as a sheet to sign off, not as a working list of vouchers: the
+           day's summary, the counter counted against the books, and what is still open. The day
+           book's own row-by-row view stays reachable from Branch Ops and from the Cashier menu. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/end-of-day']">
+        <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
      </button>
      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/withdrawal-requests']">
        <fa-icon icon="money-bill-wave" class="menu-item-icon"></fa-icon> My Withdrawal Requests
      </button>
      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-disbursement-requests']">
-        <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> My Disbursement Requests
+        <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> Disbursements &amp; Transfer
      </button>
      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/dividend-dashboard']">
        <fa-icon icon="chart-pie" class="menu-item-icon"></fa-icon> Dividend Dashboard
      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-work']">
+        <fa-icon icon="user-check" class="menu-item-icon"></fa-icon> My Vouchers
+      </button>
+      <!-- Sits under My Vouchers because it answers the same question for the one worker who has no
+           own list: the system. A nightly run belongs to nobody, so it appears on no person's page. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/system-vouchers']">
+        <fa-icon icon="robot" class="menu-item-icon"></fa-icon> System Vouchers
+      </button>
+      <!-- A clerk supervises the counter, so they need to see what each cashier is holding and what
+           went through their drawer. Both screens already return every cashier for a non-cashier
+           caller (CashierRoleHelper scopes only a cashier to themselves) — they were simply not
+           reachable from this menu. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cashier-position']">
+        <fa-icon icon="wallet" class="menu-item-icon"></fa-icon> Cashier Position
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/closing-report']">
+        <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Closing Cash Report
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/received-report']">
+        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Received Vouchers
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/payment-report']">
+        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Payment Vouchers
+      </button>
    </mat-menu>

    <mat-menu #cashierMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
@@ -1152,15 +1193,6 @@
      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/day-book']">
        <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book
      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-exceptions']">
-        <fa-icon icon="exclamation-triangle" class="menu-item-icon"></fa-icon> Voucher Exceptions
-      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher']">
-        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Voucher Lookup
-      </button>
-      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/voucher-report']">
-        <fa-icon icon="list" class="menu-item-icon"></fa-icon> Voucher Report
-      </button>
      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/transaction-entry']">
        <fa-icon icon="keyboard" class="menu-item-icon"></fa-icon> Transaction Entry
      </button>
@@ -1253,12 +1285,6 @@
      <button mat-menu-item [routerLink]="['/sponsor-dd/inventory']" tabindex="0">
        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Sponsor DD Inventory
      </button>
-      <button mat-menu-item [routerLink]="['/sponsor-dd/issue-approvals']" tabindex="0">
-        <fa-icon icon="check-double" class="menu-item-icon"></fa-icon> DD Issuance Approvals
-      </button>
-      <button mat-menu-item [routerLink]="['/sponsor-dd/reprint-approvals']" tabindex="0">
-        <fa-icon icon="print" class="menu-item-icon"></fa-icon> DD Reprint Approvals
-      </button>
    </mat-menu>

    <mat-menu #hrmMenu="matMenu" class="hrm-mega-panel" [overlapTrigger]="false">
@@ -13,6 +13,7 @@ import { MatDialog } from '@angular/material/dialog';
 import { Router, NavigationEnd } from '@angular/router';
 import { AuthenticationService } from '../authentication/authentication.service';
 import { ClerkUiStateService } from '../../cashier/clerk-ui-state.service';
+import { TenantMenuAccessService } from '../../directives/has-permission/tenant-menu-access.service';

 /** rxjs Imports */
 import { Observable, Subscription } from 'rxjs';
@@ -66,6 +67,7 @@ export class ShellComponent implements OnInit, OnDestroy {
  private router = inject(Router);
  private authService = inject(AuthenticationService);
  private clerkUiStateService = inject(ClerkUiStateService);
+  private tenantMenuAccessService = inject(TenantMenuAccessService);

  /** Subscription to breakpoint observer for handset. */
  isHandset$: Observable<boolean> = this.breakpointObserver
@@ -79,6 +81,10 @@ export class ShellComponent implements OnInit, OnDestroy {
  progressBar$: Subscription;
  /** Hides nav/sidebar for full-screen cashier routes. */
  hideShellLayout = false;
+  /** True once this tenant's own menu-access ceiling has loaded — the nav waits on this so a menu
+   *  the tenant has turned off is never shown for an instant before disappearing. See
+   *  TenantMenuAccessService. */
+  menuAccessReady = false;
  private routeSub: Subscription;

  /** Account Facilities — populated from ClerkUiStateService when account loads */
@@ -143,6 +149,11 @@ export class ShellComponent implements OnInit, OnDestroy {
      this.cdr.detectChanges();
    });

+    this.tenantMenuAccessService.load().subscribe(() => {
+      this.menuAccessReady = true;
+      this.cdr.detectChanges();
+    });
+
    // Cashier-only users: hide shell. Clerk/dashboard: also fullscreen by default.
    const checkLayout = () => {
      const url = this.router.url;
@@ -299,32 +299,38 @@
          </mat-icon>
          <a matLine>{{ 'labels.menus.Notifications' | translate }}</a>
        </mat-list-item>
-        <mat-list-item
-          [routerLink]="['/accounting/journal-entries/frequent-postings']"
-          [matTooltipPosition]="tooltipPosition"
-          matTooltip="{{ 'tooltips.Frequent Postings' | translate }}"
-          routerLinkActive="active-menu"
-          [routerLinkActiveOptions]="{ exact: false }"
-          *mifosxHasPermission="'SIDEBAR_FREQUENT_POSTINGS'"
-        >
-          <mat-icon matListIcon>
-            <fa-icon icon="sync" size="sm"></fa-icon>
-          </mat-icon>
-          <a matLine #frequentPostings>{{ 'labels.menus.Frequent Postings' | translate }}</a>
-        </mat-list-item>
-        <mat-list-item
-          [routerLink]="['/accounting/journal-entries/create']"
-          [matTooltipPosition]="tooltipPosition"
-          matTooltip="{{ 'tooltips.Create Journal Entry' | translate }}"
-          routerLinkActive="active-menu"
-          [routerLinkActiveOptions]="{ exact: false }"
-          *mifosxHasPermission="'SIDEBAR_JOURNAL_ENTRY'"
-        >
-          <mat-icon matListIcon>
-            <fa-icon icon="plus" size="sm"></fa-icon>
-          </mat-icon>
-          <a matLine #createJournalEntry>{{ 'labels.menus.Create Journal Entry' | translate }}</a>
-        </mat-list-item>
+        <!-- Frequent Postings / Create Journal Entry — hidden while disabled, see
+             accounting/disabled-features.ts -->
+        @if (!disabledFeatures.frequentPostings) {
+          <mat-list-item
+            [routerLink]="['/accounting/journal-entries/frequent-postings']"
+            [matTooltipPosition]="tooltipPosition"
+            matTooltip="{{ 'tooltips.Frequent Postings' | translate }}"
+            routerLinkActive="active-menu"
+            [routerLinkActiveOptions]="{ exact: false }"
+            *mifosxHasPermission="'SIDEBAR_FREQUENT_POSTINGS'"
+          >
+            <mat-icon matListIcon>
+              <fa-icon icon="sync" size="sm"></fa-icon>
+            </mat-icon>
+            <a matLine #frequentPostings>{{ 'labels.menus.Frequent Postings' | translate }}</a>
+          </mat-list-item>
+        }
+        @if (!disabledFeatures.createJournalEntries) {
+          <mat-list-item
+            [routerLink]="['/accounting/journal-entries/create']"
+            [matTooltipPosition]="tooltipPosition"
+            matTooltip="{{ 'tooltips.Create Journal Entry' | translate }}"
+            routerLinkActive="active-menu"
+            [routerLinkActiveOptions]="{ exact: false }"
+            *mifosxHasPermission="'SIDEBAR_JOURNAL_ENTRY'"
+          >
+            <mat-icon matListIcon>
+              <fa-icon icon="plus" size="sm"></fa-icon>
+            </mat-icon>
+            <a matLine #createJournalEntry>{{ 'labels.menus.Create Journal Entry' | translate }}</a>
+          </mat-list-item>
+        }
        <mat-list-item
          [routerLink]="['/accounting/chart-of-accounts']"
          [matTooltipPosition]="tooltipPosition"
@@ -33,6 +33,7 @@ import { MatIcon } from '@angular/material/icon';
 import { MatLine } from '@angular/material/grid-list';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { remittanceConfig } from '../../../remittances/remittance.config';
+import { DISABLED_ACCOUNTING_FEATURES } from '../../../accounting/disabled-features';
 import { environment } from '../../../../environments/environment';

 import { catchError, finalize, of, take } from 'rxjs';
@@ -81,6 +82,8 @@ export class SidenavComponent implements OnInit, AfterViewInit {
  frequentActivities: any[] = frequentActivities;
  /** Whether remittance feature is enabled */
  mifosRemittanceEnabled = remittanceConfig.isRemittanceEnabled;
+  /** Accounting features switched off for this installation — see accounting/disabled-features.ts. */
+  disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
  /** Whether Superset Analytics is enabled */
  supersetEnabled = environment.supersetEnabled;

@@ -0,0 +1,66 @@
+/**
+ * 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/.
+ */
+
+/**
+ * A date from the Fineract API as `yyyy-mm-dd`, or '' when there is none.
+ *
+ * Fineract serialises dates as `[year, month, day]` arrays, not strings, and reading one as a
+ * string gives `"2026,6,12"` — which renders literally on screen, and which `new Date()` turns
+ * into an Invalid Date, so every day-count off it comes out NaN. Two reports have already shipped
+ * that bug: the dormancy report sat on "Loading..." forever when `toISOString()` threw inside a
+ * subscribe callback, and the re-KYC report showed "2026,6,12 · Due in NaN days" with all three
+ * stage counters stuck on zero.
+ *
+ * Strings are passed through, since some endpoints are configured to return them.
+ */
+export function toIsoDate(value: any): string {
+  if (!value) {
+    return '';
+  }
+  if (Array.isArray(value)) {
+    const [
+      year,
+      month,
+      day
+    ] = value;
+    if (!year || !month || !day) {
+      return '';
+    }
+    return `${year}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+  }
+  return String(value).slice(0, 10);
+}
+
+/**
+ * A Fineract timestamp as a real Date, so Angular's `date` pipe can format it.
+ *
+ * LocalDateTime arrives as [y, M, d, H, m, s] — an array the pipe renders as nothing at all, which
+ * is how a "Raised On" column came to sit empty next to an alert that plainly had been raised.
+ * Month is 1-based on the wire and 0-based in Date, hence the shift.
+ */
+export function toApiDate(value: any): Date | null {
+  if (!value) {
+    return null;
+  }
+  if (Array.isArray(value)) {
+    const [
+      year,
+      month,
+      day,
+      hour = 0,
+      minute = 0,
+      second = 0
+    ] = value;
+    if (!year || !month || !day) {
+      return null;
+    }
+    return new Date(year, month - 1, day, hour, minute, second);
+  }
+  const parsed = new Date(value);
+  return isNaN(parsed.getTime()) ? null : parsed;
+}
@@ -367,15 +367,18 @@
    }

    <!-- Compliance / AML Action Triage -->
-    <div class="compliance-triage" style="margin-top: 16px; padding: 12px; background: #fff8f8; border: 1px dashed #f5c2c2; border-radius: 8px;">
-      <h4 style="margin: 0 0 8px; font-weight: 600; color: #b91c1c; display: flex; align-items: center; gap: 6px;">
+    <div
+      class="compliance-triage"
+      style="margin-top: 16px; padding: 12px; background: #fff8f8; border: 1px dashed #f5c2c2; border-radius: 8px"
+    >
+      <h4 style="margin: 0 0 8px; font-weight: 600; color: #b91c1c; display: flex; align-items: center; gap: 6px">
        Compliance & AML Triage
      </h4>
-      <div style="display: flex; flex-direction: column; gap: 8px;">
-        <mat-checkbox [(ngModel)]="flagAsSuspicious" [ngModelOptions]="{standalone: true}">
+      <div style="display: flex; flex-direction: column; gap: 8px">
+        <mat-checkbox [(ngModel)]="flagAsSuspicious" [ngModelOptions]="{ standalone: true }">
          Flag as suspicious (escalate to STR cases under RBI compliance)
        </mat-checkbox>
-        <mat-checkbox [(ngModel)]="markAsWhitelisted" [ngModelOptions]="{standalone: true}">
+        <mat-checkbox [(ngModel)]="markAsWhitelisted" [ngModelOptions]="{ standalone: true }">
          Mark as whitelisted (prevent future AML alerts for this account)
        </mat-checkbox>
      </div>
@@ -145,7 +145,7 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
          cases = [];
        }
      }
-      
+
      const newRef = 101 + cases.length;
      const newCase: any = {
        reportType: 'STR',
@@ -171,10 +171,10 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
        narrative: `CTS Cheque #${this.item.chequeNumber} for amount ₹${this.item.amount} flagged as suspicious by Clearing Officer during inward presentment review. Action: ${this.mode}. Reason/Notes: ${this.mode === 'RETURN' ? this.returnForm.value.reason : this.passForm.value.note || 'Manual compliance escalation'}`,
        status: 'po-review'
      };
-      
+
      cases.unshift(newCase);
      localStorage.setItem('fiu_str_cases', JSON.stringify(cases));
-      
+
      const storedCtr = localStorage.getItem('fiu_ctr_txns');
      if (storedCtr) {
        try {
@@ -201,7 +201,7 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
        whitelisted.push(account.toString());
        localStorage.setItem('compliance_whitelisted_accounts', JSON.stringify(whitelisted));
      }
-      
+
      const storedCtr = localStorage.getItem('fiu_ctr_txns');
      if (storedCtr) {
        try {
@@ -21,6 +21,7 @@ import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { CurrentAccountsService } from '../../current-accounts.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
+import { FacilityChargeFilterService } from 'app/shared/charges/facility-charge-filter.service';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';

 /**
@@ -40,6 +41,7 @@ export class AddChargeCurrentAccountComponent implements OnInit {
  private router = inject(Router);
  private dateUtils = inject(Dates);
  private currentAccountsService = inject(CurrentAccountsService);
+  private facilityChargeFilter = inject(FacilityChargeFilterService);
  private settingsService = inject(SettingsService);

  /** Minimum Due Date allowed. */
@@ -66,7 +68,9 @@ export class AddChargeCurrentAccountComponent implements OnInit {
   */
  constructor() {
    this.route.data.subscribe((data: { currentAccountActionData: any }) => {
-      this.currentAccountChargeOptions = data.currentAccountActionData.chargeOptions;
+      this.facilityChargeFilter
+        .excludeFacilityCharges(data.currentAccountActionData.chargeOptions)
+        .subscribe((charges: any[]) => (this.currentAccountChargeOptions = charges));
    });
    this.currentAccountId = this.route.snapshot.params['currentAccountId'];
  }
@@ -36,6 +36,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { MatButton, MatIconButton } from '@angular/material/button';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper';
+import { FacilityChargeFilterService } from 'app/shared/charges/facility-charge-filter.service';
 import { ChargesFilterPipe } from '../../../pipes/charges-filter.pipe';
 import { DateFormatPipe } from '../../../pipes/date-format.pipe';
 import { FormatNumberPipe } from '../../../pipes/format-number.pipe';
@@ -73,6 +74,7 @@ export class CurrentAccountChargesStepComponent implements OnInit {
  private dialog = inject(MatDialog);
  private dateUtils = inject(Dates);
  private translateService = inject(TranslateService);
+  private facilityChargeFilter = inject(FacilityChargeFilterService);

  /** Current Account Product Template */
  private _currentAccountProductTemplate: any;
@@ -80,7 +82,9 @@ export class CurrentAccountChargesStepComponent implements OnInit {
  set currentAccountProductTemplate(value: any) {
    this._currentAccountProductTemplate = value;
    if (value) {
-      this.chargeData = value.chargeOptions || [];
+      this.facilityChargeFilter
+        .excludeFacilityCharges(value.chargeOptions)
+        .subscribe((charges: any[]) => (this.chargeData = charges));
      // Only pre-populate from product template for new accounts
      if (!this.currentAccountTemplate?.id) {
        this.chargesDataSource = (value.charges || []).map((charge: any) => ({ ...charge, id: charge.chargeId }));
@@ -174,18 +174,6 @@
      </label>
    </div>

-    <div class="dig-card" [class.dig-card--on]="facilityConfig.withdrawalFacility">
-      <div class="dig-card__icon"><i class="fas fa-arrow-right-arrow-left"></i></div>
-      <div class="dig-card__body">
-        <span class="dig-card__label">Withdrawal Facility</span>
-        <span class="dig-card__status">{{ facilityConfig.withdrawalFacility ? 'Enabled' : 'Disabled' }}</span>
-      </div>
-      <label class="dig-toggle">
-        <input type="checkbox" [(ngModel)]="facilityConfig.withdrawalFacility" />
-        <span class="dig-toggle__track"><span class="dig-toggle__thumb"></span></span>
-      </label>
-    </div>
-
    <div class="dig-card" [class.dig-card--on]="facilityConfig.depositFacilityKyc">
      <div class="dig-card__icon"><i class="fas fa-id-card"></i></div>
      <div class="dig-card__body">
@@ -24,7 +24,6 @@ const DEFAULT_FACILITY_CONFIG = {
  neftFacility: false,
  rtgsFacility: false,
  interBankTotalCapFacility: false,
-  withdrawalFacility: false,
  depositFacilityKyc: false,
  virtualDebitCard: false,
  internetBanking: false,
@@ -76,7 +76,6 @@ export class CurrentAccountPreviewStepComponent implements OnChanges {
    { key: 'neftFacility', label: 'NEFT Facility' },
    { key: 'rtgsFacility', label: 'RTGS Facility' },
    { key: 'interBankTotalCapFacility', label: 'Inter-Bank Total Cap' },
-    { key: 'withdrawalFacility', label: 'Withdrawal Facility' },
    { key: 'depositFacilityKyc', label: 'Deposit Facility (KYC)' },
    { key: 'virtualDebitCard', label: 'Virtual Debit Card' },
    { key: 'internetBanking', label: 'Internet Banking' },
@@ -43,7 +43,6 @@ const DEFAULT_FACILITY_CONFIG: Record<string, boolean> = {
  neftFacility: false,
  rtgsFacility: false,
  interBankTotalCapFacility: false,
-  withdrawalFacility: false,
  depositFacilityKyc: false,
  virtualDebitCard: false,
  internetBanking: false,
@@ -66,7 +65,6 @@ const FACILITY_TOGGLES: { key: string; label: string; icon: string }[] = [
  { key: 'neftFacility', label: 'NEFT Facility', icon: 'fa-money-check-alt' },
  { key: 'rtgsFacility', label: 'RTGS Facility', icon: 'fa-money-check' },
  { key: 'interBankTotalCapFacility', label: 'Inter-Bank Total Cap', icon: 'fa-balance-scale' },
-  { key: 'withdrawalFacility', label: 'Withdrawal Facility', icon: 'fa-arrow-right-arrow-left' },
  { key: 'depositFacilityKyc', label: 'Deposit Facility (KYC)', icon: 'fa-id-card' },
  { key: 'virtualDebitCard', label: 'Virtual Debit Card', icon: 'fa-credit-card' },
  { key: 'internetBanking', label: 'Internet Banking', icon: 'fa-globe' },
@@ -11,6 +11,7 @@ import { Directive, Input, TemplateRef, ViewContainerRef, inject } from '@angula

 /** Custom Services */
 import { AuthenticationService } from '../../core/authentication/authentication.service';
+import { TenantMenuAccessService } from './tenant-menu-access.service';

 /** Environment */
 import { environment } from '../../../environments/environment';
@@ -23,6 +24,7 @@ export class HasPermissionDirective {
  private templateRef = inject<TemplateRef<any>>(TemplateRef);
  private viewContainer = inject(ViewContainerRef);
  private authenticationService = inject(AuthenticationService);
+  private tenantMenuAccessService = inject(TenantMenuAccessService);

  /** User Permissions */
  private userPermissions: any[];
@@ -75,6 +77,13 @@ export class HasPermissionDirective {
    // Menu & Sidebar permissions are ALWAYS enforced (hide/show nav items based on role)
    const isMenuPermission = permission.startsWith('MENU_') || permission.startsWith('SIDEBAR_');

+    // The tenant's own ceiling on which menu sections it may ever show — checked before anything
+    // else below, ALL_FUNCTIONS included, because ALL_FUNCTIONS bypassing this is exactly the gap
+    // this exists to close (see TenantMenuAccessApiResource). Non-menu permissions never touch this.
+    if (isMenuPermission && !this.tenantMenuAccessService.isMenuAllowed(permission)) {
+      return false;
+    }
+
    // For non-menu permissions: if RBAC is disabled, show everything (backward compatibility)
    if (!this.rbacEnabled && !isMenuPermission) {
      return true;
@@ -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/.
+ */
+
+import { Injectable, inject } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { catchError, of, tap } from 'rxjs';
+
+/**
+ * The current tenant's own cap on which top-nav menu codes may ever show — see
+ * `TenantMenuAccessApiResource` on the backend for why this exists separately from a user's own
+ * permission list: a role carrying `ALL_FUNCTIONS` bypasses every ordinary permission check, so
+ * `HasPermissionDirective` needs a second, tenant-level list that check cannot see past.
+ *
+ * Loaded once per session, into a plain `Set` rather than an `Observable` the directive would have
+ * to subscribe to — `mifosxHasPermission`'s setter runs synchronously and once per binding, so
+ * `ShellComponent` loads this before the nav renders (see `ready`) and every directive instance
+ * afterwards just reads the already-populated set.
+ */
+@Injectable({ providedIn: 'root' })
+export class TenantMenuAccessService {
+  private http = inject(HttpClient);
+
+  /** Menu codes this tenant has explicitly turned off. Absence from this set means "shown" —
+   *  a tenant that never configured anything (every tenant, until an operator narrows one) has
+   *  nothing here, which is what keeps every existing deployment behaving exactly as it does today. */
+  private disabledCodes = new Set<string>();
+
+  /** True once the initial load has settled, success or failure. `ShellComponent` waits on this
+   *  before rendering the nav, so a menu is never shown-then-hidden a moment later. */
+  private loaded = false;
+
+  isReady(): boolean {
+    return this.loaded;
+  }
+
+  isMenuAllowed(menuCode: string): boolean {
+    return !this.disabledCodes.has(menuCode);
+  }
+
+  /** Fetches this tenant's list once. A failed request is treated as "nothing disabled" — the same
+   *  as a tenant that never configured this at all — so a transient network hiccup on login never
+   *  makes the whole nav disappear. */
+  load() {
+    return this.http.get<{ menuCode: string; enabled: boolean }[]>('/tenant-menu-access').pipe(
+      tap((rows) => {
+        this.disabledCodes = new Set((rows || []).filter((r) => r.enabled === false).map((r) => r.menuCode));
+        this.loaded = true;
+      }),
+      catchError(() => {
+        this.disabledCodes = new Set();
+        this.loaded = true;
+        return of([]);
+      })
+    );
+  }
+}
@@ -0,0 +1,398 @@
+<!--
+  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="dr">
+  <!-- Header -->
+  <div class="dr-head">
+    <div>
+      <h2 class="dr-head-t"><fa-icon icon="clock"></fa-icon> Inactive, Dormant &amp; DEAF Reports</h2>
+      <div class="dr-head-s">
+        Accounts with no customer-induced transaction, at each of the three marks RBI sets. Interest the bank posts does
+        not reset the clock — only a deposit or withdrawal the customer makes.
+      </div>
+    </div>
+    <div class="dr-head-a">
+      <button class="dr-btn dr-btn--slim" (click)="load()" [disabled]="loading">
+        <fa-icon icon="undo"></fa-icon> Reload
+      </button>
+      <button class="dr-btn dr-btn--primary" (click)="exportExcel()" [disabled]="loading">
+        <fa-icon icon="file-excel"></fa-icon> Export all three
+      </button>
+    </div>
+  </div>
+
+  @if (errorMessage) {
+    <div class="dr-alert">
+      <fa-icon icon="exclamation-triangle"></fa-icon>
+      <div>{{ errorMessage }}</div>
+    </div>
+  }
+
+  <!-- The money that has left customers' accounts but not reached RBI -->
+  @if (summary.pendingRemittanceCount > 0) {
+    <div class="dr-alert">
+      <fa-icon icon="exclamation-triangle"></fa-icon>
+      <div>
+        <strong>₹{{ summary.pendingRemittance | number: '1.0-0' }}</strong> from
+        <strong>{{ summary.pendingRemittanceCount }}</strong> escheated
+        {{ summary.pendingRemittanceCount === 1 ? 'account has' : 'accounts have' }} not been recorded as remitted to
+        RBI's DEAF. The balance has already left the customer's account, so until the remittance is recorded the money
+        sits with the bank against no fund.
+        <button class="dr-link" (click)="showTab('ESCHEAT'); pendingRemittanceOnly = true">Show these accounts</button>
+      </div>
+    </div>
+  }
+
+  <!-- Entry: filters that apply to all three reports -->
+  <div class="dr-entry">
+    <div class="dr-entry-h"><fa-icon icon="filter"></fa-icon> Report criteria</div>
+    <div class="dr-entry-b">
+      <div class="dr-field">
+        <label>As on</label>
+        <!-- The idle period is worked out server-side against the business date, so this states the
+             day the figures are for rather than offering to recompute them for another. -->
+        <input class="dr-inp dr-inp--ro" type="date" [value]="today" disabled />
+      </div>
+
+      <div class="dr-field">
+        <label>Branch</label>
+        <select class="dr-inp" [(ngModel)]="branchCode">
+          <option value="">All branches</option>
+          @for (b of branches; track b) {
+            <option [value]="b">{{ b }}</option>
+          }
+        </select>
+      </div>
+
+      <div class="dr-field">
+        <label>Minimum balance</label>
+        <input class="dr-inp" type="number" [(ngModel)]="minBalance" placeholder="Any" min="0" />
+      </div>
+
+      <div class="dr-field dr-field--wide">
+        <label>Search</label>
+        <input class="dr-inp" type="text" [(ngModel)]="search" placeholder="Customer name, ID or account number" />
+      </div>
+
+      <div class="dr-field dr-field--btn">
+        <button class="dr-btn dr-btn--slim" (click)="resetFilters()"><fa-icon icon="undo"></fa-icon> Reset</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- The three reports, side by side -->
+  <div class="dr-tabs">
+    @for (t of tabs; track t) {
+      <button
+        class="dr-tab"
+        [class]="'dr-tab dr-tab--' + stageMeta[t].tone"
+        [class.dr-tab--on]="tab === t"
+        (click)="showTab(t)"
+      >
+        <div class="dr-tab-h">
+          <span class="dr-tab-l">{{ stageMeta[t].label }}</span>
+          <span class="dr-tab-n">{{ countFor(t) }}</span>
+        </div>
+        <div class="dr-tab-d">After {{ stageMeta[t].afterDays }} days idle</div>
+        <div class="dr-tab-e">{{ stageMeta[t].effect }}</div>
+      </button>
+    }
+  </div>
+
+  <!-- What this stage means, and how an account comes back from it -->
+  <div class="dr-context">
+    <div class="dr-context-i">
+      <fa-icon icon="info-circle"></fa-icon>
+      <div>
+        <strong>{{ stageMeta[tab].label }}.</strong> {{ stageMeta[tab].effect }}
+        <div class="dr-context-r"><strong>Revival:</strong> {{ stageMeta[tab].revival }}</div>
+      </div>
+    </div>
+    <div class="dr-context-t">
+      <span class="dr-context-c">{{ visibleRows.length }}</span> accounts ·
+      <span class="dr-context-c">₹{{ visibleBalance | number: '1.0-0' }}</span> total balance
+    </div>
+  </div>
+
+  @if (tab === 'ESCHEAT') {
+    <div class="dr-bar">
+      <label class="dr-chk">
+        <input type="checkbox" [(ngModel)]="pendingRemittanceOnly" /> Not yet remitted to RBI
+      </label>
+      <span class="dr-money">
+        <span class="dr-money-i dr-money-i--bad">
+          ₹{{ summary.pendingRemittance | number: '1.0-0' }} not remitted
+        </span>
+        <span class="dr-money-i dr-money-i--ok"> ₹{{ summary.remittedBalance | number: '1.0-0' }} with the fund </span>
+        @if (summary.claimedBackCount > 0) {
+          <span class="dr-money-i"> ₹{{ summary.claimedBackBalance | number: '1.0-0' }} claimed back </span>
+        }
+      </span>
+      <span class="dr-spacer"></span>
+      @if (selected.size > 0) {
+        <span class="dr-selinfo"> {{ selected.size }} selected · ₹{{ selectedTotal | number: '1.0-0' }} </span>
+        <button class="dr-btn dr-btn--slim" (click)="clearSelection()">Clear</button>
+      }
+      <button class="dr-btn dr-btn--primary" (click)="openRemit()" [disabled]="selected.size === 0">
+        <fa-icon icon="check"></fa-icon> Record remittance to RBI
+      </button>
+    </div>
+  }
+
+  <!-- Table -->
+  @if (loading) {
+    <div class="dr-empty"><fa-icon icon="spinner" [spin]="true"></fa-icon> Loading…</div>
+  } @else if (visibleRows.length === 0) {
+    <div class="dr-empty">No accounts at this stage match the criteria above.</div>
+  } @else {
+    <div class="dr-tablewrap">
+      <table class="dr-table">
+        <thead>
+          <tr>
+            @if (tab === 'ESCHEAT') {
+              <th class="dr-tick">
+                <input
+                  type="checkbox"
+                  [checked]="allSelected"
+                  (change)="toggleSelectAll()"
+                  title="Select every account not yet remitted"
+                />
+              </th>
+            }
+            <th>Account No</th>
+            <th>Customer</th>
+            <th>Branch</th>
+            <th>Product</th>
+            <th class="num">{{ tab === 'ESCHEAT' ? 'Balance Escheated' : 'Balance' }}</th>
+            <th>Last Customer Txn</th>
+            <th>Idle For</th>
+            @if (tab === 'ESCHEAT') {
+              <th>Escheated On</th>
+              <th>Remittance to RBI</th>
+            } @else {
+              <th>Next Stage</th>
+            }
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (r of visibleRows; track r.accountId) {
+            <tr [class.dr-row--warn]="isNearingEscheat(r)" [class.dr-row--sel]="selected.has(r.accountId)">
+              @if (tab === 'ESCHEAT') {
+                <td class="dr-tick">
+                  <!-- An already-remitted balance cannot be remitted again. -->
+                  <input
+                    type="checkbox"
+                    [checked]="selected.has(r.accountId)"
+                    [disabled]="r.remittance === 'REMITTED'"
+                    (click)="toggleSelect(r, $event)"
+                  />
+                </td>
+              }
+              <td class="mono">{{ r.accountNo }}</td>
+
+              <td>
+                <strong>{{ r.clientName }}</strong>
+                <div class="dr-sub mono">{{ r.clientId }} · {{ r.mobile }}</div>
+              </td>
+
+              <td>{{ branchName(r.branchCode) }}</td>
+
+              <td class="dr-prod">{{ r.productName }}</td>
+
+              <td class="num strong">{{ r.balance | number: '1.0-0' }}</td>
+
+              <td class="mono">{{ r.lastCustomerTxnDate }}</td>
+
+              <td>
+                <span [class]="toneClass(r.stage)">{{ idleText(r.daysIdle) }}</span>
+              </td>
+
+              @if (tab === 'ESCHEAT') {
+                <td class="mono">{{ r.escheatedOn || '—' }}</td>
+                <td>
+                  <span [class]="remittanceClass(r.remittance)">
+                    {{ r.remittance === 'REMITTED' ? 'Remitted' : 'Not remitted' }}
+                  </span>
+                  @if (r.remittedOn) {
+                    <div class="dr-sub mono">{{ r.remittedOn }}</div>
+                  }
+                  @if (r.deafReference) {
+                    <div class="dr-sub mono">{{ r.deafReference }}</div>
+                  }
+                  @if (r.refundedOn) {
+                    <div class="dr-claimed"><fa-icon icon="undo"></fa-icon> Claimed back {{ r.refundedOn }}</div>
+                  }
+                </td>
+              } @else {
+                <td>
+                  <div class="dr-next">{{ r.nextStageLabel }}</div>
+                  <div class="dr-sub mono" [class.dr-sub--red]="isNearingEscheat(r)">
+                    {{ r.nextStageDate }}
+                    @if (isNearingEscheat(r)) {
+                      · {{ daysToNext(r) }} days
+                    }
+                  </div>
+                </td>
+              }
+
+              <td class="dr-act">
+                <button class="dr-mini" (click)="openClient(r, $event)">
+                  <fa-icon icon="user"></fa-icon> Customer
+                </button>
+                <!-- A remitted balance can still be claimed, so long as it has not been already. -->
+                @if (tab === 'ESCHEAT' && r.remittance === 'REMITTED' && !r.refundedOn) {
+                  <button
+                    class="dr-mini"
+                    title="The customer claimed this balance back — the bank paid them and recovers it from DEAF"
+                    (click)="openRefund(r, $event)"
+                  >
+                    <fa-icon icon="undo"></fa-icon> Claimed back
+                  </button>
+                }
+              </td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
+
+  <!-- Where the money in the escheat report has to go -->
+  @if (tab === 'ESCHEAT') {
+    <div class="dr-foot">
+      <fa-icon icon="gavel"></fa-icon>
+      <div>
+        <strong>Depositor Education and Awareness Fund.</strong> A balance unclaimed for ten years is transferred to
+        RBI's DEAF. The transfer itself is made outside this system, so an account shows as escheated here from the day
+        the balance leaves it — the remittance column records that the money actually reached RBI, and stays "not
+        remitted" until it does. A customer can still claim the amount at any time; the bank pays them and recovers it
+        from the fund, which shows here as claimed back.
+      </div>
+    </div>
+  }
+</div>
+
+<!-- Record that money was sent to RBI -->
+@if (remitOpen) {
+  <div class="dr-modal-bg" (click)="remitOpen = false">
+    <div class="dr-modal" (click)="$event.stopPropagation()">
+      <div class="dr-modal-h">
+        <h3>Record remittance to RBI's DEAF</h3>
+        <button class="dr-x" (click)="remitOpen = false">&times;</button>
+      </div>
+
+      <div class="dr-modal-b">
+        <div class="dr-modal-sum">
+          <div>
+            <span class="dr-modal-n">{{ selected.size }}</span>
+            <span class="dr-modal-l">accounts</span>
+          </div>
+          <div>
+            <span class="dr-modal-n">₹{{ selectedTotal | number: '1.0-0' }}</span>
+            <span class="dr-modal-l">total remitted</span>
+          </div>
+        </div>
+
+        <div class="dr-note-box">
+          <fa-icon icon="info-circle"></fa-icon>
+          This records a transfer that has already been made to RBI. It does not move any money — it marks these
+          balances as accounted for, so they stop showing as outstanding.
+        </div>
+
+        <label class="dr-lbl">Date sent to RBI <span class="dr-req">*</span></label>
+        <input class="dr-inp dr-inp--full" type="date" [(ngModel)]="remitDate" />
+
+        <label class="dr-lbl">RBI / DEAF reference</label>
+        <input
+          class="dr-inp dr-inp--full"
+          type="text"
+          [(ngModel)]="remitReference"
+          placeholder="e.g. DEAF/2026/Q2/004913 — as printed on RBI's advice"
+        />
+
+        <label class="dr-lbl">Remarks</label>
+        <textarea class="dr-ta" rows="3" [(ngModel)]="remitRemarks" placeholder="Optional"></textarea>
+
+        @if (remitError) {
+          <div class="dr-err"><fa-icon icon="exclamation-triangle"></fa-icon> {{ remitError }}</div>
+        }
+      </div>
+
+      <div class="dr-modal-f">
+        <button class="dr-btn" (click)="remitOpen = false">Cancel</button>
+        <button class="dr-btn dr-btn--primary" (click)="saveRemittance()" [disabled]="remitSaving">
+          @if (remitSaving) {
+            <fa-icon icon="spinner" [spin]="true"></fa-icon> Saving…
+          } @else {
+            Record remittance
+          }
+        </button>
+      </div>
+    </div>
+  </div>
+}
+
+<!-- Customer claimed a remitted balance back -->
+@if (refundOpen && refundRow) {
+  <div class="dr-modal-bg" (click)="refundOpen = false">
+    <div class="dr-modal dr-modal--sm" (click)="$event.stopPropagation()">
+      <div class="dr-modal-h">
+        <h3>Record a claim against DEAF</h3>
+        <button class="dr-x" (click)="refundOpen = false">&times;</button>
+      </div>
+
+      <div class="dr-modal-b">
+        <div class="dr-modal-who">
+          <strong>{{ refundRow.clientName }}</strong>
+          <span class="mono">{{ refundRow.accountNo }}</span>
+        </div>
+
+        <div class="dr-modal-sum">
+          <div>
+            <span class="dr-modal-n">₹{{ refundRow.balance | number: '1.0-0' }}</span>
+            <span class="dr-modal-l">claimed</span>
+          </div>
+          <div>
+            <span class="dr-modal-n mono">{{ refundRow.remittedOn }}</span>
+            <span class="dr-modal-l">remitted to RBI</span>
+          </div>
+        </div>
+
+        <div class="dr-note-box">
+          <fa-icon icon="info-circle"></fa-icon>
+          A depositor can claim an unclaimed balance at any time, however long it has been with the fund. The bank pays
+          the customer and recovers the amount from RBI. This records that, so the money is no longer counted as sitting
+          with the fund.
+        </div>
+
+        <label class="dr-lbl">Date the customer was paid <span class="dr-req">*</span></label>
+        <input class="dr-inp dr-inp--full" type="date" [(ngModel)]="refundDate" />
+
+        @if (refundError) {
+          <div class="dr-err"><fa-icon icon="exclamation-triangle"></fa-icon> {{ refundError }}</div>
+        }
+      </div>
+
+      <div class="dr-modal-f">
+        <button class="dr-btn" (click)="refundOpen = false">Cancel</button>
+        <button class="dr-btn dr-btn--primary" (click)="saveRefund()" [disabled]="refundSaving">
+          @if (refundSaving) {
+            <fa-icon icon="spinner" [spin]="true"></fa-icon> Saving…
+          } @else {
+            Record claim
+          }
+        </button>
+      </div>
+    </div>
+  </div>
+}
+
+@if (toastVisible) {
+  <div class="dr-toast">{{ toastMsg }}</div>
+}
@@ -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/.
+ */
+
+:host {
+  --d-navy: #1a237e;
+  --d-blue: #1d4ed8;
+  --d-blue-l: #eff6ff;
+  --d-green: #15803d;
+  --d-green-l: #dcfce7;
+  --d-amber: #b45309;
+  --d-amber-l: #fef3c7;
+  --d-red: #c0392b;
+  --d-red-l: #fdecea;
+  --d-crit: #7f1d1d;
+  --d-crit-l: #fee2e2;
+  --d-g50: #f8fafc;
+  --d-g100: #f1f5f9;
+  --d-g200: #e2e8f0;
+  --d-g300: #cbd5e1;
+  --d-g500: #64748b;
+  --d-g700: #334155;
+  --d-g900: #0f172a;
+
+  display: block;
+  font-family: 'DM Sans', system-ui, sans-serif;
+  color: var(--d-g900);
+  background: var(--d-g50);
+  min-height: 100%;
+  padding: 16px;
+}
+
+.mono {
+  font-family: 'JetBrains Mono', ui-monospace, monospace;
+  font-size: 11.5px;
+}
+
+.num {
+  text-align: right;
+}
+
+.strong {
+  font-weight: 700;
+}
+
+/* ── Header ─────────────────────────────────────────────────────────────── */
+
+.dr-head {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  margin-bottom: 12px;
+}
+
+.dr-head-t {
+  margin: 0;
+  font-size: 18px;
+  font-weight: 700;
+  color: var(--d-navy);
+}
+
+.dr-head-s {
+  margin-top: 3px;
+  font-size: 12px;
+  color: var(--d-g500);
+  max-width: 780px;
+  line-height: 1.5;
+}
+
+.dr-head-a {
+  display: flex;
+  gap: 8px;
+  flex-shrink: 0;
+}
+
+/* The unremitted-money warning: the one number on this screen that is a live exposure. */
+.dr-alert {
+  display: flex;
+  gap: 10px;
+  padding: 11px 14px;
+  margin-bottom: 14px;
+  background: var(--d-red-l);
+  border: 1px solid #f5b7b1;
+  border-left: 4px solid var(--d-red);
+  border-radius: 7px;
+  font-size: 12px;
+  line-height: 1.55;
+  color: var(--d-g700);
+
+  fa-icon {
+    color: var(--d-red);
+    margin-top: 2px;
+  }
+}
+
+.dr-link {
+  display: inline;
+  margin-left: 4px;
+  padding: 0;
+  border: 0;
+  background: none;
+  font: inherit;
+  font-weight: 700;
+  color: var(--d-red);
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+/* ── Entry / criteria ───────────────────────────────────────────────────── */
+
+.dr-entry {
+  margin-bottom: 14px;
+  background: #fff;
+  border: 1px solid var(--d-g200);
+  border-radius: 7px;
+  overflow: hidden;
+}
+
+.dr-entry-h {
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  padding: 8px 14px;
+  background: var(--d-g100);
+  border-bottom: 1px solid var(--d-g200);
+  font-size: 11px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.4px;
+  color: var(--d-g500);
+}
+
+.dr-entry-b {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-end;
+  gap: 12px;
+  padding: 13px 14px;
+}
+
+.dr-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  min-width: 160px;
+
+  label {
+    font-size: 10.5px;
+    font-weight: 700;
+    color: var(--d-g500);
+    text-transform: uppercase;
+    letter-spacing: 0.3px;
+  }
+
+  &--wide {
+    flex: 1;
+    min-width: 240px;
+  }
+
+  &--btn {
+    min-width: 0;
+  }
+}
+
+.dr-inp {
+  padding: 7px 10px;
+  border: 1px solid var(--d-g300);
+  border-radius: 5px;
+  font: inherit;
+  font-size: 12px;
+  background: #fff;
+}
+
+.dr-chk {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  margin-bottom: 10px;
+  font-size: 12px;
+  color: var(--d-g700);
+  cursor: pointer;
+}
+
+/* ── The three reports, side by side ────────────────────────────────────── */
+
+.dr-tabs {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(255px, 1fr));
+  gap: 10px;
+  margin-bottom: 12px;
+}
+
+.dr-tab {
+  text-align: left;
+  padding: 12px 14px;
+  border: 1px solid var(--d-g200);
+  border-top: 3px solid var(--d-g300);
+  border-radius: 7px;
+  background: #fff;
+  font: inherit;
+  cursor: pointer;
+  transition: box-shadow 0.12s;
+
+  &:hover {
+    box-shadow: 0 2px 8px rgb(15 23 42 / 9%);
+  }
+
+  &--info {
+    border-top-color: var(--d-blue);
+  }
+
+  &--warn {
+    border-top-color: var(--d-amber);
+  }
+
+  &--critical {
+    border-top-color: var(--d-crit);
+  }
+
+  /* The report on display stays obvious while its rows are being read. */
+  &--on {
+    background: var(--d-g100);
+    box-shadow: inset 0 0 0 1px var(--d-g300);
+  }
+}
+
+.dr-tab-h {
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 10px;
+}
+
+.dr-tab-l {
+  font-size: 13px;
+  font-weight: 700;
+}
+
+.dr-tab-n {
+  font-size: 20px;
+  font-weight: 700;
+  line-height: 1;
+}
+
+.dr-tab-d {
+  margin-top: 2px;
+  font-size: 10.5px;
+  font-weight: 600;
+  color: var(--d-g500);
+}
+
+.dr-tab-e {
+  margin-top: 5px;
+  font-size: 10.5px;
+  color: var(--d-g500);
+  line-height: 1.45;
+}
+
+/* ── Context strip ──────────────────────────────────────────────────────── */
+
+.dr-context {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 16px;
+  padding: 10px 14px;
+  margin-bottom: 10px;
+  background: var(--d-blue-l);
+  border: 1px solid #bfdbfe;
+  border-radius: 7px;
+  font-size: 11.5px;
+  line-height: 1.55;
+  color: var(--d-g700);
+}
+
+.dr-context-i {
+  display: flex;
+  gap: 9px;
+
+  fa-icon {
+    color: var(--d-blue);
+    margin-top: 2px;
+  }
+}
+
+.dr-context-r {
+  margin-top: 3px;
+  color: var(--d-g500);
+}
+
+.dr-context-t {
+  white-space: nowrap;
+  font-size: 11.5px;
+  color: var(--d-g500);
+}
+
+.dr-context-c {
+  font-weight: 700;
+  color: var(--d-g900);
+}
+
+/* ── Buttons ────────────────────────────────────────────────────────────── */
+
+.dr-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 7px 13px;
+  border: 1px solid var(--d-g300);
+  border-radius: 5px;
+  background: #fff;
+  font: inherit;
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--d-g700);
+  cursor: pointer;
+
+  &:hover:not(:disabled) {
+    border-color: var(--d-blue);
+    color: var(--d-blue);
+  }
+
+  &:disabled {
+    opacity: 0.55;
+    cursor: not-allowed;
+  }
+
+  &--slim {
+    padding: 6px 11px;
+    font-size: 11.5px;
+  }
+
+  &--primary {
+    background: var(--d-blue);
+    border-color: var(--d-blue);
+    color: #fff;
+
+    &:hover:not(:disabled) {
+      background: #1e40af;
+      color: #fff;
+    }
+  }
+}
+
+.dr-mini {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+  padding: 3px 9px;
+  border: 1px solid var(--d-g300);
+  border-radius: 5px;
+  background: #fff;
+  font: inherit;
+  font-size: 10.5px;
+  font-weight: 600;
+  color: var(--d-g700);
+  cursor: pointer;
+
+  &:hover {
+    border-color: var(--d-blue);
+    color: var(--d-blue);
+  }
+}
+
+/* ── Table ──────────────────────────────────────────────────────────────── */
+
+.dr-tablewrap {
+  overflow-x: auto;
+  background: #fff;
+  border: 1px solid var(--d-g200);
+  border-radius: 7px;
+}
+
+.dr-table {
+  width: 100%;
+  border-collapse: collapse;
+  font-size: 12px;
+
+  th {
+    text-align: left;
+    padding: 9px 10px;
+    background: var(--d-g100);
+    border-bottom: 1px solid var(--d-g200);
+    font-size: 10.5px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.4px;
+    color: var(--d-g500);
+    white-space: nowrap;
+
+    &.num {
+      text-align: right;
+    }
+  }
+
+  td {
+    padding: 9px 10px;
+    border-bottom: 1px solid var(--d-g100);
+    vertical-align: top;
+  }
+
+  tbody tr:hover {
+    background: var(--d-g50);
+  }
+}
+
+/* A dormant account inside a year of the DEAF mark is the one to act on now. */
+.dr-row--warn {
+  background: var(--d-amber-l);
+
+  &:hover {
+    background: #fde68a;
+  }
+}
+
+.dr-sub {
+  font-size: 10.5px;
+  color: var(--d-g500);
+  margin-top: 2px;
+
+  &--red {
+    color: var(--d-amber);
+    font-weight: 700;
+  }
+}
+
+.dr-prod {
+  max-width: 220px;
+  font-size: 11.5px;
+}
+
+.dr-next {
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--d-g700);
+}
+
+.dr-ref {
+  max-width: 200px;
+}
+
+.dr-badge {
+  display: inline-block;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 10.5px;
+  font-weight: 700;
+  white-space: nowrap;
+
+  &--info {
+    background: var(--d-blue-l);
+    color: var(--d-blue);
+  }
+
+  &--warn {
+    background: var(--d-amber-l);
+    color: var(--d-amber);
+  }
+
+  &--critical {
+    background: var(--d-crit-l);
+    color: var(--d-crit);
+  }
+}
+
+.dr-rem {
+  display: inline-block;
+  padding: 2px 9px;
+  border-radius: 999px;
+  font-size: 10.5px;
+  font-weight: 700;
+
+  &--ok {
+    background: var(--d-green-l);
+    color: var(--d-green);
+  }
+
+  /* Money out of the customer's account but not yet with RBI — never shown as settled. */
+  &--pending {
+    background: var(--d-red-l);
+    color: var(--d-red);
+  }
+}
+
+.dr-empty {
+  padding: 34px;
+  text-align: center;
+  font-size: 12.5px;
+  color: var(--d-g500);
+  background: #fff;
+  border: 1px solid var(--d-g200);
+  border-radius: 7px;
+}
+
+.dr-foot {
+  display: flex;
+  gap: 10px;
+  padding: 11px 14px;
+  margin-top: 12px;
+  background: #fff;
+  border: 1px solid var(--d-g200);
+  border-radius: 7px;
+  font-size: 11.5px;
+  line-height: 1.6;
+  color: var(--d-g500);
+
+  fa-icon {
+    color: var(--d-g500);
+    margin-top: 2px;
+  }
+}
+
+/* ── Selection & remittance bar ─────────────────────────────────────────── */
+
+.dr-bar {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  margin-bottom: 10px;
+}
+
+.dr-spacer {
+  flex: 1;
+}
+
+.dr-selinfo {
+  font-size: 11.5px;
+  font-weight: 700;
+  color: var(--d-g700);
+}
+
+.dr-tick {
+  width: 34px;
+  text-align: center;
+
+  input {
+    cursor: pointer;
+  }
+
+  /* An already-remitted row cannot be picked again; the cursor should say so. */
+  input:disabled {
+    cursor: not-allowed;
+    opacity: 0.4;
+  }
+}
+
+.dr-row--sel {
+  background: var(--d-blue-l);
+}
+
+.dr-act {
+  white-space: nowrap;
+
+  .dr-mini + .dr-mini {
+    margin-left: 4px;
+  }
+}
+
+/* ── Modal ──────────────────────────────────────────────────────────────── */
+
+.dr-modal-bg {
+  position: fixed;
+  inset: 0;
+  background: rgb(15 23 42 / 45%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+  padding: 20px;
+}
+
+.dr-modal {
+  width: 100%;
+  max-width: 520px;
+  max-height: 90vh;
+  overflow-y: auto;
+  background: #fff;
+  border-radius: 9px;
+  box-shadow: 0 18px 50px rgb(15 23 42 / 26%);
+
+  &--sm {
+    max-width: 450px;
+  }
+}
+
+.dr-modal-h {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 13px 17px;
+  border-bottom: 1px solid var(--d-g200);
+
+  h3 {
+    margin: 0;
+    font-size: 14px;
+    font-weight: 700;
+    color: var(--d-navy);
+  }
+}
+
+.dr-x {
+  border: 0;
+  background: transparent;
+  font-size: 22px;
+  line-height: 1;
+  color: var(--d-g500);
+  cursor: pointer;
+}
+
+.dr-modal-b {
+  padding: 15px 17px;
+}
+
+.dr-modal-f {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  padding: 12px 17px;
+  border-top: 1px solid var(--d-g200);
+}
+
+.dr-modal-sum {
+  display: flex;
+  gap: 26px;
+  padding-bottom: 12px;
+  margin-bottom: 12px;
+  border-bottom: 1px solid var(--d-g100);
+}
+
+.dr-modal-n {
+  display: block;
+  font-size: 20px;
+  font-weight: 700;
+  line-height: 1.1;
+}
+
+.dr-modal-l {
+  font-size: 10.5px;
+  color: var(--d-g500);
+}
+
+.dr-modal-who {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  flex-wrap: wrap;
+  padding-bottom: 11px;
+  margin-bottom: 11px;
+  border-bottom: 1px solid var(--d-g100);
+  font-size: 12.5px;
+}
+
+.dr-modal-p {
+  margin: 12px 0 5px;
+  font-size: 11.5px;
+  font-weight: 700;
+  color: var(--d-g700);
+}
+
+.dr-modal-ul {
+  margin: 0;
+  padding-left: 18px;
+  font-size: 11.5px;
+  line-height: 1.75;
+  color: var(--d-g700);
+}
+
+/* Marking an account exempt is a decision on record, not a convenience. */
+.dr-modal-warn {
+  margin: 12px 0 0;
+  padding: 8px 11px;
+  background: var(--d-amber-l);
+  border-radius: 5px;
+  font-size: 11px;
+  line-height: 1.55;
+  color: var(--d-amber);
+}
+
+.dr-lbl {
+  display: block;
+  margin: 12px 0 5px;
+  font-size: 11px;
+  font-weight: 700;
+  color: var(--d-g700);
+}
+
+.dr-req {
+  color: var(--d-red);
+}
+
+.dr-inp--full {
+  width: 100%;
+}
+
+.dr-ta {
+  width: 100%;
+  padding: 8px 10px;
+  border: 1px solid var(--d-g300);
+  border-radius: 5px;
+  font: inherit;
+  font-size: 12px;
+  resize: vertical;
+}
+
+.dr-note-box {
+  display: flex;
+  gap: 8px;
+  padding: 9px 11px;
+  background: var(--d-blue-l);
+  border-radius: 5px;
+  font-size: 11px;
+  line-height: 1.55;
+  color: var(--d-g700);
+
+  fa-icon {
+    color: var(--d-blue);
+    margin-top: 1px;
+  }
+}
+
+.dr-err {
+  margin-top: 10px;
+  padding: 7px 10px;
+  background: var(--d-red-l);
+  border-radius: 5px;
+  font-size: 11.5px;
+  color: var(--d-red);
+}
+
+.dr-toast {
+  position: fixed;
+  bottom: 22px;
+  left: 50%;
+  transform: translateX(-50%);
+  padding: 10px 20px;
+  background: var(--d-g900);
+  color: #fff;
+  border-radius: 6px;
+  font-size: 12.5px;
+  box-shadow: 0 8px 22px rgb(15 23 42 / 30%);
+  z-index: 1100;
+}
+
+/* Where the escheated money currently stands, read at a glance above the table. */
+.dr-money {
+  display: inline-flex;
+  align-items: center;
+  gap: 12px;
+  flex-wrap: wrap;
+  margin-left: 14px;
+}
+
+.dr-money-i {
+  font-size: 11px;
+  font-weight: 700;
+  color: var(--d-g500);
+
+  &--bad {
+    color: var(--d-red);
+  }
+
+  &--ok {
+    color: var(--d-green);
+  }
+}
+
+/* A balance the customer has taken back is no longer with the fund. */
+.dr-claimed {
+  margin-top: 3px;
+  font-size: 10px;
+  font-weight: 700;
+  color: var(--d-blue);
+}
@@ -0,0 +1,621 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Angular Imports */
+import { Component, OnInit, inject } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+
+/** Custom Modules */
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+
+/** Custom Services */
+import { ClientsService } from '../clients/clients.service';
+
+/** Shared report helpers */
+import { exportWorkbook } from '../cashier/cashier-export';
+
+/** Report data + computation */
+import {
+  DORMANCY_POLICY,
+  DORMANCY_STAGES,
+  DormancyRow,
+  DormancyStage,
+  DormancySummary,
+  daysBetween,
+  dormancySummary,
+  nextStage,
+  sortByIdle,
+  stageFromSubStatus
+} from './dormancy-report.compute';
+import { toIsoDate } from 'app/core/utils/api-date';
+
+/**
+ * The three reports on accounts that have gone quiet.
+ *
+ * They are one screen rather than three because they are one progression: an account moves from
+ * inactive to dormant to escheat as the same silence lengthens, and an officer reading one usually
+ * wants to see what is coming behind it. The filters at the top therefore apply to all three, and
+ * the tabs only choose which stage is on display.
+ *
+ * The escheat tab carries the figure that matters most — money taken out of customers' accounts
+ * that has not yet reached RBI's DEAF. Nothing in this system performs that remittance, so without
+ * a report on it the gap is invisible.
+ */
+@Component({
+  selector: 'mifosx-dormancy-report',
+  templateUrl: './dormancy-report.component.html',
+  styleUrls: ['./dormancy-report.component.scss'],
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    FormsModule,
+    FaIconComponent
+  ]
+})
+export class DormancyReportComponent implements OnInit {
+  private router = inject(Router);
+  private clientsService = inject(ClientsService);
+
+  loading = false;
+  errorMessage = '';
+  rows: DormancyRow[] = [];
+  today = new Date().toISOString().slice(0, 10);
+
+  /** Which of the three reports is on display. */
+  tab: DormancyStage = 'DORMANT';
+
+  /** Filters, shared by all three tabs. */
+  branchCode = '';
+  search = '';
+  minBalance: number | null = null;
+  pendingRemittanceOnly = false;
+
+  /**
+   * Branch options come from the rows themselves rather than a fixed list: the server returns the
+   * office name it holds, and a dropdown built from anywhere else would offer branches that match
+   * nothing and omit ones that do.
+   */
+  get branches(): string[] {
+    return [...new Set(this.rows.map((r) => r.branchCode).filter((b) => !!b))].sort();
+  }
+  readonly policy = DORMANCY_POLICY;
+  readonly stageMeta = DORMANCY_STAGES;
+  readonly tabs: DormancyStage[] = [
+    'INACTIVE',
+    'DORMANT',
+    'ESCHEAT'
+  ];
+
+  ngOnInit(): void {
+    this.load();
+  }
+
+  /**
+   * Loads the accounts the dormancy job has marked.
+   *
+   * The stage is taken from the sub-status the job wrote rather than recomputed from the idle
+   * period. The sub-status is what actually restricts the account, so a report that worked it out
+   * independently could disagree with the account's real state and send officers after the wrong
+   * ones.
+   */
+  load(): void {
+    this.loading = true;
+    this.errorMessage = '';
+
+    this.clientsService.getDormantAccounts().subscribe({
+      next: (accounts: any[]) => {
+        // Mapping is wrapped because it did once throw on a date the API returned in a shape this
+        // screen did not expect. The throw escaped the callback, so `loading` was never cleared and
+        // the report sat on "Loading..." with every control dead and nothing in the network tab to
+        // explain it. A bad row should cost the row, not the screen.
+        try {
+          this.rows = sortByIdle(
+            (accounts || []).map((a) => this.mapAccount(a)).filter((r): r is DormancyRow => r !== null)
+          );
+        } catch (e) {
+          this.rows = [];
+          this.errorMessage = 'Could not read the dormancy reports.';
+          console.error('Dormancy report: could not map the accounts returned by the server', e);
+        }
+        this.openFirstStageWithRows();
+        this.loading = false;
+      },
+      error: (err: any) => {
+        this.rows = [];
+        this.loading = false;
+        this.errorMessage =
+          err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not load the dormancy reports.';
+      }
+    });
+  }
+
+  // ── Recording a DEAF remittance ────────────────────────────────────────────
+
+  /** Accounts ticked on the escheat tab, by account id. */
+  selected = new Set<number>();
+
+  remitOpen = false;
+  remitDate = new Date().toISOString().slice(0, 10);
+  remitReference = '';
+  remitRemarks = '';
+  remitSaving = false;
+  remitError = '';
+
+  toggleSelect(row: DormancyRow, event: Event): void {
+    event.stopPropagation();
+    if (this.selected.has(row.accountId)) {
+      this.selected.delete(row.accountId);
+    } else {
+      this.selected.add(row.accountId);
+    }
+  }
+
+  /** Ticks every unremitted row on display, or clears them if all are already ticked. */
+  toggleSelectAll(): void {
+    const selectable = this.visibleRows.filter((r) => r.remittance !== 'REMITTED');
+    if (selectable.every((r) => this.selected.has(r.accountId))) {
+      selectable.forEach((r) => this.selected.delete(r.accountId));
+    } else {
+      selectable.forEach((r) => this.selected.add(r.accountId));
+    }
+  }
+
+  /**
+   * Drops the whole selection.
+   *
+   * A method rather than `selected.clear()` in the template — Angular's expression syntax does not
+   * allow calling built-in methods on a Set.
+   */
+  clearSelection(): void {
+    this.selected.clear();
+  }
+
+  get allSelected(): boolean {
+    const selectable = this.visibleRows.filter((r) => r.remittance !== 'REMITTED');
+    return selectable.length > 0 && selectable.every((r) => this.selected.has(r.accountId));
+  }
+
+  get selectedTotal(): number {
+    return this.rows.filter((r) => this.selected.has(r.accountId)).reduce((s, r) => s + r.balance, 0);
+  }
+
+  openRemit(): void {
+    this.remitDate = new Date().toISOString().slice(0, 10);
+    this.remitReference = '';
+    this.remitRemarks = '';
+    this.remitError = '';
+    this.remitOpen = true;
+  }
+
+  /**
+   * Writes the remittance against every ticked account.
+   *
+   * The server skips anything not escheated or already recorded, so the result is reported back as
+   * counts rather than assumed — a batch that silently recorded fewer rows than were ticked would
+   * leave the officer believing money was accounted for when it was not.
+   */
+  saveRemittance(): void {
+    if (this.selected.size === 0) {
+      this.remitError = 'Select at least one account.';
+      return;
+    }
+    if (!this.remitDate) {
+      this.remitError = 'Enter the date the money was sent to RBI.';
+      return;
+    }
+
+    this.remitSaving = true;
+    this.remitError = '';
+
+    this.clientsService
+      .recordDeafRemittance({
+        savingsAccountIds: [...this.selected],
+        remittedOn: this.remitDate,
+        deafReference: this.remitReference.trim() || undefined,
+        remarks: this.remitRemarks.trim() || undefined
+      })
+      .subscribe({
+        next: (res: any) => {
+          this.remitSaving = false;
+          this.remitOpen = false;
+          const recorded = res?.changes?.recorded ?? res?.recorded ?? this.selected.size;
+          const skipped = res?.changes?.skipped ?? res?.skipped ?? 0;
+          this.selected.clear();
+          this.toast(
+            skipped > 0
+              ? `${recorded} remittance(s) recorded, ${skipped} skipped — already recorded or not escheated.`
+              : `${recorded} remittance(s) recorded.`
+          );
+          this.load();
+        },
+        error: (err: any) => {
+          this.remitSaving = false;
+          this.remitError =
+            err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not record the remittance.';
+        }
+      });
+  }
+
+  // ── Customer claiming a remitted balance back ──────────────────────────────
+
+  refundOpen = false;
+  refundRow: DormancyRow | null = null;
+  refundDate = new Date().toISOString().slice(0, 10);
+  refundSaving = false;
+  refundError = '';
+
+  /**
+   * Opens the claim dialog for a balance already sent to the fund.
+   *
+   * A customer can claim an unclaimed deposit at any time, however long it has been with DEAF. The
+   * bank pays them and recovers the amount from RBI, so recording it here keeps the remitted total
+   * honest rather than leaving money counted as still sitting in the fund.
+   */
+  openRefund(row: DormancyRow, event: Event): void {
+    event.stopPropagation();
+    this.refundRow = row;
+    this.refundDate = new Date().toISOString().slice(0, 10);
+    this.refundError = '';
+    this.refundOpen = true;
+  }
+
+  saveRefund(): void {
+    if (!this.refundRow) {
+      return;
+    }
+    if (!this.refundDate) {
+      this.refundError = 'Enter the date the customer was paid.';
+      return;
+    }
+
+    const row = this.refundRow;
+    this.refundSaving = true;
+    this.refundError = '';
+
+    this.clientsService.refundDeafRemittance(row.accountId, this.refundDate).subscribe({
+      next: () => {
+        this.refundSaving = false;
+        this.refundOpen = false;
+        this.toast(`Claim recorded for ${row.clientName}.`);
+        this.load();
+      },
+      error: (err: any) => {
+        this.refundSaving = false;
+        this.refundError =
+          err?.error?.defaultUserMessage || err?.error?.developerMessage || 'Could not record the claim.';
+      }
+    });
+  }
+
+  toastMsg = '';
+  toastVisible = false;
+  private toastTimer: any;
+
+  toast(msg: string): void {
+    this.toastMsg = msg;
+    this.toastVisible = true;
+    clearTimeout(this.toastTimer);
+    this.toastTimer = setTimeout(() => (this.toastVisible = false), 4000);
+  }
+
+  /** Maps one DormantAccountData row onto what the three reports render. */
+  private mapAccount(a: any): DormancyRow | null {
+    const stage = stageFromSubStatus(Number(a?.subStatus));
+    if (!stage) {
+      // Only the three dormancy states belong here; anything else is not on this ladder.
+      return null;
+    }
+
+    const lastTxn = toIsoDate(a?.lastCustomerTransactionDate);
+    const next = lastTxn ? nextStage(lastTxn, stage) : { date: '', label: '' };
+
+    return {
+      accountId: a?.accountId,
+      accountNo: a?.accountNo || '—',
+      clientId: a?.clientId,
+      clientName: a?.clientName || '—',
+      branchCode: a?.officeName || '',
+      productName: a?.productName || '—',
+      balance: Number(a?.balance ?? 0),
+      lastCustomerTxnDate: lastTxn,
+      daysIdle: Number(a?.daysIdle ?? 0),
+      stage,
+      subStatus: Number(a?.subStatus ?? 0),
+      nextStageDate: next.date,
+      nextStageLabel: next.label,
+      // An escheated account counts as remitted only when a remittance has actually been recorded
+      // against it. Absence of that row is the whole point of the report: the money has left the
+      // customer's account but is not yet accounted for as having reached RBI.
+      remittance: stage === 'ESCHEAT' ? (a?.deafRemittedOn ? 'REMITTED' : 'PENDING') : undefined,
+      escheatedOn: toIsoDate(a?.closedOnDate) || undefined,
+      remittedOn: toIsoDate(a?.deafRemittedOn) || undefined,
+      deafReference: a?.deafReference || undefined,
+      refundedOn: toIsoDate(a?.deafRefundedOn) || undefined,
+      mobile: a?.mobileNo || ''
+    };
+  }
+
+  // ── Filtering ──────────────────────────────────────────────────────────────
+
+  /** Rows on the tab in view, after the shared filters. */
+  get visibleRows(): DormancyRow[] {
+    return this.rowsForStage(this.tab);
+  }
+
+  private rowsForStage(stage: DormancyStage): DormancyRow[] {
+    const needle = this.search.trim().toLowerCase();
+    return this.rows.filter((r) => {
+      if (r.stage !== stage) {
+        return false;
+      }
+      if (this.branchCode && r.branchCode !== this.branchCode) {
+        return false;
+      }
+      if (this.minBalance != null && r.balance < this.minBalance) {
+        return false;
+      }
+      // Only meaningful on the escheat tab, where a row can be awaiting remittance.
+      if (this.pendingRemittanceOnly && r.remittance !== 'PENDING') {
+        return false;
+      }
+      if (needle) {
+        const hay = `${r.clientName} ${r.clientId} ${r.accountNo}`.toLowerCase();
+        if (!hay.includes(needle)) {
+          return false;
+        }
+      }
+      return true;
+    });
+  }
+
+  /** Tab counts respect the filters, so the badge matches what the tab will show. */
+  countFor(stage: DormancyStage): number {
+    return this.rowsForStage(stage).length;
+  }
+
+  get summary(): DormancySummary {
+    return dormancySummary(this.rows, this.today);
+  }
+
+  get visibleBalance(): number {
+    return this.visibleRows.reduce((s, r) => s + r.balance, 0);
+  }
+
+  resetFilters(): void {
+    this.branchCode = '';
+    this.search = '';
+    this.minBalance = null;
+    this.pendingRemittanceOnly = false;
+  }
+
+  showTab(stage: DormancyStage): void {
+    this.tab = stage;
+    // The remittance filter only exists on the escheat tab; carrying it elsewhere would silently
+    // empty a tab that has no remittance state at all.
+    if (stage !== 'ESCHEAT') {
+      this.pendingRemittanceOnly = false;
+    }
+  }
+
+  /**
+   * Opens the first stage that actually has accounts on it.
+   *
+   * The tab that happens to be selected is not necessarily the one holding the data: the report
+   * opens on Dormant, and an account that has only reached Inactive — or that fell back to it
+   * because a customer transaction reset its clock — leaves the reader looking at "No accounts at
+   * this stage" beside a card counting 1. Only moves off a tab that is empty, so a reader who has
+   * deliberately opened a stage is not thrown off it when the data reloads.
+   */
+  private openFirstStageWithRows(): void {
+    if (this.rowsForStage(this.tab).length > 0) {
+      return;
+    }
+    const ladder: DormancyStage[] = [
+      'INACTIVE',
+      'DORMANT',
+      'ESCHEAT'
+    ];
+    const populated = ladder.find((stage) => this.rowsForStage(stage).length > 0);
+    if (populated) {
+      this.showTab(populated);
+    }
+  }
+
+  // ── Presentation ───────────────────────────────────────────────────────────
+
+  /** The server already returns the office by name, so there is nothing to look up. */
+  branchName(office: string): string {
+    return office || '—';
+  }
+
+  toneClass(stage: DormancyStage): string {
+    return `dr-badge dr-badge--${DORMANCY_STAGES[stage].tone}`;
+  }
+
+  /** "3 years 2 months" reads better than a four-digit day count. */
+  idleText(days: number): string {
+    const years = Math.floor(days / 365);
+    const months = Math.floor((days % 365) / 30);
+    if (years === 0) {
+      return `${months} month${months === 1 ? '' : 's'}`;
+    }
+    if (months === 0) {
+      return `${years} year${years === 1 ? '' : 's'}`;
+    }
+    return `${years}y ${months}m`;
+  }
+
+  /** Days until the next mark, for the accounts approaching one. */
+  daysToNext(row: DormancyRow): number | null {
+    return row.nextStageDate ? daysBetween(this.today, row.nextStageDate) : null;
+  }
+
+  /** Flags a dormant account within a year of the ten-year mark. */
+  isNearingEscheat(row: DormancyRow): boolean {
+    const days = this.daysToNext(row);
+    return row.stage === 'DORMANT' && days !== null && days <= 365;
+  }
+
+  remittanceClass(state?: string): string {
+    return state === 'REMITTED' ? 'dr-rem dr-rem--ok' : 'dr-rem dr-rem--pending';
+  }
+
+  openClient(row: DormancyRow, event: Event): void {
+    event.stopPropagation();
+    this.router.navigate([
+      '/clients',
+      row.clientId,
+      'general'
+    ]);
+  }
+
+  // ── Export ─────────────────────────────────────────────────────────────────
+
+  /**
+   * Exports all three reports, not just the tab in view.
+   *
+   * They are read together — an auditor asking about escheat invariably asks what is behind it —
+   * and a workbook holding one of the three would only have to be produced three times.
+   */
+  exportExcel(): void {
+    const stamp = `As on ${this.today}${this.branchCode ? ` · ${this.branchName(this.branchCode)}` : ' · All branches'}`;
+
+    exportWorkbook(
+      [
+        {
+          sheetName: 'Inactive',
+          title: `Inactive Accounts — idle ${this.policy.inactiveDays}+ days`,
+          subtitle: stamp,
+          headers: [
+            'Account No',
+            'Customer',
+            'Customer ID',
+            'Branch',
+            'Product',
+            'Balance',
+            'Last Customer Txn',
+            'Idle',
+            'Becomes Dormant On'
+          ],
+          widths: [
+            18,
+            28,
+            12,
+            22,
+            30,
+            14,
+            18,
+            12,
+            20
+          ],
+          rows: this.rowsForStage('INACTIVE').map((r) => [
+            r.accountNo,
+            r.clientName,
+            String(r.clientId),
+            this.branchName(r.branchCode),
+            r.productName,
+            r.balance,
+            r.lastCustomerTxnDate,
+            this.idleText(r.daysIdle),
+            r.nextStageDate
+          ])
+        },
+        {
+          sheetName: 'Dormant',
+          title: `Dormant / Inoperative Accounts — idle ${this.policy.dormantDays}+ days`,
+          subtitle: stamp,
+          headers: [
+            'Account No',
+            'Customer',
+            'Customer ID',
+            'Branch',
+            'Product',
+            'Balance',
+            'Last Customer Txn',
+            'Idle',
+            'Due to DEAF On',
+            'Nearing DEAF'
+          ],
+          widths: [
+            18,
+            28,
+            12,
+            22,
+            30,
+            14,
+            18,
+            12,
+            18,
+            14
+          ],
+          rows: this.rowsForStage('DORMANT').map((r) => [
+            r.accountNo,
+            r.clientName,
+            String(r.clientId),
+            this.branchName(r.branchCode),
+            r.productName,
+            r.balance,
+            r.lastCustomerTxnDate,
+            this.idleText(r.daysIdle),
+            r.nextStageDate,
+            this.isNearingEscheat(r) ? 'Within 1 year' : ''
+          ])
+        },
+        {
+          sheetName: 'Escheat & DEAF',
+          title: `Escheated Accounts — idle ${this.policy.escheatDays}+ days`,
+          subtitle: `${stamp} · Not yet remitted to RBI: ₹${this.summary.pendingRemittance.toLocaleString('en-IN')}`,
+          headers: [
+            'Account No',
+            'Customer',
+            'Customer ID',
+            'Branch',
+            'Balance Escheated',
+            'Last Customer Txn',
+            'Idle',
+            'Escheated On',
+            'Remittance to RBI',
+            'Remitted On',
+            'DEAF Reference',
+            'Claimed Back On'
+          ],
+          widths: [
+            18,
+            28,
+            12,
+            22,
+            18,
+            18,
+            12,
+            14,
+            16,
+            14,
+            24,
+            16
+          ],
+          rows: this.rowsForStage('ESCHEAT').map((r) => [
+            r.accountNo,
+            r.clientName,
+            String(r.clientId),
+            this.branchName(r.branchCode),
+            r.balance,
+            r.lastCustomerTxnDate,
+            this.idleText(r.daysIdle),
+            r.escheatedOn || '',
+            r.remittance === 'REMITTED' ? 'Remitted' : 'Not remitted',
+            r.remittedOn || '',
+            r.deafReference || '',
+            r.refundedOn || ''
+          ])
+        }
+      ],
+      `dormancy-reports-${this.today}`
+    );
+  }
+}
@@ -0,0 +1,222 @@
+/**
+ * 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/.
+ */
+
+/**
+ * Accounts that have gone quiet, and what has happened to them.
+ *
+ * RBI counts the silence from the last *customer-induced* transaction — a deposit or a withdrawal
+ * the customer made. Interest the bank posts and charges it recovers are the bank operating the
+ * account, not the customer using it, so they do not reset the clock. An account crosses three
+ * marks: inactive at a year, inoperative at two, and due to the Depositor Education and Awareness
+ * Fund at ten.
+ *
+ * The escheat stage is the one that needs watching. Sending the balance to DEAF is a transfer to
+ * RBI that happens outside this system, so an account can sit closed here with its money not yet
+ * remitted. That gap is what the third report exists to show.
+ */
+
+/** The three marks an idle account passes. */
+export type DormancyStage = 'INACTIVE' | 'DORMANT' | 'ESCHEAT';
+
+/** Sub-status codes as stored on the savings account. */
+export const SUB_STATUS = {
+  NONE: 0,
+  INACTIVE: 100,
+  DORMANT: 200,
+  ESCHEAT: 300
+};
+
+/** RBI periods, in days from the last customer transaction. */
+export const DORMANCY_POLICY = {
+  inactiveDays: 365,
+  dormantDays: 730,
+  escheatDays: 3650
+};
+
+export interface DormancyStageMeta {
+  stage: DormancyStage;
+  label: string;
+  tone: 'info' | 'warn' | 'critical';
+  afterDays: number;
+  /** What the customer can still do. */
+  effect: string;
+  /** How the account comes back, in the officer's words. */
+  revival: string;
+}
+
+export const DORMANCY_STAGES: Record<DormancyStage, DormancyStageMeta> = {
+  INACTIVE: {
+    stage: 'INACTIVE',
+    label: 'Inactive',
+    tone: 'info',
+    afterDays: DORMANCY_POLICY.inactiveDays,
+    effect: 'Nothing is restricted. The account is flagged internally so the branch can reach out.',
+    revival: 'Any customer deposit or withdrawal clears the flag at once.'
+  },
+  DORMANT: {
+    stage: 'DORMANT',
+    label: 'Dormant / Inoperative',
+    tone: 'warn',
+    afterDays: DORMANCY_POLICY.dormantDays,
+    effect: 'Debits are stopped. Credits still land, so pension and benefit transfers are unaffected.',
+    revival: 'The customer completes KYC at the branch and makes one transaction — no reactivation charge.'
+  },
+  ESCHEAT: {
+    stage: 'ESCHEAT',
+    label: 'Escheat — due to DEAF',
+    tone: 'critical',
+    afterDays: DORMANCY_POLICY.escheatDays,
+    effect: 'The account is closed and the balance is taken out, to be remitted to RBI’s DEAF.',
+    revival: 'The customer can still claim the money from the bank, which then recovers it from DEAF.'
+  }
+};
+
+/** Whether the balance taken out at escheat has actually reached RBI. */
+export type DeafRemittanceState = 'PENDING' | 'REMITTED';
+
+export interface DormancyRow {
+  accountId: number;
+  accountNo: string;
+  clientId: number;
+  clientName: string;
+  branchCode: string;
+  productName: string;
+  balance: number;
+  /** Last transaction the customer themselves made. */
+  lastCustomerTxnDate: string;
+  daysIdle: number;
+  stage: DormancyStage;
+  /** Sub-status currently on the account. */
+  subStatus: number;
+  /** The day the next mark is crossed; blank once escheated. */
+  nextStageDate: string;
+  nextStageLabel: string;
+  /** Escheat only — whether the money has gone to RBI. */
+  remittance?: DeafRemittanceState;
+  /** Escheat only — the day the balance was taken out of the account. */
+  escheatedOn?: string;
+  /** Escheat only — the day it was remitted, once it has been. */
+  remittedOn?: string;
+  /** Escheat only — RBI's reference for the remittance. */
+  deafReference?: string;
+  /** Escheat only — set if the customer claimed the balance back after it went to the fund. */
+  refundedOn?: string;
+  mobile: string;
+}
+
+function addDays(date: string, days: number): string {
+  const d = new Date(`${date}T00:00:00Z`);
+  if (Number.isNaN(d.getTime())) {
+    // Never let an unparseable date take the whole report down with it.
+    return '';
+  }
+  return new Date(d.getTime() + days * 86400000).toISOString().slice(0, 10);
+}
+
+export function daysBetween(earlier: string, later: string): number {
+  const a = new Date(`${earlier}T00:00:00Z`).getTime();
+  const b = new Date(`${later}T00:00:00Z`).getTime();
+  return Math.round((b - a) / 86400000);
+}
+
+/**
+ * The stage an account is at, from the sub-status the dormancy job wrote on it.
+ *
+ * Preferred over deriving it from the idle period, because the sub-status is what actually
+ * restricts the account. Anything outside the three dormancy codes — a manual block, an active
+ * account — is not on this ladder and returns null.
+ */
+export function stageFromSubStatus(subStatus: number): DormancyStage | null {
+  if (subStatus === SUB_STATUS.INACTIVE) {
+    return 'INACTIVE';
+  }
+  if (subStatus === SUB_STATUS.DORMANT) {
+    return 'DORMANT';
+  }
+  if (subStatus === SUB_STATUS.ESCHEAT) {
+    return 'ESCHEAT';
+  }
+  return null;
+}
+
+/** Which mark an account has passed, from how long it has been idle. */
+export function dormancyStage(daysIdle: number): DormancyStage | null {
+  if (daysIdle >= DORMANCY_POLICY.escheatDays) {
+    return 'ESCHEAT';
+  }
+  if (daysIdle >= DORMANCY_POLICY.dormantDays) {
+    return 'DORMANT';
+  }
+  if (daysIdle >= DORMANCY_POLICY.inactiveDays) {
+    return 'INACTIVE';
+  }
+  return null;
+}
+
+/** The next mark and the day it falls due. */
+export function nextStage(lastTxnDate: string, stage: DormancyStage): { date: string; label: string } {
+  if (stage === 'INACTIVE') {
+    return { date: addDays(lastTxnDate, DORMANCY_POLICY.dormantDays), label: 'Becomes dormant' };
+  }
+  if (stage === 'DORMANT') {
+    return { date: addDays(lastTxnDate, DORMANCY_POLICY.escheatDays), label: 'Balance due to DEAF' };
+  }
+  // Escheat is the last mark — nothing further happens to the account on its own.
+  return { date: '', label: 'Awaiting DEAF remittance' };
+}
+
+export interface DormancySummary {
+  inactive: number;
+  dormant: number;
+  escheat: number;
+  inactiveBalance: number;
+  dormantBalance: number;
+  escheatBalance: number;
+  /** Escheated money not yet sent to RBI — the figure that must not be left to drift. */
+  pendingRemittance: number;
+  pendingRemittanceCount: number;
+  /** Balances that reached the fund and are still with it. */
+  remittedBalance: number;
+  /** Balances since claimed back by the customer and recovered from the fund. */
+  claimedBackBalance: number;
+  claimedBackCount: number;
+  /** Dormant accounts approaching the ten-year mark within a year. */
+  nearingEscheat: number;
+}
+
+export function dormancySummary(rows: DormancyRow[], today: string): DormancySummary {
+  const inactive = rows.filter((r) => r.stage === 'INACTIVE');
+  const dormant = rows.filter((r) => r.stage === 'DORMANT');
+  const escheat = rows.filter((r) => r.stage === 'ESCHEAT');
+  const pending = escheat.filter((r) => r.remittance === 'PENDING');
+  const claimedBack = escheat.filter((r) => r.refundedOn);
+  // A balance the customer has since claimed back is no longer with the fund, so it is counted
+  // separately rather than left in the remitted total.
+  const stillWithFund = escheat.filter((r) => r.remittance === 'REMITTED' && !r.refundedOn);
+  const sum = (list: DormancyRow[]) => list.reduce((s, r) => s + r.balance, 0);
+
+  return {
+    inactive: inactive.length,
+    dormant: dormant.length,
+    escheat: escheat.length,
+    inactiveBalance: sum(inactive),
+    dormantBalance: sum(dormant),
+    escheatBalance: sum(escheat),
+    pendingRemittance: sum(pending),
+    pendingRemittanceCount: pending.length,
+    remittedBalance: sum(stillWithFund),
+    claimedBackBalance: sum(claimedBack),
+    claimedBackCount: claimedBack.length,
+    nearingEscheat: dormant.filter((r) => r.nextStageDate && daysBetween(today, r.nextStageDate) <= 365).length
+  };
+}
+
+/** Idle longest first — the accounts closest to the next mark need attention first. */
+export function sortByIdle(rows: DormancyRow[]): DormancyRow[] {
+  return [...rows].sort((a, b) => b.daysIdle - a.daysIdle || b.balance - a.balance);
+}
--- a/Show More
+++ b/Show More