@open-mercato/core 0.6.6-develop.6543.1.49fadb4c31 → 0.6.6

package/src/modules/entities/i18n/pl.json

@@ -93,7 +93,6 @@
   "entities.customFields.editor.noFieldsets": "Nie zdefiniowano jeszcze zestawów pól. Zestawy pól pozwalają grupować pola niestandardowe dla różnych wariantów tej samej encji (np. produkty Moda vs Sport).",
   "entities.customFields.editor.noGroup": "Bez grupy",
   "entities.customFields.editor.noOptionsDefined": "Nie zdefiniowano opcji.",
-  "entities.customFields.editor.noParameterPlaceholder": "-",
   "entities.customFields.editor.noValidationRules": "Nie zdefiniowano reguł walidacji.",
   "entities.customFields.editor.optionLabelPlaceholder": "Etykieta widoczna dla użytkowników (opcjonalnie)",
   "entities.customFields.editor.options": "Opcje",
@@ -119,17 +118,6 @@
   "entities.customFields.editor.unassignedFields": "Pola nieprzypisane",
   "entities.customFields.editor.unitsOptional": "Jednostki (opcjonalnie)",
   "entities.customFields.editor.unitsPlaceholder": "kg, cm itp.",
-  "entities.customFields.editor.validation.date": "data",
-  "entities.customFields.editor.validation.eq": "równe",
-  "entities.customFields.editor.validation.float": "liczba zmiennoprzecinkowa",
-  "entities.customFields.editor.validation.gt": "większe niż",
-  "entities.customFields.editor.validation.gte": "większe lub równe",
-  "entities.customFields.editor.validation.integer": "liczba całkowita",
-  "entities.customFields.editor.validation.lt": "mniejsze niż",
-  "entities.customFields.editor.validation.lte": "mniejsze lub równe",
-  "entities.customFields.editor.validation.ne": "różne",
-  "entities.customFields.editor.validation.regex": "regex",
-  "entities.customFields.editor.validation.required": "wymagane",
   "entities.customFields.editor.validationRules": "Reguły walidacji",
   "entities.customFields.editor.value": "Wartość",
   "entities.customFields.editor.valueRequired": "Wartość jest wymagana",
@@ -195,28 +183,6 @@
   "entities.nav.systemEntities": "Encje systemowe",
   "entities.nav.userEntities": "Encje użytkownika",
   "entities.nav.userEntities.create": "Utwórz encję",
-  "entities.userEntities.edit.errors.deleteEntityFailed": "Nie udało się usunąć encji",
-  "entities.userEntities.edit.errors.invalidEntityDescription": "Brakuje identyfikatora encji albo jest on nieprawidłowy.",
-  "entities.userEntities.edit.errors.invalidEntityId": "Nieprawidłowy identyfikator encji",
-  "entities.userEntities.edit.errors.invalidEntityTitle": "Nieprawidłowa encja",
-  "entities.userEntities.edit.errors.loadDefinitionsFailed": "Nie udało się wczytać definicji encji",
-  "entities.userEntities.edit.errors.loadFailed": "Nie udało się wczytać",
-  "entities.userEntities.edit.errors.loadMetadataFailed": "Nie udało się wczytać metadanych encji",
-  "entities.userEntities.edit.errors.reloadDefinitionsFailed": "Nie udało się ponownie wczytać definicji pól",
-  "entities.userEntities.edit.errors.restoreFieldFailed": "Nie udało się przywrócić pola",
-  "entities.userEntities.edit.errors.saveEntityFailed": "Nie udało się zapisać encji",
-  "entities.userEntities.edit.errors.saveOrderFailed": "Nie udało się zapisać kolejności",
-  "entities.userEntities.edit.errors.validationFailed": "Walidacja nie powiodła się",
-  "entities.userEntities.edit.fieldsetTitle": "Edytuj zestaw pól: {{name}}",
-  "entities.userEntities.edit.flash.entityDeleted": "Encja została usunięta",
-  "entities.userEntities.edit.flash.orderSaved": "Kolejność została zapisana",
-  "entities.userEntities.edit.flash.restoredField": "Przywrócono {{key}}",
-  "entities.userEntities.edit.groups.definitions": "Definicje pól",
-  "entities.userEntities.edit.groups.settings": "Ustawienia encji",
-  "entities.userEntities.edit.orderNotice": "Zmieniono kolejność - zapisze się po opuszczeniu pola",
-  "entities.userEntities.edit.pageTitle": "Edytuj definicje",
-  "entities.userEntities.edit.showRecords": "Pokaż rekordy",
-  "entities.userEntities.edit.title": "Edytuj encję: {{entityId}}",
   "entities.userEntities.errors.entityIdExists": "Identyfikator encji już istnieje",
   "entities.userEntities.errors.entityIdRequired": "Identyfikator encji jest wymagany",
   "entities.userEntities.errors.loadFailed": "Nie udało się wczytać encji",

package/src/modules/query_index/api/status.ts

@@ -415,7 +415,10 @@ export async function GET(req: Request) {
     errorQuery = errorQuery.where('tenant_id' as any, 'is', null as any)
   }
   if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-    errorQuery = errorQuery.where('organization_id' as any, 'in', organizationScopeIds)
+    errorQuery = errorQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
   } else {
     errorQuery = errorQuery.where('organization_id' as any, 'is', null as any)
   }
@@ -453,7 +456,10 @@ export async function GET(req: Request) {
     logsQuery = logsQuery.where('tenant_id' as any, 'is', null as any)
   }
   if (Array.isArray(organizationScopeIds) && organizationScopeIds.length) {
-    logsQuery = logsQuery.where('organization_id' as any, 'in', organizationScopeIds)
+    logsQuery = logsQuery.where((eb: any) => eb.or([
+      eb('organization_id' as any, 'is', null),
+      eb('organization_id' as any, 'in', organizationScopeIds),
+    ]))
   } else {
     logsQuery = logsQuery.where('organization_id' as any, 'is', null as any)
   }

package/src/modules/sales/commands/documents.ts

@@ -125,7 +125,6 @@ import {
   type SalesLineCalculationResult,
   type SalesDocumentCalculationResult,
 } from "../lib/types";
-import { loadShippedQuantityByLine } from "../lib/shipments/snapshots";
 import { resolveDictionaryEntryValue } from "../lib/dictionaries";
 import { resolveStatusEntryIdByValue } from "../lib/statusHelpers";
 import { SalesDocumentNumberGenerator } from "../services/salesDocumentNumberGenerator";
@@ -6522,69 +6521,6 @@ const quoteAdjustmentDeleteSchema = z.object({
   quoteId: z.string().uuid(),
 });
 
-const SHIPPED_QUANTITY_TOLERANCE = 1e-6;
-
-const hasNumericChange = (
-  next: number | null | undefined,
-  previous: number | null | undefined,
-): boolean => {
-  if (next === undefined || next === null) return false;
-  if (previous === undefined || previous === null) return true;
-  return Math.abs(next - previous) > SHIPPED_QUANTITY_TOLERANCE;
-};
-
-const hasUnitChange = (
-  next: string | null | undefined,
-  previous: string | null | undefined,
-): boolean => {
-  if (next === undefined || next === null) return false;
-  const normalizedPrevious = (previous ?? "").trim().toLowerCase();
-  if (!normalizedPrevious) return false;
-  return next.trim().toLowerCase() !== normalizedPrevious;
-};
-
-async function assertShippedOrderLineEditable(
-  em: EntityManager,
-  order: SalesOrder,
-  existingSnapshot: SalesLineSnapshot | null,
-  parsed: z.infer<typeof orderLineUpsertSchema>,
-): Promise<void> {
-  const lineId = existingSnapshot?.id;
-  if (!existingSnapshot || !lineId) return;
-  const shippedByLine = await loadShippedQuantityByLine(em, order.id, {
-    tenantId: order.tenantId,
-    organizationId: order.organizationId,
-  });
-  const shippedQuantity = shippedByLine.get(lineId) ?? 0;
-  if (shippedQuantity <= 0) return;
-
-  const { translate } = await resolveTranslations();
-  const nextQuantity = parsed.quantity ?? existingSnapshot.quantity;
-  if (nextQuantity < shippedQuantity - SHIPPED_QUANTITY_TOLERANCE) {
-    throw new CrudHttpError(409, {
-      error: translate(
-        "sales.documents.items.errorQuantityBelowShipped",
-        "You cannot lower the quantity below the {{shipped}} already shipped.",
-        { shipped: shippedQuantity },
-      ),
-    });
-  }
-
-  const pricingChanged =
-    hasNumericChange(parsed.unitPriceNet, existingSnapshot.unitPriceNet) ||
-    hasNumericChange(parsed.unitPriceGross, existingSnapshot.unitPriceGross) ||
-    hasNumericChange(parsed.taxRate, existingSnapshot.taxRate) ||
-    hasUnitChange(parsed.quantityUnit, existingSnapshot.quantityUnit);
-  if (pricingChanged) {
-    throw new CrudHttpError(409, {
-      error: translate(
-        "sales.documents.items.errorPriceShipped",
-        "You cannot change the price or unit of a line that has shipped items.",
-      ),
-    });
-  }
-}
-
 const orderLineUpsertCommand: CommandHandler<
   { body?: Record<string, unknown>; query?: Record<string, unknown> },
   { orderId: string; lineId: string }
