From 9aed9d31b90d3bd18a2fb16f4d3c3b5ef4b0ca73 Mon Sep 17 00:00:00 2001
From: A R R R Associates <admin@arrrassociates.com>
Date: Mon, 10 Aug 2026 12:33:08 +0530
Subject: [PATCH] Fix existing GSTIN display in bulk registrations

---
 .../templates/registrations/bulk.html         |  5 ++--
 app/modules/registrations/ui.py               | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/modules/registrations/templates/registrations/bulk.html b/app/modules/registrations/templates/registrations/bulk.html
index d3c48b1..968f0d6 100644
--- a/app/modules/registrations/templates/registrations/bulk.html
+++ b/app/modules/registrations/templates/registrations/bulk.html
@@ -197,7 +197,7 @@
             {% set client_businesses = businesses_by_client.get(client.id, []) %}
             {% set client_branches = branches_by_client.get(client.id, []) %}
             <tr class="client-row align-top"
-                data-search="{{ ((client.client_code or '') ~ ' ' ~ (client.client_name or '') ~ ' ' ~ (client.pan or '') ~ ' ' ~ (client.gstin or '') ~ ' ' ~ (client.trade_name or ''))|lower|e }}">
+                data-search="{{ ((client.client_code or '') ~ ' ' ~ (client.client_name or '') ~ ' ' ~ (client.pan or '') ~ ' ' ~ (gstins_by_client.get(client.id, [])|join(' ')) ~ ' ' ~ (client.trade_name or ''))|lower|e }}">
               <td class="px-3 py-3">
                 <input type="checkbox" name="client_ids" value="{{ client.id }}"
                        class="client-checkbox rounded border-slate-300">
@@ -208,7 +208,8 @@
               </td>
               <td class="px-3 py-3 text-xs text-slate-600">
                 <div>PAN: {{ client.pan or '-' }}</div>
-                <div>GSTIN: {{ client.gstin or '-' }}</div>
+                {% set existing_gstins = gstins_by_client.get(client.id, []) %}
+                    <div>GSTIN: {{ existing_gstins|join(', ') if existing_gstins else '-' }}</div>
               </td>
               <td class="px-3 py-3">
                 <input name="registration_number_{{ client.id }}"
diff --git a/app/modules/registrations/ui.py b/app/modules/registrations/ui.py
index b995045..7cfa957 100644
--- a/app/modules/registrations/ui.py
+++ b/app/modules/registrations/ui.py
@@ -101,6 +101,29 @@ def bulk_registration_page(
         tenant_id = _tenant(request, user)
         branch_id = _branch(request, user)
 
+        gstins_by_client = {}
+        gstin_rows = db.execute(
+            select(
+                ClientRegistration.client_id,
+                ClientRegistration.registration_number,
+            )
+            .join(
+                RegistrationType,
+                RegistrationType.id == ClientRegistration.registration_type_id,
+            )
+            .where(
+                ClientRegistration.tenant_id == tenant_id,
+                RegistrationType.code == "GSTIN",
+            )
+            .order_by(
+                ClientRegistration.client_id.asc(),
+                ClientRegistration.registration_number.asc(),
+            )
+        ).all()
+        for gstin_client_id, gstin_number in gstin_rows:
+            number = (gstin_number or "").strip()
+            if number:
+                gstins_by_client.setdefault(int(gstin_client_id), []).append(number)
         clients_query = select(Client).where(
             Client.tenant_id == tenant_id,
             Client.is_active.is_(True),
@@ -186,6 +209,7 @@ def bulk_registration_page(
                 types=types,
                 rules=rules,
                 consultants=consultants,
+                gstins_by_client=gstins_by_client,
                 created=created,
                 skipped=skipped,
                 invalid=invalid,