Skip to content

[Vendor matching CC] Vendor column in merchant-rules CSV importer - #100760

Merged
Beamanator merged 27 commits into
Expensify:mainfrom
dominictb:feat/vendor-csv-import
Sep 18, 2026
Merged

Beamanator merged 27 commits into
Expensify:mainfrom
dominictb:feat/vendor-csv-import

Conversation

@dominictb

@dominictb dominictb commented Sep 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Implements "Updated vendor" column support for merchant-rules CSV importer. The data contains the vendorname, we need to resolve the corresponding vendorID if exists to pass to the backend.

If there is no matching vendor → Skip the Vendor column, continue with other columns (besides Merchant) if any → If there're no other columns, skip the row entirely.

Fixed Issues

$ #100762
PROPOSAL:

Tests

Precondition:

  • Workspace is connected to an accounting connection (QBO in my test)
  • Has a CSV file containing rules to import with:
    • at least 3 columns: Merchant is, Merchant contains, Updated vendor
    • "Updated vendor" column contains at least 1 vendor from the list of existing vendors (see workspace's Vendors tab).
  1. Go to workspace settings > Rules > More > Import merchant rules
  2. Select the CSV file (e.g., merchant_rules_import_mock.csv)
  3. Map the "Updated vendor" column from the file to "Updated vendor" field > Import
  4. Verify the import succeeds saying how manny vendors were skipped because they don't exist in this workspace (1 in my example file)
  5. Verify under Rules > Merchant section, the rules are imported with correct Vendor field (Uber merchant → Uber vendor; Starbucks merchant → Starbucks vendor; Amazon merchant → Agent 64 vendor as in my example file)
  • Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Same as Tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-09-11.at.01.02.54.mov

@melvin-bot

melvin-bot Bot commented Sep 9, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

@OSBotify

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index 0740e99f..99ea7cf2 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -1234,6 +1234,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'Neue Karten und Transaktionen können etwas Zeit benötigen, bis sie erscheinen. Bitte haben Sie etwas Geduld.',
         importMembersRolePermissionWarning: 'Sie haben keine Berechtigung, einige Mitgliederrollen zuzuweisen. Alle betroffenen neuen Mitglieder wurden als Mitglieder eingeladen.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 Anbieter wurde übersprungen, weil er in diesem Workspace nicht existiert.',
+            other: `${count} Anbieter wurden übersprungen, weil sie in diesem Workspace nicht existieren.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '1 Lieferant wurde übersprungen, weil er in diesem Workspace nicht existiert.',
+            other: `${count} Lieferanten wurden übersprungen, weil sie in diesem Workspace nicht existieren.`,
+        }),
     },
     receipt: {
         upload: 'Beleg hochladen',
@@ -8014,6 +8022,8 @@ Fordern Sie Spesendetails wie Belege und Beschreibungen an, legen Sie Limits und
                 turnOnTaxesFirstPrompt: 'Kategorienregeln legen einen Standardsteuersatz fest. Aktivieren Sie Steuern in Ihren Workspace-Einstellungen, um sie zu verwenden.',
                 categoryRulesApplyGoingForwardTitle: 'Kategorienregeln gelten ab jetzt',
                 categoryRulesApplyGoingForwardPrompt: 'Ein Standardsatz für Steuern gilt für neue Ausgaben in dieser Kategorie. Bereits vorhandene Ausgaben werden nicht geändert.',
+                importColumnUpdatedVendor: 'Lieferant aktualisiert',
+                importColumnUpdatedSupplier: 'Lieferant aktualisiert',
             },
             categoryRules: {
                 title: 'Kategorienregeln',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index abcb0fc0..fd8b4718 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -1283,6 +1283,14 @@ const translations: TranslationDeepObject<typeof en> = {
         importMerchantRulesRequiredColumns:
             'Ουπς! Πρέπει να αντιστοιχίσετε τουλάχιστον μία στήλη «Ο έμπορος είναι» ή «Ο έμπορος περιέχει», καθώς και τουλάχιστον ένα πεδίο για ενημέρωση. Παρακαλούμε ελέγξτε και δοκιμάστε ξανά.',
         importMembersRolePermissionWarning: 'Δεν έχετε δικαίωμα να αναθέσετε ορισμένους ρόλους μέλους. Τυχόν επηρεαζόμενα νέα μέλη προσκλήθηκαν ως μέλη.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 προμηθευτής παραλήφθηκε επειδή δεν υπάρχει σε αυτόν τον χώρο εργασίας.',
+            other: `Παραλείφθηκαν ${count} προμηθευτές επειδή δεν υπάρχουν σε αυτόν τον χώρο εργασίας.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: 'Παραλείφθηκε 1 προμηθευτής επειδή δεν υπάρχει σε αυτόν τον χώρο εργασίας.',
+            other: `Παραλείφθηκαν ${count} προμηθευτές επειδή δεν υπάρχουν σε αυτόν τον χώρο εργασίας.`,
+        }),
     },
     receipt: {
         upload: 'Μεταφορτώστε απόδειξη',
@@ -8342,6 +8350,8 @@ ${reportName}`,
                 categoryRulesApplyGoingForwardTitle: 'Οι κανόνες κατηγορίας ισχύουν από εδώ και στο εξής',
                 categoryRulesApplyGoingForwardPrompt:
                     'Ένας προεπιλεγμένος φορολογικός συντελεστής εφαρμόζεται σε νέες δαπάνες σε αυτή την κατηγορία. Οι δαπάνες που υπάρχουν ήδη δεν θα αλλάξουν.',
+                importColumnUpdatedVendor: 'Ενημερώθηκε ο προμηθευτής',
+                importColumnUpdatedSupplier: 'Ενημερώθηκε ο προμηθευτής',
             },
             newRule: {
                 title: 'Νέος κανόνας',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 05f9efd3..92a45590 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1234,6 +1234,14 @@ const translations: TranslationDeepObject<typeof en> = {
                 `Por favor confirma los detalles a continuación para los ${count} nuevos miembros del espacio de trabajo que se agregarán como parte de esta carga. Los miembros existentes no recibirán actualizaciones de rol ni mensajes de invitación.`,
         }),
         importMembersRolePermissionWarning: 'No tienes permiso para asignar algunos roles de miembro. Los nuevos miembros afectados se han invitado como miembros.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: 'Se omitió 1 proveedor porque no existe en este espacio de trabajo.',
+            other: `Se omitieron ${count} proveedores porque no existen en este espacio de trabajo.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: 'Se omitió 1 proveedor porque no existe en este espacio de trabajo.',
+            other: `Se omitieron ${count} proveedores porque no existen en este espacio de trabajo.`,
+        }),
     },
     receipt: {
         upload: 'Subir recibo',
@@ -8013,6 +8021,8 @@ ${reportName}`,
                     'Las reglas de categoría establecen una tasa de impuesto predeterminada. Activa los impuestos en la configuración de tu espacio de trabajo para usarlos.',
                 categoryRulesApplyGoingForwardTitle: 'Las reglas de categoría se aplican de ahora en adelante',
                 categoryRulesApplyGoingForwardPrompt: 'Se aplica una tasa de impuesto predeterminada a los nuevos gastos de esta categoría. Los gastos que ya existen no cambiarán.',
+                importColumnUpdatedVendor: 'Proveedor actualizado',
+                importColumnUpdatedSupplier: 'Proveedor actualizado',
             },
             categoryRules: {
                 title: 'Reglas de categoría',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index a5b9d1ff..357d4b41 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1238,6 +1238,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'L’apparition de nouvelles cartes et transactions peut prendre un certain temps, veuillez patienter.',
         importMembersRolePermissionWarning: 'Vous n’avez pas l’autorisation d’assigner certains rôles de membre. Tous les nouveaux membres concernés ont été invités en tant que membres.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 fournisseur a été ignoré car il n’existe pas dans cet espace de travail.',
+            other: `${count} fournisseurs ont été ignorés car ils n’existent pas dans cet espace de travail.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '1 fournisseur a été ignoré car il n’existe pas dans cet espace de travail.',
+            other: `${count} fournisseurs ont été ignorés car ils n'existent pas dans cet espace de travail.`,
+        }),
     },
     receipt: {
         upload: 'Télécharger le reçu',
@@ -8037,6 +8045,8 @@ Rendez obligatoires des informations de dépense comme les reçus et les descrip
                 categoryRulesApplyGoingForwardTitle: 'Les règles de catégorie s’appliquent à partir de maintenant',
                 categoryRulesApplyGoingForwardPrompt:
                     'Un taux de taxe par défaut s’applique aux nouvelles dépenses de cette catégorie. Les dépenses déjà existantes ne seront pas modifiées.',
+                importColumnUpdatedVendor: 'Fournisseur mis à jour',
+                importColumnUpdatedSupplier: 'Fournisseur mis à jour',
             },
             categoryRules: {
                 title: 'Règles de catégorie',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 337a9b81..08094ae7 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -1234,6 +1234,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'Le nuove carte e transazioni potrebbero impiegare un po’ di tempo per apparire, attendi per favore.',
         importMembersRolePermissionWarning: "Non hai l'autorizzazione per assegnare alcuni ruoli ai membri. I nuovi membri interessati sono stati invitati come membri.",
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 fornitore è stato ignorato perché non esiste in questo spazio di lavoro.',
+            other: `${count} fornitori sono stati ignorati perché non esistono in questo spazio di lavoro.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '1 fornitore è stato ignorato perché non esiste in questo spazio di lavoro.',
+            other: `${count} fornitori sono stati ignorati perché non esistono in questo spazio di lavoro.`,
+        }),
     },
     receipt: {
         upload: 'Carica ricevuta',
@@ -7974,6 +7982,8 @@ Richiedi dettagli sulle spese come ricevute e descrizioni, imposta limiti e valo
                 turnOnTaxesFirstPrompt: 'Le regole di categoria impostano un’aliquota fiscale predefinita. Attiva le imposte nelle impostazioni dello spazio di lavoro per usarle.',
                 categoryRulesApplyGoingForwardTitle: 'Le regole di categoria si applicano da ora in poi',
                 categoryRulesApplyGoingForwardPrompt: 'Un’aliquota fiscale predefinita viene applicata alle nuove spese in questa categoria. Le spese già esistenti non verranno modificate.',
+                importColumnUpdatedVendor: 'Fornitore aggiornato',
+                importColumnUpdatedSupplier: 'Fornitore aggiornato',
             },
             categoryRules: {
                 title: 'Regole di categoria',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index b143c3a5..09492737 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -1220,6 +1220,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: '新しいカードや取引が表示されるまでに少し時間がかかる場合があります。しばらくお待ちください。',
         importMembersRolePermissionWarning: '一部のメンバー権限を割り当てる権限がありません。影響のある新しいメンバーは、メンバーとして招待されました。',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: 'このワークスペースに存在しないため、ベンダーが1件スキップされました。',
+            other: `このワークスペースに存在しないため、${count} 件のベンダーをスキップしました。`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: 'このワークスペースに存在しないため、1件のサプライヤーをスキップしました。',
+            other: `${count} 件の仕入先は、このワークスペースに存在しないためスキップされました。`,
+        }),
     },
     receipt: {
         upload: '領収書をアップロード',
@@ -7871,6 +7879,8 @@ ${reportName}`,
                 turnOnTaxesFirstPrompt: 'カテゴリルールでは、デフォルトの税率を設定できます。利用するには、ワークスペース設定で税金を有効にしてください。',
                 categoryRulesApplyGoingForwardTitle: 'カテゴリルールは今後に適用されます',
                 categoryRulesApplyGoingForwardPrompt: 'このカテゴリーの新しい経費には、デフォルトの税率が適用されます。既存の経費は変更されません。',
+                importColumnUpdatedVendor: '仕入先を更新しました',
+                importColumnUpdatedSupplier: '仕入先を更新しました',
             },
             categoryRules: {
                 title: 'カテゴリルール',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 74bdfd99..d8bc130b 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -1233,6 +1233,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'Nieuwe kaarten en transacties kunnen even duren voordat ze verschijnen, even geduld.',
         importMembersRolePermissionWarning: 'Je hebt geen toestemming om sommige ledensrollen toe te wijzen. Alle betrokken nieuwe leden zijn uitgenodigd als lid.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 leverancier is overgeslagen omdat die niet bestaat in deze workspace.',
+            other: `${count} leveranciers zijn overgeslagen omdat ze niet bestaan in deze workspace.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '1 leverancier is overgeslagen omdat die niet bestaat in deze werkruimte.',
+            other: `${count} leveranciers zijn overgeslagen omdat ze niet in deze werkruimte bestaan.`,
+        }),
     },
     receipt: {
         upload: 'Bon uploaden',
@@ -7949,6 +7957,8 @@ Vereis onkostendetails zoals bonnen en beschrijvingen, stel limieten en standaar
                 turnOnTaxesFirstPrompt: 'Categorischregels stellen een standaardbelastingtarief in. Schakel belastingen in bij de instellingen van je workspace om ze te gebruiken.',
                 categoryRulesApplyGoingForwardTitle: 'Categoriegregels gelden vanaf nu',
                 categoryRulesApplyGoingForwardPrompt: 'Een standaardbelastingtarief is van toepassing op nieuwe uitgaven in deze categorie. Bestaande uitgaven veranderen niet.',
+                importColumnUpdatedVendor: 'Leverancier bijgewerkt',
+                importColumnUpdatedSupplier: 'Leverancier bijgewerkt',
             },
             categoryRules: {
                 title: 'Categorisatieregels',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 3d9e775a..e78f5b44 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -1266,6 +1266,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'Nowe karty i transakcje mogą potrzebować trochę czasu, aby się pojawić, prosimy o cierpliwość.',
         importMembersRolePermissionWarning: 'Nie masz uprawnień do przypisywania niektórych ról członków. Wszyscy nowi członkowie, których to dotyczy, zostali zaproszeni jako członkowie.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: 'Pominięto 1 kontrahenta, ponieważ nie istnieje w tej przestrzeni roboczej.',
+            other: `Pominięto ${count} dostawców, ponieważ nie istnieją w tym obszarze roboczym.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: 'Pominięto 1 dostawcę, ponieważ nie istnieje w tym obszarze roboczym.',
+            other: `Pominięto ${count} dostawców, ponieważ nie istnieją w tym workspace.`,
+        }),
     },
     receipt: {
         upload: 'Prześlij paragon',
@@ -7975,6 +7983,8 @@ Wymagaj szczegółów wydatków, takich jak paragony i opisy, ustawiaj limity i
                 turnOnTaxesFirstPrompt: 'Reguły kategorii ustawiają domyślną stawkę podatku. Włącz podatki w ustawieniach swojego workspace, aby z nich korzystać.',
                 categoryRulesApplyGoingForwardTitle: 'Reguły kategorii będą stosowane od teraz',
                 categoryRulesApplyGoingForwardPrompt: 'Domyślna stawka podatku będzie stosowana do nowych wydatków w tej kategorii. Istniejące wydatki nie zostaną zmienione.',
+                importColumnUpdatedVendor: 'Zaktualizowano kontrahenta',
+                importColumnUpdatedSupplier: 'Zaktualizowano dostawcę',
             },
             categoryRules: {
                 title: 'Reguły kategorii',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 436385fd..ec5786f4 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -1233,6 +1233,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: 'Novos cartões e transações podem levar algum tempo para aparecer, aguarde um momento.',
         importMembersRolePermissionWarning: 'Você não tem permissão para atribuir alguns cargos de membro. Quaisquer novos membros afetados foram convidados como membros.',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '1 fornecedor foi ignorado porque não existe neste workspace.',
+            other: `${count} fornecedores foram ignorados porque não existem neste workspace.`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '1 fornecedor foi ignorado porque não existe neste workspace.',
+            other: `${count} fornecedores foram ignorados porque não existem neste workspace.`,
+        }),
     },
     receipt: {
         upload: 'Carregar recibo',
@@ -7957,6 +7965,8 @@ Exija dados de despesas como recibos e descrições, defina limites e padrões e
                 turnOnTaxesFirstPrompt: 'As regras de categoria definem uma alíquota de imposto padrão. Ative os impostos nas configurações do seu workspace para usá-los.',
                 categoryRulesApplyGoingForwardTitle: 'As regras de categoria se aplicam daqui em diante',
                 categoryRulesApplyGoingForwardPrompt: 'Uma taxa de imposto padrão se aplica às novas despesas desta categoria. As despesas que já existem não serão alteradas.',
+                importColumnUpdatedVendor: 'Fornecedor atualizado',
+                importColumnUpdatedSupplier: 'Fornecedor atualizado',
             },
             categoryRules: {
                 title: 'Regras de categoria',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 35d21fb9..39ad193c 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -1184,6 +1184,14 @@ const translations: TranslationDeepObject<typeof en> = {
         }),
         importCompanyCardTransactionsPendingMessage: '新卡片和交易可能需要一些时间才会显示,请耐心等待。',
         importMembersRolePermissionWarning: '您没有权限分配某些成员角色。所有受影响的新成员已按普通成员身份被邀请。',
