pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] Merge with lp:openobject-server

Browse Source 
bzr revid: hip@tinyerp.com-20121108090237-js4abojqhla5h77c
This commit is contained in:
Hiral Patel (OpenERP)
2012-11-08 14:32:37 +05:30
parent 9be7efdc16 b5b3cbf4e4
commit 6eb7008221
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/res/res_users_view.xml
+1 -1
View File
@@ -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"/>