Skip to content

Commit 86b6574

Browse files
trisdoanquoc-pn
authored andcommitted
[IMP] mail_tracking_mass_mailing: pre-commit auto fixes
1 parent cf30abc commit 86b6574

File tree

7 files changed

+84
-92
lines changed

7 files changed

+84
-92
lines changed

mail_tracking_mass_mailing/README.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Mail tracking for mass mailing
1616
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
1717
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
1818
:alt: License: AGPL-3
19-
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github
20-
:target: https://github.com/OCA/social/tree/17.0/mail_tracking_mass_mailing
21-
:alt: OCA/social
19+
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github
20+
:target: https://github.com/OCA/mail/tree/18.0/mail_tracking_mass_mailing
21+
:alt: OCA/mail
2222
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
23-
:target: https://translation.odoo-community.org/projects/social-17-0/social-17-0-mail_tracking_mass_mailing
23+
:target: https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_tracking_mass_mailing
2424
:alt: Translate me on Weblate
2525
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
26-
:target: https://runboat.odoo-community.org/builds?repo=OCA/social&target_branch=17.0
26+
:target: https://runboat.odoo-community.org/builds?repo=OCA/mail&target_branch=18.0
2727
:alt: Try me on Runboat
2828

2929
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -61,10 +61,10 @@ mailing.
6161
Bug Tracker
6262
===========
6363

64-
Bugs are tracked on `GitHub Issues <https://github.com/OCA/social/issues>`_.
64+
Bugs are tracked on `GitHub Issues <https://github.com/OCA/mail/issues>`_.
6565
In case of trouble, please check there if your issue has already been reported.
6666
If you spotted it first, help us to smash it by providing a detailed and welcomed
67-
`feedback <https://github.com/OCA/social/issues/new?body=module:%20mail_tracking_mass_mailing%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
67+
`feedback <https://github.com/OCA/mail/issues/new?body=module:%20mail_tracking_mass_mailing%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
6868

6969
Do not contact contributors directly about support or help with technical issues.
7070

@@ -106,6 +106,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
106106
mission is to support the collaborative development of Odoo features and
107107
promote its widespread use.
108108

109-
This module is part of the `OCA/social <https://github.com/OCA/social/tree/17.0/mail_tracking_mass_mailing>`_ project on GitHub.
109+
This module is part of the `OCA/mail <https://github.com/OCA/mail/tree/18.0/mail_tracking_mass_mailing>`_ project on GitHub.
110110

111111
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

mail_tracking_mass_mailing/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"summary": "Improve mass mailing email tracking",
1010
"version": "17.0.1.0.0",
1111
"category": "Social Network",
12-
"website": "https://github.com/OCA/social",
12+
"website": "https://github.com/OCA/mail",
1313
"author": "Tecnativa, Odoo Community Association (OCA)",
1414
"license": "AGPL-3",
1515
"installable": True,

mail_tracking_mass_mailing/static/description/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ <h1 class="title">Mail tracking for mass mailing</h1>
369369
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
370370
!! source digest: sha256:fbf88a576b87f54b1f75399c95d0a26baa72fd6b966e131c4a5c3bde176e375a
371371
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
372-
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/social/tree/17.0/mail_tracking_mass_mailing"><img alt="OCA/social" src="https://img.shields.io/badge/github-OCA%2Fsocial-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/social-17-0/social-17-0-mail_tracking_mass_mailing"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/social&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
372+
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/mail/tree/18.0/mail_tracking_mass_mailing"><img alt="OCA/mail" src="https://img.shields.io/badge/github-OCA%2Fmail-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/mail-18-0/mail-18-0-mail_tracking_mass_mailing"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/mail&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
373373
<p>Links mail statistics objects with mail tracking objects.</p>
374374
<p><strong>Table of contents</strong></p>
375375
<div class="contents local topic" id="contents">
@@ -408,10 +408,10 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
408408
</div>
409409
<div class="section" id="bug-tracker">
410410
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
411-
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/social/issues">GitHub Issues</a>.
411+
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/mail/issues">GitHub Issues</a>.
412412
In case of trouble, please check there if your issue has already been reported.
413413
If you spotted it first, help us to smash it by providing a detailed and welcomed
414-
<a class="reference external" href="https://github.com/OCA/social/issues/new?body=module:%20mail_tracking_mass_mailing%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
414+
<a class="reference external" href="https://github.com/OCA/mail/issues/new?body=module:%20mail_tracking_mass_mailing%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
415415
<p>Do not contact contributors directly about support or help with technical issues.</p>
416416
</div>
417417
<div class="section" id="credits">
@@ -450,7 +450,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
450450
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
451451
mission is to support the collaborative development of Odoo features and
452452
promote its widespread use.</p>
453-
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/social/tree/17.0/mail_tracking_mass_mailing">OCA/social</a> project on GitHub.</p>
453+
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/mail/tree/18.0/mail_tracking_mass_mailing">OCA/mail</a> project on GitHub.</p>
454454
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
455455
</div>
456456
</div>

mail_tracking_mass_mailing/views/mail_mass_mailing_view.xml

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,40 @@
44
Copyright 2017 David Vidal - <david.vidal@tecnativa.com>
55
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
66
<odoo>
7+
<record model="ir.actions.act_window" id="action_view_mail_tracking_email">
8+
<field name="name">Mail tracking emails</field>
9+
<field name="res_model">mail.tracking.email</field>
10+
<field name="view_mode">tree,form</field>
11+
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
12+
</record>
713

8-
<record model="ir.actions.act_window" id="action_view_mail_tracking_email">
9-
<field name="name">Mail tracking emails</field>
10-
<field name="res_model">mail.tracking.email</field>
11-
<field name="view_mode">tree,form</field>
12-
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
13-
</record>
14+
<record model="ir.actions.act_window" id="action_view_mail_tracking_event">
15+
<field name="name">Mail tracking events</field>
16+
<field name="res_model">mail.tracking.event</field>
17+
<field name="view_mode">tree,form</field>
18+
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
19+
</record>
1420

15-
<record model="ir.actions.act_window" id="action_view_mail_tracking_event">
16-
<field name="name">Mail tracking events</field>
17-
<field name="res_model">mail.tracking.event</field>
18-
<field name="view_mode">tree,form</field>
19-
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
20-
</record>
21-
22-
<menuitem
21+
<menuitem
2322
name="Mail tracking"
2423
id="mail_tracking_menu"
2524
parent="mass_mailing.mass_mailing_menu_root"
2625
sequence="50"
2726
/>
2827

29-
<menuitem
28+
<menuitem
3029
name="Emails"
3130
id="mail_tracking_email_menu"
3231
parent="mail_tracking_menu"
3332
sequence="1"
3433
action="action_view_mail_tracking_email"
3534
/>
3635

37-
<menuitem
36+
<menuitem
3837
name="Events"
3938
id="mail_tracking_event_menu"
4039
parent="mail_tracking_menu"
4140
sequence="2"
4241
action="action_view_mail_tracking_event"
4342
/>
44-
4543
</odoo>

mail_tracking_mass_mailing/views/mail_trace_view.xml

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,35 @@
33
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
44
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
55
<odoo>
6-
7-
<record model="ir.ui.view" id="mailing_trace_view_form">
8-
<field name="name">Add tracking email info</field>
9-
<field name="model">mailing.trace</field>
10-
<field name="inherit_id" ref="mass_mailing.mailing_trace_view_form" />
11-
<field name="arch" type="xml">
12-
<xpath expr="//form/sheet" position="inside">
13-
<group>
14-
<field name="mail_tracking_id" />
15-
</group>
16-
<label for="tracking_event_ids" />
17-
<div>
18-
<field name="tracking_event_ids">
19-
<tree
6+
<record model="ir.ui.view" id="mailing_trace_view_form">
7+
<field name="name">Add tracking email info</field>
8+
<field name="model">mailing.trace</field>
9+
<field name="inherit_id" ref="mass_mailing.mailing_trace_view_form" />
10+
<field name="arch" type="xml">
11+
<xpath expr="//form/sheet" position="inside">
12+
<group>
13+
<field name="mail_tracking_id" />
14+
</group>
15+
<label for="tracking_event_ids" />
16+
<div>
17+
<field name="tracking_event_ids">
18+
<tree
2019
decoration-muted="event_type in ('deferral')"
2120
decoration-bf="event_type in ('send')"
2221
decoration-danger="event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject')"
2322
decoration-info="event_type in ('unsub', 'click', 'open')"
2423
>
25-
<field name="time" />
26-
<field name="event_type" />
27-
<field name="ip" />
28-
<field name="url" />
29-
<field name="user_country_id" string="Country" />
30-
<field name="os_family" string="OS" />
31-
<field name="ua_family" string="User agent" />
32-
</tree>
33-
</field>
34-
</div>
35-
</xpath>
36-
</field>
37-
</record>
38-
24+
<field name="time" />
25+
<field name="event_type" />
26+
<field name="ip" />
27+
<field name="url" />
28+
<field name="user_country_id" string="Country" />
29+
<field name="os_family" string="OS" />
30+
<field name="ua_family" string="User agent" />
31+
</tree>
32+
</field>
33+
</div>
34+
</xpath>
35+
</field>
36+
</record>
3937
</odoo>