@@ -6629,7 +6565,6 @@ const orderLineUpsertCommand: CommandHandler<
     const existingSnapshot = parsed.id
       ? (lineSnapshots.find((line) => line.id === parsed.id) ?? null)
       : null;
-    await assertShippedOrderLineEditable(em, order, existingSnapshot, parsed);
     const priceMode =
       parsed.priceMode === "gross"
         ? "gross"

package/src/modules/sales/commands/returns.ts

@@ -15,8 +15,8 @@ import type { SalesCalculationService } from '../services/salesCalculationServic
 import type { SalesAdjustmentDraft, SalesLineSnapshot, SalesDocumentCalculationResult } from '../lib/types'
 import { cloneJson, deriveLineNetFromGross, ensureOrganizationScope, ensureSameScope, ensureTenantScope, extractUndoPayload, toNumericString, enforceSalesDocumentOptimisticLock, SALES_RESOURCE_KIND_ORDER, SALES_RESOURCE_KIND_RETURN } from './shared'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
-import { SalesOrder, SalesOrderAdjustment, SalesOrderLine, SalesReturn, SalesReturnLine } from '../data/entities'
-import { loadShippedQuantityByLine } from '../lib/shipments/snapshots'
+import { SalesOrder, SalesOrderAdjustment, SalesOrderLine, SalesReturn, SalesReturnLine, SalesShipment, SalesShipmentItem } from '../data/entities'
+import { coerceShipmentQuantity } from '../lib/shipments/snapshots'
 import { computeAvailableReturnQuantity } from '../lib/returnQuantity'
 import {
   returnCreateSchema,
@@ -581,6 +581,36 @@ async function restoreReturnEffects(
   return createdLines
 }
 
+async function loadShippedQuantityByLine(
+  em: EntityManager,
+  orderId: string,
+  scope: { tenantId: string; organizationId: string },
+): Promise<Map<string, number>> {
+  const shipments = await findWithDecryption(
+    em,
+    SalesShipment,
+    { order: orderId, deletedAt: null },
+    {},
+    scope,
+  )
+  const shippedByLine = new Map<string, number>()
+  if (!shipments.length) return shippedByLine
+  const items = await findWithDecryption(
+    em,
+    SalesShipmentItem,
+    { shipment: { $in: shipments.map((shipment) => shipment.id) } },
+    {},
+    scope,
+  )
+  items.forEach((item) => {
+    const orderLineId = typeof item.orderLine === 'string' ? item.orderLine : item.orderLine?.id ?? null
+    if (!orderLineId) return
+    const next = (shippedByLine.get(orderLineId) ?? 0) + coerceShipmentQuantity(item.quantity)
+    shippedByLine.set(orderLineId, next)
+  })
+  return shippedByLine
+}
+
 function normalizeLinesInput(lines: ReturnCreateInput['lines']): ReturnLineInput[] {
   const seen = new Set<string>()
   const result: ReturnLineInput[] = []

package/src/modules/sales/components/documents/AddressesSection.tsx

@@ -890,12 +890,8 @@ export function SalesDocumentAddressesSection({
         if (res?.result?.id) billingId = res.result.id
       }
 
-      if (shippingSnapshot || !shippingId) {
-        payload.shippingAddressSnapshot = shippingSnapshot ?? null
-      }
-      if (billingSnapshot || !billingId) {
-        payload.billingAddressSnapshot = billingSnapshot ?? null
-      }
+      payload.shippingAddressSnapshot = shippingSnapshot ?? null
+      payload.billingAddressSnapshot = billingSnapshot ?? null
       payload.shippingAddressId = shippingSnapshot ? null : shippingId
       payload.billingAddressId = billingSnapshot ? null : billingId
 

package/src/modules/sales/components/documents/ItemsSection.tsx

@@ -817,11 +817,6 @@ export function SalesDocumentItemsSection({
         organizationId={resolvedOrganizationId}
         tenantId={resolvedTenantId}
         initialLine={lineForEdit}
-        shippedQuantity={
-          lineForEdit
-            ? Math.max(0, shippedTotals.get(lineForEdit.id) ?? 0)
-            : 0
-        }
         onSaved={async () => {
           await loadItems();
           emitSalesDocumentTotalsRefresh({ documentId, kind });

package/src/modules/sales/components/documents/LineItemDialog.tsx

@@ -278,7 +278,6 @@ type SalesLineDialogProps = {
   organizationId: string | null;
   tenantId: string | null;
   initialLine?: SalesLineRecord | null;
-  shippedQuantity?: number;
   onOpenChange: (open: boolean) => void;
   onSaved?: () => Promise<void> | void;
 };
@@ -473,7 +472,6 @@ export function LineItemDialog({
   organizationId,
   tenantId,
   initialLine,
-  shippedQuantity = 0,
   onOpenChange,
   onSaved,
 }: SalesLineDialogProps) {
@@ -1328,14 +1326,6 @@ export function LineItemDialog({
           },
         );
       }
-      if (shippedQuantity > 0 && qtyNumber < shippedQuantity) {
-        const message = t(
-          "sales.documents.items.errorQuantityBelowShipped",
-          "You cannot lower the quantity below the {{shipped}} already shipped.",
-          { shipped: shippedQuantity },
-        );
-        throw createCrudFormError(message, { quantity: message });
-      }
       const resolvedQuantityUnit = (() => {
         const entered = normalizeUnitCode(values.quantityUnit);
         if (isCustomLine) return entered;

package/src/modules/sales/components/documents/SalesDocumentForm.tsx

@@ -168,7 +168,6 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
     async (values: PersonFormValues) => {
       setSaving(true)
       try {
-        const addresses = Array.isArray(values.addresses) ? values.addresses : []
         const payload = buildPersonPayload(values, organizationId)
         const { result } = await createCrud<{ id?: string; entityId?: string }>('customers/people', payload, {
           errorMessage: t('sales.documents.form.customer.quick.error', 'Failed to create customer.'),
@@ -178,51 +177,6 @@ function CustomerQuickCreate({ t, onCreated }: CustomerQuickCreateProps) {
           (result && typeof result.id === 'string' && result.id) ||
           null
         if (!id) throw new Error('Missing customer id')
-        if (addresses.length) {
-          const normalize = (value?: string | null) => {
-            if (typeof value !== 'string') return undefined
-            const trimmed = value.trim()
-            return trimmed.length ? trimmed : undefined
-          }
-          for (const entry of addresses) {
-            const normalizedLine1 = normalize(entry.addressLine1)
-            if (!normalizedLine1) continue
-            const body: Record<string, unknown> = {
-              entityId: id,
-              ...(organizationId ? { organizationId } : {}),
-              addressLine1: normalizedLine1,
-              isPrimary: entry.isPrimary ?? false,
-            }
-            const name = normalize(entry.name)
-            if (name !== undefined) body.name = name
-            const purpose = normalize(entry.purpose)
-            if (purpose !== undefined) body.purpose = purpose
-            const line2 = normalize(entry.addressLine2)
-            if (line2 !== undefined) body.addressLine2 = line2
-            const buildingNumber = normalize(entry.buildingNumber)
-            if (buildingNumber !== undefined) body.buildingNumber = buildingNumber
-            const flatNumber = normalize(entry.flatNumber)
-            if (flatNumber !== undefined) body.flatNumber = flatNumber
-            const city = normalize(entry.city)
-            if (city !== undefined) body.city = city
-            const region = normalize(entry.region)
-            if (region !== undefined) body.region = region
-            const postalCode = normalize(entry.postalCode)
-            if (postalCode !== undefined) body.postalCode = postalCode
-            const country = normalize(entry.country)
-            if (country !== undefined) body.country = country.toUpperCase()
-            if (typeof entry.latitude === 'number') body.latitude = entry.latitude
-            if (typeof entry.longitude === 'number') body.longitude = entry.longitude
-            try {
-              await createCrud('customers/addresses', body)
-            } catch (addressErr) {
-              const message =
-                (addressErr instanceof Error && addressErr.message ? addressErr.message : null) ||
-                t('customers.people.detail.addresses.error')
-              flash(message, 'error')
-            }
-          }
-        }
         const displayName =
           typeof values.displayName === 'string' && values.displayName.trim().length
             ? values.displayName.trim()

package/src/modules/sales/components/documents/ShipmentDialog.tsx

@@ -296,13 +296,6 @@ export function ShipmentDialog({
   const [addressOptions, setAddressOptions] = React.useState<ShipmentAddressOption[]>([])
   const [addressLoading, setAddressLoading] = React.useState(false)
   const [addressError, setAddressError] = React.useState<string | null>(null)
-  const addressLoadPromiseRef = React.useRef<{
-    orderId: string
-    promise: Promise<ShipmentAddressOption[]>
-  } | null>(null)
-  const currentAddressOrderIdRef = React.useRef(orderId)
-  currentAddressOrderIdRef.current = orderId
-  const initializedDialogKeyRef = React.useRef<string | null>(null)
   const [documentStatuses, setDocumentStatuses] = React.useState<StatusOption[]>([])
   const [lineStatuses, setLineStatuses] = React.useState<StatusOption[]>([])
   const [shipmentStatuses, setShipmentStatuses] = React.useState<StatusOption[]>([])
@@ -486,52 +479,37 @@ export function ShipmentDialog({
     [],
   )
 
-  const loadAddressOptions = React.useCallback((): Promise<ShipmentAddressOption[]> => {
-    const activeRequest = addressLoadPromiseRef.current
-    if (activeRequest?.orderId === orderId) return activeRequest.promise
-
+  const loadAddressOptions = React.useCallback(async () => {
     setAddressLoading(true)
-    const request = (async () => {
-      try {
-        const params = new URLSearchParams({
-          page: '1',
-          pageSize: '100',
-          documentId: orderId,
-          documentKind: 'order',
-        })
-        const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
-          `/api/sales/document-addresses?${params.toString()}`,
-          undefined,
-          { fallback: { items: [] } },
-        )
-        const items = Array.isArray(response.result?.items) ? response.result.items : []
-        const mapped = items
-          .map((item) => mapDocumentAddressOption(item))
-          .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
-        const loadedOptions = dedupeAddressOptions([...baseAddressOptions, ...mapped])
-        if (currentAddressOrderIdRef.current !== orderId) return baseAddressOptions
-        mergeAddressOptions(loadedOptions)
-        setAddressError(null)
-        return loadedOptions
-      } catch (err) {
-        logger.error('sales.shipments.addresses.load', { err })
-        if (currentAddressOrderIdRef.current === orderId) {
-          setAddressError(
-            t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
-          )
-        }
-        return baseAddressOptions
-      }
-    })()
-    addressLoadPromiseRef.current = { orderId, promise: request }
-    void request.then(() => {
-      if (addressLoadPromiseRef.current?.promise === request) {
-        addressLoadPromiseRef.current = null
-        setAddressLoading(false)
-      }
-    })
-    return request
-  }, [baseAddressOptions, mapDocumentAddressOption, mergeAddressOptions, orderId, t])
+    try {
+      const params = new URLSearchParams({
+        page: '1',
+        pageSize: '100',
+        documentId: orderId,
+        documentKind: 'order',
+      })
+      const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+        `/api/sales/document-addresses?${params.toString()}`,
+        undefined,
+        { fallback: { items: [] } },
+      )
+      const items = Array.isArray(response.result?.items) ? response.result.items : []
+      const mapped = items
+        .map((item) => mapDocumentAddressOption(item))
+        .filter((entry): entry is ShipmentAddressOption => Boolean(entry))
+      mergeAddressOptions(mapped)
+      setAddressError(null)
+      return mapped
+    } catch (err) {
+      logger.error('sales.shipments.addresses.load', { err })
+      setAddressError(
+        t('sales.documents.shipments.addressLoadError', 'Failed to load addresses.'),
+      )
+      return []
+    } finally {
+      setAddressLoading(false)
+    }
+  }, [mapDocumentAddressOption, mergeAddressOptions, orderId, t])
 
   const buildPriceSubtitle = React.useCallback(
     (option: ShippingMethodOption): string | undefined => {
@@ -873,20 +851,16 @@ export function ShipmentDialog({
   )
 
   React.useEffect(() => {
-    if (!open) {
-      initializedDialogKeyRef.current = null
-      return
-    }
-    const dialogKey = `${orderId}:${mode}:${shipment?.id ?? 'new'}`
-    if (initializedDialogKeyRef.current === dialogKey) return
-    initializedDialogKeyRef.current = dialogKey
+    if (!open) return
     setFormResetKey((prev) => prev + 1)
     if (!shippingMethods.length) {
       void loadShippingMethods()
     }
     setAddressOptions(baseAddressOptions)
     setAddressError(null)
-    void loadAddressOptions()
+    if (!addressOptions.length) {
+      void loadAddressOptions()
+    }
     if (!shipmentStatuses.length) {
       void loadShipmentStatuses()
     }
@@ -897,6 +871,7 @@ export function ShipmentDialog({
       void loadLineStatuses()
     }
   }, [
+    addressOptions.length,
     baseAddressOptions,
     documentStatuses.length,
     loadAddressOptions,
@@ -906,8 +881,6 @@ export function ShipmentDialog({
     loadShippingMethods,
     mode,
     open,
-    orderId,
-    shipment?.id,
     lineStatuses.length,
     shipmentStatuses.length,
     shippingMethods.length,
@@ -966,9 +939,11 @@ export function ShipmentDialog({
 
   const fetchAddressItems = React.useCallback(
     async (query?: string): Promise<LookupSelectItem[]> => {
-      const options = addressOptions.length ? addressOptions : await loadAddressOptions()
+      if (!addressOptions.length && !addressLoading) {
+        await loadAddressOptions()
+      }
       const needle = query?.trim().toLowerCase() ?? ''
-      return options
+      return addressOptions
         .filter((option) => {
           if (!needle) return true
           return (
@@ -987,7 +962,7 @@ export function ShipmentDialog({
           ),
         }))
     },
-    [addressOptions, loadAddressOptions],
+    [addressLoading, addressOptions, loadAddressOptions],
   )
 
   const validateItems = React.useCallback(

package/src/modules/sales/i18n/de.json

@@ -638,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Position konnte nicht gelöscht werden.",
   "sales.documents.detail.items.errorDeleteShipped": "Positionen mit versandten Artikeln können nicht gelöscht werden.",
   "sales.documents.detail.items.errorLoad": "Positionen konnten nicht geladen werden.",
-  "sales.documents.detail.items.errorPriceShipped": "Preis oder Einheit einer Position mit versandten Artikeln können nicht geändert werden.",
   "sales.documents.detail.items.errorProductRequired": "Wähle ein Produkt aus, um fortzufahren.",
   "sales.documents.detail.items.errorQuantity": "Die Menge muss größer als 0 sein.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "Die Menge kann nicht unter die bereits versandten {{shipped}} gesenkt werden.",
   "sales.documents.detail.items.errorSave": "Position konnte nicht gespeichert werden.",
   "sales.documents.detail.items.errorUnitPrice": "Der Stückpreis muss größer als 0 sein.",
   "sales.documents.detail.items.errorVariantRequired": "Wähle eine Variante aus, um fortzufahren.",
@@ -952,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "Positionen mit versandten Artikeln können nicht gelöscht werden.",
   "sales.documents.items.errorLoad": "Positionen konnten nicht geladen werden.",
   "sales.documents.items.errorNameRequired": "Name ist für benutzerdefinierte Positionen erforderlich.",
-  "sales.documents.items.errorPriceShipped": "Preis oder Einheit einer Position mit versandten Artikeln können nicht geändert werden.",
   "sales.documents.items.errorProductRequired": "Wähle ein Produkt aus, um fortzufahren.",
   "sales.documents.items.errorQuantity": "Die Menge muss größer als 0 sein.",
-  "sales.documents.items.errorQuantityBelowShipped": "Die Menge kann nicht unter die bereits versandten {{shipped}} gesenkt werden.",
   "sales.documents.items.errorSave": "Position konnte nicht gespeichert werden.",
   "sales.documents.items.errorScope": "Organisation und Mandant sind erforderlich.",
   "sales.documents.items.errorUnitPrice": "Der Stückpreis muss größer als 0 sein.",

package/src/modules/sales/i18n/en.json

@@ -638,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Failed to delete line.",
   "sales.documents.detail.items.errorDeleteShipped": "You cannot delete a line that has shipped items.",
   "sales.documents.detail.items.errorLoad": "Failed to load items.",
-  "sales.documents.detail.items.errorPriceShipped": "You cannot change the price or unit of a line that has shipped items.",
   "sales.documents.detail.items.errorProductRequired": "Select a product to continue.",
   "sales.documents.detail.items.errorQuantity": "Quantity must be greater than 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "You cannot lower the quantity below the {{shipped}} already shipped.",
   "sales.documents.detail.items.errorSave": "Failed to save line.",
   "sales.documents.detail.items.errorUnitPrice": "Unit price must be greater than 0.",
   "sales.documents.detail.items.errorVariantRequired": "Select a variant to continue.",
@@ -952,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "You cannot delete a line that has shipped items.",
   "sales.documents.items.errorLoad": "Failed to load items.",
   "sales.documents.items.errorNameRequired": "Name is required for custom lines.",
-  "sales.documents.items.errorPriceShipped": "You cannot change the price or unit of a line that has shipped items.",
   "sales.documents.items.errorProductRequired": "Select a product to continue.",
   "sales.documents.items.errorQuantity": "Quantity must be greater than 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "You cannot lower the quantity below the {{shipped}} already shipped.",
   "sales.documents.items.errorSave": "Failed to save line.",
   "sales.documents.items.errorScope": "Organization and tenant are required.",
   "sales.documents.items.errorUnitPrice": "Unit price must be greater than 0.",

package/src/modules/sales/i18n/es.json

@@ -638,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "No se pudo eliminar la línea.",
   "sales.documents.detail.items.errorDeleteShipped": "No puedes eliminar una línea que ya tiene envíos.",
   "sales.documents.detail.items.errorLoad": "No se pudieron cargar los artículos.",
-  "sales.documents.detail.items.errorPriceShipped": "No puedes cambiar el precio ni la unidad de una línea que ya tiene envíos.",
   "sales.documents.detail.items.errorProductRequired": "Selecciona un producto para continuar.",
   "sales.documents.detail.items.errorQuantity": "La cantidad debe ser mayor que 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "No puedes reducir la cantidad por debajo de las {{shipped}} ya enviadas.",
   "sales.documents.detail.items.errorSave": "No se pudo guardar la línea.",
   "sales.documents.detail.items.errorUnitPrice": "El precio unitario debe ser mayor que 0.",
   "sales.documents.detail.items.errorVariantRequired": "Selecciona una variante para continuar.",
@@ -952,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "No puedes eliminar una línea que ya tiene envíos.",
   "sales.documents.items.errorLoad": "No se pudieron cargar los artículos.",
   "sales.documents.items.errorNameRequired": "El nombre es obligatorio para líneas personalizadas.",
-  "sales.documents.items.errorPriceShipped": "No puedes cambiar el precio ni la unidad de una línea que ya tiene envíos.",
   "sales.documents.items.errorProductRequired": "Selecciona un producto para continuar.",
   "sales.documents.items.errorQuantity": "La cantidad debe ser mayor que 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "No puedes reducir la cantidad por debajo de las {{shipped}} ya enviadas.",
   "sales.documents.items.errorSave": "No se pudo guardar la línea.",
   "sales.documents.items.errorScope": "Se requieren organización e inquilino.",
   "sales.documents.items.errorUnitPrice": "El precio unitario debe ser mayor que 0.",

package/src/modules/sales/i18n/pl.json

@@ -638,10 +638,8 @@
   "sales.documents.detail.items.errorDelete": "Nie udało się usunąć pozycji.",
   "sales.documents.detail.items.errorDeleteShipped": "Nie można usunąć pozycji, która ma wysłane sztuki.",
   "sales.documents.detail.items.errorLoad": "Nie udało się wczytać pozycji.",
-  "sales.documents.detail.items.errorPriceShipped": "Nie można zmienić ceny ani jednostki pozycji, która ma wysłane sztuki.",
   "sales.documents.detail.items.errorProductRequired": "Wybierz produkt, aby kontynuować.",
   "sales.documents.detail.items.errorQuantity": "Ilość musi być większa niż 0.",
-  "sales.documents.detail.items.errorQuantityBelowShipped": "Nie można obniżyć ilości poniżej {{shipped}} już wysłanych.",
   "sales.documents.detail.items.errorSave": "Nie udało się zapisać pozycji.",
   "sales.documents.detail.items.errorUnitPrice": "Cena jednostkowa musi być większa niż 0.",
   "sales.documents.detail.items.errorVariantRequired": "Wybierz wariant, aby kontynuować.",
@@ -952,10 +950,8 @@
   "sales.documents.items.errorDeleteShipped": "Nie można usunąć pozycji, która ma wysłane sztuki.",
   "sales.documents.items.errorLoad": "Nie udało się załadować pozycji.",
   "sales.documents.items.errorNameRequired": "Nazwa jest wymagana dla niestandardowych pozycji.",
-  "sales.documents.items.errorPriceShipped": "Nie można zmienić ceny ani jednostki pozycji, która ma wysłane sztuki.",
   "sales.documents.items.errorProductRequired": "Wybierz produkt, aby kontynuować.",
   "sales.documents.items.errorQuantity": "Ilość musi być większa niż 0.",
-  "sales.documents.items.errorQuantityBelowShipped": "Nie można obniżyć ilości poniżej {{shipped}} już wysłanych.",
   "sales.documents.items.errorSave": "Nie udało się zapisać pozycji.",
   "sales.documents.items.errorScope": "Wymagane są organizacja i najemca.",
   "sales.documents.items.errorUnitPrice": "Cena jednostkowa musi być większa niż 0.",

package/src/modules/sales/lib/shipments/snapshots.ts

@@ -136,34 +136,4 @@ export const refreshShipmentItemsSnapshot = async (
   return snapshot
 }
 
-export const loadShippedQuantityByLine = async (
-  em: EntityManager,
-  orderId: string,
-  scope: { tenantId: string; organizationId: string },
-): Promise<Map<string, number>> => {
-  const shipments = await findWithDecryption(
-    em,
-    SalesShipment,
-    { order: orderId, deletedAt: null },
-    {},
-    scope,
-  )
-  const shippedByLine = new Map<string, number>()
-  if (!shipments.length) return shippedByLine
-  const items = await findWithDecryption(
-    em,
-    SalesShipmentItem,
-    { shipment: { $in: shipments.map((shipment) => shipment.id) } },
-    {},
-    scope,
-  )
-  items.forEach((item) => {
-    const orderLineId = typeof item.orderLine === 'string' ? item.orderLine : (item.orderLine?.id ?? null)
-    if (!orderLineId) return
-    const next = (shippedByLine.get(orderLineId) ?? 0) + coerceShipmentQuantity(item.quantity)
-    shippedByLine.set(orderLineId, next)
-  })
-  return shippedByLine
-}
-
 export type { ShipmentItemSnapshot } from './types'

package/src/modules/workflows/frontend/checkout-demo/page.tsx

@@ -389,9 +389,20 @@ export default function CheckoutDemoPage() {
             currencyCode: selectedCurrency || 'USD', // Ensure currency is always set
             kind: 'product' as const,
             productId: item.id,
-            lineDescription: item.name,
+            name: item.name,
             unitPriceGross: item.price,
           })),
+          // Fold the demo's shipping and tax into order-level adjustments so the
+          // created order's grand total matches the cart total shown to the user
+          // (line items alone only cover the product subtotal).
+          orderAdjustments: [
+            ...(shipping > 0
+              ? [{ kind: 'shipping' as const, label: 'Shipping', currencyCode: selectedCurrency || 'USD', amountGross: shipping }]
+              : []),
+            ...(tax > 0
+              ? [{ kind: 'tax' as const, label: 'Tax', currencyCode: selectedCurrency || 'USD', amountGross: tax }]
+              : []),
+          ],
           itemCount: demoCart.reduce((sum, item) => sum + item.quantity, 0),
           subtotal: subtotal,
           tax: tax,