diff options
| author | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-11-09 10:59:19 +0530 |
|---|---|---|
| committer | Khushboo Bhatt (Open ERP) <kbh@tinyerp.com> | 2012-11-09 10:59:19 +0530 |
| commit | d251e8e63f148296dbf8d12650c773cb9db0431f (patch) | |
| tree | 77850de1cf7b52064980b0a3a55e61707663525d /addons/plugin_thunderbird | |
| parent | 746e31c2f09c5ee18d2bda51cb9b04283c3b50c1 (diff) | |
| parent | 0528e00788a7cca36353a2996ab58568bdd8be78 (diff) | |
[MERGE]merge with trunk
bzr revid: kbh@tinyerp.com-20121109052919-q1oo1us9il2jrqf4
Diffstat (limited to 'addons/plugin_thunderbird')
| -rw-r--r-- | addons/plugin_thunderbird/plugin_thunderbird.py | 4 | ||||
| -rw-r--r-- | addons/plugin_thunderbird/plugin_thunderbird.xml | 23 |
2 files changed, 12 insertions, 15 deletions
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py index 6473758883d..923611b97a9 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.py +++ b/addons/plugin_thunderbird/plugin_thunderbird.py @@ -30,13 +30,11 @@ class plugin_thunderbird_installer(osv.osv_memory): '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): @@ -45,4 +43,4 @@ class plugin_thunderbird_installer(osv.osv_memory): 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 +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 963e8004ce5..31fa27a644f 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -20,19 +20,18 @@ <field name="thunderbird" invisible="1"/> <field name="plugin_name" invisible="1"/> <field name="plugin_file" filename="plugin_name" widget="url"/> - <field name="pdf_file" widget="url"/> </group> <separator string="Installation and Configuration Steps"/> - <p>Thunderbird plugin installation:</p> - <ul> - <li>1. Save the Thunderbird plug-in.</li> - <li>2. From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li> - <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li> - <li>4. Click "Install Now".</li> - <li>5. Restart Thunderbird.</li> - <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li> - <li>7. Configure your openerp server.</li> - </ul> + <p>Thunderbird plug-in installation:</p> + <ol> + <li> Save the Thunderbird plug-in.</li> + <li> From the Thunderbird menubar: Tools > Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li> + <li> Select the plug-in (the file named openerp_plugin.xpi).</li> + <li> Click "Install Now".</li> + <li> Restart Thunderbird.</li> + <li> From the Thunderbird menubar: OpenERP -> Configuration.</li> + <li> Configure your openerp server.</li> + </ol> </xpath> <separator string="title" position="attributes"> <attribute name="string"></attribute> @@ -61,7 +60,7 @@ <div> <field name="module_plugin_thunderbird" class="oe_inline"/> <label for="module_plugin_thunderbird"/> - <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute" + <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute" attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/> </div> </div> |