[REF] crm: update revenue fields names

PURPOSE

Link field name with their content.

SPECIFICATIONS

This commit changes the field name "expected_revenue" into "prorated_revenue"
and the field name "planned_revenue" into "expected_revenue".

Indeed content of those fields evolved since their first naming. Their content
is not what the field name indicates. Better rename those fields to understand
code flow inside CRM.

LINKS

Task ID-2283052
odoo/odoo#54194
odoo/enterprise#12423
odoo/upgrade#1463

10 files changed, 70 insertions, 70 deletions

diff --git a/addons/crm/data/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml
index e1b3c7edf1d..144ed8e5789 100644
--- a/addons/crm/data/crm_lead_demo.xml
+++ b/addons/crm/data/crm_lead_demo.xml
@@ -343,7 +343,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Quote for 12 Tables</field>
-            <field name="planned_revenue">40000</field>
+            <field name="expected_revenue">40000</field>
             <field name="probability">10.0</field>
             <field name="contact_name">Will McEncroe</field>
             <field name="partner_name">Rediff Mail</field>
@@ -367,7 +367,7 @@ Andrew</p>]]></field>
             <field name="type">opportunity</field>
             <field name="name">Office Design Project</field>
             <field name="color">7</field>
-            <field name="planned_revenue">24000</field>
+            <field name="expected_revenue">24000</field>
             <field name="probability">10.0</field>
             <field name="partner_name">Deco Addict</field>
             <field name="email_from">info@agrolait.com</field>
@@ -392,7 +392,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Info about services</field>
-            <field name="planned_revenue">25000</field>
+            <field name="expected_revenue">25000</field>
             <field name="probability">30.0</field>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="email_from">virginie@agrolait.com</field>
@@ -484,7 +484,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=2)"/>
             <field name="type">opportunity</field>
             <field name="name">Global Solutions: Furnitures</field>
-            <field name="planned_revenue">3800</field>
+            <field name="expected_revenue">3800</field>
             <field name="probability">90.0</field>
             <field name="contact_name">Robin Smith</field>
             <field name="partner_name">Global Solutions</field>
@@ -508,7 +508,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=3)"/>
             <field name="type">opportunity</field>
             <field name="name">Balmer Inc: Potential Distributor</field>
-            <field name="planned_revenue">1000</field>
+            <field name="expected_revenue">1000</field>
             <field name="probability">35.0</field>
             <field name="partner_name">BalmerInc S.A.</field>
             <field name="contact_name">Oliver Passot</field>
@@ -542,7 +542,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=7)"/>
             <field name="type">opportunity</field>
             <field name="name">DeltaPC: 10 Computer Desks</field>
-            <field eval="35000" name="planned_revenue"/>
+            <field eval="35000" name="expected_revenue"/>
             <field eval="25.0" name="probability"/>
             <field name="contact_name">Leland Martinez</field>
             <field name="email_from">info@deltapc.com</field>
@@ -589,7 +589,7 @@ Andrew</p>]]></field>
             <field name="type">opportunity</field>
             <field name="name">Customizable Desk</field>
             <field name="color">3</field>
-            <field name="planned_revenue">15000</field>
+            <field name="expected_revenue">15000</field>
             <field name="probability">65.5</field>
             <field name="contact_name">Nhomar</field>
             <field name="partner_name">Vauxoo</field>
@@ -617,7 +617,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=7)"/>
             <field name="type">opportunity</field>
             <field name="name">Distributor Contract</field>
-            <field name="planned_revenue">19800</field>
+            <field name="expected_revenue">19800</field>
             <field name="contact_name">John M. Brown</field>
             <field name="partner_name">Epic Technologies</field>
             <field name="email_from">john.b@tech.info</field>
@@ -640,7 +640,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Office Design and Architecture</field>
-            <field name="planned_revenue">9000</field>
+            <field name="expected_revenue">9000</field>
             <field name="partner_id" ref="base.res_partner_4"/>
             <field name="country_id" ref="base.uk"/>
             <field name="city">Birmingham</field>
@@ -660,7 +660,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=8)"/>
             <field name="type">opportunity</field>
             <field name="name">5 VP Chairs</field>
