[Merge] Merged with main branch.

bzr revid: mdi@tinyerp.com-20140417064501-cf2rp86sukob7v1a

42 files changed, 1153 insertions, 1622 deletions

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 711571a2e89..2d62465ecb5 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,22 +20,24 @@
 ##############################################################################
 
 {
-    'name' : 'Employee Appraisals',
+    'name': 'Employee Appraisals',
     'version': '0.1',
     'author': 'OpenERP SA',
     'category': 'Human Resources',
     'sequence': 31,
     'website': 'http://www.openerp.com',
     'summary': 'Periodical Evaluations, Appraisals, Surveys',
-    'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg','images/hr_interview_requests.jpeg'],
-    'depends': ['hr','calendar','survey'],
+    'images': ['images/hr_evaluation_analysis.jpeg',
+               'images/hr_evaluation.jpeg',
+               'images/hr_interview_requests.jpeg'],
+    'depends': ['hr', 'calendar', 'survey'],
     'description': """
 Periodical Employees evaluation and appraisals
 ==============================================
 
-By using this application you can maintain the motivational process by doing periodical evaluations of your employees' performance. The regular assessment of human resources can benefit your people as well your organization. 
+By using this application you can maintain the motivational process by doing periodical evaluations of your employees' performance. The regular assessment of human resources can benefit your people as well your organization.
 
-An evaluation plan can be assigned to each employee. These plans define the frequency and the way you manage your periodic personal evaluations. You will be able to define steps and attach interview forms to each step. 
+An evaluation plan can be assigned to each employee. These plans define the frequency and the way you manage your periodic personal evaluations. You will be able to define steps and attach interview forms to each step.
 
 Manages several types of evaluations: bottom-up, top-down, self-evaluations and the final evaluation by the manager.
 
@@ -47,23 +49,22 @@ Key Features
 * Every evaluation filled by employees can be viewed in a PDF form.
 * Interview Requests are generated automatically by OpenERP according to employees evaluation plans. Each user receives automatic emails and requests to perform a periodical evaluation of their colleagues.
 """,
-    "demo": ["hr_evaluation_demo.xml"],
     "data": [
         'security/ir.model.access.csv',
         'security/hr_evaluation_security.xml',
         'hr_evaluation_view.xml',
         'report/hr_evaluation_report_view.xml',
         'board_hr_evaluation_view.xml',
+        'survey_data_appraisal.xml',
         'hr_evaluation_data.xml',
         'hr_evaluation_installer.xml',
     ],
-    'test': [
-        'test/test_hr_evaluation.yml',
-        'test/hr_evalution_demo.yml',
-    ],
+    "demo": ["hr_evaluation_demo.xml"],
+    # 'test': [
+    #     'test/test_hr_evaluation.yml',
+    #     'test/hr_evalution_demo.yml',
+    # ],
     'auto_install': False,
     'installable': True,
     'application': True,
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 462154e9e4a..7d9f45f3585 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -19,15 +19,17 @@
 #
 ##############################################################################
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 from dateutil import parser
 import time
 
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
+from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT as DF
 
-class hr_evaluation_plan(osv.osv):
+
+class hr_evaluation_plan(osv.Model):
     _name = "hr_evaluation.plan"
     _description = "Appraisal Plan"
     _columns = {
@@ -42,11 +44,11 @@ class hr_evaluation_plan(osv.osv):
         'active': True,
         'month_first': 6,
         'month_next': 12,
-        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
+        'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 
 
-class hr_evaluation_plan_phase(osv.osv):
+class hr_evaluation_plan_phase(osv.Model):
     _name = "hr_evaluation.plan.phase"
     _description = "Appraisal Plan Phase"
     _order = "sequence"
@@ -54,13 +56,13 @@ class hr_evaluation_plan_phase(osv.osv):
         'name': fields.char("Phase", size=64, required=True),
         'sequence': fields.integer("Sequence"),
         'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
-        'plan_id': fields.many2one('hr_evaluation.plan','Appraisal Plan', ondelete='cascade'),
+        'plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan', ondelete='cascade'),
         'action': fields.selection([
-            ('top-down','Top-Down Appraisal Requests'),
-            ('bottom-up','Bottom-Up Appraisal Requests'),
-            ('self','Self Appraisal Requests'),
-            ('final','Final Interview')], 'Action', required=True),
-        'survey_id': fields.many2one('survey','Appraisal Form',required=True),
+            ('top-down', 'Top-Down Appraisal Requests'),
+            ('bottom-up', 'Bottom-Up Appraisal Requests'),
+            ('self', 'Self Appraisal Requests'),
+            ('final', 'Final Interview')], 'Action', required=True),
+        'survey_id': fields.many2one('survey.survey', 'Appraisal Form', required=True),
         'send_answer_manager': fields.boolean('All Answers',
             help="Send all answers to the manager"),
         'send_answer_employee': fields.boolean('All Answers',
@@ -72,15 +74,14 @@ class hr_evaluation_plan_phase(osv.osv):
         'wait': fields.boolean('Wait Previous Phases',
             help="Check this box if you want to wait that all preceding phases " +
               "are finished before launching this phase."),
-        'mail_feature': fields.boolean('Send mail for this phase', help="Check this box if you want to send mail to employees"+
-                                       " coming under this phase"),
+        'mail_feature': fields.boolean('Send mail for this phase', help="Check this box if you want to send mail to employees coming under this phase"),
         'mail_body': fields.text('Email'),
-        'email_subject':fields.text('char')
+        'email_subject': fields.text('Subject')
     }
     _defaults = {
         'sequence': 1,
         'email_subject': _('''Regarding '''),
-        'mail_body': lambda *a:_('''
+        'mail_body': lambda *a: _('''
 Date: %(date)s
 
 Dear %(employee_name)s,
@@ -98,26 +99,24 @@ Thanks,
     }
 
 
-class hr_employee(osv.osv):
+class hr_employee(osv.Model):
     _name = "hr.employee"
-    _inherit="hr.employee"
-    
+    _inherit = "hr.employee"
 
     _columns = {
         'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'),
         'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."),
     }
-    def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
+
+    def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):  # cronjob
         now = parser.parse(datetime.now().strftime('%Y-%m-%d'))
         obj_evaluation = self.pool.get('hr_evaluation.evaluation')
-        emp_ids =self.search(cr, uid, [ ('evaluation_plan_id','<>',False), ('evaluation_date','=', False)], context=context)
+        emp_ids = self.search(cr, uid, [('evaluation_plan_id', '<>', False), ('evaluation_date', '=', False)], context=context)
         for emp in self.browse(cr, uid, emp_ids, context=context):
-            first_date = (now+ relativedelta(months=emp.evaluation_plan_id.month_first)).strftime('%Y-%m-%d')
+            first_date = (now + relativedelta(months=emp.evaluation_plan_id.month_first)).strftime('%Y-%m-%d')
             self.write(cr, uid, [emp.id], {'evaluation_date': first_date}, context=context)
 
-        emp_ids =self.search(cr, uid, [
-            ('evaluation_plan_id','<>',False), ('evaluation_date','<=', time.strftime("%Y-%m-%d")),
-            ], context=context) 
+        emp_ids = self.search(cr, uid, [('evaluation_plan_id', '<>', False), ('evaluation_date', '<=', time.strftime("%Y-%m-%d"))], context=context)
         for emp in self.browse(cr, uid, emp_ids, context=context):
             next_date = (now + relativedelta(months=emp.evaluation_plan_id.month_next)).strftime('%Y-%m-%d')
             self.write(cr, uid, [emp.id], {'evaluation_date': next_date}, context=context)
@@ -126,39 +125,35 @@ class hr_employee(osv.osv):
         return True
 
 
-
-class hr_evaluation(osv.osv):
+class hr_evaluation(osv.Model):
     _name = "hr_evaluation.evaluation"
     _inherit = "mail.thread"
     _description = "Employee Appraisal"
-    _rec_name = 'employee_id'
     _columns = {
         'date': fields.date("Appraisal Deadline", required=True, select=True),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
         'note_summary': fields.text('Appraisal Summary'),
-        'note_action': fields.text('Action Plan',
-            help="If the evaluation does not meet the expectations, you can propose"+
-              "an action plan"),
+        'note_action': fields.text('Action Plan', help="If the evaluation does not meet the expectations, you can propose an action plan"),
         'rating': fields.selection([
-            ('0','Significantly bellow expectations'),
-            ('1','Did not meet expectations'),
-            ('2','Meet expectations'),
-            ('3','Exceeds expectations'),
-            ('4','Significantly exceeds expectations'),
+            ('0', 'Significantly below expectations'),
+            ('1', 'Do not meet expectations'),
+            ('2', 'Meet expectations'),
+            ('3', 'Exceeds expectations'),
+            ('4', 'Significantly exceeds expectations'),
         ], "Appreciation", help="This is the appreciation on which the evaluation is summarized."),
-        'survey_request_ids': fields.one2many('hr.evaluation.interview','evaluation_id','Appraisal Forms'),
+        'survey_request_ids': fields.one2many('hr.evaluation.interview', 'evaluation_id', 'Appraisal Forms'),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', required=True),
         'state': fields.selection([
-            ('draft','New'),
-            ('cancel','Cancelled'),
-            ('wait','Plan In Progress'),
-            ('progress','Waiting Appreciation'),
-            ('done','Done'),
+            ('draft', 'New'),
+            ('cancel', 'Cancelled'),
+            ('wait', 'Plan In Progress'),
+            ('progress', 'Waiting Appreciation'),
+            ('done', 'Done'),
         ], 'Status', required=True, readonly=True),
         'date_close': fields.date('Ending Date', select=True),
     }
     _defaults = {
-        'date': lambda *a: (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'),
+        'date': lambda *a: (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months=+1)).strftime('%Y-%m-%d'),
         'state': lambda *a: 'draft',
     }
 
@@ -169,7 +164,8 @@ class hr_evaluation(osv.osv):
         res = []
         for record in reads:
             name = record.plan_id.name
-            res.append((record['id'], name))
+            employee = record.employee_id.name_related
+            res.append((record['id'], name + ' / ' + employee))
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
@@ -183,7 +179,6 @@ class hr_evaluation(osv.osv):
         return {'value': vals}
 
     def button_plan_in_progress(self, cr, uid, ids, context=None):
-        mail_message = self.pool.get('mail.message')
         hr_eval_inter_obj = self.pool.get('hr.evaluation.interview')
         if context is None:
             context = {}
