[MERGE] Forward-port of branch 13.0 to 14.0

content/administration/odoo_sh/getting_started/create.rst

@@ -78,7 +78,8 @@ You can start using Odoo.sh. Your first build is about to be created. You will s
 Import your database
 ====================
 
-You can import your database in your Odoo.sh project as long as this is an Odoo 10.0, 11.0 or above database.
+You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version
+</services/support/supported_versions>` of Odoo.
 
 Push your modules in production
 -------------------------------

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

@@ -471,12 +471,12 @@ credit and debit notes, they are set automatically by Odoo:
 Invoice PDF Report
 ~~~~~~~~~~~~~~~~~~
 
-After the invoice is Accepted and valdiated by the SII and the PDF is printed it includes the
+Once the invoice is accepted and validated by the SII and the PDF is printed, it includes the
-fiscal elements that indicates out document is fiscally valid:
+fiscal elements that indicate that the document is fiscally valid:
 
 .. image:: media/Chile22.png
    :align: center
-   :alt: Barcode and fiscal elements in the invice report.
+   :alt: Barcode and fiscal elements in the invoice report.
 
 
 Commercial Validation

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

@@ -36,8 +36,8 @@ Configuration
 Install the Colombian localization modules
 ------------------------------------------
 
-For this, go in Apps and search for Colombia. Then click Install for
+To :ref:`install <general/install>` the modules, go to :menuselection:`Apps`, remove the *Apps*
-the first two modules.
+filter and search for "Colombia". Then click on *Install* for the first two modules.
 
 .. image:: media/colombia02.png
    :align: center

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

@@ -59,9 +59,9 @@ In case of non-conformity, your company risks a fine of €7,500.
 
 To get the certification just follow the following steps:
 
-* If you use **Odoo Point of Sale**, install the **France - VAT Anti-Fraud Certification for Point
+* If you use **Odoo Point of Sale**, :ref:`install <general/install>` the **France - VAT Anti-Fraud
-  of Sale (CGI 286 I-3 bis)** module by going to :menuselection:`Apps`, removing the *Apps* filter,
+  Certification for Point of Sale (CGI 286 I-3 bis)** module by going to :menuselection:`Apps`,
-  then searching for *l10n_fr_pos_cert*, and installing the module.
+  removing the *Apps* filter, then searching for *l10n_fr_pos_cert*, and installing the module.
 
 * Make sure a country is set on your company, otherwise your entries won’t be
   encrypted for the inalterability check. To edit your company’s data,

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

@@ -33,6 +33,134 @@ feature, the german accounting localization needs to be installed on your Odoo E
 Then you can go in :menuselection:`Accounting --> Reporting --> General Ledger` then click on the
 **Export Datev (csv)** button.
 
+.. _germany/pos:
+
+Point of Sale in Germany: Technical Security System
+===================================================
+
+The **Kassensicherungsverordnung** (The Act on Protection against Manipulation of Digital Records)
+requires that electronic record-keeping systems - including the :doc:`point of sale
+<../../../../sales/point_of_sale>` systems - must be equipped with a **Technical Security System**
+(also called **TSS** or **TSE**).
+
+Odoo offers a service that is compliant with the help of `fiskaly <https://fiskaly.com>`_, a
+*cloud-based solution*.
+
+.. important::
+   Since this solution is cloud-based, a working internet connection is required.
+
+.. note::
+   The only VAT rates allowed are given by fiskaly. You can check these rates by consulting:
+   `fiskaly DSFinV-K API: VAT Definition
+   <https://developer.fiskaly.com/api/dsfinvk/v0/#tag/VAT-Definition>`_.
+
+Configuration
+-------------
+
+Modules installation
+~~~~~~~~~~~~~~~~~~~~
+
+#. If your database was created before June 2021, :ref:`upgrade <general/upgrade>` your **Point of
+   Sale** app (`point_of_sale`) and the **Restaurant** module (`pos_restaurant`).
+#. :ref:`Install <general/install>` the **Germany - Certification for Point of Sale**
+   (`l10n_de_pos_cert`) and **Germany - Certification for Point of Sale of type restaurant**
+   (`l10n_de_pos_res_cert`) modules.
+
+   .. tip::
+      If these modules are not listed, :ref:`update the app list <general/install>`.
+
+.. image:: germany/pos-upgrade.png
+   :align: center
+   :alt: Upgrading Odoo Point of Sale from the Apps dashboard
+
+Register your company at the financial authority
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To register your company, go to :menuselection:`Settings --> General Settings --> Companies -->
+Update Info` and fill out the following fields:
+
+- **Company name**
+- Valid **address**
+- **VAT** number
+- **St.-Nr** (Steuernummer): this number is assigned by the tax office to every taxable natural or
+  legal person. (e.g., `2893081508152`)
+- **W-IdNr** (Wirtschafts-Identifikationsnummer): this number is used as a permanent
+  identification number for economically active persons.
+
+You can then **register your company through fiskaly** by opening the *fiskaly* tab and clicking on
+the *fiskaly Registration* button.
+
+.. image:: germany/fiskaly-registration.png
+   :align: center
+   :alt: Button to register a company through fiskaly in Odoo
+
+Once the registration has been finalized, new fields appear:
+
+- **fiskaly organization ID** refers to the ID of your company at the fiskaly side.
+- **fiskaly API key** and **secret** are the credentials the system uses to access the services
+  offered by fiskaly.
+
+.. image:: germany/fiskaly-keys.png
+   :align: center
+   :alt: fiskaly keys as displayed on Odoo
+
+.. note::
+   It is possible to request new credentials if there is any issue with the current ones.
+
+Create and link a Technical Security System to your PoS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. image:: germany/create-tss.png
+   :align: right
+   :alt: Create TSS option from a point of sale
+
+To use your point of sale in Germany, you first have to create a :abbr:`TSS (Technical Security
+System)` for it.
+
+To do so, go to :menuselection:`Point of Sale --> Configuration --> Point of Sale`, open the point
+of sale you want to edit, then check the box next to **Create TSS** and *Save*.
+
+.. image:: germany/tss-ids.png
+   :align: right
+   :alt: Example of TSS ID and Client ID from fiskaly in Odoo Point of Sale
+
+Once the creation of the TSS is successful, you can find your **TSS ID** and **Client ID** under the
+*fiskaly API* section.
+
+- **TSS ID** refers to the ID of your TSS at fiskaly's side.
+- **Client ID** refers to your PoS but at fiskaly's side.
+
+DSFinV-K
+--------
+
+.. image:: germany/dsfinv-k-export.png
+   :align: right
+   :alt: Menu to export DSFinV-K
+
+Whenever you close a PoS session, the orders' details are sent to the :abbr:`DSFinV-K (Digitale
+Schnittstelle der Finanzverwaltung für Kassensysteme)` service of fiskaly.
+
+In case of an audit, you can export the data sent to DSFinV-K by going to :menuselection:`Point of
+Sale --> Orders --> DSFinV-k exports`.
+
+These fields are mandatory:
+
+- **Name**
+- **Start Datetime** (export data with dates larger than or equal to the given start date)
+- **End Datetime** (export data with dates smaller than or equal to the given end date)
+
+Leave the **Point of Sale** field blank if you want to export the data of all your points of sale.
+Specify a Point of Sale if you want to export this specific PoS' data only.
+
+The creation of a DSFinV-K export triggers on export at fiskaly's side.
+
+.. image:: germany/dsfinv-k-export-fields.png
+   :align: center
+   :alt: Pending DSFinV-K export on Odoo
+
+As you can see, the **State** is *Pending*. This means that the export has been successfully
+triggered and is being processed. You have to click on *Refresh State* to check if it is ready.
+
 .. _germany/gobd:
 
 German Tax Accounting Standards: Odoo's guide to GoBD Compliance

content/applications/general.rst

@@ -16,130 +16,107 @@ General
     general/in_app_purchase
     general/unsplash
 
-.. _general/users-features:
+**Odoo** is a suite of open source business apps that cover all your company needs: :doc:`CRM
+<sales/crm>`, :doc:`eCommerce <websites/ecommerce>`, :doc:`accounting <finance/accounting>`,
+:doc:`inventory <inventory_and_mrp/inventory>`, :doc:`point of sale <sales/point_of_sale>`,
+:doc:`project management <services/project>`, etc. Its unique value proposition is to be at the same
+time *very easy* to use and *fully integrated*.
 
-Users and Features
+This section of the documentation covers all functional aspects that aren't app-specific. You can
-==================
+find, for example, information about:
 
-As the administrator of your database, you are responsible for its usage.
+- :doc:`general/users` and :doc:`general/users/access_rights`, to configure each user correctly.
-This includes the Apps you install as well as the number of users currently
+- :doc:`general/export_import_data`, to transfer data from and to other environments than Odoo or
-in use.
+  update data.
+- :doc:`general/payment_acquirers`, to allow your customers to pay with their favorite payment
+  method.
+- :doc:`general/auth/google`, as an authentication method.
 
-Odoo is many things (ERP, CMS, CRM application, e-Commerce backend, etc.)
+.. important::
-but it is *not* a smartphone. You should apply caution when adding/removing
+   - | **Installing or uninstalling apps, managing users, etc., is up to you.**
-features (especially Apps) on your database since this may impact your
+     | As the administrator of your database, you are responsible for its usage, as you know best
-subscription amount significantly (or switch you from a free account
+       how your organization works. This includes the installation or uninstallation of :ref:`apps
-to a paying one on our online platform).
+       <general/apps-modules>` as well as the number of :doc:`users <general/users>` currently in
+       use.
+   - | **Odoo apps have dependencies.**
+     | Installing some apps and features with dependencies may also install additional apps and
+       modules that are technically required, even if you won't actively use them.
+   - | **Always test app installation/removal on a duplicate of your database.**
+     | This way, you can know what app dependencies may be required or what data may be erased.
 
-This section contains some information as to how you can manage your Odoo
+.. seealso::
-instances. Before carrying any of these procedures, we **strongly** advise
+   - :ref:`Online Database management: Duplicate a database <duplicate_online>`
-to test them on a duplicate of your database first. That way, if something goes
+   - :ref:`On-premises Database management: Duplicate a database <duplicate_premise>`
-wrong, your day-to-day business is not impacted.
+   - `Submit a Support Ticket <https://www.odoo.com/help>`_
 
-.. note:: You can find guides on how to duplicate your databases both for
+.. _general/apps-modules:
-    :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
+Apps and modules
-    encounter an issue while carrying out these procedures, please contact
+================
-    us through our `support form <https://www.odoo.com/help>`__.
 
+You can :ref:`install <general/install>`, :ref:`upgrade <general/upgrade>` and :ref:`uninstall
+<general/uninstall>` all apps and modules from the :menuselection:`Apps` dashboard.
 
-Deactivating Users
+By default, an *Apps* filter is applied. If you want to search for modules (including :doc:`Fiscal
-------------------
+Localization Packages
+<finance/accounting/fiscal_localizations/overview/fiscal_localization_packages>`), click on
+*Filters* and select *Extra*.
 
-.. note:: Make sure you have sufficient **administrative rights** if
+.. image:: general/apps-search-filter.png
-    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
+   :alt: Add "Extra" filter in Odoo Apps
 
-.. note:: The pre-selected filter *Internal Users* shows your paying
+.. warning::
-    users (different from the *Portal Users* which are free). If you
+   Odoo is *not a smartphone*, and its apps shouldn't be installed or uninstalled carelessly. Apply
-    remove this filter, you'll get all your users (the ones you pay for
+   caution when adding or removing apps and modules on your database since this may impact your
-    and the portal ones)
+   subscription costs.
 
