Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into brtqkr/ts-migration/3…
Browse files Browse the repository at this point in the history
…8913
  • Loading branch information
BrtqKr committed Apr 9, 2024
2 parents e5ec150 + b0c4178 commit 9e17db0
Show file tree
Hide file tree
Showing 64 changed files with 890 additions and 1,027 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
44 changes: 44 additions & 0 deletions docs/articles/expensify-classic/expenses/Expense-Types.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
title: Expense Types
description: Details of the different Expense filters and Expense Types
---

# Overview
Expense types help categorize different expenses for better financial management. While reimbursable and non-reimbursable expenses are common, Expensify offers various other options to suit your needs. Let's explore the available expense types.

# How To
## Filtering a Report by Expense Type
Organizing a report by expense type can make it easier to review expenses on a report.
- Open the report you're interested in.
- Click the **Details** icon in the upper right corner of the report,
- Change the “View” to **Detailed** and “Split by” **Reimbursable** or **Billable**.
- You’ll also see the option to **Group by Category** or **Tags**.


# Deep Dive
Each report will show the total amount for all expenses in the upper right. Under that total, there will be a breakdown of amounts that are reimbursable, billable, and non-reimbursable (depending on which of those expense types exist on the report).

## Expense Types
- **Reimbursable Expenses:** Employees pay for these expenses out of their pockets on behalf of the business and are usually reimbursed. They often come from cash, debit cards, or personal credit card purchases.
- **Non-reimbursable Expenses:** The business directly covers these expenses, so there's no need to reimburse the employee. Typically, these expenses are company card expenses.
- **Billable Expenses:** Business or employee expenses must be billed to a specific client or vendor. Choose this option if you need to track expenses for invoicing to customers, clients, or other departments.
- **Per Diem Expenses:** These expenses involve a daily or partial daily rate you can configure in your expense Workspace.
- **Time Expenses:** Employees or jobs are billed based on an hourly rate that you can set within Expensify.
- **Distance Expenses:** These expenses are related to travel for work.

{% include faq-begin.md %}

## What’s the difference between a receipt, an expense, and a report attachment?

- **Expense:** Created when you SmartScan or manually upload a receipt from a purchase.
- **Receipt:** Automatically attached to the expense during the SmartScan process.
- **Report Attachments:** Additional documents that need to be submitted to your approver (e.g., supplemental documents to the purchase) can be added to a report anytime by clicking the paperclip icon in the Reports Comments.

## How are credits or refunds displayed in Expensify?
In Expensify, a credit is displayed as an expense with a minus (ex. -$1.00) in front of it. That’s because Expensify defaults all expenses as something that needs to be paid by the company. So a credit that is returned to the company is displayed as a negative expense.

If a report includes a credit or a refund expense, it will offset the total amount on the report.
For example, the report has two reimbursable expenses, $400 and $500. The total Reimbursable is $900.
Conversely, a -$400 and $500 will be a total Reimbursable amount of $500

{% include faq-end.md %}
51 changes: 0 additions & 51 deletions docs/articles/expensify-classic/expensify-billing/Billing-Owner.md

This file was deleted.

