[MERGE] forward port of branch 7.0 up to revid 10037 mat@openerp.com-20140507133552...

[odoo/odoo.git] / addons / hr / hr.py

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 6d46620..a47ec92 100644 (file)
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -226,7 +226,13 @@ class hr_employee(osv.osv):
         'image': _get_default_image,
         'color': 0,
     }
-
+    
+    def copy_data(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default.update({'child_ids': False})
+        return super(hr_employee, self).copy_data(cr, uid, ids, default, context=context)
+        
     def create(self, cr, uid, data, context=None):
         if context is None:
             context = {}
@@ -380,18 +386,23 @@ class hr_department(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def copy(self, cr, uid, ids, default=None, context=None):
+    def copy_data(self, cr, uid, ids, default=None, context=None):
         if default is None:
             default = {}
-        default = default.copy()
         default['member_ids'] = []
-        return super(hr_department, self).copy(cr, uid, ids, default, context=context)
+        return super(hr_department, self).copy_data(cr, uid, ids, default, context=context)
 
 
 class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
 
+    def copy_data(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default.update({'employee_ids': False})
+        return super(res_users, self).copy_data(cr, uid, ids, default, context=context)
+    
     _columns = {
         'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
     }