From 2284c296be51f6d62bf3bcac1548cc5e6b21c8fe Mon Sep 17 00:00:00 2001
From: apa-tiny <apa@tinyerp.com>
Date: Mon, 13 Sep 2010 16:09:22 +0530
Subject: [PATCH] pay slip

bzr revid: apa@tinyerp.com-20100913103922-9cw221rwpkgbukpm
---
 addons/hr_payroll/report/payslip.rml | 75 ++++++++--------------------
 1 file changed, 20 insertions(+), 55 deletions(-)

diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 5a760096bc5..89d29af9273 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -227,7 +227,6 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
     <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="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -270,16 +269,13 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_header_Centre">Pay Slip</para>
+          <para style="terp_header_Centre">Pay Slip </para>
+          <para style="terp_default_Centre_9">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
@@ -295,7 +291,7 @@
           <para style="terp_default_Bold_9">Name </para>
         </td>
         <td>
-          <para style="terp_default_9">[[o.employee_id.name]]</para>
+          <para style="terp_default_Bold_9">[[o.employee_id.name]]</para>
         </td>
       </tr>
     </blockTable>
@@ -325,7 +321,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table17">
+    <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table17">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Slip ID</para>
@@ -341,7 +337,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table18">
+    <blockTable colWidths="42.0,208.0,93.0,197.0" style="Table18">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Register</para>
@@ -396,7 +392,7 @@
           <para style="terp_default_Bold_9">Basic Salary</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.basic_before_leaves or '' ]]</para>
+          <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Leaved Deduction</para>
@@ -408,13 +404,10 @@
           <para style="terp_default_Bold_9">Basic Salary – Leaves</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ formatLang(o.basic) ]]</para>
+          <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="539.0" style="Table12">
       <tr>
         <td>
@@ -422,9 +415,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="292.0,247.0" style="Table14">
       <tr>
         <td>
@@ -435,9 +425,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_9">[[repeatIn(get_leave(o.line_ids),'ld') ]]</para>
       <blockTable colWidths="293.0,246.0" style="Table13">
@@ -446,17 +433,11 @@
             <para style="terp_default_9">[[ ld.code ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="158.0,112.0,160.0,109.0" style="Table3">
       <tr>
         <td>
@@ -473,9 +454,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="269.0,269.0" style="Table8">
       <tr>
         <td>
@@ -485,7 +463,7 @@
                 <para style="terp_default_9">Basic Salary</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id.currency_id.symbol ]]</para>
               </td>
             </tr>
             <tr>
@@ -493,7 +471,7 @@
                 <para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code or removeParentNode('tr') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(a.total) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -510,7 +488,7 @@
                   <para style="terp_default_9">[[ b.code ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]]</para>
+                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id.currency_id.symbol ]]</para>
                 </td>
               </tr>
             </blockTable>
@@ -524,22 +502,19 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="181.0,88.0,177.0,93.0" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Total Earnings </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] </para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Total Deductions </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -559,9 +534,6 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="terp_default_9">[[repeatIn(get_others(o.line_ids),'ol') ]]</para>
       <blockTable colWidths="269.0,134.0,135.0" style="Table22">
@@ -570,20 +542,14 @@
             <para style="terp_default_9">[[ ol.type in ['advance','loan','otherpay','otherdeduct','installment'] and ol.code or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <blockTable colWidths="269.0,177.0,93.0" style="Table5">
       <tr>
         <td>
@@ -595,7 +561,7 @@
           <para style="terp_tblheader_Details">Net Amount </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -630,7 +596,7 @@
     <blockTable colWidths="269.0,269.0" style="Table7">
       <tr>
         <td>
-          <para style="P1">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -643,5 +609,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
-
+</document>
\ No newline at end of file