@open-mercato/core 0.7.1-develop.7195.1.b5efd1d51a → 0.7.1-develop.7201.1.9bd6c88e3d

package/src/modules/entities/lib/field-definitions.ts

@@ -36,6 +36,7 @@ const CONFIG_PASSTHROUGH_KEYS: Array<keyof CustomFieldDefinition> = [
   'formEditable',
   'listVisible',
   'indexed',
+  'encrypted',
   'priority',
   'editor',
   'input',
@@ -65,6 +66,12 @@ function configEquals(a: unknown, b: unknown): boolean {
   return JSON.stringify(normalizeValue(a ?? null)) === JSON.stringify(normalizeValue(b ?? null))
 }
 
+function hasEncryptionEnabled(definition: CustomFieldDef | null): boolean {
+  const config = definition?.configJson
+  if (!config || typeof config !== 'object') return false
+  return (config as Record<string, unknown>).encrypted === true
+}
+
 export async function ensureCustomFieldDefinitions(
   em: EntityManager,
   sets: FieldSetInput[],
@@ -103,6 +110,14 @@ export async function ensureCustomFieldDefinitions(
         if (value !== undefined) configJson[key] = value as unknown
       }
 
+      // configJson is rebuilt from the declaration, so a field encrypted through the
+      // definitions API would lose the flag on the next install while its stored
+      // values stay ciphertext the read path no longer decrypts. Keep an enabled flag
+      // unless the declaration turns it off with an explicit `encrypted: false`.
+      if (configJson.encrypted === undefined && hasEncryptionEnabled(existing)) {
+        configJson.encrypted = true
+      }
+
       if (!existing) {
         if (!scope.dryRun) {
           const createdDef = em.create(CustomFieldDef, {

package/src/modules/entities/lib/install-from-ce.ts

@@ -49,6 +49,7 @@ const FIELD_DETAIL_KEYS: Array<keyof CustomFieldDefinition> = [
   'formEditable',
   'listVisible',
   'indexed',
+  'encrypted',
   'priority',
   'editor',
   'input',

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

@@ -744,5 +744,8 @@
   "eudr.supplierPanel.viewSubmissions": "Einreichungen anzeigen",
   "eudr.supplierPanel.warnings": "Mit Warnungen",
   "eudr.warnings.harvestBeforeCutoff": "Ernte vor dem EUDR-Stichtag",
-  "eudr.warnings.speciesMissing": "Bei einer verknüpften Holz-Zuordnung fehlt der wissenschaftliche oder gebräuchliche Artname"
+  "eudr.warnings.speciesMissing": "Bei einer verknüpften Holz-Zuordnung fehlt der wissenschaftliche oder gebräuchliche Artname",
+  "search.entityType.eudr.eudr_due_diligence_statement": "DDS-Erklärung",
+  "search.entityType.eudr.eudr_evidence_submission": "Nachweiseinreichung",
+  "search.entityType.eudr.eudr_plot": "Parzelle"
 }

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

@@ -744,5 +744,8 @@
   "eudr.supplierPanel.viewSubmissions": "View submissions",
   "eudr.supplierPanel.warnings": "With warnings",
   "eudr.warnings.harvestBeforeCutoff": "Harvest before EUDR cutoff",
-  "eudr.warnings.speciesMissing": "A linked wood mapping is missing a scientific or common species name"
+  "eudr.warnings.speciesMissing": "A linked wood mapping is missing a scientific or common species name",
+  "search.entityType.eudr.eudr_due_diligence_statement": "DDS statement",
+  "search.entityType.eudr.eudr_evidence_submission": "Evidence submission",
+  "search.entityType.eudr.eudr_plot": "Plot"
 }

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

@@ -744,5 +744,8 @@
   "eudr.supplierPanel.viewSubmissions": "Ver presentaciones",
   "eudr.supplierPanel.warnings": "Con advertencias",
   "eudr.warnings.harvestBeforeCutoff": "Cosecha anterior a la fecha de corte EUDR",
-  "eudr.warnings.speciesMissing": "A una asignación de madera vinculada le falta el nombre científico o común de la especie"
+  "eudr.warnings.speciesMissing": "A una asignación de madera vinculada le falta el nombre científico o común de la especie",
+  "search.entityType.eudr.eudr_due_diligence_statement": "Declaración DDS",
+  "search.entityType.eudr.eudr_evidence_submission": "Envío de evidencia",
+  "search.entityType.eudr.eudr_plot": "Parcela"
 }

package/src/modules/eudr/i18n/ko.json

@@ -744,5 +744,8 @@
   "eudr.supplierPanel.viewSubmissions": "제출물 보기",
   "eudr.supplierPanel.warnings": "경고 있음",
   "eudr.warnings.harvestBeforeCutoff": "EUDR 기준일 이전 수확",
-  "eudr.warnings.speciesMissing": "연결된 목재 매핑에 학명 또는 일반명이 누락되었습니다"
+  "eudr.warnings.speciesMissing": "연결된 목재 매핑에 학명 또는 일반명이 누락되었습니다",
+  "search.entityType.eudr.eudr_due_diligence_statement": "DDS 진술서",
+  "search.entityType.eudr.eudr_evidence_submission": "증거 제출물",
+  "search.entityType.eudr.eudr_plot": "구획"
 }

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

@@ -744,5 +744,8 @@
   "eudr.supplierPanel.viewSubmissions": "Zobacz zgłoszenia",
   "eudr.supplierPanel.warnings": "Z ostrzeżeniami",
   "eudr.warnings.harvestBeforeCutoff": "Zbiory przed datą graniczną EUDR",
-  "eudr.warnings.speciesMissing": "W powiązanym mapowaniu drewna brakuje naukowej lub zwyczajowej nazwy gatunku"
+  "eudr.warnings.speciesMissing": "W powiązanym mapowaniu drewna brakuje naukowej lub zwyczajowej nazwy gatunku",
+  "search.entityType.eudr.eudr_due_diligence_statement": "Oświadczenie DDS",
+  "search.entityType.eudr.eudr_evidence_submission": "Zgłoszenie dowodów",
+  "search.entityType.eudr.eudr_plot": "Działka"
 }

package/src/modules/eudr/search.ts

@@ -95,23 +95,21 @@ function resolveSupplierName(record: Record<string, unknown>): string | null {
 }
 
 function buildStatementPresenter(translate: TranslateFn, record: Record<string, unknown>): SearchResultPresenter {
-  const label = translate('eudr.search.badge.statement', 'DDS statement')
   const title = readRecordText(record, 'title') ?? translate('eudr.common.recordUnavailable')
   const subtitle = formatSubtitle(
     readRecordText(record, 'reference_number', 'referenceNumber'),
     translateToken(translate, 'eudr.commodity', readRecordText(record, 'commodity')),
   )
-  return { title, subtitle, icon: 'file-check', badge: label }
+  return { title, subtitle, icon: 'file-check' }
 }
 
 function buildPlotPresenter(translate: TranslateFn, record: Record<string, unknown>): SearchResultPresenter {
-  const label = translate('eudr.search.badge.plot', 'Plot')
   const title = readRecordText(record, 'name') ?? translate('eudr.common.recordUnavailable')
   const subtitle = formatSubtitle(
     readRecordText(record, 'origin_country', 'originCountry'),
     translateToken(translate, 'eudr.plotType', readRecordText(record, 'plot_type', 'plotType')),
   )
-  return { title, subtitle, icon: 'map-pin', badge: label }
+  return { title, subtitle, icon: 'map-pin' }
 }
 
 function buildSubmissionPresenter(translate: TranslateFn, record: Record<string, unknown>): SearchResultPresenter {
@@ -125,7 +123,7 @@ function buildSubmissionPresenter(translate: TranslateFn, record: Record<string,
     supplierName,
     translateToken(translate, 'eudr.submissionStatus', readRecordText(record, 'status')),
   )
-  return { title, subtitle, icon: 'package', badge: label }
+  return { title, subtitle, icon: 'package' }
 }
 
 export const searchConfig: SearchModuleConfig = {

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

@@ -15,7 +15,8 @@ import { useDialogKeyHandler } from '@open-mercato/ui/hooks/useDialogKeyHandler'
 import { Input } from '@open-mercato/ui/primitives/input'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { E } from '#generated/entities.ids.generated'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { parseLocaleNumber } from '@open-mercato/shared/lib/number'
 import { normalizeCustomFieldSubmitValue, extractCustomFieldValues } from './customFieldHelpers'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -66,13 +67,15 @@ type PaymentDialogProps = {
   onSaved?: (totals?: PaymentTotals | null) => void | Promise<void>
 }
 
-const normalizeNumber = (value: unknown): number => {
-  if (typeof value === 'number' && Number.isFinite(value)) return value
-  if (typeof value === 'string' && value.trim().length) {
-    const parsed = Number(value)
-    if (!Number.isNaN(parsed)) return parsed
-  }
-  return 0
+// The amount field is a hand-rolled text input, so the raw string a user typed reaches
+// the submit handler carrying the separator the surrounding UI displays — `110,70` under
+// Polish (issue #5828, same defect class as #5552). A blank/absent value keeps the old
+// "must be a positive amount" message; only genuinely unparseable input returns null.
+const parseAmountInput = (value: unknown, locale?: string): number | null => {
+  if (typeof value === 'number') return Number.isFinite(value) ? value : null
+  if (typeof value !== 'string') return 0
+  if (!value.trim()) return 0
+  return parseLocaleNumber(value, locale)
 }
 
 export function PaymentDialog({
@@ -88,6 +91,7 @@ export function PaymentDialog({
   onSaved,
 }: PaymentDialogProps) {
   const t = useT()
+  const locale = useLocale()
   const dialogContentRef = React.useRef<HTMLDivElement | null>(null)
   const [formResetKey, setFormResetKey] = React.useState(0)
   const [paymentMethods, setPaymentMethods] = React.useState<PaymentMethodOption[]>([])
@@ -352,9 +356,8 @@ export function PaymentDialog({
           return (
             <div className="flex items-center gap-2">
               <Input
-                type="number"
+                type="text"
                 inputMode="decimal"
-                step="0.01"
                 value={normalized as string | number}
                 onChange={(event) => setValue(event.target.value)}
                 placeholder="0.00"
@@ -493,10 +496,14 @@ export function PaymentDialog({
   const handleSubmit = React.useCallback(
     async (values: Record<string, unknown>) => {
       const resolvedCurrency = currencyCode ? currencyCode.toUpperCase() : ''
-      const amountValue = normalizeNumber(values.amount)
+      const amountValue = parseAmountInput(values.amount, locale)
       if (!resolvedCurrency.trim()) {
         throw createCrudFormError(t('sales.documents.payments.currencyRequired', 'Currency is required.'))
       }
+      if (amountValue === null) {
+        const message = t('sales.documents.payments.amountInvalid', 'Enter the amount as a number.')
+        throw createCrudFormError(message, { amount: message })
+      }
       if (amountValue <= 0) {
         throw createCrudFormError(t('sales.documents.payments.amountRequired', 'Enter a positive amount.'), {
           amount: t('sales.documents.payments.amountRequired', 'Enter a positive amount.'),

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

@@ -1139,6 +1139,7 @@
   "sales.documents.list.table.unassigned": "Nicht zugewiesen",
   "sales.documents.payments.add": "Zahlung hinzufügen",
   "sales.documents.payments.amount": "Betrag",
+  "sales.documents.payments.amountInvalid": "Geben Sie den Betrag als Zahl ein.",
   "sales.documents.payments.amountRequired": "Geben Sie einen positiven Betrag ein.",
   "sales.documents.payments.created": "Zahlung erfasst.",
   "sales.documents.payments.createdAt": "Erstellt",

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

@@ -1139,6 +1139,7 @@
   "sales.documents.list.table.unassigned": "Unassigned",
   "sales.documents.payments.add": "Add payment",
   "sales.documents.payments.amount": "Amount",
+  "sales.documents.payments.amountInvalid": "Enter the amount as a number.",
   "sales.documents.payments.amountRequired": "Enter a positive amount.",
   "sales.documents.payments.created": "Payment recorded.",
   "sales.documents.payments.createdAt": "Created",

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

@@ -1139,6 +1139,7 @@
   "sales.documents.list.table.unassigned": "Sin asignar",
   "sales.documents.payments.add": "Agregar pago",
   "sales.documents.payments.amount": "Importe",
+  "sales.documents.payments.amountInvalid": "Introduce el importe como un número.",
   "sales.documents.payments.amountRequired": "Introduce un importe positivo.",
   "sales.documents.payments.created": "Pago registrado.",
   "sales.documents.payments.createdAt": "Creado",

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

@@ -1139,6 +1139,7 @@
   "sales.documents.list.table.unassigned": "미지정",
   "sales.documents.payments.add": "결제 추가",
   "sales.documents.payments.amount": "금액",
+  "sales.documents.payments.amountInvalid": "금액을 숫자로 입력하세요.",
   "sales.documents.payments.amountRequired": "0보다 큰 금액을 입력하세요.",
   "sales.documents.payments.created": "결제가 등록되었습니다.",
   "sales.documents.payments.createdAt": "등록일",

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

@@ -1139,6 +1139,7 @@
   "sales.documents.list.table.unassigned": "Nieprzypisany",
   "sales.documents.payments.add": "Dodaj płatność",
   "sales.documents.payments.amount": "Kwota",
+  "sales.documents.payments.amountInvalid": "Podaj kwotę jako liczbę.",
   "sales.documents.payments.amountRequired": "Wprowadź dodatnią kwotę.",
   "sales.documents.payments.created": "Płatność zarejestrowana.",
   "sales.documents.payments.createdAt": "Utworzono",

package/src/modules/sales/lib/lineSnapshots.ts

@@ -11,9 +11,28 @@ function toNumeric(value: unknown): number {
   return 0
 }
 
-function mapPersistedLine(line: SalesOrderLine | SalesQuoteLine): SalesLineSnapshot {
+/**
+ * A snapshot rebuilt from a persisted row, plus the columns the calculation
+ * engine never reads but the write paths must carry back to the row.
+ *
+ * The line upsert, line delete and adjustment write paths all rebuild *every*
+ * line of the document from these snapshots and then `Object.assign` the result
+ * onto the existing entities. Anything the mapper drops is therefore not merely
+ * absent from the calculation — it is written back as `null` over the stored
+ * value of lines the caller never touched (#5911).
+ */
+export type SalesPersistedLineSnapshot = SalesLineSnapshot & {
+  statusEntryId: string | null
+  catalogSnapshot: Record<string, unknown> | null
+  promotionSnapshot: Record<string, unknown> | null
+}
+
+function mapPersistedLine(line: SalesOrderLine | SalesQuoteLine): SalesPersistedLineSnapshot {
   return {
     id: line.id,
+    statusEntryId: line.statusEntryId ?? null,
+    catalogSnapshot: line.catalogSnapshot ? cloneJson(line.catalogSnapshot) : null,
+    promotionSnapshot: line.promotionSnapshot ? cloneJson(line.promotionSnapshot) : null,
     lineNumber: line.lineNumber,
     kind: line.kind,
     productId: line.productId ?? null,
@@ -60,11 +79,11 @@ function mapPersistedLine(line: SalesOrderLine | SalesQuoteLine): SalesLineSnaps
  * two files used to carry byte-identical copies, and that duplication is why
  * the return flows kept the discount defect after the order flows were fixed.
  */
-export function mapOrderLineEntityToSnapshot(line: SalesOrderLine): SalesLineSnapshot {
+export function mapOrderLineEntityToSnapshot(line: SalesOrderLine): SalesPersistedLineSnapshot {
   return mapPersistedLine(line)
 }
 
-export function mapQuoteLineEntityToSnapshot(line: SalesQuoteLine): SalesLineSnapshot {
+export function mapQuoteLineEntityToSnapshot(line: SalesQuoteLine): SalesPersistedLineSnapshot {
   return mapPersistedLine(line)
 }
 

package/src/modules/wms/components/backend/AdjustInventoryDialog.tsx

@@ -32,7 +32,8 @@ import {
 } from '@open-mercato/ui/primitives/select'
 import { StatusBadge } from '@open-mercato/ui/primitives/status-badge'
 import { Textarea } from '@open-mercato/ui/primitives/textarea'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { parseLocaleNumber } from '@open-mercato/shared/lib/number'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { buildInventoryMutationReferenceId } from '../../lib/inventoryMutationUi'
 import {
@@ -91,11 +92,10 @@ const EMPTY_FORM: AdjustFormValues = {
   serialNumber: '',
 }
 
-function parseDeltaInput(value: string): number | null {
+export function parseDeltaInput(value: string, locale?: string): number | null {
   const trimmed = value.trim()
   if (!trimmed || trimmed === '-' || trimmed === '+') return null
-  const parsed = Number(trimmed)
-  return Number.isFinite(parsed) ? parsed : null
+  return parseLocaleNumber(trimmed, locale)
 }
 
 export function AdjustInventoryDialog({
@@ -108,6 +108,7 @@ export function AdjustInventoryDialog({
   initialLotId,
 }: AdjustInventoryDialogProps) {
   const t = useT()
+  const locale = useLocale()
   const queryClient = useQueryClient()
   const formRef = React.useRef<HTMLFormElement>(null)
   const { runMutation, retryLastMutation } = useGuardedMutation<{
@@ -690,7 +691,7 @@ export function AdjustInventoryDialog({
                   inputMode="decimal"
                   value={String(form.delta)}
                   onChange={(event) => {
-                    const parsed = parseDeltaInput(event.target.value)
+                    const parsed = parseDeltaInput(event.target.value, locale)
                     if (parsed == null) return
                     patchForm({ delta: parsed })
                   }}

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

@@ -1,4 +1,8 @@
 {
+  "search.entityType.wms.inventory_lot": "Lagerbestand",
+  "search.entityType.wms.product_inventory_profile": "Bestandsprofil",
+  "search.entityType.wms.warehouse": "Lager",
+  "search.entityType.wms.warehouse_location": "Lagerort",
   "wms.audit.inventory.receive": "Wareneingang buchen",
   "wms.audit.salesOrder.assignWarehouse": "Lager dem Auftrag zuweisen",
   "wms.audit.salesOrder.reRunReservation": "Reservierung für Auftrag erneut ausführen",

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

@@ -1,4 +1,8 @@
 {
+  "search.entityType.wms.inventory_lot": "Inventory lot",
+  "search.entityType.wms.product_inventory_profile": "Inventory profile",
+  "search.entityType.wms.warehouse": "Warehouse",
+  "search.entityType.wms.warehouse_location": "Location",
   "wms.audit.inventory.receive": "Receive inventory",
   "wms.audit.salesOrder.assignWarehouse": "Assign warehouse to order",
   "wms.audit.salesOrder.reRunReservation": "Re-run reservation for order",

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

@@ -1,4 +1,8 @@
 {
+  "search.entityType.wms.inventory_lot": "Lote de inventario",
+  "search.entityType.wms.product_inventory_profile": "Perfil de inventario",
+  "search.entityType.wms.warehouse": "Almacén",
+  "search.entityType.wms.warehouse_location": "Ubicación",
   "wms.audit.inventory.receive": "Recibir inventario",
   "wms.audit.salesOrder.assignWarehouse": "Asignar almacén al pedido",
   "wms.audit.salesOrder.reRunReservation": "Volver a ejecutar la reserva del pedido",

package/src/modules/wms/i18n/ko.json

@@ -1,4 +1,8 @@
 {
+  "search.entityType.wms.inventory_lot": "재고 로트",
+  "search.entityType.wms.product_inventory_profile": "재고 프로필",
+  "search.entityType.wms.warehouse": "창고",
+  "search.entityType.wms.warehouse_location": "위치",
   "wms.audit.inventory.receive": "재고 수령",
   "wms.audit.salesOrder.assignWarehouse": "주문할 창고 지정",
   "wms.audit.salesOrder.reRunReservation": "주문 예약 재실행",

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

@@ -1,4 +1,8 @@
 {
+  "search.entityType.wms.inventory_lot": "Partia zapasu",
+  "search.entityType.wms.product_inventory_profile": "Profil zapasu",
+  "search.entityType.wms.warehouse": "Magazyn",
+  "search.entityType.wms.warehouse_location": "Lokalizacja",
   "wms.audit.inventory.receive": "Przyjmij zapas",
   "wms.audit.salesOrder.assignWarehouse": "Przypisz magazyn do zamówienia",
   "wms.audit.salesOrder.reRunReservation": "Ponów rezerwację dla zamówienia",

package/src/modules/wms/search.ts

@@ -63,7 +63,7 @@ function buildWarehousePresenter(
   const label = t('wms.search.badge.warehouse', 'Warehouse')
   const title = pickString(record.name, record.code, record.id) ?? label
   const subtitle = formatSubtitle(record.code, record.city, record.country)
-  return { title, subtitle, icon: 'warehouse', badge: label }
+  return { title, subtitle, icon: 'warehouse' }
 }
 
 function buildLocationPresenter(
@@ -73,7 +73,7 @@ function buildLocationPresenter(
   const label = t('wms.search.badge.location', 'Location')
   const title = pickString(record.code, record.id) ?? label
   const subtitle = formatSubtitle(record.type, record.warehouse_id ?? record.warehouseId)
-  return { title, subtitle, icon: 'map-pinned', badge: label }
+  return { title, subtitle, icon: 'map-pinned' }
 }
 
 function buildInventoryProfilePresenter(
@@ -89,7 +89,7 @@ function buildInventoryProfilePresenter(
     record.default_uom ?? record.defaultUom,
     variantId ? t('wms.search.profile.variantScoped', 'Variant-scoped') : t('wms.search.profile.productScoped', 'Product-scoped'),
   )
-  return { title, subtitle, icon: 'boxes', badge: label }
+  return { title, subtitle, icon: 'boxes' }
 }
 
 function buildLotPresenter(
@@ -99,7 +99,7 @@ function buildLotPresenter(
   const label = t('wms.search.badge.lot', 'Inventory lot')
   const title = pickString(record.lot_number, record.lotNumber, record.batch_number, record.batchNumber, record.id) ?? label
   const subtitle = formatSubtitle(record.catalog_variant_id ?? record.catalogVariantId, record.status, record.expires_at ?? record.expiresAt)
-  return { title, subtitle, icon: 'package-search', badge: label }
+  return { title, subtitle, icon: 'package-search' }
 }
 
 export const searchConfig: SearchModuleConfig = {