@open-mercato/core 0.6.3-develop.3894.1.352abf4240 → 0.6.3

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Seitlich andocken",
   "customers.deal_analyzer.sheet.title": "Deal-Analyse",
   "customers.deal_analyzer.sheet.welcomeTitle": "Deal-Analyse",
+  "customers.deals.create.associations.companiesPlaceholder": "Unternehmen nach Name oder Domain suchen…",
+  "customers.deals.create.associations.peoplePlaceholder": "Personen nach Name oder E-Mail suchen…",
+  "customers.deals.create.back": "Zurück zu Deals",
+  "customers.deals.create.cancel": "Abbrechen",
   "customers.deals.create.error": "Deal konnte nicht erstellt werden.",
+  "customers.deals.create.fields.datePlaceholder": "Datum auswählen",
+  "customers.deals.create.fields.expectedCloseAt": "Voraussichtliches Abschlussdatum",
+  "customers.deals.create.fields.probability": "Wahrscheinlichkeit",
+  "customers.deals.create.fields.stageOf": "· Phase {position} von {total}",
+  "customers.deals.create.fields.title": "Deal-Titel",
+  "customers.deals.create.fields.valueAmount": "Deal-Wert",
+  "customers.deals.create.hints.pipelineStage": "Die Phasen hängen von der ausgewählten Pipeline ab",
+  "customers.deals.create.hints.probability": "0 – 100 %, für den gewichteten Pipeline-Wert verwendet",
+  "customers.deals.create.hints.title": "Kurzer, aussagekräftiger Name auf den Pipeline-Karten",
+  "customers.deals.create.hints.valueAmount": "Potenzieller Umsatz aus dieser Opportunity",
+  "customers.deals.create.sections.associations.subtitle": "Personen und Unternehmen mit diesem Deal verknüpfen",
+  "customers.deals.create.sections.associations.title": "Verknüpfungen",
+  "customers.deals.create.sections.custom.empty": "Noch keine benutzerdefinierten Felder für Deals definiert.",
+  "customers.deals.create.sections.custom.loading": "Benutzerdefinierte Felder werden geladen…",
+  "customers.deals.create.sections.custom.manage": "Felder verwalten",
+  "customers.deals.create.sections.custom.subtitle": "{count} Felder für diesen Mandanten definiert",
+  "customers.deals.create.sections.custom.title": "Benutzerdefinierte Attribute",
+  "customers.deals.create.sections.details.subtitle": "Wichtigste Opportunity-Infos",
   "customers.deals.create.submit": "Deal erstellen",
+  "customers.deals.create.tips.item1": "Verwenden Sie im Titel das Format Firmenname + kurzes Ergebnis (z. B. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Legen Sie die Wahrscheinlichkeit nach Pipeline-Phase fest: Qualifizierung 10-25 %, Angebot 30-50 %, Verhandlung 50-75 %, Vertrag 75-90 %",
+  "customers.deals.create.tips.item3": "Verknüpfen Sie den wichtigsten Entscheider als erste Person — er erhält standardmäßig die E-Mail-CC bei Aktivitäten",
+  "customers.deals.create.tips.title": "Tipps für bessere Deals",
   "customers.deals.create.title": "Deal erstellen",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Zurück zu Deals",

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Dock to side",
   "customers.deal_analyzer.sheet.title": "Deal Analyzer",
   "customers.deal_analyzer.sheet.welcomeTitle": "Deal Analyzer",
+  "customers.deals.create.associations.companiesPlaceholder": "Search companies by name or domain…",
+  "customers.deals.create.associations.peoplePlaceholder": "Search people by name or email…",
+  "customers.deals.create.back": "Back to deals",
+  "customers.deals.create.cancel": "Cancel",
   "customers.deals.create.error": "Failed to create deal.",
