[MERGE]:lp:~openerp-dev/openobject-addons/trunk-survey-topbar-tpa

bzr revid: apa@tinyerp.com-20120427121338-z8fger97ep0ftgul

diff --cc addons/survey/survey.py
index 0101cef,0101cef..c95cc59
--- 1/addons/survey/survey.py
--- 2/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@@ -59,7 -59,7 +59,7 @@@ class survey(osv.osv)
                       help="Set to one if survey is answerable only once"),
          'response_user': fields.integer('Maximum Answer per User',
                       help="Set to one if  you require only one Answer per user"),
--        'state': fields.selection([('open', 'Open'), ('close', 'Closed'), ('cancel', 'Cancelled')], 'Status', readonly=True),
++        'state': fields.selection([('open', 'Open'), ('cancel', 'Cancelled'),('close', 'Closed') ], 'Status', readonly=True),
          'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
          'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
          'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),