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.

Sign up for GitHub

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

Update QBO connection copy #44124

Merged
merged 20 commits into from
Jun 28, 2024
Merged

Update QBO connection copy #44124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
deaee5a
Update en.ts
jamesdeanexpensify Jun 20, 2024
f674417
Update QuickbooksCompanyCardExpenseAccountPage.tsx
jamesdeanexpensify Jun 20, 2024
8ebc7b7
Update QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
jamesdeanexpensify Jun 20, 2024
5d9ab7c
Update QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
jamesdeanexpensify Jun 20, 2024
f292d93
Update QuickbooksCompanyCardExpenseAccountPage.tsx
jamesdeanexpensify Jun 20, 2024
ed3c6c6
Update QuickbooksAccountSelectPage.tsx
jamesdeanexpensify Jun 20, 2024
9096a1c
Update en.ts
jamesdeanexpensify Jun 20, 2024
826844d
Update es.ts
jamesdeanexpensify Jun 20, 2024
aef3140
Update es.ts
jamesdeanexpensify Jun 20, 2024
94b43e6
Update es.ts
jamesdeanexpensify Jun 20, 2024
d19d4a1
Update es.ts
jamesdeanexpensify Jun 20, 2024
8d3a132
Merge branch 'main' of github.com:Expensify/App into jamesdeanexpensi…
NikkiWines Jun 25, 2024
0567cfd
Update QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
jamesdeanexpensify Jun 26, 2024
99d4e99
Update QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
jamesdeanexpensify Jun 26, 2024
8fcaa79
Merge branch 'main' of github.com:Expensify/App into jamesdeanexpensi…
NikkiWines Jun 26, 2024
2bb9a6b
Merge branch 'jamesdeanexpensify-patch-5' of github.com:Expensify/App…
NikkiWines Jun 26, 2024
a9f91f8
Merge branch 'main' of github.com:Expensify/App into jamesdeanexpensi…
NikkiWines Jun 27, 2024
486cf82
fix malformed xero consts
NikkiWines Jun 27, 2024
1850e78
formatting
NikkiWines Jun 27, 2024
b1666b2
Update src/languages/es.ts
jamesdeanexpensify Jun 28, 2024
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
21 changes: 10 additions & 11 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2060,12 +2060,11 @@ export default {
exportVendorBillDescription:
"We'll create an itemized vendor bill for each Expensify report and add it to the account below. If this period is closed, we'll post to the 1st of the next open period.",
account: 'Account',
accountDescription: 'Choose where to post journal entry offsets.',
accountDescription: 'Choose where to post journal entries.',
accountsPayable: 'Accounts payable',
accountsPayableDescription: 'Choose where to create vendor bills.',
bankAccount: 'Bank account',
bankAccountDescription: 'Choose where to send checks from.',
optionBelow: 'Choose an option below:',
companyCardsLocationEnabledDescription:
"QuickBooks Online doesn't support locations on vendor bill exports. As you have locations enabled on your workspace, this export option is unavailable.",
outOfPocketTaxEnabledDescription:
Expand All @@ -2075,7 +2074,7 @@ export default {
advancedConfig: {
advanced: 'Advanced',
autoSync: 'Auto-sync',
autoSyncDescription: 'Sync QuickBooks Online and Expensify automatically, every day.',
autoSyncDescription: 'Expensify will automatically sync with QuickBooks Online every day.',
inviteEmployees: 'Invite employees',
inviteEmployeesDescription: 'Import Quickbooks Online employee records and invite employees to this workspace.',
createEntities: 'Auto-create entities',
Expand All @@ -2101,8 +2100,8 @@ export default {
[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Description`]:
"We'll create an itemized vendor bill for each Expensify report with the date of the last expense, and add it to the account below. If this period is closed, we'll post to the 1st of the next open period.",

[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Debit card transactions will export to the bank account below.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Credit card transactions will export to the bank account below.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Choose where to export debit card transactions.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Choose where to export credit card transactions.',
[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}AccountDescription`]: 'Choose a vendor to apply to all credit card transactions.',

[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Error`]: 'Vendor bills are unavailable when locations are enabled. Please choose a different export option.',
Expand Down Expand Up @@ -2149,7 +2148,7 @@ export default {
advancedConfig: {
advanced: 'Advanced',
autoSync: 'Auto-sync',
autoSyncDescription: 'Sync Xero and Expensify automatically, every day.',
autoSyncDescription: 'Expensify will automatically sync with Xero every day.',
purchaseBillStatusTitle: 'Purchase bill status',
reimbursedReports: 'Sync reimbursed reports',
reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the Xero account below.',
Expand All @@ -2159,18 +2158,18 @@ export default {
xeroBillPaymentAccountDescription: "Choose a bank account for reimbursements and we'll create the payment in Xero.",
},
exportDate: {
label: 'Export date',
description: 'Use this date when exporting purchase bills to Xero.',
label: 'Purchase bill date',
description: 'Use this date when exporting reports to Xero.',
values: {
[CONST.QUICKBOOKS_EXPORT_DATE.LAST_EXPENSE]: {
[CONST.XERO_EXPORT_DATE.LAST_EXPENSE]: {
label: 'Date of last expense',
description: 'Date of the most recent expense on the report.',
},
[CONST.QUICKBOOKS_EXPORT_DATE.REPORT_EXPORTED]: {
[CONST.XERO_EXPORT_DATE.REPORT_EXPORTED]: {
label: 'Export date',
description: 'Date the report was exported to Xero.',
},
[CONST.QUICKBOOKS_EXPORT_DATE.REPORT_SUBMITTED]: {
[CONST.XERO_EXPORT_DATE.REPORT_SUBMITTED]: {
label: 'Submitted date',
description: 'Date the report was submitted for approval.',
},
Expand Down
17 changes: 7 additions & 10 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,15 +2071,14 @@ export default {
exportInvoicesDescription: 'Usa esta cuenta al exportar facturas a QuickBooks Online.',
exportCompanyCardsDescription: 'Establece cómo se exportan las compras con tarjeta de empresa a QuickBooks Online.',
account: 'Cuenta',
accountDescription: 'Elige dónde contabilizar las compensaciones de entradas a los asientos contables.',
accountDescription: 'Elige dónde contabilizar los asientos contables.',
vendor: 'Proveedor',
defaultVendor: 'Proveedor predeterminado',
defaultVendorDescription: 'Establece un proveedor predeterminado que se aplicará a todas las transacciones con tarjeta de crédito al momento de exportarlas.',
accountsPayable: 'Cuentas por pagar',
accountsPayableDescription: 'Elige dónde crear las facturas de proveedores.',
bankAccount: 'Cuenta bancaria',
bankAccountDescription: 'Elige desde dónde enviar los cheques.',
optionBelow: 'Elija una opción a continuación:',
companyCardsLocationEnabledDescription:
'QuickBooks Online no permite lugares en las exportaciones de facturas de proveedores. Como tienes activadas los lugares en tu espacio de trabajo, esta opción de exportación no está disponible.',
exportPreferredExporterNote:
Expand All @@ -2101,7 +2100,7 @@ export default {
advancedConfig: {
advanced: 'Avanzado',
autoSync: 'Autosincronización',
autoSyncDescription: 'Sincroniza QuickBooks Online y Expensify automáticamente, todos los días.',
autoSyncDescription: 'Expensify se sincronizará automáticamente con QuickBooks Online todos los días.',
inviteEmployees: 'Invitar empleados',
inviteEmployeesDescription: 'Importe los registros de los empleados de Quickbooks Online e invítelos a este espacio de trabajo.',
createEntities: 'Crear entidades automáticamente',
Expand All @@ -2128,10 +2127,8 @@ export default {
[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Description`]:
'Crearemos una factura de proveedor desglosada para cada informe de Expensify con la fecha del último gasto, y la añadiremos a la cuenta a continuación. Si este periodo está cerrado, lo contabilizaremos en el día 1 del siguiente periodo abierto.',

[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]:
'Las transacciones con tarjeta de débito se exportarán a la cuenta bancaria que aparece a continuación.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]:
'Las transacciones con tarjeta de crédito se exportarán a la cuenta bancaria que aparece a continuación.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Elige dónde exportar las transacciones con tarjeta de débito.',
[`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Elige dónde exportar las transacciones con tarjeta de crédito.',
[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}AccountDescription`]: 'Selecciona el proveedor que se aplicará a todas las transacciones con tarjeta de crédito.',

[`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Error`]:
Expand Down Expand Up @@ -2183,7 +2180,7 @@ export default {
advancedConfig: {
advanced: 'Avanzado',
autoSync: 'Autosincronización',
autoSyncDescription: 'Sincroniza Xero y Expensify automáticamente, todos los días.',
autoSyncDescription: 'Expensify se sincronizará automáticamente con Xero todos los días.',
purchaseBillStatusTitle: 'Estado de la factura de compra',
reimbursedReports: 'Sincronizar informes reembolsados',
reimbursedReportsDescription:
Expand All @@ -2194,8 +2191,8 @@ export default {
xeroBillPaymentAccountDescription: 'Elige una cuenta bancaria para los reembolsos y crearemos el pago en Xero.',
},
exportDate: {
label: 'Fecha de exportación',
description: 'Usa esta fecha al exportar facturas de compra a Xero.',
label: 'Fecha de la factura de compra',
description: 'Usa esta fecha al exportar el informe a Xero.',
values: {
[CONST.XERO_EXPORT_DATE.LAST_EXPENSE]: {
label: 'Fecha del último gasto',
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function QuickbooksAccountSelectPage({policy}: WithPolicyConnectionsProps) {
const listHeaderComponent = useMemo(
() => (
<View style={[styles.pb2, styles.ph5]}>
<Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.invoiceAccountSelectorDescription')}</Text>
<Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.accountSelectDescription')}</Text>
</View>
),
[translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
<OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableExpensesExportDestination}>
<MenuItemWithTopDescription
title={nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}`) : undefined}
description={translate('workspace.qbo.exportCompany')}
description={translate('workspace.qbo.exportAs')}
errorText={errorFields?.nonReimbursableExpensesExportDestination ? translate('common.genericErrorMessage') : undefined}
onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_SELECT.getRoute(policyID))}
brickRoadIndicator={errorFields?.nonReimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
Expand Down Expand Up @@ -95,7 +95,7 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
<OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableBillDefaultVendor}>
<MenuItemWithTopDescription
title={nonReimbursableBillDefaultVendorObject?.name}
description={translate('workspace.qbo.vendor')}
description={translate('workspace.qbo.defaultVendor')}
onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT.getRoute(policyID))}
brickRoadIndicator={errorFields?.nonReimbursableBillDefaultVendor ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
shouldShowRightIcon
Expand Down
3 changes: 1 addition & 2 deletions ...ges/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,10 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
>
<ScreenWrapper testID={QuickbooksCompanyCardExpenseAccountSelectCardPage.displayName}>
<HeaderWithBackButton title={translate('workspace.qbo.exportCompany')} />
<HeaderWithBackButton title={translate('workspace.qbo.exportAs')} />
<View style={styles.flex1}>
<SelectionList
containerStyle={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportCompanyCardsDescription')}</Text>}
sections={sections}
ListItem={RadioListItem}
onSelectRow={selectExportCompanyCard}
Expand Down
2 changes: 0 additions & 2 deletions ...ages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import ScreenWrapper from '@components/ScreenWrapper';
import SelectionList from '@components/SelectionList';
import RadioListItem from '@components/SelectionList/RadioListItem';
import type {ListItem} from '@components/SelectionList/types';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import * as Connections from '@libs/actions/connections';
Expand Down Expand Up @@ -73,7 +72,6 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
<ScreenWrapper testID={QuickbooksNonReimbursableDefaultVendorSelectPage.displayName}>
<HeaderWithBackButton title={translate('workspace.qbo.defaultVendor')} />
<SelectionList
headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.defaultVendorDescription')}</Text>}
Copy link
Contributor

Choose a reason for hiding this comment

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

The import line for import Text on line 9 needs to be removed in this file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I think I did that too!

sections={sections}
ListItem={RadioListItem}
onSelectRow={selectVendor}
Expand Down
1 change: 0 additions & 1 deletion src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
<View style={styles.flex1}>
<SelectionList
containerStyle={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.optionBelow')}</Text>}
sections={sections}
ListItem={RadioListItem}
onSelectRow={selectExportEntity}
Expand Down
Loading