diff options
Diffstat (limited to 'addons/plugin_outlook')
3 files changed, 31 insertions, 37 deletions
diff --git a/addons/plugin_outlook/plugin_outlook.py b/addons/plugin_outlook/plugin_outlook.py index 676540dc63a..4fc1f391fab 100644 --- a/addons/plugin_outlook/plugin_outlook.py +++ b/addons/plugin_outlook/plugin_outlook.py @@ -22,29 +22,21 @@ 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) + '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."), } - _defaults = { - 'name' : '/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPluginSetup32.msi', - 'name2' : '/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. -""" - } + def default_get(self, cr, uid, fields, context=None): + 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: diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index c4791ee153c..0340a7c502f 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -14,19 +14,19 @@ <separator string="title" position="before"> <label string="This plug-in allows you to create and link outlook emails with openerp objects."/> </separator> - <xpath expr="//button[@string='Install Modules']" position="replace"> - <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/> - </xpath> - <xpath expr="//button[@string='Cancel']" position="replace"> - </xpath> - <xpath expr="//separator[@string='title']" position="after"> - <group colspan="8" height="450" width="750"> - <field name="name" widget="url" colspan="4"/> - <field name="name2" widget="url" colspan="4"/> - <newline/> - <separator string="Installation and Configuration Steps" colspan="4"/> - <field name="description" nolabel="1" colspan="8"/> + <xpath expr="//header" position="replace"/> + <xpath expr="//separator[@string='title']" position="after" version="7.0"> + <group> + <field name="plugin32" widget="url"/> + <field name="plugin64" widget="url"/> </group> + <separator string="Installation and Configuration Steps"/> + <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p> + <p>System requirements:</p> + <ul> + <li>1. MS Outlook 2005 or above.</li> + <li>2. MS .Net Framework 3.5 or above.</li> + </ul> </xpath> <separator string="title" position="attributes"> <attribute name="string">Install Outlook Plug-In</attribute> @@ -50,13 +50,15 @@ <field name="name">Sales Application</field> <field name="model">sale.config.settings</field> <field name="type">form</field> - <field name="inherit_id" ref="base.view_sale_config_settings"/> + <field name="inherit_id" ref="base_setup.view_sale_config_settings"/> <field name="arch" type="xml"> - <field name="module_plugin_outlook" position="after"> - <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}"> - <button name="%(action_outlook_installer)d" type="action" - string="Configure Outlook Plugin" icon="gtk-execute"/> - </group> + <field name="module_plugin_outlook" version="7.0" position="replace"> + <label for="module_plugin_outlook"/> + <div> + <field name="module_plugin_outlook"/> + <button name="%(action_outlook_installer)d" type="action" string="Configure" icon="gtk-execute" + attrs="{'invisible': [('module_plugin_outlook','=',False)]}"/> + </div> </field> </field> </record> diff --git a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs index b5bc2fc4472..b057201b8d1 100644 --- a/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs +++ b/addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs @@ -1,4 +1,4 @@ -/*
+/*
OpenERP, Open Source Business Applications
Copyright (c) 2011 OpenERP S.A. <http://openerp.com>
@@ -105,7 +105,7 @@ namespace OpenERPOutlookPlugin /*
* Will Redirect to the web-browser and open partner.
- * If it will not found partner in res.partner.address (in contact) then
+ * If it will not found partner in res.partner (in contact) then
it will open the contact form to create a partner.
:Param outlook.MailItem mailItem : Outlook Mail item
*/
@@ -189,7 +189,7 @@ namespace OpenERPOutlookPlugin {
/*
- * Creates a Contact record in the res.partner.address as per the details given in the
+ * Creates a Contact record in the res.partner as per the details given in the
plugin form of openERP outlook Plugin.
:Param string partner_id : Partner id for which it creates a contact
:Param string name : Contact name
|