[MERGE]merged with trunk-survey-layout-tta

bzr revid: vba@tinyerp.com-20120709130113-3lchipgil9oqpglg

14 files changed, 137 insertions, 85 deletions

diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 8e54351e296..837645b1260 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -53,6 +53,7 @@ Partners are also sent mails with user name and password for the invitation of t
         'test/survey_question_type.yml',
         'test/survey_report.yml',
     ],
+    'css': ['static/src/css/survey.css'],
     'installable': True,
     'auto_install': False,
     'certificate' : '001131639736864143245',
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index 6242a328e26..28ea57f11f6 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -996,7 +996,7 @@ msgstr ""
 
 #. module: survey
 #: field:survey,send_response:0
-msgid "E-mail Notification on Answer"
+msgid "Email Notification on Answer"
 msgstr ""
 
 #. module: survey
@@ -1211,7 +1211,7 @@ msgstr ""
 
 #. module: survey
 #: field:survey.request,email:0
-msgid "E-mail"
+msgid "Email"
 msgstr ""
 
 #. module: survey
diff --git a/addons/survey/static/css/survey.css b/addons/survey/static/css/survey.css
index 72cd1d6e106..812bbe32fa4 100644
--- a/addons/survey/static/css/survey.css
+++ b/addons/survey/static/css/survey.css
@@ -7,6 +7,7 @@
 
 .oe_survey_title_height{
     height: 33px;
+    border-top: 1px #EBEBEB solid;
 }
 
 .oe_survey_title_page {
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index cc65a2ec2e5..40f13b226f8 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -66,7 +66,7 @@ class survey(osv.osv):
         'note': fields.text('Description', size=128),
         'history': fields.one2many('survey.history', 'survey_id', 'History Lines', readonly=True),
         'users': fields.many2many('res.users', 'survey_users_rel', 'sid', 'uid', 'Users'),
-        'send_response': fields.boolean('E-mail Notification on Answer'),
+        'send_response': fields.boolean('Email Notification on Answer'),
         'type': fields.many2one('survey.type', 'Type'),
         'invited_user_ids': fields.many2many('res.users', 'survey_invited_user_rel', 'sid', 'uid', 'Invited User'),
     }
@@ -142,6 +142,17 @@ class survey(osv.osv):
                 'nodestroy':True,
             }
         return report
+    
+    def fill_survey(self, cr, uid, ids, context=None):
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': {'survey_id': ids[0]}
+        }
+
 survey()
 
 class survey_history(osv.osv):
