diff --git a/content/applications/sales/sales/sales_quotations/quote_template.rst b/content/applications/sales/sales/sales_quotations/quote_template.rst index 5aa760389..e27fec7c6 100644 --- a/content/applications/sales/sales/sales_quotations/quote_template.rst +++ b/content/applications/sales/sales/sales_quotations/quote_template.rst @@ -96,14 +96,6 @@ Both options, :guilabel:`Online Signature` and :guilabel:`Online Payment` can be simultaneously, in which case the customer must provide **both** a signature **and** a payment to confirm an order. -In the :guilabel:`Recurring Plan` field, choose from a variety of pre-configured amounts of time -(e.g. :guilabel:`Monthly`, :guilabel:`Quarterly`, etc.) to designate how often this quotation -template should occur. - -.. note:: - The :guilabel:`Recurring Plan` field **only** applies to subscription plans. For more - information, check out the documentation on :doc:`../../subscriptions/plans`. - Lines tab --------- diff --git a/content/applications/sales/subscriptions.rst b/content/applications/sales/subscriptions.rst index 0cb38039a..ca0b6c8e9 100644 --- a/content/applications/sales/subscriptions.rst +++ b/content/applications/sales/subscriptions.rst @@ -15,29 +15,29 @@ for recurring billing. The app integrates with other Odoo modules such as **Invo .. cards:: - .. card:: Subscription plans - :target: subscriptions/plans - :large: - - Customize subscription plan templates tailored to various product offerings - .. card:: Renew a subscription - :target: subscriptions/plans + :target: subscriptions/renewals :large: Understand the core management activity for subscriptions .. card:: Upsell a subscription - :target: subscriptions/plans + :target: subscriptions/upselling :large: Offer more value for current subscribers on the same sales order - .. card:: Integrate subscriptions with eCommerce - :target: subscriptions/plans + .. card:: Close a subscription + :target: subscriptions/closing :large: - Offer subscription products with an Odoo **eCommerce** app integration + Customize subscription plan templates tailored to various product offerings + + .. card:: eCommerce integration + :target: subscriptions/ecommerce + :large: + + Offer subscription products through your Odoo eCommerce store .. seealso:: - `Odoo Tutorials: Subscriptions `_ @@ -288,7 +288,6 @@ tab, under the :guilabel:`SALES` section. :titlesonly: subscriptions/ecommerce - subscriptions/plans subscriptions/upselling subscriptions/renewals subscriptions/closing diff --git a/content/applications/sales/subscriptions/closing.rst b/content/applications/sales/subscriptions/closing.rst index 1412781be..e301a66a4 100644 --- a/content/applications/sales/subscriptions/closing.rst +++ b/content/applications/sales/subscriptions/closing.rst @@ -20,8 +20,6 @@ customer portal. :align: center :alt: The Closable option on a recurring plan form in Odoo Subscriptions. -.. seealso:: - :doc:`Configure recurring plans ` Close a subscription ==================== @@ -103,4 +101,3 @@ In addition, the specified :guilabel:`Close Reason` appears on the subscription .. seealso:: - :doc:`../subscriptions` - - :doc:`plans` diff --git a/content/applications/sales/subscriptions/plans.rst b/content/applications/sales/subscriptions/plans.rst deleted file mode 100644 index 3d1ac5e8f..000000000 --- a/content/applications/sales/subscriptions/plans.rst +++ /dev/null @@ -1,102 +0,0 @@ -================== -Subscription plans -================== - -*Subscription plans* are :doc:`quotation templates -<../sales/sales_quotations/quote_template>` used to preconfigure quotations with -subscription products. Use subscription plans to quickly create subscription orders. - -Configure subscription plans -============================ - -To configure subscription plans, go to :menuselection:`Subscriptions --> Configuration --> Plans`. -Then, click :guilabel:`New` to create a new plan, or select an existing plan to edit it. - -Since the Odoo *Subscriptions* app is integrated closely with the *Sales* app, subscription plans -use the same form as quotation templates. - -.. image:: plans/subplan-quotation-template.png - :align: center - :alt: Subscription plan (quotation template) configuration form. - -The subscription plan form contains the following options: - -- :guilabel:`Name`: Enter a name for the subscription plan at the top of the page. -- :guilabel:`Quotation expires after`: Enter the number of days after which the quotation expires, - starting from the day the quotation is sent to the customer. Leave this field at zero for the - quotation to never expire. -- :guilabel:`Online Confirmation`: Check the boxes next to :guilabel:`Signature` or - :guilabel:`Payment` to enable the customer to confirm their subscription order by signing or - paying for the quotation. Enable both to leave the choice to the customer. Enable neither to only - confirm the quotation in the backend. -- :guilabel:`Confirmation Mail`: Select an :doc:`email template - ` for the confirmation email that is - automatically sent to the customer after the quotation is confirmed. Leave this field blank to - send nothing. - - - To create a new email template, enter a name for the template, then click :guilabel:`Create and - edit`. - - To edit an existing email template, select one from the drop-down menu, then click on the - :guilabel:`Internal link` arrow at the end of the line. - -- :guilabel:`Recurrence`: Select the recurrence period used for the plan. The recurrence periods - available here are the same ones that are configured in :menuselection:`Subscriptions --> - Configuration --> Recurrence Periods`. - -Selecting a :guilabel:`Recurrence` turns the quotation template into a subscription plan and enables -the following additional options: - -- :guilabel:`Duration`: Choose whether the subscription plan has no end date (:guilabel:`Forever`) - or a :guilabel:`Fixed` duration. - - - If the duration is :guilabel:`Forever`, then the subscription plan will continually renew until - either the customer or the company manually ends the subscription. - - If the duration is :guilabel:`Fixed`, then enter an :guilabel:`End After` date, which determines - the amount of time after which the subscription will automatically end. - -- :guilabel:`Self Closable`: Check this box to enable the customer to terminate their subscription - from the :doc:`customer portal - `. -- :guilabel:`Automatic Closing`: Enter the number of days after which *unpaid* subscriptions *past* - the due date are automatically closed. -- :guilabel:`Invoicing Journal`: Select the accounting journal in which invoices for this - subscription plan are recorded. Leave this field blank to use the sales journal with the lowest - sequence. - -.. image:: plans/subplan-recurrence.png - :align: center - :alt: Subscription plan with Recurrence selected. - -In the :guilabel:`Lines` tab, create the order lines for the quotation. Click :guilabel:`Add a -product`, select a product to include in the plan, and then enter the :guilabel:`Quantity` and -:guilabel:`Unit of Measure`. Add as many products as desired to the order lines. - -In the :guilabel:`Optional Products` tab, enter any optional products that the customer can add to -their quotation before confirming the order. - -If the subscription plan has unique :doc:`terms and conditions -`, add them in the -:guilabel:`Terms & Conditions` tab. If terms conditions are specified on a plan, these will be used -instead of the default terms and conditions set up in the *Sales* app settings. - -.. image:: plans/subplan-terms-conditions.png - :align: center - :alt: Subscription plan Terms & Conditions tab. - -Use subscription plans on quotations -==================================== - -Quotations for subscription products can be created in both the *Subscriptions* app and the *Sales* -app. - -From the :guilabel:`Subscriptions` dashboard, click :guilabel:`New` to create a new quotation. Then, -select a subscription plan in the :guilabel:`Subscription Plan` field. - -The :guilabel:`Recurrence`, products, and other information from the plan are automatically filled -in. The quotation can then be modified further as needed. - -From the :guilabel:`Sales` dashboard, click :guilabel:`New` to create a new quotation. Then, select -a subscription plan in the :guilabel:`Quotation Template` field. - -All subscription orders will appear on the :guilabel:`Subscriptions` dashboard regardless of whether -they were created in the *Subscriptions* app or the *Sales* app. diff --git a/content/applications/sales/subscriptions/plans/subplan-quotation-template.png b/content/applications/sales/subscriptions/plans/subplan-quotation-template.png deleted file mode 100644 index 3823f4b9d..000000000 Binary files a/content/applications/sales/subscriptions/plans/subplan-quotation-template.png and /dev/null differ diff --git a/content/applications/sales/subscriptions/plans/subplan-recurrence.png b/content/applications/sales/subscriptions/plans/subplan-recurrence.png deleted file mode 100644 index 9539b98d1..000000000 Binary files a/content/applications/sales/subscriptions/plans/subplan-recurrence.png and /dev/null differ diff --git a/content/applications/sales/subscriptions/plans/subplan-terms-conditions.png b/content/applications/sales/subscriptions/plans/subplan-terms-conditions.png deleted file mode 100644 index f87c9e20e..000000000 Binary files a/content/applications/sales/subscriptions/plans/subplan-terms-conditions.png and /dev/null differ diff --git a/content/applications/sales/subscriptions/renewals.rst b/content/applications/sales/subscriptions/renewals.rst index e35579216..c2b436dfc 100644 --- a/content/applications/sales/subscriptions/renewals.rst +++ b/content/applications/sales/subscriptions/renewals.rst @@ -126,4 +126,3 @@ related to this specific subscription. .. seealso:: - :doc:`../subscriptions` - - :doc:`plans` diff --git a/content/applications/sales/subscriptions/reports.rst b/content/applications/sales/subscriptions/reports.rst index a383dd6dc..f0f391aa3 100644 --- a/content/applications/sales/subscriptions/reports.rst +++ b/content/applications/sales/subscriptions/reports.rst @@ -401,4 +401,3 @@ Analysis` reporting page are: .. seealso:: - :doc:`../subscriptions` - - :doc:`plans` diff --git a/content/applications/sales/subscriptions/scheduled_actions.rst b/content/applications/sales/subscriptions/scheduled_actions.rst index c84d51aae..57c5cf749 100644 --- a/content/applications/sales/subscriptions/scheduled_actions.rst +++ b/content/applications/sales/subscriptions/scheduled_actions.rst @@ -184,4 +184,3 @@ For example, if the next invoice date is July 1st, and the :guilabel:`Automatic .. seealso:: - :doc:`../subscriptions` - - :doc:`plans` diff --git a/content/applications/sales/subscriptions/upselling.rst b/content/applications/sales/subscriptions/upselling.rst index a081cff8e..0187ff509 100644 --- a/content/applications/sales/subscriptions/upselling.rst +++ b/content/applications/sales/subscriptions/upselling.rst @@ -105,4 +105,3 @@ Status`. .. seealso:: - :doc:`../subscriptions` - - :doc:`plans` diff --git a/redirects/17.0.txt b/redirects/17.0.txt index c6b008904..4ff0ddf37 100644 --- a/redirects/17.0.txt +++ b/redirects/17.0.txt @@ -116,6 +116,7 @@ applications/sales/point_of_sale/pricing/digital_labels.rst applications/sales/p applications/sales/point_of_sale/payment_methods/terminals/vantiv.rst applications/sales/point_of_sale/payment_methods/terminals.rst # terminals/vantiv --> terminals applications/sales/subscriptions/payment_providers/wire_transfer.rst applications/finance/payment_providers/wire_transfer.rst applications/sales/subscriptions/payment_providers/sdd.rst applications/finance/payment_providers/sdd.rst +applications/sales/subscriptions/plans.rst applications/sales/subscriptions.rst # subscriptions/plans --> subscriptions # applications/services