diff options
| author | Tejas Tank <tta@openerp.com> | 2012-07-02 16:06:53 +0530 |
|---|---|---|
| committer | Tejas Tank <tta@openerp.com> | 2012-07-02 16:06:53 +0530 |
| commit | 525a1debcfa754a8e644ff252d35c48894c4e9ca (patch) | |
| tree | 2fe214eab4b1e9da8201191f249f5c94c088a1b4 /addons/plugin_outlook | |
| parent | 154ec16cf34f8e9b7702b95375158d755f02ba54 (diff) | |
| parent | 9c9141cc65892d2fc28f0b26bbd2acd40fff69c4 (diff) | |
merged with latest
bzr revid: tta@openerp.com-20120702103653-x6tv3p12yh57srbf
Diffstat (limited to 'addons/plugin_outlook')
| -rw-r--r-- | addons/plugin_outlook/plugin_outlook.xml | 6 | ||||
| -rw-r--r-- | addons/plugin_outlook/static/openerp-outlook-plugin/OpenERPOutlookPlugin/OpenERPOutlookPlugin.cs | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 13c1e6f32c4..0340a7c502f 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -14,11 +14,7 @@ <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="//header" position="replace"/> <xpath expr="//separator[@string='title']" position="after" version="7.0"> <group> <field name="plugin32" widget="url"/> 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
|