[IMP] hr_attendance: improved views

bzr revid: qdp-launchpad@tinyerp.com-20100810090715-k5pbjydc2h9pl0gm

3 files changed, 35 insertions, 42 deletions

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 15acf1985a5..2b8d1ab7a86 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -120,11 +120,12 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
-                  <group col="7" colspan="4">
+                    <group colspan="2">
+                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
+                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
+                    </group>
                     <field name="state"/>
-                    <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
-                    <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
-                  </group>
+                    <newline/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
index b7a9a8afab5..8d3aa343b15 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth_view.xml
@@ -2,28 +2,24 @@
 <openerp>
     <data>
 
-		<record id="view_hr_attendance_month" model="ir.ui.view">
-            <field name="name">Attendance Report Monthly</field>
+        <record id="view_hr_attendance_month" model="ir.ui.view">
+            <field name="name">Attendances Report Monthly</field>
             <field name="model">hr.attendance.month</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Attendance Report Monthly">
-			    <group col="4" colspan="6">
-			    <field name="month"/>
-			    <field name="year"/>
-			    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object"  icon="gtk-yes"/>
-				</group>
-			</form>
+            <form string="Print Attendance Report Monthly">
+                <field name="month"/>
+                <field name="year"/>
+                <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>
 
         <record id="action_hr_attendance_month" model="ir.actions.act_window">
-            <field name="name">Print Attendance by month</field>
+            <field name="name">Attendances by month</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.attendance.month</field>
             <field name="view_type">form</field>
@@ -31,15 +27,15 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_attendance_month_values">
+        <record model="ir.values" id="hr_attendance_month_values">
             <field name="model_id" ref="hr.model_hr_employee" />
             <field name="object" eval="1" />
-            <field name="name">Print Attendance by month</field>
+            <field name="name">Attendances by month</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_month'))" />
             <field name="key">action</field>
             <field name="model">hr.employee</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/hr_attendance/wizard/hr_attendance_error_view.xml b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
index fbb65993f9f..6eec4701fb4 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error_view.xml
+++ b/addons/hr_attendance/wizard/hr_attendance_error_view.xml
@@ -2,31 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_hr_attendance_error" model="ir.ui.view">
+        <record id="view_hr_attendance_error" model="ir.ui.view">
             <field name="name">Attendance Report Error</field>
             <field name="model">hr.attendance.error</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Attendance Report Error">
-			    <group col="4" colspan="6">
-		    	<separator string="Analysis Information" colspan="4"/>
-			    <field name="init_date"/>
-			    <field name="end_date"/>
-			    <field name="max_delay"/>
-			    <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
-			    <newline/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-yes"/>
-				</group>
-			</form>
+            <form string="Print Attendance Report Error">
+                <separator string="Analysis Information" colspan="4"/>
+                <field name="init_date"/>
+                <field name="end_date"/>
+                <field name="max_delay"/>
+                <label string="Bellow this delay, the error is considered to be voluntary" colspan="2"/>
+                <newline/>
+                <separator colspan="4"/>
+                <button special="cancel"  string="Cancel" icon='gtk-cancel' colspan="2"/>
+                <button name="print_report" string="Print" type="object" icon="gtk-print" colspan="2"/>
+            </form>
             </field>
         </record>
 
         <record id="action_hr_attendance_error" model="ir.actions.act_window">
-            <field name="name">Print Attendance Error Report</field>
+            <field name="name">Attendance Error Report</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.attendance.error</field>
             <field name="view_type">form</field>
@@ -34,15 +30,15 @@
             <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="hr_attendance_error_values">
+        <record model="ir.values" id="hr_attendance_error_values">
             <field name="model_id" ref="hr.model_hr_employee" />
             <field name="object" eval="1" />
-            <field name="name">Print Attendance Error Report</field>
+            <field name="name">Attendance Error Report</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_attendance_error'))" />
             <field name="key">action</field>
             <field name="model">hr.employee</field>
         </record>
 
-	</data>
+    </data>
 </openerp>