-In your list of users, click on the user you want to deactivate. As soon
+.. _general/install:
-as you are on the userform, click on the Action drop down menu, and
-then click on Archive.
 
-.. image:: general/deactivate_user.png
+Install apps and modules
-    :align: center
+------------------------
 
+Go to :menuselection:`Apps`, and click on the *Install* button of the app you want to install.
 
-The user is now deactivated.
+.. note::
+   If the module you are looking for is not listed, you can **update the app list**.
 
-.. danger:: **Never** deactivate the main user (*admin*)
+   To do so, activate the :ref:`developer mode <developer-mode>`, then go to :menuselection:`Apps
+   --> Update Apps List` and click on *Update*.
 
-Uninstalling Apps
+.. _general/upgrade:
------------------
 
-.. warning:: Make sure you first test what you are about to do on a
+Upgrade apps and modules
-    :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
+On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo
-able to see how many applications you have installed. Click on **Browse
+</services/support/supported_versions>`. To be able to use them, you must **upgrade** your app.
-Apps** to access the list of your installed applications.
 
-+----------------+----------------+
+Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to upgrade, then on
-|   |settings|   | |browse_apps|  |
+*Upgrade*.
-+----------------+----------------+
 
-In your applications' dashboard, you will see all the icons of your
+.. _general/uninstall:
-applications. Click on the application you want to uninstall. Then, on
+
-the form of the application, click on **Uninstall**.
+Uninstall apps and modules
+--------------------------
+
+Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to uninstall, then on
+*Uninstall*.
 
 .. image:: general/uninstall.png
    :align: center
 
-.. danger:: Some applications have dependencies, like Invoicing, eCommerce,
+Some apps have dependencies, meaning that one app requires another. Therefore, uninstalling one app
-    etc. Therefore, the system will give you a warning message to advise
+may uninstall multiple apps and modules. Odoo warns you which dependant apps and modules are
-    you of what is about to be removed. If you uninstall your application,
+affected by it.
-    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.
+To complete the uninstallation, click on *Confirm*.
 
-Good to know
+.. danger::
-------------
+   Uninstalling an app also uninstalls all its dependencies and permanently erases their data.
-
-* **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:
 
@@ -148,8 +125,8 @@ Activate the developer mode (debug mode)
 
 The developer mode (or debug mode) gives you access to extra and advanced tools.
 
-Through the Settings application
+Through the Settings
---------------------------------
+--------------------
 
 Go to :menuselection:`Settings --> Activate the developer mode`.
 

content/applications/general/auth/google.rst

@@ -1,49 +1,136 @@
-=======================================================
+=============================
-How to allow users to sign in with their Google account
+Google Sign-In Authentication
-=======================================================
+=============================
 
-- Connect to your Google account and go to the `Google API Dashboard
+The **Google Sign-In Authentication** is a useful function that allows your users to sign in to Odoo
-  <https://console.developers.google.com/>`_.
+with their Google account.
 
