Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate and combine accounting terms for reimbursable and non-reimbursable export destinations #45795

Merged
merged 4 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2083,9 +2083,7 @@ export default {
taxesJournalEntrySwitchNote: "QuickBooks Online doesn't support taxes on journal entries. Please change your export option to vendor bill or check.",
exportDescription: 'Configure how Expensify data exports to QuickBooks Online.',
date: 'Export date',
exportExpenses: 'Export out-of-pocket expenses as',
exportInvoices: 'Export invoices to',
exportCompany: 'Export company cards as',
exportExpensifyCard: 'Export Expensify Card transactions as',
deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
deepDiveExpensifyCardIntegration: 'our integration.',
Expand Down Expand Up @@ -2188,13 +2186,11 @@ export default {
tag: 'Tags',
},
exportDescription: 'Configure how Expensify data exports to Xero.',
exportCompanyCard: 'Export company card expenses as',
purchaseBill: 'Purchase bill',
exportDeepDiveCompanyCard: 'Exported expenses will post as bank transactions to the Xero bank account below, and transaction dates will match the dates on your bank statement.',
bankTransactions: 'Bank transactions',
xeroBankAccount: 'Xero bank account',
xeroBankAccountDescription: 'Choose where expenses will post as bank transactions.',
exportExpenses: 'Export out-of-pocket expenses as',
exportExpensesDescription: 'Reports will export as a purchase bill with the date and status selected below.',
purchaseBillDate: 'Purchase bill date',
exportInvoices: 'Export invoices as',
Expand Down Expand Up @@ -2261,15 +2257,13 @@ export default {
},
},
reimbursableExpenses: {
label: 'Export out-of-pocket expenses as',
description: 'Set how out-of-pocket expenses export to Sage Intacct.',
values: {
[CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Expense reports',
[CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Vendor bills',
},
},
nonReimbursableExpenses: {
label: 'Export company cards as',
description: 'Set how company card purchases export to Sage Intacct.',
values: {
[CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Credit cards',
Expand Down Expand Up @@ -2299,8 +2293,6 @@ export default {
subsidiary: 'Subsidiary',
subsidiarySelectDescription: "Choose the subsidiary in NetSuite that you'd like to import data from.",
exportDescription: 'Configure how Expensify data exports to NetSuite.',
exportReimbursable: 'Export reimbursable expenses as',
exportNonReimbursable: 'Export non-reimbursable expenses as',
exportInvoices: 'Export invoices to',
journalEntriesTaxPostingAccount: 'Journal entries tax posting account',
journalEntriesProvTaxPostingAccount: 'Journal entries provincial tax posting account',
Expand Down Expand Up @@ -3163,6 +3155,8 @@ export default {
'The preferred exporter can be any workspace admin, but must also be a Domain Admin if you set different export accounts for individual company cards in Domain Settings.',
exportPreferredExporterSubNote: 'Once set, the preferred exporter will see reports for export in their account.',
exportAs: 'Export as',
exportOutOfPocket: 'Export out-of-pocket expenses as',
exportCompanyCard: 'Export company card expenses as',
defaultVendor: 'Default vendor',
autoSync: 'Auto-sync',
reimbursedReports: 'Sync reimbursed reports',
Expand Down
10 changes: 2 additions & 8 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2113,9 +2113,7 @@ export default {
taxesJournalEntrySwitchNote: 'QuickBooks Online no permite impuestos en los asientos contables. Por favor, cambia la opción de exportación a factura de proveedor o cheque.',
locationsAdditionalDescription:
'QuickBooks Online no permite lugares en facturas de proveedores o cheques. Como tienes activadas los lugares en tu espacio de trabajo, estas opciones de exportación no están disponibles.',
exportExpenses: 'Exportar gastos de bolsillo como',
exportInvoices: 'Exportar facturas a',
exportCompany: 'Exportar tarjetas de empresa como',
exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Online.',
date: 'Fecha de exportación',
deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
Expand Down Expand Up @@ -2229,14 +2227,12 @@ export default {
tag: 'Etiquetas',
},
exportDescription: 'Configura cómo se exportan los datos de Expensify a Xero.',
exportCompanyCard: 'Exportar gastos de la tarjeta de empresa como',
purchaseBill: 'Factura de compra',
exportDeepDiveCompanyCard:
'Cada gasto exportado se contabiliza como una transacción bancaria en la cuenta bancaria de Xero que selecciones a continuación. Las fechas de las transacciones coincidirán con las fechas de el extracto bancario.',
bankTransactions: 'Transacciones bancarias',
xeroBankAccount: 'Cuenta bancaria de Xero',
xeroBankAccountDescription: 'Elige dónde se contabilizarán los gastos como transacciones bancarias.',
exportExpenses: 'Exportar gastos por cuenta propia como',
exportExpensesDescription: 'Los informes se exportarán como una factura de compra utilizando la fecha y el estado que seleccione a continuación',
purchaseBillDate: 'Fecha de la factura de compra',
exportInvoices: 'Exportar facturas como',
Expand Down Expand Up @@ -2305,15 +2301,13 @@ export default {
},
},
reimbursableExpenses: {
label: 'Exportar gastos por cuenta propia como',
description: 'Establece cómo se exportan los gastos por cuenta propia a Sage Intacct.',
values: {
[CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Informes de gastos',
[CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Facturas de proveedores',
},
},
nonReimbursableExpenses: {
label: 'Exportar tarjetas de empresa como',
description: 'Establece cómo se exportan las compras con tarjeta de empresa a Sage Intacct.',
values: {
[CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Tarjetas de crédito',
Expand Down Expand Up @@ -2344,8 +2338,6 @@ export default {
subsidiary: 'Subsidiaria',
subsidiarySelectDescription: 'Elige la subsidiaria de NetSuite de la que deseas importar datos.',
exportDescription: 'Configura cómo se exportan los datos de Expensify a NetSuite.',
exportReimbursable: 'Exportar gastos reembolsables como',
exportNonReimbursable: 'Exportar gastos no reembolsables como',
exportInvoices: 'Exportar facturas a',
journalEntriesTaxPostingAccount: 'Cuenta de registro de impuestos de asientos contables',
journalEntriesProvTaxPostingAccount: 'Cuenta de registro de impuestos provinciales de asientos contables',
Expand Down Expand Up @@ -3153,6 +3145,8 @@ export default {
'Puede ser cualquier administrador del espacio de trabajo, pero debe ser un administrador de dominio si configura diferentes cuentas de exportación para tarjetas de empresa individuales en la configuración del dominio.',
exportPreferredExporterSubNote: 'Una vez configurado, el exportador preferido verá los informes para exportar en tu cuenta.',
exportAs: 'Exportar cómo',
exportOutOfPocket: ' Exportar gastos por cuenta propia como',
exportCompanyCard: 'Exportar gastos de la tarjeta de empresa como',
defaultVendor: 'Proveedor predeterminado',
autoSync: 'Autosincronización',
reimbursedReports: 'Sincronizar informes reembolsados',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function SageIntacctExportPage({policy}: WithPolicyProps) {
pendingAction: config?.pendingFields?.exportDate,
},
{
description: translate('workspace.sageIntacct.reimbursableExpenses.label'),
description: translate('workspace.accounting.exportOutOfPocket'),
action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.getRoute(policyID)),
title: exportConfig?.reimbursable
? translate(`workspace.sageIntacct.reimbursableExpenses.values.${exportConfig.reimbursable}`)
Expand All @@ -45,7 +45,7 @@ function SageIntacctExportPage({policy}: WithPolicyProps) {
pendingAction: config?.pendingFields?.reimbursable ?? config?.pendingFields?.reimbursableExpenseReportDefaultVendor,
},
{
description: translate('workspace.sageIntacct.nonReimbursableExpenses.label'),
description: translate('workspace.accounting.exportCompanyCard'),
action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID)),
title: exportConfig?.nonReimbursable
? translate(`workspace.sageIntacct.nonReimbursableExpenses.values.${exportConfig.nonReimbursable}`)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ function SageIntacctNonReimbursableExpensesPage({policy}: WithPolicyProps) {

return (
<ConnectionLayout
headerTitle="workspace.sageIntacct.nonReimbursableExpenses.label"
headerTitle="workspace.accounting.exportCompanyCard"
title="workspace.sageIntacct.nonReimbursableExpenses.description"
titleStyle={[styles.ph5, styles.pb5]}
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function SageIntacctReimbursableExpensesPage({policy}: WithPolicyProps) {

return (
<ConnectionLayout
headerTitle="workspace.sageIntacct.reimbursableExpenses.label"
headerTitle="workspace.accounting.exportOutOfPocket"
title="workspace.sageIntacct.reimbursableExpenses.description"
titleStyle={[styles.ph5, styles.pb5]}
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
},
{
type: 'menuitem',
description: translate('workspace.netsuite.exportReimbursable'),
description: translate('workspace.accounting.exportOutOfPocket'),
onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE)),
brickRoadIndicator: config?.errorFields?.reimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
title: config?.reimbursableExpensesExportDestination ? translate(`workspace.netsuite.exportDestination.values.${config.reimbursableExpensesExportDestination}.label`) : undefined,
Expand All @@ -96,7 +96,7 @@ function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
},
{
type: 'menuitem',
description: translate('workspace.netsuite.exportNonReimbursable'),
description: translate('workspace.accounting.exportCompanyCard'),
onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.NON_REIMBURSABLE)),
brickRoadIndicator: config?.errorFields?.nonreimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
title: config?.nonreimbursableExpensesExportDestination
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function NetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps) {
<ConnectionLayout
displayName={NetSuiteExportExpensesPage.displayName}
onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
headerTitle={`workspace.netsuite.${isReimbursable ? 'exportReimbursable' : 'exportNonReimbursable'}`}
headerTitle={`workspace.accounting.${isReimbursable ? 'exportOutOfPocket' : 'exportCompanyCard'}`}
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
policyID={policyID}
featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
includeSafeAreaPaddingBottom={false}
testID={QuickbooksCompanyCardExpenseAccountPage.displayName}
>
<HeaderWithBackButton title={translate('workspace.qbo.exportCompany')} />
<HeaderWithBackButton title={translate('workspace.accounting.exportCompanyCard')} />
<ScrollView contentContainerStyle={styles.pb2}>
<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportCompanyCardsDescription')}</Text>
<OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableExpensesExportDestination}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
errorText: errorFields?.exportDate ? translate('common.genericErrorMessage') : undefined,
},
{
description: translate('workspace.qbo.exportExpenses'),
description: translate('workspace.accounting.exportOutOfPocket'),
onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID)),
brickRoadIndicator: !!errorFields?.exportEntity || !!errorFields?.reimbursableExpensesAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
title: reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}`) : undefined,
Expand All @@ -68,7 +68,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
errorText: errorFields?.receivableAccount ? translate('common.genericErrorMessage') : undefined,
},
{
description: translate('workspace.qbo.exportCompany'),
description: translate('workspace.accounting.exportCompanyCard'),
onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID)),
brickRoadIndicator: errorFields?.exportCompanyCard ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
title: nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}`) : undefined,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
includeSafeAreaPaddingBottom={false}
testID={QuickbooksOutOfPocketExpenseConfigurationPage.displayName}
>
<HeaderWithBackButton title={translate('workspace.qbo.exportExpenses')} />
<HeaderWithBackButton title={translate('workspace.accounting.exportOutOfPocket')} />
<ScrollView contentContainerStyle={styles.pb2}>
<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportOutOfPocketExpensesDescription')}</Text>
<OfflineWithFeedback pendingAction={pendingFields?.reimbursableExpensesExportDestination}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
errorText: errorFields?.exporter ? translate('common.genericErrorMessage') : undefined,
},
{
description: translate('workspace.xero.exportExpenses'),
description: translate('workspace.accounting.exportOutOfPocket'),
title: translate('workspace.xero.purchaseBill'),
interactive: false,
shouldShowRightIcon: false,
Expand Down Expand Up @@ -72,7 +72,7 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
helperText: translate('workspace.xero.exportInvoicesDescription'),
},
{
description: translate('workspace.xero.exportCompanyCard'),
description: translate('workspace.accounting.exportCompanyCard'),
title: translate('workspace.xero.bankTransactions'),
shouldShowRightIcon: false,
interactive: false,
Expand Down
Loading