Skip to content

Commit 0fc1bc1

Browse files
chienandalutrisdoan
authored andcommitted
[MIG] mail_tracking_mass_mailing: Migration to 17.0
TT49915
1 parent d3e3636 commit 0fc1bc1

File tree

10 files changed

+37
-63
lines changed

10 files changed

+37
-63
lines changed

mail_tracking_mass_mailing/README.rst

+10-12
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,21 @@ Links mail statistics objects with mail tracking objects.
3838
Installation
3939
============
4040

41-
This addon will be automatically installed when 'mail_tracking' and
42-
'mass_mailing' are both installed.
41+
This addon will be automatically installed when ``mail_tracking`` and
42+
``mass_mailing`` are both installed.
4343

4444
Usage
4545
=====
4646

47-
From mail statistic object, you can see: - Email tracking state - Email
48-
related tracking object - Email related tracking events
47+
From mail statistic object, you can see:
4948

50-
From mass mailing contact, you can see: - Email score, in order to clean
51-
up your lists from bad score emails
49+
- Email tracking state
50+
- Email related tracking object
51+
- Email related tracking events
52+
53+
From mass mailing contact, you can see:
54+
55+
- Email score, in order to clean up your lists from bad score emails
5256

5357
Mass mailing emails are sent only to recipients once. If you want to
5458
send emails again to all the recipients, you must duplicate mass
@@ -89,12 +93,6 @@ Contributors
8993

9094
- nguyenhk <nguyenhk@trobz.com>
9195

92-
Other credits
93-
-------------
94-
95-
The migration of this module from 15.0 to 16.0 was financially supported
96-
by Camptocamp
97-
9896
Maintainers
9997
-----------
10098

mail_tracking_mass_mailing/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
44

55
from . import models
6-
from .hooks import pre_init_hook

mail_tracking_mass_mailing/__manifest__.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
{
88
"name": "Mail tracking for mass mailing",
99
"summary": "Improve mass mailing email tracking",
10-
"version": "16.0.1.0.0",
10+
"version": "17.0.1.0.0",
1111
"category": "Social Network",
1212
"website": "https://github.com/OCA/social",
1313
"author": "Tecnativa, Odoo Community Association (OCA)",
1414
"license": "AGPL-3",
15-
"application": False,
1615
"installable": True,
1716
"auto_install": True,
1817
"depends": ["mass_mailing", "mail_tracking"],
@@ -22,5 +21,4 @@
2221
"views/mail_mass_mailing_view.xml",
2322
"views/mailing_contact_view.xml",
2423
],
25-
"pre_init_hook": "pre_init_hook",
2624
}

mail_tracking_mass_mailing/hooks.py

-20
This file was deleted.

mail_tracking_mass_mailing/models/mail_mail.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class MailMail(models.Model):
99
_inherit = "mail.mail"
1010

1111
@api.model
12-
def _tracking_email_prepare(self, partner, email):
13-
res = super()._tracking_email_prepare(partner, email)
12+
def _tracking_email_prepare(self, email):
13+
res = super()._tracking_email_prepare(email)
1414
res["mail_id_int"] = self.id
1515
res["mass_mailing_id"] = self.mailing_id.id
1616
res["mail_stats_id"] = (

mail_tracking_mass_mailing/models/mail_tracking_email.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def _statistics_link_prepare(self, tracking):
2323

2424
@api.depends("mail_stats_id")
2525
def _compute_message_id(self):
26-
"""For the mass mailings, the message id is stored in the mailing.trace record."""
26+
"""In mass mailings, the message id is stored in the `mailing.trace` record."""
2727
res = super()._compute_message_id()
2828
for tracking in self.filtered("mail_stats_id"):
2929
tracking.message_id = tracking.mail_stats_id.message_id

mail_tracking_mass_mailing/readme/CREDITS.md

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
This addon will be automatically installed when 'mail_tracking' and
2-
'mass_mailing' are both installed.
1+
This addon will be automatically installed when `mail_tracking` and
2+
`mass_mailing` are both installed.
+7-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
From mail statistic object, you can see: - Email tracking state - Email
2-
related tracking object - Email related tracking events
1+
From mail statistic object, you can see:
2+
- Email tracking state
3+
- Email related tracking object
4+
- Email related tracking events
35

4-
From mass mailing contact, you can see: - Email score, in order to clean
5-
up your lists from bad score emails
6+
From mass mailing contact, you can see:
7+
- Email score, in order to clean up your lists from bad score emails
68

7-
Mass mailing emails are sent only to recipients once. If you want to
8-
send emails again to all the recipients, you must duplicate mass
9+
Mass mailing emails are sent only to recipients once. If you want to send emails again to all the recipients, you must duplicate mass
910
mailing.

mail_tracking_mass_mailing/static/description/index.html

+14-14
Original file line numberDiff line numberDiff line change
@@ -379,23 +379,28 @@ <h1 class="title">Mail tracking for mass mailing</h1>
379379
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
380380
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
381381
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
382-
<li><a class="reference internal" href="#other-credits" id="toc-entry-7">Other credits</a></li>
383-
<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
382+
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
384383
</ul>
385384
</li>
386385
</ul>
387386
</div>
388387
<div class="section" id="installation">
389388
<h1><a class="toc-backref" href="#toc-entry-1">Installation</a></h1>
390-
<p>This addon will be automatically installed when mail_tracking and
391-
mass_mailing are both installed.</p>
389+
<p>This addon will be automatically installed when <tt class="docutils literal">mail_tracking</tt> and
390+
<tt class="docutils literal">mass_mailing</tt> are both installed.</p>
392391
</div>
393392
<div class="section" id="usage">
394393
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
395-
<p>From mail statistic object, you can see: - Email tracking state - Email
396-
related tracking object - Email related tracking events</p>
397-
<p>From mass mailing contact, you can see: - Email score, in order to clean
398-
up your lists from bad score emails</p>
394+
<p>From mail statistic object, you can see:</p>
395+
<ul class="simple">
396+
<li>Email tracking state</li>
397+
<li>Email related tracking object</li>
398+
<li>Email related tracking events</li>
399+
</ul>
400+
<p>From mass mailing contact, you can see:</p>
401+
<ul class="simple">
402+
<li>Email score, in order to clean up your lists from bad score emails</li>
403+
</ul>
399404
<p>Mass mailing emails are sent only to recipients once. If you want to
400405
send emails again to all the recipients, you must duplicate mass
401406
mailing.</p>
@@ -435,13 +440,8 @@ <h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
435440
</li>
436441
</ul>
437442
</div>
438-
<div class="section" id="other-credits">
439-
<h2><a class="toc-backref" href="#toc-entry-7">Other credits</a></h2>
440-
<p>The migration of this module from 15.0 to 16.0 was financially supported
441-
by Camptocamp</p>
442-
</div>
443443
<div class="section" id="maintainers">
444-
<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
444+
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
445445
<p>This module is maintained by the OCA.</p>
446446
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
447447
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose

0 commit comments

Comments
 (0)