Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-798681-nco into lp:openobject-server

  1. trunk-bug-798681-nco
  2. Merge into trunk
Proposed by Nimesh Contractor(Open ERP)
Status: Merged
Approved by: Naresh(OpenERP)
Approved revision: 3471
Merged at revision: 3570
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-798681-nco
Merge into: lp:openobject-server
Diff against target: 12 lines (+1/-1)
1 file modified
openerp/addons/base/res/res_user.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-798681-nco
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email: mp+65442@code.launchpad.net

Description of the change

Hello sir,

    I have change the label of new_password field to Set password of res.user.

Thank you.

To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_user.py'
2--- openerp/addons/base/res/res_user.py 2011-05-23 11:19:53 +0000
3+++ openerp/addons/base/res/res_user.py 2011-06-22 06:27:29 +0000
4@@ -218,7 +218,7 @@
5 'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
6 'new_password': fields.function(_get_password, method=True, type='char', size=64,
7 fnct_inv=_set_new_password,
8- string='Change password', help="Only specify a value if you want to change the user password. "
9+ string='Set password', help="Only specify a value if you want to change the user password. "
10 "This user will have to logout and login again!"),
11 'email': fields.char('E-mail', size=64,
12 help='If an email is provided, the user will be sent a message '