From 01ec59b2e54c25d396d31554117e19147f39bbab Mon Sep 17 00:00:00 2001
From: qmo-odoo <qmo@odoo.com>
Date: Fri, 2 Aug 2019 08:22:03 +0000
Subject: [PATCH] [REF] mass_mailing: Renaming 'mass_mailing_' fields to
mailing
This commit renames the mass_mailing_ids and the mass_mailing_clicks_ratio
to mailing_ids and mailing_clicks_ratio. Indeed it is shorted and more
inlined with the new model names.
Task ID: 2002029
PR: #34015
---
addons/mass_mailing/models/utm.py | 8 ++++----
addons/mass_mailing/views/utm_campaign_views.xml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/addons/mass_mailing/models/utm.py b/addons/mass_mailing/models/utm.py
index 2dddd30b3ec1..9418dd914f22 100644
--- a/addons/mass_mailing/models/utm.py
+++ b/addons/mass_mailing/models/utm.py
@@ -6,10 +6,10 @@ from odoo import api, fields, models
class UtmCampaign(models.Model):
_inherit = 'utm.campaign'
- mass_mailing_ids = fields.One2many(
+ mailing_ids = fields.One2many(
'mailing.mailing', 'campaign_id',
string='Mass Mailings')
- mass_mailing_clicks_ratio = fields.Integer(default=0, compute="_compute_mass_mailing_clicks_ratio", string="Number of clicks")
+ mailing_clicks_ratio = fields.Integer(default=0, compute="_compute_mailing_clicks_ratio", string="Number of clicks")
mailing_items = fields.Integer(compute="_compute_mailing_items", string='Mailings')
mailing_clicked = fields.Integer(compute="_compute_mailing_items", string='Mailings Clicked')
# stat fields
@@ -51,9 +51,9 @@ class UtmCampaign(models.Model):
campaign.mailing_clicked = campaign_items_values.get('clicked_total', 0)
@api.depends('mailing_items', 'mailing_clicked')
- def _compute_mass_mailing_clicks_ratio(self):
+ def _compute_mailing_clicks_ratio(self):
for campaign in self:
- campaign.mass_mailing_clicks_ratio = campaign.mailing_clicked / campaign.mailing_items * 100 if campaign.mailing_items > 0 else 0
+ campaign.mailing_clicks_ratio = campaign.mailing_clicked / campaign.mailing_items * 100 if campaign.mailing_items > 0 else 0
def _compute_statistics(self):
""" Compute statistics of the mass mailing campaign """
diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml
index fa1f30859fe7..0523ad7fca29 100644
--- a/addons/mass_mailing/views/utm_campaign_views.xml
+++ b/addons/mass_mailing/views/utm_campaign_views.xml
@@ -21,7 +21,7 @@
<xpath expr="//notebook" position="inside">
<page string="Mailings" attrs="{}">
<group groups="base.group_no_one">
- <field name="mass_mailing_ids" readonly="1" nolabel="1">
+ <field name="mailing_ids" readonly="1" nolabel="1">
<tree>
<field name="name"/>
<field name="sent_date"/>
@@ -83,12 +83,12 @@
<field name="inherit_id" ref="utm.utm_campaign_view_kanban"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='user_id']" position="after">
- <field name="mass_mailing_ids"/>
+ <field name="mailing_ids"/>
</xpath>
<xpath expr="//div[hasclass('o_kanban_record_headings')]">
<a name="%(action_view_mass_mailings_from_campaign)d" type="action"
class="oe_mailings o_kanban_record_subtitle d-inline-block">
- <t t-raw="record.mass_mailing_ids.raw_value.length"/> Mailings
+ <t t-raw="record.mailing_ids.raw_value.length"/> Mailings
</a>
</xpath>
</field>
--
GitLab