summaryrefslogtreecommitdiff
path: root/bin/addons/base/base_update.xml
diff options
context:
space:
mode:
authorYSA (OpenERP) <ysa@openerp.com>2010-12-29 21:12:50 +0100
committerOlivier Dony <odo@openerp.com>2010-12-29 21:12:50 +0100
commitcbe201785fd3a7b93acea9797b09abc39ba7c69c (patch)
tree61ecfe49b8b4b98fec54ed5e94e416b2ac51437a /bin/addons/base/base_update.xml
parente2f6d60065963ce74a8df99a3915f2c7702574a2 (diff)
parent6112db95ddc52bc09b197c9df8b2a9181d57fc5f (diff)
[MERGE] base, report: several bugfixes (see bug links)
bzr revid: odo@openerp.com-20101229201250-q7le63xa3rbsce6o
Diffstat (limited to 'bin/addons/base/base_update.xml')
-rw-r--r--bin/addons/base/base_update.xml34
1 files changed, 31 insertions, 3 deletions
diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 2448306ad79..411d67ec6f7 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -69,6 +69,35 @@
Users
======================
-->
+
+ <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>
@@ -87,12 +116,11 @@
<newline/>
</page>
<page string="Preferences">
- <field name="password" password="True" readonly="0" />
<field name="context_lang" completion="1" readonly="0"/>
- <label string="" colspan="1"/>
- <label colspan="3" string="You must logout and login again after changing your password."/>
<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 &amp; Signature" colspan="4"/>
<group colspan="4"><field name="user_email" widget="email" readonly="0"/></group>
<field colspan="4" name="signature" readonly="0" nolabel="1"/>