From 7f6c66bd5e662fdc58b0abe8056185178331ba40 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Wed, 29 Mar 2023 12:19:34 +0000
Subject: [PATCH 1/4] [IMP] utm: allow archiving campaigns

Allow archiving campaigns from the form and kanban views.
Add the "Archived" filter.

Task-3240966

Part-of: odoo/odoo#116230
---
 addons/utm/models/utm_campaign.py       | 1 +
 addons/utm/models/utm_mixin.py          | 2 +-
 addons/utm/tests/test_utm.py            | 8 ++++++++
 addons/utm/views/utm_campaign_views.xml | 8 ++++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/addons/utm/models/utm_campaign.py b/addons/utm/models/utm_campaign.py
index ecf5f77a73f..924a67a3214 100644
--- a/addons/utm/models/utm_campaign.py
+++ b/addons/utm/models/utm_campaign.py
@@ -9,6 +9,7 @@ class UtmCampaign(models.Model):
     _description = 'UTM Campaign'
     _rec_name = 'title'
 
+    active = fields.Boolean('Active', default=True)
     name = fields.Char(string='Campaign Identifier', required=True, compute='_compute_name',
                        store=True, readonly=False, precompute=True, translate=False)
     title = fields.Char(string='Campaign Name', required=True, translate=True)
diff --git a/addons/utm/models/utm_mixin.py b/addons/utm/models/utm_mixin.py
index 515c244826c..afb4b78b975 100644
--- a/addons/utm/models/utm_mixin.py
+++ b/addons/utm/models/utm_mixin.py
@@ -62,7 +62,7 @@ class UtmMixin(models.AbstractModel):
         """Based on the model name and on the name of the record, retrieve the corresponding record or create it."""
         Model = self.env[model_name]
 
-        record = Model.search([('name', '=', name)], limit=1)
+        record = Model.with_context(active_test=False).search([('name', '=', name)], limit=1)
 
         if not record:
             # No record found, create a new one
diff --git a/addons/utm/tests/test_utm.py b/addons/utm/tests/test_utm.py
index 5a05724061c..133490489d0 100644
--- a/addons/utm/tests/test_utm.py
+++ b/addons/utm/tests/test_utm.py
@@ -21,6 +21,14 @@ class TestUtm(TestUTMCommon):
         self.assertNotIn(source_4, source_1 | source_2)
         self.assertEqual(source_4.name, 'Source 3')
 