-- Click on **Create Project** and enter the project name and other details.
+This is particularly helpful if your organization uses Google Workforce and you want the employees
+within your organization to connect to Odoo with their Google Accounts.
 
-.. image:: media/google01.png
+.. _google-sign-in/configuration:
+
+Configuration
+=============
+
+The integration of the Google sign-in function requires configuration both on Google and on Odoo.
+
+.. _google-sign-in/api:
+
+Google API Dashboard
+--------------------
+
+#. Go to the `Google API Dashboard <https://console.developers.google.com/>`_.
+#. Make sure the right project is opened. If you don't have a project yet, click on *Create
+   Project*, fill out the project name and other details of your company, and click on *Create*.
+
+   .. image:: google/new-project-details.png
       :align: center
+      :alt: Filling out the details of a new project
 
-.. image:: media/google02.png
+   .. tip::
+      Choose the name of your own company from the drop-down menu.
+
+.. _google-sign-in/oauth:
+
+OAuth consent screen
+~~~~~~~~~~~~~~~~~~~~
+
+#. On the left side menu, click on :menuselection:`OAuth consent screen`.
+
+   .. image:: google/consent-selection.png
       :align: center
+      :alt: Google oauth consent selection menu
 
-- Click on **Use Google APIs**
+#. Choose one of the options **(Internal / External)** as instructed, and click on *Create*.
 
-.. image:: media/google03.png
+   .. image:: google/consent.png
       :align: center
+      :alt: Choice of a user type in oauth consent
 
-- On the left side menu, select the sub menu **Credentials** (from **API Manager**) then select **OAuth consent screen**.
+#. Fill out your details and domain info, then click on *Save and Continue*.
+#. On the **Scopes** page, leave all fields as is, and click on *Save and Continue*.
 
-.. image:: media/google04.png
+.. _google-sign-in/credentials:
+
+Credentials
+~~~~~~~~~~~
+
+#. On the left side menu, click on :menuselection:`Credentials`.
+
+   .. image:: google/credentials-button.png
       :align: center
+      :alt: Credentials button menu
 
-- Fill in your address, email and the product name (for example odoo) and then save.
+#. Click on *Create Credentials* and select **OAuth client ID**.
 
-.. image:: media/google05.png
+   .. image:: google/client-id.png
       :align: center
+      :alt: Oauth client id selection
 
