[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20121108090825-jrs7pwqnkeoyi8z4
2012-11-08 10:08:25 +01:00
parent e6a9084677 b5b3cbf4e4
commit 311cd19465
2 changed files with 1 additions and 2 deletions
@@ -202,6 +202,7 @@
                        <field name="name" readonly="1" class="oe_inline"/>
                        (<field name="login" readonly="1" class="oe_inline"/>)
                    </h1>
+                    <button name="preference_change_password" type="object" string="Change password" class="oe_link"/>
                    <group name="preferences" col="4">
                        <field name="lang" readonly="0"/>
                        <field name="tz" readonly="0"/>
@@ -213,7 +214,6 @@
                        <field name="signature" readonly="0"/>
                    </group>
                    <footer>
-                        <button name="preference_change_password" type="object" string="Change password"/>
                        <button name="preference_save" type="object" string="Save"/>
                        or
                        <button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
@@ -126,7 +126,6 @@ setuptools.setup(
          'vobject',
          'werkzeug',
          'xlwt',
-          'zsi', # optional
      ],
      extras_require = {
          'SSL' : ['pyopenssl'],