@spaceinvoices/react-ui 0.4.6 → 0.4.8

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

@@ -182,8 +182,10 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Za prodaju EU tvrtkama s valjanim PDV brojevima. Obično uključuje izjavu o prijenosu porezne obveze.",
   "Enter reverse charge clause...": "Unesite klauzulu o prijenosu porezne obveze...",
-  "tax-clauses.export.label": "Izvoz (izvan EU)",
-  "tax-clauses.export.description": "Za prodaju kupcima izvan EU. Obično navodi oslobođenje od PDV-a za izvoz.",
+  "tax-clauses.3w_b2b.label": "Izvan EU B2B (izvoz)",
+  "tax-clauses.3w_b2b.description": "Za prodaju poduzećima izvan EU. Obično navodi oslobođenje od PDV-a za izvoz.",
+  "tax-clauses.3w_b2c.label": "Izvan EU B2C (izvoz)",
+  "tax-clauses.3w_b2c.description": "Za prodaju potrošačima izvan EU. Obično navodi oslobođenje od PDV-a za izvoz.",
   "Enter export exemption clause...": "Unesite klauzulu o oslobođenju od izvoza...",
   "tax-clauses.domestic.label": "Zadano / Domaće",
   "tax-clauses.domestic.description":

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

@@ -187,9 +187,12 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Per vendite a imprese UE con numeri IVA validi. Di solito include una dichiarazione di inversione contabile.",
   "Enter reverse charge clause...": "Inserisci la clausola di inversione contabile...",
-  "tax-clauses.export.label": "Esportazione (extra-UE)",
-  "tax-clauses.export.description":
-    "Per vendite a clienti extra-UE. Di solito indica l'esenzione IVA per esportazione.",
+  "tax-clauses.3w_b2b.label": "Extra-UE B2B (esportazione)",
+  "tax-clauses.3w_b2b.description":
+    "Per vendite a imprese extra-UE. Di solito indica l'esenzione IVA per esportazione.",
+  "tax-clauses.3w_b2c.label": "Extra-UE B2C (esportazione)",
+  "tax-clauses.3w_b2c.description":
+    "Per vendite a consumatori extra-UE. Di solito indica l'esenzione IVA per esportazione.",
   "Enter export exemption clause...": "Inserisci la clausola di esenzione per esportazione...",
   "tax-clauses.domestic.label": "Predefinito / Nazionale",
   "tax-clauses.domestic.description":

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

@@ -184,9 +184,12 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Voor verkopen aan EU-bedrijven met geldige btw-nummers. Bevat meestal een verklaring van verlegging.",
   "Enter reverse charge clause...": "Voer de verleggingsclausule in...",
-  "tax-clauses.export.label": "Export (buiten EU)",
-  "tax-clauses.export.description":
-    "Voor verkopen aan klanten buiten de EU. Vermeldt meestal de btw-vrijstelling voor export.",
+  "tax-clauses.3w_b2b.label": "Niet-EU B2B (export)",
+  "tax-clauses.3w_b2b.description":
+    "Voor verkopen aan bedrijven buiten de EU. Vermeldt meestal de btw-vrijstelling voor export.",
+  "tax-clauses.3w_b2c.label": "Niet-EU B2C (export)",
+  "tax-clauses.3w_b2c.description":
+    "Voor verkopen aan consumenten buiten de EU. Vermeldt meestal de btw-vrijstelling voor export.",
   "Enter export exemption clause...": "Voer de exportvrijstellingsclausule in...",
   "tax-clauses.domestic.label": "Standaard / Binnenlands",
   "tax-clauses.domestic.description":

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

@@ -186,8 +186,12 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Dla sprzedaży firmom w UE z ważnymi numerami VAT. Zwykle zawiera oświadczenie o odwrotnym obciążeniu.",
   "Enter reverse charge clause...": "Wprowadź klauzulę odwrotnego obciążenia...",
-  "tax-clauses.export.label": "Eksport (poza UE)",
-  "tax-clauses.export.description": "Dla sprzedaży klientom poza UE. Zwykle wskazuje zwolnienie z VAT na eksport.",
+  "tax-clauses.3w_b2b.label": "Poza UE B2B (eksport)",
+  "tax-clauses.3w_b2b.description":
+    "Dla sprzedaży do przedsiębiorstw spoza UE. Zwykle wskazuje zwolnienie z VAT na eksport.",
+  "tax-clauses.3w_b2c.label": "Poza UE B2C (eksport)",
+  "tax-clauses.3w_b2c.description":
+    "Dla sprzedaży do konsumentów spoza UE. Zwykle wskazuje zwolnienie z VAT na eksport.",
   "Enter export exemption clause...": "Wprowadź klauzulę zwolnienia eksportowego...",
   "tax-clauses.domestic.label": "Domyślne / Krajowe",
   "tax-clauses.domestic.description":

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

@@ -186,9 +186,12 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Para vendas a empresas da UE com números de IVA válidos. Normalmente inclui uma declaração de autoliquidação.",
   "Enter reverse charge clause...": "Introduza a cláusula de autoliquidação...",
-  "tax-clauses.export.label": "Exportação (fora da UE)",
-  "tax-clauses.export.description":
-    "Para vendas a clientes fora da UE. Normalmente indica a isenção de IVA por exportação.",
+  "tax-clauses.3w_b2b.label": "Fora da UE B2B (exportação)",
+  "tax-clauses.3w_b2b.description":
+    "Para vendas a empresas fora da UE. Normalmente indica a isenção de IVA por exportação.",
+  "tax-clauses.3w_b2c.label": "Fora da UE B2C (exportação)",
+  "tax-clauses.3w_b2c.description":
+    "Para vendas a consumidores fora da UE. Normalmente indica a isenção de IVA por exportação.",
   "Enter export exemption clause...": "Introduza a cláusula de isenção de exportação...",
   "tax-clauses.domestic.label": "Predefinido / Nacional",
   "tax-clauses.domestic.description":

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

