Merge lp:~fabien-morin/unifield-server/fm-us-2856 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/hr/hr_department.py'
--- bin/addons/hr/hr_department.py	2017-02-20 10:01:21 +0000
+++ bin/addons/hr/hr_department.py	2017-05-12 14:11:44 +0000
@@ -41,10 +41,25 @@
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
+    def _get_ids_to_update(self, cr, uid, ids, context=None):
+        '''
+        recursive method to get all hr.department ids which have ancestor
+        related to ids
+        '''
+        child_ids = self.search(cr, uid, [('parent_id', 'in', ids)], context=context)
+        sub_child_ids = []
+        if child_ids:
+             sub_child_ids = self._get_ids_to_update(cr, uid, child_ids, context=context)
+        return ids + sub_child_ids
+
     _name = "hr.department"
     _columns = {
         'name': fields.char('Department Name', size=64, required=True),
-        'complete_name': fields.function(_dept_name_get_fnc, method=True, type="char", string='Name'),
+        'complete_name': fields.function(_dept_name_get_fnc, method=True,
+            type="char", string='Name', size=512,
+            store = {
+                'hr.department': (_get_ids_to_update, ['child_ids', 'name'], 10),
+            }),
         'company_id': fields.many2one('res.company', 'Company', select=True, required=False),
         'parent_id': fields.many2one('hr.department', 'Parent Department', select=True),
         'child_ids': fields.one2many('hr.department', 'parent_id', 'Child Departments'),
@@ -55,6 +70,8 @@
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.department', context=c),
                 }
 
+    _order = 'complete_name, name, id'
+
     def _get_members(self, cr, uid, context=None):
         mids = self.search(cr, uid, [('manager_id', '=', uid)], context=context)
         result = {uid: 1}