[MERGE] base, report: several bugfixes (see bug links)

[odoo/odoo.git] / bin / addons / base / base_update.xml

diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 5a008bd..411d67e 100644 (file)
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -76,13 +76,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Change Password">
-                       <field name="current_password" password="True" readonly="0" colspan="4"/>
-                       <field name="new_password" password="True" readonly="0" colspan="4"/>
-                       <field name="confirm_password" password="True" readonly="0" colspan="4"/>
+                    <field name="current_password" password="True" readonly="0" colspan="4"/>
+                    <field name="new_password" password="True" readonly="0" colspan="4"/>
+                    <field name="confirm_password" password="True" readonly="0" colspan="4"/>
+                    <label colspan="1" string=""/>
+                    <label colspan="3" string="You must logout and login again after changing your password."/>
                     <separator colspan="4" />
                     <label align="0.0" colspan="2" string=""/>
                     <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button colspan="1" icon="gtk-execute" name="change_password" string="Change" type="object"/>
+                    <button colspan="1" icon="gtk-ok" name="change_password" string="Change" type="object"/>
                 </form>
             </field>
         </record>
@@ -116,8 +118,6 @@
                          <page string="Preferences">
                             <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
-                            <label string="" colspan="1"/>
-                            <label colspan="3" string="You must logout and login again after changing your password."/>
                             <field name="menu_tips" colspan="2" readonly="0"/>
                             <label string="" colspan="1"/>
                             <button name="%(action_view_change_password_form)d" string="Change Password" type="action" icon="gtk-execute"/>