diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index 676540dc63a..ac63e0a0d23 100644 --- a/addons/plugin_outlook/plugin_outlook.py +++ b/addons/plugin_outlook/plugin_outlook.py @@ -22,29 +22,30 @@ from osv import fields from osv import osv import addons - import base64 class outlook_installer(osv.osv_memory): _name = 'outlook.installer' _inherit = 'res.config.installer' - _columns = { '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/OpenERPOutlookPluginSetup32.msi', - 'name2' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi', - 'description' : """ + + def default_get(self, cr, uid, fields, context=None): + res = {} + plugin_32bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi' + plugin_64bit_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi' + description = """ 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 or above. """ - } - + res['name'] = plugin_32bit_url + res['name2'] = plugin_64bit_url + res['description'] = description + return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index 7e9b5626e5b..47233eba904 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -34,13 +34,10 @@ class plugin_thunderbird_installer(osv.osv_memory): 'pdf_file':fields.char('Installation Manual', size=264, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), 'description':fields.text('Description', readonly=True) } - - _defaults = { - 'thunderbird' : True, - 'name' : 'openerp_plugin.xpi', - 'pdf_file' : 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html', - 'plugin_file' : '/plugin_thunderbird/static/openerp_plugin.xpi', - 'description' : """ + def default_get(self, cr, uid, fields, context=None): + res = {} + plugin_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + '/plugin_thunderbird/static/openerp_plugin.xpi' + description = """ Thunderbird plugin installation: 1. Save the Thunderbird plug-in. 2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file... @@ -50,5 +47,11 @@ Thunderbird plugin installation: 7. From the Thunderbird menubar: OpenERP -> Configuration. 8. Configure your openerp server. """ - } + res['thunderbird'] = True, + res['name'] = 'openerp_plugin.xpi' + res['plugin_file'] = plugin_url + res['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html', + res['description'] = description + return res +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file