[MERGE] Forward-port of 13.0 into 13.2

accounting/payables/supplier_bills/deferred_expenses.rst

@@ -186,7 +186,7 @@ You have three choices for the **Automate Deferred Expense** field:
 
 .. tip::
    You can, for example, select this account as the default **Expense Account** of a product to
-   fully automate its sale completely. (see: `Choose a different Expense Account for specific
+   fully automate its purchase. (see: `Choose a different Expense Account for specific
    products`_).
 
 .. seealso::

accounting/receivables/customer_invoices/deferred_revenues.rst

@@ -186,7 +186,7 @@ You have three choices for the **Automate Deferred Revenue** field:
 
 .. tip::
    You can, for example, select this account as the default **Income Account** of a product to fully
-   automate its sale completely. (see: `Choose a different Income Account for specific products`_).
+   automate its sale. (see: `Choose a different Income Account for specific products`_).
 
 .. seealso::
    * :doc:`../../others/configuration/account_type`

discuss/email_servers.rst

@@ -2,7 +2,7 @@
 How to use my mail server to send and receive emails in Odoo
 ============================================================
 
-This document is mainly dedicated to Odoo on-premise users who don't 
+This document is mainly dedicated to Odoo on-premise users who don't
 benefit from an out-of-the-box solution to send and receive emails in Odoo,
 unlike `Odoo Online <https://www.odoo.com/trial>`__ & `Odoo.sh <https://www.odoo.sh>`__.
 
@@ -22,9 +22,8 @@ information on how to integrate your own email solution with Odoo.
 
 How to manage outbound messages
 ===============================
-
+As a system admin, go to :menuselection:`Settings --> General Settings`
-As a system admin, go to :menuselection:`Settings --> General Settings` 
+and check *External Email Servers*.
-and check *External Email Servers*. 
 Then, click *Outgoing Mail Servers* to create one and reference the SMTP data of your email server. 
 Once all the information has been filled out, click on *Test Connection*.
 
@@ -35,6 +34,14 @@ Here is a typical configuration for a G Suite server.
 
 Then set your email domain name in the General Settings.
 
+.. note::
+   If you get a ``[AUTHENTICATIONFAILED] Invalid credentials (Failure)`` warning when you *Test
+   Connection* on a Gmail address, activate the *Less secure app access* option. A direct link can
+   be `accessed here <https://myaccount.google.com/lesssecureapps?pli=1>`_.
+
+   In addition to that, enable the IMAP setting on your Gmail account.
+
+
 Can I use an Office 365 server
 ------------------------------
 You can use an Office 365 server if you run Odoo on-premise.

point_of_sale/advanced_pricing_features.rst

@@ -1,6 +1,6 @@
-=========================
+================
-Advanced Pricing Features
+Pricing Features
-=========================
+================
 
 .. toctree::
    :titlesonly:

point_of_sale/belgian_fdm.rst

@@ -1,6 +1,6 @@
-==========================
+===================
-Belgian Fiscal Data Module
+Fiscal Data Modules
-==========================
+===================
 
 .. toctree::
    :titlesonly:

point_of_sale/payment.rst

@@ -7,4 +7,4 @@ Payment Terminals
 
    payment/ingenico
    payment/vantiv
-   payment/six
+   payment/six

point_of_sale/restaurant.rst

@@ -1,6 +1,6 @@
-============================
+===================
-Advanced Restaurant Features
+Restaurant Features
-============================
+===================
 
 .. toctree::
    :titlesonly:

point_of_sale/shop.rst

@@ -1,6 +1,6 @@
-======================
+=============
-Advanced Shop Features
+Shop Features
-======================
+=============
 
 .. toctree::
    :titlesonly: