From 806761eec558cc1c00e99a5df921cfb89d7ce962 Mon Sep 17 00:00:00 2001 From: Raf Geens Date: Fri, 21 May 2021 16:56:36 +0200 Subject: [PATCH 1/4] [FIX] developer: correct `cr.execute` signature in ORM doc `cr.execute` takes a single argument which is a list, a tuple, or a dict. --- content/developer/reference/orm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/developer/reference/orm.rst b/content/developer/reference/orm.rst index 6085c4f5b..1b152fd57 100644 --- a/content/developer/reference/orm.rst +++ b/content/developer/reference/orm.rst @@ -517,7 +517,7 @@ cursor for the current database transaction and allows executing SQL directly, either for queries which are difficult to express using the ORM (e.g. complex joins) or for performance reasons:: - self.env.cr.execute("some_sql", param1, param2, param3) + self.env.cr.execute("some_sql", params) Because models use the same cursor and the :class:`~odoo.api.Environment` holds various caches, these caches must be invalidated when *altering* the From 7f3b2a1edd67064aa023565c1c85bf053ef3545b Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Thu, 20 May 2021 15:39:25 +0200 Subject: [PATCH 2/4] [IMP] sign: add content to top-level TOC page + improve structure 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 improves the structure of the "Sign" app: - it removes a useless "overview" category - it adds a brief explanation at the "app" level, including links to relevant docs task-2535899 --- content/applications/finance/sign.rst | 71 ++++++++++++++++++- .../applications/finance/sign/overview.rst | 8 --- .../sign/overview/signature_validity.rst | 60 ---------------- redirects.txt | 4 +- 4 files changed, 71 insertions(+), 72 deletions(-) delete mode 100644 content/applications/finance/sign/overview.rst delete mode 100644 content/applications/finance/sign/overview/signature_validity.rst diff --git a/content/applications/finance/sign.rst b/content/applications/finance/sign.rst index 61047829f..a6c1a9d6a 100644 --- a/content/applications/finance/sign.rst +++ b/content/applications/finance/sign.rst @@ -1,8 +1,73 @@ +:show-content: + ==== Sign ==== -.. toctree:: - :titlesonly: +**Odoo Sign** allows you to send, sign and approve documents online. - sign/overview \ No newline at end of file +You can upload any PDF file and add drag-and-dropping fields on it. These fields are automatically +filled out with the user's detail if they are logged in. + +.. seealso:: + - `Odoo Sign: product page `_ + +Validity of electronic signatures +================================= + +The legal validity of electronic signatures generated by Odoo depends on the legislation of your +country. Companies doing business abroad should consider electronic signature laws of other +countries as well. + +In the European Union +--------------------- + +The `eIDAS regulation `_ establishes the framework for +electronic signatures in all `27 member states of the European Union +`_. + +It distinguishes three types of electronic signatures: + +#. Electronic signatures +#. Advanced electronic signatures +#. Qualified electronic signatures + +Odoo generates the first type, regular electronic signatures, and these signatures can produce legal +effects in the EU, as the regulation states that “an electronic signature shall not be denied legal +effect and admissibility as evidence in legal proceedings solely on the grounds that it is in an +electronic form or that it does not meet the requirements for qualified electronic signatures.” + +Note that electronic signatures may not be automatically recognized as valid. You may need to bring +supporting evidence of a signature’s validity. + +In the United States of America +------------------------------- + +The `ESIGN Act (Electronic Signatures in Global and National Commerce Act) +`_, at the interstate and +international levels, and the `UETA (Uniform Electronic Transactions Act) +`_, +at the state level, provide the legal framework for electronic signatures. Note that `Illinois +`_ and `New York +`_ have not adopted the UETA, but +similar acts instead. + +Overall, to be recognized as valid, electronic signatures have to meet five criteria: + +#. A signer must show a clear intent to sign. For example, using a mouse to draw a signature can + show intent. The signer must also have the option to opt-out of electronically signing a + document. +#. A signer must first express or imply their consent to conduct business electronically. +#. The signature must be clearly attributed. In Odoo, metadata, such as the signer’s IP address, is + added to the signature, which can be used as supporting evidence. +#. The signature must be associated with the document being signed, for example, by keeping a record + detailing how the signature was captured. +#. Electronically signed documents need to be retained and available for later reference by all + parties involved, for example, by providing the signer either a fully-executed copy or the option + to download a copy. + +.. note:: + The information provided here does not constitute legal advice; it is provided for general + informational purposes only. As laws governing electronic signatures evolve rapidly, we cannot + guarantee that the information is up to date. We advise you to should contact a local attorney to + obtain legal advice. \ No newline at end of file diff --git a/content/applications/finance/sign/overview.rst b/content/applications/finance/sign/overview.rst deleted file mode 100644 index 6f5e8e0e5..000000000 --- a/content/applications/finance/sign/overview.rst +++ /dev/null @@ -1,8 +0,0 @@ -======== -Overview -======== - -.. toctree:: - :titlesonly: - - overview/signature_validity \ No newline at end of file diff --git a/content/applications/finance/sign/overview/signature_validity.rst b/content/applications/finance/sign/overview/signature_validity.rst deleted file mode 100644 index e2302b573..000000000 --- a/content/applications/finance/sign/overview/signature_validity.rst +++ /dev/null @@ -1,60 +0,0 @@ -================================= -Validity of electronic signatures -================================= - -The legal validity of electronic signatures generated by Odoo depends on the legislation of your -country. Companies doing business abroad should consider electronic signature laws of other -countries as well. - -In the European Union -===================== - -The `eIDAS regulation `_ establishes the framework for -electronic signatures in all `27 member states of the European Union -`_. - -It distinguishes three types of electronic signatures: - -#. Electronic signatures -#. Advanced electronic signatures -#. Qualified electronic signatures - -Odoo generates the first type, regular electronic signatures, and these signatures can produce legal -effects in the EU, as the regulation states that “an electronic signature shall not be denied legal -effect and admissibility as evidence in legal proceedings solely on the grounds that it is in an -electronic form or that it does not meet the requirements for qualified electronic signatures.” - -Note that electronic signatures may not be automatically recognized as valid. You may need to bring -supporting evidence of a signature’s validity. - -In the United States of America -=============================== - -The `ESIGN Act (Electronic Signatures in Global and National Commerce Act) -`_, at the interstate and -international levels, and the `UETA (Uniform Electronic Transactions Act) -`_, -at the state level, provide the legal framework for electronic signatures. Note that `Illinois -`_ and `New York -`_ have not adopted the UETA, but -similar acts instead. - -Overall, to be recognized as valid, electronic signatures have to meet five criteria: - -#. A signer must show a clear intent to sign. For example, using a mouse to draw a signature can - show intent. The signer must also have the option to opt-out of electronically signing a - document. -#. A signer must first express or imply their consent to conduct business electronically. -#. The signature must be clearly attributed. In Odoo, metadata, such as the signer’s IP address, is - added to the signature, which can be used as supporting evidence. -#. The signature must be associated with the document being signed, for example, by keeping a record - detailing how the signature was captured. -#. Electronically signed documents need to be retained and available for later reference by all - parties involved, for example, by providing the signer either a fully-executed copy or the option - to download a copy. - -.. note:: - The information provided here does not constitute legal advice; it is provided for general - informational purposes only. As laws governing electronic signatures evolve rapidly, we cannot - guarantee that the information is up to date. We advise you to should contact a local attorney to - obtain legal advice. \ No newline at end of file diff --git a/redirects.txt b/redirects.txt index abbe99d8c..ec68e2cf6 100644 --- a/redirects.txt +++ b/redirects.txt @@ -187,4 +187,6 @@ discuss/overview.rst applications/productivity/discuss/overview/get_started.rst crm/optimize/onsip.rst applications/general/voip/onsip.rst # crm/optimize/* --> general/voip/* crm/optimize/setup.rst applications/general/voip/asterisk.rst # crm/optimize/setup --> general/voip/asterisk -general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst # add_user --> users \ No newline at end of file +general/odoo_basics/add_user.rst applications/general/odoo_basics/users.rst # add_user --> users + +applications/finance/sign/overview/signature_validity.rst applications/finance/sign.rst #sign/overview/signature_validity -> sign/* From d66de0d1f2a8ffd21cb7753b335b6cf943bc461e Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Thu, 20 May 2021 16:10:22 +0200 Subject: [PATCH 3/4] [IMP] accounting: move in-odoo to top-level TOC page + imp structure 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 improves the structure of the "Accounting" app: - it moves the doc "in-odoo" in the top "app" level and its content is included in "accounting.rst" (the content will later be improved) - adds new intro - changes external links to mementos to correct doc references - it renames the category accounting/overview to accounting/getting_started - it renames the category accounting/overview/getting_started to accounting/getting_started/initial_configuration - it moves "memento" one level above, from accounting/overview/main_concepts to the renamed accounting/getting_started as it is the last doc remaining in this category - it renames the app "Invoicing and Accounting" to "Accounting and Invoicing" since the focus should be on "Accounting" task-2535899 --- content/applications/finance/accounting.rst | 159 +++++++++++++++++- .../overview/fiscal_localization_packages.rst | 2 +- .../finance/accounting/getting_started.rst | 10 ++ .../getting_started/initial_configuration.rst | 9 + .../chart_of_accounts.rst | 0 .../media/chart_of_accounts01.png | Bin .../media/chart_of_accounts02.png | Bin .../media/setup_accounting_onboarding.png | Bin .../media/setup_chart_of_accounts.png | Bin .../media/setup_company.png | Bin .../media/setup_document_layout.png | Bin .../media/setup_invoicing_onboarding.png | Bin .../initial_configuration}/setup.rst | 0 .../memento.rst | 0 .../process_overview.rst | 0 .../process_overview/customer_invoice.rst | 0 .../process_overview/media/invoice01.png | Bin .../process_overview/media/invoice02.png | Bin .../process_overview/media/invoice03.png | Bin .../process_overview/media/invoice04.png | Bin .../process_overview/media/invoice05.png | Bin .../process_overview/media/invoice06.png | Bin .../process_overview/media/invoice07.png | Bin .../process_overview/media/invoice08.png | Bin .../process_overview/media/invoice09.png | Bin .../process_overview/media/invoice10.png | Bin .../process_overview/media/invoice11.png | Bin .../process_overview/media/invoice12.png | Bin .../process_overview/media/invoice13.png | Bin .../process_overview/media/invoice14.png | Bin .../process_overview/media/invoice15.png | Bin .../process_overview/media/invoice16.png | Bin .../process_overview/media/vendor_bill01.png | Bin .../process_overview/media/vendor_bill02.png | Bin .../process_overview/media/vendor_bill03.png | Bin .../process_overview/media/vendor_bill04.png | Bin .../process_overview/media/vendor_bill05.png | Bin .../process_overview/media/vendor_bill06.png | Bin .../process_overview/supplier_bill.rst | 0 .../finance/accounting/overview.rst | 10 -- .../accounting/overview/getting_started.rst | 9 - .../accounting/overview/main_concepts.rst | 9 - .../overview/main_concepts/in_odoo.rst | 141 ---------------- .../payables/supplier_bills/assets.rst | 2 +- .../supplier_bills/deferred_expenses.rst | 2 +- .../customer_invoices/deferred_revenues.rst | 2 +- .../reporting/declarations/tax_returns.rst | 4 +- .../manage_multi_companies.rst | 2 +- .../products_prices/products/variants.rst | 2 +- redirects.txt | 8 +- 50 files changed, 190 insertions(+), 181 deletions(-) create mode 100644 content/applications/finance/accounting/getting_started.rst create mode 100644 content/applications/finance/accounting/getting_started/initial_configuration.rst rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/chart_of_accounts.rst (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/chart_of_accounts01.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/chart_of_accounts02.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/setup_accounting_onboarding.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/setup_chart_of_accounts.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/setup_company.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/setup_document_layout.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/media/setup_invoicing_onboarding.png (100%) rename content/applications/finance/accounting/{overview/getting_started => getting_started/initial_configuration}/setup.rst (100%) rename content/applications/finance/accounting/{overview/main_concepts => getting_started}/memento.rst (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview.rst (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/customer_invoice.rst (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice01.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice02.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice03.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice04.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice05.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice06.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice07.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice08.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice09.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice10.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice11.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice12.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice13.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice14.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice15.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/invoice16.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill01.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill02.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill03.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill04.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill05.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/media/vendor_bill06.png (100%) rename content/applications/finance/accounting/{overview => getting_started}/process_overview/supplier_bill.rst (100%) delete mode 100644 content/applications/finance/accounting/overview.rst delete mode 100644 content/applications/finance/accounting/overview/getting_started.rst delete mode 100644 content/applications/finance/accounting/overview/main_concepts.rst delete mode 100644 content/applications/finance/accounting/overview/main_concepts/in_odoo.rst diff --git a/content/applications/finance/accounting.rst b/content/applications/finance/accounting.rst index 2aca64ebe..aef28dbe8 100644 --- a/content/applications/finance/accounting.rst +++ b/content/applications/finance/accounting.rst @@ -1,16 +1,169 @@ +:show-content: ======================== -Invoicing and Accounting +Accounting and Invoicing ======================== .. toctree:: :titlesonly: - accounting/overview + accounting/getting_started accounting/receivables accounting/payables accounting/bank accounting/taxation accounting/reporting accounting/others - accounting/fiscal_localizations \ No newline at end of file + accounting/fiscal_localizations + +**Odoo Invoicing** is a standalone invoicing app that allows you to :doc:`issue invoices +`, send them to your customers, and manage +payments, including :doc:`online payments +`. It works as a "lighter" version of Odoo +Accounting, and you can upgrade it to Odoo Accounting if you need more advanced accounting features. + +**Odoo Accounting** is a complete and strong accounting app. The automation of processes is at the +core of its development with its perfect integration with all Odoo apps and with features such as +:doc:`AI-powered invoice recognition `, +:doc:`synchronization with your bank accounts `, and +:doc:`automatic suggestions for a simplified reconciliation process +`. + +.. seealso:: + - `Odoo Invoicing: product page `_ + - `Odoo Accounting: product page `_ + +Double-entry bookkeeping +======================== + +Odoo automatically creates all the behind-the-scenes journal entries +for each of your accounting transactions: customer invoices, point of +sale order, expenses, inventory moves, etc. + +Odoo uses the rules of double-entry bookkeeping system: all journal +entries are automatically balanced (sum of debits = sum of credits). + +.. seealso:: + - :doc:`Understand Odoo's accounting transactions per document + ` + +Accrual and Cash Basis Methods +============================== + +Odoo supports both accrual and cash basis reporting. This allows you to +report income / expense at the time transactions occur (i.e., accrual basis), or when +payment is made or received (i.e., cash basis). + +Multi-companies +=============== + +Odoo allows one to manage several companies within the same database. Each +company has its own chart of accounts and rules. You can get +consolidation reports following your consolidation rules. + +Users can access several companies but always work in one company at a +time. + +Multi-currencies +================ + +Every transaction is recorded in the default currency of the +company. For transactions occurring in another currency, Odoo stores +both the value in the currency of the company and the value in the +currency of the transaction. Odoo can generate currencies gains and +losses after the reconciliation of the journal items. + +Currency rates are updated once a day using a yahoo.com online +web-service. + +International Standards +======================= + +Odoo accounting supports more than 50 countries. The Odoo core +accounting implements accounting standards that are common to all +countries. Specific modules exist per country for the +specificities of the country like the chart of accounts, taxes, or +bank interfaces. + +In particular, Odoo's core accounting engine supports: + +* Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking + countries including Ireland, Canada, Australia, and New Zealand) + where costs of good sold are reported when products are + sold/delivered. +* European accounting where expenses are accounted at the supplier + bill. + +Odoo has modules to comply with IFRS rules. + +Accounts Receivable and Payable +=============================== + +By default, Odoo uses a single account for all account +receivable entries and one for all accounts payable entries. You can +create separate accounts per customers/suppliers, but you don't need +to. + +As transactions are associated to customers or suppliers, you get +reports to perform analysis per customer/supplier such as the customer +statement, revenues per customers, aged receivable/payables, ... + +Wide range of financial reports +=============================== + +In Odoo, you can generate financial reports in real time. Odoo's +reports range from basic accounting reports to advanced management +reports. Odoo's reports include: + +* Performance reports (such as Profit and Loss, Budget Variance) +* Position reports (such as Balance Sheet, Aged Payables, Aged + Receivables) +* Cash reports (such as Bank Summary) +* Detail reports (such as Trial Balance and General Ledger) +* Management reports (such as Budgets, Executive Summary) + +Odoo's report engine allows you to customize your own report based on +your own formulae. + +Import bank feeds automatically +=============================== + +Bank reconciliation is a process that matches your bank statement +lines, as supplied by the bank, to your accounting transactions in the +general ledger. Odoo makes bank reconciliation easy by frequently +importing bank statement lines from your bank directly into your Odoo +account. This means you can have a daily view of your cashflow without +having to log into your online banking or wait for your paper bank +statements. + +Odoo speeds up bank reconciliation by matching most of your imported +bank statement lines to your accounting transactions. Odoo also +remembers how you've treated other bank statement lines and provides +suggested general ledger transactions. + +Calculate the tax you owe your tax authority +============================================ + +Odoo totals all your accounting transactions for your tax period and +uses these totals to calculate your tax obligation. You can then check +your sales tax by running Odoo's Tax Report. + +Inventory Valuation +=================== + +Odoo support both periodic (manual) and perpetual (automated) +inventory valuations. The available methods are standard price, +average price, LIFO (for countries allowing it) and FIFO. + +.. seealso:: + - :doc:`View impact of the valuation method on your transactions + <../inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>` + +Easy retained earnings +====================== + +Retained earnings are the portion of income retained by your +business. Odoo automatically calculates your current year earnings in +real time so no year-end journal or rollover is required. This is +calculated by reporting the profit and loss balance to your balance +sheet report automatically. diff --git a/content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst b/content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst index 4e5183ca8..6b7b4a5bc 100644 --- a/content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst +++ b/content/applications/finance/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst @@ -42,7 +42,7 @@ Please refer to the documentation listed below for more information. .. seealso:: - :doc:`localizations_list` - - :doc:`../../overview/getting_started/chart_of_accounts` + - :doc:`../../getting_started/initial_configuration/chart_of_accounts` - :doc:`../../taxation/taxes/taxes` .. todo:: update list of linked docs, and link with the future one about country-specific statements. \ No newline at end of file diff --git a/content/applications/finance/accounting/getting_started.rst b/content/applications/finance/accounting/getting_started.rst new file mode 100644 index 000000000..4c7ac4385 --- /dev/null +++ b/content/applications/finance/accounting/getting_started.rst @@ -0,0 +1,10 @@ +=============== +Getting Started +=============== + +.. toctree:: + :titlesonly: + + getting_started/memento + getting_started/initial_configuration + getting_started/process_overview diff --git a/content/applications/finance/accounting/getting_started/initial_configuration.rst b/content/applications/finance/accounting/getting_started/initial_configuration.rst new file mode 100644 index 000000000..1d527f62d --- /dev/null +++ b/content/applications/finance/accounting/getting_started/initial_configuration.rst @@ -0,0 +1,9 @@ +===================== +Initial Configuration +===================== + +.. toctree:: + :titlesonly: + + initial_configuration/setup + initial_configuration/chart_of_accounts diff --git a/content/applications/finance/accounting/overview/getting_started/chart_of_accounts.rst b/content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/chart_of_accounts.rst rename to content/applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst diff --git a/content/applications/finance/accounting/overview/getting_started/media/chart_of_accounts01.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/chart_of_accounts01.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/chart_of_accounts01.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/chart_of_accounts01.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/chart_of_accounts02.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/chart_of_accounts02.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/chart_of_accounts02.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/chart_of_accounts02.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/setup_accounting_onboarding.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/setup_accounting_onboarding.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/setup_accounting_onboarding.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/setup_accounting_onboarding.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/setup_chart_of_accounts.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/setup_chart_of_accounts.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/setup_chart_of_accounts.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/setup_chart_of_accounts.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/setup_company.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/setup_company.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/setup_company.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/setup_company.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/setup_document_layout.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/setup_document_layout.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/setup_document_layout.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/setup_document_layout.png diff --git a/content/applications/finance/accounting/overview/getting_started/media/setup_invoicing_onboarding.png b/content/applications/finance/accounting/getting_started/initial_configuration/media/setup_invoicing_onboarding.png similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/media/setup_invoicing_onboarding.png rename to content/applications/finance/accounting/getting_started/initial_configuration/media/setup_invoicing_onboarding.png diff --git a/content/applications/finance/accounting/overview/getting_started/setup.rst b/content/applications/finance/accounting/getting_started/initial_configuration/setup.rst similarity index 100% rename from content/applications/finance/accounting/overview/getting_started/setup.rst rename to content/applications/finance/accounting/getting_started/initial_configuration/setup.rst diff --git a/content/applications/finance/accounting/overview/main_concepts/memento.rst b/content/applications/finance/accounting/getting_started/memento.rst similarity index 100% rename from content/applications/finance/accounting/overview/main_concepts/memento.rst rename to content/applications/finance/accounting/getting_started/memento.rst diff --git a/content/applications/finance/accounting/overview/process_overview.rst b/content/applications/finance/accounting/getting_started/process_overview.rst similarity index 100% rename from content/applications/finance/accounting/overview/process_overview.rst rename to content/applications/finance/accounting/getting_started/process_overview.rst diff --git a/content/applications/finance/accounting/overview/process_overview/customer_invoice.rst b/content/applications/finance/accounting/getting_started/process_overview/customer_invoice.rst similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/customer_invoice.rst rename to content/applications/finance/accounting/getting_started/process_overview/customer_invoice.rst diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice01.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice01.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice01.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice01.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice02.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice02.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice02.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice02.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice03.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice03.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice03.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice03.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice04.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice04.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice04.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice04.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice05.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice05.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice05.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice05.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice06.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice06.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice06.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice06.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice07.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice07.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice07.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice07.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice08.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice08.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice08.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice08.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice09.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice09.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice09.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice09.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice10.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice10.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice10.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice10.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice11.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice11.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice11.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice11.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice12.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice12.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice12.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice12.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice13.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice13.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice13.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice13.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice14.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice14.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice14.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice14.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice15.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice15.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice15.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice15.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/invoice16.png b/content/applications/finance/accounting/getting_started/process_overview/media/invoice16.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/invoice16.png rename to content/applications/finance/accounting/getting_started/process_overview/media/invoice16.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill01.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill01.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill01.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill01.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill02.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill02.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill02.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill02.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill03.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill03.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill03.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill03.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill04.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill04.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill04.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill04.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill05.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill05.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill05.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill05.png diff --git a/content/applications/finance/accounting/overview/process_overview/media/vendor_bill06.png b/content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill06.png similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/media/vendor_bill06.png rename to content/applications/finance/accounting/getting_started/process_overview/media/vendor_bill06.png diff --git a/content/applications/finance/accounting/overview/process_overview/supplier_bill.rst b/content/applications/finance/accounting/getting_started/process_overview/supplier_bill.rst similarity index 100% rename from content/applications/finance/accounting/overview/process_overview/supplier_bill.rst rename to content/applications/finance/accounting/getting_started/process_overview/supplier_bill.rst diff --git a/content/applications/finance/accounting/overview.rst b/content/applications/finance/accounting/overview.rst deleted file mode 100644 index c03298083..000000000 --- a/content/applications/finance/accounting/overview.rst +++ /dev/null @@ -1,10 +0,0 @@ -======== -Overview -======== - -.. toctree:: - :titlesonly: - - overview/main_concepts - overview/getting_started - overview/process_overview diff --git a/content/applications/finance/accounting/overview/getting_started.rst b/content/applications/finance/accounting/overview/getting_started.rst deleted file mode 100644 index 20ac50fd5..000000000 --- a/content/applications/finance/accounting/overview/getting_started.rst +++ /dev/null @@ -1,9 +0,0 @@ -=============== -Getting Started -=============== - -.. toctree:: - :titlesonly: - - getting_started/setup - getting_started/chart_of_accounts diff --git a/content/applications/finance/accounting/overview/main_concepts.rst b/content/applications/finance/accounting/overview/main_concepts.rst deleted file mode 100644 index e889ac38e..000000000 --- a/content/applications/finance/accounting/overview/main_concepts.rst +++ /dev/null @@ -1,9 +0,0 @@ -============= -Main Concepts -============= - -.. toctree:: - :titlesonly: - - main_concepts/in_odoo - main_concepts/memento diff --git a/content/applications/finance/accounting/overview/main_concepts/in_odoo.rst b/content/applications/finance/accounting/overview/main_concepts/in_odoo.rst deleted file mode 100644 index 8eadb3a0c..000000000 --- a/content/applications/finance/accounting/overview/main_concepts/in_odoo.rst +++ /dev/null @@ -1,141 +0,0 @@ -========================== -The Accounting behind Odoo -========================== - -This page summarises the way Odoo deals with typical accounts and -transactions. - -Double-entry bookkeeping -======================== - -Odoo automatically creates all the behind-the-scenes journal entries -for each of your accounting transactions: customer invoices, point of -sale order, expenses, inventory moves, etc. - -Odoo uses the rules of double-entry bookkeeping system: all journal -entries are automatically balanced (sum of debits = sum of credits). - -.. seealso:: - - `Understand Odoo's accounting transactions per document - `_ - -Accrual and Cash Basis Methods -============================== - -Odoo supports both accrual and cash basis reporting. This allows you to -report income / expense at the time transactions occur (i.e., accrual basis), or when -payment is made or received (i.e., cash basis). - -Multi-companies -=============== - -Odoo allows one to manage several companies within the same database. Each -company has its own chart of accounts and rules. You can get -consolidation reports following your consolidation rules. - -Users can access several companies but always work in one company at a -time. - -Multi-currencies -================ - -Every transaction is recorded in the default currency of the -company. For transactions occurring in another currency, Odoo stores -both the value in the currency of the company and the value in the -currency of the transaction. Odoo can generate currencies gains and -losses after the reconciliation of the journal items. - -Currency rates are updated once a day using a yahoo.com online -web-service. - -International Standards -======================= - -Odoo accounting supports more than 50 countries. The Odoo core -accounting implements accounting standards that are common to all -countries. Specific modules exist per country for the -specificities of the country like the chart of accounts, taxes, or -bank interfaces. - -In particular, Odoo's core accounting engine supports: - -* Anglo-Saxon Accounting (U.S., U.K.,, and other English-speaking - countries including Ireland, Canada, Australia, and New Zealand) - where costs of good sold are reported when products are - sold/delivered. -* European accounting where expenses are accounted at the supplier - bill. - -Odoo has modules to comply with IFRS rules. - -Accounts Receivable & Payable -============================= - -By default, Odoo uses a single account for all account -receivable entries and one for all accounts payable entries. You can -create separate accounts per customers/suppliers, but you don't need -to. - -As transactions are associated to customers or suppliers, you get -reports to perform analysis per customer/supplier such as the customer -statement, revenues per customers, aged receivable/payables, ... - -Wide range of financial reports -=============================== - -In Odoo, you can generate financial reports in real time. Odoo's -reports range from basic accounting reports to advanced management -reports. Odoo's reports include: - -* Performance reports (such as Profit and Loss, Budget Variance) -* Position reports (such as Balance Sheet, Aged Payables, Aged - Receivables) -* Cash reports (such as Bank Summary) -* Detail reports (such as Trial Balance and General Ledger) -* Management reports (such as Budgets, Executive Summary) - -Odoo's report engine allows you to customize your own report based on -your own formulae. - -Import bank feeds automatically -=============================== - -Bank reconciliation is a process that matches your bank statement -lines, as supplied by the bank, to your accounting transactions in the -general ledger. Odoo makes bank reconciliation easy by frequently -importing bank statement lines from your bank directly into your Odoo -account. This means you can have a daily view of your cashflow without -having to log into your online banking or wait for your paper bank -statements. - -Odoo speeds up bank reconciliation by matching most of your imported -bank statement lines to your accounting transactions. Odoo also -remembers how you've treated other bank statement lines and provides -suggested general ledger transactions. - -Calculate the tax you owe your tax authority -============================================ - -Odoo totals all your accounting transactions for your tax period and -uses these totals to calculate your tax obligation. You can then check -your sales tax by running Odoo's Tax Report. - -Inventory Valuation -=================== - -Odoo support both periodic (manual) and perpetual (automated) -inventory valuations. The available methods are standard price, -average price, LIFO (for countries allowing it) and FIFO. - -.. seealso:: - - `View impact of the valuation method on your transactions - `_ - -Easy retained earnings -====================== - -Retained earnings are the portion of income retained by your -business. Odoo automatically calculates your current year earnings in -real time so no year-end journal or rollover is required. This is -calculated by reporting the profit and loss balance to your balance -sheet report automatically. diff --git a/content/applications/finance/accounting/payables/supplier_bills/assets.rst b/content/applications/finance/accounting/payables/supplier_bills/assets.rst index a55d9d08b..a762c22c1 100644 --- a/content/applications/finance/accounting/payables/supplier_bills/assets.rst +++ b/content/applications/finance/accounting/payables/supplier_bills/assets.rst @@ -251,4 +251,4 @@ You have three choices for the **Automate Assets** field: fully automate its purchase. (see: :ref:`product-assets-account`). .. seealso:: - * :doc:`../../overview/getting_started/chart_of_accounts` \ No newline at end of file + * :doc:`../../getting_started/initial_configuration/chart_of_accounts` \ No newline at end of file diff --git a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst b/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst index c52135c6b..34ccd48b1 100644 --- a/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst +++ b/content/applications/finance/accounting/payables/supplier_bills/deferred_expenses.rst @@ -192,4 +192,4 @@ You have three choices for the **Automate Deferred Expense** field: products`_). .. seealso:: - * :doc:`../../overview/getting_started/chart_of_accounts` \ No newline at end of file + * :doc:`../../getting_started/initial_configuration/chart_of_accounts` \ No newline at end of file diff --git a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst b/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst index 2cf5f38c6..3ca9efcb2 100644 --- a/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst +++ b/content/applications/finance/accounting/receivables/customer_invoices/deferred_revenues.rst @@ -191,5 +191,5 @@ You have three choices for the **Automate Deferred Revenue** field: automate its sale. (see: `Choose a different Income Account for specific products`_). .. seealso:: - * :doc:`../../overview/getting_started/chart_of_accounts` + * :doc:`../../getting_started/initial_configuration/chart_of_accounts` * `Odoo Academy: Deferred Revenues (Recognition) `_ \ No newline at end of file diff --git a/content/applications/finance/accounting/reporting/declarations/tax_returns.rst b/content/applications/finance/accounting/reporting/declarations/tax_returns.rst index 824984cc0..08a5ad988 100644 --- a/content/applications/finance/accounting/reporting/declarations/tax_returns.rst +++ b/content/applications/finance/accounting/reporting/declarations/tax_returns.rst @@ -37,7 +37,7 @@ and go to the **Tax Return Periodicity** section. .. note:: This is usually configured during the :doc:`app's initial set up - <../../overview/getting_started/setup>`. + <../../getting_started/initial_configuration/setup>`. Tax Grids --------- @@ -121,5 +121,5 @@ with the amount you have to pay or be refunded. .. seealso:: * :doc:`../../taxation/taxes/taxes` - * :doc:`../../overview/getting_started/setup` + * :doc:`../../getting_started/initial_configuration/setup` * :doc:`../../fiscal_localizations/overview/fiscal_localization_packages` \ No newline at end of file diff --git a/content/applications/general/multi_companies/manage_multi_companies.rst b/content/applications/general/multi_companies/manage_multi_companies.rst index 4968f4583..280c0009b 100644 --- a/content/applications/general/multi_companies/manage_multi_companies.rst +++ b/content/applications/general/multi_companies/manage_multi_companies.rst @@ -83,7 +83,7 @@ Inter-Company Transactions First, make sure each one of your companies is properly set in relation to: -- :doc:`Chart of Accounts <../../finance/accounting/overview/getting_started/chart_of_accounts>` +- :doc:`Chart of Accounts <../../finance/accounting/getting_started/initial_configuration/chart_of_accounts>` - :doc:`Taxes <../../finance/accounting/taxation/taxes/default_taxes>` - :doc:`Fiscal Positions <../../finance/accounting/taxation/taxes/fiscal_positions>` - :doc:`Journals <../../finance/accounting/bank/setup/bank_accounts>` diff --git a/content/applications/sales/sales/products_prices/products/variants.rst b/content/applications/sales/sales/products_prices/products/variants.rst index 26b4d4781..934256240 100644 --- a/content/applications/sales/sales/products_prices/products/variants.rst +++ b/content/applications/sales/sales/products_prices/products/variants.rst @@ -222,4 +222,4 @@ When you have entered all the extra values, click on **Save**. .. seealso:: - `Accounting Memento: Details of Journal Entries `_ - - :doc:`/applications/finance/accounting/overview/process_overview/supplier_bill` + - :doc:`/applications/finance/accounting/getting_started/process_overview/supplier_bill` diff --git a/redirects.txt b/redirects.txt index ec68e2cf6..46a6a4253 100644 --- a/redirects.txt +++ b/redirects.txt @@ -50,7 +50,7 @@ accounting/receivables/customer_invoices/refund.rst applications/finance/account accounting/receivables/customer_payments/payment_sepa.rst applications/finance/accounting/receivables/customer_payments/batch_sdd.rst # payment_sepa --> batch_sdd (#475) accounting/bank/feeds/synchronize.rst applications/finance/accounting/bank/feeds/bank_synchronization.rst # synchronize --> bank_synchronization (#535) accounting/others/adviser/assets.rst applications/finance/accounting/payables/supplier_bills/assets.rst # others/adviser/* --> payables/supplier_bills/* (#541) -accounting/others/configuration/account_type.rst applications/finance/accounting/overview/getting_started/chart_of_accounts.rst # others/configuration/account_type --> overview/getting_started/chart_of_accounts (#554) +accounting/others/configuration/account_type.rst applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst # others/configuration/account_type --> getting_started/initial_configuration/chart_of_accounts (#554) accounting/bank/feeds/manual.rst applications/finance/accounting/bank/feeds/bank_statements.rst # manual --> bank_statements [merged] (#569) accounting/bank/feeds/coda.rst applications/finance/accounting/bank/feeds/bank_statements.rst # coda --> bank_statements [merged] (#569) accounting/bank/feeds/ofx.rst applications/finance/accounting/bank/feeds/bank_statements.rst # ofx --> bank_statements [merged] (#569) @@ -100,6 +100,12 @@ accounting/fiscality/taxes/retention.rst applications/finance/accounting/taxatio accounting/fiscality/taxes/taxcloud.rst applications/finance/accounting/taxation/taxes/taxcloud.rst # fiscality/* -> taxation/* accounting/fiscality/taxes/taxes.rst applications/finance/accounting/taxation/taxes/taxes.rst # fiscality/* -> taxation/* accounting/fiscality/taxes/vat_validation.rst applications/finance/accounting/taxation/taxes/vat_validation.rst # fiscality/* -> taxation/* +applications/finance/accounting/overview/main_concepts/in_odoo.rst applications/finance/accounting.rst # finance/accounting/overview/main_concepts/in_odoo -> finance/accounting.rst +applications/finance/accounting/overview/main_concepts/memento.rst applications/finance/accounting/getting_started/memento.rst # overview/main_concepts/* -> getting_started/* +applications/finance/accounting/overview/getting_started/chart_of_accounts.rst applications/finance/accounting/getting_started/initial_configuration/chart_of_accounts.rst # overview/getting_started/* -> getting_started/initial_configuration/* +applications/finance/accounting/overview/getting_started/setup.rst applications/finance/accounting/getting_started/initial_configuration/setup.rst # overview/getting_started/* -> getting_started/initial_configuration/* +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/* social_marketing/social_marketing.rst applications/marketing/social_marketing/overview.rst # social_marketing/* -> overview/* (#578) From 5c3a4e60e296d011b6ca3a5ba133ec5da43a88df Mon Sep 17 00:00:00 2001 From: Jonathan Castillo Date: Fri, 21 May 2021 16:41:03 +0200 Subject: [PATCH 4/4] [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)