[ADD] odoo_sh: new pricing options

odoo_sh/getting_started/branches.rst

@@ -54,12 +54,17 @@ You still have access to the log of the failed update, so you can troubleshoot i
 The demo data is not loaded, as it is not meant to be used in a production database.
 The unit tests are not performed, as it would increase the unavailabity time of the production database during the updates.
 
+Partners using trial projects should be aware their production branch, along with all the staging branches,
+will automatically be set back to the development stage after 15 days.
+
 Staging
 -------
 Staging branches are meant to test your new features using the production data.
 
-When you push a new commit in one of these branches,
+Pushing a new commit in one of these branches will either
-a new server is started, using a duplicate of the production database and the new revision of the branch.
+* 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
 production database with test records.
@@ -70,11 +75,9 @@ That way, you do not have to worry about sending test emails to your contacts.
 
 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,
+used by your production database as well, you might cause unwanted changes in your production.
-you might cause unwanted changes in your production.
 
-The databases created for staging branches are meant to live around two weeks.
+The latest database will be kept alive indefinitely, older ones may get garbage collected automatically.
-After that, they can be 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.
 
@@ -235,6 +238,8 @@ The *import database* feature accepts database archives in the format provided b
 * the Odoo.sh backup download button of this *Backups* tab,
 * the Odoo.sh dump download button in the :ref:`Builds view <odoosh-gettingstarted-builds>`.
 
+.. _odoosh-gettingstarted-branches-tabs-settings:
+
 Settings
 --------
 Here you can find a couple of settings that only apply to the currently selected branch.

odoo_sh/getting_started/create.rst

@@ -47,11 +47,11 @@ Then, choose a name or select the repository you want to use.
 
 Choose the Odoo version you want to use. If you plan to import an existing database or an existing set of applications, you might need to choose the according version. If you start from scratch, use the latest version.
 
-Enter your *subscription code*. This is also called *subscription referral* or *contract number*.
+Enter your *subscription code*. This is also called *subscription referral*, *contract number* or *activation code*.
 
-For partners, Odoo.sh is free. If the free offer changes in the future, we guarantee that any project created under this offer will remain free for the same set of features.
+It should be the code of your Enterprise subscription that includes Odoo.sh.
 
-For customers, your Enterprise subscription needs to include Odoo.sh.
+Partners can use their partnership codes to start a trial. Should their clients start a project, they ought to get an Enterprise subscription including Odoo.sh and use its subscription code. The partner will get the full amount as back commission.
 Contact your sales representative or account manager in order to get it.
 
 When submitting the form, if you are notified your subscription is not valid, it either means:
@@ -69,7 +69,7 @@ In case of doubt with your subscription, please contact the `Odoo support <https
 You're done !
 =============
 
-You can begin to use Odoo.sh. Your first build is about to be created. You will soon be able to connect to your first database.
+You can start using Odoo.sh. Your first build is about to be created. You will soon be able to connect to your first database.
 
 .. image:: ./media/deploy-done.png
    :align: center

odoo_sh/getting_started/settings.rst

@@ -58,6 +58,8 @@ In addition, they cannot use the webshell nor have access to the server logs.
 +---------------------+-----------------+-----------+-----------+
 |                     | Mails           |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
+|                     | Settings        |     X     |     X     |
++---------------------+-----------------+-----------+-----------+
 |Production & Staging | History         |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
 |                     | 1-click connect |           |     X     |
@@ -68,6 +70,10 @@ In addition, they cannot use the webshell nor have access to the server logs.
 +---------------------+-----------------+-----------+-----------+
 |                     | Mails           |           |     X     |
 +---------------------+-----------------+-----------+-----------+
+|                     | Backups         |           |     X     |
++---------------------+-----------------+-----------+-----------+
+|                     | Settings        |     X     |     X     |
++---------------------+-----------------+-----------+-----------+
 |Status               |                 |     X     |     X     |
 +---------------------+-----------------+-----------+-----------+
 |Settings             |                 |           |     X     |
@@ -202,3 +208,48 @@ To configure the deploy key for a private repository, proceed as follow:
   * Bitbucket.com: :menuselection:`Settings --> Access keys --> Add key`
   * Gitlab.com: :menuselection:`Settings --> Repository --> Deploy Keys`
   * Self-hosted: append the key to the git user’s authorized_keys file in its .ssh directory
+
+Storage Size
+============
+
+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.
+
+Database Workers
+================
+
+Additional database workers can be configured here. More workers help increase the load your production database is able to handle.
+
+.. 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.
+
+Staging Branches
+================
+
+Additional staging branches allow you to develop and test more features at the same time.
+
+.. 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
+==========
+
+Shows the status of the project's activation. You can change the project's activation code if needed.
+
+.. image:: ./media/interface-settings-activation.png
+   :align: center