[MERGE] Forward-port 11.0 up to 21c4b5c

crm/acquire_leads.rst

@@ -1,5 +1,5 @@
 =============
-Acquire Leads
+Acquire leads
 =============
 
 .. toctree::

db_management/db_online.rst

@@ -24,14 +24,14 @@ Several actions are available:
 .. image:: media/db_buttons.png
     :align: center
 
-* Upgrade
+* :ref:`Upgrade <upgrade_button>`
     Upgrade your database to the latest Odoo version to enjoy cutting-edge
     features
 * :ref:`Duplicate <duplicate_online>`
     Make an exact copy of your database, if you want
     to try out new apps or new flows without compromising
     your daily operations
-* Rename
+* :ref:`Rename <rename_online_database>`
     Rename your database (and its URL)
 * **Backup**
     Download an instant backup of your database; note that we
@@ -45,6 +45,36 @@ Several actions are available:
     Access our `support page <https://www.odoo.com/help>`__
     with the correct database already selected
 
+.. _upgrade_button:
+
+Upgrade
+=======
+
+Make sure to be connected to the database you want to upgrade and access to the
+database management page. On the line of the database you want to upgrade, click
+on the "Upgrade" button.
+
+.. image:: media/upgrade1.png
+    :align: center
+
+By clicking on the "Test upgrade" button an upgrade request will be generated.
+If our automated system does not encounter any problem, you will receive a
+"Test" version of your upgraded database.
+
+.. image:: media/test_upgrade.png
+    :align: center
+
+.. note :: If our automatic system detect an issue during the creation of your
+    test database, our dedicated team will have to work on it. You will be
+    notified by email and the process will take up to 4 weeks.
+
+You will have the possibility to test it for 1 month. When you will be ready,
+and be sure that there are no problem compared to your actual version, you can
+click again on the Upgrade button, and confirm by clicking on Upgrade (the button
+with the little rocket!) to definitely switch to the upgraded version of Odoo.
+
+.. image:: media/upgrade.png
+    :align: center
 
 .. _duplicate_online:
 
@@ -87,6 +117,19 @@ database.
     .. image:: media/dup_expires.png
         :align: center
 
+.. _rename_online_database:
+
+Rename a Database
+===================
+
+To rename your database, make sure you are connected to the database you want
+to rename, access the `database management page <https://www.odoo.com/my/databases>`__
+and click **Rename**. You will have to give a new name to your database,
+then click **Rename Database**.
+
+.. image:: media/rename.png
+    :align: center
+
 .. _delete_online_database:
 
 Deleting a Database
@@ -119,5 +162,9 @@ reload automatically.
 .. note::
     * If you need to re-use this database name, it will be immediately available.
 
-    * If you want to delete your Account, please contact 
+    * It is not possible to delete a database if it is expired or linked
+      to a Subscription. In these cases contact
+      `Odoo Support <https://www.odoo.com/help>`__
+
+    * If you want to delete your Account, please contact
       `Odoo Support <https://www.odoo.com/help>`__

discuss/email_servers.rst

@@ -45,6 +45,8 @@ To do so you need to enable a SMTP relay and to allow *Any addresses*
 in the *Allowed senders* section. The configuration steps are explained in 
 `Google documentation <https://support.google.com/a/answer/2956491?hl=en>`__.
 
+.. _discuss-email_servers-spf-compliant:
+
 Be SPF-compliant
 ----------------
 In case you use SPF (Sender Policy Framework) to increase the deliverability 

inventory/settings/products/usage.rst

@@ -69,4 +69,3 @@ When you are selling several trays, you might wrap all the trays into a
 .. seealso::
     * :doc:`../../overview/start/setup`
     * :doc:`uom`
-    * :doc:`packages`

locale/zh_CN/LC_MESSAGES/helpdesk.po

@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-08 14:28+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Martin Trigaux, 2017\n"
+"Last-Translator: mrshelly <mrshelly@hotmail.com>, 2018\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,7 @@ msgstr ""
 
 #: ../../helpdesk/getting_started.rst:11
 msgid "Installing Odoo Helpdesk:"
-msgstr ""
+msgstr "安装 Odoo 服务台:"
 
 #: ../../helpdesk/getting_started.rst:13
 msgid "Open the Apps module, search for \"Helpdesk\", and click install"

odoo_sh/advanced/submodules.rst

@@ -22,7 +22,7 @@ and you have the control of the revision you want.
 It's up to you to decide whether you want to pin the submodule to a specific revision and when you want to update
 to a newer revision.
 
-In Odoo.sh, the submodules gives you the possibility to use and depend on modules available in other repositories.
+In Odoo.sh, the submodules give you the possibility to use and depend on modules available in other repositories.
 The platform will detect that you added modules through submodules in your branches
 and add them to your addons path automatically so you can install them in your databases.
 

odoo_sh/getting_started/branches.rst

@@ -203,17 +203,18 @@ The fetching is automatically stopped after 5 minutes. You can restart it using
 
 Backups
 -------
-A list of the backups available for download and restore, as well as the ability to import a database.
+A list of the backups available for download and restore, the ability to perform a manual backup and to import a
+database.
 
 .. image:: ./media/interface-branches-backups.png
    :align: center
 
-Odoo.sh keeps backups for production databases: 7 daily, 4 weekly and 3 monthly.
+Odoo.sh makes daily backups of the production database. It keeps 7 daily, 4 weekly and 3 monthly backups.
 Each backup includes the database dump, the filestore (attachments, binary fields), logs and sessions.
 
-Staging databases and development databases are not backed up..
-You nevertheless have the possibility to restore a backup of the production database on your staging databases, for
-testing purposes, or to manually recover data that has been deleted unexpectedly from the production database.
+Staging and development databases are not backed up.
+You nevertheless have the possibility to restore a backup of the production database in your staging branches, for
+testing purposes, or to manually recover data that has been deleted by accident from the production database.
 
 The list contains the backups kept on the server your production database is hosted on.
 This server only keeps one month of backups: 7 daily and 4 weekly backups.
@@ -221,6 +222,9 @@ This server only keeps one month of backups: 7 daily and 4 weekly backups.
 Dedicated backup servers keep the same backups, as well as 3 additional monthly backups.
 To restore or download one of these monthly backups, please `contact us <https://www.odoo.com/help>`_.
 
+You can make a backup manually before making big changes in your production database in case something goes wrong.
+To avoid abuse, we limit manual backups to 5 per day.
+
 The *import database* feature accepts database archives in the format provided by:
 
 * the standard Odoo databases manager,

odoo_sh/getting_started/builds.rst

@@ -117,4 +117,5 @@ in the dropdown menu of the *Connect* button.
 
 In the dropdown menu of the build, you can access the same features than in :ref:`the branches view <odoosh-gettingstarted-branches-tabs>`:
 *Logs*, *Web Shell*, *Outgoing e-mails*.
-You also have the possibility to *Download a dump* of the build's database.
+You also have the possibility to *Download a dump* of the build's database and for the production database only,
+you have the ability to *Make a test duplicate*.

odoo_sh/getting_started/settings.rst

@@ -156,6 +156,16 @@ You can use a third-party CDN such as *Cloudflare.com* to enable the *HTTPS* sup
 
 .. _odoosh-gettingstarted-settings-submodules:
 
+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.
+
 Submodules
 ==========
 

point_of_sale/overview/setup.rst

@@ -176,9 +176,9 @@ Image building process
 ----------------------
 
 We generate the official POSBox images using the scripts in
-https://github.com/odoo/odoo/tree/11.0/addons/point_of_sale/tools/posbox. More
+https://github.com/odoo/odoo/tree/8.0/addons/point_of_sale/tools/posbox. More
 specifically, we run 
-`posbox_create_image.sh <https://github.com/odoo/odoo/blob/11.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_.
+`posbox_create_image.sh <https://github.com/odoo/odoo/blob/8.0/addons/point_of_sale/tools/posbox/posbox_create_image.sh>`_.
 This builds an image
 called ``posbox.img``, which we zip and upload to `nightly.odoo.com <https://nightly.odoo.com>`_
 for users to download.
@@ -329,7 +329,7 @@ hardware drivers are implemented as Odoo modules. Those modules are
 all prefixed with ``hw_*`` and they are the only modules that are
 running on the POSBox. Odoo is only used for the framework it
 provides. No business data is processed or stored on the POSBox. The
