From bf83d4fdec413bba3569098dc6cf6ff47e30f864 Mon Sep 17 00:00:00 2001
From: "rch (Open ERP)" <>
Date: Wed, 15 Sep 2010 11:49:34 +0530
Subject: [PATCH] [IMP]: Add currency symbol in 'Print Salary Structure'
 report.'

bzr revid: rch_open_erp-20100915061934-kra8ly6i2optld2p
---
 .../report/report_emp_salary_structure.rml         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/addons/hr_payroll/report/report_emp_salary_structure.rml b/addons/hr_payroll/report/report_emp_salary_structure.rml
index b171d700977..43019a9b0a0 100644
--- a/addons/hr_payroll/report/report_emp_salary_structure.rml
+++ b/addons/hr_payroll/report/report_emp_salary_structure.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Salary Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -210,7 +210,7 @@
     <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -246,6 +246,9 @@
       <tr>
         <td>
           <para style="terp_header_Centre">Salary Structure</para>
+          <para style="terp_header_Centre">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
@@ -367,7 +370,7 @@
             <para style="terp_tblheader_Details">Salary</para>
           </td>
           <td>
-            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]]</para>
+            <para style="terp_default_9">[[ formatLang(cont.wage) or '' ]] [[ employee.company_id.currency_id.symbol]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details">Notes:</para>
@@ -439,7 +442,7 @@
                 <para style="terp_default_9">[[ get_line_amount_type(line.amount_type) ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(line.amount) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(line.amount) or '']][[ employee.company_id.currency_id.symbol]]</para>
               </td>
               <td>
                 <para style="terp_default_9">[[ get_line_type(line.type) ]]</para>
@@ -548,5 +551,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
-
+</document>
\ No newline at end of file