From ad5b2a277b7782b4db555a41d2fe65032c5a4f74 Mon Sep 17 00:00:00 2001
From: Dossogne Bertrand <bedo@odoo.com>
Date: Tue, 10 May 2022 10:20:53 +0000
Subject: [PATCH] [IMP] hr_recruitment: improve reports clarity

This commit aims to improve the recruitment reports clarity,
particularly the confusion between source and medium

TaskID : 2837445

closes odoo/odoo#90975

Related: odoo/enterprise#27148
Signed-off-by: Kevin Baptiste <kba@odoo.com>
---
 .../hr_recruitment/models/hr_recruitment.py   |  1 +
 .../views/hr_recruitment_views.xml            | 54 ++++++++++++-------
 .../models/hr_recruitment.py                  |  2 +-
 3 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py
index dd9d5b6758e..a7d2f2917bc 100644
--- a/addons/hr_recruitment/models/hr_recruitment.py
+++ b/addons/hr_recruitment/models/hr_recruitment.py
@@ -29,6 +29,7 @@ class RecruitmentSource(models.Model):
     has_domain = fields.Char(compute='_compute_has_domain')
     job_id = fields.Many2one('hr.job', "Job", ondelete='cascade')
     alias_id = fields.Many2one('mail.alias', "Alias ID")
+    medium_id = fields.Many2one('utm.medium', default=lambda self: self.env.ref('utm.utm_medium_website'))
 
     def _compute_has_domain(self):
         self.has_domain = bool(self.env["ir.config_parameter"].sudo().get_param("mail.catchall.domain"))
diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml
index f0e16ea1cf8..8fd69b2f930 100644
--- a/addons/hr_recruitment/views/hr_recruitment_views.xml
+++ b/addons/hr_recruitment/views/hr_recruitment_views.xml
@@ -144,8 +144,8 @@
                         <field name="user_id" widget="many2one_avatar_user"/>
                         <field name="date_closed" attrs="{'invisible': [('date_closed', '=', False)]}" />
                         <field name="priority" widget="priority"/>
-                        <field name="medium_id" groups="base.group_no_one" />
                         <field name="source_id"/>
+                        <field name="medium_id"/>
                     </group>
                     <group string="Job">
                         <field name="job_id"/>
@@ -994,23 +994,13 @@
             <tree string="Sources of Applicants" editable="top" class="o_recruitment_list" sample="1">
                 <field name="has_domain" invisible="1"/>
                 <field name="source_id" placeholder="e.g. LinkedIn" decoration-bf="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="medium_id" optional="hidden"/>
                 <field name="job_id" attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="email" attrs="{'invisible': [('email', '=', False)]}" widget="email"/>
                 <button name="create_alias" string="Generate Email" class="btn btn-primary" type="object" attrs="{'invisible': ['|', ('has_domain', '=', False), ('email', '!=', False)]}"/>
             </tree>
         </field>
     </record>
-    <record id="hr_recruitment_source_action" model="ir.actions.act_window">
-        <field name="name">Sources of Applicants</field>
-        <field name="res_model">hr.recruitment.source</field>
-    </record>
-
-    <menuitem
-        id="menu_hr_recruitment_source"
-        parent="menu_hr_recruitment_config_applications"
-        action="hr_recruitment_source_action"
-        groups="base.group_no_one"
-        sequence="15"/>
 
     <record id="hr_applicant_action_from_department" model="ir.actions.act_window">
         <field name="name">New Applications</field>
@@ -1048,14 +1038,15 @@
     </record>
 
     <record id="hr_applicant_view_pivot" model="ir.ui.view">
-         <field name="name">hr.applicant.pivot</field>
-         <field name="model">hr.applicant</field>
-         <field name="arch" type="xml">
-             <pivot string="Recruitment Analysis" sample="1">
-                 <field name="stage_id" type="row"/>
-                 <field name="job_id" type="col"/>
-             </pivot>
-         </field>
+        <field name="name">hr.applicant.pivot</field>
+        <field name="model">hr.applicant</field>
+        <field name="arch" type="xml">
+            <pivot string="Recruitment Analysis" sample="1">
+                <field name="stage_id" type="row"/>
+                <field name="job_id" type="col"/>
+                <field name="name"/>
+            </pivot>
+        </field>
     </record>
 
     <record id="hr_applicant_view_graph" model="ir.ui.view">
@@ -1197,5 +1188,28 @@
         <field name="context">{'group_by': ['create_date:month', 'department_id']}</field>
     </record>
 
+    <menuitem
+        id="menu_hr_recruitment_utm"
+        parent="menu_hr_recruitment_configuration"
+        name="UTMs"
+        groups="base.group_no_one"
+        sequence="15"/>
+
+    <menuitem
+        id="menu_hr_recruitment_utm_sources"
+        parent="menu_hr_recruitment_utm"
+        name="Sources"
+        action="utm.utm_source_action"
+        groups="base.group_no_one"
+        sequence="15"/>
+
+    <menuitem
+        id="menu_hr_recruitment_utm_mediums"
+        parent="menu_hr_recruitment_utm"
+        name="Mediums"
+        action="utm.utm_medium_action"
+        groups="base.group_no_one"
+        sequence="15"/>
+
     </data>
 </odoo>
diff --git a/addons/website_hr_recruitment/models/hr_recruitment.py b/addons/website_hr_recruitment/models/hr_recruitment.py
index 4940b8d2832..45de00a1f24 100644
--- a/addons/website_hr_recruitment/models/hr_recruitment.py
+++ b/addons/website_hr_recruitment/models/hr_recruitment.py
@@ -20,7 +20,7 @@ class RecruitmentSource(models.Model):
                 source.job_id.website_url,
                 urls.url_encode({
                     'utm_campaign': self.env.ref('hr_recruitment.utm_campaign_job').name,
-                    'utm_medium': self.env.ref('utm.utm_medium_website').name,
+                    'utm_medium': source.medium_id.name or self.env.ref('utm.utm_medium_website').name,
                     'utm_source': source.source_id.name
                 })
             ))