From d25e8fe61a25ba75798ebd0de5de3daa62fb78b2 Mon Sep 17 00:00:00 2001
From: "psi (Open ERP)" <psi@tinyerp.co.in>
Date: Fri, 27 May 2011 12:26:41 +0530
Subject: [PATCH] [IMP] hr_payroll: Add total and quantity field on payslip
 report and add currency symbol to every row in payslip report and payslip
 details report

bzr revid: psi@tinyerp.co.in-20110527065641-uks394pt8eyj5r5y
---
 addons/hr_payroll/report/report_payslip.rml   | 96 ++++++++++---------
 .../report/report_payslip_details.rml         | 15 ++-
 2 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 6e9cc84235d..a17b9ca4fc1 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -107,9 +107,15 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table9">
       <blockAlignment value="LEFT"/>
@@ -117,6 +123,8 @@
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
@@ -134,20 +142,16 @@
     <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
-    <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
-    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P22" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <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"/>
@@ -190,20 +194,20 @@
     <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
       <tr>
         <td>
-          <para style="P18">Name</para>
+          <para style="P15">Name</para>
         </td>
         <td>
-          <para style="P18">[[o.employee_id.name]]</para>
+          <para style="P15">[[o.employee_id.name]]</para>
         </td>
         <td>
-          <para style="P18">Designation </para>
+          <para style="P15">Designation </para>
         </td>
         <td>
           <para style="P4">[[ o.employee_id.job_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,475.0" style="Table3">
+    <blockTable colWidths="63.0,476.0" style="Table3">
       <tr>
         <td>
           <para style="terp_default_Bold_8">
@@ -218,7 +222,7 @@
     <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
       <tr>
         <td>
-          <para style="P18">Email</para>
+          <para style="P15">Email</para>
         </td>
         <td>
           <para style="P4">[[ o.employee_id.work_email or '' ]]</para>
@@ -233,26 +237,26 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table5">
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
       <tr>
         <td>
-          <para style="P18">Reference</para>
+          <para style="P15">Reference</para>
         </td>
         <td>
           <para style="P4">[[ o.number or '' ]]</para>
         </td>
         <td>
-          <para style="P18">Bank Account</para>
+          <para style="P15">Bank Account</para>
         </td>
         <td>
           <para style="P4">[[ o.employee_id.otherid or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table6">
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
       <tr>
         <td>
-          <para style="P18">Date From</para>
+          <para style="P15">Date From</para>
         </td>
         <td>
           <para style="P4">[[ o.date_from or '']]</para>
@@ -278,25 +282,28 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="54.0,387.0,97.0" style="Table8">
+    <blockTable colWidths="31.0,337.0,56.0,57.0,57.0" style="Table8">
       <tr>
         <td>
-          <para style="P14">Code</para>
+          <para style="P13">Code</para>
         </td>
         <td>
-          <para style="P14">Name</para>
+          <para style="P13">Name</para>
         </td>
         <td>
-          <para style="P15">Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']])</para>
+          <para style="P13">Quantity</para>
+        </td>
+        <td>
+          <para style="P13">Amount</para>
+        </td>
+        <td>
+          <para style="P14">Total</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P11">
-      <font color="white"> </font>
-    </para>
     <section>
       <para style="P4">[[repeatIn(get_payslip_lines(o.line_ids),'p') ]]</para>
-      <blockTable colWidths="54.0,387.0,97.0" style="Table9">
+      <blockTable colWidths="31.0,337.0,56.0,59.0,56.0" style="Table9">
         <tr>
           <td>
             <para style="P4">[[ p.code ]]</para>
@@ -305,18 +312,21 @@
             <para style="P4">[[ p.name ]]</para>
           </td>
           <td>
-            <para style="P5">[[ p.total or '0.0']]</para>
+            <para style="P4">[[ p.quantity ]]</para>
+          </td>
+          <td>
+            <para style="P4">[[ p.amount ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ p.total or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="P12">
-        <font color="white"> </font>
-      </para>
     </section>
-    <para style="P23">
+    <para style="P10">
       <font color="white"> </font>
     </para>
-    <para style="P22">
+    <para style="P16">
       <font color="white"> </font>
     </para>
     <para style="P6">
@@ -333,16 +343,16 @@
           </para>
         </td>
         <td>
-          <para style="P13">
+          <para style="P12">
             <font color="white"> </font>
           </para>
-          <para style="P13">
+          <para style="P12">
             <font color="white"> </font>
           </para>
-          <para style="P13">
+          <para style="P12">
             <font color="white"> </font>
           </para>
-          <para style="P13">Authorized Signature </para>
+          <para style="P12">Authorized Signature </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index 43ad71a7c9e..8e7c9497e2b 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -237,7 +237,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,475.0" style="Table3">
+    <blockTable colWidths="63.0,476.0" style="Table3">
       <tr>
         <td>
           <para style="terp_default_Bold_8">
@@ -267,7 +267,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table5">
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
       <tr>
         <td>
           <para style="P19">Reference</para>
@@ -283,7 +283,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="63.0,205.0,89.0,181.0" style="Table6">
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
       <tr>
         <td>
           <para style="P19">Date From</para>
@@ -327,7 +327,7 @@
           <para style="P17">Name</para>
         </td>
         <td>
-          <para style="P18">Amount<font face="Helvetica">(in [[o.company_id and o.company_id.currency_id.symbol or '']])</font></para>
+          <para style="P18">Total</para>
         </td>
       </tr>
     </blockTable>
@@ -351,7 +351,7 @@
             <para style="P21">[[ h['name'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font></para>
           </td>
           <td>
-            <para style="P7">[[ h['total'] ]] <font face="Helvetica" size="8.0">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+            <para style="P7">[[ h['total'] ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
           </td>
         </tr>
       </blockTable>
@@ -379,7 +379,7 @@
           <para style="P15">Name</para>
         </td>
         <td>
-          <para style="P16">Amount (in [[o.company_id and o.company_id.currency_id.symbol or '']])</para>
+          <para style="P16">Total</para>
         </td>
       </tr>
     </blockTable>
@@ -397,7 +397,7 @@
             <para style="P6">[[ r['name'] ]]</para>
           </td>
           <td>
-            <para style="P7">[[ r['total'] or '0.0']]</para>
+            <para style="P7">[[ r['total'] or '0.0']] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
           </td>
         </tr>
       </blockTable>
@@ -428,4 +428,3 @@
     </para>
   </story>
 </document>
-