[FIX] plugin_outlook 64bit support manual merge build

lp bug: https://launchpad.net/bugs/916670 fixed

bzr revid: al@openerp.com-20120216172136-rh7yk89dgztj0cdg

diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py
index d91070a..676540d 100644 (file)
--- a/addons/plugin_outlook/plugin_outlook.py
+++ b/addons/plugin_outlook/plugin_outlook.py
@@ -30,18 +30,20 @@ class outlook_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     _columns = {
-        'name':fields.char('Outlook Plug-in', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
+        'name':fields.char('Outlook Plug-in 32bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
+        'name2':fields.char('Outlook Plug-in 64bits', size=64, readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'description':fields.text('Description', readonly=True)
     }
 
     _defaults = {
-        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi',
+        'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi',
+        'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi',
         'description' : """
-Click on icon next to the link above to download the installer and execute it.
+Click on icon next to the link above to download the installer either for 32 or 64 bits and execute it.
 
 System requirements:
     1.  MS Outlook 2005 or above.
-    2.  MS .Net Framework 3.5 .
+    2.  MS .Net Framework 3.5 or above.
 """
         }
 

diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index 62400e2..37b924f 100644 (file)
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -27,7 +27,8 @@
                     </xpath>
                     <group colspan="8" position="replace">
                         <group colspan="8" height="450" width="750">
-                            <field name="name" widget="url"/>
+                            <field name="name" widget="url" colspan="4"/>
+                            <field name="name2" widget="url" colspan="4"/>
                             <newline/>
                             <separator string="Installation and Configuration Steps" colspan="4"/>
                             <field name="description" nolabel="1" colspan="8"/>

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi
deleted file mode 100644 (file)
index 45f2d7c..0000000
Binary files a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi and /dev/null differ

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi
new file mode 100644 (file)
index 0000000..45f2d7c
Binary files /dev/null and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi differ

diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi
new file mode 100644 (file)
index 0000000..7e15551
Binary files /dev/null and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi differ