@spaceinvoices/react-ui 0.4.12 → 0.4.31

package/src/components/credit-notes/create/locales/pt.ts

@@ -10,6 +10,7 @@ export default {
   Items: "Itens",
   "Add item": "Adicionar item",
   Save: "Guardar",
+  Update: "Atualizar",
   "Save as Draft": "Guardar como rascunho",
   Quantity: "Quantidade",
   Price: "Preco",
@@ -24,16 +25,15 @@ export default {
   "Add new tax...": "Adicionar novo imposto...",
   Description: "Descricao",
   "Mark as Paid": "Marcar como pago",
-  Paid: "Pago",
-  "Credit note will be marked as fully paid upon creation":
-    "A nota de credito sera marcada como totalmente paga ao ser criada",
+  "Paid": "Pago",
+  "Credit note will be marked as fully paid upon creation": "A nota de crédito será marcada como totalmente paga na criação",
   "Payment Type": "Tipo de pagamento",
   "Select payment type": "Selecione o tipo de pagamento",
-  Cash: "Dinheiro",
-  "Bank Transfer": "Transferencia bancaria",
-  Card: "Cartao",
-  Check: "Cheque",
-  Other: "Outro",
+  "Cash": "Dinheiro",
+  "Bank Transfer": "Transferência bancária",
+  "Card": "Cartão",
+  "Check": "Cheque",
+  "Other": "Outro",
   // Note field
   Note: "Nota",
   "Insert variable": "Inserir variavel",
@@ -95,4 +95,17 @@ export default {
   Footer: "Rodapé",
   "Add document footer...": "Adicionar rodapé do documento...",
   "Reverse charge - tax exempt EU B2B sale": "Autoliquidação - venda B2B UE isenta de imposto",
+  "Please select": "Selecione",
+  "Amount": "Montante",
+  "Add payment": "Adicionar pagamento",
+  "Recorded now": "Registado agora",
+  "Remaining due": "Valor em dívida",
+  "Remaining to allocate": "Valor por alocar",
+  "This document must be fully paid on creation": "Este documento tem de estar totalmente pago na criação",
+  "Record one or more payments on creation": "Registar um ou mais pagamentos na criação",
+  // Service date
+  "Service Date": "Data do serviço",
+  "Service Period": "Período de serviço",
+  From: "De",
+  To: "Até",
 } as const;

package/src/components/credit-notes/create/locales/sk.ts

@@ -10,6 +10,7 @@ export default {
   Items: "Položky",
   "Add item": "Add item",
   Save: "Uložiť",
+  Update: "Aktualizovať",
   "Save as Draft": "Save as Draft",
   Quantity: "Quantity",
   Price: "Cena",
@@ -23,16 +24,16 @@ export default {
   "No taxes found": "No taxes found",
   "Add new tax...": "Add new tax...",
   Description: "Popis",
-  "Mark as Paid": "Mark as Paid",
-  Paid: "Zaplatené",
-  "Credit note will be marked as fully paid upon creation": "Credit note will be marked as fully paid upon creation",
-  "Payment Type": "Payment Type",
+  "Mark as Paid": "Označiť ako uhradené",
+  "Paid": "Uhradené",
+  "Credit note will be marked as fully paid upon creation": "Dobropis bude pri vytvorení označený ako plne uhradený",
+  "Payment Type": "Typ platby",
   "Select payment type": "Vyberte typ platby",
-  Cash: "Hotovosť",
+  "Cash": "Hotovosť",
   "Bank Transfer": "Bankový prevod",
-  Card: "Karta",
-  Check: "Šek",
-  Other: "Iné",
+  "Card": "Karta",
+  "Check": "Šek",
+  "Other": "Iné",
   Note: "Note",
   "Insert variable": "Insert variable",
   "Add payment instructions, terms, or other notes...": "Add payment instructions, terms, or other notes...",
@@ -84,4 +85,17 @@ export default {
   Footer: "Footer",
   "Add document footer...": "Add document footer...",
   "Reverse charge - tax exempt EU B2B sale": "Reverse charge - tax exempt EU B2B sale",
+  "Please select": "Vyberte",
+  "Amount": "Suma",
+  "Add payment": "Pridať platbu",
+  "Recorded now": "Aktuálne zaevidované",
+  "Remaining due": "Zostáva uhradiť",
+  "Remaining to allocate": "Zostáva priradiť",
+  "This document must be fully paid on creation": "Tento dokument musí byť pri vytvorení plne uhradený",
+  "Record one or more payments on creation": "Pri vytvorení zaevidujte jednu alebo viac platieb",
+  // Service date
+  "Service Date": "Dátum služby",
+  "Service Period": "Obdobie služby",
+  From: "Od",
+  To: "Do",
 } as const;

package/src/components/credit-notes/create/locales/sl.ts

@@ -10,6 +10,7 @@ export default {
   Items: "Postavke",
   "Add item": "Dodaj postavko",
   Save: "Shrani",
+  Update: "Posodobi",
   "Save as Draft": "Shrani kot osnutek",
   Quantity: "Količina",
   Price: "Cena",
@@ -24,15 +25,15 @@ export default {
   "Add new tax...": "Dodaj nov davek...",
   Description: "Opis",
   "Mark as Paid": "Označi kot plačano",
-  Paid: "Plačano",
+  "Paid": "Plačano",
   "Credit note will be marked as fully paid upon creation": "Dobropis bo označen kot plačan ob ustvarjanju",
   "Payment Type": "Vrsta plačila",
   "Select payment type": "Izberi vrsto plačila",
-  Cash: "Gotovina",
+  "Cash": "Gotovina",
   "Bank Transfer": "Bančno nakazilo",
-  Card: "Kartica",
-  Check: "Ček",
-  Other: "Drugo",
+  "Card": "Kartica",
+  "Check": "Ček",
+  "Other": "Drugo",
   // Note field
   Note: "Pripis",
   "Insert variable": "Vstavi spremenljivko",
@@ -94,4 +95,17 @@ export default {
   Footer: "Noga dokumenta",
   "Add document footer...": "Dodaj nogo dokumenta...",
   "Reverse charge - tax exempt EU B2B sale": "Obrnjena davčna obveznost - davka oproščena EU B2B prodaja",
+  "Please select": "Izberi",
+  "Amount": "Znesek",
+  "Add payment": "Dodaj plačilo",
+  "Recorded now": "Trenutno zabeleženo",
+  "Remaining due": "Preostanek za plačilo",
+  "Remaining to allocate": "Preostanek za razporeditev",
+  "This document must be fully paid on creation": "Ta dokument mora biti ob ustvarjanju v celoti plačan",
+  "Record one or more payments on creation": "Ob ustvarjanju zabeleži eno ali več plačil",
+  // Service date
+  "Service Date": "Datum storitve",
+  "Service Period": "Obdobje storitve",
+  From: "Od",
+  To: "Do",
 } as const;

package/src/components/credit-notes/create/locales/sv.ts

@@ -10,6 +10,7 @@ export default {
   Items: "Artiklar",
   "Add item": "Add item",
   Save: "Spara",
+  Update: "Uppdatera",
   "Save as Draft": "Save as Draft",
   Quantity: "Quantity",
   Price: "Pris",
@@ -23,16 +24,16 @@ export default {
   "No taxes found": "No taxes found",
   "Add new tax...": "Add new tax...",
   Description: "Beskrivning",
-  "Mark as Paid": "Mark as Paid",
-  Paid: "Betald",
-  "Credit note will be marked as fully paid upon creation": "Credit note will be marked as fully paid upon creation",
-  "Payment Type": "Payment Type",
+  "Mark as Paid": "Markera som betald",
+  "Paid": "Betald",
+  "Credit note will be marked as fully paid upon creation": "Kreditnotan markeras som fullt betald vid skapande",
+  "Payment Type": "Betalningstyp",
   "Select payment type": "Välj betalningstyp",
-  Cash: "Kontant",
+  "Cash": "Kontant",
   "Bank Transfer": "Banköverföring",
-  Card: "Kort",
-  Check: "Check",
-  Other: "Övrigt",
+  "Card": "Kort",
+  "Check": "Check",
+  "Other": "Övrigt",
   Note: "Note",
   "Insert variable": "Insert variable",
   "Add payment instructions, terms, or other notes...": "Add payment instructions, terms, or other notes...",
@@ -84,4 +85,17 @@ export default {
   Footer: "Footer",
   "Add document footer...": "Add document footer...",
   "Reverse charge - tax exempt EU B2B sale": "Reverse charge - tax exempt EU B2B sale",
+  "Please select": "Välj",
+  "Amount": "Belopp",
+  "Add payment": "Lägg till betalning",
+  "Recorded now": "Registrerat nu",
+  "Remaining due": "Återstående att betala",
+  "Remaining to allocate": "Återstår att fördela",
+  "This document must be fully paid on creation": "Det här dokumentet måste vara fullt betalt vid skapande",
+  "Record one or more payments on creation": "Registrera en eller flera betalningar vid skapande",
+  // Service date
+  "Service Date": "Tjänstedatum",
+  "Service Period": "Tjänsteperiod",
+  From: "Från",
+  To: "Till",
 } as const;

package/src/components/credit-notes/create/prepare-credit-note-submission.ts

@@ -1,6 +1,12 @@
 import type { CreateCreditNoteRequest } from "@spaceinvoices/js-sdk";
 import { normalizePtDocumentInput } from "@/ui/lib/pt-document-input";
-import { prepareDocumentSubmission } from "../../documents/create/prepare-document-submission";
+import {
+  buildDocumentBasePayload,
+  cleanupEmptyCustomerId,
+  prepareDocumentCustomerData,
+  prepareDocumentItems,
+  prepareDocumentSubmission,
+} from "../../documents/create/prepare-document-submission";
 
 type PrepareOptions = {
   originalCustomer: any;
@@ -30,3 +36,31 @@ export function prepareCreditNoteSubmission(values: any, options: PrepareOptions
   }
   return payload;
 }
+
+export function prepareCreditNoteUpdateSubmission(
+  values: any,
+  options: Pick<PrepareOptions, "originalCustomer" | "wasCustomerFormShown" | "priceModes">,
+): Record<string, unknown> {
+  const nextValues: any = {
+    ...values,
+    customer: values.customer ? { ...values.customer } : values.customer,
+    items: values.items
+      ? values.items.map((item: any) => ({ ...item, taxes: item?.taxes ? [...item.taxes] : item?.taxes }))
+      : values.items,
+  };
+
+  prepareDocumentCustomerData(nextValues, options);
+  cleanupEmptyCustomerId(nextValues);
+  nextValues.items = prepareDocumentItems(nextValues.items, options.priceModes ?? {});
+
+  const payload = buildDocumentBasePayload(nextValues, {
+    documentType: "credit_note",
+  });
+
+  const pt = normalizePtDocumentInput(values.pt);
+  if (pt) {
+    payload.pt = pt;
+  }
+
+  return payload;
+}

package/src/components/credit-notes/credit-notes.hooks.ts

@@ -8,7 +8,13 @@
  * - Less code duplication
  */
 
-import type { CreateCreditNoteRequest, CreditNote, SDKMethodOptions, UpdateCreditNote } from "@spaceinvoices/js-sdk";
+import type {
+  CreateCreditNoteRequest,
+  CreditNote,
+  CustomCreateCreditNote,
+  SDKMethodOptions,
+  UpdateCreditNote,
+} from "@spaceinvoices/js-sdk";
 import { creditNotes } from "@spaceinvoices/js-sdk";
 import { createResourceHooks } from "@/ui/hooks/create-resource-hooks";
 
@@ -31,7 +37,20 @@ const {
   CREDIT_NOTES_CACHE_KEY,
 );
 
-export { useCreateCreditNote, useDeleteCreditNote, useUpdateCreditNote };
+const { useCreateResource: useCreateCustomCreditNote } = createResourceHooks<
+  CreditNote,
+  CustomCreateCreditNote,
+  UpdateCreditNote
+>(
+  {
+    create: creditNotes.createCustom,
+    update: creditNotes.update,
+    delete: voidCreditNote,
+  },
+  CREDIT_NOTES_CACHE_KEY,
+);
+
+export { useCreateCreditNote, useCreateCustomCreditNote, useDeleteCreditNote, useUpdateCreditNote };
 
 // ============================================================================
 // FURS Last-Used Combo (localStorage) for credit notes

package/src/components/credit-notes/list/list-table.tsx

@@ -17,6 +17,7 @@ import type {
 import { Badge } from "@/ui/components/ui/badge";
 import { Button } from "@/ui/components/ui/button";
 import { Tooltip, TooltipContent, TooltipTrigger } from "@/ui/components/ui/tooltip";
+import { getDisplayDocumentNumber } from "@/ui/lib/document-display";
 import { getEslogSelectionState } from "@/ui/lib/eslog-export";
 import { getFiscalizationFailureType } from "@/ui/lib/fiscalization";
 import { createTranslation } from "@/ui/lib/translation";
@@ -222,7 +223,7 @@ export default function CreditNoteListTable({
           return (
             <div className="flex items-center gap-2">
               <Button variant="link" className="cursor-pointer py-0 underline" onClick={() => onRowClick?.(creditNote)}>
-                {creditNote.number}
+                {getDisplayDocumentNumber(creditNote as CreditNote & { is_draft?: boolean }, t)}
               </Button>
               {(creditNote as any).is_draft && (
                 <Badge

package/src/components/delivery-notes/create/create-delivery-note-form.tsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import type { CreateDeliveryNoteRequest, DeliveryNote } from "@spaceinvoices/js-sdk";
+import type { CreateDeliveryNoteRequest, DeliveryNote, UpdateDeliveryNote } from "@spaceinvoices/js-sdk";
 import { useQueryClient } from "@tanstack/react-query";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { Resolver } from "react-hook-form";
@@ -11,6 +11,7 @@ import { Label } from "@/ui/components/ui/label";
 import { createDeliveryNoteSchema } from "@/ui/generated/schemas";
 import { useNextDocumentNumber } from "@/ui/hooks/use-next-document-number";
 import { useTransactionTypeCheck } from "@/ui/hooks/use-transaction-type-check";
+import { normalizeLineItemDiscountsForForm } from "@/ui/lib/schemas/shared";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { useEntities } from "@/ui/providers/entities-context";
@@ -26,8 +27,11 @@ import {
 import { withRequiredDocumentItemFields } from "../../documents/create/document-item-validation";
 import { DocumentItemsSection, type PriceModesMap } from "../../documents/create/document-items-section";
 import { DocumentRecipientSection } from "../../documents/create/document-recipient-section";
+import { prepareDocumentItems } from "../../documents/create/prepare-document-submission";
+import { applyCustomCreateTemplate } from "../../documents/create/custom-create-template";
+import { financialInputsMatchInitial, resolvePreservedExpectedTotal } from "../../documents/create/preserved-expected-total";
 import type { DocumentTypes } from "../../documents/types";
-import { useCreateDeliveryNote } from "../delivery-notes.hooks";
+import { useCreateCustomDeliveryNote, useCreateDeliveryNote, useUpdateDeliveryNote } from "../delivery-notes.hooks";
 import de from "./locales/de";
 import es from "./locales/es";
 import fr from "./locales/fr";
@@ -37,7 +41,7 @@ import nl from "./locales/nl";
 import pl from "./locales/pl";
 import pt from "./locales/pt";
 import sl from "./locales/sl";
-import { prepareDeliveryNoteSubmission } from "./prepare-delivery-note-submission";
+import { prepareDeliveryNoteSubmission, prepareDeliveryNoteUpdateSubmission } from "./prepare-delivery-note-submission";
 import { useDeliveryNoteCustomerForm } from "./use-delivery-note-customer-form";
 
 const translations = {
@@ -71,6 +75,8 @@ type CreateDeliveryNoteFormProps = {
   initialValues?: Partial<CreateDeliveryNoteRequest>;
   /** Whether draft actions should be available in the UI */
   allowDrafts?: boolean;
+  mode?: "create" | "edit";
+  documentId?: string;
   translationLocale?: string;
 } & ComponentTranslationProps;
 
@@ -83,6 +89,8 @@ export default function CreateDeliveryNoteForm({
   onAddNewTax,
   initialValues,
   allowDrafts = true,
+  mode = "create",
+  documentId,
   translationLocale,
   t: translateProp,
   namespace,
@@ -98,6 +106,7 @@ export default function CreateDeliveryNoteForm({
 
   const { activeEntity } = useEntities();
   const queryClient = useQueryClient();
+  const isEditMode = mode === "edit";
 
   // Draft submission state
   const [isDraftPending, setIsDraftPending] = useState(false);
@@ -110,7 +119,7 @@ export default function CreateDeliveryNoteForm({
 
   // Fetch next delivery note number
   const { data: nextNumberData } = useNextDocumentNumber(entityId, "delivery_note", {
-    enabled: !!entityId,
+    enabled: !!entityId && !isEditMode,
   });
 
   const form = useForm<CreateDeliveryNoteFormValues>({
@@ -118,22 +127,27 @@ export default function CreateDeliveryNoteForm({
       withRequiredDocumentItemFields(createDeliveryNoteSchema),
     ) as Resolver<CreateDeliveryNoteFormValues>,
     defaultValues: {
-      number: "",
+      number: (initialValues as any)?.number ?? "",
+      calculation_mode: (initialValues as any)?.calculation_mode ?? undefined,
       date: initialValues?.date || new Date().toISOString(),
       customer_id: initialValues?.customer_id ?? undefined,
       // Cast customer to form schema type (API type may have additional fields)
       customer: (initialValues?.customer as CreateDeliveryNoteFormValues["customer"]) ?? undefined,
       items: initialValues?.items?.length
         ? initialValues.items.map((item: any) => ({
-            type: item.type,
+            type: item.type ?? undefined,
             name: item.name || "",
             description: item.description || "",
             ...(item.type !== "separator"
               ? {
+                  item_id: item.item_id ?? undefined,
                   quantity: item.quantity ?? 1,
-                  // Use gross_price if set, otherwise use price
                   price: item.gross_price ?? item.price,
+                  gross_price: item.gross_price ?? undefined,
+                  unit: item.unit ?? undefined,
+                  classification: item.classification ?? undefined,
                   taxes: item.taxes || [],
+                  discounts: normalizeLineItemDiscountsForForm(item.discounts),
                 }
               : {}),
           }))
@@ -148,9 +162,12 @@ export default function CreateDeliveryNoteForm({
           ],
       currency_code: initialValues?.currency_code || activeEntity?.currency_code || "EUR",
       reference: (initialValues as any)?.reference ?? "",
-      note: initialValues?.note ?? defaultNote,
+      note: initialValues?.note ?? (isEditMode ? "" : defaultNote),
       tax_clause: (initialValues as any)?.tax_clause ?? "",
-      footer: (initialValues as any)?.footer ?? defaultFooter,
+      footer: (initialValues as any)?.footer ?? (isEditMode ? "" : defaultFooter),
+      signature:
+        (initialValues as any)?.signature ??
+        (isEditMode ? "" : (activeEntity?.settings as any)?.default_document_signature || ""),
     },
   });
 
@@ -166,29 +183,62 @@ export default function CreateDeliveryNoteForm({
     }, {} as PriceModesMap);
   }, [initialValues?.items]);
   const priceModesRef = useRef<PriceModesMap>(initialPriceModes);
+  const customCreateTemplate = (initialValues as any)?._custom_create_template;
+  const financialInputsMatchSource = useCallback(
+    (values: { items?: any[]; currency_code?: string; calculation_mode?: string | null }) =>
+      financialInputsMatchInitial({
+        initialItems: initialValues?.items,
+        currentItems: values.items,
+        initialCurrencyCode: initialValues?.currency_code,
+        currentCurrencyCode: values.currency_code,
+        initialCalculationMode: (initialValues as any)?.calculation_mode ?? null,
+        currentCalculationMode: values.calculation_mode ?? null,
+        initialPriceModes,
+        currentPriceModes: priceModesRef.current,
+      }),
+    [initialPriceModes, initialValues],
+  );
+  const getPreservedExpectedTotalWithTax = useCallback(
+    (values: { items?: any[]; currency_code?: string; calculation_mode?: string | null }) =>
+      resolvePreservedExpectedTotal({
+        initialExpectedTotalWithTax: (initialValues as any)?._preserved_expected_total_with_tax,
+        initialItems: initialValues?.items,
+        currentItems: values.items,
+        initialCurrencyCode: initialValues?.currency_code,
+        currentCurrencyCode: values.currency_code,
+        initialCalculationMode: (initialValues as any)?.calculation_mode ?? null,
+        currentCalculationMode: values.calculation_mode ?? null,
+        initialPriceModes,
+        currentPriceModes: priceModesRef.current,
+      }),
+    [initialPriceModes, initialValues],
+  );
 
   // Update number when fetched
   useEffect(() => {
+    if (isEditMode) return;
     if (nextNumberData?.number) {
       form.setValue("number", nextNumberData.number);
     }
-  }, [nextNumberData?.number, form]);
+  }, [nextNumberData?.number, form, isEditMode]);
 
   // Set default footer from entity settings when entity data is available
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultFooter = (activeEntity?.settings as any)?.document_footer;
     if (entityDefaultFooter && !form.getValues("footer")) {
       form.setValue("footer", entityDefaultFooter);
     }
-  }, [activeEntity, form]);
+  }, [activeEntity, form, isEditMode]);
 
   // Set default note from entity settings when entity data is available
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultNote = (activeEntity?.settings as any)?.default_delivery_note_note;
     if (entityDefaultNote && !form.getValues("note")) {
       form.setValue("note", entityDefaultNote);
     }
-  }, [activeEntity, form]);
+  }, [activeEntity, form, isEditMode]);
 
   // Auto-add tax field for tax subject entities
   useEffect(() => {
@@ -202,11 +252,12 @@ export default function CreateDeliveryNoteForm({
 
   // Set default signature from entity settings
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultSignature = (activeEntity?.settings as any)?.default_document_signature;
     if (entityDefaultSignature && !form.getValues("signature")) {
       form.setValue("signature", entityDefaultSignature);
     }
-  }, [activeEntity, form]);
+  }, [activeEntity, form, isEditMode]);
 
   const formValues = useWatch({
     control: form.control,
@@ -237,13 +288,14 @@ export default function CreateDeliveryNoteForm({
   useEffect(() => {
     if (effectiveTransactionType === prevTransactionTypeRef.current) return;
     prevTransactionTypeRef.current = effectiveTransactionType;
+    if (isEditMode) return;
 
     const taxClauseDefaults = (activeEntity?.settings as any)?.tax_clause_defaults;
     if (!taxClauseDefaults) return;
 
     const clause = taxClauseDefaults[effectiveTransactionType] ?? "";
     form.setValue("tax_clause", clause);
-  }, [effectiveTransactionType, activeEntity, form]);
+  }, [effectiveTransactionType, activeEntity, form, isEditMode]);
 
   // Extract customer management logic into a custom hook
   const {
@@ -267,18 +319,58 @@ export default function CreateDeliveryNoteForm({
     },
     onError,
   });
+  const { mutate: createCustomDeliveryNote, isPending: isCreateCustomPending } = useCreateCustomDeliveryNote({
+    entityId,
+    onSuccess: (data) => {
+      if (data.customer_id) {
+        queryClient.invalidateQueries({ queryKey: [CUSTOMERS_CACHE_KEY] });
+      }
+      onSuccess?.(data);
+    },
+    onError,
+  });
+  const { mutate: updateDeliveryNote, isPending: isUpdatePending } = useUpdateDeliveryNote({
+    entityId,
+    onSuccess,
+    onError,
+  });
 
   // Shared submit logic for both regular save and save as draft
   const submitDeliveryNote = useCallback(
     (values: CreateDeliveryNoteFormValues, isDraft: boolean) => {
       try {
+        if (isEditMode) {
+          if (!documentId) {
+            throw new Error("Delivery note edit mode requires a documentId");
+          }
+
+          const updatePayload = prepareDeliveryNoteUpdateSubmission(values, {
+            originalCustomer,
+            priceModes: priceModesRef.current,
+            hidePrices,
+          }) as UpdateDeliveryNote;
+          updateDeliveryNote({ id: documentId, data: updatePayload });
+          return;
+        }
+
         const submission = prepareDeliveryNoteSubmission(values, {
           originalCustomer,
           priceModes: priceModesRef.current,
           isDraft,
           hidePrices,
         });
-        createDeliveryNote(submission);
+        const preservedExpectedTotalWithTax = getPreservedExpectedTotalWithTax(values);
+        if (preservedExpectedTotalWithTax !== undefined) {
+          (submission as any).expected_total_with_tax = preservedExpectedTotalWithTax;
+        } else {
+          delete (submission as any).expected_total_with_tax;
+        }
+        if (customCreateTemplate && financialInputsMatchSource(values)) {
+          delete (submission as any).expected_total_with_tax;
+          createCustomDeliveryNote(applyCustomCreateTemplate(submission as any, customCreateTemplate));
+        } else {
+          createDeliveryNote(submission);
+        }
       } catch (error) {
         console.error("Delivery note submission error:", error);
         if (onError) {
@@ -286,7 +378,19 @@ export default function CreateDeliveryNoteForm({
         }
       }
     },
-    [createDeliveryNote, onError, originalCustomer, hidePrices],
+    [
+      createDeliveryNote,
+      createCustomDeliveryNote,
+      customCreateTemplate,
+      documentId,
+      financialInputsMatchSource,
+      getPreservedExpectedTotalWithTax,
+      hidePrices,
+      isEditMode,
+      onError,
+      originalCustomer,
+      updateDeliveryNote,
+    ],
   );
 
   // Handle save as draft
@@ -305,48 +409,46 @@ export default function CreateDeliveryNoteForm({
 
   const secondaryAction = useMemo(
     () =>
-      allowDrafts
+      allowDrafts && !isEditMode
         ? {
             label: t("Save as Draft"),
             onClick: handleSaveAsDraft,
             isPending: isDraftPending,
           }
         : undefined,
-    [allowDrafts, t, handleSaveAsDraft, isDraftPending],
+    [allowDrafts, isEditMode, t, handleSaveAsDraft, isDraftPending],
   );
 
   useFormFooterRegistration({
     formId: "create-delivery-note-form",
-    isPending,
+    isPending: isPending || isCreateCustomPending || isUpdatePending,
     isDirty: form.formState.isDirty || !!initialValues,
-    label: t("Create Delivery Note"),
+    label: isEditMode ? t("Update") : t("Create Delivery Note"),
     secondaryAction,
   });
 
   const buildPreviewPayload = useCallback(
     (values: CreateDeliveryNoteFormValues): DeliveryNotePreviewPayload => {
-      const currentItems = values.items || [];
-
-      const transformedItems = currentItems.map((item: any, index: number) => {
-        const { price, ...rest } = item;
-        const isGross = priceModesRef.current[index] ?? false;
-        return isGross ? { ...rest, gross_price: price } : { ...rest, price };
-      });
-
+      const preservedExpectedTotalWithTax = getPreservedExpectedTotalWithTax(values);
       return {
         number: values.number,
         date: values.date,
         customer_id: values.customer_id,
         customer: values.customer,
-        items: transformedItems,
+        items: prepareDocumentItems(values.items, priceModesRef.current),
         currency_code: values.currency_code,
         reference: values.reference,
         note: values.note,
+        tax_clause: values.tax_clause,
         signature: values.signature,
+        footer: values.footer,
         hide_prices: hidePrices,
+        ...(preservedExpectedTotalWithTax !== undefined
+          ? { expected_total_with_tax: preservedExpectedTotalWithTax }
+          : {}),
       };
     },
-    [hidePrices],
+    [getPreservedExpectedTotalWithTax, hidePrices],
   );
 
   const emitPreviewPayload = useCallback((payload: DeliveryNotePreviewPayload) => {

package/src/components/delivery-notes/create/locales/bg.ts

@@ -34,6 +34,7 @@ export default {
   Discount: "Discount",
   Description: "Описание",
   Save: "Запази",
+  Update: "Актуализирай",
   "Save as Draft": "Save as Draft",
   "Pick a date": "Pick a date",
   Currency: "Валута",

package/src/components/delivery-notes/create/locales/cs.ts

@@ -34,6 +34,7 @@ export default {
   Discount: "Discount",
   Description: "Popis",
   Save: "Uložit",
+  Update: "Aktualizovat",
   "Save as Draft": "Save as Draft",
   "Pick a date": "Pick a date",
   Currency: "Měna",