[IMP] hr_attendance: remove cancel button from wizard.

bzr revid: tpa@tinyerp.com-20120615132707-94v8x65jfvkru9y1

4 files changed, 23 insertions, 32 deletions

diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index a5015fe4fe5..31d33bdacb7 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Print Attendance Report Monthly" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <group col="4">
                     <field name="month"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
index 63cd0978a7f..59c32fd1fd5 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml
@@ -6,13 +6,12 @@
             <field name="model">hr.attendance.week</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Print Attendance Report Weekly">
+            <form string="Print Attendance Report Weekly" version="7.0">
+                <header>
+                    <button name="print_report" string="Print" type="object"  icon="gtk-print" class="oe_form_button_active_flow"/>
+                </header>
                 <field name="init_date"/>
                 <field name="end_date"/>
-                <newline/>
-                <separator colspan="4"/>
-                <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                <button name="print_report" string="Print" type="object"  icon="gtk-print"/>
             </form>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index a9557fa2962..376892eeec8 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Print Attendance Report Error" version="7.0">
                 <header>
-                    <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
+                    <button name="print_report" string="Print" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
                 </header>
                 <group string="Analysis Information" col="4">
                     <field name="init_date"/>
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
index 13ce91c79d4..e1b0b6232ae 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
@@ -6,7 +6,11 @@
             <field name="model">hr.sign.in.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
+                <form string="Sign in / Sign out" version="7.0">
+                    <header>
+                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <separator colspan="4" string="Sign in / Sign out"/>
                     <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
                     <newline/>
@@ -14,12 +18,6 @@
                     <field name="name" />
                     <field name="state" />
                     </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object"/>
-                        <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -29,11 +27,11 @@
             <field name="model">hr.sign.in.out</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign in / Sign out">
+                <form string="Sign in / Sign out" version="7.0">
+                    <header>
+                        <button icon="gtk-cancel" special="cancel" string="Ok" class="oe_form_button_active_flow"/>
+                    </header>
                     <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Ok"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -56,17 +54,15 @@
             <field name="model">hr.sign.in.out.ask</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="hr.sign.out.ask">
+                <form string="hr.sign.out.ask" version="7.0">
+                    <header>
+                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" >
                     <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
                     <field name="name" />
                     <field name="last_time" string="Your last sign out" />
                     </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign in" name="sign_in" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -76,17 +72,15 @@
             <field name="model">hr.sign.in.out.ask</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="hr.sign.in.out.ask">
+                <form string="hr.sign.in.out.ask" version="7.0">
+                    <header>
+                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" >
                     <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
                     <field name="name" />
                     <field name="last_time" string="Your last sign in" />
                     </group>
-                    <separator colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-back" string="Sign out" name="sign_out" type="object"/>
-                   </group>
                </form>
             </field>
         </record>