[MERGE] lp:931523 (fix error message when pushing on Documents)
bzr revid: rco@openerp.com-20120222153220-0ezmr1as14egzh18
This commit is contained in:
commit
f266fa4c53
|
@ -417,7 +417,8 @@ class mail_message(osv.osv):
|
||||||
if 'text/html' in msg.get('content-type', ''):
|
if 'text/html' in msg.get('content-type', ''):
|
||||||
msg['body_html'] = body
|
msg['body_html'] = body
|
||||||
msg['subtype'] = 'html'
|
msg['subtype'] = 'html'
|
||||||
body = tools.html2plaintext(body)
|
if body:
|
||||||
|
body = tools.html2plaintext(body)
|
||||||
msg['body_text'] = tools.ustr(body, encoding)
|
msg['body_text'] = tools.ustr(body, encoding)
|
||||||
|
|
||||||
attachments = []
|
attachments = []
|
||||||
|
|
|
@ -144,7 +144,16 @@ namespace OpenERPOutlookPlugin
|
||||||
OpenERPConnect openerp_connect = openerp_outlook.Connection;
|
OpenERPConnect openerp_connect = openerp_outlook.Connection;
|
||||||
ArrayList args = new ArrayList();
|
ArrayList args = new ArrayList();
|
||||||
Hashtable vals = new Hashtable();
|
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(model);
|
||||||
args.Add(email.ToString());
|
args.Add(email.ToString());
|
||||||
args.Add(thread_id);
|
args.Add(thread_id);
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
<IncrementalBuild>false</IncrementalBuild>
|
<IncrementalBuild>false</IncrementalBuild>
|
||||||
<RegisterForComInterop>true</RegisterForComInterop>
|
<RegisterForComInterop>true</RegisterForComInterop>
|
||||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugSymbols>false</DebugSymbols>
|
<DebugSymbols>false</DebugSymbols>
|
||||||
|
@ -241,12 +242,6 @@
|
||||||
<Content Include="Resources\Success.gif" />
|
<Content Include="Resources\Success.gif" />
|
||||||
<Content Include="Resources\Task.png" />
|
<Content Include="Resources\Task.png" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\OpenERPClient\OpenERPClient.csproj">
|
|
||||||
<Project>{8E62B8DF-E3A2-4429-A820-FB8A31C2EB00}</Project>
|
|
||||||
<Name>OpenERPClient</Name>
|
|
||||||
</ProjectReference>
|
|
||||||
</ItemGroup>
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||||
<Visible>False</Visible>
|
<Visible>False</Visible>
|
||||||
|
@ -264,6 +259,12 @@
|
||||||
<Install>true</Install>
|
<Install>true</Install>
|
||||||
</BootstrapperPackage>
|
</BootstrapperPackage>
|
||||||
</ItemGroup>
|
</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" />
|
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue