From e4a4ffb974ccde1842e1b2389450718f8576ad5b Mon Sep 17 00:00:00 2001
From: "Benjamin Frantzen (bfr)" <bfr@odoo.com>
Date: Wed, 18 Dec 2019 13:45:38 +0000
Subject: [PATCH] [IMP] customer ratings flow improvements

- Rename the 'Use Rating on Project' feature into 'Customer Ratings'
- Rename the 'Set Email Template to Stages' link to 'Set a Rating Email Template on Stages'
- Add an optional list view for the Stages menu
- display warning if the rating_template_id field is set and if one of the selected project_ids doesn't have the rating_status field set to true
- Project form view revamp
- rename the '% on tasks' stat button into 'Customer Satisfaction'
- Remove the 'no option' for the rating frequency field because it is required
- project form : Add a 'Go to Website' stat button
- Project dashboard: remove the 'Customer Ratings' menu item in more
- Ratings page: the 'Last 30 days' filter include ratings from today
- remove the Appointment / Helpdesk Customer Satisfaction / Live Support menu items

TASK ID : 1251
---
 .../data/im_livechat_channel_demo.xml         |  14 +-
 .../report/im_livechat_report_channel.py      |   6 +-
 .../im_livechat/static/src/js/im_livechat.js  |   2 +-
 .../static/src/xml/im_livechat.xml            |   4 +-
 .../static/src/js/portal_chatter.js           |   9 +-
 .../static/src/js/portal_composer.js          |   8 +-
 .../static/src/js/portal_rating_composer.js   |   4 +-
 .../portal_rating/views/rating_templates.xml  |   2 +-
 addons/project/__manifest__.py                |   1 -
 addons/project/controllers/__init__.py        |   1 -
 addons/project/data/project_data.xml          |   1 +
 addons/project/data/project_demo.xml          |   4 +-
 .../data/project_mail_template_data.xml       |   8 +-
 addons/project/models/project.py              |  50 +--
 addons/project/models/res_config_settings.py  |  16 +-
 addons/project/tests/test_project_flow.py     |   6 +-
 addons/project/views/project_views.xml        | 334 ++++++++++--------
 addons/project/views/rating_views.xml         |   5 +-
 .../views/res_config_settings_views.xml       |   2 +-
 addons/rating/controllers/main.py             |   8 +-
 addons/rating/models/rating.py                |  34 +-
 addons/rating/models/rating_mixin.py          |   6 +-
 addons/rating/static/src/img/rating_10.png    | Bin 2398 -> 0 bytes
 .../rating/static/src/img/rating_10_white.png | Bin 2293 -> 0 bytes
 addons/rating/static/src/img/rating_3.png     | Bin 0 -> 2186 bytes
 .../rating/static/src/img/rating_3_white.png  | Bin 0 -> 2180 bytes
 addons/rating/static/src/img/rating_5.png     | Bin 2186 -> 2398 bytes
 .../rating/static/src/img/rating_5_white.png  | Bin 2180 -> 2293 bytes
 addons/rating/tests/test_security.py          |   6 +-
 .../data/website_livechat_data.xml            |   4 -
 .../tests/tours/website_livechat_common.js    |   4 +-
 addons/website_livechat/tests/common.py       |   2 +-
 .../tests/test_livechat_request.py            |   2 +-
 .../views/website_livechat.xml                |  10 +-
 addons/website_project/__init__.py            |   5 +
 addons/website_project/__manifest__.py        |  18 +
 .../website_project/controllers/__init__.py   |   4 +
 .../controllers/rating.py                     |  18 +-
 addons/website_project/models/__init__.py     |   4 +
 addons/website_project/models/project.py      |  23 ++
 .../views/project_project_views.xml           |  16 +
 .../views/project_rating_templates.xml        |  72 ++--
 .../website_slides/data/slide_user_demo.xml   |  10 +-
 addons/website_slides/models/slide_channel.py |   2 +-
 .../views/rating_rating_views.xml             |   2 +-
 doc/reference/mixins.rst                      |   4 +-
 46 files changed, 407 insertions(+), 324 deletions(-)
 delete mode 100644 addons/rating/static/src/img/rating_10.png
 delete mode 100644 addons/rating/static/src/img/rating_10_white.png
 create mode 100644 addons/rating/static/src/img/rating_3.png
 create mode 100644 addons/rating/static/src/img/rating_3_white.png
 create mode 100644 addons/website_project/__init__.py
 create mode 100644 addons/website_project/__manifest__.py
 create mode 100644 addons/website_project/controllers/__init__.py
 rename addons/{project => website_project}/controllers/rating.py (85%)
 create mode 100644 addons/website_project/models/__init__.py
 create mode 100644 addons/website_project/models/project.py
 create mode 100644 addons/website_project/views/project_project_views.xml
 rename addons/{project => website_project}/views/project_rating_templates.xml (82%)

diff --git a/addons/im_livechat/data/im_livechat_channel_demo.xml b/addons/im_livechat/data/im_livechat_channel_demo.xml
index e6cde7dbfa6..5e3ca7fc937 100644
--- a/addons/im_livechat/data/im_livechat_channel_demo.xml
+++ b/addons/im_livechat/data/im_livechat_channel_demo.xml
@@ -31,7 +31,7 @@
             <field eval="False" name="partner_id"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_0')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_0')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_5_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_0"/>
@@ -92,7 +92,7 @@
             <field eval="False" name="partner_id"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_1')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_1')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_10_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_1"/>
@@ -205,7 +205,7 @@
             <field name="partner_id" ref="base.partner_demo_portal"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_3')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_3')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_17_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_3"/>
@@ -300,7 +300,7 @@
             <field eval="False" name="partner_id"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_5')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_5')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_25_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_5"/>
@@ -352,7 +352,7 @@
             <field name="partner_id" ref="base.partner_demo_portal"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_6')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_6')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_29_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_6"/>
@@ -404,7 +404,7 @@
             <field eval="False" name="partner_id"/>
             <field eval="True" name="consumed"/>
         </record>
-        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_7')], 10)" model="mail.channel" name="rating_apply"/>
+        <function eval="([ref('im_livechat.im_livechat_mail_channel_data_7')], 5)" model="mail.channel" name="rating_apply"/>
         <record id="im_livechat_mail_message_33_data" model="mail.message">
             <field name="model">mail.channel</field>
             <field name="res_id" ref="im_livechat.im_livechat_mail_channel_data_7"/>
@@ -514,7 +514,7 @@
             <field name="partner_id" ref="base.partner_admin"/>
             <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
             <field name="res_id" ref="im_livechat.mail_channel_livechat_1"/>
-            <field name="rating" eval="10"/>
+            <field name="rating" eval="5"/>
             <field name="consumed" eval="True"/>
         </record>
 
diff --git a/addons/im_livechat/report/im_livechat_report_channel.py b/addons/im_livechat/report/im_livechat_report_channel.py
index b22e040327a..07c01110b8e 100644
--- a/addons/im_livechat/report/im_livechat_report_channel.py
+++ b/addons/im_livechat/report/im_livechat_report_channel.py
@@ -72,14 +72,14 @@ class ImLivechatReportChannel(models.Model):
                     END as is_anonymous,
                     C.country_id,
                     CASE 
-                        WHEN rate.rating = 10 THEN 1
+                        WHEN rate.rating = 5 THEN 1
                         ELSE 0
                     END as is_happy,
                     Rate.rating as rating,
                     CASE
                         WHEN Rate.rating = 1 THEN 'Unhappy'
-                        WHEN Rate.rating = 10 THEN 'Happy'
-                        WHEN Rate.rating = 5 THEN 'Neutral'
+                        WHEN Rate.rating = 5 THEN 'Happy'
+                        WHEN Rate.rating = 3 THEN 'Neutral'
                         ELSE null
                     END as rating_text,
                     CASE 
