summaryrefslogtreecommitdiff
path: root/addons/plugin_thunderbird
diff options
context:
space:
mode:
authorAtul Patel (OpenERP) <atp@tinyerp.com>2012-06-09 20:00:00 +0530
committerAtul Patel (OpenERP) <atp@tinyerp.com>2012-06-09 20:00:00 +0530
commitf535c29fbdaa95e039d46402f96b25721a8eecd3 (patch)
treeb8d821c5e89840238184558107bad23ccaf6f9cb /addons/plugin_thunderbird
parent8fc56178604a3e756d918407ad193f4759100c77 (diff)
parent582bb4c31153bed1fd8414658d5e91793c8ce9c6 (diff)
[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-configuration_wizard_improvement-atp-configuration_wizard_sales-nco
bzr revid: atp@tinyerp.com-20120609143000-n73f2kh0qutvau3z
Diffstat (limited to 'addons/plugin_thunderbird')
-rw-r--r--addons/plugin_thunderbird/plugin_thunderbird.py37
-rw-r--r--addons/plugin_thunderbird/plugin_thunderbird.xml2
2 files changed, 21 insertions, 18 deletions
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 7e9b5626e5b..88d84c57cd2 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -34,21 +34,24 @@ 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)
}
+ 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
+ return res
- _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' : """
-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.
-"""
- }
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b5601e7904a..c535527fc63 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -63,7 +63,7 @@
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<field name="module_plugin_thunderbird" position="after">
- <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+ <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_thunderbird','=',False)]}">
<button name="%(action_thunderbird_installer)d" type="action"
string="Configure Thunderbird Plugin" icon="gtk-execute"/>
</group>