diff options
| author | Raphael Collet <rco@openerp.com> | 2012-10-05 12:12:20 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-10-05 12:12:20 +0200 |
| commit | bc34a0b071fbd0d6ccd140f1da3fe6493ff1cff6 (patch) | |
| tree | a9156fcd558026c2cf3dc340aa2da8cf70f496a3 | |
| parent | 40265731a095bfec36dad140a4ae3e2d6c1ddcc6 (diff) | |
[FIX] res_users: fix method copy() to not break test case
bzr revid: rco@openerp.com-20121005101220-jhnomko7woiuwf1f
| -rw-r--r-- | openerp/addons/base/res/res_users.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 8bd5c3a0179..a1c06a52494 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -341,14 +341,12 @@ class res_users(osv.osv): def copy(self, cr, uid, id, default=None, context=None): user2copy = self.read(cr, uid, [id], ['login','name'])[0] - if default is None: - default = {} - copy_pattern = _("%s (copy)") - copydef = dict(login=(copy_pattern % user2copy['login']), - name=(copy_pattern % user2copy['name']), - ) - copydef.update(default) - return super(res_users, self).copy(cr, uid, id, copydef, context) + default = dict(default or {}) + if ('name' not in default) and ('partner_id' not in default): + default['name'] = _("%s (copy)") % user2copy['name'] + if 'login' not in default: + default['login'] = _("%s (copy)") % user2copy['login'] + return super(res_users, self).copy(cr, uid, id, default, context) def context_get(self, cr, uid, context=None): user = self.browse(cr, SUPERUSER_ID, uid, context) |