+  "customers.deals.create.fields.datePlaceholder": "Pick a date",
+  "customers.deals.create.fields.expectedCloseAt": "Expected close date",
+  "customers.deals.create.fields.probability": "Probability",
+  "customers.deals.create.fields.stageOf": "· stage {position} of {total}",
+  "customers.deals.create.fields.title": "Deal title",
+  "customers.deals.create.fields.valueAmount": "Deal value",
+  "customers.deals.create.hints.pipelineStage": "Stages depend on the selected pipeline",
+  "customers.deals.create.hints.probability": "0 – 100%, used for weighted pipeline value",
+  "customers.deals.create.hints.title": "Short, descriptive name shown on pipeline cards",
+  "customers.deals.create.hints.valueAmount": "Potential revenue from this opportunity",
+  "customers.deals.create.sections.associations.subtitle": "Link people and companies to this deal",
+  "customers.deals.create.sections.associations.title": "Associations",
+  "customers.deals.create.sections.custom.empty": "No custom fields defined for deals yet.",
+  "customers.deals.create.sections.custom.loading": "Loading custom fields…",
+  "customers.deals.create.sections.custom.manage": "Manage fields",
+  "customers.deals.create.sections.custom.subtitle": "{count} fields defined for this tenant",
+  "customers.deals.create.sections.custom.title": "Custom attributes",
+  "customers.deals.create.sections.details.subtitle": "Core opportunity info",
   "customers.deals.create.submit": "Create deal",
+  "customers.deals.create.tips.item1": "Use the company name + short deliverable format in the title (e.g. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Set probability based on pipeline stage: Qual 10-25%, Proposal 30-50%, Negotiation 50-75%, Contract 75-90%",
+  "customers.deals.create.tips.item3": "Link primary decision maker as first person — they get default email CC on activities",
+  "customers.deals.create.tips.title": "Tips for better deals",
   "customers.deals.create.title": "Create deal",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Back to deals",

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Anclar al lado",
   "customers.deal_analyzer.sheet.title": "Analizador de negocios",
   "customers.deal_analyzer.sheet.welcomeTitle": "Analizador de negocios",
+  "customers.deals.create.associations.companiesPlaceholder": "Buscar empresas por nombre o dominio…",
+  "customers.deals.create.associations.peoplePlaceholder": "Buscar personas por nombre o correo…",
+  "customers.deals.create.back": "Volver a oportunidades",
+  "customers.deals.create.cancel": "Cancelar",
   "customers.deals.create.error": "No se pudo crear la oportunidad.",
+  "customers.deals.create.fields.datePlaceholder": "Elegir una fecha",
+  "customers.deals.create.fields.expectedCloseAt": "Fecha de cierre prevista",
+  "customers.deals.create.fields.probability": "Probabilidad",
+  "customers.deals.create.fields.stageOf": "· etapa {position} de {total}",
+  "customers.deals.create.fields.title": "Título de la oportunidad",
+  "customers.deals.create.fields.valueAmount": "Valor de la oportunidad",
+  "customers.deals.create.hints.pipelineStage": "Las etapas dependen del pipeline seleccionado",
+  "customers.deals.create.hints.probability": "0 – 100 %, usada para el valor ponderado del pipeline",
+  "customers.deals.create.hints.title": "Nombre corto y descriptivo que se muestra en las tarjetas del pipeline",
+  "customers.deals.create.hints.valueAmount": "Ingresos potenciales de esta oportunidad",
+  "customers.deals.create.sections.associations.subtitle": "Vincula personas y empresas a esta oportunidad",
+  "customers.deals.create.sections.associations.title": "Asociaciones",
+  "customers.deals.create.sections.custom.empty": "Aún no hay campos personalizados definidos para oportunidades.",
+  "customers.deals.create.sections.custom.loading": "Cargando campos personalizados…",
+  "customers.deals.create.sections.custom.manage": "Gestionar campos",
+  "customers.deals.create.sections.custom.subtitle": "{count} campos definidos para este tenant",
+  "customers.deals.create.sections.custom.title": "Atributos personalizados",
+  "customers.deals.create.sections.details.subtitle": "Información principal de la oportunidad",
   "customers.deals.create.submit": "Crear oportunidad",
