Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-931523-nco into
lp:openobject-addons.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-931523-nco/+merge/93568
Hello sir,
I have fix the Outlook-Plugin on a x64-System with Outlook 2007
error-message when push the button: "Documents".
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-931523-nco/+merge/93568
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-931523-nco.
=== modified file 'mail/mail_message.py'
--- mail/mail_message.py 2012-01-31 13:36:57 +0000
+++ mail/mail_message.py 2012-02-17 14:09:21 +0000
@@ -417,7 +417,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)
attachments = []
=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs' (properties changed: -x to +x)
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2011-12-09 14:28:39 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs 2012-02-17 14:09:21 +0000
@@ -144,7 +144,16 @@
OpenERPConnect openerp_connect = openerp_outlook.Connection;
ArrayList args = new ArrayList();
Hashtable vals = new Hashtable();
- string email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+ string email;
+ if (Tools.GetHeader(mail)!= null)
+ {
+ email = Tools.GetHeader(mail); //TODO: Outlook.MailItem Should be Converted into MIME Message
+ }
+ else
+ {
+ email = "";
+ }
+
args.Add(model);
args.Add(email.ToString());
args.Add(thread_id);
=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj' (properties changed: -x to +x)
--- plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj 2011-12-12 16:00:27 +0000
+++ plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj 2012-02-17 14:09:21 +0000
@@ -44,6 +44,7 @@
<IncrementalBuild>false</IncrementalBuild>
<RegisterForComInterop>true</RegisterForComInterop>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@@ -242,12 +243,6 @@
<Content Include="Resources\Task.png" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
- <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
- <Name>OpenERPClient</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
@@ -264,6 +259,12 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
+ <Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
+ <Name>OpenERPClient</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>
<PreBuildEvent>
=== modified file 'plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.csproj.user' (properties changed: -x to +x)
=== 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-02-17 14:09:21 +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