diff --git a/addons/im_livechat/static/src/js/im_livechat.js b/addons/im_livechat/static/src/js/im_livechat.js
index 000ac6665b9..134679e933d 100644
--- a/addons/im_livechat/static/src/js/im_livechat.js
+++ b/addons/im_livechat/static/src/js/im_livechat.js
@@ -525,7 +525,7 @@ var Feedback = Widget.extend({
         this.$('.o_livechat_rating_choices img[data-value="'+this.rating+'"]').addClass('selected');
 
         // only display textearea if bad smiley selected
-        if (this.rating !== 10) {
+        if (this.rating !== 5) {
             this.$('.o_livechat_rating_reason').show();
         } else {
             this.$('.o_livechat_rating_reason').hide();
diff --git a/addons/im_livechat/static/src/xml/im_livechat.xml b/addons/im_livechat/static/src/xml/im_livechat.xml
index c19e2d09881..9e85f86baeb 100644
--- a/addons/im_livechat/static/src/xml/im_livechat.xml
+++ b/addons/im_livechat/static/src/xml/im_livechat.xml
@@ -9,8 +9,8 @@
                     Did we correctly answer your question ?
                 </div>
                 <div class="o_livechat_rating_choices">
-                    <img t-att-src="widget.server_origin + '/rating/static/src/img/rating_10.png'" alt="Good" data-value="10"/>
-                    <img t-att-src="widget.server_origin + '/rating/static/src/img/rating_5.png'" alt="OK" data-value="5"/>
+                    <img t-att-src="widget.server_origin + '/rating/static/src/img/rating_5.png'" alt="Good" data-value="5"/>
+                    <img t-att-src="widget.server_origin + '/rating/static/src/img/rating_3.png'" alt="OK" data-value="3"/>
                     <img t-att-src="widget.server_origin + '/rating/static/src/img/rating_1.png'" alt="Bad" data-value="1" />
                 </div>
             </div>
diff --git a/addons/portal_rating/static/src/js/portal_chatter.js b/addons/portal_rating/static/src/js/portal_chatter.js
index 51b403b521b..baaebd17be6 100644
--- a/addons/portal_rating/static/src/js/portal_chatter.js
+++ b/addons/portal_rating/static/src/js/portal_chatter.js
@@ -9,7 +9,6 @@ var time = require('web.time');
 var _t = core._t;
 var PortalChatter = portalChatter.PortalChatter;
 var qweb = core.qweb;
-var STAR_RATING_RATIO = 2; // conversion factor from the star (1-5) to the db rating range (1-10)
 
 /**
  * PortalChatter
@@ -67,7 +66,7 @@ PortalChatter.include({
         messages = this._super.apply(this, arguments);
         if (this.options['display_rating']) {
             _.each(messages, function (m, i) {
-                m.rating_value = self.roundToHalf(m['rating_value'] / STAR_RATING_RATIO);
+                m.rating_value = self.roundToHalf(m['rating_value']);
                 m.rating = self._preprocessCommentData(m.rating, i);
             });
         }
@@ -114,13 +113,13 @@ PortalChatter.include({
                 return;
             }
             var ratingData = {
-                'avg': Math.round(result['rating_stats']['avg'] / STAR_RATING_RATIO * 100) / 100,
+                'avg': Math.round(result['rating_stats']['avg'] * 100) / 100,
                 'percent': [],
             };
             _.each(_.keys(result['rating_stats']['percent']).reverse(), function (rating) {
                 if (rating % 2 === 0) {
                     ratingData['percent'].push({
-                        'num': rating / STAR_RATING_RATIO,
+                        'num': rating,
                         'percent': utils.round_precision(result['rating_stats']['percent'][rating], 0.01),
                     });
                 }
@@ -347,7 +346,7 @@ PortalChatter.include({
     _onChangeRatingDomain: function () {
         var domain = [];
         if (this.get('rating_value')) {
-            domain = [['rating_value', '=', this.get('rating_value') * STAR_RATING_RATIO]];
+            domain = [['rating_value', '=', this.get('rating_value')]];
         }
         this._changeCurrentPage(1, domain);
     },
diff --git a/addons/portal_rating/static/src/js/portal_composer.js b/addons/portal_rating/static/src/js/portal_composer.js
index 37b0b9e3511..63854caa302 100644
--- a/addons/portal_rating/static/src/js/portal_composer.js
+++ b/addons/portal_rating/static/src/js/portal_composer.js
@@ -8,8 +8,6 @@ var _t = core._t;
 
 var PortalComposer = portalComposer.PortalComposer;
 
-var STAR_RATING_RATIO = 2;  // conversion factor from the star (1-5) to the db rating range (1-10)
-
 /**
  * PortalComposer
  *
@@ -31,7 +29,7 @@ PortalComposer.include({
 
         // apply ratio to default rating value
         if (options.default_rating_value) {
-            options.default_rating_value = parseFloat(options.default_rating_value) / STAR_RATING_RATIO;
+            options.default_rating_value = parseFloat(options.default_rating_value);
         }
 
         // default options
@@ -66,7 +64,7 @@ PortalComposer.include({
 
             // set the default value to trigger the display of star widget and update the hidden input value.
             self.set("star_value", self.options.default_rating_value); 
-            self.$input.val(self.options.default_rating_value * STAR_RATING_RATIO);
+            self.$input.val(self.options.default_rating_value);
         });
     },
 
@@ -97,7 +95,7 @@ PortalComposer.include({
         var index = this.$('.stars i').index(ev.currentTarget);
         this.set("star_value", index + 1);
         this.user_click = true;
-        this.$input.val(this.get("star_value") * STAR_RATING_RATIO);
+        this.$input.val(this.get("star_value"));
     },
     /**
      * @private
diff --git a/addons/portal_rating/static/src/js/portal_rating_composer.js b/addons/portal_rating/static/src/js/portal_rating_composer.js
index 8bf205a6cb8..af7a55b8749 100644
--- a/addons/portal_rating/static/src/js/portal_rating_composer.js
+++ b/addons/portal_rating/static/src/js/portal_rating_composer.js
@@ -7,8 +7,6 @@ var portalComposer = require('portal.composer');
 
 var PortalComposer = portalComposer.PortalComposer;
 
-var STAR_RATING_RATIO = 2;  // conversion factor from the star (1-5) to the db rating range (1-10)
-
 /**
  * RatingPopupComposer
  *
@@ -25,7 +23,7 @@ var RatingPopupComposer = publicWidget.Widget.extend({
 
     init: function (parent, options) {
         this._super.apply(this, arguments);
-        this.rating_avg = Math.round(options['ratingAvg'] / STAR_RATING_RATIO * 100) / 100 || 0.0;
+        this.rating_avg = Math.round(options['ratingAvg'] / 100) / 100 || 0.0;
         this.rating_total = options['ratingTotal'] || 0.0;
 
         this.options = _.defaults({}, options, {
diff --git a/addons/portal_rating/views/rating_templates.xml b/addons/portal_rating/views/rating_templates.xml
index a1faae6aa21..78561828a00 100644
--- a/addons/portal_rating/views/rating_templates.xml
+++ b/addons/portal_rating/views/rating_templates.xml
@@ -4,7 +4,7 @@
         Rating widget static: show 5 stars (full or empty) regarding the given rating_avg and rating_count
     -->
     <template id="rating_widget_stars_static" name="Rating: static star widget">
-        <t t-set="rating_avg" t-value="round(rating_avg * 100) / 100 / 2"/>
+        <t t-set="rating_avg" t-value="round(rating_avg * 100) / 100"/>
         <t t-set="val_decimal" t-value="round(rating_avg % 1, 1)"/>
         <t t-set="val_integer" t-value="int(rating_avg)"/>
         <t t-set="empty_star" t-value="5 - (val_integer+1) if val_decimal else 5 - val_integer"/>
diff --git a/addons/project/__manifest__.py b/addons/project/__manifest__.py
index 87d37668020..d727cf9cfc2 100644
--- a/addons/project/__manifest__.py
+++ b/addons/project/__manifest__.py
@@ -33,7 +33,6 @@
         'views/mail_activity_views.xml',
         'views/project_assets.xml',
         'views/project_portal_templates.xml',
-        'views/project_rating_templates.xml',
         'data/digest_data.xml',
         'data/project_mail_template_data.xml',
         'data/project_data.xml',
diff --git a/addons/project/controllers/__init__.py b/addons/project/controllers/__init__.py
index 10825353c81..903b755e71e 100644
--- a/addons/project/controllers/__init__.py
+++ b/addons/project/controllers/__init__.py
@@ -2,4 +2,3 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import portal
-from . import rating
diff --git a/addons/project/data/project_data.xml b/addons/project/data/project_data.xml
index d78834cfad2..5e45f5c628b 100644
--- a/addons/project/data/project_data.xml
+++ b/addons/project/data/project_data.xml
@@ -95,6 +95,7 @@
             <field name="alias_defaults">{'project_id': 1}</field>
             <field name="alias_force_thread_id">0</field>
             <field name="alias_parent_model_id" ref="model_project_project"/>
+            <field name="rating_status">stage</field>
         </record>
 
         <record forcecreate="False" id="project_stage_data_0" model="project.task.type">
diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml
index 44be6bc5ec4..be21ed9dfa3 100644
--- a/addons/project/data/project_demo.xml
+++ b/addons/project/data/project_demo.xml
@@ -324,8 +324,8 @@ Send it ASAP, its urgent.</field>
             <field name="rating_template_id" ref="rating_project_request_email_template"/>
         </record>
 
-        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_3')], 10)"/>
-        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_24')], 10)"/>
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_3')], 5)"/>
+        <function model="project.task" name="rating_apply" eval="([ref('project.project_task_24')], 5)"/>
         <function model="project.task" name="rating_apply" eval="([ref('project.project_task_8')], 1)"/>
     </data>
 </odoo>
diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml
index bc96d795102..441be455f31 100644
--- a/addons/project/data/project_mail_template_data.xml
+++ b/addons/project/data/project_mail_template_data.xml
@@ -60,13 +60,13 @@
                     <table style="width:100%;text-align:center;">
                         <tr>
                             <td>
-                                <a href="/rating/${access_token}/10">
-                                    <img alt="Satisfied" src="/rating/static/src/img/rating_10.png" title="Satisfied"/>
+                                <a href="/rating/${access_token}/5">
+                                    <img alt="Satisfied" src="/rating/static/src/img/rating_5.png" title="Satisfied"/>
                                 </a>
                             </td>
                             <td>
-                                <a href="/rating/${access_token}/5">
-                                    <img alt="Not satisfied" src="/rating/static/src/img/rating_5.png" title="Not satisfied"/>
+                                <a href="/rating/${access_token}/3">
+                                    <img alt="Not satisfied" src="/rating/static/src/img/rating_3.png" title="Not satisfied"/>
                                 </a>
                             </td>
                             <td>
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index 8accaa81de7..cc90d132df1 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -51,6 +51,7 @@ class ProjectTaskType(models.Model):
             " * A good feedback from the customer will update the kanban state to 'ready for the new stage' (green bullet).\n"
             " * A medium or a bad feedback will set the kanban state to 'blocked' (red bullet).\n")
     is_closed = fields.Boolean('Closing Stage', help="Tasks in this stage are considered as closed.")
+    disabled_rating_warning = fields.Text(compute='_compute_disabled_rating_warning')
 
     def unlink_wizard(self, stage_view=False):
         self = self.with_context(active_test=False)
@@ -82,6 +83,15 @@ class ProjectTaskType(models.Model):
             self.env['project.task'].search([('stage_id', 'in', self.ids)]).write({'active': False})
         return super(ProjectTaskType, self).write(vals)
 
+    @api.depends('project_ids', 'project_ids.rating_active')
+    def _compute_disabled_rating_warning(self):
+        for stage in self:
+            disabled_projects = stage.project_ids.filtered(lambda p: not p.rating_active)
+            if disabled_projects:
+                stage.disabled_rating_warning = '\n'.join('- %s' % p.name for p in disabled_projects)
+            else:
+                stage.disabled_rating_warning = False
+
 
 class Project(models.Model):
     _name = "project.project"
@@ -172,11 +182,6 @@ class Project(models.Model):
     def _get_default_favorite_user_ids(self):
         return [(6, 0, [self.env.uid])]
 
-    def _get_default_rating_status(self):
-        if self.user_has_groups('project.group_project_rating'):
-            return 'stage'
-        return 'no'
-
     name = fields.Char("Name", index=True, required=True, tracking=True)
     active = fields.Boolean(default=True,
         help="If the active field is set to False, it will allow you to hide the project without removing it.")
@@ -238,20 +243,22 @@ class Project(models.Model):
 
     # rating fields
     rating_request_deadline = fields.Datetime(compute='_compute_rating_request_deadline', store=True)
-    rating_status = fields.Selection([
-        ('stage', 'Rating when changing stage'),
-        ('periodic', 'Periodical Rating'),
-        ('no', 'No rating')], string='Customer Ratings', default=_get_default_rating_status, required=True,
+    rating_active = fields.Boolean('Customer Ratings', default=True)
+    rating_status = fields.Selection(
+        [('stage', 'Rating when changing stage'),
+         ('periodic', 'Periodical Rating')
+        ], 'Customer Ratings Status', default="stage", required=True,
         help="How to get customer feedback?\n"
-                 "- Rating when changing stage: an email will be sent when a task is pulled in another stage.\n"
-                 "- Periodical Rating: email will be sent periodically.\n\n"
-                 "Don't forget to set up the mail templates on the stages for which you want to get the customer's feedbacks.")
+             "- Rating when changing stage: an email will be sent when a task is pulled in another stage.\n"
+             "- Periodical Rating: email will be sent periodically.\n\n"
+             "Don't forget to set up the mail templates on the stages for which you want to get the customer's feedbacks.")
     rating_status_period = fields.Selection([
-        ('daily', 'Daily'), ('weekly', 'Weekly'), ('bimonthly', 'Twice a Month'),
-        ('monthly', 'Once a Month'), ('quarterly', 'Quarterly'), ('yearly', 'Yearly')
-    ], 'Rating Frequency')
-
-    portal_show_rating = fields.Boolean('Rating visible publicly', copy=False)
+        ('daily', 'Daily'),
+        ('weekly', 'Weekly'),
+        ('bimonthly', 'Twice a Month'),
+        ('monthly', 'Once a Month'),
+        ('quarterly', 'Quarterly'),
+        ('yearly', 'Yearly')], 'Rating Frequency', required=True, default='monthly')
 
     _sql_constraints = [
         ('project_date_greater', 'check(date >= date_start)', 'Error! project start-date must be lower than project end-date.')
@@ -452,14 +459,7 @@ class Project(models.Model):
         return action
 
     def action_view_all_rating(self):
-        """ return the action to see all the rating of the project, and activate default filters """
-        if self.portal_show_rating:
-            return {
-                'type': 'ir.actions.act_url',
-                'name': "Redirect to the Website Projcet Rating Page",
-                'target': 'self',
-                'url': "/project/rating/%s" % (self.id,)
-            }
+        """ return the action to see all the rating of the project and activate default filters"""
         action = self.env['ir.actions.act_window'].for_xml_id('project', 'rating_rating_action_view_project_rating')
         action['name'] = _('Ratings of %s') % (self.name,)
         action_context = ast.literal_eval(action['context']) if action['context'] else {}
diff --git a/addons/project/models/res_config_settings.py b/addons/project/models/res_config_settings.py
index 439e09d7705..e63c53edc59 100644
--- a/addons/project/models/res_config_settings.py
+++ b/addons/project/models/res_config_settings.py
@@ -10,18 +10,4 @@ class ResConfigSettings(models.TransientModel):
     module_project_forecast = fields.Boolean(string="Planning")
     module_hr_timesheet = fields.Boolean(string="Task Logs")
     group_subtask_project = fields.Boolean("Sub-tasks", implied_group="project.group_subtask_project")
-    group_project_rating = fields.Boolean("Use Rating on Project", implied_group='project.group_project_rating')
-
-    def _get_subtasks_projects_domain(self):
-        return []
-
-    def execute(self):
-        res = super(ResConfigSettings, self).execute()
-        if self.group_project_rating:
-            # Change the rating status on existing projects from 'no' to 'stage'
-            self.env['project.project'].search([('rating_status', '=', 'no')]).write({
-                'rating_status': 'stage'})
-        if self.group_subtask_project:
-            domain = self._get_subtasks_projects_domain()
-            self.env['project.project'].search(domain).write({'allow_subtasks': True})
-        return res
+    group_project_rating = fields.Boolean("Customer Ratings", implied_group='project.group_project_rating')
diff --git a/addons/project/tests/test_project_flow.py b/addons/project/tests/test_project_flow.py
index 5f1d8e3400c..fdb5450e12a 100644
--- a/addons/project/tests/test_project_flow.py
+++ b/addons/project/tests/test_project_flow.py
@@ -142,7 +142,7 @@ class TestProjectFlow(TestProjectCommon):
             'parent_res_id': self.project_pigs.id,
             'rated_partner_id': self.partner_2.id,
             'partner_id': self.partner_2.id,
-            'rating': 10,
+            'rating': 5,
             'consumed': False,
         })
 
@@ -153,7 +153,7 @@ class TestProjectFlow(TestProjectCommon):
             'parent_res_id': self.project_pigs.id,
             'rated_partner_id': self.partner_2.id,
             'partner_id': self.partner_2.id,
-            'rating': 5,
+            'rating': 3,
             'consumed': True,
         })
 
@@ -170,7 +170,7 @@ class TestProjectFlow(TestProjectCommon):
         self.assertEqual(self.project_pigs.rating_percentage_satisfaction, 0)  # There is a rating but not a "great" on, just an "okay".
 
         # Consuming rating_good
-        first_task.rating_apply(10, rating_good.access_token)
+        first_task.rating_apply(5, rating_good.access_token)
 
         # We need to invalidate cache since it is not done automatically by the ORM
         # Our One2Many is linked to a res_id (int) for which the orm doesn't create an inverse
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 2fd2c4ef026..72a73474862 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -89,6 +89,161 @@
             </field>
         </record>
 
+        <!-- Task types -->
+        <record id="task_type_search" model="ir.ui.view">
+            <field name="name">project.task.type.search</field>
+            <field name="model">project.task.type</field>
+            <field name="arch" type="xml">
+                <search string="Tasks Stages">
+                   <field name="name" string="Tasks Stages"/>
+                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+                </search>
+            </field>
+        </record>
+
+        <record id="task_type_edit" model="ir.ui.view">
+            <field name="name">project.task.type.form</field>
+            <field name="model">project.task.type</field>
+            <field name="arch" type="xml">
+                <form string="Task Stage" delete="0">
+                    <field name="active" invisible="1" />
+                    <sheet>
+                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="mail_template_id"/>
+                                <field name="rating_template_id" groups="project.group_project_rating"/>
+                                <div class="alert alert-warning" role="alert" colspan='2' attrs="{'invisible': ['|', ('rating_template_id','=', False), ('disabled_rating_warning', '=', False)]}">
+                                    <i class="fa fa-warning" title="Customer disabled on projects"/><b> Customer Ratings</b> are disabled on the following project(s) : <br/>
+                                    <field name="disabled_rating_warning" class="mb-0" />
+                                </div>
+                                <field name="auto_validation_kanban_state" attrs="{'invisible': [('rating_template_id','=', False)]}" groups="project.group_project_rating"/>
+                            </group>
+                            <group>
+                                <field name="fold"/>
+                                <field name="is_closed" groups="base.group_no_one"/>
+                                <field name="project_ids" widget="many2many_tags" groups="base.group_no_one"/>
+                                <field name="sequence" groups="base.group_no_one"/>
+                            </group>
+                        </group>
+                        <group string="Stage Description and Tooltips">
+                            <p class="text-muted" colspan="2">
+                                At each stage employees can block or make task/issue ready for next stage.
+                                You can define here labels that will be displayed for the state instead
+                                of the default labels.
+                            </p>
+                            <label for="legend_normal" string=" " class="o_status oe_project_kanban_legend"
+                                title="Task in progress. Click to block or set as done."
+                                aria-label="Task in progress. Click to block or set as done." role="img"/>
+                            <field name="legend_normal" nolabel="1"/>
+                            <label for="legend_blocked" string=" " class="o_status o_status_red oe_project_kanban_legend"
+                                title="Task is blocked. Click to unblock or set as done."
+                                aria-label="Task is blocked. Click to unblock or set as done." role="img"/>
+                            <field name="legend_blocked" nolabel="1"/>
+                            <label for="legend_done" string=" " class="o_status o_status_green oe_project_kanban_legend"
+                                title="This step is done. Click to block or set in progress."
+                                aria-label="This step is done. Click to block or set in progress." role="img"/>
+                            <field name="legend_done" nolabel="1"/>
+
+                            <p class="text-muted" colspan="2">
+                                You can also add a description to help your coworkers understand the meaning and purpose of the stage.
+                            </p>
+                            <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="task_type_tree" model="ir.ui.view">
+            <field name="name">project.task.type.tree</field>
+            <field name="model">project.task.type</field>
+            <field name="arch" type="xml">
+                <tree string="Task Stage" delete="0">
+                    <field name="sequence" widget="handle" optional="show"/>
+                    <field name="name"/>
+                    <field name="fold" optional="show"/>
+                    <field name="mail_template_id" optional="show"/>
+                    <field name="rating_template_id" optional="show"/>
+                    <field name="auto_validation_kanban_state" optional="hide" />
+                    <field name="description" optional="hide"/>
+                    <field name="project_ids" optional="show" widget="many2many_tags" options="{'color_field': 'color'}" />
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_project_task_type_kanban" model="ir.ui.view">
+            <field name="name">project.task.type.kanban</field>
+            <field name="model">project.task.type</field>
+            <field name="arch" type="xml">
+                <kanban class="o_kanban_mobile">
+                    <field name="name"/>
+                    <field name="fold"/>
+                    <field name="description"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div t-attf-class="oe_kanban_global_click">
+                                <div class="row">
+                                    <div class="col-12">
+                                        <strong><t t-esc="record.name.value"/></strong>
+                                    </div>
+                                </div>
+                                <t t-if="record.description.value">
+                                    <hr class="mt8 mb8"/>
+                                    <t t-esc="record.description.value"/>
+                                </t>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="open_task_type_form" model="ir.actions.act_window">
+            <field name="name">Stages</field>
+            <field name="res_model">project.task.type</field>
+            <field name="view_mode">tree,kanban,form</field>
+            <field name="view_id" ref="task_type_tree"/>
+            <field name="help" type="html">
+              <p class="o_view_nocontent_smiling_face">
+                Create a new stage in the task pipeline
+              </p><p>
+                Define the steps that will be used in the project from the
+                creation of the task, up to the closing of the task or issue.
+                You will use these stages in order to track the progress in
+                solving a task or an issue.
+              </p>
+            </field>
+        </record>
+
+        <record id="open_task_type_form_domain" model="ir.actions.act_window">
+            <field name="name">Stages</field>
+            <field name="res_model">project.task.type</field>
+            <field name="view_mode">tree,kanban,form</field>
+            <field name="domain">[('project_ids','=', project_id)]</field>
+            <field name="view_id" ref="task_type_tree"/>
+            <field name="help" type="html">
+                <p class="o_view_nocontent_smiling_face">
+                Create a new stage in the task pipeline
+                </p><p>
+                Define the steps that will be used in the project from the
+                creation of the task, up to the closing of the task or issue.
+                You will use these stages in order to track the progress in
+                solving a task or an issue.
+                </p>
+            </field>
+        </record>
+
+        <record id="unlink_task_type_action" model="ir.actions.server">
+            <field name="name">Delete</field>
+            <field name="model_id" ref="project.model_project_task_type"/>
+            <field name="binding_model_id" ref="project.model_project_task_type"/>
+            <field name="binding_view_types">form,list</field>
+            <field name="state">code</field>
+            <field name="code">action = records.unlink_wizard(stage_view=True)</field>
+        </record>
+
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
             <field name="name">project.project.form</field>
@@ -107,16 +262,17 @@
                             name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
                             <field string="Tasks In Progress" name="task_count" widget="statinfo" options="{'label_field': 'label_tasks'}"/>
                         </button>
-                        <button name="action_view_all_rating" type="object" attrs="{'invisible': ['|', ('rating_status', '=', 'no'), ('rating_percentage_satisfaction', '=', -1)]}" class="oe_stat_button oe_percent" icon="fa-smile-o" groups="project.group_project_rating">
+                        <button name="action_view_all_rating" type="object" attrs="{'invisible': ['|', ('rating_active', '=', False), ('rating_percentage_satisfaction', '=', -1)]}" class="oe_stat_button oe_percent oe_read_only" icon="fa-smile-o" groups="project.group_project_rating">
                             <div class="o_field_widget o_stat_info">
                                 <span class="o_stat_value">
                                     <field name="rating_percentage_satisfaction" nolabel="1"/>
+                                    %
                                 </span>
                                 <span class="o_stat_text">
-                                    % On <field readonly="1" name="label_tasks" options="{'label_field': 'label_tasks'}" />
+                                    Customer Satisfaction
                                 </span>
                             </div>
-                        </button>
+                        </button>                            
                     </div>
                     <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <div class="oe_title">
@@ -151,23 +307,24 @@
                             </group>
                             <div class="row mt16 o_settings_container">
                                 <div id="rating_settings" class="col-lg-6 o_setting_box" groups="project.group_project_rating">
+                                    <div class="o_setting_left_pane">
+                                        <field name="rating_active"/>
+                                    </div>
                                     <div class="o_setting_right_pane">
-                                        <label for="rating_status"/>
+                                        <label for="rating_active" />
                                         <div class="text-muted">
                                             Get customer feedback
                                         </div>
-                                        <div class="mt16">
-                                            <field name="rating_status" widget="radio"/>
-                                            <p attrs="{'invisible': [('rating_status','not in',('periodic','stage'))]}" class="text-muted oe_edit_only">
-                                                Edit project's stages and set an email template on the stages on which you want to activate the rating.
-                                            </p>
+                                        <div class="mt16" attrs="{'invisible':[('rating_active','==',False)]}">
+                                            <field name="rating_status" widget="radio" />
                                             <div  attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}">
                                                 <label for="rating_status_period"/>
-                                                <field name="rating_status_period"  class="oe_inline"/>
+                                                <field name="rating_status_period"/>
                                             </div>
-                                            <div attrs="{'invisible': [('rating_status','==','no')]}">
-                                                <label for="portal_show_rating"/>
-                                                <field name="portal_show_rating"/>
+                                            <div class="content-group">
+                                                    <div class="mt8">
+                                                        <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
+                                                    </div>
                                             </div>
                                         </div>
                                     </div>
@@ -352,6 +509,7 @@
                     <field name="is_favorite"/>
                     <field name="rating_percentage_satisfaction"/>
                     <field name="rating_status"/>
+                    <field name="rating_active" />
                     <field name="analytic_account_id"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -368,16 +526,13 @@
                                             <div t-if="record.alias_name.value and record.alias_domain.value">
                                                 <span><i class="fa fa-envelope" role="img" aria-label="Domain Alias" title="Domain Alias"></i> <t t-esc="record.alias_id.value"/></span>
                                             </div>
-                                            <div t-if="record.rating_status.raw_value != 'no'" class="mt8 text-primary" title="Percentage of happy ratings over the past 30 days. Get rating details from the More menu." groups="project.group_project_rating">
+                                            <div t-if="record.rating_active.raw_value" class="mt8 text-primary" title="Percentage of happy ratings over the past 30 days." groups="project.group_project_rating">
                                                 <b>
-                                                    <t t-if="record.rating_percentage_satisfaction.value == -1">
-                                                        <i class="fa fa-smile-o"/> No rating yet
-                                                    </t>
-                                                    <t t-if="record.rating_percentage_satisfaction.value != -1">
-                                                        <a name="action_view_all_rating" type="object" context="{'search_default_rating_last_30_days':1}">
+                                                    <a name="action_view_all_rating" type="object" context="{'search_default_rating_last_30_days':1}">
+                                                        <t t-if="record.rating_percentage_satisfaction.value != -1">
                                                             <i class="fa fa-smile-o" role="img" aria-label="Percentage of satisfaction" title="Percentage of satisfaction"/> <t t-esc="record.rating_percentage_satisfaction.value"/>%
-                                                        </a>
-                                                    </t>
+                                                        </t>
+                                                    </a>
                                                 </b>
                                             </div>
                                         </div>
@@ -390,9 +545,6 @@
                                             <div role="menuitem">
                                                 <a type="edit">Edit</a>
                                             </div>
-                                            <div role="menuitem" t-if="record.rating_status.raw_value != 'no'">
-                                                <a name="action_view_all_rating" type="object">Customer Ratings</a>
-                                            </div>
                                         </div>
                                         <div role="menuitem" aria-haspopup="true" class="o_no_padding_kanban_colorpicker">
                                             <ul class="oe_kanban_colorpicker" data-field="color" role="popup"/>
@@ -674,8 +826,8 @@
                                             <span role="alert" class='oe_kanban_mail_new' title='Unread Messages'><i class='fa fa-comments' role="img" aria-label="Unread Messages"/><t t-raw="record.message_needaction_counter.raw_value"/></span>
                                         </t>
                                         <b t-if="record.rating_ids.raw_value.length">
-                                            <span style="font-weight:bold;" class="fa fa-fw mt4 fa-smile-o text-success" t-if="record.rating_last_value.value == 10" title="Latest Rating: Satisfied" role="img" aria-label="Happy face"/>
-                                            <span style="font-weight:bold;" class="fa fa-fw mt4 fa-meh-o text-warning" t-if="record.rating_last_value.value == 5" title="Latest Rating: Not Satisfied" role="img" aria-label="Neutral face"/>
+                                            <span style="font-weight:bold;" class="fa fa-fw mt4 fa-smile-o text-success" t-if="record.rating_last_value.value == 5" title="Latest Rating: Satisfied" role="img" aria-label="Happy face"/>
+                                            <span style="font-weight:bold;" class="fa fa-fw mt4 fa-meh-o text-warning" t-if="record.rating_last_value.value == 3" title="Latest Rating: Not Satisfied" role="img" aria-label="Neutral face"/>
                                             <span style="font-weight:bold;" class="fa fa-fw mt4 fa-frown-o text-danger" t-if="record.rating_last_value.value == 1" title="Latest Rating: Higly Dissatisfied" role="img" aria-label="Sad face"/>
                                         </b>
                                         <!-- formating of the date -->
@@ -874,135 +1026,7 @@
             <field name="context">{'project_id':active_id}</field>
         </record>
 
-        <!-- Task types -->
-        <record id="task_type_search" model="ir.ui.view">
-            <field name="name">project.task.type.search</field>
-            <field name="model">project.task.type</field>
-            <field name="arch" type="xml">
-                <search string="Tasks Stages">
-                   <field name="name" string="Tasks Stages"/>
-                    <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
-                </search>
-            </field>
-        </record>
-
-        <record id="task_type_edit" model="ir.ui.view">
-            <field name="name">project.task.type.form</field>
-            <field name="model">project.task.type</field>
-            <field name="arch" type="xml">
-                <form string="Task Stage" delete="0">
-                    <field name="active" invisible="1" />
-                    <sheet>
-                        <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}" />
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="mail_template_id"/>
-                                <field name="rating_template_id" groups="project.group_project_rating"/>
-                                <field name="auto_validation_kanban_state" attrs="{'invisible': [('rating_template_id','=', False)]}" groups="project.group_project_rating"/>
-                            </group>
-                            <group>
-                                <field name="fold"/>
-                                <field name="is_closed" groups="base.group_no_one"/>
-                                <field name="project_ids" widget="many2many_tags" groups="base.group_no_one"/>
-                                <field name="sequence" groups="base.group_no_one"/>
-                            </group>
-                        </group>
-                        <group string="Stage Description and Tooltips">
-                            <p class="text-muted" colspan="2">
-                                At each stage employees can block or make task/issue ready for next stage.
-                                You can define here labels that will be displayed for the state instead
-                                of the default labels.
-                            </p>
-                            <label for="legend_normal" string=" " class="o_status oe_project_kanban_legend"
-                                title="Task in progress. Click to block or set as done."
-                                aria-label="Task in progress. Click to block or set as done." role="img"/>
-                            <field name="legend_normal" nolabel="1"/>
-                            <label for="legend_blocked" string=" " class="o_status o_status_red oe_project_kanban_legend"
-                                title="Task is blocked. Click to unblock or set as done."
-                                aria-label="Task is blocked. Click to unblock or set as done." role="img"/>
-                            <field name="legend_blocked" nolabel="1"/>
-                            <label for="legend_done" string=" " class="o_status o_status_green oe_project_kanban_legend"
-                                title="This step is done. Click to block or set in progress."
-                                aria-label="This step is done. Click to block or set in progress." role="img"/>
-                            <field name="legend_done" nolabel="1"/>
-
-                            <p class="text-muted" colspan="2">
-                                You can also add a description to help your coworkers understand the meaning and purpose of the stage.
-                            </p>
-                            <field name="description" placeholder="Add a description..." nolabel="1" colspan="2"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="task_type_tree" model="ir.ui.view">
-            <field name="name">project.task.type.tree</field>
-            <field name="model">project.task.type</field>
-            <field name="arch" type="xml">
-                <tree string="Task Stage" delete="0">
-                    <field name="sequence" widget="handle" groups="base.group_no_one"/>
-                    <field name="name"/>
-                    <field name="fold"/>
-                    <field name="description"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_project_task_type_kanban" model="ir.ui.view">
-            <field name="name">project.task.type.kanban</field>
-            <field name="model">project.task.type</field>
-            <field name="arch" type="xml">
-                <kanban class="o_kanban_mobile">
-                    <field name="name"/>
-                    <field name="fold"/>
-                    <field name="description"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_global_click">
-                                <div class="row">
-                                    <div class="col-12">
-                                        <strong><t t-esc="record.name.value"/></strong>
-                                    </div>
-                                </div>
-                                <t t-if="record.description.value">
-                                    <hr class="mt8 mb8"/>
-                                    <t t-esc="record.description.value"/>
-                                </t>
-                            </div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="open_task_type_form" model="ir.actions.act_window">
-            <field name="name">Stages</field>
-            <field name="res_model">project.task.type</field>
-            <field name="view_mode">tree,kanban,form</field>
-            <field name="view_id" ref="task_type_tree"/>
-            <field name="help" type="html">
-              <p class="o_view_nocontent_smiling_face">
-                Create a new stage in the task pipeline
-              </p><p>
-                Define the steps that will be used in the project from the
-                creation of the task, up to the closing of the task or issue.
-                You will use these stages in order to track the progress in
-                solving a task or an issue.
-              </p>
-            </field>
-        </record>
-
-        <record id="unlink_task_type_action" model="ir.actions.server">
-            <field name="name">Delete</field>
-            <field name="model_id" ref="project.model_project_task_type"/>
-            <field name="binding_model_id" ref="project.model_project_task_type"/>
-            <field name="binding_view_types">form,list</field>
-            <field name="state">code</field>
-            <field name="code">action = records.unlink_wizard(stage_view=True)</field>
-        </record>
-
+        <!-- Menu item for project -->
         <menuitem id="menu_tasks_config" name="GTD" parent="menu_project_config" sequence="2"/>
 
         <menuitem action="open_task_type_form" id="menu_project_config_project" name="Stages" parent="menu_project_config" sequence="3" groups="base.group_no_one"/>
diff --git a/addons/project/views/rating_views.xml b/addons/project/views/rating_views.xml
index 2cfe3dc4e47..7d7da90fa75 100644
--- a/addons/project/views/rating_views.xml
+++ b/addons/project/views/rating_views.xml
@@ -12,8 +12,7 @@
             </xpath>
             <xpath expr="/search" position="inside">
                 <filter string="Last 30 Days" name="rating_last_30_days" domain="[
-                    ('create_date', '>=', (datetime.datetime.combine(context_today() + relativedelta(days=-30), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S')),
-                    ('create_date', '&lt;', (datetime.datetime.combine(context_today(), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"
+                    ('create_date', '>=', (datetime.datetime.combine(context_today() + relativedelta(days=-30), datetime.time(0,0,0)).to_utc()).strftime('%Y-%m-%d %H:%M:%S'))]"
                 />
                 <separator/>
             </xpath>
@@ -28,7 +27,7 @@
         <field name="search_view_id" ref="rating_rating_view_search_project"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_empty_folder">
-                There are no ratings for this object at the moment
+                There are no ratings for this project at the moment
             </p>
         </field>
     </record>
diff --git a/addons/project/views/res_config_settings_views.xml b/addons/project/views/res_config_settings_views.xml
index 759291fc286..8346330c8c7 100644
--- a/addons/project/views/res_config_settings_views.xml
+++ b/addons/project/views/res_config_settings_views.xml
@@ -44,7 +44,7 @@
                                     </div>
                                     <div class="content-group" attrs="{'invisible': [('group_project_rating', '=', False)]}">
                                         <div class="mt8">
-                                            <button name="%(project.open_task_type_form)d" icon="fa-arrow-right" type="action" string="Set Email Template to Stages" class="btn-link"/>
+                                            <button name="%(project.open_task_type_form)d" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/rating/controllers/main.py b/addons/rating/controllers/main.py
index 5c1f7f5f4ce..e27fc6b7c53 100644
--- a/addons/rating/controllers/main.py
+++ b/addons/rating/controllers/main.py
@@ -11,13 +11,13 @@ class Rating(http.Controller):
 
     @http.route('/rating/<string:token>/<int:rate>', type='http', auth="public", website=True)
     def open_rating(self, token, rate, **kwargs):
-        assert rate in (1, 5, 10), "Incorrect rating"
+        assert rate in (1, 3, 5), "Incorrect rating"
         rating = request.env['rating.rating'].sudo().search([('access_token', '=', token)])
         if not rating:
             return request.not_found()
         rate_names = {
-            10: _("satisfied"),
-            5: _("not satisfied"),
+            5: _("satisfied"),
+            3: _("not satisfied"),
             1: _("highly dissatisfied")
         }
         rating.write({'rating': rate, 'consumed': True})
@@ -30,7 +30,7 @@ class Rating(http.Controller):
     @http.route(['/rating/<string:token>/submit_feedback'], type="http", auth="public", methods=['post'], website=True)
     def submit_rating(self, token, **kwargs):
         rate = int(kwargs.get('rate'))
-        assert rate in (1, 5, 10), "Incorrect rating"
+        assert rate in (1, 3, 5), "Incorrect rating"
         rating = request.env['rating.rating'].sudo().search([('access_token', '=', token)])
         if not rating:
             return request.not_found()
diff --git a/addons/rating/models/rating.py b/addons/rating/models/rating.py
index 391c6781626..7c0ee789177 100644
--- a/addons/rating/models/rating.py
+++ b/addons/rating/models/rating.py
@@ -7,7 +7,7 @@ from odoo import api, fields, models
 
 from odoo.modules.module import get_resource_path
 
-RATING_LIMIT_SATISFIED = 7
+RATING_LIMIT_SATISFIED = 5
 RATING_LIMIT_OK = 3
 RATING_LIMIT_MIN = 1
 
@@ -18,7 +18,7 @@ class Rating(models.Model):
     _order = 'write_date desc'
     _rec_name = 'res_name'
     _sql_constraints = [
-        ('rating_range', 'check(rating >= 0 and rating <= 10)', 'Rating should be between 0 to 10'),
+        ('rating_range', 'check(rating >= 0 and rating <= 5)', 'Rating should be between 0 to 5'),
     ]
 
     @api.depends('res_model', 'res_id')
@@ -41,7 +41,7 @@ class Rating(models.Model):
     parent_res_id = fields.Integer('Parent Document', index=True)
     rated_partner_id = fields.Many2one('res.partner', string="Rated person", help="Owner of the rated resource")
     partner_id = fields.Many2one('res.partner', string='Customer', help="Author of the rating")
-    rating = fields.Float(string="Rating Number", group_operator="avg", default=0, help="Rating value: 0=Unhappy, 10=Happy")
+    rating = fields.Float(string="Rating Number", group_operator="avg", default=0, help="Rating value: 0=Unhappy, 5=Happy")
     rating_image = fields.Binary('Image', compute='_compute_rating_image')
     rating_text = fields.Selection([
         ('satisfied', 'Satisfied'),
@@ -66,21 +66,23 @@ class Rating(models.Model):
                 name = name and name[0][1] or ('%s/%s') % (rating.parent_res_model, rating.parent_res_id)
             rating.parent_res_name = name
 
-    @api.depends('rating')
+    def _get_rating_image_filename(self):
+        self.ensure_one()
+        if self.rating >= RATING_LIMIT_SATISFIED:
+            rating_int = 5
+        elif self.rating >= RATING_LIMIT_OK:
+            rating_int = 3
+        elif self.rating >= RATING_LIMIT_MIN:
+            rating_int = 1
+        else:
+            rating_int = 0
+        return 'rating_%s.png' % rating_int
+
     def _compute_rating_image(self):
-        # Due to some new widgets, we may have ratings different from 0/1/5/10 (e.g. slide.channel review)
-        # Let us have some custom rounding while finding a better solution for images.
         for rating in self:
-            rating_for_img = 0
-            if rating.rating >= 8:
-                rating_for_img = 10
-            elif rating.rating > 3:
-                rating_for_img = 5
-            elif rating.rating >= 1:
-                rating_for_img = 1
             try:
-                image_path = get_resource_path('rating', 'static/src/img', 'rating_%s.png' % rating_for_img)
-                rating.rating_image = base64.b64encode(open(image_path, 'rb').read())
+                image_path = get_resource_path('rating', 'static/src/img', rating._get_rating_image_filename())
+                rating.rating_image = base64.b64encode(open(image_path, 'rb').read()) if image_path else False
             except (IOError, OSError):
                 rating.rating_image = False
 
@@ -89,7 +91,7 @@ class Rating(models.Model):
         for rating in self:
             if rating.rating >= RATING_LIMIT_SATISFIED:
                 rating.rating_text = 'satisfied'
-            elif rating.rating > RATING_LIMIT_OK:
+            elif rating.rating >= RATING_LIMIT_OK:
                 rating.rating_text = 'not_satisfied'
             elif rating.rating >= RATING_LIMIT_MIN:
                 rating.rating_text = 'highly_dissatisfied'
diff --git a/addons/rating/models/rating_mixin.py b/addons/rating/models/rating_mixin.py
index c95bc3d5ed1..e0cf0e6837e 100644
--- a/addons/rating/models/rating_mixin.py
+++ b/addons/rating/models/rating_mixin.py
@@ -199,9 +199,9 @@ class RatingMixin(models.AbstractModel):
                     author_id=rating.partner_id and rating.partner_id.id or None  # None will set the default author in mail_thread.py
                 )
             if hasattr(self, 'stage_id') and self.stage_id and hasattr(self.stage_id, 'auto_validation_kanban_state') and self.stage_id.auto_validation_kanban_state:
-                if rating.rating > 5:
+                if rating.rating > 2:
                     self.write({'kanban_state': 'done'})
-                if rating.rating < 5:
+                else:
                     self.write({'kanban_state': 'blocked'})
         return rating
 
@@ -222,7 +222,7 @@ class RatingMixin(models.AbstractModel):
             base_domain += domain
         data = self.env['rating.rating'].read_group(base_domain, ['rating'], ['rating', 'res_id'])
         # init dict with all posible rate value, except 0 (no value for the rating)
-        values = dict.fromkeys(range(1, 11), 0)
+        values = dict.fromkeys(range(1, 6), 0)
         values.update((d['rating'], d['rating_count']) for d in data)
         # add other stats
         if add_stats:
diff --git a/addons/rating/static/src/img/rating_10.png b/addons/rating/static/src/img/rating_10.png
deleted file mode 100644
index 3af034234c0a7af5d6750f5f33beb41dff14a0cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2398
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
QNdN!<07*qoM6N<$f+WIUA^-pY

diff --git a/addons/rating/static/src/img/rating_10_white.png b/addons/rating/static/src/img/rating_10_white.png
deleted file mode 100644
index d756eee931fbac071b661000e324363a8afe2ff0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2293
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

diff --git a/addons/rating/static/src/img/rating_3.png b/addons/rating/static/src/img/rating_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ec3a2a7325d8287ea0f01d8d10869ad9ae47570
GIT binary patch
literal 2186
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
M07*qoM6N<$f^J9*^#A|>

literal 0
HcmV?d00001

diff --git a/addons/rating/static/src/img/rating_3_white.png b/addons/rating/static/src/img/rating_3_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d146dc5b37d7356402bef6b25761297990630025
GIT binary patch
literal 2180
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

literal 0
HcmV?d00001

diff --git a/addons/rating/static/src/img/rating_5.png b/addons/rating/static/src/img/rating_5.png
index 8ec3a2a7325d8287ea0f01d8d10869ad9ae47570..3af034234c0a7af5d6750f5f33beb41dff14a0cc 100644
GIT binary patch
delta 2372
zcmV-K3A^@+5#ADzGk*ycNkl<Zc%0>2zi%VQ75={AuI(g1%))??BDlR1iIk=Tmj;f9
z`~gQ7DV#=B5g0j1M{W_MJYAb+NRy0WAizmQQUwqdAV`ry6yS6Qjw(_FlJBT4O%Mtx
z3?G;CQY?41%OB#8rFbX#>vp&^JMVF3-rM)Sx5SFzXq~oFZ-0M4>E{G04FC|y0|0?E
z00__p0FW)e-E@Viw%7mmq~p5XRm_vuIe1n#a!}?zghdd!M1u+1pzOh@<5PFDy`(9Q
zVCf3U>PAi|>jVlQoMn#>01$KpXnK;WcHCcemO1p&6yoSz$7cTth~lJs1ad4uo59vF
z7;FvI^?x`1R)12+``1Vl$Pv6h@xg+<o}`{GOEHNR;%J?=)LSJ&c7}fw;DSIChOHi6
zH5WYx9Iewf-YP&zUVs9DcSoPa9nZX~COvBsDI`;EJb{=p$#i^jIE0bPnY-OeGXBKp
z>RKKOJHsnSM7p4=oRv18E;{x?3URbfTeJ^Ie`$vkf`1&tVCT9NF^nq|)AYpKSY)-#
zt&ps4<Un~AwHgAPi;?oz?sjwD@s@!#T`N$rLf}r=C}{U2^~t<v%UlY{=vp4cL3E1<
z<mp*yd*u9h9mrH`I|QEu*CNuTs0Z_yX*KJOS=}g7@hDJ+02eUacvF-C0B5D`9T;v1
zZ~*`$(|=I%JgXZME#EL^S|M58C_>4z;97tS8s@LlK}v$GZsbHsD`t%hH%{Hny=i@?
zDkP(8c`6=Vw#Z4(c==Vi(u=~;I&CYf1@MEQO^iI4cHm#RW&8sa2bV23Lm2?jaouju
zczHlh!bajCs~cCoLQGsCj@D_L_EBI>1UUChFMoFvlo5sRINF_X`v}@S={=Yv$HWz4
z(LRVM<AR2To2CrFUnw-q2L~;PoJIR!(*0u<lBw2qqE43>DZZ%(=qxyOH`_EU2iGL>
znQCpUbsX6;z87k}49zRyo;}{GT;Ft8hp3+-B3)0syThw~WQEwuu3Y*Wa(r8q0Sx?<
z!G9r3GHok+M7Eeh9KGuRSPvTv-WaEASrCJA<Z^u=bBLHiEP6WZ2svKWOWG=N=5DtH
zavWUSsvrB)Lxp5?El;u#T+^tiCT|snWLwYZT4+E*g-|i-@9*Dat1=A(+4h6$sO+Ia
zMC4)E!|>J|q!SU5F)F(P!tD~g#h%~h)qfG-)ZJ_ga1QtuC)hR$07M}?I|TAtf;_JS
z1VW<`=s*F05=OQQZk=VB1Y<7$d?kJuQaO6p3GycbTr3g>{Bf=J(ekFb8188O(|P;E
zWF>Nr-gPW1)h|H8=DAkKTBZJ565H&{e>2tk4-C|AUX&jFe%^^C!CIyECk6am$bbK2
zEA>=gO!0;L_^-3}7vPY<LjbT+{epr>B!wU|AEp`od6|$hfp<Xuh`<jOOyyp+{<C=m
zN`h>){<$JQ1!)m@AH;h~sXyPX{O%{Sj}nntBt3IXbr@7?gQOj61Kw6ZY0)tkz%Pay
z2)vV0=9h~OsDMarW!3{#gd+I<*ngiO-&=GtbK#3GY!URw{$}L;na7FCoL_8(kOJWE
z!_6Y{N(^V-zlreKXFUKXBkdv{RO%0l4yz~(Bhx|Bc^3Sy_sy?G@J|809W?bo{^Nza
zx^Tfa7CsfozaioQ07PCv_{X!ykB+Bw4H1=@!grai)<YX}TH2aBlXtIH`+rDz{J2l`
zx0mHd|C+b|GH|cj_?R#sniT)?a%<~+-u_V?SV<@IVte~50AD2?C(#^An_mL>av5W(
zz@G=g0MT~}QJDoeSAc}cU<=-NP9brbrL(Xfa$BJUxb)OgOhk-xv`$aIYk648^CB_}
z(6&Op7l61MKOY>u>sa)jXMZX+5NtwNy^gp_NZ}GGf^gP!?UO{j6p?h0jUmvDSs8*0
zpCL9(9+$k4A}GadrQQZ*uV=jdq*=c~5Nq8h^+}jf8ifBAR!B@{vTM<(CX@upn}-v7
zPC*Z^nii~LjNU}#09I^eSF)A*o{$|t+Mw!QMaCV_8SX%kCy<}Saeo!yoQ8=~B_i^W
z9ITK&TLgeiwcZKoNQNIKS?ZH`Uz2BqcF16c<c0}+<GaW)joO=q?{O7;VzE5;$He(r
zY0I&IFqF0q07jW2fQ3^KgIrENs~b6^Op#zA#{C)wkz?dyGUUVnEoIc+nY*==v&kq^
zRF~&R3mAB+#z<2su73lUp|qqJtg<qIvcCmP!QZcvi;`Hz!FLv=BS0Gltv<ZgbubT<
z@P6<g1mVQ+FNyl|J(Ie-Y|8XFWOXAKvX=pP@Y<`QTsV5yu~q+Na2>qIg;pjON>g4D
zxc<EE>r8j}GWzR5fWx5uGErqDJfH|Zxy|o2j^1@*^v#Iup?^ZYcDI{XC4p}fqOu9(
zIO^EN-(}+ThY_m4ZNN0jM@%8ZQ~`_qXSijE$|S(yFy&+9ZPznam<cD5pN9qfrX#Bx
z#VB{qGpP}OYeXRfa~o0xgho%}cHRW|m0m_in)b)J7GvWfJ<}^kxmZGTwCY#;Wx~-q
zEi^}$uLW}A%YQhEu?p$9ZWl%sqa=Ep_Kj3ZKtPTcEvVw$#NAVOvkfC5O#(#DrmZL4
z|E9vGtz&P?MhaIsgja?T&)n@63^&3CqL{7JZ;a*1R_f1UMUjRZ(};w#m4{U8dx+ZZ
zDSYwQjbWbt0Q;w<t*I7srXcfRpwRLRw$Jl7(fVX{BY$Vpe!hq@fH^9vPD@)wA>6Qm
zaD?V)P1g!nbXzIbbgdvXN6`XmA>3J&0W462I4Jnri&ZNvxtMrfj4PrR;6jWP=M6wF
zRHiz%gv+1BUQc@N>S7u?J+LCN6_BI^Zs9^^zl6)KAbQy1vY2=oRn}KM+fr|p#uZTm
z*zcKMd4JJoCoXj#ga<3*g32Ojk<#oL>oDnd3cfTU!oqL?H4p}#%SnSyOZyl?RyT^G
zWM^VPdGJLCQaZv^8vwjM&xaM|=v~K3i9d!&9wO<hzBCb}B9cbn11$A(8No*jL`fkC
zM_v~MIHX}S$wwB(;o3f^a`{CEQ=S%OpB-`nqdh9iRzeil`h}SQj@D@lRt_oV2KnPW
qKxfkS3epe&S|GdVOM6uj`TqmGhBtbJC{#%R0000<MNUMnLSTaH{$jEK

delta 2158
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

diff --git a/addons/rating/static/src/img/rating_5_white.png b/addons/rating/static/src/img/rating_5_white.png
index d146dc5b37d7356402bef6b25761297990630025..d756eee931fbac071b661000e324363a8afe2ff0 100644
GIT binary patch
delta 1596
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
U9LCeA#Tvgt@$>=8@q3c~0m;GTyZ`_I

delta 1482
zcmZ|HXE+-O0LJl%sMtd75hG?@D`G@SNkr^Xo2F_+&Umbv9h%tGmDr=<tRhBF5o$Ji
zc^XkY^Hf!d)v7vD*WxM8-G|=CzMp^p_bVg=(rFKbA`G!;W4N_325p3a!>y5~`e>Y$
z6%vCpLBg>ZWN{c!>3?JLBl8FdzxMsd@CU|NO(ibgErf_7L<c8ChD62NVa?T&BV#TS
z!U(AEt<ewKVmPlA3GzJL1pokjvBRQ0k{5UI!_l*r=aXjZffB8OXvc)Jv;m9?{Ld4<
z1R2e9={~Zq-3D|=TfGdvTpeN%CNfjpR@ly$LaE(lP|GaHFk9gs%<A>yr4j#KMH2O|
zh27$N_y0~9Io^CXTyUp6cQl|j1cnMw4p=ji%o}1gW*3km_m_BgD2HyPxg`RD={G<N
z1a535WF6Sc9njB^B}>6ZZD}imE!LMjiW`c=jgLIZlH5uq#hlRa&?4GKM5SZJycxQv
zNJt%~8qd(Jy)0X%%-};F^}`NhIy;sv^(G~k*TwDF6v*^BAHlJ*RQj;$(`cFF5>wTk
za-Ydm5*PxHL|gd9(lwm5gc-)KQ?Gl3{iNlyz^~h0KwQkINYj}aD+DVijGphBQDZ_{
znh-d`Q750!Zw*!AHUZ`na9Db{fkozaD;VCNWsbM$foJEZJPOj%U~=Y#T{1f+WtIDy
zK;em$=J6q>^zHkO-?knc^aSPR@1E+#9?Osj>n(hSa~orwg0@*u=>_CD3ub7czG}&*
z5idZ51nZltuh3xD*3!TeFQ5VTp1n6g5ql#%M!Chyz}0(2$vS70R_cktwAaG-p^5#L
zP8W0*@haLdW;;3Y7plPA&OH08CYxA#wc^r#m01#2hk5bIE1@vWn=EXF#f<96I4NYi
zV!9*s9^V+3PAEw3Hr8NjLYJmm)#KZn!M-T<jU3+Itf~ISRs4PV?j_LOSGQtb^Q;8D
zKp~P-25~^-$^ce%9nKLmI91?k^Q-v-4|w)?o&jD8^k6>-<aSkDVTjb{kt4_s<e$lx
z<%&L^=ZeRO#z@hRMRrwfeDMXOKK}>-)OvtT3zdIql0q3wd)=fSu3HVkNr?2T+)6>I
z8)&|f*S@u9&vg3Yp0Op-i(~V%KS2>{8&FOj=PNIxts?S|{Z!|YqY!zn5?AKgOJxgQ
zO@uS-45SzUJ>ZEB?upf#*qLeE#!kqKm-(N7jtYy}!+cM9l3D%Yb)>_SFumduioqCJ
zv$AhY!HbVQ^*ixho7&v?K?F5q`hs)5_xet!FIqx)n_lB2mrv1IE_Vr=uJWF8_RDQ^
z&)}|}#p*iMO>t4QrP=&eQBV79%1zmS5F&LnLx(4c6WUQO^vpW>HK#%<L(sq5!|z&M
zqFyk88n5p!xELr#+Dro}j8;qRvA7HGO}>0I233EGt7;wReD1wyMRN~N{Aft?W-Ots
zW;gX)3!{Mw8a29i+1cuEcSQB1v>|w3woRj3YEe}D+Xg`*-j`-+*QxBW56MC|V+q^@
zB5?ubnKUOO1Ril-dEnOE+8|e>b!D9DHPPirGJDH(S|M5WrG%Q%0p$<p6TevxSv#rF
z!Ez~z506+6d_FAeaXi9sw4{PKiF)7K+lRzCNl2hV6xjK~$Kc)E{pJyjX;tj-psSY9
z%^uBaB!Ouf^d4**`(k2p>xC(@WJA1O1Nod@6Q>^vp3n2ALLD|CkIkg<N@DtA9!jYW
zi<LMADKN-9M2(Q$@(y<BMbDvYuqNNwKdTS@Y}DCNw&8CtdbRBY0eXLG)KlDmAKD2r
z7_{k%yOZYe2))SdUPGT5PP2r6Eds^Mlgd{)fHJp4mPsK;q!jK|MQT|qcR-{`OVRt&
zt2j+kp-rb^h!REj%QRZwQ`%^rMXA~TR){<#@=PWG5QFk_+-rdj0{)wwwKMiHCLrx!
DtTUK9

diff --git a/addons/rating/tests/test_security.py b/addons/rating/tests/test_security.py
index 44d47c9e4cf..440ce58396d 100644
--- a/addons/rating/tests/test_security.py
+++ b/addons/rating/tests/test_security.py
@@ -51,14 +51,14 @@ class TestAccessRating(common.SavepointCase):
                 'res_model_id': self.env['ir.model'].sudo().search([('model', '=', 'res.partner')], limit=1).id,
                 'res_model': 'res.partner',
                 'res_id': self.partner_to_rate.id,
-                'rating': 2
+                'rating': 1
             })
         with self.assertRaises(AccessError):
             self.env['rating.rating'].with_user(self.user_public).create({
                 'res_model_id': self.env['ir.model'].sudo().search([('model', '=', 'res.partner')], limit=1).id,
                 'res_model': 'res.partner',
                 'res_id': self.partner_to_rate.id,
-                'rating': 5
+                'rating': 3
             })
 
         # No error with employee
@@ -66,7 +66,7 @@ class TestAccessRating(common.SavepointCase):
             'res_model_id': self.env['ir.model'].sudo().search([('model', '=', 'res.partner')], limit=1).id,
             'res_model': 'res.partner',
             'res_id': self.partner_to_rate.id,
-            'rating': 5
+            'rating': 3
         })
 
         with self.assertRaises(AccessError):
diff --git a/addons/website_livechat/data/website_livechat_data.xml b/addons/website_livechat/data/website_livechat_data.xml
index 556079a5970..46db5021300 100644
--- a/addons/website_livechat/data/website_livechat_data.xml
+++ b/addons/website_livechat/data/website_livechat_data.xml
@@ -4,9 +4,5 @@
          <record id="website.default_website" model="website">
              <field name="channel_id" ref="im_livechat.im_livechat_channel_data"></field>
          </record>
-
-        <record id="im_livechat.im_livechat_channel_data" model="im_livechat.channel">
-            <field name="is_published" eval="True"/>
-        </record>
      </data>
 </odoo>
diff --git a/addons/website_livechat/static/tests/tours/website_livechat_common.js b/addons/website_livechat/static/tests/tours/website_livechat_common.js
index 446b1fa8fc9..1ec61f700ec 100644
--- a/addons/website_livechat/static/tests/tours/website_livechat_common.js
+++ b/addons/website_livechat/static/tests/tours/website_livechat_common.js
@@ -132,7 +132,7 @@ var closeStep = [{
 
 var goodRatingStep = [{
     content: "Send Good Rating",
-    trigger: "div.o_livechat_rating_choices > img[data-value=10]",
+    trigger: "div.o_livechat_rating_choices > img[data-value=5]",
 }, {
     content: "Check if feedback has been sent",
     trigger: "div.o_thread_window_header.feedback_sent",
@@ -143,7 +143,7 @@ var goodRatingStep = [{
 
 var okRatingStep = [{
     content: "Send ok Rating",
-    trigger: "div.o_livechat_rating_choices > img[data-value=5]",
+    trigger: "div.o_livechat_rating_choices > img[data-value=3]",
 }];
 
 var sadRatingStep = [{
diff --git a/addons/website_livechat/tests/common.py b/addons/website_livechat/tests/common.py
index 800dde98b4e..9cc162ff709 100644
--- a/addons/website_livechat/tests/common.py
+++ b/addons/website_livechat/tests/common.py
@@ -69,7 +69,7 @@ class TestLivechatCommon(tests.TransactionCase):
     def _send_rating(self, channel, visitor, rating_value, reason=False):
         channel_messages_count = len(channel.message_ids)
 
-        rating_to_emoji = {1: "😞", 5: "😐", 10: "😊"}
+        rating_to_emoji = {1: "😞", 3: "😐", 5: "😊"}
         self.opener.post(url=self.send_feedback_url, json={'params': {
             'uuid': channel.uuid,
             'rate': rating_value,
diff --git a/addons/website_livechat/tests/test_livechat_request.py b/addons/website_livechat/tests/test_livechat_request.py
index 3e4025e4524..f50780da6a6 100644
--- a/addons/website_livechat/tests/test_livechat_request.py
+++ b/addons/website_livechat/tests/test_livechat_request.py
@@ -13,7 +13,7 @@ class TestLivechatRequestHttpCase(tests.HttpCase, TestLivechatCommon):
         # Send first chat request - Open chat from operator side
         channel_1 = self._common_chat_request_flow()
         # Visitor Rates the conversation (Good)
-        self._send_rating(channel_1, self.visitor, 10)
+        self._send_rating(channel_1, self.visitor, 5)
 
         # Operator Re-Send a chat request
         channel_2 = self._common_chat_request_flow()
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 23c27eadb10..f961e862679 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -80,7 +80,7 @@
                                             <div class="col-lg-4 d-flex justify-content-end flex-column">
                                                 <div class="card bg-success text-white" t-attf-style="height: #{160 + int(percentage['great'])}px;">
                                                     <div class="card-body text-center">
-                                                        <img src="/rating/static/src/img/rating_10.png" style="height:40px" alt="Happy face"/>
+                                                        <img src="/rating/static/src/img/rating_5.png" style="height:40px" alt="Happy face"/>
                                                     </div>
                                                     <div class="card-body text-center">
                                                         <h2 style="margin: 0">
@@ -95,7 +95,7 @@
                                             <div class="col-lg-4 d-flex justify-content-end flex-column">
                                                 <div class="card bg-warning text-white" t-attf-style="height: #{160 + int(percentage['okay'])}px;">
                                                     <div class="card-body text-center">
-                                                        <img src="/rating/static/src/img/rating_5.png" style="height:40px" alt="Neutral face"/>
+                                                        <img src="/rating/static/src/img/rating_3.png" style="height:40px" alt="Neutral face"/>
                                                     </div>
                                                     <div class="card-body text-center">
                                                         <h2 style="margin: 0">
@@ -131,7 +131,7 @@
                                         <div>
                                             <t t-foreach="ratings" t-as="rating">
                                                 <img t-attf-src='/rating/static/src/img/rating_#{int(rating.rating)}.png' t-att-alt="rating.res_name" width="48px" height="48px"/>
-                                                <t t-if="(rating_index+1) % 10 == 0">
+                                                <t t-if="(rating_index+1) % 5 == 0">
                                                     <br/>
                                                 </t>
                                             </t>
@@ -161,11 +161,11 @@
                                             <div class="row">
                                                 <t t-if="user.partner_id.id in ratings_per_user">
                                                     <div class="col-lg-4 pl-0 pr-0">
-                                                        <img t-attf-src='/rating/static/src/img/rating_10.png' alt="Great" width="16px" height="16px"/>
+                                                        <img t-attf-src='/rating/static/src/img/rating_5.png' alt="Great" width="16px" height="16px"/>
                                                         <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['great']"/>%</span>
                                                     </div>
                                                     <div class="col-lg-4 pl-0 pr-0">
-                                                        <img t-attf-src='/rating/static/src/img/rating_5.png' alt="Okay" width="16px" height="16px"/>
+                                                        <img t-attf-src='/rating/static/src/img/rating_3.png' alt="Okay" width="16px" height="16px"/>
                                                         <span class="align-middle"><t t-esc="ratings_per_user[user.partner_id.id]['okay']"/>%</span>
                                                     </div>
                                                     <div class="col-lg-4 pl-0 pr-0">
diff --git a/addons/website_project/__init__.py b/addons/website_project/__init__.py
new file mode 100644
index 00000000000..7d34c7c054a
--- /dev/null
+++ b/addons/website_project/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import controllers
+from . import models
diff --git a/addons/website_project/__manifest__.py b/addons/website_project/__manifest__.py
new file mode 100644
index 00000000000..cb467db65e6
--- /dev/null
+++ b/addons/website_project/__manifest__.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Website Project',
+    'category': 'Website/Website',
+    'summary': 'Publish your project ratings',
+    'version': '1.0',
+    'description': """
+Allows to publish all ratings for a particular project.""",
+    'depends': ['website', 'project'],
+    'data': [
+        'views/project_rating_templates.xml',
+        'views/project_project_views.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+}
diff --git a/addons/website_project/controllers/__init__.py b/addons/website_project/controllers/__init__.py
new file mode 100644
index 00000000000..7367c6c8192
--- /dev/null
+++ b/addons/website_project/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import rating
diff --git a/addons/project/controllers/rating.py b/addons/website_project/controllers/rating.py
similarity index 85%
rename from addons/project/controllers/rating.py
rename to addons/website_project/controllers/rating.py
index c57734e6a99..7e0c3d5dda2 100644
--- a/addons/project/controllers/rating.py
+++ b/addons/website_project/controllers/rating.py
@@ -11,9 +11,11 @@ class RatingProject(http.Controller):
 
     @http.route(['/project/rating'], type='http', auth="public", website=True, sitemap=True)
     def index(self, **kw):
-        projects = request.env['project.project'].sudo().search([('rating_status', '!=', 'no'), ('portal_show_rating', '=', True)])
+        projects = request.env['project.project'].sudo().search([
+            ('rating_active', '=', True),
+            ('is_published', '=', True)])
         values = {'projects': projects}
-        return request.render('project.rating_index', values)
+        return request.render('website_project.rating_index', values)
 
     def _calculate_period_partner_stats(self, project_id):
         # get raw data: number of rating by rated partner, by rating value, by period
@@ -36,7 +38,7 @@ class RatingProject(http.Controller):
                     AND res_model = 'project.task'
                     AND rated_partner_id IS NOT NULL
                     AND write_date >= current_date - interval '90' day
-                    AND rating IN (1,5,10)
+                    AND rating IN (1, 3, 5)
             GROUP BY
                 rated_partner_id, rating, period
         """, (project_id, ))
@@ -44,7 +46,7 @@ class RatingProject(http.Controller):
         raw_data = request.env.cr.dictfetchall()
 
         # periodical statistics
-        default_period_dict = {'rating_10': 0, 'rating_5': 0, 'rating_1': 0, 'total': 0}
+        default_period_dict = {'rating_5': 0, 'rating_3': 0, 'rating_1': 0, 'total': 0}
         period_statistics = {
             'days_06': dict(default_period_dict),
             'days_15': dict(default_period_dict),
@@ -58,7 +60,7 @@ class RatingProject(http.Controller):
                     period_statistics[period_statistics_key]['total'] += row['rating_count']
 
         # partner statistics
-        default_partner_dict = {'rating_10': 0, 'rating_5': 0, 'rating_1': 0, 'total': 0, 'rated_partner': None, 'percentage_happy': 0.0}
+        default_partner_dict = {'rating_5': 0, 'rating_3': 0, 'rating_1': 0, 'total': 0, 'rated_partner': None, 'percentage_happy': 0.0}
         partner_statistics = {}
         for row in raw_data:
             if row['period'] <= 'days_15':
@@ -69,7 +71,7 @@ class RatingProject(http.Controller):
                 partner_statistics[row['rated_partner_id']]['total'] += row['rating_count']
 
         for partner_id, stat_values in partner_statistics.items():
-            stat_values['percentage_happy'] = (stat_values['rating_10'] / float(stat_values['total'])) * 100 if stat_values['total'] else 0.0
+            stat_values['percentage_happy'] = (stat_values['rating_5'] / float(stat_values['total'])) * 100 if stat_values['total'] else 0.0
 
         return {
             'partner_statistics': partner_statistics,
@@ -82,10 +84,10 @@ class RatingProject(http.Controller):
         project = request.env['project.project'].sudo().browse(project_id)
         # to avoid giving any access rights on projects to the public user, let's use sudo
         # and check if the user should be able to view the project (project managers only if it's unpublished or has no rating)
-        if not ((project.rating_status != 'no') and project.portal_show_rating) and not user.with_user(user).has_group('project.group_project_manager'):
+        if not (project.rating_active and project.is_published) and not user.with_user(user).has_group('project.group_project_manager'):
             raise NotFound()
 
-        return request.render('project.rating_project_rating_page', {
+        return request.render('website_project.rating_project_rating_page', {
             'project': project,
             'ratings': request.env['rating.rating'].sudo().search([
                 ('consumed', '=', True),
diff --git a/addons/website_project/models/__init__.py b/addons/website_project/models/__init__.py
new file mode 100644
index 00000000000..527e2954c06
--- /dev/null
+++ b/addons/website_project/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import project
diff --git a/addons/website_project/models/project.py b/addons/website_project/models/project.py
new file mode 100644
index 00000000000..ded92b699a2
--- /dev/null
+++ b/addons/website_project/models/project.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class Project(models.Model):
+    _name = 'project.project'
+    _inherit = ['project.project', 'website.published.mixin']
+
+    def action_view_all_rating(self):
+        if self.website_published:
+            return self.open_website_url()
+        return super(Project, self).action_view_all_rating()
+
+    def open_website_url(self):
+        """ return the action to see all the rating of the project, and activate default filters """
+        return {
+            'type': 'ir.actions.act_url',
+            'name': "Redirect to the Website Project Rating Page",
+            'target': 'self',
+            'url': "/project/rating/%s" % (self.id)
+        }
diff --git a/addons/website_project/views/project_project_views.xml b/addons/website_project/views/project_project_views.xml
new file mode 100644
index 00000000000..354adc30d5b
--- /dev/null
+++ b/addons/website_project/views/project_project_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="project_project_view_form" model="ir.ui.view">
+        <field name="name">project.project.form</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <field name="is_published"
+                       widget="website_redirect_button"
+                       groups="project.group_project_rating"
+                       attrs="{'invisible': [('rating_active', '=', False)]}"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/project/views/project_rating_templates.xml b/addons/website_project/views/project_rating_templates.xml
similarity index 82%
rename from addons/project/views/project_rating_templates.xml
rename to addons/website_project/views/project_rating_templates.xml
index a1b8613ccb3..197bf781b30 100644
--- a/addons/project/views/project_rating_templates.xml
+++ b/addons/website_project/views/project_rating_templates.xml
@@ -58,15 +58,15 @@
         <!-- Page : Project Rating Page (and widgets) -->
         <template id="portal_project_rating_progressbar">
             <div class="progress o_rating_progress">
-                <t t-set="percent_rating_10" t-value="(stats['rating_10'] / float(stats['total'])) * 100 if stats['total'] else 0.0"/>
-                <div class="progress-bar bg-success" t-attf-style="width: #{percent_rating_10}%;" title="Happy">
-                    <t t-esc="percent_rating_10"/>%
-                </div>
-                <t t-set="percent_rating_5" t-value="(stats['rating_5'] / float(stats['total'])) * 100 if stats['total'] else 0.0"/>
-                <div class="progress-bar bg-warning" t-attf-style="width: #{percent_rating_5}%;" title="Average">
+                <t t-set="percent_rating_5" t-value="int(round((stats['rating_5'] / float(stats['total'])) * 100)) if stats['total'] else 0.0"/>
+                <div class="progress-bar bg-success" t-attf-style="width: #{percent_rating_5}%;" title="Happy">
                     <t t-esc="percent_rating_5"/>%
                 </div>
-                <t t-set="percent_rating_1" t-value="(stats['rating_1'] / float(stats['total'])) * 100 if stats['total'] else 0.0"/>
+                <t t-set="percent_rating_3" t-value="int(round((stats['rating_3'] / float(stats['total'])) * 100)) if stats['total'] else 0.0"/>
+                <div class="progress-bar bg-warning" t-attf-style="width: #{percent_rating_3}%;" title="Average">
+                    <t t-esc="percent_rating_3"/>%
+                </div>
+                <t t-set="percent_rating_1" t-value="int(round((stats['rating_1'] / float(stats['total'])) * 100)) if stats['total'] else 0.0"/>
                 <div class="progress-bar bg-danger" t-attf-style="width: #{percent_rating_1}%;" title="Bad">
                     <t t-esc="percent_rating_1"/>%
                 </div>
@@ -84,26 +84,26 @@
                         <span class="ml8" t-esc="partner_stat['rated_partner'].name"/>
                     </div>
                     <div class="col-md-4 o_smiley_no_padding_right">
-                        <div class="col-md-4 o_smiley_no_padding_right o_smiley_no_padding_left">
-                            <span t-if="partner_stat['rating_10']">
-                                <img title="happy" alt="Happy face" class="o_top_partner_rating_image" src='/rating/static/src/img/rating_10.png'/>
-                                <span class="o_rating_count" t-esc="partner_stat['rating_10']"/>
-                            </span>
-                            <span t-if="not partner_stat['rating_10']">
-                                <img title="happy" alt="Happy face" class="o_top_partner_rating_image o_lighter_smileys" src='/rating/static/src/img/rating_10.png'/>
-                                <span class="o_rating_count o_lighter_smileys" t-esc="partner_stat['rating_10']"/>
-                            </span>
-                        </div>
                         <div class="col-md-4 o_smiley_no_padding_right o_smiley_no_padding_left">
                             <span t-if="partner_stat['rating_5']">
-                                <img title="average" alt="Neutral face" class="o_top_partner_rating_image" src='/rating/static/src/img/rating_5.png'/>
+                                <img title="happy" alt="Happy face" class="o_top_partner_rating_image" src='/rating/static/src/img/rating_5.png'/>
                                 <span class="o_rating_count" t-esc="partner_stat['rating_5']"/>
                             </span>
                             <span t-if="not partner_stat['rating_5']">
-                                <img title="average" alt="Neutral face" class="o_top_partner_rating_image o_lighter_smileys" src='/rating/static/src/img/rating_5.png'/>
+                                <img title="happy" alt="Happy face" class="o_top_partner_rating_image o_lighter_smileys" src='/rating/static/src/img/rating_5.png'/>
                                 <span class="o_rating_count o_lighter_smileys" t-esc="partner_stat['rating_5']"/>
                             </span>
                         </div>
+                        <div class="col-md-4 o_smiley_no_padding_right o_smiley_no_padding_left">
+                            <span t-if="partner_stat['rating_3']">
+                                <img title="average" alt="Neutral face" class="o_top_partner_rating_image" src='/rating/static/src/img/rating_3.png'/>
+                                <span class="o_rating_count" t-esc="partner_stat['rating_3']"/>
+                            </span>
+                            <span t-if="not partner_stat['rating_3']">
+                                <img title="average" alt="Neutral face" class="o_top_partner_rating_image o_lighter_smileys" src='/rating/static/src/img/rating_3.png'/>
+                                <span class="o_rating_count o_lighter_smileys" t-esc="partner_stat['rating_3']"/>
+                            </span>
+                        </div>
                         <div class="col-md-4 o_smiley_no_padding_right o_smiley_no_padding_left">
                            <span t-if="partner_stat['rating_1']">
                                 <img title="bad" alt="Sad face" class="o_top_partner_rating_image" src='/rating/static/src/img/rating_1.png'/>
@@ -116,7 +116,7 @@
                         </div>
                     </div>
                     <div class="col-md-3 o_smiley_no_padding_left">
-                        <strong class="float-right"><t t-esc="partner_stat['percentage_happy']"/>%</strong>
+                        <strong class="float-right"><t t-esc="int(round(partner_stat['percentage_happy']))"/>%</strong>
                     </div>
                 </div>
             </t>
@@ -125,11 +125,11 @@
         <template id="portal_project_rating_popover">
             <div t-attf-id="rating_#{rating.id}" class="container d-none">
                 <div class="row">
-                    <div class="col-lg-2">
-                        <img t-if="rating.partner_id.image_1024" class="o_top_partner_image" t-att-src="image_data_uri(rating.partner_id.image_1024)" alt="Rated partner"/>
-                        <img  t-if="not rating.partner_id.image_1024" class="o_top_partner_image" src='/web/static/src/img/placeholder.png' alt="Placeholder"/>
+                    <div class="col-lg-4">
+                        <img t-if="rating.partner_id.image_1024" class="img-fluid" t-att-src="image_data_uri(rating.partner_id.image_1024)" alt="Rated partner"/>
+                        <img  t-if="not rating.partner_id.image_1024" class="img-fluid" src='/web/static/src/img/placeholder.png' alt="Placeholder"/>
                     </div>
-                    <div class="col-lg-10">
+                    <div class="col-lg-8">
                         <div class="mt4">
                             <strong><t t-esc="rating.rated_partner_id.name"/></strong> - <span class="rating_timeduration"><t t-esc="rating.create_date"/></span>
                         </div>
@@ -149,42 +149,52 @@
                  <div id="wrap" class="row mt4">
                     <div class="oe_structure" id="oe_structure_project_rating_page_1"/>
                     <div class="container o_project o_portal_project_rating">
+                        <br/>
                         <h2 t-esc="project.name"/>
+                        <br/>
                         <div class="row mb32">
                             <div class="col-lg-12">
-                                <h3 class="o_page_header">Customer Ratings</h3>
+                                <div class="o_page_header">
+                                    <div class="justify-content-end" groups="project.group_project_manager">
+                                        <t t-call="website.publish_management">
+                                            <t t-set="object" t-value="project"/>
+                                            <t t-set="publish_edit" t-value="True"/>
+                                        </t>
+                                    </div>
+                                    <h3>Customer Ratings</h3>
+                                </div>
                                 <div class="row">
                                     <div class="col-lg-7">
                                         <t t-foreach="ratings" t-as="rating">
-                                            <img t-attf-src='/rating/static/src/img/rating_#{int(rating.rating)}.png'
+                                            <img t-attf-src='/rating/static/src/img/#{rating._get_rating_image_filename()}'
                                                 class="mt4 o_rating_image"
                                                 t-att-alt="rating.res_name"
                                                 t-att-data-id="rating.id"
                                                 t-att-data-rating-date="rating.write_date"/>
-                                            <t t-call="project.portal_project_rating_popover"/>
+                                            <t t-call="website_project.portal_project_rating_popover"/>
                                         </t>
                                     </div>
                                     <div class="col-lg-5 o_vertical_separator">
                                         <div t-if="statistics['period_statistics']['days_06']">
                                             <h5>Last 7 days</h5>
-                                            <t t-call="project.portal_project_rating_progressbar">
+                                            <t t-call="website_project.portal_project_rating_progressbar">
                                                 <t t-set="stats" t-value="statistics['period_statistics']['days_06']"/>
                                             </t>
                                         </div>
                                         <div t-if="statistics['period_statistics']['days_30']">
                                             <h5>Last 30 days</h5>
-                                            <t t-call="project.portal_project_rating_progressbar">
+                                            <t t-call="website_project.portal_project_rating_progressbar">
                                                 <t t-set="stats" t-value="statistics['period_statistics']['days_30']"/>
                                             </t>
                                         </div>
                                         <div t-if="statistics['period_statistics']['days_90']">
                                             <h5>Last 3 months</h5>
-                                            <t t-call="project.portal_project_rating_progressbar">
+                                            <t t-call="website_project.portal_project_rating_progressbar">
                                                 <t t-set="stats" t-value="statistics['period_statistics']['days_90']"/>
                                             </t>
                                         </div>
                                         <div>
-                                            <t t-call="project.portal_project_rating_partner_stat">
+                                            <t t-call="website_project.portal_project_rating_partner_stat">
                                                 <t t-set="partner_stats" t-value="statistics['partner_statistics']"/>
                                             </t>
                                         </div>
diff --git a/addons/website_slides/data/slide_user_demo.xml b/addons/website_slides/data/slide_user_demo.xml
index 95fcc2cbd67..80d87842323 100644
--- a/addons/website_slides/data/slide_user_demo.xml
+++ b/addons/website_slides/data/slide_user_demo.xml
@@ -52,7 +52,7 @@
         <field name="partner_id" ref="base.partner_admin"/>
         <field name="consumed" eval="True"/>
         <field name="feedback">I fear beginners could be lost... Isn't it a bit harsh for a "basics" course ?</field>
-        <field name="rating">6</field>
+        <field name="rating">3</field>
         <field name="message_id" ref="website_slides.message_channel_0_admin"/>
     </record>
     <record id="message_channel_0_demo" model="mail.message">
@@ -68,7 +68,7 @@
         <field name="res_id" ref="website_slides.slide_channel_demo_0_gard_0"/>
         <field name="partner_id" ref="base.partner_demo"/>
         <field name="consumed" eval="True"/>
-        <field name="rating">10</field>
+        <field name="rating">5</field>
         <field name="feedback">Back to basics and interesting. Just WOW !</field>
         <field name="message_id" ref="website_slides.message_channel_0_demo"/>
     </record>
@@ -140,7 +140,7 @@
         <field name="partner_id" ref="base.partner_admin"/>
         <field name="consumed" eval="True"/>
         <field name="feedback">Very good course.</field>
-        <field name="rating">10</field>
+        <field name="rating">5</field>
         <field name="message_id" ref="website_slides.message_channel_1_admin"/>
     </record>
     <record id="message_channel_1_demo" model="mail.message">
@@ -156,7 +156,7 @@
         <field name="res_id" ref="website_slides.slide_channel_demo_1_gard1"/>
         <field name="partner_id" ref="base.partner_demo"/>
         <field name="consumed" eval="True"/>
-        <field name="rating">8</field>
+        <field name="rating">4</field>
         <field name="feedback">Interesting !</field>
         <field name="message_id" ref="website_slides.message_channel_1_demo"/>
     </record>
@@ -173,7 +173,7 @@
         <field name="res_id" ref="website_slides.slide_channel_demo_1_gard1"/>
         <field name="partner_id" ref="base.partner_demo_portal"/>
         <field name="consumed" eval="True"/>
-        <field name="rating">6</field>
+        <field name="rating">3</field>
         <field name="feedback">Interesting. Could be great to include more examples.</field>
         <field name="message_id" ref="website_slides.message_channel_1_portal"/>
         <field name="publisher_comment">Thanks for the feedback! We just updated first lessons to better include newcomers.</field>
diff --git a/addons/website_slides/models/slide_channel.py b/addons/website_slides/models/slide_channel.py
index 34b5bc0fcd9..fe2c009f6ee 100644
--- a/addons/website_slides/models/slide_channel.py
+++ b/addons/website_slides/models/slide_channel.py
@@ -260,7 +260,7 @@ class Channel(models.Model):
     def _compute_rating_stats(self):
         super(Channel, self)._compute_rating_stats()
         for record in self:
-            record.rating_avg_stars = record.rating_avg / 2
+            record.rating_avg_stars = record.rating_avg
 
     @api.depends('slide_partner_ids', 'total_slides')
     @api.depends_context('uid')
diff --git a/addons/website_slides/views/rating_rating_views.xml b/addons/website_slides/views/rating_rating_views.xml
index 379bb72d781..688bc40df44 100644
--- a/addons/website_slides/views/rating_rating_views.xml
+++ b/addons/website_slides/views/rating_rating_views.xml
@@ -12,7 +12,7 @@
                 <field name="partner_id"/>
                 <templates>
                     <t t-name="kanban-box">
-                        <t t-set="val_stars" t-value="record.rating.raw_value / 2"/>
+                        <t t-set="val_stars" t-value="record.rating.raw_value"/>
                         <t t-set="val_integer" t-value="Math.floor(val_stars)"/>
                         <t t-set="val_decimal" t-value="val_stars - val_integer"/>
                         <t t-set="empty_star" t-value="5 - (val_integer + Math.ceil(val_decimal))"/>
diff --git a/doc/reference/mixins.rst b/doc/reference/mixins.rst
index d290e418652..b64387fcc2c 100644
--- a/doc/reference/mixins.rst
+++ b/doc/reference/mixins.rst
@@ -1030,8 +1030,8 @@ links to the rating object. A very basic email template could look like this:
     <p>Hi,</p>
     <p>How satsified are you?</p>
     <ul>
-        <li><a href="/rating/${access_token}/10">Satisfied</a></li>
-        <li><a href="/rating/${access_token}/5">Not satisfied</a></li>
+        <li><a href="/rating/${access_token}/5">Satisfied</a></li>
+        <li><a href="/rating/${access_token}/3">Not satisfied</a></li>
         <li><a href="/rating/${access_token}/1">Very unsatisfied</a></li>
     </ul>
     ]]></field>