+  "customers.deals.create.tips.item1": "Usa el formato nombre de la empresa + entregable corto en el título (p. ej. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Define la probabilidad según la etapa del pipeline: Calificación 10-25 %, Propuesta 30-50 %, Negociación 50-75 %, Contrato 75-90 %",
+  "customers.deals.create.tips.item3": "Vincula al principal responsable de la decisión como primera persona — recibe la copia (CC) por defecto en las actividades",
+  "customers.deals.create.tips.title": "Consejos para mejores oportunidades",
   "customers.deals.create.title": "Crear oportunidad",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Volver a los deals",

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

@@ -665,8 +665,34 @@
   "customers.deal_analyzer.sheet.dock": "Zadokuj z boku",
   "customers.deal_analyzer.sheet.title": "Analizator transakcji",
   "customers.deal_analyzer.sheet.welcomeTitle": "Analizator transakcji",
+  "customers.deals.create.associations.companiesPlaceholder": "Szukaj firm po nazwie lub domenie…",
+  "customers.deals.create.associations.peoplePlaceholder": "Szukaj osób po nazwie lub e-mailu…",
+  "customers.deals.create.back": "Powrót do szans sprzedaży",
+  "customers.deals.create.cancel": "Anuluj",
   "customers.deals.create.error": "Nie udało się utworzyć szansy.",
+  "customers.deals.create.fields.datePlaceholder": "Wybierz datę",
+  "customers.deals.create.fields.expectedCloseAt": "Przewidywana data zamknięcia",
+  "customers.deals.create.fields.probability": "Prawdopodobieństwo",
+  "customers.deals.create.fields.stageOf": "· etap {position} z {total}",
+  "customers.deals.create.fields.title": "Tytuł szansy",
+  "customers.deals.create.fields.valueAmount": "Wartość szansy",
+  "customers.deals.create.hints.pipelineStage": "Etapy zależą od wybranego lejka",
+  "customers.deals.create.hints.probability": "0 – 100%, używane do ważonej wartości lejka",
+  "customers.deals.create.hints.title": "Krótka, opisowa nazwa wyświetlana na kartach lejka",
+  "customers.deals.create.hints.valueAmount": "Potencjalny przychód z tej szansy",
+  "customers.deals.create.sections.associations.subtitle": "Powiąż osoby i firmy z tą szansą",
+  "customers.deals.create.sections.associations.title": "Powiązania",
+  "customers.deals.create.sections.custom.empty": "Nie zdefiniowano jeszcze pól niestandardowych dla szans sprzedaży.",
+  "customers.deals.create.sections.custom.loading": "Ładowanie pól niestandardowych…",
+  "customers.deals.create.sections.custom.manage": "Zarządzaj polami",
+  "customers.deals.create.sections.custom.subtitle": "{count} pól zdefiniowanych dla tego najemcy",
+  "customers.deals.create.sections.custom.title": "Atrybuty niestandardowe",
+  "customers.deals.create.sections.details.subtitle": "Podstawowe informacje o szansie",
   "customers.deals.create.submit": "Utwórz szansę",
+  "customers.deals.create.tips.item1": "Użyj w tytule formatu nazwa firmy + krótki rezultat (np. \"Copperleaf — Q3 Renewal\")",
+  "customers.deals.create.tips.item2": "Ustaw prawdopodobieństwo na podstawie etapu lejka: Kwalifikacja 10-25%, Oferta 30-50%, Negocjacje 50-75%, Umowa 75-90%",
+  "customers.deals.create.tips.item3": "Powiąż głównego decydenta jako pierwszą osobę — domyślnie otrzyma kopię (CC) e-maili przy aktywnościach",
+  "customers.deals.create.tips.title": "Wskazówki dla lepszych szans sprzedaży",
   "customers.deals.create.title": "Utwórz szansę",
   "customers.deals.detail.actions.apply": "Apply",
   "customers.deals.detail.actions.backToList": "Powrót do listy szans",

