[MERGE] Forward-port of branch 14.0 to master

Makefile

@@ -1,6 +1,6 @@
 # Makefile for Sphinx documentation
 
-# Pass WORKERS=auto for parallel build
+# Pass WORKERS=1 for single-worker build
 ifndef WORKERS
   WORKERS = auto
 endif

README.md

@@ -4,10 +4,10 @@
 
 ### Requirements
 
-- [Git](https://www.odoo.com/documentation/master/contributing/documentation/introduction_guide.html#install-git)
+- [Git](https://www.odoo.com/documentation/master/contributing/documentation.html#install-git)
-- [Python 3.6, 3.7, or 3.8](https://www.odoo.com/documentation/master/contributing/documentation/introduction_guide.html#python)
+- [Python 3.6, 3.7, or 3.8](https://www.odoo.com/documentation/master/contributing/documentation.html#python)
 - Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/master/requirements.txt).
-- [Make](https://www.odoo.com/documentation/master/contributing/documentation/introduction_guide.html#make)
+- [Make](https://www.odoo.com/documentation/master/contributing/documentation.html#make)
 - A local copy of the [odoo/odoo repository in master](https://github.com/odoo/odoo/tree/master) (Optional)
 
 ### Instructions
@@ -23,7 +23,7 @@
 
 2. Open the file `documentation/_build/html/index.html` in your web browser to display the render.
 
-3. See [this guide](https://www.odoo.com/documentation/master/contributing/documentation/introduction_guide.html#preview-your-changes)
+3. See [this guide](https://www.odoo.com/documentation/master/contributing/documentation.html#preview-your-changes)
    for more detailed instructions.
 
 Optional: to fully build the developer documentation with inline docstrings for documented Python
@@ -34,7 +34,7 @@ be shown.
 ## Contribute to the documentation
 
 For contributions to the content of the documentation, please refer to the
-[Introduction Guide](https://www.odoo.com/documentation/master/contributing/documentation/introduction_guide.html).
+[Introduction Guide](https://www.odoo.com/documentation/master/contributing/documentation.html).
 
 To **report a content issue**, **request new content** or **ask a question**, use the
 [repository's issue tracker](https://github.com/odoo/documentation-user/issues) as usual.

content/administration/odoo_sh/getting_started/create.rst

@@ -151,7 +151,7 @@ Check your outgoing email servers
 There is a default mail server provided with Odoo.sh.
 To use it, there must be no enabled outgoing mail server configured in your database in
 :menuselection:`Settings --> Technical --> Outgoing Mail Servers`
-(:doc:`Developer mode </applications/general/developer_mode/activate>` must be activated).
+(:ref:`Developer mode <developer-mode>` must be activated).
 
 After the import of your database,
 all outgoing email servers are disabled so you use the Odoo.sh email server provided by default.

content/administration/odoo_sh/getting_started/first_module.rst

@@ -263,7 +263,7 @@ and on your production you would not like your module to be installed automatica
 
 Your module may not appear directly in your apps to install either, you need to update your apps list first:
 
-* activate the :doc:`Developer mode </applications/general/developer_mode/activate>`
+* Activate the :ref:`developer mode <developer-mode>`
 * in the apps menu, click the *Update Apps List* button,
 * in the dialog that appears, click the *Update* button.
 

content/applications.rst

@@ -12,5 +12,4 @@ Applications
     applications/marketing
     applications/services
     applications/productivity
-    applications/settings
     applications/general

content/applications/finance/accounting/fiscal_localizations/localizations/argentina.rst

@@ -275,8 +275,8 @@ with the same letter will share the same sequence.  For example:
 Sequences
 ~~~~~~~~~
 In case that you want to synchronize the next number in the sequence in Odoo based on the next
-number in the AFIP POS, the next button that is visible under :doc:`developer mode
+number in the AFIP POS, the next button that is visible under :ref:`developer mode <developer-mode>`
-</applications/general/developer_mode>` can be used:
+can be used:
 
 .. image:: media/argentina_edi_05.png
    :align: center

content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst

@@ -377,7 +377,10 @@ You can manually change the document type if needed.
 .. image:: media/Chile15.png
    :align: center
    :alt: Document type selection on invoices.
-
+   
+.. important::
+   Documents type 33: Electronic Invoice must have at least one item with tax, otherwise the SII
+   rejects the document validation.
 
 Validation and DTE Status
 ~~~~~~~~~~~~~~~~~~~~~~~~~

content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst

@@ -142,7 +142,7 @@ Journals
 Once the DIAN has assigned the official sequence and prefix for the
 electronic invoice resolution, the Sales journals related to your
 invoice documents need to be updated in Odoo.  The sequence can be
-accessed using the :doc:`Developer mode </applications/general/developer_mode>`: :menuselection:`Accounting -->
+accessed using the :ref:`developer mode <developer-mode>`: :menuselection:`Accounting -->
 Settings --> Configuration Setting --> Journals`.
 
 .. image:: media/colombia09.png

content/applications/finance/accounting/fiscal_localizations/localizations/france.rst

@@ -72,7 +72,7 @@ To get the certification just follow the following steps:
 .. note::
    * To install the module in any system created before
      December 18th 2017, you should update the modules list.
-     To do so, activate the :doc:`Developer mode </applications/general/developer_mode>`.
+     To do so, activate the :ref:`developer mode <developer-mode>`.
      Then go to the *Apps* menu and press *Update Modules List* in the top-menu.
    * In case you run Odoo on-premise, you need to update your installation
      and restart your server beforehand.
@@ -154,8 +154,8 @@ Invoicing and Accounting apps.
    it will be counted in the very next closing.
 
 .. tip:: For test & audit purposes such closings can be manually generated in the
-   :doc:`Developer mode </applications/general/developer_mode>`. Then go to
+   :ref:`developer mode <developer-mode>`. Then go to :menuselection:`Settings -->
-   :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions`.
+   Technical --> Automation --> Scheduled Actions`.
 
 
 Responsibilities

content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst

@@ -1333,7 +1333,7 @@ Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)
 Frequently you want receive explicit errors from the fields incorrectly set
 on the xml, those errors are better informed to the user if the check is
 enable, to enable the Check with xsd feature follow the next steps (with the
-:doc:`Developer mode </applications/general/developer_mode>` enabled).
+:ref:`developer mode <developer-mode>` enabled).
 
 - Go to :menuselection:`Settings --> Technical --> Actions --> Server Actions`
 - Look for the Action called "Download XSD files to CFDI"

content/applications/finance/accounting/receivables/customer_payments/online_payment.rst

@@ -42,4 +42,4 @@ They can choose which Payment Acquirer to use by clicking on *Pay Now*.
 
 .. seealso::
 
-   - :doc:`/applications/general/payment_acquirers/payment_acquirers`
+   - :doc:`/applications/general/payment_acquirers`

content/applications/finance/accounting/reporting/overview/customize.rst

@@ -14,7 +14,7 @@ Activate the developer mode
 ===========================
 
 In order to have access to the financial report creation interface, the
-:doc:`Developer mode </applications/general/developer_mode>` needs to be activated.
+:ref:`developer mode <developer-mode>` needs to be activated.
 
 Create your financial report
 ============================

content/applications/finance/documents.rst

@@ -33,8 +33,8 @@ on *Create*.
    An action applies to all *Child Workspaces* under the *Parent Workspace* you selected.
 
 .. tip::
-   If you use the :doc:`developer mode <../general/developer_mode/activate>`, you can directly
+   If you use the :ref:`developer mode <developer-mode>`, you can directly access all your actions
-   access all your actions by going to :menuselection:`Documents --> Configuration --> Actions`.
+   by going to :menuselection:`Documents --> Configuration --> Actions`.
 
 Set the conditions
 ------------------
@@ -66,9 +66,8 @@ Advanced condition type: domain
    It is recommended to have some knowledge of Odoo development to properly configure *Domain*
    filters.
 
-To access the *Domain* condition, the :doc:`developer mode <../general/developer_mode/activate>`
+To access the *Domain* condition, the :ref:`developer mode <developer-mode>` needs to be activated.
-needs to be activated. Once that's done, select the *Domain* condition type, and click on *Add
+Once that's done, select the *Domain* condition type, and click on *Add Filter*.
-Filter*.
 
 .. image:: documents/activate-domain-condition.png
    :align: center

content/applications/general.rst

@@ -1,18 +1,207 @@
+:show-content:
+
 =======
 General
 =======
 
-
 .. toctree::
 
-    general/odoo_basics
+    general/users
-    general/unsplash
+    general/export_import_data
-    general/base_import
     general/multi_companies
     general/auth
     general/payment_acquirers
     general/voip
     general/calendars
     general/in_app_purchase
-    general/developer_mode
+    general/unsplash
-    general/mobile
+
+.. _general/users-features:
+
+Users and Features
+==================
+
+As the administrator of your database, you are responsible for its usage.
+This includes the Apps you install as well as the number of users currently
+in use.
+
+Odoo is many things (ERP, CMS, CRM application, e-Commerce backend, etc.)
+but it is *not* a smartphone. You should apply caution when adding/removing
+features (especially Apps) on your database since this may impact your
+subscription amount significantly (or switch you from a free account
+to a paying one on our online platform).
+
+This section contains some information as to how you can manage your Odoo
+instances. Before carrying any of these procedures, we **strongly** advise
+to test them on a duplicate of your database first. That way, if something goes
+wrong, your day-to-day business is not impacted.
+
+.. note:: You can find guides on how to duplicate your databases both for
+    :ref:`online <duplicate_online>` and :ref:`on premise <duplicate_premise>`
+    installations.
+
+.. note:: If you have questions about the content of this section or if you
+    encounter an issue while carrying out these procedures, please contact
+    us through our `support form <https://www.odoo.com/help>`__.
+
+
+Deactivating Users
+------------------
+
+.. note:: Make sure you have sufficient **administrative rights** if
+    you want to change the status of any of your users.
+
+In your Odoo instance, click on **Settings**. You will have a section
+showing you the active users on your database. Click on **Manage Users.**
+
++----------------+----------------+
+|   |settings|   | |browse_users| |
++----------------+----------------+
+
+You'll then see the list of your users.
+
+.. image:: general/list_users.png
+    :align: center
+
+.. note:: The pre-selected filter *Internal Users* shows your paying
+    users (different from the *Portal Users* which are free). If you
+    remove this filter, you'll get all your users (the ones you pay for
+    and the portal ones)
+
+In your list of users, click on the user you want to deactivate. As soon
+as you are on the userform, click on the Action drop down menu, and
+then click on Archive.
+
+.. image:: general/deactivate_user.png
+    :align: center
+
+
+The user is now deactivated.
+
+.. danger:: **Never** deactivate the main user (*admin*)
+
+Uninstalling Apps
+-----------------
+
+.. warning:: Make sure you first test what you are about to do on a
+    :ref:`duplicate <duplicate_online>` of your database before making any
+    changes (*especially* installing/uninstalling apps).
+
+In your Odoo instance click on **Settings**; in this app, you will be
+able to see how many applications you have installed. Click on **Browse
+Apps** to access the list of your installed applications.
+
++----------------+----------------+
+|   |settings|   | |browse_apps|  |
++----------------+----------------+
+
+In your applications' dashboard, you will see all the icons of your
+applications. Click on the application you want to uninstall. Then, on
+the form of the application, click on **Uninstall**.
+
+.. image:: general/uninstall.png
+    :align: center
+
+.. danger:: Some applications have dependencies, like Invoicing, eCommerce,
+    etc. Therefore, the system will give you a warning message to advise
+    you of what is about to be removed. If you uninstall your application,
+    all its dependencies will be uninstalled as well (and the data in them
+    will permanently disappear). If you are sure you still want to uninstall
+    it, then click **Confirm**.
+
+Last, after having checked the warning message (if any), click **Confirm**.
+
+.. image:: general/uninstall_deps.png
+    :align: center
+
+You have finished uninstalling your application.
+
+Good to know
+------------
+
+* **Uninstalling apps, managing users, etc. is up to you**: no one else can
+  know if your business flow is broken better than you. If we were to uninstall
+  applications for you, we would never be able to tell if relevant data had
+  been removed or if one of your business flow was broken because we *do not
+  know how you work* and therefore cannot validate these kinds of operations.
+
+* **Odoo Apps have dependencies**: this means that you may need to install
+  modules that you do not actively use to access some features of Odoo
+  you might need. For example, the Website Builder app is needed to be
+  able to show your customer their Quotes in a web page. Even though you
+  might not need or use the Website itself, it is needed for the Online
+  Quotes feature to work properly.
+
+* **Always test app installation/removal on a duplicate** (or on a
+  free trial database): that way you can know what other apps may
+  be required, etc. This will avoid surprises when uninstalling
+  or when receiving your invoices.
+
+.. |settings| image:: general/settings_app.png
+.. |browse_apps| image:: general/browse_apps.png
+.. |browse_users| image:: general/browse_users.png
+
+.. _developer-mode:
+
+Activate the developer mode (debug mode)
+========================================
+
+The developer mode (or debug mode) gives you access to extra and advanced tools.
+
+Through the Settings application
+--------------------------------
+
+Go to :menuselection:`Settings --> Activate the developer mode`.
+
+.. image:: general/settings.png
+   :align: center
+   :alt: Overview of the debug options under settings in Odoo
+
+.. note::
+   *Activate the developer mode (with assets)* is used by developers; *Activate the developer mode
+   (with tests assets)* is used by developers and testers.
+
+Once activated, the *Deactivate the developer mode* option becomes available.
+
+Through a browser extension
+---------------------------
+
+| Go to the settings and extensions of your web browser, and search for *Odoo Debug*. Once the
+  extension is installed, a new icon will be shown on your toolbar.
+| For the *Odoo Debug* extension, a single click enables a normal version of the mode, while a
+  double click enables it with assets. To deactivate it, use a single click.
+
+.. image:: general/monkey.png
+   :align: center
+   :alt: View of odoo’s debug icon in a chrome’s toolbar
+
+Through the URL
+---------------
+
+In the URL add ``?debug=1`` or ``?debug=true`` after *web*.
+
+.. image:: general/url.png
+   :align: center
+   :alt: Overview of an url with the debug mode command added in Odoo
+
+.. tip::
+   Developers: type ``?debug=assets`` and activate the mode with assets.
+
+Locate the mode tools
+---------------------
+
+The Developer mode tools can be accessed from the *Open Developer Tools* button, located on the
+header of your pages.
+
+.. image:: general/button_location.png
+   :align: center
+   :alt: Overview of a console page and the debug icon being shown in Odoo
+
+Mobile Push Notifications
+=========================
+
+As of Odoo 12.0, 13.0 or above, there is no more complex configuration to enable push
+notifications in the mobile app.
+
+Simply go to :menuselection:`Settings --> General Settings --> Odoo Cloud Notification (OCN)`
+and make sure that **Push Notifications** is checked.

content/applications/general/base_import.rst

@@ -1,9 +0,0 @@
-===========
-Data Import
-===========
-
-.. toctree::
-   :titlesonly:
-
-   base_import/adapt_template
-   base_import/import_faq

content/applications/general/base_import/adapt_template.rst

@@ -1,50 +0,0 @@
-===============================
-How to adapt an import template
-===============================
-
-Import templates are provided in the import tool of the most common data to
-import (contacts, products, bank statements, etc.).
-You can open them with any spreadsheets software (Microsoft Office, 
-OpenOffice, Google Drive, etc.).
-
-How to customize the file
-=========================
-
-* Remove columns you don't need. We advise to not remove the *ID* one (see
-  why here below).
-* Set a unique ID to every single record by dragging down the ID sequencing.
-
-.. image:: media/dragdown.gif
-    :align: center
-
-* When you add a new column, Odoo might not be able to map it automatically if its 
-  label doesn't fit any field of the system. 
-  If so, find the corresponding field using the search.
-
-    .. image:: media/field_list.png
-        :align: center
-
-  Then, use the label you found in your import template in order to make it work
-  straight away the very next time you try to import.
-
-Why an “ID” column
-==================
-
-The **ID** (External ID) is an unique identifier for the line item.
-Feel free to use the one of your previous software to ease the transition to Odoo.
-
-Setting an ID is not mandatory when importing but it helps in many cases:
-
-* Update imports: you can import the same file several times without creating duplicates;
-* Import relation fields (see here below).
-
-How to import relation fields
-=============================
-
-An Odoo object is always related to many other objects (e.g. a product is linked
-to product categories, attributes, vendors, etc.). To import those relations you need to
-import the records of the related object first from their own list menu.
-
-You can do it using either the name of the related record or its ID. The ID is expected when
-two records have the same name. In such a case add " / ID" at the end of the column title
-(e.g. for product attributes: Product Attributes / Attribute / ID).

content/applications/general/developer_mode.rst

@@ -1,8 +0,0 @@
-==============
-Developer Mode
-==============
-
-.. toctree::
-   :titlesonly:
-
-   developer_mode/activate

content/applications/general/developer_mode/activate.rst

@@ -1,54 +0,0 @@
-===================================
-Activate the Developer (Debug) Mode
-===================================
-
-The Developer or Debug Mode gives you access to extra and advanced tools.
-
-Through the Settings application
---------------------------------
-
-Go to :menuselection:`Settings --> Activate the developer mode`.
-
-.. image:: media/settings.png
-   :align: center
-   :alt: Overview of the debug options under settings in Odoo
-
-.. note::
-   *Activate the developer mode (with assets)* is used by developers; *Activate the developer mode
-   (with tests assets)* is used by developers and testers.
-
-Once activated, the *Deactivate the developer mode* option becomes available.
-
-Through a browser extension
----------------------------
-
-| Go to the settings and extensions of your web browser, and search for *Odoo Debug*. Once the
-  extension is installed, a new icon will be shown on your toolbar.
-| For the *Odoo Debug* extension, a single click enables a normal version of the mode, while a
-  double click enables it with assets. To deactivate it, use a single click.
-
-.. image:: media/monkey.png
-   :align: center
-   :alt: View of odoo’s debug icon in a chrome’s toolbar
-
-Through the URL
----------------
-
-In the URL add ``?debug=1`` or ``?debug=true`` after *web*.
-
-.. image:: media/url.png
-   :align: center
-   :alt: Overview of an url with the debug mode command added in Odoo
-
-.. tip::
-   Developers: type ``?debug=assets`` and activate the mode with assets.
-
-Locate the mode tools
----------------------
-
-The Developer mode tools can be accessed from the *Open Developer Tools* button, located on the
-header of your pages.
-
-.. image:: media/button_location.png
-   :align: center
-   :alt: Overview of a console page and the debug icon being shown in Odoo

content/applications/general/export_import_data.rst

@@ -1,22 +1,82 @@
-===========
+======================
-Import data
+Export and import data
-===========
+======================
+
+.. _export-data:
+
+Export data from Odoo
+=====================
+
+When working with a database, it sometimes is necessary to export your data in a distinct file.
+Doing so can help to do reporting over your activities (even if Odoo offers a precise and easy
+reporting tool with each available application).
+
+With Odoo, you can export the values from any field in any record. To do so,
+activate the list view on the items that need to be exported, click on *Action*, and, then,
+on *Export*.
+
+.. image:: export_import_data/list-view-export.png
+   :align: center
+   :alt: view of the different things to enable/click to export data
+
+Pretty simple, this action still comes with some specificities. In fact,
+when clicking on *Export*, a pop-up window appears with several
+options for the data to export:
+
+.. image:: export_import_data/export-data-overview.png
+   :align: center
+   :alt: overview of all the options to take into account when exporting data in Odoo
+
+#. With the *I want to update data* option ticked, the system only
+   shows the fields which can be imported. This is very helpful in
+   case you want to update existing records. Basically, this works
+   like a filter. Leaving the box unticked gives way more field
+   options because it shows all the fields, not just the ones which
+   can be imported.
+#. When exporting, you can choose between two formats: .csv and .xls.
+   With .csv, items are separated with a comma, while .xls holds information about all the
+   worksheets in a file, including both content and formatting.
+#. Those are the items you may want to export. Use the arrows to display
+   more sub-field options. Of course, you can use the search bar to
+   find specific fields more easily. To use the search option more
+   efficiently, display all the fields by clicking on all the
+   arrows!
+#. The + button is there to add fields to the "to export" list.
+#. The "handles" next to the selected fields allow you to move the fields up and down to
+   change the order in which they must be displayed in the exported
+   file.
+#. The trashcan is there if you need to remove fields.
+#. For recurring reports, it might be interesting to save export presets.
+   Select all the needed ones and click on the template bar.
+   There, click on *New template* and give a name to yours. The
+   next time you need to export the same list, simply select the
+   related template.
+
+.. tip::
+   It’s good to keep the field’s external identifier in mind. For example,
+   *Related Company* is equal to *parent_id*. Doing so helps export
+   only what you would like to import next.
+
+.. _import-data:
+
+Import data into Odoo
+=====================
 
 How to start
 ------------
 
-You can import data on any Odoo's business object using either Excel 
+You can import data on any Odoo's business object using either Excel
 (.xlsx) or CSV (.csv) formats:
 contacts, products, bank statements, journal entries and even orders!
 
 Open the view of the object you want to populate and click on :menuselection:`Favorites --> Import
 records`.
 
-.. image:: media/import_button.png
+.. image:: export_import_data/import_button.png
    :align: center
 
 There you are provided with templates you can easily populate
-with your own data. Such templates can be imported in one click; 
+with your own data. Such templates can be imported in one click;
 The data mapping is already done.
 
 How to adapt the template
@@ -26,55 +86,54 @@ How to adapt the template
 * We advise to not remove the **ID** one (see why in the next section).
 * Set a unique ID to every single record by dragging down the ID sequencing.
 
-  .. image:: media/dragdown.gif
+.. image:: export_import_data/dragdown.gif
-     :align: center
+   :align: center
 
-* When you add a new column, Odoo might not be able to map it automatically if its 
+* When you add a new column, Odoo might not be able to map it automatically if its
   label doesn't fit any field in Odoo. Don't worry! You can map
   new columns manually when you test the import. Search the list for the
   corresponding field.
 
-  .. image:: media/field_list.png
+    .. image:: export_import_data/field_list.png
-     :align: center
+       :align: center
 
   Then, use this field's label in your file in order to make it work
   straight on the very next time.
 
-
 How to import from another application
 --------------------------------------
 
-In order to re-create relationships between different records, 
+In order to re-create relationships between different records,
-you should use the unique identifier from the original application 
+you should use the unique identifier from the original application
-and map it to the **ID** (External ID) column in Odoo. 
+and map it to the **ID** (External ID) column in Odoo.
-When you import another record that links to the first one, 
+When you import another record that links to the first one,
 use **XXX/ID** (XXX/External ID) to the original unique identifier.
-You can also find this record using its name but you will be stuck 
+You can also find this record using its name but you will be stuck
 if at least 2 records have the same name.
 
-The **ID** will also be used to update the original import 
+The **ID** will also be used to update the original import
-if you need to re-import modified data later, 
+if you need to re-import modified data later,
 it's thus good practice to specify it whenever possible.
 
 
 I cannot find the field I want to map my column to
 --------------------------------------------------
 
-Odoo tries to find with some heuristic, based on the first ten lines of 
+Odoo tries to find with some heuristic, based on the first ten lines of
-the files, the type of field for each column inside your file. 
+the files, the type of field for each column inside your file.
-For example if you have a column only containing numbers, 
+For example if you have a column only containing numbers,
-only the fields that are of type *Integer* will be displayed for you 
+only the fields that are of type *Integer* will be displayed for you
-to choose from. 
+to choose from.
-While this behavior might be good and easy for most cases, 
+While this behavior might be good and easy for most cases,
-it is also possible that it goes wrong or that you want to 
+it is also possible that it goes wrong or that you want to
 map your column to a field that is not proposed by default.
 
-If that happens, you just have to check the 
+If that happens, you just have to check the
-** Show fields of relation fields (advanced)** option, 
+** Show fields of relation fields (advanced)** option,
 you will then be able to choose from the complete list of fields for each column.
 
-.. image:: media/field_list.png
+.. image:: export_import_data/field_list.png
-  :align: center
+   :align: center
 
 Where can I change the date import format?
 ------------------------------------------
@@ -147,14 +206,14 @@ link to a record of the 'Country' object. When you want to import such fields, O
 recreate links between the different records. To help you import such fields, Odoo provides three
 mechanisms. You must use one and only one mechanism per field you want to import.
 
-For example, to reference the country of a contact, Odoo proposes you 3 different fields to import: 
+For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:
 
 - Country: the name or code of the country
 - Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column
 - Country/External ID: the ID of this record referenced in another application (or the .XML file
   that imported it)
 
-For the country Belgium, you can use one of these 3 ways to import: 
+For the country Belgium, you can use one of these 3 ways to import:
 
 - Country: Belgium
 - Country/Database ID: 21
@@ -176,10 +235,10 @@ with columns like "Field/External ID". The following two CSV files give you an e
 and their Categories.
 
 :download:`CSV file for categories
-<files/External_id_3rd_party_application_product_categories.csv>`.
+<export_import_data/External_id_3rd_party_application_product_categories.csv>`.
 
 :download:`CSV file for Products
-<files/External_id_3rd_party_application_products.csv>`.
+<export_import_data/External_id_3rd_party_application_products.csv>`.
 
 What can I do if I have multiple matches for a field?
 -----------------------------------------------------
@@ -200,7 +259,7 @@ The tags should be separated by a comma without any spacing. For example, if you
 to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode "Manufacturer,Retailer"
 in the same column of your CSV file.
 
-:download:`CSV file for Manufacturer, Retailer <files/m2m_customers_tags.csv>`
+:download:`CSV file for Manufacturer, Retailer <export_import_data/m2m_customers_tags.csv>`
 
 
 How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?
@@ -213,16 +272,16 @@ any information in the fields relative to the order. As an example, here is
 ``purchase.order_functional_error_line_cant_adpat.CSV`` file of some quotations you can import,
 based on demo data.
 
-:download:`File for some Quotations <files/purchase.order_functional_error_line_cant_adpat.csv>`.
+:download:`File for some Quotations <export_import_data/purchase.order_functional_error_line_cant_adpat.csv>`.
 
 The following CSV file shows how to import purchase orders with their respective purchase order
 lines:
 
-:download:`Purchase orders with their respective purchase order lines <files/o2m_purchase_order_lines.csv>`.
+:download:`Purchase orders with their respective purchase order lines <export_import_data/o2m_purchase_order_lines.csv>`.
 
 The following CSV file shows how to import customers and their respective contacts:
 
-:download:`Customers and their respective contacts <files/o2m_customers_contacts.csv>`.
+:download:`Customers and their respective contacts <export_import_data/o2m_customers_contacts.csv>`.
 
 Can I import several times the same record?
 -------------------------------------------
@@ -258,7 +317,7 @@ must be unique across all the records of all objects, so it's a good practice to
 As an example, suppose you have a SQL database with two tables you want to import: companies and
 persons. Each person belong to one company, so you will have to recreate the link between a person
 and the company he work for. (If you want to test this example, here is a :download:`dump of such a
-PostgreSQL database <files/database_import_test.sql>`)
+PostgreSQL database <export_import_data/database_import_test.sql>`)
 
 We will first export all companies and their "External ID". In PSQL, write the following command:
 
@@ -300,3 +359,53 @@ original database).
 The two files produced are ready to be imported in Odoo without any modifications. After having
 imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are
 linked to the first company). You must first import the companies and then the persons.
+
+How to adapt an import template
+===============================
+
+Import templates are provided in the import tool of the most common data to
+import (contacts, products, bank statements, etc.).
+You can open them with any spreadsheets software (Microsoft Office,
+OpenOffice, Google Drive, etc.).
+
+How to customize the file
+=========================
+
+* Remove columns you don't need. We advise to not remove the *ID* one (see
+  why here below).
+* Set a unique ID to every single record by dragging down the ID sequencing.
+
+  .. image:: export_import_data/dragdown.gif
+     :align: center
+
+* When you add a new column, Odoo might not be able to map it automatically if its
+  label doesn't fit any field of the system.
+  If so, find the corresponding field using the search.
+
+    .. image:: export_import_data/field_list.png
+       :align: center
+
+  Then, use the label you found in your import template in order to make it work
+  straight away the very next time you try to import.
+
+Why an “ID” column
+==================
+
+The **ID** (External ID) is an unique identifier for the line item.
+Feel free to use the one of your previous software to ease the transition to Odoo.
+
+Setting an ID is not mandatory when importing but it helps in many cases:
+
+* Update imports: you can import the same file several times without creating duplicates;
+* Import relation fields (see here below).
+
+How to import relation fields
+=============================
+
+An Odoo object is always related to many other objects (e.g. a product is linked
+to product categories, attributes, vendors, etc.). To import those relations you need to
+import the records of the related object first from their own list menu.
+
+You can do it using either the name of the related record or its ID. The ID is expected when
+two records have the same name. In such a case add " / ID" at the end of the column title
+(e.g. for product attributes: Product Attributes / Attribute / ID).

content/applications/general/in_app_purchase.rst

@@ -1,8 +1,71 @@
-===============
+=====================
-In-App Purchase
+In-App Purchase (IAP)
-===============
+=====================
 
-.. toctree::
+In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows you
-   :titlesonly:
+to send SMS Text Messages or to send Invoices by post directly from my database.
 
-   in_app_purchase/in_app_purchase
+Buying Credits
+==============
+
+Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current
+balance or to recharge my account, go to :menuselection:`Settings --> Odoo IAP --> View my
+Services`.
+
+.. image:: in_app_purchase/image1.png
+   :align: center
+
+.. tip::
+   If I am on Odoo Online (SAAS) and have the Enterprise version, I benefit from free credits to
+   test our IAP features.
+
+IAP accounts
+============
+
+Credits to use IAP services are stored on IAP accounts, which are specific to each service and
+database. By default, IAP accounts are common to all companies, but can be restricted to specific
+ones. Activate the :ref:`developer mode <developer-mode>`, then go to :menuselection:`Technical
+Settings --> IAP Account`.
+
+.. image:: in_app_purchase/image2.png
+   :align: center
+   
+IAP Portal
+==========
+
+The IAP Portal is a platform regrouping my IAP Services. It is accessible from
+:menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, I can view my current
+balance, recharge my credits, review my consumption and set a reminder to when credits are low.
+
+.. image:: in_app_purchase/image3.png
+   :align: center
+
+Get notified when credits are low
+=================================
+
+To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through
+:menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and mark the
+Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email
+addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by
+email!
+
+.. image:: in_app_purchase/image4.png
+   :align: center
+
+IAP services available
+======================
+
+Different services are available depending on the hosting type of your Database:
+
+- *Odoo Online (SAAS)*: only the IAP services provided by Odoo can be used (i.e. the SMS, Snailmail,
+  Reveal and Partner Autocomplete features);
+- *Odoo.sh and Odoo Enterprise (on-premise)*: both the services provided by Odoo and by third-party
+  apps can be used.
+
+Offering my own services 
+========================
+
+I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity
+to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole
+initial purchase. Please, find more information at: :doc:`In-App Purchase
+</developer/webservices/iap>`.

content/applications/general/in_app_purchase/in_app_purchase.rst

@@ -1,71 +0,0 @@
-==================================================
-General guide about In-App Purchase (IAP) Services
-==================================================
-
-In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows me
-to send SMS Text Messages or to send Invoices by post directly from my database.
-
-Buying Credits
-==============
-
-Each IAP Service relies on prepaid credits to work and has its own pricing. To consult my current
-balance or to recharge my account, go to :menuselection:`Settings --> Odoo IAP -->
-View my Services`.
-
-.. image:: media/image1.png
-   :align: center
-
-.. tip::
-   If I am on Odoo Online (SAAS) and have the Enterprise version, I benefit from free credits to
-   test our IAP features.
-
-IAP accounts
-============
-
-Credits to use IAP services are stored on IAP accounts, which are specific to each service and
-database. By default, IAP accounts are common to all companies, but can be restricted to specific
-ones. Activate the :doc:`Developer mode </applications/general/developer_mode>`, then go to
-:menuselection:`Technical Settings --> IAP Account`.
-
-.. image:: media/image2.png
-   :align: center
-
-IAP Portal
-==========
-
-The IAP Portal is a platform regrouping my IAP Services. It is accessible from
-:menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, I can view my current
-balance, recharge my credits, review my consumption and set a reminder to when credits are low.
-
-.. image:: media/image3.png
-   :align: center
-
-Get notified when credits are low
-=================================
-
-To be notified when it’s time to recharge my credits, I’ll go to my IAP Portal through
-:menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and mark the
-Receive threshold warning option. Then, I’ll provide a minimum amount of credits and email
-addresses. Now, every time that the limit is reached, an automatic reminder will be sent to by
-email!
-
-.. image:: media/image4.png
-   :align: center
-
-IAP services available
-======================
-
-Different services are available depending on the hosting type of your Database:
-
-- *Odoo Online (SAAS)*: only the IAP services provided by Odoo can be used (i.e. the SMS, Snailmail,
-  Reveal and Partner Autocomplete features);
-- *Odoo.sh and Odoo Enterprise (on-premise)*: both the services provided by Odoo and by third-party
-  apps can be used.
-
-Offering my own services
-========================
-
-I am more than welcome to offer my own IAP services through Odoo Apps! It is the perfect opportunity
-to get recurring revenue for an ongoing service use rather than — and possibly instead of — a sole
-initial purchase. Please, find more information at: :doc:`In-App Purchase
-</developer/webservices/iap>`.

content/applications/general/mobile.rst

@@ -1,13 +0,0 @@
-
-======
-Mobile
-======
-
-Push Notifications
-==================
-
-As of Odoo 12.0, 13.0 or above, there is no more complex configuration to enable push
-notifications in the mobile app.
-
-Simply go to :menuselection:`Settings --> General Settings --> Odoo Cloud Notification (OCN)`
-and make sure that **Push Notifications** is checked.

content/applications/general/multi_companies.rst

@@ -2,7 +2,132 @@
 Multi Companies
 ===============
 
-.. toctree::
+A centralized management environment allows you to select multiple companies simultaneously and set
-   :titlesonly:
+their specific warehouses, customers, equipment, and contacts. It provides you the ability to
+generate reports of aggregated figures without switching interfaces, which facilitates daily tasks
+and the overall management process.
+
+Manage companies and records
+============================
+
+Go to :menuselection:`Settings --> Manage Companies` and fill in the form with your company’s
+information. If a *Parent Company* is selected, records are shared between the two companies (as
+long as both environments are active).
+
+.. image:: multi_companies/create_js_store_us.png
+   :align: center
+   :alt: Overview of a new company's form in Odoo
+
+.. tip::
+   Activate the :ref:`developer mode <developer-mode>` to choose a *Favicon* for each of your
+   companies, and easily identify them by the browser tabs. Set your favicons’ files size to 16x16
+   or 32x32 pixels. JPG, PNG, GIF, and ICO are extensions accepted.
+
+   .. image:: multi_companies/favicon.png
+      :align: center
+      :height: 200
+      :alt: View of a web browser and the favicon for a specific company chosen in Odoo
+
+Switch between or select multiple companies by enabling their selection boxes to activate them. The
+grayed company is the one which environment is in use. To switch environments, click on the
+company’s name. In the example below, the user has access to three companies, two are activated, and
+the environment in use is of *JS Store US*.
+
+.. image:: multi_companies/multi_companies_menu_dashboard.png
+   :align: center
+   :alt: View of the companies menu through the main dashboard in Odoo
+
+Data such as Products, Contacts, and Equipment can be shared or set to be shown for a specific
+company only. To do so, on their forms, choose between:
+
+- *A blank field*: the record is shared within all companies.
+- *Adding a company*: the record is visible to users logged in to that specific company.
+
+.. image:: multi_companies/product_form_company.png
+   :align: center
+   :alt: View of a product's form emphasizing the company field in Odoo Sales
+
+Employees' access
+=================
+
+Once companies are created, manage your employees' :doc:`Access Rights <users/access_rights>` for
+*Multi Companies*.
+
+.. image:: multi_companies/access_rights_multi_companies.png
+   :align: center
+   :alt: View of an user form emphasizing the multi companies field under the access rights tabs
+         in Odoo
+
+| If a user has multiple companies *activated* on his database, and he is **editing** a record,
+  the editing happens on the record's related company.
+| Example: if editing a sale order issued under JS Store US while working on the JS Store Belgium
+  environment, the changes are applied under JS Store US (the company from which the sale order
+  was issued).
+| When **creating** a record, the company taken into account is:
+
+- The current company (the one active) or,
+- No company is set (on products and contacts’ forms for example) or,
+- The company set is the one linked to the document (the same as if a record is being edited).
+
+Documents’ format
+=================
+
+To set documents' formats according to each company, *activate* and *select* the respective one and,
+under *Settings*, click on *Configure Document Layout*.
+
+.. image:: multi_companies/document_layout.png
+   :align: center
+   :alt: View of the settings page emphasizing the document layout field in Odoo
+
+Inter-Company Transactions
+==========================
+
+First, make sure each one of your companies is properly set in relation to:
+
+- :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>`
+- :doc:`Fiscal Localizations <../finance/accounting/fiscal_localizations/overview/fiscal_localization_packages>`
+- :doc:`Pricelists <../sales/sales/products_prices/prices/pricing>`
+
+Now, activate the *Inter-Company Transactions* option under *Settings*. With the respective company
+*activated* and *selected*, choose if you would like operations between companies to be synchronized
+at an invoice/bills level or at a sales/purchase orders level.
+
+.. image:: multi_companies/inter_company_transactions.png
+   :align: center
+   :alt: View of the settings page emphasizing the inter company transaction field in Odoo
+
+- **Synchronize invoice/bills**: generates a bill/invoice when a company confirms a bill/invoice for
+  the selected company.
+
+  *Example:* an invoice posted on JS Store Belgium, for JS Store US, automatically creates a vendor
+  bill on the JS Store US, from the JS Store Belgium.
+
+.. image:: multi_companies/invoice_inter_company.png
+   :align: center
+   :alt: View of an invoice for JS Store US created on JS Store Belgium in Odoo
+
+- **Synchronize sales/purchase order**: generates a drafted purchase/sales order using the selected
+  company warehouse when a sales/purchase order is confirmed for the selected company. If instead of
+  a drafted purchase/sales order you rather have it validated, enable *Automatic Validation*.
+
+  *Example:* when a sale order for JS Store US is confirmed on JS Store Belgium, a purchase order
+  on JS Store Belgium is automatically created (and confirmed if the *Automatic Validation* feature
+  was enabled).
+
+.. image:: multi_companies/purchase_order_inter_company.png
+   :align: center
+   :alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo
+
+.. note::
+   Products have to be configured as *Can be sold* and must be shared between the companies.
+
+.. tip::
+   Remember to test all workflows as an user other than the administrator.
+
+.. seealso::
+   - :doc:`Multi-company Guidelines </developer/howtos/company>`
+   - :doc:`../finance/accounting/others/multicurrencies/how_it_works`
 
-   multi_companies/manage_multi_companies

content/applications/general/multi_companies/manage_multi_companies.rst

@@ -1,131 +0,0 @@
-Multi Companies
-===============
-
-A centralized management environment allows you to select multiple companies simultaneously and set
-their specific warehouses, customers, equipment, and contacts. It provides you the ability to
-generate reports of aggregated figures without switching interfaces, which facilitates daily tasks
-and the overall management process.
-
-Manage companies and records
-----------------------------
-
-Go to :menuselection:`Settings --> Manage Companies` and fill in the form with your company’s
-information. If a *Parent Company* is selected, records are shared between the two companies (as
-long as both environments are active).
-
-.. image:: media/create_js_store_us.png
-   :align: center
-   :alt: Overview of a new company's form in Odoo
-
-.. tip::
-   Activate the :doc:`Developer mode <../developer_mode/activate>` to choose a *Favicon*
-   for each of your companies, and easily identify them by the browser tabs. Set your
-   favicons’ files size to 16x16 or 32x32 pixels. JPG, PNG, GIF, and ICO are extensions accepted.
-
-   .. image:: media/favicon.png
-      :align: center
-      :height: 200
-      :alt: View of a web browser and the favicon for a specific company chosen in Odoo
-
-Switch between or select multiple companies by enabling their selection boxes to activate them. The
-grayed company is the one which environment is in use. To switch environments, click on the
-company’s name. In the example below, the user has access to three companies, two are activated, and
-the environment in use is of *JS Store US*.
-
-.. image:: media/multi_companies_menu_dashboard.png
-   :align: center
-   :alt: View of the companies menu through the main dashboard in Odoo
-
-Data such as Products, Contacts, and Equipment can be shared or set to be shown for a specific
-company only. To do so, on their forms, choose between:
-
-- *A blank field*: the record is shared within all companies.
-- *Adding a company*: the record is visible to users logged in to that specific company.
-
-.. image:: media/product_form_company.png
-   :align: center
-   :alt: View of a product's form emphasizing the company field in Odoo Sales
-
-Employees' access
------------------
-
-Once companies are created, manage your employees' :doc:`Access Rights <../odoo_basics/users>`
-for *Multi Companies*.
-
-.. image:: media/access_rights_multi_companies.png
-   :align: center
-   :alt: View of an user form emphasizing the multi companies field under the access rights tabs
-         in Odoo
-
-| If a user has multiple companies *activated* on his database, and he is **editing** a record,
-  the editing happens on the record's related company.
-| Example: if editing a sale order issued under JS Store US while working on the JS Store Belgium
-  environment, the changes are applied under JS Store US (the company from which the sale order
-  was issued).
-| When **creating** a record, the company taken into account is:
-
-- The current company (the one active) or,
-- No company is set (on products and contacts’ forms for example) or,
-- The company set is the one linked to the document (the same as if a record is being edited).
-
-Documents’ format
------------------
-
-To set documents' formats according to each company, *activate* and *select* the respective one and,
-under *Settings*, click on *Configure Document Layout*.
-
-.. image:: media/document_layout.png
-   :align: center
-   :alt: View of the settings page emphasizing the document layout field in Odoo
-
-Inter-Company Transactions
---------------------------
-
-First, make sure each one of your companies is properly set in relation to:
-
-- :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>`
-- :doc:`Fiscal Localizations <../../finance/accounting/fiscal_localizations/overview/fiscal_localization_packages>`
-- :doc:`Pricelists <../../sales/sales/products_prices/prices/pricing>`
-
-Now, activate the *Inter-Company Transactions* option under *Settings*. With the respective company
-*activated* and *selected*, choose if you would like operations between companies to be synchronized
-at an invoice/bills level or at a sales/purchase orders level.
-
-.. image:: media/inter_company_transactions.png
-   :align: center
-   :alt: View of the settings page emphasizing the inter company transaction field in Odoo
-
-- **Synchronize invoice/bills**: generates a bill/invoice when a company confirms a bill/invoice for
-  the selected company.
-
-  *Example:* an invoice posted on JS Store Belgium, for JS Store US, automatically creates a vendor
-  bill on the JS Store US, from the JS Store Belgium.
-
-.. image:: media/invoice_inter_company.png
-   :align: center
-   :alt: View of an invoice for JS Store US created on JS Store Belgium in Odoo
-
-- **Synchronize sales/purchase order**: generates a drafted purchase/sales order using the selected
-  company warehouse when a sales/purchase order is confirmed for the selected company. If instead of
-  a drafted purchase/sales order you rather have it validated, enable *Automatic Validation*.
-
-  *Example:* when a sale order for JS Store US is confirmed on JS Store Belgium, a purchase order
-  on JS Store Belgium is automatically created (and confirmed if the *Automatic Validation* feature
-  was enabled).
-
-.. image:: media/purchase_order_inter_company.png
-   :align: center
-   :alt: View of the purchase created on JS Store US from JS Store Belgium in Odoo
-
-.. note::
-   Products have to be configured as *Can be sold* and must be shared between the companies.
-
-.. tip::
-   Remember to test all workflows as an user other than the administrator.
-
-.. seealso::
-   - :doc:`Multi-company Guidelines </developer/howtos/company>`
-   - :doc:`../../finance/accounting/others/multicurrencies/how_it_works`

content/applications/general/odoo_basics.rst

@@ -1,10 +0,0 @@
-======
-Basics
-======
-
-.. toctree::
-   :titlesonly:
-
-   odoo_basics/choose_language
-   odoo_basics/users
-   odoo_basics/export-data

content/applications/general/odoo_basics/export-data.rst

@@ -1,53 +0,0 @@
-======================
-Export Data From Odoo
-======================
-
-When working with a database, it sometimes is necessary to export your data in a distinct file. 
-Doing so can help to do reporting over your activities (even if Odoo offers a precise and easy 
-reporting tool with each available application).
-
-With Odoo, you can export the values from any field in any record. To do so, 
-activate the list view on the items that need to be exported, click on *Action*, and, then, 
-on *Export*.
-
-.. image:: media/list-view-export.png
-   :align: center
-   :alt: view of the different things to enable/click to export data
-
-Pretty simple, this action still comes with some specificities. In fact,
-when clicking on *Export*, a pop-up window appears with several
-options for the data to export:
-
-.. image:: media/export-data-overview.png
-   :align: center
-   :alt: overview of all the options to take into account when exporting data in Odoo
-
-1. With the *I want to update data* option ticked, the system only
-   shows the fields which can be imported. This is very helpful in
-   case you want to update existing records. Basically, this works
-   like a filter. Leaving the box unticked gives way more field
-   options because it shows all the fields, not just the ones which
-   can be imported.
-2. When exporting, you can choose between two formats: .csv and .xls.
-   With .csv, items are separated with a comma, while .xls holds information about all the 
-   worksheets in a file, including both content and formatting.
-3. Those are the items you may want to export. Use the arrows to display
-   more sub-field options. Of course, you can use the search bar to
-   find specific fields more easily. To use the search option more
-   efficiently, display all the fields by clicking on all the
-   arrows!
-4. The + button is there to add fields to the “to export” list.
-5. The “handles” next to the selected fields allow you to move the fields up and down to
-   change the order in which they must be displayed in the exported
-   file.
-6. The trashcan is there if you need to remove fields.
-7. For recurring reports, it might be interesting to save export presets. 
-   Select all the needed ones and click on the template bar.
-   There, click on *New template* and give a name to yours. The
-   next time you need to export the same list, simply select the
-   related template.
-
-.. tip::
-   It’s good to keep the field’s external identifier in mind. For example,
-   *Related Company* is equal to *parent_id*. Doing so helps export
-   only what you would like to import next.

content/applications/general/payment_acquirers.rst

@@ -1,12 +1,239 @@
-=================
+:show-content:
-Payment Acquirers
+
-=================
+================================================
+Payment Acquirers (Credit Cards, Online Payment)
+================================================
 
 .. toctree::
    :titlesonly:
 
-   payment_acquirers/payment_acquirers
    payment_acquirers/wire_transfer
    payment_acquirers/authorize
    payment_acquirers/paypal
    payment_acquirers/stripe
+
+Odoo embeds several **payment acquirers** that allow your customers to pay on their *Customer
+Portals* or your *eCommerce website*. They can pay Sales Orders, invoices, or subscriptions with
+recurring payments with their favorite payment methods such as **Credit Cards**.
+
+Offering several payment methods increases the chances of getting paid in time, or even immediately,
+as you make it more convenient for your customers to pay with the payment method they prefer and
+trust.
+
+.. image:: payment_acquirers/online-payment.png
+   :align: center
+   :alt: Pay online in the customer portal and select which payment acquirer to use.
+
+.. note::
+   Odoo apps delegate the handling of sensitive information to the certified payment acquirer so
+   that you don't ever have to worry about PCI compliance.
+
+   This means that no sensitive information (such as credit card numbers or credentials) is stored
+   on Odoo servers or Odoo databases hosted elsewhere. Instead, Odoo apps use a unique reference
+   number to the data stored safely in the payment acquirers' systems.
+
+.. _payment_acquirers/acquirers:
+
+Payment Acquirers
+=================
+
+From an accounting perspective, we can distinguish two types of payment acquirers: the payments that
+go directly on the bank account and follow the usual reconciliation workflow, and the payment
+acquirers that are third-party services and require you to follow another accounting workflow.
+
+.. _payment_acquirers/bank_payments:
+
+Bank Payments
+-------------
+
+- | :doc:`Wire Transfer <payment_acquirers/wire_transfer>`
+  | When selected, Odoo displays your payment information with a payment reference. You have to
+    approve the payment manually once you have received it on your bank account.
+- | SEPA Direct Debit
+  | Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged
+    directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for more
+    information about this payment method.
+
+.. _payment_acquirers/online_providers:
+
+Online Payment Providers
+------------------------
+
++-------------------------------------+----------------------+-----------+------------+-----------------+
+|                                     | Redirection to       | Payment   | Save Cards | Capture Amount  |
+|                                     | the acquirer website | from Odoo |            | Manually        |
++=====================================+======================+===========+============+=================+
+| Adyen                               | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Alipay                              | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| :doc:`Authorize.Net                 | ✔                    | ✔         | ✔          | ✔               |
+| <payment_acquirers/authorize>`      |                      |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Buckaroo                            | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Ingenico                            | ✔                    | ✔         | ✔          |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| :doc:`PayPal                        | ✔                    |           |            |                 |
+| <payment_acquirers/paypal>`         |                      |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| PayUMoney                           | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| SIPS                                | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Stripe                              | ✔                    | ✔         | ✔          |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+
+.. note::
+   Some of these Online Payment Providers can also be added as :doc:`Bank Accounts
+   <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding them
+   as Payment Acquirers. Payment Acquirers allow customers to pay online, and Bank Accounts are
+   added and configured on your Accounting app to do a bank reconciliation, which is an accounting
+   control process.
+
+.. _payment_acquirers/configuration:
+
+Configuration
+=============
+
+Some of the features described in this section are available only with some Payment Acquirers. Refer
+to :ref:`the table above <payment_acquirers/online_providers>` for more details.
+
+.. _payment_acquirers/add_new:
+
+Add a new Payment Acquirer
+--------------------------
+
+To add a new Payment acquirer and make it available to your customers, go to
+:menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer,
+install the related module, and activate it. To do so, open the payment acquirer and change its
+state from *Disabled* to *Enabled*.
+
+.. image:: payment_acquirers/activation.png
+   :align: center
+   :alt: Click on install, then on activate to make the payment acquirer available on Odoo.
+
+.. warning::
+   We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is
+   meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices
+   as usual. It isn't always possible to cancel an invoice, and this could create some issues with
+   your invoices numbering if you were to test your payment acquirers on your main database.
+
+.. _payment_acquirers/credentials_tab:
+
+Credentials tab
+~~~~~~~~~~~~~~~
+
+If not done yet, go to the **Online Payment Provider**'s website, create an account, and make sure
+to have the credentials required for third-party use. Odoo requires these credentials to communicate
+with the Payment Acquirer and get the confirmation of the *payment authentication*.
+
+The form in this section is specific to the Payment Acquirer you are configuring. Please refer to
+the related documentation for more information.
+
+.. _payment_acquirers/configuration_tab:
+
+Configuration tab
+~~~~~~~~~~~~~~~~~
+
+You can change the Payment Acquirer front-end appearance by modifying its name under the **Displayed
+as** field and which credit card icons to display under the **Supported Payment Icons** field.
+
+.. _payment_acquirers/save_cards:
+
+Save and reuse Credit Cards
+***************************
+
+With the **Save Cards** feature, Odoo can store **Payment Tokens** in your database, which can be
+used for subsequent payments, without having to reenter the payment details. This is particularly
+useful for subscriptions' recurring payments.
+
+.. _payment_acquirers/capture_amount:
+
+Place a hold on a card
+**********************
+
+If the **Capture Amount Manually** field is enabled, the funds are reserved for a few days on the
+customer's card, but not charged yet. You must then go to the related Sales Order and manually
+*capture* the funds before its automatic cancellation, or *void the transaction* to unlock the funds
+from the customer's card.
+
+.. _payment_acquirers/payment_flow:
+
+Payment Flow
+************
+
+Choose in the **Payment Flow** field if to redirect the user to the payment acquirer's portal to
+authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo.
+
+.. note::
+   Some features are available only if you select *Redirection to the acquirer website*.
+
+.. _payment_acquirers/countries:
+
+Countries
+*********
+
+Restrict the use of the Payment Acquirer to a selection of countries. Leave this field blank to make
+the Payment Acquirer available to all countries.
+
+.. _payment_acquirers/journal:
+
+Payment Journal
+***************
+
+The **Payment Journal** selected for your Payment Acquirer must be a *Bank* journal.
+
+.. important::
+   In many cases, Odoo automatically creates a new **Journal** and a new **Account** when you
+   activate a new Payment Acquirer. Both of them are preset to work out-of-the-box, but we strongly
+   recommend you to make sure these fields are correctly set according to your accounting needs, and
+   adapt them if necessary.
+
+.. _payment_acquirers/messages:
+
+Messages tab
+~~~~~~~~~~~~
+
+Change here the messages displayed by Odoo after a payment's confirmation or failure.
+
+.. _payment_acquirers/accounting:
+
+Accounting perspective
+======================
+
+The **Bank Payments** that go directly to one of your bank accounts follow their usual
+reconciliation workflows. However, payments recorded with **Online Payment Providers** require you
+to consider how you want to record your payments' journal entries. We recommend you to ask your
+accountant for advice.
+
+Odoo default method is to record the payments on a *Current Assets Account*, on a dedicated *Bank
+Journal*, once the *Payment Authentication* is confirmed. At some point, you transfer the funds from
+the *Payment Acquirer* to your *Bank Account*.
+
+Here are the requirements for this to work:
+
+- Bank Journal
+
+  - The Journal's **type** must be *Bank Journal*.
+  - Select the right **Default Debit Account** and **Default Credit Account**.
+  - | Under the *Advanced Settings* tab, make sure that **Posting** is set as *Post At Payment
+      Validation*.
+    | This implies that the Journal Entry is recorded directly when your Odoo database receives the
+      confirmation of the *Payment Authentication* from the Online Payment Provider.
+
+- Current Asset Account
+
+  - The Account's **type** is *Current Assets*
+  - The Account must **Allow Reconciliation**
+
+.. note::
+   In many cases, Odoo automatically creates a new **Journal** and a new **Current Asset Account**
+   when you activate a new Payment Acquirer. You can modify them if necessary.
+
+.. seealso::
+
+   - :doc:`../finance/accounting/receivables/customer_payments/recording`
+   - :doc:`payment_acquirers/wire_transfer`
+   - :doc:`payment_acquirers/authorize`
+   - :doc:`payment_acquirers/paypal`

content/applications/general/payment_acquirers/authorize.rst

@@ -10,7 +10,7 @@ provider, allowing businesses to accept **credit cards**.
    :alt: Authorize.Net logo
 
 This Payment Acquirer offers additional options that are not available for other :doc:`Payment
-Acquirers <payment_acquirers>`, such as the ability to process your customer's payment after
+Acquirers <../payment_acquirers>`, such as the ability to process your customer's payment after
 delivery.
 
 Authorize.Net account
@@ -47,7 +47,7 @@ Configuration --> Payment Acquirers`, open **Authorize.Net**, and change the **S
 Don't forget to click on *Save* once you've set everything up.
 
 .. note::
-   Please refer to the :doc:`Payment Acquirers documentation <payment_acquirers>` to read how to
+   Please refer to the :doc:`Payment Acquirers documentation <../payment_acquirers>` to read how to
    configure this payment acquirer.
 
 Credentials
@@ -113,5 +113,5 @@ order is canceled, you can click on *Void Transaction* to unlock the funds from
 .. seealso::
    - `Authorize.Net: Getting Started Guide
      <https://support.authorize.net/s/article/Authorize-Net-Getting-Started-Guide>`__
-   - :doc:`payment_acquirers`
+   - :doc:`../payment_acquirers`
    - :doc:`../../websites/ecommerce/shopper_experience/payment_acquirer`

content/applications/general/payment_acquirers/payment_acquirers.rst

@@ -1,226 +0,0 @@
-================================================
-Payment Acquirers (Credit Cards, Online Payment)
-================================================
-
-Odoo embeds several **payment methods** that allow your customers to pay on their *Customer Portals*
-or your *eCommerce website*. They can pay Sales Orders, invoices, or subscriptions with recurring
-payments with their favorite payment acquirers, including **online payment providers** that accept
-**Credit Cards**.
-
-Having several payment methods increases the chances of getting paid in time, or even immediately,
-as you make it more convenient for your customers to pay with the payment method they prefer and
-trust.
-
-.. image:: media/payment-acquirers-online-payment.png
-   :align: center
-   :alt: Pay online in the customer portal and select which payment acquirer to use.
-
-.. important::
-   Odoo does not keep Credit Card numbers or credentials on its servers, nor is it stored on Odoo
-   databases hosted elsewhere. Instead, Odoo apps use a unique reference to the data stored in the
-   payment acquirers' systems, where the information is safely stored. This reference is useless
-   without your credentials for the payment acquirer.
-
-.. _payment_acquirers/acquirers:
-
-Payment Acquirers
-=================
-
-From an accounting perspective, we can distinguish two types of payment acquirers: the payments that
-go directly on the bank account and follow the usual reconciliation workflow, and the payment
-acquirers that are third-party services and require you to follow another accounting workflow.
-
-.. _payment_acquirers/bank_payments:
-
-Bank Payments
--------------
-
-- | :doc:`Wire Transfer <wire_transfer>`
-  | When selected, Odoo displays your payment information with a payment reference. You have to
-    approve the payment manually once you have received it on your bank account.
-- | SEPA Direct Debit
-  | Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged
-    directly. :doc:`Click here <../../finance/accounting/receivables/customer_payments/batch_sdd>` for more
-    information about this payment method.
-
-.. _payment_acquirers/online_providers:
-
-Online Payment Providers
-------------------------
-
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-|                                     | Redirection to       | Payment   | Save Cards | Capture Amount  |
-|                                     | the acquirer website | from Odoo |            | Manually        |
-+=====================================+======================+===========+============+=================+
-| Adyen                               | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| Alipay                              | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| :doc:`Authorize.Net <authorize>`    | ✔                    | ✔         | ✔          | ✔               |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| Buckaroo                            | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| Ingenico                            | ✔                    | ✔         | ✔          |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| :doc:`PayPal <paypal>`              | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| PayUMoney                           | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| SIPS                                | ✔                    |           |            |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-| Stripe                              | ✔                    | ✔         | ✔          |                 |
-+-------------------------------------+----------------------+-----------+------------+-----------------+
-
-.. note::
-   Some of these Online Payment Providers can also be added as :doc:`Bank Accounts
-   <../../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding them
-   as Payment Acquirers. Payment Acquirers allow customers to pay online, and Bank Accounts are
-   added and configured on your Accounting app to do a bank reconciliation, which is an accounting
-   control process.
-
-.. _payment_acquirers/configuration:
-
-Configuration
-=============
-
-Some of the features described in this section are available only with some Payment Acquirers. Refer
-to :ref:`the table above <payment_acquirers/online_providers>` for more details.
-
-.. _payment_acquirers/add_new:
-
-Add a new Payment Acquirer
---------------------------
-
-To add a new Payment acquirer and make it available to your customers, go to
-:menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer,
-install the related module, and activate it. To do so, open the payment acquirer and change its
-state from *Disabled* to *Enabled*.
-
-.. image:: media/payment-acquirers-activation.png
-   :align: center
-   :alt: Click on install, then on activate to make the payment acquirer available on Odoo.
-
-.. warning::
-   We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is
-   meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices
-   as usual. It isn't always possible to cancel an invoice, and this could create some issues with
-   your invoices numbering if you were to test your payment acquirers on your main database.
-
-.. _payment_acquirers/credentials_tab:
-
-Credentials tab
-~~~~~~~~~~~~~~~
-
-If not done yet, go to the **Online Payment Provider**'s website, create an account, and make sure
-to have the credentials required for third-party use. Odoo requires these credentials to communicate
-with the Payment Acquirer and get the confirmation of the *payment authentication*.
-
-The form in this section is specific to the Payment Acquirer you are configuring. Please refer to
-the related documentation for more information.
-
-.. _payment_acquirers/configuration_tab:
-
-Configuration tab
-~~~~~~~~~~~~~~~~~
-
-You can change the Payment Acquirer front-end appearance by modifying its name under the **Displayed
-as** field and which credit card icons to display under the **Supported Payment Icons** field.
-
-.. _payment_acquirers/save_cards:
-
-Save and reuse Credit Cards
-***************************
-
-With the **Save Cards** feature, Odoo can store **Payment Tokens** in your database, which can be
-used for subsequent payments, without having to reenter the payment details. This is particularly
-useful for subscriptions' recurring payments.
-
-.. _payment_acquirers/capture_amount:
-
-Place a hold on a card
-**********************
-
-If the **Capture Amount Manually** field is enabled, the funds are reserved for a few days on the
-customer's card, but not charged yet. You must then go to the related Sales Order and manually
-*capture* the funds before its automatic cancellation, or *void the transaction* to unlock the funds
-from the customer's card.
-
-.. _payment_acquirers/payment_flow:
-
-Payment Flow
-************
-
-Choose in the **Payment Flow** field if to redirect the user to the payment acquirer's portal to
-authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo.
-
-.. note::
-   Some features are available only if you select *Redirection to the acquirer website*.
-
-.. _payment_acquirers/countries:
-
-Countries
-*********
-
-Restrict the use of the Payment Acquirer to a selection of countries. Leave this field blank to make
-the Payment Acquirer available to all countries.
-
-.. _payment_acquirers/journal:
-
-Payment Journal
-***************
-
-The **Payment Journal** selected for your Payment Acquirer must be a *Bank* journal.
-
-.. important::
-   In many cases, Odoo automatically creates a new **Journal** and a new **Account** when you
-   activate a new Payment Acquirer. Both of them are preset to work out-of-the-box, but we strongly
-   recommend you to make sure these fields are correctly set according to your accounting needs, and
-   adapt them if necessary.
-
-.. _payment_acquirers/messages:
-
-Messages tab
-~~~~~~~~~~~~
-
-Change here the messages displayed by Odoo after a payment's confirmation or failure.
-
-.. _payment_acquirers/accounting:
-
-Accounting perspective
-======================
-
-The **Bank Payments** that go directly to one of your bank accounts follow their usual
-reconciliation workflows. However, payments recorded with **Online Payment Providers** require you
-to consider how you want to record your payments' journal entries. We recommend you to ask your
-accountant for advice.
-
-Odoo default method is to record the payments on a *Current Assets Account*, on a dedicated *Bank
-Journal*, once the *Payment Authentication* is confirmed. At some point, you transfer the funds from
-the *Payment Acquirer* to your *Bank Account*.
-
-Here are the requirements for this to work:
-
-- Bank Journal
-
-  - The Journal's **type** must be *Bank Journal*.
-  - Select the right **Default Debit Account** and **Default Credit Account**.
-  - | Under the *Advanced Settings* tab, make sure that **Posting** is set as *Post At Payment
-      Validation*.
-    | This implies that the Journal Entry is recorded directly when your Odoo database receives the
-      confirmation of the *Payment Authentication* from the Online Payment Provider.
-
-- Current Asset Account
-
-  - The Account's **type** is *Current Assets*
-  - The Account must **Allow Reconciliation**
-
-.. note::
-   In many cases, Odoo automatically creates a new **Journal** and a new **Current Asset Account**
-   when you activate a new Payment Acquirer. You can modify them if necessary.
-
-.. seealso::
-
-   - :doc:`../../finance/accounting/receivables/customer_payments/recording`
-   - :doc:`wire_transfer`
-   - :doc:`authorize`
-   - :doc:`paypal`

content/applications/general/payment_acquirers/paypal.rst

@@ -203,5 +203,5 @@ when a fictitious transaction is completed.
 Run a test transaction from Odoo using the sandbox personal account.
 
 .. seealso::
-   - :doc:`payment_acquirers`
+   - :doc:`../payment_acquirers`
    - :doc:`../../websites/ecommerce/shopper_experience/payment_acquirer`

content/applications/general/unsplash.rst

@@ -2,8 +2,65 @@
 Unsplash
 ========
 
-.. toctree::
+Generate an Unsplash access key
-   :titlesonly:
+===============================
 
-   unsplash/unsplash_access_key
+.. tip::
-   unsplash/unsplash_application_id
+   **As a SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up
+   Unsplash information since you will use our own Odoo Unsplash key in a transparent way.
+
+Generate an Unsplash access key for non-Saas users
+--------------------------------------------------
+
+- Create an account on `Unsplash.com <https://unsplash.com/join>`_.
+
+- Go to your `applications dashboard <https://unsplash.com/oauth/applications>`_ and click on **New
+  Application**.
+
+.. image:: unsplash/create_app.png
+   :align: center
+
+- Accept the conditions and click on **Accept terms**.
+
+.. image:: unsplash/accept_terms.png
+   :align: center
+
+- You will be prompted to insert an **Application name** and a **Description**. Please prefix your
+  application name by "**Odoo:** " so that Unsplash can recognize it as an Odoo instance. Once done,
+  click on **Create application**.
+
+.. image:: unsplash/app_infos.png
+   :align: center
+
+- You should be redirected to your application details page. Scroll down a bit to find your **access
+  key**.
+
+.. image:: unsplash/access_key.png
+   :align: center
+
+.. warning::
+   **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be
+   limited to your test key that has a restriction of 50 Unsplash requests per hour.
+
+Generate an Unsplash application ID
+===================================
+
+.. tip::
+   You should first create and set up your Unsplash application.
+
+- Go to your `applications dashboard <https://unsplash.com/oauth/applications>`_ and click on your
+  newly created Unsplash application under **Your applications**.
+
+.. image:: unsplash/select_app.png
+    :align: center
+
+- You will be redirected to your application details page. The **application ID** will be visible in
+  your browser's URL. The URL should be something like
+  ``https://unsplash.com/oauth/applications/<application_id>``
+
+.. image:: unsplash/app_id_url.png
+   :align: center
+
+.. warning::
+   **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be
+   limited to your test key that has a 50 Unsplash requests per hour restriction.

content/applications/general/unsplash/unsplash_access_key.rst

@@ -1,37 +0,0 @@
-=======================================================
-How to generate an Unsplash access key
-=======================================================
-
-.. tip::
-  **As an SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up Unsplash information, since you will use our own Odoo Unsplash key in a transparent way.
-
-Generate an Unsplash access key for **non-Saas** users
-======================================================
-
-- Create an account on `Unsplash.com <https://unsplash.com/join>`_.
-
-- Go to your `applications dashboard <https://unsplash.com/oauth/applications>`_ and click on **New Application**.
-
-.. image:: media/create_app.png
-    :align: center
-
-- Accept the conditions and click on **Accept terms**.
-
-.. image:: media/accept_terms.png
-    :align: center
-
-- You will be prompted to insert an **Application name** and a **Description**. Please prefix your application name by "**Odoo:** " so that Unsplash can recognize it as an Odoo instance. Once done, click on **Create application**.
-
-.. image:: media/app_infos.png
-    :align: center
-
-- You should be redirected to your application details page. Scroll down a bit to find your **access key**.
-
-.. image:: media/access_key.png
-    :align: center
-
-.. warning::
-  **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be limited to your test key that has a restriction of 50 Unsplash requests per hour.
-
-.. seealso::
-    * :doc:`unsplash_application_id`

content/applications/general/unsplash/unsplash_application_id.rst

@@ -1,19 +0,0 @@
-=======================================================
-How to generate an Unsplash application ID
-=======================================================
-
-.. tip::
-  You should first create and set up your Unsplash application with this tutorial: :doc:`unsplash_access_key`.
-
-- Go to your `applications dashboard <https://unsplash.com/oauth/applications>`_ and click on your newly created Unsplash application under **Your applications**.
-
-.. image:: media/select_app.png
-    :align: center
-
-- You will be redirected to your application details page. The **application ID** will be visible in your browser's URL. The URL should be something like ``https://unsplash.com/oauth/applications/<application_id>``
-
-.. image:: media/app_id_url.png
-    :align: center
-
-.. warning::
-  **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be limited to your test key that has a 50 Unsplash requests per hour restriction.

content/applications/general/users.rst

@@ -1,12 +1,24 @@
-=======================
+:show-content:
-Users and Access Rights
+
-=======================
+==============
+Users settings
+==============
+
+.. toctree::
+   :titlesonly:
+
+   users/language
+   users/access_rights
 
 Odoo defines a *user* as someone who has access to a database to perform daily tasks. You can add as
 many users as you need and, in order to restrict the type of information each user can access, rules
 can be applied. Users and access rights can be added and changed at any point.
 
-.. _general/odoo_basics/add_individual_user:
+.. seealso::
+   - :doc:`users/language`
+   - :doc:`users/access_rights`
+
+.. _users/add-individual:
 
 Add individual users
 ====================
@@ -19,11 +31,11 @@ Go to :menuselection:`Settings --> Manage Users` and click on *Create*.
    :alt: View of the settings page emphasizing the manage users field in Odoo
 
 | Fill in the form with the needed information. Under the tab
-  :ref:`Access Rights <general/odoo_basics/users/access_rights>` choose the group within
+  :doc:`Access Rights <users/access_rights>` choose the group within each application the user can
-  each application the user can have access to.
+  have access to.
 | The list of applications shown is based on the applications installed on the database.
 
-.. image:: media/new_user.png
+.. image:: users/new_user.png
    :align: center
    :alt: View of a user’s form emphasizing the access rights tab in Odoo
 
@@ -39,8 +51,7 @@ the user. The user must click on it to accept the invitation and create a login.
    `pricing page <https://www.odoo.com/pricing>`_
    for more information.
 
-With the :doc:`Developer mode </applications/general/developer_mode>` activated, *User Types* can
+With the :ref:`developer mode <developer-mode>` activated, *User Types* can be selected.
-be selected.
 
 .. image:: users/user-type.png
    :align: center
@@ -116,74 +127,7 @@ Enter a new password and confirm by clicking on *Change Password*.
 Click on *Change Password* one more time. You are then redirected to an Odoo login page where you
 can reaccess your database using your new password.
 
-.. _general/odoo_basics/users/access_rights:
+.. _users/multi-companies:
-
-Access Rights in detail
-=======================
-
-Activate the :doc:`Developer mode </applications/general/developer_mode>`, then go to
-:menuselection:`Settings --> Users & Companies --> Groups`.
-
-Groups
-------
-
-| When choosing the groups the user can have access under
-  :ref:`Access Rights <general/odoo_basics/add_individual_user>`, details of the rules and
-  inheritances of that group are not shown, so this is when the menu *Groups* comes along. *Groups*
-  are created to define rules to models within an application.
-| Under *Users*, have a list of the current ones. The ones with administrative rights are shown
-  in black.
-
-.. image:: users/groups-users.png
-   :align: center
-   :alt: View of a group’s form emphasizing the tab users in Odoo
-
-*Inherited* means that users added to this application group are automatically added to the
-following ones. In the example below, users who have access to the group *Administrator* of *Sales*
-also have access to *Website/Restricted Editor* and *Sales/User: All Documents*.
-
-.. image:: users/groups-inherited.png
-   :align: center
-   :height: 330
-   :alt: View of a group’s form emphasizing the tab inherited in Odoo
-
-.. important::
-   Remember to always test the settings being changed in order to ensure that they are being applied
-   to the needed and right users.
-
-The *Menus* tab is where you define which menus (models) the user can have access to.
-
-.. image:: users/groups-menus.png
-   :align: center
-   :height: 330
-   :alt: View of a group’s form emphasizing the tab menus in Odoo
-
-*Access Rights* rules are the first level of rights. The field is composed of the object name, which
-is the technical name given to a model. For each model, enable the following options as appropriate:
-
-- *Read*: the values of that object can be only seen by the user.
-- *Write*: the values of that object can be edited by the user.
-- *Create*: values for that object can be created by the user.
-- *Delete*: the values of that object can be deleted by the user.
-
-.. image:: users/groups-access-rights.png
-   :align: center
-   :alt: View of a group’s form emphasizing the tab access rights in Odoo
-
-| As a second layer of editing and visibility rules, *Record Rules* can be formed. They overwrite,
-  or refine, the *Access Rights*.
-| A record rule is written using a *Domain*. Domains are conditions used to filter or searching
-  data. Therefore, a domain expression is a list of conditions. For each rule, choose among the
-  following options: *Read*, *Write*, *Create* and *Delete* values.
-
-.. image:: users/groups-record-rules.png
-   :align: center
-   :alt: View of a group’s form emphasizing the tab record rules in Odoo
-
-.. important::
-   Making changes in access rights can have a big impact on the database. For this reason, we
-   recommend you to contact your Odoo Business Analyst or our Support Team, unless you have
-   knowledge about Domains in Odoo.
 
 Multi Companies
 ===============
@@ -202,5 +146,5 @@ the user can have access.
    :alt: View of a user’s form emphasizing the multi companies field in Odoo
 
 .. seealso::
-   - :doc:`../multi_companies/manage_multi_companies`
+   - :doc:`multi_companies`
-   - :doc:`../../settings/users_and_features`
+   - :doc:`../general`

content/applications/general/users/access_rights.rst

@@ -0,0 +1,67 @@
+=============
+Access Rights
+=============
+
+Activate the :ref:`developer mode <developer-mode>`, then go to :menuselection:`Settings --> Users &
+Companies --> Groups`.
+
+Groups
+======
+
+| When choosing the groups the user can have access under
+  :ref:`Access Rights <users/add-individual>`, details of the rules and inheritances of that group
+  are not shown, so this is when the menu *Groups* comes along. *Groups* are created to define rules
+  to models within an application.
+| Under *Users*, have a list of the current ones. The ones with administrative rights are shown
+  in black.
+
+.. image:: access_rights/groups-users.png
+   :align: center
+   :alt: View of a group’s form emphasizing the tab users in Odoo
+
+*Inherited* means that users added to this application group are automatically added to the
+following ones. In the example below, users who have access to the group *Administrator* of *Sales*
+also have access to *Website/Restricted Editor* and *Sales/User: All Documents*.
+
+.. image:: access_rights/groups-inherited.png
+   :align: center
+   :height: 330
+   :alt: View of a group’s form emphasizing the tab inherited in Odoo
+
+.. important::
+   Remember to always test the settings being changed in order to ensure that they are being applied
+   to the needed and right users.
+
+The *Menus* tab is where you define which menus (models) the user can have access to.
+
+.. image:: access_rights/groups-menus.png
+   :align: center
+   :height: 330
+   :alt: View of a group’s form emphasizing the tab menus in Odoo
+
+*Access Rights* rules are the first level of rights. The field is composed of the object name, which
+is the technical name given to a model. For each model, enable the following options as appropriate:
+
+- *Read*: the values of that object can be only seen by the user.
+- *Write*: the values of that object can be edited by the user.
+- *Create*: values for that object can be created by the user.
+- *Delete*: the values of that object can be deleted by the user.
+
+.. image:: access_rights/groups-access-rights.png
+   :align: center
+   :alt: View of a group’s form emphasizing the tab access rights in Odoo
+
+| As a second layer of editing and visibility rules, *Record Rules* can be formed. They overwrite,
+  or refine, the *Access Rights*.
+| A record rule is written using a *Domain*. Domains are conditions used to filter or searching
+  data. Therefore, a domain expression is a list of conditions. For each rule, choose among the
+  following options: *Read*, *Write*, *Create* and *Delete* values.
+
+.. image:: access_rights/groups-record-rules.png
+   :align: center
+   :alt: View of a group’s form emphasizing the tab record rules in Odoo
+
+.. important::
+   Making changes in access rights can have a big impact on the database. For this reason, we
+   recommend you to contact your Odoo Business Analyst or our Support Team, unless you have
+   knowledge about Domains in Odoo.

content/applications/general/users/language.rst

@@ -1,6 +1,6 @@
-================================
+===============
-Manage Odoo in your own language
+Change language
-================================
+===============
 
 Odoo provides you with the option to manage Odoo in different languages,
 and each user can use Odoo in his own language .
@@ -15,7 +15,7 @@ From the general dashboard click on the **Settings** app; on the top
 left of the page select :menuselection:`Translations --> Load a Translation`,
 select a language to install and click on **LOAD.**
 
-.. image:: media/choose_language01.png
+.. image:: language/choose_language01.png
     :align: center
 
 .. note::
@@ -30,13 +30,13 @@ You can change the language to the installed language by going to the
 drop-down menu at the top right side of the screen, choose
 **Preferences**.
 
-.. image:: media/choose_language02.png
+.. image:: language/choose_language02.png
     :align: center
 
 Then change the Language setting to your installed language and click
 **SAVE.**
 
-.. image:: media/choose_language03.png
+.. image:: language/choose_language03.png
     :align: center
 
 Open a new menu to view the changes.
@@ -54,7 +54,7 @@ user and click on **Edit** in the top left corner. Under Preferences you
 can change the Language to any previously installed language and click
 **SAVE.**
 
-.. image:: media/choose_language04.png
+.. image:: language/choose_language04.png
     :align: center
 
 .. seealso::

content/applications/inventory_and_mrp/inventory/barcode/operations/barcode_nomenclature.rst

@@ -14,7 +14,7 @@ Create a Barcode Nomenclature
 
 Odoo supports Barcode Nomenclatures, which determine the mapping and
 interpretation of the encoded information. You can configure your barcode nomenclature being in
-:doc:`Developer mode </applications/general/developer_mode>`.
+:ref:`developer mode <developer-mode>`.
 To do so, go to :menuselection:`Inventory --> Configuration --> Barcode Nomenclature`.
 
 You can create a barcode nomenclature from there, and then add a line to

content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst

@@ -184,7 +184,7 @@ accounting modes.
 
 Usually, based on your country, the correct accounting mode will be
 chosen by default. If you want to verify your accounting mode, activate
-the :doc:`Developer mode </applications/general/developer_mode>` and open your accounting
+the :ref:`developer mode <developer-mode>` and open your accounting
 settings.
 
 Manual Inventory Valuation