-            <field name="planned_revenue">5600</field>
+            <field name="expected_revenue">5600</field>
             <field name="probability">30.0</field>
             <field name="contact_name">Benjamin Flores</field>
             <field name="partner_name">Nebula Business</field>
@@ -679,7 +679,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=7)"/>
             <field name="type">opportunity</field>
             <field name="name">Access to Online Catalog</field>
-            <field name="planned_revenue">2000</field>
+            <field name="expected_revenue">2000</field>
             <field name="probability">80.0</field>
             <field name="partner_id" ref="base.res_partner_18"/>
             <field name="priority">0</field>
@@ -696,7 +696,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=7)"/>
             <field name="type">opportunity</field>
             <field name="name">Need 20 Desks</field>
-            <field name="planned_revenue">60000</field>
+            <field name="expected_revenue">60000</field>
             <field name="probability">90.0</field>
             <field name="email_from">info@mycompany.net</field>
             <field name="country_id" ref="base.pe"/>
@@ -715,7 +715,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Modern Open Space</field>
-            <field name="planned_revenue">4500</field>
+            <field name="expected_revenue">4500</field>
             <field name="probability">60</field>
             <field name="contact_name">Henry Jordan</field>
             <field name="partner_name">E-light Industry</field>
@@ -739,7 +739,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=6)"/>
             <field name="type">opportunity</field>
             <field name="name">Open Space Design</field>
-            <field name="planned_revenue">11000</field>
+            <field name="expected_revenue">11000</field>
             <field name="probability">45</field>
             <field name="partner_name">Deco Addict</field>
             <field name="email_from">info@agrolait.com</field>
@@ -763,7 +763,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Interest in your products</field>
-            <field name="planned_revenue">2000</field>
+            <field name="expected_revenue">2000</field>
             <field name="probability">80</field>
             <field name="partner_name">Deco Addict</field>
             <field name="email_from">info@agrolait.com</field>
@@ -787,7 +787,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Furnish a 60m² office</field>
-            <field name="planned_revenue">7500</field>
+            <field name="expected_revenue">7500</field>
             <field name="probability">20</field>
             <field name="partner_name">Deco Addict</field>
             <field name="email_from">info@agrolait.com</field>
@@ -852,7 +852,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - relativedelta(months=1)"/>
             <field name="type">opportunity</field>
             <field name="name">Quote for 150 carpets</field>
-            <field name="planned_revenue">40000</field>
+            <field name="expected_revenue">40000</field>
             <field name="probability">10.0</field>
             <field name="contact_name">Erik N. French</field>
             <field name="email_from">ErikNFrench@armyspy.com</field>
@@ -874,7 +874,7 @@ Andrew</p>]]></field>
             <field name="create_date" eval="datetime.now() - relativedelta(months=2)"/>
             <field name="type">opportunity</field>
             <field name="name">Quote for 600 Chairs</field>
-            <field name="planned_revenue">22500</field>
+            <field name="expected_revenue">22500</field>
             <field name="probability">20.0</field>
             <field name="contact_name">Erik N. French</field>
             <field name="email_from">ErikNFrench@armyspy.com</field>
@@ -896,7 +896,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(months=1)"/>
 <field name="type">lead</field>
 <field name="name">Recurring delivery contract</field>
-<field name="planned_revenue">36221</field>
+<field name="expected_revenue">36221</field>
 <field name="probability">20</field>
 <field name="contact_name">Max Johnson</field>
 <field name="email_from">max123@itconsult.com</field>
@@ -915,7 +915,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=18)"/>
 <field name="type">lead</field>
 <field name="name">Need info about pricing</field>
-<field name="planned_revenue">28443</field>
+<field name="expected_revenue">28443</field>
 <field name="probability">80</field>
 <field name="contact_name">Aloysius Akred</field>
 <field name="email_from">aakreda@theglobeandmail.com</field>
@@ -935,7 +935,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=24)"/>
 <field name="type">lead</field>
 <field name="name">Trelian New Offices</field>
-<field name="planned_revenue">88715</field>
+<field name="expected_revenue">88715</field>
 <field name="probability">12</field>
 <field name="contact_name">Rosalynd Oxshott</field>
 <field name="partner_name">Photobug</field>
@@ -955,7 +955,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=40)"/>
 <field name="type">lead</field>
 <field name="name">Branded Furniture</field>
-<field name="planned_revenue">7784</field>
+<field name="expected_revenue">7784</field>
 <field name="probability">20</field>
 <field name="contact_name">Myrna Limprecht</field>
 <field name="email_from">mlimprecht8@fastcompany.com</field>
@@ -974,7 +974,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=45)"/>
 <field name="type">lead</field>
 <field name="name">Design New Shelves</field>
-<field name="planned_revenue">54587</field>
+<field name="expected_revenue">54587</field>
 <field name="probability">81</field>
 <field name="contact_name">Alys Kalinovich</field>
 <field name="partner_name">Jaloo</field>
@@ -994,7 +994,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=48)"/>
 <field name="type">lead</field>
 <field name="name">Office chairs</field>
-<field name="planned_revenue">5474</field>
+<field name="expected_revenue">5474</field>
 <field name="probability">20</field>
 <field name="contact_name">Jennine Jobbins</field>
 <field name="partner_name">Shufflebeat</field>
@@ -1014,7 +1014,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=80)"/>
 <field name="type">lead</field>
 <field name="name">Cleaning subscription</field>
-<field name="planned_revenue">11475</field>
+<field name="expected_revenue">11475</field>
 <field name="probability">25</field>
 <field name="contact_name">Elmo Espinazo</field>
 <field name="partner_name">Realblab</field>
@@ -1034,7 +1034,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=37)"/>
 <field name="type">lead</field>
 <field name="name">Custom Desks (100 pieces)</field>
-<field name="planned_revenue">9987</field>
+<field name="expected_revenue">9987</field>
 <field name="probability">20</field>
 <field name="contact_name">Chalmers Redford</field>
 <field name="partner_name">Muxo</field>
@@ -1056,7 +1056,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=32)"/>
 <field name="type">lead</field>
 <field name="name">Need a price: urgent</field>
-<field name="planned_revenue">4482</field>
+<field name="expected_revenue">4482</field>
 <field name="probability">90</field>
 <field name="contact_name">Itch Kirvell</field>
 <field name="partner_name">Skibox</field>
@@ -1076,7 +1076,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=18)"/>
 <field name="type">lead</field>
 <field name="name">Furnitures for new location</field>
-<field name="planned_revenue">22500</field>
+<field name="expected_revenue">22500</field>
 <field name="probability">20</field>
 <field name="contact_name">Napoleon Grabert</field>
 <field name="partner_name">Twinte</field>
@@ -1096,7 +1096,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=52)"/>
 <field name="type">lead</field>
 <field name="name">Modernize old offices</field>
-<field name="planned_revenue">99755</field>
+<field name="expected_revenue">99755</field>
 <field name="probability">20</field>
 <field name="contact_name">Franny Seiller</field>
 <field name="partner_name">Yozio</field>
@@ -1117,7 +1117,7 @@ Andrew</p>]]></field>
 <field name="create_date" eval="datetime.now() - relativedelta(days=52)"/>
 <field name="type">lead</field>
 <field name="name">Quote for 35 windows</field>
-<field name="planned_revenue">41421</field>
+<field name="expected_revenue">41421</field>
 <field name="probability">20</field>
 <field name="contact_name">Tommi Brockhouse</field>
 <field name="partner_name">Gabcube</field>
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index 57e08c62d29..12b39893342 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -38,7 +38,7 @@ CRM_LEAD_FIELDS_TO_MERGE = [
     'partner_name',
     'phone',
     'probability',
-    'planned_revenue',
+    'expected_revenue',
     'street',
     'street2',
     'zip',
@@ -125,8 +125,8 @@ class Lead(models.Model):
         help="Classify and analyze your lead/opportunity categories like: Training, Service")
     color = fields.Integer('Color Index', default=0)
     # Opportunity specific
-    planned_revenue = fields.Monetary('Expected Revenue', currency_field='company_currency', tracking=True)
-    expected_revenue = fields.Monetary('Prorated Revenue', currency_field='company_currency', store=True, compute="_compute_expected_revenue")
+    expected_revenue = fields.Monetary('Expected Revenue', currency_field='company_currency', tracking=True)
+    prorated_revenue = fields.Monetary('Prorated Revenue', currency_field='company_currency', store=True, compute="_compute_prorated_revenue")
     company_currency = fields.Many2one("res.currency", string='Currency', related='company_id.currency_id', readonly=True)
     # Dates
     date_closed = fields.Datetime('Closed Date', readonly=True, copy=False)
@@ -366,10 +366,10 @@ class Lead(models.Model):
                 if was_automated:
                     lead.probability = lead.automated_probability
 
-    @api.depends('planned_revenue', 'probability')
-    def _compute_expected_revenue(self):
+    @api.depends('expected_revenue', 'probability')
+    def _compute_prorated_revenue(self):
         for lead in self:
-            lead.expected_revenue = round((lead.planned_revenue or 0.0) * (lead.probability or 0) / 100.0, 2)
+            lead.prorated_revenue = round((lead.expected_revenue or 0.0) * (lead.probability or 0) / 100.0, 2)
 
     def _compute_meeting_count(self):
         if self.ids:
@@ -721,14 +721,14 @@ class Lead(models.Model):
         self.ensure_one()
         self.action_set_won()
 
