From e46d88687499f3b364c2d1102c0067f1c5bd6d41 Mon Sep 17 00:00:00 2001
From: "SAZ (Open ERP)" <>
Date: Thu, 23 Sep 2010 11:10:22 +0530
Subject: [PATCH] [IMP]: Improve 'Salary Register' report.

bzr revid: jni@tinyerp.com-20100923054022-86k42oek5xv7vg0y
---
 .../hr_payroll/report/report_year_report.rml  | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 77a6cdfa1fb..58448de5704 100755
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -68,19 +68,19 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Times-Roman"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -90,13 +90,13 @@
     <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Times-Roman"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -106,8 +106,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -121,8 +121,8 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_header_Centre">Yearly Salary Details </para>
     <para style="terp_default_Centre_9">For [[ get_fiscalyear(data['form']['fiscalyear_id']) ]]</para>
@@ -173,7 +173,7 @@
             <para style="terp_tblheader_Details_Right">[[ m[11] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">Total</para>
+            <para style="terp_tblheader_Details_Right">Total([[company.currency_id.code]])</para>
           </td>
         </tr>
       </blockTable>
@@ -188,43 +188,43 @@
               <para style="terp_default_9">[[ e[0] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[1]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[1]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[2]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[2]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[3]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[3]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[4]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[4]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[5]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[5]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[6]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[6]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[7]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[7]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[8]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[8]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[9]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[9]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[10]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[10]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[11]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[11]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(e[12]) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(e[12]) ]] [[company.currency_id.symbol]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]]</para>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
             </td>
           </tr>
         </blockTable>
@@ -244,46 +244,46 @@
       <blockTable colWidths="74.0,54.0,51.0,55.0,52.0,56.0,55.0,53.0,56.0,56.0,56.0,56.0,56.0,56.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_tblheader_Details">Total</para>
+            <para style="terp_tblheader_Details">Total([[company.currency_id.code]])</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>