From 97d0545f074da0188bedbc1b5144b40c151c21a3 Mon Sep 17 00:00:00 2001
From: Nitesh Yadav <nitesh.yadav@lincpay.org>
Date: Thu, 23 Jul 2026 17:08:10 +0530
Subject: [PATCH] fix(chequebook,ctsclearing): surface global stock allocation
 in UI; fix decided-state check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Receive Stock form now displays the actual highest-allocated serial across
every series (not just silently prefilling the field), so the operator
can see and trust the auto-suggested range start rather than taking it
on faith.

Fixes a real bug where item.decision (which InwardClearingItem.java always
sets to the literal string "PENDING" at creation, never null) was checked
with a plain truthy test everywhere a "has this been decided yet" branch
was needed. Since "PENDING" is a non-empty string, that check was always
true — silently breaking the Decide/View button label, the collapsed
validation summary, the "Awaiting settlement" text, and the decision
dialog itself (which never showed the actual Pass/Return form, even for
still-pending items). Replaced with a proper isDecided() check everywhere.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../stock-management.component.html           | 13 +++++++++++-
 .../stock-management.component.scss           | 13 ++++++++++++
 .../stock-management.component.ts             | 21 ++++++++++++-------
 .../inward-batch-detail.component.html        | 20 ++++++++++--------
 .../inward-batch-detail.component.ts          |  8 +++++++
 .../item-decision-dialog.component.html       |  6 +++---
 .../item-decision-dialog.component.ts         |  8 +++++++
 src/assets/translations/en-US.json            |  3 +++
 src/environments/.env.ts                      |  4 ++--
 9 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/src/app/chequebook/stock-management/stock-management.component.html b/src/app/chequebook/stock-management/stock-management.component.html
index 0fe1e7026..817bbbb29 100644
--- a/src/app/chequebook/stock-management/stock-management.component.html
+++ b/src/app/chequebook/stock-management/stock-management.component.html
@@ -45,6 +45,12 @@
         @if (showReceiveForm) {
           <mat-card class="add-form">
             <mat-card-content>
+              <div class="global-allocation-note">
+                {{ 'labels.text.Highest leaf serial allocated so far, across every series' | translate }}:
+                <strong>{{ globalHighestAllocated }}</strong>
+                — {{ 'labels.text.next available start' | translate }}:
+                <strong>{{ globalHighestAllocated + 1 }}</strong>
+              </div>
               <form [formGroup]="receiveForm" (ngSubmit)="submitReceive()">
                 <div class="form-grid">
                   <mat-form-field appearance="fill">
@@ -82,7 +88,12 @@
                   <mat-form-field appearance="fill">
                     <mat-label>{{ 'labels.inputs.Range Start' | translate }}</mat-label>
                     <input matInput type="number" formControlName="rangeStart" required />
-                    <mat-hint>{{ 'labels.text.Auto-suggested to avoid overlap; editable' | translate }}</mat-hint>
+                    <mat-hint
+                      >{{ 'labels.text.Auto-suggested to avoid overlap across every series; editable' | translate }} ({{
+                        globalHighestAllocated
+                      }}
+                      + 1)</mat-hint
+                    >
                   </mat-form-field>
                   <mat-form-field appearance="fill">
                     <mat-label>{{ 'labels.inputs.Range End' | translate }}</mat-label>
diff --git a/src/app/chequebook/stock-management/stock-management.component.scss b/src/app/chequebook/stock-management/stock-management.component.scss
index b27993936..aa34846e9 100644
--- a/src/app/chequebook/stock-management/stock-management.component.scss
+++ b/src/app/chequebook/stock-management/stock-management.component.scss
@@ -92,6 +92,19 @@
   margin-bottom: 16px;
 }
 
+.global-allocation-note {
+  margin-bottom: 14px;
+  padding: 8px 12px;
+  border-radius: 4px;
+  background: rgb(25 118 210 / 8%);
+  color: rgb(0 0 0 / 70%);
+  font-size: 0.85rem;
+
+  strong {
+    font-variant-numeric: tabular-nums;
+  }
+}
+
 .form-grid {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(220px, 1fr));
