From b28aae2a711c8281cdcac1bd9332a047dba5c7fa Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Mon, 1 Mar 2021 09:21:11 +0000
Subject: [PATCH 1/6] [IMP] website_crm_partner_assign: add data, action helper
 and rename menu

- For sake of having basic config for 'Partner Level' and 'Activation'
  in contact form view (until user discovers the dedicated menus under
  CRM > Configuration > Resellers) in blank db, this commit moves the
  demo data related to 'Partner Level' to data, and adds new data for
  'Activation', in following sequence:

  - Fully-Operation
  - Ramp-up
  - First Contact

  Also, higher ranks for partner level and activation are considered
  better, and so the tree views for them now display the records in
  the order of their rank (highest on top).

  Note that with this commit, we remove 'Platinum' partner level and
  it's references that were available in demo data.

- Apart from that in this commit we have also done these changes,
  - Renames the menu 'Partner Level' to 'Partner Levels' and adds
    action helper for the same.
  - Adds action helper for the 'Partner Activations' menu.

TaskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 .../__manifest__.py                           |  2 +
 .../data/res_partner_activation_data.xml      | 15 +++++++
 .../data/res_partner_demo.xml                 | 44 ++++---------------
 .../data/res_partner_grade_data.xml           | 15 +++++++
 .../data/res_partner_grade_demo.xml           | 13 ++----
 .../models/res_partner.py                     |  4 +-
 .../views/res_partner_views.xml               | 16 ++++++-
 7 files changed, 61 insertions(+), 48 deletions(-)
 create mode 100644 addons/website_crm_partner_assign/data/res_partner_activation_data.xml
 create mode 100644 addons/website_crm_partner_assign/data/res_partner_grade_data.xml

diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py
index aec9cf1600c..0bd6dbba40c 100644
--- a/addons/website_crm_partner_assign/__manifest__.py
+++ b/addons/website_crm_partner_assign/__manifest__.py
@@ -27,6 +27,8 @@ The automatic assignment is figured from the weight of partner levels and the ge
         'data/crm_lead_merge_template.xml',
         'data/crm_tag_data.xml',
         'data/mail_template_data.xml',
+        'data/res_partner_activation_data.xml',
+        'data/res_partner_grade_data.xml',
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
         'wizard/crm_forward_to_partner_view.xml',
diff --git a/addons/website_crm_partner_assign/data/res_partner_activation_data.xml b/addons/website_crm_partner_assign/data/res_partner_activation_data.xml
new file mode 100644
index 00000000000..c75cfe10494
--- /dev/null
+++ b/addons/website_crm_partner_assign/data/res_partner_activation_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="res_partner_activation_data_fully_operational" model="res.partner.activation">
+        <field name="name">Fully Operational</field>
+        <field name="sequence">3</field>
+    </record>
+    <record id="res_partner_activation_data_ramp_up" model="res.partner.activation">
+        <field name="name">Ramp-up</field>
+        <field name="sequence">2</field>
+    </record>
+    <record id="res_partner_activation_data_first_contact" model="res.partner.activation">
+        <field name="name">First Contact</field>
+        <field name="sequence">1</field>
+    </record>
+</odoo>
diff --git a/addons/website_crm_partner_assign/data/res_partner_demo.xml b/addons/website_crm_partner_assign/data/res_partner_demo.xml
index dde9e124af6..1cf8ecd345e 100644
--- a/addons/website_crm_partner_assign/data/res_partner_demo.xml
+++ b/addons/website_crm_partner_assign/data/res_partner_demo.xml
@@ -1,70 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
-        <record id="res_partner_grade_platinium" model="res.partner.grade">
-            <field name="name">Platinum</field>
-            <field name="sequence">4</field>
-        </record>
-        <record id="res_partner_grade_gold" model="res.partner.grade">
-            <field name="name">Gold</field>
-            <field name="sequence">3</field>
-        </record>
-        <record id="res_partner_grade_silver" model="res.partner.grade">
-            <field name="name">Silver</field>
-            <field name="sequence">2</field>
-        </record>
-        <record id="res_partner_grade_bronze" model="res.partner.grade">
-            <field name="name">Bronze</field>
-            <field name="sequence">1</field>
-        </record>
-
         <record id="base.res_partner_3" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
         <record model="res.partner" id="base.res_partner_2">
             <field name="assigned_partner_id" ref="base.res_partner_3"/>
         </record>
        <record id="base.res_partner_4" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_bronze"/>
+            <field name="grade_id" ref="res_partner_grade_data_bronze"/>
             <field name="partner_weight">10</field>
         </record>
 
         <record id="base.res_partner_3" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_silver"/>
+            <field name="grade_id" ref="res_partner_grade_data_silver"/>
             <field name="partner_weight">10</field>
         </record>
 
         <record id="base.res_partner_10" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_18" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
         <record id="base.res_partner_1" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_gold"/>
-            <field name="partner_weight">10</field>
-        </record>
-
-        <record id="base.res_partner_12" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_platinium"/>
-            <field name="partner_weight">10</field>
-        </record>
-        <record id="base.res_partner_4" model="res.partner">
-            <field name="grade_id" ref="res_partner_grade_platinium"/>
+            <field name="grade_id" ref="res_partner_grade_data_gold"/>
             <field name="partner_weight">10</field>
         </record>
 
diff --git a/addons/website_crm_partner_assign/data/res_partner_grade_data.xml b/addons/website_crm_partner_assign/data/res_partner_grade_data.xml
new file mode 100644
index 00000000000..86b774a91e0
--- /dev/null
+++ b/addons/website_crm_partner_assign/data/res_partner_grade_data.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="res_partner_grade_data_gold" model="res.partner.grade">
+        <field name="name">Gold</field>
+        <field name="sequence">3</field>
+    </record>
+    <record id="res_partner_grade_data_silver" model="res.partner.grade">
+        <field name="name">Silver</field>
+        <field name="sequence">2</field>
+    </record>
+    <record id="res_partner_grade_data_bronze" model="res.partner.grade">
+        <field name="name">Bronze</field>
+        <field name="sequence">1</field>
+    </record>
+</odoo>
diff --git a/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
index c12607f0cbf..c04c1b22036 100644
--- a/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
+++ b/addons/website_crm_partner_assign/data/res_partner_grade_demo.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo>
     <data noupdate="1">
-        <record id="website_crm_partner_assign.res_partner_grade_platinium" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_gold" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_gold" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_silver" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_silver" model="res.partner.grade">
+        <record id="website_crm_partner_assign.res_partner_grade_data_bronze" model="res.partner.grade">
             <field name="is_published" eval="True" />
         </record>
-        <record id="website_crm_partner_assign.res_partner_grade_bronze" model="res.partner.grade">
-            <field name="is_published" eval="True" />
-        </record>
-        <record id="base.partner_demo_portal" model="res.partner">
-            <field name="grade_id" ref="website_crm_partner_assign.res_partner_grade_platinium"/>
-            <field name="partner_weight">10</field>
-        </record>
     </data>
 </odoo>
diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index 8790859f0c5..8e7bc8a0fa6 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -7,7 +7,7 @@ from odoo.addons.http_routing.models.ir_http import slug
 
 class ResPartnerGrade(models.Model):
     _name = 'res.partner.grade'
-    _order = 'sequence'
+    _order = 'sequence desc'
     _inherit = ['website.published.mixin']
     _description = 'Partner Grade'
 
@@ -28,7 +28,7 @@ class ResPartnerGrade(models.Model):
 
 class ResPartnerActivation(models.Model):
     _name = 'res.partner.activation'
-    _order = 'sequence'
+    _order = 'sequence desc'
     _description = 'Partner Activation'
 
     sequence = fields.Integer('Sequence')
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
index 61555b7c5c7..a5995d04b61 100644
--- a/addons/website_crm_partner_assign/views/res_partner_views.xml
+++ b/addons/website_crm_partner_assign/views/res_partner_views.xml
@@ -34,6 +34,13 @@
             <field name="name">Partner Activations</field>
             <field name="res_model">res.partner.activation</field>
             <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+               <p class="o_view_nocontent_smiling_face">
+                  Create a Partner Activation
+               </p><p>
+                  Those are used to know where your Partners stand in your onboarding process.
+               </p>
+            </field>
         </record>
 
         <menuitem id="res_partner_activation_config_mi" parent="crm_menu_resellers" action="res_partner_activation_act"
@@ -90,9 +97,16 @@
     </record>
 
     <record id="res_partner_grade_action" model="ir.actions.act_window">
-        <field name="name">Partner Level</field>
+        <field name="name">Partner Levels</field>
         <field name="res_model">res.partner.grade</field>
         <field name="search_view_id" ref="res_partner_grade_view_search"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a Partner Level
+            </p><p>
+                Partner Levels allow you to rank your Partners based on their performances.
+            </p>
+        </field>
     </record>
 
     <menuitem action="res_partner_grade_action" id="menu_res_partner_grade_action"

From 433bc7474eb64c0a914cd88eca9dc444971e2737 Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Mon, 1 Mar 2021 10:30:27 +0000
Subject: [PATCH 2/6] [IMP] website_crm_partner_assign: improve 'Partner
 Assignment' and creation

- This commit removes `selection` widget given on 'Partner Level'
  and 'Activation' fields on contact form view to allow users to
  create records for them on the fly (with 'no_open' option).

- This commit moves geo-location related fields below the parter assignment
  related fields in the 'Partner Assignment' page of contact form view.

- This commit adds default lowest 'Partner Level' and 'Activation' (based on
  sequence) while creating assigned partner on the fly from opportunity form
  view. The purpose is to allow user to select the created partner again in
  'Assigned Partner' m2o, which displays only partners having 'Partner Level'
  (grade_id) set.

TaskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 .../website_crm_partner_assign/models/res_partner.py | 12 ++++++++++++
 .../views/crm_lead_views.xml                         |  2 +-
 .../views/res_partner_views.xml                      |  8 ++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index 8e7bc8a0fa6..264f8f9ff1e 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -38,6 +38,18 @@ class ResPartnerActivation(models.Model):
 class ResPartner(models.Model):
     _inherit = "res.partner"
 
