diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 027aafa5d31..a3db4b08f93 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -284,6 +284,7 @@ survey_request() class hr_evaluation_interview(osv.osv): _name = 'hr.evaluation.interview' _inherits = {'survey.request': 'request_id'} + _rec_name = 'request_id' _description = 'Evaluation Interview' _columns = { 'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True), @@ -293,7 +294,19 @@ class hr_evaluation_interview(osv.osv): _defaults = { 'is_evaluation': True, } - + + def name_get(self, cr, uid, ids, context=None): + if context is None: + context = {} + if not len(ids): + return [] + reads = self.browse(cr, uid, ids, context=context) + res = [] + for record in reads: + name = record.request_id.survey_id.title + res.append((record['id'], name)) + return res + def survey_req_waiting_answer(self, cr, uid, ids, context=None): if context is None: context = {} diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py index 75aecf6a9f1..576c782bfd8 100644 --- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py +++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py @@ -25,7 +25,7 @@ class hr_evaluation_reminder(osv.osv_memory): _name = "hr.evaluation.reminder" _description = "Sends Reminders to employess to fill the evaluations" _columns = { - 'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluations', required=True) + 'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True) } def send_mail(self, cr, uid, ids, context=None): diff --git a/addons/hr_expense/board_hr_expense_manager_view.xml b/addons/hr_expense/board_hr_expense_manager_view.xml index 4a17292ce4e..1f679953610 100644 --- a/addons/hr_expense/board_hr_expense_manager_view.xml +++ b/addons/hr_expense/board_hr_expense_manager_view.xml @@ -6,7 +6,7 @@ All Employee Expenses hr.expense.expense form - [('state','in',('draft', 'confirm'))] + [('state','=','accepted')] diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml index 6b6578d1ddb..f0fa8fe0e3a 100644 --- a/addons/hr_holidays/board_hr_manager_holidays_view.xml +++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml @@ -8,6 +8,7 @@ hr.holidays form tree,form + [('state','in',('confirm', 'validate'))]