[IMP]:hr_evaluation:i have add two data in this module 1)Employee Evaluation 2)job Survey

bzr revid: han@tinyerp.com-20110524125703-6nt9o8hgckwh2c6i

7 files changed, 986 insertions, 1214 deletions

diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index 1a611768d7e..3e45d38156e 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -47,7 +47,8 @@ in the form of pdf file. Implements a dashboard for My Current Evaluations
         "wizard/hr_evaluation_mail_view.xml",
         "hr_evaluation_view.xml",
         "report/hr_evaluation_report_view.xml",
-        "board_hr_evaluation_view.xml"
+        "board_hr_evaluation_view.xml",
+        "hr_evaluation_data.xml"
         ],
     "test": ["test/test_hr_evaluation.yml"],
     "active": False,
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
new file mode 100644
index 00000000000..769522e876b
--- /dev/null
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -0,0 +1,597 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="survey_2" model="survey">
+            <field name="title">Employee Evaluation</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 Evaluation 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-evaluation 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 / Evaluations</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 / Evaluations</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_answer_98" model="survey.answer">
+            <field name="answer">Title</field>
+            <field name="question_id" ref="survey_question_2"/>
+            <field name="type">char</field>
+            <field eval="6" 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>
+    </data>
+</openerp>
diff --git a/addons/hr_evaluation/hr_evaluation_demo.xml b/addons/hr_evaluation/hr_evaluation_demo.xml
index 59396717d49..a7be585272f 100644
--- a/addons/hr_evaluation/hr_evaluation_demo.xml
+++ b/addons/hr_evaluation/hr_evaluation_demo.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-        <record id="survey_2" model="survey">
-            <field name="title">Employee Evaluation</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_demo"/>
-            <field name="response_user">5</field>
-            <field name="state">open</field>
-        </record>
-    </data>
 
     <data>
         <record id="survey_3" model="survey">
@@ -25,14 +13,6 @@
     </data>
 
     <data>
-        <record id="survey_page_1" model="survey.page">
-            <field name="title">Employee Evaluation Form</field>
-            <field name="survey_id" ref="survey_2"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
         <record id="survey_page_2" model="survey.page">
             <field name="title">Process</field>
             <field name="survey_id" ref="survey_3"/>
@@ -41,45 +21,6 @@
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
         <record id="survey_page_10" model="survey.page">
             <field name="title">Survey</field>
             <field name="survey_id" ref="survey_3"/>
@@ -113,31 +54,6 @@
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
         <record id="survey_question_3" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -163,32 +79,6 @@
     </data>
 
     <data>
-        <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 / Evaluations</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>
-    </data>
-
-    <data>
         <record id="survey_question_6" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -214,58 +104,6 @@
     </data>
 
     <data>
-        <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 / Evaluations</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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
         <record id="survey_question_10" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -316,31 +154,6 @@
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
         <record id="survey_question_18" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -366,60 +179,6 @@
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
         <record id="survey_question_40" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -470,68 +229,6 @@
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
-        <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-evaluation 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>
-    </data>
-
-    <data>
         <record id="survey_question_21" model="survey.question">
             <field name="in_visible_answer_type">1</field>
             <field name="validation_type">do_not_validate</field>
@@ -566,197 +263,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
     <data>
         <record id="survey_question_column_heading_14" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
@@ -1037,15 +543,6 @@ Once the form had been filled, the employee send it to his supervisor.
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
         <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>
@@ -1120,15 +617,6 @@ Once the form had been filled, the employee send it to his supervisor.
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
         <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>
@@ -1211,15 +699,6 @@ Once the form had been filled, the employee send it to his supervisor.
     </data>
 
     <data>
-        <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>
-    </data>
-
-    <data>
         <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>
@@ -1255,113 +734,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
 
     <data>
         <record id="survey_answer_51" model="survey.answer">
@@ -1381,150 +753,6 @@ Once the form had been filled, the employee send it to his supervisor.
         </record>
     </data>
 
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <record id="survey_answer_98" model="survey.answer">
-            <field name="answer">Title</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="6" name="sequence"/>
-        </record>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
-    <data>
-        <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>
-    </data>
-
     <data noupdate="1">
         <record id="hr_evaluation_plan_managersevaluationplan0" model="hr_evaluation.plan">
             <field eval="1" name="active"/>
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 7985ddb42f0..2287f3c05c3 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -65,6 +65,378 @@
         <field name="sequence">7</field>
         <field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
     </record>
