[IMP] administration: introduce standard and extended support

To align with the updated terms of the Odoo Entreprise Subscription Agreement

X-original-commit: 7330f71f96

content/administration.rst

@@ -10,7 +10,7 @@ Database management
 These guides provide instructions on how to install, maintain and upgrade Odoo databases.
 
 .. seealso::
-    :doc:`History of Versions <administration/supported_versions>`
+    :doc:`History of Versions <administration/standard_extended_support>`
 
 Installation
 ============
@@ -60,6 +60,6 @@ functionalities, including functional support, upgrades, and hosting. `Pricing
     administration/on_premise
     administration/upgrade
     administration/neutralized_database
-    administration/supported_versions
+    administration/standard_extended_support
     administration/mobile
     administration/odoo_accounts

content/administration/hosting.rst

@@ -18,7 +18,7 @@ To Odoo Online
 
 .. important::
    - Odoo Online is *not* compatible with **non-standard apps**.
-   - The database's current version must be :doc:`supported <supported_versions>`.
+   - The database's current version must be :doc:`supported <standard_extended_support>`.
 
 #. Create a :ref:`duplicate of the database <on-premise/duplicate>`.
 #. In this duplicate, uninstall all **non-standard apps**.
@@ -46,10 +46,10 @@ Transferring an Odoo Online database
 ====================================
 
 .. important::
-   Odoo Online's :ref:`intermediary versions <supported_versions>` are not supported by Odoo.sh or
+   Odoo Online's :doc:`intermediary versions <standard_extended_support>` are not supported by
-   on-premise. Therefore, if the database to transfer is running an intermediary version, it must be
+   Odoo.sh or on-premise. Therefore, if the database to transfer is running an intermediary version,
-   upgraded first to the next :ref:`major version <supported_versions>`, waiting for its release if
+   it must be upgraded first to the next :doc:`major version <standard_extended_support>`, waiting
-   necessary.
+   for its release if necessary.
 
    .. example::
       Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo

content/administration/odoo_sh/getting_started/create.rst

@@ -67,7 +67,7 @@ Import a database
 =================
 
 Once your platform is deployed, you can import a database into your Odoo.sh project, provided it
-uses a :doc:`supported version <../../supported_versions>` of Odoo.
+uses a :doc:`supported version <../../standard_extended_support>` of Odoo.
 
 .. note::
    Due to `Odoo's backup policy <https://www.odoo.com/cloud-sla>`_, the import process requires

content/administration/standard_extended_support.rst

@@ -0,0 +1,102 @@
+=============================
+Standard and extended support
+=============================
+
+.. warning::
+   The information presented on this page is not intended to amend, modify, or replace any terms of
+   the :doc:`Odoo Enterprise Subscription Agreement <../legal/terms/enterprise>`. In the event of
+   any inconsistency or conflict, the Subscription Agreement shall govern.
+
+Odoo provides **standard support** for all major versions for three years. It includes helpdesk
+support, bug fixing, and security updates.
+
+Beyond those three years, you can benefit from **extended support** by paying an extra fee. It
+includes helpdesk support and bug fixes (depending on feasibility).
+
+.. note::
+   - Odoo releases intermediary versions, called online or SaaS versions, every two to three months.
+     These versions are only available on Odoo Online and are not eligible for extended support.
+   - You can `upgrade <https://upgrade.odoo.com>`_ from any version.
+
+The table below shows the support status of every version. Major releases are highlighted in bold.
+
+.. list-table::
+   :header-rows: 1
+   :widths: auto
+
+   * -
+     - Odoo Online
+     - Odoo.sh
+     - On-premise
+     - Release date
+     - End of standard support
+   * - **Odoo 19.0**
+     - |green|
+     - |green|
+     - |green|
+     - September 2025
+     - September 2028 (planned)
+   * - Odoo SaaS 18.4
+     - |red|
+     - N/A
+     - N/A
+     - July 2025
+     -
+   * - Odoo SaaS 18.3
+     - |red|
+     - N/A
+     - N/A
+     - May 2025
+     -
+   * - Odoo SaaS 18.2
+     - |red|
+     - N/A
+     - N/A
+     - March 2025
+     -
+   * - **Odoo 18.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2024
+     - September 2027 (planned)
+   * - **Odoo 17.0**
+     - |green|
+     - |green|
+     - |green|
+     - November 2023
+     - September 2026 (planned)
+   * - **Odoo 16.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2022
+     - September 2025
+   * - **Odoo 15.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2021
+     - October 2024
+   * - Older versions
+     - |red|
+     - |red|
+     - |red|
+     - Before 2021
+     - Before 2024
+
+.. admonition:: Legend
+
+   |green| : Standard support
+
+   |red| : Extended support available (with an extra fee)
+
+   N/A : Never released for this platform
+
+.. |green| raw:: html
+
+   <span class="text-success" style="font-size: 32px; line-height: 32px; display: inline-block; vertical-align: middle;">●</span>
+
+.. |red| raw:: html
+
+   <span class="text-danger" style="font-size: 32px; line-height: 32px; display: inline-block; vertical-align: middle;">●</span>

content/administration/supported_versions.rst

@@ -1,107 +0,0 @@
-:hide-page-toc:
-
-.. _supported_versions:
-
-==================
-Supported versions
-==================
-
-Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
-
-.. note::
-   Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online
-   <odoo_online>` hosting every two months. Odoo Online users can then benefit from the latest
-   features of Odoo.
-
-   - Admins of Odoo Online databases are invited to :doc:`upgrade <upgrade>` them regularly.
-   - Online versions are *not* released for Odoo.sh and On-Premise installations.
-   - Online versions are listed below as *SaaS*.
-
-This matrix shows the support status of every version.
-
-**Major releases are in bold type.**
-
-.. list-table::
-   :header-rows: 1
-   :widths: auto
-
-   * -
-     - Odoo Online
-     - Odoo.sh
-     - On-Premise
-     - Release date
-     - End of support
-   * - **Odoo 19.0**
-     - |green|
-     - |green|
-     - |green|
-     - September 2025
-     - September 2028 (planned)
-   * - Odoo SaaS 18.4
-     - |red|
-     - N/A
-     - N/A
-     - July 2025
-     -
-   * - Odoo SaaS 18.3
-     - |red|
-     - N/A
-     - N/A
-     - May 2025
-     -
-   * - Odoo SaaS 18.2
-     - |red|
-     - N/A
-     - N/A
-     - March 2025
-     -
-   * - **Odoo 18.0**
-     - |green|
-     - |green|
-     - |green|
-     - October 2024
-     - September 2027 (planned)
-   * - **Odoo 17.0**
-     - |green|
-     - |green|
-     - |green|
-     - November 2023
-     - September 2026 (planned)
-   * - **Odoo 16.0**
-     - |red|
-     - |red|
-     - |red|
-     - October 2022
-     - September 2025
-   * - **Odoo 15.0**
-     - |red|
-     - |red|
-     - |red|
-     - October 2021
-     - October 2024
-   * - Older versions
-     - |red|
-     - |red|
-     - |red|
-     - Before 2021
-     - Before 2024
-
-.. admonition:: Legend
-
-    |green| Supported version
-
-    |red| End-of-support
-
-    N/A Never released for this platform
-
-.. important::
-   Even though we don't support older versions, you can always `upgrade from any version
-   <https://upgrade.odoo.com/>`_.
-
-.. |green| raw:: html
-
-   <span class="text-success" style="font-size: 32px; line-height: 0.5">●</span>
-
-.. |red| raw:: html
-
-   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>

content/administration/upgrade.rst

@@ -4,8 +4,8 @@ Upgrade
 
 An upgrade involves moving a database from an older version to a newer supported version (e.g., from
 Odoo 16.0 to Odoo 18.0). Regular upgrades are crucial as each version offers new features, bug
-fixes, and security patches. Using a :doc:`supported version <supported_versions>` is strongly
+fixes, and security patches. Using a :doc:`supported version <standard_extended_support>` is
-recommended. Each major version is supported for three years.
+strongly recommended. Each major version is supported for three years.
 
 Depending on the hosting type and Odoo version used, a database upgrade can be **mandatory**.
 
@@ -429,4 +429,4 @@ The following upgrade-related services are **not** included:
 
 .. seealso::
    - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <supported_versions>`
+   - :doc:`Supported Odoo versions <standard_extended_support>`

content/applications/finance/fiscal_localizations/belgium.rst

@@ -563,7 +563,7 @@ The Odoo POS system is certified for databases hosted on **Odoo Online**, **Odoo
 **On-Premise**.
 
 .. seealso::
-   :doc:`/administration/supported_versions`
+   :doc:`/administration/standard_extended_support`
 
 A `certified POS system <https://www.systemedecaisseenregistreuse.be/systemes-certifies>`_ must
 adhere to rigorous government regulations, which means it operates differently from a non-certified

content/applications/general/apps_modules.rst

@@ -45,8 +45,16 @@ app's card.
 Upgrade apps and modules
 ========================
 
+<<<<<<< 81aec5c2284d14cc6e91d6d097b0cdf62093b8a3
 With each :doc:`new Odoo release </administration/supported_versions>`, new improvements or app
 features are added. Upgrade the app to use these new improvements and features.
+||||||| cfa058587d9b70a32d9685e6521503dd5dd33577
+On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo
+</administration/supported_versions>`. To be able to use them, you must **upgrade** your app.
+=======
+On some occasions, new improvements or app features are added to :doc:`supported versions of Odoo
+</administration/standard_extended_support>`. To be able to use them, you must **upgrade** your app.
+>>>>>>> 84985b3b555c3cf7a146fd3f7cad031723651be1
 
 Go to :menuselection:`Apps` and then on the app to upgrade, click the :icon:`fa-ellipsis-v`
 :guilabel:`(vertical ellipsis)` icon and select :guilabel:`Upgrade`.

content/contributing.rst

@@ -31,10 +31,10 @@ lists the most important of them.
      - Anyone interested in Odoo
    * - Submit bug reports
      - Help improve the stability of Odoo by reporting the bugs that you discover in :doc:`supported
-       versions </administration/supported_versions>` directly to Odoo support. Make sure to include
+       versions </administration/standard_extended_support>` directly to Odoo support. Make sure to
-       as many details (version, environment, test scenario...) as possible. If you don't have the
+       include as many details (version, environment, test scenario...) as possible. If you don't
-       Odoo Enterprise license required for contacting the support, open a new issue on the GitHub
+       have the Odoo Enterprise license required for contacting the support, open a new issue on the
-       repository of Odoo.
+       GitHub repository of Odoo.
      - * `Odoo support <https://www.odoo.com/help>`_
        * `Issue tracker on GitHub <https://github.com/odoo/odoo/issues>`_
      - Users of Odoo

content/contributing/development.rst

@@ -103,9 +103,9 @@ Now that your environment is set up, you can start contributing to the codebase.
 navigate to the directory where you installed Odoo from sources and follow the guide below.
 
 #. Choose the version of Odoo to which you want to make changes. Keep in mind that contributions
-   targeting an :doc:`unsupported version of Odoo </administration/supported_versions>` are not
+   targeting an :doc:`unsupported version of Odoo </administration/standard_extended_support>` are
-   accepted. This guide assumes that the changes target Odoo {CURRENT_VERSION}, which corresponds to
+   not accepted. This guide assumes that the changes target Odoo {CURRENT_VERSION}, which
-   branch `{CURRENT_BRANCH}`.
+   corresponds to branch `{CURRENT_BRANCH}`.
 #. Create a new branch starting from branch {CURRENT_BRANCH}. Prefix the branch name with the base
    branch: `{CURRENT_BRANCH}-...`. If you work at Odoo, suffix the branch name with your Odoo
    handle: `{CURRENT_BRANCH}-...-xyz`.

content/contributing/documentation.rst

@@ -216,8 +216,8 @@ Contributing to the documentation
 
       #. Choose the version of the documentation to which you want to make changes. Keep in mind
          that contributions targeting an :doc:`unsupported version of Odoo
-         </administration/supported_versions>` are not accepted. This guide assumes that the changes
+         </administration/standard_extended_support>` are not accepted. This guide assumes that the
-         target the documentation of Odoo {CURRENT_VERSION}, which corresponds to branch
+         changes target the documentation of Odoo {CURRENT_VERSION}, which corresponds to branch
          `{CURRENT_BRANCH}`.
       #. Create a new branch starting from branch {CURRENT_BRANCH}. Prefix the branch name with the
          base branch: `{CURRENT_BRANCH}-...`. If you work at Odoo, suffix the branch name with your

redirects/17.0.txt

@@ -1,3 +1,7 @@
+# administration
+
+administration/supported_versions.rst administration/standard_extended_support.rst
+
 # administration/odoo_sh
 
 administration/odoo_sh/getting_started/first_module.rst administration/odoo_sh/first_module.rst