From 5ab63d8bb388393dc729f8ac29096290bcedb60d Mon Sep 17 00:00:00 2001
From: "Turkesh Patel (Open ERP)" <tpa@tinyerp.com>
Date: Mon, 18 Jun 2012 11:20:05 +0530
Subject: [PATCH] [IMP] hr_timesheet: remove cancel button from wizard and
 improved view.

bzr revid: tpa@tinyerp.com-20120618055005-9u7w260t9btjan70
---
 .../hr_timesheet_print_employee_view.xml      | 20 +++++-------
 .../wizard/hr_timesheet_print_users_view.xml  | 10 +++---
 .../wizard/hr_timesheet_sign_in_out_view.xml  | 32 ++++++++-----------
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
index 1eda6de05cb..c35fcf16483 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -8,17 +8,15 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employee Timesheet">
+				<form string="Monthly Employee Timesheet" version="7.0">
+				    <header>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+				    </header>
 					<group colspan="4">
 						<field name="month"/>
 						<field name="year"/>
 						<field name="employee_id" colspan="3"/>
 					</group>
-					<separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
                 </form>
 			</field>
 		</record>
@@ -44,17 +42,15 @@
             <field name="model">hr.analytical.timesheet.employee</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Print My Timesheet">
+                <form string="Print My Timesheet" version="7.0">
+                    <header>
+                        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4">
                     <separator string="This wizard will print monthly timesheet" colspan="4"/>
                         <field name="month"/>
                         <field name="year"/>
                     </group>
-                    <separator colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-print" string="Print" name="print_report" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
index 95b7bd3b93e..555351c3ff3 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,7 +8,10 @@
             <field name="model">hr.analytical.timesheet.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Monthly Employees Timesheet">
+				<form string="Monthly Employees Timesheet" version="7.0">
+				    <header>
+				        <button icon="gtk-print" string="Print" name="print_report" type="object" class="oe_form_button_active_flow"/>
+				    </header>
 					<group height="260" width="460">
 						<group colspan="4">
 							<field name="month"/>
@@ -16,11 +19,6 @@
                             <separator string="Employees" colspan="4"/>
 							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
-						<separator colspan="4"/>
-						<group colspan="4">
-							<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-							<button icon="gtk-print" string="Print" name="print_report" type="object"/>
-						</group>
 					</group>
 				</form>
             </field>
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 7e8d7eea549..c00fc3338cf 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -6,14 +6,12 @@
             <field name="model">hr.sign.in.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
+                <form string="Sign In/Out by Project" verssion="7.0">
+                    <header>
+                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <separator colspan="4" string="Sign In/Out by Project"/>
                     <label colspan="4" nolabel="1" string="Employees can encode their time spent on the different projects they are assigned on. A  project is an analytic account and the time spent on a project generates costs on the analytic account. This feature allows to record at the same time the attendance and the timesheet."/>
-                    <newline/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Sign in / Sign out" name="check_state" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -23,7 +21,10 @@
             <field name="model">hr.sign.in.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
+                <form string="Sign In/Out by Project" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
                         <field name="name" readonly="True" />
@@ -33,10 +34,6 @@
                         <field name="date"/>
                         <label string="(Keep empty for current time)" colspan="2"/>
                     </group>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Start Working" name="sign_in_result" type="object"/>
-                   </group>
                </form>
             </field>
         </record>
@@ -56,7 +53,11 @@
             <field name="model">hr.sign.out.project</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sign In/Out by Project">
+                <form string="Sign In/Out by Project" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object" class="oe_form_button_active_flow"/>
+                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object" class="oe_form_button_active_flow"/>
+                    </header>
                     <group colspan="4" >
                         <separator string="General Information" colspan="4" />
                         <field name="name" readonly="True" />
@@ -70,12 +71,7 @@
                         <label string="(Keep empty for current_time)" colspan="2"/>
                         <field name="analytic_amount"/>
                     </group>
-                    <separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-ok" string="Change Work" name="sign_out_result" type="object"/>
-                        <button icon="gtk-ok" string="Stop Working" name="sign_out_result_end" type="object"/>
-                   </group>
+
                </form>
             </field>
         </record>