+    <record id="survey_job_0" model="survey">
+        <field name="title">Job Survey</field>
+        <field name="state">draft</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_job_0" model="survey.page">
+        <field name="title">Default Section</field>
+        <field name="survey_id" ref="survey_job_0"/>
+        <field eval="1" name="sequence"/>
+    </record>
+    <record id="survey_page_job_1" model="survey.page">
+        <field name="title">Education &amp; Activities</field>
+        <field name="survey_id" ref="survey_job_0"/>
+        <field eval="2" name="sequence"/>
+    </record>
+    <record id="survey_page_job_2" model="survey.page">
+        <field name="title">Importance</field>
+        <field name="survey_id" ref="survey_job_0"/>
+        <field eval="3" name="sequence"/>
+    </record>
+    <record id="survey_question_job_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">From which university will you graduate?</field>
+        <field eval="0" name="is_require_answer"/>
+        <field name="type">single_textbox</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_0"/>
+        <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_job_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="1" name="sequence"/>
+        <field name="question">Rate the Importance</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_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_job_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">Education</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_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_job_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="2" name="sequence"/>
+        <field name="question">Knowledge</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_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_job_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="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">What is your gender?</field>
+        <field eval="0" name="is_require_answer"/>
+        <field name="type">multiple_choice_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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_0"/>
+        <field name="comment_label">Other</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field eval="0" name="allow_comment"/>
+    </record>
+
+    <record id="survey_answer_job_70" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Male</field>
+        <field name="question_id" ref="survey_question_job_4"/>
+        <field eval="1" name="sequence"/>
+    </record>
+
+    <record id="survey_answer_job_71" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Female</field>
+        <field name="question_id" ref="survey_question_job_4"/>
+        <field eval="2" name="sequence"/>
+    </record>
+
+    <record id="survey_question_job_5" 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">What age group do you belong to?</field>
+        <field eval="0" name="is_require_answer"/>
+        <field name="type">multiple_choice_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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_0"/>
+        <field name="comment_label">Other</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field eval="0" name="allow_comment"/>
+    </record>
+
+    <record id="survey_answer_job_81" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">0 - 15</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="1" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_82" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">16 - 20</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="2" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_83" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">21 - 30</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="3" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_84" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">31 - 40</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="4" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_85" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">41 - 50</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="5" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_86" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">51 - 60</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="6" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_87" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">61 - 70</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="7" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_88" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">71 +</field>
+        <field name="question_id" ref="survey_question_job_5"/>
+        <field eval="8" name="sequence"/>
+    </record>
 
+    <record id="survey_question_job_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="3" name="sequence"/>
+        <field name="question">Exprience</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_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_job_7" 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">Activities</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="1" name="in_visible_menu_choice"/>
+        <field name="page_id" ref="survey_page_job_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_column_heading_job_0" model="survey.question.column.heading">
+        <field eval="1" name="in_visible_menu_choice"/>
+        <field name="title">Not important</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field name="question_id" ref="survey_question_job_1"/>
+    </record>
+    <record id="survey_question_column_heading_job_1" model="survey.question.column.heading">
+        <field eval="1" name="in_visible_menu_choice"/>
+        <field name="title">Somewhat important</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field name="question_id" ref="survey_question_job_1"/>
+    </record>
+    <record id="survey_question_column_heading_job_2" model="survey.question.column.heading">
+        <field eval="1" name="in_visible_menu_choice"/>
+        <field name="title">Important</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field name="question_id" ref="survey_question_job_1"/>
+    </record>
+    <record id="survey_question_column_heading_job_3" model="survey.question.column.heading">
+        <field eval="1" name="in_visible_menu_choice"/>
+        <field name="title">Very important</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field name="question_id" ref="survey_question_job_1"/>
+    </record>
+    <record id="survey_question_column_heading_job_4" model="survey.question.column.heading">
+        <field eval="1" name="in_visible_menu_choice"/>
+        <field name="title">Most important</field>
+        <field eval="1" name="in_visible_rating_weight"/>
+        <field name="question_id" ref="survey_question_job_1"/>
+    </record>
+    <record id="survey_answer_job_0" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Good pay</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="1" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_1" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Getting on with colleagues</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="2" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_2" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Office environment (décor, light, space etc)</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="3" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_3" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Desk space</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="4" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_4" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">State of the art technology</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="5" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_5" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Office location (proximity to home)</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="6" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_6" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Good management/boss</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="7" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_7" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Freebies such as tea, coffee and stationery</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="8" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_8" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Perks such as free parking, gym passes etc</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="9" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_9" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">No out of hours working</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="10" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_10" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Dress code</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="11" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_11" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Regular meetings</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="12" name="sequence"/>
+    </record>
+    <record id="survey_answer_job_12" model="survey.answer">
+        <field name="in_visible_answer_type">1</field>
+        <field name="answer">Good social life (office nights out, good Christmas parties etc)</field>
+        <field name="question_id" ref="survey_question_job_1"/>
+        <field eval="13" name="sequence"/>
+    </record>
 </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
index 4811e2b91a2..df34ec093c8 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@@ -134,442 +134,5 @@
         <field eval="time.strftime('%Y-%m-15')" name="date_deadline"/>
         <field eval="'6630125'" name="partner_phone"/>
     </record>
-
 </data>
