Skip to content

Commit 57d57a1

Browse files
MrMuzykMrMuzyk
committed
Merge branch 'main' of https://github.com/Expensify/App into feat/refactor-moneyRequestConfirmationList
2 parents e2fc5da + 59e74e9 commit 57d57a1

File tree

118 files changed

+1822
-693
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1822
-693
lines changed

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.10.0
1+
20.13.0

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ android {
9898
minSdkVersion rootProject.ext.minSdkVersion
9999
targetSdkVersion rootProject.ext.targetSdkVersion
100100
multiDexEnabled rootProject.ext.multiDexEnabled
101-
versionCode 1001047201
102-
versionName "1.4.72-1"
101+
versionCode 1001047300
102+
versionName "1.4.73-0"
103103
// Supported language variants must be declared here to avoid from being removed during the compilation.
104104
// This also helps us to not include unnecessary language variants in the APK.
105105
resConfigs "en", "es"

‎assets/images/credit-card-hourglass.svg

Lines changed: 19 additions & 0 deletions
Loading

‎assets/images/receipt-scan.svg

Lines changed: 1 addition & 1 deletion
Loading

‎docs/articles/new-expensify/connections/Set-up-QuickBooks-Online-connection.md

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
---
2+
title: Set up QuickBooks Online connection
3+
description: Integrate QuickBooks Online with Expensify
4+
---
5+
<div id="new-expensify" markdown="1">
6+
7+
{% include info.html %}
8+
To use the QuickBooks Online connection, you must have a QuickBooks Online account and an Expensify Collect plan. The QuickBooks Self-employed subscription is not supported.
9+
{% include end-info.html %}
10+
11+
The features available for the Expensify connection with QuickBooks Online vary based on your QuickBooks subscription. The features may still be visible in Expensify even if you don’t have access, but you will receive an error if the feature isn't available with your subscription.
12+
13+
Here is a list of the features supported by each QuickBooks Online subscription:
14+
15+
| Feature | Simple Start | Essentials | Essentials Plus |
16+
|----------------------------|--------------|------------|-----------------|
17+
| Expense Reports | &#10004; | &#10004; | &#10004; |
18+
| GL Accounts as Categories | &#10004; | &#10004; | &#10004; |
19+
| Credit Card Transactions | &#10004; | &#10004; | &#10004; |
20+
| Debit Card Transaction | | &#10004; | &#10004; |
21+
| Classes | | &#10004; | &#10004; |
22+
| Customers | | &#10004; | &#10004; |
23+
| Projects | | &#10004; | &#10004; |
24+
| Vendor Bills | | &#10004; | &#10004; |
25+
| Journal Entries | | &#10004; | &#10004; |
26+
| Tax | | &#10004; | &#10004; |
27+
| Billable | | | &#10004; |
28+
| Location | | | &#10004; |
29+
30+
To set up your QuickBooks Online connection, complete the 5 steps below.
31+
32+
# Step 1: Set up employees in QuickBooks Online
33+
34+
Log in to QuickBooks Online and ensure all of your employees are setup as either Vendors or Employees using the same email address that they are listed under in Expensify. This process may vary by country, but you can go to **Payroll** and select **Employees** in QuickBooks Online to add new employees or edit existing ones.
35+
36+
# Step 2: Connect Expensify to QuickBooks Online
37+
38+
<ol type="a">
39+
<li>Click your profile image or icon in the bottom left menu.</li>
40+
<li>Scroll down and click <b>Workspaces</b> in the left menu.</li>
41+
<li>Select the workspace you want to connect to QuickBooks Online.</li>
42+
<li>Click <b>More features</b> in the left menu.</li>
43+
<li>Scroll down to the Integrate section and enable the Accounting toggle.</li>
44+
<li>Click <b>Accounting</b> in the left menu.</li>
45+
<li>Click <b>Set up</b> to the right of QuickBooks Online.</li>
46+
<li>Enter your Intuit login details to import your settings from QuickBooks Online to Expensify.</li>
47+
</ol>
48+
49+
# Step 3: Configure import settings
50+
51+
The following steps help you determine how data will be imported from QuickBooks Online to Expensify.
52+
53+
<ol type="a">
54+
<li>Under the Accounting settings for your workspace, click Import under the QuickBooks Online connection.</li>
55+
<li>Review each of the following import settings:</li>
56+
<ul>
57+
<li><b>Chart of accounts</b>: The chart of accounts are automatically imported from QuickBooks Online as categories. This cannot be amended.</li>
58+
<li><b>Classes</b>: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.</li>
59+
<li><b>Customers/projects</b>: Choose whether to import customers/projects, which will be shown in Expensify as tags for expense-level coding.</li>
60+
<li><b>Locations</b>: Choose whether to import locations, which will be shown in Expensify as tags for expense-level coding.</li>
61+
{% include info.html %}
62+
As Locations are only configurable as tags, you cannot export expense reports as vendor bills or checks to QuickBooks Online. To unlock these export options, either disable locations import or upgrade to the Control Plan to export locations encoded as a report field.
63+
{% include end-info.html %}
64+
<li><b>Taxes</b>: Choose whether to import tax rates and defaults.</li>
65+
</ul>
66+
</ol>
67+
68+
# Step 4: Configure export settings
69+
70+
The following steps help you determine how data will be exported from Expensify to QuickBooks Online.
71+
72+
<ol type="a">
73+
<li>Under the Accounting settings for your workspace, click Export under the QuickBooks Online connection.</li>
74+
<li>Review each of the following export settings:</li>
75+
<ul>
76+
<li><b>Preferred Exporter</b>: Choose whether to assign a Workspace Admin as the Preferred Exporter. Once selected, the Preferred Exporter automatically receives reports for export in their account to help automate the exporting process.</li>
77+
78+
{% include info.html %}
79+
* Other Workspace Admins will still be able to export to QuickBooks Online.
80+
* If you set different export accounts for individual company cards under your domain settings, then your Preferred Exporter must be a Domain Admin.
81+
{% include end-info.html %}
82+
83+
<li><b>Date</b>: Choose whether to use the date of last expense, export date, or submitted date.</li>
84+
<li><b>Export Out-of-Pocket Expenses as</b>: Select whether out-of-pocket expenses will be exported as a check, journal entry, or vendor bill.</li>
85+
86+
{% include info.html %}
87+
These settings may vary based on whether tax is enabled for your workspace.
88+
* If tax is not enabled on the workspace, you’ll also select the Accounts Payable/AP.
89+
* If tax is enabled on the workspace, journal entry will not be available as an option. If you select the journal entries option first and later enable tax on the workspace, you will see a red dot and an error message under the “Export Out-of-Pocket Expenses as” options. To resolve this error, you must change your export option to vendor bill or check to successfully code and export expense reports.
90+
{% include end-info.html %}
91+
92+
<li><b>Invoices</b>: Select the QuickBooks Online invoice account that invoices will be exported to.</li>
93+
<li><b>Export as</b>: Select whether company cards export to QuickBooks Online as a credit card (the default), debit card, or vendor bill. Then select the account they will export to.</li>
94+
<li>If you select vendor bill, you’ll also select the accounts payable account that vendor bills will be created from, as well as whether to set a default vendor for credit card transactions upon export. If this option is enabled, you will select the vendor that all credit card transactions will be applied to.</li>
95+
</ul>
96+
</ol>
97+
98+
# Step 5: Configure advanced settings
99+
100+
The following steps help you determine the advanced settings for your connection, like auto-sync and employee invitation settings.
101+
102+
<ol type="a">
103+
<li>Under the Accounting settings for your workspace, click Advanced under the QuickBooks Online connection.</li>
104+
<li>Select an option for each of the following settings:</li>
105+
<ul>
106+
<li><b>Auto-sync</b>: Choose whether to enable QuickBooks Online to automatically communicate changes with Expensify 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.</li>
107+
<li><b>Invite Employees</b>: Choose whether to enable Expensify to import employee records from QuickBooks Online and invite them to this workspace.</li>
108+
<li><b>Automatically Create Entities</b>: Choose whether to enable Expensify to automatically create vendors and customers in QuickBooks Online if a matching vendor or customer does not exist.</li>
109+
<li><b>Sync Reimbursed Reports</b>: Choose whether to enable report syncing for reimbursed expenses. If enabled, all reports that are marked as Paid in QuickBooks Online will also show in Expensify as Paid. If enabled, you must also select the QuickBooks Online account that reimbursements are coming out of, and Expensify will automatically create the payment in QuickBooks Online.</li>
110+
<li><b>Invoice Collection Account</b>: Select the invoice collection account that you want invoices to appear under once the invoice is marked as paid.</li>
111+
</ul>
112+
</ol>
113+
114+
{% include faq-begin.md %}
115+
116+
**Why do I see a red dot next to my connection?**
117+
If there is an error with your connection, you’ll see a red dot next to Accounting in the left menu. When you click Accounting, you’ll also see a red dot displayed next to the QuickBooks Online connection card.
118+
119+
This may occur if you incorrectly enter your QuickBooks Online login information when trying to establish the connection. To resubmit your login details,
120+
1. Click the three-dot menu to the right of the QuickBooks Online connection.
121+
2. Click **Enter credentials**.
122+
3. Enter your Intuit login details (the login information you use for QuickBooks Online) to establish the connection.
123+
124+
{% include faq-end.md %}
125+
126+
</div>

‎docs/articles/new-expensify/expenses/Track-expenses.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: Track Expenses
3+
description: Create, store, or share non-reimbursable expenses
4+
---
5+
<div id="new-expensify" markdown="1">
6+
7+
Create, store, or share non-reimbursable expenses with the Track Expenses feature.
8+
9+
{% include selector.html values="desktop, mobile" %}
10+
11+
{% include option.html value="desktop" %}
12+
1. Click the + icon in the bottom left menu and select **Track Expense**.
13+
2. Create the expense manually, scan the receipt, or add a distance expense.
14+
15+
{% include info.html %}
16+
For an in-depth walkthrough on how to create an expense, check out the <a href="[url](https://help.expensify.com/articles/new-expensify/expenses/Create-an-expense)">create an expense</a> article.
17+
{% include end-info.html %}
18+
19+
3. Choose the next steps for the expense:
20+
- **Submit it to someone**: Select this option to request payment from other members of your Expensify workspace.
21+
- **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.
22+
- **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.
23+
- **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.
24+
{% include end-option.html %}
25+
26+
{% include option.html value="mobile" %}
27+
1. Tap the + icon in the bottom menu and select **Track Expense**.
28+
2. Create the expense manually, scan the receipt, or add a distance expense.
29+
30+
{% include info.html %}
31+
For an in-depth walkthrough on how to create an expense, check out the <a href="[url](https://help.expensify.com/articles/new-expensify/expenses/Create-an-expense)">create an expense</a> article.
32+
{% include end-info.html %}
33+
34+
3. Choose the next steps for the expense:
35+
- **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.
36+
- **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.
37+
- **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.
38+
- **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.
39+
{% include end-option.html %}
40+
41+
{% include end-selector.html %}
42+
43+
</div>

‎docs/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
---
2+
title: Upgrade to the new Expensify Card from Visa
3+
description: Get the new Expensify Visa® Commercial Card
4+
---
5+
<div id="new-expensify" markdown="1">
6+
7+
If your company is already using Expensify Cards, you can upgrade your cards for free to the new Expensify Visa® Commercial Card to get even more tools to manage employee spending, including:
8+
- Unlimited <a href="[url](https://use.expensify.com/unlimited-virtual-cards)">virtual cards</a>
9+
- Controlled spending amounts on virtual cards to manage subscriptions
10+
- Tighter controls for managing spend across employees and merchants
11+
- Fixed or monthly spend limits for each card
12+
- Unique naming for each virtual card for simplified expense categorization
13+
14+
# Upgrade your company’s Expensify Cards
15+
16+
{% include info.html %}
17+
This process must be completed by a Domain Admin. Although the process is available for all Domain Admins, only one admin needs to complete these steps.
18+
19+
Before completing this process, you’ll want to:
20+
21+
- Have your employees update their address if needed so that they receive their new Expensify Card in the mail before completing the steps below.
22+
- Ensure that existing cardholders have a limit greater than $0 if you want them to receive a new Expensify Card. If their limit is $0, increase the limit.
23+
{% include end-info.html %}
24+
25+
1. On your Home page, click the task titled “Upgrade to the new and improved Expensify Card.”
26+
2. Review and agree to the Terms of Service.
27+
3. Click **Get the new card**. All existing cardholders with a limit greater than $0 will be automatically mailed a new physical card to the address they have on file. Virtual cards will be automatically issued and available for immediate use.
28+
4. If you have Positive Pay enabled for your settlement account, contact your bank as soon as possible to whitelist the new ACH ID: 2270239450.
29+
5. Remind your employees to update their payment information for recurring charges to their virtual card information.
30+
31+
New cards will have the same limit as the existing cards. Each cardholder’s current physical and virtual cards will remain active until a Domain Admin or the cardholder deactivates it.
32+
33+
{% include info.html %}
34+
Cards won’t be issued to any employees who don’t currently have them. In this case, you’ll need to <a href="[url](https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Expensify-Visa%C2%AE-Commercial-Card-for-your-Company#:~:text=we%20have%20them.-,How%20to%20issue%20cards,-After%20you%E2%80%99ve%20been)">issue a new card</a>.
35+
{% include end-info.html %}
36+
37+
{% include faq-begin.md %}
38+
39+
**Why don’t I see the task to agree to new terms on my Home page?**
40+
41+
There are a few reasons why you might not see the task on your Home page:
42+
- You may not be a Domain Admin
43+
- Another domain admin has already accepted the terms
44+
- The task may be hidden. To find hidden tasks, scroll to the bottom of the Home page and click **Show Hidden Tasks** to see all of your available tasks.
45+
46+
**Will this affect the continuous reconciliation process?**
47+
48+
No. During the transition period, you may have some employees with old cards and some with new cards, so you’ll have two different debits (settlements) made to your settlement account for each settlement period. Once all spending has transitioned to the new cards, you’ll only see one debit/settlement.
49+
50+
**Do I have to upgrade to the new Expensify Visa® Commercial Card?**
51+
52+
Yes. We’ll provide a deadline soon. But don’t worry—you’ll have plenty of time to upgrade.
53+
{% include faq-end.md %}
54+
</div>

0 commit comments

Comments
 (0)