diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml index eb06b5c4..4d95853b 100644 --- a/addons/account/views/res_config_settings_views.xml +++ b/addons/account/views/res_config_settings_views.xml @@ -135,7 +135,7 @@ -
+
diff --git a/addons/mail/tests/test_mail_gateway.py b/addons/mail/tests/test_mail_gateway.py index 3fffe9a9..c5b4c874 100644 --- a/addons/mail/tests/test_mail_gateway.py +++ b/addons/mail/tests/test_mail_gateway.py @@ -10,7 +10,7 @@ from flectra.tools import mute_logger MAIL_TEMPLATE = """Return-Path: To: {to} cc: {cc} -Received: by mail1.openerp.com (Postfix, from userid 10002) +Received: by mail1.flectra.com (Postfix, from userid 10002) id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST) From: {email_from} Subject: {subject} @@ -569,7 +569,6 @@ class TestMailgateway(TestMail): MAIL_TEMPLATE, to='erroneous@example.com', extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % self.fake_email.message_id, msg_id='<1198923581.41972151344608186800.JavaMail.4@agrolait.com>') - self.assertEqual(len(self.test_public.message_ids), 2, 'message_process: group should contain one new message') self.assertEqual(len(self.fake_email.child_ids), 1, 'message_process: new message should be children of the existing one') @@ -582,7 +581,6 @@ class TestMailgateway(TestMail): extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % self.fake_email.message_id, msg_id='<1198923581.41972151344608186800.JavaMail.4@agrolait.com>', target_model='mail.channel') - self.assertEqual(len(self.test_public.message_ids), 1, 'message_process: group should not contain new message') self.assertEqual(len(self.fake_email.child_ids), 0, 'message_process: original email should not contain childs') self.assertEqual(res_test.name, 'My Dear Forward') diff --git a/flectra/tools/mail.py b/flectra/tools/mail.py index 9e39bcf2..be0c7988 100644 --- a/flectra/tools/mail.py +++ b/flectra/tools/mail.py @@ -421,8 +421,8 @@ command_re = re.compile("^Set-([a-z]+) *: *(.+)$", re.I + re.UNICODE) # Updated in 7.0 to match the model name as well # Typical form of references is # group(1) = the record ID ; group(2) = the model (if any) ; group(3) = the domain -reference_re = re.compile("<.*-open(?:object|erp)-(\\d+)(?:-([\w.]+))?[^>]*@([^>]*)>", re.UNICODE) -discussion_re = re.compile("<.*-open(?:object|erp)-private[^>]*@([^>]*)>", re.UNICODE) +reference_re = re.compile("<.*-flectra-(\\d+)(?:-([\w.]+))?[^>]*@([^>]*)>", re.UNICODE) +discussion_re = re.compile("<.*-flectra-private[^>]*@([^>]*)>", re.UNICODE) mail_header_msgid_re = re.compile('<[^<>]+>')