From 349b2a270776954c6274e9f347ba1c735f9bd509 Mon Sep 17 00:00:00 2001 From: "Nimesh (Open ERP)" Date: Thu, 7 Jun 2012 15:45:16 +0530 Subject: [IMP] correct the link of thunderbird plugin xpi file and outlook msi file configuration bzr revid: nco@tinyerp.com-20120607101516-uwvenu14iwreubt8 --- addons/plugin_outlook/plugin_outlook.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'addons/plugin_outlook/plugin_outlook.py') 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: -- cgit v1.2.3 From 2979554b40e51aed414636e9bc6e34f7a8dcebdd Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 25 Jun 2012 12:32:35 +0200 Subject: [IMP] plugin_outlook, plugin_thunderbird: simplify wizards bzr revid: rco@openerp.com-20120625103235-111al037cqvpaitr --- addons/plugin_outlook/plugin_outlook.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'addons/plugin_outlook/plugin_outlook.py') diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index 2b05282163f..9da90f3839c 100644 --- a/addons/plugin_outlook/plugin_outlook.py +++ b/addons/plugin_outlook/plugin_outlook.py @@ -28,24 +28,15 @@ 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) + 'plugin32': fields.char('Outlook Plug-in 32bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."), + 'plugin64': fields.char('Outlook Plug-in 64bits', size=256, readonly=True, help="Outlook plug-in file. Save this file and install it in Outlook."), } - + 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 + res = super(outlook_installer, self).default_get(cr, uid, fields, context) + base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi' + res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi' return res + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 991323c4664b751e79f0c7e32a355d3a59e9d592 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 25 Jun 2012 14:40:37 +0200 Subject: [FIX] plugin_outlook: wrong indentation in code bzr revid: rco@openerp.com-20120625124037-18rg0a4rum9vroml --- addons/plugin_outlook/plugin_outlook.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/plugin_outlook/plugin_outlook.py') diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index 9da90f3839c..4fc1f391fab 100644 --- a/addons/plugin_outlook/plugin_outlook.py +++ b/addons/plugin_outlook/plugin_outlook.py @@ -36,7 +36,7 @@ class outlook_installer(osv.osv_memory): res = super(outlook_installer, self).default_get(cr, uid, fields, context) base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') res['plugin32'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi' - res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi' + res['plugin64'] = base_url + '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup64.msi' return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3