@@ -699,7 +710,7 @@ class survey_request(osv.osv):
     _columns = {
         'date_deadline': fields.date("Deadline date"),
         'user_id': fields.many2one("res.users", "User"),
-        'email': fields.char("E-mail", size=64),
+        'email': fields.char("Email", size=64),
         'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response': fields.many2one('survey.response', 'Answer'),
         'state': fields.selection([('draft','Draft'),('cancel', 'Cancelled'),('waiting_answer', 'Waiting Answer'),('done', 'Done')], 'Status', readonly=1)
diff --git a/addons/survey/survey_report.xml b/addons/survey/survey_report.xml
index ebb52ce285c..647be4c26c5 100644
--- a/addons/survey/survey_report.xml
+++ b/addons/survey/survey_report.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" ?>
 <openerp>
-	<data>
+    <data>
 
-		<report auto="False"
-				id="report_survey_form"
-				model="survey"
-				name="survey.form"
-				string="Survey"/>
+        <report auto="False"
+                id="report_survey_form"
+                model="survey"
+                name="survey.form"
+                string="Survey"/>
 
-		<report auto="True"
-				id="survey_analysis"
-				model="survey"
-				name="survey.analysis"
-				rml=""
-				string="Survey Statistics"/>
+        <report auto="True"
+                id="survey_analysis"
+                model="survey"
+                name="survey.analysis"
+                rml=""
+                string="Survey Statistics"/>
 
-		<report auto="True"
-				id="survey_browse_response"
-				model="survey"
-				name="survey.browse.response"
-				rml=""
-				string="Survey Answers"/>
-	</data>
+        <report auto="True"
+                id="survey_browse_response"
+                model="survey"
+                name="survey.browse.response"
+                rml=""
+                string="Survey Answers"/>
+    </data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2124042de84..7135d838d3a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -21,7 +21,7 @@
                 <form string="Survey" version="7.0">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
-                    <button name="survey_close" string="Close" states="open" type="object"/>
+                    <button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
                     <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
                             string="Test Survey" icon="gtk-new" type="action"
@@ -35,22 +35,22 @@
                 </header>
                 <sheet>
                     <group col="6" colspan="6">
-                    <field name="title" select="1"/>
+                    <field name="title"/>
                         <field name="responsible_id"/>
                         <field name="id" invisible="1"/>
                     </group>
                     <notebook>
                         <page string="Survey">
-                            <field name="page_ids" colspan="4" nolabel="1" mode="form,tree">
+                            <field name="page_ids" colspan="4" nolabel="1" mode="tree">
                                 <form string="Survey Page">
-                                    <field name="title" select="1"/>
+                                    <field name="title"/>
                                     <field name="sequence" groups="base.group_no_one"/>
                                     <separator string="Description" colspan="4"/>
                                     <field name="note" colspan="4" nolabel="1"/>
                                     <field name="question_ids" height="200" width="200" colspan="4" nolabel="1">
                                         <form string="Survey Question" >
                                             <group col="6" colspan="6" height="600" width="200">
-                                            <field name="question" colspan="4" select="1"/>
+                                            <field name="question" colspan="4"/>
                                             <field name="sequence"/>
                                             <field name="tot_resp"/>
                                             <field name="type" on_change="on_change_type(type)"/>
@@ -182,7 +182,7 @@
                                         </form>
                                         <tree string="Survey Question">
                                             <field name="sequence" string="Seq"/>
-                                            <field name="question" colspan="4" select="1"/>
+                                            <field name="question" colspan="4"/>
                                             <field name="answer_choice_ids"/>
                                         </tree>
                                     </field>
@@ -205,10 +205,10 @@
                             <field name="invited_user_ids" nolabel="1" readonly="1"/>
                         </page>
                         <page string="History">
-                            <field name="date_open" select="1"/>
+                            <field name="date_open"/>
                             <field name="date_close"/>
-                            <field name="tot_start_survey" select="1"/>
-                            <field name="tot_comp_survey" select="1"/>
+                            <field name="tot_start_survey"/>
+                            <field name="tot_comp_survey"/>
                             <field name="history" colspan="4" nolabel="1">
                                 <tree string="History">
                                     <field name="date"/>
@@ -232,13 +232,12 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="gray:state == 'close'" string="Survey">
-                    <field name="title" select="1"/>
-                    <field name="type" select="1"/>
+                    <field name="title"/>
+                    <field name="type"/>
                     <field name="responsible_id"/>
-                    <field name="date_open" select="1" string="Open Date"/>
+                    <field name="date_open"  string="Open Date"/>
                     <field name="tot_start_survey" string="Started"/>
                     <field name="tot_comp_survey" string="Completed"/>
-                    <field name="state" select="1"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}"/>
                     <button name="%(action_view_survey_question_message)d" states="open,draft"
                         string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
@@ -246,6 +245,7 @@
                         string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
                     <button name="action_print_survey" states="open,draft,close,cancel"
                         string="Print Answer" type="object" icon="gtk-print"/>
+                    <field name="state" select="1"/>
                 </tree>
             </field>
         </record>
@@ -276,13 +276,53 @@
                </search>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_survey_kanban">
+            <field name="name">event.survey.kanban</field>
+            <field name="model">survey</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="title"/>
+                    <field name="date_open"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                          <div class="oe_module_survey">
+                            <a class="oe_module_icon">
+                               <div class="oe_survey_title"><t t-esc="record.title.raw_value.toString()"/></div><br/>
+                               <div class="oe_survey_responsible">
+                                   <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
+                               </div><br/>
+                               <div class="oe_survey_start_date">
+                                  Open From:
+                                   <t t-if="record.date_open.raw_value">
+                                       <t t-esc="record.date_open.raw_value.getDate()"/>
+                                       <t t-esc="record.date_open.raw_value.toString('MMM')"/>, 
+                                       <t t-esc="record.date_open.raw_value.getFullYear()"/>
+                                   </t>
+                               </div><br/>
+                               <div class="oe_survey_rate">
+                                   Rate:
+    							<div class="oe_survey_fill" >
+                                   <button type="object" name="fill_survey" class="">
+                                       <span>Fill</span>
+                                   </button>
+                               </div>                                   
+                               </div>
+                            </a>
+                          </div>  
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
         <record model="ir.actions.act_window" id="action_survey_form1">
             <field name="name">Surveys</field>
             <field name="res_model">survey</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="survey_tree"></field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="view_id" ref="view_survey_kanban"></field>
             <field name="search_view_id" ref="survey_search"/>
             <field name="help">You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface.</field>
         </record>
@@ -303,14 +343,14 @@
             <field name="arch" type="xml">
                 <form string="Survey Page" version="7.0">
                     <sheet>
-                        <field name="title" colspan="4" select="1"/>
-                        <field name="survey_id" select="1"/>
+                        <field name="title" colspan="4"/>
+                        <field name="survey_id"/>
                         <field name="sequence"/>
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
                         <field name="question_ids" colspan="4" nolabel="1">
                         <form string="Survey Question">
-                            <field name="question" colspan="4" select="1"/>
+                            <field name="question" colspan="4"/>
                             <field name="sequence"/>
                             <field name="tot_resp"/>
                             <field name="type" on_change="on_change_type(type)"/>
@@ -442,7 +482,7 @@
                         </form>
                         <tree string="Survey Question">
                             <field name="sequence" string="Seq"/>
-                            <field name="question" colspan="4" select="1"/>
+                            <field name="question" colspan="4"/>
                             <field name="answer_choice_ids"/>
                         </tree>
                         </field>
@@ -502,7 +542,7 @@
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <form string="Survey Pages">
-                    <field name="title" colspan="4" select="1"/>
+                    <field name="title" colspan="4"/>
                     <field name="sequence"/>
                     <separator string="Description" colspan="4"/>
                     <field name="note" colspan="4" nolabel="1"/>
@@ -853,7 +893,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
-                    <field name="answer" colspan="4" select="1"/>
+                    <field name="answer" colspan="4"/>
                     <field name="sequence"/>
                     <field name="in_visible_answer_type" invisible="1"/>
                        <group colspan="4" attrs="{'invisible':[('in_visible_answer_type','=',True)]}">
@@ -875,7 +915,7 @@
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Survey Answer">
                     <field name="sequence" string="Seq"/>
-                    <field name="answer" select="1"/>
+                    <field name="answer"/>
                     <field name="type"/>
                 </tree>
             </field>
@@ -892,7 +932,7 @@
             <field name="arch" type="xml">
                 <form string="Survey Answer">
                     <field name="question_id"/>
-                    <field name="date_create" select="1"/>
+                    <field name="date_create"/>
                     <notebook colspan="4">
                         <page string="Answer">
                             <field name="response_answer_ids" colspan="4" nolabel="1"/>
@@ -934,7 +974,7 @@
                 <tree string="Survey Answer Line">
                     <field name="page_id"/>
                     <field name="question_id"/>
-                    <field name="date_create" select="1"/>
+                    <field name="date_create"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -950,12 +990,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Answer">
-                    <field name="survey_id" select="1"/>
-                    <field name="date_create" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="response_type" select="1"/>
+                    <field name="survey_id"/>
+                    <field name="date_create"/>
+                    <field name="user_id"/>
+                    <field name="response_type"/>
                     <field name="question_ids" nolabel="1" colspan="4" />
-                    <field name="state" select="1"/>
+                    <field name="state"/>
                 </form>
             </field>
         </record>
@@ -966,11 +1006,11 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Answer">
-                    <field name="survey_id" select="1"/>
-                    <field name="date_create" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="response_type" select="1"/>
-                    <field name="state" select="1"/>
+                    <field name="survey_id"/>
+                    <field name="date_create"/>
+                    <field name="user_id"/>
+                    <field name="response_type"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -1062,12 +1102,12 @@
                 <form version="7.0">
                 <header>
                     <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_highlight"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_highlight"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>
-                <sheet string="Survey Request" layout="auto">
+                <sheet string="Survey Request">
                     <group class="oe_header">
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
@@ -1146,8 +1186,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Survey Type">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
                 </form>
             </field>
         </record>
@@ -1158,8 +1198,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Survey Type">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                    <field name="name"/>
+                    <field name="code"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 8e9710f929a..40ebbd1fdf3 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -150,8 +150,6 @@ class survey_question_wiz(osv.osv_memory):
                     xml_header = etree.SubElement(xml_form, 'header', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
                     xml_header_title = etree.SubElement(xml_header, 'group', {'col': '6', 'colspan': '6'})
 
-                    #############  PAGE HEADER : START ###################
-
                     etree.SubElement(xml_header_title, 'label', {'string': tools.ustr(pag_rec.title) ,'colspan': '2' ,'class' : 'oe_survey_title'})
                     xml_header_group = etree.SubElement(xml_header_title, 'group', {'col': '4', 'colspan': '1'})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '8', 'colspan': '4'})
@@ -172,8 +170,6 @@ class survey_question_wiz(osv.osv_memory):
                         etree.SubElement(xml_header_group, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_right"})
                     etree.SubElement(xml_header_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_right oe_survey_title_page"})
 
-                    #############  PAGE HEADER : END ###################
-
                     if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
                         etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
                         context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
@@ -198,7 +194,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
-                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0), 'modifiers':'{"invisible":true}'})
+                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'})
 
                     if pag_rec.note:
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index a2069cfdb9a..29cdd4ad5fb 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -13,8 +13,9 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <separator colspan="4"  string =  "Select Survey and Related Answer"/>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index bbafb79ab61..7ea5f491e13 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -11,8 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Survey Print" version="7.0">
                     <header>
-                        <button colspan="1" icon="gtk-print" name="action_next" string="Print" type="object"/>
-                        <button colspan="1" icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <separator string="Survey" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 265c56ee1c6..5218067e9ef 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -11,8 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Print Answer" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <separator string="Answer" colspan="4"/>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index e2c064c6a14..3ea6bc4b487 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -11,8 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Survey Print Statistics" version="7.0">
                     <header>
-                        <button icon="gtk-print" name="action_next" string="Print" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button name="action_next" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <field name="survey_ids"/>
                 </form>
diff --git a/addons/survey/wizard/survey_selection.xml b/addons/survey/wizard/survey_selection.xml
index 940ac7833b2..7dc736d3008 100644
--- a/addons/survey/wizard/survey_selection.xml
+++ b/addons/survey/wizard/survey_selection.xml
@@ -12,8 +12,9 @@
             <field name="arch" type="xml">
                 <form string="Survey" version="7.0">
                     <header>
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_next" string="Start" type="object"/>
+                        <button name="action_next" string="Start" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group string="Select Survey">
                         <field name="survey_id" on_change="on_change_survey(survey_id)"/>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index ad055c70c19..3df1f2af713 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -191,7 +191,7 @@ class survey_send_invitation(osv.osv_memory):
         if skipped:
             note += "%d contacts where ignored (an email address is missing).\n\n" % (skipped)
         if error:
-            note += 'E-Mail not send successfully:\n====================\n%s\n' % (error)
+            note += 'Email not send successfully:\n====================\n%s\n' % (error)
         context.update({'note' : note})
         return {
             'view_type': 'form',
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 12c4df8bd69..5c8a2e93fa7 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -11,8 +11,9 @@
             <field name="arch" type="xml">
                 <form string="Send Invitation" version="7.0">
                     <header>
-                        <button icon="gtk-go-forward" name="action_send" string="_Send" type="object"/>
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
+                        <button name="action_send" string="_Send" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
@@ -55,9 +56,6 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="User creation" version="7.0">
-                    <header>
-                        <button icon="gtk-ok" special="cancel" string="_Ok"/>
-                    </header>
                     <group string="Results :">
                         <field name="note"/>
                     </group>