@spaceinvoices/react-ui 0.4.12 → 0.4.32

package/src/components/entities/entity-settings-form/locales/pt.ts

@@ -190,6 +190,13 @@ export default {
   "tax-rules.require_gross_prices.label": "Exigir preços brutos",
   "tax-rules.require_gross_prices.description":
     "Exigir preços brutos quando a autoliquidação é aplicada. Previne variações inesperadas nos valores totais das faturas.",
+  "tax-rules.calculation_mode.label": "Calculation mode",
+  "tax-rules.calculation_mode.description": "Choose how discounts and VAT are ordered when document totals are calculated.",
+  "tax-rules.calculation_mode.b2b_standard.label": "B2B standard",
+  "tax-rules.calculation_mode.b2b_standard.description": "Discounts reduce the net line amount first, then VAT is calculated.",
+  "tax-rules.calculation_mode.b2c_gross_discount.label": "B2C gross discount",
+  "tax-rules.calculation_mode.b2c_gross_discount.description":
+    "Discounts reduce the final gross payable amount, then net and VAT are derived from that result.",
   // Tax clauses settings
   "Default Tax Clauses": "Cláusulas fiscais predefinidas",
   "Set default tax clauses that are automatically added to documents based on transaction type":

package/src/components/entities/entity-settings-form/locales/sk.ts

@@ -169,6 +169,13 @@ export default {
   "tax-rules.auto_remove_tax_export.description": "tax-rules.auto_remove_tax_export.description",
   "tax-rules.require_gross_prices.label": "tax-rules.require_gross_prices.label",
   "tax-rules.require_gross_prices.description": "tax-rules.require_gross_prices.description",
+  "tax-rules.calculation_mode.label": "Calculation mode",
+  "tax-rules.calculation_mode.description": "Choose how discounts and VAT are ordered when document totals are calculated.",
+  "tax-rules.calculation_mode.b2b_standard.label": "B2B standard",
+  "tax-rules.calculation_mode.b2b_standard.description": "Discounts reduce the net line amount first, then VAT is calculated.",
+  "tax-rules.calculation_mode.b2c_gross_discount.label": "B2C gross discount",
+  "tax-rules.calculation_mode.b2c_gross_discount.description":
+    "Discounts reduce the final gross payable amount, then net and VAT are derived from that result.",
   "Default Tax Clauses": "Default Tax Clauses",
   "Set default tax clauses that are automatically added to documents based on transaction type":
     "Set default tax clauses that are automatically added to documents based on transaction type",

package/src/components/entities/entity-settings-form/locales/sl.ts

@@ -64,19 +64,19 @@ export default {
   "This note will be pre-filled when creating new invoices":
     "Ta pripis bo vnaprej izpolnjen pri ustvarjanju novih računov",
   "This note will be pre-filled when creating new estimates":
-    "Ta pripis bo vnaprej izpolnjen pri ustvarjanju novih predračunov",
+    "Ta pripis bo vnaprej izpolnjen pri ustvarjanju novih ponudb",
   "This note will be pre-filled when creating new credit notes":
     "Ta pripis bo vnaprej izpolnjen pri ustvarjanju novih dobropisov",
   "Payment terms pre-filled when creating new invoices":
     "Plačilni pogoji bodo vnaprej izpolnjeni pri ustvarjanju novih računov",
   "Payment terms pre-filled when creating new estimates":
-    "Plačilni pogoji bodo vnaprej izpolnjeni pri ustvarjanju novih predračunov",
+    "Plačilni pogoji bodo vnaprej izpolnjeni pri ustvarjanju novih ponudb",
   "Payment terms pre-filled when creating new credit notes":
     "Plačilni pogoji bodo vnaprej izpolnjeni pri ustvarjanju novih dobropisov",
   "Optional note for the document.": "Neobvezna opomba za dokument.",
   "Please remit payment using the bank details shown on the document.":
     "Plačilo izvedite po bančnih podatkih, navedenih na dokumentu.",
-  "This estimate is valid until {document_valid_until}.": "Ta predračun velja do {document_valid_until}.",
+  "This estimate is valid until {document_valid_until}.": "Ta ponudba velja do {document_valid_until}.",
   "Payment due upon acceptance.": "Plačilo ob sprejemu.",
   "Credit note for invoice {document_number}.": "Dobropis za račun {document_number}.",
   "Credit will be applied to your account.": "Dobropis bo upoštevan na vašem računu.",
@@ -167,7 +167,7 @@ export default {
     "UPN QR je slovenski standard za plačilne naloge. Ko je omogočen, bodo vaši računi vključevali QR kodo, ki jo stranke lahko skenirajo z mobilno bančno aplikacijo za takojšnje plačilo.",
   // Number format settings
   Invoice: "Račun",
-  Estimate: "Predračun",
+  Estimate: "Ponudba",
   "Credit Note": "Dobropis",
   "Advance Invoice": "Avansni račun",
   "Number Format": "Format številke",
@@ -186,6 +186,14 @@ export default {
   "tax-rules.require_gross_prices.label": "Zahtevaj bruto cene",
   "tax-rules.require_gross_prices.description":
     "Zahtevaj bruto cene, ko se uporabi obrnjena davčna obveznost. Prepreči nepričakovane spremembe skupnih zneskov računov.",
+  "tax-rules.calculation_mode.label": "Način izračuna",
+  "tax-rules.calculation_mode.description": "Izberite vrstni red popustov in DDV pri izračunu zneskov dokumenta.",
+  "tax-rules.calculation_mode.b2b_standard.label": "Standard B2B",
+  "tax-rules.calculation_mode.b2b_standard.description":
+    "Popusti najprej zmanjšajo neto znesek postavke, nato se obračuna DDV.",
+  "tax-rules.calculation_mode.b2c_gross_discount.label": "B2C bruto popust",
+  "tax-rules.calculation_mode.b2c_gross_discount.description":
+    "Popusti zmanjšajo končni bruto znesek za plačilo, neto osnova in DDV pa se izračunata iz tega rezultata.",
   // Tax clauses settings
   "Default Tax Clauses": "Privzete davčne klavzule",
   "Set default tax clauses that are automatically added to documents based on transaction type":

package/src/components/entities/entity-settings-form/locales/sv.ts

@@ -175,6 +175,13 @@ export default {
   "tax-rules.auto_remove_tax_export.description": "tax-rules.auto_remove_tax_export.description",
   "tax-rules.require_gross_prices.label": "tax-rules.require_gross_prices.label",
   "tax-rules.require_gross_prices.description": "tax-rules.require_gross_prices.description",
+  "tax-rules.calculation_mode.label": "Calculation mode",
+  "tax-rules.calculation_mode.description": "Choose how discounts and VAT are ordered when document totals are calculated.",
+  "tax-rules.calculation_mode.b2b_standard.label": "B2B standard",
+  "tax-rules.calculation_mode.b2b_standard.description": "Discounts reduce the net line amount first, then VAT is calculated.",
+  "tax-rules.calculation_mode.b2c_gross_discount.label": "B2C gross discount",
+  "tax-rules.calculation_mode.b2c_gross_discount.description":
+    "Discounts reduce the final gross payable amount, then net and VAT are derived from that result.",
   "Default Tax Clauses": "Standardskatteklausuler",
   "Set default tax clauses that are automatically added to documents based on transaction type":
     "Ange standardskatteklausuler som automatiskt läggs till i dokument utifrån transaktionstyp",

package/src/components/entities/settings/tax-rules-settings-form.tsx

@@ -17,6 +17,7 @@ import {
 } from "@/ui/components/ui/form";
 import { Switch } from "@/ui/components/ui/switch";
 import { Textarea } from "@/ui/components/ui/textarea";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/ui/components/ui/select";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { cn } from "@/ui/lib/utils";
@@ -28,6 +29,7 @@ import sl from "../entity-settings-form/locales/sl";
 const translations = { sl, de } as const;
 
 const taxRulesSettingsSchema = z.object({
+  calculation_mode: z.enum(["b2b_standard", "b2c_gross_discount"]),
   vies_validate_vat: z.boolean(),
   auto_reverse_charge: z.boolean(),
   auto_remove_tax_export: z.boolean(),
@@ -83,6 +85,7 @@ export function TaxRulesSettingsForm({
 
   const defaultValues = useMemo(
     (): TaxRulesSettingsSchema => ({
+      calculation_mode: currentSettings.calculation?.default_mode ?? "b2b_standard",
       vies_validate_vat: currentTaxRules.vies_validate_vat ?? true,
       auto_reverse_charge: currentTaxRules.auto_reverse_charge ?? false,
       auto_remove_tax_export: currentTaxRules.auto_remove_tax_export ?? false,
@@ -129,6 +132,10 @@ export function TaxRulesSettingsForm({
   const onSubmit = (values: TaxRulesSettingsSchema) => {
     const updatedSettings: EntitySettings = {
       ...currentSettings,
+      calculation: {
+        ...currentSettings.calculation,
+        default_mode: values.calculation_mode,
+      },
       tax_rules: {
         eu: {
           vies_validate_vat: values.vies_validate_vat,
@@ -165,6 +172,35 @@ export function TaxRulesSettingsForm({
   // Tax rules section content (switches)
   const taxRulesContent = (
     <div className="space-y-4">
+      <FormField
+        control={form.control}
+        name="calculation_mode"
+        render={({ field }) => (
+          <FormItem className="rounded-lg border p-4">
+            <FormLabel className="text-base">{t("tax-rules.calculation_mode.label")}</FormLabel>
+            <FormDescription>{t("tax-rules.calculation_mode.description")}</FormDescription>
+            <FormControl>
+              <Select value={field.value} onValueChange={field.onChange}>
+                <SelectTrigger className="mt-3">
+                  <SelectValue />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectItem value="b2b_standard">{t("tax-rules.calculation_mode.b2b_standard.label")}</SelectItem>
+                  <SelectItem value="b2c_gross_discount">
+                    {t("tax-rules.calculation_mode.b2c_gross_discount.label")}
+                  </SelectItem>
+                </SelectContent>
+              </Select>
+            </FormControl>
+            <div className="mt-3 space-y-1 text-muted-foreground text-sm">
+              <p>{t("tax-rules.calculation_mode.b2b_standard.description")}</p>
+              <p>{t("tax-rules.calculation_mode.b2c_gross_discount.description")}</p>
+            </div>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
+
       <FormField
         control={form.control}
         name="vies_validate_vat"

package/src/components/estimates/create/create-estimate-form.tsx

@@ -1,7 +1,7 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import type { CreateEstimateRequest, Estimate } from "@spaceinvoices/js-sdk";
+import type { CreateEstimateRequest, Estimate, UpdateEstimate } from "@spaceinvoices/js-sdk";
 import { useQueryClient } from "@tanstack/react-query";
-import { RefreshCw } from "lucide-react";
+import { ArrowUpDown } from "lucide-react";
 import type { ReactNode } from "react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { Resolver } from "react-hook-form";
@@ -17,11 +17,13 @@ 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 { useEntities } from "@/ui/providers/entities-context";
 import { useFormFooterRegistration } from "@/ui/providers/form-footer-context";
 import { CUSTOMERS_CACHE_KEY } from "../../customers/customers.hooks";
+import { withEstimateIssueDateValidation } from "../../documents/create/document-date-validation";
 import {
   DocumentDetailsSection,
   DocumentFooterField,
@@ -33,8 +35,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 { useCreateEstimate } from "../estimates.hooks";
+import { useCreateCustomEstimate, useCreateEstimate, useUpdateEstimate } from "../estimates.hooks";
 import de from "./locales/de";
 import es from "./locales/es";
 import fr from "./locales/fr";
@@ -44,7 +49,7 @@ import nl from "./locales/nl";
 import pl from "./locales/pl";
 import pt from "./locales/pt";
 import sl from "./locales/sl";
-import { prepareEstimateSubmission } from "./prepare-estimate-submission";
+import { prepareEstimateSubmission, prepareEstimateUpdateSubmission } from "./prepare-estimate-submission";
 import { useEstimateCustomerForm } from "./use-estimate-customer-form";
 
 function calculateDueDate(dateIso: string, days: number): string {
@@ -64,10 +69,12 @@ const translations = {
   pl,
   hr,
 } as const;
-const createEstimateFormSchema = withRequiredDocumentItemFields(
-  createEstimateSchema.extend({
-    pt: ptDocumentInputFormSchema.optional(),
-  }),
+const createEstimateFormSchema = withEstimateIssueDateValidation(
+  withRequiredDocumentItemFields(
+    createEstimateSchema.extend({
+      pt: ptDocumentInputFormSchema.optional(),
+    }),
+  ),
 );
 
 // Form values: extend schema with local-only fields (number is for display, not sent to API)
@@ -88,7 +95,12 @@ type CreateEstimateFormProps = {
   /** Callback to update header action (title toggle) */
   onHeaderActionChange?: (action: ReactNode) => void;
   /** Initial values for form fields (used for document duplication) */
-  initialValues?: Partial<CreateEstimateRequest>;
+  initialValues?: Partial<CreateEstimateRequest> & {
+    number?: string;
+    title_type?: "estimate" | "proforma_invoice" | null;
+  };
+  mode?: "create" | "edit";
+  documentId?: string;
   /** Whether draft actions should be available in the UI */
   allowDrafts?: boolean;
   /** Optional app-level content rendered inside the details section. */
@@ -105,6 +117,8 @@ export default function CreateEstimateForm({
   onAddNewTax,
   onHeaderActionChange,
   initialValues,
+  mode = "create",
+  documentId,
   allowDrafts = true,
   detailsExtras,
   translationLocale,
@@ -122,9 +136,12 @@ export default function CreateEstimateForm({
 
   const { activeEntity } = useEntities();
   const queryClient = useQueryClient();
+  const isEditMode = mode === "edit";
 
-  // Title type state: "estimate" (default) or "quote"
-  const [titleType, setTitleType] = useState<"estimate" | "quote">((initialValues as any)?.title_type || "estimate");
+  // Title type state: "estimate" (default) or "proforma_invoice"
+  const [titleType, setTitleType] = useState<"estimate" | "proforma_invoice">(
+    (initialValues as any)?.title_type || "estimate",
+  );
 
   // Draft submission state
   const [isDraftPending, setIsDraftPending] = useState(false);
@@ -135,7 +152,7 @@ export default function CreateEstimateForm({
 
   // Fetch next estimate number
   const { data: nextNumberData } = useNextDocumentNumber(entityId, "estimate", {
-    enabled: !!entityId,
+    enabled: !!entityId && !isEditMode,
   });
 
   // Get default payment terms and footer from entity settings
@@ -145,22 +162,29 @@ export default function CreateEstimateForm({
   const form = useForm<CreateEstimateFormValues>({
     resolver: zodResolver(createEstimateFormSchema) as Resolver<CreateEstimateFormValues>,
     defaultValues: {
-      number: "",
+      number: initialValues?.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 CreateEstimateFormValues["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,
+                  classification: item.classification ?? undefined,
+                  unit: item.unit ?? 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,
                   taxes: item.taxes || [],
+                  discounts: normalizeLineItemDiscountsForForm(item.discounts),
+                  metadata: item.metadata ?? undefined,
                 }
               : {}),
           }))
@@ -175,13 +199,16 @@ export default function CreateEstimateForm({
           ],
       currency_code: initialValues?.currency_code || activeEntity?.currency_code || "EUR",
       reference: (initialValues as any)?.reference ?? "",
-      note: initialValues?.note ?? defaultEstimateNote,
+      note: initialValues?.note ?? (isEditMode ? "" : defaultEstimateNote),
       tax_clause: (initialValues as any)?.tax_clause ?? "",
-      payment_terms: initialValues?.payment_terms ?? defaultPaymentTerms,
-      footer: (initialValues as any)?.footer ?? defaultFooter,
+      payment_terms: initialValues?.payment_terms ?? (isEditMode ? "" : defaultPaymentTerms),
+      signature: (initialValues as any)?.signature ?? "",
+      footer: (initialValues as any)?.footer ?? (isEditMode ? "" : defaultFooter),
       date_valid_till:
         initialValues?.date_valid_till ||
-        calculateDueDate(initialValues?.date || new Date().toISOString(), defaultEstimateValidDays),
+        (isEditMode
+          ? undefined
+          : calculateDueDate(initialValues?.date || new Date().toISOString(), defaultEstimateValidDays)),
       pt: ((initialValues as any)?.pt as PtDocumentInputForm | undefined) ?? undefined,
     },
   });
@@ -189,6 +216,7 @@ export default function CreateEstimateForm({
   // Price modes per item (gross vs net) - collected from component state at submit
   const onHeaderActionChangeRef = useRef(onHeaderActionChange);
   onHeaderActionChangeRef.current = onHeaderActionChange;
+  const headerActionSignatureRef = useRef<string | null>(null);
 
   const onChangeRef = useRef(onChange);
   onChangeRef.current = onChange;
@@ -201,16 +229,48 @@ export default function CreateEstimateForm({
     }, {} 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]);
+  }, [form, isEditMode, nextNumberData?.number]);
 
   // Update default note and valid-till date when entity loads
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultNote = (activeEntity?.settings as any)?.default_estimate_note;
     if (entityDefaultNote && !form.getValues("note")) {
       form.setValue("note", entityDefaultNote);
@@ -226,7 +286,7 @@ export default function CreateEstimateForm({
         form.setValue("date_valid_till", calculateDueDate(currentDate, validDays));
       }
     }
-  }, [activeEntity, form, initialValues?.date_valid_till]);
+  }, [activeEntity, form, initialValues?.date_valid_till, isEditMode]);
 
   // Auto-add tax field for tax subject entities
   useEffect(() => {
@@ -241,12 +301,39 @@ export default function CreateEstimateForm({
   // Update header with clickable title toggle
   useEffect(() => {
     const callback = onHeaderActionChangeRef.current;
-    if (!callback) return;
+    if (!callback) {
+      headerActionSignatureRef.current = null;
+      return;
+    }
 
     const toggleTitle = () => {
-      setTitleType((prev) => (prev === "estimate" ? "quote" : "estimate"));
+      setTitleType((prev) => (prev === "estimate" ? "proforma_invoice" : "estimate"));
     };
 
+    const titleLabel = isEditMode
+      ? titleType === "estimate"
+        ? t("Estimate")
+        : t("Proforma invoice")
+      : titleType === "estimate"
+        ? t("Create Estimate")
+        : t("Create Proforma invoice");
+    const tooltipLabel = isEditMode
+      ? titleType === "estimate"
+        ? t("Click to switch to Proforma invoice")
+        : t("Click to switch to Estimate")
+      : titleType === "estimate"
+        ? t("Click to switch to Proforma invoice")
+        : t("Click to switch to Estimate");
+    const headerActionSignature = JSON.stringify({
+      titleLabel,
+      tooltipLabel,
+      isEditMode,
+      titleType,
+    });
+
+    if (headerActionSignatureRef.current === headerActionSignature) return;
+    headerActionSignatureRef.current = headerActionSignature;
+
     callback(
       <TooltipProvider>
         <Tooltip>
@@ -256,17 +343,24 @@ export default function CreateEstimateForm({
               onClick={toggleTitle}
               className="flex cursor-pointer items-center gap-2 font-bold text-2xl hover:text-primary"
             >
-              {titleType === "estimate" ? t("Create Estimate") : t("Create Quote")}
-              <RefreshCw className="size-4 text-muted-foreground" />
+              {titleLabel}
+              <ArrowUpDown className="size-4 text-muted-foreground" />
             </button>
           </TooltipTrigger>
-          <TooltipContent side="bottom">
-            {titleType === "estimate" ? t("Click to switch to Quote") : t("Click to switch to Estimate")}
-          </TooltipContent>
+          <TooltipContent side="bottom">{tooltipLabel}</TooltipContent>
         </Tooltip>
       </TooltipProvider>,
     );
-  }, [titleType, t]);
+  }, [isEditMode, t, titleType]);
+
+  useEffect(() => {
+    const callback = onHeaderActionChangeRef.current;
+    return () => {
+      if (!callback || headerActionSignatureRef.current === null) return;
+      headerActionSignatureRef.current = null;
+      callback(null);
+    };
+  }, []);
 
   const formValues = useWatch({
     control: form.control,
@@ -297,13 +391,14 @@ export default function CreateEstimateForm({
   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 {
@@ -327,18 +422,59 @@ export default function CreateEstimateForm({
     },
     onError,
   });
+  const { mutate: createCustomEstimate, isPending: isCreateCustomPending } = useCreateCustomEstimate({
+    entityId,
+    onSuccess: (data) => {
+      if (data.customer_id) {
+        queryClient.invalidateQueries({ queryKey: [CUSTOMERS_CACHE_KEY] });
+      }
+      onSuccess?.(data);
+    },
+    onError,
+  });
+  const { mutate: updateEstimate, isPending: isUpdatePending } = useUpdateEstimate({
+    entityId,
+    onSuccess,
+    onError,
+  });
 
   // Shared submit logic for both regular save and save as draft
   const submitEstimate = useCallback(
     (values: CreateEstimateFormValues, isDraft: boolean) => {
       try {
+        if (isEditMode) {
+          if (!documentId) {
+            throw new Error("Estimate edit mode requires a documentId");
+          }
+
+          const submission = prepareEstimateUpdateSubmission(values as any, {
+            originalCustomer,
+            priceModes: priceModesRef.current,
+            titleType,
+          }) as UpdateEstimate;
+
+          updateEstimate({ id: documentId, data: submission });
+          return;
+        }
+
         const submission = prepareEstimateSubmission(values, {
           originalCustomer,
           priceModes: priceModesRef.current,
           titleType,
           isDraft,
         });
-        createEstimate(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;
+          createCustomEstimate(applyCustomCreateTemplate(submission as any, customCreateTemplate));
+        } else {
+          createEstimate(submission);
+        }
       } catch (error) {
         console.error("Estimate submission error:", error);
         if (onError) {
@@ -346,7 +482,19 @@ export default function CreateEstimateForm({
         }
       }
     },
-    [createEstimate, onError, originalCustomer, titleType],
+    [
+      createEstimate,
+      createCustomEstimate,
+      customCreateTemplate,
+      documentId,
+      financialInputsMatchSource,
+      getPreservedExpectedTotalWithTax,
+      isEditMode,
+      onError,
+      originalCustomer,
+      titleType,
+      updateEstimate,
+    ],
   );
 
   // Handle save as draft
@@ -365,26 +513,27 @@ export default function CreateEstimateForm({
 
   const secondaryAction = useMemo(
     () =>
-      allowDrafts
+      allowDrafts && !isEditMode
         ? {
             label: t("Save as Draft"),
             onClick: handleSaveAsDraft,
             isPending: isDraftPending,
           }
         : undefined,
-    [allowDrafts, t, handleSaveAsDraft, isDraftPending],
+    [allowDrafts, t, handleSaveAsDraft, isDraftPending, isEditMode],
   );
 
   useFormFooterRegistration({
     formId: "create-estimate-form",
-    isPending,
+    isPending: isPending || isCreateCustomPending || isUpdatePending,
     isDirty: form.formState.isDirty || !!initialValues,
-    label: titleType === "estimate" ? t("Create Estimate") : t("Create Quote"),
+    label: isEditMode ? t("Update") : titleType === "estimate" ? t("Create Estimate") : t("Create Proforma invoice"),
     secondaryAction,
   });
 
   // Set default payment terms and footer from entity settings when entity data is available
   useEffect(() => {
+    if (isEditMode) return;
     const entityDefaultPaymentTerms = (activeEntity?.settings as any)?.default_estimate_payment_terms;
     if (entityDefaultPaymentTerms && !form.getValues("payment_terms")) {
       form.setValue("payment_terms", entityDefaultPaymentTerms);
@@ -393,44 +542,44 @@ export default function CreateEstimateForm({
     if (entityDefaultFooter && !form.getValues("footer")) {
       form.setValue("footer", entityDefaultFooter);
     }
-  }, [activeEntity, form]);
+  }, [activeEntity, form, isEditMode]);
 
   // Recalculate valid-till date when document date changes
   const prevDateRef = useRef(form.getValues("date"));
   useEffect(() => {
+    if (isEditMode) return;
     const currentDate = formValues.date;
     if (!currentDate || currentDate === prevDateRef.current) return;
     prevDateRef.current = currentDate;
     const validDays = (activeEntity?.settings as any)?.default_estimate_valid_days ?? 30;
     form.setValue("date_valid_till", calculateDueDate(currentDate, validDays));
-  }, [formValues.date, activeEntity, form]);
+  }, [formValues.date, activeEntity, form, isEditMode]);
 
   const buildPreviewPayload = useCallback(
     (values: CreateEstimateFormValues): EstimatePreviewPayload => {
-      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,
         payment_terms: values.payment_terms,
         signature: values.signature,
+        footer: values.footer,
+        date_valid_till: values.date_valid_till,
         title_type: titleType,
+        ...(preservedExpectedTotalWithTax !== undefined
+          ? { expected_total_with_tax: preservedExpectedTotalWithTax }
+          : {}),
         ...(normalizePtDocumentInput(values.pt) ? { pt: normalizePtDocumentInput(values.pt) } : {}),
       };
     },
-    [titleType],
+    [getPreservedExpectedTotalWithTax, titleType],
   );
 
   const emitPreviewPayload = useCallback((payload: EstimatePreviewPayload) => {