[MERGE] with trunk-survey2-rim addons branch

bzr revid: dizzy.zala@gmail.com-20140225053204-mra08nfvumkxyixa

7 files changed, 22 insertions, 561 deletions

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 25cafe4faf9..f246a92d707 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -47,9 +47,9 @@ sent mails with personal token for the invitation of the survey.
         'data/survey_cron.xml'
     ],
     'demo': ['data/survey_demo_user.xml',
-             'data/survey_demo_recruitment.xml',
              'data/survey_demo_feedback.xml',
-             'data/survey_demo_appraisal.xml'],
+             'data/survey.user_input.csv',
+             'data/survey.user_input_line.csv'],
     'installable': True,
     'auto_install': False,
     'application': True,
diff --git a/addons/survey/data/survey.user_input.csv b/addons/survey/data/survey.user_input.csv
new file mode 100644
index 00000000000..e6ee973035f
--- /dev/null
+++ b/addons/survey/data/survey.user_input.csv
@@ -0,0 +1,6 @@
+id,survey_id:id,state
+ui1,feedback_form,done
+ui2,feedback_form,done
+ui3,feedback_form,done
+ui4,feedback_form,skip
+ui5,feedback_form,skip
diff --git a/addons/survey/data/survey.user_input_line.csv b/addons/survey/data/survey.user_input_line.csv
new file mode 100644
index 00000000000..7900ca34c0b
--- /dev/null
+++ b/addons/survey/data/survey.user_input_line.csv
@@ -0,0 +1 @@
+id,user_input_id:id,question_id:id,skipped,answer_type,value_text,value_number,value_date,value_free_text,value_suggested,value_suggested_row
diff --git a/addons/survey/data/survey_demo_appraisal.xml b/addons/survey/data/survey_demo_appraisal.xml
deleted file mode 100644
index 063c70bab66..00000000000
--- a/addons/survey/data/survey_demo_appraisal.xml
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Appraisal form -->
-        <record model="survey.survey" id="appraisal_form">
-            <field name="title">Employee Appraisal Form</field>
-            <field name="state">open</field>
-            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')" />
-            <field name="visible_to_user" eval="False"/>
-            <field name="auth_required" eval="True" />
-            <field name="users_can_go_back" eval="True" />
-            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
-            <field name="thank_you_message">&lt;p&gt; &lt;/p&gt;</field>
-        </record>
-        <!-- Page 1 -->
-        <record model="survey.page" id="appraisal_1">
-            <field name="title">Employee Appraisal Form</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="sequence">1</field>
-            <field name="description">&lt;h2&gt;Overall Purpose Of Employee Appraisal&lt;/h2&gt;
-&lt;ul&gt;&lt;li&gt;To initiate a clear and open communication of performance expectations
-&lt;li&gt;To assist employees in their professional growth, through the identification of strengths and opportunities for
-development&lt;/ul&gt;
-&lt;h2&gt;At the outset of the appraisal time period&lt;/h2&gt;
-&lt;ul&gt;&lt;li&gt;It is the joint responsibility of the employee and the supervisor (appraiser) to establish a feasible work plan for the
-coming year, including major employee responsibilities and corresponding benchmarks against which results will be
-evaluated.
-&lt;li&gt;Critical or key elements of performance and professional development needs (if any), should also be noted at this time&lt;/ul&gt;
-&lt;h2&gt;At the conclusion of the appraisal time period&lt;/h2&gt;
-&lt;ul&gt;&lt;li&gt;The employee will be responsible for completing a draft of the Appraisal Form as a tool for self-appraisal and a starting
-point for the supervisor’s evaluation. The employee can add examples of achievements for each criterion.
-Once the form had been filled, the employee send it to his supervisor.
-&lt;li&gt;It is the primary responsibility of the supervisor to gather the necessary input from the appropriate sources of feedback
-(internal and/or external customers, peers). In case of collaboration with OpenERP SA Belgium, the supervisor must
-receive completed evaluation form from the employee's Belgian project manager.
-&lt;li&gt;The supervisor synthesizes and integrates all input into the completed appraisal. He motivates his evaluation in the ad
-hoc fields.
-&lt;li&gt;The employee may choose to offer comments or explanation regarding the completed review.
-&lt;li&gt;The supervisor send the form to the HR department in India and in Belgium&lt;/ul&gt;</field>
-        </record>
-        <record model="survey.question" id="appraisal_1_1">
-            <field name="page_id" ref="appraisal_1" />
-            <field name="sequence">1</field>
-            <field name="question">Name</field>
-            <field name="type">textbox</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_1_2">
-            <field name="page_id" ref="appraisal_1" />
-            <field name="sequence">2</field>
-            <field name="question">Position Title</field>
-            <field name="type">textbox</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_1_3">
-            <field name="page_id" ref="appraisal_1" />
-            <field name="sequence">3</field>
-            <field name="question">Appraisal for Period</field>
-            <field name="type">textbox</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_1_4">
-            <field name="page_id" ref="appraisal_1" />
-            <field name="sequence">4</field>
-            <field name="question">Date of review</field>
-            <field name="type">textbox</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_1_5">
-            <field name="page_id" ref="appraisal_1" />
-            <field name="sequence">5</field>
-            <field name="question">Appraiser</field>
-            <field name="type">textbox</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <!-- Page 2 -->
-        <record model="survey.page" id="appraisal_2">
-            <field name="title">Work Plan</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="sequence">2</field>
-            <field name="description">&lt;p&gt; &lt;/p&gt;</field>
-        </record>
-        <record model="survey.question" id="appraisal_2_1">
-            <field name="page_id" ref="appraisal_2" />
-            <field name="sequence">1</field>
-            <field name="question">Objectives</field>
-            <field name="type">free_text</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_2_2">
-            <field name="page_id" ref="appraisal_2" />
-            <field name="sequence">2</field>
-            <field name="question">Results</field>
-            <field name="type">free_text</field>
-            <field name="constr_mandatory" eval="True" />
-        </record>
-        <record model="survey.question" id="appraisal_2_3">
-            <field name="page_id" ref="appraisal_2" />
-            <field name="sequence">3</field>
-            <field name="question">Additional Comments</field>
-            <field name="type">free_text</field>
-        </record>
-        <!-- Page 3 -->
-        <record model="survey.page" id="appraisal_3">
-            <field name="title">Employee Performance in Key Areas</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="sequence">3</field>
-            <field name="description">The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided
-below:&lt;ol&gt;
-&lt;li&gt; Significantly exceeds standards and expectations required of the position
-&lt;li&gt; Exceeds standards and expectations
-&lt;li&gt; Meet standards and expectations
-&lt;li&gt; Did not meet standards and expectations
-&lt;li&gt; Significantly below standards and expectations&lt;/ol&gt;</field>
-        </record>
-        <record model="survey.question" id="appraisal_3_1">
-            <field name="page_id" ref="appraisal_3" />
-            <field name="sequence">1</field>
-            <field name="question">Subject</field>
-            <field name="type">matrix</field>
-            <field name="matrix_subtype">simple</field>
-            <field name="constr_mandatory" eval="True" />
-            <field name="constr_type">all</field>
-        </record>
-                <record model="survey.label" id="acol_3_1_1">
-                    <field name="question_id" ref="appraisal_3_1"/>
-                    <field name="sequence">1</field>
-                    <field name="value">1</field>
-                </record>
-                <record model="survey.label" id="acol_3_1_2">
-                    <field name="question_id" ref="appraisal_3_1"/>
-                    <field name="sequence">2</field>
-                    <field name="value">2</field>
-                </record>
-                <record model="survey.label" id="acol_3_1_3">
-                    <field name="question_id" ref="appraisal_3_1"/>
-                    <field name="sequence">3</field>
-                    <field name="value">3</field>
-                </record>
-                <record model="survey.label" id="acol_3_1_4">
-                    <field name="question_id" ref="appraisal_3_1"/>
-                    <field name="sequence">4</field>
-                    <field name="value">4</field>
-                </record>
-                <record model="survey.label" id="acol_3_1_5">
-                    <field name="question_id" ref="appraisal_3_1"/>
-                    <field name="sequence">5</field>
-                    <field name="value">5</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_1">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">1</field>
-                    <field name="value">Ability to cope with multidisciplinarity of team</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_2">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">2</field>
-                    <field name="value">Enthusiasm &amp; implication toward projects/assignments</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_3">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">3</field>
-                    <field name="value">Compliance to internal rules and processes (timesheets completion, etc.)</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_4">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">4</field>
-                    <field name="value">Team spirit: ability to work efficiently with peers, manage the conflicts with diplomacy</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_5">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">5</field>
-                    <field name="value">Initiative and self autonomy</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_6">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">6</field>
-                    <field name="value">Ability to follow and complete work as instructed</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_7">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">7</field>
-                    <field name="value">Decision making</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_8">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">8</field>
-                    <field name="value">Customer commitment</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_9">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">9</field>
-                    <field name="value">Communication skills (written &amp; verbally): clearness, concision, exactitude</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_10">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">10</field>
-                    <field name="value">Technical skills regarding to the job requirements</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_11">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">11</field>
-                    <field name="value">Analytical and synthetic mind</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_12">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">12</field>
-                    <field name="value">Promptness and attendance record</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_13">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">13</field>
-                    <field name="value">Adaptability: Ability to adapt oneself to organizational changes while keeping efficiency</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_14">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">14</field>
-                    <field name="value">Creativity and forward looking aptitude</field>
-                </record>
-                <record model="survey.label" id="arow_3_1_15">
-                    <field name="question_id_2" ref="appraisal_3_1"/>
-                    <field name="sequence">15</field>
-                    <field name="value">Time management: projects/tasks are completed on time</field>
-                </record>
-        <record model="survey.question" id="appraisal_3_2">
-            <field name="page_id" ref="appraisal_3" />
-            <field name="sequence">2</field>
-            <field name="question">Supervisors only</field>
-            <field name="type">matrix</field>
-            <field name="matrix_subtype">simple</field>
-        </record>
-                <record model="survey.label" id="acol_3_2_1">
-                    <field name="question_id" ref="appraisal_3_2"/>
-                    <field name="sequence">1</field>
-                    <field name="value">1</field>
-                </record>
-                <record model="survey.label" id="acol_3_2_2">
-                    <field name="question_id" ref="appraisal_3_2"/>
-                    <field name="sequence">2</field>
-                    <field name="value">2</field>
-                </record>
-                <record model="survey.label" id="acol_3_2_3">
-                    <field name="question_id" ref="appraisal_3_2"/>
-                    <field name="sequence">3</field>
-                    <field name="value">3</field>
-                </record>
-                <record model="survey.label" id="acol_3_2_4">
-                    <field name="question_id" ref="appraisal_3_2"/>
-                    <field name="sequence">4</field>
-                    <field name="value">4</field>
-                </record>
-                <record model="survey.label" id="acol_3_2_5">
-                    <field name="question_id" ref="appraisal_3_2"/>
-                    <field name="sequence">5</field>
-                    <field name="value">5</field>
-                </record>
-                <record model="survey.label" id="arow_3_2_1">
-                    <field name="question_id_2" ref="appraisal_3_2"/>
-                    <field name="sequence">1</field>
-                    <field name="value">Results of the bottom-up survey and mitigation actions to face technical, organizational, structural and/or relational issues</field>
-                </record>
-                <record model="survey.label" id="arow_3_2_2">
-                    <field name="question_id_2" ref="appraisal_3_2"/>
-                    <field name="sequence">2</field>
-                    <field name="value">Delegation: Ability to efficiently assign tasks to other people</field>
-                </record>
-                <record model="survey.label" id="arow_3_2_3">
-                    <field name="question_id_2" ref="appraisal_3_2"/>
-                    <field name="sequence">3</field>
-                    <field name="value">Leadership: create a challenging and motivating work environment aligned with the company's strategy</field>
-                </record>
-                <record model="survey.label" id="arow_3_2_4">
-                    <field name="question_id_2" ref="appraisal_3_2"/>
-                    <field name="sequence">4</field>
-                    <field name="value">Leadership: sustain subordinates in their professional growth</field>
-                </record>
-                <record model="survey.label" id="arow_3_2_5">
-                    <field name="question_id_2" ref="appraisal_3_2"/>
-                    <field name="sequence">5</field>
-                    <field name="value">Ability to manage planning resources, risks, budgets and deadlines</field>
-                </record>
-        <!-- Page 4 -->
-        <record model="survey.page" id="appraisal_4">
-            <field name="title">Professional Development and Performance Plan</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="sequence">4</field>
-            <field name="description">&lt;p&gt;Identify professional, performance, or project objectives you recommend for employee’s continued career development
-over the coming year.&lt;/p&gt;</field>
-        </record>
-        <record model="survey.question" id="appraisal_4_1">
-            <field name="page_id" ref="appraisal_4" />
-            <field name="sequence">1</field>
-            <field name="question">Professional Development Objectives</field>
-            <field name="type">free_text</field>
-        </record>
-        <record model="survey.question" id="appraisal_4_2">
-            <field name="page_id" ref="appraisal_4" />
-            <field name="sequence">2</field>
-            <field name="question">Personal Performance Objectives</field>
-            <field name="type">free_text</field>
-        </record>
-        <record model="survey.question" id="appraisal_4_3">
-            <field name="page_id" ref="appraisal_4" />
-            <field name="sequence">3</field>
-            <field name="question">Project Objectives</field>
-            <field name="type">free_text</field>
-        </record>
-        <!-- Page 5 -->
-        <record model="survey.page" id="appraisal_5">
-            <field name="title">Employee Comments</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-            <field name="sequence">5</field>
-        </record>
-        <record model="survey.question" id="appraisal_5_1">
-            <field name="page_id" ref="appraisal_5" />
-            <field name="sequence">1</field>
-            <field name="question">Use the following space to make any comments regarding the above performance evaluation.</field>
-            <field name="type">free_text</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/survey/data/survey_demo_recruitment.xml b/addons/survey/data/survey_demo_recruitment.xml
deleted file mode 100644
index 5bd765e56f7..00000000000
--- a/addons/survey/data/survey_demo_recruitment.xml
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Recruitment Form -->
-        <record model="survey.survey" id="recruitment_form">
-            <field name="title">Recruitment Form</field>
-            <field name="state">open</field>
-            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')" />
-            <field name="visible_to_user" eval="False"/>
-            <field name="auth_required" eval="True" />
-            <field name="users_can_go_back" eval="False" />
-            <field name="description">&lt;p&gt;This form is intended to help the responsible of a recruitment interview.&lt;/p&gt;</field>
-            <field name="thank_you_message">&lt;p&gt;&lt;/p&gt;</field>
-        </record>
-        <!-- Page 1 -->
-        <record model="survey.page" id="recruitment_1">
-            <field name="title">Basic information</field>
-            <field name="survey_id" ref="recruitment_form" />
-            <field name="sequence">1</field>
-            <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-        </record>
-        <record model="survey.question" id="recruitment_1_1">
-            <field name="page_id" ref="recruitment_1" />
-            <field name="sequence">1</field>
-            <field name="question">From which university will you graduate?</field>
-            <field name="type">textbox</field>
-        </record>
-        <record model="survey.question" id="recruitment_1_2">
-            <field name="page_id" ref="recruitment_1" />
-            <field name="sequence">2</field>
-            <field name="question">What is your gender?</field>
-            <field name="type">simple_choice</field>
-            <field name="display_mode">dropdown</field>
-        </record>
-                <record model="survey.label" id="recruitment_1_2_1">
-                    <field name="question_id" ref="recruitment_1_2"/>
-                    <field name="sequence">1</field>
-                    <field name="value">Male</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_2_2">
-                    <field name="question_id" ref="recruitment_1_2"/>
-                    <field name="sequence">2</field>
-                    <field name="value">Female</field>
-                </record>
-        <record model="survey.question" id="recruitment_1_3">
-            <field name="page_id" ref="recruitment_1" />
-            <field name="sequence">3</field>
-            <field name="question">What age group do you belong to?</field>
-            <field name="type">simple_choice</field>
-            <field name="display_mode">columns</field>
-            <field name="column_nb">4</field>
-        </record>
-                <record model="survey.label" id="recruitment_1_3_1">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">1</field>
-                    <field name="value">0-15</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_2">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">2</field>
-                    <field name="value">16-20</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_3">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">3</field>
-                    <field name="value">21-30</field>
-                </record>
-
-                <record model="survey.label" id="recruitment_1_3_4">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">4</field>
-                    <field name="value">31-40</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_5">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">5</field>
-                    <field name="value">41-50</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_6">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">6</field>
-                    <field name="value">51-60</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_7">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">7</field>
-                    <field name="value">61-70</field>
-                </record>
-                <record model="survey.label" id="recruitment_1_3_8">
-                    <field name="question_id" ref="recruitment_1_3"/>
-                    <field name="sequence">8</field>
-                    <field name="value">71+</field>
-                </record>
-        <!-- Page 2 -->
-        <record model="survey.page" id="recruitment_2">
-            <field name="title">Education and Activities</field>
-            <field name="survey_id" ref="recruitment_form" />
-            <field name="sequence">2</field>
-            <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-        </record>
-        <record model="survey.question" id="recruitment_2_1">
-            <field name="page_id" ref="recruitment_2" />
-            <field name="sequence">1</field>
-            <field name="question">Knowledge</field>
-            <field name="type">free_text</field>
-        </record>
-        <record model="survey.question" id="recruitment_2_2">
-            <field name="page_id" ref="recruitment_2" />
-            <field name="sequence">2</field>
-            <field name="question">Education</field>
-            <field name="type">free_text</field>
-        </record>
-        <record model="survey.question" id="recruitment_2_3">
-            <field name="page_id" ref="recruitment_2" />
-            <field name="sequence">3</field>
-            <field name="question">Experience</field>
-            <field name="type">free_text</field>
-        </record>
-        <record model="survey.question" id="recruitment_2_4">
-            <field name="page_id" ref="recruitment_2" />
-            <field name="sequence">4</field>
-            <field name="question">Activities</field>
-            <field name="type">free_text</field>
-        </record>
-        <!-- Page 3 -->
-        <record model="survey.page" id="recruitment_3">
-            <field name="title">Importance</field>
-            <field name="survey_id" ref="recruitment_form" />
-            <field name="sequence">3</field>
-            <field name="description">&lt;p&gt;&lt;/p&gt;</field>
-        </record>
-        <record model="survey.question" id="recruitment_3_1">
-            <field name="page_id" ref="recruitment_3" />
-            <field name="sequence">1</field>
-            <field name="question">Rate the Importance</field>
-            <field name="type">matrix</field>
-            <field name="matrix_subtype">simple</field>
-        </record>
-                <record model="survey.label" id="rcol_3_1_1">
-                    <field name="question_id" ref="recruitment_3_1"/>
-                    <field name="sequence">1</field>
-                    <field name="value">Not important</field>
-                </record>
-                <record model="survey.label" id="rcol_3_1_2">
-                    <field name="question_id" ref="recruitment_3_1"/>
-                    <field name="sequence">2</field>
-                    <field name="value">Somewhat important</field>
-                </record>
-                <record model="survey.label" id="rcol_3_1_3">
-                    <field name="question_id" ref="recruitment_3_1"/>
-                    <field name="sequence">3</field>
-                    <field name="value">Important</field>
-                </record>
-                <record model="survey.label" id="rcol_3_1_4">
-                    <field name="question_id" ref="recruitment_3_1"/>
-                    <field name="sequence">4</field>
-                    <field name="value">Very important</field>
-                </record>
-                <record model="survey.label" id="rcol_3_1_5">
-                    <field name="question_id" ref="recruitment_3_1"/>
-                    <field name="sequence">5</field>
-                    <field name="value">Most important</field>
-                </record>
-
-                <record model="survey.label" id="rrow_2_1_1">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">1</field>
-                    <field name="value">Good pay</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_2">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">2</field>
-                    <field name="value">Getting on with colleagues</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_3">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">3</field>
-                    <field name="value">Office environment</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_4">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">4</field>
-                    <field name="value">Desk space</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_5">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">5</field>
-                    <field name="value">State of the art technology</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_6">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">6</field>
-                    <field name="value">Office location</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_7">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">7</field>
-                    <field name="value">Good management</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_8">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">8</field>
-                    <field name="value">Freebies such as tea, coffee and stationery</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_9">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">9</field>
-                    <field name="value">Perks such as free parking, gym passes</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_10">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">10</field>
-                    <field name="value">No out of hours working</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_11">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">11</field>
-                    <field name="value">Dress code</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_12">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">12</field>
-                    <field name="value">Regular meetings</field>
-                </record>
-                <record model="survey.label" id="rrow_2_1_13">
-                    <field name="question_id_2" ref="recruitment_3_1"/>
-                    <field name="sequence">13</field>
-                    <field name="value">Good social life</field>
-                </record>
-    </data>
-</openerp>
diff --git a/addons/survey/static/src/js/survey.js b/addons/survey/static/src/js/survey.js
index 3ff47795a56..de70fde7ed9 100644
--- a/addons/survey/static/src/js/survey.js
+++ b/addons/survey/static/src/js/survey.js
@@ -35,7 +35,7 @@ $(document).ready(function () {
     // Printing mode: will disable all the controls in the form
     if (_.isUndefined(submit_controller)) {
         $('.js_surveyform :input').prop('disabled', true);
-        print_mode = true
+        print_mode = true;
     }
 
     // Custom code for right behavior of radio buttons with comments box
@@ -86,7 +86,7 @@ $(document).ready(function () {
                 console.warn("[survey] Unable to load prefill data");
             });
         return prefill_def;
-    };
+    }
 
     // Parameters for form submission
     $('.js_surveyform').ajaxForm({
@@ -129,7 +129,7 @@ $(document).ready(function () {
         // Activate the print dialog if needed
         if (print_mode){
             window.print();
-        };
+        }
     });
 
     console.debug("[survey] Custom JS for survey loaded!");
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 27e0b2eb7df..7aa012acb67 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -252,11 +252,14 @@ class survey_survey(osv.Model):
 
     def action_start_survey(self, cr, uid, ids, context=None):
         ''' Open the website page with the survey form '''
+        trail = ""
+        if context and 'survey_token' in context:
+            trail = context['survey_token'] + "/"
         return {
             'type': 'ir.actions.act_url',
             'name': "Start Survey",
             'target': 'self',
-            'url': self.read(cr, uid, ids, ['public_url'], context=context)[0]['public_url']
+            'url': self.read(cr, uid, ids, ['public_url'], context=context)[0]['public_url'] + trail
         }
 
     def action_send_survey(self, cr, uid, ids, context=None):
@@ -298,11 +301,14 @@ class survey_survey(osv.Model):
 
     def action_print_survey(self, cr, uid, ids, context=None):
         ''' Open the website page with the survey printable view '''
+        trail = ""
+        if context and 'survey_token' in context:
+            trail = context['survey_token'] + "/"
         return {
             'type': 'ir.actions.act_url',
             'name': "Print Survey",
             'target': 'self',
-            'url': self.read(cr, uid, ids, ['print_url'], context=context)[0]['print_url']
+            'url': self.read(cr, uid, ids, ['print_url'], context=context)[0]['print_url'] + trail
         }
 
     def action_result_survey(self, cr, uid, ids, context=None):
@@ -700,7 +706,7 @@ class survey_user_input(osv.Model):
     def _quizz_get_score(self, cr, uid, ids, name, args, context=None):
         ret = dict()
         for user_input in self.browse(cr, uid, ids, context=context):
-            ret[user_input.id] = sum([uil.quizz_mark for uil in user_input.user_input_line_ids] or 0.0)
+            ret[user_input.id] = sum([uil.quizz_mark for uil in user_input.user_input_line_ids] or [0.0])
         return ret
 
     _columns = {
@@ -745,6 +751,7 @@ class survey_user_input(osv.Model):
         'type': 'manually',
         'state': 'new',
         'token': lambda s, cr, uid, c: uuid.uuid4().__str__(),
+        'quizz_score': 0.0,
     }
 
     _sql_constraints = [