[MERGE] Forward-port of 11.0 up to 00d5bd76d7

accounting/others/reporting/customize.rst

@@ -5,9 +5,10 @@ How to create a customized reports with your own formulas?
 Overview
 ========
 
-Odoo 9 comes with a powerful and easy-to-use reporting framework.
-Creating new reports (such as a tax report or a balance sheet for a
-specific country) to suit your needs is now easier than ever.
+Odoo 12 comes with a powerful and easy-to-use reporting framework.
+Creating new reports (such as a tax report or a balance sheet or
+income statement with specific groupings and layout ) to suit your
+needs is now easier than ever.
 
 Activate the developer mode
 ===========================
@@ -33,21 +34,21 @@ First, you need to create your financial report. To do that, go to
 .. image:: media/customize02.png
    :align: center
 
-Once the name is filled, there are two other parameters that need to be
+Once the name is entered, there are two other parameters that need to be
 configured:
 
 -  **Show Credit and Debit Columns**
 
 -  **Analysis Period** :
 
-   -  Based on date ranges (eg Profit and Loss)
+   -  Based on date ranges (e.g. Profit and Loss)
 
-   -  Based on a single date (eg Balance Sheet)
+   -  Based on a single date (e.g. Balance Sheet)
 
    -  Based on date ranges with 'older' and 'total' columns and last 3
-      months (eg. Aged Partner Balances)
+      months (e.g. Aged Partner Balances)
 
-   -  Bases on date ranges and cash basis method (eg Cash Flow
+   -  Bases on date ranges and cash basis method (e.g. Cash Flow
       Statement)
 
 Add lines in your custom reports
@@ -95,4 +96,4 @@ Other useful fields :
    (always displayed) or ``never`` (never shown).
 
 .. seealso::
-    * :doc:`main_reports`
+    * :doc:`main_reports`

ecommerce/shopper_experience/paypal.rst

@@ -97,6 +97,9 @@ Click *More Options* and set the two default encoding formats as
 
 Your Paypal account is ready!
 
+  .. tip:: For Encrypted Website Payments & EWP_SETTINGS error,
+     please check the `paypal documentation. <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/encryptedwebpayments/#encrypted-website-payments-ewp>`__
+
 Settings in Odoo
 ================
 

inventory/barcode/setup/hardware.rst

@@ -26,13 +26,13 @@ scanner** and the **mobile computer scanner**.
     is a good choice if you want to be mobile but don't need a big
     investment. An approach is to log in Odoo on you smartphone, pair
     the bluetooth scanner with the smartphone and work in the
-    warehouse with always the possibility to check your smartphone
+    warehouse with the possibility to check your smartphone
     from time to time and use the software 'manually'.
 
 -   For heavy use, the **mobile computer scanner** is the handiest solution.
-    It consists in a small computer with a built-in barcode scanner.
+    It consists of a small computer with a built-in barcode scanner.
     This one can turn out to be a very productive solution, however
-    you need to make sure that is is capable of running Odoo smoothy.
+    you need to make sure that is is capable of running Odoo smoothly.
     The most recent models using Android + Google Chrome or Windows +
     Internet Explorer Mobile should do the job. However, due to the
     variety of models and configurations on the market, it is

inventory/management/delivery/scheduled_dates.rst

@@ -81,7 +81,7 @@ numbers of security days from the calculation and thus to compute a
 scheduled date earlier than the one you promised to your client. In that
 way you are sure to be able to keep your commitment.
 
-To set ut your security dates, go to :menuselection:`Settings --> General settings` and
+To set up your security dates, go to :menuselection:`Settings --> General settings` and
 click on **Configure your company data**.
 
 .. image:: media/scheduled_dates04.png

inventory/management/lots_serial_numbers/serial_numbers.rst

@@ -66,7 +66,7 @@ numbers.
    :align: center
 
 If you move products that already have serial numbers assigned, those
-will appear in the list. Just click on the **+** icon to to confirm that you
+will appear in the list. Just click on the **+** icon to confirm that you
 are moving those serial numbers.
 
 .. image:: media/serial_numbers05.png
@@ -126,4 +126,4 @@ You can have more details by clicking on the **Traceability** button :
 
 .. seealso::
     * :doc:`differences`
-    * :doc:`lots`
+    * :doc:`lots`

inventory/routes/concepts/procurement_rule.rst

@@ -43,14 +43,14 @@ In the Procurement rules section, click on Add an item.
     :align: center
 
 Here you can set the conditions of your rule. There are 3 types of
-action possibles :
+action possible :
 
 -   Move from another location rules
 
 -   Manufacturing rules that will trigger the creation of manufacturing
-    orders.
+    orders
 
--   Buy rules that will trigger the creation of purchase orders.
+-   Buy rules that will trigger the creation of purchase orders
 
 .. note:: 
     The Manufacturing application has to be installed in order to
@@ -74,4 +74,4 @@ action possibles :
 .. seealso::
     * :doc:`push_rule`
     * :doc:`inter_warehouse`
-    * :doc:`cross_dock`
+    * :doc:`cross_dock`

inventory/routes/concepts/push_rule.rst

@@ -13,7 +13,7 @@ meet the forecast demand and sell, or push, the goods to the consumer.
 Disadvantages of the push inventory control system are that forecasts
 are often inaccurate as sales can be unpredictable and vary from one
 year to the next. Another problem with push inventory control systems is
-that if too much product is left in inventory. This increases the
+that if too much product is left in inventory, this increases the
 company's costs for storing these goods. An advantage to the push system
 is that the company is fairly assured it will have enough product on
 hand to complete customer orders, preventing the inability to meet
@@ -82,4 +82,4 @@ be moved to the main stock.
 .. seealso::
     * :doc:`procurement_rule`
     * :doc:`inter_warehouse`
-    * :doc:`cross_dock`
+    * :doc:`cross_dock`

inventory/routes/strategies/removal.rst

@@ -124,7 +124,7 @@ These dates can be set from :menuselection:`Inventory Control --> Serial Numbers
 
 -   **Removal Date:** This is the date on which the goods with this
     serial/lot number should be removed from the stock. Using the FEFO
-    removal strategym goods are picked for delivery orders using this date.
+    removal strategy goods are picked for delivery orders using this date.
 
 -   **Alert Date:** This is the date on which an alert should be sent
     about the goods with this serial/lot number.

inventory/settings/products/uom.rst

@@ -7,7 +7,7 @@ Overview
 
 In some cases, handling products in different unit of measures is
 necessary. For example, if you buy products in a country where the
-metric system is of application and sell the in a country where the
+metric system is of application and sell them in a country where the
 imperial system is used, you will need to convert the units.
 
 You can set up Odoo to work with different units of measure for one
@@ -26,7 +26,7 @@ different units of measure (advanced)**, then click on **Apply**.
 Setting up units on your products
 =================================
 
-In :menuselection:`Inventory Control --> Products`, open the product which you would like to
+In :menuselection:`Master Data --> Products`, open the product which you would like to
 change the purchase/sale unit of measure, and click on **Edit**.
 
 In the **Unit of Measure** section, select the unit in which the product
@@ -126,4 +126,4 @@ converted automatically :
     -  When should you use packages, units of measure or kits?
 
 
-.. |edit| image:: ./media/uom07.png
+.. |edit| image:: ./media/uom07.png

inventory/shipping/operation/invoicing.rst

@@ -61,8 +61,8 @@ On your sale order, choose the carrier that will be used. Click on
 The price is computed when you **save** the sale order. Confirm the sale
 order and proceed to deliver the product.
 
-The real shipping cost are computed when the delivery order is
-validated.
+The real shipping cost is computed when the delivery order is
+validated, you can see the real cost in the chatter of the delivery order.
 
 .. image:: media/invoicing02.png
    :align: center

odoo_sh/getting_started/branches.rst

@@ -55,7 +55,7 @@ The demo data is not loaded, as it is not meant to be used in a production datab
 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.
+will automatically be set back to the development stage after 30 days.
 
 Staging
 -------

odoo_sh/getting_started/settings.rst

@@ -155,12 +155,9 @@ Most domain managers have the feature to configure this redirection. This is com
 HTTPS/SSL
 ---------
 
-You can use a third-party CDN such as *Cloudflare.com* to enable the *HTTPS* support for your custom domain:
+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.
 
-* `Create a Cloudflare account <https://support.cloudflare.com/hc/en-us/articles/201720164-Step-2-Create-a-Cloudflare-account-and-add-a-website>`_
-* `Change your domain name servers to Cloudflare <https://support.cloudflare.com/hc/en-us/articles/205195708-Step-3-Change-your-domain-name-servers-to-Cloudflare>`_
-* `Choose an SSL mode <https://support.cloudflare.com/hc/en-us/articles/201897700-Step-4-Recommended-First-Steps-for-all-Cloudflare-users#sslmode>`_
-* `Redirect your visitors to HTTPS <https://support.cloudflare.com/hc/en-us/articles/200170536-How-do-I-redirect-all-visitors-to-HTTPS-SSL->`_
+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
 -----------------------