[MERGE] forward port of bugfixes made in 7.0, up to revision 8969.

bzr revid: qdp-launchpad@openerp.com-20130404095257-oek77sijuxjyi0aj

6 files changed, 17 insertions, 11 deletions

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
index 75fe271e5d6..f9ac3e31553 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPClient/OpenERPClient.csproj
@@ -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>

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
index f4705664cf4..ad53769e5b4 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin.sln
@@ -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}"

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
index 1336c7f7695..dae4db88aa2 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/Connect.cs
@@ -303,6 +303,7 @@ namespace OpenERPOutlookPlugin
 

                     foreach (outlook.MailItem mailitem in Tools.MailItems())

                     {

+                        

 

                         Object[] contact = Cache.OpenERPOutlookPlugin.RedirectPartnerPage(mailitem);

                         if ((int)contact[1] > 0)

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
index b057201b8d1..e1d45318ee4 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs
@@ -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)

         {

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
index a31471c28ba..9d9dd5d3ad3 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi
index 87cac88be70..0c2fa88bb24 100644
--- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi
+++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi