[MERGE] Forward-port of branch 13.0 to 14.0

accounting/bank/feeds/bank_statements.rst

@@ -1,50 +1,54 @@
 ===============
 Bank Statements
 ===============
+
 Importing your bank statements in Odoo Accounting allows you to keep track of the financial
 movements that occur on your bank accounts and reconcile them with the transactions recorded in your
 accounting.
 
-The easiest way to do so is by synchronizing. To do so, please read the related documentation:
+We recommend you use bank synchronization for more efficiency. Please read the related
-:doc:`bank_synchronization`.
+documentation: :doc:`bank_synchronization`.
 
-However, if your bank account is not synchronized with Odoo, you still have two options:
+However, if you don't want to use bank synchronization or if your bank is not a supported
+institution, you still have other options:
 
 #. Import the bank statement files delivered by your bank
 #. Register the bank statements manually
 
 Import bank statements files
 ============================
+
 Odoo supports multiple file formats to import bank statements:
 
 - SEPA recommended Cash Management format (CAMT.053)
 - Comma-separated values (.CSV)
 - Open Financial Exchange (.OFX)
 - Quicken Interchange Format (.QIF)
-- Belgium Coded Statement of Account (.CODA)
+- Belgium: Coded Statement of Account (.CODA)
 
 To import them, go to :menuselection:`Accounting --> Overview --> Bank`, click on *Import
 Statements*, or on the three dots, and then on *Import Statement*.
 
-.. image:: media/bank_statements01.png
+.. image:: media/bank-statements-01.png
    :align: center
    :alt: Import a bank statement file in Odoo Accounting
 
 Next, select the file you want to import and click on *Import*.
 
-Odoo opens an **import tool** with which you can set the **Formatting Options** and **map** the
+Odoo opens an **import widget** to help you set the **Formatting Options** and **map** the
 different columns you want to import.
 
-.. image:: media/bank_statements02.png
+.. image:: media/bank-statements-02.png
    :align: center
    :alt: Register bank statements manually in Odoo Accounting
 
 .. note::
-   Quicken Interchange Format (.QIF) is an older file format that is not supported since 2005. If
+   Quicken Interchange Format (.QIF) is an older file format that is no longer supported since 2005. 
-   possible, prefer OFX files over QIF.
+   If possible, prefer OFX files over QIF.
 
 Register bank statements manually
 =================================
+
 If needed, you can also record your bank statements manually.
 
 To do so, go to :menuselection:`Accounting --> Overview --> Bank`, click on *Create Statements*, or
@@ -55,7 +59,7 @@ Add a new line for each transaction written on the original bank statement.
 To ease the reconciliation process, make sure to fill out the *Partner* field. You can also write
 the payments’ references in the *Label* field.
 
-.. image:: media/bank_statements03.png
+.. image:: media/bank-statements-03.png
    :align: center
    :alt: Register bank statements manually in Odoo Accounting
 
@@ -65,4 +69,4 @@ the payments’ references in the *Label* field.
 
 .. seealso::
    * :doc:`bank_synchronization`
-.. todo:: add doc link to new documentation about reconciliation
+.. todo:: add doc link to new documentation about reconciliation

accounting/fiscal_localizations/localizations/argentina.rst

@@ -2,6 +2,13 @@
 Argentina
 =========
 
+Webinars
+========
+
+Below you can find videos with a general description of the localization, and how to configure it.
+
+- `VIDEO WEBINAR OF A COMPLETE DEMO <https://youtu.be/c41-8cVaYAI>`_.
+
 Introduction
 ============
 

accounting/fiscal_localizations/localizations/colombia.rst

@@ -2,6 +2,13 @@
 Colombia
 ========
 
+Webinars
+========
+
+Below you can find videos with a general description of the localization, and how to configure it.
+
+- `VIDEO WEBINAR OF A COMPLETE DEMO <https://youtu.be/BOzucXRUZDE>`_.
+
 Introduction
 ============
 

accounting/fiscal_localizations/localizations/mexico.rst

@@ -86,6 +86,11 @@ company’s contact.
 .. image:: media/mexico03.png
    :align: center
 
