diff --git a/addons/mass_mailing_sale/data/mass_mailing_demo.xml b/addons/mass_mailing_sale/data/mass_mailing_demo.xml
index c1872022fa3..d80d975c1e9 100644
--- a/addons/mass_mailing_sale/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing_sale/data/mass_mailing_demo.xml
@@ -11,7 +11,7 @@
[]
- email
+ new
${object.company_id.email}
|
diff --git a/addons/test_mail/tests/test_mail_composer.py b/addons/test_mail/tests/test_mail_composer.py
index 6c60ea3d293..17f8e1f5afb 100644
--- a/addons/test_mail/tests/test_mail_composer.py
+++ b/addons/test_mail/tests/test_mail_composer.py
@@ -110,7 +110,7 @@ class TestComposerForm(TestMailComposer):
'MailComposer: comment mode should have default subject Re: record_name')
# record name not displayed currently in view
# self.assertEqual(composer_form.record_name, self.test_record.name, 'MailComposer: comment mode should compute record name')
- self.assertFalse(composer_form.no_auto_thread)
+ self.assertFalse(composer_form.reply_to_force_new)
self.assertEqual(composer_form.composition_mode, 'comment')
self.assertEqual(composer_form.model, self.test_record._name)
@@ -172,7 +172,7 @@ class TestComposerForm(TestMailComposer):
self.assertFalse(composer_form.subject, 'MailComposer: mass mode should have void default subject if no template')
# record name not displayed currently in view
# self.assertFalse(composer_form.record_name, 'MailComposer: mass mode should have void record name')
- self.assertFalse(composer_form.no_auto_thread)
+ self.assertFalse(composer_form.reply_to_force_new)
self.assertEqual(composer_form.composition_mode, 'mass_mail')
self.assertEqual(composer_form.model, self.test_records._name)
@@ -186,7 +186,7 @@ class TestComposerForm(TestMailComposer):
'MailComposer: mass mode should have template raw body if template')
# record name not displayed currently in view
# self.assertFalse(composer_form.record_name, 'MailComposer: mass mode should have void record name')
- self.assertFalse(composer_form.no_auto_thread)
+ self.assertFalse(composer_form.reply_to_force_new)
self.assertEqual(composer_form.composition_mode, 'mass_mail')
self.assertEqual(composer_form.model, self.test_records._name)
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py
index 8da6b228b9f..b76e5d9752b 100644
--- a/addons/test_mail/tests/test_mail_gateway.py
+++ b/addons/test_mail/tests/test_mail_gateway.py
@@ -1043,14 +1043,14 @@ class TestMailgateway(TestMailCommon):
first_record = self.env['mail.test.simple'].with_user(self.user_employee).create({'name': 'Replies to Record'})
record_msg = first_record.message_post(
subject='Discussion',
- no_auto_thread=False,
+ reply_to_force_new=False,
subtype_xmlid='mail.mt_comment',
)
self.assertEqual(record_msg.reply_to, formataddr(('%s %s' % (self.user_employee.company_id.name, first_record.name), '%s@%s' % ('catchall.test', 'test.com'))))
mail_msg = first_record.message_post(
subject='Replies to Record',
reply_to='groups@test.com',
- no_auto_thread=True,
+ reply_to_force_new=True,
subtype_xmlid='mail.mt_comment',
)
self.assertEqual(mail_msg.reply_to, 'groups@test.com')
diff --git a/addons/test_mail/tests/test_mail_message.py b/addons/test_mail/tests/test_mail_message.py
index 8cf04011b6b..c654d9f58fc 100644
--- a/addons/test_mail/tests/test_mail_message.py
+++ b/addons/test_mail/tests/test_mail_message.py
@@ -169,11 +169,11 @@ class TestMessageValues(TestMailCommon):
self.assertEqual(msg.reply_to, formataddr((reply_to_name, reply_to_email)))
self.assertEqual(msg.email_from, formataddr((self.user_employee.name, self.user_employee.email)))
- def test_mail_message_values_no_auto_thread(self):
+ def test_mail_message_values_reply_to_force_new(self):
msg = self.Message.create({
'model': 'mail.test.container',
'res_id': self.alias_record.id,
- 'no_auto_thread': True,
+ 'reply_to_force_new': True,
})
self.assertIn('reply_to', msg.message_id.split('@')[0])
self.assertNotIn('mail.test.container', msg.message_id.split('@')[0])
diff --git a/addons/test_mass_mailing/tests/__init__.py b/addons/test_mass_mailing/tests/__init__.py
index 2391896e3e4..978ceb47d01 100644
--- a/addons/test_mass_mailing/tests/__init__.py
+++ b/addons/test_mass_mailing/tests/__init__.py
@@ -5,6 +5,6 @@ from . import test_blacklist
from . import test_blacklist_behavior
from . import test_blacklist_mixin
from . import test_link_tracker
-from . import test_mailing_internals
-from . import test_mass_mailing
+from . import test_mailing_test
+from . import test_mailing
from . import test_performance
diff --git a/addons/test_mass_mailing/tests/common.py b/addons/test_mass_mailing/tests/common.py
index 43b1ad27ea1..2a132a9656b 100644
--- a/addons/test_mass_mailing/tests/common.py
+++ b/addons/test_mass_mailing/tests/common.py
@@ -11,6 +11,13 @@ class TestMassMailCommon(MassMailCommon, TestMailCommon):
def setUpClass(cls):
super(TestMassMailCommon, cls).setUpClass()
+ cls.test_alias = cls.env['mail.alias'].create({
+ 'alias_name': 'test.alias',
+ 'alias_user_id': False,
+ 'alias_model_id': cls.env['ir.model']._get('mailing.test.simple').id,
+ 'alias_contact': 'everyone'
+ })
+
# enforce last update by user_marketing to match _process_mass_mailing_queue
# taking last writer as user running a batch
cls.mailing_bl = cls.env['mailing.mailing'].with_user(cls.user_marketing).create({
@@ -32,6 +39,7 @@ class TestMassMailCommon(MassMailCommon, TestMailCommon):
""",
'mailing_type': 'mail',
'mailing_model_id': cls.env['ir.model']._get('mailing.test.blacklist').id,
+ 'reply_to_mode': 'update',
})
@classmethod
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing.py b/addons/test_mass_mailing/tests/test_mailing.py
similarity index 53%
rename from addons/test_mass_mailing/tests/test_mass_mailing.py
rename to addons/test_mass_mailing/tests/test_mailing.py
index 0a2f45f0e17..7615d858a45 100644
--- a/addons/test_mass_mailing/tests/test_mass_mailing.py
+++ b/addons/test_mass_mailing/tests/test_mailing.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo.addons.test_mass_mailing.data.mail_test_data import MAIL_TEMPLATE
from odoo.addons.test_mass_mailing.tests.common import TestMassMailCommon
from odoo.tests import tagged
from odoo.tests.common import users
@@ -14,6 +15,62 @@ class TestMassMailing(TestMassMailCommon):
def setUpClass(cls):
super(TestMassMailing, cls).setUpClass()
+ @users('user_marketing')
+ @mute_logger('odoo.addons.mail.models.mail_thread')
+ def test_mailing_gateway_reply(self):
+ customers = self.env['res.partner']
+ for x in range(0, 3):
+ customers |= self.env['res.partner'].create({
+ 'name': 'Customer_%02d' % x,
+ 'email': '"Customer_%02d" Hello ${object.name}',
+ 'reply_to_mode': 'new',
+ 'reply_to': '%s@%s' % (self.test_alias.alias_name, self.test_alias.alias_domain),
+ 'keep_archives': True,
+ 'mailing_model_id': self.env['ir.model']._get('mailing.list').id,
+ 'contact_list_ids': [(4, self.mailing_list_1.id)],
+ 'source_id': source.id,
+ 'medium_id': medium.id,
+ 'campaign_id': campaign.id
+ })
+
+ mailing.action_put_in_queue()
+ with self.mock_mail_gateway(mail_unlink_sent=False):
+ mailing._process_mass_mailing_queue()
+
+ traces = self.env['mailing.trace'].search([('model', '=', self.mailing_list_1.contact_ids._name), ('res_id', 'in', self.mailing_list_1.contact_ids.ids)])
+ self.assertEqual(len(traces), 3)
+
+ # simulate response to mailing
+ self.gateway_mail_reply_wrecord(MAIL_TEMPLATE, self.mailing_list_1.contact_ids[0], use_in_reply_to=True)
+ self.gateway_mail_reply_wrecord(MAIL_TEMPLATE, self.mailing_list_1.contact_ids[1], use_in_reply_to=False)
+
+ mailing_test_utms = self.env['mailing.test.utm'].search([('name', '=', 'Re: %s' % subject)])
+ self.assertEqual(len(mailing_test_utms), 2)
+ for test_utm in mailing_test_utms:
+ self.assertEqual(test_utm.campaign_id, campaign)
+ self.assertEqual(test_utm.source_id, source)
+ self.assertEqual(test_utm.medium_id, medium)
+
@users('user_marketing')
@mute_logger('odoo.addons.mail.models.mail_mail')
def test_mailing_w_blacklist(self):
diff --git a/addons/test_mass_mailing/tests/test_mailing_internals.py b/addons/test_mass_mailing/tests/test_mailing_internals.py
deleted file mode 100644
index 555578e492d..00000000000
--- a/addons/test_mass_mailing/tests/test_mailing_internals.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo.addons.test_mass_mailing.tests.common import TestMassMailCommon
-from odoo.addons.test_mass_mailing.data.mail_test_data import MAIL_TEMPLATE
-from odoo.tests.common import users
-from odoo.tools import mute_logger
-
-
-class TestMailingInternals(TestMassMailCommon):
-
- def setUp(self):
- super(TestMailingInternals, self).setUp()
-
- self.env['ir.config_parameter'].set_param('mail.bounce.alias', 'bounce.test')
- self.env['ir.config_parameter'].set_param('mail.catchall.alias', 'catchall.test')
- self.env['ir.config_parameter'].set_param('mail.catchall.domain', 'test.example.com')
-
- self.test_alias = self.env['mail.alias'].create({
- 'alias_name': 'test.alias',
- 'alias_user_id': False,
- 'alias_model_id': self.env['ir.model']._get('mailing.test.simple').id,
- 'alias_contact': 'everyone'
- })
-
- @mute_logger('odoo.addons.mail.models.mail_render_mixin')
- def test_mailing_test_button(self):
- mailing = self.env['mailing.mailing'].create({
- 'name': 'TestButton',
- 'subject': 'Subject ${object.name}',
- 'preview': 'Preview ${object.name}',
- 'state': 'draft',
- 'mailing_type': 'mail',
- 'body_html': ' Hello ${object.name} ',
- 'mailing_model_id': self.env['ir.model']._get('res.partner').id,
- })
- mailing_test = self.env['mailing.mailing.test'].create({
- 'email_to': 'test@test.com',
- 'mass_mailing_id': mailing.id,
- })
-
- with self.mock_mail_gateway():
- mailing_test.send_mail_test()
-
- # Test if bad jinja in the subject raises an error
- mailing.write({'subject': 'Subject ${object.name_id.id}'})
- with self.mock_mail_gateway(), self.assertRaises(Exception):
- mailing_test.send_mail_test()
-
- # Test if bad jinja in the body raises an error
- mailing.write({
- 'subject': 'Subject ${object.name}',
- 'body_html': 'Hello ${object.name_id.id} ',
- })
- with self.mock_mail_gateway(), self.assertRaises(Exception):
- mailing_test.send_mail_test()
-
- # Test if bad jinja in the preview raises an error
- mailing.write({
- 'body_html': 'Hello ${object.name} ',
- 'preview': 'Preview ${object.name_id.id}',
- })
- with self.mock_mail_gateway(), self.assertRaises(Exception):
- mailing_test.send_mail_test()
-
- def test_mailing_trace_update(self):
- customers = self.env['res.partner']
- for x in range(0, 3):
- customers |= self.env['res.partner'].create({
- 'name': 'Customer_%02d' % x,
- 'email': '"Customer_%02d" Hello ${object.name}',
- 'reply_to_mode': 'email',
- 'reply_to': '%s@%s' % (self.test_alias.alias_name, self.test_alias.alias_domain),
- 'keep_archives': True,
- 'mailing_model_id': self.env['ir.model']._get('mailing.list').id,
- 'contact_list_ids': [(4, self.mailing_list_1.id)],
- 'source_id': source.id,
- 'medium_id': medium.id,
- 'campaign_id': campaign.id
- })
-
- mailing.action_put_in_queue()
- with self.mock_mail_gateway(mail_unlink_sent=False):
- mailing._process_mass_mailing_queue()
-
- traces = self.env['mailing.trace'].search([('model', '=', self.mailing_list_1.contact_ids._name), ('res_id', 'in', self.mailing_list_1.contact_ids.ids)])
- self.assertEqual(len(traces), 3)
-
- # simulate response to mailing
- self.gateway_mail_reply_wrecord(MAIL_TEMPLATE, self.mailing_list_1.contact_ids[0], use_in_reply_to=True)
- self.gateway_mail_reply_wrecord(MAIL_TEMPLATE, self.mailing_list_1.contact_ids[1], use_in_reply_to=False)
-
- mailing_test_utms = self.env['mailing.test.utm'].search([('name', '=', 'Re: %s' % subject)])
- self.assertEqual(len(mailing_test_utms), 2)
- for test_utm in mailing_test_utms:
- self.assertEqual(test_utm.campaign_id, campaign)
- self.assertEqual(test_utm.source_id, source)
- self.assertEqual(test_utm.medium_id, medium)
diff --git a/addons/test_mass_mailing/tests/test_mailing_test.py b/addons/test_mass_mailing/tests/test_mailing_test.py
new file mode 100644
index 00000000000..33c0419af07
--- /dev/null
+++ b/addons/test_mass_mailing/tests/test_mailing_test.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.test_mass_mailing.tests.common import TestMassMailCommon
+from odoo.tests.common import users
+from odoo.tools import mute_logger
+
+
+class TestMailingTest(TestMassMailCommon):
+
+ @users('user_marketing')
+ @mute_logger('odoo.addons.mail.models.mail_render_mixin')
+ def test_mailing_test_button(self):
+ mailing = self.env['mailing.mailing'].create({
+ 'name': 'TestButton',
+ 'subject': 'Subject ${object.name}',
+ 'preview': 'Preview ${object.name}',
+ 'state': 'draft',
+ 'mailing_type': 'mail',
+ 'body_html': 'Hello ${object.name} ',
+ 'mailing_model_id': self.env['ir.model']._get('res.partner').id,
+ })
+ mailing_test = self.env['mailing.mailing.test'].create({
+ 'email_to': 'test@test.com',
+ 'mass_mailing_id': mailing.id,
+ })
+
+ with self.mock_mail_gateway():
+ mailing_test.send_mail_test()
+
+ # Test if bad jinja in the subject raises an error
+ mailing.write({'subject': 'Subject ${object.name_id.id}'})
+ with self.mock_mail_gateway(), self.assertRaises(Exception):
+ mailing_test.send_mail_test()
+
+ # Test if bad jinja in the body raises an error
+ mailing.write({
+ 'subject': 'Subject ${object.name}',
+ 'body_html': 'Hello ${object.name_id.id} ',
+ })
+ with self.mock_mail_gateway(), self.assertRaises(Exception):
+ mailing_test.send_mail_test()
+
+ # Test if bad jinja in the preview raises an error
+ mailing.write({
+ 'body_html': 'Hello ${object.name} ',
+ 'preview': 'Preview ${object.name_id.id}',
+ })
+ with self.mock_mail_gateway(), self.assertRaises(Exception):
+ mailing_test.send_mail_test()
diff --git a/addons/test_mass_mailing/tests/test_performance.py b/addons/test_mass_mailing/tests/test_performance.py
index 127857c4d4f..33ea1885522 100644
--- a/addons/test_mass_mailing/tests/test_performance.py
+++ b/addons/test_mass_mailing/tests/test_performance.py
@@ -45,7 +45,7 @@ class TestMassMailPerformance(TestMassMailPerformanceBase):
'name': 'Test',
'subject': 'Test',
'body_html': 'Hello quuxUnsubscribe ',
- 'reply_to_mode': 'email',
+ 'reply_to_mode': 'new',
'mailing_model_id': self.ref('test_mass_mailing.model_mailing_performance'),
'mailing_domain': [('id', 'in', self.mm_recs.ids)],
})
@@ -85,7 +85,7 @@ class TestMassMailBlPerformance(TestMassMailPerformanceBase):
'name': 'Test',
'subject': 'Test',
'body_html': 'Hello quuxUnsubscribe ',
- 'reply_to_mode': 'email',
+ 'reply_to_mode': 'new',
'mailing_model_id': self.ref('test_mass_mailing.model_mailing_performance_blacklist'),
'mailing_domain': [('id', 'in', self.mm_recs.ids)],
})
diff --git a/addons/website_form/controllers/main.py b/addons/website_form/controllers/main.py
index 3d3bdb87812..5a60a7e60a3 100644
--- a/addons/website_form/controllers/main.py
+++ b/addons/website_form/controllers/main.py
@@ -223,7 +223,6 @@ class WebsiteForm(http.Controller):
'body': nl2br(custom_content),
'model': model_name,
'message_type': 'comment',
- 'no_auto_thread': False,
'res_id': record.id,
}
mail_id = request.env['mail.message'].with_user(SUPERUSER_ID).create(values)
@@ -258,7 +257,6 @@ class WebsiteForm(http.Controller):
'body': _('Attached files : '),
'model': model_name,
'message_type': 'comment',
- 'no_auto_thread': False,
'res_id': id_record,
'attachment_ids': [(6, 0, orphan_attachment_ids)],
'subtype_id': request.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment'),
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 5c867047313..6e3433e9fa7 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -109,7 +109,6 @@ class WebsiteSaleForm(WebsiteForm):
'body': nl2br(data['custom']),
'model': 'sale.order',
'message_type': 'comment',
- 'no_auto_thread': False,
'res_id': order.id,
}
request.env['mail.message'].with_user(SUPERUSER_ID).create(values)
|
|