diff --git a/mail_tracking/models/mail_tracking_email.py b/mail_tracking/models/mail_tracking_email.py index f7bdcd8d7..4c885c766 100644 --- a/mail_tracking/models/mail_tracking_email.py +++ b/mail_tracking/models/mail_tracking_email.py @@ -105,8 +105,7 @@ class MailTrackingEmail(models.Model): if not email: return False res = self._email_last_tracking_state(email) - return res and res[0].get('state', '') in {'rejected', 'error', - 'spam', 'bounced'} + return res and res[0].get('state') in {'rejected', 'spam', 'bounced'} @api.model def _email_last_tracking_state(self, email): @@ -222,7 +221,6 @@ class MailTrackingEmail(models.Model): 'error_description': tools.ustr(exception), 'state': 'error', }) - self.sudo()._partners_email_bounced_set('error') return True @api.multi diff --git a/mail_tracking/tests/test_mail_tracking.py b/mail_tracking/tests/test_mail_tracking.py index 4b769ceea..0d124cf1e 100644 --- a/mail_tracking/tests/test_mail_tracking.py +++ b/mail_tracking/tests/test_mail_tracking.py @@ -303,7 +303,7 @@ class TestMailTracking(TransactionCase): self.assertEqual('error', tracking.state) self.assertEqual('Warning', tracking.error_type) self.assertEqual('Test error', tracking.error_description) - self.assertTrue(self.recipient.email_bounced) + self.assertFalse(self.recipient.email_bounced) def test_partner_email_change(self): mail, tracking = self.mail_send(self.recipient.email) diff --git a/mail_tracking_mass_mailing/models/mail_tracking_email.py b/mail_tracking_mass_mailing/models/mail_tracking_email.py index 953d832eb..aef847113 100644 --- a/mail_tracking_mass_mailing/models/mail_tracking_email.py +++ b/mail_tracking_mass_mailing/models/mail_tracking_email.py @@ -47,7 +47,6 @@ class MailTrackingEmail(models.Model): def smtp_error(self, mail_server, smtp_server, exception): res = super(MailTrackingEmail, self).smtp_error( mail_server, smtp_server, exception) - self._contacts_email_bounced_set('error') return res @api.multi diff --git a/mail_tracking_mass_mailing/tests/test_mass_mailing.py b/mail_tracking_mass_mailing/tests/test_mass_mailing.py index aa2907e5f..0754ba61b 100644 --- a/mail_tracking_mass_mailing/tests/test_mass_mailing.py +++ b/mail_tracking_mass_mailing/tests/test_mass_mailing.py @@ -55,7 +55,7 @@ class TestMassMailing(TransactionCase): self.assertEqual('Warning', track.error_type) self.assertEqual('Mock test error', track.error_description) - self.assertTrue(self.contact_a.email_bounced) + self.assertFalse(self.contact_a.email_bounced) def test_tracking_email_link(self): self.mailing.send_mail()