@@ -202,10 +197,9 @@ class hr_evaluation(osv.osv):
 
                     int_id = hr_eval_inter_obj.create(cr, uid, {
                         'evaluation_id': evaluation.id,
-                        'survey_id': phase.survey_id.id,
-                        'date_deadline': (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'),
+                        'phase_id': phase.id,
+                        'deadline': (parser.parse(datetime.now().strftime('%Y-%m-%d')) + relativedelta(months=+1)).strftime('%Y-%m-%d'),
                         'user_id': child.user_id.id,
-                        'user_to_review_id': evaluation.employee_id.id
                     }, context=context)
                     if phase.wait:
                         wait = True
@@ -214,7 +208,7 @@ class hr_evaluation(osv.osv):
 
                     if (not wait) and phase.mail_feature:
                         body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
-                            'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
+                            'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time}
                         sub = phase.email_subject
                         if child.work_email:
                             vals = {'state': 'outgoing',
@@ -224,32 +218,32 @@ class hr_evaluation(osv.osv):
                                     'email_from': evaluation.employee_id.work_email}
                             self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
-        self.write(cr, uid, ids, {'state':'wait'}, context=context)
+        self.write(cr, uid, ids, {'state': 'wait'}, context=context)
         return True
 
     def button_final_validation(self, cr, uid, ids, context=None):
         request_obj = self.pool.get('hr.evaluation.interview')
-        self.write(cr, uid, ids, {'state':'progress'}, context=context)
+        self.write(cr, uid, ids, {'state': 'progress'}, context=context)
         for evaluation in self.browse(cr, uid, ids, context=context):
             if evaluation.employee_id and evaluation.employee_id.parent_id and evaluation.employee_id.parent_id.user_id:
                 self.message_subscribe_users(cr, uid, [evaluation.id], user_ids=[evaluation.employee_id.parent_id.user_id.id], context=context)
-            if len(evaluation.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', evaluation.id),('state', 'in', ['done','cancel'])], context=context)):
-                raise osv.except_osv(_('Warning!'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state."))
+            if len(evaluation.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', evaluation.id), ('state', 'in', ['done', 'cancel'])], context=context)):
+                raise osv.except_osv(_('Warning!'), _("You cannot change state, because some appraisal forms have not been completed."))
         return True
 
     def button_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
+        self.write(cr, uid, ids, {'state': 'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
     def button_cancel(self, cr, uid, ids, context=None):
-        interview_obj=self.pool.get('hr.evaluation.interview')
+        interview_obj = self.pool.get('hr.evaluation.interview')
         evaluation = self.browse(cr, uid, ids[0], context)
         interview_obj.survey_req_cancel(cr, uid, [r.id for r in evaluation.survey_request_ids])
-        self.write(cr, uid, ids,{'state':'cancel'}, context=context)
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         return True
 
     def button_draft(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids,{'state': 'draft'}, context=context)
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
         return True
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -260,65 +254,90 @@ class hr_evaluation(osv.osv):
         default = default.copy()
         default['survey_request_ids'] = []
         return super(hr_evaluation, self).copy(cr, uid, id, default, context=context)
-    
+
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('employee_id'):
             employee_id = self.pool.get('hr.employee').browse(cr, uid, vals.get('employee_id'), context=context)
             if employee_id.parent_id and employee_id.parent_id.user_id:
                 vals['message_follower_ids'] = [(4, employee_id.parent_id.user_id.partner_id.id)]
         if 'date' in vals:
-            new_vals = {'date_deadline': vals.get('date')}
+            new_vals = {'deadline': vals.get('date')}
             obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
-            for evalutation in self.browse(cr, uid, ids, context=context):
-                for survey_req in evalutation.survey_request_ids:
+            for evaluation in self.browse(cr, uid, ids, context=context):
+                for survey_req in evaluation.survey_request_ids:
                     obj_hr_eval_iterview.write(cr, uid, [survey_req.id], new_vals, context=context)
         return super(hr_evaluation, self).write(cr, uid, ids, vals, context=context)
 
 
-class survey_request(osv.osv):
-    _inherit = "survey.request"
-    _columns = {
-        'is_evaluation': fields.boolean('Is Appraisal?'),
-    }
-
-
-class hr_evaluation_interview(osv.osv):
+class hr_evaluation_interview(osv.Model):
     _name = 'hr.evaluation.interview'
-    _inherits = {'survey.request': 'request_id'}
-    _inherit =  'mail.thread'
-    _rec_name = 'request_id'
+    _inherit = 'mail.thread'
+    _rec_name = 'user_to_review_id'
     _description = 'Appraisal Interview'
     _columns = {
-        'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
-        'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
-        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Appraisal Form'),
+        'request_id': fields.many2one('survey.user_input', 'Survey Request', ondelete='cascade', readonly=True),
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Appraisal Plan', required=True),
+        'phase_id': fields.many2one('hr_evaluation.plan.phase', 'Appraisal Phase', required=True),
+        'user_to_review_id': fields.related('evaluation_id', 'employee_id', type="many2one", relation="hr.employee", string="Employee to evaluate"),
+        'user_id': fields.many2one('res.users', 'Interviewer'),
+        'state': fields.selection([('draft', "Draft"),
+                                   ('waiting_answer', "In progress"),
+                                   ('done', "Done"),
+                                   ('cancel', "Cancelled")],
+                                  string="State", required=True),
+        'survey_id': fields.related('phase_id', 'survey_id', string="Appraisal Form", type="many2one", relation="survey.survey"),
+        'deadline': fields.related('request_id', 'deadline', type="datetime", string="Deadline"),
     }
     _defaults = {
-        'is_evaluation': True,
+        'state': 'draft'
     }
 
+    def create(self, cr, uid, vals, context=None):
+        phase_obj = self.pool.get('hr_evaluation.plan.phase')
+        survey_id = phase_obj.read(cr, uid, vals.get('phase_id'), fields=['survey_id'], context=context)['survey_id'][0]
+
+        if vals.get('user_id'):
+            user_obj = self.pool.get('res.users')
+            partner_id = user_obj.read(cr, uid, vals.get('user_id'), fields=['partner_id'], context=context)['partner_id'][0]
+        else:
+            partner_id = None
+
+        user_input_obj = self.pool.get('survey.user_input')
+
+        if not vals.get('deadline'):
+            vals['deadline'] = (datetime.now() + timedelta(days=28)).strftime(DF)
+
+        ret = user_input_obj.create(cr, uid, {'survey_id': survey_id,
+                                              'deadline': vals.get('deadline'),
+                                              'type': 'link',
+                                              'partner_id': partner_id}, context=context)
+        vals['request_id'] = ret
+        return super(hr_evaluation_interview, self).create(cr, uid, vals, context=context)
+
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
         reads = self.browse(cr, uid, ids, context=context)
         res = []
         for record in reads:
-            name = record.request_id.survey_id.title
+            name = record.survey_id.title
             res.append((record['id'], name))
         return res
 
     def survey_req_waiting_answer(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'state': 'waiting_answer'}, context=context)
+        request_obj = self.pool.get('survey.user_input')
+        for interview in self.browse(cr, uid, ids, context=context):
+            request_obj.action_survey_resent(cr, uid, [interview.id], context=context)
+            self.write(cr, uid, interview.id, {'state': 'waiting_answer'}, context=context)
         return True
 
     def survey_req_done(self, cr, uid, ids, context=None):
-        hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
         for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
             if not id.evaluation_id.id:
-                raise osv.except_osv(_('Warning!'),_("You cannot start evaluation without Appraisal."))
-            records = hr_eval_obj.browse(cr, uid, [id.evaluation_id.id], context=context)[0].survey_request_ids
+                raise osv.except_osv(_('Warning!'), _("You cannot start evaluation without Appraisal."))
+            records = id.evaluation_id.survey_request_ids
             for child in records:
                 if child.state == "draft":
                     wating_id = child.id
@@ -327,35 +346,29 @@ class hr_evaluation_interview(osv.osv):
                     flag = True
             if not flag and wating_id:
                 self.survey_req_waiting_answer(cr, uid, [wating_id], context=context)
-        self.write(cr, uid, ids, { 'state': 'done'}, context=context)
-        return True
-
-    def survey_req_draft(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'state': 'draft'}, context=context)
+        self.write(cr, uid, ids, {'state': 'done'}, context=context)
         return True
 
     def survey_req_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, { 'state': 'cancel'}, context=context)
+        self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
         return True
 
     def action_print_survey(self, cr, uid, ids, context=None):
-        """
-        If response is available then print this response otherwise print survey form(print template of the survey).
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Survey IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value for print survey form.
-        """
-        if context is None:
-            context = {}
-        record = self.browse(cr, uid, ids, context=context)
-        record = record and record[0]
-        context.update({'survey_id': record.survey_id.id, 'response_id': [record.response.id], 'response_no':0,})
-        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
-        return value
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:1
+        """ If response is available then print this response otherwise print survey form (print template of the survey) """
+        context = context if context else {}
+        interview = self.browse(cr, uid, ids, context=context)[0]
+        survey_obj = self.pool.get('survey.survey')
+        response_obj = self.pool.get('survey.user_input')
+        response = response_obj.browse(cr, uid, interview.request_id.id, context=context)
+        context.update({'survey_token': response.token})
+        return survey_obj.action_print_survey(cr, uid, [interview.survey_id.id], context=context)
+
+    def action_start_survey(self, cr, uid, ids, context=None):
+        context = context if context else {}
+        interview = self.browse(cr, uid, ids, context=context)[0]
+        survey_obj = self.pool.get('survey.survey')
+        response_obj = self.pool.get('survey.user_input')
+        # grab the token of the response and start surveying
+        response = response_obj.browse(cr, uid, interview.request_id.id, context=context)
+        context.update({'survey_token': response.token})
+        return survey_obj.action_start_survey(cr, uid, [interview.survey_id.id], context=context)
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index 2afb5200091..38171b0f733 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
@@ -16,1146 +16,7 @@
             <field name="body"><![CDATA[<p>Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels. Evaluations filled by employees may be exported as pdf files.</p>]]></field>
         </record>
 
-        <record id="survey_2" model="survey">
-            <field name="title">Self Appraisal</field>
-            <field name="max_response_limit">20</field>
-            <field eval="[(6,0,[])]" name="users"/>
-            <field name="type" ref="survey.survey_type1"/>
-            <field name="responsible_id" ref="base.user_root"/>
-            <field name="response_user">5</field>
-            <field name="state">open</field>
-        </record>
-        <record id="survey_page_1" model="survey.page">
-            <field name="title">Employee Appraisal Form</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_page_5" model="survey.page">
-            <field name="title">Work Plan</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_page_6" model="survey.page">
-            <field name="title">Employee Performance In Key Areas</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="3" name="sequence"/>
-            <field name="note">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
-                1 - Significantly exceeds standards and expectations required of the position
-                2 - Exceeds standards and expectations
-                3 - Meet standards and expectations
-                4 - Did not meet standards and expectations
-                5 - Significantly below standards and expectations  </field>
-        </record>
-        <record id="survey_page_16" model="survey.page">
-            <field name="title">Professional Development And Performance Plan (optional)</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="4" name="sequence"/>
-            <field name="note">Identify professional, performance, or project objectives you recommend for employee’s continued career development over the coming year. </field>
-        </record>
-        <record id="survey_page_26" model="survey.page">
-            <field name="title">Employee Comments</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_question_2" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Employee Information</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_textboxes_diff_type</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_39" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Overall Purpose Of Employee Appraisal</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* To initiate a clear and open communication of performance expectations
-
-* To assist employees in their professional growth, through the identification of strengths and opportunities for development</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="hr_evaluation.survey_page_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_42" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="3" name="sequence"/>
-            <field name="question">At the outset of the appraisal time period</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the coming year, including major employee responsibilities and corresponding benchmarks against which results will be evaluated.
-* Critical or key elements of performance and professional development needs (if any), should also be noted at this time</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="hr_evaluation.survey_page_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_43" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="4" name="sequence"/>
-            <field name="question">At the conclusion of the appraisal time period</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
-Once the form had been filled, the employee send it to his supervisor.
-
-* It is the primary responsibility of the supervisor to gather the necessary input from     the appropriate sources of feedback (internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must receive completed evaluation form from the employee's Belgian project manager.
-
-* The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad hoc fields.
-
-* The employee may choose to offer comments or explanation regarding the completed review.
-
-* The supervisor send the form to the HR department in India and in Belgium. </field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="hr_evaluation.survey_page_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_9" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Work Plan</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">table</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_5"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-            <field eval="10" name="no_of_rows"/>
-        </record>
-        <record id="survey_question_17" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Additional comments : </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_5"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_4" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="1" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Subject</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="column_name">Recommendations / Appraisals</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_6"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_8" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="1" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Supervisors only : </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="column_name">Recommendations / Appraisals</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_6"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_23" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="3" name="sequence"/>
-            <field name="question">Overall Performance Summary Rating</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">including the project evaluation form (if any)</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="hr_evaluation.survey_page_6"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_17_1" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Professional Development Objectives </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_16"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_17_2" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Personal Performance Objectives</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_16"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_17_3" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="4" name="sequence"/>
-            <field name="question">Project Objectives</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_16"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_17_2_12" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="5" name="sequence"/>
-            <field name="question">Use the following space to make any comments regarding the above performance evaluation.</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_26"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_answer_1" model="survey.answer">
-            <field name="answer">Name</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_10" model="survey.answer">
-            <field name="answer">Position Title</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_20" model="survey.answer">
-            <field name="answer">Appraisal for Period</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_25" model="survey.answer">
-            <field name="answer">Date of Review</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">datetime</field>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="survey_answer_43" model="survey.answer">
-            <field name="answer">Appraiser</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_question_column_heading_4" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_4"/>
-        </record>
-        <record id="survey_question_column_heading_5" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_4"/>
-        </record>
-        <record id="survey_question_column_heading_6" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_4"/>
-        </record>
-        <record id="survey_question_column_heading_7" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_4"/>
-        </record>
-        <record id="survey_question_column_heading_8" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_4"/>
-        </record>
-        <record id="survey_answer_44" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Ability to cope with multidisciplinary of team</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_45" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Enthusiasm &amp; implication toward projects/assignments</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_46" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Compliance to internal rules and processes (timesheets completion, etc.)</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_47" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Team spirit : ability to work efficiently with peers,  manage the conflicts with diplomacy</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_67" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Initiative and self autonomy</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_68" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Ability to follow and complete work as instructed</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_69" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Decision making</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_72" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Customer commitment</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_73" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Communication skills ( written &amp; verbally): clearness, concision, exactitude </field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_74" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Technical skills regarding to the job requirements</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_75" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Analytical and synthetic mind</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_76" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Promptness and attendance record</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_77" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Adaptability : Ability to adapt oneself to organizational changes while keeping efficiency</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_78" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Creativity and forward looking aptitude</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_26" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Time management :  projects/tasks are completed on time</field>
-            <field name="question_id" ref="survey_question_4"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_question_column_heading_9" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_8"/>
-        </record>
-        <record id="survey_question_column_heading_10" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_8"/>
-        </record>
-        <record id="survey_question_column_heading_11" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_8"/>
-        </record>
-        <record id="survey_question_column_heading_12" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_8"/>
-        </record>
-        <record id="survey_question_column_heading_13" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_8"/>
-        </record>
-        <record id="survey_answer_27" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Results of the bottom-up survey and mitigation actions  to face technical, organizational, structural and/or relational issues</field>
-            <field name="question_id" ref="survey_question_8"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_31" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Delegation : Ability to efficiently assign tasks to other people</field>
-            <field name="question_id" ref="survey_question_8"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_48" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Leadership: create a challenging and motivating work environment aligned with the company's strategy</field>
-            <field name="question_id" ref="survey_question_8"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_49" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Leadership: sustain  subordinates in their professional growth</field>
-            <field name="question_id" ref="survey_question_8"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_50" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Ability to manage  planning resources, risks, budgets and deadlines</field>
-            <field name="question_id" ref="survey_question_8"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_tbl_column_heading_objectives0" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">Objectives</field>
-            <field name="question_id" ref="survey_question_9"/>
-        </record>
-        <record id="survey_tbl_column_heading_results0" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">Results</field>
-            <field name="question_id" ref="survey_question_9"/>
-        </record>
-        <record id="survey_tbl_column_heading_comments0" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">Comments</field>
-            <field name="question_id" ref="survey_question_9"/>
-        </record>
-        <record id="survey_answer_70" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">At the conclusion of the appraisal time period:</field>
-            <field name="question_id" ref="survey_question_42"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_71" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">At the outset of the appraisal time period:</field>
-            <field name="question_id" ref="survey_question_42"/>
-            <field eval="5" name="sequence"/>
-        </record>
 
-        <record id="survey_3" model="survey">
-            <field name="title">Employee Opinion</field>
-            <field name="max_response_limit">20</field>
-            <field eval="[(6,0,[])]" name="users"/>
-            <field name="type" ref="survey.survey_type1"/>
-            <field name="responsible_id" ref="base.user_root"/>
-            <field name="response_user">5</field>
-        </record>
-        <record id="survey_page_2" model="survey.page">
-            <field name="title">Process</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_page_10" model="survey.page">
-            <field name="title">Survey</field>
-            <field name="survey_id" ref="survey_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_question_0" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Employee Details</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_textboxes_diff_type</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_3" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="1" name="sequence"/>
-            <field name="question">Engagement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_6" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">Leadership</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_10" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="3" name="sequence"/>
-            <field name="question">Effectiveness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_14" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="4" name="sequence"/>
-            <field name="question">Continuous Improvement</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_18" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="5" name="sequence"/>
-            <field name="question">Openness</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_40" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="6" name="sequence"/>
-            <field name="question">Miscellaneous</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">matrix_of_choices_only_one_ans</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_41" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="7" name="sequence"/>
-            <field name="question">Additional comments :</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">comment</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="0" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_10"/>
-            <field name="comment_label">Other</field>
-            <field eval="0" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_21" model="survey.question">
-            <field name="in_visible_answer_type">1</field>
-            <field name="validation_type">do_not_validate</field>
-            <field name="comment_valid_type">do_not_validate</field>
-            <field name="make_comment_field_err_msg">Please enter a comment.</field>
-            <field name="numeric_required_sum_err_msg">The choices need to add up to [enter sum here].</field>
-            <field eval="0" name="comment_column"/>
-            <field name="validation_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field eval="0" name="rating_allow_one_column_require"/>
-            <field name="req_error_msg">This question requires an answer.</field>
-            <field eval="2" name="sequence"/>
-            <field name="question">At the supervisor's appraisal date </field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">descriptive_text</field>
-            <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
-            <field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
-
-* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
-* The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
-
-    1 - Significantly exceeds standards and expectations required of the position
-    2 - Exceeds standards and expectations
-    3 - Meet standards and expectations
-    4 - Did not meet standards and expectations
-    5 - Significantly below standards and expectations</field>
-            <field eval="0" name="make_comment_field"/>
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-        <record id="survey_question_column_heading_14" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-        <record id="survey_question_column_heading_15" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-        <record id="survey_question_column_heading_16" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-        <record id="survey_question_column_heading_17" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-        <record id="survey_question_column_heading_18" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_3"/>
-        </record>
-        <record id="survey_question_column_heading_19" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-        <record id="survey_question_column_heading_20" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-        <record id="survey_question_column_heading_21" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-        <record id="survey_question_column_heading_22" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-        <record id="survey_question_column_heading_23" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_6"/>
-        </record>
-        <record id="survey_question_column_heading_24" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-        <record id="survey_question_column_heading_25" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-        <record id="survey_question_column_heading_26" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-        <record id="survey_question_column_heading_27" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-        <record id="survey_question_column_heading_28" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_10"/>
-        </record>
-        <record id="survey_question_column_heading_29" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-        <record id="survey_question_column_heading_30" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-        <record id="survey_question_column_heading_31" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-        <record id="survey_question_column_heading_32" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-        <record id="survey_question_column_heading_33" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_14"/>
-        </record>
-        <record id="survey_question_column_heading_34" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-        <record id="survey_question_column_heading_35" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-        <record id="survey_question_column_heading_36" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-        <record id="survey_question_column_heading_37" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-        <record id="survey_question_column_heading_38" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_18"/>
-        </record>
-        <record id="survey_question_column_heading_39" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">1</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-        <record id="survey_question_column_heading_40" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">2</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-        <record id="survey_question_column_heading_41" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">3</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-        <record id="survey_question_column_heading_42" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">4</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-        <record id="survey_question_column_heading_43" model="survey.question.column.heading">
-            <field name="in_visible_rating_weight">1</field>
-            <field name="in_visible_menu_choice">1</field>
-            <field name="title">5</field>
-            <field name="question_id" ref="survey_question_40"/>
-        </record>
-        <record id="survey_answer_0" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Demonstrates genuine concern for me as a person. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_2" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I'm efficient at work and my achievements are successful.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_3" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am proud to tell others I work here. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_4" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Name of your direct supervisor</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">char</field>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_5" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_6" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I know the company's values and live them.</field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_7" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_8" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have enough work.</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_9" model="survey.answer">
-            <field name="in_visible_answer_type">0</field>
-            <field name="answer">Date</field>
-            <field name="question_id" ref="survey_question_0"/>
-            <field name="type">datetime</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_11" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_12" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My job provides me with a sense of personal accomplishment.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_13" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_14" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
-            <field name="question_id" ref="survey_question_18"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_15" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_16" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
-(Scale: Well below others, Below othe</field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_17" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_18" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_19" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_21" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I mostly work on value-added tasks for the company, the products or the services. (Value-added task : significant improvement pe</field>
-            <field name="question_id" ref="survey_question_10"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_22" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
-            <field name="question_id" ref="survey_question_14"/>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="survey_answer_23" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="survey_answer_24" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I understand the company strategy and how my workgroup supports it. </field>
-            <field name="question_id" ref="survey_question_40"/>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="survey_answer_51" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
-            <field name="question_id" ref="survey_question_3"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_52" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">I believe the information that I get from the person I report to. </field>
-            <field name="question_id" ref="survey_question_6"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-
-    <data noupdate="1">
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
             <field eval="6" name="month_next"/>
@@ -1163,9 +24,8 @@ Once the form had been filled, the employee send it to his supervisor.
             <field eval="3" name="month_first"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-    </data>
 
-    <data noupdate="1">
+
         <record id="hr_evaluation_plan_phase_sendtoemployee0" model="hr_evaluation.plan.phase">
             <field name="plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
             <field name="name">Send to Employee</field>
@@ -1175,19 +35,17 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="action">self</field>
             <field eval="0" name="send_anonymous_employee"/>
             <field eval="0" name="send_answer_employee"/>
-            <field name="survey_id" ref="hr_evaluation.survey_2"/>
+            <field name="survey_id" ref="appraisal_form"/>
             <field eval="0" name="send_answer_manager"/>
             <field eval="0" name="wait"/>
         </record>
-    </data>
 
-    <data noupdate="1">
+
         <record id="hr.employee" model="hr.employee">
             <field name="evaluation_plan_id" ref="hr_evaluation_plan_managersevaluationplan0"/>
         </record>
-    </data>
 
-    <data>
+
         <record forcecreate="True" id="ir_cron_scheduler_evaluation" model="ir.cron">
            <field name="name">Run Employee Appraisal</field>
            <field eval="True" name="active" />
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 28bc4a6c96e..8f3998eeb42 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -21,24 +21,26 @@
             <field name="model">hr_evaluation.plan</field>
             <field name="arch" type="xml">
                 <form string="Appraisal Plan" version="7.0">
-                    <group col="4">
-                        <group>
-                            <field name="name"/>
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="active"/>
-                        </group>
-                        <group>
-                            <field name="month_first"/>
-                            <field name="month_next"/>
+                    <sheet>
+                        <group col="4">
+                            <group>
+                                <field name="name"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <field name="month_first"/>
+                                <field name="month_next"/>
+                            </group>
                         </group>
-                    </group>
-                     <notebook>
-                         <page string="Appraisal Phases">
+                        <notebook>
+                        <page string="Appraisal Phases">
                             <field name="phase_ids"/>
-                         </page>
-                     </notebook>
+                        </page>
+                    </notebook>
+                </sheet>
                 </form>
-            </field>
+        </field>
         </record>
         <record model="ir.ui.view" id="view_hr_evaluation_plan_tree">
             <field name="name">hr_evaluation.plan.form</field>
@@ -58,9 +60,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
       <!-- Appraisal Interviews Action -->
-      
+
         <record id="act_hr_employee_2_hr__evaluation_interview" model="ir.actions.act_window">
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
@@ -127,7 +129,7 @@
                     <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="action"/>
-                    <field name="survey_id"/>
+                    <field name="survey_id" domain="[('res_model','=','hr_evaluation')]"/>
                     <field name="wait"/>
                 </tree>
             </field>
@@ -165,11 +167,9 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" class="oe_inline"
-                                attrs="{'readonly': [('state', '=', 'done')]}"
-                                on_change="onchange_employee_id(employee_id)"/>,
-                        <field name="date"
-                                attrs="{'readonly': [('state', '=', 'done')]}"/>
+                    <h1>
+                        <field name="employee_id" class="oe_inline" attrs="{'readonly': [('state', '=', 'done')]}" on_change="onchange_employee_id(employee_id)"/>
+                        <field name="date" attrs="{'readonly': [('state', '=', 'done')]}"/>
                     </h1>
                     <label for="plan_id" class="oe_edit_only"/>
                     <h2><field name="plan_id" attrs="{'readonly': [('state', '=', 'done')]}"/></h2>
@@ -180,31 +180,7 @@
                         </group>
                     </group>
                     <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
-                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}">
-                            <form string="Interview Appraisal" version="7.0">
-                                <div class="oe_right oe_button_box">
-                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                    <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
-                                </div>
-                                <group>
-                                    <group>
-                                        <field name="survey_id"/>
-                                        <field name="user_to_review_id"/>
-                                        <field name="user_id" string="Interviewer" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_hr_manager']}"/>
-                                    </group>
-                                    <group>              
-                                        <field name="date_deadline"/>
-                                        <field name="response" readonly="1"/>
-                                    </group>
-                                </group>
-                                <group col="4" string="Status" invisible="1">
-                                     <field name="state"/>
-                                     <div>
-                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                     </div>
-                                </group>
-                            </form>
-                        </field>
+                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}" />
                     </group>
                     <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
                         <field nolabel="1" name="note_action"
@@ -230,7 +206,6 @@
                     <field name="employee_id"/>
                     <field name="plan_id"/>
                     <field name="date"/>
-                    <!--field name="progress" widget="progressbar"/-->
                     <field name="rating"/>
                     <field name="state"/>
                 </tree>
@@ -289,15 +264,10 @@
                     <header>
                         <button string="Cancel Survey" name="survey_req_cancel" type="object"
                             states="draft,waiting_answer" class="oe_left"/>
-                        <button string="Print Survey" name="action_print_survey"  type="object"
-                            states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
-                            attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Print Survey" name="action_print_survey" type="object" states='waiting_answer,done' attrs="{'readonly':[('survey_id','=',False)]}"/>
                         <button string="Send Request" name="survey_req_waiting_answer" type="object"
                             states="draft" class="oe_highlight"/>
-                        <button string="Answer Survey" name="%(survey.action_view_survey_question_message)d" type="action"
-                            states="waiting_answer" class="oe_highlight"
-                            context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}"
-                            attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button string="Answer Survey" class="oe_highlight" name="action_start_survey" type="object" states='waiting_answer' attrs="{'readonly':[('request_id','=',False)]}"/>
                         <button string="Done" name="survey_req_done" type="object"
                             states="waiting_answer"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
@@ -306,19 +276,22 @@
                         <div class="oe_right oe_button_box" name="button_box">
                             <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
                                 states="waiting_answer"
-                                context="{'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                                context="{'default_body': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
                                             'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
                             <group>
-                                <field name="survey_id"/>
-                                <field name="user_to_review_id"/>
+                                <field name="evaluation_id" string="Appraisal"/>
+                                <field name="phase_id"/>
+                                <field name="user_to_review_id" readonly="1"/>
+                            </group>
+                            <group>
                                 <field name="user_id" string="Interviewer" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_hr_manager']}"/>
+                                <field name="deadline"/>
                             </group>
                             <group>
-                                <field name="date_deadline"/>
-                                <field name="response" readonly="1"/>
-                                <field name="evaluation_id" string="Appraisal Plan"/>
+                                <field name="request_id"/>
+                                <field name="survey_id" domain="[('res_model','=','hr_evaluation')]" readonly="1"/>
                             </group>
                         </group>
                     </sheet>
@@ -326,18 +299,18 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
+         <record model="ir.ui.view" id="view_hr_evaluation_interview_tree">
             <field name="name">hr_evaluation.interview.tree</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="arch" type="xml">
                 <tree string="Interview Appraisal">
-                    <field name="date_deadline" string="Deadline Date"/>
-                    <field name="survey_id"/>
+                    <field name="deadline" string="Deadline Date"/>
+                    <field name="survey_id" domain="[('res_model','=','hr_evaluation')]"/>
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
-                    <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <field name="request_id" readonly="1" invisible="True"/>
+                    <button name="action_start_survey" string="Answer Survey" type="object" icon="gtk-execute"  attrs="{'readonly':[('request_id','=',False)]}"/>
+                    <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print"  attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
                     <field name="state"/>
                     <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
@@ -351,7 +324,7 @@
             <field name="model">hr.evaluation.interview</field>
             <field name="arch" type="xml">
                 <search string="Search Appraisal">
-                    <field name="date_deadline"/>
+                    <field name="deadline"/>
                     <filter icon="terp-gtk-go-back-rtl" string="To Do" name="todo" domain="[('state','=','waiting_answer')]"/>
                     <field name="user_to_review_id"/>
                     <field name="user_id" string="Interviewer"/>
@@ -368,7 +341,7 @@
             <field name="name">Interview Requests</field>
             <field name="model">hr.evaluation.interview</field>
             <field name="arch" type="xml">
-                <calendar string="Interview Request" color="user_to_review_id" date_start="date_deadline">
+                <calendar string="Interview Request" color="user_to_review_id" date_start="deadline">
                     <field name="request_id"/>
                 </calendar>
             </field>
@@ -379,12 +352,11 @@
             <field name="res_model">hr.evaluation.interview</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="domain">[('is_evaluation' ,'=', True)]</field>
-            <field name="context">{'default_is_evaluation': True, "search_default_todo":1,"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_todo":1,"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a new interview request related to a personal evaluation. 
+                Click to create a new interview request related to a personal evaluation.
               </p><p>
                 Interview requests are usually generated automatically by
                 OpenERP according to an employee's appraisal plan. Each user
@@ -425,7 +397,7 @@
         target="new" multi="True"
         key2="client_action_multi"
         context="{'default_composition_mode': 'mass_mail',
-                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_body': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
                     'default_subject': 'Reminder to fill up Survey'}"/>
 
     </data>
diff --git a/addons/hr_evaluation/i18n/ar.po b/addons/hr_evaluation/i18n/ar.po
index 8900d232cdc..51ee8226923 100644
--- a/addons/hr_evaluation/i18n/ar.po
+++ b/addons/hr_evaluation/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:55+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index fd7373392d8..d015695f3af 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:55+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index a0c0f1c7f1c..ac11381eb86 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/cs.po b/addons/hr_evaluation/i18n/cs.po
index f822e096869..1c8650494a8 100644
--- a/addons/hr_evaluation/i18n/cs.po
+++ b/addons/hr_evaluation/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/da.po b/addons/hr_evaluation/i18n/da.po
index 68fbf3640b8..cd0ee20ef4d 100644
--- a/addons/hr_evaluation/i18n/da.po
+++ b/addons/hr_evaluation/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 61708642af7..c7c48526501 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index 8caacc02a14..22b8a2148c1 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es_CR.po b/addons/hr_evaluation/i18n/es_CR.po
index aeb72e718c1..5774af89258 100644
--- a/addons/hr_evaluation/i18n/es_CR.po
+++ b/addons/hr_evaluation/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 "Language: es\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index aee281968d0..9c6234428b9 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:07+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index c0339c573eb..ef7f829433e 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index bd4b90cbdd4..2ff890b4518 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 9b7424a0604..661c08bc9f8 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index 6508bc7e457..d109449b4b6 100644
--- a/addons/hr_evaluation/i18n/gl.po
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 64b6ae5bb8b..fedf3751e23 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 5fe1bd3cef2..ba12b16a67a 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index 2c74c6f000a..499f09625d3 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 84708531b16..632df76072f 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index ee4c22f5531..d793b88a4c0 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/mk.po b/addons/hr_evaluation/i18n/mk.po
index 86deeba8eb2..06afd1d6435 100644
--- a/addons/hr_evaluation/i18n/mk.po
+++ b/addons/hr_evaluation/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 837b078b443..81e3d8a6b54 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index 4b128bb094b..9bd6ed21f98 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/pl.po b/addons/hr_evaluation/i18n/pl.po
index f171eb4e736..93b3f6b61b4 100644
--- a/addons/hr_evaluation/i18n/pl.po
+++ b/addons/hr_evaluation/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index c1cdaec9bce..6c931222188 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index aa97b78f6e5..35d238c4cb8 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ro.po b/addons/hr_evaluation/i18n/ro.po
index 8bc803e24fc..9db95d7b001 100644
--- a/addons/hr_evaluation/i18n/ro.po
+++ b/addons/hr_evaluation/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 756893b07a5..fc19038964e 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sl.po b/addons/hr_evaluation/i18n/sl.po
index c933d5f34e5..71e341e1c03 100644
--- a/addons/hr_evaluation/i18n/sl.po
+++ b/addons/hr_evaluation/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index 3d4b480a88d..5487f5d804f 100644
--- a/addons/hr_evaluation/i18n/sr.po
+++ b/addons/hr_evaluation/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index ef96de5ecbf..f7bcb4f719f 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:07+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index e7d4d864366..f8f4718139b 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -25,14 +25,14 @@ msgstr "Skicka en anonym sammanfattning till chefen"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr "Starta Bedömning"
+msgstr "Starta utvärdering"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr "Gruppera efter..."
+msgstr "Gruppera på..."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
@@ -43,30 +43,30 @@ msgstr "Request_id"
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr "Fördröjning till Start"
+msgstr "Tid till start"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in waiting appreciation state"
-msgstr "Bedömning som väntar"
+msgstr "Utvärdering som väntar på erkännande"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr "Företag"
+msgstr "Bolag"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr "Bedömningsformulär"
+msgstr "Utvärderingsformulär"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -78,12 +78,12 @@ msgstr "Dag"
 #: view:hr_evaluation.plan:0
 #: field:hr_evaluation.plan,phase_ids:0
 msgid "Appraisal Phases"
-msgstr "Bedömningsfaser"
+msgstr "Utvärderingsetapper"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "Skicka begäran"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -91,40 +91,40 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
-"Det antal månader ska användas för att schemalägga den första "
-"Utvärderingsdatumet för den anställde, när man väljer en Utvärderingsplan. "
+"Det antal månader som skall användas för att schemalägga det första "
+"utvärderingsdatumet för den anställde, när man väljer en utvärderingsplan. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisals"
-msgstr ""
+msgstr "Utvärderingar"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Appraisal Name"
-msgstr "(Eval_name): Bedömnings namn"
+msgstr "(Eval_name): Utvärderingsnamn"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meddelanden"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr "Meddelande"
+msgstr "Meddelandetext"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr "Invänta tidigare faser"
+msgstr "Invänta tidigare etapper"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Appraisal"
-msgstr "Bedömning av anställd"
+msgstr "Utvärdering av personal"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -143,13 +143,13 @@ msgstr "Uppfyller inte förväntningarna"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 msgid "Appraisal"
-msgstr "Bedömning"
+msgstr "Utvärdering"
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_unread:0
 #: help:hr_evaluation.evaluation,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Om ikryssad nya meddelanden som kräver din uppmärksamhet"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -213,7 +213,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in Plan In Progress state"
-msgstr "Bedömning som pågår"
+msgstr "Planerad och pågående utvärdering"
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_summary:0
@@ -222,11 +222,13 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Lagrar pladder-sammanfattning (antal meddelanden, ...). Denna sammanfattning "
+"presenteras i html-format för att kunna sättas in i kanban vyer."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Reset to Draft"
-msgstr "Återställ till Utkast"
+msgstr "Återställ till utkast"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -238,7 +240,7 @@ msgstr "Tidsfrist"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Varning!"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -248,7 +250,7 @@ msgstr "Pågående Utvärderingar"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr "undersöknings.begäran"
+msgstr "survey.request"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -258,7 +260,7 @@ msgstr "(Datum)s: Aktuellt datum"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "Intervjuer"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:83
@@ -270,13 +272,13 @@ msgstr "Beträffande "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Följare"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Olästa meddelanden"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -285,7 +287,7 @@ msgstr ""
 #: field:hr_evaluation.evaluation,employee_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_employee
 msgid "Employee"
-msgstr "Anställd"
+msgstr "Medarbetare"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
@@ -309,12 +311,12 @@ msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
 msgstr ""
 "Markera denna ruta om du vill skicka e-post till anställda som omfattas av "
-"denna fas"
+"denna etapp"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr "Skapades"
+msgstr "Registeringsdatum"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
@@ -377,12 +379,12 @@ msgstr "Juli"
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr "Recension Bedömning Planer"
+msgstr "Granska utvärderingsplaner"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
@@ -399,6 +401,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicka för att definiera en ny utvärderingsplan .\n"
+"               </p><p>\n"
+"                 Du kan definiera utvärderingsplaner (ex: första intervju "
+"efter 6\n"
+"                 månader, därefter varje år). Sedan kan varje anställd "
+"kopplas till\n"
+"                 en utvärderingsplan så att OpenERP automatiskt kan "
+"generera\n"
+"                 intervjubegäran till chefer och / eller underordnade.\n"
+"               </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -413,12 +427,12 @@ msgstr "Handlingsplan"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr "Regelbunden Bedömning"
+msgstr "Periodisk utvärdering"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Appraisal (months)"
-msgstr "Periodicitet av Bedömning (månader)"
+msgstr "Periodicitet av utvärdering (månader)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
@@ -446,7 +460,7 @@ msgstr "Alla svar"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Svara på undersökningen"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -477,7 +491,7 @@ msgstr "E-postinställningar"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr "BedömningsPåminnelser"
+msgstr "Utvärderingspåminnelser"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -496,7 +510,7 @@ msgstr "Teckenförklaring"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Appraisal in (months)"
-msgstr "Första Bedömning i (månader)"
+msgstr "Första utvärdering i (månader)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -522,7 +536,7 @@ msgstr "Pågående"
 #: field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Appraisal Plan"
-msgstr "BedömningsPlan"
+msgstr "Utvärderingsplan"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -548,7 +562,7 @@ msgstr "Betydligt under förväntningarna"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Appraisal"
-msgstr "Validera Bedömning"
+msgstr "Granska utvärdering"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -559,7 +573,7 @@ msgstr " (Employee_name) s: Partners namn"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Är en följare"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -592,7 +606,7 @@ msgstr "Skicka en anonym sammanfattning till den anställde"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Appraisal Plan Phase"
-msgstr "BedömningPlan fas"
+msgstr "Utvärderingsplane etapp"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -608,7 +622,7 @@ msgstr "Utvecklingssamtal"
 #: field:hr.evaluation.interview,message_summary:0
 #: field:hr_evaluation.evaluation,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammandrag"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -641,12 +655,12 @@ msgstr "Väntar Värdering"
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Appraisal Analysis"
-msgstr "BedömningsAnalys"
+msgstr "Utvärderingsanalys"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Appraisal Deadline"
-msgstr "Tidsfrist Bedömning"
+msgstr "Frist för utvärdering"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
@@ -672,12 +686,12 @@ msgstr "Datum Tidsfrist"
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on which the evaluation is summarized."
-msgstr ""
+msgstr "Detta är sammanfattningen av utvärderingens slutliga bedömning."
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr "Uppifrån och ner Begäran om Bedömning"
+msgstr "Begäran av utvärdering från ledningen"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -703,7 +717,7 @@ msgstr "Klar"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Appraisal Plans"
-msgstr "BedömningsPlaner"
+msgstr "Utvärderingsplaner"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
@@ -752,8 +766,8 @@ msgid ""
 "The date of the next appraisal is computed by the appraisal plan's dates "
 "(first appraisal + periodicity)."
 msgstr ""
-"Datumet för nästa Bedömning beräknas genom Bedömningsplanens datum (första "
-"Bedömning + periodicitet)."
+"Datumet för nästa utvärdering beräknas genom planeringens datum (första "
+"utvärderingen + periodicitet)."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
@@ -772,13 +786,13 @@ msgstr ""
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr "Egen Begäran om Bedömning"
+msgstr "Utvärdering på egen begäran"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr "BedömningsBlanketter"
+msgstr "Utvärderingsblankett"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -802,6 +816,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Klicka för att skapa en ny "
+"utvärdering. </p><p>Varje anställd kan tilldelas en utvärderingsplan. En "
+"sådan plan definierar frekvensen och ditt sätt att hantera din periodiska "
+"personalutvärdering. Du kommer att kunna fastställa åtgärder och bifoga "
+"intervjuer till varje steg. OpenERP hanterar alla typer av utvärderingar: "
+"bottom-up, top-down, självutvärdering och slutlig utvärdering av "
+"projektledaren. </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -821,7 +843,7 @@ msgstr "Fas"
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr "Nerifrån och upp Begäran om Bedömning"
+msgstr "Begäran av utvärdering från golvet"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -832,7 +854,7 @@ msgstr "Februari"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr "Intervju Bedömning"
+msgstr "Utvärderingsintervju"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -843,7 +865,7 @@ msgstr "Är Bedömning?"
 #: code:addons/hr_evaluation/hr_evaluation.py:320
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr "Du kan inte starta Utvärdering utan Bedömning."
+msgstr "Du kan inte starta kartläggning utan utvärdering."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
@@ -857,6 +879,8 @@ msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
 "draft state."
 msgstr ""
+"Du kan inte ändra status, eftersom vissa utvärderingssvar är att vänta eller "
+"bara är preleminära."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -866,7 +890,7 @@ msgstr "April"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Appraisal Plan Phases"
-msgstr "Bedömning Plan faser"
+msgstr "Utvärderingsplan etapper"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -883,18 +907,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\"> Klicka för att skapa en ny "
+"intervjubegäran i samband med en personlig utvärdering. </p><p> "
+"Intervjuförfrågningar brukar genereras automatiskt av OpenERP enligt en "
+"anställds utvärderingsplan. Varje användare tar emot automatiska e-"
+"postmeddelanden och önskemål för att utvärdera sina kollegor regelbundet. "
+"</p>\n"
+"            "
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meddelande- och kommunikationshistorik"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Search Appraisal"
-msgstr "Sök Bedömning"
+msgstr "Sök utvärdering"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
@@ -928,7 +959,7 @@ msgstr "År"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Appraisal Summary"
-msgstr "Bedömning Sammanfattning"
+msgstr "Utvärderingssammanfattning"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index d39731eec68..774dd156bd1 100644
--- a/addons/hr_evaluation/i18n/tr.po
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 657ef4cb8ed..e62e4237450 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:07+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/zh_TW.po b/addons/hr_evaluation/i18n/zh_TW.po
index 0f84324177d..4498b830e00 100644
--- a/addons/hr_evaluation/i18n/zh_TW.po
+++ b/addons/hr_evaluation/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-03-27 07:06+0000\n"
-"X-Generator: Launchpad (build 16967)\n"
+"X-Launchpad-Export-Date: 2014-04-12 07:56+0000\n"
+"X-Generator: Launchpad (build 16976)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report.py b/addons/hr_evaluation/report/hr_evaluation_report.py
index 36353b65dfb..ce6f381fb60 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report.py
+++ b/addons/hr_evaluation/report/hr_evaluation_report.py
@@ -22,41 +22,43 @@
 from openerp import tools
 from openerp.osv import fields, osv
 
-class hr_evaluation_report(osv.osv):
+
+class hr_evaluation_report(osv.Model):
     _name = "hr.evaluation.report"
     _description = "Evaluations Statistics"
     _auto = False
     _columns = {
         'create_date': fields.date('Create Date', readonly=True),
-        'delay_date':fields.float('Delay to Start', digits=(16,2),readonly=True),
-        'overpass_delay':fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
+        'delay_date': fields.float('Delay to Start', digits=(16, 2), readonly=True),
+        'overpass_delay': fields.float('Overpassed Deadline', digits=(16, 2), readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'deadline': fields.date("Deadline", readonly=True),
-        'request_id': fields.many2one('survey.request', 'Request_id', readonly=True),
+        'request_id': fields.many2one('survey.user_input', 'Request_id', readonly=True),
         'closed': fields.date("closed", readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
-        'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
+            ('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'plan_id': fields.many2one('hr_evaluation.plan', 'Plan', readonly=True),
         'employee_id': fields.many2one('hr.employee', "Employee", readonly=True),
         'rating': fields.selection([
-            ('0','Significantly bellow expectations'),
-            ('1','Did not meet expectations'),
-            ('2','Meet expectations'),
-            ('3','Exceeds expectations'),
-            ('4','Significantly exceeds expectations'),
+            ('0', 'Significantly bellow expectations'),
+            ('1', 'Did not meet expectations'),
+            ('2', 'Meet expectations'),
+            ('3', 'Exceeds expectations'),
+            ('4', 'Significantly exceeds expectations'),
         ], "Overall Rating", readonly=True),
-        'nbr':fields.integer('# of Requests', readonly=True),
+        'nbr': fields.integer('# of Requests', readonly=True),
         'state': fields.selection([
-            ('draft','Draft'),
-            ('wait','Plan In Progress'),
-            ('progress','Final Validation'),
-            ('done','Done'),
-            ('cancel','Cancelled'),
-        ], 'Status',readonly=True),
+            ('draft', 'Draft'),
+            ('wait', 'Plan In Progress'),
+            ('progress', 'Final Validation'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', readonly=True),
     }
     _order = 'create_date desc'
+
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'hr_evaluation_report')
         cr.execute("""
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index 1f22e3b5d16..3fb1425651c 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -6,37 +6,20 @@ access_hr_evaluation_plan_phase_user,hr_evaluation.plan.phase.user,model_hr_eval
 access_hr_evaluation_interview_user,hr.evaluation.interview.user,model_hr_evaluation_interview,base.group_hr_user,1,1,1,1

 access_hr_evaluation_interview_employee,hr.evaluation.interview.employee,model_hr_evaluation_interview,base.group_user,1,1,1,0

 access_hr_evaluation_report,hr.evaluation.report,model_hr_evaluation_report,base.group_hr_manager,1,1,1,1

-access_survey_type_hr_manager,survey.type,survey.model_survey_type,base.group_hr_manager,1,1,1,1

-access_survey_hr_manager,survey.hr.manager,survey.model_survey,base.group_hr_manager,1,1,1,1

-access_survey_history_manager,survey.history,survey.model_survey_history,base.group_hr_manager,1,1,1,1

+access_survey_hr_manager,survey.hr.manager,survey.model_survey_survey,base.group_hr_manager,1,1,1,1

 access_survey_question_hr_manager,survey.question,survey.model_survey_question,base.group_hr_manager,1,1,1,1

-access_survey_question_column_heading_hr_manager,survey.question.column.heading,survey.model_survey_question_column_heading,base.group_hr_manager,1,1,1,1

-access_survey_answer_hr_manager,survey.answer,survey.model_survey_answer,base.group_hr_manager,1,1,1,1

-access_survey_response_hr_manager,survey.response,survey.model_survey_response,base.group_hr_manager,1,1,1,1

-access_survey_response_line_hr_manager,survey.response.line,survey.model_survey_response_line,base.group_hr_manager,1,1,1,1

-access_survey_tbl_column_heading_hr_manager,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_hr_manager,1,1,1,1

-access_survey_response_answer_hr_manager,survey.response.answer,survey.model_survey_response_answer,base.group_hr_manager,1,1,1,1

-access_survey_request_hr_manager,survey.request,survey.model_survey_request,base.group_hr_manager,1,1,1,1

-access_survey_answer_hr_user,survey.answer.hr.user,survey.model_survey_answer,base.group_hr_user,1,1,1,0

-access_survey_response_answer_hr_user,survey.response.answer.hr.user,survey.model_survey_response_answer,base.group_hr_user,1,1,1,0

-access_survey_type_hr_user,survey.type.hr.user,survey.model_survey_type,base.group_hr_user,1,1,1,0

+access_survey_question_column_heading_hr_manager,survey.question.column.heading,survey.model_survey_label,base.group_hr_manager,1,1,1,1

+access_survey_response_hr_manager,survey.response,survey.model_survey_user_input,base.group_hr_manager,1,1,1,1

+access_survey_response_line_hr_manager,survey.response.line,survey.model_survey_user_input_line,base.group_hr_manager,1,1,1,1

 access_survey_question_hr_user,survey.question.hr.user,survey.model_survey_question,base.group_hr_user,1,1,1,0

 access_survey_page_hr_user,survey.page.hr.user,survey.model_survey_page,base.group_hr_user,1,1,1,1

-access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_response,base.group_hr_user,1,1,1,0

-access_survey_history_hr_user,survey.history.hr.user,survey.model_survey_history,base.group_hr_user,1,1,1,0

-access_survey_request_hr_user,survey.request.hr.user,survey.model_survey_request,base.group_hr_user,1,1,1,0

-access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_question_column_heading,base.group_hr_user,1,1,1,0

-access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_response_line,base.group_hr_user,1,1,1,0

-access_survey_tbl_column_heading_hr_user,survey.tbl.column.heading.hr.user,survey.model_survey_tbl_column_heading,base.group_hr_user,1,1,1,0

+access_survey_response_hr_user,survey.response.hr.user,survey.model_survey_user_input,base.group_hr_user,1,1,1,0

+access_survey_question_column_heading_hr_user,survey.question.column.heading.hr.user,survey.model_survey_label,base.group_hr_user,1,1,1,0

+access_survey_response_line_hr_user,survey.response.line.hr.user,survey.model_survey_user_input_line,base.group_hr_user,1,1,1,0

 access_calendar_attendee_survey_user,base.calendar.calendar.attendee.survey.user,calendar.model_calendar_attendee,base.group_survey_user,1,1,1,0

-access_calendar_attendee_tool_user,base.calendar.calendar.attendee.tool.user,calendar.model_calendar_attendee,base.group_tool_user,1,1,1,0

-access_survey_request_hr_employee,survey.request.hr.employee,survey.model_survey_request,base.group_user,1,1,1,0

-access_survey_hr_employee,survey.hr.employee,survey.model_survey,base.group_user,1,1,0,0

+access_survey_hr_employee,survey.hr.employee,survey.model_survey_survey,base.group_user,1,1,0,0

 access_survey_page_hr_employee,survey.page.hr.employee,survey.model_survey_page,base.group_user,1,0,0,0

-access_survey_answer_hr_employee,survey.answer.employee,survey.model_survey_answer,base.group_user,1,0,0,0

 access_survey_question_hr_employee,survey.question.employee,survey.model_survey_question,base.group_user,1,0,0,0

-access_survey_response_hr_employee,survey.response.employee,survey.model_survey_response,base.group_user,1,1,1,0

-access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_question_column_heading,base.group_user,1,0,0,0

-access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0

-access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0

-access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
\ No newline at end of file
+access_survey_response_hr_employee,survey.response.employee,survey.model_survey_user_input,base.group_user,1,1,1,0

+access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_label,base.group_user,1,0,0,0

+access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_user_input_line,base.group_user,1,1,1,0
\ No newline at end of file
diff --git a/addons/hr_evaluation/survey_data_appraisal.xml b/addons/hr_evaluation/survey_data_appraisal.xml
new file mode 100644
index 00000000000..d3f83f91ba5
--- /dev/null
+++ b/addons/hr_evaluation/survey_data_appraisal.xml
@@ -0,0 +1,676 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Appraisal form -->
+        <record model="survey.survey" id="appraisal_form">
+            <field name="title">Employee Appraisal Form</field>
+            <field name="stage_id" ref="survey.stage_permanent" />
+            <field name="res_model">hr_evaluation</field>
+            <field name="auth_required" eval="True" />
+            <field name="users_can_go_back" eval="True" />
+            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
+            <field name="thank_you_message">&lt;p&gt; &lt;/p&gt;</field>
+        </record>
+        <!-- Page 1 -->
+        <record model="survey.page" id="appraisal_1">
+            <field name="title">Employee Appraisal Form</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="sequence">1</field>
+            <field name="description">&lt;h2&gt;Overall Purpose Of Employee Appraisal&lt;/h2&gt;
+&lt;ul&gt;&lt;li&gt;To initiate a clear and open communication of performance expectations
+&lt;li&gt;To assist employees in their professional growth, through the identification of strengths and opportunities for
+development&lt;/ul&gt;
+&lt;h2&gt;At the outset of the appraisal time period&lt;/h2&gt;
+&lt;ul&gt;&lt;li&gt;It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the
+coming year, including major employee responsibilities and corresponding benchmarks against which results will be
+evaluated.
+&lt;li&gt;Critical or key elements of performance and professional development needs (if any), should also be noted at this time&lt;/ul&gt;
+&lt;h2&gt;At the conclusion of the appraisal time period&lt;/h2&gt;
+&lt;ul&gt;&lt;li&gt;The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting
+point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
+Once the form had been filled, the employee send it to his supervisor.
+&lt;li&gt;It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback
+(internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must
+receive completed evaluation form from the employee's Belgian project manager.
+&lt;li&gt;The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad
+hoc fields.
+&lt;li&gt;The employee may choose to offer comments or explanation regarding the completed review.
+&lt;li&gt;The supervisor send the form to the HR department in India and in Belgium&lt;/ul&gt;</field>
+        </record>
+        <record model="survey.question" id="appraisal_1_1">
+            <field name="page_id" ref="appraisal_1" />
+            <field name="sequence">1</field>
+            <field name="question">Name</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_1_2">
+            <field name="page_id" ref="appraisal_1" />
+            <field name="sequence">2</field>
+            <field name="question">Position Title</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_1_3">
+            <field name="page_id" ref="appraisal_1" />
+            <field name="sequence">3</field>
+            <field name="question">Appraisal for Period</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_1_4">
+            <field name="page_id" ref="appraisal_1" />
+            <field name="sequence">4</field>
+            <field name="question">Date of review</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_1_5">
+            <field name="page_id" ref="appraisal_1" />
+            <field name="sequence">5</field>
+            <field name="question">Appraiser</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <!-- Page 2 -->
+        <record model="survey.page" id="appraisal_2">
+            <field name="title">Work Plan</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="sequence">2</field>
+            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
+        </record>
+        <record model="survey.question" id="appraisal_2_1">
+            <field name="page_id" ref="appraisal_2" />
+            <field name="sequence">1</field>
+            <field name="question">Objectives</field>
+            <field name="type">free_text</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_2_2">
+            <field name="page_id" ref="appraisal_2" />
+            <field name="sequence">2</field>
+            <field name="question">Results</field>
+            <field name="type">free_text</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="appraisal_2_3">
+            <field name="page_id" ref="appraisal_2" />
+            <field name="sequence">3</field>
+            <field name="question">Additional Comments</field>
+            <field name="type">free_text</field>
+        </record>
+        <!-- Page 3 -->
+        <record model="survey.page" id="appraisal_3">
+            <field name="title">Employee Performance in Key Areas</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="sequence">3</field>
+            <field name="description">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided
+below:&lt;ol&gt;
+&lt;li&gt; Significantly exceeds standards and expectations required of the position
+&lt;li&gt; Exceeds standards and expectations
+&lt;li&gt; Meet standards and expectations
+&lt;li&gt; Did not meet standards and expectations
+&lt;li&gt; Significantly below standards and expectations&lt;/ol&gt;</field>
+        </record>
+        <record model="survey.question" id="appraisal_3_1">
+            <field name="page_id" ref="appraisal_3" />
+            <field name="sequence">1</field>
+            <field name="question">Subject</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+                <record model="survey.label" id="acol_3_1_1">
+                    <field name="question_id" ref="appraisal_3_1"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="acol_3_1_2">
+                    <field name="question_id" ref="appraisal_3_1"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="acol_3_1_3">
+                    <field name="question_id" ref="appraisal_3_1"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="acol_3_1_4">
+                    <field name="question_id" ref="appraisal_3_1"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="acol_3_1_5">
+                    <field name="question_id" ref="appraisal_3_1"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_1">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">1</field>
+                    <field name="value">Ability to cope with multidisciplinarity of team</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_2">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">2</field>
+                    <field name="value">Enthusiasm &amp; implication toward projects/assignments</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_3">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">3</field>
+                    <field name="value">Compliance to internal rules and processes (timesheets completion, etc.)</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_4">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">4</field>
+                    <field name="value">Team spirit: ability to work efficiently with peers, manage the conflicts with diplomacy</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_5">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">5</field>
+                    <field name="value">Initiative and self autonomy</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_6">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">6</field>
+                    <field name="value">Ability to follow and complete work as instructed</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_7">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">7</field>
+                    <field name="value">Decision making</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_8">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">8</field>
+                    <field name="value">Customer commitment</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_9">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">9</field>
+                    <field name="value">Communication skills (written &amp; verbally): clearness, concision, exactitude</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_10">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">10</field>
+                    <field name="value">Technical skills regarding to the job requirements</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_11">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">11</field>
+                    <field name="value">Analytical and synthetic mind</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_12">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">12</field>
+                    <field name="value">Promptness and attendance record</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_13">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">13</field>
+                    <field name="value">Adaptability: Ability to adapt oneself to organizational changes while keeping efficiency</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_14">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">14</field>
+                    <field name="value">Creativity and forward looking aptitude</field>
+                </record>
+                <record model="survey.label" id="arow_3_1_15">
+                    <field name="question_id_2" ref="appraisal_3_1"/>
+                    <field name="sequence">15</field>
+                    <field name="value">Time management: projects/tasks are completed on time</field>
+                </record>
+        <record model="survey.question" id="appraisal_3_2">
+            <field name="page_id" ref="appraisal_3" />
+            <field name="sequence">2</field>
+            <field name="question">Supervisors only</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="acol_3_2_1">
+                    <field name="question_id" ref="appraisal_3_2"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="acol_3_2_2">
+                    <field name="question_id" ref="appraisal_3_2"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="acol_3_2_3">
+                    <field name="question_id" ref="appraisal_3_2"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="acol_3_2_4">
+                    <field name="question_id" ref="appraisal_3_2"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="acol_3_2_5">
+                    <field name="question_id" ref="appraisal_3_2"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="arow_3_2_1">
+                    <field name="question_id_2" ref="appraisal_3_2"/>
+                    <field name="sequence">1</field>
+                    <field name="value">Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues</field>
+                </record>
+                <record model="survey.label" id="arow_3_2_2">
+                    <field name="question_id_2" ref="appraisal_3_2"/>
+                    <field name="sequence">2</field>
+                    <field name="value">Delegation: Ability to efficiently assign tasks to other people</field>
+                </record>
+                <record model="survey.label" id="arow_3_2_3">
+                    <field name="question_id_2" ref="appraisal_3_2"/>
+                    <field name="sequence">3</field>
+                    <field name="value">Leadership: create a challenging and motivating work environment aligned with the company's strategy</field>
+                </record>
+                <record model="survey.label" id="arow_3_2_4">
+                    <field name="question_id_2" ref="appraisal_3_2"/>
+                    <field name="sequence">4</field>
+                    <field name="value">Leadership: sustain subordinates in their professional growth</field>
+                </record>
+                <record model="survey.label" id="arow_3_2_5">
+                    <field name="question_id_2" ref="appraisal_3_2"/>
+                    <field name="sequence">5</field>
+                    <field name="value">Ability to manage planning resources, risks, budgets and deadlines</field>
+                </record>
+        <!-- Page 4 -->
+        <record model="survey.page" id="appraisal_4">
+            <field name="title">Professional Development and Performance Plan</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="sequence">4</field>
+            <field name="description">&lt;p&gt;Identify professional, performance, or project objectives you recommend for employee’s continued career development
+over the coming year.&lt;/p&gt;</field>
+        </record>
+        <record model="survey.question" id="appraisal_4_1">
+            <field name="page_id" ref="appraisal_4" />
+            <field name="sequence">1</field>
+            <field name="question">Professional Development Objectives</field>
+            <field name="type">free_text</field>
+        </record>
+        <record model="survey.question" id="appraisal_4_2">
+            <field name="page_id" ref="appraisal_4" />
+            <field name="sequence">2</field>
+            <field name="question">Personal Performance Objectives</field>
+            <field name="type">free_text</field>
+        </record>
+        <record model="survey.question" id="appraisal_4_3">
+            <field name="page_id" ref="appraisal_4" />
+            <field name="sequence">3</field>
+            <field name="question">Project Objectives</field>
+            <field name="type">free_text</field>
+        </record>
+        <!-- Page 5 -->
+        <record model="survey.page" id="appraisal_5">
+            <field name="title">Employee Comments</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="description">&lt;p&gt;&lt;/p&gt;</field>
+            <field name="sequence">5</field>
+        </record>
+        <record model="survey.question" id="appraisal_5_1">
+            <field name="page_id" ref="appraisal_5" />
+            <field name="sequence">1</field>
+            <field name="question">Use the following space to make any comments regarding the above performance evaluation.</field>
+            <field name="type">free_text</field>
+        </record>
+        <!-- Employee Opinion form -->
+        <record model="survey.survey" id="opinion_form">
+            <field name="title">Employee Opinion Form</field>
+            <field name="stage_id" ref="survey.stage_permanent" />
+            <field name="res_model">hr_evaluation</field>
+            <field name="auth_required" eval="True" />
+            <field name="users_can_go_back" eval="True" />
+            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
+            <field name="thank_you_message">&lt;p&gt; &lt;/p&gt;</field>
+        </record>
+        <!-- Page 1 -->
+        <record model="survey.page" id="opinion_1">
+            <field name="title">Appraisal Process</field>
+            <field name="survey_id" ref="opinion_form" />
+            <field name="sequence">1</field>
+            <field name="description">&lt;h2&gt;At the supervisor's appraisal date&lt;/h2&gt;
+&lt;p&gt;His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in thecompany...&lt;/p&gt;
+&lt;p&gt;The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.&lt;/p&gt;
+&lt;p&gt;The appraiser should rate the employee's major work accomplishments and performance according to the metric provided below
+&lt;ol&gt;
+&lt;li&gt;Significantly exceeds standards and expectations required of the position&lt;/li&gt;
+&lt;li&gt;Exceeds standards and expectations&lt;/li&gt;
+&lt;li&gt;Meet standards and expectations&lt;/li&gt;
+&lt;li&gt;Did not meet standards and expectations&lt;/li&gt;
+&lt;li&gt;Significantly below standards and expectations&lt;/li&gt;
+&lt;/ol&gt;&lt;/p&gt;</field>
+        </record>
+        <record model="survey.question" id="opinion_1_1">
+            <field name="page_id" ref="opinion_1" />
+            <field name="sequence">1</field>
+            <field name="question">Name of your direct supervisor</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <record model="survey.question" id="opinion_1_2">
+            <field name="page_id" ref="opinion_1" />
+            <field name="sequence">2</field>
+            <field name="question">Date</field>
+            <field name="type">textbox</field>
+            <field name="constr_mandatory" eval="True" />
+        </record>
+        <!-- Page 2 -->
+        <record model="survey.page" id="opinion_2">
+            <field name="title">Evaluation</field>
+            <field name="survey_id" ref="opinion_form" />
+            <field name="sequence">2</field>
+            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
+        </record>
+        <record model="survey.question" id="opinion_2_1">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">1</field>
+            <field name="question">Engagement</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_1_1">
+                    <field name="question_id" ref="opinion_2_1"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_1_2">
+                    <field name="question_id" ref="opinion_2_1"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_1_3">
+                    <field name="question_id" ref="opinion_2_1"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_1_4">
+                    <field name="question_id" ref="opinion_2_1"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_1_5">
+                    <field name="question_id" ref="opinion_2_1"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_1_1">
+                    <field name="question_id_2" ref="opinion_2_1"/>
+                    <field name="sequence">1</field>
+                    <field name="value">I am proud to tell others I work here</field>
+                </record>
+                <record model="survey.label" id="oprow_2_1_2">
+                    <field name="question_id_2" ref="opinion_2_1"/>
+                    <field name="sequence">2</field>
+                    <field name="value">My job provides me with a sense of personal accomplishment</field>
+                </record>
+                <record model="survey.label" id="oprow_2_1_3">
+                    <field name="question_id_2" ref="opinion_2_1"/>
+                    <field name="sequence">3</field>
+                    <field name="value">I would prefer to remain with this company even if a comparable job were available in another company</field>
+                </record>
+                <record model="survey.label" id="oprow_2_1_4">
+                    <field name="question_id_2" ref="opinion_2_1"/>
+                    <field name="sequence">4</field>
+                    <field name="value">Taking everything into account, how satisfied are you with your current job?</field>
+                </record>
+                <record model="survey.label" id="oprow_2_1_5">
+                    <field name="question_id_2" ref="opinion_2_1"/>
+                    <field name="sequence">5</field>
+                    <field name="value">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed</field>
+                </record>
+        <record model="survey.question" id="opinion_2_2">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">2</field>
+            <field name="question">Leadership</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_2_1">
+                    <field name="question_id" ref="opinion_2_2"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_2_2">
+                    <field name="question_id" ref="opinion_2_2"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_2_3">
+                    <field name="question_id" ref="opinion_2_2"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_2_4">
+                    <field name="question_id" ref="opinion_2_2"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_2_5">
+                    <field name="question_id" ref="opinion_2_2"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_2_1">
+                    <field name="question_id_2" ref="opinion_2_2"/>
+                    <field name="sequence">1</field>
+                    <field name="value">Demonstrates genuine concern for me as a person</field>
+                </record>
+                <record model="survey.label" id="oprow_2_2_2">
+                    <field name="question_id_2" ref="opinion_2_2"/>
+                    <field name="sequence">2</field>
+                    <field name="value">I consistently acquire new knowledge, skills or understanding through contact with my supervisor. He helps me growing my compete</field>
+                </record>
+                <record model="survey.label" id="oprow_2_2_3">
+                    <field name="question_id_2" ref="opinion_2_2"/>
+                    <field name="sequence">3</field>
+                    <field name="value">Listens and takes into account all ideas and do his best to put in place the best of these</field>
+                </record>
+                <record model="survey.label" id="oprow_2_2_4">
+                    <field name="question_id_2" ref="opinion_2_2"/>
+                    <field name="sequence">4</field>
+                    <field name="value">I believe the information that I get from the person I report to.</field>
+                </record>
+        <record model="survey.question" id="opinion_2_3">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">3</field>
+            <field name="question">Effectiveness</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_3_1">
+                    <field name="question_id" ref="opinion_2_3"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_3_2">
+                    <field name="question_id" ref="opinion_2_3"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_3_3">
+                    <field name="question_id" ref="opinion_2_3"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_3_4">
+                    <field name="question_id" ref="opinion_2_3"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_3_5">
+                    <field name="question_id" ref="opinion_2_3"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_3_1">
+                    <field name="question_id_2" ref="opinion_2_3"/>
+                    <field name="sequence">1</field>
+                    <field name="value">I'm efficient at work and my achievements are successful</field>
+                </record>
+                <record model="survey.label" id="oprow_2_3_2">
+                    <field name="question_id_2" ref="opinion_2_3"/>
+                    <field name="sequence">2</field>
+                    <field name="value">I have enough work</field>
+                </record>
+                <record model="survey.label" id="oprow_2_3_3">
+                    <field name="question_id_2" ref="opinion_2_3"/>
+                    <field name="sequence">3</field>
+                    <field name="value">I mostly work on value-added tasks for the company, the products or the services</field>
+                </record>
+        <record model="survey.question" id="opinion_2_4">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">4</field>
+            <field name="question">Continuous Improvement</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_4_1">
+                    <field name="question_id" ref="opinion_2_4"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_4_2">
+                    <field name="question_id" ref="opinion_2_4"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_4_3">
+                    <field name="question_id" ref="opinion_2_4"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_4_4">
+                    <field name="question_id" ref="opinion_2_4"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_4_5">
+                    <field name="question_id" ref="opinion_2_4"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_4_1">
+                    <field name="question_id_2" ref="opinion_2_4"/>
+                    <field name="sequence">1</field>
+                    <field name="value">My work contributes towards the continuous improvement of the company, our services or products</field>
+                </record>
+                <record model="survey.label" id="oprow_2_4_2">
+                    <field name="question_id_2" ref="opinion_2_4"/>
+                    <field name="sequence">2</field>
+                    <field name="value">What I did several months ago is still of use to the company, the services or the products today</field>
+                </record>
+                <record model="survey.label" id="oprow_2_4_3">
+                    <field name="question_id_2" ref="opinion_2_4"/>
+                    <field name="sequence">3</field>
+                    <field name="value">Overall, I believe the quality of products and/or services my workgroup delivers is improving</field>
+                </record>
+                <record model="survey.label" id="oprow_2_4_4">
+                    <field name="question_id_2" ref="opinion_2_4"/>
+                    <field name="sequence">4</field>
+                    <field name="value">Our workgroup identifies and reduces waste of time in our activities and processes</field>
+                </record>
+        <record model="survey.question" id="opinion_2_5">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">5</field>
+            <field name="question">Openness</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_5_1">
+                    <field name="question_id" ref="opinion_2_5"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_5_2">
+                    <field name="question_id" ref="opinion_2_5"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_5_3">
+                    <field name="question_id" ref="opinion_2_5"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_5_4">
+                    <field name="question_id" ref="opinion_2_5"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_5_5">
+                    <field name="question_id" ref="opinion_2_5"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_5_1">
+                    <field name="question_id_2" ref="opinion_2_5"/>
+                    <field name="sequence">1</field>
+                    <field name="value">I know the company's values and live them</field>
+                </record>
+                <record model="survey.label" id="oprow_2_5_2">
+                    <field name="question_id_2" ref="opinion_2_5"/>
+                    <field name="sequence">2</field>
+                    <field name="value">My best achievements have been communicated to the community, internally or to customers</field>
+                </record>
+        <record model="survey.question" id="opinion_2_6">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">6</field>
+            <field name="question">Miscellaneous</field>
+            <field name="type">matrix</field>
+            <field name="matrix_subtype">simple</field>
+        </record>
+                <record model="survey.label" id="opcol_2_6_1">
+                    <field name="question_id" ref="opinion_2_6"/>
+                    <field name="sequence">1</field>
+                    <field name="value">1</field>
+                </record>
+                <record model="survey.label" id="opcol_2_6_2">
+                    <field name="question_id" ref="opinion_2_6"/>
+                    <field name="sequence">2</field>
+                    <field name="value">2</field>
+                </record>
+                <record model="survey.label" id="opcol_2_6_3">
+                    <field name="question_id" ref="opinion_2_6"/>
+                    <field name="sequence">3</field>
+                    <field name="value">3</field>
+                </record>
+                <record model="survey.label" id="opcol_2_6_4">
+                    <field name="question_id" ref="opinion_2_6"/>
+                    <field name="sequence">4</field>
+                    <field name="value">4</field>
+                </record>
+                <record model="survey.label" id="opcol_2_6_5">
+                    <field name="question_id" ref="opinion_2_6"/>
+                    <field name="sequence">5</field>
+                    <field name="value">5</field>
+                </record>
+                <record model="survey.label" id="oprow_2_6_1">
+                    <field name="question_id_2" ref="opinion_2_6"/>
+                    <field name="sequence">1</field>
+                    <field name="value">Actions by Executive management show genuine interest in the well-being of employees</field>
+                </record>
+                <record model="survey.label" id="oprow_2_6_2">
+                    <field name="question_id_2" ref="opinion_2_6"/>
+                    <field name="sequence">2</field>
+                    <field name="value">I have the same opportunity to succeed as others with similar experiences, performance and educational background</field>
+                </record>
+                <record model="survey.label" id="oprow_2_6_3">
+                    <field name="question_id_2" ref="opinion_2_6"/>
+                    <field name="sequence">3</field>
+                    <field name="value">Compared to similar jobs in other companies where I could work, my total compensation...</field>
+                </record>
+                <record model="survey.label" id="oprow_2_6_4">
+                    <field name="question_id_2" ref="opinion_2_6"/>
+                    <field name="sequence">4</field>
+                    <field name="value">I understand the company strategy and how my workgroup supports it</field>
+                </record>
+        <record model="survey.question" id="opinion_2_7">
+            <field name="page_id" ref="opinion_2" />
+            <field name="sequence">7</field>
+            <field name="question">Additional comments</field>
+            <field name="type">free_text</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_evaluation/test/hr_evalution_demo.yml b/addons/hr_evaluation/test/hr_evalution_demo.yml
index 8c62969dea6..d6a7a327c66 100644
--- a/addons/hr_evaluation/test/hr_evalution_demo.yml
+++ b/addons/hr_evaluation/test/hr_evalution_demo.yml
@@ -1,6 +1,6 @@
--
-  !record {model: hr.employee, id: hr.employee_fp, view: False}:
-    evaluation_plan_id: hr_evaluation_plan_managersevaluationplan0
--
-  !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, view: False}:
-    plan_id: hr_evaluation.hr_evaluation_plan_managersevaluationplan0
\ No newline at end of file
+# -
+#   !record {model: hr.employee, id: hr.employee_fp, view: False}:
+#     evaluation_plan_id: hr_evaluation_plan_managersevaluationplan0
+# -
+#   !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, view: False}:
+#     plan_id: hr_evaluation.hr_evaluation_plan_managersevaluationplan0
\ No newline at end of file
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 3244e37302e..d9d6c8edd49 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -1,108 +1,103 @@
--
-  I set the "Employee Evaluation" survey in open state.
--
-  !python {model: survey}: |
-    self.survey_open(cr, uid, [ref("survey_2")], context)
--
-  I check that state of "Employee Evaluation" survey is Open.
--
-  !assert {model: survey, id: survey_2, severity: error, string: Survey should be in OPen state}:
-    - state == 'open'
--
-  I start the evaluation process by click on "Start Evaluation" button.
--
-  !python {model: hr_evaluation.evaluation}: |
-     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
--
-  I check that state is "Plan in progress".
--
-  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be 'Plan in progress' state}:
-    - state == 'wait'
--
-  I find a mistake on evaluation form. So I cancel the evaluation and again start it.
--
-  !python {model: hr_evaluation.evaluation}: |
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
-    self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')])
-    assert evaluation.state == 'cancel', 'Evaluation should be in cancel state'
-    self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')])
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
-    assert evaluation.state == 'draft', 'Evaluation should be in draft state'
-    self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
--
-  I check that state is "Plan in progress" and "Interview Request" record is created
--
-  !python {model: hr_evaluation.evaluation}: |
-    interview_obj = self.pool.get('hr.evaluation.interview')
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
-    assert evaluation.state == 'wait', "Evaluation should be 'Plan in progress' state"
-    interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
-    assert len(interview_ids), "Interview evaluation survey not created"
--
-  Give answer of the first page in "Employee Evaluation" survey.
--
-  !python {model: survey.question.wiz}: |
-    name_wiz_obj=self.pool.get('survey.name.wiz')
-    interview_obj = self.pool.get('hr.evaluation.interview')
-    interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
-    assert len(interview_ids), "Interview evaluation survey not created"
-    ctx = {'active_model':'hr.evaluation.interview', 'active_id': interview_ids[0], 'active_ids': [interview_ids], 'survey_id': ref("survey_2")}
-    name_id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_2")})
-    ctx ["sur_name_id"] = name_id
-    self.create(cr, uid, {str(ref("survey_question_2")) +"_" +str(ref("survey_answer_1")) + "_multi" :'tpa',
-               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_10")) + "_multi" :'application eng',
-               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_20")) + "_multi" :'3',
-               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_25")) + "_multi" :'2011-12-02 16:42:00',
-               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_43")) + "_multi" :'HR',
-               }, context = ctx)
--
-  I close this Evaluation survey by giving answer of questions.
--
-  !python {model: hr_evaluation.evaluation}: |
-    interview_obj = self.pool.get('hr.evaluation.interview')
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
-    interview_obj.survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids])
-    for survey in evaluation.survey_request_ids:
-        interview = interview_obj.browse(cr, uid, survey.id, context)
-        assert interview.state == "done", 'survey must be in done state'
--
-  I print the evaluation.
--
-  !python {model: hr_evaluation.evaluation}: |
-    evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
-    self.pool.get('hr.evaluation.interview').action_print_survey(cr, uid, [r.id for r in evaluation.survey_request_ids])
--
-  I click on "Final Validation" button to finalise evaluation.
--
-  !python {model: hr_evaluation.evaluation}: |
-    self.button_final_validation(cr, uid, [ref("hr_evaluation_evaluation_0")])
--
-  I check that state is "Waiting Appreciation".
--
-  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
-      - state == 'progress'
--
-  Give Rating "Meet expectations" by selecting overall Rating.
--
-  !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
-    rating: '2'
--
-  I close this Evaluation by click on "Done" button of this wizard.
--
-  !python {model: hr_evaluation.evaluation}: |
-    self.button_done(cr, uid, [ref("hr_evaluation_evaluation_0")])
--
-  I check that state of Evaluation is done.
--
-  !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be in done state}:
-      - state == 'done'
--
-  Print Evaluations Statistics Report
--
-  !python {model: hr.evaluation.report}: |
-    import os, time
-    from openerp import tools
-    ctx={}
-    data_dict={'state': 'done', 'rating': 2, 'employee_id': ref("hr.employee_fp")}
-    from openerp.tools import test_reports
-    test_reports.try_report_action(cr, uid, 'hr_evaluation_evaluation_0',wiz_data=data_dict, context=ctx, our_module='hr_evaluation')
+# -
+#   I check that state of "Employee Evaluation" survey is Open.
+# -
+#   !assert {model: survey.survey, id: appraisal_form, severity: error, string: Survey should be in 'open' state}:
+#     - state == 'open'
+# -
+#   I start the evaluation process by click on "Start Evaluation" button.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#      self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+# -
+#   I check that state is "Plan in progress".
+# -
+#   !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be 'Plan in progress' state}:
+#     - state == 'wait'
+# -
+#   I find a mistake on evaluation form. So I cancel the evaluation and again start it.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+#     self.button_cancel(cr, uid, [ref('hr_evaluation_evaluation_0')])
+#     assert evaluation.state == 'cancel', 'Evaluation should be in cancel state'
+#     self.button_draft(cr, uid, [ref('hr_evaluation_evaluation_0')])
+#     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+#     assert evaluation.state == 'draft', 'Evaluation should be in draft state'
+#     self.button_plan_in_progress(cr, uid, [ref('hr_evaluation_evaluation_0')])
+# -
+#   I check that state is "Plan in progress" and "Interview Request" record is created
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     interview_obj = self.pool.get('hr.evaluation.interview')
+#     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0') , context)
+#     assert evaluation.state == 'wait', "Evaluation should be 'Plan in progress' state"
+#     interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
+#     assert len(interview_ids), "Interview evaluation survey not created"
+# -
+#   Give answer of the first page in "Employee Evaluation" survey.
+# -
+#   !python {model: survey.question.wiz}: |
+#     name_wiz_obj=self.pool.get('survey.name.wiz')
+#     interview_obj = self.pool.get('hr.evaluation.interview')
+#     interview_ids = interview_obj.search(cr, uid, [('evaluation_id','=', ref('hr_evaluation_evaluation_0'))])
+#     assert len(interview_ids), "Interview evaluation survey not created"
+#     ctx = {'active_model':'hr.evaluation.interview', 'active_id': interview_ids[0], 'active_ids': [interview_ids], 'survey_id': ref("survey_2")}
+#     name_id = name_wiz_obj.create(cr, uid, {'survey_id': ref("survey_2")})
+#     ctx ["sur_name_id"] = name_id
+#     self.create(cr, uid, {str(ref("survey_question_2")) +"_" +str(ref("survey_answer_1")) + "_multi" :'tpa',
+#                 str(ref("survey_question_2")) +"_" +str(ref("survey_answer_10")) + "_multi" :'application eng',
+#                 str(ref("survey_question_2")) +"_" +str(ref("survey_answer_20")) + "_multi" :'3',
+#                 str(ref("survey_question_2")) +"_" +str(ref("survey_answer_25")) + "_multi" :'2011-12-02 16:42:00',
+#                 str(ref("survey_question_2")) +"_" +str(ref("survey_answer_43")) + "_multi" :'HR',
+#                 }, context = ctx)
+# -
+#   I close this Evaluation survey by giving answer of questions.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     interview_obj = self.pool.get('hr.evaluation.interview')
+#     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
+#     interview_obj.survey_req_done(cr, uid, [r.id for r in evaluation.survey_request_ids])
+#     for survey in evaluation.survey_request_ids:
+#       interview = interview_obj.browse(cr, uid, survey.id, context)
+#       assert interview.state == "done", 'survey must be in done state'
+# -
+#   I print the evaluation.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     evaluation = self.browse(cr, uid, ref('hr_evaluation_evaluation_0'))
+#     self.pool.get('hr.evaluation.interview').action_print_survey(cr, uid, [r.id for r in evaluation.survey_request_ids])
+# -
+#   I click on "Final Validation" button to finalise evaluation.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     self.button_final_validation(cr, uid, [ref("hr_evaluation_evaluation_0")])
+# -
+#   I check that state is "Waiting Appreciation".
+# -
+#   !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+#       - state == 'progress'
+# -
+#   Give Rating "Meet expectations" by selecting overall Rating.
+# -
+#   !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
+#     rating: '2'
+# -
+#   I close this Evaluation by click on "Done" button of this wizard.
+# -
+#   !python {model: hr_evaluation.evaluation}: |
+#     self.button_done(cr, uid, [ref("hr_evaluation_evaluation_0")])
+# -
+#   I check that state of Evaluation is done.
+# -
+#   !assert {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0, severity: error, string: Evaluation should be in done state}:
+#       - state == 'done'
+# -
+#   Print Evaluations Statistics Report
+# -
+#   !python {model: hr.evaluation.report}: |
+#     import os, time
+#     from openerp import tools
+#     ctx={}
+#     data_dict={'state': 'done', 'rating': 2, 'employee_id': ref("hr.employee_fp")}
+#     from openerp.tools import test_reports
+#     test_reports.try_report_action(cr, uid, 'hr_evaluation_evaluation_0',wiz_data=data_dict, context=ctx, our_module='hr_evaluation')