credativ team mailing list archive

["Stefan Rijnhart \(Therp\)" <stefan@xxxxxxxx>]

Stefan Rijnhart (Therp) has proposed merging lp:~therp-nl/openupgrade-addons/7.0-mail-various-fixes into lp:openupgrade-addons.

Requested reviews:
  OpenUpgrade Committers (openupgrade-committers)

For more details, see:
https://code.launchpad.net/~therp-nl/openupgrade-addons/7.0-mail-various-fixes/+merge/184262
-- 
https://code.launchpad.net/~therp-nl/openupgrade-addons/7.0-mail-various-fixes/+merge/184262
Your team OpenUpgrade Committers is requested to review the proposed merge of lp:~therp-nl/openupgrade-addons/7.0-mail-various-fixes into lp:openupgrade-addons.

=== modified file 'mail/migrations/7.0.1.0/post-migration.py'
--- mail/migrations/7.0.1.0/post-migration.py	2013-08-02 11:29:45 +0000
+++ mail/migrations/7.0.1.0/post-migration.py	2013-09-06 11:55:26 +0000
@@ -24,11 +24,13 @@
 from openerp import pooler, SUPERUSER_ID
 from openerp.tools.mail import html_sanitize, plaintext2html
 from openerp.openupgrade import openupgrade
+from openerp.openupgrade import openupgrade_70
 
 logger = logging.getLogger('OpenUpgrade (mail)')
 
 subtype_mapping = {
     'plain': (openupgrade.get_legacy_name('body_text'), plaintext2html),
+    'mixed': (openupgrade.get_legacy_name('body_text'), plaintext2html),
     'html': (openupgrade.get_legacy_name('body_html'), html_sanitize),
     }
 
@@ -68,7 +70,7 @@
 
     for message_id in message_ids:
         message = message_obj.read(
-            cr, SUPERUSER_ID, message_id, ['model', 'res_id', 'user_id'])
+            cr, SUPERUSER_ID, message_id, ['model', 'res_id', 'user_id', 'email_from'])
     
         # Set message type to notification
         write_vals = {
@@ -76,7 +78,7 @@
             }
         # Convert user_id to author partner
         if user_ids[message['id']]:
-            write_vals['author_id'] = openupgrade.get_partner_id_from_user_id(
+            write_vals['author_id'] = openupgrade_70.get_partner_id_from_user_id(
                 cr, user_ids[message['id']])
         message_obj.write(cr, SUPERUSER_ID, message['id'], write_vals)
         
@@ -94,11 +96,13 @@
                     """, (name, message['id']))
             
         mail_id = mail_obj.create(
-            cr, SUPERUSER_ID,
-            {'mail_message_id': message['id']})
+            cr, SUPERUSER_ID, {
+                'mail_message_id': message['id'],
+                'email_from': message['email_from'],
+                })
 
     # Copy legacy fields from message table to mail table
-    cr.execute(
+    openupgrade.logged_query(cr,
         """
         UPDATE mail_mail
         SET body_html = msg.body,
@@ -123,7 +127,7 @@
 
     # Migrate m2o partner_id to m2m partner_ids
     openupgrade.m2o_to_m2m(
-        cr, 'mail.message', 'mail_message', 'partner_ids',
+        cr, pool.get('mail.message'), 'mail_message', 'partner_ids',
         openupgrade.get_legacy_name('partner_id'))