diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py
index c1cbdbeb15f65..d22a6bf69d071 100644
--- a/odoo/addons/base/models/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
@@ -205,11 +205,13 @@ def default_get(self, default_fields):
     partner_latitude = fields.Float(string='Geo Latitude', digits=(10, 7))
     partner_longitude = fields.Float(string='Geo Longitude', digits=(10, 7))
     email = fields.Char()
-    email_formatted = fields.Char(
-        'Formatted Email', compute='_compute_email_formatted',
+    email_formatted = fields.Char('Formatted Email', compute='_compute_email_formatted',
         help='Format email address "Name <email@domain>"')
     phone = fields.Char()
     mobile = fields.Char()
+    primary_phone = fields.Selection(
+        string="Primary Phone", selection=[("phone", "Phone"), ("mobile", "Mobile")], required=True)
+    primary_phone_number = fields.Char(string='Primary Phone', compute='_compute_primary_phone_number', readonly=True)
     is_company = fields.Boolean(string='Is a Company', default=False,
         help="Check if the contact is a company, otherwise it is a person")
     industry_id = fields.Many2one('res.partner.industry', 'Industry')
@@ -242,6 +244,20 @@ def default_get(self, default_fields):
         ('check_name', "CHECK( (type='contact' AND name IS NOT NULL) or (type!='contact') )", 'Contacts require a name'),
     ]
 
+    @api.depends('primary_phone', 'phone', 'mobile')
+    def _compute_primary_phone_number(self):
+        for partner_id in self:
+            if partner_id.primary_phone:
+                if partner_id.primary_phone == 'phone':
+                    partner_id.primary_phone_number = "Primary Phone is %s" %partner_id.phone
+                elif partner_id.primary_phone == 'mobile':
+                    partner_id.primary_phone_number = "Primary Phone is %s" %partner_id.mobile
+            else:
+                partner_id.primary_phone_number = ""
+
+            if partner_id.primary_phone_number == "Primary Phone is False":
+                partner_id.primary_phone_number = ""
+
     @api.depends('name', 'user_ids.share', 'image_1920', 'is_company', 'type')
     def _compute_avatar_1920(self):
         super()._compute_avatar_1920()
diff --git a/odoo/addons/base/views/ir_actions_views.xml b/odoo/addons/base/views/ir_actions_views.xml
index 4f0b81b6ac87d..3317a228c7987 100644
--- a/odoo/addons/base/views/ir_actions_views.xml
+++ b/odoo/addons/base/views/ir_actions_views.xml
@@ -417,10 +417,10 @@ env['res.partner'].create({'name': partner_name})
             <field name="name">Config Wizard Steps</field>
             <field name="arch" type="xml">
                 <form string="Config Wizard Steps">
-                  <header>
+                    <header>
                         <button name="action_launch"
                             states="open" string="Launch"
-                            type="object" icon="fa-cogs" class="oe_highlight" 
+                            type="object" icon="fa-cogs" class="oe_highlight"
                             help="Launch Configuration Wizard"/>
                         <button name="action_open" states="done"
                             string="Set as Todo" type="object"
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index d498086ea4fcd..32de8e21f33a8 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -209,16 +209,18 @@
                         <group>
                             <field name="function" placeholder="e.g. Sales Director"
                                 attrs="{'invisible': [('is_company','=', True)]}"/>
-                            <field name="phone" widget="phone"/>
-                            <field name="mobile" widget="phone"/>
+                            <field name="phone" widget="phone" attrs="{'required': [('primary_phone','=', 'phone'),('primary_phone_number','=','')]}"/>
+                            <field name="mobile" widget="phone" attrs="{'required': [('primary_phone','=', 'mobile'),('primary_phone_number','=','')]}"/>
+                            <field name="primary_phone" class="oe_edit_only"/>
+                            <field name="primary_phone_number"  class="oe_inline" attrs="{'invisible': [('primary_phone_number','=','')]}"
+                                   style="color: green"/>
                             <field name="user_ids" invisible="1"/>
-                            <field name="email" widget="email" context="{'gravatar_image': True}" attrs="{'required': [('user_ids','!=', [])]}"/>
+                            <field name="email" widget="email" context="{'gravatar_image': True}" attrs="{'required': [('user_ids','!=',[])]}"/>
                             <field name="website" string="Website" widget="url" placeholder="e.g. https://www.odoo.com"/>
-                            <field name="title" options='{"no_open": True}' placeholder="e.g. Mister"
-                                attrs="{'invisible': [('is_company', '=', True)]}"/>
+                            <field name="title" options='{"no_open": True}' placeholder="e.g. Mister" attrs="{'invisible': [('is_company', '=', True)]}"/>
                             <field name="active_lang_count" invisible="1"/>
-                            <label for="lang" attrs="{'invisible': [('active_lang_count', '&lt;=', 1)]}"/>
-                            <div class="o_row" attrs="{'invisible': [('active_lang_count', '&lt;=', 1)]}">
+                            <label for="lang" attrs="{'invisible': [('active_lang_count','&lt;=',1)]}"/>
+                            <div class="o_row" attrs="{'invisible': [('active_lang_count','&lt;=',1)]}">
                                 <field name="lang"/>
                                 <button
                                     type="action"