[MERGE]:merged with parent branch

bzr revid: apa@tinyerp.com-20120719054045-pb4zp74nlr05qaqt
2012-07-19 11:10:45 +05:30
parent 0a43ec2682 537126dbad
commit eef123d5b7
50 changed files with 1877 additions and 431 deletions
@@ -14,7 +14,7 @@
                     <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"/>