diff options
| author | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-08-03 16:24:50 +0200 |
| commit | f0873dcb32a673c83a7d9e5c3e35f4226d9051a8 (patch) | |
| tree | 669f2f30cb225f24681cb6de886c8fb6e0a49ea5 /addons/plugin_thunderbird/plugin_thunderbird.xml | |
| parent | 093f7392738355edb718e777bd951908c29c12ec (diff) | |
| parent | c61431bd3ee9db871317156fddb80ce662543f96 (diff) | |
[MERGE] Sync with trunk - bunch of conflicts resolved
bzr revid: odo@openerp.com-20120803142450-97z551yam1js822h
Diffstat (limited to 'addons/plugin_thunderbird/plugin_thunderbird.xml')
| -rw-r--r-- | addons/plugin_thunderbird/plugin_thunderbird.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index fef7772dfdf..1adb4fa5eda 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -11,10 +11,7 @@ <form position="attributes"> <attribute name="string">Install Thunderbird Plug-In</attribute> </form> - <separator string="title" position="before"> - <label string="This plug-in allows you to link your email to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."/> - </separator> - <xpath expr="//header" position="replace"/> + <xpath expr="//footer" position="replace"/> <xpath expr="//separator[@string='title']" position="after"> <group> <field name="thunderbird" invisible="1"/> @@ -35,7 +32,7 @@ </ul> </xpath> <separator string="title" position="attributes"> - <attribute name="string">Install Thunderbird Plug-In</attribute> + <attribute name="string"></attribute> </separator> </data> </field> |