Amit Dodiya (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/6.1-opw-579592-ado into 
lp:openobject-addons/6.1.

Requested reviews:
  Xavier ALT (OpenERP) (xal-openerp)
  Naresh(OpenERP) (nch-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-579592-ado/+merge/128480

Hello,

"[FIX] outlookplugin64_bit gives traceback while clicking on document button on 
office2010_64bit"

Steps:
1). Install OutlookPluginSetup64-bit and configure with Office 2010 64-bit
2). Now try to use the document button on outlook it gives error.

Thanks,
Amit
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-579592-ado/+merge/128480
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.1-opw-579592-ado.
=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2012-07-27 13:50:07 +0000
+++ mail/mail_message.py	2012-10-08 12:45:16 +0000
@@ -437,7 +437,8 @@
             if 'text/html' in msg.get('content-type', ''):
                 msg['body_html'] =  body
                 msg['subtype'] = 'html'
-                body = tools.html2plaintext(body)
+                if msg['body_html']!='':
+                    body = tools.html2plaintext(body)
             msg['body_text'] = tools.ustr(body, encoding, errors='replace')
 
         attachments = []

=== modified file 'plugin/plugin_handler.py'
--- plugin/plugin_handler.py	2011-12-26 17:12:29 +0000
+++ plugin/plugin_handler.py	2012-10-08 12:45:16 +0000
@@ -44,11 +44,11 @@
         url = ""
         name = ""
         msg = mail_message_obj.parse_message(email)
-        references = [msg.get('message-id')]
+        references = msg.get('message-id')
         refs =  msg.get('references',False)
         if refs:
             references.extend(refs.split())
-        msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
+        msg_ids = mail_message_obj.search(cr, uid, [('message_id','=',references)])
         if msg_ids:
             msg = mail_message_obj.browse(cr, uid, msg_ids[0])
             res_id = msg.res_id

=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi' (properties changed: -x to +x)
Binary files plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi	2012-02-16 17:21:36 +0000 and plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi	2012-10-08 12:45:16 +0000 differ
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to