From 187e9ff63c7b9d89a2c0a80b270bb8d05b53a27e Mon Sep 17 00:00:00 2001
From: "PSI(OpenERP)" <>
Date: Thu, 5 Aug 2010 10:11:04 +0530
Subject: [PATCH] [IMP] hr_payroll: Reports improvements and add bank field on
 payroll advice object

bzr revid: mra@mra-laptop-20100805044104-jt6s9irtb1v59fr2
---
 addons/hr_payroll/hr_payroll.py               | 24 +++++++
 addons/hr_payroll/hr_payroll_view.xml         | 15 +++--
 addons/hr_payroll/report/payroll_register.rml | 20 +++---
 addons/hr_payroll/report/payslip.rml          | 65 ++++++-------------
 .../report/report_payroll_advice.rml          | 43 ++++++------
 5 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index a7984d7c7fa..6454c02a04d 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -325,6 +325,17 @@ class payroll_advice(osv.osv):
     _name = 'hr.payroll.advice'
     _description = 'Bank Advice Note'
 
+    def _get_bank(self, cr, uid, ids, field_name, args, context=None):
+        res = {}
+        if context is None:
+            context = {}
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.company_id and rec.company_id.partner_id.bank_ids:
+                res[rec.id] = rec.company_id.partner_id.bank_ids[0].bank.name
+            else:
+                res[rec.id] = ''
+        return res
+
     _columns = {
         'register_id':fields.many2one('hr.payroll.register', 'Payroll Register', required=False),
         'name':fields.char('Name', size=2048, required=True, readonly=False),
@@ -340,6 +351,7 @@ class payroll_advice(osv.osv):
         'chaque_nos':fields.char('Chaque Nos', size=256, required=False, readonly=False),
         'account_id': fields.many2one('account.account', 'Account', required=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
+        'bank': fields.function(_get_bank, method=True, string='Bank', type="char"),
     }
 
     _defaults = {
@@ -368,6 +380,18 @@ class payroll_advice(osv.osv):
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        res = {}
+        if context is None:
+            context = {}
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            res.update({'bank': company.partner_id.bank_ids[0].bank.name})
+        return {
+            'value':res
+        }
+
+
 payroll_advice()
 
 class payroll_advice_line(osv.osv):
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8f50302d703..2ad028bd752 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -606,7 +606,7 @@
                     <filter icon="terp-check" string="Deduction" domain="[('type','=','deduction')]"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1"/>
-                   	<field name="code" select="1"/>
+                     <field name="code" select="1"/>
                     <field name="type"/>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
@@ -692,11 +692,11 @@
             </field>
         </record>
 
-		<record id="view_hr_company_contribution_filter" model="ir.ui.view">
+    <record id="view_hr_company_contribution_filter" model="ir.ui.view">
             <field name="name">company.contribution.select</field>
              <field name="model">company.contribution</field>
             <field name="type">search</field>
-          	 <field name="arch" type="xml">
+             <field name="arch" type="xml">
                 <search string="Search Company Contribution">
                     <group col="8" colspan="4">
                         <filter icon="terp-document-new" string="Fixed Amount" domain="[('amount_type','=','fix')]" help="Draft Slip"/>
@@ -720,7 +720,7 @@
             <field name="res_model">company.contribution</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_company_contribution_tree"/>
-           	<field name="search_view_id" ref="view_hr_company_contribution_filter"/>
+             <field name="search_view_id" ref="view_hr_company_contribution_filter"/>
         </record>
         <menuitem
             id="menu_hr_company_contribution_tree"
@@ -814,10 +814,13 @@
                                     <field name="flag"/>
                                 </tree>
                             </field>
-                            <field name="company_id"/>
-                            <field name="chaque_nos"/>
                         </page>
                         <page string="Letter Content">
+                            <group colspan="4" col="6">
+                              <field name="company_id" on_change="onchange_company_id(company_id)"/>
+                              <field name="chaque_nos"/>
+                              <field name="bank"/>
+                            </group>
                             <separator colspan="4" string="Letter Details"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 13e40b68fe5..10f01c182cd 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="57.0" y1="57.0" width="480" height="728"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -104,7 +104,7 @@
     <para style="P3">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="72.0,295.0,47.0,68.0" style="Table3">
+    <blockTable colWidths="72.0,294.0,46.0,68.0" style="Table3">
       <tr>
         <td>
           <para style="P6">Expanse To</para>
@@ -130,7 +130,7 @@
           <para style="P6">Date</para>
         </td>
         <td>
-          <para style="P12">[[o.date]]</para>
+          <para style="P12">[[formatLang(time.strftime('%Y-%m-%d'), date = True)]]</para>
         </td>
       </tr>
     </blockTable>
@@ -177,22 +177,22 @@
             <para style="P8">[[ l.employee_id.name ]]</para>
           </td>
           <td>
-            <para style="P10">[[l.basic]]</para>
+            <para style="P10">[[formatLang(l.basic)]]</para>
           </td>
           <td>
-            <para style="P10">[[l.other_pay]]</para>
+            <para style="P10">[[formatLang(l.other_pay)]]</para>
           </td>
           <td>
-            <para style="P10">[[l.allounce]]</para>
+            <para style="P10">[[formatLang(l.allounce)]]</para>
           </td>
           <td>
-            <para style="P10">[[l.grows]]</para>
+            <para style="P10">[[formatLang(l.grows)]]</para>
           </td>
           <td>
-            <para style="P10">[[l.deduction]]</para>
+            <para style="P10">[[formatLang(l.deduction)]]</para>
           </td>
           <td>
-            <para style="P10">[[l.net]]</para>
+            <para style="P10">[[formatLang(l.net)]]</para>
           </td>
         </tr>
       </blockTable>
@@ -230,7 +230,7 @@
         <font color="white"> </font>
       </para>
     </section>
-    <blockTable colWidths="241.0,241.0" style="Table5">
+    <blockTable colWidths="240.0,240.0" style="Table5">
       <tr>
         <td>
           <para style="P6">For [[company.name]],</para>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index ede60a9a490..30f20d167c6 100755
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -72,15 +72,9 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table18">
       <blockAlignment value="LEFT"/>
@@ -95,15 +89,9 @@
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table10">
       <blockAlignment value="LEFT"/>
@@ -240,18 +228,18 @@
       <paraStyle name="all" alignment="justify"/>
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
-    <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" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" 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="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" 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="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" 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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -272,11 +260,11 @@
     <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Table" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <blockTable colWidths="539.0" style="Table2">
@@ -296,7 +284,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="43.0,101.0,67.0,328.0" style="Table15">
+    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table15">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Code</para>
@@ -312,7 +300,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="43.0,496.0" style="Table16">
+    <blockTable colWidths="42.0,497.0" style="Table16">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Address </para>
@@ -322,7 +310,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="43.0,168.0,65.0,263.0" style="Table1">
+    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Email</para>
@@ -338,7 +326,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="43.0,102.0,66.0,169.0,68.0,91.0" style="Table17">
+    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table17">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Slip ID</para>
@@ -346,12 +334,6 @@
         <td>
           <para style="terp_default_9">[[ o.number or '' ]]</para>
         </td>
-        <td>
-          <para style="terp_default_Bold_9">Bill No</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.move_id and o.move_id.name or '' ]]</para>
-        </td>
         <td>
           <para style="terp_default_Bold_9">PAN No</para>
         </td>
@@ -360,7 +342,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="43.0,102.0,66.0,169.0,68.0,91.0" style="Table18">
+    <blockTable colWidths="42.0,207.0,93.0,197.0" style="Table18">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Register</para>
@@ -368,17 +350,11 @@
         <td>
           <para style="terp_default_9">[[ o.register_id and o.register_id.name or '' ]]</para>
         </td>
-        <td>
-          <para style="terp_default_Bold_9">Payment</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ o.payment_id and o.payment_id.name or '' ]]</para>
-        </td>
         <td>
           <para style="terp_default_Bold_9">Designation </para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].function.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.employee_id.contract_ids and o.employee_id.contract_ids[0].job_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -515,7 +491,7 @@
             </tr>
             <tr>
               <td>
-                <para style="terp_default_9"><font>[[repeatIn(get_earnings(o.line_ids),'a') ]]</font><font>[[ a.code or removeParentNode('tr') ]]</font></para>
+                <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>
@@ -669,3 +645,4 @@
     </para>
   </story>
 </document>
+
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index 00a2d599d0e..d9f8c793a8e 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -64,14 +64,14 @@
       <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="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
     <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"/>
@@ -81,8 +81,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.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="8.0" leading="10" 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="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -97,10 +97,10 @@
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
     <paraStyle name="Drawing" fontName="Helvetica-Oblique" 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="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 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"/>
     <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -109,15 +109,15 @@
     <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" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" 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" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" 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" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_tblheader_Details_Centre">Payment Advice</para>
@@ -132,7 +132,9 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.date,date=True) ]]</para>
+          <para style="terp_default_Right_9">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
       <tr>
@@ -147,7 +149,7 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Axis Bank</para>
+          <para style="terp_default_Bold_9">[[o.bank or 'Bank']]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9">
@@ -172,7 +174,7 @@
     <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre"><u>[[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</u></para>
+          <para style="terp_tblheader_General_Centre">[[ o.name ]] for period [[ get_month(o.date)['mname'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -335,3 +337,4 @@
     </para>
   </story>
 </document>
+