Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-584763-rgo into lp:openobject-addons/6.1

  1. 6.1-opw-584763-rgo
  2. Merge into 6.1
Proposed by Ravi Gohil (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-584763-rgo
Merge into: lp:openobject-addons/6.1
Diff against target: 39 lines (+11/-2)
2 files modified
mail/mail_message.py (+2/-1)
plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs (+9/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-584763-rgo
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+156799@code.launchpad.net

Description of the change

Hello,

This branch fixes the issue mentioned in bug report lp:931523, ie. when clicking on "Documents" button of OpenERP Outlook addin(System: Windowns-7 64-bit, Outlook-2007 32-bit) it throws error: "fault response contains string calue where integer expected [fault response : struct mapped to type Fault : member faultCode mapped to type Int32]"

Fix backported from lp:~openerp-dev/openobject-addons/trunk-bug-931523-nco

Kindly review the fix.

Thanks.

To post a comment you must log in.

Unmerged revisions

7199. By Ravi Gohil (OpenERP)

[FIX] plugin_outlook: Rebuild the outlook plugin to fix the issue which was faced when clicking on 'Documents' button of OpenERP outlook addin. (Maintenance Case: 584763)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mail/mail_message.py'
2--- mail/mail_message.py 2012-09-24 14:02:33 +0000
3+++ mail/mail_message.py 2013-04-03 10:34:24 +0000
4@@ -437,7 +437,8 @@
5 if 'text/html' in msg.get('content-type', ''):
6 msg['body_html'] = body
7 msg['subtype'] = 'html'
8- body = tools.html2plaintext(body)
9+ if msg['body_html']!='':
10+ body = tools.html2plaintext(body)
11 msg['body_text'] = tools.ustr(body, encoding, errors='replace')
12
13 attachments = []
14
15=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs'
16--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2011-12-09 14:28:39 +0000
17+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2013-04-03 10:34:24 +0000
18@@ -144,7 +144,15 @@
19 OpenERPConnect openerp_connect = openerp_outlook.Connection;
20 ArrayList args = new ArrayList();
21 Hashtable vals = new Hashtable();
22- string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
23+ string email;
24+ if (Tools.GetHeader(mail) != null)
25+ {
26+ email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
27+ }
28+ else
29+ {
30+ email = "";
31+ }
32 args.Add(model);
33 args.Add(email.ToString());
34 args.Add(thread_id);
35
36=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi'
37Binary files plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi 2012-02-16 17:21:36 +0000 and plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi 2013-04-03 10:34:24 +0000 differ
38=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi'
39Binary 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 2013-04-03 10:34:24 +0000 differ