[IMP] subscriptions: overhaul of the basic docs

This commit improves the structure of the Subscription doc and updates
its content (recurring products, subscription plans, sales flow)

task-3222232

Co-authored-by: Xavier Platteau <xpl@odoo.com>
Co-authored-by: Tom Aarab <toaa@odoo.com>"

content/applications/finance/accounting/receivables/customer_invoices/overview.rst

@@ -103,7 +103,7 @@ The frequency of the invoicing and the services/products invoiced are
 defined on the contract.
 
 .. seealso::
-   - :doc:`/applications/sales/sales/invoicing/subscriptions`
+   - :doc:`/applications/sales/subscriptions`
 
 Others
 ======

content/applications/finance/accounting/receivables/customer_payments/batch.rst

@@ -1,99 +1,71 @@
-==================================================
-Batch payments: Batch deposits (checks, cash etc.)
-==================================================
+==============================
+Batch payments by bank deposit
+==============================
 
-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.
+A **batch deposit** is a convenient way to group customer payments and deposit them into your bank
+account. The feature lets you list multiple payments and generate a detailed deposit slip with a
+batch reference. This reference can be used when reconciling to match bank statement lines with
+transactions 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:: batch/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.
+Go to :menuselection:`Accounting --> Configuration --> Settings --> Customer Payments` and tick
+:guilabel:`Batch Payments` to activate the feature.
 
 Deposit multiple payments in batch
 ==================================
 
-Record payments to deposit in batch
------------------------------------
+Register payments
+-----------------
 
-: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.
+Before performing a batch deposit, it is necessary to register each transaction's payment. To do so,
+open the corresponding customer invoice and click :guilabel:`Register Payment`. In the pop-up
+window, select the :guilabel:`Journal` linked to your bank account and :guilabel:`Batch Deposit` as
+the :guilabel:`Payment Method`, and click :guilabel:`Create Payment`.
 
-.. image:: batch/batch-register-payment.png
+.. image:: batch/batch-payments.png
    :align: center
-   :alt: Registering a customer payment as part of a Batch Deposit in Odoo Accounting
+   :alt: Registering a customer payment as part of a batch deposit
 
-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
+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*.
+To add payments to a batch deposit, go to :menuselection:`Accounting --> Customers --> Batch
+Payments`, and click :guilabel:`New`. Next, select the :guilabel:`Bank` and choose :guilabel:`Batch
+Deposit` as the :guilabel:`Payment Method`.
 
-.. image:: batch/batch-new-inbound.png
+.. image:: batch/batch-customer-payment.png
    :align: center
-   :alt: Filling out a new Inbound Batch Payment form on Odoo Accounting
+   :alt: Filling out a new inbound batch payment form
 
-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*.
+Click :guilabel:`Add a line`. In the pop-up window, tick all payments to include in the batch
+deposit, then click :guilabel:`Select`.
 
-.. image:: batch/batch-payments-selection.png
+.. image:: batch/batch-lines-selection.png
    :align: center
-   :alt: Selection of all payments to include in the Batch Deposit
+   :alt: Selecting 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.
+Once done, click :guilabel:`Validate` to finalize the batch deposit.
 
-Bank Reconciliation
+.. tip::
+   Click :guilabel:`Print` to download a PDF file to include with the deposit slip.
+
+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.
+Once the bank transactions are on your database, you can reconcile bank statement lines with the
+batch payment. To do so, go to the :guilabel:`Accounting Dashboard` and click :guilabel:`Reconcile
+Items` on the related bank account. Go to the :guilabel:`Batch Payments` tab to select a specific
+batch and click :guilabel:`Validate` to finalize the process.
+
+.. image:: batch/batch-reconciliation.png
+   :align: center
+   :alt: Reconciling the batch payment with all its transactions
 
 .. note::
-   The *Batch Payments* tab won't appear if a Partner is selected for this bank statement line.
-
-.. image:: batch/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.
+   If a specific payment could not be processed by the bank or is missing, remove the related
+   payment before reconciling.
 
 .. seealso::
    - :doc:`recording`

content/applications/inventory_and_mrp/inventory/management.rst

@@ -10,7 +10,6 @@ Warehouse Management
 
    management/products
    management/warehouses
-   management/replenishment_strategies
    management/inventory_adjustments
    management/delivery
    management/incoming

content/applications/inventory_and_mrp/inventory/management/replenishment_strategies.rst

@@ -1,11 +0,0 @@
-:nosearch:
-
-========================
-Replenishment strategies
-========================
-
-.. toctree::
-   :titlesonly:
-   :glob:
-
-   replenishment_strategies/virtual_warehouses

content/applications/inventory_and_mrp/inventory/management/replenishment_strategies/virtual_warehouses.rst

@@ -1,53 +0,0 @@
-===============================
-Resupply from another Warehouse
-===============================
-
-Configuration
-=============
-
-In order to be able to resupply from another warehouse, you need to
-activate \*multi-step routes\*.
-
-.. image:: virtual_warehouses/virtual-warehouses-settings.png
-   :align: center
-   :alt: Enable Multi-Step Routes in an Odoo database's settings
-
-You can then access your warehouses via :menuselection:`Inventory --> Configuration -->
-Warehouses`.
-Enter the warehouse which should be resupplied by another one. You will
-have the possibility to directly indicate through which warehouse it
-gets resupplied.
-
-.. image:: virtual_warehouses/virtual_warehouses_02.png
-   :align: center
-
-By activating this option, a new route will now be available on your
-products \*Supply Product from Second warehouse\*. It can now be
-selected, along with either a \*reordering rule\* or a \*make to
-order\*.
-
-.. image:: virtual_warehouses/virtual_warehouses_03.png
-   :align: center
-
-For the demonstration, I set a reordering rule with a minimum of 5 units
-in stock and a maximum of 10 units in stock, having currently 0 units on
-hand. I will run the scheduler by going to :menuselection:`Inventory --> Operations -->
-Run scheduler`.
-
-.. image:: virtual_warehouses/virtual_warehouses_04.png
-   :align: center
-
-The system automatically creates two pickings, one \*delivery order\*
-from my Second Warehouse which contains the necessary products, and a
-receipt in my main warehouse WH/Stock for the same products. The source
-document is the \*reordering rule\* which triggered the route \*Supply
-Product from Second warehouse\*.
-
-.. image:: virtual_warehouses/virtual_warehouses_05.png
-   :align: center
-
-.. image:: virtual_warehouses/virtual_warehouses_06.png
-   :align: center
-
-.. image:: virtual_warehouses/virtual_warehouses_07.png
-   :align: center

content/applications/inventory_and_mrp/inventory/management/warehouses.rst

@@ -8,5 +8,6 @@ Warehouses
    :titlesonly:
    :glob:
 
-   warehouses/warehouses_locations
    warehouses/resupply_warehouses
+   warehouses/warehouse_replenishment_transfer
+   warehouses/warehouses_locations

content/applications/inventory_and_mrp/inventory/management/warehouses/warehouse_replenishment_transfer.rst

