[MERGE] addons 16 survey

[odoo/odoo.git] / addons / hr_evaluation / hr_evaluation_view.xml

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index fb9d287..697ed6b 100644 (file)
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -210,8 +210,8 @@
                     </group>
               </sheet>
                  <div class="oe_chatter">
-                     <field name="message_ids" widget="mail_thread"/>
                      <field name="message_follower_ids" widget="mail_followers"/>
+                     <field name="message_ids" widget="mail_thread"/>
                  </div>
               </form>
             </field>
@@ -283,7 +283,7 @@
                 <form string="Interview Appraisal" version="7.0">
                     <header>
                         <button string="Cancel" name="survey_req_cancel" type="object"
-                            states="draft,waiting_answer"/>
+                            states="draft,waiting_answer" class="oe_left"/>
                         <button string="Print Survey" name="action_print_survey"  type="object"
                             states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
                             attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>