diff --git a/Mobile-Expensify b/Mobile-Expensify index 968526b0c05c..d7deab1b6ee2 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 968526b0c05cb7b22fc1993647574fa3a9d9c6b6 +Subproject commit d7deab1b6ee267462169efc293582364c898ef00 diff --git a/android/app/build.gradle b/android/app/build.gradle index 4b21c4109dc7..a25df116f5f6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -110,8 +110,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009009201 - versionName "9.0.92-1" + versionCode 1009009202 + versionName "9.0.92-2" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/docs/articles/expensify-classic/connections/xero/Configure-Xero.md b/docs/articles/expensify-classic/connections/xero/Configure-Xero.md index 170e8d0b6974..907223c72ca9 100644 --- a/docs/articles/expensify-classic/connections/xero/Configure-Xero.md +++ b/docs/articles/expensify-classic/connections/xero/Configure-Xero.md @@ -1,104 +1,107 @@ --- title: Configure Xero -description: Configure Xero +description: Learn how to configure Xero in Expensify, including best practices, export settings, coding configurations, and advanced options. --- -**Best Practices Using Xero** +## Best Practices Using Xero -A connection to Xero lets you combine the power of Expensify's expense management features with Xero's accounting capabilities. By following the recommended best practices below, your finances will be automatically categorized correctly and accounted for in the right place. +A connection to Xero lets you combine Expensify's expense management features with Xero's accounting capabilities. Follow these best practices to ensure your finances are correctly categorized and accounted for: -- Configure your setup immediately after making the connection, and review each settings tab thoroughly. -- Keep Auto Sync enabled. - - The daily auto sync will update Expensify with any changes to your chart of accounts, customers/projects, or bank accounts in Xero. - - Finalized reports will be exported to Xero automatically, saving your admin team time with every report. -- Set your preferred exporter to a user who is both a workspace and domain admin. -- Configure your coding settings and enforce them by requiring categories and tags on expenses. +- Configure your setup immediately after connecting and review each settings tab thoroughly. +- Keep **Auto Sync** enabled to: + - Update Expensify daily with changes to your chart of accounts, customers/projects, or bank accounts in Xero. + - Automatically export finalized reports to Xero, saving your admin team time. +- Set the **Preferred Exporter** to a user who is both a Workspace and Domain Admin. +- Configure **coding settings** and enforce them by requiring categories and tags on expenses. -# Accessing the Xero Configuration Settings -Xero is connected at the workspace level, and each workspace can have a unique configuration that dictates how the connection functions. To access the configuration: +## Accessing the Xero Configuration Settings + +Xero is connected at the workspace level, and each workspace has a unique configuration. To access the settings: 1. Click **Settings** near the bottom of the left-hand menu. -2. Navigate to Workspaces > Groups > [workspace Name] > Connections. -3. Scroll down to the Xero connection and click the **Configure** button to open the settings menu. - -# Step 1: Configure Export Settings -The following steps help you determine how data will be exported from Expensify to Xero. - -1. Click the **Configure** button under the Xero connection to open the settings menu. -2. Under the Export tab, review each of the following export settings: - - **Preferred Exporter**: Choose a Workspace Admin to set as the Preferred Exporter. - - Concierge exports reports automatically on behalf of the preferred exporter. - - Other Workspace Admins will still be able to export to Xero manually. - - If you set different export bank accounts for individual company cards under your Domain > Company Cards, then your Preferred Exporter must be a Domain Admin in addition to Workspace Admin. - - **Export reimbursable expenses and bills as**: Reimbursable expenses export as a Purchase Bill. This setting cannot be amended. - - **Purchase Bill Date**: Choose whether to use the date of the last expense on the report, export date, or submitted date. - - **Export invoices as**: All invoices exported to Xero will be as sales invoices. Sales invoices always display the date on which the invoice was sent. This setting cannot be amended. - - **Export non-reimbursable expenses as**: Each exported expense posts as a bank transaction to the Xero bank account you select below, and transaction dates will match the dates on your bank statement. - - **Xero Bank Account**: Select which bank account will be used to post bank transactions when non-reimbursable expenses are exported. - -## Step 1B: Optional configuration when company cards are connected -1. Click **Settings** near the bottom of the left-hand menu. -2. Navigate to Domains > [domain name] > Company Cards. -3. If you have more than one company card connection, select the connection first. -4. Locate the cardholder you want to configure in the list, -5. Click the **Edit Exports** button and assign the account the card expenses should export to in Xero. - -# Step 2: Configure Coding settings -The following steps help you determine how data will be imported from Xero to Expensify. - -1. Click the **Configure** button under the Xero connection to open the settings menu. -2. Under the Coding tab, review each of the following settings and configure the options to determine what information will be imported: - - **Chart of Accounts**: Your Xero Chart of Accounts is imported into Expensify as expense categories. _This is enabled by default and cannot be disabled._ - - **Tax Rates**: When Enabled, your tax rates in Xero will be imported into your workspace. After being imported, you can find them on the [Tax](https://expensify.com/policy?param=%7B%22policyID%22:%22B936DE4542E9E78B%22%7D#tax) page of your workspace settings. - - **Tracking Categories**: When Enabled, you can configure how Xero Cost Centres and Xero Regions import. - - Xero contact default (applies the Xero contact default during export to Xero) - - Tag (line-item level) - - Report Field (header level) - - **Billable Expenses**: When enabled, your Xero customer contacts will be imported as tags. Xero requires all billable expenses to have a customer tag to be able to be exported to Xero. - -# Step 3: Configure advanced settings -The following steps help you determine the advanced settings for your connection, like auto-sync. - -1. Click the **Configure** button under the Xero connection to open the settings menu. -2. Under the Advanced tab, review each of the following settings and configure the options you wish to use: - - **Auto Sync**: When enabled, the connection will sync daily to ensure that the data shared between the two systems is up-to-date. - - New report approvals/reimbursements will be synced during the next auto-sync period. -Reimbursable expenses will export after reimbursement occurs or the report is marked as reimbursed outside Expensify when using Direct or Indirect reimbursement. - - Non-reimbursable expenses will export automatically after the report is final approved. - - **Newly Imported Categories Should Be**: When a new account is created in the Xero chart of accounts, this setting controls whether the new category in Expensify is enabled or disabled by default. Disabled categories are not visible to employees when coding expenses. - - **Set purchase bill status** (optional): Reimbursable expenses are exported as purchase bills with the status selected. The options available are: - - Awaiting Payment (default) - - Draft - - Awaiting Approval - - **Sync Reimbursed Reports**: When enabled, you can configure the Bill Payment and Invoice Collections accounts to be used when reimbursing reports and paying invoices. - - Anytime a report is reimbursed, or an invoice is paid through Expensify, the corresponding purchase bill or sales invoice in Xero will be marked as paid. - - Similarly, if a purchase bill or sales invoice is marked as paid in Xero, the related Expensify report or invoice will be automatically marked as reimbursed/paid. - - **Xero Bill Payment Account**: Once the expense report is paid, your reimbursements will appear under this Xero Bill Payment account. - - **Xero Invoice Collections Account**: If you are exporting invoices from Expensify, select the invoice collection account under which you want invoices to appear once they are marked as paid. +2. Navigate to **Workspaces > Groups > [Workspace Name] > Connections**. +3. Scroll to the Xero connection and click **Configure**. -{% include faq-begin.md %} +--- + +## Step 1: Configure Export Settings -## I have multiple organizations in Xero. Can I connect them all to Expensify? +Define how data will be exported from Expensify to Xero: -Yes, you can connect each organization you have to Expensify. Here are some essential things to keep in mind: +1. Click **Configure** under the Xero connection. +2. Under the **Export** tab, review and set up: + - **Preferred Exporter**: Assign a Workspace Admin. + - Concierge exports reports automatically for the preferred exporter. + - Other Workspace Admins can export manually. + - If you set different export bank accounts for company cards, the Preferred Exporter must also be a Domain Admin. + - **Export reimbursable expenses and bills as**: Always exported as a **Purchase Bill**. + - **Purchase Bill Date**: Choose **last expense date, export date, or submitted date**. + - **Export invoices as**: Always exported as **Sales Invoices**. + - **Export non-reimbursable expenses as**: Posted as **bank transactions** to a Xero bank account. + - **Xero Bank Account**: Select the bank account for posting non-reimbursable expenses. -- Organization Selection in the Workspace > Connections > Xero Configuration > Export settings tab: This option is available only if multiple organizations are configured in Xero. -- One Workspace, One Organization: Each Workspace can connect to just one organization at a time. It’s a one-to-one connection. -- Adding New Organizations: If you create a new organization in Xero after your initial connection, you’ll need to disconnect and then reconnect it to Xero. Don’t forget to take a screenshot of your current settings by clicking Configure and checking the Export, Coding, and Advanced tabs. This way, you can easily set everything up again. +### Step 1B: Configure Company Card Exports (If Applicable) -## How can I view the purchase bills exported to Xero? +1. Click **Settings**. +2. Navigate to **Domains > [Domain Name] > Company Cards**. +3. If multiple company card connections exist, select the relevant one. +4. Locate the cardholder and click **Edit Exports**. +5. Assign the correct Xero account for the card expenses. + +--- + +## Step 2: Configure Coding Settings + +Define how data is imported from Xero to Expensify: + +1. Click **Configure** under the Xero connection. +2. Under the **Coding** tab, configure: + - **Chart of Accounts**: Imported as **expense categories** (enabled by default). + - **Tax Rates**: Enabled to import Xero tax rates, visible under [Tax Settings](https://expensify.com/policy?param=%7B%22policyID%22:%22B936DE4542E9E78B%22%7D#tax). + - **Tracking Categories**: Choose import method: + - **Xero contact default** (applies during export) + - **Tag** (line-item level) + - **Report Field** (header level) + - **Billable Expenses**: Enables importing Xero customer contacts as tags. All billable expenses require a customer tag for export. + +--- + +## Step 3: Configure Advanced Settings + +1. Click **Configure** under the Xero connection. +2. Under the **Advanced** tab, configure: + - **Auto Sync**: Ensures daily synchronization. + - Reimbursable expenses export after reimbursement. + - Non-reimbursable expenses export after final approval. + - **Newly Imported Categories Should Be**: Controls default visibility of new Xero accounts in Expensify. + - **Set Purchase Bill Status** (optional): + - **Awaiting Payment** (default) + - **Draft** + - **Awaiting Approval** + - **Sync Reimbursed Reports**: Ensures paid reports and invoices sync across Expensify and Xero. + - **Xero Bill Payment Account**: Specifies where reimbursements appear in Xero. + - **Xero Invoice Collections Account**: Defines the invoice collection account for exported invoices. + +--- + +{% include faq-begin.md %} + +## Can I connect multiple Xero organizations to Expensify? + +Yes, but each workspace can connect to only one Xero organization at a time. If you add a new organization in Xero, you'll need to disconnect and reconnect the integration. Take screenshots of your settings beforehand to reconfigure quickly. + +## How can I view purchase bills exported to Xero? -**To view the bills in Xero:** 1. Log into Xero. -2. Navigate to Business > Purchase Overview > Awaiting Payments. - - Bills will be payable to the individual who created and submitted the report in Expensify. +2. Navigate to **Business > Purchase Overview > Awaiting Payments**. + - Bills are payable to the user who created and submitted the report in Expensify. -## How can I view the bank transactions in Xero? +## How can I view bank transactions in Xero? -**To view the transactions in Xero:** 1. Log into Xero. -2. Head over to your Dashboard. -3. Select your company card. -4. Locate the specific expense you’re interested in. +2. Open your **Dashboard**. +3. Select your **Company Card**. +4. Locate the relevant expense. {% include faq-end.md %} + diff --git a/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md b/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md index 2fb71a780e41..fc79d1a595f6 100644 --- a/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md +++ b/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md @@ -1,28 +1,36 @@ --- title: Connect to Xero -description: Everything you need to know about Expensify's direct integration with Xero +description: Learn how to integrate Expensify with Xero for seamless expense management order: 1 --- -**Prerequisites** +## Prerequisites -You must be a Workspace Admin in Expensify using a Collect or Control Workspace to connect your Xero account to Expensify. +To connect Xero with Expensify, you must: +- Be a **Workspace Admin** in Expensify. +- Use a **Collect** or **Control** Workspace. ## Step 1: Connect Expensify to Xero -1. Click **Settings** near the bottom of the left-hand menu. -2. Navigate to Workspaces > Groups > [workspace Name] > Connections. -3. Click on **Connect to Xero**. -4. Click the **Create a New Xero Connection** button. + +Follow these steps to set up the Xero integration: + +1. Click **Settings** in the bottom left menu. +2. Navigate to **Workspaces** > **Groups** > *[Workspace Name]* > **Connections**. +3. Click **Connect to Xero**. +4. Click **Create a New Xero Connection**. 5. Enter your Xero login credentials. -6. Review the access information and click Allow Access. -7. You will be redirected back to Expensify and the connection will import some initial settings from Xero to Expensify. -8. Once the sync is complete, the configuration window for Xero will open automatically so you can configure your export, import, and advanced settings. -9. Click the **Save** button when you’re done configuring to finalize the connection. +6. Review the access permissions and click **Allow Access**. +7. You will be redirected back to Expensify, where the connection will begin syncing initial settings from Xero. +8. Once the sync is complete, the **Xero Configuration** window will open automatically. +9. Configure your **export, import, and advanced settings** as needed. +10. Click **Save** to finalize the connection. {% include faq-begin.md %} -## I use a Cashbook or Ledger Xero account, can I still connect in Expensify? +## FAQ + +### Can I connect a Cashbook or Ledger Xero account to Expensify? -Starting in September 2021, there’s a chance for Cashbook and Ledger-type organizations in Xero. Apps like Expensify won’t be able to create invoices and bills for these accounts using the Xero API. So, if you’re using a Cashbook or Ledger Xero account, please be aware that this might affect your Expensify integration. +Starting in September 2021, **Cashbook and Ledger** Xero accounts may experience limitations. Apps like Expensify cannot create invoices or bills for these account types using the Xero API. If you are using a **Cashbook or Ledger** Xero account, please note that this may affect your Expensify integration. {% include faq-end.md %} diff --git a/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md b/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md index f23ec515cde4..6d34d87d4f73 100644 --- a/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md +++ b/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md @@ -1,155 +1,142 @@ --- title: Xero Troubleshooting -description: Xero Troubleshooting +description: Troubleshooting common Xero integration errors in Expensify, including sync and export issues. --- # Overview of Xero Troubleshooting -Synchronizing and exporting data between Expensify and Xero can streamline your financial processes, but occasionally, users may encounter errors that prevent a smooth integration. These errors often arise from discrepancies in settings, missing data, or configuration issues within Xero or Expensify. +Synchronizing and exporting data between Expensify and Xero can streamline your financial processes, but occasionally, errors may occur due to discrepancies in settings, missing data, or configuration issues. -This troubleshooting guide aims to help you identify and resolve common sync and export errors, ensuring a seamless connection between your financial management systems. By following the step-by-step solutions provided for each specific error, you can quickly address issues and maintain accurate and efficient expense reporting and data management. +This guide provides step-by-step solutions to common Xero-related errors to ensure a seamless connection and accurate expense reporting. -# ExpensiError XRO014 Billable Expenses Require A Customer - -**Why does this happen?** - -This happens because Xero requires all billable expenses exported from Expensify to have a customer associated with it. This error occurs when one or more expenses on a report have been marked "billable," and do not have a customer associated with them. - -## How to fix it - -1. Navigate to your Settings > Workspaces > [click workspace] > Connections > Configure button > Coding tab. -2. Click the **toggle** to enable Billable Expenses. -3. Click the **Save** button to save the change and sync the connection. -4. Open the report in question and apply a _Customer_ tag to each billable expense. - - _Note: A Contact in Xero is not imported as a Customer until they have had some kind of bill raised against them. If you can't see your Customer imported as a tag, you may need to raise a dummy invoice at the Xero end and then delete/void it. Don’t forget to sync the connection again after taking this step._ -5. Try to export the report again by clicking the **Export to** button and select the **Xero** option. - -# ExpensiError XRO027: Expense on this report is categorized with a category no longer in Xero - -**Why does this happen?** - -When exporting expense data, Xero will not accept a category on an expense that no longer exists in the chart of accounts. This error occurs when one or more expenses on the report are categorized with a category that no longer exists in Xero. - -## How to fix it - -1. Log into Xero. -2. Navigate to Settings > Chart of Accounts. -3. Confirm that each category used on an expense in the report in Expensify is still an active account in Xero. -4. If the account doesn’t exist, add it again and sync the connection in Expensify. -5. If the account still exists, open the details, check “Show in Expense Claims,” and then sync the connection in Expensify. -6. After syncing, open the report and re-categorize any expenses showing a red workspace violation for out-of-workspace categories. -7. After recategorizing, click the **Export to** button and select the **Xero** option. - -# ExpensiError XRO031: Payment has already been allocated to reimbursable expenses - -**Why does this happen?** - -Xero does not allow for paid expenses to be modified. When you attempt to export the reimbursable expenses again, Xero considers that a modification and rejects the export. This error occurs when the report contains reimbursable expenses that have already been exported to Xero where a payment was issued on the purchase bill. - -## How to fix it +--- -1. Log into Xero. -2. Click on Business > Bills to Pay > and then the Paid tab. -3. Locate the report from the error and click on it to open it. -4. Click on the blue text that says Payment. -5. Click the Options dropdown and then Remove and Redo to delete the payment. - - _Note: Do not void the bill in Xero._ -6. Head back to Expensify and open the report again. -7. Click the **Export to** button and select the **Xero** option. +## ExpensiError XRO014: Billable Expenses Require a Customer -The new export will override the current report in Xero and retain the same report ID. +### Why does this happen? +Xero requires all billable expenses exported from Expensify to have a customer assigned. This error occurs when one or more expenses are marked "billable" but lack an associated customer. -# ExpensiError XRO087 No Bank Account or Incorrect Bank Account +### How to fix it +1. Navigate to **Settings > Workspaces > [workspace] > Connections > Configure > Coding tab**. +2. Enable **Billable Expenses** by toggling the setting. +3. Click **Save** to sync the connection. +4. Open the report and apply a **Customer** tag to each billable expense. + - *Note: A Xero Contact becomes a Customer only after an invoice has been raised against them. If the Customer is missing, create a dummy invoice in Xero, then delete/void it and sync again.* +5. Retry the export by clicking **Export to > Xero**. -**Why does this happen?** +--- -Xero requires all bank transactions created from non-reimbursable expenses in Expensify to be posted to an active bank account. This error occurs when the destination account in Xero doesn’t exist, isn’t set, or is not the right type. +## ExpensiError XRO027: Category No Longer Exists in Xero -## How to fix it +### Why does this happen? +Xero does not accept expenses categorized under accounts that no longer exist in the Chart of Accounts. -1. Navigate to Settings > Workspaces > [workspace name] > Connections > click the **Configure** button. -2. Select a Xero Bank Account from the dropdown that will apply to all non-reimbursable expenses exported to Xero. -3. Click the **Save** button to sync the connection. -4. Open the report again and click the **Export to** button and then the **Xero** option. +### How to fix it +1. Log into Xero and navigate to **Settings > Chart of Accounts**. +2. Ensure all expense categories in Expensify are active in Xero. +3. If a category is missing, add it back in Xero and sync Expensify. +4. If the category exists, ensure **Show in Expense Claims** is enabled. +5. Sync Expensify, open the report, and recategorize expenses flagged with a red violation. +6. Click **Export to > Xero**. -# ExpensiError XRO052: Expenses Are Not Categorized With A Xero Account +--- -**Why does this happen?** +## ExpensiError XRO031: Payment Already Allocated to Reimbursable Expenses -Xero requires all expenses exported from Expensify to use a category matching an account in your chart of accounts. If a category from another source is used, Xero will reject the expense. This error occurs when an expense on the report has a category applied that is not valid. +### Why does this happen? +Xero does not allow modifications to paid expenses. If a reimbursable expense is re-exported, Xero rejects it as a modification. -## How to fix it +### How to fix it +1. In Xero, go to **Business > Bills to Pay > Paid tab**. +2. Locate and open the report with the error. +3. Click on the blue **Payment** link. +4. Click **Options > Remove and Redo** (*Do not void the bill*). +5. In Expensify, open the report and click **Export to > Xero**. + - The new export will override the previous report while retaining the same ID. -1. Sync your Xero connection in Expensify from Settings > Workspaces > [click workspace] > Connections, and click the **Sync Now** button. -2. Review the expenses on the report. If any appear with a red _Category no longer valid_ violation, recategorize the expense until all expenses are violation-free. -3. Click the **Export to** button and then the **Xero** option. -4. If you receive the same error, continue. - - _Note the categories used on the expenses and check the Settings > Workspaces > [click workspace] > Categories page to confirm the exact categories used on the report are enabled and connected to Xero (you'll see a blue icon next to all connected categories)._ -5. Confirm that the categories used for expenses in the report match exactly the accounts in your Xero chart of accounts. -6. If you make any changes in Xero or in Expensify, always sync the connection and then try to export again. +--- -# ExpensiError XRO068: Organization is not subscribed to currency x +## ExpensiError XRO087: No or Incorrect Bank Account -**Why does this happen?** +### Why does this happen? +Xero requires bank transactions from Expensify to post to an active bank account. This error occurs when the destination account is missing or incorrect. -Xero requires the currencies you’re using in Expensify to be added to your account before you can export expenses in that currency. For example, if your workspace is set to Canadian currency, all expenses submitted on that workspace will be converted to CAD. You must also have the Canadian currency added to your Xero account to export successfully. This error occurs when your Xero account does not have the currency mentioned in the error added. +### How to fix it +1. In Expensify, go to **Settings > Workspaces > [workspace] > Connections > Configure**. +2. Select a **Xero Bank Account** for non-reimbursable expenses. +3. Click **Save** to sync the connection. +4. Open the report and retry the export. -## How to fix it -_Note: Not all versions of Xero allow adding currencies. To add currencies, please upgrade your Xero account to the Established [plan](https://www.xero.com/us/pricing-plans/)._ +--- -1. Log into Xero. -2. Navigate to Settings > General Settings. -3. Under the heading Features, select Currencies. -4. Click **Add Currency** to add the currency listed in the error message. -5. Sync your Xero connection in Settings > Workspaces > [click workspace] > Connections. -6. Open the report and click the **Export to** button and then the **Xero** option. +## ExpensiError XRO052: Expenses Not Categorized with a Xero Account -# ExpensiError XRO076: This report has already been exported once to Xero, but has been voided +### Why does this happen? +Xero requires all expenses to be categorized under valid accounts in the Chart of Accounts. -**Why does this happen?** +### How to fix it +1. Sync Expensify with Xero (**Settings > Workspaces > [workspace] > Connections > Sync Now**). +2. Review expenses for red category violations and recategorize them. +3. Click **Export to > Xero**. +4. If errors persist: + - Verify category settings under **Settings > Workspaces > Categories**. + - Ensure categories match exactly with Xero’s Chart of Accounts. +5. Sync again and retry the export. -Xero does not allow Expensify to modify a purchase bill created from a previous export if the bill has been voided. This error occurs when the report has already been exported to Xero, and the purchase bill has been voided. +--- -## How to fix it -_Note: Xero does not support “unvoiding” a bill, it is an irreversible action._ +## ExpensiError XRO068: Currency Not Subscribed in Xero -1. From the Reports page in Expensify, locate the report associated with the voided bill. -2. Check the box to the left of the report and click **Copy**. -3. Open the new report and submit it through the approval workflow, then confirm it exports to Xero successfully. +### Why does this happen? +Xero requires all currencies used in Expensify to be added before exporting expenses in that currency. -# ExpensiError XRO099: You have reached the limit of invoices you can approve with your Xero account. +### How to fix it +1. In Xero, go to **Settings > General Settings > Features > Currencies**. +2. Click **Add Currency** and select the required currency. +3. Sync Expensify with Xero (**Settings > Workspaces > Connections**). +4. Open the report and click **Export to > Xero**. + - *Note: Adding currencies requires the Established Xero plan. [Upgrade if necessary](https://www.xero.com/us/pricing-plans/).* -**Why does this happen?** +--- -The Early plan only allows you to enter 5 bills per month. This error occurs when you are on a trial account of Xero and have run out of your allowable exports. +## ExpensiError XRO076: Report Previously Exported and Voided -## How to fix it -Please upgrade your Xero account to a Growing or Established [plan](https://www.xero.com/us/pricing-plans/) so you can continue to use the integration and export reports without error. +### Why does this happen? +Xero does not allow modifications to voided purchase bills. -# Why are company card expenses exported to the wrong account? +### How to fix it +1. In Expensify, locate the report on the **Reports** page. +2. Select the report and click **Copy**. +3. Submit the copied report for approval and export it to Xero. -Multiple factors could be causing your company card transactions to export to the wrong place in your accounting system, but the best place to start is always the same. +--- -- First, confirm that the company cards have been mapped to the correct accounts in Settings > Domains > Company Cards > click the **Edit Export** button for the card to view the account. -- Next, confirm the expenses in question have been imported from the company card? - - Only expenses that have the Card+Lock icon next to them will export according to the mapping settings that you configure in the domain settings. +## ExpensiError XRO099: Xero Invoice Approval Limit Reached -It’s important to note that expenses imported from a card linked at the individual account level, expenses created from a SmartScanned receipt, and manually created cash expenses will export to the default bank account selected in your connection's configuration settings. +### Why does this happen? +The Early plan in Xero allows only 5 bills per month. This error occurs when the limit is reached. -**Is the report exporter a domain admin?** +### How to fix it +Upgrade your Xero account to a **Growing or Established plan**. [See Xero pricing](https://www.xero.com/us/pricing-plans/). -The user exporting the report must be a domain admin. You can check the history and comment section at the bottom of the report to see who exported the report. +--- -If your reports are being exported automatically by Concierge, the user listed as the Preferred Exporter under Settings > Workspaces > [workspaces name] > Connections > click **Configure** must be a domain admin as well. +## Why Are Company Card Expenses Exported to the Wrong Account? -If the report exporter is not a domain admin, all company card expenses will export to the bank account set in Settings > Workspaces > [workspace name] > Connections > click **Configure** for non-reimbursable expenses. +1. Confirm that **company cards** are mapped correctly: + - **Settings > Domains > Company Cards > Edit Export**. +2. Verify that expenses have the **Card+Lock icon** (indicating they were imported from a company card). +3. Ensure the exporter is a **Domain Admin**: + - Check the **Preferred Exporter** setting under **Settings > Workspaces > Connections > Configure**. +4. Verify company card mapping under the correct workspace. -**Has the company card been mapped under the correct workspace?** +--- -If you have multiple workspaces connected to Xero, each connected workspace will have a separate list of accounts to assign the card to. Unless you choose an account listed under the same workspace as the report you are exporting, expenses will export to the default bank account. +## Why Do Non-Reimbursable Expenses Show 'Credit Card Misc' Instead of the Merchant? -# Why do non-reimbursable expenses say 'Credit Card Misc,' instead of the merchant? +If a merchant in Expensify **matches** a contact in Xero, expenses will reflect the vendor name. Otherwise, they default to \"Expensify Credit Card Misc\" to prevent duplicates. -Where the merchant in Expensify is an exact match to a contact you have set up in Xero then exported credit card expenses will show the vendor name. If not we use the the default name Expensify Credit Card Misc. This is done to prevent multiple variations of the same contact (e.g. Starbucks and Starbucks #1234 as is often seen in credit card statements) being created in Xero. +### How to fix it +Use **Expense Rules** in Expensify to standardize merchant names. Learn more [here](https://help.expensify.com/articles/expensify-classic/expenses/Create-Expense-Rules). -To change merchant names to match your vendor list in Xero, we recommend using our Expense Rules feature. More information on this can be found [here](https://community.expensify.com/discussion/5654/deep-dive-using-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package/p1?new=1). +--- diff --git a/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md b/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md index 77256279b1d7..37d522673dcd 100644 --- a/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md +++ b/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md @@ -1,45 +1,33 @@ --- title: Track Expenses -description: Create, store, or share non-reimbursable expenses +description: Easily learn how to track, manage, and take action on your expenses in Expensify with this step-by-step guide --- -
- -Create, store, or share non-reimbursable expenses with the Track Expenses feature. - -{% include selector.html values="desktop, mobile" %} - -{% include option.html value="desktop" %} -1. Click the + icon in the bottom left menu and select **Track Expense**. -2. Create the expense manually, scan the receipt, or add a distance expense. - -{% include info.html %} -For an in-depth walkthrough on how to create an expense, check out the [create an expense](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Create-an-expense) article. -{% include end-info.html %} - -3. Choose the next steps for the expense: - - **Submit it to someone**: Select this option to request payment from other members of your Expensify workspace. - - **Categorize it**: Select this option to choose a category and additional details to code the expense for a specific workspace. The expense will then be placed on a report and can be submitted to the workspace for approval. - - **Share it with my accountant**: Select this option to share the expense with your accountant. The expense will then be placed on a report under the workspace for your accountant to review. - - **Nothing for now**: Select this option to store the expense. Expensify will keep the expense until you are ready to take action on it—it won’t expire. When you’re ready, you can then select one of the above options for the expense at a later time. -{% include end-option.html %} - -{% include option.html value="mobile" %} -1. Tap the + icon in the bottom menu and select **Track Expense**. -2. Create the expense manually, scan the receipt, or add a distance expense. - -{% include info.html %} -For an in-depth walkthrough on how to create an expense, check out the [create an expense](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Create-an-expense) article. -{% include end-info.html %} - -3. Choose the next steps for the expense: - - **Submit it to someone**: Select this option to request payment from a contact in your phone’s contact list or from other members of your Expensify workspace. - - **Categorize it**: Select this option to choose a category and additional details to code the expense for a specific workspace. The expense will then be placed on a report and can be submitted to the workspace for approval. - - **Share it with my accountant**: Select this option to share the expense with your accountant. The expense will then be placed on a report under the workspace for your accountant to review. - - **Nothing for now**: Select this option to store the expense. Expensify will keep the expense until you are ready to take action on it—it won’t expire. When you’re ready, you can then select one of the above options for the expense at a later time. -{% include end-option.html %} - -{% include end-selector.html %} - -![The New Expensify page is open with the FAB (big + button) clicked and the option to Track Expenses is highlighted.]({{site.url}}/assets/images/FAB_track_expense.png){:width="100%"} - -
+Tracking an expense in Expensify is simple and can be done in just a few steps. Follow the guide below to track an expense without submitting it. + +## Steps to Track an Expense + +1. Press the **big green + button** +2. Choose **Create Expense** +3. Select how you would like to create the expense: + - Scan a receipt + - Enter mileage + - Enter manually +4. Follow the prompts to enter the required information (this will vary depending on your selection in step 3) +5. Click **Next** +6. Choose **Just track it (don’t submit it)** +7. Enter or modify details in the fields shown (these fields will vary depending on how your Workspace is configured) +8. Click **Create Expense** + +## Where to Find Tracked Expenses + +Once the expense is created, it will appear in your **Workspace Chat** in the left-hand navigation. Within the workspace chat, you can take the following further actions on the expense at any time: + +- **Submit it to someone** – Send the expense for approval or processing. +- **Categorize it** – Assign the expense to a category for better organization. +- **Share it with my accountant** – Provide access to relevant financial contacts. +- **Nothing for now** – Leave the expense in your records for future action. + +You can also view your tracked expenses by doing the following: +1. Click on Reports +2. Click on Expenses +3. Use the filters to help you locate your expenses diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index b282e883628d..33b277fc4b93 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.0.92.1 + 9.0.92.2 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 2c9396128bb8..888f9fcf9fea 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.92.1 + 9.0.92.2 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index e43588eea8dd..fed88beda610 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.92 CFBundleVersion - 9.0.92.1 + 9.0.92.2 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 4222166d7e32..0a87290eace7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.92-1", + "version": "9.0.92-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.92-1", + "version": "9.0.92-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 6be584d00bf9..1b7a4947557f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.92-1", + "version": "9.0.92-2", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", diff --git a/patches/react-native-reanimated+3.16.4+004+fix-transform-animation-gitter.patch b/patches/react-native-reanimated+3.16.4+004+fix-transform-animation-gitter.patch deleted file mode 100644 index 9e7657c2dda4..000000000000 --- a/patches/react-native-reanimated+3.16.4+004+fix-transform-animation-gitter.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/node_modules/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp b/node_modules/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp -index 673ebd1..08d65fe 100644 ---- a/node_modules/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp -+++ b/node_modules/react-native-reanimated/Common/cpp/reanimated/NativeModules/NativeReanimatedModule.cpp -@@ -710,6 +710,15 @@ void NativeReanimatedModule::performOperations() { - jsPropsUpdater.call(rt, viewTag, nonAnimatableProps); - } - -+ if (propsRegistry_->shouldReanimatedSkipCommit()) { -+ // It may happen that `performOperations` is called on the UI thread -+ // while React Native tries to commit a new tree on the JS thread. -+ // In this case, we should skip the commit here and let React Native do -+ // it. The commit will include the current values from PropsRegistry which -+ // will be applied in ReanimatedCommitHook. -+ return; -+ } -+ - bool hasLayoutUpdates = false; - for (const auto &[shadowNode, props] : copiedOperationsQueue) { - if (isThereAnyLayoutProp(rt, props->asObject(rt))) { diff --git a/src/CONST.ts b/src/CONST.ts index 54fe44979d3d..b4c70adba0c2 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -103,13 +103,6 @@ const selfGuidedTourTask: OnboardingTask = { const onboardingEmployerOrSubmitMessage: OnboardingMessage = { message: 'Getting paid back is as easy as sending a message. Let’s go over the basics.', - video: { - url: `${CLOUDFRONT_URL}/videos/guided-setup-get-paid-back-v3.mp4`, - thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-get-paid-back.jpg`, - duration: 26, - width: 1280, - height: 960, - }, tasks: [ selfGuidedTourTask, { @@ -157,13 +150,6 @@ const combinedTrackSubmitOnboardingEmployerOrSubmitMessage: OnboardingMessage = const onboardingPersonalSpendMessage: OnboardingMessage = { message: 'Here’s how to track your spend in a few clicks.', - video: { - url: `${CLOUDFRONT_URL}/videos/guided-setup-track-personal-v2.mp4`, - thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-track-personal.jpg`, - duration: 55, - width: 1280, - height: 960, - }, tasks: [ selfGuidedTourTask, { @@ -5020,13 +5006,6 @@ const CONST = { [onboardingChoices.SUBMIT]: onboardingEmployerOrSubmitMessage, [onboardingChoices.MANAGE_TEAM]: { message: 'Here are some important tasks to help get your team’s expenses under control.', - video: { - url: `${CLOUDFRONT_URL}/videos/guided-setup-manage-team-v2.mp4`, - thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-manage-team.jpg`, - duration: 55, - width: 1280, - height: 960, - }, tasks: [ { type: 'createWorkspace', @@ -5159,13 +5138,6 @@ const CONST = { [onboardingChoices.PERSONAL_SPEND]: onboardingPersonalSpendMessage, [onboardingChoices.CHAT_SPLIT]: { message: 'Splitting bills with friends is as easy as sending a message. Here’s how.', - video: { - url: `${CLOUDFRONT_URL}/videos/guided-setup-chat-split-bills-v2.mp4`, - thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-chat-split-bills.jpg`, - duration: 55, - width: 1280, - height: 960, - }, tasks: [ selfGuidedTourTask, { @@ -5206,13 +5178,6 @@ const CONST = { }, [onboardingChoices.ADMIN]: { message: "As an admin, learn how to manage your team's workspace and submit expenses yourself.", - video: { - url: `${CLOUDFRONT_URL}/videos/guided-setup-manage-team-v2.mp4`, - thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-manage-team.jpg`, - duration: 55, - width: 1280, - height: 960, - }, tasks: [ { type: 'meetSetupSpecialist', diff --git a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx similarity index 76% rename from src/components/Search/SearchPageHeader/SearchPageHeader.tsx rename to src/components/Search/SearchPageHeader.tsx index 8072db12f1c6..a36368293cb2 100644 --- a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx +++ b/src/components/Search/SearchPageHeader.tsx @@ -1,3 +1,4 @@ +import {useFocusEffect} from '@react-navigation/native'; import React, {useCallback, useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; @@ -9,8 +10,6 @@ import DecisionModal from '@components/DecisionModal'; import * as Expensicons from '@components/Icon/Expensicons'; import {usePersonalDetails} from '@components/OnyxProvider'; import {useProductTrainingContext} from '@components/ProductTrainingContext'; -import {useSearchContext} from '@components/Search/SearchContext'; -import type {PaymentData, SearchQueryJSON} from '@components/Search/types'; import EducationalTooltip from '@components/Tooltip/EducationalTooltip'; import useActiveWorkspace from '@hooks/useActiveWorkspace'; import useLocalize from '@hooks/useLocalize'; @@ -29,20 +28,22 @@ import { import {mergeCardListWithWorkspaceFeeds} from '@libs/CardUtils'; import Navigation from '@libs/Navigation/Navigation'; import {getAllTaxRates, hasVBBA} from '@libs/PolicyUtils'; -import {buildFilterFormValuesFromQuery} from '@libs/SearchQueryUtils'; +import {buildFilterFormValuesFromQuery, isCannedSearchQuery} from '@libs/SearchQueryUtils'; import SearchSelectedNarrow from '@pages/Search/SearchSelectedNarrow'; import variables from '@styles/variables'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; +import {useSearchContext} from './SearchContext'; import SearchPageHeaderInput from './SearchPageHeaderInput'; +import type {PaymentData, SearchQueryJSON} from './types'; -type SearchPageHeaderProps = {queryJSON: SearchQueryJSON; searchRouterListVisible?: boolean; onSearchRouterFocus?: () => void}; +type SearchPageHeaderProps = {queryJSON: SearchQueryJSON}; type SearchHeaderOptionValue = DeepValueOf | undefined; -function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFocus}: SearchPageHeaderProps) { +function SearchPageHeader({queryJSON}: SearchPageHeaderProps) { const {translate} = useLocalize(); const theme = useTheme(); const styles = useThemeStyles(); @@ -67,12 +68,24 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false); const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false); + const [isScreenFocused, setIsScreenFocused] = useState(false); + const {renderProductTrainingTooltip, shouldShowProductTrainingTooltip, hideProductTrainingTooltip} = useProductTrainingContext( CONST.PRODUCT_TRAINING_TOOLTIP_NAMES.SEARCH_FILTER_BUTTON_TOOLTIP, + isScreenFocused, ); const {status, hash} = queryJSON; + useFocusEffect( + useCallback(() => { + setIsScreenFocused(true); + return () => { + setIsScreenFocused(false); + }; + }, []), + ); + const selectedTransactionsKeys = Object.keys(selectedTransactions ?? {}); const handleDeleteExpenses = () => { @@ -302,106 +315,94 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc styles.textWrap, ]); - const onFiltersButtonPress = useCallback(() => { + if (shouldUseNarrowLayout) { + if (selectionMode?.isEnabled) { + return ( + + + { + setIsDeleteExpensesConfirmModalVisible(false); + }} + title={translate('iou.deleteExpense', {count: selectedTransactionsKeys.length})} + prompt={translate('iou.deleteConfirmation', {count: selectedTransactionsKeys.length})} + confirmText={translate('common.delete')} + cancelText={translate('common.cancel')} + danger + /> + setIsOfflineModalVisible(false)} + secondOptionText={translate('common.buttonConfirm')} + isVisible={isOfflineModalVisible} + onClose={() => setIsOfflineModalVisible(false)} + /> + setIsDownloadErrorModalVisible(false)} + secondOptionText={translate('common.buttonConfirm')} + isVisible={isDownloadErrorModalVisible} + onClose={() => setIsDownloadErrorModalVisible(false)} + /> + + ); + } + return null; + } + + const onFiltersButtonPress = () => { hideProductTrainingTooltip(); const filterFormValues = buildFilterFormValuesFromQuery(queryJSON, policyCategories, policyTagsLists, currencyList, personalDetails, allCards, reports, taxRates); updateAdvancedFilters(filterFormValues); Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS); - }, [allCards, currencyList, hideProductTrainingTooltip, personalDetails, policyCategories, policyTagsLists, queryJSON, reports, taxRates]); - - const InputRightComponent = useMemo(() => { - return headerButtonsOptions.length > 0 ? ( - null} - shouldAlwaysShowDropdownMenu - buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM} - customText={translate('workspace.common.selected', {count: selectedTransactionsKeys.length})} - options={headerButtonsOptions} - isSplitButton={false} - shouldUseStyleUtilityForAnchorPosition - /> - ) : ( - -