Compare commits

...

3 Commits
12.0 ... 12.3

Author SHA1 Message Date
Nicolas JEUDY 5f3b3b2ab2 [FIX] write can be multi 5 years ago
Nicolas JEUDY 9ce95f0be2 [FIX] color not possible in tree anymore 5 years ago
Nicolas JEUDY 438deca230 [FIX] document moved to mail,base 5 years ago
  1. 2
      mail_attach_existing_attachment/__manifest__.py
  2. 3
      mail_tracking/models/mail_bounced_mixin.py
  3. 7
      mail_tracking/views/mail_tracking_email_view.xml
  4. 4
      mail_tracking/views/mail_tracking_event_view.xml

2
mail_attach_existing_attachment/__manifest__.py

@ -33,7 +33,7 @@
'license': 'AGPL-3',
'depends': [
'mail',
'document',
'base',
],
'data': [
'wizard/mail_compose_message_view.xml',

3
mail_tracking/models/mail_bounced_mixin.py

@ -31,8 +31,9 @@ class MailBouncedMixin(models.AbstractModel):
partners = self.filtered(lambda r: not r.email_bounced)
return partners.write({'email_bounced': True})
@api.multi
def write(self, vals):
[email_field] = self._primary_email
[email_field] = self[0]._primary_email
if email_field not in vals:
return super().write(vals)
email = vals[email_field].lower() if vals[email_field] else False

7
mail_tracking/views/mail_tracking_email_view.xml

@ -42,7 +42,8 @@
<label for="tracking_event_ids"/>
<div>
<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')">
<!-- TODO: 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 string="Tracking events">
<field name="time"/>
<field name="event_type"/>
<field name="ip"/>
@ -62,8 +63,8 @@
<field name="name">mail.tracking.email.tree</field>
<field name="model">mail.tracking.email</field>
<field name="arch" type="xml">
<tree string="MailTracking emails" create="false" edit="false" delete="false"
colors="grey:state in (False, 'deferred');black:state in ('sent', 'delivered');green:state in ('opened');red:state in ('rejected', 'spam', 'bounced', 'soft-bounced');blue:state in ('unsub')">
<!-- TODO: colors="grey:state in (False, 'deferred');black:state in ('sent', 'delivered');green:state in ('opened');red:state in ('rejected', 'spam', 'bounced', 'soft-bounced');blue:state in ('unsub')"-->
<tree string="MailTracking emails" create="false" edit="false" delete="false">
<field name="time"/>
<field name="date" invisible="1"/>
<field name="name"/>

4
mail_tracking/views/mail_tracking_event_view.xml

@ -55,8 +55,8 @@
<field name="name">mail.tracking.event.tree</field>
<field name="model">mail.tracking.event</field>
<field name="arch" type="xml">
<tree string="MailTracking events" create="false" edit="false" delete="false"
colors="grey:event_type in ('deferral',);black:event_type in ('sent', 'delivered');red:event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject');blue:event_type in ('unsub', 'click', 'open')">
<!-- TODO: colors="grey:event_type in ('deferral',);black:event_type in ('sent', 'delivered');red:event_type in ('hard_bounce', 'soft_bounce', 'spam', 'reject');blue:event_type in ('unsub', 'click', 'open')" -->
<tree string="MailTracking events" create="false" edit="false" delete="false">
<field name="time"/>
<field name="tracking_email_id"/>
<field name="recipient"/>

Loading…
Cancel
Save