diff options
| author | Olivier Dony <odo@openerp.com> | 2011-01-06 18:38:28 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-01-06 18:38:28 +0100 |
| commit | 7d3375f49f6d4ef47b148dc3f229f3012a358643 (patch) | |
| tree | fadd5ac0486560e6f7ce70c23d93fc5a76a3e585 /bin/addons/base/base_update.xml | |
| parent | f68dbc723c2a74aed5bb2c4add9ccb76bb82d1bf (diff) | |
| parent | bf5765b3ef0f22dcbca413e86fc39dfef9f1d87f (diff) | |
[MERGE] bugfixes: default language for partners, password change, validation of custom selection fields, ...
See the bug links
lp bug: https://launchpad.net/bugs/670264 fixed
lp bug: https://launchpad.net/bugs/692891 fixed
lp bug: https://launchpad.net/bugs/695678 fixed
lp bug: https://launchpad.net/bugs/631547 fixed
lp bug: https://launchpad.net/bugs/632927 fixed
bzr revid: odo@openerp.com-20110106173828-kdv1gtdvbws1ceb5
Diffstat (limited to 'bin/addons/base/base_update.xml')
| -rw-r--r-- | bin/addons/base/base_update.xml | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml index 969b8d49bdd..7432018fd94 100644 --- a/bin/addons/base/base_update.xml +++ b/bin/addons/base/base_update.xml @@ -70,34 +70,6 @@ ====================== --> - <record id="view_change_user_password_form" model="ir.ui.view"> - <field name="name">change.user.password</field> - <field name="model">change.user.password</field> - <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"/> - <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-ok" name="change_password" string="Change" type="object"/> - </form> - </field> - </record> - - <record id="action_view_change_password_form" model="ir.actions.act_window"> - <field name="name">Change Password</field> - <field name="type">ir.actions.act_window</field> - <field name="res_model">change.user.password</field> - <field name="view_type">form</field> - <field name="view_mode">form</field> - <field name="target">new</field> - </record> - <record id="view_users_form_simple_modif" model="ir.ui.view"> <field name="name">res.users.form.modif</field> <field name="model">res.users</field> @@ -119,8 +91,6 @@ <field name="context_lang" completion="1" readonly="0"/> <field name="context_tz" completion="1" readonly="0"/> <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"/> <separator string="Email & Signature" colspan="4"/> <group colspan="4"><field name="user_email" widget="email" readonly="0"/></group> <field colspan="4" name="signature" readonly="0" nolabel="1"/> @@ -139,7 +109,7 @@ <field name="name" select="1"/> <field name="active"/> <field name="login" select="1"/> - <field name="password" password="True"/> + <field name="new_password" password="True"/> <newline/> <notebook colspan="4"> <page string="User"> |