From efa088041c674f2339a4405a950a89f4b34fcdd2 Mon Sep 17 00:00:00 2001
From: SnehaRH <sneha@navadhiti.com>
Date: Mon, 2 Feb 2026 14:06:12 +0530
Subject: [PATCH 1/2] fix: amm-1969 batch not appearing after approval or 
 unable to save

---
 .../manual-indent-dispense.component.ts                    | 7 +++++++
 src/assets/Assamese.json                                   | 3 ++-
 src/assets/English.json                                    | 3 ++-
 src/assets/Hindi.json                                      | 3 ++-
 src/assets/Kannada.json                                    | 3 ++-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
index 13fd33b..ec0a269 100644
--- a/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
+++ b/src/app/app-modules/inventory/indent/indent-order-worklist/main-store-indent-order-worklist/indent-dispenses/manual-indent-dispense/manual-indent-dispense.component.ts
@@ -136,6 +136,13 @@ export class ManualIndentDispenseComponent implements OnInit, DoCheck {
           console.log('Batch list response', batchlistResponse);
           this.batchlist = batchlistResponse.data;
           console.log('this.batchList', this.batchlist);
+          if (this.batchlist.length === 0) {
+            this.confirmationService.alert(
+              this.currentLanguageSet.noBatchesAvailable,
+              'error',
+            );
+            return;
+          } 
           this.openSelectBatchDialog(
             selectedItem,
             this.batchlist,
diff --git a/src/assets/Assamese.json b/src/assets/Assamese.json
index ad2a10d..0c30ab6 100644
--- a/src/assets/Assamese.json
+++ b/src/assets/Assamese.json
@@ -391,6 +391,7 @@
             "failedStock": "ব্যৰ্থ ষ্টক"
 
         },
-        "healthId":"হেল্থ আইডি"
+        "healthId":"হেল্থ আইডি",
+        "noBatchesAvailable": "নির্বাচিত আইটেমৰ বাবে কোনো বেচ উপলব্ধ নহয়"
     }
 }
\ No newline at end of file
diff --git a/src/assets/English.json b/src/assets/English.json
index cda5c61..08119f0 100644
--- a/src/assets/English.json
+++ b/src/assets/English.json
@@ -384,6 +384,7 @@
             "drugName": "Drug Name",
             "failedStock": "Failed Stock"
         },
-        "healthId":"Health ID"
+        "healthId":"Health ID",
+        "noBatchesAvailable":"No batches available for the selected item"
     }
 }
diff --git a/src/assets/Hindi.json b/src/assets/Hindi.json
index 5892f3b..418581e 100644
--- a/src/assets/Hindi.json
+++ b/src/assets/Hindi.json
@@ -388,6 +388,7 @@
             "drugName": "दवा का नाम",
             "failedStock": "विफल स्टॉक"
         },
-        "healthId": "हेल्थ आईडी"
+        "healthId": "हेल्थ आईडी",
+        "noBatchesAvailable": "चयनित आइटम के लिए कोई बैच उपलब्ध नहीं है"
     }
 }
\ No newline at end of file
diff --git a/src/assets/Kannada.json b/src/assets/Kannada.json
index 9a327b1..ea6a164 100644
--- a/src/assets/Kannada.json
+++ b/src/assets/Kannada.json
@@ -385,6 +385,7 @@
 
         },
         "healthId":"ಆರೋಗ್ಯ ಐಡಿ",
-        "list": "ಪಟ್ಟಿ"
+        "list": "ಪಟ್ಟಿ",
+        "noBatchesAvailable":"ಆಯ್ಕೆಮಾಡಿದ ಐಟಂಗೆ ಯಾವುದೇ ಬ್ಯಾಚ್ ಲಭ್ಯವಿಲ್ಲ"
     }
 }

From 588582db71d89245a4449f1d131b27467ffe58d4 Mon Sep 17 00:00:00 2001
From: SnehaRH <sneha@navadhiti.com>
Date: Mon, 2 Feb 2026 14:45:25 +0530
Subject: [PATCH 2/2] fix: pointing common ui to latest branch 3.6.1

---
 Common-UI | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common-UI b/Common-UI
index 27a185b..bc6c63e 160000
--- a/Common-UI
+++ b/Common-UI
@@ -1 +1 @@
-Subproject commit 27a185ba15fbefd6333683f5a6bf8495b837f3af
+Subproject commit bc6c63e14dce0649fe6f7c0c1de665ce49955680