package/src/modules/dictionaries/components/DictionaryEntrySelect.tsx

@@ -70,6 +70,7 @@ export type DictionarySelectLabels = {
 }
 
 export type DictionaryEntrySelectProps = {
+  id?: string
   value?: string
   onChange: (value: string | undefined) => void
   fetchOptions: () => Promise<DictionaryOption[]>
@@ -83,9 +84,17 @@ export type DictionaryEntrySelectProps = {
   disabled?: boolean
   showLabelInput?: boolean
   showManage?: boolean
+  /**
+   * When false, hides the read-only appearance preview (color swatch + icon + hex)
+   * rendered below the trigger for the currently-selected entry. Defaults to true to
+   * preserve existing behavior; set false where the host only wants a plain select
+   * (e.g. a create form that shouldn't surface dictionary styling).
+   */
+  showActiveAppearance?: boolean
 }
 
 export function DictionaryEntrySelect({
+  id,
   value,
   onChange,
   fetchOptions,
@@ -99,6 +108,7 @@ export function DictionaryEntrySelect({
   disabled: disabledProp = false,
   showLabelInput = true,
   showManage = true,
+  showActiveAppearance = true,
 }: DictionaryEntrySelectProps) {
   const pathname = usePathname()
   const searchParams = useSearchParams()
@@ -247,6 +257,7 @@ export function DictionaryEntrySelect({
           disabled={disabled}
         >
           <SelectTrigger
+            id={id}
             className={selectClassName}
             title={activeOption?.label ?? undefined}
           >
@@ -345,7 +356,7 @@ export function DictionaryEntrySelect({
           ) : null}
         </div>
       </div>
-      {activeOption && (activeOption.icon || activeOption.color) ? (
+      {showActiveAppearance && activeOption && (activeOption.icon || activeOption.color) ? (
         <div className="flex items-center gap-2 text-xs text-muted-foreground">
           <span className="inline-flex items-center gap-2 rounded border border-dashed px-2 py-1">
             {activeOption.icon ? renderDictionaryIcon(activeOption.icon, 'h-4 w-4') : null}

package/src/modules/feature_toggles/lib/feature-flag-check.ts

@@ -62,6 +62,13 @@ const getCacheTags = (identifier: string, tenantId: string) => {
 
 export class FeatureTogglesService {
   private cacheTtlMs: number = 1 * 60 * 1000 // 1 minute
+  // Resolution cache can be disabled via env (e.g. integration tests that flip
+  // overrides rapidly between cases). The 1-minute TTL is a production
+  // optimization; under fast flag churn it can serve a stale value across
+  // override set/clear despite invalidation, so tests opt out for determinism.
+  private readonly cacheDisabled: boolean =
+    process.env.OM_FEATURE_TOGGLES_CACHE_DISABLED === '1' ||
+    process.env.OM_FEATURE_TOGGLES_CACHE_DISABLED === 'true'
   constructor(
     private readonly cache: CacheService,
     private readonly em: EntityManager
@@ -72,6 +79,7 @@ export class FeatureTogglesService {
     tenantId: string,
     result: ToggleResolutionResult,
   ) {
+    if (this.cacheDisabled) return
     const key = getIsEnabledCacheKey(identifier, tenantId)
     await runWithCacheTenant(
       tenantId,
@@ -82,10 +90,12 @@ export class FeatureTogglesService {
   private async resolveToggle(identifier: string, tenantId: string): Promise<ToggleResolutionResult> {
     const key = getIsEnabledCacheKey(identifier, tenantId)
 
-    const cached = await runWithCacheTenant(tenantId, () => this.cache.get(key))
-    if (cached) {
-      const parsed = toCachedResolution(cached)
-      if (parsed) return parsed
+    if (!this.cacheDisabled) {
+      const cached = await runWithCacheTenant(tenantId, () => this.cache.get(key))
+      if (cached) {
+        const parsed = toCachedResolution(cached)
+        if (parsed) return parsed
+      }
     }
 
     let toggle: FeatureToggle | null = null

package/src/modules/query_index/subscribers/coverage_refresh.ts

@@ -15,6 +15,12 @@ type Payload = {
 const DEFAULT_DELAY_MS = 0
 const pending = new Map<string, NodeJS.Timeout>()
 
+function forkRefreshEntityManager(em: EntityManager): EntityManager {
+  const fork = (em as unknown as { fork?: (options?: Record<string, unknown>) => EntityManager }).fork
+  if (typeof fork !== 'function') return em
+  return fork.call(em, { clear: true, freshEventManager: true, useContext: false })
+}
+
 function scopeKey(input: Payload): string {
   const entity = String(input.entityType || '')
   const tenant = input.tenantId ?? '__null__'
@@ -35,10 +41,10 @@ export default async function handle(payload: Payload, ctx: { resolve: <T = any>
   const withDeleted = payload?.withDeleted === true
   const delayMs = typeof payload?.delayMs === 'number' && payload.delayMs >= 0 ? payload.delayMs : DEFAULT_DELAY_MS
 
-  const em = ctx.resolve<EntityManager>('em')
   const key = scopeKey({ entityType, tenantId, organizationId, withDeleted })
 
   const handleRefresh = async () => {
+    const em = forkRefreshEntityManager(ctx.resolve<EntityManager>('em'))
     try {
       await refreshCoverageSnapshot(em, { entityType, tenantId, organizationId, withDeleted })
     } catch (err) {

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

@@ -199,6 +199,7 @@
   "resources.resourceTypes.errors.delete": "Ressourcentyp konnte nicht gelöscht werden.",
   "resources.resourceTypes.errors.deleteAssigned": "Dem Ressourcentyp sind Ressourcen zugewiesen.",
   "resources.resourceTypes.errors.load": "Ressourcentypen konnten nicht geladen werden.",
+  "resources.resourceTypes.errors.notFound": "Ressourcentyp nicht gefunden.",
   "resources.resourceTypes.errors.save": "Ressourcentyp konnte nicht gespeichert werden.",
   "resources.resourceTypes.form.appearance.colorClear": "Farbe entfernen",
   "resources.resourceTypes.form.appearance.colorHelp": "Wähle eine Farbe für diesen Ressourcentyp.",

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

@@ -199,6 +199,7 @@
   "resources.resourceTypes.errors.delete": "Failed to delete resource type.",
   "resources.resourceTypes.errors.deleteAssigned": "Resource type has assigned resources.",
   "resources.resourceTypes.errors.load": "Failed to load resource types.",
+  "resources.resourceTypes.errors.notFound": "Resource type not found.",
   "resources.resourceTypes.errors.save": "Failed to save resource type.",
   "resources.resourceTypes.form.appearance.colorClear": "Clear color",
   "resources.resourceTypes.form.appearance.colorHelp": "Pick a color for this resource type.",

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

@@ -199,6 +199,7 @@
   "resources.resourceTypes.errors.delete": "No se pudo eliminar el tipo de recurso.",
   "resources.resourceTypes.errors.deleteAssigned": "El tipo de recurso tiene recursos asignados.",
   "resources.resourceTypes.errors.load": "No se pudieron cargar los tipos de recurso.",
+  "resources.resourceTypes.errors.notFound": "Tipo de recurso no encontrado.",
   "resources.resourceTypes.errors.save": "No se pudo guardar el tipo de recurso.",
   "resources.resourceTypes.form.appearance.colorClear": "Quitar color",
   "resources.resourceTypes.form.appearance.colorHelp": "Elige un color para este tipo de recurso.",

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

@@ -199,6 +199,7 @@
   "resources.resourceTypes.errors.delete": "Nie udało się usunąć typu zasobu.",
   "resources.resourceTypes.errors.deleteAssigned": "Ten typ zasobu ma przypisane zasoby.",
   "resources.resourceTypes.errors.load": "Nie udało się wczytać typów zasobów.",
+  "resources.resourceTypes.errors.notFound": "Nie znaleziono typu zasobu.",
   "resources.resourceTypes.errors.save": "Nie udało się zapisać typu zasobu.",
   "resources.resourceTypes.form.appearance.colorClear": "Wyczyść kolor",
   "resources.resourceTypes.form.appearance.colorHelp": "Wybierz kolor dla tego typu zasobu.",

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

@@ -69,6 +69,7 @@
   "sales.channels.form.errors.create": "Kanal konnte nicht erstellt werden.",
   "sales.channels.form.errors.delete": "Kanal konnte nicht gelöscht werden.",
   "sales.channels.form.errors.load": "Kanal konnte nicht geladen werden.",
+  "sales.channels.form.errors.notFound": "Kanal nicht gefunden.",
   "sales.channels.form.errors.update": "Kanal konnte nicht gespeichert werden.",
   "sales.channels.form.groups.address": "Standort",
   "sales.channels.form.groups.contact": "Kontakt",
@@ -96,6 +97,7 @@
   "sales.channels.offers.errors.duplicateProduct": "Dieses Produkt hat bereits ein Angebot in diesem Kanal.",
   "sales.channels.offers.errors.load": "Angebote konnten nicht geladen werden.",
   "sales.channels.offers.errors.loadOffer": "Angebot konnte nicht geladen werden.",
+  "sales.channels.offers.errors.notFound": "Angebot nicht gefunden.",
   "sales.channels.offers.errors.priceKindDuplicate": "Jede Preisart kann nur einmal überschrieben werden.",
   "sales.channels.offers.errors.priceKindRequired": "Wähle für jede Preisüberschreibung eine Preisart.",
   "sales.channels.offers.errors.removePrice": "Preisüberschreibung konnte nicht entfernt werden.",

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

@@ -69,6 +69,7 @@
   "sales.channels.form.errors.create": "Failed to create channel.",
   "sales.channels.form.errors.delete": "Failed to delete channel.",
   "sales.channels.form.errors.load": "Failed to load channel.",
+  "sales.channels.form.errors.notFound": "Channel not found.",
   "sales.channels.form.errors.update": "Failed to save channel.",
   "sales.channels.form.groups.address": "Location",
   "sales.channels.form.groups.contact": "Contact",
@@ -96,6 +97,7 @@
   "sales.channels.offers.errors.duplicateProduct": "This product already has an offer in this channel.",
   "sales.channels.offers.errors.load": "Failed to load offers.",
   "sales.channels.offers.errors.loadOffer": "Failed to load offer.",
+  "sales.channels.offers.errors.notFound": "Offer not found.",
   "sales.channels.offers.errors.priceKindDuplicate": "Each price kind can only be overridden once.",
   "sales.channels.offers.errors.priceKindRequired": "Select a price kind for each price override.",
   "sales.channels.offers.errors.removePrice": "Failed to remove price override.",

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

@@ -69,6 +69,7 @@
   "sales.channels.form.errors.create": "No se pudo crear el canal.",
   "sales.channels.form.errors.delete": "No se pudo eliminar el canal.",
   "sales.channels.form.errors.load": "No se pudo cargar el canal.",
+  "sales.channels.form.errors.notFound": "Canal no encontrado.",
   "sales.channels.form.errors.update": "No se pudo guardar el canal.",
   "sales.channels.form.groups.address": "Ubicación",
   "sales.channels.form.groups.contact": "Contacto",
@@ -96,6 +97,7 @@
   "sales.channels.offers.errors.duplicateProduct": "Este producto ya tiene una oferta en este canal.",
   "sales.channels.offers.errors.load": "No se pudieron cargar las ofertas.",
   "sales.channels.offers.errors.loadOffer": "No se pudo cargar la oferta.",
+  "sales.channels.offers.errors.notFound": "Oferta no encontrada.",
   "sales.channels.offers.errors.priceKindDuplicate": "Cada tipo de precio solo se puede anular una vez.",
   "sales.channels.offers.errors.priceKindRequired": "Selecciona un tipo de precio para cada precio personalizado.",
   "sales.channels.offers.errors.removePrice": "No se pudo eliminar el precio personalizado.",

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

@@ -69,6 +69,7 @@
   "sales.channels.form.errors.create": "Nie udało się utworzyć kanału.",
   "sales.channels.form.errors.delete": "Nie udało się usunąć kanału.",
   "sales.channels.form.errors.load": "Nie udało się wczytać kanału.",
+  "sales.channels.form.errors.notFound": "Nie znaleziono kanału.",
   "sales.channels.form.errors.update": "Nie udało się zapisać kanału.",
   "sales.channels.form.groups.address": "Lokalizacja",
   "sales.channels.form.groups.contact": "Kontakt",
@@ -96,6 +97,7 @@
   "sales.channels.offers.errors.duplicateProduct": "Ten produkt ma już ofertę w tym kanale.",
   "sales.channels.offers.errors.load": "Nie udało się wczytać ofert.",
   "sales.channels.offers.errors.loadOffer": "Nie udało się wczytać oferty.",
+  "sales.channels.offers.errors.notFound": "Nie znaleziono oferty.",
   "sales.channels.offers.errors.priceKindDuplicate": "Każdy typ ceny można nadpisać tylko raz.",
   "sales.channels.offers.errors.priceKindRequired": "Wybierz rodzaj ceny dla każdego nadpisania.",
   "sales.channels.offers.errors.removePrice": "Nie udało się usunąć nadpisania ceny.",

package/src/modules/sync_excel/widgets/injection/upload-config/target-options.ts

@@ -202,6 +202,45 @@ function normalizeMatchToken(value: string): string {
     .trim()
 }
 
+const TRAILING_IMPORT_QUALIFIERS = new Set(['external', 'imported', 'crm'])
+
+function addNormalizedMatchToken(tokens: Set<string>, value: string): void {
+  const normalized = normalizeMatchToken(value)
+  if (normalized.length > 0) {
+    tokens.add(normalized)
+  }
+}
+
+function stripParentheticalText(value: string): string {
+  return value.replace(/\s*\([^)]*\)\s*/g, ' ')
+}
+
+function stripTrailingImportQualifier(value: string): string {
+  const parts = normalizeMatchToken(value).split(' ').filter((part) => part.length > 0)
+  while (parts.length > 1 && TRAILING_IMPORT_QUALIFIERS.has(parts[parts.length - 1])) {
+    parts.pop()
+  }
+  return parts.join(' ')
+}
+
+function buildCustomFieldMatchTokens(def: CustomFieldDefDto, fallback: string): string[] {
+  const tokens = new Set<string>()
+  const candidates = [
+    def.key,
+    fallback,
+    stripParentheticalText(fallback),
+    stripTrailingImportQualifier(def.key),
+    stripTrailingImportQualifier(fallback),
+    stripTrailingImportQualifier(stripParentheticalText(fallback)),
+  ]
+
+  for (const candidate of candidates) {
+    addNormalizedMatchToken(tokens, candidate)
+  }
+
+  return Array.from(tokens)
+}
+
 function titleizeKey(key: string): string {
   return key
     .split('_')
@@ -248,16 +287,12 @@ function buildCustomFieldOption(def: CustomFieldDefDto): MappingTargetOption {
   const fallback = typeof def.label === 'string' && def.label.trim().length > 0
     ? def.label.trim()
     : titleizeKey(def.key)
-  const normalizedTokens = Array.from(new Set([
-    normalizeMatchToken(def.key),
-    normalizeMatchToken(fallback),
-  ].filter((value) => value.length > 0)))
 
   return {
     value: `cf:${def.key}`,
     fallback,
     mappingKind: 'custom_field',
-    matchTokens: normalizedTokens,
+    matchTokens: buildCustomFieldMatchTokens(def, fallback),
   }
 }