+        importMerchantRulesSkippedVendors: ({count}: {count: number}) => ({
+            one: '有 1 个供应商已被跳过,因为它在此工作区中不存在。',
+            other: `已跳过 ${count} 个供应商,因为它们在此工作区中不存在。`,
+        }),
+        importMerchantRulesSkippedSuppliers: ({count}: {count: number}) => ({
+            one: '已跳过 1 个供应商,因为它在此工作区中不存在。',
+            other: `已跳过 ${count} 个供应商,因为它们在此工作区中不存在。`,
+        }),
     },
     receipt: {
         upload: '上传收据',
@@ -7676,6 +7684,8 @@ ${reportName}`,
                 turnOnTaxesFirstPrompt: '类别规则会设置默认税率。请在工作区设置中启用税费以使用此功能。',
                 categoryRulesApplyGoingForwardTitle: '类别规则将从现在起生效',
                 categoryRulesApplyGoingForwardPrompt: '此类别中的新报销将应用默认税率,已存在的报销不会改变。',
+                importColumnUpdatedVendor: '已更新供应商',
+                importColumnUpdatedSupplier: '已更新供应商',
             },
             categoryRules: {
                 title: '类别规则',

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@dominictb
dominictb marked this pull request as ready for review September 10, 2026 18:13
@dominictb
dominictb requested review from a team as code owners September 10, 2026 18:13
@melvin-bot
melvin-bot Bot requested a review from cretadn22 September 10, 2026 18:13
@melvin-bot

melvin-bot Bot commented Sep 10, 2026

Copy link
Copy Markdown

@cretadn22 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from joekaufmanexpensify and removed request for a team September 10, 2026 18:13
@dominictb
dominictb requested review from heyjennahay and removed request for joekaufmanexpensify September 10, 2026 18:13

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 259fd2961b

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@melvin-bot

melvin-bot Bot commented Sep 16, 2026

Copy link
Copy Markdown

I could not review this diff, so I did not approve the workflow runs. An Expensify employee will review it and approve them manually.

@dominictb
dominictb requested a review from cretadn22 September 16, 2026 17:41
@melvin-bot
melvin-bot Bot requested a review from Beamanator September 17, 2026 13:12

@heyjennahay heyjennahay left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Map the "Updated vendor" column from the file to "Updated vendor" (QBO, Sage Intacct) or "Updated supplier" (Xero) field > Import

Just to clarify, we should use the term Vendor universally, across all connections, including Xero

@Beamanator

Copy link
Copy Markdown
Contributor

@dominictb conflicts, sorry - and can you also check to make sure that we still use the term "Vendor" for Xero? 🙏

@melvin-bot

melvin-bot Bot commented Sep 18, 2026

Copy link
Copy Markdown

I could not review this diff, so I did not approve the workflow runs. An Expensify employee will review it and approve them manually.

@dominictb

Copy link
Copy Markdown
Contributor Author

Updated and retested well

@Beamanator Beamanator left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks!

@Beamanator
Beamanator merged commit 2d262c8 into Expensify:main Sep 18, 2026
37 of 39 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 Beamanator has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.4.90-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Yes, help site changes are required. Draft PR: Docs updates for E/A#100760 Updated vendor column in merchant rules import — labelled HelpDot, assigned to dominictb.

Two published articles document the merchant-rules spreadsheet importer, and both listed every mappable field except the new Updated vendor option. Neither explained how a vendor name is resolved, or why a vendor can be dropped from an import that otherwise succeeds.

What I changed

docs/articles/new-expensify/workspaces/Import-Merchant-Rules.md

  • Added Updated vendor to the mappable fields in step 6.
  • Added a prerequisite note that the field only appears where vendor matching is active.
  • New section on how a vendor name is matched: case-insensitive, spaces trimmed, skipped on no match or duplicate name, whole row skipped when it was the row's only update.
  • Noted that the confirmation message reports how many vendors were skipped.
  • New FAQs: why a vendor was skipped, and that an Updated supplier header is auto-detected even though the field is always labelled Updated vendor.

docs/articles/new-expensify/workspaces/Workspace-Merchant-Rules.md

  • Added Updated vendor to the spreadsheet column list.
  • Added Vendor to the "What expense fields can be updated by Merchant Rules?" FAQ, which was already stale for the manually-created rule field.
How I verified the labels, and two things I left out

Labels. Updated vendor comes from src/languages/en.ts:8477. The updatedvendor / updatedsupplier header auto-detection comes from src/libs/importSpreadsheetUtils.ts:155-158. The name-match, duplicate-name, and whole-row-skip behavior comes from src/pages/workspace/rules/MerchantRules/ImportedMerchantRulesPage.tsx:118-127 and the row-skip condition at line 234.

Live UI. I confirmed the navigation path on a Control workspace with Rules enabled: the Rules page shows General, Card restrictions, Expense defaults, Field requirements, Flag for review, and Agents; More opens a menu with exactly Import merchant rules; that opens an Import spreadsheet panel with a Choose file button. I could not reach the column-mapping screen — the web test harness has no file-upload primitive — so the mapping dropdown options in the articles come from en.ts rather than from a screenshot. Worth a glance when you review.

Left out on purpose, your call:

  • docs/assets/Files/merchant-rule-import-template.csv is unchanged. Adding an Updated vendor column would put an unmappable column in the template for every workspace without vendor matching. Tell me and I'll add it.
  • Xero, Rillet, and DualEntry vendor matching sit behind the vendorMatching beta, so the prerequisite wording says "an accounting connection that assigns vendors to company card expenses" instead of naming them.

@dominictb, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.4.90-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants