[MERGE] Forward port of 11.0 to 12.0

accounting/overview/main_concepts/in_odoo.rst

@@ -65,8 +65,6 @@ In particular, Odoo's core accounting engine supports:
   sold/delivered.
 * European accounting where expenses are accounted at the supplier
   bill.
-* Storno accounting (Italy) where refund invoices have negative
-  credit/debit instead of a reverting the original journal items.
 
 Odoo also have modules to comply with IFRS rules.
 

odoo_sh/getting_started/branches.rst

@@ -28,7 +28,7 @@ You can change the stage of a branch by drag and dropping it on the stage sectio
 
 Production
 ----------
-This is the branch holding the code on which your production database run.
+This is the branch holding the code on which your production database runs.
 There can be only one production branch.
 
 When you push a new commit in this branch,
@@ -59,26 +59,24 @@ will automatically be set back to the development stage after 30 days.
 
 Staging
 -------
-Staging branches are meant to test your new features using the production data.
+Staging branches are meant to test your new features using the production data without compromising
+the actual production database with test records. They will create databases that are neutralized
+duplicates of the production database.
 
-Pushing a new commit in one of these branches will either
+The neutralization includes:
-* start a new server, using a duplicate of the production database and the new revision of the branch
-* or update the previous database running on the branch,
-depending on the push behaviour configured in the :ref:`branch's settings <odoosh-gettingstarted-branches-tabs-settings>`.
 
-You can therefore test your latest features using the production data without compromising the actual
+* Disabling scheduled actions. If you want to test them, you can trigger their action manually or
-production database with test records.
+  re-enable them. Be aware that the platform will trigger them less often if no one is using the
+  database in order to save up resources.
+* Disabling outgoing emails by intercepting them with a mailcatcher. An
+  :ref:`interface to view <odoosh-gettingstarted-branches-tabs-mails>` the emails sent by your
+  database is provided. That way, you do not have to worry about sending test emails to your contacts.
+* Setting payment acquirers and shipping providers in test mode.
+* Disabling IAP services
 
-The outgoing emails are not sent: They are intercepted by the mailcatcher,
+The latest database will be kept alive indefinitely, older ones from the same branch may get garbage collected
-which provides an interface to preview the emails sent by your database.
+to make room for new ones. It will be valid for 3 months, after which you will be expected to rebuild the branch.
-That way, you do not have to worry about sending test emails to your contacts.
+If you make configuration or view changes in these databases, make sure to document them or write them directly
-
-Scheduled actions are disabled. If you want to test them, you have to enable them or trigger their action manually.
-Be careful though: If these actions perform changes on third-party services (FTP servers, email servers, ...)
-used by your production database as well, you might cause unwanted changes in your production.
-
-The latest database will be kept alive indefinitely, older ones may get garbage collected automatically.
-If you make configuration changes or view changes in these branches, make sure to document them or write them directly
 in the modules of the branch, using XML data files overriding the default configuration or views.
 
 The unit tests are not performed as, in Odoo, they currently rely on the demo data, which is not loaded in the
@@ -89,18 +87,20 @@ Odoo.sh will then consider running the tests on staging databases.
 Development
 -----------
 Development branches create new databases using the demo data to run the unit tests.
-The modules installed and tested by default are the ones included in your branches.
+The installed modules are the ones included in your branches. You can change this list of modules
-You can change this list of modules to install in your projects settings.
+to install in your :ref:`project Settings <odoosh-gettingstarted-settings-modules-installation>`.
 
 When you push a new commit in one of these branches,
 a new server is started, with a database created from scratch and the new revision of the branch.
-The demo data is loaded, and the unit tests are performed.
+The demo data is loaded, and the unit tests are performed by default.
-This verifies your changes do not break any of the features tested by them.
+This verifies your changes do not break any of the features tested by them. If you wish, you can
+disable the tests in the :ref:`branch's settings <odoosh-gettingstarted-branches-tabs-mails>`.
 
-Similar to staging branches, the emails are not sent: They are intercepted by the mailcatcher.
+Similar to staging branches, the emails are not sent but are intercepted by a mailcatcher and
+scheduled actions are not triggered as often is the database is not in use.
 
 The databases created for development branches are meant to live around three days.
-After that, they can be garbage collected automatically.
+After that, they can be garbage collected to make room for new databases.
 
 .. _odoosh-gettingstarted-branches-mergingbranches:
 
@@ -163,6 +163,8 @@ It can provide information about the ongoing operation on the database (installa
 or its result (tests feedback, successful backup import, ...).
 When an operation is successful, you can access the database thanks to the *connect* button.
 
+.. _odoosh-gettingstarted-branches-tabs-mails:
+
 Mails
 -----
 This tab contains the mail catcher. It displays an overview of the emails sent by your database.
@@ -212,7 +214,8 @@ Different logs are available:
 * install.log: The logs of the database installation. In a development branch, the logs of the tests are included.
 * pip.log: The logs of the Python dependencies installation.
 * odoo.log: The logs of the running server.
-* update.log: The logs of the database updates. This is available only for the production database.
+* update.log: The logs of the database updates.
+* pg_long_queries.log: The logs of psql queries that take an unusual amount of time.
 
 If new lines are added in the logs, they will be displayed automatically.
 If you scroll to the bottom, the browser will scroll automatically each time a new line is added.
@@ -259,30 +262,90 @@ Settings
 --------
 Here you can find a couple of settings that only apply to the currently selected branch.
 
-.. image:: ./media/interface-branches-settings.png
+.. image:: ./media/interface-branches-settings.jpg
    :align: center
 
-**Mute Branch**
+**Behaviour upon new commit**
 
-You have the possibility to mute a branch, so that new commits won't trigger builds on Odoo.sh. You can activate this
+For development and staging branches, you can change the branch's behavior upon receiving a new
-should you have branches that are used for other purposes than on Odoo.sh. By default, when creating a project from an
+commit. By default, a development branch will create a new build and a staging branch will update
-existing repository, all branches except the default branch are muted.
+the previous build (see the :ref:`Production Stage <stage_production>`). This is especially useful
+should the feature you're working on require a particular setup or configuration, to avoid having
+to manually set it up again on every commit. If you choose new build for a staging branch, it will
+make a fresh copy from the production build every time a commit is pushed. A branch that is put
+back from staging to development will automatically be set to 'Do nothing'.
 
-**Push Behavior**
+**Test suite**
 
-You can change the branch's behavior upon receiving a new commit. By default, it will create a new build, but you can
+For development branches, you can choose to enable or disable the test suite. It's enabled by default.
-choose to have it update your previous build same as for your production branch (see the
-:ref:`Production Stage <stage_production>`). This is especially useful should the feature you're working on require a
-particular setup or configuration, to avoid having to manually set it up again on every commit.
 
 **Odoo Version**
 
 For development branches only, you can change the version of Odoo, should you want to test upgraded code or develop
 features while your production database is in the process of being upgraded to a newer version.
 
-The production branch has no settings. It can't be muted, will always update the existing production database and will
+In addition, for each version you have two options regarding the code update. 
-run on the project's version of Odoo. If you want to upgrade your production to a newer version please refer to the
+
-:ref:`Upgrade section <odoosh-advanced-upgrade_your_database>`.
+* You can choose to benefit from the latest bug, security and performance fixes automatically. The
+  sources of your Odoo server will be updated weekly. This is the 'Latest' option.
+* You can choose to pin the Odoo sources to a specific revision by selecting them from a list of
+  dates. Revisions will expire after 3 months. You will be notified by mail when the expiration
+  date approaches and if you don't take action afterwards, you will automatically be set to the
+  latest revision.
+
+**Custom domains**
+
+Here you can configure additional domains for the selected branch. It's possible to add other
+*<name>.odoo.com* domains or your own custom domains. For the latter you have to:
+
+* own or purchase the domain name,
+* add the domain name in this list,
+* in your registrar's domain name manager,
+  configure the domain name with a ``CNAME`` record set to your production database domain name.
+
+For instance, to associate *www.mycompany.com* to your database *mycompany.odoo.com*:
+
+* in Odoo.sh, add *www.mycompany.com* in the custom domains of your project settings,
+* in your domain name manager (e.g. *godaddy.com*, *gandi.net*, *ovh.com*),
+  configure *www.mycompany.com* with a ``CNAME`` record with as value *mycompany.odoo.com*.
+
+Bare domains (e.g. *mycompany.com*) are not accepted:
+
+* they can only be configured using ``A`` records,
+* ``A`` records only accept IP addresses as value,
+* the IP address of your database can change, following an upgrade, a hardware failure or
+  your wish to host your database in another country or continent.
+
+Therefore, bare domains could suddenly no longer work because of this change of IP address.
+
+In addition, if you would like both *mycompany.com* and *www.mycompany.com* to work with your database,
+having the first redirecting to the second is amongst the
+`SEO best practices <https://support.google.com/webmasters/answer/7451184?hl=en>`_
+(See *Provide one version of a URL to reach a document*)
+in order to have one dominant URL. You can therefore just configure *mycompany.com* to redirect to *www.mycompany.com*.
+Most domain managers have the feature to configure this redirection. This is commonly called a web redirection.
+
+**HTTPS/SSL**
+
+If the redirection is correctly set up, the platform will automatically generate an SSL certificate
+with `Let's Encrypt <https://letsencrypt.org/about/>`_ within the hour and your domain will be
+accessible through HTTPS.
+
+While it is currently not possible to configure your own SSL certificates on the Odoo.sh platform
+we are considering the feature if there is enough demand.
+
+
+**SPF and DKIM compliance**
+
+In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM
+(DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name
+settings to increase the deliverability of your outgoing emails.
+The configuration steps are explained in the :ref:`Discuss app documentation <discuss-email_servers-spf-compliant>`.
+
+.. Warning::
+  Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the
+  delivery of your emails as spam in your contacts inbox.
+
 
 Shell commands
 ==============

odoo_sh/getting_started/settings.rst

@@ -7,7 +7,7 @@ Settings
 Overview
 ========
 
-The settings allows you to manage the configuration of your project.
+The settings allow you to manage the configuration of your project.
 
 .. image:: ./media/interface-settings.png
    :align: center
@@ -56,7 +56,7 @@ In addition, they cannot use the webshell nor have access to the server logs.
 +---------------------+-----------------+-----------+-----------+
 |                     | Logs            |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
-|                     | Shell           |     X     |     X     |
+|                     | Shell/SSH       |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
 |                     | Mails           |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
@@ -68,7 +68,7 @@ In addition, they cannot use the webshell nor have access to the server logs.
 +---------------------+-----------------+-----------+-----------+
 |                     | Logs            |           |     X     |
 +---------------------+-----------------+-----------+-----------+
-|                     | Shell           |           |     X     |
+|                     | Shell/SSH       |           |     X     |
 +---------------------+-----------------+-----------+-----------+
 |                     | Mails           |           |     X     |
 +---------------------+-----------------+-----------+-----------+
@@ -95,6 +95,8 @@ In addition, visitors have access to the logs, shell and mails of your developme
 
 Production and staging builds are excluded, visitors can only see their status.
 
+.. _odoosh-gettingstarted-settings-modules-installation:
+
 Modules installation
 ====================
 
@@ -110,64 +112,14 @@ Choose the modules to install automatically for your development builds.
 * *Install a list of modules* will install the modules specified in the input just below this option.
   The names are the technical name of the modules, and they must be comma-separated.
 
-All installed modules will be tested.
+If the tests are enabled, the standard Odoo modules suite can take up to 1 hour.
-The tests in the standard Odoo modules suite can take up to 1 hour.
 This setting applies to development builds only.
 Staging builds duplicate the production build and the production build only installs base.
 
 Custom domains
 ==============
 
-Configure your own domain name.
+To configure additional domains please refer to the corresponding branch's :ref:`settings tab <odoosh-gettingstarted-branches-tabs-settings>`.
-
-.. image:: ./media/interface-settings-customdomains.png
-   :align: center
-
-If you would like to access your production database using your own domain name, you have to:
-
-* own or purchase the domain name,
-* add the domain name in this list,
-* in your registrar's domain name manager,
-  configure the domain name with a ``CNAME`` record set to your production database domain name.
-
-For instance, to associate *www.mycompany.com* to your database *mycompany.odoo.com*:
-
-* in Odoo.sh, add *www.mycompany.com* in the custom domains of your project settings,
-* in your domain name manager (e.g. *godaddy.com*, *gandi.net*, *ovh.com*),
-  configure *www.mycompany.com* with a ``CNAME`` record with as value *mycompany.odoo.com*.
-
-Bare domains (e.g. *mycompany.com*) are not accepted:
-
-* they can only be configured using ``A`` records,
-* ``A`` records only accept IP addresses as value,
-* the IP address of your database can change, following an upgrade, a hardware failure or
-  your wish to host your database in another country or continent.
-
-Therefore, bare domains could suddenly no longer work because of this change of IP address.
-
-In addition, if you would like both *mycompany.com* and *www.mycompany.com* to work with your database,
-having the first redirecting to the second is amongst the
-`SEO best practices <https://support.google.com/webmasters/answer/7451184?hl=en>`_
-(See *Provide one version of a URL to reach a document*)
-in order to have one dominant URL. You can therefore just configure *mycompany.com* to redirect to *www.mycompany.com*.
-Most domain managers have the feature to configure this redirection. This is commonly called a web redirection.
-
-HTTPS/SSL
----------
-
-If the redirection is correctly set up, the platform will automatically generate an SSL certificate with `Let's Encrypt <https://letsencrypt.org/about/>`_ within the hour and your domain will be accessible through HTTPS.
-
-While it is currently not possible to configure your own SSL certificates on the Odoo.sh platform we are considering the feature.
-
-SPF and DKIM compliance
------------------------
-In case the domain of your users email address uses SPF (Sender Policy Framework) or DKIM (DomainKeys Identified Mail)
-to increase the deliverability of your outgoing emails,
-don't forget to authorize Odoo as a sending host in your domain name settings.
-The configuration steps are explained in the :ref:`Discuss app documentation <discuss-email_servers-spf-compliant>`.
-
-.. Warning::
-  Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the delivery of your emails as spam in your contacts inbox.
 
 .. _odoosh-gettingstarted-settings-submodules:
 
@@ -185,12 +137,12 @@ as submodules in your branches to allow Odoo.sh to download them.
 .. image:: ./media/interface-settings-submodules.png
    :align: center
 
-When a repository is private, this is not possible to publicly download its branches and revisions.
+When a repository is private, it is not possible to publicly download its branches and revisions.
 For that reason, you need to configure a deploy key for Odoo.sh,
 so the remote Git server allows our platform to download the revisions
 of this private repository.
 
-To configure the deploy key for a private repository, proceed as follow:
+To configure the deploy key for a private repository, proceed as follows:
 
 * in the input, paste the SSH URL of your private sub-repository and click on *Add*,
 
@@ -216,35 +168,34 @@ This section shows a small description of the storage size used by your project.
 .. image:: ./media/interface-settings-storage.png
    :align: center
 
-If your production database exceeds 4 GB, you will automatically be billed on the subscription activating the project with the excess size.
+Should your production database size grow to exceed what's provisioned in your subscription, it
+will automatically be synchronized with it.
 
 Database Workers
 ================
 
-Additional database workers can be configured here. More workers help increase the load your production database is able to handle.
+Additional database workers can be configured here. More workers help increase the load your
+production database is able to handle. If you add more, it will automatically be synchronized
+with your subscription.
 
 .. image:: ./media/interface-settings-workers.png
    :align: center
 
 .. Warning::
-  Adding more workers will not magically solve all performance issues. It mainly allows the server to handle more connections at the same time.
+  Adding more workers will not magically solve all performance issues. It only allows the server
+  to handle more connections at the same time. If some operations are unusually slow, it's most
+  likely a problem with the code, if it's not due to your own customizations you can open a ticket
+  `here <https://www.odoo.com/help>`_.
 
 Staging Branches
 ================
 
-Additional staging branches allow you to develop and test more features at the same time.
+Additional staging branches allow you to develop and test more features at the same time. If you
+add more, it will automatically be synchronized with your subscription.
 
 .. image:: ./media/interface-settings-staging-branches.png
    :align: center
 
-Odoo Source Code
-================
-
-Lists the source code's revisions of your production database. Useful if you need to know if a recent bugfix has already been deployed or not.
-
-.. image:: ./media/interface-settings-source-code.png
-   :align: center
-
 Activation
 ==========