-
-<data>
-        <record id="survey_job_0" model="survey">
-            <field name="title">Job Survey</field>
-            <field name="state">draft</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>
-    </data>
-    <data>
-        <record id="survey_page_job_0" model="survey.page">
-            <field name="title">Default Section</field>
-            <field name="survey_id" ref="survey_job_0"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_page_job_1" model="survey.page">
-            <field name="title">Education &amp; Activities</field>
-            <field name="survey_id" ref="survey_job_0"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_page_job_2" model="survey.page">
-            <field name="title">Importance</field>
-            <field name="survey_id" ref="survey_job_0"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_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">From which university will you graduate?</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">single_textbox</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_0"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_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="1" name="sequence"/>
-            <field name="question">Rate the Importance</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_2"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_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">Education</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_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="2" name="sequence"/>
-            <field name="question">Knowledge</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_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="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">What is your gender?</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_choice_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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_0"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-
-        <record id="survey_answer_job_70" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Male</field>
-            <field name="question_id" ref="survey_question_job_4"/>
-            <field eval="1" name="sequence"/>
-        </record>
-
-        <record id="survey_answer_job_71" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Female</field>
-            <field name="question_id" ref="survey_question_job_4"/>
-            <field eval="2" name="sequence"/>
-        </record>
-
-    </data>
-    <data>
-        <record id="survey_question_job_5" 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">What age group do you belong to?</field>
-            <field eval="0" name="is_require_answer"/>
-            <field name="type">multiple_choice_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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_0"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-
-        <record id="survey_answer_job_81" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">0 - 15</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_82" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">16 - 20</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_83" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">21 - 30</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_84" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">31 - 40</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_85" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">41 - 50</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_86" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">51 - 60</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_87" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">61 - 70</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="7" name="sequence"/>
-        </record>
-        <record id="survey_answer_job_88" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">71 +</field>
-            <field name="question_id" ref="survey_question_job_5"/>
-            <field eval="8" name="sequence"/>
-        </record>
-
-    </data>
-    <data>
-        <record id="survey_question_job_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="3" name="sequence"/>
-            <field name="question">Exprience</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_job_7" 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">Activities</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="1" name="in_visible_menu_choice"/>
-            <field name="page_id" ref="survey_page_job_1"/>
-            <field name="comment_label">Other</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field eval="0" name="allow_comment"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_column_heading_job_0" model="survey.question.column.heading">
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="title">Not important</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field name="question_id" ref="survey_question_job_1"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_column_heading_job_1" model="survey.question.column.heading">
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="title">Somewhat important</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field name="question_id" ref="survey_question_job_1"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_column_heading_job_2" model="survey.question.column.heading">
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="title">Important</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field name="question_id" ref="survey_question_job_1"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_column_heading_job_3" model="survey.question.column.heading">
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="title">Very important</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field name="question_id" ref="survey_question_job_1"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_question_column_heading_job_4" model="survey.question.column.heading">
-            <field eval="1" name="in_visible_menu_choice"/>
-            <field name="title">Most important</field>
-            <field eval="1" name="in_visible_rating_weight"/>
-            <field name="question_id" ref="survey_question_job_1"/>
-        </record>
-    </data>
-
-    <data>
-        <record id="survey_answer_job_0" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Good pay</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="1" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_1" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Getting on with colleagues</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="2" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_2" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Office environment (décor, light, space etc)</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="3" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_3" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Desk space</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="4" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_4" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">State of the art technology</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="5" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_5" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Office location (proximity to home)</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="6" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_6" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Good management/boss</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="7" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_7" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Freebies such as tea, coffee and stationery</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="8" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_8" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Perks such as free parking, gym passes etc</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="9" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_9" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">No out of hours working</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="10" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_10" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Dress code</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="11" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_11" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Regular meetings</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="12" name="sequence"/>
-        </record>
-    </data>
-    <data>
-        <record id="survey_answer_job_12" model="survey.answer">
-            <field name="in_visible_answer_type">1</field>
-            <field name="answer">Good social life (office nights out, good Christmas parties etc)</field>
-            <field name="question_id" ref="survey_question_job_1"/>
-            <field eval="13" name="sequence"/>
-        </record>
-    </data>
-
 </openerp>
diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml
index c057868d6de..7627c5d54b0 100644
--- a/addons/survey/survey_data.xml
+++ b/addons/survey/survey_data.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+        <record model="survey.type" id="survey_type1">
+            <field name="name">Human Resources</field>
+            <field name="code">Human Resources</field>
+        </record>
+        <record model="survey.type" id="survey_type2">
+            <field name="name">Customer Feeback</field>
+            <field name="code">Customer Feeback</field>
+        </record>
+        <record model="survey.type" id="survey_type3">
+            <field name="name">Supplier Selection</field>
+            <field name="code">Supplier Selection</field>
+        </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index c8fa9c269ff..e9e4821e957 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -6,7 +6,7 @@
             <field eval="[(4, ref('base.group_tool_user')),(4, ref('base.group_survey_user'))]" name="groups_id"/>
         </record>
 
-        <record model="survey.type" id="survey_type1">
+        <!--record model="survey.type" id="survey_type1">
             <field name="name">Human Resources</field>
             <field name="code">Human Resources</field>
         </record>
@@ -17,7 +17,7 @@
         <record model="survey.type" id="survey_type3">
             <field name="name">Supplier Selection</field>
             <field name="code">Supplier Selection</field>
-        </record>
+        </record-->
 
         <!--  Partner Feedback Demo data -->
         <record model="survey" id="survey_partner_feedback">