-- Then click on **Add Credentials** and select the second option (OAuth 2.0 Client ID).
+#. Select **Web Application** as the Application type. Now configure the allowed pages on which you
+   will be redirected.
    
-.. image:: media/google06.png
+   In order to achieve this, in the **Authorized redirect URIs** field, enter your database's domain
+   immediately followed by ``/auth_oauth/signin``. For example:
+   ``https://mydomain.odoo.com/auth_oauth/signin``, then click on *Create*.
+
+   .. image:: google/create-client-id.png
       :align: center
+      :alt: Creating oauth client id
 
-.. image:: media/google07.png
+.. _google-sign-in/auth-odoo:
+
+Google Authentication on Odoo
+-----------------------------
+
+.. _google-sign-in/client-id:
+
+Retrieve the Client ID
+~~~~~~~~~~~~~~~~~~~~~~
+
+Once you have done the previous steps, two keys are generated on the Google API Dashboard: *Client
+ID* and *Client Secret*. Copy the *Client ID*.
+
+.. image:: google/secret-ids.png
    :align: center
+   :alt: Google OAuth Client ID generated
 
-- Check that the application type is set on **Web Application**. Now configure the allowed pages on which you will be redirected.
+.. _google-sign-in/odoo-activation:
 
-- To achieve this, complete the field **Authorized redirect URIs**. Copy paste the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. Then click on **Create**
+Odoo activation
+~~~~~~~~~~~~~~~
 
-.. image:: media/google08.png
+#. Go to :menuselection:`Odoo General Settings --> Integrations` and activate **OAuth
+   Authentication**.
+
+   .. note::
+      You may have to log in again after this step.
+   
+#. Go back to :menuselection:`General Settings --> Integrations`, activate **Google
+   Authentication**, then fill out the *Client ID* with the key from the Google API Dashboard, and
+   *Save*.
+
+   .. image:: google/odoo-client-id.png
       :align: center
+      :alt: Filling out the client id in Odoo settings
 
-.. image:: media/google09.png
+.. _google-sign-in/log-in:
+
+Log in to Odoo with Google
+==========================
+
+To link your Google account to your Odoo profile, click on *Log in with Google* when you are asked
+to choose a new password.
+
+   .. image:: google/first-login.png
       :align: center
+      :alt: Reset password screen with "Log in with Google" button
 
-- Once done, you receive two information (your Client ID and Client Secret). You have to insert your Client ID in the **General Settings**.
+Existing users must :ref:`reset their password <users/reset-password>` to access the *reset
+password* page, while new users can directly click on *Log in with Google* instead of choosing a new
+password.
+
+.. seealso::
+   - `Google Cloud Platform Console Help - Setting up OAuth 2.0
+     <https://support.google.com/cloud/answer/6158849>`_

content/applications/general/users.rst

@@ -62,6 +62,17 @@ The *Portal* and *Public* options do not allow you to choose access rights. Memb
 ones (such as record rules and restricted menus) and usually do not belong to the usual Odoo
 groups.
 
+.. _users/deactivate:
+
+Deactivate Users
+================
+
+Go to :menuselection:`Settings --> Users & Companies --> Users`, open the user you want to
+deactivate, click on *Action*, and then on *Archive*.
+
+.. danger::
+   **Never** deactivate the main user (*admin*).
+
 .. _users/passwords-management:
 
 Passwords management

content/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/expiration_dates.rst

@@ -1,24 +1,23 @@
-=======================
+================
-Manage expiration dates
+Expiration Dates
-=======================
+================
 
-In many companies, products have expiration dates and they should be
+In many companies, products have expiration dates and they should be managed based on those dates.
-tracked based on those dates. In the food industry, for example,
+In the food industry, for example, tracking and managing product stock based on expiration dates is
-tracking stocks based on expiration dates is mandatory to avoid selling
+mandatory to avoid selling expired products to customers.
-expired products to customers.
 
-With Odoo, you can track your products based on their expiration dates,
+With Odoo, you can track and manage your products based on their expiration dates, even if they are
-even if they are already tracked by lots or serial numbers.
+already tracked by lots or serial numbers.
 
-Configurations
+Configuration
-==============
+=============
 
 Application configuration
 -------------------------
 