-        if self.user_id and self.team_id and self.planned_revenue:
+        if self.user_id and self.team_id and self.expected_revenue:
             query = """
                 SELECT
                     SUM(CASE WHEN user_id = %(user_id)s THEN 1 ELSE 0 END) as total_won,
-                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '30 days' AND user_id = %(user_id)s THEN planned_revenue ELSE 0 END) as max_user_30,
-                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '7 days' AND user_id = %(user_id)s THEN planned_revenue ELSE 0 END) as max_user_7,
-                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '30 days' AND team_id = %(team_id)s THEN planned_revenue ELSE 0 END) as max_team_30,
-                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '7 days' AND team_id = %(team_id)s THEN planned_revenue ELSE 0 END) as max_team_7
+                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '30 days' AND user_id = %(user_id)s THEN expected_revenue ELSE 0 END) as max_user_30,
+                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '7 days' AND user_id = %(user_id)s THEN expected_revenue ELSE 0 END) as max_user_7,
+                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '30 days' AND team_id = %(team_id)s THEN expected_revenue ELSE 0 END) as max_team_30,
+                    MAX(CASE WHEN date_closed >= CURRENT_DATE - INTERVAL '7 days' AND team_id = %(team_id)s THEN expected_revenue ELSE 0 END) as max_team_7
                 FROM crm_lead
                 WHERE
                     type = 'opportunity'
@@ -748,13 +748,13 @@ class Lead(models.Model):
             message = False
             if query_result['total_won'] == 1:
                 message = _('Go, go, go! Congrats for your first deal.')
-            elif query_result['max_team_30'] == self.planned_revenue:
+            elif query_result['max_team_30'] == self.expected_revenue:
                 message = _('Boom! Team record for the past 30 days.')
-            elif query_result['max_team_7'] == self.planned_revenue:
+            elif query_result['max_team_7'] == self.expected_revenue:
                 message = _('Yeah! Deal of the last 7 days for the team.')
-            elif query_result['max_user_30'] == self.planned_revenue:
+            elif query_result['max_user_30'] == self.expected_revenue:
                 message = _('You just beat your personal record for the past 30 days.')
-            elif query_result['max_user_7'] == self.planned_revenue:
+            elif query_result['max_user_7'] == self.expected_revenue:
                 message = _('You just beat your personal record for the past 7 days.')
 
             if message:
diff --git a/addons/crm/models/crm_team.py b/addons/crm/models/crm_team.py
index 695823a0d80..5d0b8267d43 100644
--- a/addons/crm/models/crm_team.py
+++ b/addons/crm/models/crm_team.py
@@ -63,14 +63,14 @@ class Team(models.Model):
             ('team_id', 'in', self.ids),
             ('probability', '<', 100),
             ('type', '=', 'opportunity'),
-        ]).read(['planned_revenue', 'team_id'])
+        ]).read(['expected_revenue', 'team_id'])
         counts = {}
         amounts = {}
         for datum in opportunity_data:
             counts.setdefault(datum['team_id'][0], 0)
             amounts.setdefault(datum['team_id'][0], 0)
             counts[datum['team_id'][0]] += 1
-            amounts[datum['team_id'][0]] += (datum.get('planned_revenue', 0))
+            amounts[datum['team_id'][0]] += (datum.get('expected_revenue', 0))
         for team in self:
             team.opportunities_count = counts.get(team.id, 0)
             team.opportunities_amount = amounts.get(team.id, 0)
@@ -81,9 +81,9 @@ class Team(models.Model):
             ('probability', '<', 100),
             ('type', '=', 'opportunity'),
             ('date_deadline', '<', fields.Date.to_string(fields.Datetime.now()))
-        ], ['planned_revenue', 'team_id'], ['team_id'])
+        ], ['expected_revenue', 'team_id'], ['team_id'])
         counts = {datum['team_id'][0]: datum['team_id_count'] for datum in opportunity_data}
-        amounts = {datum['team_id'][0]: (datum['planned_revenue']) for datum in opportunity_data}
+        amounts = {datum['team_id'][0]: (datum['expected_revenue']) for datum in opportunity_data}
         for team in self:
             team.opportunities_overdue_count = counts.get(team.id, 0)
             team.opportunities_overdue_amount = amounts.get(team.id, 0)
diff --git a/addons/crm/report/crm_opportunity_report_views.xml b/addons/crm/report/crm_opportunity_report_views.xml
index f8b101e02c7..b97a0f6fc14 100644
--- a/addons/crm/report/crm_opportunity_report_views.xml
+++ b/addons/crm/report/crm_opportunity_report_views.xml
@@ -10,7 +10,7 @@
                 <pivot string="Pipeline Analysis">
                     <field name="create_date" interval="month" type="col"/>
                     <field name="stage_id" type="row"/>
-                    <field name="expected_revenue" type="measure"/>
+                    <field name="prorated_revenue" type="measure"/>
                 </pivot>
             </field>
         </record>
@@ -35,7 +35,7 @@
                 <graph string="Pipeline Analysis" stacked="True" sample="1">
                     <field name="stage_id" type="row"/>
                     <field name="date_deadline" type="row" interval="month"/>
-                    <field name="expected_revenue" type="measure"/>
+                    <field name="prorated_revenue" type="measure"/>
                 </graph>
             </field>
         </record>
diff --git a/addons/crm/static/src/js/tours/crm.js b/addons/crm/static/src/js/tours/crm.js
index db1ff6d1e8e..6af1e0207af 100644
--- a/addons/crm/static/src/js/tours/crm.js
+++ b/addons/crm/static/src/js/tours/crm.js
@@ -35,7 +35,7 @@ tour.register('crm_tour', {
     trigger: ".o_kanban_quick_create .o_field_widget[name='name']",
     auto: true,
 }, {
-    trigger: '.o_kanban_quick_create .o_field_monetary[name="planned_revenue"]',
+    trigger: '.o_kanban_quick_create .o_field_monetary[name="expected_revenue"]',
     content: _t("Define here the Expected Revenue of this Opportunity."),
     position: 'right',
 }, {
diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 749187354a2..67bc4f41e67 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -47,10 +47,10 @@
                             <h1><field name="name" placeholder="e.g. Product Pricing"/></h1>
                             <h2 class="o_row row no-gutters d-flex align-items-end">
                                 <div class="col" attrs="{'invisible': [('type', '=', 'lead')]}">
-                                    <label for="planned_revenue" class="oe_edit_only" />
+                                    <label for="expected_revenue" class="oe_edit_only" />
                                     <div class="o_row">
                                         <field name="company_currency" invisible="1"/>
-                                        <field name="planned_revenue" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency'}"/>
+                                        <field name="expected_revenue" class="oe_inline" widget='monetary' options="{'currency_field': 'company_currency'}"/>
                                         <span class="oe_grey p-2"> at </span>
                                     </div>
                                 </div>
@@ -387,7 +387,7 @@
             <field name="priority" eval="2"/>
             <field name="arch" type="xml">
                 <calendar string="Leads Generation" create="0" mode="month" date_start="activity_date_deadline" color="user_id" hide_time="true" event_limit="5">
-                    <field name="planned_revenue"/>
+                    <field name="expected_revenue"/>
                     <field name="partner_id" avatar_field="image_128"/>
                     <field name="user_id" filters="1" invisible="1"/>
                 </calendar>
@@ -405,9 +405,9 @@
                         <field name="name" placeholder="e.g. Product Pricing" />
                         <field name="email_from" string="Email" />
                         <field name="phone" string="Phone" />
-                        <label for="planned_revenue"/>
+                        <label for="expected_revenue"/>
                         <div class="o_row">
-                            <field name="planned_revenue" class="oe_inline mr-5" widget="monetary" options="{'currency_field': 'company_currency'}"/>
+                            <field name="expected_revenue" class="oe_inline mr-5" widget="monetary" options="{'currency_field': 'company_currency'}"/>
                             <field name="priority" class="oe_inline" nolabel="1" widget="priority"/>
                         </div>
                         <field name="company_currency" invisible="1"/>
@@ -441,7 +441,7 @@
                             <img t-att-src="activity_image('res.users', 'image_128', record.user_id.raw_value)" t-att-title="record.user_id.value" t-att-alt="record.user_id.value"/>
                             <div>
                                 <field name="name" display="full"/>
-                                <field name="planned_revenue" widget="monetary" display="full" muted="1"/>
+                                <field name="expected_revenue" widget="monetary" display="full" muted="1"/>
                             </div>
                         </div>
                     </templates>
@@ -459,7 +459,7 @@
                     <field name="stage_id" options='{"group_by_tooltip": {"requirements": "Description"}}'/>
                     <field name="color"/>
                     <field name="priority"/>
-                    <field name="planned_revenue"/>
+                    <field name="expected_revenue"/>
                     <field name="kanban_state"/>
                     <field name="activity_date_deadline"/>
                     <field name="user_email"/>
@@ -470,7 +470,7 @@
                     <field name="company_currency"/>
                     <field name="activity_state" />
                     <field name="activity_ids" />
-                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="planned_revenue" help="This bar allows to filter the opportunities based on scheduled activities."/>
+                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="expected_revenue" help="This bar allows to filter the opportunities based on scheduled activities."/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="#{!selection_mode ? kanban_color(record.color.raw_value) : ''} oe_kanban_global_click">
@@ -490,8 +490,8 @@
                                         <strong><field name="name"/></strong>
                                     </div>
                                     <div class="o_kanban_record_subtitle">
-                                        <t t-if="record.planned_revenue.raw_value">
-                                            <field name="planned_revenue" widget="monetary" options="{'currency_field': 'company_currency'}"/>
+                                        <t t-if="record.expected_revenue.raw_value">
+                                            <field name="expected_revenue" widget="monetary" options="{'currency_field': 'company_currency'}"/>
                                             <span t-if="record.partner_id.value"> - </span>
                                         </t>
                                         <span t-if="record.partner_id.value" t-esc="record.partner_id.value"></span>
@@ -644,7 +644,7 @@
                     <field name="medium_id" optional="hide"/>
                     <field name="source_id" optional="hide"/>
                     <field name="company_currency" invisible="1"/>
-                    <field name="planned_revenue" sum="Expected Revenues" optional="show" widget="monetary" options="{'currency_field': 'company_currency'}"/>
+                    <field name="expected_revenue" sum="Expected Revenues" optional="show" widget="monetary" options="{'currency_field': 'company_currency'}"/>
                     <field name="stage_id" optional="show" decoration-bf="1"/>
                     <field name="active" invisible="1"/>
                     <field name="probability" optional="hide"/>
@@ -730,7 +730,7 @@
                 <pivot string="Pipeline Analysis">
                     <field name="create_date" interval="month" type="row"/>
                     <field name="stage_id" type="col"/>
-                    <field name="planned_revenue" type="measure"/>
+                    <field name="expected_revenue" type="measure"/>
                     <field name="color" invisible="1"/>
                 </pivot>
             </field>
diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py
index 314257fe69d..85bc2e7cc88 100644
--- a/addons/website_crm_partner_assign/controllers/main.py
+++ b/addons/website_crm_partner_assign/controllers/main.py
@@ -109,7 +109,7 @@ class WebsiteAccount(CustomerPortal):
             'date': {'label': _('Newest'), 'order': 'create_date desc'},
             'name': {'label': _('Name'), 'order': 'name'},
             'contact_name': {'label': _('Contact Name'), 'order': 'contact_name'},
-            'revenue': {'label': _('Expected Revenue'), 'order': 'planned_revenue desc'},
+            'revenue': {'label': _('Expected Revenue'), 'order': 'expected_revenue desc'},
             'probability': {'label': _('Probability'), 'order': 'probability desc'},
             'stage': {'label': _('Stage'), 'order': 'stage_id'},
         }
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 287832ecf70..09735aed057 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -208,7 +208,7 @@ class CrmLead(models.Model):
         self.check_access_rights('write')
         for lead in self:
             lead_values = {
-                'planned_revenue': values['planned_revenue'],
+                'expected_revenue': values['expected_revenue'],
                 'probability': values['probability'],
                 'priority': values['priority'],
                 'date_deadline': values['date_deadline'] or False,
diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index 59a835945a0..c034ecf3eee 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -143,7 +143,7 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
             method: 'update_lead_portal',
             args: [[parseInt($('.edit_opp_form .opportunity_id').val())], {
                 date_deadline: this._parse_date($('.edit_opp_form .date_deadline').val()),
-                planned_revenue: parseFloat($('.edit_opp_form .planned_revenue').val()),
+                expected_revenue: parseFloat($('.edit_opp_form .expected_revenue').val()),
                 probability: parseFloat($('.edit_opp_form .probability').val()),
                 activity_type_id: parseInt($('.edit_opp_form .next_activity').find(':selected').attr('data')),
                 activity_summary: $('.edit_opp_form .activity_summary').val(),
diff --git a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
index 13ad7f7267a..c9a13fca304 100644
--- a/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+++ b/addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
@@ -320,7 +320,7 @@
                         </td>
                         <td><span t-field="opp.contact_name" /></td>
                         <td>
-                            <span class="text-nowrap" t-esc="opp.planned_revenue" t-options="{'widget': 'monetary', 'display_currency': opp.company_currency}"/> at <span t-field="opp.probability" />%
+                            <span class="text-nowrap" t-esc="opp.expected_revenue" t-options="{'widget': 'monetary', 'display_currency': opp.company_currency}"/> at <span t-field="opp.probability" />%
                         </td>
                         <td>
                             <span class="badge badge-info badge-pill" title="Current stage of the opportunity" t-esc="opp.stage_id.name" />
@@ -529,7 +529,7 @@
                         <div class="col-lg-5 mb-4 mb-lg-0">
                             <div class="border-bottom d-flex justify-content-between py-2 mb-3 align-items-center">
                                 <h5 class="mb-0">
-                                    <span class="text-nowrap" t-esc="opportunity.planned_revenue" t-options="{'widget': 'monetary', 'display_currency': opportunity.company_currency}"/> at
+                                    <span class="text-nowrap" t-esc="opportunity.expected_revenue" t-options="{'widget': 'monetary', 'display_currency': opportunity.company_currency}"/> at
                                     <span class="badge badge-info badge-pill"><span t-field="opportunity.probability"/>%</span>
                                 </h5>
                                 <button type="button" data-toggle="modal" data-target=".modal_edit_opp" class="btn btn-link btn-sm"><i class="fa fa-pencil mr-1"/>Edit</button>
@@ -633,7 +633,7 @@
                                                             <div class="input-group-prepend">
                                                                 <div class="input-group-text"><span class="text-nowrap" t-esc="opportunity.company_currency.symbol"/></div>
                                                             </div>
-                                                            <input type="text" name="planned_revenue" class="form-control planned_revenue" t-att-value="opportunity.planned_revenue" placeholder="Planned Revenue"/>
+                                                            <input type="text" name="expected_revenue" class="form-control expected_revenue" t-att-value="opportunity.expected_revenue" placeholder="Planned Revenue"/>
                                                         </div>
                                                     </div>
                                                     <div class="col-auto">at</div>