From 5c3a4e60e296d011b6ca3a5ba133ec5da43a88df Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Fri, 21 May 2021 16:41:03 +0200 Subject: [PATCH] [IMP] expenses: ref content to top-level TOC page This commit is part of a larger work to improve the documentation's structure. The toctree structure used to add levels to create categories and make the structure visually more understandable. With the new version of the documentation, plenty of these categories are now redundant. This commit: - renames "expense" to "expenses" as it is in the app and in the title - restructures the files - moves the media files from "media" folder to "expenses" folder - adds a short intro to expenses task-2535899 --- content/applications/finance.rst | 2 +- .../supplier_bills/purchase_receipts.rst | 4 +- .../{expense/expense.rst => expenses.rst} | 35 +++++++++++------- .../approval_01.png} | Bin .../approval_02.png} | Bin .../approval_03.png} | Bin .../invoicing_01.png} | Bin .../invoicing_02.png} | Bin .../invoicing_03.png} | Bin .../invoicing_04.png} | Bin .../product.png} | Bin .../submit_01.png} | Bin .../submit_02.png} | Bin .../submit_03.png} | Bin redirects.txt | 4 +- 15 files changed, 28 insertions(+), 17 deletions(-) rename content/applications/finance/{expense/expense.rst => expenses.rst} (90%) rename content/applications/finance/{expense/media/expense_approval_01.png => expenses/approval_01.png} (100%) rename content/applications/finance/{expense/media/expense_approval_02.png => expenses/approval_02.png} (100%) rename content/applications/finance/{expense/media/expense_approval_03.png => expenses/approval_03.png} (100%) rename content/applications/finance/{expense/media/expense_invoicing_01.png => expenses/invoicing_01.png} (100%) rename content/applications/finance/{expense/media/expense_invoicing_02.png => expenses/invoicing_02.png} (100%) rename content/applications/finance/{expense/media/expense_invoicing_03.png => expenses/invoicing_03.png} (100%) rename content/applications/finance/{expense/media/expense_invoicing_04.png => expenses/invoicing_04.png} (100%) rename content/applications/finance/{expense/media/expense_product.png => expenses/product.png} (100%) rename content/applications/finance/{expense/media/expense_submit_01.png => expenses/submit_01.png} (100%) rename content/applications/finance/{expense/media/expense_submit_02.png => expenses/submit_02.png} (100%) rename content/applications/finance/{expense/media/expense_submit_03.png => expenses/submit_03.png} (100%) diff --git a/content/applications/finance.rst b/content/applications/finance.rst index d7a4b7815..67be59b0a 100644 --- a/content/applications/finance.rst +++ b/content/applications/finance.rst @@ -6,5 +6,5 @@ Finance .. toctree:: finance/accounting - finance/expense/expense + finance/expenses finance/sign diff --git a/content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst b/content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst index 36ed3821b..2d5245111 100644 --- a/content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst +++ b/content/applications/finance/accounting/payables/supplier_bills/purchase_receipts.rst @@ -12,7 +12,7 @@ amount is first credited on a debt account before a later payment reconciliation .. note:: Expenses paid by employees can be managed with **Odoo Expenses**, an app dedicated to the approval of such expenses and the payments management. Click :doc:`here - ` for more information on how to use Odoo Expenses. + ` for more information on how to use Odoo Expenses. Register a receipt ================== @@ -42,4 +42,4 @@ needs, and click on *Post*. .. seealso:: - :doc:`manage` - - :doc:`/applications/finance/expense/expense` + - :doc:`/applications/finance/expenses` diff --git a/content/applications/finance/expense/expense.rst b/content/applications/finance/expenses.rst similarity index 90% rename from content/applications/finance/expense/expense.rst rename to content/applications/finance/expenses.rst index c9eb10f20..259f7100f 100644 --- a/content/applications/finance/expense/expense.rst +++ b/content/applications/finance/expenses.rst @@ -1,16 +1,24 @@ +:show-content: ======== Expenses ======== +**Odoo Expenses** streamlines the management of expenses. Employees can submit their expenses; +managers can approve them; accountants can record them and process the payments. + +.. seealso:: + - `Odoo Expenses: product page `_ + How to set expense types ======================== + The first step to track expenses is to configure the expense types (managed as products in Odoo) that your company allows, from the *Configuration* menu. When a specific expense is reimbursed at a fixed price, set a cost on the product. Otherwise keep the cost at 0.0 and employees will report the real cost per expense. -.. image:: ./media/expense_product.png +.. image:: expenses/product.png :align: center Here are some examples to configure: @@ -52,7 +60,7 @@ Manually As an employee (Employee in user access rights), you can record expenses from :menuselection:`My Expenses --> Expenses to Submit`. -.. image:: ./media/expense_submit_01.png +.. image:: expenses/submit_01.png :align: center 1. Select the related product and enter either the total amount @@ -65,11 +73,12 @@ expenses from :menuselection:`My Expenses --> Expenses to Submit`. photo/scan of the receipt from the discussion thread. That will help the manager and the accountant validate it. -.. image:: ./media/expense_submit_02.png +.. image:: expenses/submit_02.png :align: center In one click from emails ------------------------ + Let your employees record their expenses from a simple email. Make a snapshot of the receipt and send it by email, or simply forward a bill! @@ -93,7 +102,7 @@ from the list view and click on :menuselection:`Action --> Submit to Manager`. Save the newly created expense report (i.e. set of expenses), and wait for your manager to approve it. -.. image:: ./media/expense_submit_03.png +.. image:: expenses/submit_03.png :align: center You can also submit expenses one by one from the *Submit to Manager* @@ -110,19 +119,19 @@ HR and team managers get an overview of all expense reports to validate from the top menu :menuselection:`To Approve --> Expense Reports to Approve`. Such users must have at least *Officers* access rights for *Expenses*. -.. image:: ./media/expense_approval_01.png +.. image:: expenses/approval_01.png :align: center They can review expense reports, approve or reject them, as well as providing feedback thanks to the integrated communication tool. -.. image:: ./media/expense_approval_02.png +.. image:: expenses/approval_02.png :align: center As a team manager you can easily find the expense reports of your team members. You need to be set as manager in the detail form of those employees. -.. image:: ./media/expense_approval_03.png +.. image:: expenses/approval_03.png :align: center @@ -154,8 +163,8 @@ To record the payment or pay by check, click *Register a Payment*. See how you can easily manage the payment process in Odoo: -* :doc:`../accounting/payables/pay/check` -* :doc:`../accounting/payables/pay/sepa` +* :doc:`accounting/payables/pay/check` +* :doc:`accounting/payables/pay/sepa` How to re-invoice expenses to your customers @@ -183,7 +192,7 @@ Setup - At sales price: will invoice based on a fixed sales price set on the sale order. -.. image:: media/expense_invoicing_01.png +.. image:: expenses/invoicing_01.png :align: center Create an order @@ -196,7 +205,7 @@ Create an order - Link the expense to the Sale Order. -.. image:: media/expense_invoicing_02.png +.. image:: expenses/invoicing_02.png :align: center Submit, validate and post expenses @@ -206,7 +215,7 @@ Submit, validate and post expenses line on approving expenses reports. Click the line to add one if missing. Employees are already able to set one when submitting. -.. image:: media/expense_invoicing_03.png +.. image:: expenses/invoicing_03.png :align: center - As an accountant, post journal entries. @@ -219,7 +228,7 @@ Now you can invoice the order. It shows up in to Invoice. The expenses have been added automatically in the order lines. Such items show up in blue (i.e. to invoice). -.. image:: media/expense_invoicing_04.png +.. image:: expenses/invoicing_04.png :align: center e (i.e. to invoice). \ No newline at end of file diff --git a/content/applications/finance/expense/media/expense_approval_01.png b/content/applications/finance/expenses/approval_01.png similarity index 100% rename from content/applications/finance/expense/media/expense_approval_01.png rename to content/applications/finance/expenses/approval_01.png diff --git a/content/applications/finance/expense/media/expense_approval_02.png b/content/applications/finance/expenses/approval_02.png similarity index 100% rename from content/applications/finance/expense/media/expense_approval_02.png rename to content/applications/finance/expenses/approval_02.png diff --git a/content/applications/finance/expense/media/expense_approval_03.png b/content/applications/finance/expenses/approval_03.png similarity index 100% rename from content/applications/finance/expense/media/expense_approval_03.png rename to content/applications/finance/expenses/approval_03.png diff --git a/content/applications/finance/expense/media/expense_invoicing_01.png b/content/applications/finance/expenses/invoicing_01.png similarity index 100% rename from content/applications/finance/expense/media/expense_invoicing_01.png rename to content/applications/finance/expenses/invoicing_01.png diff --git a/content/applications/finance/expense/media/expense_invoicing_02.png b/content/applications/finance/expenses/invoicing_02.png similarity index 100% rename from content/applications/finance/expense/media/expense_invoicing_02.png rename to content/applications/finance/expenses/invoicing_02.png diff --git a/content/applications/finance/expense/media/expense_invoicing_03.png b/content/applications/finance/expenses/invoicing_03.png similarity index 100% rename from content/applications/finance/expense/media/expense_invoicing_03.png rename to content/applications/finance/expenses/invoicing_03.png diff --git a/content/applications/finance/expense/media/expense_invoicing_04.png b/content/applications/finance/expenses/invoicing_04.png similarity index 100% rename from content/applications/finance/expense/media/expense_invoicing_04.png rename to content/applications/finance/expenses/invoicing_04.png diff --git a/content/applications/finance/expense/media/expense_product.png b/content/applications/finance/expenses/product.png similarity index 100% rename from content/applications/finance/expense/media/expense_product.png rename to content/applications/finance/expenses/product.png diff --git a/content/applications/finance/expense/media/expense_submit_01.png b/content/applications/finance/expenses/submit_01.png similarity index 100% rename from content/applications/finance/expense/media/expense_submit_01.png rename to content/applications/finance/expenses/submit_01.png diff --git a/content/applications/finance/expense/media/expense_submit_02.png b/content/applications/finance/expenses/submit_02.png similarity index 100% rename from content/applications/finance/expense/media/expense_submit_02.png rename to content/applications/finance/expenses/submit_02.png diff --git a/content/applications/finance/expense/media/expense_submit_03.png b/content/applications/finance/expenses/submit_03.png similarity index 100% rename from content/applications/finance/expense/media/expense_submit_03.png rename to content/applications/finance/expenses/submit_03.png diff --git a/redirects.txt b/redirects.txt index 46a6a4253..5de69f0ba 100644 --- a/redirects.txt +++ b/redirects.txt @@ -67,7 +67,7 @@ accounting/others/taxes/default_taxes.rst applications/finance/accounting/taxati accounting/others/taxes/retention.rst applications/finance/accounting/taxation/taxes/retention.rst # others/* --> taxation/* (#575) accounting/others/taxes/tax_included.rst applications/finance/accounting/taxation/taxes/tax_included.rst # others/* --> taxation/* (#575) accounting/others/taxes/taxcloud.rst applications/finance/accounting/taxation/taxes/taxcloud.rst # others/* --> taxation/* (#575) -accounting/payables/misc/employee_expense.rst finance/expense/expense.rst # applications/finance/accounting/payables/misc/employee_expense --> expense/expense [merged] +accounting/payables/misc/employee_expense.rst finance/expenses.rst # applications/finance/accounting/payables/misc/employee_expense --> expenses [merged] accounting/others/reporting/customize.rst applications/finance/accounting/reporting/overview/customize.rst # others/reporting/* --> reporting/overview/* accounting/others/reporting/main_reports.rst applications/finance/accounting/reporting/overview/main_reports.rst # others/reporting/* --> reporting/overview/* accounting/fiscality/taxes/tax_returns.rst applications/finance/accounting/reporting/declarations/tax_returns.rst # fiscality/taxes/* --> reporting/declarations/* @@ -107,6 +107,8 @@ applications/finance/accounting/overview/getting_started/setup.rst applications/ applications/finance/accounting/overview/process_overview/customer_invoice.rst applications/finance/accounting/getting_started/process_overview/customer_invoice.rst # overview/* -> getting_started/* applications/finance/accounting/overview/process_overview/supplier_bill.rst applications/finance/accounting/getting_started/process_overview/supplier_bill.rst # overview/* -> getting_started/* +applications/finance/expense/expense.rst applications/finance/expenses.rst #expense/expense -> expenses + social_marketing/social_marketing.rst applications/marketing/social_marketing/overview.rst # social_marketing/* -> overview/* (#578) project/planning/assignments.rst applications/services/project/planning/forecast.rst # assignments/* -> forecast/* (#583)