diff --git a/_static/banners/subscriptions.png b/_static/banners/subscriptions.png
index 41a3947c8..2d51b7118 100644
Binary files a/_static/banners/subscriptions.png and b/_static/banners/subscriptions.png differ
diff --git a/accounting/others/adviser.rst b/accounting/others/adviser.rst
index 1155807f6..a23d277de 100644
--- a/accounting/others/adviser.rst
+++ b/accounting/others/adviser.rst
@@ -5,5 +5,4 @@ Adviser
.. toctree::
:titlesonly:
- adviser/budget
- adviser/reverse_entry
+ adviser/budget
\ No newline at end of file
diff --git a/accounting/others/adviser/media/reverse_entry01.png b/accounting/others/adviser/media/reverse_entry01.png
deleted file mode 100644
index a04657b35..000000000
Binary files a/accounting/others/adviser/media/reverse_entry01.png and /dev/null differ
diff --git a/accounting/others/adviser/reverse_entry.rst b/accounting/others/adviser/reverse_entry.rst
deleted file mode 100644
index c0b69a59e..000000000
--- a/accounting/others/adviser/reverse_entry.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-=========================================
-Reverse an accounting entry automatically
-=========================================
-
-You may want to automatically reverse an accounting entry at a specific
-date.
-
-This is, for example, used when you make a provision (e.g. provision for
-bad debt). When making the accounting entry for the provision, the
-amount you entered is only an estimated amount. You will only be sure of
-the amount at the end of the fiscal year. That's why, at that point, you
-want the accounting entry to be reversed to be able to enter the real
-loss that occurred.
-
-For this, you just have to tick the box "Reverse Automatically" on the
-journal entry and to define a reversal date. The accounting entry will
-be reversed at that date.
-
-.. image:: media/reverse_entry01.png
- :align: center
diff --git a/inventory/management/planning/scheduled_dates.rst b/inventory/management/planning/scheduled_dates.rst
index 7f9489396..5bb3a0bd9 100644
--- a/inventory/management/planning/scheduled_dates.rst
+++ b/inventory/management/planning/scheduled_dates.rst
@@ -18,9 +18,11 @@ suppliers, into account.
How are Lead Times Calculated?
==============================
-.. image:: media/scheduled_dates_01.png
- :align: center
- :alt: Visual representation of various lead times such as customer lead time or delivery LT
+.. raw:: html
+
+
+
+.. link to the Google Slides: https://docs.google.com/presentation/d/1nVM5PyD5OYM4jB13HqHpmBHn40NSDqbLEUUMxivsJeo
As said above, there are several types of lead times. Each is calculated
based on various indicators. Before going through the configuration,
diff --git a/inventory/management/products/usage.rst b/inventory/management/products/usage.rst
index 0329352a1..0d5ae205d 100644
--- a/inventory/management/products/usage.rst
+++ b/inventory/management/products/usage.rst
@@ -1,6 +1,6 @@
-=======================================================
-When Should you Use Packages, Units of Measure or Kits?
-=======================================================
+====================================================================
+When Should you Use Packages, Units of Measure or Special Packaging?
+====================================================================
Units of Measure
================
diff --git a/iot/config/iot_notfound.rst b/iot/config/iot_notfound.rst
index 5978bd9e6..142a3a174 100644
--- a/iot/config/iot_notfound.rst
+++ b/iot/config/iot_notfound.rst
@@ -18,7 +18,7 @@ then you may have problems with your IoT Box image. It should be version
If your IoT Box image is from an earlier version, then you will have to
reflash the SD card of your IoT Box to update the image (the latest
-image can be found `here `__).
+image can be found `here `__).
.. seealso::
- :doc:`flash_sdcard`
diff --git a/legal/terms/enterprise.rst b/legal/terms/enterprise.rst
index 2cc227403..ca4547f4b 100644
--- a/legal/terms/enterprise.rst
+++ b/legal/terms/enterprise.rst
@@ -283,7 +283,7 @@ list price (at the beginning of the Term) for the additional Users or Apps, for
In addition, services for Covered Extra Modules are charged based on the number of lines of code
in these modules. When the Customer opts for the maintenance of Covered Extra Modules, the charge
is a monthly fee of 16€ per 100 lines of code (rounded up to the next hundred), unless otherwise
-specified in writing at the conclusion of the Agreement. Lines of code will be counted with `cloc`
+specified in writing at the conclusion of the Agreement. Lines of code will be counted with the ``cloc``
command of the Software, and include all text lines in the source code of those modules, regardless
of the programming language (Python, Javascript, XML, etc.), excluding blank lines, comment lines
and files that are not loaded when installing or executing the Software.
diff --git a/legal/terms/i18n/enterprise_fr.rst b/legal/terms/i18n/enterprise_fr.rst
index 664638eef..2c0db8606 100644
--- a/legal/terms/i18n/enterprise_fr.rst
+++ b/legal/terms/i18n/enterprise_fr.rst
@@ -307,7 +307,7 @@ Par ailleurs, les services concernant les Modules Supplémentaires Couverts sont
du nombre de lignes de code dans ces modules. Lorsque le client opte pour l'abonnement de maintenance
des Modules Supplémentaires Couverts, le coût mensuel est de 16€ par 100 lignes de code (arrondi à la
centaine supérieure), sauf si spécifié par écrit à la conclusion du Contrat. Les lignes de code
-sont comptées avec la commande `cloc` du Logiciel, et comprennent toutes les lignes de texte du code
+sont comptées avec la commande ``cloc`` du Logiciel, et comprennent toutes les lignes de texte du code
source de ces modules, peu importe le langage de programmation (Python, Javascript, XML, etc.),
à l'exclusion des lignes vides, des lignes de commentaires et des fichiers qui ne sont pas chargés
à l'installation ou à l'exécution du Logiciel.
diff --git a/odoo_sh/getting_started/settings.rst b/odoo_sh/getting_started/settings.rst
index 74519492d..fcc84be37 100644
--- a/odoo_sh/getting_started/settings.rst
+++ b/odoo_sh/getting_started/settings.rst
@@ -163,11 +163,20 @@ To configure the deploy key for a private repository, proceed as follows:
Storage Size
============
-This section shows a small description of the storage size used by your project.
+This section shows the storage size used by your project.
.. image:: ./media/interface-settings-storage.png
:align: center
+Storage size is computed as follows:
+
+* the size of the PostgreSQL database
+
+* the size of the disk files available in your container: database filestore, sessions storage directory...
+
+.. Warning::
+ In case you want to analyze disk usage, you can run the tool `ncdu `_ in your Web Shell.
+
Should your production database size grow to exceed what's provisioned in your subscription, it
will automatically be synchronized with it.
diff --git a/planning/overview/send_planned_shifts.rst b/planning/overview/send_planned_shifts.rst
index 009c9d55c..dcc5cd0a4 100644
--- a/planning/overview/send_planned_shifts.rst
+++ b/planning/overview/send_planned_shifts.rst
@@ -2,7 +2,7 @@
Send Planned Shifts and Give Employees Autonomy Over Shifts
===========================================================
-If you are not on top of your tasks and shifts you might fall behind, loosing productivity.
+If you are not on top of your tasks and shifts you might fall behind, losing productivity.
Allowing your employees to have a say over shifts helps you to be on top of your workload, and
gives them flexibility.
diff --git a/point_of_sale/payment/media/six_02.png b/point_of_sale/payment/media/six_02.png
index 850862202..e33b7e217 100644
Binary files a/point_of_sale/payment/media/six_02.png and b/point_of_sale/payment/media/six_02.png differ
diff --git a/point_of_sale/payment/six.rst b/point_of_sale/payment/six.rst
index e327bd9de..3cdea395e 100644
--- a/point_of_sale/payment/six.rst
+++ b/point_of_sale/payment/six.rst
@@ -1,12 +1,15 @@
====================================================
-Connect a SIX/Worldline Payment Terminal to your PoS
+Connect a SIX Payment Terminal to your PoS
====================================================
-Connecting a SIX/Worldline payment terminal allows you to offer a fluid
+Connecting a SIX payment terminal allows you to offer a fluid
payment flow to your customers and ease the work of your cashiers.
-.. note::
- Please note SIX/Worldine is currently only available for UE customers.
+.. warning::
+ Even though Worldline has recently acquired SIX Payment Services and both
+ companies use Yomani payment terminals, the firmware they run is different.
+ Terminals received from Worldline are therefore not compatible with this
+ integration.
Configuration
=============
diff --git a/purchase/purchases/rfq/3_way_matching.rst b/purchase/purchases/rfq/3_way_matching.rst
index 328234076..4f4b916db 100644
--- a/purchase/purchases/rfq/3_way_matching.rst
+++ b/purchase/purchases/rfq/3_way_matching.rst
@@ -7,7 +7,7 @@ receiving the ordered products. However, you might not want to pay it
until the products have been received.
To define whether the vendor bill should be paid or not, you can use
-what we call *3-way matching*. It refers to the comparaison of the
+what we call *3-way matching*. It refers to the comparison of the
information appearing on the *Purchase Order*, the *Vendor Bill*
and the *Receipt*.
diff --git a/social_marketing/overview/campaigns.rst b/social_marketing/overview/campaigns.rst
index 5e70bd565..1bc4a0b6e 100644
--- a/social_marketing/overview/campaigns.rst
+++ b/social_marketing/overview/campaigns.rst
@@ -13,8 +13,8 @@ Go to :menuselection:`Social Marketing --> Campaigns --> Create`.
:align: center
:alt: Click on create to start a campaign in Odoo Social Marketing
-As you create content, tabs for that specific channel will be shown. The overview of the campaign
-shows you global metric such as:
+As you create content, tabs for that specific channel are shown. The overview of the campaign
+displays global metrics such as:
- *Revenue*: number of users who, from a link in your content, finished a transaction (paid).
- *Quotations*: number of users who, from a link in your content, have started but not finished a
diff --git a/subscriptions.rst b/subscriptions.rst
index aa82b32a5..3ed689f65 100644
--- a/subscriptions.rst
+++ b/subscriptions.rst
@@ -9,3 +9,5 @@ Subscriptions
subscriptions/configuration
subscriptions/sales_flow
+ subscriptions/follow_up
+ subscriptions/reporting
\ No newline at end of file
diff --git a/subscriptions/configuration/media/subscription_templates_2.png b/subscriptions/configuration/media/creation-of-subscription-templates.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_templates_2.png
rename to subscriptions/configuration/media/creation-of-subscription-templates.png
diff --git a/subscriptions/configuration/media/subscription_templates_1.png b/subscriptions/configuration/media/default-subscription-templates.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_templates_1.png
rename to subscriptions/configuration/media/default-subscription-templates.png
diff --git a/subscriptions/configuration/media/subscription_templates_4.png b/subscriptions/configuration/media/health-check-on-subscription-templates.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_templates_4.png
rename to subscriptions/configuration/media/health-check-on-subscription-templates.png
diff --git a/subscriptions/configuration/media/subscription_products_1.png b/subscriptions/configuration/media/subscription-products-configuration.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_products_1.png
rename to subscriptions/configuration/media/subscription-products-configuration.png
diff --git a/subscriptions/configuration/media/subscription_products_2.png b/subscriptions/configuration/media/subscription-products-form.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_products_2.png
rename to subscriptions/configuration/media/subscription-products-form.png
diff --git a/subscriptions/configuration/media/subscription_products_3.png b/subscriptions/configuration/media/subscription-products-using-subscription-templates.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_products_3.png
rename to subscriptions/configuration/media/subscription-products-using-subscription-templates.png
diff --git a/subscriptions/configuration/media/subscription_templates_3.png b/subscriptions/configuration/media/terms-and-conditions-on-subscription-templates.png
similarity index 100%
rename from subscriptions/configuration/media/subscription_templates_3.png
rename to subscriptions/configuration/media/terms-and-conditions-on-subscription-templates.png
diff --git a/subscriptions/configuration/subscription_products.rst b/subscriptions/configuration/subscription_products.rst
index 8c75c4fe6..12dbeffe5 100644
--- a/subscriptions/configuration/subscription_products.rst
+++ b/subscriptions/configuration/subscription_products.rst
@@ -2,8 +2,8 @@
Add subscription products
=========================
-To properly sell your subscriptions using our amazing **Odoo Subscriptions** application, you must follow
-these steps:
+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**
@@ -22,7 +22,7 @@ product type, it is recommended to use *Service* for subscription products as th
products that you provide to your customers. Finally, you can adapt your prices and also add an
internal reference.
-.. image:: media/subscription_products_1.png
+.. image:: media/subscription-products-configuration.png
:align: center
:alt: View of a subscription product form in Odoo Subscriptions
@@ -32,13 +32,13 @@ internal reference.
application, this option is selected by default. However, if you create a product from another
application, it is not the case.
- .. image:: media/subscription_products_2.png
+ .. image:: media/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:: media/subscription_products_3.png
+ .. image:: media/subscription-products-using-subscription-templates.png
:align: center
:alt: View of a subscription product form in Odoo Subscriptions
diff --git a/subscriptions/configuration/subscription_templates.rst b/subscriptions/configuration/subscription_templates.rst
index 19d81eb42..44daf767b 100644
--- a/subscriptions/configuration/subscription_templates.rst
+++ b/subscriptions/configuration/subscription_templates.rst
@@ -35,7 +35,7 @@ Go to :menuselection:`Subscriptions --> Configuration --> Subscription templates
suggests you two types of subscription (MON - Monthly subscription *vs* YEA - Yearly subscription).
You can also create your own ones.
-.. image:: media/subscription_templates_1.png
+.. image:: media/default-subscription-templates.png
:align: center
:alt: Default subscription templates on Odoo Subscriptions
@@ -54,7 +54,7 @@ Among the payment options, an additional field called *Invoice email* appears wh
*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:: media/subscription_templates_2.png
+.. image:: media/creation-of-subscription-templates.png
:align: center
:alt: Create your own subscription templates on Odoo Subscriptions
@@ -67,7 +67,7 @@ subscriptions or not. If enabled, you can set an *Automatic closing* limit and s
essential to set out important contractual points between the customers and the sellers (payment,
refund policy, cancellation, complaints, etc.).
- .. image:: media/subscription_templates_3.png
+ .. image:: media/terms-and-conditions-on-subscription-templates.png
:align: center
:alt: Terms & conditions on Odoo Subscriptions
@@ -77,7 +77,7 @@ subscriptions or not. If enabled, you can set an *Automatic closing* limit and s
summarizes all the records corresponding to these filters and you are able to manage them in one
click.
- .. image:: media/subscription_templates_4.png
+ .. image:: media/health-check-on-subscription-templates.png
:align: center
:alt: Health check on Odoo Subscriptions
diff --git a/subscriptions/follow_up.rst b/subscriptions/follow_up.rst
new file mode 100644
index 000000000..49833c1fd
--- /dev/null
+++ b/subscriptions/follow_up.rst
@@ -0,0 +1,8 @@
+=========
+Follow-up
+=========
+
+.. toctree::
+ :titlesonly:
+
+ follow_up/automatic_alerts
\ No newline at end of file
diff --git a/subscriptions/follow_up/automatic_alerts.rst b/subscriptions/follow_up/automatic_alerts.rst
new file mode 100644
index 000000000..9bbb307ff
--- /dev/null
+++ b/subscriptions/follow_up/automatic_alerts.rst
@@ -0,0 +1,86 @@
+=======================
+Set up 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
+subscribers to check how things are going. This is what the *Automatic Alerts* feature is for.
+
+For example, when customers subscribe to your magazine, you would probably want to send them an
+email to welcome them and express your gratitude. Or, if the satisfaction rate of your customers
+drops below 50%, you would probably want to schedule a call with them to understand the reasons for
+their dissatisfaction.
+
+With **Odoo Subscriptions**, you can set automatic emails, create a "Call" task for one
+of your salespeople so that he/she can try to understand your customer's dissatisfaction, and
+finally, why not automatically send satisfaction surveys so customers can evaluate your services?
+All of that is now possible.
+
+Create a new automatic alert
+============================
+
+The following example shows how to create a new automatic alert to send satisfaction surveys to your
+customers, by email, after one month of subscription. To do so, go to :menuselection:`Subscriptions
+--> Configuration --> Alerts`, and create a new alert.
+
+.. image:: media/create-a-new-automatic-alert.png
+ :align: center
+ :alt: New automatic alert in Odoo Subscriptions
+
+1. On the *Apply on* section, first give the alert a name. Then, you can choose to apply this alert
+ on a subscription template, on a specific customer, or even on a specific product. If you want
+ to add more specifications, you can also specify the value of your MRR, the change rate of your
+ MRR over a certain period of time, the value of the satisfaction rate, and even the stage to
+ which you want to apply this alert.
+
+ .. note::
+ In this example, the alert is applied to a specific product, and the stage goes from
+ *Undefined* to *In Progress*.
+
+2. For the *Action* section, specify the *Action* and the *Trigger on*. If the *Trigger on* is set
+ to *Modification*, the action is triggered every time there is a change or anything added to the
+ subscription, and all the conditions on the *Apply on* section are met. Now, if the *Trigger on*
+ is set to *Timed condition*, it means that the action is triggered based on the type of
+ *Trigger date*. After that, you can choose your *Action*. You have the choice between
+ *Create next activity*, *Set a tag on the subscription*, *Set a stage on the subscription*,
+ *Mark as To Renew*, *Send an email to the customer* and *Send an SMS Text Message to the
+ customer*.
+
+ .. note::
+ In the example above, the *Trigger on* is set to *Timed condition*, therefore, a
+ *Trigger date* and *Delay after trigger* need to be specified. And because the *Send an email
+ to the customer* action was adopted, an *Email template* can be chosen.
+
+As a result, this alert will send a rating survey after one month, to the customers who have
+purchased that specific product. The survey will appear in the chatter of your respective
+subscription.
+
+.. image:: media/rating-satisfaction-survey.png
+ :align: center
+ :alt: Satisfaction survey in Odoo Subscriptions
+
+Modify an existing automatic alert
+==================================
+
+By default, Odoo suggests you an automatic alert called *Take action on less satisfied clients*.
+
+.. image:: media/modify-an-existing-automatic-alert.png
+ :align: center
+ :alt: Modify an existing automatic alert in Odoo Subscriptions
+
+This alert is applied to the *Rating Satisfaction* of your customers, and the action is triggered
+on *Timed condition*. If their satisfaction rate is lower than 50%, a salesperson contacts the
+customer. This action is automatically assigned to the salesperson who manages the subscription,
+and the due date is 5 days after the triggering of this action. This alert ensures that your
+clients are happy and that you are taking actions if they are not. It helps to keep your customer
+retention rates very high.
+
+.. note::
+ By editing the alert, you can modify the *Apply on*, the *Action* and *Activity* sections, and
+ 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`
\ No newline at end of file
diff --git a/subscriptions/follow_up/media/create-a-new-automatic-alert.png b/subscriptions/follow_up/media/create-a-new-automatic-alert.png
new file mode 100644
index 000000000..476537457
Binary files /dev/null and b/subscriptions/follow_up/media/create-a-new-automatic-alert.png differ
diff --git a/subscriptions/follow_up/media/modify-an-existing-automatic-alert.png b/subscriptions/follow_up/media/modify-an-existing-automatic-alert.png
new file mode 100644
index 000000000..1a4981ccc
Binary files /dev/null and b/subscriptions/follow_up/media/modify-an-existing-automatic-alert.png differ
diff --git a/subscriptions/follow_up/media/rating-satisfaction-survey.png b/subscriptions/follow_up/media/rating-satisfaction-survey.png
new file mode 100644
index 000000000..c2b3bb7a5
Binary files /dev/null and b/subscriptions/follow_up/media/rating-satisfaction-survey.png differ
diff --git a/subscriptions/reporting.rst b/subscriptions/reporting.rst
new file mode 100644
index 000000000..90d09e099
--- /dev/null
+++ b/subscriptions/reporting.rst
@@ -0,0 +1,8 @@
+=========
+Reporting
+=========
+
+.. toctree::
+ :titlesonly:
+
+ reporting/subscription_reports
\ No newline at end of file
diff --git a/subscriptions/reporting/media/detailed-MRR-report.png b/subscriptions/reporting/media/detailed-MRR-report.png
new file mode 100644
index 000000000..ce5dd487b
Binary files /dev/null and b/subscriptions/reporting/media/detailed-MRR-report.png differ
diff --git a/subscriptions/reporting/media/difference-between-MRR-and-ARR.png b/subscriptions/reporting/media/difference-between-MRR-and-ARR.png
new file mode 100644
index 000000000..18d801cfb
Binary files /dev/null and b/subscriptions/reporting/media/difference-between-MRR-and-ARR.png differ
diff --git a/subscriptions/reporting/media/difference-between-logo-churn-and-revenue-churn.png b/subscriptions/reporting/media/difference-between-logo-churn-and-revenue-churn.png
new file mode 100644
index 000000000..c028dd53c
Binary files /dev/null and b/subscriptions/reporting/media/difference-between-logo-churn-and-revenue-churn.png differ
diff --git a/subscriptions/reporting/media/retention-analysis-report.png b/subscriptions/reporting/media/retention-analysis-report.png
new file mode 100644
index 000000000..b67773f36
Binary files /dev/null and b/subscriptions/reporting/media/retention-analysis-report.png differ
diff --git a/subscriptions/reporting/media/revenue-KPIs-report.png b/subscriptions/reporting/media/revenue-KPIs-report.png
new file mode 100644
index 000000000..55eccffa4
Binary files /dev/null and b/subscriptions/reporting/media/revenue-KPIs-report.png differ
diff --git a/subscriptions/reporting/media/salesperson-dashboard-report.png b/subscriptions/reporting/media/salesperson-dashboard-report.png
new file mode 100644
index 000000000..380bc2096
Binary files /dev/null and b/subscriptions/reporting/media/salesperson-dashboard-report.png differ
diff --git a/subscriptions/reporting/media/subscriptions-analysis-report.png b/subscriptions/reporting/media/subscriptions-analysis-report.png
new file mode 100644
index 000000000..de2ce620a
Binary files /dev/null and b/subscriptions/reporting/media/subscriptions-analysis-report.png differ
diff --git a/subscriptions/reporting/subscription_reports.rst b/subscriptions/reporting/subscription_reports.rst
new file mode 100644
index 000000000..c014c8317
--- /dev/null
+++ b/subscriptions/reporting/subscription_reports.rst
@@ -0,0 +1,122 @@
+=============================
+Generate subscription 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.
+
+Before getting to the heart of the matter, it is very important to recall certain essential
+concepts to the proper understanding of the following reports:
+
+- **Monthly Recurring Revenue (MRR)**: MRR is arguably the most important metric for subscription
+ businesses. It shows the monthly revenue earned with subscription-based products or services. It
+ is a consistent number used to track all recurring revenue over time, in monthly increments.
+
+- **Annual Run-Rate (ARR)**: ARR is the yearly version of MRR, which is based on the current MRR,
+ to estimate the coming year's performance. However, this estimation does not take variations and
+ growth into account.
+
+.. image:: media/difference-between-MRR-and-ARR.png
+ :align: center
+ :alt: Difference between MRR and ARR in Odoo Subscriptions
+
+- **Non-Recurring Revenue (NRR)**: NRR shows the revenue earned for everything else than
+ subscription-based products or services. This includes gains of a rare or unique nature that are
+ unlikely to occur in the ordinary course of businesses.
+
+- **Customer Retention**: Practices to engage existing customers to continue buying products or
+ services from your business. Customer retention can be a challenge, because you must prove you
+ are worthy of your customers' trust.
+
+- **Churn Rate**: Also known as the Rate of Attrition or Customer Churn, the churn rate can be
+ defined, in this case, as the percentage of subscribers who discontinued their subscriptions
+ within a given time period. We can distinguish two types of Churn:
+
+ - **Logo Churn**: It corresponds to the subscription cancellation rate.
+
+ - **Revenue Churn**: It corresponds to the monthly recurring revenue loss rate.
+
+ .. admonition::
+ Let's imagine a 2$ increase in a subscription service.
+
+ - We lost 3 customers out of the initial 20, which generates a **Logo Churn** of 15%.
+ - | Therefore, the 56$ of MRR difference out of the initial 600$ causes a **Revenue Churn**
+ | of 9,33%.
+
+ .. image:: media/difference-between-logo-churn-and-revenue-churn.png
+ :align: center
+ :alt: Difference between logo churn and revenue churn in Odoo Subscriptions
+
+ Reminder: even though they seem to evolve in the same direction most of the time, it might not
+ be the case all the time.
+
+- **Customer Lifetime Value (CLV)**: Indicates how much revenue can be expected for a customer
+ during his/her entire contract. This approach emphasizes the importance of customer retention,
+ shifting our focus from a quarterly or yearly approach to a long-term one.
+
+Check out the different kinds of reports you can access from the **Odoo Subscriptions**
+application.
+
+Subscriptions analysis report
+=============================
+
+Go to :menuselection:`Subscriptions --> Reporting --> Subscriptions`. From there, you can change
+the *Measures*. By default, Odoo uses the *Monthly Recurring Revenue*. In addition to that, you
+can choose *Quantity*, *Recurring Price*, *Yearly Recurring Revenue* and *Count*. For this example,
+*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:: media/subscriptions-analysis-report.png
+ :align: center
+ :alt: Subscriptions analysis report in Odoo Subscriptions
+
+Retention analysis report
+=========================
+
+Go to :menuselection:`Subscriptions --> Reporting --> Retention`. The default measure applied is
+*Count*, but you can change to the appropriate one for you. For the example below,
+*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:: media/retention-analysis-report.png
+ :align: center
+ :alt: Retention analysis report in Odoo Subscriptions
+
+Revenue KPIs report
+===================
+
+Go to :menuselection:`Subscriptions --> Reporting --> Revenue KPIs`. From there, you can check
+different KPIs: *Monthly Recurring Revenue*, *Net Revenue*, *Non-Recurring Revenue*,
+*Revenue per Subscription*, *Annual Run-Rate*, *Lifetime Value*, and more. You can also filter this
+information on subscriptions, companies, and sales teams. This is useful if you are looking for
+specific information.
+
+.. image:: media/revenue-KPIs-report.png
+ :align: center
+ :alt: Revenue KPIs report in Odoo Subscriptions
+
+The example below shows the *Monthly Recurring Revenue* detailed report. At the moment, there is no
+data, which is the typical scenario for a new business. But, as your company grows over the months,
+these graphs get populated with more and more data. Once again, you can filter these specific KPIs
+on subscriptions, companies, and sales teams.
+
+.. image:: media/detailed-MRR-report.png
+ :align: center
+ :alt: Detailed MRR report in Odoo Subscriptions
+
+Salesperson dashboard report
+============================
+
+Go to :menuselection:`Subscriptions --> Reporting --> Salesperson Dashboard`. This page gives you a
+summary of your *Monthly Recurring Revenue*, *Non-Recurring Revenue*, *Subscription modifications*,
+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:: media/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`
\ No newline at end of file
diff --git a/subscriptions/sales_flow/closing.rst b/subscriptions/sales_flow/closing.rst
index 8506342aa..e74f0d48e 100644
--- a/subscriptions/sales_flow/closing.rst
+++ b/subscriptions/sales_flow/closing.rst
@@ -35,7 +35,7 @@ create a new *Subscription template* or modify an existing one. When editing you
the Invoicing tab, you have the possibility to activate the option *Closable by customer*.
Once enabled, this option gives your customers the right to close their own subscriptions.
-.. image:: media/closing_1.png
+.. image:: media/configuration-to-close-your-subscriptions.png
:align: center
:alt: Configuration to close your subscription with Odoo Subscriptions
@@ -55,7 +55,7 @@ Once confirmed, a quotation becomes a sales order and a new subscription is auto
Therefore, this subscription has the status *In progress*. From there, you have the possibility to
close the subscription.
-.. image:: media/closing_2.png
+.. image:: media/close-your-subscriptions-as-an-administrator.png
:align: center
:alt: Close your subscription from an administration point of view with Odoo Subscriptions
@@ -64,26 +64,26 @@ expensive", "Subscription does not meet my requirements", "Subscription reached
Immediately after confirming your close reason, you can observe that the status of the subscription
is now *Closed* and that the close reason is mentioned on the subscription.
-.. image:: media/closing_3.png
+.. image:: media/use-of-close-reasons.png
:align: center
:alt: What happens when you close your subscription with Odoo Subscriptions?
Customer view
-------------
-As previously explained in the *Administrator view* part, from the subscription form, you also have the
-possibility to visualize what your customers see when managing their subscriptions thanks to the
+As previously explained in the *Administrator view* part, from the subscription form, you also have
+the possibility to visualize what your customers see when managing their subscriptions thanks to the
*Customer preview* button. In this example, the customer has the choice to close his/her subscription
whenever he/she wants to, due to the *Close Subscription* button.
-.. image:: media/closing_4.png
+.. image:: media/close-your-subscriptions-as-a-customer.png
:align: center
:alt: Close your subscription from a customer point of view with Odoo Subscriptions
By using this button, the customer can specify the reason for cancelling his/her subscription and
he/she can even leave a message.
-.. image:: media/closing_5.png
+.. image:: media/use-of-close-reasons-as-a-customer.png
:align: center
:alt: What happens when customers close their subscription with Odoo Subscriptions?
@@ -92,7 +92,7 @@ informed of this modification. Indeed, the status of the subscription becomes *C
appears in the chatter with the new stage, the end date, the close reason, and the closing text
added by the customer.
-.. image:: media/closing_6.png
+.. image:: media/chatter-history-when-a-customer-closes-a-subscription.png
:align: center
:alt: What happens when customers close their subscription in Odoo Subscriptions?
diff --git a/subscriptions/sales_flow/create_a_quotation.rst b/subscriptions/sales_flow/create_a_quotation.rst
index 72e5b02b9..7a6ddc912 100644
--- a/subscriptions/sales_flow/create_a_quotation.rst
+++ b/subscriptions/sales_flow/create_a_quotation.rst
@@ -32,7 +32,7 @@ to your templates.
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:: media/quotations_1.png
+.. image:: media/create-a-quotation-using-subscription-products.png
:align: center
:alt: View of a quotation form in Odoo Sales
@@ -41,7 +41,7 @@ it. It is better to first *Send by email* the quotation to your customers to hav
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:: media/quotations_2.png
+.. image:: media/customer-preview-of-a-quotation-using-subscription-products.png
:align: center
:alt: Customer preview of a quotation form in Odoo Sales
@@ -56,7 +56,7 @@ 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:: media/quotations_3.png
+.. image:: media/manage-your-subscriptions-from-your-sales-order.png
:align: center
:alt: Quotation form in Odoo Sales with a button "Subscriptions"
@@ -66,7 +66,7 @@ By clicking on the *Subscriptions* button, you can see that the status of the su
:doc:`Close <../../subscriptions/sales_flow/closing>` or
:doc:`Upsell <../../subscriptions/sales_flow/upselling>` your subscription.
-.. image:: media/quotations_4.png
+.. image:: media/use-of-the-subscriptions-button-in-odoo-sales.png
:align: center
:alt: Use of the intelligent button "Subscriptions" in Odoo Sales
diff --git a/subscriptions/sales_flow/media/closing_6.png b/subscriptions/sales_flow/media/chatter-history-when-a-customer-closes-a-subscription.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_6.png
rename to subscriptions/sales_flow/media/chatter-history-when-a-customer-closes-a-subscription.png
diff --git a/subscriptions/sales_flow/media/closing_4.png b/subscriptions/sales_flow/media/close-your-subscriptions-as-a-customer.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_4.png
rename to subscriptions/sales_flow/media/close-your-subscriptions-as-a-customer.png
diff --git a/subscriptions/sales_flow/media/closing_2.png b/subscriptions/sales_flow/media/close-your-subscriptions-as-an-administrator.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_2.png
rename to subscriptions/sales_flow/media/close-your-subscriptions-as-an-administrator.png
diff --git a/subscriptions/sales_flow/media/closing_1.png b/subscriptions/sales_flow/media/configuration-to-close-your-subscriptions.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_1.png
rename to subscriptions/sales_flow/media/configuration-to-close-your-subscriptions.png
diff --git a/subscriptions/sales_flow/media/upsell_1.png b/subscriptions/sales_flow/media/configuration-to-upsell-a-subscription.png
similarity index 100%
rename from subscriptions/sales_flow/media/upsell_1.png
rename to subscriptions/sales_flow/media/configuration-to-upsell-a-subscription.png
diff --git a/subscriptions/sales_flow/media/quotations_1.png b/subscriptions/sales_flow/media/create-a-quotation-using-subscription-products.png
similarity index 100%
rename from subscriptions/sales_flow/media/quotations_1.png
rename to subscriptions/sales_flow/media/create-a-quotation-using-subscription-products.png
diff --git a/subscriptions/sales_flow/media/quotations_2.png b/subscriptions/sales_flow/media/customer-preview-of-a-quotation-using-subscription-products.png
similarity index 100%
rename from subscriptions/sales_flow/media/quotations_2.png
rename to subscriptions/sales_flow/media/customer-preview-of-a-quotation-using-subscription-products.png
diff --git a/subscriptions/sales_flow/media/renewals_2.png b/subscriptions/sales_flow/media/customer-preview-of-a-renewal.png
similarity index 100%
rename from subscriptions/sales_flow/media/renewals_2.png
rename to subscriptions/sales_flow/media/customer-preview-of-a-renewal.png
diff --git a/subscriptions/sales_flow/media/quotations_3.png b/subscriptions/sales_flow/media/manage-your-subscriptions-from-your-sales-order.png
similarity index 100%
rename from subscriptions/sales_flow/media/quotations_3.png
rename to subscriptions/sales_flow/media/manage-your-subscriptions-from-your-sales-order.png
diff --git a/subscriptions/sales_flow/media/renewals_3.png b/subscriptions/sales_flow/media/renew-a-quotation.png
similarity index 100%
rename from subscriptions/sales_flow/media/renewals_3.png
rename to subscriptions/sales_flow/media/renew-a-quotation.png
diff --git a/subscriptions/sales_flow/media/renewals_1.png b/subscriptions/sales_flow/media/renew-your-subscription.png
similarity index 100%
rename from subscriptions/sales_flow/media/renewals_1.png
rename to subscriptions/sales_flow/media/renew-your-subscription.png
diff --git a/subscriptions/sales_flow/media/upsell_5.png b/subscriptions/sales_flow/media/sales-order-updates.png
similarity index 100%
rename from subscriptions/sales_flow/media/upsell_5.png
rename to subscriptions/sales_flow/media/sales-order-updates.png
diff --git a/subscriptions/sales_flow/media/renewals_4.png b/subscriptions/sales_flow/media/subscription-management-category.png
similarity index 100%
rename from subscriptions/sales_flow/media/renewals_4.png
rename to subscriptions/sales_flow/media/subscription-management-category.png
diff --git a/subscriptions/sales_flow/media/renewals_5.png b/subscriptions/sales_flow/media/subscriptions-dashboard-with-the-to-renew-filter.png
similarity index 100%
rename from subscriptions/sales_flow/media/renewals_5.png
rename to subscriptions/sales_flow/media/subscriptions-dashboard-with-the-to-renew-filter.png
diff --git a/subscriptions/sales_flow/media/upsell_4.png b/subscriptions/sales_flow/media/subscriptions-updates.png
similarity index 100%
rename from subscriptions/sales_flow/media/upsell_4.png
rename to subscriptions/sales_flow/media/subscriptions-updates.png
diff --git a/subscriptions/sales_flow/media/upsell_2.png b/subscriptions/sales_flow/media/upsell-your-subscription.png
similarity index 100%
rename from subscriptions/sales_flow/media/upsell_2.png
rename to subscriptions/sales_flow/media/upsell-your-subscription.png
diff --git a/subscriptions/sales_flow/media/closing_5.png b/subscriptions/sales_flow/media/use-of-close-reasons-as-a-customer.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_5.png
rename to subscriptions/sales_flow/media/use-of-close-reasons-as-a-customer.png
diff --git a/subscriptions/sales_flow/media/closing_3.png b/subscriptions/sales_flow/media/use-of-close-reasons.png
similarity index 100%
rename from subscriptions/sales_flow/media/closing_3.png
rename to subscriptions/sales_flow/media/use-of-close-reasons.png
diff --git a/subscriptions/sales_flow/media/quotations_4.png b/subscriptions/sales_flow/media/use-of-the-subscriptions-button-in-odoo-sales.png
similarity index 100%
rename from subscriptions/sales_flow/media/quotations_4.png
rename to subscriptions/sales_flow/media/use-of-the-subscriptions-button-in-odoo-sales.png
diff --git a/subscriptions/sales_flow/media/upsell_3.png b/subscriptions/sales_flow/media/use-of-the-upsell-button-in-odoo-sales.png
similarity index 100%
rename from subscriptions/sales_flow/media/upsell_3.png
rename to subscriptions/sales_flow/media/use-of-the-upsell-button-in-odoo-sales.png
diff --git a/subscriptions/sales_flow/renewals.rst b/subscriptions/sales_flow/renewals.rst
index e59a1078b..f6e0b9c63 100644
--- a/subscriptions/sales_flow/renewals.rst
+++ b/subscriptions/sales_flow/renewals.rst
@@ -30,7 +30,7 @@ have the possibility to renew the subscription. In the Other Info tab, underneat
section, you can activate the *To renew* option. When activated, a yellow tag automatically appears
in the upper right corner of the subscription.
-.. image:: media/renewals_1.png
+.. image:: media/renew-your-subscription.png
:align: center
:alt: Renew your subscription with Odoo Subscriptions
@@ -39,7 +39,7 @@ in the upper right corner of the subscription.
on the customer portal. To visualize that, you just have to click on the *Customer preview*
button. The tag *To renew* appears on the top right corner.
- .. image:: media/renewals_2.png
+ .. image:: media/customer-preview-of-a-renewal.png
:align: center
:alt: Customer preview of a renewal with Odoo Subscriptions
@@ -54,7 +54,7 @@ first *Send by email* the quotation to your customers in order to have their con
from the previous subscription". Once confirmed by your customers, this quotation becomes a
sales order and a new sale is mentioned in the upper right corner of the subscription.
- .. image:: media/renewals_3.png
+ .. image:: media/renew-a-quotation.png
:align: center
:alt: Renew a quotation with Odoo Subscriptions
@@ -62,7 +62,7 @@ first *Send by email* the quotation to your customers in order to have their con
The only difference between your two quotations is the description underneath the
*Subscription Management* category. There, you can easily visualize which one is your renewal.
- .. image:: media/renewals_4.png
+ .. image:: media/subscription-management-category.png
:align: center
:alt: Renewal as Subscription Management form in Odoo Subscriptions
@@ -72,7 +72,7 @@ Visualize your subscriptions to renew
Finally, if you want to visualize all your subscriptions and easily find those to renew, you can go
to your *Subscriptions dashboard* and use the filter *To renew*.
-.. image:: media/renewals_5.png
+.. image:: media/subscriptions-dashboard-with-the-to-renew-filter.png
:align: center
:alt: List view of all subscriptions and use of the filter to renew in Odoo Subscriptions
diff --git a/subscriptions/sales_flow/upselling.rst b/subscriptions/sales_flow/upselling.rst
index a13bc522e..5330e9b8c 100644
--- a/subscriptions/sales_flow/upselling.rst
+++ b/subscriptions/sales_flow/upselling.rst
@@ -28,7 +28,7 @@ As previously explained, to upsell a subscription to new customers, it is recomm
*Discounts*. To activate this option, go to :menuselection:`Sales --> Configuration --> Settings` and,
under the *Pricing* category, you have the possibility to grant discounts on sales order lines.
-.. image:: media/upsell_1.png
+.. image:: media/configuration-to-upsell-a-subscription.png
:align: center
:alt: Activation of the discount option in Odoo Sales
@@ -41,14 +41,14 @@ products. Indeed, once confirmed, a quotation becomes a sales order and a new su
automatically created. Therefore, this subscription has the status *In progress*. From there, you
have the possibility to upsell your subscription.
-.. image:: media/upsell_2.png
+.. image:: media/upsell-your-subscription.png
:align: center
:alt: Upsell your subscription with Odoo Subscriptions
By using the smart button *Upsell*, you are able to create a new quotation with new subscription
products and send it to your customers for approval.
-.. image:: media/upsell_3.png
+.. image:: media/use-of-the-upsell-button-in-odoo-sales.png
:align: center
:alt: Add products to your subscription via the upsell option in Odoo Subscriptions
@@ -65,14 +65,14 @@ click on the smart button *Subscriptions* to visualize all updates. From there,
additional line has been added to the subscription with the new extra service the customer wanted to
purchase.
-.. image:: media/upsell_4.png
+.. image:: media/subscriptions-updates.png
:align: center
:alt: Visualize all your subscriptions updates with Odoo Subscriptions
In addition, by clicking on the *Sales* button, you have a summary of your sales orders in a list
view.
-.. image:: media/upsell_5.png
+.. image:: media/sales-order-updates.png
:align: center
:alt: List view of all sales orders created for a subscription
diff --git a/support/supported_versions.rst b/support/supported_versions.rst
index c4e22f531..bceb485b1 100644
--- a/support/supported_versions.rst
+++ b/support/supported_versions.rst
@@ -23,6 +23,8 @@ This matrix shows the support status of every version.
+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
| | Odoo Online | Odoo.sh | On-Premise | Release date | |
+====================+=============+==========+==============+================+==============================================+
+| **Odoo 14.0** | 🏁 | 🏁 | 🏁 | October 2020 | |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
| **Odoo 13.0** | |green| | |green| | |green| | October 2019 | |
+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
| Odoo 12.saas~3 | |green| | N/A | N/A | August 2019 | |