diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 3830b5fe60f..6b118d426b8 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -42,7 +42,19 @@ You can manage: """, 'author': 'OpenERP SA', 'website': 'https://www.odoo.com/page/employees', - 'depends': ['base_setup', 'mail', 'resource', 'board', 'web_tip'], + 'images': [ + 'images/hr_department.jpeg', + 'images/hr_employee.jpeg', + 'images/hr_job_position.jpeg', + 'static/src/img/default_image.png', + ], + 'depends': [ + 'base_setup', + 'mail', + 'resource', + 'board', + 'web_kanban', + ], 'data': [ 'security/hr_security.xml', 'security/ir.model.access.csv', @@ -64,5 +76,5 @@ You can manage: 'installable': True, 'application': True, 'auto_install': False, - 'qweb': [ 'static/src/xml/suggestions.xml' ], + 'qweb': ['static/src/xml/suggestions.xml'], } diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 25b8939569c..8a6f828f730 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -391,6 +391,7 @@ class hr_department(osv.osv): 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True), 'jobs_ids': fields.one2many('hr.job', 'department_id', 'Jobs'), 'note': fields.text('Note'), + 'color': fields.integer('Color Index'), } _defaults = { @@ -414,10 +415,12 @@ class hr_department(osv.osv): ] def name_get(self, cr, uid, ids, context=None): - if context is None: - context = {} if not ids: return [] + if isinstance(ids, (int, long)): + ids = [ids] + if context is None: + context = {} reads = self.read(cr, uid, ids, ['name','parent_id'], context=context) res = [] for record in reads: diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index fff137c964e..c2e7515fc91 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -45,14 +45,14 @@ - - + @@ -75,8 +75,8 @@ - @@ -114,7 +114,7 @@ - + @@ -129,14 +129,14 @@ - + - + @@ -181,7 +181,7 @@ - +
- + -