@@ -0,0 +1,150 @@
+========================================================
+Transfer products between warehouses using replenishment
+========================================================
+
+For companies that use multiple warehouses, it is often necessary to transfer items between them.
+This is referred to as an *inter-warehouse transfer*. Odoo *Inventory* handles the administrative
+process of inter-warehouse transfers to ensure that inventory counts remain accurate during and
+after the transfer. This document will detail the method for conducting an inter-warehouse transfer
+using replenishment.
+
+Configure warehouses for inter-warehouse replenishment
+======================================================
+
+First, ensure the :guilabel:`Multi-Step Routes` setting is enabled by navigating to
+:menuselection:`Inventory --> Configuration --> Settings`, and then check the box under the
+:guilabel:`Warehouse` tab. This will provide additional configuration options when creating a second
+warehouse that are needed for inter-warehouse replenishment.
+
+By default, Odoo comes with a main warehouse already configured. If an additional warehouse has not
+already been created, do so now from the :guilabel:`Inventory` module by selecting
+:menuselection:`Configuration --> Warehouses --> Create`. Otherwise, select the warehouse that
+products will be transferred to from the :guilabel:`Warehouses` page and then click :guilabel:`Edit`
+to change its settings. Configure the warehouse as follows:
+
+- :guilabel:`Warehouse`: choose a name that is not already being used for another warehouse (e.g.
+  `Alternative Warehouse`)
+- :guilabel:`Short Name`: choose a short name by which the warehouse will be identified (e.g.
+  `ALT_WH`)
+
+Click :guilabel:`Save` and the new warehouse will be created. In addition, a new :guilabel:`Resupply
+From` field will appear on the warehouse's form. Click :guilabel:`Edit` and then check the box next
+to the warehouse that will be used to resupply the warehouse that is currently being configured.
+
+.. image:: warehouse_replenishment_transfer/new-warehouse-configuration.png
+   :align: center
+   :alt: A warehouse settings form configured to allow resupplying between warehouses.
+
+.. note::
+   For the purposes of this demonstration, the warehouse that products are transferred from
+   (outgoing) will be titled "San Francisco", and the warehouse that products are transferred to
+   (incoming) will be titled "San Francisco 2".
+
+Configure products for inter-warehouse replenishment
+====================================================
+
+Products must also be configured properly in order for them to be transferred between warehouses.
+Navigate to :menuselection:`Inventory --> Products --> Products` and select an existing product or
+:guilabel:`Create` a new one, if necessary.
+
+Then, on the product form, go to the :guilabel:`Inventory` tab and enable the checkbox for
+:guilabel:`X: Supply Product from Y`, with *X* being the warehouse receiving the transferred
+products and *Y* being the warehouse that products are transferred from.
+
+.. image:: warehouse_replenishment_transfer/product-transfer-configuration.png
+   :align: center
+   :alt: Enable the checkbox to resupply one warehouse from another.
+
+Replenish one warehouse from another
+====================================
+
+Starting in the :menuselection:`Inventory` module, select :menuselection:`Products --> Products` and
+then choose the product that will be replenished. Click the :guilabel:`Replenish` button on the top
+left of the product page and fill out the pop-up form as follows:
+
+- :guilabel:`Quantity`: the number of units that will be sent to the warehouse being replenished
+- :guilabel:`Scheduled Date`: the date that the replenishment is scheduled to take place
+- :guilabel:`Warehouse`: the warehouse that will be replenished
+- :guilabel:`Preferred Routes`: select `X: Supply Product from Y`, with *X* being the warehouse to
+  be replenished and *Y* being the warehouse that the product will be transferred from
+
+.. image:: warehouse_replenishment_transfer/product-replenishment-form.png
+   :align: center
+   :alt: The form for replenishing a product.
+
+Click :guilabel:`Confirm` and a delivery order will be created for the outgoing warehouse along with
+a receipt for the warehouse that will receive the product. Depending on the configuration settings
+for the outgoing and incoming warehouses, processing delivery orders and receipts will require
+between one and three steps. This document will detail how to process one-step deliveries and
+receipts.
+
+Process the delivery order
+--------------------------
+
+The first stage of a replenishment order is processing the delivery from the warehouse that the
+product is being transferred from. On the :menuselection:`Inventory` dashboard, select the
+:guilabel:`X to Process` button on the :guilabel:`Delivery Orders` card for the outgoing warehouse,
+then the delivery order created for the replenishment. On the delivery order page, click the
+:guilabel:`Check Availability` button in the top left to reserve the quantity of the product to be
+transferred. Once the delivery has been dispatched, click the :guilabel:`Validate` button to
+register the quantities shipped.
+
+.. image:: warehouse_replenishment_transfer/delivery-orders-card.png
+   :align: center
+   :alt: The delivery orders card for the outgoing warehouse.
+
+Process the receipt
+-------------------
+
+Once the goods arrive at the incoming warehouse, the receipt created for that warehouse must be
+processed as well. Return to the :menuselection:`Inventory` dashboard and select the :guilabel:`X to
+Process` button on the :guilabel:`Receipts` card for the incoming warehouse, then the receipt
+created for the replenishment. On the receipt page, click the :guilabel:`Validate` button in the top
+left of the page to register the quantities received.
+
+.. image:: warehouse_replenishment_transfer/receipts-card.png
+   :align: center
+   :alt: The delivery orders card for the outgoing warehouse.
+
+After processing the receipt, the products transferred will now appear in the inventory of the
+incoming warehouse. The stock numbers for both warehouses can be viewed by returning to the product
+page and selecting the :guilabel:`X Units On Hand` button at the top of the screen.
+
+Automate inter-warehouse replenishment
+======================================
+
+Using reordering rules, it is possible to automate the process of replenishing one warehouse from
+another.
+
+To get started, navigate to :menuselection:`Inventory --> Products --> Products`, and then
+choose the product that will be replenished. From the product page, select the :guilabel:`Reordering
+Rules` smart button at the top of the form, and then on the next page, click :guilabel:`Create` to
+configure the form as follows:
+
+- :guilabel:`Location`: the location that the reordering rule will replenish when triggered, in this
+  case, the incoming warehouse
+- :guilabel:`Min Quantity`: when the quantity on hand at the incoming warehouse falls below this
+  number, the reordering rule will be triggered
+- :guilabel:`Max Quantity`: when the reordering rule is triggered, the product will be replenished
+  at the incoming warehouse up to this quantity
+- :guilabel:`Multiple Quantity`: specify if the product should be replenished in batches of a
+  certain quantity; for example, a product could be replenished in batches of 20
+- :guilabel:`UoM`: the unit of measure used for reordering the product; this value can simply be
+  `Units`, or a specific unit of measurement for weight, length, etc.
+
+.. image:: warehouse_replenishment_transfer/reordering-rule-configuration.png
+   :align: center
+   :alt: A fully configured reordering rule.
+
+Finish by clicking :guilabel:`Save` and the reordering rule will be created. Now, when the scheduler
+runs automatically each day, a transfer will be created for each reordering rule that has been
+triggered.
+
+.. tip::
+   To manually trigger reordering rules, start from the :menuselection:`Inventory` module and select
+   :menuselection:`Operation --> Run Scheduler`, then click the green :guilabel:`Run Scheduler`
+   button in the pop-up that appears.
+
+After the scheduler runs, a delivery order and receipt will be created for the outgoing and incoming
+warehouses, respectively. Both the delivery order and receipt should be processed using the same
+method as detailed above.

content/applications/inventory_and_mrp/inventory/routes/concepts.rst

@@ -9,6 +9,5 @@ Concepts
    :glob:
 
    concepts/use_routes
-   concepts/inter_warehouse
    concepts/cross_dock
    concepts/stock_warehouses

content/applications/inventory_and_mrp/inventory/routes/concepts/inter_warehouse.rst

