diff --git a/addons/crm_hr/crm_hr_data.xml b/addons/crm_hr/crm_hr_data.xml
index 337e9f3af24..897434987a4 100644
--- a/addons/crm_hr/crm_hr_data.xml
+++ b/addons/crm_hr/crm_hr_data.xml
@@ -107,6 +107,7 @@
 	</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>
@@ -130,6 +131,7 @@
 	</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>
@@ -153,6 +155,7 @@
 	</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>
@@ -176,6 +179,7 @@
 	</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>
@@ -199,6 +203,7 @@
 	</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>
@@ -221,12 +226,14 @@
 		</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="crm_hr.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="crm_hr.survey_question_job_4"/>
 			<field eval="2" name="sequence"/>
@@ -235,6 +242,7 @@
 	</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>
@@ -257,41 +265,49 @@
 		</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="crm_hr.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="crm_hr.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="crm_hr.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="crm_hr.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="crm_hr.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="crm_hr.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="crm_hr.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="crm_hr.survey_question_job_5"/>
 			<field eval="8" name="sequence"/>
@@ -300,6 +316,7 @@
 	</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>
@@ -323,6 +340,7 @@
 	</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>
@@ -387,6 +405,7 @@
 
 	<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="crm_hr.survey_question_job_1"/>
 			<field eval="1" name="sequence"/>
@@ -394,6 +413,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="2" name="sequence"/>
@@ -401,6 +421,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="3" name="sequence"/>
@@ -408,6 +429,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="4" name="sequence"/>
@@ -415,6 +437,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="5" name="sequence"/>
@@ -422,6 +445,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="6" name="sequence"/>
@@ -429,6 +453,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="7" name="sequence"/>
@@ -436,6 +461,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="8" name="sequence"/>
@@ -443,6 +469,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="9" name="sequence"/>
@@ -450,6 +477,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="10" name="sequence"/>
@@ -457,6 +485,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="11" name="sequence"/>
@@ -464,6 +493,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="12" name="sequence"/>
@@ -471,6 +501,7 @@
 	</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="crm_hr.survey_question_job_1"/>
 			<field eval="13" name="sequence"/>
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index d2223e45fb2..fdd66ca403c 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -79,6 +79,7 @@
 
 	<data>
 		<record id="survey_question_0" model="survey.question">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="validation_type">do_not_validate</field>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -90,7 +91,7 @@
 			<field eval="1" name="sequence"/>
 			<field name="question">Employee Details</field>
 			<field eval="0" name="is_require_answer"/>
-			<field name="type">multiple_textboxes</field>
+			<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"/>
@@ -103,6 +104,7 @@
 
 	<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>
@@ -114,7 +116,7 @@
 			<field eval="1" name="sequence"/>
 			<field name="question">Employee Information</field>
 			<field eval="0" name="is_require_answer"/>
-			<field name="type">multiple_textboxes</field>
+			<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"/>
@@ -126,6 +128,7 @@
 	</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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -149,6 +152,7 @@
 	</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>
@@ -174,6 +178,7 @@
 
 	<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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -194,6 +199,7 @@
 	</data>
 	<data>
 		<!--record id="survey_question_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>
@@ -217,6 +223,7 @@
 	</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>
@@ -242,6 +249,7 @@
 
 	<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>
@@ -267,6 +275,7 @@
 
 	<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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -293,6 +302,7 @@
 
 	<data>
 		<record id="survey_question_14" model="survey.question">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="validation_type">do_not_validate</field>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -318,6 +328,7 @@
 
 	<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>
@@ -341,6 +352,7 @@
 	</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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -367,6 +379,7 @@
 
 	<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>
@@ -392,6 +405,7 @@
 
 	<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>
@@ -418,6 +432,7 @@
 	</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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -441,6 +456,7 @@
 	</data>
 	<data>
 		<record id="survey_question_41" model="survey.question">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="validation_type">do_not_validate</field>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -465,6 +481,7 @@
 
 	<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>
@@ -492,6 +509,7 @@
 
 	<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>
@@ -526,6 +544,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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>
 			<field name="comment_valid_type">do_not_validate</field>
 			<field name="make_comment_field_err_msg">Please enter a comment.</field>
@@ -561,6 +580,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<!--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>
@@ -604,6 +624,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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>
@@ -628,6 +649,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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>
@@ -652,6 +674,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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>
@@ -676,6 +699,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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>
@@ -699,327 +723,328 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_question_column_heading_4" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_4"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_5" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_4"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_6" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_4"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_7" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_4"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_8" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_4"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_9" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_8"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_10" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_8"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_11" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_8"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_12" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_8"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_13" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_8"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_14" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_3"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_15" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_3"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_16" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_3"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_17" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_3"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_18" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_3"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_19" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_6"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_20" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_6"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_21" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_6"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_22" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_6"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_23" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_6"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_24" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_10"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_25" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_10"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_26" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_10"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_27" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_10"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_28" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_10"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_29" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_14"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_30" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_14"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_31" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_14"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_32" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_14"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_33" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_14"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_34" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_18"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_35" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_18"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_36" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_18"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_37" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_18"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_38" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_18"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_39" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">1</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_40"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_40" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">2</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_40"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_41" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">3</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_40"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_42" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">4</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_40"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_question_column_heading_43" model="survey.question.column.heading">
-			<field eval="0" name="in_visible_menu_choice"/>
+		    <field name="in_visible_rating_weight">1</field>
+            <field name="in_visible_menu_choice">1</field>
 			<field name="title">5</field>
-			<field eval="0" name="in_visible_rating_weight"/>
 			<field name="question_id" ref="survey_question_40"/>
 		</record>
 	</data>
 
 	<data>
 		<record id="survey_answer_0" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Demonstrates genuine concern for me as a person. </field>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="1" name="sequence"/>
@@ -1029,11 +1054,13 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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>
 			<field name="question_id" ref="survey_question_10"/>
 			<field eval="1" name="sequence"/>
@@ -1041,6 +1068,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_3" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I am proud to tell others I work here. </field>
 			<field name="question_id" ref="survey_question_3"/>
 			<field eval="1" name="sequence"/>
@@ -1048,13 +1076,16 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_4" model="survey.answer">
+		    <field name="in_visible_answer_type">0</field>
 			<field name="answer">Name of your direct supervisor</field>
 			<field name="question_id" ref="survey_question_0"/>
+			<field name="type">char</field>
 			<field eval="1" name="sequence"/>
 		</record>
 	</data>
 	<data>
 		<record id="survey_answer_5" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Actions by Executive management show genuine interest in the well-being of employees.</field>
 			<field name="question_id" ref="survey_question_40"/>
 			<field eval="1" name="sequence"/>
@@ -1062,6 +1093,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_6" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I know the company's values and live them.</field>
 			<field name="question_id" ref="survey_question_18"/>
 			<field eval="1" name="sequence"/>
@@ -1069,6 +1101,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_7" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">My work contributes towards the continuous improvement of the company, our services or products. </field>
 			<field name="question_id" ref="survey_question_14"/>
 			<field eval="1" name="sequence"/>
@@ -1076,6 +1109,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_8" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I have enough work.</field>
 			<field name="question_id" ref="survey_question_10"/>
 			<field eval="2" name="sequence"/>
@@ -1083,8 +1117,10 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_9" model="survey.answer">
+		    <field name="in_visible_answer_type">0</field>
 			<field name="answer">Date</field>
 			<field name="question_id" ref="survey_question_0"/>
+			<field name="type">datetime</field>
 			<field eval="2" name="sequence"/>
 		</record>
 	</data>
@@ -1092,11 +1128,13 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="2" name="sequence"/>
@@ -1104,6 +1142,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_12" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">My job provides me with a sense of personal accomplishment.</field>
 			<field name="question_id" ref="survey_question_3"/>
 			<field eval="2" name="sequence"/>
@@ -1111,6 +1150,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_13" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">What I did several months ago is still of use to the company, the services or the products today. </field>
 			<field name="question_id" ref="survey_question_14"/>
 			<field eval="2" name="sequence"/>
@@ -1118,6 +1158,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_14" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">My best achievements have been communicated to the community, internally or to customers. </field>
 			<field name="question_id" ref="survey_question_18"/>
 			<field eval="2" name="sequence"/>
@@ -1125,6 +1166,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_15" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I have the same opportunity to succeed as others with similar experiences, performance and educational background. </field>
 			<field name="question_id" ref="survey_question_40"/>
 			<field eval="2" name="sequence"/>
@@ -1132,6 +1174,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_16" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Compared to similar jobs in other companies where I could work, my total compensation is:
 (Scale: Well below others, Below othe</field>
 			<field name="question_id" ref="survey_question_40"/>
@@ -1140,6 +1183,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_17" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Overall, I believe the quality of products and/or services my workgroup delivers is improving.</field>
 			<field name="question_id" ref="survey_question_14"/>
 			<field eval="3" name="sequence"/>
@@ -1147,6 +1191,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_18" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I would prefer to remain with this company even if a comparable job were available in another company. </field>
 			<field name="question_id" ref="survey_question_3"/>
 			<field eval="3" name="sequence"/>
@@ -1154,6 +1199,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_19" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Listens and takes into account all ideas and do his best to put in place the best of these. </field>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="3" name="sequence"/>
@@ -1163,11 +1209,13 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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>
 			<field name="question_id" ref="survey_question_10"/>
 			<field eval="3" name="sequence"/>
@@ -1175,6 +1223,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_22" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Our workgroup identifies and reduces waste of time in our activities and processes. </field>
 			<field name="question_id" ref="survey_question_14"/>
 			<field eval="4" name="sequence"/>
@@ -1182,6 +1231,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_23" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">Taking everything into account, how satisfied are you with your current job? </field>
 			<field name="question_id" ref="survey_question_3"/>
 			<field eval="4" name="sequence"/>
@@ -1189,6 +1239,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_24" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I understand the company strategy and how my workgroup supports it. </field>
 			<field name="question_id" ref="survey_question_40"/>
 			<field eval="4" name="sequence"/>
@@ -1198,11 +1249,13 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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"/>
@@ -1210,6 +1263,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1220,6 +1274,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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"/>
@@ -1231,11 +1286,13 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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"/>
@@ -1243,6 +1300,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1250,6 +1308,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1257,6 +1316,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1264,6 +1324,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1271,6 +1332,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1278,6 +1340,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1285,6 +1348,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_51" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I am willing to put in a great deal of effort beyond what is expected to help my workgroup succeed.</field>
 			<field name="question_id" ref="survey_question_3"/>
 			<field eval="5" name="sequence"/>
@@ -1292,6 +1356,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</data>
 	<data>
 		<record id="survey_answer_52" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field name="answer">I believe the information that I get from the person I report to. </field>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="5" name="sequence"/>
@@ -1300,6 +1365,7 @@ Once the form had been filled, the employee send it to his supervisor.
 
 	<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"/>
@@ -1307,6 +1373,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1314,6 +1381,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1321,6 +1389,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1328,6 +1397,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1335,6 +1405,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1342,6 +1413,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1349,6 +1421,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1356,6 +1429,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1363,6 +1437,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1370,6 +1445,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1377,6 +1453,7 @@ Once the form had been filled, the employee send it to his supervisor.
 	</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"/>
@@ -1387,24 +1464,31 @@ Once the form had been filled, the employee send it to his supervisor.
 		<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>
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index b9c74ebbc2d..2a95d144625 100755
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -144,13 +144,13 @@ class survey_analysis(report_rml):
                         for col in range(0, len(que.column_heading_ids) + 1):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 1)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
-                        matrix_ans = ['',]
+                        matrix_ans = [(0,'')]
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
-                                matrix_ans.append(col.title)
+                                matrix_ans.append((col.id,col.title))
                         rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
-                        for mat_col in matrix_ans:
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        for mat_col in range(0, len(matrix_ans)):
+                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
                         rml+="""<td><para style="response">Response Count</para></td>
                                 </tr>"""
                         last_col = cols_widhts[-1]
@@ -158,13 +158,13 @@ class survey_analysis(report_rml):
                             rml+="""<tr><td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
                             cr.execute("select count(id) from survey_response_answer sra where sra.answer_id = %d"%(ans.id))
                             tot_res = cr.fetchone()[0]
-                            cr.execute("select count(id) ,sra.answer from survey_response_answer sra where sra.answer_id = %d group by sra.answer" % ans.id)
+                            cr.execute("select count(id) ,sra.column_id from survey_response_answer sra where sra.answer_id = %d group by sra.column_id" % ans.id)
                             calc_res = cr.dictfetchall()
                             for mat_col in range(1, len(matrix_ans)):
                                 percantage = 0
                                 cal_count = 0
                                 for cal in calc_res:
-                                    if cal['answer'] == matrix_ans[mat_col]:
+                                    if cal['column_id'] == matrix_ans[mat_col][0]:
                                         cal_count = cal['count']
                                 if tot_res:
                                     percantage = round(float(cal_count)*100 / tot_res,2)
@@ -181,7 +181,7 @@ class survey_analysis(report_rml):
                             rml+="""<blockTable colWidths=" """+ str(500 - last_col) +"," + str(last_col) + """ " style="Table1"><tr><td><para style="answer_right">""" + to_xml(tools.ustr(que.comment_label)) + """</para></td>
                                     <td><para style="answer">""" + tools.ustr(tot_res) + """</para></td></tr></blockTable>"""
 
-                    elif que.type in['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'multiple_textboxes','date_and_time','date']:
+                    elif que.type in['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'multiple_textboxes','date_and_time','date','multiple_textboxes_diff_type']:
                         rml +="""<blockTable colWidths="280.0,120,100.0" style="Table1">"""
                         rml += """ <tr>
                              <td> <para style="Standard"> </para></td>
@@ -234,13 +234,13 @@ class survey_analysis(report_rml):
                         for col in range(0,len(que.column_heading_ids) + 2):
                             cols_widhts.append(float(300 / (len(que.column_heading_ids) + 2)))
                         colWidths = ",".join(map(tools.ustr, cols_widhts))
-                        matrix_ans = ['',]
+                        matrix_ans = [(0,'')]
                         for col in que.column_heading_ids:
                             if col.title not in matrix_ans:
-                                matrix_ans.append(col.title)
+                                matrix_ans.append((col.id,col.title))
                         rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
-                        for mat_col in matrix_ans:
-                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                        for mat_col in range(0,len(matrix_ans)):
+                            rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
                         rml+="""<td><para style="response">Rating Average</para></td>
                                 <td><para style="response">Response Count</para></td>
                                 </tr>"""
@@ -250,14 +250,13 @@ class survey_analysis(report_rml):
                             rating_weight_sum = 0
                             for mat_col in range(1, len(matrix_ans)):
                                 cr.execute("select count(sra.answer_id) from survey_response_line sr, survey_response_answer sra\
-                                     where sr.id = sra.response_id and  sra.answer_id = %d and sra.answer ='%s'" % (ans.id,matrix_ans[mat_col]))
+                                     where sr.id = sra.response_id and  sra.answer_id = %d and sra.column_id ='%d'" % (ans.id,matrix_ans[mat_col][0]))
                                 tot_res = cr.fetchone()[0]
                                 cr.execute("select count(sra.answer_id),sqc.rating_weight from survey_response_line sr, survey_response_answer sra ,\
                                         survey_question_column_heading sqc where sr.id = sra.response_id and \
                                         sqc.question_id = sr.question_id  and sra.answer_id = %d and sqc.title ='%s'\
-                                        group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col]))
+                                        group by sra.answer_id,sqc.rating_weight" % (ans.id,matrix_ans[mat_col][1]))
                                 col_weight =  cr.fetchone()
-                                
                                 if not col_weight:
                                     col_weight= (0,0)
                                 elif not col_weight[1]:
@@ -295,10 +294,10 @@ class survey_analysis(report_rml):
                                 rml += """<td><para style="response">""" + to_xml(tools.ustr(menu)) + """</para></td>"""
                             rml += """<td><para style="response">Response Count</para></td></tr>"""
                             cr.execute("select count(id), sra.answer_id from survey_response_answer sra \
-                                     where sra.answer='%s' group by sra.answer_id "  % (column.title))
+                                     where sra.column_id='%s' group by sra.answer_id "  % (column.id))
                             res_count = cr.dictfetchall()
-                            cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.answer from survey_response_answer sra \
-                                 where sra.answer='%s'  group by sra.value_choice ,sra.answer_id, sra.answer" % (column.title))
+                            cr.execute("select count(sra.id),sra.value_choice, sra.answer_id, sra.column_id from survey_response_answer sra \
+                                 where sra.column_id='%s'  group by sra.value_choice ,sra.answer_id, sra.column_id" % (column.id))
                             calc_percantage = cr.dictfetchall()
                             for ans in que.answer_choice_ids:
                                 rml+="""<tr><td><para style="answer_right">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>"""
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index a1e07cd0d3a..0a9104495b0 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -251,7 +251,7 @@ class survey_browse_response(report_rml):
                                 rml +="""<blockTable colWidths="500" style="Table1">
                                  <tr>  <td> <para style="response">No Response</para></td> </tr>
                                 </blockTable>"""
-                        elif que.type in ['multiple_textboxes','date','date_and_time','numerical_textboxes']:
+                        elif que.type in ['multiple_textboxes_diff_type','multiple_textboxes','date','date_and_time','numerical_textboxes','multiple_textboxes_diff_type']:
                             if len(answer) and answer[0].state == "done":
                                 for ans in answer[0].response_answer_ids:
                                     rml +="""<blockTable colWidths="200,300" style="Table1">
@@ -301,16 +301,16 @@ class survey_browse_response(report_rml):
                                         i+=1
                                     cols_widhts.append(round(tmp,2))
                                 colWidths = ",".join(map(tools.ustr, cols_widhts))
-                                matrix_ans = ['',]
+                                matrix_ans = [(0,''),]
                                 for col in que.column_heading_ids:
                                     if col.title not in matrix_ans:
-                                        matrix_ans.append(col.title)
+                                        matrix_ans.append((col.id,col.title))
                                 len_matrix = len(matrix_ans)
                                 if que.type in ['matrix_of_choices_only_one_ans','rating_scale'] and que.comment_column:
                                     matrix_ans.append(que.column_name)
                                 rml+="""<blockTable colWidths=" """ + colWidths + """ " style="Table1"><tr>"""
-                                for mat_col in matrix_ans:
-                                    rml+="""<td><para style="response">""" + to_xml(tools.ustr(mat_col)) + """</para></td>"""
+                                for mat_col in range(0, len(matrix_ans)):
+                                    rml+="""<td><para style="response">""" + to_xml(tools.ustr(matrix_ans[mat_col][1])) + """</para></td>"""
                                 rml +="""</tr>"""
                                 rml+="""</blockTable>"""
                                 i=0
@@ -326,7 +326,7 @@ class survey_browse_response(report_rml):
                                     for mat_col in range(1, len_matrix):
                                         value = """"""
                                         for res_ans in answer[0].response_answer_ids:
-                                            if res_ans.answer_id.id == ans.id and res_ans.answer == matrix_ans[mat_col]:
+                                            if res_ans.answer_id.id == ans.id and res_ans.column_id.id == matrix_ans[mat_col][0]:
                                                 comment_value =  to_xml(tools.ustr(res_ans.comment_field))
                                                 if que.type in ['matrix_of_drop_down_menus']:
                                                     value = """<para style="response">""" + to_xml(tools.ustr(res_ans.value_choice)) + """</para>"""
diff --git a/addons/survey/report/survey_form.py b/addons/survey/report/survey_form.py
index 0cdc9194c2a..84d6de286fb 100644
--- a/addons/survey/report/survey_form.py
+++ b/addons/survey/report/survey_form.py
@@ -288,16 +288,11 @@ class survey_form(report_rml):
                                 else:
                                     rml+="""<td><illustration>""" + value + """</illustration></td>"""
                             rml+= """</tr></blockTable>"""
-                    elif que.type in ['multiple_textboxes','numerical_textboxes', 'date_and_time','date']:
+                    elif que.type in ['multiple_textboxes','numerical_textboxes', 'date_and_time','date','multiple_textboxes_diff_type']:
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         cols_widhts.append(float(_tbl_widths.replace('cm',''))/2)
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
                         colWidths = tools.ustr(colWidths) + 'cm'
-                        rect_len = ""
-                        if que.type in ['multiple_textboxes']:
-                            rect_len =  tools.ustr(cols_widhts[0] - 0.3) + "cm"
-                        else:
-                            rect_len = "6cm"
                         for ans in que.answer_choice_ids:
                             rml +="""<para style="P1"></para>
                             <blockTable colWidths=" """+ colWidths + """ " style="ans_tbl">
@@ -305,7 +300,7 @@ class survey_form(report_rml):
                                 <td><para style="answer">""" + to_xml(tools.ustr(ans.answer)) + """</para></td>
                                     <td>
                                     <illustration>
-                                        <rect x="0.0cm" y="-0.5cm" width='""" + tools.ustr(rect_len) + """' height="0.6cm" fill="no" stroke="yes"/>
+                                        <rect x="0.0cm" y="-0.5cm" width='""" + tools.ustr(str(cols_widhts[0] - 0.3) + "cm") + """' height="0.6cm" fill="no" stroke="yes"/>
                                     </illustration>
                                     </td>
                                 </tr>
@@ -313,14 +308,11 @@ class survey_form(report_rml):
                     elif que.type in ['comment']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        colWidths = colWidths+'cm'
-                        rect_len = ""
-                        rect_len =  tools.ustr(cols_widhts[0] - 0.4) + "cm"
-                        rml+="""<blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                        rml+="""<blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td><para style="comment"><font color="white"> </font></para>
                                     <illustration>
-                                        <rect x="0.0cm" y="0.3cm" width='""" + tools.ustr(rect_len) + """' height="1.5cm" fill="no" stroke="yes"/>
+                                        <rect x="0.1cm" y="0.3cm" width='""" + tools.ustr(str(float(colWidths) - 0.6) +'cm') + """' height="1.5cm" fill="no" stroke="yes"/>
                                     </illustration>
                                 </td>
                             </tr>
@@ -328,13 +320,12 @@ class survey_form(report_rml):
                     elif que.type in ['single_textbox']:
                         cols_widhts.append(float(_tbl_widths.replace('cm','')))
                         colWidths = "cm,".join(map(tools.ustr, cols_widhts))
-                        colWidths = colWidths+'cm'
                         rml+="""<para style="P2"><font color="white"> </font></para>
-                        <blockTable colWidths=" """ + colWidths + """ " style="ans_tbl">
+                        <blockTable colWidths=" """ + colWidths + """cm " style="ans_tbl">
                             <tr>
                                 <td>
                                     <illustration>
-                                        <rect x="0.2cm" y="0.3cm" width="15.0 cm" height="0.6cm" fill="no" stroke="yes"/>
+                                        <rect x="0.2cm" y="0.3cm" width='""" + tools.ustr(str(float(colWidths) - 0.7) +'cm') + """' height="0.6cm" fill="no" stroke="yes"/>
                                     </illustration>
                                 </td>
                             </tr>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 07fa3fcd9f0..3ec03031644 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -194,7 +194,9 @@ class survey_question(osv.osv):
                                      ('matrix_of_choices_only_multi_ans','Matrix of Choices (Multiple Answers Per Row)'),
                                      ('matrix_of_drop_down_menus','Matrix of Drop-down Menus'),
                                      ('rating_scale','Rating Scale'),('single_textbox','Single Textbox'),
-                                     ('multiple_textboxes','Multiple Textboxes'),('comment','Comment/Essay Box'),
+                                     ('multiple_textboxes','Multiple Textboxes'),
+                                     ('multiple_textboxes_diff_type','Multiple Textboxes With Different Type'),
+                                     ('comment','Comment/Essay Box'),
                                      ('numerical_textboxes','Numerical Textboxes'),('date','Date'),
                                      ('date_and_time','Date and Time'),('descriptive_text','Descriptive Text'),
                                      ('table','Table'),
@@ -238,6 +240,7 @@ class survey_question(osv.osv):
         'rating_allow_one_column_require' : fields.boolean('Allow Only One Response per Column (Forced Ranking)'),
         'in_visible_rating_weight':fields.boolean('Is Rating Scale Invisible?'),
         'in_visible_menu_choice':fields.boolean('Is Menu Choice Invisible?'),
+        'in_visible_answer_type':fields.boolean('Is Answer Type Invisible?'),
         'comment_column':fields.boolean('Add comment column in matrix'),
         'column_name':fields.char('Column Name',size=256),
         'no_of_rows' : fields.integer('No of Rows'),
@@ -256,9 +259,13 @@ class survey_question(osv.osv):
          'validation_valid_err_msg' : lambda * a : 'The comment you entered is in an invalid format.',
          'numeric_required_sum_err_msg' : lambda * a :'The choices need to add up to [enter sum here].',
          'make_comment_field_err_msg' : lambda * a : 'Please enter a comment.',
+         'in_visible_answer_type' : lambda * a: 1
     }
 
     def on_change_type(self, cr, uid, ids, type, context=None):
+        print ":A:::::::::::::::::::::::::",type
+        if type in ['multiple_textboxes_diff_type']:
+            return {'value': {'in_visible_answer_type':False}}
         if type in ['rating_scale']:
             return {'value': {'in_visible_rating_weight':False,'in_visible_menu_choice':True}}
         elif type in ['matrix_of_drop_down_menus']:
@@ -266,7 +273,7 @@ class survey_question(osv.osv):
         elif type in ['single_textbox']:
             return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':True}}
         else:
-            return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':True}}
+            return {'value': {'in_visible_rating_weight':True,'in_visible_menu_choice':True,'in_visible_answer_type':True}}
 
     def write(self, cr, uid, ids, vals, context=None):
         questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type','req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids'])
@@ -450,15 +457,24 @@ class survey_answer(osv.osv):
             }
         return val
 
+    def _get_in_visible_answer_type(self,cr, uid, context={}):
+        if context.get('in_visible_answer_type',False):
+            return context['in_visible_answer_type']
+        return False
+    
     _columns = {
         'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
         'answer' : fields.char('Answer', size=128, required=1),
         'sequence' : fields.integer('Sequence'),
         'response' : fields.function(_calc_response_avg, method=True, string="#Response", multi='sums'),
         'average' : fields.function(_calc_response_avg, method=True, string="#Avg", multi='sums'),
+        'type' : fields.selection([('char','Character'),('date','Date'),('datetime','Date & Time'),('integer','Integer'),('float','Float')], "Type of Answer",required=1),
+        'in_visible_answer_type':fields.boolean('Is Answer Type Invisible??')
     }
     _defaults = {
-         'sequence' : lambda * a: 1
+         'sequence' : lambda * a: 1,
+         'type' : lambda * a: 'char',
+         'in_visible_answer_type':_get_in_visible_answer_type,
     }
 
     def default_get(self, cr, uid, fields, context={}):
@@ -495,7 +511,7 @@ class survey_response_line(osv.osv):
         'response_id' : fields.many2one('survey.response', 'Response', ondelete='cascade'),
         'date_create' : fields.datetime('Create Date', required=1),
         'state' : fields.selection([('draft', 'Draft'), ('done', 'Answered'),('skip', 'Skiped')], 'Status', readonly=True),
-        'question_id' : fields.many2one('survey.question', 'Question', ondelete='cascade'),
+        'question_id' : fields.many2one('survey.question', 'Question'),
         'page_id' : fields.related('question_id', 'page_id', type='many2one', relation='survey.page', string='Page'),
         'response_answer_ids' : fields.one2many('survey.response.answer', 'response_id', 'Response Answer'),
         'response_table_ids' : fields.one2many('survey.tbl.column.heading', 'response_table_id', 'Response Answer'),
@@ -525,7 +541,7 @@ class survey_tbl_column_heading(osv.osv):
     _order = 'name'
     _columns = {
         'name' : fields.integer('Row Number'),
-        'column_id' : fields.many2one('survey.question.column.heading', 'Column', ondelete='cascade'),
+        'column_id' : fields.many2one('survey.question.column.heading', 'Column'),
         'value' : fields.char('Value', size = 255),
         'response_table_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
     }
@@ -538,7 +554,8 @@ class survey_response_answer(osv.osv):
     _rec_name = 'response_id'
     _columns = {
         'response_id' : fields.many2one('survey.response.line', 'Response', ondelete='cascade'),
-        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1, ondelete='cascade'),
+        'answer_id' : fields.many2one('survey.answer', 'Answer', required=1),
+        'column_id' : fields.many2one('survey.question.column.heading','Column'),
         'answer' : fields.char('Value', size =255),
         'value_choice' : fields.char('Value Choice', size =255),
         'comment' : fields.text('Notes'),
@@ -727,7 +744,7 @@ class survey_question_wiz(osv.osv_memory):
                                 etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_selection_" + tools.ustr(row['id']),'string':to_xml(tools.ustr(row['answer']))})
                                 selection = [('','')]
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    selection.append((col['title'], col['title']))
+                                    selection.append((col['id'], col['title']))
                                 fields[tools.ustr(que) + "_selection_" + tools.ustr(row['id'])] = {'type':'selection', 'selection' : selection, 'string': "Answer"}
                                 if que_rec['comment_column']:
                                    fields[tools.ustr(que) + "_commentcolumn_"+tools.ustr(row['id']) + "_field"] = {'type':'char', 'size' : 255, 'string':tools.ustr(que_rec['column_name']), 'views':{}}
@@ -740,8 +757,8 @@ class survey_question_wiz(osv.osv_memory):
                             for row in ans_ids:
                                 etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(row['answer'])) +' :-', 'align': '0.0'})
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
-                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['title']), 'nolabel':"1"})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['title'])] = {'type':'boolean', 'string': col['title']}
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']), 'nolabel':"1"})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'boolean', 'string': col['title']}
                         elif que_rec['type'] == 'matrix_of_drop_down_menus':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': str(len(que_rec['column_heading_ids']) + 1), 'colspan': '4'})
                             etree.SubElement(xml_group, 'separator', {'string': '.','colspan': '1'})
@@ -754,8 +771,8 @@ class survey_question_wiz(osv.osv_memory):
                                     if col['menu_choice']:
                                         for item in col['menu_choice'].split('\n'):
                                             if item and not item.strip() == '': selection.append((item ,item))
-                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['title']),'nolabel':'1'})
-                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['title'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
+                                    etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(row['id']) + "_" + tools.ustr(col['id']),'nolabel':'1'})
+                                    fields[tools.ustr(que) + "_" + tools.ustr(row['id'])  + "_" + tools.ustr(col['id'])] = {'type':'selection', 'string': col['title'], 'selection':selection}
                         elif que_rec['type'] == 'multiple_textboxes':
                             xml_group = etree.SubElement(xml_group, 'group', {'col': '1', 'colspan': '4'})
                             type = "char"
@@ -804,6 +821,15 @@ class survey_question_wiz(osv.osv_memory):
                                 for col in que_col_head.read(cr, uid, que_rec['column_heading_ids']):
                                     etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row), 'nolabel':"1"})
                                     fields[tools.ustr(que) + "_table_" + tools.ustr(col['id']) +"_"+ tools.ustr(row)] = {'type':'char','size':255,'views':{}}
+                        elif que_rec['type'] == 'multiple_textboxes_diff_type':
+                            xml_group = etree.SubElement(xml_group, 'group', {'col': '1', 'colspan': '4'})
+                            for ans in ans_ids:
+                                etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"})
+                                if ans['type'] == "char" :
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type':'char', 'size':255, 'string':ans['answer']}
+                                else:
+                                    fields[tools.ustr(que) + "_" + tools.ustr(ans['id']) + "_multi"] = {'type': str(ans['type']), 'string':ans['answer']}
+
                         if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans', 'matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale'] and que_rec['is_comment_require']:
                             if que_rec['type'] in ['multiple_choice_only_one_ans', 'multiple_choice_multiple_ans'] and que_rec['comment_field_type'] in ['char','text'] and que_rec['make_comment_field']:
                                 etree.SubElement(xml_group, 'field', {'name': tools.ustr(que) + "_otherfield", 'colspan':"4"})
@@ -985,7 +1011,7 @@ class survey_question_wiz(osv.osv_memory):
                             continue
                         elif val1 and key1.split('_')[1] == "selection" and key1.split('_')[0] == que_id:
                             if len(key1.split('_')) > 2:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'answer' : val1})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[-1], 'column_id' : val1})
                                 selected_value.append(val1)
                                 response_list.append(str(ans_create_id) + "_" + str(key1.split('_')[-1]))
                             else:
@@ -1074,10 +1100,10 @@ class survey_question_wiz(osv.osv_memory):
                             numeric_sum += int(val1)
                         elif val1 and que_id == key1.split('_')[0] and len(key1.split('_')) == 3:
                             if type(val1) == type('') or type(val1) == type(u''):
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2], 'value_choice' : val1})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2], 'value_choice' : val1})
                                 sur_name_read['store_ans'][resp_id].update({key1:val1})
                             else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'answer' : key1.split('_')[2]})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':resp_id, 'answer_id':key1.split('_')[1], 'column_id' : key1.split('_')[2]})
                                 sur_name_read['store_ans'][resp_id].update({key1:True})
                             matrix_list.append(key1.split('_')[0] + '_' + key1.split('_')[1])
                             select_count += 1
@@ -1106,7 +1132,7 @@ class survey_question_wiz(osv.osv_memory):
                         for res in resp_id_list:
                             sur_name_read['store_ans'].pop(res)
                         raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
-                    if que_rec['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
+                    if que_rec['type'] in ['multiple_textboxes_diff_type', 'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                         if matrix_list:
                             if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
                             (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
@@ -1159,7 +1185,7 @@ class survey_question_wiz(osv.osv_memory):
                             continue
                         elif val and key.split('_')[1] == "selection":
                             if len(key.split('_')) > 2:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'answer' : val})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':key.split('_')[-1], 'column_id' : val})
                                 selected_value.append(val)
                                 response_list.append(str(ans_create_id) + "_" + str(key.split('_')[-1]))
                             else:
@@ -1247,10 +1273,10 @@ class survey_question_wiz(osv.osv_memory):
                         elif val and len(key.split('_')) == 3:
                             resp_obj.write(cr, uid, update, {'state': 'done'})
                             if type(val) == type('') or type(val) == type(u''):
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : ans_id_len[2], 'value_choice' : val})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2], 'value_choice' : val})
                                 sur_name_read['store_ans'][update].update({key:val})
                             else:
-                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'answer' : ans_id_len[2]})
+                                ans_create_id = res_ans_obj.create(cr, uid, {'response_id':update, 'answer_id':ans_id_len[1], 'column_id' : ans_id_len[2]})
                                 sur_name_read['store_ans'][update].update({key:True})
                             matrix_list.append(key.split('_')[0] + '_' + key.split('_')[1])
                             select_count += 1
@@ -1274,7 +1300,7 @@ class survey_question_wiz(osv.osv_memory):
                     raise osv.except_osv(_('Error re !'), _("'" + que_rec['question'] + "' " + tools.ustr(que_rec['numeric_required_sum_err_msg'])))
                 if not select_count:
                     resp_obj.write(cr, uid, update, {'state': 'skip'})
-                if que_rec['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
+                if que_rec['type'] in ['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time'] and que_rec['is_require_answer']:
                     if matrix_list:
                         if (que_rec['required_type'] == 'all' and len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \
                         (que_rec['required_type'] == 'at least' and len(list(set(matrix_list))) < que_rec['req_ans']) or \
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 03ac38d8b74..277c6dd90c5 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -23,6 +23,7 @@
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
             <field eval="1" name="sequence"/>
+            <field name="in_visible_answer_type">1</field>
         </record>
 
         <record id="survey_question_company_size" model="survey.question">
@@ -31,39 +32,47 @@
             <field name="type">multiple_choice_only_one_ans</field>
             <field name="in_visible_single_text">1</field>
             <field eval="2" name="sequence"/>
+            <field name="in_visible_answer_type">1</field>
         </record>
 
         <record id="survey_question_company_size_1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">1 - 10</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field eval="1" name="sequence"/>
         </record>
         <record id="survey_question_company_size_11" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">11 - 50</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field eval="2" name="sequence"/>
         </record>
         <record id="survey_question_company_size_51" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">51 - 100</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_question_company_size_101" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">101 - 250</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_company_size_251" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">251 - 500</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_company_size_501" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">501 - 1000</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field name="sequence" eval="6"/>
         </record>
         <record id="survey_question_company_size_1000" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">> 1000</field>
             <field name="question_id" ref="survey_question_company_size" />
             <field name="sequence" eval="7"/>
@@ -73,6 +82,7 @@
         </record>
 
         <record id="survey_question_located" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Where are you located?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -80,26 +90,31 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_question_company_size_Europ" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Europ</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_question_company_size_North_America" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">North America</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_company_size_Asia" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Asia</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_company_size_South_America" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">South America</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_company_size_Australia" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Australia</field>
             <field name="question_id" ref="survey_question_located" />
             <field name="sequence" eval="5"/>
@@ -111,6 +126,7 @@
         </record>
 
         <record id="survey_question_offical_partner" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">When did you become an OpenERP official partner?</field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -118,26 +134,31 @@
             <field eval="4" name="sequence"/>
         </record>
         <record id="survey_question_company_size_2009" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">in 2009</field>
             <field name="question_id" ref="survey_question_offical_partner" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_question_company_size_2008" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">in 2008</field>
             <field name="question_id" ref="survey_question_offical_partner" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_company_size_2007" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">in 2007</field>
             <field name="question_id" ref="survey_question_offical_partner" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_company_size_2006" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">in 2006</field>
             <field name="question_id" ref="survey_question_offical_partner" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_company_size_before_2006" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">before 2006</field>
             <field name="question_id" ref="survey_question_offical_partner" />
             <field name="sequence" eval="5"/>
@@ -147,6 +168,7 @@
         </record>
 
         <record id="survey_question_your_customers" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">What kind of solutions do you sell to your customers? </field>
             <field name="page_id" ref="survey_page_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -154,16 +176,19 @@
             <field eval="5" name="sequence"/>
         </record>
         <record id="survey_answer_specific_devlopments" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Integrations without specific developments</field>
             <field name="question_id" ref="survey_question_your_customers" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_with_specific_devlopments" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Integrations with specific developments</field>
             <field name="question_id" ref="survey_question_your_customers" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_saas_services" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Odoo Saas Offer</field>
             <field name="question_id" ref="survey_question_your_customers" />
             <field name="sequence" eval="3"/>
@@ -177,6 +202,7 @@
         </record>
 
         <record id="survey_question_partnership_contract" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about the partnership contract?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -184,21 +210,25 @@
             <field eval="1" name="sequence"/>
         </record>
         <record id="survey_answer_Ambiguous" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Ambiguous</field>
             <field name="question_id" ref="survey_question_partnership_contract" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_enough" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Not clear enough</field>
             <field name="question_id" ref="survey_question_partnership_contract" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_Clear" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Clear</field>
             <field name="question_id" ref="survey_question_partnership_contract" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_very_clear" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Very Clear</field>
             <field name="question_id" ref="survey_question_partnership_contract" />
             <field name="sequence" eval="4"/>
@@ -208,6 +238,7 @@
         </record>
 
         <record id="survey_question_contract_customers" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">When do you propose a maintenance contract to your customers?</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -218,16 +249,19 @@
             <field name="is_comment_require">True</field>
         </record>
         <record id="survey_answer_very_integration" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">With each integration</field>
             <field name="question_id" ref="survey_question_contract_customers" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_sometimes" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Sometimes</field>
             <field name="question_id" ref="survey_question_contract_customers" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_never" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Never... </field>
             <field name="question_id" ref="survey_question_contract_customers" />
             <field name="sequence" eval="2"/>
@@ -237,6 +271,7 @@
         </record>
 
         <record id="survey_question_sell_to_your_customers" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Which maintenance contract do you sell to your customers.</field>
             <field name="page_id" ref="survey_page_Contracts" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -244,16 +279,19 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_answer_maintenance_contract" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">OpenERP maintenance contract</field>
             <field name="question_id" ref="survey_question_sell_to_your_customers" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_buy_an_openerp_one" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Your own contract, but you buy an OpenERP one</field>
             <field name="question_id" ref="survey_question_sell_to_your_customers" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_buying_an_openerp" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Your own contract without buying an OpenERP one</field>
             <field name="question_id" ref="survey_question_sell_to_your_customers" />
             <field name="sequence" eval="3"/>
@@ -269,6 +307,7 @@
         </record>
 
         <record id="survey_question_launchpad_reporting" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Launchpad reporting :</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -276,16 +315,19 @@
             <field eval="2" name="sequence"/>
         </record>
         <record id="survey_answer_find_openobject_website1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is Launchpad easy to find in OpenObject website?</field>
             <field name="question_id" ref="survey_question_launchpad_reporting" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_bug_or_blueprint" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is it easy to report a bug or a blueprint?</field>
             <field name="question_id" ref="survey_question_launchpad_reporting" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_modify_a_translation" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is it easy to add or modify a translation?</field>
             <field name="question_id" ref="survey_question_launchpad_reporting" />
             <field name="sequence" eval="3"/>
@@ -315,17 +357,20 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
  		<record id="survey_question_Leads" model="survey.question">
+ 			<field name="in_visible_answer_type">1</field>
             <field name="question">Leads</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
             <field name="in_visible_single_text">1</field>
         </record>
         <record id="survey_answer_find_openobject_website" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is Launchpad easy to find in OpenObject website?</field>
             <field name="question_id" ref="survey_question_Leads" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_converted_in_customers" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">How are the leads that you find thanks to Tiny be converted in customers?</field>
             <field name="question_id" ref="survey_question_Leads" />
             <field name="sequence" eval="2"/>
@@ -362,6 +407,7 @@
         </record>
 
         <record id="survey_question_partners_about" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">How is Tiny's communication with partners about...</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -369,16 +415,19 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_answer_Maintenance_contracts" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Maintenance contracts</field>
             <field name="question_id" ref="survey_question_partners_about" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_partner_Leads" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Leads</field>
             <field name="question_id" ref="survey_question_partners_about" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_Training_sessions" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Training sessions</field>
             <field name="question_id" ref="survey_question_partners_about" />
             <field name="sequence" eval="3"/>
@@ -408,12 +457,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_partners_about" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_partners_on_which_subjects" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, how could Tiny better communicate with partners and on which subjects?</field>
             <field name="page_id" ref="survey_page_communication" />
             <field name="type">comment</field>
@@ -437,6 +488,7 @@
         </record>
 
         <record id="survey_question_odoo_company_name" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's name?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">single_textbox</field>
@@ -446,6 +498,7 @@
         </record>
 
         <record id="survey_question_odoo_company_sector" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">What is your company's sector?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -453,96 +506,115 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_Agriculture" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Agriculture</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_question_Bank_Finance" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Bank &amp; Finance</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_Engineering" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Engineering</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_Chemical_Pharmaceutical" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Chemical &amp; Pharmaceutical</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_HR" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">HR</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_Construction" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Construction</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="6"/>
         </record>
         <record id="survey_question_Retail" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Retail</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="7"/>
         </record>
         <record id="survey_question_Electronics" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Electronics</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="8"/>
         </record>
         <record id="survey_question_Energy" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Energy</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="9"/>
         </record>
         <record id="survey_question_Education" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Education</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="10"/>
         </record>
         <record id="survey_question_Industry" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Industry</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="11"/>
         </record>
         <record id="survey_question_Logistics" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Logistics</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="12"/>
         </record>
         <record id="survey_question_Media_Entertainment" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Media &amp; Entertainment</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="13"/>
         </record>
         <record id="survey_question_Public_Nonprofit" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Public &amp; Nonprofit</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="14"/>
         </record>
         <record id="survey_question_Services" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Services</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="15"/>
         </record>
         <record id="survey_question_Healthcare" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Healthcare</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="16"/>
         </record>
         <record id="survey_question_Telecommunication" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Telecommunication And ICT</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
            <field name="sequence" eval="17"/>
         </record>
         <record id="survey_question_Tourism_Catering" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Tourism &amp; Catering</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="18"/>
         </record>
         <record id="survey_question_Other_sector" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Other sector</field>
             <field name="question_id" ref="survey_question_odoo_company_sector" />
             <field name="sequence" eval="19"/>
@@ -554,6 +626,7 @@
          </record>
 
          <record id="survey_question_odoo_mange_with_odoo" model="survey.question">
+         	<field name="in_visible_answer_type">1</field>
             <field name="question">Which activities do you plan to manage with Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -561,41 +634,49 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_Customer_Relationship_Management" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Customer Relationship Management</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_question_Customer_Accounting_Finance" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Accounting &amp; Finance</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_Customer_inventory_Management" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Inventory Management</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_Customer_Manufacturing" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Manufacturing</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_Customer_Human_Resources" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Human Resources</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_Project_Management" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Project Management</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="6"/>
         </record>
         <record id="survey_question_Sales_Purchases" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Sales &amp; Purchases</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="7"/>
         </record>
         <record id="survey_question_Other_odoo_mange_with_odoo" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Other</field>
             <field name="question_id" ref="survey_question_odoo_mange_with_odoo" />
             <field name="sequence" eval="8"/>
@@ -607,6 +688,7 @@
         </record>
 
         <record id="survey_question_odoo_discover_odoo" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">How did you discover Odoo ?</field>
             <field name="page_id" ref="survey_page_odoo_who_are_you" />
             <field name="type">multiple_choice_multiple_ans</field>
@@ -614,31 +696,37 @@
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_OpenERP_website" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">OpenERP website</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_question_Search_Engine" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Search Engine</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_question_Word_of_mouth" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Word of mouth</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_question_Trade_show" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Trade show</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_question_Press" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Press</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="5"/>
         </record>
         <record id="survey_question_Other" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Other</field>
             <field name="question_id" ref="survey_question_odoo_discover_odoo" />
             <field name="sequence" eval="6"/>
@@ -656,6 +744,7 @@
         </record>
 
         <record id="survey_question_odoo_subscribe_to_odoo" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Why did you subscribe to Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -663,32 +752,38 @@
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_switch_to_online_offer1" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">I was already using OpenERP and wanted to switch to an online offer</field>
             <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_maintaining_by_myself" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">It's easier and cheaper than maintaining by myself</field>
             <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_saas_offr_my_customers" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">I am looking for a SaaS offer for my customers</field>
             <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_download_install_later_use" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">After having tested it, I plan to download and install it by myself for later use</field>
             <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_answer_tested_planto_use_it" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">After having tested it, I don't plan to use it</field>
             <field name="question_id" ref="survey_question_odoo_subscribe_to_odoo" />
             <field name="sequence" eval="5"/>
         </record>
 
         <record id="survey_question_odoo_configure_the_application" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">How much time did you spend to configure the application?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -696,26 +791,31 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_switch_to_online_offer" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Creating users and access rights</field>
             <field name="question_id" ref="survey_question_odoo_configure_the_application" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_adding_modules_need" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Adding the modules I need</field>
             <field name="question_id" ref="survey_question_odoo_configure_the_application" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_configuring_the_modules" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Configuring the modules</field>
             <field name="question_id" ref="survey_question_odoo_configure_the_application" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_importing_my_data" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Importing my data</field>
             <field name="question_id" ref="survey_question_odoo_configure_the_application" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_answer_initial_data" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Creating the initial data</field>
             <field name="question_id" ref="survey_question_odoo_configure_the_application" />
             <field name="sequence" eval="5"/>
@@ -752,6 +852,7 @@
         </record>
 
         <record id="survey_question_odoo_continue_using_odoo" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to continue using Odoo?</field>
             <field name="page_id" ref="survey_page_odoo_Subscription_and_configuration" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -762,11 +863,13 @@
             <field name="is_comment_require">True</field>
         </record>
         <record id="survey_answer_yes" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Yes</field>
             <field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_no" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">No</field>
             <field name="question_id" ref="survey_question_odoo_continue_using_odoo" />
             <field name="sequence" eval="2"/>
@@ -781,6 +884,7 @@
             <field eval="3" name="sequence"/>
         </record>
         <record id="survey_question_odoo_would_you_prefer_use" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Which interface would you prefer to use?</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -788,16 +892,19 @@
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_web_interface" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">The web interface</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_KDE_interface" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">The rich interface (GTK or KDE)</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_both_interface" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Both</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_use" />
             <field name="sequence" eval="3"/>
@@ -807,6 +914,7 @@
         </record>
 
         <record id="survey_question_odoo_give_your_opinion" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -814,21 +922,25 @@
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_appropriately_structured" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is Odoo Website appropriately structured?</field>
             <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_faq_clear_and_choicese" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Are Odoo Website FAQ clear and concise?</field>
             <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_webclient_simple_and_useful" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is OpenERP Web Client simple and useful?</field>
             <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_control_center_user_friendly" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Is the Control Center user-friendly?</field>
             <field name="question_id" ref="survey_question_odoo_give_your_opinion" />
             <field name="sequence" eval="4"/>
@@ -872,6 +984,7 @@
         </record>
 
         <record id="survey_question_odoo_you_think_about" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">What do you think about ... </field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -881,26 +994,31 @@
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_database_new_version" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Migrating a database to a new version</field>
             <field name="question_id" ref="survey_question_odoo_you_think_about" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_downloadin_your_backups" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Browsing and downloading your backups</field>
             <field name="question_id" ref="survey_question_odoo_you_think_about" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_duplicating_database" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Duplicating a database</field>
             <field name="question_id" ref="survey_question_odoo_you_think_about" />
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_monthly_hours_statistics" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Checking your monthly hours statistics</field>
             <field name="question_id" ref="survey_question_odoo_you_think_about" />
             <field name="sequence" eval="4"/>
         </record>
         <record id="survey_answer_support_ticket" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Creating a support ticket</field>
             <field name="question_id" ref="survey_question_odoo_you_think_about" />
             <field name="sequence" eval="5"/>
@@ -936,12 +1054,14 @@
             <field name="in_visible_menu_choice">1</field>
         </record>
         <record id="survey_question_odoo_you_think_about" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="required_type">at least</field>
             <field eval="1" name="req_ans"/>
             <field name="req_error_msg">This question requires an answer.</field>
         </record>
 
         <record id="survey_question_odoo_modules_are_missing_in_odoo" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">In your opinion, which modules are missing in Odoo? Give examples :</field>
             <field name="page_id" ref="survey_page_odoo_using_odoo" />
             <field name="type">single_textbox</field>
@@ -958,6 +1078,7 @@
         </record>
 
         <record id="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">How often would you prefer to receive your prepaid bill?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -965,16 +1086,19 @@
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_Monthly" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Monthly</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_annually_with_discount" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Annually with 20% discount</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_with_25_discount" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Every 2 years with 25% discount</field>
             <field name="question_id" ref="survey_question_odoo_would_you_prefer_receive_your_prepaid_bill" />
             <field name="sequence" eval="3"/>
@@ -984,6 +1108,7 @@
         </record>
 
         <record id="survey_question_odoo_dms" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Do you plan to use the document management system?</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">multiple_choice_only_one_ans</field>
@@ -994,11 +1119,13 @@
             <field name="is_comment_require">True</field>
         </record>
         <record id="survey_answer_YES" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Yes, I plan to use (GB)</field>
             <field name="question_id" ref="survey_question_odoo_dms" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_No" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">No</field>
             <field name="question_id" ref="survey_question_odoo_dms" />
             <field name="sequence" eval="2"/>
@@ -1008,6 +1135,7 @@
         </record>
 
         <record id="survey_question_odoo_support_services" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">How satisfied are you with Odoo's support services :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1015,11 +1143,13 @@
             <field name="sequence" eval="3"/>
         </record>
         <record id="survey_answer_our_answer_is" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">The time between your question and our answer is</field>
             <field name="question_id" ref="survey_question_odoo_support_services" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_pertinence_our_answer" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">The pertinence of our answers is</field>
             <field name="question_id" ref="survey_question_odoo_support_services" />
             <field name="sequence" eval="2"/>
@@ -1061,6 +1191,7 @@
         </record>
 
         <record id="survey_question_offer_opinion_about_odoo" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">Give your opinion about Odoo's</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">matrix_of_choices_only_one_ans</field>
@@ -1068,16 +1199,19 @@
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_pricing_criteria" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Pricing criteria</field>
             <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
             <field name="sequence" eval="1"/>
         </record>
         <record id="survey_answer_pricing_understanding" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Pricing understanding</field>
             <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
             <field name="sequence" eval="2"/>
         </record>
         <record id="survey_answer_pricing_available_modules" model="survey.answer">
+            <field name="in_visible_answer_type">1</field>
             <field name="answer">Range of available modules</field>
             <field name="question_id" ref="survey_question_offer_opinion_about_odoo" />
             <field name="sequence" eval="3"/>
@@ -1119,6 +1253,7 @@
         </record>
 
         <record id="survey_question_offer_comments_them_here" model="survey.question">
+        	<field name="in_visible_answer_type">1</field>
             <field name="question">If you have any additional comments, write them here :</field>
             <field name="page_id" ref="survey_page_odoo_the_offer" />
             <field name="type">comment</field>
@@ -1194,6 +1329,7 @@
 	</data>
 	<data>
 		<record id="survey_question_0" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="1" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1213,6 +1349,7 @@
 	</data>
 	<data>
 		<record id="survey_question_1" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="2" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1232,6 +1369,7 @@
 	</data>
 	<data>
 		<record id="survey_question_2" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="1" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1252,6 +1390,7 @@
 
 	<data>
 		<record id="survey_question_3" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="3" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1272,6 +1411,7 @@
 	</data>
 	<data>
 		<record id="survey_question_4" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="4" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1291,6 +1431,7 @@
 	</data>
 	<data>
 		<record id="survey_question_5" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="2" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1310,6 +1451,7 @@
 	</data>
 	<data>
 		<record id="survey_question_6" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="3" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1329,6 +1471,7 @@
 	</data>
 	<data>
 		<record id="survey_question_7" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="1" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1348,6 +1491,7 @@
 	</data>
 	<data>
 		<record id="survey_question_8" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="1" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1367,6 +1511,7 @@
 	</data>
 	<data>
 		<record id="survey_question_9" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="5" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1386,6 +1531,7 @@
 	</data>
 	<data>
 		<record id="survey_question_10" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="2" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1406,6 +1552,7 @@
 	</data>
 	<data>
 		<record id="survey_question_11" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="3" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1426,6 +1573,7 @@
 	</data>
 	<data>
 		<record id="survey_question_12" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="6" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1445,6 +1593,7 @@
 	</data>
 	<data>
 		<record id="survey_question_13" model="survey.question">
+			<field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;do_not_validate&quot;&quot;&quot;" name="comment_valid_type"/>
 			<field eval="7" name="sequence"/>
 			<field eval="&quot;&quot;&quot;The choices need to add up to [enter sum here].&quot;&quot;&quot;" name="numeric_required_sum_err_msg"/>
@@ -1592,6 +1741,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_0" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I participate to discussion and forums&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_8"/>
 			<field eval="1" name="sequence"/>
@@ -1599,6 +1749,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_1" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I'd like to contribute but I don't know how ?&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_8"/>
 			<field eval="2" name="sequence"/>
@@ -1606,6 +1757,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_2" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;There is too many groups defined, security is too complex to set&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_12"/>
 			<field eval="1" name="sequence"/>
@@ -1613,6 +1765,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_3" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;There is too few groups defined, security isn't accurate enough&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_12"/>
 			<field eval="2" name="sequence"/>
@@ -1620,6 +1773,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_4" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The number of groups is good&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_12"/>
 			<field eval="3" name="sequence"/>
@@ -1627,6 +1781,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_5" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The GTK client&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_5"/>
 			<field eval="1" name="sequence"/>
@@ -1634,6 +1789,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_6" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The web interface&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_5"/>
 			<field eval="2" name="sequence"/>
@@ -1641,6 +1797,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_7" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The KDE client&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_5"/>
 			<field eval="3" name="sequence"/>
@@ -1648,6 +1805,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_8" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;At least two of them&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_5"/>
 			<field eval="4" name="sequence"/>
@@ -1655,6 +1813,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_9" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Yes, I use a version &lt; 5.0&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_2"/>
 			<field eval="1" name="sequence"/>
@@ -1662,6 +1821,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_10" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Yes, I use the 5.0 version, installed locally&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_2"/>
 			<field eval="2" name="sequence"/>
@@ -1669,6 +1829,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_11" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Yes, I use the latest version on Odoo&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_2"/>
 			<field eval="3" name="sequence"/>
@@ -1676,6 +1837,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_12" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;No, I just tested it&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_2"/>
 			<field eval="4" name="sequence"/>
@@ -1683,6 +1845,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_13" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Sales Management&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="1" name="sequence"/>
@@ -1690,6 +1853,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_14" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Purchases Management&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="2" name="sequence"/>
@@ -1697,6 +1861,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_15" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Financial Management&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="3" name="sequence"/>
@@ -1704,6 +1869,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_16" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;CRM / SRM&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="4" name="sequence"/>
@@ -1711,6 +1877,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_17" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Project Management&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="5" name="sequence"/>
@@ -1718,6 +1885,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_18" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Human Ressources&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_6"/>
 			<field eval="6" name="sequence"/>
@@ -1725,6 +1893,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_19" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Descriptions and help tooltips are clear enough&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_13"/>
 			<field eval="1" name="sequence"/>
@@ -1732,6 +1901,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_20" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Configuration wizard exists for each important setting&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_13"/>
 			<field eval="2" name="sequence"/>
@@ -1739,6 +1909,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_21" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Extra modules proposed are relevant&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_13"/>
 			<field eval="3" name="sequence"/>
@@ -1746,6 +1917,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_22" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The current menu structure is good&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_4"/>
 			<field eval="1" name="sequence"/>
@@ -1753,6 +1925,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_23" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It can be improved&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_4"/>
 			<field eval="2" name="sequence"/>
@@ -1760,6 +1933,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_24" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;They are too much menus, it's complex to understand&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_4"/>
 			<field eval="3" name="sequence"/>
@@ -1767,6 +1941,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_25" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I develop new features&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_8"/>
 			<field eval="3" name="sequence"/>
@@ -1774,6 +1949,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_26" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I help to translate&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_8"/>
 			<field eval="4" name="sequence"/>
@@ -1781,6 +1957,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_27" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I write documentations&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_8"/>
 			<field eval="5" name="sequence"/>
@@ -1788,6 +1965,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_28" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Running the configuration wizards is a good way to spare time&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_13"/>
 			<field eval="4" name="sequence"/>
@@ -1795,6 +1973,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_29" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I use Launchpad, like all official OpenERP projects&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_7"/>
 			<field eval="1" name="sequence"/>
@@ -1802,6 +1981,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_30" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The security rules defined on groups are helpfull&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="1" name="sequence"/>
@@ -1809,6 +1989,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_31" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;They are covering all objects&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="2" name="sequence"/>
@@ -1816,6 +1997,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_32" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;Those security rules are standard and can be used out-of-the-box in most cases&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="3" name="sequence"/>
@@ -1823,6 +2005,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_33" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group helps in daily work&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="4" name="sequence"/>
@@ -1830,6 +2013,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_34" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The 'Usability/Extended View' group hides only optional fields&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="5" name="sequence"/>
@@ -1837,6 +2021,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_35" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;The groups set on menu items are relevant&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_9"/>
 			<field eval="6" name="sequence"/>
@@ -1844,6 +2029,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_36" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It is up-to-date&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_0"/>
 			<field eval="1" name="sequence"/>
@@ -1851,6 +2037,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_37" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It helps in the beginning&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_0"/>
 			<field eval="2" name="sequence"/>
@@ -1858,6 +2045,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_38" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I use the contextual help in OpenERP&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_0"/>
 			<field eval="3" name="sequence"/>
@@ -1865,6 +2053,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_39" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It is complete&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_0"/>
 			<field eval="4" name="sequence"/>
@@ -1872,6 +2061,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_40" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It is clear&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_0"/>
 			<field eval="5" name="sequence"/>
@@ -1879,6 +2069,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_41" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;They help new users to understand OpenERP&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_1"/>
 			<field eval="1" name="sequence"/>
@@ -1886,6 +2077,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_42" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;They are clean and correct&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_1"/>
 			<field eval="2" name="sequence"/>
@@ -1893,6 +2085,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_43" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;They are useful on a daily usage&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_1"/>
 			<field eval="3" name="sequence"/>
@@ -1900,6 +2093,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_44" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;A process is defined for all enterprise flows&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_1"/>
 			<field eval="4" name="sequence"/>
@@ -1907,6 +2101,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_45" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;It's easy to find the process you need&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_1"/>
 			<field eval="5" name="sequence"/>
@@ -1914,6 +2109,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_46" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I use another repository system (sourceforge, ...)&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_7"/>
 			<field eval="2" name="sequence"/>
@@ -1921,6 +2117,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_47" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I host on my own website&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_7"/>
 			<field eval="3" name="sequence"/>
@@ -1928,6 +2125,7 @@
 	</data>
 	<data>
 		<record id="survey_answer_48" model="survey.answer">
+		    <field name="in_visible_answer_type">1</field>
 			<field eval="&quot;&quot;&quot;I don't publish my developments&quot;&quot;&quot;" name="answer"/>
 			<field name="question_id" ref="survey_question_7"/>
 			<field eval="4" name="sequence"/>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 5c84eb6d1e4..7e8760d6318 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -47,12 +47,13 @@
                                             <field name="type" on_change="on_change_type(type)"/>
 						                    <field name="in_visible_rating_weight" invisible="1"/>
 						                    <field name="in_visible_menu_choice" invisible="1"/>
+						                    <field name="in_visible_answer_type" invisible="1"/>
 						                    <notebook colspan="4">
 						                        <page string="Options">
-													<group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+													<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
 							                          <separator string="Answer" colspan="4"/>
 													   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-								                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+								                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
 								                       </group>
 								                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
 								                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
@@ -93,16 +94,15 @@
 								                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
 								                                </group>
 								                            </group>
+								                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+									                            <field name="comment_column"/>
+									                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+									                                <field name="column_name" colspan="2"/>
+									                            </group>
+															</group>
 														</group>
 							                        </group>
 							                        <newline/>
-						                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-							                            <field name="comment_column"/>
-							                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-							                                <field name="column_name" colspan="2"/>
-							                            </group>
-													</group>
-							                        <newline/>
 							                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
 							                            <separator string="Validation" colspan="4"/>
 							                            <group colspan="4">
@@ -129,12 +129,12 @@
 							                            </group>
 							                        </group>
 							                        <newline/>
-							                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+							                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
 							                            <separator string="Required Answer" colspan="4"/>
 							                            <newline/>
 						                                <field name="is_require_answer"/>
 														<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-								                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+								                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
 								                                <field name="required_type"/>
 								                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
 								                                    <field name="req_ans" />
@@ -306,12 +306,13 @@
                         <field name="type" on_change="on_change_type(type)"/>
 	                    <field name="in_visible_rating_weight" invisible="1"/>
 	                    <field name="in_visible_menu_choice" invisible="1"/>
-	                    <notebook colspan="4">
+	                    <field name="in_visible_answer_type" invisible="1"/>
+                        <notebook colspan="4">
 	                        <page string="Options">
-								<group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+								<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
 		                          <separator string="Answer" colspan="4"/>
 								   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-			                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+			                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
 			                       </group>
 			                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
 			                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
@@ -352,16 +353,15 @@
 			                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
 			                                </group>
 			                            </group>
+			                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+				                            <field name="comment_column"/>
+				                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+				                                <field name="column_name" colspan="2"/>
+				                            </group>
+										</group>
 									</group>
 		                        </group>
 		                        <newline/>
-	                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-		                            <field name="comment_column"/>
-		                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-		                                <field name="column_name" colspan="2"/>
-		                            </group>
-								</group>
-		                        <newline/>
 		                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
 		                            <separator string="Validation" colspan="4"/>
 		                            <group colspan="4">
@@ -388,12 +388,12 @@
 		                            </group>
 		                        </group>
 		                        <newline/>
-		                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+		                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
 		                            <separator string="Required Answer" colspan="4"/>
 		                            <newline/>
 	                                <field name="is_require_answer"/>
 									<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-			                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+			                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
 			                                <field name="required_type"/>
 			                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
 			                                    <field name="req_ans" />
@@ -427,6 +427,7 @@
 		                        </group>
 	                        </page>
 	                    </notebook>
+
                     </form>
                     <tree string="Survey Question">
                         <field name="sequence" string="Seq"/>
@@ -500,12 +501,13 @@
                     <field name="type" on_change="on_change_type(type)"/>
                     <field name="in_visible_rating_weight" invisible="1"/>
                     <field name="in_visible_menu_choice" invisible="1"/>
+                    <field name="in_visible_answer_type" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Options">
-							<group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+							<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
 	                          <separator string="Answer" colspan="4"/>
 							   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
 		                       </group>
 		                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
 		                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
@@ -546,16 +548,15 @@
 		                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
 		                                </group>
 		                            </group>
+		                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
+			                            <field name="comment_column"/>
+			                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
+			                                <field name="column_name" colspan="2"/>
+			                            </group>
+									</group>
 								</group>
 	                        </group>
 	                        <newline/>
-                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
-	                            <field name="comment_column"/>
-	                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
-	                                <field name="column_name" colspan="2"/>
-	                            </group>
-							</group>
-	                        <newline/>
 	                        <group attrs="{'invisible':[('type','!=','single_textbox'), ('type','!=','multiple_textboxes')]}">
 	                            <separator string="Validation" colspan="4"/>
 	                            <group colspan="4">
@@ -582,12 +583,12 @@
 	                            </group>
 	                        </group>
 	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
 	                            <separator string="Required Answer" colspan="4"/>
 	                            <newline/>
                                 <field name="is_require_answer"/>
 								<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
 		                                <field name="required_type"/>
 		                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
 		                                    <field name="req_ans" />
@@ -665,12 +666,13 @@
                     <field name="type" on_change="on_change_type(type)"/>
                     <field name="in_visible_rating_weight" invisible="1"/>
                     <field name="in_visible_menu_choice" invisible="1"/>
+                    <field name="in_visible_answer_type" invisible="1"/>
                     <notebook colspan="4">
                         <page string="Options">
-							<group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
+							<group attrs="{'invisible':[('type','!=','multiple_textboxes_diff_type'),('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','table')]}">
 	                          <separator string="Answer" colspan="4"/>
 							   <group colspan="4" attrs="{'invisible':[('type','=','table')]}">
-		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}"/>
+		                           <field name="answer_choice_ids" nolabel="1" colspan="4" context="{'line_order': answer_choice_ids}" default_get="{'in_visible_answer_type': in_visible_answer_type}"/>
 		                       </group>
 		                       <group colspan="4" attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','table')]}">
 		                           <field name="column_heading_ids" colspan="4" nolabel="1" default_get="{'in_visible_rating_weight':in_visible_rating_weight,'in_visible_menu_choice':in_visible_menu_choice}"/>
@@ -711,7 +713,7 @@
 		                                    <field name="comment_valid_err_msg" nolabel="1" colspan="4"/>
 		                                </group>
 		                            </group>
-		                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale')]}">
+		                            <group attrs="{'invisible':[('type','!=','matrix_of_choices_only_one_ans'),('type','!=','rating_scale')]}">
 			                            <field name="comment_column"/>
 			                            <group colspan="2" attrs="{'invisible':[('comment_column','!=',True)]}">
 			                                <field name="column_name" colspan="2"/>
@@ -746,12 +748,12 @@
 	                            </group>
 	                        </group>
 	                        <newline/>
-	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment')]}">
+	                        <group attrs="{'invisible':[('type','!=','multiple_choice_only_one_ans'), ('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','single_textbox'),('type','!=','comment'),('type','!=','multiple_textboxes_diff_type')]}">
 	                            <separator string="Required Answer" colspan="4"/>
 	                            <newline/>
                                 <field name="is_require_answer"/>
 								<group col="6" colspan="4" attrs="{'invisible':[('is_require_answer','=',False)]}">
-		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time')]}">
+		                            <group colspan="4" attrs="{'invisible':[('type','!=','multiple_choice_multiple_ans'),('type','!=','matrix_of_choices_only_one_ans'),('type','!=','matrix_of_choices_only_multi_ans'),('type','!=','matrix_of_drop_down_menus'),('type','!=','rating_scale'),('type','!=','multiple_textboxes'),('type','!=','numerical_textboxes'),('type','!=','date'),('type','!=','date_and_time'),('type','!=','multiple_textboxes_diff_type')]}">
 		                                <field name="required_type"/>
 		                                <group colspan="2" attrs="{'invisible':[('required_type','!=','at least'),('required_type','!=','at most'),('required_type','!=','exactly')]}">
 		                                    <field name="req_ans" />
@@ -805,6 +807,10 @@
                 <form string="Survey Answer">
                     <field name="answer" colspan="4" select="1"/>
                     <field name="sequence"/>
+                    <field name="in_visible_answer_type" invisible="1"/>
+                   	<group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}">
+                        <field name="type"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -815,7 +821,7 @@
             <field name="model">survey.answer</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Survey Answer">
+                <tree editable="top" string="Survey Answer">
                     <field name="sequence" string="Seq"/>
                     <field name="answer" select="1"/>
                 </tree>
@@ -939,7 +945,10 @@
                     </group>
                     <field name="value_choice"/>
                     <label string="(Use Only Question Type is matrix_of_drop_down_menus)" align="0.0"/>
-                    <field name="comment_field"/>
+                    <group colspan="4" col="4">
+	                    <field name="comment_field"/>
+	                    <field name="column_id"/>
+	                </group>
                 </form>
             </field>
         </record>
@@ -953,6 +962,7 @@
                     <field name="answer_id"/>
                     <field name="answer" />
                     <field name="value_choice" />
+                    <field name="column_id"/>
                     <field name="comment_field"/>
                 </tree>
             </field>