@spaceinvoices/react-ui 0.4.12 → 0.4.31

package/cli/dist/index.js

@@ -933,7 +933,7 @@ async function list(options = {}) {
 
 // cli/src/index.ts
 var program = new Command();
-program.name("spaceinvoices-ui").description("CLI for adding Space Invoices React UI components to your project").version("0.4.12");
+program.name("spaceinvoices-ui").description("CLI for adding Space Invoices React UI components to your project").version("0.4.31");
 program.option("--local <path>", "Use local registry from specified path (for development)");
 program.command("init").description("Initialize Space Invoices UI in your project").option("-y, --yes", "Skip prompts and use defaults").option("-f, --force", "Overwrite existing configuration").option("--cwd <path>", "Working directory (defaults to current directory)").action(async (options) => {
   const globalOpts = program.opts();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spaceinvoices/react-ui",
   "type": "module",
-  "version": "0.4.12",
+  "version": "0.4.31",
   "private": false,
   "license": "MIT",
   "description": "Space Invoices UI components - copy-paste distribution with CLI support",

package/src/common/autocomplete.tsx

@@ -196,7 +196,13 @@ export function Autocomplete({
         aria-invalid={ariaInvalid || undefined}
       />
       <Popover.Portal>
-        <Popover.Positioner anchor={inputRef} align="start" sideOffset={4} className="isolate z-50">
+        <Popover.Positioner
+          anchor={inputRef}
+          align="start"
+          sideOffset={4}
+          positionMethod="fixed"
+          className="isolate z-50"
+        >
           <Popover.Popup
             initialFocus={false}
             finalFocus={false}

package/src/components/advance-invoices/advance-invoices.hooks.ts

@@ -1,42 +1,46 @@
-import type { AdvanceInvoice, CreateAdvanceInvoice } from "@spaceinvoices/js-sdk";
+import type {
+  AdvanceInvoice,
+  CreateAdvanceInvoiceRequest,
+  CustomCreateAdvanceInvoice,
+  SDKMethodOptions,
+  UpdateAdvanceInvoice,
+} from "@spaceinvoices/js-sdk";
 import { advanceInvoices } from "@spaceinvoices/js-sdk";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { NEXT_DOCUMENT_NUMBER_CACHE_KEY } from "@/ui/hooks/use-next-document-number";
+import { createResourceHooks } from "@/ui/hooks/create-resource-hooks";
 
-// Define constants for cache keys
 export const ADVANCE_INVOICES_CACHE_KEY = "advance-invoices";
 
-// ============================================================================
-// Create Advance Invoice Hook
-// ============================================================================
-
-type UseCreateAdvanceInvoiceOptions = {
-  entityId: string;
-  onSuccess?: (data: AdvanceInvoice) => void;
-  onError?: (error: unknown) => void;
+const voidAdvanceInvoice = async (id: string, options?: SDKMethodOptions): Promise<void> => {
+  await advanceInvoices.void(id, {}, options);
 };
 
-export function useCreateAdvanceInvoice({ entityId, onSuccess, onError }: UseCreateAdvanceInvoiceOptions) {
-  const queryClient = useQueryClient();
+const {
+  useCreateResource: useCreateAdvanceInvoice,
+  useUpdateResource: useUpdateAdvanceInvoice,
+  useDeleteResource: useDeleteAdvanceInvoice,
+} = createResourceHooks<AdvanceInvoice, CreateAdvanceInvoiceRequest, UpdateAdvanceInvoice>(
+  {
+    create: advanceInvoices.create,
+    update: advanceInvoices.update,
+    delete: voidAdvanceInvoice,
+  },
+  ADVANCE_INVOICES_CACHE_KEY,
+);
 
-  return useMutation({
-    mutationFn: async (data: CreateAdvanceInvoice) => {
-      return advanceInvoices.create(data, { entity_id: entityId });
-    },
-    onSuccess: (data) => {
-      // Invalidate advance invoices list cache
-      queryClient.invalidateQueries({ queryKey: [ADVANCE_INVOICES_CACHE_KEY] });
-      // Invalidate next number cache (shared cache key)
-      queryClient.invalidateQueries({ queryKey: [NEXT_DOCUMENT_NUMBER_CACHE_KEY] });
-      onSuccess?.(data);
-    },
-    onError,
-  });
-}
+const { useCreateResource: useCreateCustomAdvanceInvoice } = createResourceHooks<
+  AdvanceInvoice,
+  CustomCreateAdvanceInvoice,
+  UpdateAdvanceInvoice
+>(
+  {
+    create: advanceInvoices.createCustom,
+    update: advanceInvoices.update,
+    delete: voidAdvanceInvoice,
+  },
+  ADVANCE_INVOICES_CACHE_KEY,
+);
 
-// ============================================================================
-// FURS Last-Used Combo (localStorage) - Reuse from invoices
-// ============================================================================
+export { useCreateAdvanceInvoice, useCreateCustomAdvanceInvoice, useDeleteAdvanceInvoice, useUpdateAdvanceInvoice };
 
 const FURS_ADV_LAST_USED_KEY = "si:furs:adv:last-used";
 
@@ -45,10 +49,6 @@ export type FursCombo = {
   electronic_device_name: string;
 };
 
-/**
- * Get last-used FURS premise/device combo from localStorage for advance invoices
- * @param entityId - Entity ID (combos are stored per-entity)
- */
 export function getLastUsedFursCombo(entityId: string): FursCombo | null {
   if (typeof window === "undefined") return null;
   try {
@@ -59,11 +59,6 @@ export function getLastUsedFursCombo(entityId: string): FursCombo | null {
   }
 }
 
-/**
- * Save last-used FURS premise/device combo to localStorage for advance invoices
- * @param entityId - Entity ID
- * @param combo - FURS premise/device combo
- */
 export function setLastUsedFursCombo(entityId: string, combo: FursCombo): void {
   if (typeof window === "undefined") return;
   try {
@@ -73,10 +68,6 @@ export function setLastUsedFursCombo(entityId: string, combo: FursCombo): void {
   }
 }
 
-// ============================================================================
-// FINA Last-Used Combo (localStorage) for advance invoices
-// ============================================================================
-
 const FINA_ADV_LAST_USED_KEY = "hr:fina:adv:last-used";
 
 export type FinaCombo = {

package/src/components/advance-invoices/create/create-advance-invoice-form.tsx

@@ -1,5 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import type { AdvanceInvoice, CreateAdvanceInvoiceRequest } from "@spaceinvoices/js-sdk";
+import type { AdvanceInvoice, CreateAdvanceInvoiceRequest, UpdateAdvanceInvoice } from "@spaceinvoices/js-sdk";
 import { AlertCircle, Check, FileCode2, X } from "lucide-react";
 import type { ReactNode } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -27,6 +27,7 @@ import {
   type PtDocumentInputForm,
   ptDocumentInputFormSchema,
 } from "@/ui/lib/pt-document-input";
+import { normalizeLineItemDiscountsForForm } from "@/ui/lib/schemas/shared";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { cn } from "@/ui/lib/utils";
@@ -49,9 +50,12 @@ import {
   createEmptyPaymentRow,
   type DraftPaymentRow,
   getFirstValidPaymentType,
-  serializePaymentRows,
+  serializePaymentRowsForApi,
   validatePaymentRows,
 } from "../../documents/create/payment-rows";
+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 { scrollToFirstInvalidField } from "../../documents/create/scroll-to-first-invalid-field";
 import { useDocumentCustomerForm } from "../../documents/create/use-document-customer-form";
 import type { DocumentTypes } from "../../documents/types";
@@ -72,7 +76,7 @@ import invoiceNl from "../../invoices/create/locales/nl";
 import invoicePl from "../../invoices/create/locales/pl";
 import invoicePt from "../../invoices/create/locales/pt";
 import invoiceSl from "../../invoices/create/locales/sl";
-import { useCreateAdvanceInvoice } from "../advance-invoices.hooks";
+import { useCreateAdvanceInvoice, useCreateCustomAdvanceInvoice, useUpdateAdvanceInvoice } from "../advance-invoices.hooks";
 import de from "./locales/de";
 import es from "./locales/es";
 import fr from "./locales/fr";
@@ -82,7 +86,10 @@ import nl from "./locales/nl";
 import pl from "./locales/pl";
 import pt from "./locales/pt";
 import sl from "./locales/sl";
-import { prepareAdvanceInvoiceSubmission } from "./prepare-advance-invoice-submission";
+import {
+  prepareAdvanceInvoiceSubmission,
+  prepareAdvanceInvoiceUpdateSubmission,
+} from "./prepare-advance-invoice-submission";
 
 const translations = {
   sl: { ...invoiceSl, ...sl },
@@ -125,6 +132,8 @@ type CreateAdvanceInvoiceFormProps = {
   initialValues?: Partial<CreateAdvanceInvoiceRequest>;
   /** Whether draft actions should be available in the UI */
   allowDrafts?: boolean;
+  mode?: "create" | "edit";
+  documentId?: string;
   /** Optional app-level content rendered inside the details section. */
   detailsExtras?: ReactNode;
   /** Request-scoped operator override for embed fiscalization flows. */
@@ -142,6 +151,8 @@ export default function CreateAdvanceInvoiceForm({
   onHeaderActionChange,
   initialValues,
   allowDrafts = true,
+  mode = "create",
+  documentId,
   detailsExtras,
   operatorPrefill,
   translationLocale,
@@ -158,6 +169,7 @@ export default function CreateAdvanceInvoiceForm({
   });
 
   const { activeEntity } = useEntities();
+  const isEditMode = mode === "edit";
 
   // Advance invoices have their own default note setting.
   // Note: Advance invoices don't have payment terms - they are documents requesting payment.
@@ -193,6 +205,36 @@ export default function CreateAdvanceInvoiceForm({
     }, {} 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],
+  );
 
   const baseResolver = useMemo(
     () => zodResolver(createAdvanceInvoiceFormSchema) as Resolver<CreateAdvanceInvoiceFormValues>,
@@ -200,12 +242,14 @@ export default function CreateAdvanceInvoiceForm({
   );
   const eslogResolverStateRef = useRef({
     activeEntity,
+    isEditMode,
     isEnabled: eslog.isEnabled === true,
     translate: t,
     setEntityErrors: eslog.setEntityErrors,
   });
   eslogResolverStateRef.current = {
     activeEntity,
+    isEditMode,
     isEnabled: eslog.isEnabled === true,
     translate: t,
     setEntityErrors: eslog.setEntityErrors,
@@ -214,7 +258,8 @@ export default function CreateAdvanceInvoiceForm({
     () => async (values, context, options) => {
       const result = await baseResolver(values, context, options);
       const resolverState = eslogResolverStateRef.current;
-      const shouldValidateEslog = eslogValidationModeRef.current === "submit" && resolverState.isEnabled;
+      const shouldValidateEslog =
+        eslogValidationModeRef.current === "submit" && !resolverState.isEditMode && resolverState.isEnabled;
 
       if (!shouldValidateEslog) {
         eslogEntityErrorsRef.current = [];
@@ -246,22 +291,27 @@ export default function CreateAdvanceInvoiceForm({
   const form = useForm<CreateAdvanceInvoiceFormValues>({
     resolver,
     defaultValues: {
-      number: "", // Will be set by useNextAdvanceInvoiceNumber
+      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 CreateAdvanceInvoiceFormValues["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),
                 }
               : {}),
           }))
@@ -276,9 +326,12 @@ export default function CreateAdvanceInvoiceForm({
           ],
       currency_code: initialValues?.currency_code || activeEntity?.currency_code || "EUR",
       reference: (initialValues as any)?.reference ?? "",
-      note: initialValues?.note ?? defaultNote,
-      tax_clause: "",
-      footer: (initialValues as any)?.footer ?? defaultFooter,
+      note: initialValues?.note ?? (isEditMode ? "" : defaultNote),
+      tax_clause: (initialValues as any)?.tax_clause ?? "",
+      footer: (initialValues as any)?.footer ?? (isEditMode ? "" : defaultFooter),
+      signature:
+        (initialValues as any)?.signature ??
+        (isEditMode ? "" : (activeEntity?.settings as any)?.default_document_signature || ""),
       pt: ((initialValues as any)?.pt as PtDocumentInputForm | undefined) ?? undefined,
     },
   });
@@ -296,13 +349,13 @@ export default function CreateAdvanceInvoiceForm({
   const previousMarkAsPaidRef = useRef(markAsPaid);
 
   useEffect(() => {
-    if (skipPreferenceInitializedRef.current || furs.isLoading) return;
+    if (skipPreferenceInitializedRef.current || furs.isLoading || isEditMode) return;
 
     skipPreferenceInitializedRef.current = true;
     if (furs.settings?.default_skip_fiscalization === true) {
       setSkipFiscalization(true);
     }
-  }, [furs.isLoading, furs.settings?.default_skip_fiscalization]);
+  }, [furs.isLoading, furs.settings?.default_skip_fiscalization, isEditMode]);
 
   useEffect(() => {
     const skipJustEnabled = skipFiscalization && !previousSkipFiscalizationRef.current;
@@ -345,6 +398,10 @@ export default function CreateAdvanceInvoiceForm({
   // Update header action with FURS and e-SLOG toggle buttons
   useEffect(() => {
     if (!onHeaderActionChange) return;
+    if (isEditMode) {
+      onHeaderActionChange(null);
+      return;
+    }
 
     if (furs.isLoading || fina.isLoading) {
       onHeaderActionChange(null);
@@ -444,6 +501,7 @@ export default function CreateAdvanceInvoiceForm({
     eslog.isAvailable,
     eslog.isEnabled,
     eslog.setEnabled,
+    isEditMode,
     onHeaderActionChange,
     t,
   ]);
@@ -538,19 +596,22 @@ export default function CreateAdvanceInvoiceForm({
   const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextDocumentNumber(entityId, "advance_invoice", {
     businessPremiseName: activePremiseNameForNumber,
     electronicDeviceName: activeDeviceNameForNumber,
-    enabled: !!entityId && !furs.isLoading && furs.isSelectionReady && !fina.isLoading && fina.isSelectionReady,
+    enabled:
+      !!entityId && !furs.isLoading && furs.isSelectionReady && !fina.isLoading && fina.isSelectionReady && !isEditMode,
   });
 
   // Overall loading state
-  const isFormDataLoading =
-    furs.isLoading || !furs.isSelectionReady || fina.isLoading || !fina.isSelectionReady || isNextNumberLoading;
+  const isFormDataLoading = isEditMode
+    ? false
+    : furs.isLoading || !furs.isSelectionReady || fina.isLoading || !fina.isSelectionReady || isNextNumberLoading;
 
   // Pre-fill advance invoice number from preview
   useEffect(() => {
+    if (isEditMode) return;
     if (nextNumberData?.number) {
       form.setValue("number", nextNumberData.number);
     }
-  }, [nextNumberData?.number, form]);
+  }, [nextNumberData?.number, form, isEditMode]);
 
   // Auto-populate tax_clause from entity settings when transaction type changes
   const effectiveTransactionType = transactionType ?? "domestic";
@@ -558,13 +619,14 @@ export default function CreateAdvanceInvoiceForm({
   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]);
 
   // Customer form management
   const {
@@ -587,11 +649,40 @@ export default function CreateAdvanceInvoiceForm({
     },
     onError,
   });
+  const { mutate: createCustomAdvanceInvoice, isPending: isCreateCustomPending } = useCreateCustomAdvanceInvoice({
+    entityId,
+    onSuccess: (data) => {
+      furs.saveCombo();
+      fina.saveCombo();
+      onSuccess?.(data);
+    },
+    onError,
+  });
+  const { mutate: updateAdvanceInvoice, isPending: isUpdatePending } = useUpdateAdvanceInvoice({
+    entityId,
+    onSuccess,
+    onError,
+  });
 
   // Shared submit logic for both regular save and save as draft
   const submitAdvanceInvoice = useCallback(
     (values: CreateAdvanceInvoiceFormValues, isDraft: boolean) => {
-      if (!isDraft && eslog.isEnabled && eslogEntityErrorsRef.current.length > 0) {
+      if (!isEditMode && !isDraft && eslog.isEnabled && eslogEntityErrorsRef.current.length > 0) {
+        return;
+      }
+
+      if (isEditMode) {
+        if (!documentId) {
+          throw new Error("Advance invoice edit mode requires a documentId");
+        }
+
+        const updatePayload = prepareAdvanceInvoiceUpdateSubmission(values, {
+          originalCustomer,
+          wasCustomerFormShown: showCustomerForm,
+          priceModes: priceModesRef.current,
+        }) as UpdateAdvanceInvoice;
+
+        updateAdvanceInvoice({ id: documentId, data: updatePayload });
         return;
       }
 
@@ -634,21 +725,40 @@ export default function CreateAdvanceInvoiceForm({
         originalCustomer,
         wasCustomerFormShown: showCustomerForm,
         markAsPaid: isDraft ? false : markAsPaid,
-        payments: serializePaymentRows(paymentRows, paymentDocumentTotal),
+        payments: serializePaymentRowsForApi(paymentRows, paymentDocumentTotal, {
+          preserveUntouchedAmounts: true,
+        }),
         furs: fursOptions,
         fina: finaOptions,
         eslog: eslogOptions,
         priceModes: priceModesRef.current,
         isDraft,
       });
+      const preservedExpectedTotalWithTax = getPreservedExpectedTotalWithTax(values);
+      if (preservedExpectedTotalWithTax !== undefined) {
+        (payload as any).expected_total_with_tax = preservedExpectedTotalWithTax;
+      } else {
+        delete (payload as any).expected_total_with_tax;
+      }
 
-      createAdvanceInvoice(payload);
+      if (customCreateTemplate && financialInputsMatchSource(values)) {
+        delete (payload as any).expected_total_with_tax;
+        createCustomAdvanceInvoice(applyCustomCreateTemplate(payload as any, customCreateTemplate));
+      } else {
+        createAdvanceInvoice(payload);
+      }
     },
     [
       createAdvanceInvoice,
+      createCustomAdvanceInvoice,
+      customCreateTemplate,
+      documentId,
       eslog,
       furs,
       fina,
+      financialInputsMatchSource,
+      getPreservedExpectedTotalWithTax,
+      isEditMode,
       useFinaNumbering,
       markAsPaid,
       originalCustomer,
@@ -657,6 +767,7 @@ export default function CreateAdvanceInvoiceForm({
       showCustomerForm,
       skipFiscalization,
       operatorPrefill,
+      updateAdvanceInvoice,
     ],
   );
 
@@ -680,20 +791,22 @@ export default function CreateAdvanceInvoiceForm({
 
   useFormFooterRegistration({
     formId: "create-advance-invoice-form",
-    isPending,
+    isPending: isPending || isCreateCustomPending || isUpdatePending,
     isDirty: form.formState.isDirty || !!initialValues,
-    label: t("Save"),
-    secondaryAction: allowDrafts
-      ? {
-          label: t("Save as Draft"),
-          onClick: handleSaveAsDraft,
-          isPending: isDraftPending,
-        }
-      : undefined,
+    label: isEditMode ? t("Update") : t("Save"),
+    secondaryAction:
+      allowDrafts && !isEditMode
+        ? {
+            label: t("Save as Draft"),
+            onClick: handleSaveAsDraft,
+            isPending: isDraftPending,
+          }
+        : undefined,
   });
 
   // Set default note, footer, and signature from entity settings (advance invoices don't have payment terms)
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultNote =
       (activeEntity?.settings as any)?.default_advance_invoice_note ||
       (activeEntity?.settings as any)?.default_invoice_note;
@@ -708,7 +821,7 @@ export default function CreateAdvanceInvoiceForm({
     if (entityDefaultSignature && !form.getValues("signature")) {
       form.setValue("signature", entityDefaultSignature);
     }
-  }, [activeEntity, form]);
+  }, [activeEntity, form, isEditMode]);
 
   // Auto-add tax field for tax subject entities
   useEffect(() => {
@@ -720,28 +833,29 @@ export default function CreateAdvanceInvoiceForm({
     }
   }, [activeEntity?.is_tax_subject, form]);
 
-  const buildPreviewPayload = useCallback((values: CreateAdvanceInvoiceFormValues): AdvanceInvoicePreviewPayload => {
-    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 };
-    });
-
-    return {
-      number: values.number,
-      date: values.date,
-      customer_id: values.customer_id,
-      customer: values.customer,
-      items: transformedItems,
-      currency_code: values.currency_code,
-      reference: values.reference,
-      note: values.note,
-      signature: values.signature,
-      ...(normalizePtDocumentInput(values.pt) ? { pt: normalizePtDocumentInput(values.pt) } : {}),
-    };
-  }, []);
+  const buildPreviewPayload = useCallback(
+    (values: CreateAdvanceInvoiceFormValues): AdvanceInvoicePreviewPayload => {
+      const preservedExpectedTotalWithTax = getPreservedExpectedTotalWithTax(values);
+      return {
+        number: values.number,
+        date: values.date,
+        customer_id: values.customer_id,
+        customer: values.customer,
+        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,
+        ...(preservedExpectedTotalWithTax !== undefined
+          ? { expected_total_with_tax: preservedExpectedTotalWithTax }
+          : {}),
+        ...(normalizePtDocumentInput(values.pt) ? { pt: normalizePtDocumentInput(values.pt) } : {}),
+      };
+    },
+    [getPreservedExpectedTotalWithTax],
+  );
 
   const emitPreviewPayload = useCallback((payload: AdvanceInvoicePreviewPayload) => {
     const callback = onChangeRef.current;
@@ -862,7 +976,7 @@ export default function CreateAdvanceInvoiceForm({
             t={t}
             locale={locale}
             fursInline={
-              furs.isEnabled && furs.hasPremises
+              !isEditMode && furs.isEnabled && furs.hasPremises
                 ? {
                     premises: furs.activePremises.map((p) => ({
                       id: p.id,
@@ -881,7 +995,7 @@ export default function CreateAdvanceInvoiceForm({
                 : undefined
             }
             finaInline={
-              useFinaNumbering
+              !isEditMode && useFinaNumbering
                 ? {
                     premises: fina.activePremises.map((p: any) => ({
                       id: p.id,
@@ -900,24 +1014,26 @@ export default function CreateAdvanceInvoiceForm({
             }
           >
             {/* Mark as paid section (UI-only state, not in form schema) */}
-            <MarkAsPaidSection
-              checked={markAsPaid}
-              onCheckedChange={(checked) => {
-                setMarkAsPaid(checked);
-                setPaymentValidationMessage(undefined);
-              }}
-              paymentRows={paymentRows}
-              onPaymentRowsChange={(rows) => {
-                setPaymentRows(rows);
-                setPaymentValidationMessage(undefined);
-              }}
-              documentTotal={paymentDocumentTotal}
-              t={t}
-              alwaysShowPaymentType={!!fina.isActive}
-              forced
-              validationMessage={paymentValidationMessage}
-              requireFullPayment
-            />
+            {!isEditMode && (
+              <MarkAsPaidSection
+                checked={markAsPaid}
+                onCheckedChange={(checked) => {
+                  setMarkAsPaid(checked);
+                  setPaymentValidationMessage(undefined);
+                }}
+                paymentRows={paymentRows}
+                onPaymentRowsChange={(rows) => {
+                  setPaymentRows(rows);
+                  setPaymentValidationMessage(undefined);
+                }}
+                documentTotal={paymentDocumentTotal}
+                t={t}
+                alwaysShowPaymentType={!!fina.isActive}
+                forced
+                validationMessage={paymentValidationMessage}
+                requireFullPayment
+              />
+            )}
             {detailsExtras}
           </DocumentDetailsSection>
         </div>