-To use expiration dates tracking, open the *Inventory* application and
+To use expiration date tracking, open the *Inventory* application and go to
-go to :menuselection:`Configuration --> Settings` and activate the *Lots & Serial
+:menuselection:`Configuration --> Settings` and activate the *Lots & Serial Numbers* and *Expiration
-Numbers* and *Expiration Dates* features.
+Dates* features.
 
 .. image:: media/expiration_dates_01.png
    :align: center
@@ -26,16 +25,18 @@ Numbers* and *Expiration Dates* features.
 Product configuration
 ---------------------
 
-Now, you have the possibility to define different dates in the
+Now, you can define different dates in the *inventory tab* of the product form:
-*inventory tab* of the product form:
 
--  Product Use Time: it’s the number of days before the goods start deteriorating, without being dangerous yet. It will be computed using the lot/serial number;
+- Product Use Time: the number of days before the goods start deteriorating, without being
-
+  dangerous. This is used to calculate the Best before date on each lot/serial number received.
--  Product Life Time: refers to the number of days before the goods may become dangerous and must not be consumed. It will be computed on the lot/serial number;
+- Product Life Time: the number of days before the goods may become dangerous and must not be
-
+  consumed. This is used to calculate the Expiration date on each lot/serial number received.
--  Product Removal Time: shows the number of days before the goods should be removed from the stock. It will be computed on the lot/serial number;
+- Product Removal Time: shows the number of days before the goods should be removed from the stock.
-
+  This is used to calculate the Removal date on each lot/serial number received.
--  Product Alert Time: refers to the number of days before an alert should be raised on the lot/serial number.
+- Product Alert Time: refers to the number of days before an alert should be raised on the
+  lot/serial number. This is used to calculate the Alert date on each lot/serial number received.
+  Once the Alert date is reached, an Activity is assigned on the relevant lot/serial number to the
+  Responsible user defined on the Product.
 
 .. image:: media/expiration_dates_02.png
    :align: center
@@ -43,10 +44,9 @@ Now, you have the possibility to define different dates in the
 Expiration Date on Lots/Serial Numbers
 ======================================
 
-When receiving a product in stock, the dates will automatically be
+When receiving a product into inventory, the dates will automatically be updated on the
-updated on the corresponding lot/serial number. This update will be
+corresponding lot/serial number. These updates will be based on the receipt date of the product and
-based on the reception date of the product and the times set on the
+the days set on the product form.
-product form.
 
 .. image:: media/expiration_dates_03.png
    :align: center
@@ -57,10 +57,9 @@ product form.
 Expiration Alerts
 =================
 
-You can access all your expiration alerts from the *inventory* app. To
+You can access expiration alerts from the *inventory* app. To do so, go to :menuselection:`Master
-do so, go to :menuselection:`Master Data --> Lots/Serial Numbers`. There, you can use
+Data --> Lots/Serial Numbers`. There, you can use the pre-existing filter to show all the
-the pre-existing filter that shows all the lots/serial numbers that
+lots/serial numbers that have exceeded their respective alert dates.
-exceeded their alert date.
 
 .. image:: media/expiration_dates_05.png
    :align: center

content/applications/sales.rst

@@ -11,3 +11,4 @@ Sales
     sales/sales
     sales/point_of_sale
     sales/subscriptions
+    sales/rental

content/applications/sales/rental.rst