@@ -1,71 +0,0 @@
-=========================
-Inter-warehouse transfers
-=========================
-
-When owning several warehouses, goods might need to be transferred from one warehouse to another.
-This type of transfer is called an *inter-warehouse transfer*. While physically performing the
-inter-warehouse transfer might be simple, the administrative part can be complex. Fortunately, Odoo
-comes with an intuitive flow that helps save time when registering inter-warehouse transfers.
-
-Create an internal transfer
-===========================
-
-The following paragraphs detail a sample inter-warehouse transfer, referred to as an *internal
-transfer*, use case. The sample use case assumes that the user has already configured their second
-warehouse.
-
-To transfer eight units of a product from the first warehouse to another one, proceed as follows:
-
-From the :guilabel:`Inventory` dashboard, select an internal movement operation of one of the two
-warehouses. To do so, click on the three vertical dots icon on the top right corner of the
-operation card and select :guilabel:`Planned Transfer`.
-
-.. image:: inter_warehouse/internal-transfer-choice.png
-   :align: center
-   :alt: View of the choice between planned transfer and immediate transfer.
-
-On the new planned transfer form, select the :guilabel:`Source Location` (in this case, the first
-warehouse) and the :guilabel:`Destination Location` (in this case, the second warehouse).
-
-Next, add the products that will be transferred by clicking on :guilabel:`Add a line`, then click
-on :guilabel:`Save` and :guilabel:`Mark as ToDo` once done. After that, Odoo puts the transfer in
-the :guilabel:`Waiting` status. Then, click on :guilabel:`Reserve` to reserve the number of
-products in the source warehouse.
-
-.. image:: inter_warehouse/planned-internal-transfer.png
-   :align: center
-   :alt: View of the internal transfer form.
-
-.. note::
-   If :guilabel:`Immediate Transfer` was selected instead of :guilabel:`Planned Transfer`, Odoo
-   processes the transfer automatically after the :guilabel:`Validate` button is clicked on the
-   internal transfer form.
-
-It is also possible to manually transfer each product:
-
-#. On the :guilabel:`Inventory` dashboard, open the souce location's internal transfer operation
-   page.
-
-.. image:: inter_warehouse/in-progress-internal-transfer.png
-   :align: center
-   :alt: View of the dashboard with a zoom of the pending internal transfer.
-
-#. Open the desired transfer order form.
-
-.. image:: inter_warehouse/internal-transfers-list.png
-   :align: center
-   :alt: View of the pending internal transfers list.
-
-#. Click on the pencil icon in the lower right corner to open the operation details window. In this
-   new window, the quantity of products can be manually set.
-
-.. image:: inter_warehouse/backorder.png
-   :align: center
-   :alt: View of a backorder pop-up window because all products are not moved at the same time.
-
-.. note::
-   To process the transfer order partially (e.g., a part of the products can't be shipped yet due
-   to an unexpected event), Odoo automatically asks if a *backorder* should be created.
-
-   - Create a backorder if it is expected that the remaining products will be processed later.
-   - Do not create a backorder if the remaining products will not be supplied/received.

content/applications/marketing/sms_marketing.rst

@@ -13,4 +13,5 @@ SMS Marketing
 .. toctree::
    :titlesonly:
 
+   sms_marketing/essentials
    sms_marketing/pricing

content/applications/marketing/sms_marketing/essentials.rst

@@ -0,0 +1,12 @@
+:nosearch:
+
+==========
+Essentials
+==========
+
+.. toctree::
+   :titlesonly:
+
+   essentials/sms_essentials
+   essentials/sms_campaign_settings
+   essentials/mailing_lists_blacklists

content/applications/marketing/sms_marketing/essentials/mailing_lists_blacklists.rst

