[MERGE] Forward-port of branch 13.0 to 13.3

accounting/bank/misc.rst

@@ -5,5 +5,4 @@ Miscellaneous
 .. toctree::
    :titlesonly:
 
-   misc/batch
    misc/interbank

accounting/bank/misc/batch.rst

@@ -1,146 +0,0 @@
-===============================
-Manage batch deposits of checks
-===============================
-
-When your company's collections group receives checks from customers
-they will often place this money into their bank account in batches. As
-this money has been received in a physical form, someone in your company
-must manually bring the checks to the bank.
-
-The bank will ask for a deposit ticket (also referred to as deposit
-slip) to be filled-in with the details of the checks or cash to be
-included in the transactions.
-
-The bank statement will reflect the total amount that was deposited and
-the reference to the deposit ticket, not the individual checks.
-
-Odoo assists you to prepare and print your deposit tickets, and later on
-reconcile them with your bank statement easily.
-
-Configuration
-=============
-
-Install the batch deposit feature
----------------------------------
-
-In order to use the batch deposit feature, you need the module **Batch
-Deposit** to be installed.
-
-.. note::
-
-    Usually, this module is automatically
-    installed if checks are widely used in your country.
-
-To verify that the **Batch Deposit** feature is installed, go to the
-:menuselection:`Configuration --> Settings` menu of the accounting application.
-Check the feature: **Allow batch deposit**.
-
-.. image:: media/batch01.png
-   :align: center
-
-Activate the feature on your bank accounts
-------------------------------------------
-
-Once you have installed this feature, Odoo automatically activate bank
-deposits on your main bank accounts.
-
-To control which bank account can do batch deposit and which can not, go
-to the journal that you defined to pay your checks, usually called
-'Checks' or 'Bank' (see :doc:`../../receivables/customer_payments/check`,
-in the Accounting apps, :menuselection:`Configuration --> Accounting --> Journals`.
-
-In **Advanced Settings** tab, in section **Miscellaneous**, set Debit Method to
-**Batch Deposit**.
-
-.. image:: media/batch02.png
-   :align: center
-
-If you check **Batch Deposit** in your debit method field, it means that
-payments created using this Journal (called Payment method when you want
-to make or receive a payment) will be applicable for the creation of
-Batch Deposits afterwards.
-
-From checks received to the bank
-================================
-
-Receive customer checks
------------------------
-
-Once your checks are received, record them on the bank account on
-which you plan to deposit them. Once you select the bank account (or
-check journal if you configured Odoo that way), Odoo proposes you to use
-a batch deposit. Select this option if you plan to deposit the check to
-your bank.
-
-.. image:: media/batch03.png
-   :align: center
-
-In the memo field, you can set the reference of the check.
-
-.. note::
-
-    payments can be registered from the menu :menuselection:`Sales --> Payments`,
-    or directly on the related invoice, using the **Register Payment** button.
-
-Prepare a batch deposit
------------------------
-
-From the Accounting application, go to the menu :menuselection:`Sales --> Batch Deposit`,
-and create a new **Batch Deposit**.
-
-.. image:: media/batch04.png
-   :align: center
-
-Select the bank, then select the payments (checks) you want to add in
-this deposit. By default, Odoo proposes you all the checks that have not
-been deposited yet. That way you can verify that you do not forget or
-lost a check.
-
-.. image:: media/batch05.png
-   :align: center
-
-You can then print the batch deposit, which will be very useful
-to prepare the deposit slip that the bank usually requires to complete.
-
-Reconciling the Deposit with the Bank Statement
------------------------------------------------
-
-When you process the bank statement reconciliation you will see the
-deposit ticket number referenced in the statement. When the reconciliation
-process is run, the user will be able to select the batch deposit that
-matches with the bank statement line.
-
-.. image:: media/batch06.png
-   :align: center
-
-If you select a batch deposit, Odoo will automatically fill all the
-checks contained in this deposit for the matching. (2 checks were in
-the batch deposit in the example below)
-
-.. image:: media/batch07.png
-   :align: center
-
-Troubleshooting
-===============
-
-I don't see the batch deposit link on bank statements?
-------------------------------------------------------
-
-If you don't have a batch deposit link in your bank statement, there
-could be two reasons:
-
-- After having installed the batch deposit features you need to reload
-  the page so that the browser is aware of this new feature. Just
-  click the reload button of your browser.
-
-- You do not have a batch deposit created for this bank account.
-
-What happens if a check was refused?
-------------------------------------
-
-If you have a smaller amount in your bank statement than the actual
-amount in your batch deposit, it probably means that one of your check
-has been refused.
-
-In this case click on the line related to this check to remove it from
-the bank statement matching.

accounting/fiscal_localizations/localizations/mexico.rst

@@ -69,8 +69,8 @@ integrate with the normal invoicing flow in Odoo.
 .. _mx-legal-info:
 
 
-Set you legal information in the company
+Set your legal information in the company
-----------------------------------------
+-----------------------------------------
 
 First, make sure that your company is configured with the correct data.
 Go in :menuselection:`Settings --> Users --> Companies`

accounting/fiscal_localizations/overview/fiscal_localization_packages.rst

@@ -42,6 +42,6 @@ Please refer to the documentation listed below for more information.
 
 .. seealso::
    - :doc:`../../overview/getting_started/chart_of_accounts`
-   - :doc:`../../fiscality/taxes/create`
+   - :doc:`../../fiscality/taxes/taxes`
 
 .. todo:: update list of linked docs, and link with the future one about country-specific statements.

accounting/fiscality/taxes.rst

@@ -5,11 +5,10 @@ Taxes
 .. toctree::
    :titlesonly:
 
-   taxes/create
+   taxes/taxes
    taxes/default_taxes
    taxes/fiscal_positions
    taxes/taxcloud
-   taxes/tax_included
    taxes/retention
    taxes/B2B_B2C
    taxes/cash_basis_taxes

accounting/fiscality/taxes/create.rst

@@ -1,70 +0,0 @@
-================
-Create new taxes
-================
-
-Odoo's tax engine is very flexible and support many different type of
-taxes: value added taxes (VAT), eco-taxes, federal/states/city taxes, retention,
-withholding taxes, etc. For most countries, your system is pre-configured with the
-right taxes.
-
-This section details how you can define new taxes for specific use cases.
-
-* Go to :menuselection:`Accounting --> Configuration --> Taxes`. From this menu, you
-  get all the taxes you can use: sales taxes and purchase taxes.
-
-.. image:: media/create01.png
-   :align: center
-
-* Choose a scope: Sales, Purchase or None (e.g. deprecated tax).
-
-* Select a computation method:
-
-  * **Fixed**: eco-taxes, etc.
-
-  * **Percentage of Price**: most common (e.g. 15% sales tax)
-
-  * **Percentage of Price Tax Included**: used in Brazil, etc.
-
-  * **Group of taxes**: allows to have a compound tax
-
-.. image:: media/create02.png
-   :align: center
-
-
-* If you use Odoo Accounting, set a tax account (i.e. where the tax journal item will be
-  posted). This field is optional, if you keep it empty, Odoo posts
-  the tax journal item in the income account.
-
-.. tip::
-    If you want to avoid using a tax, you can not delete it because the tax
-    is probably used in several invoices. So, in order to avoid users to
-    continue using this tax, you should set the field *Tax Scope* to *None*.
-
-.. note::
-    If you need more advanced tax mechanism, you can install the
-    module **account_tax_python** and you will be able to define new taxes
-    with Python code.
-
-Advanced configuration
-======================
-
-* **Label on Invoices**: a short text on how you want this tax to be
-  printed on invoice line. For example, a tax named "15% on
-  Services" can have the following label on invoice "15%".
-
-* **Tax Group**: defines where this tax is summed in the invoice footer.
-  All the tax belonging to the same tax group will be grouped on
-  the invoice footer. Examples of tax group: VAT, Retention.
-
-* **Include in Analytic Cost**: the tax is counted as a cost and, thus,
-  generate an analytic entry if your invoice uses analytic
-  accounts.
-
-* **Tags**: are used for custom reports. Usually, you can keep this field
-  empty.
-
-
-.. seealso::
-
-  * :doc:`fiscal_positions`
-  * :doc:`tax_included`

accounting/fiscality/taxes/default_taxes.rst

@@ -2,7 +2,7 @@
 Default Taxes
 =============
 
-**Default Taxes** define which :doc:`taxes <create>` are automatically selected when there is no
+**Default Taxes** define which :doc:`taxes <taxes>` are automatically selected when there is no
 other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the
 Default Taxes when you create a new product or add a new line on an invoice.
 
@@ -35,6 +35,6 @@ To change your **Default Taxes**, go to :menuselection:`Accounting --> Configura
 
 .. seealso::
 
-  - :doc:`create`
+  - :doc:`taxes`
   - :doc:`fiscal_positions`
   - :doc:`../../fiscal_localizations/overview/fiscal_localization_packages`

accounting/fiscality/taxes/fiscal_positions.rst

@@ -106,6 +106,6 @@ To manually select which Fiscal Position to use for a new Sales Order, Invoice,
 
 .. seealso::
 
-  * :doc:`create`
+  * :doc:`taxes`
   * :doc:`taxcloud`
   * :doc:`B2B_B2C`

accounting/fiscality/taxes/retention.rst

@@ -67,4 +67,4 @@ The printed invoice will show the different amounts in each tax group.
 
 .. seealso::
 
-  * :doc:`create`
+  * :doc:`taxes`

accounting/fiscality/taxes/tax_included.rst

@@ -1,41 +0,0 @@
-=======================
-Set tax-included prices
-=======================
-
-In most countries, B2C prices are tax-included. To do that in Odoo, check
-*Included in Price* for each of your sales taxes in
-:menuselection:`Accounting --> Configuration --> Accounting --> Taxes`.
-
-.. image:: media/tax_included.png
-   :align: center
-
-This way the price set on the product form includes the tax. As an example,
-let's say you have a product with a sales tax of 10%. The sales price on
-the product form is $100.
-
-- If the tax is not included in the price, you will get:
-
-  - Price without tax: $100
-
-  - Taxes: $10
-
-  - Total to pay: $110
-
-- If the tax is included in the price
-
-  - Price without tax: 90.91
-
-  - Taxes: $9.09
-
-  - Total to pay: $100
-
-You can rely on following documentation if you need both tax-included (B2C) and
-tax-excluded prices (B2B): :doc:`B2B_B2C`.
-
-Show tax-included prices in eCommerce catalog
-=============================================
-
-By default prices displayed in your eCommerce catalog are tax-excluded. To display
-it in tax-included, check *Show line subtotals with taxes included (B2C)* in
-:menuselection:`Sales --> Configuration --> Settings` (Tax Display).
-

accounting/fiscality/taxes/taxes.rst

@@ -0,0 +1,282 @@
+=====
+Taxes
+=====
+
+There are numerous types of **taxes**, and their application varies greatly, depending mostly on
+your company's localization. To make sure they are recorded with accuracy, Odoo's tax engine
+supports all kinds of uses and computations.
+
+.. _taxes/list_activation:
+
+Activate Sales Taxes from the List view
+=======================================
+
+As part of your :doc:`Fiscal Localization Package
+<../../fiscal_localizations/overview/fiscal_localization_packages>`, most of your country's sales
+taxes are already preconfigured on your database. However, only a few of them are activated by
+default, so that you can activate only the ones relevant for your business.
+
+To activate Sale Taxes, go to :menuselection:`Accounting --> Configuration --> Taxes` and use the
+*Activate* toggle button to activate or deactivate a tax.
+
+.. image:: media/taxes-list.png
+   :align: center
+   :alt: Activate pre-configured taxes in Odoo Accounting
+
+.. _taxes/configuration:
+
+Configuration
+=============
+
+To edit or create a **Tax**, go to :menuselection:`Accounting --> Configuration --> Taxes` and open
+a tax or click on *Create*.
+
+.. image:: media/taxes-edit.png
+   :align: center
+   :alt: Edition of a tax in Odoo Accounting
+
+.. _taxes/labels:
+
+.. important::
+   Taxes have three different labels, each one having a specific use. Refer to the following table to
+   see where they are displayed.
+
+   +------------------+-------------------------+-------------------------+
+   | :ref:`Tax Name   | :ref:`Label on Invoice  | :ref:`Tax Group         |
+   | <taxes/name>`    | <taxes/label-invoices>` | <taxes/tax-group>`      |
+   +==================+=========================+=========================+
+   | Back end         | *Taxes* column on       | Above the *Total* line  |
+   |                  | exported invoices       | on exported invoices    |
+   +------------------+-------------------------+-------------------------+
+
+Basic Options
+-------------
+
+.. _taxes/name:
+
+Tax Name
+~~~~~~~~
+
+The **Tax Name** as you want to display it for backend users. This is the :ref:`label
+<taxes/labels>` you see while editing Sales Orders, Invoices, Products, etc.
+
+.. _taxes/computation:
+
+Tax Computation
+~~~~~~~~~~~~~~~
+
+- **Group of Taxes**
+
+  The tax is a combination of multiple sub-taxes. You can add as many taxes you want, in the order
+  you want them to be applied.
+
+  .. important::
+     Make sure that the tax sequence is correct, as the order in which they are may impact the
+     taxes' amounts computation, especially if one of the taxes :ref:`affects the base of the
+     subsequent ones <taxes/base-subsequent>`.
+
+- **Fixed**
+
+  The tax has a fixed amount in the default currency. The amount remains the same, regardless of the
+  Sales Price.
+
+  For example, a product has a Sales Price of $1000, and we apply a *$10 fixed* tax. We then have:
+
+  +-------------+-------------+----------+----------+
+  | Product's   | Price       | Tax      | Total    |
+  | Sales Price | without tax |          |          |
+  +=============+=============+==========+==========+
+  | 1,000       | 1,000       | 10       | 1,010.00 |
+  +-------------+-------------+----------+----------+
+
+- **Percentage of Price**
+
+  The *Sales Price* is the taxable basis: the tax's amount is computed by multiplying the Sales
+  Price by the tax's percentage.
+
+  For example, a product has a Sales Price of $1000, and we apply a *10% of Price* tax. We then
+  have:
+
+  +-------------+-------------+----------+----------+
+  | Product's   | Price       | Tax      | Total    |
+  | Sales Price | without tax |          |          |
+  +=============+=============+==========+==========+
+  | 1,000       | 1,000       | 100      | 1,100.00 |
+  +-------------+-------------+----------+----------+
+
+- **Percentage of Price Tax Included**
+
+  The *Total* is the taxable basis: the tax's amount is a percentage of the Total.
+
+  For example, a product has a Sales Price of $1000, and we apply a *10% of Price Tax Included* tax.
+  We then have:
+
+  +-------------+-------------+----------+----------+
+  | Product's   | Price       | Tax      | Total    |
+  | Sales Price | without tax |          |          |
+  +=============+=============+==========+==========+
+  | 1,000       | 1,000       | 111.11   | 1,111.11 |
+  +-------------+-------------+----------+----------+
+
+.. _taxes/active:
+
+Active
+~~~~~~
+
+Only **Active** taxes can be added to new documents.
+
+.. important::
+   It is not possible to delete taxes that have already been used. Instead, you can deactivate them
+   to prevent future use.
+
+.. note::
+   This field can be modified from the *List View*. See :ref:`above <taxes/list_activation>` for
+   more information.
+
+.. _taxes/scope:
+
+Tax Scope
+~~~~~~~~~
+
+The **Tax Scope** determines the tax's application, which also restricts where it is displayed.
+
+- **Sales**: Customer Invoices, Product's Customer Taxes, etc.
+- **Purchase**: Vendor Bills, Product's Vendor Taxes, etc.
+- **None**
+
+.. tip::
+   You can use **None** for taxes that you want to include in a :ref:`Group of Taxes
+   <taxes/computation>` but that you don't want to list along with other Sales or Purchase taxes.
+
+.. _taxes/definition-tab:
+
+Definition tab
+--------------
+
+Allocate with precision the amount of the taxable basis or percentages of the computed tax to
+multiple accounts and Tax Grids.
+
+.. image:: media/taxes-definition.png
+   :align: center
+   :alt: Allocate tax amounts to the right accounts and tax grids
+
+- **Based On**:
+
+  - Base: the price on the invoice line
+  - % of tax: a percentage of the computed tax.
+
+- **Account**: if defined, an additional Journal Item is recorded.
+- **Tax Grids**:  used to generate :doc:`Tax Reports <../../reporting/declarations/tax_returns>`
+  automatically, according to your country's regulations.
+
+.. _taxes/advanced-tab:
+
+Advanced Options tab
+--------------------
+
+.. _taxes/label-invoices:
+
+Label on Invoices
+~~~~~~~~~~~~~~~~~
+
+The label of the tax, as displayed on each invoice line in the **Taxes** column. This is the
+:ref:`label <taxes/labels>` visible to *front end* users, on exported invoices, on their Customer
+Portals, etc.
+
+.. image:: media/taxes-invoice-label.png
+   :align: center
+   :alt: The Label on Invoices is displayed on each invoice line
+
+.. _taxes/tax-group:
+
+Tax Group
+~~~~~~~~~
+
+Select to which **Tax Group** the tax belongs. The Tax Group name is the :ref:`label
+<taxes/labels>` displayed above the *Total* line on exported invoices, and the Customer Portals.
+
+Tax groups include different iterations of the same tax. This can be useful when you must record
+differently the same tax according to :doc:`Fiscal Positions <fiscal_positions>`.
+
+.. image:: media/taxes-invoice-tax-group.png
+   :align: center
+   :alt: The Tax Group name is different from the Label on Invoices
+
+In the example above, we see a 0% tax for Intra-Community customers in Europe. It records amounts on
+specific accounts and with specific tax grids. Still, to the customer, it is a 0% tax. That's why
+the :ref:`Label on the Invoice <taxes/label-invoices>` indicates *0% EU*, and the Tax Group name,
+above the *Total* line, indicates *0%*.
+
+.. _taxes/analytic-cost:
+
+Include in Analytic Cost
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+With this option activated, the tax's amount is assigned to the same **Analytic Account** as the
+invoice line.
+
+.. _taxes/included-in-price:
+
+Included in Price
+~~~~~~~~~~~~~~~~~
+
+With this option activated, the total (including the tax) equals the **Sales Price**.
+
+:dfn:`Total = Sales Price = Computed Tax-Excluded price + Tax`
+
+For example, a product has a Sales Price of $1000, and we apply a *10% of Price* tax, which is
+*included in the price*. We then have:
+
++-------------+-------------+----------+----------+
+| Product's   | Price       | Tax      | Total    |
+| Sales Price | without tax |          |          |
++=============+=============+==========+==========+
+| 1,000       | 900.10      | 90.9     | 1,000.00 |
++-------------+-------------+----------+----------+
+
+.. note::
+   If you need to define prices accurately, both tax-included and tax-excluded, please refer to the
+   following documentation: :doc:`B2B_B2C`.
+
+.. note::
+   - **Invoices**: By default, the Line Subtotals displayed on your invoices are *Tax-Excluded*. To
+     display *Tax-Included* Line Subtotals, go to :menuselection:`Accounting --> Configuration -->
+     Settings --> Customer Invoices`, and select *Tax-Included* in the **Line Subtotals Tax
+     Display** field, then click on *Save*.
+   - **eCommerce**: By default, the prices displayed on your eCommerce website are *Tax-Excluded*.
+     To display *Tax-Included* prices, go to :menuselection:`Website --> Configuration --> Settings
+     --> Pricing`, and select *Tax-Included* in the **Product Prices** field, then click on *Save*.
+
+.. _taxes/base-subsequent:
+
+Affect Base of Subsequent Taxes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+With this option, the total tax-included becomes the taxable basis for the other taxes applied to
+the same product.
+
+You can configure a new :ref:`Group of Taxes <taxes/computation>` to include this tax, or add it
+directly to a product line.
+
+.. image:: media/taxes-subsequent-line.png
+   :align: center
+   :alt: The eco-tax is taken into the basis of the 21% VAT tax
+
+.. warning::
+   The order in which you add the taxes on a product line has no effect on how amounts are computed.
+   If you add taxes directly on a product line, only the tax sequence determines the order in which
+   they are applied.
+
+   To reorder the sequence, go to :menuselection:`Accounting --> Configuration --> Taxes`, and drag
+   and drop the lines with the handles next to the tax names.
+
+   .. image:: media/taxes-list-sequence.png
+      :align: center
+      :alt: The taxes' sequence in Odoo determines which tax is applied first
+
+.. seealso::
+
+  - :doc:`fiscal_positions`
+  - :doc:`B2B_B2C`
+  - :doc:`taxcloud`
+  - :doc:`../../reporting/declarations/tax_returns`

accounting/payables/supplier_bills/ocr.rst

@@ -36,3 +36,17 @@ respective tag (available in *Edit* mode), and selecting the right information i
 
 .. note::
    The more bills you scan, the better the system gets at identifying the correct data.
+
+Pricing
+=======
+
+| The *Bill Digitalization* is an *In-App Purchase (IAP)* service which requires prepaid credits to
+  work. Digitalizing one document consumes one credit.
+| To buy credits, go to :menuselection:`Accounting --> Configuration --> Settings --> Bill
+  Digitalization` and click on *Buy credits*, or go to :menuselection:`Settings --> Odoo IAP` and
+  click on *View My Services*.
+
+.. important::
+   - If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial
+     credits to test the feature.
+   - Click `here <https://iap.odoo.com/privacy#header_4>`_ to know about our *Privacy Policy*.

accounting/receivables/customer_payments.rst

@@ -8,5 +8,6 @@ Customer Payments
    customer_payments/recording
    customer_payments/online_payment
    customer_payments/check
+   customer_payments/batch
    customer_payments/batch_sdd
    customer_payments/followup

accounting/receivables/customer_payments/batch.rst

@@ -0,0 +1,100 @@
+==================================================
+Batch Payments: Batch Deposits (checks, cash etc.)
+==================================================
+
+A **Batch Deposit** groups multiple payments in a single batch. This allows you to deposit several
+payments into your bank account with a single transaction. This is particularly useful to deposit
+cash and checks.
+
+This feature allows you to list several customer payments and print a **deposit slip**. This ticket
+contains the details of the transactions and a reference to the batch deposit. You can then select
+this reference during a bank reconciliation to match the single bank statement line with all the
+transactions listed in the batch deposit.
+
+Configuration
+=============
+
+To activate the feature, go to :menuselection:`Accounting --> Configuration --> Settings -->
+Customer Payments`, activate **Batch Payments**, and click on *Save*.
+
+Payment Method Types
+--------------------
+
+To record new payments as part of a Batch Deposit, you have to configure first the Journal on which
+you record them.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open the Journal
+you want to edit, click on *Edit*, and open the *Advanced Settings* tab. In the *Payment Method
+Types* section, enable **Batch Deposit**, and click on *Save*.
+
+.. image:: media/batch-journal-settings.png
+   :align: center
+   :alt: Payment Method Types in a journal's advanced settings
+
+.. note::
+   Your main bank accounts are automatically configured to process batch payments when you activate
+   the feature.
+
+Deposit multiple payments in batch
+==================================
+
+Record payments to deposit in batch
+-----------------------------------
+
+:doc:`Register the payments <recording>` on the bank account on which you plan to deposit them by
+opening the *Customer Invoice* for which you received a payment, and clicking on *Register Payment*.
+There, select the appropriate Journal linked to your bank account and select *Batch Deposit* as
+Payment Method.
+
+.. image:: media/batch-register-payment.png
+   :align: center
+   :alt: Registering a customer payment as part of a Batch Deposit in Odoo Accounting
+
+Do this step for all checks or payments you want to process in batch.
+
+.. note::
+   Make sure to write the payment reference in the **Memo** field.
+
+Add payments to a Batch Deposit
+-------------------------------
+
+To add the payments to a Batch Deposit, go to :menuselection:`Accounting --> Customers --> Batch
+Payments`, and click on *Create*. Next, select the Bank and Payment Method, then click on *Add a
+line*.
+
+.. image:: media/batch-new-inbound.png
+   :align: center
+   :alt: Filling out a new Inbound Batch Payment form on Odoo Accounting
+
+Select all payments to include in the current Batch Deposit and click on *Select*. You can also
+record a new payment and add it to the list by clicking on *Create*.
+
+.. image:: media/batch-payments-selection.png
+   :align: center
+   :alt: Selection of all payments to include in the Batch Deposit
+
+Once done, click on *Validate* to finalize your Batch Deposit. You can then click on *Print* to
+download a PDF file to include with the deposit slip that the bank usually requires to fill out.
+
+Bank Reconciliation
+-------------------
+
+Once the bank statements are on your database, you can reconcile the bank statement line with the
+*Batch Payment* reference. To do so, start your **Bank Reconciliation** by going to your Accounting
+dashboard and clicking on *Reconcile Items* on the related bank account. At the bank statement line,
+click on *Choose counterpart or Create Write-off* to display more options, open the *Batch Payments*
+tab, and select your Batch Payment. All related payments are automatically added.
+
+.. note::
+   The *Batch Payments* tab won't appear if a Partner is selected for this bank statement line.
+
+.. image:: media/batch-bank-reconciliation.png
+   :align: center
+   :alt: Reconciliation of the Batch Payment with all its transactions
+
+If a check, or a payment, couldn't be processed by the bank and is missing, remove the related
+payment before validating the bank reconciliation.
+
+.. seealso::
+   - :doc:`recording`
+   - :doc:`batch_sdd`

accounting/receivables/customer_payments/batch_sdd.rst

@@ -147,6 +147,7 @@ Finally, upload this file to your online banking interface to process the paymen
    :menuselection:`Accounting --> Configuration --> Customers --> Batch Payments`.
 
 .. seealso::
+   * :doc:`batch`
    * :doc:`../../bank/setup/bank_accounts`
    * `Odoo Academy: SEPA Direct Debit Mandates (SDD) <https://www.odoo.com/r/Zxs>`_
    * `List of all SEPA countries

accounting/reporting/declarations/tax_returns.rst

@@ -120,6 +120,6 @@ with the amount you have to pay or be refunded.
    above.
 
 .. seealso::
-   * :doc:`../../fiscality/taxes/create`
+   * :doc:`../../fiscality/taxes/taxes`
    * :doc:`../../overview/getting_started/setup`
    * :doc:`../../fiscal_localizations/overview/fiscal_localization_packages`

applications.rst

@@ -57,6 +57,7 @@ Applications
    sales
    purchase
    accounting
+   subscriptions
    project
    timesheets
    planning

ecommerce/taxes.rst

@@ -7,6 +7,6 @@ Collect taxes
 
    ../../accounting/fiscality/taxes/default_taxes
    ../../accounting/fiscality/taxes/fiscal_positions
-   ../../accounting/fiscality/taxes/tax_included
+   ../../accounting/fiscality/taxes/taxes
    ../../accounting/fiscality/taxes/taxcloud
 

events.rst

@@ -7,4 +7,5 @@ Events
 .. toctree::
    :titlesonly:
 
+   events/overview
    events/integrations

events/overview.rst

@@ -0,0 +1,11 @@
+========
+Overview
+========
+
+.. toctree::
+   :titlesonly:
+
+   overview/create_event
+   overview/tickets
+   overview/track_attendees
+   overview/track_talks

events/overview/create_event.rst

@@ -0,0 +1,101 @@
+=======================
+Create your First Event
+=======================
+
+Some of the reasons why hosting events is essential are:
+
+- To create an engaging experience with your audience;
+- To generate word of mouth about your company;
+- To allow networking;
+- To provide an opportunity for sales representatives to walk their prospects through the product
+  and even their pipeline.
+
+Get started
+===========
+
+Under the menu *Events*, have a view of all existing events and some key information, such as the
+number of expected and confirmed attendees.
+
+.. image:: media/events_dashboard.png
+   :align: center
+   :alt: Overview of events with the kanban view in Odoo Events
+
+To start a new one, click on *Create* and fill in the form with all the needed information. Enable
+*Website Menu* to have the menus *Introduction*, *Location*, and *Register* being shown on your
+event’s website page.
+
+.. image:: media/website_menu_field.png
+   :align: center
+   :alt: View of an event's form emphasizing the option website menu in Odoo Events
+
+To personalize these pages, click on *Edit* to open the
+`website builder <https://www.odoo.com/slides/slide/website-basics-643?fullscreen=1>`_, and edit
+content by dragging and dropping blocks.
+
+.. image:: media/website_edit.png
+   :align: center
+   :alt: View of an event's website page emphasizing the edit button for Odoo Events
+
+Tab: Tickets
+------------
+
+| Go to :menuselection:`Events --> Configuration --> Settings` and enable
+  :doc:`Tickets and Online Ticketing <tickets>`.
+| Now, under the *Tickets* Tab, add lines to include the different ticket types you offer. Include
+  the price, the start and end dates for registrations, and even the maximum number of tickets that
+  can be sold.
+| The *Reserved Seats* and *Unconfirmed Seat Reservations* are counted as attendees are marked as
+  :doc:`confirmed <track_attendees>` or not.
+
+.. image:: media/tickets_tab.png
+   :align: center
+   :alt: View of an event form emphasizing the tab tickets in Odoo Events
+
+Tab: Communication
+------------------
+
+| Choose the email and/or SMS message template, as well as the frequency with which you would like
+  to communicate with your attendees under the tab *Communication*.
+| Create a template on the fly or choose an existing one. Define the *Interval* (2, 7, 15..) for the
+  *Unit* (days, hours, weeks, etc.), and the *Trigger* action (after registration, after the event,
+  etc.).
+
+.. image:: media/communication_tab.png
+   :align: center
+   :alt: View of an event form and the tab communication in Odoo Events
+
+Tab: Questions
+--------------
+
+| Go to :menuselection:`Configuration --> Settings` and enable *Questions*.
+| Now, under the tab *Questions*, edit your questions and answers, choosing if you would like your
+  questionnaire to be asked per order or per registration.
+| Example of a registration for 3 attendees: if enabling the option *Ask each attendee*,
+  the questionnaire is shown 3 times, meaning that answers can vary for each attendee; if *Ask each
+  attendee* is not enabled, the questionnaire is shown once, resulting in a global answer.
+
+.. image:: media/questions_tab.png
+   :align: center
+   :alt: View of an event form and a question’s window opened in Odoo Events
+
+Once your event is *Confirmed*, you can manage attendees badges, and mark the event as
+*Finished*. Events marked as *Finished* can be *Set to draft*, putting the event back to an
+*Unconfirmed* stage from which it can be edited and used again.
+
+.. image:: media/set_to_draft.png
+   :align: center
+   :alt: View of an event’s form emphasizing the option set to draft in Odoo Events
+
+Publish your event
+------------------
+
+*Go to Website* and turn *Published* on.
+
+.. image:: media/publish_event.png
+   :align: center
+   :alt: View of a website page and the option to publish the event in Odoo Events
+
+.. seealso::
+   - :doc:`track_attendees`
+   - :doc:`tickets`
+   - :doc:`track_talks`

events/overview/tickets.rst

@@ -0,0 +1,53 @@
+===============
+Selling Tickets
+===============
+
+If you automate processes, you save time. If you give attendees multiple payment options to choose
+from, you allow flexibility and open margins for more registrations to happen.
+
+Configuration
+=============
+
+| Go to :menuselection:`Configuration --> Settings` and activate *Tickets* and *Online Ticketing*.
+| *Tickets* allow tickets to be sold :ref:`events/create_event/through_sales_orders`. *Online
+  Ticketing* allows the sale of tickets to happen :ref:`events/create_event/through_the_website`.
+
+.. image:: media/registration_tickets_online.png
+   :align: center
+   :alt: View of the settings page for Odoo Events
+
+.. _events/create_event/through_sales_orders:
+
+Through Sales Orders
+--------------------
+
+On the *Sales* application, choose the event product you created and add it as a product line. A
+window pops-up, allowing you to choose the event for which you want to create the sales order.
+
+.. image:: media/ticket_sales_order.png
+   :align: center
+   :alt: View of a sales order and the option to choose the event as the product line in Odoo Events
+
+.. important::
+   Remember to create a product form for the event registration, under *Product*, in the *Sales*
+   application, and to add that same product under your event’s form.
+
+   .. image:: media/tickets_product.png
+      :align: center
+      :alt: View of an event form highlighting the column product under the tab tickets in Odoo
+            Events
+
+.. _events/create_event/through_the_website:
+
+Through the Website
+-------------------
+
+On the website, once tickets are added to the cart, the user can continue the transaction choosing
+among the payment methods you chose to have available.
+
+.. image:: media/website_ticket_transaction.png
+   :align: center
+   :alt: View of website transaction for Odoo Events
+
+.. seealso::
+   - :doc:`../../general/payment_acquirers/payment_acquirers`

events/overview/track_attendees.rst

@@ -0,0 +1,46 @@
+====================
+Track your Attendees
+====================
+
+Attendees are at the heart of your event. Keeping track of their number and managing their
+registration and attendance is necessary for planning and analyzing reasons.
+
+Attendees list and attendance
+=============================
+
+| Once attendees have registered or bought their tickets, they are added to the *Attendees* list.
+| Tickets sold through sales orders validate attendees as soon as the quotation is confirmed.
+
+.. image:: media/attendees.png
+   :align: center
+   :alt: Overview of events with the kanban view in Odoo Events
+
+The check mark button is used to confirm the registration. Once a registration is confirmed,
+attendance can be marked.
+
+.. image:: media/attendees_registration.png
+   :align: center
+   :alt: Overview of events with the kanban view in Odoo Events
+
+Bagdes and cancellations
+------------------------
+
+On the attendees form, choose to send badges manually by clicking on *Send By Email*. *Cancel
+Registration* to have that attendee being moved to the *Cancelled* stage.
+
+.. image:: media/emails_and_cancel_registration.png
+   :align: center
+   :alt: View of an attendee form emphasizing the send by email and cancel registration in Odoo
+         Events
+
+To see a list of your canceled attendees, under *Filters*, add a *Custom Filter* choosing *Status
+> is > Cancelled*.
+
+.. image:: media/filters.png
+   :align: center
+   :alt: View of a list of the canceled attendees using the filters in Odoo Events
+
+.. seealso::
+   - :doc:`../integrations/integration_sms`
+   - :doc:`tickets`
+   - :doc:`track_talks`

events/overview/track_talks.rst

@@ -0,0 +1,49 @@
+======================
+Track and Manage Talks
+======================
+
+Allow partners to submit talk proposals so they can share their knowledge and expertise. Good
+speakers and talks are what make your event great.
+
+Configuration
+=============
+
+| Go to :menuselection:`Events --> Configuration --> Settings` and enable *Schedule & Tracks*.
+| Now, in your event's form, once *Website menu* is enabled, the options *Tracks on Website* and
+  *Track Proposals on Website* become available. Enabling them adds the menus *Talks*,
+  *Talk Proposals*, and *Agenda* to your website.
+
+.. image:: media/track_proposals_website.png
+   :align: center
+   :alt: View of an event form and the options to track and propose speaker in Odoo Events
+
+Besides having the ability to suggest their own talks, the website now allows users to see a list of
+the whole agenda and scheduled talks.
+
+.. image:: media/website_menus.png
+   :align: center
+   :alt: View of the published website and the menus talks, talk proposal and agenda in Odoo Events
+
+.. tip::
+   To handle tracks internally and not have the menus *Talks*, *Talk Proposals*, and *Agenda*
+   online, use the menu *Tracks* individually.
+
+Publishing speaker proposals
+----------------------------
+
+Once partners have filled in the appropriate form and submitted their proposals, a new *Proposal* is
+instantly created under the menu *Track*.
+
+.. image:: media/proposals_list.png
+   :align: center
+   :alt: View of the talks’ proposals page emphasizing the column proposal in Odoo Events
+
+If the proposal is accepted and can go online, simply open its form and click on *Go to Website*.
+From the website page, turn *Published* on.
+
+.. image:: media/publish_speakers.png
+   :align: center
+   :alt: View of the website page to publish a proposed talk for Odoo Events
+
+.. seealso::
+   - :doc:`../integrations/integration_sms`

expense/expense.rst

@@ -33,7 +33,7 @@ Here are some examples to configure:
 Don't forget to set an expense tax on each expense type 
 (and an account if you use Odoo Accounting). 
 It's usually a good practice to use a tax that is configured 
-with *Tax Included in Price* (see: :doc:`../accounting/fiscality/taxes/tax_included`).
+with :ref:`Tax Included in Price <taxes/included-in-price>`.
 That way, employees report expenses with 
 prices including taxes, which is usually the expected behaviour.
 

general/payment_acquirers/authorize.rst

@@ -81,7 +81,7 @@ Settings --> Transaction Response Settings --> Response/Receipt URLs`, and set t
 - | Default Receipt URL:
   | *https://[yourcompany.odoo.com]*/**payment/authorize/return**
 - | Default Relay Response URL:
-  | *https://[yourcompany.odoo.com]*/**payment/authorize/return**
+  | *https://[yourcompany.odoo.com]*/**shop/confirmation**
 
 .. note::
    | Failing to complete this step results in the following error:

iot/config/connect.rst

@@ -25,10 +25,16 @@ Ethernet Connection
 
 2. Power on the IoT Box.
 
-3. Then click on the Scan button.
+3. Read the Pairing Code from a screen or a receipt printer connected to the IoT Box.
 
-.. image:: media/connect04.png
+   .. image:: media/connect04.png
-   :align: center
+
+4. Input the Pairing Code and click on the Pair button.
+
+.. note::
+   Recent changes in modern web browsers forced us to modify the connection wizard.
+   If your screen is different from the screenshots, make sure that the
+   ``iot_pairing`` module is installed.
 
 WiFi Connection
 ~~~~~~~~~~~~~~~
@@ -37,23 +43,20 @@ WiFi Connection
 
 2. Copy the token
 
-.. image:: media/connect05.png
+   .. image:: media/connect05.png
-   :align: center
 
-1. Connect to the IoT Box WiFi Network (make sure there is no ethernet
+3. Connect to the IoT Box WiFi Network (make sure there is no ethernet
    cable plugged in your computer).
 
-.. image:: media/connect06.png
+   .. image:: media/connect06.png
-   :align: center
 
 4. You will be redirected to the IoT Box Homepage (if it doesn't work,
    connect to the IP address of the box). Give a name to your IoT Box (not
    required) and paste the token, then click on next.
 
-.. image:: media/connect07.png
+   .. image:: media/connect07.png
-   :align: center
 
-.. tip::
+   .. tip::
       If you are on Runbot, do not forget to add the -all or -base in the
       token (e.g. this token
       **http://375228-saas-11-5-iot-f3f920.runbot16.odoo.com\|4957098401**
@@ -64,8 +67,7 @@ WiFi Connection
    if there is one) and click on Submit. Wait a few seconds before being
    redirected to your database.
 
-.. image:: media/connect08.png
+   .. image:: media/connect08.png
-   :align: center
 
 You should now see the IoT Box.
 

odoo_sh/advanced/submodules.rst

@@ -102,7 +102,7 @@ You can read the `git-scm.com documentation <https://git-scm.com/book/en/v2/Git-
 for more details about the Git submodules.
 For instance, if you would like to update your submodules to have their latest revision,
 you can follow the chapter
-`Pulling in Upstream changes <https://git-scm.com/book/en/v2/Git-Tools-Submodules#_pulling_in_upstream_changes>`_.
+`Pulling in Upstream changes <https://git-scm.com/book/en/v2/Git-Tools-Submodules#_pulling_in_upstream_changes_from_the_submodule_remote>`_.
 
 Ignore modules
 ==============

odoo_sh/getting_started/branches.rst

@@ -19,7 +19,7 @@ Stages
 
 Odoo.sh offers three different stages for your branches: production, staging and development.
 
-You can change the stage of a branch by drag and dropping it on the stage section title.
+You can change the stage of a branch by drag and dropping it into the stage section title.
 
 .. image:: ./media/interface-branches-stagechange.png
    :align: center
@@ -107,7 +107,7 @@ After that, they can be automatically garbage collected to make room for new dat
 
 Merging your branches
 ---------------------
-You can merge your branches easily by drag and dropping them on each other.
+You can merge your branches easily by drag and dropping them into each other.
 
 .. image:: ./media/interface-branches-merge.png
    :align: center

planning/overview/duplicate_a_planning.rst

@@ -1,11 +1,13 @@
-============================================
+==========================================
 Create a Schedule and Make Encoding Easier
-============================================
+==========================================
+
 Organize regular schedules or forecast projects in a long term basis. Create shifts to manage your
 tasks, assign employees, and stay organized at a high level.
 
 Organize your team by roles
-============================
+===========================
+
 Go to :menuselection:`Configuration --> Roles --> Create`.
 Optionally, go to the *Employees* application, select the respective employee, and under *Work
 Information* select the *Default Planning Role*.
@@ -15,7 +17,8 @@ Information* select the *Default Planning Role*.
    :alt: Roles in Odoo Planning Application
 
 Make shifts recurrent
-======================
+=====================
+
 While creating a shift, select *Repeat* and configure as needed, saving you from the need
 of re-planning it.
 
@@ -23,32 +26,34 @@ of re-planning it.
    :align: center
    :alt: Repeat shifts in Odoo Planning Application
 
-
 .. note::
-   Repeated shifts are generated for the next six months. A modification is possible in developer
+   Repeated shifts are generated for the next six months. A modification is possible in
-   mode, from *Settings*.
+   :doc:`Developer mode <../../general/developer_mode/activate>`, from *Settings*.
+
+      .. image:: media/rate_shift_generation.png
+         :align: center
+         :alt: Repeat shifts in Odoo Planning Application
 
 .. tip::
    To duplicate a shift in the Gantt view, press CTRL + drag and drop.
 
-
 Save shifts as templates
-=========================
+========================
-If creating a shift on the fly and knowing that you will use that template in the future,
+
-click on *Save as a Template*.
+If creating a shift on the fly and know you might use that template in the future, click on *Save as
+a Template*.
 
 .. image:: media/cs3.png
    :align: center
    :alt: Save shift as a Template in Odoo Planning Application
 
-
 .. tip::
    To create a template in advance, go to :menuselection:`Configuration --> Shifts Templates -->
    Create`.
 
-
 Duplicate a planning from the previous week
-============================================
+===========================================
+
 When in the Gantt view, either under *Schedule by Employee, Role or Project*, instead of re-planning
 shifts that have been planned before, simply click on *Copy Previous Week*.
 
@@ -56,7 +61,6 @@ shifts that have been planned before, simply click on *Copy Previous Week*.
    :align: center
    :alt: Shift recurrency in Odoo Planning Application
 
-
 .. note::
    The integration with the *Time off* and *Employee* applications, show you grayed cells to the
    days when the employee does not work and is on vacation time, for example.

planning/overview/send_planned_shifts.rst

@@ -1,12 +1,14 @@
-============================================================
+===========================================================
 Send Planned Shifts and Give Employees Autonomy Over Shifts
-============================================================
+===========================================================
+
 If you are not on top of your tasks and shifts you might fall behind, loosing productivity.
 Allowing your employees to have a say over shifts helps you to be on top of your workload, and
 gives them flexibility.
 
 Publish and send the planned week by email
-===========================================
+==========================================
+
 Once you have your shifts planned, click on *Send Schedule*. Select *Include Open shift* if
 you would like the *Unassigned* shifts to be seen.
 
@@ -15,18 +17,17 @@ you would like the *Unassigned* shifts to be seen.
    :alt: Publish and Send planned shifts in Odoo Planning Application
 
 Choose if you just want to *Publish* or *Publish and Send*. If you *Publish and Send*, employees
-will get an email that will redirect them to their planned tasks:
+get an email that redirects them to their planned tasks:
 
 .. image:: media/sp2.png
    :alt: Publish and Send planned shifts in Odoo Planning Application
 
-
 .. note::
    Employees will not be able to see shifts until they have been published.
 
-
 Let employees unassign themselves from shifts
-===============================================
+=============================================
+
 Go to *Configuration* and enable *Allow Unassignment*.
 From now on, when an employee opens his tasks, he can indicate his unavailability clicking
 on *I am unavailable*. The shift will be opened again, allowing someone else to take it.
@@ -35,11 +36,9 @@ on *I am unavailable*. The shift will be opened again, allowing someone else to
    :align: center
    :alt: Allow Unassignment in Odoo Planning Application
 
-
 .. image:: media/sp4.png
    :align: center
    :alt: Allow Unassignment in Odoo Planning Application
 
-
 .. tip::
    Employees have portal access; users have access to the database.

redirects.txt

@@ -38,6 +38,7 @@ sales/sale_amazon.rst sales/amazon_connector.rst                # sale_amazon ->
 sales/sale_amazon/apply.rst sales/amazon_connector/apply.rst    # sale_amazon/* -> amazon_connector/* (#524)
 sales/sale_amazon/setup.rst sales/amazon_connector/setup.rst    # sale_amazon/* -> amazon_connector/* (#524)
 sales/sale_amazon/manage.rst sales/amazon_connector/manage.rst  # sale_amazon/* -> amazon_connector/* (#524)
+sales/amazon_connector/apply.rst sales/amazon_connector/update.rst # (#728)
 sales/sale_ebay.rst sales/ebay_connector.rst                    # sale_ebay -> ebay_connector (#524)
 sales/ebay/setup.rst sales/ebay_connector/setup.rst             # ebay/* moved to ebay_connector/* (#524)
 sales/ebay/manage.rst sales/ebay_connector/manage.rst           # ebay/* moved to ebay_connector/* (#524)
@@ -85,6 +86,9 @@ accounting/payables/supplier_bills/bills_or_receipts.rst accounting/payables/sup
 accounting/bank/reconciliation/configure.rst accounting/bank/reconciliation/reconciliation_models.rst             # configure -> reconciliation_models (#613)
 accounting/receivables/customer_payments/credit_cards.rst accounting/receivables/customer_payments/online_payment.rst # credit_cards -> online_payment
 accounting/fiscality/taxes/application.rst accounting/fiscality/taxes/fiscal_positions.rst                        # application -> fiscal_positions
+accounting/fiscality/taxes/create.rst accounting/fiscality/taxes/taxes.rst                                        # create -> taxes
+accounting/fiscality/taxes/tax_included.rst accounting/fiscality/taxes/taxes.rst                                  # tax_included -> taxes
+accounting/bank/misc/batch.rst accounting/receivables/customer_payments/batch.rst                                 # bank/misc/* -> receivables/customer_payments/*
 
 social_marketing/social_marketing.rst social_marketing/overview.rst    # social_marketing/* -> overview/* (#578)
 
@@ -153,7 +157,7 @@ helpdesk/close_tickets.rst helpdesk/advanced/close_tickets.rst
 helpdesk/invoice_time.rst helpdesk/timesheet_and_invoice/invoice_time.rst                        # (#565)
 helpdesk/reinvoice_from_project.rst helpdesk/timesheet_and_invoice/reinvoice_from_project.rst    # (#565)
 
-# Redirections introduced in 13.2 :
+# Redirections introduced in 13.3 :
 
 planning/duplicate_a_planning.rst planning/overview/duplicate_a_planning.rst    # (#567)
 planning/send_planned_shifts.rst planning/overview/send_planned_shifts.rst      # (#567)

sales/amazon_connector.rst

@@ -5,6 +5,7 @@ Amazon Connector
 .. toctree::
    :titlesonly:
 
-   amazon_connector/apply
+   amazon_connector/features
    amazon_connector/setup
    amazon_connector/manage
+   amazon_connector/update

sales/amazon_connector/apply.rst

@@ -1,10 +0,0 @@
-================================
-Apply for Amazon MWS Access Keys
-================================
-
-.. _amazon/developer-form:
-
-.. warning::
-   | The authentication mechanism that previously used MWS keys is no longer authorized by Amazon
-     and will soon be replaced by another flow.
-   | This page will be updated accordingly in the coming weeks.

sales/amazon_connector/features.rst

@@ -0,0 +1,51 @@
+====================================
+Amazon Connector: supported features
+====================================
+
+The **Amazon Connector** synchronizes the orders between Amazon and your Odoo database, which
+reduces considerably the amount of time spent on your Amazon Seller Central dashboard, making your
+daily routine a lot easier.
+
+The connector is able to:
+
+- Synchronize (Amazon to Odoo) all confirmed orders (both FBA and FBM) and their order items which
+  include:
+
+  - the product’s name, description and quantity
+  - the shipping costs for the product
+  - the gift wrapping charges
+
+- Create on Odoo any missing partner related to an order (contact types supported: contact and
+  delivery).
+- Notify Amazon of a shipping confirmed on Odoo (FBM) in order to get paid.
+
+- Support multiple seller accounts.
+- Support multiple marketplaces per seller account.
+
++----------------------+----------------------------+-------------------------------------+
+|                      | Fulfilled By Amazon (FBA)  | Fulfilled By Merchant (FBM)         |
++======================+============================+=====================================+
+| **Orders**           | Synchronize shipped and    | Synchronize unshipped and canceled  |
+|                      | canceled orders            | orders                              |
++----------------------+----------------------------+-------------------------------------+
+| **Shipping**         | - Charges                  | - Charges                           |
+|                      |                            | - Delivery created                  |
++----------------------+----------------------------+-------------------------------------+
+| **Gift Wrapping**    | Handled by Amazon          | - Gift wrapping charges             |
+|                      |                            | - Gift message                      |
++----------------------+----------------------------+-------------------------------------+
+| **Stock Management** | One stock move created     | Handled by the delivery             |
+|                      | per sales order item       |                                     |
++----------------------+----------------------------+-------------------------------------+
+| **Confirmation**     | Handled by Amazon          | Notify Amazon when confirming       |
+|                      |                            | delivery                            |
++----------------------+----------------------------+-------------------------------------+
+
+.. note::
+   The connector is designed to synchronize orders' data as detailed above. Other actions, such as
+   downloading monthly fees report, handling disputes, or issuing refunds must be managed from
+   Amazon Seller Central, as usual.
+
+.. seealso::
+   - :doc:`setup`
+   - :doc:`manage`

sales/amazon_connector/manage.rst

@@ -12,12 +12,6 @@ and **Canceled** orders are fetched. For **FBM** (Fulfilled by Merchant), the sa
 **Unshipped** and **Canceled** orders. For each synchronized order, a sales order and a customer are
 created in Odoo if they are not yet registered.
 
-.. note::
-   If you did not request access to Personally Identifiable Information of your customers in the
-   :ref:`Developer Registration and Assessment form <amazon/developer-form>`, the customers are
-   created anonymously (the name, postal address and phone number are omitted) and named
-   **Amazon Customer**.
-
 When an order is canceled in Amazon and was already synchronized in Odoo, the corresponding sales
 order is automatically canceled in Odoo.
 
@@ -31,8 +25,7 @@ order is automatically canceled in Odoo.
 .. tip::
    To synchronize immediately the orders of your Amazon account switch to
    :doc:`Developer mode <../../general/developer_mode/activate>`, head to your Amazon account and
-   click on **SYNC ORDERS**. The same can be done with order cancellations and pickings by clicking
+   click on **SYNC ORDERS**. The same can be done with pickings by clicking on **SYNC PICKINGS**.
-   on **SYNC CANCELLATIONS** and **SYNC PICKINGS**.
 
 Manage deliveries in FBM
 ========================
@@ -99,3 +92,7 @@ reporting for the sales of this account.
    Then, create another registration for this account and remove all marketplaces, except the one to
    isolate from the others. Finally, assign another sales team to one of the two registrations of
    your account.
+
+.. seealso::
+   - :doc:`features`
+   - :doc:`setup`

sales/amazon_connector/setup.rst

@@ -2,16 +2,67 @@
 Configure Amazon Connector in Odoo
 ==================================
 
+Generate an Authorization Token in Seller Central
+=================================================
+
+.. _amazon/generate_auth_token:
+
+The Amazon Connector uses an Authorization Token that allows Odoo to fetch data from your Amazon
+Seller Central account. This token can be obtained directly through Seller Central in a few clicks
+and needs to be set up in your Odoo database configuration.
+
+Connect to your Seller Central account for the marketplace you initially signed
+up (e.g. if you created your account on Amazon Germany, go to `Amazon Seller
+Central for Germany <https://sellercentral.amazon.de>`_) with an administrator account.
+
+.. note::
+  You might need to use the *main* (or first) administrator account and not one
+  added subsequently.
+
+In the main menu, select :menuselection:`Apps & Services --> Manage Your Apps`;
+in the page that displays, click on the ``Authorize new developper`` button:
+
+.. image:: ./media/seller_central_apps.png
+  :align: center
+
+Fill in the form depending on your Marketplace:
+
+.. image:: ./media/seller_central_form.png
+  :align: center
+
+If your seller account is registered in the **North America** region, use these values:
+
+- Developer's Name: ``Odoo S.A.``
+- Developer ID: ``586127723692``
+
+For the **Europe** region, use these values:
+
+- Developer's Name: ``Odoo S.A.``
+- Developer ID: ``579095187166``
+
+Amazon will then inform you that by submitting the form, you are giving access
+to your Seller Central Information to Odoo S.A.
+
+.. note::
+    Odoo S.A. is unable to access your Amazon account's information without the
+    Authorization Token which is stored in your Odoo database - we do not store
+    these tokens on our platform directly and are therefore unable to access
+    your account's information outside of the Amazon Connector normal flows.
+
 Register your Amazon account in Odoo
 ====================================
 
+.. _amazon/setup:
+
 To register your seller account in Odoo, navigate to :menuselection:`Sales --> Configuration
 --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts` and click on **CREATE**.
 
 The **Seller ID** can be found in Seller Central under the link **Your Merchant Token** on the
-**Seller Account Information** page. The **Access Key** and the **Secret Key** can be found in
+**Seller Account Information** page. The **Authorization Token** is the one you generated in the
-Developer Central (where the :ref:`Developer Registration and Assessment form
+:ref:`previous step <amazon/generate_auth_token>`.
-<amazon/developer-form>` was located).
+
+Upon saving, your credentials are checked. In case of issues, an error will be displayed - the
+information cannot be saved until your credentials are recognized by Amazon.
 
 Once the account is registered, the marketplaces available to this account are synchronized and
 listed under the **Marketplaces** tab. If you wish, you can remove some items from the list of
@@ -63,3 +114,49 @@ the subtotals between Seller Central and Odoo.
    As Amazon does not necessarily apply the same taxes as those configured in Odoo, it may happen
    that order totals differ by a few cents from that on Seller Central. Those differences can be
    resolved with a write-off when reconciling the payments in Odoo.
+
+Add an unsupported marketplace to the Amazon Connector
+======================================================
+
+Some Amazon Marketplaces, such as Amazon Brazil or Amazon Netherlands, are
+not included by default in the Amazon Connector list of possible marketplaces.
+
+These marketplaces can be added manually should you wish to use them.
+
+.. important::
+    These marketplaces are not officially supported by Odoo - there is no guarantee
+    that adding a new marketplace as described here will work, nor can this be considered
+    as a bug when contacting Odoo Support.
+
+.. note::
+    Amazon marketplaces are only supported in the European and North American region;
+    though Amazon includes Brazil with the North American region and India in the
+    European region, so your mileage may vary; check the `Amazon Documentation
+    <https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html>`_
+    to know to which region your marketplace belongs.
+
+To add a new marketplace, you must first enable 
+:doc:`Developer mode <../../general/developer_mode/activate>`.
+
+Once that is done, go to :menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync -->
+Amazon Marketplaces`.
+
+From there, you can create a new marketplace record. You will need the Marketplace ID and Endpoint for your
+marketplace as described in the
+`Amazon Documentation <https://docs.developer.amazonservices.com/en_US/dev_guide/DG_Endpoints.html>`_.
+
+Set the name of the record to ``Amazon.<domain>`` to easily retrieve it. The **Code**, **Domain** and
+**API Identifier** fields should contain the *Country Code*, *Amazon MWS Endpoint* and *MarkteplaceId*
+values from the Amazon Documentation respectively.
+
+Once the marketplace is saved, you should then update the Amazon Account configuration by going to 
+:menuselection:`Sales --> Configuration --> Settings --> Connectors --> Amazon Sync --> Amazon Accounts`,
+open the account on which you wish to use the new marketplace, go to the **Marketplaces** tab and click
+on **Update available marketplaces** (an animation should confirm the success of the operation). You can then
+edit the Amazon Account to add the new marketplace in the list of synchronized marketplaces - if the new
+marketplace is not available in the list, it means it is either incompatible with the account's region or
+simply that it is not supported by the Amazon Connector.
+
+.. seealso::
+   - :doc:`features`
+   - :doc:`manage`

sales/amazon_connector/update.rst

@@ -0,0 +1,75 @@
+==================================================
+Install the Amazon Connector Authentication Update
+==================================================
+
+Starting July 2020, the Amazon Connector requires the use of a new authentication
+method that makes it easier for you to set up the Connector.
+
+Prior to the update, Odoo customers who wished to use the Amazon Connector had
+to apply to get developer credentials through Amazon, which was a painful and long
+process that could take weeks. This method of authentication is still technically
+possible, but Amazon will refuse to provide developer credentials for Odoo customers
+from July 2020 onwards and will deactivate such credentials for existing customers.
+
+This documentation will help you install the update and use the new authentication
+flow.
+
+Note that if your Odoo database was first created after the update was released, the
+update module is installed automatically. You can check if this module is already installed
+by going to the  **Apps** menu, removing the ``Apps`` search facet and search for ``amazon``.
+If the module **Amazon/Authentication Patch** is present and marked as installed, your Odoo
+database is already up-to-date and you can proceed with the :doc:`setup <setup>` step
+of the Amazon Connector.
+
+Update Odoo to the latest release
+=================================
+
+The new authentication mechanism is made available through a new Odoo module; to
+be able to install it, you must make sure that your Odoo source code is up-to-date.
+
+If you use Odoo on Odoo.com or Odoo.sh platform, your code is already up-to-date and
+you can proceed to the next step.
+
+If you use Odoo with an on-premise setup or through a partner, then you must update
+your installation as detailed in
+`this documentation page <https://www.odoo.com/documentation/13.0/setup/update.html>`_
+or by contacting your integrating partner.
+
+Update the list of available modules
+====================================
+
+New modules must be *discovered* by your Odoo instance to be available in the **Apps**
+menu.
+
+To do so, activate the :doc:`Developer Mode <../../../general/developer_mode/activate>`, and go to
+:menuselection:`Apps --> Update Apps List`. A wizard will ask for confirmation.
+
+Install the Amazon/Authentication Patch
+=======================================
+
+.. warning::
+    You should never install new modules in your production database without testing
+    them in a duplicate or staging environment. For Odoo.com customers, a duplicate database
+    can be created from the database management page as explained in 
+    :doc:`this documentation page <../../db_management/db_online>`. For
+    Odoo.sh users, you should use a staging or duplicate database. For on-premise users,
+    you should use a staging environment - you should contact your integrating partner for
+    more information regarding how to test a new module in your particular setup.
+
+The module should now be available in your **Apps** menu. Remove the ``Apps`` search facet
+and search for ``amazon``; the module **Amazon/Authentication Patch** should be available for
+installation. If you cannot find the module after having updated the list of available
+modules, it means your Odoo source code is not up-to-date; refer to step one of this
+page.
+
+.. image:: ./media/auth_module.png
+  :align: center
+
+Once the module is installed, you will need to generate an Authorization Token in Amazon
+Seller Central and set it up on your Amazon Account in Odoo; this process is detailed
+in the :doc:`setup <setup>` page.
+
+.. seealso::
+   - :doc:`features`
+   - :doc:`setup`
+   - :doc:`manage`

sales/products_prices/taxes.rst

@@ -7,7 +7,7 @@ Set taxes
 
    ../../accounting/fiscality/taxes/default_taxes
    ../../accounting/fiscality/taxes/fiscal_positions
-   ../../accounting/fiscality/taxes/tax_included
+   ../../accounting/fiscality/taxes/taxes
    ../../accounting/fiscality/taxes/taxcloud
    ../../accounting/fiscality/taxes/B2B_B2C
 

studio.rst

@@ -9,3 +9,4 @@ Studio
 
    studio/concepts
    studio/use_cases
+   studio/how_to

studio/how_to.rst

@@ -0,0 +1,10 @@
+======
+How To
+======
+
+.. toctree::
+   :titlesonly:
+
+   how_to/rainbow_man
+   how_to/reports
+   how_to/export_import

studio/how_to/export_import.rst

@@ -0,0 +1,28 @@
+=========================
+Export and Import Modules
+=========================
+
+When you do customizations in Odoo Studio, a new module is created in your database, making it easy
+to use Studio for prototyping.
+
+To export these customizations, activate Studio on the main dashboard and, under the menu
+*Customizations*, click on *Export*. The default filename is *customizations.zip*.
+
+.. image:: media/export_import/customizations_menu.png
+   :align: center
+   :alt: View of the menu customizations in Odoo Studio
+
+| The module created contains the definition of custom models and fields, as well as the UI elements
+  of any customization in an XML format.
+| To import and install the customizations in another instance, connect to the destination database,
+  activate Studio and, under *Customizations*, click on *Import*.
+
+.. image:: media/export_import/import_modules.png
+   :align: center
+   :alt: View of the import modules window for Odoo Studio
+
+.. warning::
+   Studio does not know which apps are customized (because the same view can be modified on
+   different apps), therefore, it *does not* add the underlying modules as dependencies of the
+   exported module. In other words, the applications installed on the source database should be
+   installed on the destination database.