[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

closes odoo/documentation#4070

X-original-commit: 878fc0e21f
Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
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/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`

content/applications/sales/subscriptions/follow_up.rst

@@ -1,10 +0,0 @@
-:nosearch:
-
-=========
-Follow-up
-=========
-
-.. toctree::
-   :titlesonly:
-
-   follow_up/automatic_alerts

content/applications/sales/subscriptions/plans.rst

@@ -0,0 +1,46 @@
+==================
+Subscription plans
+==================
+
+Subscription plans are :doc:`quotation templates <../sales/send_quotations/quote_template>` specific
+to **subscriptions** used to preconfigure selectable **plans** and **recurrence periods** to
+configure quotations quickly.
+
+Configuration
+=============
+
+To create a new subscription plan or edit an existing one, go to :menuselection:`Subscriptions -->
+Configuration --> Plans`, and click :guilabel:`New` or select an existing plan.
+
+.. image:: plans/subplan-configuration.png
+   :alt: Subscription plan (quotation template) configuration
+
+When creating a subscription plan, several options are available:
+
+- The **name** of the plan;
+- :guilabel:`Quotation expires after`: after how many days the quotation expires;
+- :guilabel:`Online confirmation`: if the customer's :guilabel:`Signature` or
+  :guilabel:`Payment` confirms the order. Enable both to leave the choice to the customer;
+- :guilabel:`Confirmation Mail`: the **mail template** used for the order confirmation mail;
+- :guilabel:`Recurrence`: the recurrence of **recurring products** used with this template.
+
+Selecting a :guilabel:`Recurrence` enables the following additional options:
+
+- :guilabel:`Duration`: whether **recurring products** used with this template have no **end date**,
+  or if they have a :guilabel:`Fixed` duration. Selecting :guilabel:`Fixed` enables an additional
+  option to select the **duration**;
+- :guilabel:`Self Closable`: if enabled, the **customer** can terminate their subscription from
+  their **customer portal**;
+- :guilabel:`Automatic Closing`: the number of days after which **unpaid** subscriptions *past* the
+  due date are automatically closed;
+- :guilabel:`Invoicing Journal`: if set, subscriptions with this template are invoiced in the set
+  journal. If none, the sales journal with the lowest sequence is used.
+
+.. note::
+   On each template, you can add specific :doc:`Terms & Conditions
+   <../sales/send_quotations/terms_and_conditions>`. If **terms and conditions** are specified on a
+   template, these will be used instead of the default **terms and conditions** set in the **Sales**
+   app settings (if any are set).
+
+.. image:: plans/subplan-terms.png
+   :alt: Terms and conditions of subscription plan

content/applications/sales/subscriptions/products.rst

@@ -0,0 +1,61 @@
+==================
+Recurring products
+==================
+
+When creating a subscription, at least one product on the order lines must be configured as
+:ref:`recurring <subscriptions/product/recurring>`.
+
+If a single product is sold using more than one recurrence period, configure the product's
+:ref:`time-based pricing <subscriptions/product/time-based-pricing>` to automatically adapt the unit
+price on the subscription based on the recurrence set.
+
+.. _subscriptions/product/recurring:
+
+Configuration
+=============
+
+To create a recurring product, go to :menuselection:`Subscriptions --> Subscriptions --> Products`
+and click :guilabel:`New`. Choose a :guilabel:`Product Name` and leave :guilabel:`Recurring` and
+:guilabel:`Can be Sold` enabled.
+
+.. _subscriptions/product/time-based-pricing:
+
+Time-based pricing
+------------------
+
+To set a recurring product's time-based pricing, go to :menuselection:`Subscriptions -->
+Subscriptions --> Products`, select a product, and open the :guilabel:`Time-based pricing` tab.
+Click :guilabel:`Add a price`, select a :guilabel:`Period`, and set a :guilabel:`Price`. Add as many
+prices as needed.
+
+.. note::
+   :guilabel:`Daily` and :guilabel:`Hourly` periods cannot be used on recurring products.
+
+.. _subscriptions/product/pricelists:
+
+Pricelists
+~~~~~~~~~~
+
+:doc:`Pricelists <../sales/products_prices/prices/pricing>` can be used with recurring products. To
+do so, go to :menuselection:`Sales --> Products --> Pricelists`, click :guilabel:`New`, name the
+pricelist, and open the :guilabel:`Time-based rules` tab. Click :guilabel:`Add a line`, select a
+:guilabel:`Period`, and set a :guilabel:`Price`. Add as many lines as needed. Once done, the
+product's :ref:`time-based pricing <subscriptions/product/time-based-pricing>` tab is automatically
+updated.
+
+.. _subscriptions/product/ecommerce:
+
+eCommerce
+~~~~~~~~~
+
+When a recurring product uses :ref:`time-based pricing <subscriptions/product/time-based-pricing>`,
+only the shortest period is used on the eCommerce product page by default.
+
+To let the customer select the period, go to :menuselection:`Subscriptions --> Subscriptions -->
+Products`, select a product, and open the :guilabel:`Attributes & Variants` tab. Name the
+:guilabel:`Attribute`, create :guilabel:`Values` for the different periods that should be available,
+and save manually. Open the :guilabel:`Time-based pricing` tab and select the correct
+:guilabel:`Product Variants` for each :guilabel:`Period`.
+
+.. seealso::
+   :doc:`../../websites/ecommerce/managing_products/variants`

content/applications/sales/subscriptions/renewals.rst

@@ -23,7 +23,7 @@ Renew your first subscription
 =============================
 
 Before renewing a subscription, be sure to check out our documentation on how to
-:doc:`Create a quotation <../../subscriptions/sales_flow/create_a_quotation>` using subscription
+:doc:`Create a quotation <../subscriptions>` using subscription
 products. Indeed, once confirmed, a quotation becomes a sales order and a new subscription is
 automatically created. Therefore, this subscription has the status *In progress*. From there, you
 have the possibility to renew the subscription. In the Other Info tab, underneath the To Renew
@@ -77,6 +77,6 @@ to your *Subscriptions dashboard* and use the filter *To renew*.
   :alt: List view of all subscriptions and use of the filter to renew in Odoo Subscriptions
 
 .. 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/reporting.rst

@@ -1,10 +0,0 @@
-:nosearch:
-
-=========
-Reporting
-=========
-
-.. toctree::
-   :titlesonly:
-
-   reporting/subscription_reports

content/applications/sales/subscriptions/reports.rst

@@ -1,6 +1,6 @@
-=============================
-Generate subscription reports
-=============================
+=======
+Reports
+=======
 
 As we know, understanding how our business is going, and where it is going, is key to success. And
 particularly so when we offer subscription services or products.
@@ -16,7 +16,7 @@ concepts to the proper understanding of the following reports:
   to estimate the coming year's performance. However, this estimation does not take variations and
   growth into account.
 
-.. image:: subscription_reports/difference-between-MRR-and-ARR.png
+.. image:: reports/difference-between-MRR-and-ARR.png
   :align: center
   :alt: Difference between MRR and ARR in Odoo Subscriptions
 
@@ -43,7 +43,7 @@ concepts to the proper understanding of the following reports:
        - | Therefore, the 56$ of MRR difference out of the initial 600$ causes a **Revenue Churn**
          | of 9,33%.
 
-       .. image:: subscription_reports/difference-between-logo-churn-and-revenue-churn.png
+       .. image:: reports/difference-between-logo-churn-and-revenue-churn.png
           :align: center
           :alt: Difference between logo churn and revenue churn in Odoo Subscriptions
 
@@ -66,7 +66,7 @@ can choose *Quantity*, *Recurring Price*, *Yearly Recurring Revenue* and *Count*
 *Quantity* is added. This way, you can review both of these measures at the same time. You can even
 *Group By Start Date* and, more precisely, by *Week*, to get a clear view of your report.
 
-.. image:: subscription_reports/subscriptions-analysis-report.png
+.. image:: reports/subscriptions-analysis-report.png
   :align: center
   :alt: Subscriptions analysis report in Odoo Subscriptions
 
@@ -78,7 +78,7 @@ Go to :menuselection:`Subscriptions --> Reporting --> Retention`. The default me
 *Monthly Recurring Revenue* was chosen, and the *Month* periodicity remains intact.
 By using these criteria, you can see the progression of the retention from its start.
 
-.. image:: subscription_reports/retention-analysis-report.png
+.. image:: reports/retention-analysis-report.png
   :align: center
   :alt: Retention analysis report in Odoo Subscriptions
 
@@ -91,7 +91,7 @@ different KPIs: *Monthly Recurring Revenue*, *Net Revenue*, *Non-Recurring Reven
 information on subscriptions, companies, and sales teams. This is useful if you are looking for
 specific information.
 
-.. image:: subscription_reports/revenue-KPIs-report.png
+.. image:: reports/revenue-KPIs-report.png
   :align: center
   :alt: Revenue KPIs report in Odoo Subscriptions
 
@@ -100,7 +100,7 @@ data, which is the typical scenario for a new business. But, as your company gro
 these graphs get populated with more and more data. Once again, you can filter these specific KPIs
 on subscriptions, companies, and sales teams.
 
-.. image:: subscription_reports/detailed-MRR-report.png
+.. image:: reports/detailed-MRR-report.png
   :align: center
   :alt: Detailed MRR report in Odoo Subscriptions
 
@@ -112,11 +112,11 @@ summary of your *Monthly Recurring Revenue*, *Non-Recurring Revenue*, *Subscript
 and *Non-Recurring Invoices* for each of your salespeople. You can choose the period you want to
 apply and the salesperson you want to analyze.
 
-.. image:: subscription_reports/salesperson-dashboard-report.png
+.. image:: reports/salesperson-dashboard-report.png
   :align: center
   :alt: Salesperson dashboard report in Odoo Subscriptions
 
 .. 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/sales_flow.rst

@@ -1,13 +0,0 @@
-:nosearch:
-
-==========
-Sales flow
-==========
-
-.. toctree::
-   :titlesonly:
-
-   sales_flow/create_a_quotation
-   sales_flow/renewals
-   sales_flow/upselling
-   sales_flow/closing

content/applications/sales/subscriptions/sales_flow/create_a_quotation.rst

@@ -1,83 +0,0 @@
-==============================================
-Create a quotation using subscription products
-==============================================
-
-Selling a digital product or service gives instant gratification. However, you have to work hard for
-a new customer to make a purchase. It costs time and money. By convincing customers to sign up for a
-subscription, you maximize your income and streamline your cash flow. You can sell any type of
-product or service through a subscription business model.
-
-.. raw:: html
-
-   <div align="center" style="color:#AD5E99; font-size: 2rem ;margin: 20px 0"> <b>The only limit is
-   your imagination.</b> </div>
-
-Here is a scenario using **Odoo Subscriptions** to create a quotation including subscription
-products.
-
-Create your first quotation
-===========================
-
-Before creating your first quotation, be sure to check out our documentation on how to create and
-manage your own
-:doc:`Subscription templates <../../subscriptions/configuration/subscription_templates>`
-and on how to add
-:doc:`Subscription products <../../subscriptions/configuration/subscription_products>`
-to your templates.
-
-.. important::
-
-   These steps are **mandatory** to make a basic sales flow using **Odoo Subscriptions**.
-
-Go to **Odoo Sales** and create a new quotation. Then, choose a customer and add a product.
-Be careful to select a product that you previously configured as a *Subscription product*.
-
-.. image:: create_a_quotation/create-a-quotation-using-subscription-products.png
-  :align: center
-  :alt: View of a quotation form in Odoo Sales
-
-When your quotation is ready, you have the possibility to send it to your customers or to confirm
-it. It is better to first *Send by email* the quotation to your customers to have their confirmation
-and, then, *Confirm* it in **Odoo Sales**. By clicking on *Customer preview*, you have an idea of
-what your customers will see when receiving your quotation.
-
-.. image:: create_a_quotation/customer-preview-of-a-quotation-using-subscription-products.png
-  :align: center
-  :alt: Customer preview of a quotation form in Odoo Sales
-
-From there, your customers have three choices: *Sign & Pay* the quotation, give you a *Feedback* or
-*Reject* the quotation. It appears that they are very happy and accept the option *Sign & Pay*.
-Then, they have to validate the order with a signature and by choosing a payment method. When it is
-done, you can check out the quotation in **Odoo Sales** and *Confirm* it.
-
-Manage your subscriptions from your SO
-======================================
-
-Once confirmed, the quotation becomes a sales order and a new button appears, *Subscriptions*.
-Indeed, a subscription is automatically created.
-
-.. image:: create_a_quotation/manage-your-subscriptions-from-your-sales-order.png
-  :align: center
-  :alt: Quotation form in Odoo Sales with a button "Subscriptions"
-
-By clicking on the *Subscriptions* button, you can see that the status of the subscription is
-*In progress*. From there, you will have three options:
-:doc:`Renew <../../subscriptions/sales_flow/renewals>`,
-:doc:`Close <../../subscriptions/sales_flow/closing>` or
-:doc:`Upsell <../../subscriptions/sales_flow/upselling>` your subscription.
-
-.. image:: create_a_quotation/use-of-the-subscriptions-button-in-odoo-sales.png
-  :align: center
-  :alt: Use of the intelligent button "Subscriptions" in Odoo Sales
-
-In the top-right corner, you can see the status of the subscription. When a subscription is new and
-created from **Odoo Subscriptions**, the status is *Draft*. When a sales order has been validated,
-the status is *In progress*. Finally, when a customer decides to close his subscription, the status
-becomes *Closed*.
-
-.. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_templates`
-  - :doc:`../../subscriptions/configuration/subscription_products`
-  - :doc:`../../subscriptions/sales_flow/renewals`
-  - :doc:`../../subscriptions/sales_flow/closing`
-  - :doc:`../../subscriptions/sales_flow/upselling`

content/applications/sales/subscriptions/upselling.rst

@@ -36,7 +36,7 @@ Upsell your first subscription
 ==============================
 
 Before upselling a subscription, be sure to check out our documentation on how to
-:doc:`Create a quotation <../../subscriptions/sales_flow/create_a_quotation>` using subscription
+:doc:`Create a quotation <../subscriptions>` using subscription
 products. Indeed, once confirmed, a quotation becomes a sales order and a new subscription is
 automatically created. Therefore, this subscription has the status *In progress*. From there, you
 have the possibility to upsell your subscription.
@@ -80,6 +80,7 @@ The only difference between your two sales orders is the description underneath
 *Subscription Management* category. There, you can easily visualize which one is your upselling.
 
 .. seealso::
-  - :doc:`../../subscriptions/configuration/subscription_templates`
-  - :doc:`../../subscriptions/configuration/subscription_products`
-  - :doc:`../../subscriptions/sales_flow/create_a_quotation`
+   - :doc:`../subscriptions`
+   - :doc:`plans`
+   - :doc:`products`
+

redirects/16.0.txt

@@ -20,6 +20,18 @@ applications/finance/payment_acquirers/sips.rst applications/finance/payment_pro
 applications/finance/payment_acquirers/stripe.rst applications/finance/payment_providers/stripe.rst                                   # /payment_acquirers/* -> /payment_providers/*
 applications/finance/payment_acquirers/wire_transfer.rst applications/finance/payment_providers/wire_transfer.rst                     # /payment_acquirers/* -> /payment_providers/*
 
+# applications/sales
+
+applications/sales/sales/invoicing/subscriptions.rst applications/sales/subscriptions.rst                                             # sales/sales/invoicing/subscriptions --> /sales/subscriptions
+applications/sales/subscriptions/configuration/subscription_products.rst applications/sales/subscriptions/products.rst                # configuration/subscription_products --> products
+applications/sales/subscriptions/configuration/subscription_templates.rst applications/sales/subscriptions/plans.rst                  # configuration/subscription_templates --> plans
+applications/sales/subscriptions/follow_up/automatic_alerts.rst applications/sales/subscriptions/automatic_alerts.rst                 # follow_up/* --> *
+applications/sales/subscriptions/reporting/subscription_reports.rst applications/sales/subscriptions/reports.rst                      # reporting/subscription_reports --> reports
+applications/sales/subscriptions/sales_flow/closing.rst applications/sales/subscriptions/closing.rst                                  # sales_flow/* --> *
+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/websites
 
 applications/websites/ecommerce/getting_started/catalog.rst applications/websites/ecommerce/managing_products/catalog.rst                        # /getting_started/catalog -> /managing_products/catalog