+.. warning::
+   From a legal point of view, a Mexican company must use the local currency (MXN).
+   Therefore, Odoo does not provide features to manage an alternative configuration.
+   If you want to manage another currency, let MXN be the default currency and use
+   price list instead.
 
 Set the proper "Fiscal Position" on the partner that represent the company
 --------------------------------------------------------------------------

db_management/db_upgrade.rst

@@ -131,8 +131,7 @@ There are two possibilities:
 #. Via the interface of our `website form <https://upgrade.odoo.com>`_
 #. | For technically-advanced users and partners, via the following command line (to be used on the
      machine where your database is hosted):
-   | ``python <(curl -s beta.upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0 -c <your
+   | ``python <(curl -s beta.upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0``
-     subscription code>``
 
 What does it do?
 ~~~~~~~~~~~~~~~~
@@ -263,12 +262,11 @@ Select *Production* purpose.
 Assistance
 ~~~~~~~~~~
 
-If you encounter issues or problems in the **production database**, please contact the Odoo Upgrade
+If you encounter issues or problems in the **production database**, please contact the **Odoo
-Support:
+Support**:
 
 #. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
+#. Under the *Ticket Description* section, select the appropriate type related to your issue but
-   Under the *Ticket Description* section, select the appropriate type related to your issue but
    **do not select** the option *An issue related to my upgrade*.
 
    .. note::
@@ -284,8 +282,8 @@ Support:
       :alt: "Detailed Description" field in the support form on Odoo
 
    .. warning::
-      If you choose another *Ticket Description* type, the request will be redirected to another
+      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
-      team than the upgrade one and will slow down the processing and response time.
+      to another team than the support one and will slow down the processing and response time.
 
 .. _db-upgrade/faq:
 

odoo_sh/advanced/frequent_technical_questions.rst

@@ -32,17 +32,14 @@ We advise that:
   cause side-effects if they are started more often than expected.
 
 
-Can you install ``pycups`` or some similar library linked to ``CUPS`` ?
+Can you install `pycups <https://pypi.org/project/pycups/>`_ or some similar library linked to `CUPS <https://www.cups.org/>`_ ?
------------------------------------------------------------------------
+--------------------------------------------------------------------------------------------------------------------------------
 
 Several community apps for Odoo list ``pycups`` as required dependency.
 
-- `pycups <https://pypi.org/project/pycups/>`_ is a set of Python bindings for the libcups library.
+- ``pycups`` is a set of Python bindings for the libcups library. They are meant to integrate your computer with a local printing server.
-  They are meant to integrate your computer with a local printing server.
+- CUPS is a printing server meant to be used for printers on the same local network as the Odoo server.
-- `CUPS <https://www.cups.org/>`_ is a printing server meant to be used for printers on the same
-  local network as the Odoo server.
 
 We consider adding new system packages as long as they are indeed used.
-Regarding ``pycups``, you won't be able to configure a printer in the local network of your Odoo.sh
+Regarding ``pycups``, you won't be able to configure a printer in the local network of your Odoo.sh server.
-server.
 

odoo_sh/advanced/upgrade_your_database.rst

@@ -10,7 +10,7 @@ Download and Upload your database
 =================================
 
 Download a dump of your database (from the :ref:`Builds view <odoosh-gettingstarted-builds-download-dump>`), choose the
-exact copy and without filestore options. Upload the .sql.gz dump on https://upgrade.odoo.com/database/upload and
+exact copy and without filestore options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and
 select the Testing Purpose. If you have custom code, you can choose to have it upgraded by us, or do it yourself. Once
 it's processed, you'll get a dump of the database in return.
 

sms_marketing/pricing/pricing_and_faq.rst

@@ -128,3 +128,8 @@ More common questions
 #. **How does the GDPR regulation affect this service?**
 
    Please find our `Privacy Policy here <https://iap.odoo.com/privacy#sms>`__.
+
+#. **Can I use my own SMS provider?**
+
+   Yes, but it is not possible out of the box. Our experts can help you customize your database
+   to make it happen. Please, check our success packs `here <https://www.odoo.com/pricing-packs>`_.