diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index d91070afccc..676540dc63a 100644 --- 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 62400e22f71..37b924f319f 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -27,7 +27,8 @@ - + + diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi similarity index 100% rename from addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup.msi rename to 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 new file mode 100644 index 00000000000..7e15551928c Binary files /dev/null and b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi differ