Merge lp:~openerp-dev/openobject-addons/trunk-fetchmail-inbox-tde into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

Mail: improve incoming/outgoing emails behavior
Main:
- updated overall code to match the new mail openerp tools
- message_route: after checking the headers to find if the incoming email is a reply in an existing discussion, it checks whether the email is a reply to a private discussion (without model, res_id), based on the message_id of the mail; it then relies on the aliases then fetchmail, as before
- incoming emails and quick posting through Chatter now calls message_post_user_api (based on old message_post_api), that performs some things the composer do on its side (adding recipients of a replied message, cleaning the content)
Misc:
- general: updated modules according to the new tools mail functions
- general: message related to a new app installation now have a comment subtype, meaning they will effectively be pushed
- mail: improved set_message_read, fixed a bug with message_id
- fetchmail: fixed a bug in fetchmail module about non-existing variable
- portal: updated demo data

=== modified file 'account_accountant/account_accountant_data.xml'
--- account_accountant/account_accountant_data.xml	2012-10-16 11:23:23 +0000
+++ account_accountant/account_accountant_data.xml	2012-11-14 14:39:22 +0000
@@ -26,12 +26,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Accounting and Finance application installed!</field>
-            <field name="body"><![CDATA[
-                With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.
-
-<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>
-            ]]></field>
+            <field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial  data, and can setup analytic accounting, forecast taxes, control  budgets, easily create and send invoices, record bank statements, etc.</p>
+<p>The accounting features are fully integrated  with other OpenERP applications to automate all your processes:  creation of customer invoices, control of supplier invoices,  point-of-sale integration, automated follow-ups, etc.</p>]]></field>
         </record>
     </data>
 </openerp>
 
=== modified file 'account_voucher/account_voucher_data.xml'
--- account_voucher/account_voucher_data.xml	2012-10-02 20:40:23 +0000
+++ account_voucher/account_voucher_data.xml	2012-11-14 14:39:22 +0000
@@ -7,12 +7,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">eInvoicing &amp; Payments application installed!</field>
-            <field name="body"><![CDATA[
-                OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.  
-
-<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>
-            ]]></field>
+            <field name="body"><![CDATA[<p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>
+<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>]]></field>
         </record>
 
         <!-- mail: subtypes -->
 