@@ -0,0 +1,145 @@
+============================
+Mailing lists and blacklists
+============================
+
+Creating or importing mailing lists in Odoo is very useful when curating content to specific groups
+of people that already share similar demographics or interests. Mailing lists are also a great way
+to get started if a company is migrating from another system, and already has a established
+audience.
+
+Moreover, providing an audience with the option to 'unsubscribe' from mailings, helps businesses
+maintain good customer relations, by giving recipients the power to control what they are (and
+aren't) sent.
+
+Mailing lists
+=============
+
+In the :guilabel:`SMS Marketing` app, there's an option on the header menu called :guilabel:`Mailing
+Lists`. When clicked, a sub-menu is revealed with options for :guilabel:`Mailing Lists` and
+:guilabel:`Mailing List Contacts`.
+
+Click :menuselection:`Mailing Lists --> Mailing Lists` to see an overview of all mailing lists in
+the database.
+
+.. image:: mailing_lists_blacklists/mailing-list-main-page.png
+   :align: center
+   :alt: View of the main SMS mailing list page on the Odoo SMS Marketing application.
+
+To edit any existing list, select the desired list from the :guilabel:`Mailing Lists` page, and
+proceed to modify it in a number of ways.
+
+To create a new mailing list, click :guilabel:`Create` in the upper left corner of the
+:guilabel:`Mailing Lists` page. Doing so, will reveal a blank mailing list template form.
+
+.. image:: mailing_lists_blacklists/sms-mailing-list-popup.png
+   :align: center
+   :alt: View of the mailing list pop-up window in Odoo SMS Marketing.
+
+First, choose a name for the :guilabel:`Mailing List`, and activate the option :guilabel:`Is
+Public`, to make the mailing list accessible to recipients on the :guilabel:`Subscription Management
+page`. Doing so allows users to update their subscription preferences at any time.
+
+.. note::
+   Checking the :guilabel:`Is Public` box is not required, but is recommended to maintain good
+   customer relations.
+
+When those fields are filled in, click :guilabel:`Create` to finalize the form. Then on the main
+:guilabel:`Mailing Lists` dashboard, the new mailing list that was just created will be accessible.
+
+To edit or customize the mailing list further, select the mailing list from the main
+:guilabel:`Mailing Lists` page to reveal the mailing list detail form.
+
+Along the top of the mailing list detail form, there are various analytical smart buttons displaying
+statistics for different metrics related to the mailing list (e.g. :guilabel:`Recipients`,
+:guilabel:`Mailings`, etc.).
+
+To review or edit any of those elements, click the desired smart button to reveal a separate page
+with in-depth data associated with the mailing list.
+
+To make changes to the mailing list itself, click the :guilabel:`Edit` button in the upper-left
+corner of the mailing list detail form.
+
+.. image:: mailing_lists_blacklists/sms-mailing-list.png
+   :align: center
+   :alt: View of the mailing list template form in Odoo SMS Marketing.
+
+.. note::
+   Don't forget to hit the :guilabel:`Save` button once changes have been made.
+
+Mailing lists contacts
+======================
+
+Access contacts information from one or more mailing lists navigate to :menuselection:`Mailing Lists
+--> Mailing List Contacts` to reveal a dashboard with with all the contacts associated with one or
+more of the configured mailing lists in the database.
+
+.. image:: mailing_lists_blacklists/mailing-list-contacts-page.png
+   :align: center
+   :alt: View of the mailing lists contact page in the Odoo SMS Marketing application.
+
+.. note::
+   By default, Odoo reveals the :guilabel:`Mailing List Contacts` page with the :guilabel:`Exclude
+   Blacklisted Phone` filter in the search bar. Therefore only showing contact information for
+   recipients who still want to receive communications and mailings.
+
+Communication history in the Chatter
+------------------------------------
+
+An accessible record of every sent mailing(s) is kept on each recipient's *chatter* section, located
+beneath a recipient's contact form (in the *Contacts* application).
+
+Database users can reference the chatter to easily keep track of communications, and see a history
+of interactions with contacts and prospects.
+
+For example, sales representatives can use the chatter to quickly find out which :abbr:`SMS (Short
+Message Service)` mailing promotions a certain customer has received (or not received).
+
+.. image:: mailing_lists_blacklists/sms-marketing-chatter.png
+   :align: center
+   :alt: View of what the chatter looks like in the Odoo Contacts app.
+
+Blacklist
+=========
+
+Odoo *SMS Marketing* has a :guilabel:`Blacklist` feature that provides recipients with the power to
+add their phone number to a list of people who no longer want to receieve communications or
+mailings.
+
+This is also known as the unsubscribe process: customers will automatically be added onto a
+*blacklist*, if they click :guilabel:`Unsubscribe`, via their :guilabel:`Subscription Management`
+page. Customers can also be added manually to the blacklist, if necessary.
+
+To see a complete collection of blacklisted numbers, navigate to the :menuselection:`SMS Marketing
+app --> Configuration --> Blacklisted Phone Numbers` to reveal a dashboard containing every
+blacklisted phone number in the database.
+
+.. image:: mailing_lists_blacklists/sms-blacklist-menu.png
+   :align: center
+   :alt: SMS Blacklist menu in the application.
+
+To manually add a number to a blacklist, click the :guilabel:`Create` button in the upper-left
+corner of the dashboard and enter the phone number on the next page's form. There's also a
+checkbox to indicate whether that particular phone numnber is :guilabel:`Active` (or not).
+
+.. image:: mailing_lists_blacklists/sms-blacklist-create.png
+   :align: center
+   :alt: SMS Blacklist menu in the application.
+
+Once the form is completed, click :guilabel:`Save` to add it to the :guilabel:`Blacklisted Phone
+Numbers` list. To remove any number from the blacklist, select the desired number on the dashboard,
+and then, on the phone number's form, click :guilabel:`Unblacklist`.
+
+Importing blacklists
+--------------------
+
+During a software/platform migration, it is possible to import an already existing blacklist of
+contacts. This would include customers, who have already asked to be blacklisted` on :abbr:`SMS
+(Short Message Service)` mailings.
+
+To do that, navigate to :menuselection:`SMS Marketing app --> Configuration --> Blacklisted Phone
+Numbers`, and then select the :guilabel:`Favorites` drop-down menu (beneath the search bar), and
+click :guilabel:`Import records`.
+
+.. image:: mailing_lists_blacklists/import-blacklist.png
+   :align: center
+   :alt: View of how to import a blacklist in Odoo SMS Marketing.

content/applications/marketing/sms_marketing/essentials/sms_campaign_settings.rst

@@ -0,0 +1,158 @@
+=====================
+SMS campaign settings
+=====================
+
+Utilizing :abbr:`SMS (Short Message Service)` campaigns with Odoo *SMS Marketing* isn't just an
+effective advertisement strategy, it's also a great way to remind people about upcoming events,
+issued invoices, and so much more.
+
+But, before :abbr:`SMS (Short Message Service)` campaigns can be created (and sent), a few specific
+settings and features must be enabled first.
+
+SMS campaign setting
+====================
+
+To enable :abbr:`SMS (Short Message Service)` campaigns in Odoo, make sure the *Mailing Campaigns*
+feature is activated by going to :menuselection:`Email Marketing --> Configuration --> Settings`,
+and then enable :guilabel:`Mailing Campaigns` and :guilabel:`Save` the changes.
+
+.. image:: sms_campaign_settings/sms-mailing-campaigns.png
+   :align: center
+   :alt: View of the mailing campaigns setting in Odoo.
+
+.. note::
+   Activating the *Mailing Campaigns* feature in the *General Settings* also enables the *A/B Test*
+   feature.
+
+Once the setting is enabled, navigate back to the :menuselection:`SMS Marketing` app, and notice the
+:guilabel:`Campaigns` header menu is now available for use. Similarly, the :guilabel:`A/B Test` tab
+is now also available on every :abbr:`SMS (Short Message Service)` template form.
+
+A/B tests
+=========
+
+:guilabel:`A/B Tests` allows any :abbr:`SMS (Short Message Service)` mailings to be tested against
+other versions within the same campaign, in order to compare which version is the most successful in
+producing engagement and/or conversion outcomes.
+
+On an :abbr:`SMS (Short Message Service)` template form, under the :guilabel:`A/B Tests` tab,
+initially, there's only a single checkbox labeled: :guilabel:`Allow A/B Testing.`
+
+When clicked, a series of other options appear.
+
+.. image:: sms_campaign_settings/ab-tests-sms.png
+   :align: center
+   :alt: The A/B Test tab is located on an Odoo SMS Marketing app campaign form.
+
+In the first field, enter a desired percentage of recipients to conduct the A/B Test on.
+
+Beneath the percentage field is the :guilabel:`Winner Selection` field. This is what Odoo will use
+to determine the successful result of an A/B Test. In other words, this tells Odoo how to pick a
+winning A/B test.
+
+The following sections are available: :guilabel:`Manual`, :guilabel:`Highest Click Rate`,
+:guilabel:`Leads`, :guilabel:`Quotations`, or :guilabel:`Revenues`.
+
+Finally, the :guilabel:`Send Final On` field is listed. This represents the date-time that Odoo uses
+as a deadline to determine the winning mailing variation. Then, Odoo sends that winning mailing
+variation to the remaining recipients, who weren't involved in the test, at that prior date and
+time.
+
+.. tip::
+   Quickly create different versions of the mailing to add to the A/B Test by clicking the
+   :guilabel:`Create an Alternate Version` button.
+
+.. note::
+   Remember, the winning mailing variation is based on the criteria selected in the
+   :guilabel:`Winner Selection` field.
+
+Campaigns page
+==============
+
+To create, edit, or analyze any campaign, click :menuselection:`Campaigns` in the header menu of the
+:guilabel:`SMS Marketing` app. On the :guilabel:`Campaigns` page, each campaign displays various
+information related to the mailings associated with that campaign (e.g. number of emails, social
+posts, SMSs, and push notifications).
+
+.. image:: sms_campaign_settings/campaigns-page.png
+   :align: center
+   :alt: Dasbhoard view of different Campaigns in the Odoo SMS Marketing app, separated by stage.
+
+Campaign templates
+==================
+
+Click :guilabel:`Create` to create a new campaign, and Odoo reveals a blank campaign template form
+to fill out. Alternatively, select any previously-made campaign in order to duplicate, review, or
+edit its campaign template form.
+
+.. image:: sms_campaign_settings/sms-campaign-template.png
+   :align: center
+   :alt: View of an SMS campaign template in Odoo SMS marketing.
+
+With each campaign, the options to :guilabel:`Send New Mailing`, :guilabel:`Send SMS`,
+:guilabel:`Send Social Post`, and :guilabel:`Push Notifications` are available above the template
+form.
+
+Whenever one of those communication options is added to the campaign, Odoo will create a new
+corresponding tab on the template form, where those types of messages can be reviewed or edited,
+along with various data sets related to each specific mailing.
+
+At the top of the template, there are various analytical smart buttons. When clicked, Odoo reveals
+in-depth metrics related to that specific topic (e.g. :guilabel:`Engagement`,
+:guilabel:`Opportunities`, etc.) on a separate page.
+
+Beneath the smart buttons, are fields for :guilabel:`Campaign Name` and :guilabel:`Responsible`.
+Odoo also allows for various :guilabel:`Tags` to be added, as well (if necessary).
+
+Sending SMSs through the Contacts app
+=====================================
+
+Sending :abbr:`SMS (Short Message Service)` mailings directly through a contact's form is available
+by default.
+
+In order to send an :abbr:`SMS (Short Message Service)` in this fashion, navigate to the
+:menuselection:`Contacts` app, select the desired contact in the database, and click on the
+:guilabel:`SMS` icon on the contact form (next to the :guilabel:`Phone Number` field).
+
+.. image:: sms_campaign_settings/sms-contact-form.png
+   :align: center
+   :alt: The SMS icon is located on an individual's contact form in Odoo Contacts.
+
+To send a message to multiple contacts at once, navigate to the main :menuselection:`Contacts` app
+main dashboard, choose the :guilabel:`List View`, and select all the desired contacts to whom the
+message should be sent. Then, under :guilabel:`Action`, select :guilabel:`Send SMS`.
+
+.. image:: sms_campaign_settings/sms-contacts-action-send-message.png
+   :align: center
+   :alt: Select a number of contacts, click action, and select send multiple SMSs.
+
+Set up SMS templates for future use
+===================================
+
+In order to set up :guilabel:`SMS Templates` for future use, activate :ref:`developer mode
+<developer-mode>`, by navigating to the main Odoo dashboard that is full of apps, and select the
+:menuselection:`Settings app`. Then, scroll down to the :guilabel:`Developer Tools` section, and
+click :guilabel:`Activate the Developer Mode`.
+
+Once *developer mode* is activated, the main Odoo dashboard appears once more, with a now-visible
+bug icon, which is located at the top-right corner of the dashboard; this bug icon indicates that
+developer mode is currently active.
+
+Next return to the :menuselection:`Settings app` and, in the now-visible header menus at the top,
+choose :menuselection:`Technical --> SMS Templates` to begin setting up :abbr:`SMS (Short Message
+Service)` templates for future marketing campaigns.
+
+.. image:: sms_campaign_settings/sms-template-setting.png
+   :align: center
+   :alt: Select the SMS Template option in the Technical dropdown on the Settings app.
+
+Inside of the :guilabel:`SMS Templates` dashboard, Odoo reveals an entire page of :abbr:`SMS (Short
+Message Service)` templates. The default :guilabel:`List` view showcases each template's name, and
+to which recipients it applies.
+
+On this page, :abbr:`SMS (Short Message Service)` templates can be edited or created from scratch.
+
+.. image:: sms_campaign_settings/sms-template.png
+   :align: center
+   :alt: The SMS Templates page in Odoo is available after enabling developer mode in the General
+         Settings

content/applications/marketing/sms_marketing/essentials/sms_essentials.rst

@@ -0,0 +1,181 @@
+==============
+SMS essentials
+==============
+
+Utilizing :abbr:`SMS (Short Message Service)` outreach in communication strategies can help
+companies expand their market reach, especially in some countries, where emails might not be very
+common, or even used at all.
+
+Odoo's *SMS Marketing* application can also help boost conversion rates around valuable actions,
+such as event registrations, free trials, purchases, etc., since text and mobile-based marketing
+channels typically yield higher :abbr:`CTOR (click-to-open rate)` and :abbr:`CTR (click-through
+rate)` outcomes.
+
+SMS marketing dashboard
+=======================
+
+When the application is opened, Odoo displays the main :guilabel:`SMS Marketing` dashboard, which
+showcases the various SMS mailings that have been created, along with pertinent information and data
+related to that specific message.
+
+The :guilabel:`Kanban` view is the default Odoo uses when the application is opened, which provides
+an organized display of the SMS mailings that have been created, and what their current status is at
+the moment.
+
+.. note::
+   An :abbr:`SMS (Short Message Service)` mailing can have one of the following statuses:
+   :guilabel:`Draft`, :guilabel:`In Queue`, :guilabel:`Sending`, or :guilabel:`Sent`.
+
+In the upper right corner of the main :guilabel:`SMS Marketing` dashboard, there are a few different
+view options to choose from. Each one provides a unique take on the same SMS information.
+
+The :guilabel:`List` view provides the same useful data related to SMS mailings, but in a more
+traditional list layout.
+
+The :guilabel:`Calendar` view provides a simple calendar, making it easy to see when SMS mailings
+are going to be sent (or have been sent). If a future date is clicked, Odoo reveals a blank SMS
+template that, when completed, will be scheduled to be sent on that specific future date.
+
+Lastly, the :guilabel:`Graph` view visualizes that same SMS-related data in series of graphs and
+charts. Odoo also provides various ways to sort and group the data for more detailed analysis.
+
+Create SMS messages
+===================
+
+To start, click :guilabel:`Create` on the main :guilabel:`SMS Marketing` dashboard, and Odoo reveals
+a blank SMS template form, which can be configured in a number of different ways.
+
+.. image:: sms_essentials/sms-create.png
+   :align: center
+   :alt: Creating an SMS marketing template.
+
+First, give the mailing a :guilabel:`Subject`, which describes what the mailing is about.
+
+Next, in the :guilabel:`Recipients` field, choose to whom this :abbr:`SMS (Short Message Service)`
+will be sent. By default, Odoo has :guilabel:`Mailing List` selected. If this is the desired
+:guilabel:`Recipients` field option, specify which mailing list Odoo should send this :abbr:`SMS
+(Short Message Service)` to in the :guilabel:`Select Mailing List` field.
+
+.. note::
+   To create (or edit) a mailing list, go to :menuselection:`Mailing Lists --> Mailing List`. There,
+   Odoo displays all previously created mailing lists, along with various types of data related to
+   that specific list (e.g. number of contacts, mailings, recipients, etc.).
+
+   To learn more about mailing lists and contacts, check out
+   :doc:`mailing_lists_blacklists`
+
+.. image:: sms_essentials/sms-mailing-list.png
+   :align: center
+   :alt: View of the mailing list page in the SMS marketing application.
+
+To reveal all the possible options in the :guilabel:`Recipients` field, click the field to see all
+the choices Odoo makes avaialble.
+
+When another field (other than :guilabel:`Mailing List`) is selected, the option to specify that
+chosen field even further becomes available — either with a default recipient filter equation that
+appears automatically (which can be customized to fit any business need), or, if no default
+recipient filter equation is present, an :guilabel:`Add Filter` button will appear.
+
+Clicking the :guilabel:`Add Filter` button, reveals fully customizable domain rule fields, which can
+be configured similar to an equation. You can create multiple recipient rules, if necessary.
+
+Then, Odoo will only send the :abbr:`SMS (Short Message Service)` to recipients who fit into
+whatever criteria is configured in those fields. Multiple rules can be added.
+
+.. example::
+   If :guilabel:`Contact` is chosen, all of the *Contacts* records in the Odoo database (vendors,
+   customers, etc.) will receive the :abbr:`SMS (Short Message Service)`, by default — unless more
+   specific recipient rules are entered.
+
+   For instance, the message below will only be sent to contacts in the database that are located in
+   the United States (e.g. `Country` > `Country Name` equals `United States`), and they haven't
+   blacklisted themselves from any mailings (e.g. `Blacklist` > `is` > `not set`).
+
+   .. image:: sms_essentials/contact-recipient.png
+      :align: center
+      :alt: Contact recipients on SMS marketing.
+
+Writing SMS messages
+--------------------
+
+Enter the content of the :abbr:`SMS (Short Message Service)` in the text field, found in the
+:guilabel:`SMS Content` tab. Links and emojis can also be included. Beneath the text field, Odoo
+displays how many characters are used in the message, along with how many :abbr:`SMS (Short Message
+Service)` mailings it will take to deliver the complete message.
+
+.. tip::
+   To check the price of sending an :abbr:`SMS (Short Message Service)` for a country, click on the
+   :guilabel:`Information` icon.
+
+.. image:: sms_essentials/sms-price-check.png
+   :align: center
+   :alt: SMS price check icon.
+
+.. note::
+   Credits must be purchased from Odoo in order to take advantage of the *SMS Marketing* app;
+   :abbr:`SMS (Short Message Service)` messages will not be sent without credits.
+
+.. seealso::
+   `Odoo SMS - FAQ <https://iap-services.odoo.com/iap/sms/pricing>`_
+
+Track links used in SMS messages
+--------------------------------
+
+When links are used in :abbr:`SMS (Short Message Service)` messages, Odoo automatically generates
+link trackers to gather analytical data and metrics related to those specific links, which can be
+found by going to :menuselection:`Configuration --> Link Tracker`.
+
+.. image:: sms_essentials/sms-link-tracker.png
+   :align: center
+   :alt: SMS Link Tracker page.
+
+Adjust SMS settings
+===================
+
+Under the :guilabel:`Settings` tab of the SMS template, there is an option to :guilabel:`Include
+opt-out link`. If activated, the recipient is able to unsubscribe from the mailing list, thus
+avoiding all future mailings.
+
+An employee can be designated as the :guilabel:`Responsible` in the :guilabel:`Tracking` section of
+the :guilabel:`Settings` tab, as well.
+
+.. image:: sms_essentials/sms-settings-tab.png
+   :align: center
+   :alt: SMS Settings tab.
+
+Send SMS messages
+=================
+
+Once a mailing is created, choose when Odoo should deliver the message from the following options:
+
+- :guilabel:`Send`: sends the message immediately. Consider using this option if the recipient list
+  is highly refined, or in cases that involve fast approaching deadlines, such as a "flash sale."
+- :guilabel:`Schedule`: choose a day (and time) for Odoo to send the mailing. This is typically the
+  best option for mailings related to a specific event. Such a method can also be used to promote a
+  limited-time offer, or to help plan a company's content strategy in advance.
+- :guilabel:`Test`: allows for an :abbr:`SMS (Short Message Service)` to be sent to one or multiple
+  numbers for test purposes. Remember to use a comma between phone numbers if multiple numbers are
+  used as recipients.
+
+Visualize reports
+=================
+
+On the :guilabel:`Reporting` page (accessible via the :menuselection:`Reporting` option in the
+header menu), there are options to apply different combinations of :guilabel:`Filters` and
+:guilabel:`Measures` to view metrics in a number of different layouts (e.g. :guilabel:`Graph`,
+:guilabel:`List`, and :guilabel:`Cohort` views.)
+
+Each :guilabel:`Reporting` metric view option allows for more extensive performance analysis of
+:abbr:`SMS (Short Message Service)` mailings.
+
+For example, while in the default :guilabel:`Graph` view, :abbr:`SMS (Short Message Service)` data
+is visualized as different graphs and charts, which can be sorted and grouped in various ways (e.g.
+:guilabel:`Measures` drop down menu).
+
+.. image:: sms_essentials/sms-reporting-page.png
+   :align: center
+   :alt: Reporting page in SMS Marketing.
+
+.. seealso::
+   - :doc:`sms_campaign_settings`
+   - :doc:`mailing_lists_blacklists`

content/applications/sales/crm/track_leads/lead_scoring.rst

@@ -1,73 +1,172 @@
-=============================
-Assign leads based on scoring
-=============================
+=========================================
+Assign leads with predictive lead scoring
+=========================================
 
-*Lead Scoring* lets you rank and prioritize leads based on selected criteria. A higher score
-indicates that a lead is more likely to bring value to your company.
+The Odoo *CRM* app can automatically assign leads/opportunities to sales teams and salespeople. A
+standard practice is to assign leads based on the probability of winning each lead. Companies can
+prioritize the leads that are more likely to result in successful deals by quickly assigning them
+to the appropriate salespeople.
 
-For example, if customers from Canada tend to be more likely to purchase your products, you can
-assign them a higher score than customers from other countries.
+Odoo automatically calculates the probability of winning each lead using a method called *predictive
+lead scoring*.
+
+Predictive lead scoring
+=======================
+
+Predictive lead scoring is a machine-learning model that uses historical data from Odoo *CRM* to
+score open leads/opportunities.
+
+As a company processes opportunities through the CRM pipeline, Odoo collects data on which
+opportunities are won and lost. Predictive lead scoring uses this data to predict the probability
+of winning each new lead or opportunity.
+
+The more opportunities that are sent through the CRM pipeline, the more data Odoo collects,
+resulting in more accurate probabilities.
+
+Specifically, Odoo's predictive lead scoring uses the *naive Bayes* probability model:
+
+.. math::
+   \begin{equation}
+   P(A | B) = \frac{P(A) \times P(B | A)}{P(B)}
+   \end{equation}
+
+The probability of success of each opportunity is displayed on the opportunity form, and it updates
+automatically as the opportunity progresses through the CRM pipeline.
+
+.. image:: lead_scoring/probability-opportunity-form.png
+   :align: center
+   :alt: The probability of success displayed on the opportunity form.
+
+When an opportunity moves to the next stage, its probability of success automatically increases
+according to the predictive lead scoring algorithm.
 
 Configuration
-=============
+-------------
 
-To use scoring, go to :menuselection:`Apps`, remove the :guilabel:`Apps` filter, search for
-:guilabel:`Lead Scoring` and then install the module.
+Predictive lead scoring is always active in Odoo *CRM*. However, the variables used to calculate the
+probability of success can be customized in the settings.
 
-.. image:: lead_scoring/lead-scoring-module.png
+To customize the variables used by predictive lead scoring, go to :menuselection:`CRM -->
+Configuration --> Settings`. Under :guilabel:`Predictive Lead Scoring`, click on the
+:guilabel:`Update Probabilities` button.
+
+Then, click on the drop-down menu to choose which variables the predictive lead scoring feature
+will take into account.
+
+.. image:: lead_scoring/update-probabilities.png
    :align: center
-   :alt: Lead Scoring module installation
+   :alt: The Update Probabilities window in the Predictive Lead Scoring settings.
 
-Create scoring rules
-====================
+Any number of the following variables can be activated:
 
-To manage scoring rules, go to :menuselection:`CRM --> Leads --> Scoring Rules`.
-
-Customize your rules to fit the needs of your business, and add as many criteria as you want.
-
-.. image:: lead_scoring/scoring-example.png
-   :align: center
-   :alt: Score Rule example
-
-Every hour, Odoo automatically assigns scores to new leads according to your configured rules.
-
-.. image:: lead_scoring/scoring-section-on-lead.png
-   :align: center
-   :alt: Scoring section on a lead
-
-Assign leads
-============
-
-Odoo can also assign leads to specific teams based on configured rules. To configure assignment
-rules, go to the individual Sales Team's configuration page via :menuselection:`CRM --> Leads -->
-Team Assignment` or :menuselection:`CRM --> Configuration --> Sales Teams`, and apply a specific
-Domain to each team. The Domain can include lead scores.
-
-.. image:: lead_scoring/team-assignation.png
-   :align: center
-   :alt: Team Assignments using domains
-
-Assign leads to specific salespeople using further refined Domains at :menuselection:`CRM --> Leads
---> Leads Assignment`.
-
-.. image:: lead_scoring/lead-assignment-filters.png
-   :align: center
-   :alt: Lead Assignments
-
-Odoo automatically assigns new leads to teams/salespeople once per day.
-
-Evaluate and use the unassigned leads
-=====================================
-
-Not all leads will fall into your set Domains and get assigned automatically by Odoo.
-
-To view your unassigned leads, go to :menuselection:`CRM --> Leads --> Leads` and select the
-Unassigned filter.
-
-.. image:: lead_scoring/unassigned-filter.png
-   :align: center
-   :alt: Filtering for unassigned leads
+- :guilabel:`State`: the geographical state from which the opportunity originates
+- :guilabel:`Country`: the geographical country from which the opportunity originates
+- :guilabel:`Phone Quality`: whether or not a phone number is listed for the opportunity
+- :guilabel:`Email Quality`: whether or not an email address is listed for the opportunity
+- :guilabel:`Source`: the source of an opportunity (e.g. search engine, social media)
+- :guilabel:`Language`: the spoken language specified on the opportunity
+- :guilabel:`Tags`: the tags placed on the opportunity
 
 .. note::
-   You can also find unassigned leads and create re-engagement campaigns using the :guilabel:`Email
-   Marketing` or :guilabel:`Marketing Automation` apps.
+   The variables `Stage` and `Team` are always in effect. `Stage` refers to the CRM pipeline stage
+   that an opportunity is in. `Team` refers to the sales team that is assigned to an opportunity.
+   Predictive lead scoring *always* takes into account these two variables, regardless of which
+   optional variables are selected.
+
+Next, click on the date field next to the option :guilabel:`Consider leads created as of the:` to
+select the date from which predictive lead scoring will begin its calculations.
+
+Lastly, click :guilabel:`Confirm` to save changes.
+
+Change the probability manually
+-------------------------------
+
+An opportunity's probability of success can be changed manually on the opportunity form. Click on
+the probability number to edit it.
+
+.. important::
+   Manually changing the probability removes the automatic probability updates for that
+   opportunity. The probability will no longer update automatically as the opportunity moves
+   through each stage of the pipeline.
+
+To reactivate automatic probability, click on the gear icon next to the probability percentage.
+
+.. image:: lead_scoring/probability-gear-icon.png
+   :align: center
+   :alt: The gear icon used to reactivate automatic probability on an opportunity form.
+
+Assign leads based on probability
+=================================
+
+Odoo *CRM* can assign leads/opportunities to sales teams and salespeople based on specified rules.
+Create assignment rules based on the leads' probability of success to prioritize those that are
+more likely to result in deals.
+
+Configure rule-based assignment
+-------------------------------
+
+To activate *rule-based assignment*, navigate to :menuselection:`CRM --> Configuration -->
+Settings`, and activate :guilabel:`Rule-Based Assignment`.
+
+The rule-based assignment feature can be set to run :guilabel:`Manually`, meaning an Odoo user must
+manually trigger the assignment, or :guilabel:`Repeatedly`, meaning Odoo will automatically trigger
+the assignment according to the chosen time period.
+
+To set up automatic lead assignment, select :guilabel:`Repeatedly` for the :guilabel:`Running`
+section. Then, customize how often Odoo will trigger the automatic assignment in the
+:guilabel:`Repeat every` section.
+
+.. image:: lead_scoring/rule-based-assignment.png
+   :align: center
+   :alt: The Rule-Based Assignment setting in CRM settings.
+
+If rule-based assignment is set to run :guilabel:`Repeatedly`, the assignment can still be
+triggered manually using the circular arrow icon in the :guilabel:`Rule-Based Assignment` settings
+(or using the :guilabel:`Assign Leads` button on the sales team configuration page).
+
+Configure assignment rules
+--------------------------
+
+Next, configure the *assignment rules* for each sales team and/or salesperson. These rules
+determine which leads Odoo assigns to which people. To get started, navigate to :menuselection:`CRM
+--> Configuration --> Sales Teams`, and select a sales team.
+
+On the sales team configuration form, under :guilabel:`Assignment Rules`, click on :guilabel:`Edit
+Domain` to configure the rules that Odoo uses to determine lead assignment for this sales team. The
+rules can include anything that may be relevant for this company or team, and any number of rules
+can be added.
+
+Click :guilabel:`Add Filter` to start creating assignment rules. Click on the :guilabel:`+` sign on
+the right of the assignment rule to add another line. Click on the :guilabel:`x` symbol to remove
+the line.
+
+To create an assignment rule based on an opportunity's probability of success, click on the far
+left drop-down menu of an assignment rule line, and select :guilabel:`Probability`.
+
+From the middle drop-down menu, select the desired equation symbol—most likely the symbol for
+*greater than*, *less than*, *greater than or equal to*, or *less than or equal to*.
+
+In the far right space, enter the desired number value of the probability. Finally, click
+:guilabel:`Save` to save changes.
+
+.. example::
+   To configure an assignment rule such that a sales team receives leads that have a probability of
+   success of 20% or greater, create a :guilabel:`Domain` line that reads: `Probability >= 20`.
+
+   .. image:: lead_scoring/probability-domain.png
+      :align: center
+      :alt: Sales team domain set to probability greater than or equal to twenty percent.
+
+Separate assignment rules can also be configured for individual team members. From the sales team
+configuration page, click on a team member in the :guilabel:`Members` tab, then edit the
+:guilabel:`Domain` section. Click :guilabel:`Save` to save changes.
+
+If automatic lead assignment is configured in the settings, both the sales team and individual team
+members have the option to :guilabel:`Skip auto assignment`. Check this box to omit a particular
+sales team or salesperson from being assigned leads automatically by Odoo's rule-based assignment
+feature. If :guilabel:`Skip auto assignment` is activated, the sales team or salesperson can still
+be assigned leads manually.
+
+To manually assign leads to this sales team, click on the :guilabel:`Assign Leads` button at the
+top of the sales team configuration page. This will assign any leads that are currently unassigned
+and match this team's specified domain.

content/applications/sales/sales/invoicing.rst

@@ -13,4 +13,3 @@ Invoicing Method
    invoicing/time_materials
    invoicing/milestone
    invoicing/expense
-   invoicing/subscriptions

content/applications/sales/sales/invoicing/subscriptions.rst

@@ -1,19 +0,0 @@
-==================
-Sell subscriptions
-==================
-
-Selling subscription products will give you predictable revenue, making
-planning ahead much easier.
-
-Make a subscription from a sales order
-======================================
-
-From the sales app, create a quotation to the desired customer, and
-select the subscription product your previously created from the Subscriptions App.
-
-When you confirm the sale the subscription will be created
-automatically. You will see a direct link from the sales order to the
-Subscription in the upper right corner.
-
-.. image:: subscriptions/subscriptions01.png
-    :align: center

content/applications/sales/subscriptions.rst

@@ -1,23 +1,82 @@
-:nosearch:
 :show-content:
-:hide-page-toc:
-:show-toc:
 
 =============
 Subscriptions
 =============
 
-**Odoo Subscriptions** is used to run recurring businesses: sell new contracts, upsell customers,
-keep the churn under control and have reporting on the main KPIs: MRR, ARR, retention, churn,
-upselling, etc.
+**Odoo Subscriptions** is used to run recurring businesses: :ref:`sell new contracts
+<subscriptions/quotations>`, :doc:`upsell customers <subscriptions/upselling>`, keep the churn under
+control, and :doc:`generate reports <subscriptions/reports>` on the main KPIs: MRR, ARR, retention,
+churn, upselling, etc.
 
 .. seealso::
    - `Odoo Tutorials: Subscriptions <https://www.odoo.com/slides/subscription-20>`_
+   - :doc:`subscriptions/products`
+   - :doc:`subscriptions/plans`
+   - :doc:`subscriptions/upselling`
+   - :doc:`subscriptions/renewals`
+   - :doc:`subscriptions/closing`
+   - :doc:`subscriptions/automatic_alerts`
+   - :doc:`subscriptions/reports`
+
+.. _subscriptions/quotations:
+
+Subscription quotations
+=======================
+
+.. important::
+   Sales orders with a defined recurrence become subscriptions.
+
+To create a new subscription, click on :guilabel:`New` from the Subscription or the :doc:`Sales
+<sales>` app. You can either:
+
+- Select a :doc:`subscription plan <subscriptions/plans>` to prefill the quotation instantly, or
+- Fill out the quotation normally, making sure to select a recurrence and an end date if necessary
+  and adding :doc:`recurrent products <subscriptions/products>`.
+
+.. tip::
+   You can define different invoice and delivery addresses by enabling the :doc:`Customer Addresses
+   <sales/send_quotations/different_addresses>` feature.
+
+.. _subscriptions/confirmation:
+
+Confirmation
+============
+
+Send the quotation to the customer for confirmation by clicking on :guilabel:`Send by email`, or
+confirm it immediately by clicking on :guilabel:`Confirm`.
+
+.. tip::
+   Click on :guilabel:`Customer Preview` to preview the customer portal where the customer can view
+   their quotation, sign and pay it, and communicate with you.
+
+.. _subscriptions/automatic-payments:
+
+Automatic payments
+==================
+
+You can require the customer to set an automatic payment method and pre-pay the subscription's first
+occurrence before they can confirm their quotation. To do so, go to the :guilabel:`Other Info` tab
+of the quotation and check the :guilabel:`Payment` option in the :guilabel:`Online confirmation`
+field.
+
+If you leave :guilabel:`Payment` unchecked, the customer doesn't have to pre-pay to start the
+subscription. This means that the payment is not automatic and that the customer must pay each
+invoice manually.
+
+.. important::
+   If the online confirmation requires a pre-payment, your customer can select only the
+   :ref:`payment providers <payment_providers/supported_providers>` that have the :ref:`tokenization
+   feature <payment_providers/features/tokenization>`. This ensures that the customer is
+   automatically charged at each new period.
 
 .. toctree::
    :titlesonly:
 
-   subscriptions/configuration
-   subscriptions/sales_flow
-   subscriptions/follow_up
-   subscriptions/reporting
+   subscriptions/products
+   subscriptions/plans
+   subscriptions/upselling
+   subscriptions/renewals
+   subscriptions/closing
+   subscriptions/automatic_alerts
+   subscriptions/reports

content/applications/sales/subscriptions/automatic_alerts.rst

@@ -1,6 +1,6 @@
-=======================
-Set up automatic alerts
-=======================
+================
+Automatic alerts
+================
 
 Now that your subscriptions are up and running, you want to stay up-to-date with your customers.
 Some automation would be appreciated since you would not want to go through the list of all your
@@ -80,7 +80,6 @@ retention rates very high.
    adapt them to your own needs.
 
 .. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_templates`
-  - :doc:`../../subscriptions/configuration/subscription_products`
-  - :doc:`../../subscriptions/sales_flow/create_a_quotation`
-  - :doc:`../../subscriptions/reporting/subscription_reports`
+   - :doc:`../subscriptions`
+   - :doc:`plans`
+   - :doc:`products`

content/applications/sales/subscriptions/closing.rst

@@ -41,7 +41,7 @@ Once enabled, this option gives your customers the right to close their own subs
 
 .. note::
    Be sure to check out our documentation on
-   how to :doc:`Use subscription templates <../../subscriptions/configuration/subscription_templates>`
+   how to :doc:`Use subscription templates <plans>`
    to fully understand the importance of this feature in a basic flow using the
    **Odoo Subscriptions** application.
 
@@ -98,10 +98,10 @@ added by the customer.
 
 .. note::
    Before closing a subscription, check out our documentation on how to
-   :doc:`Create a quotation using subscription products <../../subscriptions/sales_flow/create_a_quotation>`
+   :doc:`Create a quotation using subscription products <../subscriptions>`
    to understand how subscriptions are managed in the **Odoo Subscriptions** application.
 
 .. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_templates`
-  - :doc:`../../subscriptions/configuration/subscription_products`
-  - :doc:`../../subscriptions/sales_flow/create_a_quotation`
+   - :doc:`../subscriptions`
+   - :doc:`plans`
+   - :doc:`products`

content/applications/sales/subscriptions/configuration.rst

@@ -1,11 +0,0 @@
-:nosearch:
-
-=============
-Configuration
-=============
-
-.. toctree::
-   :titlesonly:
-
-   configuration/subscription_templates
-   configuration/subscription_products

content/applications/sales/subscriptions/configuration/subscription_products.rst

@@ -1,54 +0,0 @@
-=========================
-Add subscription products
-=========================
-
-To properly sell your subscriptions using our amazing **Odoo Subscriptions** application, you must
-follow these steps:
-
-1. **Create your own subscription templates**
-2. **Create your own subscription products with the right settings**
-
-As a result, you will be able to manage your subscriptions like any other product, create your
-quotations and continue the sales flow to track the number of subscriptions you sell and manage the
-revenue they generate.
-
-Configuration
-=============
-
-Go to :menuselection:`Subscriptions --> Subscription products` to learn how you can configure your
-own subscription products. You have the possibility to create a new product or edit an existing one.
-Once named, be careful to select the option *Can be sold* and deselect *Can be purchased*. For the
-product type, it is recommended to use *Service* for subscription products as they are non-material
-products that you provide to your customers. Finally, you can adapt your prices and also add an
-internal reference.
-
-.. image:: subscription_products/subscription-products-configuration.png
-  :align: center
-  :alt: View of a subscription product form in Odoo Subscriptions
-
-.. note::
-   In the Sales tab, underneath the Subscriptions section, make sure the *Subscription products*
-   option is activated. In fact, if you create a subscription product from the **Odoo Subscriptions**
-   application, this option is selected by default. However, if you create a product from another
-   application, it is not the case.
-
-   .. image:: subscription_products/subscription-products-form.png
-     :align: center
-     :alt: View of a subscription product form in Odoo Subscriptions
-
-   You can also choose the subscription templates you want to use.
-
-   .. image:: subscription_products/subscription-products-using-subscription-templates.png
-     :align: center
-     :alt: View of a subscription product form in Odoo Subscriptions
-
-.. important::
-   Be sure to check out our documentation on how to create, edit and manage your own
-   :doc:`Subscription templates <../../subscriptions/configuration/subscription_templates>`
-   before creating your own subscription products. Once created, check out our documentation on how to
-   :doc:`Create a quotation using subscription products <../../subscriptions/sales_flow/create_a_quotation>`,
-   to complete the sales flow.
-
-.. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_templates`
-  - :doc:`../../subscriptions/sales_flow/create_a_quotation`

content/applications/sales/subscriptions/configuration/subscription_templates.rst

@@ -1,91 +0,0 @@
-==========================
-Use subscription templates
-==========================
-
-The subscription business model is becoming more popular. Are you wondering why?
-
-- For **customers**, value lies in **convenience**:
-
-  - Subscriptions simplify the business process. Indeed, subscribers never have to remember to renew
-    their orders every month, which gives them the assurance that they will have everything they
-    need before they actually need it.
-  - Subscriptions help customers stay on budget.
-
-- For **businesses**, value lies in the **ability to predict recurring revenue**:
-
-  - Subscriptions reduce customer churn rate and significantly increase customer retention.
-  - Subscriptions provide much higher payment security for your business. They stabilize and
-    maintain recurring revenue streams by guaranteeing monthly revenues and adding value to your
-    business.
-
-.. raw:: html
-
-   <div align="center" style="color:#AD5E99; font-size: 2rem ;margin: 20px 0"> <b>Simplicity.
-   Higher customer retention. Opportunities for marketing. Business consistency. Better cash flow
-   management.</b> </div>
-
-**Odoo Subscriptions** help you save time and money. Subscription templates can help you generate
-recurring invoices and manage renewals at a fast pace. With Odoo you have the possibility to create,
-edit, and manage your own subscription templates.
-
-Configuration
-=============
-
-Go to :menuselection:`Subscriptions --> Configuration --> Subscription templates`. By default, Odoo
-suggests you two types of subscription (MON - Monthly subscription *vs* YEA - Yearly subscription).
-You can also create your own ones.
-
-.. image:: subscription_templates/default-subscription-templates.png
-  :align: center
-  :alt: Default subscription templates on Odoo Subscriptions
-
-.. important::
-   The **Odoo Subscriptions** application automatically installs **Odoo Sales** and **Odoo Invoicing**
-   as they work integrated.
-
-Create your first template
-==========================
-
-You can create a new template or edit an existing one. The first thing you need to do is give your
-template a name. After that, choose an *Invoicing period* and specify whether you would like to
-invoice your customers per *Days*, *Weeks*, *Months* or *Years*. On *Duration*, determine if
-the subscription must go on *Forever* (until it’s manually closed), or for a *Fixed amount* of time.
-Among the payment options, an additional field called *Invoice email* appears when you choose
-*Send*, *Send & try to charge* or *Send after successful payment*. This field allows you to add an
-invoice email template to your subscription templates.
-
-.. image:: subscription_templates/creation-of-subscription-templates.png
-  :align: center
-  :alt: Create your own subscription templates on Odoo Subscriptions
-
-For each template, you can also choose if you want your customers to be able to close their
-subscriptions or not. If enabled, you can set an *Automatic closing* limit and specify the
-*Group of subscription* and *Journal* options.
-
-.. note::
-   On each template, you can add your **Terms and Conditions**. Specifying terms and conditions is
-   essential to set out important contractual points between the customers and the sellers (payment,
-   refund policy, cancellation, complaints, etc.).
-
-   .. image:: subscription_templates/terms-and-conditions-on-subscription-templates.png
-     :align: center
-     :alt: Terms & conditions on Odoo Subscriptions
-
-   Finally, if you want to know the basic running health status of your subscriptions, you also have
-   access to a specific tab called **Health Check**. There, you can edit and create your own
-   filters to define what is a subscription in good health *vs* bad health. The system automatically
-   summarizes all the records corresponding to these filters and you are able to manage them in one
-   click.
-
-   .. image:: subscription_templates/health-check-on-subscription-templates.png
-     :align: center
-     :alt: Health check on Odoo Subscriptions
-
-.. important::
-   After creating your own subscription templates, be sure to check out our documentation on how to
-   create, edit and manage your own
-   :doc:`Subscription products <../../subscriptions/configuration/subscription_products>`,
-   to complete the sales flow.
-
-.. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_products`