[FW][REF] Subscriptions: rewrite overview, integrate products page

content/applications/sales/sales/products_prices/prices/pricing.rst

@@ -9,8 +9,8 @@ time periods, etc., and is useful for creating pricing strategies and optimizing
 Odoo **Sales** has a useful pricelist feature that can be tailored to fit any unique pricing
 strategy. Pricelists suggest certain prices, but they can always be overridden on the sales order.
 
-Pricelists configuration
-========================
+Configuration
+=============
 
 To enable pricelists in the Odoo **Sales** app, first navigate to :menuselection:`Sales app -->
 Configuration --> Settings`. In the :guilabel:`Pricing` section, tick the checkbox next to the
@@ -147,9 +147,8 @@ From here, there are several configuration options:
 Recurring Prices tab
 --------------------
 
-Recurring prices are specifically used with :doc:`subscription products
-<../../../subscriptions/products>`. When configuring price rules in this tab, keep in mind that
-they will only apply to subscription products, or products with recurring prices enabled.
+Time-based rules are used specifically with subscription products. Be sure to check out the Odoo
+:doc:`Subscriptions </applications/sales/subscriptions>` documentation for more information.
 
 In the :guilabel:`Recurring Prices` tab, pricelists are configured with the same options as in the
 :guilabel:`Price Rules` tab, with additional columns for :guilabel:`Product Variants` add
@@ -213,8 +212,13 @@ The :guilabel:`Selectable` can be enabled to allow the customer to choose this p
 Finally, promotional and loyalty codes can be added to the :guilabel:`E-commerce Promotional Code`
 field.
 
-.. image:: pricing/sales-pricelist-ecommerce.png
-   :alt: The Ecommerce tab in a pricelist configuration form.
+Tick the :guilabel:`Selectable` checkbox to have this pricelist as a selectable option for
+customers to choose as they shop. If the :guilabel:`Selectable` box is left unticked, customers
+**cannot** select this pricelist for themselves.
+
+Lastly, there is the option to add an :guilabel:`E-commerce Promotional Code`. To add a code, type
+in the desired promo code that, when entered during the checkout process, applies the pricelist to
+the customer, even if the customer does not fall into the previously-specified criteria.
 
 Customer pricelist application
 ==============================

content/applications/sales/sales/sales_quotations/quote_template.rst

@@ -7,8 +7,6 @@ Reusable quotation templates can be made in Odoo's **Sales** app for common prod
 By using these templates, quotations can be tailored and sent to customers at a quicker pace,
 without having to create new quotations from scratch every time a sales negotiation occurs.
 
-.. _sales/send_quotations/templates:
-
 Configuration
 =============
 

content/applications/sales/subscriptions/automatic_alerts.rst

@@ -163,7 +163,6 @@ If :guilabel:`Create next activity` is selected in the :guilabel:`Action To Do`
    as the assignee(s) for the configured activity.
 
 .. seealso::
-   - :doc:`../subscriptions`
-   - :doc:`plans`
-   - :doc:`products`
-   - :doc:`../../essentials/in_app_purchase`
+  - :doc:`../subscriptions`
+  - :doc:`plans`
+  - :doc:`../../essentials/in_app_purchase`

content/applications/sales/subscriptions/closing.rst

@@ -104,4 +104,3 @@ In addition, the specified :guilabel:`Close Reason` appears on the subscription
 .. seealso::
    - :doc:`../subscriptions`
    - :doc:`plans`
-   - :doc:`products`

content/applications/sales/subscriptions/ecommerce.rst

@@ -5,14 +5,15 @@ Subscriptions in the eCommerce shop
 Subscription products can be sold in the Odoo *eCommerce* shop just like regular sales products.
 
 .. seealso::
-   - :doc:`Configure subscription products </applications/sales/subscriptions/products>`
+   - :doc:`Configure subscription products </applications/sales/subscriptions>`
+   - :doc:`Product variants </applications/sales/sales/products_prices/products/variants>`
 
 Selling eCommerce subscriptions
 ===============================
 
-:doc:`Configure the subscription product <products>`  as a regular recurring sales product. To
-start selling the subscription in the eCommerce shop, click the :guilabel:`Go to Website` smart
-button to navigate to the product page.
+:doc:`Configure subscription products </applications/sales/subscriptions>` as a regular recurring
+sales product. To start selling the subscription in the eCommerce shop, click the :guilabel:`Go to
+Website` smart button to navigate to the product page.
 
 From here, review the subscription product and its recurring periods. Then, toggle the switch in the
 upper-right corner from :guilabel:`Unpublished` to :guilabel:`Published`.

content/applications/sales/subscriptions/renewals.rst

@@ -127,4 +127,3 @@ related to this specific subscription.
 .. seealso::
    - :doc:`../subscriptions`
    - :doc:`plans`
-   - :doc:`products`

content/applications/sales/subscriptions/reports.rst

@@ -402,4 +402,3 @@ Analysis` reporting page are:
 .. seealso::
    - :doc:`../subscriptions`
    - :doc:`plans`
-   - :doc:`products`

content/applications/sales/subscriptions/scheduled_actions.rst

@@ -185,5 +185,4 @@ For example, if the next invoice date is July 1st, and the :guilabel:`Automatic
 .. seealso::
    - :doc:`../subscriptions`
    - :doc:`plans`
-   - :doc:`products`
    - :doc:`automatic_alerts`

content/applications/sales/subscriptions/upselling.rst

@@ -106,4 +106,3 @@ Status`.
 .. seealso::
    - :doc:`../subscriptions`
    - :doc:`plans`
-   - :doc:`products`

redirects/16.0.txt

@@ -162,6 +162,7 @@ applications/sales/subscriptions/sales_flow/closing.rst applications/sales/subsc
 applications/sales/subscriptions/sales_flow/create_a_quotation.rst applications/sales/subscriptions.rst                               # subscriptions/sales_flow/create_a_quotation --> subscriptions
 applications/sales/subscriptions/sales_flow/renewals.rst applications/sales/subscriptions/renewals.rst                                # sales_flow/* --> *
 applications/sales/subscriptions/sales_flow/upselling.rst applications/sales/subscriptions/upselling.rst                              # sales_flow/* --> *
+applications/sales/subscriptions/products.rst applications/sales/subscriptions.rst # subscriptions/products --> subscriptions
 
 # applications/services