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_thunderbird/plugin_thunderbird.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'addons/plugin_thunderbird/plugin_thunderbird.py') 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 -- 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_thunderbird/plugin_thunderbird.py | 37 ++++++++++--------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'addons/plugin_thunderbird/plugin_thunderbird.py') diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index 88d84c57cd2..6473758883d 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -27,31 +27,22 @@ class plugin_thunderbird_installer(osv.osv_memory): _inherit = 'res.config.installer' _columns = { - 'name':fields.char('File name', size=34), - 'pdf_name':fields.char('File name', size=64), - 'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."), - 'plugin_file':fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."), - '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) + 'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."), + 'plugin_name': fields.char('File name', size=64), + 'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."), + 'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True), } + + _defaults = { + 'thunderbird': True, + 'plugin_name': 'openerp_plugin.xpi', + 'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html', + } + 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... - 4. Select the plug-in (the file named openerp_plugin.xpi). - 5. Click "Install Now". - 6. Restart Thunderbird. - 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 + res = super(plugin_thunderbird_installer, self).default_get(cr, uid, fields, context) + base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi' return res # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file -- cgit v1.2.3