+    @api.model
+    def default_get(self, fields_list):
+        default_vals = super().default_get(fields_list)
+        if self.env.context.get('partner_set_default_grade_activation'):
+            # sets the lowest grade and activation if no default values given, mainly useful while
+            # creating assigned partner on the fly (to make it visible in same m2o again)
+            if 'grade_id' in fields_list and not default_vals.get('grade_id'):
+                default_vals['grade_id'] = self.env['res.partner.grade'].search([], order='sequence', limit=1).id
+            if 'activation' in fields_list and not default_vals.get('activation'):
+                default_vals['activation'] = self.env['res.partner.activation'].search([], order='sequence', limit=1).id
+        return default_vals
+
     partner_weight = fields.Integer(
         'Level Weight', compute='_compute_partner_weight',
         readonly=False, store=True, tracking=True,
diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 4645c09afda..09792280f13 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -21,7 +21,7 @@
                             </div>
                             <button string="Automatic Assignment" name="action_assign_partner" type="object" class="btn-link"/>
 
-                            <field name="partner_assigned_id" domain="[('grade_id','!=',False)]"/>
+                            <field name="partner_assigned_id" domain="[('grade_id','!=',False)]" context="{'partner_set_default_grade_activation': 1}"/>
                             <button string="Send Email" type="action" class="btn-link"
                                 attrs="{'invisible':[('partner_assigned_id','=',False)]}"
                                 name="%(crm_lead_forward_to_partner_act)d"
diff --git a/addons/website_crm_partner_assign/views/res_partner_views.xml b/addons/website_crm_partner_assign/views/res_partner_views.xml
index a5995d04b61..17b18fbc62c 100644
--- a/addons/website_crm_partner_assign/views/res_partner_views.xml
+++ b/addons/website_crm_partner_assign/views/res_partner_views.xml
@@ -144,12 +144,12 @@
         <field name="inherit_id" ref="base_geolocalize.view_crm_partner_geo_form"/>
         <field name="arch" type="xml">
             <data>
-                <xpath expr="//page[@name='geo_location']" position="inside">
-                    <group>
+                <xpath expr="//page[@name='geo_location']/group" position="before">
+                    <group name="group_partner_activation_review">
                         <group>
                             <separator string="Partner Activation" colspan="2"/>
-                            <field name="grade_id" options="{'no_open': True, 'no_create': True}"/>
-                            <field name="activation" options="{'no_open': True, 'no_create': True}"/>
+                            <field name="grade_id" options="{'no_open': True}"/>
+                            <field name="activation" options="{'no_open': True}"/>
                             <field name="partner_weight"/>
                         </group>
                         <group>

From 308ebb2a2cdf095ca8a67008c34da50f83040357 Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Tue, 2 Mar 2021 13:23:42 +0000
Subject: [PATCH 3/6] [IMP] website_crm_partner_assign: show assigned partner
 on opportunity kanban
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit display the assigned parter on kanban view of opportunities next
to the partner (if assigned parter is set). For example, if the customer name
is 'Main Contact' and assigned partner's name is 'Assigned Contact', it will
appear in following format:

Main Contact → Assigned Contact

If there is no customer and only assignd parner, it will look like

→ Assigned Contact

Note that if there is only customer, or no assigned partner and no customer,
nothing changes in the view.

taskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 .../views/crm_lead_views.xml                  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/addons/website_crm_partner_assign/views/crm_lead_views.xml b/addons/website_crm_partner_assign/views/crm_lead_views.xml
index 09792280f13..cf8ed757853 100644
--- a/addons/website_crm_partner_assign/views/crm_lead_views.xml
+++ b/addons/website_crm_partner_assign/views/crm_lead_views.xml
@@ -136,4 +136,26 @@
                 </xpath>
             </field>
         </record>
+
+        <record id="crm_lead_view_kanban" model="ir.ui.view">
+            <field name="name">crm.lead.view.kanban.inherit.website.crm.partner.assign</field>
+            <field name="model">crm.lead</field>
+            <field name="inherit_id" ref="crm.crm_case_kanban_view_leads"/>
+            <field name="arch" type="xml">
+                <field name="user_id" position="after">
+                    <field name="partner_assigned_id"/>
+                </field>
+                <xpath expr="//span[@t-esc='record.partner_id.value']" position="replace">
+                    <t t-if="record.partner_id.value or record.partner_assigned_id.value">
+                        <span class="o_text_overflow">
+                            <t t-esc="record.partner_id.value"/>
+                            <t t-if="record.partner_assigned_id.value">
+                                <i class="fa fa-arrow-circle-right" aria-label="Arrow icon" title="Arrow"/>
+                                <t t-esc="record.partner_assigned_id.value"/>
+                            </t>
+                        </span>
+                    </t>
+                </xpath>
+            </field>
+        </record>
 </odoo>

From d361d4948150edc675c2c2cd1cd2565b625ea2db Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Wed, 3 Mar 2021 06:35:50 +0000
Subject: [PATCH 4/6] [IMP] website_crm_partner_assign: improve opportunity
 front-end page

This commit improves the following:
 - Hides the icons under the 'Contact' section if the related
   information is not available.
 - Moves the 'Next Activity Date' next to 'Next Activity' on
   opportunity edition dialog, and opens the date-picker to
   schedule next activity below the input instead of above it.
 - Increased the height of 'Details Next Activity' textarea so
   that 'Next Activity Date' picker can be shown within the modal
   without introducing scroll-bar.
 - This commit renames the label 'Title' to 'Opportunity' to avoid
   confusion, and auto-fills it based on the 'Contact Name' for the
   modal that is used for creating opportunities from front-end.

   Apart from that, this commit also improves string of the button
   responsible to create new opportunity from front-end.

TaskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 .../static/src/js/crm_partner_assign.js       | 19 +++--
 .../website_crm_partner_assign_templates.xml  | 71 ++++++++++---------
 2 files changed, 51 insertions(+), 39 deletions(-)

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 e43d1430579..2f3974807ba 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
@@ -1,6 +1,7 @@
 odoo.define('crm.partner_assign', function (require) {
 'use strict';
 
+const {_t} = require('web.core');
 var publicWidget = require('web.public.widget');
 var time = require('web.time');
 
@@ -15,6 +16,7 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
         'click .new_opp_confirm': '_onNewOppConfirm',
         'click .edit_opp_confirm': '_onEditOppConfirm',
         'change .edit_opp_form .next_activity': '_onChangeNextActivity',
+        'change #new-opp-dialog .contact_name': '_onChangeContactName',
         'click div.input-group.date[data-target-input="nearest"]': '_onCalendarInputGroupClick',
     },
 
@@ -229,6 +231,17 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
         ev.stopPropagation();
         this._buttonExec($(ev.currentTarget), this._editOpportunity);
     },
+    /**
+     * @private
+     * @param {Event} ev
+     */
+    _onChangeContactName: function (ev) {
+        const contactName = ev.currentTarget.value.trim();
+        let titleEl = this.el.querySelector('.title');
+        if (!titleEl.value.trim()) {
+            titleEl.value = contactName ? _.str.sprintf(_t("%s's Opportunity"), contactName) : '';
+        }
+    },
     /**
      * @private
      * @param {Event} ev
@@ -259,12 +272,6 @@ publicWidget.registry.crmPartnerAssign = publicWidget.Widget.extend({
                 down: 'fa fa-chevron-down',
             },
         };
-        // in some screen sizes, the automatic position opens the picker below input,
-        // but because #next_activity_div is the last element, we always open the
-        // picker on top the input to prevent extra scroll
-        if ($calendarInputGroup.is('#next_activity_div')) {
-            calendarOptions.widgetPositioning = {vertical: 'top'};
-        }
         $calendarInputGroup.datetimepicker(calendarOptions);
     },
 
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 796dae42fff..72b4fdbf243 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
@@ -254,7 +254,7 @@
 
                 <div class="form-inline ml-lg-4" t-if="request.env.user.partner_id.grade_id or request.env.user.commercial_partner_id.grade_id">
                     <button class="btn btn-success btn-sm" name='new_opp' data-toggle="modal" data-target=".modal_new_opp" title="Add an opportunity" aria-label="Add an opportunity">
-                        <i class="fa fa-plus"/> Create New
+                        Create Opportunity
                     </button>
                 </div>
             </t>
@@ -273,7 +273,7 @@
                                 <input type='text' name="contact_name" class="form-control contact_name"/>
                             </div>
                             <div class="form-group">
-                                <label class="col-form-label h4dd" for="title">Title</label>
+                                <label class="col-form-label h4dd" for="title">Opportunity</label>
                                 <input type='text' name="title" class="form-control title"/>
                             </div>
                             <div class="form-group">
@@ -569,31 +569,29 @@
                             <div class="row mb-3" t-if="opportunity.partner_name or opportunity.email_from or opportunity.contact_name">
                                 <strong class="col-12 col-sm-3">Customer</strong>
                                 <div class="col">
-                                    <div>
+                                    <div t-if="opportunity.partner_name or opportunity.contact_name">
                                         <span class="fa fa-user fa-fw" role="img" aria-label="User" title="User"/>
                                         <strong class="font-italic" t-if="opportunity.partner_name" itemprop="name" t-field="opportunity.partner_name" />
                                         <strong class="font-italic" t-else="" itemprop="name" t-field="opportunity.contact_name" />
                                     </div>
-                                    <div>
+                                    <div t-if="opportunity.phone">
                                         <span class="fa fa-phone fa-fw" role="img" aria-label="Phone" title="Phone"/>
-                                        <span t-if="opportunity.phone" itemprop="telephone" t-field="opportunity.phone"/>
-                                        <span t-else="" class="text-muted"> - </span>
+                                        <span itemprop="telephone" t-field="opportunity.phone"/>
                                     </div>
-                                    <div>
+                                    <div t-if="opportunity.mobile">
                                         <span class="fa fa-mobile fa-fw" role="img" aria-label="Mobile" title="Mobile"/>
-                                        <span t-if="opportunity.mobile" itemprop="mobile" t-field="opportunity.mobile"/>
-                                        <span t-else="" class="text-muted"> - </span>
+                                        <span itemprop="mobile" t-field="opportunity.mobile"/>
                                     </div>
-                                    <div>
+                                    <div t-if="opportunity.email_from">
                                         <span class="fa fa-envelope fa-fw" role="img" aria-label="Email" title="Email"/>
-                                        <span t-if="opportunity.email_from" itemprop="email" t-field="opportunity.email_from"/>
-                                        <span t-else="" class="text-muted"> - </span>
+                                        <span itemprop="email" t-field="opportunity.email_from"/>
                                     </div>
                                 </div>
                             </div>
                             <div class="row">
                                 <strong class="col-12 col-sm-3">Address</strong>
-                                <address class="col d-flex align-items-baseline mb-0">
+                                <address t-if="opportunity.street or opportunity.street2 or opportunity.city or opportunity.zip or opportunity.state_id or opportunity.country_id"
+                                    class="col d-flex align-items-baseline mb-0">
                                     <span class="fa fa-map-marker fa-fw" role="img" aria-label="Address" title="Address"/>
                                     <div>
                                         <div t-if="opportunity.street"><span t-field="opportunity.street"/></div>
@@ -602,7 +600,7 @@
                                         <div t-if="opportunity.city or opportunity.zip">
                                             <span t-field="opportunity.city"/> <span t-field="opportunity.zip"/>
                                         </div>
-                                        <div t-if="opportunity.state_id or country_id">
+                                        <div t-if="opportunity.state_id or opportunity.country_id">
                                             <span t-field="opportunity.state_id"/> <span t-field="opportunity.country_id"/>
                                         </div>
                                     </div>
@@ -684,28 +682,35 @@
                                                 </div>
                                             </div>
                                             <div class="form-group">
-                                                <label class="col-form-label" for="next_activity">Next Activity</label>
-                                                <select class="form-control next_activity" name="next_activity">
-                                                    <t t-foreach="activity_types" t-as="activity_type">
-                                                        <option t-att-data="activity_type.id" t-att-selected="activity_type.id == user_activity.activity_type_id.id" t-att-name="activity_type.name" t-att-delay_count="activity_type.delay_count" t-att-delay_unit="activity_type.delay_unit" t-att-summary="activity_type.summary"><t t-esc="activity_type.name"/></option>
-                                                    </t>
-                                                </select>
+                                                <div class="row">
+                                                    <div class="col-md-5">
+                                                        <label class="col-form-label" for="next_activity">Next Activity</label>
+                                                        <select class="form-control next_activity" name="next_activity">
+                                                            <t t-foreach="activity_types" t-as="activity_type">
+                                                                <option t-att-data="activity_type.id" t-att-selected="activity_type.id == user_activity.activity_type_id.id"
+                                                                    t-att-name="activity_type.name" t-att-delay_count="activity_type.delay_count"
+                                                                    t-att-delay_unit="activity_type.delay_unit" t-att-summary="activity_type.summary">
+                                                                <t t-esc="activity_type.name"/></option>
+                                                            </t>
+                                                        </select>
+                                                    </div>
+                                                    <div class="col-md-7">
+                                                        <label class="col-form-label" for="activity_date_deadline">Next Activity Date</label>
+                                                        <div class="input-group date" id="next_activity_div" data-target-input="nearest">
+                                                            <t t-set='date_formatted'><t t-options='{"widget": "date"}' t-esc="user_activity.date_deadline"/></t>
+                                                            <input type="text" name="activity_date_deadline" data-target="#next_activity_div" t-att-value="date_formatted" class="form-control activity_date_deadline datetimepicker-input" t-att-name="prefix"/>
+                                                            <div class="input-group-append" data-target="#next_activity_div" data-toggle="datetimepicker">
+                                                                <span class="input-group-text">
+                                                                    <span class="fa fa-calendar" role="img" aria-label="Calendar" title="Calendar"></span>
+                                                                </span>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
                                             </div>
                                             <div class="form-group">
                                                 <label class="col-form-label" for="activity_summary">Details Next Activity</label>
-                                                <textarea rows="3" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea>
-                                            </div>
-                                            <div class="form-group">
-                                                <label class="col-form-label" for="activity_date_deadline">Next Activity Date</label>
-                                                <div class="input-group date" id="next_activity_div" data-target-input="nearest">
-                                                    <t t-set='date_formatted'><t t-options='{"widget": "date"}' t-esc="user_activity.date_deadline"/></t>
-                                                    <input type="text" name="activity_date_deadline" data-target="#next_activity_div" t-att-value="date_formatted" class="form-control activity_date_deadline datetimepicker-input" t-att-name="prefix"/>
-                                                    <div class="input-group-append" data-target="#next_activity_div" data-toggle="datetimepicker">
-                                                        <span class="input-group-text">
-                                                            <span class="fa fa-calendar" role="img" aria-label="Calendar" title="Calendar"></span>
-                                                        </span>
-                                                    </div>
-                                                </div>
+                                                <textarea rows="6" name="activity_summary" class="form-control activity_summary"><t t-esc="user_activity.summary"/></textarea>
                                             </div>
                                         </main>
                                         <footer class="modal-footer">

From 5f2dc97e1c05f13de88355fd6255973a70bc4a93 Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Thu, 4 Mar 2021 13:04:09 +0000
Subject: [PATCH 5/6] [IMP] website_crm_partner_assign: consider assigned
 partner for stat button

Currently the 'Opportunities' stat button on partner form view does not show
the opportunities where current partner is assigned one, it only shows the
ones that have current partner(and it's children) set as a customer.

This commit includes such opportunities (where current partner is set as
assigned parter) in the count of stat button and on the view we get when
clicking this button.

taskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 .../models/res_partner.py                      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/addons/website_crm_partner_assign/models/res_partner.py b/addons/website_crm_partner_assign/models/res_partner.py
index 264f8f9ff1e..f43ca2b6bf6 100644
--- a/addons/website_crm_partner_assign/models/res_partner.py
+++ b/addons/website_crm_partner_assign/models/res_partner.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo import api, fields, models
+from odoo.osv import expression
 from odoo.addons.http_routing.models.ir_http import slug
 
 
@@ -79,3 +80,20 @@ class ResPartner(models.Model):
     def _compute_partner_weight(self):
         for partner in self:
             partner.partner_weight = partner.grade_id.partner_weight if partner.grade_id else 0
+
+    def _compute_opportunity_count(self):
+        super()._compute_opportunity_count()
+        assign_counts = {}
+        if self.ids:
+            opportunity_data = self.env['crm.lead'].with_context(active_test=False).read_group(
+                [('partner_assigned_id', 'in', self.ids)],
+                ['partner_assigned_id'], ['partner_assigned_id']
+            )
+            assign_counts = {datum['partner_assigned_id'][0]: datum['partner_assigned_id_count'] for datum in opportunity_data}
+        for partner in self:
+            partner.opportunity_count += assign_counts.get(partner.id, 0)
+
+    def action_view_opportunity(self):
+        action = super().action_view_opportunity()
+        action['domain'] = expression.OR([action.get('domain', []), [('partner_assigned_id', '=', self.id)]])
+        return action

From c557dbacd10f123b72f297e75cc171be0e9e1357 Mon Sep 17 00:00:00 2001
From: ijas ahammed <ija@odoo.com>
Date: Tue, 6 Apr 2021 05:04:01 +0000
Subject: [PATCH 6/6] [IMP] base_geolocalize,website_crm_partner_assign: show a
 toaster message

- Right now, if you click on 'Geolocate' button on partner form view, and if
  partner has no address, it gives no feedback and user doesn't know what
  happend.

  With this commit, if the geolocating does not work, user will get a toast
  notification telling him that 'No address found' to avoid confusion.

- When we click on 'Automatic Assignment' button from crm form view,
  if there is no country set on lead, odoo skips the process, but we get the tag
  that 'no partner available' which is not correct. It should be
  there only when odoo actually tries to find the partner based on
  lead's country.

  This commit fixes the behavior by showing a toast notification to
  user in this case, saying 'There is no country set in address'.

TaskID-2443894
closes https://github.com/odoo/odoo/pull/67524

Part-of: odoo/odoo#67524
---
 addons/base_geolocalize/models/res_partner.py    | 14 +++++++++++++-
 .../models/crm_lead.py                           | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/addons/base_geolocalize/models/res_partner.py b/addons/base_geolocalize/models/res_partner.py
index 0367c3e07e2..95a396522fd 100644
--- a/addons/base_geolocalize/models/res_partner.py
+++ b/addons/base_geolocalize/models/res_partner.py
@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 
 
 class ResPartner(models.Model):
@@ -18,6 +18,7 @@ class ResPartner(models.Model):
 
     def geo_localize(self):
         # We need country names in English below
+        partners_not_geo_localized = self.env['res.partner']
         for partner in self.with_context(lang='en_US'):
             result = self._geo_localize(partner.street,
                                         partner.zip,
@@ -31,4 +32,15 @@ class ResPartner(models.Model):
                     'partner_longitude': result[1],
                     'date_localization': fields.Date.context_today(partner)
                 })
+            else:
+                partners_not_geo_localized |= partner
+        if partners_not_geo_localized:
+            self.env['bus.bus'].sendone(
+                (self.env.cr.dbname, 'res.partner', self.env.user.partner_id.id),
+                {'type': 'simple_notification',
+                 'title': _("Warning"),
+                 'message': _('No address found for %(partner_names)s.',
+                              partner_names=', '.join(partners_not_geo_localized.mapped('name'))
+                              )
+                 })
         return True
diff --git a/addons/website_crm_partner_assign/models/crm_lead.py b/addons/website_crm_partner_assign/models/crm_lead.py
index 4903950eff3..0376f7b9d4a 100644
--- a/addons/website_crm_partner_assign/models/crm_lead.py
+++ b/addons/website_crm_partner_assign/models/crm_lead.py
@@ -51,7 +51,21 @@ class CrmLead(models.Model):
             leads.write({'user_id': salesman_id})
 
     def action_assign_partner(self):
-        return self.assign_partner(partner_id=False)
+        """ While assigning a partner, geo-localization is performed only for leads having country
+            set (see method 'assign_geo_localize' and 'search_geo_partner'). So for leads that does not
+            have country set, we show the notification, and for the rest, we geo-localize them.
+        """
+        leads_with_country = self.filtered(lambda lead: lead.country_id)
+        leads_without_country = self - leads_with_country
+        if leads_without_country:
+            self.env['bus.bus'].sendone(
+                (self.env.cr.dbname, 'res.partner', self.env.user.partner_id.id),
+                {'type': 'simple_notification',
+                 'title': _("Warning"),
+                 'message': _('There is no country set in addresses for %(lead_names)s.',
+                              lead_names=', '.join(leads_without_country.mapped('name')))
+                 })
+        return leads_with_country.assign_partner(partner_id=False)
 
     def assign_partner(self, partner_id=False):
         partner_dict = {}