mirror of https://github.com/OCA/social.git
[IMP] pre-commit run -a
parent
6fea297ed7
commit
dd6e060ed0
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
||||||
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
||||||
Copyright 2017 David Vidal - <david.vidal@tecnativa.com>
|
Copyright 2017 David Vidal - <david.vidal@tecnativa.com>
|
||||||
|
@ -19,15 +19,27 @@
|
||||||
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
|
<field name="domain">[('mass_mailing_id', '!=', False)]</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<menuitem name="Mail tracking" id="mail_tracking_menu"
|
<menuitem
|
||||||
parent="mass_mailing.mass_mailing_menu_root" sequence="50"/>
|
name="Mail tracking"
|
||||||
|
id="mail_tracking_menu"
|
||||||
|
parent="mass_mailing.mass_mailing_menu_root"
|
||||||
|
sequence="50"
|
||||||
|
/>
|
||||||
|
|
||||||
<menuitem name="Emails" id="mail_tracking_email_menu"
|
<menuitem
|
||||||
parent="mail_tracking_menu" sequence="1"
|
name="Emails"
|
||||||
action="action_view_mail_tracking_email"/>
|
id="mail_tracking_email_menu"
|
||||||
|
parent="mail_tracking_menu"
|
||||||
|
sequence="1"
|
||||||
|
action="action_view_mail_tracking_email"
|
||||||
|
/>
|
||||||
|
|
||||||
<menuitem name="Events" id="mail_tracking_event_menu"
|
<menuitem
|
||||||
parent="mail_tracking_menu" sequence="2"
|
name="Events"
|
||||||
action="action_view_mail_tracking_event"/>
|
id="mail_tracking_event_menu"
|
||||||
|
parent="mail_tracking_menu"
|
||||||
|
sequence="2"
|
||||||
|
action="action_view_mail_tracking_event"
|
||||||
|
/>
|
||||||
|
|
||||||
</odoo>
|
</odoo>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
||||||
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
||||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
||||||
|
@ -7,23 +7,26 @@
|
||||||
<record model="ir.ui.view" id="mailing_trace_view_form">
|
<record model="ir.ui.view" id="mailing_trace_view_form">
|
||||||
<field name="name">Add tracking email info</field>
|
<field name="name">Add tracking email info</field>
|
||||||
<field name="model">mailing.trace</field>
|
<field name="model">mailing.trace</field>
|
||||||
<field name="inherit_id" ref="mass_mailing.mailing_trace_view_form"/>
|
<field name="inherit_id" ref="mass_mailing.mailing_trace_view_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//form/sheet" position="inside">
|
<xpath expr="//form/sheet" position="inside">
|
||||||
<group>
|
<group>
|
||||||
<field name="mail_tracking_id" />
|
<field name="mail_tracking_id" />
|
||||||
</group>
|
</group>
|
||||||
<label for="tracking_event_ids"/>
|
<label for="tracking_event_ids" />
|
||||||
<div>
|
<div>
|
||||||
<field name="tracking_event_ids">
|
<field name="tracking_event_ids">
|
||||||
<tree string="Tracking events" colors="grey:event_type in ('deferral');black:event_type in ('send');red:event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject');blue:event_type in ('unsub', 'click', 'open')">
|
<tree
|
||||||
<field name="time"/>
|
string="Tracking events"
|
||||||
<field name="event_type"/>
|
colors="grey:event_type in ('deferral');black:event_type in ('send');red:event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject');blue:event_type in ('unsub', 'click', 'open')"
|
||||||
<field name="ip"/>
|
>
|
||||||
<field name="url"/>
|
<field name="time" />
|
||||||
<field name="user_country_id" string="Country"/>
|
<field name="event_type" />
|
||||||
<field name="os_family" string="OS"/>
|
<field name="ip" />
|
||||||
<field name="ua_family" string="User agent"/>
|
<field name="url" />
|
||||||
|
<field name="user_country_id" string="Country" />
|
||||||
|
<field name="os_family" string="OS" />
|
||||||
|
<field name="ua_family" string="User agent" />
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
||||||
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
||||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
||||||
|
@ -7,11 +7,11 @@
|
||||||
<record model="ir.ui.view" id="view_mail_tracking_email_form">
|
<record model="ir.ui.view" id="view_mail_tracking_email_form">
|
||||||
<field name="name">Add mass mailing and mail stadistics</field>
|
<field name="name">Add mass mailing and mail stadistics</field>
|
||||||
<field name="model">mail.tracking.email</field>
|
<field name="model">mail.tracking.email</field>
|
||||||
<field name="inherit_id" ref="mail_tracking.view_mail_tracking_email_form"/>
|
<field name="inherit_id" ref="mail_tracking.view_mail_tracking_email_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="date" position="after">
|
<field name="date" position="after">
|
||||||
<field name="mass_mailing_id"/>
|
<field name="mass_mailing_id" />
|
||||||
<field name="mail_stats_id"/>
|
<field name="mail_stats_id" />
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
<!-- Copyright 2016 Antonio Espinosa - <antonio.espinosa@tecnativa.com>
|
||||||
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
Copyright 2017 Vicent Cubells - <vicent.cubells@tecnativa.com>
|
||||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
|
||||||
|
@ -7,11 +7,11 @@
|
||||||
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_tree">
|
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_tree">
|
||||||
<field name="name">Add email score and stars</field>
|
<field name="name">Add email score and stars</field>
|
||||||
<field name="model">mailing.contact</field>
|
<field name="model">mailing.contact</field>
|
||||||
<field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_tree"/>
|
<field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_tree" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<field name="is_blacklisted" position="after">
|
<field name="is_blacklisted" position="after">
|
||||||
<field name="email_bounced"/>
|
<field name="email_bounced" />
|
||||||
<field name="email_score" widget="progressbar"/>
|
<field name="email_score" widget="progressbar" />
|
||||||
</field>
|
</field>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
@ -19,11 +19,14 @@
|
||||||
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_search">
|
<record model="ir.ui.view" id="view_mail_mass_mailing_contact_search">
|
||||||
<field name="name">Filter bounced contacts</field>
|
<field name="name">Filter bounced contacts</field>
|
||||||
<field name="model">mailing.contact</field>
|
<field name="model">mailing.contact</field>
|
||||||
<field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_search"/>
|
<field name="inherit_id" ref="mass_mailing.view_mail_mass_mailing_contact_search" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<filter name="filter_not_email_bl" position="after">
|
<filter name="filter_not_email_bl" position="after">
|
||||||
<filter string="Email bounced" name="email_bounced"
|
<filter
|
||||||
domain="[('email_bounced', '=', True)]"/>
|
string="Email bounced"
|
||||||
|
name="email_bounced"
|
||||||
|
domain="[('email_bounced', '=', True)]"
|
||||||
|
/>
|
||||||
</filter>
|
</filter>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
Loading…
Reference in New Issue