@@ -181,8 +181,10 @@ export default {
   "tax-clauses.intra_eu_b2b.description":
     "Za prodajo EU podjetjem z veljavnimi DDV številkami. Običajno vključuje izjavo o obrnjeni davčni obveznosti.",
   "Enter reverse charge clause...": "Vnesite klavzulo za samoobdavčitev...",
-  "tax-clauses.export.label": "Izvoz (izven EU)",
-  "tax-clauses.export.description": "Za prodajo strankam izven EU. Običajno navaja oprostitev DDV za izvoz.",
+  "tax-clauses.3w_b2b.label": "Izven EU B2B (izvoz)",
+  "tax-clauses.3w_b2b.description": "Za prodajo podjetjem izven EU. Običajno navaja oprostitev DDV za izvoz.",
+  "tax-clauses.3w_b2c.label": "Izven EU B2C (izvoz)",
+  "tax-clauses.3w_b2c.description": "Za prodajo potrošnikom izven EU. Običajno navaja oprostitev DDV za izvoz.",
   "Enter export exemption clause...": "Vnesite klavzulo za izvozno oprostitev...",
   "tax-clauses.domestic.label": "Privzeto / Domače",
   "tax-clauses.domestic.description":

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

@@ -1,10 +1,5 @@
 import { zodResolver } from "@hookform/resolvers/zod";
-import type {
-  Entity,
-  EntitySettings,
-  EntitySettingsTaxClauseDefaults,
-  TaxRules,
-} from "@spaceinvoices/js-sdk";
+import type { Entity, EntitySettings, EntitySettingsTaxClauseDefaults, TaxRules } from "@spaceinvoices/js-sdk";
 import { ChevronDown, Globe, MessageSquareText } from "lucide-react";
 import type { ReactNode } from "react";
 import { useState } from "react";
@@ -39,7 +34,8 @@ const taxRulesSettingsSchema = z.object({
   require_gross_prices: z.boolean(),
   // Tax clause defaults per transaction type
   tax_clause_intra_eu_b2b: z.string().optional(),
-  tax_clause_export: z.string().optional(),
+  tax_clause_3w_b2b: z.string().optional(),
+  tax_clause_3w_b2c: z.string().optional(),
   tax_clause_domestic: z.string().optional(),
   tax_clause_intra_eu_b2c: z.string().optional(),
 });
@@ -92,7 +88,8 @@ export function TaxRulesSettingsForm({
       auto_remove_tax_export: currentTaxRules.auto_remove_tax_export ?? false,
       require_gross_prices: currentTaxRules.require_gross_prices ?? false,
       tax_clause_intra_eu_b2b: currentTaxClauseDefaults.intra_eu_b2b ?? "",
-      tax_clause_export: currentTaxClauseDefaults.export ?? "",
+      tax_clause_3w_b2b: (currentTaxClauseDefaults as any)["3w_b2b"] ?? currentTaxClauseDefaults.export ?? "",
+      tax_clause_3w_b2c: (currentTaxClauseDefaults as any)["3w_b2c"] ?? currentTaxClauseDefaults.export ?? "",
       tax_clause_domestic: currentTaxClauseDefaults.domestic ?? "",
       tax_clause_intra_eu_b2c: currentTaxClauseDefaults.intra_eu_b2c ?? "",
     },
@@ -127,7 +124,8 @@ export function TaxRulesSettingsForm({
       },
       tax_clause_defaults: {
         intra_eu_b2b: values.tax_clause_intra_eu_b2b || null,
-        export: values.tax_clause_export || null,
+        "3w_b2b": values.tax_clause_3w_b2b || null,
+        "3w_b2c": values.tax_clause_3w_b2c || null,
         domestic: values.tax_clause_domestic || null,
         intra_eu_b2c: values.tax_clause_intra_eu_b2c || null,
       },
@@ -288,14 +286,34 @@ export function TaxRulesSettingsForm({
             )}
           />
 
-          {/* Export */}
+          {/* 3W B2B (non-EU business) */}
           <FormField
             control={form.control}
-            name="tax_clause_export"
+            name="tax_clause_3w_b2b"
             render={({ field }) => (
               <FormItem className="rounded-lg border p-4">
-                <FormLabel>{t("tax-clauses.export.label")}</FormLabel>
-                <FormDescription>{t("tax-clauses.export.description")}</FormDescription>
+                <FormLabel>{t("tax-clauses.3w_b2b.label")}</FormLabel>
+                <FormDescription>{t("tax-clauses.3w_b2b.description")}</FormDescription>
+                <FormControl>
+                  <Textarea
+                    placeholder={t("Enter export exemption clause...")}
+                    className="min-h-[80px] resize-y"
+                    {...field}
+                  />
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          {/* 3W B2C (non-EU consumer) */}
+          <FormField
+            control={form.control}
+            name="tax_clause_3w_b2c"
+            render={({ field }) => (
+              <FormItem className="rounded-lg border p-4">
+                <FormLabel>{t("tax-clauses.3w_b2c.label")}</FormLabel>
+                <FormDescription>{t("tax-clauses.3w_b2c.description")}</FormDescription>
                 <FormControl>
                   <Textarea
                     placeholder={t("Enter export exemption clause...")}

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

@@ -11,7 +11,7 @@ import { Form } from "@/ui/components/ui/form";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/ui/components/ui/tooltip";
 import { createEstimateSchema } from "@/ui/generated/schemas";
 import { useNextDocumentNumber } from "@/ui/hooks/use-next-document-number";
-import { useViesCheck } from "@/ui/hooks/use-vies-check";
+import { useTransactionTypeCheck } from "@/ui/hooks/use-transaction-type-check";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { useEntities } from "@/ui/providers/entities-context";
@@ -259,12 +259,13 @@ export default function CreateEstimateForm({
     transactionType,
     isFetching: isViesFetching,
     warning: viesWarning,
-  } = useViesCheck({
+  } = useTransactionTypeCheck({
     issuerCountryCode: activeEntity?.country_code,
     isTaxSubject: activeEntity?.is_tax_subject ?? true,
     customerCountry: formValues.customer?.country,
     customerCountryCode: formValues.customer?.country_code,
     customerTaxNumber: formValues.customer?.tax_number,
+    customerIsEndConsumer: (formValues.customer as any)?.is_end_consumer,
     enabled: !!activeEntity,
   });
 

package/src/components/estimates/create/locales/de.ts

@@ -73,7 +73,8 @@ export default {
   Domestic: "Inland",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Export",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Transaktionstyp wird ermittelt...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Diese Rechnung wird nicht fiskalisiert (nicht-inländische Transaktion)",

package/src/components/estimates/create/locales/es.ts

@@ -66,7 +66,8 @@ export default {
   Domestic: "Nacional",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Exportación",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Determinando tipo de transacción...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Esta factura no será fiscalizada (transacción no nacional)",

package/src/components/estimates/create/locales/fr.ts

@@ -67,7 +67,8 @@ export default {
   Domestic: "Nationale",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Exportation",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Détermination du type de transaction...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Cette facture ne sera pas fiscalisée (transaction non nationale)",

package/src/components/estimates/create/locales/hr.ts

@@ -66,7 +66,8 @@ export default {
   Domestic: "Domaća",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Izvoz",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Određivanje vrste transakcije...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Ovaj račun neće biti fiskaliziran (nedomaća transakcija)",

package/src/components/estimates/create/locales/it.ts

@@ -66,7 +66,8 @@ export default {
   Domestic: "Nazionale",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Esportazione",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Determinazione tipo di transazione...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Questa fattura non sarà fiscalizzata (transazione non nazionale)",

package/src/components/estimates/create/locales/nl.ts

@@ -67,7 +67,8 @@ export default {
   Domestic: "Binnenland",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Export",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Transactietype bepalen...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Deze factuur wordt niet gefiscaliseerd (niet-binnenlandse transactie)",

package/src/components/estimates/create/locales/pl.ts

@@ -66,7 +66,8 @@ export default {
   Domestic: "Krajowa",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Eksport",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Określanie typu transakcji...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Ta faktura nie będzie fiskalizowana (transakcja niekrajowa)",

package/src/components/estimates/create/locales/pt.ts

@@ -67,7 +67,8 @@ export default {
   Domestic: "Nacional",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Exportação",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Determinando tipo de transação...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Esta fatura não será fiscalizada (transação não nacional)",

package/src/components/estimates/create/locales/sl.ts

@@ -72,7 +72,8 @@ export default {
   Domestic: "Domača",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Izvoz",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Določanje vrste transakcije...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Ta račun ne bo fiskaliziran (nedomača transakcija)",

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

@@ -13,7 +13,7 @@ import { Form } from "@/ui/components/ui/form";
 import { Skeleton } from "@/ui/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/ui/components/ui/tooltip";
 import { createInvoiceSchema } from "@/ui/generated/schemas";
-import { useViesCheck } from "@/ui/hooks/use-vies-check";
+import { useTransactionTypeCheck } from "@/ui/hooks/use-transaction-type-check";
 import type { ComponentTranslationProps } from "@/ui/lib/translation";
 import { createTranslation } from "@/ui/lib/translation";
 import { cn } from "@/ui/lib/utils";
@@ -416,14 +416,56 @@ export default function CreateInvoiceForm({
   const isFinaActive =
     isFinaEnabled && hasFinaPremises && selectedFinaBusinessPremiseName && selectedFinaElectronicDeviceName;
 
+  // ============================================================================
+  // VIES Check - determine transaction type early (needed for number preview)
+  // ============================================================================
+  const customerCountry = useWatch({ control: form.control, name: "customer.country" });
+  const customerCountryCode = useWatch({ control: form.control, name: "customer.country_code" });
+  const customerTaxNumber = useWatch({ control: form.control, name: "customer.tax_number" });
+  const customerIsEndConsumerWatch =
+    useWatch({ control: form.control, name: "customer.is_end_consumer" as any }) === true;
+
+  const {
+    reverseChargeApplies,
+    transactionType,
+    isFetching: isViesFetching,
+    warning: viesWarning,
+  } = useTransactionTypeCheck({
+    issuerCountryCode: activeEntity?.country_code,
+    isTaxSubject: activeEntity?.is_tax_subject ?? true,
+    customerCountry,
+    customerCountryCode,
+    customerTaxNumber,
+    customerIsEndConsumer: customerIsEndConsumerWatch,
+    enabled: !!activeEntity,
+  });
+
+  // FINA numbering guard: use FINA numbering for domestic transactions (or all if unified numbering is on)
+  const finaUnifiedNumbering = finaSettings?.unified_numbering !== false;
+  const useFinaNumbering =
+    !!isFinaActive && (finaUnifiedNumbering || transactionType == null || transactionType === "domestic");
+  const isFinaNonDomestic = !!isFinaActive && !useFinaNumbering;
+
   // ============================================================================
   // Next Invoice Number Preview
   // ============================================================================
   // Wait for FURS selection to be ready before querying to prevent number flashing
   // Skip in edit mode - we use the existing document number
+  // Use the same premise/device params for both FURS and FINA (an entity is either one, never both)
+  const activePremiseName = isFursActive
+    ? selectedPremiseName
+    : useFinaNumbering
+      ? selectedFinaBusinessPremiseName
+      : undefined;
+  const activeDeviceNameForNumber = isFursActive
+    ? selectedDeviceName
+    : useFinaNumbering
+      ? selectedFinaElectronicDeviceName
+      : undefined;
+
   const { data: nextNumberData, isLoading: isNextNumberLoading } = useNextInvoiceNumber(entityId, {
-    business_premise_name: isFursActive ? selectedPremiseName : undefined,
-    electronic_device_name: isFursActive ? selectedDeviceName : undefined,
+    business_premise_name: activePremiseName,
+    electronic_device_name: activeDeviceNameForNumber,
     enabled:
       !!entityId && !isFursLoading && isFursSelectionReady && !isFinaLoading && isFinaSelectionReady && !isEditMode,
   });
@@ -551,11 +593,6 @@ export default function CreateInvoiceForm({
     }
   }, [nextNumberData?.number, form]);
 
-  // Watch specific fields for VIES check (stable references)
-  const customerCountry = useWatch({ control: form.control, name: "customer.country" });
-  const customerCountryCode = useWatch({ control: form.control, name: "customer.country_code" });
-  const customerTaxNumber = useWatch({ control: form.control, name: "customer.tax_number" });
-
   // Watch fields needed for document note/payment terms preview
   const watchedNumber = useWatch({ control: form.control, name: "number" });
   const watchedDate = useWatch({ control: form.control, name: "date" });
@@ -563,29 +600,45 @@ export default function CreateInvoiceForm({
   const watchedCurrencyCode = useWatch({ control: form.control, name: "currency_code" });
   const watchedCustomer = useWatch({ control: form.control, name: "customer" });
 
-  // ============================================================================
-  // VIES Check - determine if reverse charge applies
-  // ============================================================================
-  const {
-    reverseChargeApplies,
-    transactionType,
-    customerCountryCode: viesCustomerCountryCode,
-    isFetching: isViesFetching,
-    warning: viesWarning,
-  } = useViesCheck({
-    issuerCountryCode: activeEntity?.country_code,
-    isTaxSubject: activeEntity?.is_tax_subject ?? true,
-    customerCountry,
-    customerCountryCode,
-    customerTaxNumber,
-    enabled: !!activeEntity,
-  });
+  // Croatian invoice validation:
+  // - Domestic/3w B2C requires FINA
+  // - Domestic B2B (customer has tax number and NOT end consumer) is blocked
+  const isCroatianEntity = activeEntity?.country_code === "HR";
+  const customerHasTaxNumber = !!customerTaxNumber?.trim();
+  const isDomesticTransaction = transactionType === "domestic";
+  const requiresFinaFiscalization = isDomesticTransaction || transactionType === "3w_b2c";
+  const is3wTransaction = transactionType === "3w_b2b" || transactionType === "3w_b2c";
+
+  // Auto-toggle is_end_consumer based on tax number for Croatian domestic/3w customers
+  // Default: checked (end consumer). When tax number is entered: uncheck (business). User can override.
+  const prevAutoSetTaxRef = useRef<string | undefined>(undefined);
+  useEffect(() => {
+    if (!isCroatianEntity || !(isDomesticTransaction || is3wTransaction)) return;
+    const hasTaxNumber = !!customerTaxNumber?.trim();
+    const hadTaxNumber = !!prevAutoSetTaxRef.current?.trim();
+    prevAutoSetTaxRef.current = customerTaxNumber ?? undefined;
+
+    // Auto-uncheck when tax number goes from empty to filled (likely a business)
+    if (hasTaxNumber && !hadTaxNumber && customerIsEndConsumerWatch) {
+      form.setValue("customer.is_end_consumer" as any, false);
+    }
+    // Auto-check when tax number goes from filled to empty (likely an individual)
+    if (!hasTaxNumber && hadTaxNumber && !customerIsEndConsumerWatch) {
+      form.setValue("customer.is_end_consumer" as any, true);
+    }
+  }, [customerTaxNumber, isCroatianEntity, isDomesticTransaction, is3wTransaction, customerIsEndConsumerWatch, form]);
 
-  // FINA non-domestic guard: hide FINA selectors for non-domestic transactions
-  // When unified_numbering is enabled (default: true), show FINA selectors for all transactions
-  const finaUnifiedNumbering = finaSettings?.unified_numbering !== false;
-  const isFinaNonDomestic =
-    isFinaEnabled && !finaUnifiedNumbering && viesCustomerCountryCode != null && viesCustomerCountryCode !== "HR";
+  const finaValidationError = (() => {
+    if (!isCroatianEntity || !requiresFinaFiscalization) return undefined;
+    // Domestic B2B is always blocked (3w B2B never reaches here since requiresFinaFiscalization is false for 3w B2B)
+    if (isDomesticTransaction && customerHasTaxNumber && !customerIsEndConsumerWatch) {
+      return t("Domestic B2B invoicing in Croatia is not supported");
+    }
+    if (!isFinaEnabled) {
+      return t("FINA fiscalization must be enabled for domestic invoices");
+    }
+    return undefined;
+  })();
 
   // Auto-populate tax_clause from entity settings when transaction type changes
   const effectiveTransactionType = transactionType ?? "domestic";
@@ -658,6 +711,9 @@ export default function CreateInvoiceForm({
   // Shared submit logic for both regular save and save as draft
   const submitInvoice = useCallback(
     (values: CreateInvoiceFormValues, isDraft: boolean) => {
+      // Block Croatian domestic B2B and domestic B2C without FINA
+      if (finaValidationError) return;
+
       // Skip e-SLOG validation for drafts and edit mode
       if (!isDraft && !isEditMode && eslogValidationEnabled) {
         const validationErrors = validateEslogForm(values as any, activeEntity);
@@ -691,8 +747,7 @@ export default function CreateInvoiceForm({
       const finaOptions =
         !isDraft &&
         !isEditMode &&
-        isFinaEnabled &&
-        !isFinaNonDomestic &&
+        useFinaNumbering &&
         selectedFinaBusinessPremiseName &&
         selectedFinaElectronicDeviceName
           ? {
@@ -740,13 +795,13 @@ export default function CreateInvoiceForm({
       updateInvoice,
       documentId,
       eslogValidationEnabled,
+      finaValidationError,
       forceLinkedDocuments,
       form,
       isEditMode,
       isEslogAvailable,
       isFursEnabled,
-      isFinaEnabled,
-      isFinaNonDomestic,
+      useFinaNumbering,
       markAsPaid,
       originalCustomer,
       paymentTypes,
@@ -916,25 +971,36 @@ export default function CreateInvoiceForm({
         <div className="flex w-full flex-col md:flex-row md:gap-6">
           {/* Recipient section skeleton */}
           <div className="flex-1 space-y-4">
-            <Skeleton className="h-7 w-24" /> {/* "Recipient" title */}
-            <Skeleton className="h-10 w-full" /> {/* Customer autocomplete */}
+            <Skeleton className="h-7 w-24" />
+            <Skeleton className="h-10 w-full" />
           </div>
-          {/* Details section skeleton */}
-          <div className="flex-1 space-y-4">
-            <Skeleton className="h-7 w-20" /> {/* "Details" title */}
-            <Skeleton className="h-5 w-16" /> {/* "Number *" label */}
-            <Skeleton className="h-10 w-full" /> {/* Number field */}
-            <Skeleton className="h-5 w-12" /> {/* "Date *" label */}
-            <Skeleton className="h-10 w-full" /> {/* Date picker */}
-            <Skeleton className="h-5 w-16" /> {/* "Due Date" label */}
-            <Skeleton className="h-10 w-full" /> {/* Due date picker */}
-            <Skeleton className="h-5 w-20" /> {/* "Currency *" label */}
-            <Skeleton className="h-10 w-full" /> {/* Currency select */}
-            {/* Mark as paid section */}
+          {/* Details section skeleton — inline label rows */}
+          <div className="flex-1 space-y-3">
+            <Skeleton className="h-7 w-20" />
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
+            <div className="flex items-center gap-3">
+              <Skeleton className="h-5 w-[6.5rem] shrink-0" />
+              <Skeleton className="h-10 flex-1" />
+            </div>
             <div className="space-y-3 rounded-md border p-4">
               <div className="flex items-center gap-3">
-                <Skeleton className="h-4 w-4 rounded" /> {/* Checkbox */}
-                <Skeleton className="h-5 w-28" /> {/* "Mark as Paid" */}
+                <Skeleton className="h-4 w-4 rounded" />
+                <Skeleton className="h-5 w-28" />
               </div>
             </div>
           </div>
@@ -942,25 +1008,22 @@ export default function CreateInvoiceForm({
 
         {/* Items section skeleton */}
         <div className="space-y-4">
-          <Skeleton className="h-7 w-16" /> {/* "Items" title */}
+          <Skeleton className="h-7 w-16" />
           <div className="space-y-4 rounded-lg border p-4">
-            <Skeleton className="h-10 w-full" /> {/* Item name */}
+            <Skeleton className="h-10 w-full" />
             <div className="flex gap-4">
-              <Skeleton className="h-10 w-24" /> {/* Quantity */}
-              <Skeleton className="h-10 flex-1" /> {/* Price */}
+              <Skeleton className="h-10 w-24" />
+              <Skeleton className="h-10 flex-1" />
             </div>
           </div>
-          <Skeleton className="h-9 w-24" /> {/* Add item button */}
+          <Skeleton className="h-9 w-24" />
         </div>
 
         {/* Note field skeleton */}
         <div className="space-y-2">
-          <Skeleton className="h-5 w-12" /> {/* "Note" label */}
-          <Skeleton className="h-24 w-full" /> {/* Textarea */}
+          <Skeleton className="h-5 w-12" />
+          <Skeleton className="h-24 w-full" />
         </div>
-
-        {/* Save button skeleton */}
-        <Skeleton className="h-10 w-24" />
       </div>
     );
   }
@@ -968,6 +1031,14 @@ export default function CreateInvoiceForm({
   return (
     <Form {...form}>
       <form id="create-invoice-form" onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
+        {/* Croatian domestic invoice validation errors */}
+        {finaValidationError && (
+          <Alert variant="destructive">
+            <AlertCircle className="h-4 w-4" />
+            <AlertTitle>{finaValidationError}</AlertTitle>
+          </Alert>
+        )}
+
         {/* e-SLOG entity-level validation errors */}
         {eslogEntityErrors.length > 0 && (
           <Alert variant="destructive">
@@ -996,6 +1067,7 @@ export default function CreateInvoiceForm({
             shouldFocusName={shouldFocusName}
             selectedCustomerId={selectedCustomerId}
             initialCustomerName={initialCustomerName}
+            showEndConsumerToggle={isCroatianEntity && (isDomesticTransaction || is3wTransaction)}
             t={t}
           />
           <DocumentDetailsSection
@@ -1017,7 +1089,7 @@ export default function CreateInvoiceForm({
                 : undefined
             }
             finaInline={
-              !isEditMode && isFinaEnabled && hasFinaPremises && !isFinaNonDomestic
+              !isEditMode && useFinaNumbering
                 ? {
                     premises: activeFinaPremises.map((p: any) => ({
                       id: p.id,
@@ -1052,7 +1124,7 @@ export default function CreateInvoiceForm({
                 paymentTypes={paymentTypes}
                 onPaymentTypesChange={setPaymentTypes}
                 t={t}
-                alwaysShowPaymentType={!!isFinaActive}
+                alwaysShowPaymentType={!!isFinaActive && requiresFinaFiscalization}
               />
             )}
           </DocumentDetailsSection>

package/src/components/invoices/create/locales/de.ts

@@ -146,7 +146,8 @@ export default {
   Domestic: "Inland",
   "EU B2B": "EU B2B",
   "EU B2C": "EU B2C",
-  Export: "Export",
+  "3W B2B": "3W B2B",
+  "3W B2C": "3W B2C",
   "Determining transaction type...": "Transaktionstyp wird ermittelt...",
   "This invoice will not be fiscalized (non-domestic transaction)":
     "Diese Rechnung wird nicht fiskalisiert (nicht-inländische Transaktion)",
@@ -154,4 +155,10 @@ export default {
   "Add tax clause...": "Steuerklausel hinzufügen...",
   Footer: "Fußzeile",
   "Add document footer...": "Dokumentfußzeile hinzufügen...",
+  // Croatian domestic invoice validation
+  "End consumer": "Endverbraucher",
+  "Domestic B2B invoicing in Croatia is not supported":
+    "Inländische B2B-Rechnungsstellung in Kroatien wird nicht unterstützt. Kroatien erfordert die Einhaltung von Fiskalisierung 2.0 für B2B-Rechnungsstellung.",
+  "FINA fiscalization must be enabled for domestic invoices":
+    "FINA-Fiskalisierung muss für inländische Rechnungen aktiviert sein. Aktivieren Sie sie in den Unternehmenseinstellungen.",
 } as const;