mail_tracking_mass_mailing/views/mail_tracking_email_view.xml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
44
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
55
<odoo>
6-
7-
<record model="ir.ui.view" id="view_mail_tracking_email_form">
8-
<field name="name">Add mass mailing and mail stadistics</field>
9-
<field name="model">mail.tracking.email</field>
10-
<field name="inherit_id" ref="mail_tracking.view_mail_tracking_email_form" />
11-
<field name="arch" type="xml">
12-
<field name="date" position="after">
13-
<field name="mass_mailing_id" />
14-
<field name="mail_stats_id" />
6+
<record model="ir.ui.view" id="view_mail_tracking_email_form">
7+
<field name="name">Add mass mailing and mail stadistics</field>
8+
<field name="model">mail.tracking.email</field>
9+
<field name="inherit_id" ref="mail_tracking.view_mail_tracking_email_form" />
10+
<field name="arch" type="xml">
11+
<field name="date" position="after">
12+
<field name="mass_mailing_id" />
13+
<field name="mail_stats_id" />
14+
</field>
1515
</field>
16-
</field>
17-
</record>
18-
16+
</record>
1917
</odoo>

mail_tracking_mass_mailing/views/mailing_contact_view.xml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
44
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
55
<odoo>
6-
7-
<record model="ir.ui.view" id="mailing_contact_view_tree">
8-
<field name="name">Add email score and stars</field>
9-
<field name="model">mailing.contact</field>
10-
<field name="inherit_id" ref="mass_mailing.mailing_contact_view_tree" />
11-
<field name="arch" type="xml">
12-
<field name="is_blacklisted" position="after">
13-
<field name="email_bounced" />
14-
<field name="email_score" widget="progressbar" />
6+
<record model="ir.ui.view" id="mailing_contact_view_tree">
7+
<field name="name">Add email score and stars</field>
8+
<field name="model">mailing.contact</field>
9+
<field name="inherit_id" ref="mass_mailing.mailing_contact_view_tree" />
10+
<field name="arch" type="xml">
11+
<field name="is_blacklisted" position="after">
12+
<field name="email_bounced" />
13+
<field name="email_score" widget="progressbar" />
14+
</field>
1515
</field>
16-
</field>
17-
</record>
16+
</record>
1817

19-
<record model="ir.ui.view" id="mailing_contact_view_search">
20-
<field name="name">Filter bounced contacts</field>
21-
<field name="model">mailing.contact</field>
22-
<field name="inherit_id" ref="mass_mailing.mailing_contact_view_search" />
23-
<field name="arch" type="xml">
24-
<filter name="filter_not_email_bl" position="after">
25-
<filter
18+
<record model="ir.ui.view" id="mailing_contact_view_search">
19+
<field name="name">Filter bounced contacts</field>
20+
<field name="model">mailing.contact</field>
21+
<field name="inherit_id" ref="mass_mailing.mailing_contact_view_search" />
22+
<field name="arch" type="xml">
23+
<filter name="filter_not_email_bl" position="after">
24+
<filter
2625
string="Email bounced"
2726
name="email_bounced"
2827
domain="[('email_bounced', '=', True)]"
2928
/>
30-
</filter>
31-
</field>
32-
</record>
33-
29+
</filter>
30+
</field>
31+
</record>
3432
</odoo>

0 commit comments

Comments
 (0)