+    def test_find_or_create_with_archived_record(self):
+        archived_campaign = self.env['utm.campaign'].create([{
+            'active': False,
+            'name': 'Archived Campaign',
+        }])
+        campaign = self.env['utm.mixin']._find_or_create_record('utm.campaign', 'Archived Campaign')
+        self.assertEqual(archived_campaign, campaign, "An archived record must be found instead of re-created.")
+
     def test_name_generation(self):
         """Test that the name is always unique.
 
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index b86561ed3f4..cb34c83235e 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -9,6 +9,7 @@
                 <field name="tag_ids"/>
                 <field name="user_id"/>
                 <field name="is_auto_campaign"/>
+                <filter string="Archived" name="filter_inactive" domain="[('active', '=', False)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Stage" name="group_stage_id"
                         context="{'group_by': 'stage_id'}"/>
@@ -30,7 +31,9 @@
                 <sheet>
                     <div class="oe_button_box d-flex justify-content-end" name="button_box">
                     </div>
+                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/>
                     <group id="top-group">
+                        <field name="active" invisible="1"/>
                         <field class="text-break" name="title" string="Campaign Name" placeholder="e.g. Black Friday"/>
                         <field name="name" invisible="1"/>
                         <field name="user_id" widget="many2one_avatar_user" domain="[('share', '=', False)]"/>
@@ -81,6 +84,7 @@
                 <field name='color'/>
                 <field name='user_id'/>
                 <field name="stage_id"/>
+                <field name='active'/>
                 <templates>
                     <t t-name="kanban-menu">
                         <t t-if="widget.editable">
@@ -89,6 +93,10 @@
                         <t t-if="widget.deletable">
                             <a role="menuitem" type="delete" class="dropdown-item">Delete</a>
                         </t>
+                        <a role="menuitem" class="dropdown-item o_kanban_mailing_active" name="toggle_active" type="object">
+                            <t t-if="record.active.raw_value">Archive</t>
+                            <t t-else="">Restore</t>
+                        </a>
                         <div role="separator" class="dropdown-divider"/>
                         <ul class="oe_kanban_colorpicker" data-field="color"/>
                     </t>

From efac0ab86e2faaf0494704c2614de9ddbb4a24e1 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Mon, 3 Apr 2023 10:55:30 +0000
Subject: [PATCH 2/4] [IMP] utm,sale,link_tracker,crm: change kanban icons to
 buttons

Change the icons of the utm campaign kanban cards to buttons.
This allows a faster access to concerned views.

Task-3240966

Part-of: odoo/odoo#116230
---
 addons/crm/views/utm_campaign_views.xml       | 21 +++++++++++-----
 .../link_tracker/views/utm_campaign_views.xml | 14 +++++++----
 addons/sale/views/utm_campaign_views.xml      | 25 ++++++++++++-------
 addons/utm/views/utm_campaign_views.xml       |  2 +-
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/addons/crm/views/utm_campaign_views.xml b/addons/crm/views/utm_campaign_views.xml
index a134c2b1b0d..baff90d8c33 100644
--- a/addons/crm/views/utm_campaign_views.xml
+++ b/addons/crm/views/utm_campaign_views.xml
@@ -8,12 +8,21 @@
             <xpath expr="//field[@name='user_id']" position="after">
                 <field name="use_leads"/>
             </xpath>
-            <xpath expr="//div[@id='utm_statistics']" position="inside">
-                <div class="me-3"
-                    groups="sales_team.group_sale_salesman"
-                    t-att-title="record.use_leads.raw_value ? 'Leads' : 'Opportunities'">
-                    <i class="fa fa-star text-muted"></i> <small class="fw-bold"><field name="crm_lead_count"/></small>
-                </div>
+            <xpath expr="//div[hasclass('oe_kanban_bottom_left')]" position="inside">
+                <t t-if="record.use_leads.raw_value">
+                    <t t-set="crm_lead_count_label">Leads</t>
+                </t>
+                <t t-else="">
+                    <t t-set="crm_lead_count_label">Opportunities</t>
+                </t>
+                <a t-if="record.crm_lead_count" href="#" t-att-title="crm_lead_count_label" role="button"
+                    groups="sales_team.group_sale_salesman" data-type="object" data-name="action_redirect_to_leads_opportunities"
+                    class="oe_kanban_action oe_kanban_action_a btn-outline-primary rounded-pill me-1 order-3">
+                    <span class="badge">
+                        <i class="fa fa-fw fa-star" t-att-aria-label="crm_lead_count_label" role="img"/>
+                        <field name="crm_lead_count"/>
+                    </span>
+                </a>
             </xpath>
         </field>
     </record>
diff --git a/addons/link_tracker/views/utm_campaign_views.xml b/addons/link_tracker/views/utm_campaign_views.xml
index 21d9b4a3ede..8da189f3198 100644
--- a/addons/link_tracker/views/utm_campaign_views.xml
+++ b/addons/link_tracker/views/utm_campaign_views.xml
@@ -22,12 +22,16 @@
             <xpath expr="//field[@name='stage_id']" position="after">
                 <field name="click_count"/>
             </xpath>
-            <xpath expr="//div[@id='utm_statistics']" position="inside">
-                <div class="me-3" title="Clicks">
-                    <i class="fa fa-mouse-pointer text-muted"></i> <small class="fw-bold" t-esc="record.click_count.raw_value" />
-                </div>
+            <xpath expr="//div[hasclass('oe_kanban_bottom_left')]" position="inside">
+                <a t-if="record.click_count" href="#" title="Clicks" role="button"
+                    data-type="action" data-name="%(link_tracker_action_campaign)d"
+                    class="oe_kanban_action oe_kanban_action_a btn-outline-primary rounded-pill me-1 order-4">
+                    <span class="badge">
+                        <i class="fa fa-fw fa-mouse-pointer" aria-label="Clicks" role="img"/>
+                        <t t-out="record.click_count.raw_value"/>
+                    </span>
+                </a>
             </xpath>
         </field>
     </record>
 </odoo>
-
diff --git a/addons/sale/views/utm_campaign_views.xml b/addons/sale/views/utm_campaign_views.xml
index 7e2132d72f4..d47a9ddabab 100644
--- a/addons/sale/views/utm_campaign_views.xml
+++ b/addons/sale/views/utm_campaign_views.xml
@@ -6,16 +6,23 @@
         <field name="model">utm.campaign</field>
         <field name="inherit_id" ref="utm.utm_campaign_view_kanban"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='utm_statistics']" position="inside">
-                <div class="me-3" title="Revenues" groups="sales_team.group_sale_salesman">
-                    <field name="currency_id" invisible="True"/>
-                    <small class="fw-bold">
+            <xpath expr="//div[hasclass('oe_kanban_bottom_left')]" position="inside">
+                <a t-if="record.invoiced_amount" href="#" title="Revenues" role="button"
+                    groups="sales_team.group_sale_salesman" data-type="object" data-name="action_redirect_to_invoiced"
+                    class="oe_kanban_action oe_kanban_action_a btn-outline-primary rounded-pill me-1 order-1">
+                    <span class="badge">
+                        <field name="currency_id" invisible="True"/>
                         <field name="invoiced_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                    </small>
-                </div>
-                <div class="me-3" title="Quotations" groups="sales_team.group_sale_salesman">
-                    <i class="fa fa-money text-muted"></i> <small class="fw-bold"><field name="quotation_count"/></small>
-                </div>
+                    </span>
+                </a>
+                <a t-if="record.quotation_count" href="#" title="Quotations" role="button"
+                    groups="sales_team.group_sale_salesman" data-type="object" data-name="action_redirect_to_quotations"
+                    class="oe_kanban_action oe_kanban_action_a btn-outline-primary rounded-pill me-1 order-2">
+                    <span class="badge">
+                        <i class="fa fa-fw fa-money me-1" aria-label="Quotations" role="img"/>
+                        <field name="quotation_count"/>
+                    </span>
+                </a>
             </xpath>
         </field>
     </record>
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index cb34c83235e..9a5b25d2ad8 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -113,7 +113,7 @@
                                     <ul id="o_utm_actions" class="list-group list-group-horizontal my-0"/>
                                 </div>
                                 <div class="o_kanban_record_bottom h5 mt-2 mb-0">
-                                    <div id="utm_statistics" class="d-flex flex-grow-1 text-600 mt-1"/>
+                                    <div class="oe_kanban_bottom_left py-auto"/>
                                     <div class="oe_kanban_bottom_right">
                                          <field name="user_id" widget="many2one_avatar_user"/>
                                     </div>

From d9eea928b3379f481dd17afe830a9cb738829f68 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Wed, 12 Apr 2023 09:57:16 +0000
Subject: [PATCH 3/4] [IMP] utm: improve campaign UI

Purpose
=======
Give users a better experience while using the utm campaign module.

Specifications
==============
* Add a filter called "My Campaigns" filtering on the current user_id.
* Add a groupby Tags.
* Always underline the Tags field in the campaign quick create.
* When duplicating a campaign, do not copy the stage and make it
restart the pipe.
* In the list view:
  - Change the column name from "Campaign Name" to "Name".
  - Add bold on the stage field.
  - Add the avatar widget to the Responsible field.
* For the edit stage modal:
  - Make the dialog smaller.
  - Only display the name field.
  - Add a placeholder to the name field.

Task-3240966

Part-of: odoo/odoo#116230
---
 addons/utm/models/utm_campaign.py       |  2 +-
 addons/utm/views/utm_campaign_views.xml | 13 +++++++++----
 addons/utm/views/utm_stage_views.xml    | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/addons/utm/models/utm_campaign.py b/addons/utm/models/utm_campaign.py
index 924a67a3214..603f6c6ae74 100644
--- a/addons/utm/models/utm_campaign.py
+++ b/addons/utm/models/utm_campaign.py
@@ -20,7 +20,7 @@ class UtmCampaign(models.Model):
     stage_id = fields.Many2one(
         'utm.stage', string='Stage', ondelete='restrict', required=True,
         default=lambda self: self.env['utm.stage'].search([], limit=1),
-        group_expand='_group_expand_stage_ids')
+        copy=False, group_expand='_group_expand_stage_ids')
     tag_ids = fields.Many2many(
         'utm.tag', 'utm_tag_rel',
         'tag_id', 'campaign_id', string='Tags')
diff --git a/addons/utm/views/utm_campaign_views.xml b/addons/utm/views/utm_campaign_views.xml
index 9a5b25d2ad8..ed945e9f1b0 100644
--- a/addons/utm/views/utm_campaign_views.xml
+++ b/addons/utm/views/utm_campaign_views.xml
@@ -9,12 +9,17 @@
                 <field name="tag_ids"/>
                 <field name="user_id"/>
                 <field name="is_auto_campaign"/>
+                <filter string="My Campaigns" name="filter_assigned_to_me" domain="[('user_id', '=', uid)]"
+                    help="Campaigns that are assigned to me"/>
+                <separator/>
                 <filter string="Archived" name="filter_inactive" domain="[('active', '=', False)]"/>
                 <group expand="0" string="Group By">
                     <filter string="Stage" name="group_stage_id"
                         context="{'group_by': 'stage_id'}"/>
                     <filter string="Responsible" name="group_user_id"
                         context="{'group_by': 'user_id'}"/>
+                    <filter string="Tags" name="group_tags_id"
+                        context="{'group_by': 'tag_ids'}"/>
                 </group>
             </search>
         </field>
@@ -51,10 +56,10 @@
         <field name="model">utm.campaign</field>
         <field name="arch" type="xml">
             <tree string="UTM Campaigns" multi_edit="1" sample="1">
-                <field name="title" readonly="1"/>
+                <field name="title" string="Name" readonly="1"/>
                 <field name="name" invisible="1"/>
-                <field name="user_id"/>
-                <field name="stage_id"/>
+                <field name="user_id" widget="many2one_avatar_user"/>
+                <field name="stage_id" decoration-bf="1"/>
                 <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color'}"/>
             </tree>
         </field>
@@ -70,7 +75,7 @@
                     <field name="name" invisible="1"/>
                     <field class="o_text_overflow" name="title" string="Campaign Name" placeholder="e.g. Black Friday"/>
                     <field name="user_id" widget="many2one_avatar_user" domain="[('share', '=', False)]"/>
-                    <field name="tag_ids" widget="many2many_tags" options="{'color_field': 'color', 'no_create_edit': True}"/>
+                    <field name="tag_ids" widget="many2many_tags" class="o_field_highlight" options="{'color_field': 'color', 'no_create_edit': True}"/>
                 </group>
             </form>
         </field>
diff --git a/addons/utm/views/utm_stage_views.xml b/addons/utm/views/utm_stage_views.xml
index 1500e29e6d8..bbc6c9caaf5 100644
--- a/addons/utm/views/utm_stage_views.xml
+++ b/addons/utm/views/utm_stage_views.xml
@@ -22,6 +22,22 @@
         </field>
     </record>
 
+    <record id="utm_stage_view_form" model="ir.ui.view">
+        <field name="name">utm.stage.view.form</field>
+        <field name="model">utm.stage</field>
+        <field name="arch" type="xml">
+            <form string="Stages">
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="name" placeholder='e.g. "Brainstorming"'/>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
     <record id="action_view_utm_stage" model="ir.actions.act_window">
         <field name="name">UTM Stages</field>
         <field name="res_model">utm.stage</field>

From 64dd4bed9d2860fbed01266e9656aa83330ea211 Mon Sep 17 00:00:00 2001
From: amdi-odoo <amdi@odoo.com>
Date: Wed, 22 Mar 2023 15:06:02 +0000
Subject: [PATCH 4/4] [IMP] link_tracker: add placeholders

Add placeholders to the mediums and sources tree views.

Task-3240966

Part-of: odoo/odoo#116230
---
 addons/utm/views/utm_medium_views.xml | 2 +-
 addons/utm/views/utm_source_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/utm/views/utm_medium_views.xml b/addons/utm/views/utm_medium_views.xml
index 394bca00436..74ee151e1f1 100644
--- a/addons/utm/views/utm_medium_views.xml
+++ b/addons/utm/views/utm_medium_views.xml
@@ -5,7 +5,7 @@
         <field name="model">utm.medium</field>
         <field name="arch" type="xml">
             <tree string="Mediums" editable="bottom" sample="1">
-                <field name="name"/>
+                <field name="name" placeholder='e.g. "Email"'/>
                 <field name="active" invisible="1"/>
             </tree>
         </field>
diff --git a/addons/utm/views/utm_source_views.xml b/addons/utm/views/utm_source_views.xml
index af2fee6fa08..f9fb4fd7553 100644
--- a/addons/utm/views/utm_source_views.xml
+++ b/addons/utm/views/utm_source_views.xml
@@ -5,7 +5,7 @@
         <field name="model">utm.source</field>
         <field name="arch" type="xml">
             <tree string="Source" editable="bottom" sample="1">
-                <field name="name"/>
+                <field name="name" placeholder='e.g. "Christmas Mailing"'/>
             </tree>
         </field>
     </record>