From 4c41bbb80a31b513cde150102944da1ab3e05098 Mon Sep 17 00:00:00 2001
From: "apa (OpenERP)" <apa@tinyerp.com>
Date: Wed, 15 Dec 2010 16:18:02 +0530
Subject: [PATCH] [IMP]:improved hr reports.

bzr revid: apa@tinyerp.com-20101215104802-95pv1tz74fuj433b
---
 addons/hr_attendance/report/bymonth.xsl       |  2 +-
 addons/hr_expense/report/expense.rml          | 34 ++++++-------------
 addons/hr_timesheet/report/user_timesheet.xsl |  2 +-
 3 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/addons/hr_attendance/report/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl
index 3975e4d1d11..23e7fb14b3d 100644
--- a/addons/hr_attendance/report/bymonth.xsl
+++ b/addons/hr_attendance/report/bymonth.xsl
@@ -29,7 +29,7 @@
 
     <xsl:template name="story">
 		<spacer length="1cm" />
-		<para style="terp_header_Centre" t="1">Attendance By Month</para>
+		<para style="terp_header_Centre" t="1">Attendances By Month</para>
 		<spacer length="1cm" />
         <blockTable>
 			<xsl:attribute name="style">week</xsl:attribute>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index b12971564b1..eeb9854c059 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -68,10 +68,8 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -113,7 +111,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -122,7 +120,7 @@
           <para style="terp_tblheader_Details">Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -131,7 +129,7 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -176,7 +174,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -185,7 +183,7 @@
           <para style="terp_tblheader_Details">Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -194,7 +192,7 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -203,7 +201,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
-      <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
+      <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_expense_line">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
@@ -256,7 +254,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="57.0,171.0,171.0,32.0,92.0" style="Table_Final_total">
+    <blockTable colWidths="365.0,70.0,100.0" style="Table_Final_total">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -264,17 +262,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total:</para>
+          <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl
index b4a5a8c8d25..b58e8af33b2 100644
--- a/addons/hr_timesheet/report/user_timesheet.xsl
+++ b/addons/hr_timesheet/report/user_timesheet.xsl
@@ -48,7 +48,7 @@
 
     <xsl:template name="story">
 		<spacer length="1cm" />
-		<para style="title" t="1">Timesheet</para>
+		<para style="title" t="1">Timesheet by Employee</para>
 		<spacer length="1cm" />
 		<para style="employee"><xsl:value-of select="/report/employee" /></para>
 		<spacer length="1cm" />