@@ -0,0 +1,103 @@
+======
+Rental
+======
+
+**Odoo Rental** is a comprehensive solution to manage your rentals.
+
+From a single view, you can send out quotations, confirm orders, schedule rentals, register when
+products are picked up and returned, and invoice your customers.
+
+.. seealso::
+   - `Odoo Rental: product page <https://www.odoo.com/app/rental>`_
+   - `Odoo Tutorials: Rental <https://www.odoo.com/slides/rental-48>`_
+
+.. _rental/pricing:
+
+Rental Pricing
+==============
+
+Configuration
+-------------
+
+Go to :menuselection:`Rental --> Products`, select or create a product, and click on the product's
+*Rental* tab. Under *Rental Pricing*, click on *Add a price*. Then choose a *Unit* of time (hours,
+days, weeks, or months), a *Duration*, and a *Price*. You can add as many price lines as necessary,
+usually to give out discounts for longer rental durations.
+
+.. image:: rental/rental-pricing-example.png
+   :align: center
+   :alt: Example of rental pricing configuration in Odoo Rental
+
+.. tip::
+   Under *Reservations*, you can add fines for any *Extra Hour* or *Extra Day*. You can also set a
+   *Security Time*, expressed in hours, to make the product temporarily unavailable between two
+   rental orders.
+
+.. note::
+   If you want to rent a product created outside of the Rental app, do not forget to tick *Can be
+   Rented* under the product's name. By default, this option is ticked when you create a product
+   directly from the Rental app.
+
+Computing
+---------
+
+Odoo always uses two rules to compute the price of a product when you create a rental order:
+
+#. Only one price line is used.
+#. The cheapest line is selected.
+
+.. exercise::
+   Consider the following rental pricing configuration for a product:
+
+   - 1 day: $100
+   - 3 days: $250
+   - 1 week: $500
+
+   A customer wants to rent this product for eight days. What price will they pay?
+
+   After an order is created, Odoo selects the second line as this is the cheapest option. The
+   customer has to pay three times '3 days' to cover the rental's eight days, for a total of $750.
+
+.. _rental/customer-signature:
+
+Customer signature
+==================
+
+You can ask your customers to sign a rental agreement outlining the arrangement between you and your
+customers before they pick up products to make sure your products are returned on time and in their
+original condition. To do so, go to :menuselection:`Rental --> Configuration --> Settings`, activate
+*Digital Documents*, and *Save*.
+
+.. image:: rental/digital-documents-settings.png
+   :align: center
+   :alt: Digital Documents settings in Odoo Rental
+
+.. note::
+   This feature requires the :doc:`Sign <../finance/sign>` app. If necessary, Odoo installs it after
+   activating *Digital Documents*.
+
+Once the app settings are saved, you have the option to change the default *Rental Agreement* from
+the dropdown menu. You can pick any document already uploaded to the *Sign* app, or upload a new one
+to the *Sign* app by clicking on *Upload Template*.
+
+To request a customer signature, select a confirmed rental order, click on *Sign Documents*, choose
+the document template and click on *Sign Documents* again. On the next window, select your customer
+and click on *Sign Now* to start the signing process with your customer. Once the document is
+completed, click on *Validate & Send Completed Document*.
+
+.. seealso::
+   - `Odoo Tutorials: Sign <https://www.odoo.com/slides/sign-61>`_
+
+.. _rental/pickup-return:
+
+Pickup and Return receipt
+=========================
+
+You can print and give your customers receipts when they pick up and/or return products. To do so,
+open any rental order, click on *Print* and select *Pickup and Return Receipt*. Odoo then generates
+a PDF detailing all information about the current status of the rented items: which were picked up,
+when they are expected to be returned, which were returned, and potential rental delay costs.
+
+.. image:: rental/print-receipt.png
+   :align: center
+   :alt: Printing a Pickup and Return receipt in Odoo Rental

content/applications/websites/ecommerce/managing_products/variants.rst

@@ -1,92 +1,110 @@
-==============================
+=======================
-How to manage product variants
+Manage product variants
-==============================
+=======================
 
-Product variants are used to offer variations of the same product to your
+Product variants are used to offer variations of the same product to your customers on the product's
-customers on the products page. For example, the customer chooses a T-shirt
+page.
-and then selects its size and color.  In the example below, the customer
-chooses a phone, and then selects the memory; color and Wi-Fi band from the
-available options.
 
-.. image:: ./media/variants.png
+Let's say one of your customers selects a T-shirt from your product catalog.
+
+Then, they choose the size and color they want. The various size and color combinations are known as
+product variants.
+
+Create attributes & variants
+============================
+
+In order to create various attributes and variants for your products, you first need to turn on
+*Variants* in :menuselection:`Sales --> Configuration --> Settings`.
+
+Then, select a product from the Products list (:menuselection:`Sales / Website --> Products -->
+Products`). When the product detail form opens, click on *Edit*, and go to the *Variants* tab.
+
+Here, you can add as many different attributes as you'd like by clicking on *Add a line*.
+
+These attributes appear as three different types:
+
+- Radio buttons
+- Color buttons
+- Drop-down menu
+
+Several variants appear as soon as there are two values for one attribute.
+
+Don't forget to hit *Save* once all variants have been entered.
+
+.. image:: variants/values.png
    :align: center
+   :alt: ecommerce product variants values
 
-How to create attributes & variants
+Edit variants
-===================================
+=============
 