-Odoo instance is a shallow git clone of the ``11.0`` branch.
+Odoo instance is a shallow git clone of the ``8.0`` branch.
 
 The root partition on the POSBox is mounted read-only, ensuring that
 we don't wear out the SD card by writing to it too much. It also

portal/my_odoo_portal.rst

@@ -0,0 +1,116 @@
+
+:banner: banners/my_odoo_portal.jpg
+
+==============
+My Odoo Portal
+==============
+
+In this section of the portal you will find all the communications between you
+and Odoo, documents such Quotations, Sales Orders, Invoices and your Subscriptions.
+
+.. note :: To access this section you have to log with your username and password
+    to `Odoo <https://www.odoo.com/my/home>`__ . If you are already logged-in just
+    click on your name on the top-right corner and select "My Account".
+
+
+.. image:: media/my_portal.png
+    :align: center
+
+Quotations
+==========
+
+Here you will find all the quotations sent to you by Odoo. For example, a
+quotation can be generated for you after adding an Application or a User to your
+database or if your contract has to be renewed.
+
+.. image:: media/quotations.png
+    :align: center
+
+The *Valid Until* column shows until when the quotation is valid; after that date
+the quotation will be "Expired". By clicking on the quotation you will see all
+the details of the offer, the pricing and other useful information.
+
+.. image:: media/quotation_accept.png
+    :align: center
+
+If you want to accept the quotation just click "Accept & Pay" and the quote
+will get confirmed. If you don't want to accept it, or you need to ask for some
+modifications, click on "Ask Changes Reject".
+
+Sales Orders
+============
+
+All your purchases within Odoo such as Upsells, Themes, Applications, etc.
+will be registered under this section.
+
+.. image:: media/sales.png
+    :align: center
+
+By clicking on the sale order you can review the details of the products purchased
+and process the payment.
+
+Invoices
+========
+
+All the invoices of your subscription(s), or generated by a sales order, will be
+shown in this section. The tag before the Amount Due will indicate you if the
+invoice has been paid.
+
+.. image:: media/invoices.png
+    :align: center
+
+Just click on the Invoice if you wish to see more information, pay the invoice
+or download a PDF version of the document.
+
+Tickets
+=======
+
+When you submit a ticket through `Odoo Support <https://www.odoo.com/help>`__
+a ticket will be created. Here you can find all the tickets that you have opened,
+the conversation between you and our Agents, the Status of the ticket and the ID
+(# Ref).
+
+.. image:: media/tickets.png
+    :align: center
+
+Subscriptions
+=============
+
+You can access to your Subscription with Odoo from this section. The first page
+shows you the subscriptions that you have and their status.
+
+.. image:: media/subscriptionstatus.png
+    :align: center
+
+By clicking on the Subscription you will access to all the details regarding your
+plan: this includes the number of applications purchased, the billing information
+and the payment method.
+
+To change the payment method click on "Change Payment Method" and enter the new
+credit card details.
+
+.. image:: media/changemethod.png
+    :align: center
+
+If you want to remove the credit cards saved, you can do it by clicking on
+"Manage you payment methods" at the bottom of the page. Click then on "Delete" to
+delete the payment method.
+
+.. image:: media/managepayment.png
+    :align: center
+
+.. warning :: At the date of the next invoice, if there is no payment
+    information provided or if your credit card has expired, the status of your
+    subscription will change to "To Renew".  You will then have 7 days to
+    provide a valid method of payment. After this delay, the subscription will
+    be closed and you will no longer be able to access the database.
+
+Success Packs
+=============
+With a Success Pack/Partner Success Pack, you are assigned an expert to provide
+unique personalized assistance to help you customize your solution and optimize
+your workflows as part of your initial implementation. These hours never expire
+allowing you to utilize them whenever you need support.
+
+.. seealso ::
+    If you need information about how to manage your database see :ref:`db_online`

practical.rst

@@ -10,4 +10,5 @@ Practical Information
    db_management/documentation
    db_management/db_online
    db_management/db_premise
+   portal/my_odoo_portal
    legal

project/advanced.rst

@@ -6,5 +6,4 @@ Advanced
    :titlesonly:
 
    advanced/so_to_task
-   advanced/claim_issue
    advanced/feedback

project/advanced/claim_issue.rst

@@ -1,97 +0,0 @@
-============================================
-How to use projects to handle claims/issues?
-============================================
-
-A company selling support services often has to deal with problems
-occurring during the implementation of the project. These issues have to
-be solved and followed up as fast as possible in order to ensure the
-deliverability of the project and a positive customer satisfaction.
-
-For example, as an IT company offering the implementation of your
-software, you might have to deal with customers emails experiencing
-technical problems. Odoo offers the opportunity to create dedicated
-support projects which automatically generate tasks upon receiving an
-customer support email. This way, the issue can then be assigned
-directly to an employee and can be closed more quickly.
-
-Configuration
-=============
-
-The following configuration are needed to be able to use projects for
-support and issues. You need to install the **Project management** and the
-**Issue Tracking** modules.
-
-.. image:: media/claim_issue01.png
-    :align: center
-
-.. image:: media/claim_issue02.png
-    :align: center
-
-Create a project 
-=================
-
-The first step in order to set up a claim/issue management system is to
-create a project related to those claims. Let's start by simply creating
-a **support project**. Enter the Project application dashboard, click on
-create and name your project **Support**. Tick the **Issues** box and rename
-the field if you want to customize the Issues label (e.g. **Bugs** or
-**Cases**). As issues are customer-oriented tasks, you might want to set
-the Privacy/Visibility settings to **Customer project** (therefore your
-client will be able to follow his claim in his portal).
-
-.. note::
-    You can link the project to a customer if the project has been 
-    created to handle a specific client issues, otherwise you can 
-    leave the field empty.
-
-.. image:: media/claim_issue03.png
-    :align: center
-
-Invite followers
-----------------
-
-You can decide to notify your employees as soon as a new issue will be
-created. On the **Chatter** (bottom of the screen), you will notice two
-buttons on the right : **Follow** (green) and **No follower** (white). Click on
-the first to receive personally notifications and on the second to add
-others employees as follower of the project (see screenshot below).
-
-.. image:: media/claim_issue04.png
-    :align: center
-
-Set up your workflow
---------------------
-
-You can easily personalize your project stages to suit your workflow by
-creating new columns. From the Kanban view of your project, you can add
-stages by clicking on **Add new column** (see image below). If you
-want to rearrange the order of your stages, you can easily do so by
-dragging and dropping the column you want to move to the desired
-location. You can also edit, fold or unfold anytime your stages by using
-the **setting** icon on your desired stage.
-
-.. image:: media/claim_issue05.png
-    :align: center
-
-Generate issues from emails
-===========================
-
-When your project is correctly set up and saved, you will see it
-appearing in your dashboard. Note that an email address for that project
-is automatically generated, with the name of the project as alias.
-
-.. image:: media/claim_issue06.png
-    :align: center
-
-.. note:: 
-    If you cannot see the email address on your project, go to the menu
-    :menuselection:`Settings --> General Settings` and configure your 
-    alias domain. Hit **Apply** and go back to your **Projects** dashboard 
-    where you will now see the email address under the name of your project.
-
-Every time one of your client will send an email to that email address,
-a new issue will be created.
-
-.. seealso::
-    * :doc:`../configuration/setup`
-    * :doc:`../configuration/collaboration`

website/optimize/seo.rst

@@ -231,15 +231,8 @@ the Configuration menu. Here is an example of configuration you can use:
 HTML Pages
 ----------
 
-Odoo allows to minify HTML pages, from the **Website Admin** app, using
-the :menuselection:`Configuration` menu. This will automatically remove extra space and
-tabs in your HTML code, reduce some tags code, etc.
-
-.. image:: media/seo07.png
-  :align: center
-
-On top of that, the HTML pages can be compressed, but this is usually
-handled by your web server (NGINX or Apache).
+The HTML pages can be compressed, but this is usually handled by your web
+server (NGINX or Apache).
 
 The Odoo Website builder has been optimized to guarantee clean and short
 HTML code. Building blocks have been developed to produce clean HTML