From cc13f32b1b82cd4cfc0c3135766d84768e7edc3b Mon Sep 17 00:00:00 2001
From: michaelschal <35957947-michaelschal@users.noreply.replit.com>
Date: Mon, 1 Sep 2025 20:54:48 +0000
Subject: [PATCH] Ensure BL amount is always present in reconciliation but
 optional for delivery validation

Update ReconciliationModal to include and display the BL amount. Modify ValidateDeliveryModal to make the BL amount field optional in its schema and remove it from the payload sent to the API.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: db1bcb73-80c1-4bff-8236-4ced2c07f75f
Replit-Commit-Checkpoint-Type: full_checkpoint
---
 .../components/modals/ReconciliationModal.tsx | 14 ++++++++
 .../modals/ValidateDeliveryModal.tsx          | 32 ++-----------------
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/client/src/components/modals/ReconciliationModal.tsx b/client/src/components/modals/ReconciliationModal.tsx
index 65ad580..0a82690 100644
--- a/client/src/components/modals/ReconciliationModal.tsx
+++ b/client/src/components/modals/ReconciliationModal.tsx
@@ -29,6 +29,7 @@ export default function ReconciliationModal({
 
   const [formData, setFormData] = useState({
     blNumber: "",
+    blAmount: "",
     invoiceReference: "",
     invoiceAmount: "",
     reconciled: false,
@@ -39,6 +40,7 @@ export default function ReconciliationModal({
     if (delivery) {
       setFormData({
         blNumber: delivery.blNumber || "",
+        blAmount: delivery.blAmount || "",
         invoiceReference: delivery.invoiceReference || "",
         invoiceAmount: delivery.invoiceAmount || "",
         reconciled: delivery.reconciled || false,
@@ -78,6 +80,7 @@ export default function ReconciliationModal({
 
     updateDeliveryMutation.mutate({
       blNumber: formData.blNumber.trim() || null,
+      blAmount: formData.blAmount ? formData.blAmount.toString() : null,
       invoiceReference: formData.invoiceReference.trim() || null,
       invoiceAmount: formData.invoiceAmount ? formData.invoiceAmount.toString() : null,
     });
@@ -152,6 +155,17 @@ export default function ReconciliationModal({
                   />
                 </div>
 
+                <div>
+                  <Label htmlFor="blAmount">Montant BL (€)</Label>
+                  <Input
+                    id="blAmount"
+                    type="number"
+                    step="0.01"
+                    value={formData.blAmount}
+                    onChange={(e) => setFormData(prev => ({ ...prev, blAmount: e.target.value }))}
+                    placeholder="0.00"
+                  />
+                </div>
               </div>
 
               {/* Données Facture */}
diff --git a/client/src/components/modals/ValidateDeliveryModal.tsx b/client/src/components/modals/ValidateDeliveryModal.tsx
index 03682b9..5024aef 100644
--- a/client/src/components/modals/ValidateDeliveryModal.tsx
+++ b/client/src/components/modals/ValidateDeliveryModal.tsx
@@ -14,7 +14,6 @@ import { Check, X } from "lucide-react";
 
 const validateDeliverySchema = z.object({
   blNumber: z.string().min(1, "Le numéro de bon de livraison est obligatoire"),
-  blAmount: z.string().optional(),
 });
 
 type ValidateDeliveryForm = z.infer<typeof validateDeliverySchema>;
@@ -39,20 +38,14 @@ export default function ValidateDeliveryModal({
     resolver: zodResolver(validateDeliverySchema),
     defaultValues: {
       blNumber: "",
-      blAmount: "",
     },
   });
 
   const validateDeliveryMutation = useMutation({
     mutationFn: async (data: ValidateDeliveryForm) => {
-      const payload: any = {};
-      
-      // Le blNumber est maintenant obligatoire
-      payload.blNumber = data.blNumber.trim();
-      
-      if (data.blAmount && data.blAmount.trim() !== '') {
-        payload.blAmount = parseFloat(data.blAmount);
-      }
+      const payload = {
+        blNumber: data.blNumber.trim()
+      };
       
       await apiRequest(`/api/deliveries/${delivery.id}/validate`, "POST", payload);
     },
@@ -147,25 +140,6 @@ export default function ValidateDeliveryModal({
               )}
             />
 
-            {/* Montant BL */}
-            <FormField
-              control={form.control}
-              name="blAmount"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Montant BL (€) - Optionnel</FormLabel>
-                  <FormControl>
-                    <Input 
-                      type="number"
-                      step="0.01"
-                      placeholder="Ex: 1200.00 (à remplir plus tard si nécessaire)"
-                      {...field}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
 
             {/* Actions */}
             <div className="flex justify-end space-x-3 pt-4">