diff --git a/src/app/chequebook/stock-management/stock-management.component.ts b/src/app/chequebook/stock-management/stock-management.component.ts
index e49ebf95f..98d7b8b88 100644
--- a/src/app/chequebook/stock-management/stock-management.component.ts
+++ b/src/app/chequebook/stock-management/stock-management.component.ts
@@ -281,17 +281,22 @@ export class StockManagementComponent implements OnInit {
     return start + leaves - 1;
   }
 
+  /** Highest leaf-serial allocated so far, across every series/office — the actual number the "Range Start"
+   *  suggestion is based on. Shown directly in the form (not just silently applied to the field) so the operator
+   *  can see and trust the reasoning instead of taking a pre-filled number on faith. */
+  get globalHighestAllocated(): number {
+    return this.allStockLots.reduce((m, l) => Math.max(m, l.rangeEnd || 0), 0);
+  }
+
   /**
-   * Next unused serial WITHIN this series, so a fresh receipt continues that series' own numbering —
-   * each series is numbered independently (a separate stationery order from the press), so a different
-   * series' stock is not relevant here.
+   * Next unused serial across EVERY series, not just the one being received — a real bank allocates leaf-serial
+   * numbers from one bank-wide numbering authority, so two different cheque designs never legitimately reuse the
+   * same range. Suggesting a start that only avoids the same series' own lots is exactly what let two series end
+   * up overlapping (and, once both got issued to the same account, an unresolvable serial collision) before the
+   * backend's own overlap check was widened to match (ChequeStockLotRepository.countOverlappingAnySeries).
    */
   private nextFreeSerial(): number {
-    const seriesId = this.receiveForm.get('seriesId')?.value;
-    const maxEnd = this.allStockLots
-      .filter((l) => l.seriesId === seriesId)
-      .reduce((m, l) => Math.max(m, l.rangeEnd || 0), 0);
-    return maxEnd + 1;
+    return this.globalHighestAllocated + 1;
   }
 
   onReceiveSeriesChange(): void {
diff --git a/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.html b/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.html
index c2f22fa5d..7ff9e1f69 100644
--- a/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.html
+++ b/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.html
@@ -160,7 +160,7 @@
       <ng-container matColumnDef="checks">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Validation' | translate }}</th>
         <td mat-cell *matCellDef="let it">
-          @if (it.decision) {
+          @if (isDecided(it)) {
             <span class="pill" [ngClass]="hasFailedChecks(it) ? 'bad' : 'ok'">
               {{ hasFailedChecks(it) ? 'Some checks failed' : 'All checks passed' }}
             </span>
@@ -191,7 +191,7 @@
       <ng-container matColumnDef="decision">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Decision' | translate }}</th>
         <td mat-cell *matCellDef="let it">
-          @if (it.decision) {
+          @if (isDecided(it)) {
             <span class="pill" [ngClass]="pillClass(it.decision)">{{ it.decision }}</span>
           } @else {
             <span class="pill neutral">{{ it.itemStatus || 'PENDING' }}</span>
@@ -199,16 +199,18 @@
           @if (it.returnReasonCode) {
             <div class="muted">{{ it.returnReasonCode }}</div>
           }
-          @if (it.decisionedOn) {
+          @if (isDecided(it) && it.decisionedOn) {
             <div class="muted">{{ it.decisionedOn | dateFormat }}</div>
           }
-          @if (it.decisionReason) {
+          @if (isDecided(it) && it.decisionReason) {
             <div class="muted">{{ it.decisionReason }}</div>
           }
-          @if (it.settlementBatchId) {
-            <div class="muted">Settlement #{{ it.settlementBatchId }}</div>
-          } @else if (it.decision) {
-            <div class="muted">Awaiting settlement</div>
+          @if (isDecided(it)) {
+            @if (it.settlementBatchId) {
+              <div class="muted">Settlement #{{ it.settlementBatchId }}</div>
+            } @else {
+              <div class="muted">Awaiting settlement</div>
+            }
           }
         </td>
       </ng-container>
@@ -244,7 +246,7 @@
         <th mat-header-cell *matHeaderCellDef></th>
         <td mat-cell *matCellDef="let it">
           <button mat-button color="primary" (click)="decide(it)">
-            {{ (it.decision ? 'labels.buttons.View' : 'labels.buttons.Decide') | translate }}
+            {{ (isDecided(it) ? 'labels.buttons.View' : 'labels.buttons.Decide') | translate }}
           </button>
         </td>
       </ng-container>
diff --git a/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.ts b/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.ts
index b076a35f5..8ae8f5b38 100644
--- a/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.ts
+++ b/src/app/ctsclearing/inward-batch-detail/inward-batch-detail.component.ts
@@ -209,6 +209,14 @@ export class InwardBatchDetailComponent implements OnInit, OnDestroy {
     return this.rules.some((rule) => this.ruleClass(item, rule) === 'bad') || item?.iqaStatus === 'FAIL';
   }
 
+  /** item.decision is NEVER null/empty — InwardClearingItem.java sets it to the literal string "PENDING" at
+   *  creation, then "PASS"/"RETURN" once decided. A plain truthy check on it.decision is always true, which
+   *  silently broke every "is this item decided yet" branch (View-vs-Decide, read-only summary, collapsed
+   *  validation) into always showing the decided state, even for a still-PENDING item. */
+  isDecided(item: any): boolean {
+    return item?.decision === 'PASS' || item?.decision === 'RETURN';
+  }
+
   runValidation(): void {
     if (this.busy) {
       return;
diff --git a/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.html b/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.html
index f0c920fac..ef174ef10 100644
--- a/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.html
+++ b/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.html
@@ -283,7 +283,7 @@
     }
   }
 
-  @if (item.decision) {
+  @if (isDecided) {
     <h3 class="section-title">Decision</h3>
     <div class="decided-summary" [ngClass]="pillClass(item.decision)">
       <div class="decided-headline">
@@ -372,9 +372,9 @@
 
 <div mat-dialog-actions align="end">
   <button mat-raised-button type="button" mat-dialog-close>
-    {{ (item.decision ? 'labels.buttons.Close' : 'labels.buttons.Cancel') | translate }}
+    {{ (isDecided ? 'labels.buttons.Close' : 'labels.buttons.Cancel') | translate }}
   </button>
-  @if (!item.decision) {
+  @if (!isDecided) {
     <button
       mat-raised-button
       [color]="mode === 'RETURN' ? 'warn' : 'primary'"
diff --git a/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.ts b/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.ts
index 53a7aebc1..419e5d7b8 100644
--- a/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.ts
+++ b/src/app/ctsclearing/inward-batch-detail/item-decision-dialog/item-decision-dialog.component.ts
@@ -185,6 +185,14 @@ export class ItemDecisionDialogComponent implements OnInit, OnDestroy {
     return good ? 'ok' : 'bad';
   }
 
+  /** item.decision is NEVER null — InwardClearingItem.java sets it to the literal string "PENDING" at creation,
+   *  then "PASS"/"RETURN" once decided. A plain truthy check on it is always true, which silently made this
+   *  dialog show the read-only decision summary (and hide the Pass/Return form) for every item, including ones
+   *  still genuinely PENDING. */
+  get isDecided(): boolean {
+    return this.item?.decision === 'PASS' || this.item?.decision === 'RETURN';
+  }
+
   /** What each automatic rule actually compared (amount vs words, instrument date vs the valid-until window,
    *  balance vs amount, etc.) instead of just the pass/fail pill — opened on demand, not always-on clutter. */
   openValidationDetail(): void {
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 7025253a3..e1a61c5fa 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -3319,6 +3319,9 @@
       "Only series applicable to this account type are shown": "Only series applicable to this account type are shown",
       "Leaves handed over = books x the series book size": "Leaves handed over = books × the series book size",
       "Auto-suggested to avoid overlap; editable": "Auto-suggested to avoid overlap; editable",
+      "Auto-suggested to avoid overlap across every series; editable": "Auto-suggested to avoid overlap across every series; editable",
+      "Highest leaf serial allocated so far, across every series": "Highest leaf serial allocated so far, across every series",
+      "next available start": "next available start",
       "Calculated from books x book size": "Calculated from books × book size",
       "Searching...": "Searching...",
       "Type at least 4 digits of the account number": "Type at least 4 digits of the account number",
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index a61e35393..80abab109 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -9,8 +9,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '260721',
-    'hash': '6d205c0e'
+    'version': '260723',
+    'hash': 'ca85bae4'
   },
   'allow_switching_backend_instance': true
 };