[IMP]:Outlook blugin for 32 and 64bit
bzr revid: aja@tinyerp.com-20130220050050-oqk1tvi41uib20fc
This commit is contained in:
parent
fcc20d8de2
commit
2264cf3f21
|
@ -95,14 +95,13 @@ class plugin_handler(osv.osv_memory):
|
|||
msg = self.pool.get('mail.thread').message_parse(cr, uid, email)
|
||||
message_id = msg.get('message-id')
|
||||
mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
|
||||
|
||||
if message_id and mail_ids :
|
||||
mail_record = mail_message.browse(cr, uid, mail_ids)[0]
|
||||
res_id = mail_record.res_id
|
||||
notify = "Email already pushed"
|
||||
elif res_id == 0:
|
||||
if model == 'res.partner':
|
||||
notify = 'User the Partner button to create a new partner'
|
||||
notify = 'Use the Partner button to create a new partner'
|
||||
else:
|
||||
res_id = model_obj.message_process(cr, uid, model, email)
|
||||
notify = "Mail successfully pushed, a new %s has been created " % model
|
||||
|
@ -155,6 +154,7 @@ class plugin_handler(osv.osv_memory):
|
|||
push_mail = self.push_message(cr, uid, model, headers, res_id)
|
||||
res_id = push_mail[1]
|
||||
model = push_mail[0]
|
||||
notify = push_mail[3]
|
||||
for name in attachments.keys():
|
||||
attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', model), ('res_id', '=', res_id), ('datas_fname', '=', name)])
|
||||
if attachment_ids:
|
||||
|
@ -166,4 +166,4 @@ class plugin_handler(osv.osv_memory):
|
|||
if mail_ids:
|
||||
ids = mail_message.write(cr, uid, mail_ids[0], { 'attachment_ids': [(6, 0, attach_ids)],'body':body,'body_html':body_html})
|
||||
url = self._make_url(cr, uid, res_id, model)
|
||||
return (model, res_id, url)
|
||||
return (model, res_id, url,notify)
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
|
@ -29,7 +30,6 @@
|
|||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
|
@ -53,9 +53,8 @@
|
|||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CookComputing.XmlRpcV2, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\OpenERPOutlookPlugin\bin\Release\CookComputing.XmlRpcV2.dll</HintPath>
|
||||
<Reference Include="CookComputing.XmlRpcV2">
|
||||
<HintPath>..\CookComputing.XmlRpcV2.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core">
|
||||
|
@ -81,7 +80,7 @@
|
|||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
|
@ -91,7 +90,7 @@
|
|||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 10.00
|
||||
# Visual Studio 2008
|
||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
||||
# Visual Studio 2010
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenERPOutlookPlugin", "OpenERPOutlookPlugin\OpenERPOutlookPlugin.csproj", "{F4B2219B-F235-400F-81B4-92F15250BBA4}"
|
||||
EndProject
|
||||
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "OpenERPOutlookPluginSetup", "OpenERPOutlookPluginSetup\OpenERPOutlookPluginSetup.vdproj", "{96333293-0156-4998-9065-42721CEB0368}"
|
||||
|
|
|
@ -303,6 +303,7 @@ namespace OpenERPOutlookPlugin
|
|||
|
||||
foreach (outlook.MailItem mailitem in Tools.MailItems())
|
||||
{
|
||||
|
||||
|
||||
Object[] contact = Cache.OpenERPOutlookPlugin.RedirectPartnerPage(mailitem);
|
||||
if ((int)contact[1] > 0)
|
||||
|
|
|
@ -95,7 +95,6 @@ namespace OpenERPOutlookPlugin
|
|||
/*
|
||||
* Will open the url into the web browser.
|
||||
*/
|
||||
|
||||
System.Diagnostics.Process.Start(web_url.ToString());
|
||||
}
|
||||
|
||||
|
@ -163,9 +162,16 @@ namespace OpenERPOutlookPlugin
|
|||
args.Add(attachments);
|
||||
object push_mail = this.Connection.Execute("plugin.handler", "push_message_outlook", args.ToArray());
|
||||
object[] push = (object[])push_mail;
|
||||
this.RedirectWeb(push[2].ToString());
|
||||
return true;
|
||||
if (Convert.ToInt32(push[1]) == 0)
|
||||
{
|
||||
MessageBox.Show(push[3].ToString());
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
this.RedirectWeb(push[2].ToString());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
public long CreatePartnerRecord(string name)
|
||||
{
|
||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue