diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index ea8dd418424..3a123fb6412 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -16,10 +16,14 @@
             <field name="body"><![CDATA[<p>Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels. Evaluations filled by employees may be exported as pdf files.</p>]]></field>
         </record>
 
+        <record model="survey.type" id="survey_type_hr_evaluation">
+            <field name="name">Human Resources</field>
+        </record>
+
         <record id="survey_2" model="survey">
             <field name="title">Self Appraisal</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey.survey_type1"/>
+            <field name="type" ref="survey_type_hr_evaluation"/>
             <field name="responsible_id" ref="base.user_root"/>
             <field name="state">open</field>
             <field name="sign_in">1</field>
@@ -605,7 +609,7 @@ Once the form had been filled, the employee send it to his supervisor.
         <record id="survey_3" model="survey">
             <field name="title">Employee Opinion</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey.survey_type1"/>
+            <field name="type" ref="survey_type_hr_evaluation"/>
             <field name="responsible_id" ref="base.user_root"/>
         </record>
         <record id="survey_page_2" model="survey.page">
diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml
index 20410f5ea38..fe0c42460a0 100644
--- a/addons/survey/survey_data.xml
+++ b/addons/survey/survey_data.xml
@@ -2,12 +2,9 @@
 <openerp>
     <data>
         <record model="survey.type" id="survey_type1">
-            <field name="name">Human Resources</field>
-        </record>
-        <record model="survey.type" id="survey_type2">
             <field name="name">Customer Feeback</field>
         </record>
-        <record model="survey.type" id="survey_type3">
+        <record model="survey.type" id="survey_type2">
             <field name="name">Supplier Selection</field>
         </record>
     </data>
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index d3fc4bdc895..a40866cffa1 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -10,7 +10,7 @@
         <record model="survey" id="survey_Initial_partner_feedback">
             <field name="title">Initial Partner Feedback</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey_type2"/>
+            <field name="type" ref="survey_type1"/>
             <field name="state">open</field>
             <field name="authenticate">0</field>
             <field name="color">5</field>
@@ -157,7 +157,7 @@
         <record model="survey" id="survey_partner_feedback">
             <field name="title">OpenERP Partner Feedback</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey_type2"/>
+            <field name="type" ref="survey_type1"/>
             <field name="state">open</field>
             <field name="authenticate">0</field>
             <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
@@ -621,7 +621,7 @@
         <record model="survey" id="survey_odoo_feedback">
             <field name="title">Odoo Feedback</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey_type2"/>
+            <field name="type" ref="survey_type1"/>
             <field name="state">open</field>
             <field name="authenticate">0</field>
             <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
@@ -1395,7 +1395,7 @@
             <field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
             <field name="color">4</field>
             <field name="max_response_limit">20</field>
-            <field name="type" ref="survey_type2"/>
+            <field name="type" ref="survey_type1"/>
             <field name="state">open</field>
             <field name="authenticate">0</field>
         </record>
@@ -2243,7 +2243,7 @@
             <field name="note">Please take a few minutes to complete this survey on the quality of service we provide. We welcome your feedback and appreciate your honesty. With your help, we hope to strengthen the bond between our clients.</field>
             <field name="state">open</field>
             <field name="authenticate">0</field>
-            <field name="type" ref="survey_type3"/>
+            <field name="type" ref="survey_type2"/>
             <field name="max_response_limit">20</field>
         </record>
     </data>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2e6e5d844cb..2ffeddbeda4 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -8,8 +8,7 @@
 
         <menuitem name="Configuration" id="menu_surveys_configuration" parent="menu_surveys" sequence="3" groups="base.group_tool_manager"/>
         
-        <menuitem name="Reporting" parent="base.menu_tools"
-            id="base.menu_lunch_reporting" sequence="6"/>
+        <menuitem name="Reporting" parent="base.menu_tools" id="base.menu_lunch_reporting" sequence="6"/>
         <menuitem name="Reporting" id="menu_reporting" parent="menu_surveys" sequence="60"/>
         <menuitem id="base.next_id_10" name="Survey" parent="base.menu_reporting" sequence="1" groups="base.group_survey_user"/>
 
@@ -23,7 +22,7 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                 <header>
-                    <button name="survey_draft" string="Draft" states="cancel" type="object"/>
+                    <button name="survey_draft" string="Draft" states="cancel,close" type="object"/>
                     <button name="survey_open" class="oe_highlight" string="Open" states="draft,close" type="object"/>
                     <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
                     <button name="survey_cancel" string="Cancel" states="draft" type="object"/>
@@ -441,7 +440,7 @@
                 <data>
                     <xpath expr="//group[@colspan='4']" position="after">
                         <group colspan="4">
-                            <button name="survey_save"  string="Ok" type="object" icon="gtk-go-forward"/>
+                            <button name="survey_save"  string="Ok" type="object" icon="gtk-go-forward" invisible="not context.get('show_button_ok')"/>
                         </group>
                     </xpath>
                 </data>
@@ -700,7 +699,6 @@
             res_model="survey.question"
             src_model="survey"/>
 
-
         <act_window
             context="{'search_default_page_id': active_id, 'default_page_id': active_id}"
             id="act_survey_page_question"
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index d33a6a3f1ab..84496b51f6b 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -988,9 +988,10 @@ class survey_question_wiz(osv.osv_memory):
         if context is None:
             context = {}
         for key, val in context.items():
-            if type(key) == type(True):
+            if isinstance(key, bool):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question'), ('name', '=', 'survey_question_wizard_test')], context=context)
+        context.update({'show_button_ok': True})
         return {
             'view_type': 'form',
             "view_mode": 'form',
@@ -1078,9 +1079,10 @@ class survey_question_wiz(osv.osv_memory):
         if context is None:
             context = {}
         for key, val in context.items():
-            if type(key) == type(True):
+            if isinstance(key, bool):
                 context.pop(key)
         view_id = self.pool.get('ir.ui.view').search(cr, uid, [('model', '=', 'survey.question'), ('name', '=', 'survey_question_wizard_test')], context=context)
+        context.update({'show_button_ok': True})
         return {
             'view_type': 'form',
             "view_mode": 'form',