17 changes: 17 additions & 0 deletions docs/redirects.csv
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,20 @@ https://help.expensify.com/articles/expensify-classic/workspace-and-domain-setti
https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/User-Roles.html,https://help.expensify.com/expensify-classic/hubs/copilots-and-delegates/
https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Owner,https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account
https://help.expensify.com/articles/expensify-classic/insights-and-custom-reporting/Other-Export-Options.html,https://help.expensify.com/articles/expensify-classic/spending-insights/Other-Export-Options
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Global-Reimbursements
https://help.expensify.com/expensify-classic/hubs/bank-accounts-and-credit-cards,https://help.expensify.com/expensify-classic/hubs/
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports
https://help.expensify.com/expensify-classic/hubs/bank-accounts-and-credit-cards/company-cards,https://help.expensify.com/expensify-classic/hubs/connect-credit-cards/company-cards
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Global-Reimbursements
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards
https://help.expensify.com/expensify-classic/hubs/bank-accounts-and-credit-cards/deposit-accounts,https://help.expensify.com/expensify-classic/hubs/connect-credit-cards/deposit-accounts
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-USD,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/deposit-accounts/Deposit-Accounts-USD
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-AUD,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/deposit-accounts/Deposit-Accounts-AUD
https://help.expensify.com/expensify-classic/hubs/bank-accounts-and-credit-cards/business-bank-accounts,https://help.expensify.com/expensify-classic/hubs/connect-credit-cards/business-bank-accounts
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/CSV-Import
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Company-Card-Settings,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-ANZ,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Connect-ANZ
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Reconciliation
https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"react-content-loader": "^7.0.0",
"react-dom": "18.1.0",
"react-error-boundary": "^4.0.11",
"react-fast-pdf": "^1.0.8",
"react-fast-pdf": "^1.0.6",
"react-map-gl": "^7.1.3",
"react-native": "0.73.2",
"react-native-android-location-enabler": "^2.0.1",
Expand Down
22 changes: 12 additions & 10 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ const ROUTES = {
getRoute: (backTo?: string) => getUrlWithBackToParam('settings/exit-survey/confirm', backTo),
},

SETTINGS_SAVE_THE_WORLD: 'settings/teachersunite',

KEYBOARD_SHORTCUTS: 'keyboard-shortcuts',

NEW: 'new',
Expand Down Expand Up @@ -325,14 +327,14 @@ const ROUTES = {
getUrlWithBackToParam(`${action}/${iouType}/amount/${transactionID}/${reportID}`, backTo),
},
MONEY_REQUEST_STEP_TAX_RATE: {
route: 'create/:iouType/taxRate/:transactionID/:reportID?',
getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo: string) =>
getUrlWithBackToParam(`create/${iouType}/taxRate/${transactionID}/${reportID}`, backTo),
route: ':action/:iouType/taxRate/:transactionID/:reportID?',
getRoute: (action: ValueOf<typeof CONST.IOU.ACTION>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
getUrlWithBackToParam(`${action}/${iouType}/taxRate/${transactionID}/${reportID}`, backTo),
},
MONEY_REQUEST_STEP_TAX_AMOUNT: {
route: 'create/:iouType/taxAmount/:transactionID/:reportID?',
getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo: string) =>
getUrlWithBackToParam(`create/${iouType}/taxAmount/${transactionID}/${reportID}`, backTo),
route: ':action/:iouType/taxAmount/:transactionID/:reportID?',
getRoute: (action: ValueOf<typeof CONST.IOU.ACTION>, iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
getUrlWithBackToParam(`${action}/${iouType}/taxAmount/${transactionID}/${reportID}`, backTo),
},
MONEY_REQUEST_STEP_CATEGORY: {
route: ':action/:iouType/category/:transactionID/:reportID/:reportActionID?',
Expand Down Expand Up @@ -440,10 +442,10 @@ const ROUTES = {
ONBOARD_MANAGE_EXPENSES: 'onboard/manage-expenses',
ONBOARD_EXPENSIFY_CLASSIC: 'onboard/expensify-classic',

TEACHERS_UNITE: 'teachersunite',
I_KNOW_A_TEACHER: 'teachersunite/i-know-a-teacher',
I_AM_A_TEACHER: 'teachersunite/i-am-a-teacher',
INTRO_SCHOOL_PRINCIPAL: 'teachersunite/intro-school-principal',
TEACHERS_UNITE: 'settings/teachersunite',
I_KNOW_A_TEACHER: 'settings/teachersunite/i-know-a-teacher',
I_AM_A_TEACHER: 'settings/teachersunite/i-am-a-teacher',
INTRO_SCHOOL_PRINCIPAL: 'settings/teachersunite/intro-school-principal',

ERECEIPT: {
route: 'eReceipt/:transactionID',
Expand Down
Loading

0 comments on commit 9e17db0

Please sign in to comment.