Merge lp:~openerp-dev/openobject-addons/7.0-bug-1256437-avo into lp:openobject-addons/7.0

Proposed by Amit Vora(OpenERP)
Status: Merged
Merged at revision: 10033
Proposed branch: lp:~openerp-dev/openobject-addons/7.0-bug-1256437-avo
Merge into: lp:openobject-addons/7.0
Diff against target: 32 lines (+15/-1)
1 file modified
hr/hr.py (+15/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/7.0-bug-1256437-avo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+208280@code.launchpad.net

Description of the change

Hello,
I have fixed duplicating a user duplicates all employee data.
Thanks.
avo

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr/hr.py'
2--- hr/hr.py 2013-04-25 09:12:56 +0000
3+++ hr/hr.py 2014-04-25 11:53:45 +0000
4@@ -211,7 +211,14 @@
5 }
6
7 _order='name_related'
8-
9+
10+ def copy(self, cr, uid, ids, default=None, context=None):
11+ if default is None:
12+ default = {}
13+ default = default.copy()
14+ default.update({'child_ids': False})
15+ return super(hr_employee, self).copy(cr, uid, ids, default, context=context)
16+
17 def create(self, cr, uid, data, context=None):
18 employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
19 try:
20@@ -302,6 +309,13 @@
21 _name = 'res.users'
22 _inherit = 'res.users'
23
24+ def copy(self, cr, uid, ids, default=None, context=None):
25+ if default is None:
26+ default = {}
27+ default = default.copy()
28+ default.update({'employee_ids': False})
29+ return super(res_users, self).copy(cr, uid, ids, default, context=context)
30+
31 def create(self, cr, uid, data, context=None):
32 user_id = super(res_users, self).create(cr, uid, data, context=context)
33