=== modified file 'crm/crm_data.xml'
--- crm/crm_data.xml	2012-09-17 06:57:40 +0000
+++ crm/crm_data.xml	2012-11-14 14:39:22 +0000
@@ -58,9 +58,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">CRM application installed!</field>
-            <field name="body">From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
-To manage quotations and sale orders, install the "Sales Management" application.</field>
+            <field name="body"><![CDATA[<p>From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.</p>
+<br />To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
         </record>
 
         <record model="mail.alias" id="default_sales_alias">
 
=== modified file 'email_template/email_template.py'
--- email_template/email_template.py	2012-11-07 11:39:25 +0000
+++ email_template/email_template.py	2012-11-14 14:39:22 +0000
@@ -28,8 +28,6 @@
 from osv import fields
 import tools
 from tools.translate import _
-from tools.html_sanitize import html_sanitize
-from tools import append_content_to_html
 from urllib import quote as quote
 _logger = logging.getLogger(__name__)
 
@@ -293,10 +291,10 @@
                                                  or False
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_html'] = append_content_to_html(values['body_html'], signature)
+            values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
 
         if values['body_html']:
-            values['body'] = html_sanitize(values['body_html'])
+            values['body'] = tools.html_sanitize(values['body_html'])
 
         values.update(mail_server_id=template.mail_server_id.id or False,
                       auto_delete=template.auto_delete,
 
=== modified file 'email_template/tests/test_mail.py'
--- email_template/tests/test_mail.py	2012-11-13 13:10:44 +0000
+++ email_template/tests/test_mail.py	2012-11-14 14:39:22 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 import base64
-from openerp.addons.mail.tests import test_mail
-
-
-class test_message_compose(test_mail.TestMailMockups):
+from openerp.addons.mail.tests import test_mail_mockup
+
+
+class test_message_compose(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_message_compose, self).setUp()
@@ -52,8 +52,8 @@
         # Mail data
         _subject1 = 'Pigs'
         _subject2 = 'Bird'
-        _body_html1 = 'Fans of Pigs, unite !\n<pre>Admin</pre>\n'
-        _body_html2 = 'I am angry !\n<pre>Admin</pre>\n'
+        _body_html1 = 'Fans of Pigs, unite !\n<p>Admin</p>\n'
+        _body_html2 = 'I am angry !\n<p>Admin</p>\n'
         _attachments = [
             {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
             {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
 
=== modified file 'fetchmail/fetchmail.py'
--- fetchmail/fetchmail.py	2012-10-25 13:09:30 +0000
+++ fetchmail/fetchmail.py	2012-11-14 14:39:22 +0000
@@ -243,20 +243,20 @@
 
     def create(self, cr, uid, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = fetchmail_server_id
-        res = super(mail_mail,self).create(cr, uid, values, context=context)
+        res = super(mail_mail, self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
-            values['fetchmail_server_id'] = server_id
-        res = super(mail_mail,self).write(cr, uid, ids, values, context=context)
+            values['fetchmail_server_id'] = fetchmail_server_id
+        res = super(mail_mail, self).write(cr, uid, ids, values, context=context)
         return res
 
 
 
=== modified file 'hr/hr_data.xml'
--- hr/hr_data.xml	2012-08-30 14:18:52 +0000
+++ hr/hr_data.xml	2012-11-14 14:39:22 +0000
@@ -6,11 +6,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Employee Directory application installed!</field>
-            <field name="body">Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.
-
-More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
-Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</field>
+            <field name="body"><![CDATA[<p>Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.</p>
+<p>More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
+Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
         </record>
 
         <record id="employee" model="hr.employee">
 
=== modified file 'hr_evaluation/hr_evaluation_data.xml'
--- hr_evaluation/hr_evaluation_data.xml	2012-09-20 09:09:11 +0000
+++ hr_evaluation/hr_evaluation_data.xml	2012-11-14 14:39:22 +0000
@@ -11,9 +11,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Employee Appraisals application installed!</field>
-            <field name="body">Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels.
-Evaluations filled by employees may be exported as pdf files.</field>
+            <field name="body"><![CDATA[<p>Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels. Evaluations filled by employees may be exported as pdf files.</p>]]></field>
         </record>
 
         <record id="survey_2" model="survey">
 
=== modified file 'hr_expense/hr_expense_data.xml'
--- hr_expense/hr_expense_data.xml	2012-08-30 14:18:52 +0000
+++ hr_expense/hr_expense_data.xml	2012-11-14 14:39:22 +0000
@@ -6,10 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Expense Management application installed!</field>
-            <field name="body">Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.
-
-This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</field>
+            <field name="body"><![CDATA[<p>Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.</p>
+<p>This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</p>]]></field>
         </record>
 
         <!-- Resource: product.uom.categ -->
 
=== modified file 'hr_holidays/hr_holidays_data.xml'
--- hr_holidays/hr_holidays_data.xml	2012-10-02 20:40:23 +0000
+++ hr_holidays/hr_holidays_data.xml	2012-11-14 14:39:22 +0000
@@ -11,9 +11,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Leave Management application installed!</field>
-            <field name="body">Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.
-Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</field>
+            <field name="body"><![CDATA[<p>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.</p>
+<p>Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</p>]]></field>
         </record>
 
 
 
=== modified file 'hr_recruitment/hr_recruitment_data.xml'
--- hr_recruitment/hr_recruitment_data.xml	2012-10-08 09:50:03 +0000
+++ hr_recruitment/hr_recruitment_data.xml	2012-11-14 14:39:22 +0000
@@ -6,10 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Recruitment Process application installed!</field>
-            <field name="body">Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.
-
-You can automatically receive job application though an email gateway, see the Human Resources settings.</field>
+            <field name="body"><![CDATA[<p>Manage job positions and your company's recruitment process.  This application is integrated with the Survey application to help you define interviews for different jobs.</p>
+<p>You can automatically receive job application though an email gateway, see the Human Resources settings.</p>]]></field>
         </record>
 
     <!-- Meeting Types (for interview meetings) -->
 
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_data.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_data.xml	2012-09-24 08:23:00 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_data.xml	2012-11-14 14:39:22 +0000
@@ -6,8 +6,9 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Timesheet Validation application installed!</field>
-            <field name="body">From the top menu "Human Resources", enter and validate timesheets and attendances.</field>
+            <field name="body"><![CDATA[<p>From the top menu "Human Resources", enter and validate timesheets and attendances.</p>]]></field>
         </record>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
 
=== modified file 'mail/data/mail_demo.xml'
--- mail/data/mail_demo.xml	2012-11-12 15:27:53 +0000
+++ mail/data/mail_demo.xml	2012-11-14 14:39:22 +0000
@@ -11,44 +11,48 @@
         <record id="message_blogpost0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
-            <field name="body">Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</field>
+            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.</p>]]></field>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body"><![CDATA[Great.]]></field>
+            <field name="body"><![CDATA[<p>Oh, I had forgotten. This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Thanks, but where is Christine's office, if I may ask? (I'm new here)</field>
+            <field name="body"><![CDATA[<p>Thanks! Could you please remind me where is Christine's office, if I may ask? I'm new here!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <!-- This one is starred for having mailboxes with demo data -->
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Building B3, second floor on the right :-)</field>
+            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-).</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
             <field name="favorite_user_ids" eval="[(6, 0, [ref('base.user_root'), ref('base.user_demo')])]"/>
         </record>
         <record id="message_blogpost0_comment3" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="body">Great news, I need to buy a new fridge, I think I can pay it with the eco-vouchers!</field>
+            <field name="body"><![CDATA[<p>Many thanks. Actually that's good news, next year I'll have to buy a new fridge, I think I will pay it with the eco-vouchers!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
             <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
         <!-- Demo user and admin conversation -->
 
=== modified file 'mail/data/mail_group_data.xml'
--- mail/data/mail_group_data.xml	2012-11-12 23:04:18 +0000
+++ mail/data/mail_group_data.xml	2012-11-14 14:39:22 +0000
@@ -17,12 +17,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
-            <field name="body">Your homepage is a summary of messages you received and key information about documents you follow.
-
-The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
-
-To setup your preferences (name, email signature, avatar), click on the top right corner.</field>
+            <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.<br />
+The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.<br />
+To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>
 </openerp>
 
=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py	2012-11-12 13:17:59 +0000
+++ mail/mail_followers.py	2012-11-14 14:39:22 +0000
@@ -84,11 +84,13 @@
         return False
 
     def set_message_read(self, cr, uid, msg_ids, read=None, context=None):
-        """ Set a message and its child messages as (un)read for uid.
+        """ Set messages as (un)read. Technically, the notifications related
+            to uid are set to (un)read. If for some msg_ids there are missing
+            notifications (i.e. due to load more or thread parent fetching),
+            they are created.
 
-            :param bool read: read / unread
+            :param bool read: (un)read notification
         """
-        # TDE note: use child_of or front-end send correct values ?
         user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         notif_ids = self.search(cr, uid, [
             ('partner_id', '=', user_pid),
@@ -100,10 +102,9 @@
             return self.write(cr, uid, notif_ids, {'read': read}, context=context)
 
         # some messages do not have notifications: find which one, create notification, update read status
-        exist_notification = dict.fromkeys(msg_ids, False)
-        for notification in self.browse(cr, uid, notif_ids, context=context):
-            exist_notification[notification.message_id.id] = True
-        for msg_id in exist_notification.keys():
+        notified_msg_ids = [notification.message_id.id for notification in self.browse(cr, uid, notif_ids, context=context)]
+        to_create_msg_ids = list(set(msg_ids) - set(notified_msg_ids))
+        for msg_id in to_create_msg_ids:
             self.create(cr, uid, {'partner_id': user_pid, 'read': read, 'message_id': msg_id}, context=context)
         return self.write(cr, uid, notif_ids, {'read': read}, context=context)
 
@@ -156,10 +157,10 @@
         # add signature
         body_html = msg.body
         # if quote_context:
-        #     body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
-        signature = msg.author_id and msg.author_id.user_ids[0].signature or ''
+            # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
+        signature = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].signature or ''
         if signature:
-            body_html = tools.append_content_to_html(body_html, signature)
+            body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
 
         mail_values = {
             'mail_message_id': msg.id,
 
=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2012-11-12 14:04:08 +0000
+++ mail/mail_message.py	2012-11-14 14:39:22 +0000
@@ -25,6 +25,7 @@
 from email.header import decode_header
 from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
+from openerp.tools import html_email_clean
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -280,7 +281,7 @@
 
         return {'id': message.id,
                 'type': message.type,
-                'body': message.body,
+                'body': html_email_clean(message.body),
                 'model': message.model,
                 'res_id': message.res_id,
                 'record_name': message.record_name,
@@ -633,6 +634,8 @@
     def create(self, cr, uid, values, context=None):
         if not values.get('message_id') and values.get('res_id') and values.get('model'):
             values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
+        elif not values.get('message_id'):
+            values['message_id'] = tools.generate_tracking_message_id('private')
         newid = super(mail_message, self).create(cr, uid, values, context)
         self._notify(cr, SUPERUSER_ID, newid, context=context)
         return newid
@@ -763,7 +766,7 @@
                 ], context=context)
             fol_objs = fol_obj.read(cr, uid, fol_ids, ['partner_id'], context=context)
             partners_to_notify |= set(fol['partner_id'][0] for fol in fol_objs)
-        # when writing to a wall
+        # remove me from notified partners, unless the message is written on my own wall
         if message.get('author_id') and message.get('model') == "res.partner" and message.get('res_id') == message.get('author_id')[0]:
             partners_to_notify |= set([message.get('author_id')[0]])
         elif message.get('author_id'):
 
=== modified file 'mail/mail_thread.py'
--- mail/mail_thread.py	2012-11-12 13:10:51 +0000
+++ mail/mail_thread.py	2012-11-14 14:39:22 +0000
@@ -319,10 +319,12 @@
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
         message_id = message.get('Message-Id')
+        references = decode_header(message, 'References')
+        in_reply_to = decode_header(message, 'In-Reply-To')
 
         # 1. Verify if this is a reply to an existing thread
-        references = decode_header(message, 'References') or decode_header(message, 'In-Reply-To')
-        ref_match = references and tools.reference_re.search(references)
+        thread_references = references or in_reply_to
+        ref_match = thread_references and tools.reference_re.search(thread_references)
         if ref_match:
             thread_id = int(ref_match.group(1))
             model = ref_match.group(2) or model
@@ -333,6 +335,14 @@
                               message_id, model, thread_id, custom_values, uid)
                 return [(model, thread_id, custom_values, uid)]
 
+        # Verify this is a reply to a private message
+        message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context)
+        if message_ids:
+            message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
+                            message_id, message.id, custom_values, uid)
+            return [(False, 0, custom_values, uid)]
+
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
@@ -376,14 +386,19 @@
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
-        """Process an incoming RFC2822 email message, relying on
-           ``mail.message.parse()`` for the parsing operation,
-           and ``message_route()`` to figure out the target model.
+        """ Process an incoming RFC2822 email message, relying on
+            ``mail.message.parse()`` for the parsing operation,
+            and ``message_route()`` to figure out the target model.
 
-           Once the target model is known, its ``message_new`` method
-           is called with the new message (if the thread record did not exist)
+            Once the target model is known, its ``message_new`` method
+            is called with the new message (if the thread record did not exist)
             or its ``message_update`` method (if it did).
 
+            There is a special case where the target model is False: a reply
+            to a private message. In this case, we skip the message_new /
+            message_update step, to just post a new message using mail_thread
+            message_post.
+
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
                (may be None if a matching alias is supposed to be present)
@@ -425,15 +440,19 @@
         for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
-            model_pool = self.pool.get(model)
-            assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
-                "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (msg['message_id'], model)
-            if thread_id and hasattr(model_pool, 'message_update'):
-                model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+            if model:
+                model_pool = self.pool.get(model)
+                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
+                        (msg['message_id'], model)
+                if thread_id and hasattr(model_pool, 'message_update'):
+                    model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+                else:
+                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
             else:
-                thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-            model_pool.message_post(cr, uid, [thread_id], context=context, **msg)
+                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
+                model_pool = self.pool.get('mail.thread')
+            model_pool.message_post_user_api(cr, uid, [thread_id], context=context, content_subtype='html', **msg)
         return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
@@ -501,7 +520,7 @@
             body = tools.ustr(body, encoding, errors='replace')
             if message.get_content_type() == 'text/plain':
                 # text/plain -> <pre/>
-                body = tools.append_content_to_html(u'', body)
+                body = tools.append_content_to_html(u'', body, preserve=True)
         else:
             alternative = (message.get_content_type() == 'multipart/alternative')
             for part in message.walk():
@@ -516,7 +535,7 @@
                 # 2) text/plain -> <pre/>
                 if part.get_content_type() == 'text/plain' and (not alternative or not body):
                     body = tools.append_content_to_html(body, tools.ustr(part.get_payload(decode=True),
-                                                                         encoding, errors='replace'))
+                                                                         encoding, errors='replace'), preserve=True)
                 # 3) text/html -> raw
                 elif part.get_content_type() == 'text/html':
                     html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
@@ -556,7 +575,6 @@
         """
         msg_dict = {
             'type': 'email',
-            'subtype': 'mail.mt_comment',
             'author_id': False,
         }
         if not isinstance(message, Message):
@@ -588,7 +606,7 @@
             else:
                 msg_dict['email_from'] = message.get('from')
         partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
-        msg_dict['partner_ids'] = partner_ids
+        msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
 
         if 'Date' in message:
             date_hdr = decode(message.get('Date'))
@@ -629,7 +647,8 @@
             mail.message ID. Extra keyword arguments will be used as default
             column values for the new mail.message record.
             Auto link messages for same id and object
-            :param int thread_id: thread ID to post into, or list with one ID
+            :param int thread_id: thread ID to post into, or list with one ID;
+                if False/0, mail.message model will also be set as False
             :param str body: body of the message, usually raw HTML that will
                 be sanitized
             :param str subject: optional subject
@@ -639,10 +658,13 @@
                 ``(name,content)``, where content is NOT base64 encoded
             :return: ID of newly created mail.message
         """
-        context = context or {}
-        attachments = attachments or []
+        if context is None:
+            context = {}
+        if attachments is None:
+            attachments = {}
+
         assert (not thread_id) or isinstance(thread_id, (int, long)) or \
-            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id"
+            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id; should be 0, False, an ID or a list with one ID"
         if isinstance(thread_id, (list, tuple)):
             thread_id = thread_id and thread_id[0]
         mail_message = self.pool.get('mail.message')
@@ -682,7 +704,6 @@
             # avoid loops when finding ancestors
             processed_list = []
             if message_ids:
-                _counter, _counter_max = 0, 200
                 message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context)
                 while (message.parent_id and message.parent_id.id not in processed_list):
                     processed_list.append(message.parent_id.id)
@@ -707,18 +728,45 @@
 
         return mail_message.create(cr, uid, values, context=context)
 
-    def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None):
-        """ Wrapper on message_post, used only in Chatter (JS). The purpose is
-            to handle attachments.
-            # TDE FIXME: body is plaintext: convert it into html
+    def message_post_user_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False,
+                                attachment_ids=None, context=None, content_subtype='plaintext', **kwargs):
+        """ Wrapper on message_post, used for user input :
+            - mail gateway
+            - quick reply in Chatter (refer to mail.js), not
+                the mail.compose.message wizard
+            The purpose is to perform some pre- and post-processing:
+            - if body is plaintext: convert it into html
+            - if parent_id: handle reply to a previous message by adding the
+                parent partners to the message
+            - type and subtype: comment and mail.mt_comment by default
+            - attachment_ids: supposed not attached to any document; attach them
+                to the related document. Should only be set by Chatter.
         """
-        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment',
-                        subtype='mail.mt_comment', parent_id=parent_id, context=context)
-
-        # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
+        ir_attachment = self.pool.get('ir.attachment')
+        mail_message = self.pool.get('mail.message')
+
+        # 1. Pre-processing: body, partner_ids, type and subtype
+        if content_subtype == 'plaintext':
+            body = tools.text2html(body)
+
+        partner_ids = kwargs.pop('partner_ids', [])
+        if parent_id:
+            parent_message = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
+            partner_ids += [(4, partner.id) for partner in parent_message.partner_ids]
+            # TDE FIXME HACK: mail.thread -> private message
+            if self._name == 'mail.thread' and parent_message.author_id.id:
+                partner_ids.append((4, parent_message.author_id.id))
+
+        message_type = kwargs.pop('type', 'comment')
+        message_subtype = kwargs.pop('subtype', 'mail.mt_comment')
+
+        # 2. Post message
+        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=message_type,
+                        subtype=message_subtype, parent_id=parent_id, context=context, partner_ids=partner_ids, **kwargs)
+
+        # 3. Post-processing
+        # HACK TDE FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
         if attachment_ids:
-            ir_attachment = self.pool.get('ir.attachment')
-            mail_message = self.pool.get('mail.message')
             filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
                 ('res_model', '=', 'mail.compose.message'),
                 ('res_id', '=', 0),
 
=== modified file 'mail/res_partner.py'
--- mail/res_partner.py	2012-10-15 13:23:13 +0000
+++ mail/res_partner.py	2012-11-14 14:39:22 +0000
@@ -42,4 +42,22 @@
         'notification_email_send': lambda *args: 'comment'
     }
 
+    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        """ Override related to res.partner. In case of email message, set it as
+            private:
+            - add the target partner in the message partner_ids
+            - set thread_id as None, because this will trigger the 'private'
+                aspect of the message (model=False, res_id=False)
+        """
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        if type == 'email':
+            partner_ids = kwargs.get('partner_ids', [])
+            if thread_id not in partner_ids:
+                partner_ids.append(thread_id)
+            kwargs['partner_ids'] = partner_ids
+            return super(res_partner_mail, self).message_post(cr, uid, False, body=body, subject=subject,
+                type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'mail/security/ir.model.access.csv'
--- mail/security/ir.model.access.csv	2012-11-06 15:04:31 +0000
+++ mail/security/ir.model.access.csv	2012-11-14 14:39:22 +0000
@@ -7,12 +7,13 @@
 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
 access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
-access_mail_notification_aystem,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
+access_mail_notification_group_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
+access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
 access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
 access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
-access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
-access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
+access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
 access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0
 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
 access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
 
=== modified file 'mail/security/mail_security.xml'
--- mail/security/mail_security.xml	2012-10-19 09:59:19 +0000
+++ mail/security/mail_security.xml	2012-11-14 14:39:22 +0000
@@ -10,7 +10,7 @@
             <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
         </record>
 
-        <record id="mail_followers_read_own" model="ir.rule">
+        <record id="mail_followers_read_write_own" model="ir.rule">
             <field name="name">mail.followers: read and write its own entries</field>
             <field name="model_id" ref="model_mail_followers"/>
             <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
@@ -18,6 +18,14 @@
             <field name="perm_unlink" eval="False"/>
         </record>
 
+        <record id="mail_notification_read_write_own" model="ir.rule">
+            <field name="name">mail.notification: read and write its own entries</field>
+            <field name="model_id" ref="model_mail_notification"/>
+            <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
         <!--
         This rule can not be uncommented, because we have a more wide method in mail.message. When we implement a many2one_variable field, we will be able to uncomment this.
         <record id="mail_message_read_partner_or_author" model="ir.rule">
 
=== modified file 'mail/static/src/css/mail.css'
--- mail/static/src/css/mail.css	2012-11-13 10:35:30 +0000
+++ mail/static/src/css/mail.css	2012-11-14 14:39:22 +0000
@@ -87,6 +87,10 @@
     margin-bottom: 0px;
     margin-top: 2px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p{
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
 
 /* a) Indented Messages */
 
 
=== modified file 'mail/static/src/js/mail.js'
--- mail/static/src/js/mail.js	2012-11-13 14:57:22 +0000
+++ mail/static/src/js/mail.js	2012-11-14 14:39:22 +0000
@@ -590,7 +590,7 @@
 
             if (body.match(/\S+/)) {
                 //session.web.blockUI();
-                this.parent_thread.ds_thread.call('message_post_api', [
+                this.parent_thread.ds_thread.call('message_post_user_api', [
                         this.context.default_res_id, 
                         mail.ChatterUtils.get_text2html(body), 
                         false, 
@@ -728,7 +728,6 @@
 
     mail.ThreadMessage = mail.MessageCommon.extend({
         template: 'mail.thread.message',
-
         
         start: function () {
             this._super.apply(this, arguments);
 
=== modified file 'mail/tests/__init__.py'
--- mail/tests/__init__.py	2012-09-14 11:58:15 +0000
+++ mail/tests/__init__.py	2012-11-14 14:39:22 +0000
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from . import test_mail, test_mail_access_rights
 
 checks = [
 
=== modified file 'mail/tests/test_mail.py'
--- mail/tests/test_mail.py	2012-11-09 15:11:22 +0000
+++ mail/tests/test_mail.py	2012-11-14 14:39:22 +0000
@@ -21,8 +21,8 @@
 
 import tools
 
-from openerp.tests import common
-from openerp.tools.html_sanitize import html_sanitize
+from openerp.addons.mail.tests import test_mail_mockup
+from openerp.tools.mail import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <[e-mail]>
 To: {to}
@@ -84,43 +84,11 @@
 """
 
 
-class TestMailMockups(common.TransactionCase):
-
-    def _mock_smtp_gateway(self, *args, **kwargs):
-        return True
-
-    def _init_mock_build_email(self):
-        self._build_email_args_list = []
-        self._build_email_kwargs_list = []
-
-    def _mock_build_email(self, *args, **kwargs):
-        """ Mock build_email to be able to test its values. Store them into
-            some internal variable for latter processing. """
-        self._build_email_args_list.append(args)
-        self._build_email_kwargs_list.append(kwargs)
-        return self._build_email(*args, **kwargs)
-
-    def setUp(self):
-        super(TestMailMockups, self).setUp()
-        # Install mock SMTP gateway
-        self._init_mock_build_email()
-        self._build_email = self.registry('ir.mail_server').build_email
-        self.registry('ir.mail_server').build_email = self._mock_build_email
-        self._send_email = self.registry('ir.mail_server').send_email
-        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
-
-    def tearDown(self):
-        # Remove mocks
-        self.registry('ir.mail_server').build_email = self._build_email
-        self.registry('ir.mail_server').send_email = self._send_email
-        super(TestMailMockups, self).tearDown()
-
-
-class test_mail(TestMailMockups):
+class test_mail(test_mail_mockup.TestMailMockups):
 
     def _mock_send_get_mail_body(self, *args, **kwargs):
         # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
-        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner')
+        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner', plaintext=False)
         return body
 
     def setUp(self):
@@ -375,10 +343,10 @@
         _subject = 'Pigs'
         _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
         _body1 = 'Pigs rules'
-        _mail_body1 = 'Pigs rules\n<pre>Admin</pre>\n'
-        _mail_bodyalt1 = 'Pigs rules\nAdmin'
+        _mail_body1 = 'Pigs rules\n<div><p>Admin</p></div>\n'
+        _mail_bodyalt1 = 'Pigs rules\nAdmin\n'
         _body2 = '<html>Pigs rules</html>'
-        _mail_body2 = html_sanitize('<html>Pigs rules\n<pre>Admin</pre>\n</html>')
+        _mail_body2 = html_sanitize('<html>Pigs rules\n<div><p>Admin</p></div>\n</html>')
         _mail_bodyalt2 = 'Pigs rules\nAdmin'
         _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
 
@@ -399,7 +367,7 @@
         # Test: sent_email: email send by server: correct subject, body, body_alternative
         for sent_email in sent_emails:
             self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
-            self.assertEqual(sent_email['body'], _mail_body1 + '\n<pre>Bert Tartopoils</pre>\n', 'sent_email body incorrect')
+            self.assertEqual(sent_email['body'], _mail_body1 + '\nBert Tartopoils\n', 'sent_email body incorrect')
             # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
             # depending if you have installed beautiful soup.
             self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
 
=== modified file 'mail/tests/test_mail_access_rights.py'
--- mail/tests/test_mail_access_rights.py	2012-10-25 11:30:48 +0000
+++ mail/tests/test_mail_access_rights.py	2012-11-14 14:39:22 +0000
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests import test_mail
+from openerp.addons.mail.tests import test_mail_mockup
 from osv.orm import except_orm
 
 
-class test_mail_access_rights(test_mail.TestMailMockups):
+class test_mail_access_rights(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_mail_access_rights, self).setUp()
 
=== added file 'mail/tests/test_mail_mockup.py'
--- mail/tests/test_mail_mockup.py	1970-01-01 00:00:00 +0000
+++ mail/tests/test_mail_mockup.py	2012-11-14 14:39:22 +0000
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestMailMockups(common.TransactionCase):
+
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _init_mock_build_email(self):
+        self._build_email_args_list = []
+        self._build_email_kwargs_list = []
+
+    def _mock_build_email(self, *args, **kwargs):
+        """ Mock build_email to be able to test its values. Store them into
+            some internal variable for latter processing. """
+        self._build_email_args_list.append(args)
+        self._build_email_kwargs_list.append(kwargs)
+        return self._build_email(*args, **kwargs)
+
+    def setUp(self):
+        super(TestMailMockups, self).setUp()
+        # Install mock SMTP gateway
+        self._init_mock_build_email()
+        self._build_email = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self._send_email = self.registry('ir.mail_server').send_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+    def tearDown(self):
+        # Remove mocks
+        self.registry('ir.mail_server').build_email = self._build_email
+        self.registry('ir.mail_server').send_email = self._send_email
+        super(TestMailMockups, self).tearDown()
 
=== modified file 'mrp/mrp_data.xml'
--- mrp/mrp_data.xml	2012-10-02 20:40:23 +0000
+++ mrp/mrp_data.xml	2012-11-14 14:39:22 +0000
@@ -6,11 +6,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">MRP application installed!</field>
-            <field name="body">Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.
-This application supports complete integration and production scheduling for stockable goods, consumables, and services.
-
-From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</field>
+            <field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.<br />
+This application supports complete integration and production scheduling for stockable goods, consumables, and services.</p>
+<p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
         </record>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
 
=== modified file 'note/note.py'
--- note/note.py	2012-11-02 13:17:59 +0000
+++ note/note.py	2012-11-14 14:39:22 +0000
@@ -20,9 +20,7 @@
 ##############################################################################
 
 from openerp.osv import osv, fields
-from tools.translate import _
-import re
-from openerp.tools.misc import html2plaintext
+from openerp.tools import html2plaintext
 
 class note_stage(osv.osv):
     """ Category of Note """
 
=== modified file 'pad/pad.py'
--- pad/pad.py	2012-11-09 06:30:02 +0000
+++ pad/pad.py	2012-11-14 14:39:22 +0000
@@ -6,7 +6,7 @@
 import urllib2
 import logging
 from tools.translate import _
-from openerp.tools.misc import html2plaintext
+from openerp.tools import html2plaintext
 from py_etherpad import EtherpadLiteClient
 
 _logger = logging.getLogger(__name__)
 
=== modified file 'point_of_sale/point_of_sale_data.xml'
--- point_of_sale/point_of_sale_data.xml	2012-09-16 11:42:49 +0000
+++ point_of_sale/point_of_sale_data.xml	2012-11-14 14:39:22 +0000
@@ -20,10 +20,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Point of Sale application installed!</field>
-            <field name="body">Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.
-
-If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</field>
+            <field name="body"><![CDATA[<p>Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.</p>
+<p>If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</p>]]></field>
         </record>
 
         <record id="unreferenced_product" model="product.product">
 
=== modified file 'portal/mail_mail.py'
--- portal/mail_mail.py	2012-10-01 09:14:41 +0000
+++ portal/mail_mail.py	2012-11-14 14:39:22 +0000
@@ -36,5 +36,5 @@
         if partner:
             context = dict(context or {}, signup_valid=True)
             partner = self.pool.get('res.partner').browse(cr, uid, partner.id, context)
-            body = tools.append_content_to_html(body, "Log in our portal at: %s" % partner.signup_url)
+            body = tools.append_content_to_html(body, ("<div><p>Log in our portal at: %s</p></div>" % partner.signup_url), plaintext=False)
         return body
 
=== modified file 'portal/portal_demo.xml'
--- portal/portal_demo.xml	2012-09-20 14:57:53 +0000
+++ portal/portal_demo.xml	2012-11-14 14:39:22 +0000
@@ -1,17 +1,22 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <!-- Create a portal member attached to a partner -->
+        <!-- Create a partner, that is also a portal user -->
+        <record id="partner_demo_portal" model="res.partner">
+            <field name="name">Demo Portal User</field>
+            <field name="email">[e-mail]</field>
+            <field name="supplier" eval="False"/>
+            <field name="customer" eval="True"/>
+        </record>
         <record id="demo_user0" model="res.users">
-            <field name="name">Demo Portal User</field>
+            <field name="partner_id" ref="partner_demo_portal"/>
             <field name="login">portal</field>
             <field name="password">portal</field>
+            <field name="signature">--
+Mr Demo Portal</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
-            <field name="supplier" eval="False"/>
-            <field name="customer" eval="True"/>
-            <field name="email">[e-mail]</field>
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
@@ -24,33 +29,41 @@
             <field name="subject">Our company's first blog-post !</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Hello, and welcome to our company's portal !
-
-Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
-
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
-
-Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p>
+<p>It is a great pleasure to announce you the creation of our portal by writing this first news! As you may have seen, a new discussion group is now present under your 'My groups' menu: <b>Company's News</b>. We will post news about the company and its employees in this discussion group. Moreover, we will be able to communicate with our partners that are given the opportunity to join us in our portal.</p>
+<p>A new era of communication has begun! <b>Feel free to post your feelings about our portal by replying on this message!</b></p>]]></field>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Great first blogpost !  (first comment)]]></field>
-            <field name="parent_id" ref="message_company_news0"/>
-            <field name="type">comment</field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="partner_demo_portal"/>
+        </record>
+
+        <record id="message_company_news0_comment1" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="body"><![CDATA[<p>That's good news! As said by <i>Demo Portal User</i> in the previous post, I'm looking forward to hearing from you!</p>]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.res_partner_1"/>
         </record>
 
-        <record id="message_company_news0_comment1" model="mail.message">
+        <record id="message_company_news0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="body"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="body"><![CDATA[<p>This feature is realy great! We will be able to communicate directly to our partners!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="author_id" ref="base.partner_demo"/>
         </record>
 
 
=== modified file 'portal/tests/test_portal.py'
--- portal/tests/test_portal.py	2012-10-09 15:54:56 +0000
+++ portal/tests/test_portal.py	2012-11-14 14:39:22 +0000
@@ -19,12 +19,11 @@
 #
 ##############################################################################
 
-from openerp.addons.mail.tests import test_mail
-from openerp.tools import append_content_to_html
+from openerp.addons.mail.tests import test_mail_mockup
 from osv.orm import except_orm
 
 
-class test_portal(test_mail.TestMailMockups):
+class test_portal(test_mail_mockup.TestMailMockups):
 
     def setUp(self):
         super(test_portal, self).setUp()
 
=== modified file 'portal/wizard/portal_wizard.py'
--- portal/wizard/portal_wizard.py	2012-10-25 13:09:30 +0000
+++ portal/wizard/portal_wizard.py	2012-11-14 14:39:22 +0000
@@ -24,10 +24,9 @@
 
 from osv import osv, fields
 from tools.translate import _
-from tools.misc import email_re
+from tools import email_re
 from openerp import SUPERUSER_ID
 
-from base.res.res_partner import _lang_get
 _logger = logging.getLogger(__name__)
 
 # welcome email sent to portal users
 
=== modified file 'project/project_data.xml'
--- project/project_data.xml	2012-11-02 15:41:54 +0000
+++ project/project_data.xml	2012-11-14 14:39:22 +0000
@@ -125,11 +125,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Project Management application installed!</field>
-            <field name="body">Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.
-
-You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.
-You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</field>
+            <field name="body"><![CDATA[<p>Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.</p>
+<p>You can manage todo lists on tasks by installing the "Todo Lists" application, supporting the Getting Things Done (GTD) methodology.</p>
+<p>You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</p>]]></field>
         </record>
     </data>
 </openerp>
 
=== modified file 'project_gtd/project_gtd_data.xml'
--- project_gtd/project_gtd_data.xml	2012-08-30 14:18:52 +0000
+++ project_gtd/project_gtd_data.xml	2012-11-14 14:39:22 +0000
@@ -30,9 +30,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Todo Lists application installed!</field>
-            <field name="body">Add todo items on project tasks, to help you organize your work.
-This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</field>
+            <field name="body"><![CDATA[<p>Add todo items on project tasks, to help you organize your work.
+This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</p>]]></field>
         </record>
 
     </data>
 
=== modified file 'project_issue/project_issue_data.xml'
--- project_issue/project_issue_data.xml	2012-11-02 15:41:54 +0000
+++ project_issue/project_issue_data.xml	2012-11-14 14:39:22 +0000
@@ -36,10 +36,11 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Issue Tracker application installed!</field>
-            <field name="body">Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
+            <field name="body"><![CDATA[<p>Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.
 You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.
-Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</field>
+Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</p>]]></field>
         </record>
 
         <!-- Mail subtypes -->
 
=== modified file 'purchase/purchase_data.xml'
--- purchase/purchase_data.xml	2012-10-02 20:40:23 +0000
+++ purchase/purchase_data.xml	2012-11-14 14:39:22 +0000
@@ -7,10 +7,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Purchase Management application installed!</field>
-            <field name="body">From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.
-
-You can also manage purchase requisitions, see also the Purchase Settings.</field>
+            <field name="body"><![CDATA[<p>From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.</p>
+<p>You can also manage purchase requisitions, see also the Purchase Settings.</p>]]></field>
         </record>
 
         <record id="req_link_purchase_order" model="res.request.link">
 
=== modified file 'sale/sale_data.xml'
--- sale/sale_data.xml	2012-10-02 20:40:23 +0000
+++ sale/sale_data.xml	2012-11-14 14:39:22 +0000
@@ -38,10 +38,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Sales Management application installed!</field>
-            <field name="body">This application lets you create and send quotations and process your sales orders; from delivery to invoicing.
-
-If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</field>
+            <field name="body"><![CDATA[<p>This application lets you create and send quotations and process your sales orders; from delivery to invoicing.</p>
+<p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the &lt;i&gt;CRM&lt;/i&gt; application may be useful. Use the Settings menu to install it.</p>]]></field>
         </record>
     </data>
 </openerp>
 
=== modified file 'stock/stock_data.xml'
--- stock/stock_data.xml	2012-10-02 20:40:23 +0000
+++ stock/stock_data.xml	2012-11-14 14:39:22 +0000
@@ -6,9 +6,10 @@
             <field name="model">mail.group</field>
             <field name="res_id" ref="mail.group_all_employees"/>
             <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Warehouse Management application installed!</field>
-            <field name="body">Manage your product inventoy and stock locations: you can control stock moves history and planning,
-watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</field>
+            <field name="body"><![CDATA[<p>Manage your product inventoy and stock locations: you can control stock moves history and planning,
+watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</p>]]></field>
         </record>
 
         <record id="stock_journal_sequence" model="ir.sequence">