.gitignore

@@ -45,7 +45,3 @@ coverage
 .turbo
 *.tsbuildinfo
 
-
-FORM16_SAP_ACTUAL_IMPLEMENTATION_ANALYSIS.txt
-FORM16_SAP_FIELDS_ONLY.txt
-form16_use_cases_report.txt

src/components/admin/Form16AdminConfig/Form16AdminConfig.tsx

@@ -4,6 +4,7 @@ import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
+import { Textarea } from '@/components/ui/textarea';
 import {
   Table,
   TableBody,
@@ -350,11 +351,31 @@ export function Form16AdminConfig() {
               <div className="flex-1 min-w-0 space-y-3">
                 <p className="font-medium">26AS data added</p>
                 <p className="text-sm text-muted-foreground">
-                  <span className="font-medium text-foreground">Sent to:</span> RE users who can view 26AS. <span className="font-medium text-foreground">When:</span> As soon as new 26AS data is uploaded.
-                </p>
-                <p className="text-xs text-muted-foreground mt-2">
-                  Notification messages use a fixed system template and cannot be edited here.
+                  <span className="font-medium text-foreground">Sent to:</span> RE users who can view 26AS, and separately to all dealers. <span className="font-medium text-foreground">When:</span> As soon as new 26AS data is uploaded.
                 </p>
+                <div className="space-y-2">
+                  <div>
+                    <Label className="text-xs text-muted-foreground">Message to RE users</Label>
+                    <Textarea
+                      rows={2}
+                      value={notification26AsDataAdded.templateRe ?? ''}
+                      onChange={(e) => setNotification26AsDataAdded((prev) => ({ ...prev, templateRe: e.target.value }))}
+                      className="resize-none text-sm mt-1"
+                      placeholder="e.g. 26AS data has been added. Please review..."
+                    />
+                  </div>
+                  <div>
+                    <Label className="text-xs text-muted-foreground">Message to dealers</Label>
+                    <Textarea
+                      rows={2}
+                      value={notification26AsDataAdded.templateDealers ?? ''}
+                      onChange={(e) => setNotification26AsDataAdded((prev) => ({ ...prev, templateDealers: e.target.value }))}
+                      className="resize-none text-sm mt-1"
+                      placeholder="e.g. New 26AS data has been uploaded. You can submit Form 16..."
+                    />
+                  </div>
+                  <p className="text-xs text-muted-foreground">Placeholders: [Name], [Request ID]</p>
+                </div>
               </div>
               <Switch
                 checked={notification26AsDataAdded.enabled}
@@ -369,9 +390,16 @@ export function Form16AdminConfig() {
                 <p className="text-sm text-muted-foreground">
                   <span className="font-medium text-foreground">Sent to:</span> The dealer who submitted the Form 16. <span className="font-medium text-foreground">When:</span> Immediately after their submission is matched with 26AS and a credit note is generated.
                 </p>
-                <p className="text-xs text-muted-foreground mt-2">
-                  Notification message is fixed in the system configuration.
-                </p>
+                <div className="mt-2">
+                  <Textarea
+                    rows={2}
+                    value={notificationForm16SuccessCreditNote.template ?? ''}
+                    onChange={(e) => setNotificationForm16SuccessCreditNote((prev) => ({ ...prev, template: e.target.value }))}
+                    className="resize-none text-sm"
+                    placeholder="Message template..."
+                  />
+                  <p className="text-xs text-muted-foreground mt-1">Placeholders: [Name], [CreditNoteRef], [Request ID]</p>
+                </div>
               </div>
               <Switch
                 checked={notificationForm16SuccessCreditNote.enabled}
@@ -386,9 +414,16 @@ export function Form16AdminConfig() {
                 <p className="text-sm text-muted-foreground">
                   <span className="font-medium text-foreground">Sent to:</span> The dealer who submitted. <span className="font-medium text-foreground">When:</span> When their submission fails (e.g. value mismatch with 26AS, duplicate, or validation error) so they can correct and resubmit.
                 </p>
-                <p className="text-xs text-muted-foreground mt-2">
-                  Notification message is fixed in the system configuration.
-                </p>
+                <div className="mt-2">
+                  <Textarea
+                    rows={2}
+                    value={notificationForm16Unsuccessful.template ?? ''}
+                    onChange={(e) => setNotificationForm16Unsuccessful((prev) => ({ ...prev, template: e.target.value }))}
+                    className="resize-none text-sm"
+                    placeholder="Message template..."
+                  />
+                  <p className="text-xs text-muted-foreground mt-1">Placeholders: [Name], [Issue], [Request ID]</p>
+                </div>
               </div>
               <Switch
                 checked={notificationForm16Unsuccessful.enabled}
@@ -448,9 +483,16 @@ export function Form16AdminConfig() {
                       />
                     </div>
                   </div>
-                  <p className="text-xs text-muted-foreground">
-                    Alert message content is fixed and managed by the system.
-                  </p>
+                  <div>
+                    <Textarea
+                      rows={2}
+                      value={alertSubmitForm16Template}
+                      onChange={(e) => setAlertSubmitForm16Template(e.target.value)}
+                      className="resize-none text-sm mt-1"
+                      placeholder="Message template for alert to dealers..."
+                    />
+                    <p className="text-xs text-muted-foreground mt-1">Placeholders: [Name], [DueDate], [Request ID]</p>
+                  </div>
                 </div>
               </div>
               <Switch
@@ -511,9 +553,16 @@ export function Form16AdminConfig() {
                       />
                     </div>
                   </div>
-                  <p className="text-xs text-muted-foreground">
-                    Reminder message content is fixed and managed by the system.
-                  </p>
+                  <div>
+                    <Textarea
+                      rows={2}
+                      value={reminderNotificationTemplate}
+                      onChange={(e) => setReminderNotificationTemplate(e.target.value)}
+                      className="resize-none text-sm mt-1"
+                      placeholder="Message template for reminder to dealers..."
+                    />
+                    <p className="text-xs text-muted-foreground mt-1">Placeholders: [Name], [Request ID], [Status], [TAT]</p>
+                  </div>
                 </div>
               </div>
               <Switch

src/custom/components/request-detail/Form16QuickActions.tsx

@@ -7,11 +7,22 @@
 import { useState, useEffect } from 'react';
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
 import { Loader2, Receipt, X, RotateCcw } from 'lucide-react';
 import {
   getCreditNoteByRequestId,
   cancelForm16Submission,
   setForm16ResubmissionNeeded,
+  generateForm16CreditNoteManually,
 } from '@/services/form16Api';
 import { toast } from 'sonner';
 
@@ -24,11 +35,14 @@ interface Form16QuickActionsProps {
 export function Form16QuickActions({ requestId, request, onRefresh }: Form16QuickActionsProps) {
   const [creditNote, setCreditNote] = useState<{ id: number; status: string } | null>(null);
   const [loading, setLoading] = useState(true);
-  const [actionLoading, setActionLoading] = useState<'cancel' | 'resubmit' | null>(null);
+  const [actionLoading, setActionLoading] = useState<'cancel' | 'resubmit' | 'credit' | null>(null);
+  const [generateCnOpen, setGenerateCnOpen] = useState(false);
+  const [generateCnAmount, setGenerateCnAmount] = useState('');
 
   const form16 = request?.form16Submission;
   const hasSubmission = !!form16;
   const hasCreditNote = !!creditNote && creditNote.status !== 'withdrawn';
+  const suggestedAmount = form16?.tdsAmount != null ? Number(form16.tdsAmount) : undefined;
 
   useEffect(() => {
     if (!requestId) {
@@ -77,41 +91,115 @@ export function Form16QuickActions({ requestId, request, onRefresh }: Form16Quic
     }
   };
 
+  const handleGenerateCreditNote = async () => {
+    const amount = parseFloat(generateCnAmount);
+    if (!requestId || Number.isNaN(amount) || amount <= 0) {
+      toast.error('Enter a valid amount to generate credit note');
+      return;
+    }
+    setActionLoading('credit');
+    try {
+      await generateForm16CreditNoteManually(requestId, amount);
+      setGenerateCnOpen(false);
+      setGenerateCnAmount('');
+      toast.success('Credit note generated (manually approved)');
+      const note = await getCreditNoteByRequestId(requestId);
+      setCreditNote(note ? { id: typeof note.id === 'number' ? note.id : Number(note.id), status: note.status || '' } : null);
+      onRefresh?.();
+    } catch (e) {
+      toast.error(e instanceof Error ? e.message : 'Failed to generate credit note');
+    } finally {
+      setActionLoading(null);
+    }
+  };
+
   if (loading || !hasSubmission || hasCreditNote) return null;
 
   return (
-    <Card className="border-blue-200 bg-blue-50/30" data-testid="form16-quick-actions-card">
-      <CardHeader className="pb-2">
-        <CardTitle className="text-sm flex items-center gap-2 text-blue-800">
-          <Receipt className="w-4 h-4" />
-          Form 16 actions
-        </CardTitle>
-        <CardDescription className="text-xs text-gray-600">
-          View the document in the Documents tab. Cancel submission or mark resubmission needed.
-        </CardDescription>
-      </CardHeader>
-      <CardContent className="space-y-2">
-        <Button
-          variant="outline"
-          size="sm"
-          className="w-full justify-start border-red-300 text-red-700 hover:bg-red-50"
-          onClick={handleCancelSubmission}
-          disabled={!!actionLoading}
-        >
-          {actionLoading === 'cancel' ? <Loader2 className="w-3 h-3 animate-spin mr-1" /> : <X className="w-3 h-3 mr-1" />}
-          Cancel submission
-        </Button>
-        <Button
-          variant="outline"
-          size="sm"
-          className="w-full justify-start border-amber-300 text-amber-700 hover:bg-amber-50"
-          onClick={handleResubmissionNeeded}
-          disabled={!!actionLoading}
-        >
-          {actionLoading === 'resubmit' ? <Loader2 className="w-3 h-3 animate-spin mr-1" /> : <RotateCcw className="w-3 h-3 mr-1" />}
-          Resubmission needed
-        </Button>
-      </CardContent>
-    </Card>
+    <>
+      <Card className="border-blue-200 bg-blue-50/30" data-testid="form16-quick-actions-card">
+        <CardHeader className="pb-2">
+          <CardTitle className="text-sm flex items-center gap-2 text-blue-800">
+            <Receipt className="w-4 h-4" />
+            Form 16 actions
+          </CardTitle>
+          <CardDescription className="text-xs text-gray-600">
+            View the document in the Documents tab. Cancel submission, mark resubmission needed, or generate credit note (e.g. when OCR was partial).
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="space-y-2">
+          <Button
+            variant="outline"
+            size="sm"
+            className="w-full justify-start border-red-300 text-red-700 hover:bg-red-50"
+            onClick={handleCancelSubmission}
+            disabled={!!actionLoading}
+          >
+            {actionLoading === 'cancel' ? <Loader2 className="w-3 h-3 animate-spin mr-1" /> : <X className="w-3 h-3 mr-1" />}
+            Cancel submission
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            className="w-full justify-start border-amber-300 text-amber-700 hover:bg-amber-50"
+            onClick={handleResubmissionNeeded}
+            disabled={!!actionLoading}
+          >
+            {actionLoading === 'resubmit' ? <Loader2 className="w-3 h-3 animate-spin mr-1" /> : <RotateCcw className="w-3 h-3 mr-1" />}
+            Resubmission needed
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            className="w-full justify-start border-emerald-300 text-emerald-700 hover:bg-emerald-50"
+            onClick={() => {
+              setGenerateCnAmount(suggestedAmount != null ? String(suggestedAmount) : '');
+              setGenerateCnOpen(true);
+            }}
+            disabled={!!actionLoading}
+          >
+            {actionLoading === 'credit' ? <Loader2 className="w-3 h-3 animate-spin mr-1" /> : <Receipt className="w-3 h-3 mr-1" />}
+            Generate credit note
+          </Button>
+        </CardContent>
+      </Card>
+
+      <Dialog open={generateCnOpen} onOpenChange={setGenerateCnOpen}>
+        <DialogContent className="sm:max-w-md">
+          <DialogHeader>
+            <DialogTitle>Generate credit note (manual)</DialogTitle>
+            <DialogDescription>
+              Enter the amount for the credit note. This will mark the Form 16 as manually approved.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="grid gap-4 py-4">
+            <div className="grid gap-2">
+              <Label htmlFor="form16-cn-amount">Amount (₹)</Label>
+              <Input
+                id="form16-cn-amount"
+                type="number"
+                min="0"
+                step="0.01"
+                placeholder={suggestedAmount != null ? String(suggestedAmount) : '0'}
+                value={generateCnAmount}
+                onChange={(e) => setGenerateCnAmount(e.target.value)}
+              />
+              {suggestedAmount != null && (
+                <p className="text-xs text-gray-500">Suggested from submission TDS amount: ₹{suggestedAmount.toLocaleString('en-IN')}</p>
+              )}
+            </div>
+          </div>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setGenerateCnOpen(false)} disabled={!!actionLoading}>
+              Cancel
+            </Button>
+            <Button onClick={handleGenerateCreditNote} disabled={!!actionLoading || !generateCnAmount.trim()}>
+              {actionLoading === 'credit' ? <Loader2 className="w-4 h-4 animate-spin mr-2" /> : null}
+              Generate credit note
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </>
   );
 }

src/dealer-claim/components/request-detail/claim-cards/ProcessDetailsCard.tsx

@@ -31,7 +31,6 @@ interface DMSDetails {
   ackNo?: string;
   ackDate?: string;
   signedInvoiceUrl?: string;
-  creditNoteWfmData?: any[];
 }
 
 interface ClaimAmountDetails {
@@ -100,7 +99,6 @@ export function ProcessDetailsCard({
   const hasContent =
     (visibility.showIODetails && ioDetails) ||
     (visibility.showDMSDetails && dmsDetails) ||
-    (dmsDetails?.creditNoteWfmData && dmsDetails.creditNoteWfmData.length > 0) ||
     (visibility.showClaimAmount && claimAmount && claimAmount.amount !== undefined && claimAmount.amount !== null) ||
     (estimatedBudgetBreakdown && estimatedBudgetBreakdown.length > 0) ||
     (closedExpensesBreakdown && closedExpensesBreakdown.length > 0);
@@ -229,32 +227,6 @@ export function ProcessDetailsCard({
           </div>
         )}
 
-        {/* Credit Note Validation */}
-        {dmsDetails?.creditNoteWfmData && dmsDetails.creditNoteWfmData.length > 0 && (
-          <div className="bg-white rounded-lg p-3 border border-pink-200">
-            <div className="flex items-center gap-2 mb-2">
-              <Receipt className="w-4 h-4 text-pink-600" />
-              <Label className="text-xs font-semibold text-pink-900 uppercase tracking-wide">
-                Credit Note Validation
-              </Label>
-            </div>
-            <div className="space-y-2">
-              {dmsDetails.creditNoteWfmData.map((cn: any, idx: number) => (
-                <div key={idx} className="bg-pink-50 p-2 rounded border border-pink-100 text-[10px]">
-                  <div className="flex justify-between mb-1 text-pink-900">
-                    <span className="font-semibold break-words flex-1 pr-2">Credit Note No: {cn.DOC_NO || 'N/A'}</span>
-                    <span className={`px-1.5 py-0.5 rounded-sm text-white font-medium self-start whitespace-nowrap ${cn.MSG_TYP === 'E' ? 'bg-red-500' : 'bg-green-500'}`}>
-                      {cn.MSG_TYP === 'E' ? 'Error' : (cn.MSG_TYP === 'S' ? 'Success' : cn.MSG_TYP || 'Unknown')}
-                    </span>
-                  </div>
-                  <div className="text-gray-500 mb-0.5">Txn: {cn.TRNS_UNIQ_NO || 'N/A'}</div>
-                  <div className="text-gray-700 break-words font-medium">{cn.MESSAGE || 'No Message'}</div>
-                </div>
-              ))}
-            </div>
-          </div>
-        )}
-
         {/* Claim Amount */}
         {visibility.showClaimAmount && claimAmount && (
           <div className="bg-white rounded-lg p-3 border border-green-200">

src/hooks/useRequestDetails.ts

@@ -2,7 +2,6 @@ import { useState, useEffect, useMemo, useCallback } from 'react';
 import workflowApi, { getPauseDetails } from '@/services/workflowApi';
 import apiClient from '@/services/authApi';
 import { getSocket } from '@/utils/socket';
-import { isClaimManagementRequest } from '@/utils/claimRequestUtils';
 
 /**
  * Custom Hook: useRequestDetails
@@ -240,18 +239,8 @@ export function useRequestDetails(
       let completionDetails = null;
       let internalOrder = null;
       let internalOrders = [];
-      let creditNoteWfmData = null;
-
-      if (isClaimManagementRequest(wf)) {
-        // Fetch Credit Note independently
-        try {
-          const cnResponse = await apiClient.get(`/dealer-claims/${wf.requestId}/credit-note-wfm`);
-          const responseData = cnResponse.data ?? cnResponse;
-          creditNoteWfmData = Array.isArray(responseData?.data) ? responseData.data : (Array.isArray(responseData) ? responseData : []);
-        } catch (cnError) {
-          console.warn('[useRequestDetails] Error fetching credit note WFM data:', cnError);
-        }
 
+      if (wf.workflowType === 'CLAIM_MANAGEMENT' || wf.templateType === 'claim-management') {
         try {
           const claimResponse = await apiClient.get(`/dealer-claims/${wf.requestId}`);
 
@@ -275,7 +264,6 @@ export function useRequestDetails(
               (claimDetails as any).invoice = invoice;
               (claimDetails as any).creditNote = creditNote;
               (claimDetails as any).completionExpenses = completionExpenses;
-              (claimDetails as any).creditNoteWfmData = creditNoteWfmData;
             }
 
             // Extracted details processed
@@ -345,7 +333,6 @@ export function useRequestDetails(
         budgetTracking: (claimDetails as any)?.budgetTracking || null,
         invoice: claimDetails?.invoice || (claimDetails as any)?.invoice || null,
         creditNote: (claimDetails as any)?.creditNote || null,
-        creditNoteWfmData: creditNoteWfmData || (claimDetails as any)?.creditNoteWfmData || null,
         completionExpenses: (claimDetails as any)?.completionExpenses || null,
         templateType: wf.templateType || wf.template_type,
         form16Submission: details.form16Submission || null,
@@ -536,18 +523,8 @@ export function useRequestDetails(
         let completionDetails = null;
         let internalOrder = null;
         let internalOrders = [];
-        let creditNoteWfmData = null;
-
-        if (isClaimManagementRequest(wf)) {
-          // Fetch Credit Note independently
-          try {
-            const cnResponse = await apiClient.get(`/dealer-claims/${wf.requestId}/credit-note-wfm`);
-            const responseData = cnResponse.data ?? cnResponse;
-            creditNoteWfmData = Array.isArray(responseData?.data) ? responseData.data : (Array.isArray(responseData) ? responseData : []);
-          } catch (cnError) {
-            console.warn('[useRequestDetails] Error fetching credit note WFM data:', cnError);
-          }
 
+        if (wf.workflowType === 'CLAIM_MANAGEMENT' || wf.templateType === 'claim-management') {
           try {
             const claimResponse = await apiClient.get(`/dealer-claims/${wf.requestId}`);
 
@@ -570,7 +547,6 @@ export function useRequestDetails(
                 (claimDetails as any).invoice = invoice;
                 (claimDetails as any).creditNote = creditNote;
                 (claimDetails as any).completionExpenses = completionExpenses;
-                (claimDetails as any).creditNoteWfmData = creditNoteWfmData;
               }
 
               // Initial load - Extracted details processed
@@ -627,7 +603,6 @@ export function useRequestDetails(
           budgetTracking: (claimDetails as any)?.budgetTracking || null,
           invoice: (claimDetails as any)?.invoice || null,
           creditNote: (claimDetails as any)?.creditNote || null,
-          creditNoteWfmData: creditNoteWfmData || (claimDetails as any)?.creditNoteWfmData || null,
           completionExpenses: (claimDetails as any)?.completionExpenses || null,
           templateType: wf.templateType || wf.template_type,
           form16Submission: details.form16Submission || null,

src/services/form16Api.ts

@@ -132,6 +132,18 @@ export async function setForm16ResubmissionNeeded(requestId: string): Promise<vo
   await apiClient.post(`/form16/requests/${encodeURIComponent(requestId)}/resubmission-needed`);
 }
 
+/** RE only. Manually generate credit note for Form 16 request. Body: { amount: number }. */
+export async function generateForm16CreditNoteManually(requestId: string, amount: number): Promise<{ creditNote: Form16CreditNoteItem }> {
+  const { data } = await apiClient.post<{ data?: { creditNote?: Form16CreditNoteItem }; creditNote?: Form16CreditNoteItem }>(
+    `/form16/requests/${encodeURIComponent(requestId)}/generate-credit-note`,
+    { amount }
+  );
+  const payload = data?.data ?? data;
+  const creditNote = payload?.creditNote;
+  if (!creditNote) throw new Error('Credit note not returned');
+  return { creditNote };
+}
+
 /** Get a single credit note by id with dealer info and dealer transaction history. */
 export interface CreditNoteDetailResponse {
   creditNote: Form16CreditNoteItem & { submission?: { submittedDate?: string | null } };

src/utils/claimDataMapper.ts

@@ -95,7 +95,6 @@ export interface ClaimManagementRequest {
     ackDate?: string;
     signedInvoiceUrl?: string;
     taxBreakdown?: any;
-    creditNoteWfmData?: any[];
   };
 
   // Claim Amount
@@ -299,7 +298,6 @@ export function mapToClaimManagementRequest(
       ackDate: invoice.ackDate || claimDetails.ackDate,
       signedInvoiceUrl: invoice.signedInvoiceUrl || claimDetails.signedInvoiceUrl,
       taxBreakdown: invoice.taxBreakdown || claimDetails.taxBreakdown,
-      creditNoteWfmData: apiRequest.creditNoteWfmData || claimDetails.creditNoteWfmData || [],
     };
 
     // Map claim amounts