-* Turn on *Products can have several attributes, defining variants (Example:
+After you hit *Save*, you are able to see all the variants from the product template detail form via
-  size, color,...)* in :menuselection:`Sales --> Settings`.
+the *Variants* smart button.
 
-* Select a product from the Products list, go to the *Variants* tab.
+.. image:: variants/smart-button.png
-
-* Add as many attributes as you need from 3 different types: radio buttons,
-  drop-down menu or color buttons. You get several variants as soon as there are
-  2 values for 1 attribute.
-
-.. image:: ./media/variants_setup.png
    :align: center
+   :alt: ecommerce product variants smart button
 
-How to edit variants
+Clicking the *Variants* smart button takes you to the Product Variants page, where you can edit the
-====================
+following data for each specific variant:
 
-See all the variants from the product template detail form.
+- Picture(s)
-
+- Internal Reference (SKU #)
-.. image:: ./media/variants_button.png
+- Barcode
-   :align: center
+- Volume
-   :scale: 50
+- Weight
-   :width: 50
+- Cost
-   :height: 50
-
-You can edit following data:
-
-* Picture (will update in real time on the website),
-* Barcode,
-* Internal Reference (SKU #),
-* Volume,
-* Weight,
-* Active (available in quotes & website).
 
 .. note::
-   Both the Barcode and the Internal Reference are variant-specific.
+   Both the Barcode and the Internal Reference are variant-specific. You need to populate them once
-   You need to populate them once the variants generated.
+   the variants are generated.
 
-.. tip::
+Set specific prices per variant
-   See and edit all the variants from :menuselection:`Sales --> Sales --> Product Variants`
-   as well. This might be quicker if you manage lots of variants.
-
-How to set specific prices per variant
-======================================
-
-You can also set a specific public price per variant by clicking *Variant Prices*
-in the product detail form (action in top-left corner).
-
-.. image:: ./media/variant_prices_button.png
-   :align: center
-
-The Price Extra is added to the product price whenever the corresponding attribute
-value is selected.
-
-.. image:: ./media/variant_prices.png
-   :align: center
-
-.. image:: ./media/variant_prices_web.png
-   :align: center
-
-.. tip::
-   Pricelist formulas let you set advanced price computation methods for product variants.
-   See :doc:`../maximizing_revenue/pricing`.
-
-How to disable/archive variants
 ===============================
 
-You can disable/archive specific variants so that they are no longer available in quotes &
+You can set a specific public price per variant by clicking on *Configure Variants* in the product
-website (not existing in your stock, deprecated, etc.). Simply uncheck *Active* in their detail form.
+detail form (top-left corner). That takes you to the *Product Variant Values* page for that product.
 
-.. image:: ./media/variant_active.png
+.. image:: variants/configure-variants.png
    :align: center
+   :alt: ecommerce product variants configure variants
 
-To retrieve such archived items, hit *Archived* on searching the variants list. You can
+To set a specific public price for a particular variant, simply click on the variant you want to
-reactivate them the same way.
+modify, then click on *Edit*.
 
-.. image:: ./media/variant_archive.png
+The *Value Price Extra* field represents the monetary value that is added to the original product
+price whenever the corresponding attribute value is selected.
+
+.. image:: variants/value-price-extra.png
    :align: center
+   :alt: ecommerce value price extra
+
+This is how the *Value Price Extra* looks on your website:
+
+.. image:: variants/value-price-extra-frontend.png
+   :align: center
+   :alt: ecommerce value price extra on the frontend
+
+.. note::
+   Pricelist formulas let you set advanced price computation methods for product variants. See
+   :doc:`../maximizing_revenue/pricing`.
+
+Disable/archive variants
+========================
+
+You can disable/archive specific variants so they are no longer available in quotes or on your
+website (not existing in your stock, deprecated, etc.). Simply select *Archive* in their detail
+form. You can reactivate them the same way.
+
+.. image:: variants/archive.png
+   :align: center
+   :alt: ecommerce product variants archive
+
+To retrieve such items, hit *Archived* in the *Filters* category while searching the variants list.
+
+.. image:: variants/archive-search.png
+   :align: center
+   :alt: ecommerce product variants archive search
+
+.. seealso::
+   - :doc:`../../../sales/sales/products_prices/products/variants`