diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py index 6a3417791d3..1f9613a8733 100644 --- a/addons/hr_contract/hr_contract.py +++ b/addons/hr_contract/hr_contract.py @@ -100,8 +100,8 @@ class hr_contract(osv.osv): 'job_id': fields.many2one('hr.job', 'Job Title'), 'date_start': fields.date('Start Date', required=True), 'date_end': fields.date('End Date'), - 'trial_date_start': fields.date('Trial start Date'), - 'trial_date_end': fields.date('Trial end Date'), + 'trial_date_start': fields.date('Trial Start Date'), + 'trial_date_end': fields.date('Trial End Date'), 'working_hours': fields.many2one('resource.calendar','Working Schedule'), 'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True), 'wage': fields.float('Wage', digits=(16,2), required=True), diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 7d07e676a24..027aafa5d31 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -220,8 +220,8 @@ class hr_evaluation(osv.osv): elif phase.action == "self": childs = [evaluation.employee_id] for child in childs: - if not child.user_id: - continue +# if not child.user_id: +# continue int_id = hr_eval_inter_obj.create(cr, uid, { 'evaluation_id': evaluation.id, diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index dec14079bb9..d9b666cfbf1 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -204,7 +204,7 @@ + sequence="2"/>