diff --git a/addons/hr_evaluation/survey_data_appraisal.xml b/addons/hr_evaluation/survey_data_appraisal.xml index c06708cef4e..f46a43b7c06 100644 --- a/addons/hr_evaluation/survey_data_appraisal.xml +++ b/addons/hr_evaluation/survey_data_appraisal.xml @@ -5,6 +5,7 @@ Employee Appraisal Form open + hr_evaluation @@ -323,6 +324,7 @@ over the coming year.</p> Employee Opinion Form open + hr_evaluation diff --git a/addons/hr_recruitment/survey_data_recruitment.xml b/addons/hr_recruitment/survey_data_recruitment.xml index d4939673bb2..607b3ea206e 100644 --- a/addons/hr_recruitment/survey_data_recruitment.xml +++ b/addons/hr_recruitment/survey_data_recruitment.xml @@ -5,6 +5,7 @@ Recruitment Form open + hr_recruitment diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py index c3833d38a6c..3df5ced523d 100644 --- a/addons/survey/__openerp__.py +++ b/addons/survey/__openerp__.py @@ -44,6 +44,7 @@ sent mails with personal token for the invitation of the survey. 'views/survey_templates.xml', 'views/survey_result.xml', 'wizard/survey_email_compose_message.xml', + 'data/survey_stages.xml', 'data/survey_cron.xml' ], 'demo': ['data/survey_demo_user.xml', diff --git a/addons/survey/data/survey_demo_feedback.xml b/addons/survey/data/survey_demo_feedback.xml index 9ee6a63f9f2..314679ba30d 100644 --- a/addons/survey/data/survey_demo_feedback.xml +++ b/addons/survey/data/survey_demo_feedback.xml @@ -5,6 +5,7 @@ User Feedback Form open + diff --git a/addons/survey/data/survey_stages.xml b/addons/survey/data/survey_stages.xml new file mode 100644 index 00000000000..c6ce63bc3af --- /dev/null +++ b/addons/survey/data/survey_stages.xml @@ -0,0 +1,30 @@ + + + + + + Draft + + + + + + In progress + + + + + + Closed + + + + + + Permanent + + + + + + diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 9d84719b17f..8008e990fb1 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -351,11 +351,12 @@ class survey_stage(osv.Model): _columns = { 'name': fields.text(string="Name", required=True, translate=True), 'sequence': fields.integer(string="Sequence"), - 'open': fields.boolean(string="Display these surveys?") + 'survey_open': fields.boolean(string="Display these surveys?"), + 'folded': fields.boolean(string="Folded column by default") } _defaults = { 'sequence': 1, - 'open': True + 'survey_open': True } _sql_constraints = [ ('positive_sequence', 'CHECK(sequence >= 0)', 'Sequence number MUST be a natural')